aboutsummaryrefslogtreecommitdiffstats
path: root/test/libsolidity/SolidityScanner.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'test/libsolidity/SolidityScanner.cpp')
-rw-r--r--test/libsolidity/SolidityScanner.cpp172
1 files changed, 38 insertions, 134 deletions
diff --git a/test/libsolidity/SolidityScanner.cpp b/test/libsolidity/SolidityScanner.cpp
index 9ad738ae..f2e756bb 100644
--- a/test/libsolidity/SolidityScanner.cpp
+++ b/test/libsolidity/SolidityScanner.cpp
@@ -155,170 +155,74 @@ BOOST_AUTO_TEST_CASE(trailing_dot)
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
-BOOST_AUTO_TEST_CASE(underscores_in_integer)
-{
- Scanner scanner(CharStream("var x = 1_23_4;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
- BOOST_CHECK_EQUAL(scanner.currentLiteral(), "1234");
- BOOST_CHECK_EQUAL(scanner.next(), Token::Semicolon);
- BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(underscores_in_scientific_notation)
+BOOST_AUTO_TEST_CASE(leading_underscore_decimal_is_identifier)
{
- Scanner scanner(CharStream("var x = 1_2e10;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
+ // Actual error is cought by SyntaxChecker.
+ Scanner scanner(CharStream("_1.2"));
+ BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
- BOOST_CHECK_EQUAL(scanner.currentLiteral(), "12e10");
- BOOST_CHECK_EQUAL(scanner.next(), Token::Semicolon);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
-BOOST_AUTO_TEST_CASE(underscores_in_scientific_notation_in_exp_part)
+BOOST_AUTO_TEST_CASE(leading_underscore_decimal_after_dot_illegal)
{
- Scanner scanner(CharStream("var x = 12e1_0;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
- BOOST_CHECK_EQUAL(scanner.currentLiteral(), "12e10");
- BOOST_CHECK_EQUAL(scanner.next(), Token::Semicolon);
+ // Actual error is cought by SyntaxChecker.
+ Scanner scanner(CharStream("1._2"));
+ BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-}
-
-BOOST_AUTO_TEST_CASE(underscores_in_hex)
-{
- Scanner scanner(CharStream("var x = 0xab_19cf;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
- BOOST_CHECK_EQUAL(scanner.currentLiteral(), "0xab_19cf");
- BOOST_CHECK_EQUAL(scanner.next(), Token::Semicolon);
+ scanner.reset(CharStream("1._"), "");
+ BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
-BOOST_AUTO_TEST_CASE(leading_underscore_integer_is_identifier)
-{
- Scanner scanner(CharStream("var x = _12;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-}
-
-BOOST_AUTO_TEST_CASE(leading_underscore_decimal_is_identifier)
-{
- Scanner scanner(CharStream("var x = _1.2;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
-}
-
-BOOST_AUTO_TEST_CASE(leading_underscore_decimal_after_dot_illegal)
-{
- Scanner scanner(CharStream("var x = 1._2;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-}
-
BOOST_AUTO_TEST_CASE(leading_underscore_exp_are_identifier)
{
- Scanner scanner(CharStream("var x = _1e2;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
+ // Actual error is cought by SyntaxChecker.
+ Scanner scanner(CharStream("_1e2"));
+ BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
+ BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
BOOST_AUTO_TEST_CASE(leading_underscore_exp_after_e_illegal)
{
- Scanner scanner(CharStream("var x = 1e_2;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
+ // Actual error is cought by SyntaxChecker.
+ Scanner scanner(CharStream("1e_2"));
+ BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
+ BOOST_CHECK_EQUAL(scanner.currentLiteral(), "1e_2");
+ BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
BOOST_AUTO_TEST_CASE(leading_underscore_hex_illegal)
{
- Scanner scanner(CharStream("var x = 0x_abc;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-}
-
-BOOST_AUTO_TEST_CASE(trailing_underscore_integer_illegal)
-{
- Scanner scanner(CharStream("var x = 12_;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-}
-
-BOOST_AUTO_TEST_CASE(leading_underscore_after_decimal_illegal)
-{
- Scanner scanner(CharStream("var x = 1.2_;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-}
-
-BOOST_AUTO_TEST_CASE(leading_underscore_before_decimal_illegal)
-{
- Scanner scanner(CharStream("var x = 1_.2;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
+ Scanner scanner(CharStream("0x_abc"));
+ BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
+ BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
-BOOST_AUTO_TEST_CASE(trailing_underscore_exp_illegal)
+BOOST_AUTO_TEST_CASE(fixed_number_invalid_underscore_front)
{
- Scanner scanner(CharStream("var x = 1e2_;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
+ // Actual error is cought by SyntaxChecker.
+ Scanner scanner(CharStream("12._1234_1234"));
+ BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
+ BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
-BOOST_AUTO_TEST_CASE(trailing_underscore_exp_before_e_illegal)
+BOOST_AUTO_TEST_CASE(number_literals_with_trailing_underscore_at_eos)
{
- Scanner scanner(CharStream("var x = 1_e2;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-}
+ // Actual error is cought by SyntaxChecker.
+ Scanner scanner(CharStream("0x123_"));
+ BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
+ BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-BOOST_AUTO_TEST_CASE(trailing_underscore_hex_illegal)
-{
- Scanner scanner(CharStream("var x = 0xabc_;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
-}
+ scanner.reset(CharStream("123_"), "");
+ BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
+ BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
-BOOST_AUTO_TEST_CASE(double_underscore_illegal)
-{
- Scanner scanner(CharStream("var x = 1__2;"));
- BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Var);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Assign);
- BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
+ scanner.reset(CharStream("12.34_"), "");
+ BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
+ BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
BOOST_AUTO_TEST_CASE(negative_numbers)
generated by cgit (git 2.34.1) at 2024-11-18 03:52:39 +0800