Skip to content

Commit 70f345a

Browse files
committed
update the test
1 parent b2d0879 commit 70f345a

File tree

3 files changed

+49
-27
lines changed

3 files changed

+49
-27
lines changed

scanner/run_tests

-629 KB
Binary file not shown.

scanner/test/scanner_test.cpp

Lines changed: 47 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,29 @@ namespace TINY
4141
Scanner scanner(input);
4242

4343
// First identifier: "varName"
44-
EXPECT_EQ(scanner.getNextToken().getType(), TokenType::IDENTIFIER);
45-
EXPECT_EQ(scanner.getNextToken().getValue(), "varName");
44+
Token token1 = scanner.getNextToken(); // Store the token
45+
EXPECT_EQ(token1.getType(), TokenType::IDENTIFIER);
46+
EXPECT_EQ(token1.getValue(), "varName");
4647

4748
// Identifier: "another"
48-
EXPECT_EQ(scanner.getNextToken().getType(), TokenType::IDENTIFIER);
49-
EXPECT_EQ(scanner.getNextToken().getValue(), "another");
49+
Token token2 = scanner.getNextToken(); // Store the next token
50+
EXPECT_EQ(token2.getType(), TokenType::IDENTIFIER);
51+
EXPECT_EQ(token2.getValue(), "another");
5052

5153
// Underscore as UNKNOWN token
52-
EXPECT_EQ(scanner.getNextToken().getType(), TokenType::UNKNOWN);
53-
EXPECT_EQ(scanner.getNextToken().getValue(), "_");
54+
Token token3 = scanner.getNextToken(); // Store the next token
55+
EXPECT_EQ(token3.getType(), TokenType::UNKNOWN);
56+
EXPECT_EQ(token3.getValue(), "_");
5457

5558
// Identifier: "var"
56-
EXPECT_EQ(scanner.getNextToken().getType(), TokenType::IDENTIFIER);
57-
EXPECT_EQ(scanner.getNextToken().getValue(), "var");
59+
Token token4 = scanner.getNextToken(); // Store the next token
60+
EXPECT_EQ(token4.getType(), TokenType::IDENTIFIER);
61+
EXPECT_EQ(token4.getValue(), "var");
5862

5963
// Final identifier: "lastVar"
60-
EXPECT_EQ(scanner.getNextToken().getType(), TokenType::IDENTIFIER);
61-
EXPECT_EQ(scanner.getNextToken().getValue(), "lastVar");
64+
Token token5 = scanner.getNextToken(); // Store the next token
65+
EXPECT_EQ(token5.getType(), TokenType::IDENTIFIER);
66+
EXPECT_EQ(token5.getValue(), "lastVar");
6267
}
6368

6469
// Test numeric literals
@@ -67,14 +72,20 @@ namespace TINY
6772
std::string input = "123 45678 999";
6873
Scanner scanner(input);
6974

70-
EXPECT_EQ(scanner.getNextToken().getType(), TokenType::NUMBER);
71-
EXPECT_EQ(scanner.getNextToken().getValue(), "123");
75+
// First number: "123"
76+
Token token1 = scanner.getNextToken(); // Store the token
77+
EXPECT_EQ(token1.getType(), TokenType::NUMBER);
78+
EXPECT_EQ(token1.getValue(), "123");
7279

73-
EXPECT_EQ(scanner.getNextToken().getType(), TokenType::NUMBER);
74-
EXPECT_EQ(scanner.getNextToken().getValue(), "45678");
80+
// Second number: "45678"
81+
Token token2 = scanner.getNextToken(); // Store the next token
82+
EXPECT_EQ(token2.getType(), TokenType::NUMBER);
83+
EXPECT_EQ(token2.getValue(), "45678");
7584

76-
EXPECT_EQ(scanner.getNextToken().getType(), TokenType::NUMBER);
77-
EXPECT_EQ(scanner.getNextToken().getValue(), "999");
85+
// Third number: "999"
86+
Token token3 = scanner.getNextToken(); // Store the next token
87+
EXPECT_EQ(token3.getType(), TokenType::NUMBER);
88+
EXPECT_EQ(token3.getValue(), "999");
7889
}
7990

8091
// Test mixed tokens
@@ -95,17 +106,28 @@ namespace TINY
95106
// Test unknown tokens
96107
TEST(ScannerTest, UnknownTokens)
97108
{
98-
std::string input = "@ $ #";
109+
std::string input = "@ _ $ #";
99110
Scanner scanner(input);
100111

101-
EXPECT_EQ(scanner.getNextToken().getType(), TokenType::UNKNOWN);
102-
EXPECT_EQ(scanner.getNextToken().getValue(), "@");
103-
104-
EXPECT_EQ(scanner.getNextToken().getType(), TokenType::UNKNOWN);
105-
EXPECT_EQ(scanner.getNextToken().getValue(), "$");
106-
107-
EXPECT_EQ(scanner.getNextToken().getType(), TokenType::UNKNOWN);
108-
EXPECT_EQ(scanner.getNextToken().getValue(), "#");
112+
// First unknown token: "@"
113+
Token token1 = scanner.getNextToken(); // Store the token
114+
EXPECT_EQ(token1.getType(), TokenType::UNKNOWN);
115+
EXPECT_EQ(token1.getValue(), "@");
116+
117+
// Second unknown token: "_"
118+
Token token2 = scanner.getNextToken(); // Store the next token
119+
EXPECT_EQ(token2.getType(), TokenType::UNKNOWN);
120+
EXPECT_EQ(token2.getValue(), "_");
121+
122+
// Second unknown token: "$"
123+
Token token3 = scanner.getNextToken(); // Store the next token
124+
EXPECT_EQ(token3.getType(), TokenType::UNKNOWN);
125+
EXPECT_EQ(token3.getValue(), "$");
126+
127+
// Third unknown token: "#"
128+
Token token4 = scanner.getNextToken(); // Store the next token
129+
EXPECT_EQ(token4.getType(), TokenType::UNKNOWN);
130+
EXPECT_EQ(token4.getValue(), "#");
109131
}
110132

111133
} // namespace SCANNER

scanner/test/token_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ namespace TINY
2222
{
2323
Token token(TokenType::IF, "if", 1, 1);
2424

25-
EXPECT_EQ(token.toString(false), "IF, if");
26-
EXPECT_EQ(token.toString(true), "IF, if [Line: 1, Column: 1]");
25+
EXPECT_EQ(token.toString(false), "if, IF");
26+
EXPECT_EQ(token.toString(true), "if, IF [Line: 1, Column: 1]");
2727
}
2828

2929
} // namespace SCANNER

0 commit comments

Comments
 (0)