cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

adapt to latest code changes

Browse Source
This commit is contained in:
Lazaridis
2018-11-23 17:27:52 +01:00
committed by Christian Parpart
parent 2e861bf1a0
commit e454737a3c
11 changed files with 79 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/SolidityScanner.cpp
+19 -16
View File
@@ -59,6 +59,8 @@ BOOST_AUTO_TEST_CASE(smoke_test)
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
// STRING ESCAPES
BOOST_AUTO_TEST_CASE(string_escapes)
{
Scanner scanner(CharStream(" { \"a\\x61\""));
@@ -87,12 +89,12 @@ BOOST_AUTO_TEST_CASE(string_escape_illegal)
{
Scanner scanner(CharStream(" bla \"\\x6rf\" (illegalescape)"));
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.next(), Token::IllegalStringEscape);
BOOST_CHECK_EQUAL(scanner.currentLiteral(), "");
// TODO recovery from illegal tokens should be improved
BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.next(), Token::IllegalNumberEnd);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.next(), Token::IllegalStringEndQuote);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
@@ -110,18 +112,19 @@ BOOST_AUTO_TEST_CASE(hex_numbers)
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
BOOST_CHECK_EQUAL(scanner.currentLiteral(), "0x1234");
scanner.reset(CharStream("0X1234"), "");
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
// @todo update underlying code to return "Expected lower-case 'x' for Hex-Numbers." or similar.
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::IllegalNumberEnd);
}
BOOST_AUTO_TEST_CASE(octal_numbers)
{
Scanner scanner(CharStream("07"));
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::IllegalOctalNotAllowed);
scanner.reset(CharStream("007"), "");
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::IllegalOctalNotAllowed);
scanner.reset(CharStream("-07"), "");
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Sub);
BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.next(), Token::IllegalOctalNotAllowed);
scanner.reset(CharStream("-.07"), "");
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Sub);
BOOST_CHECK_EQUAL(scanner.next(), Token::Number);
@@ -204,7 +207,7 @@ BOOST_AUTO_TEST_CASE(leading_underscore_exp_after_e_illegal)
BOOST_AUTO_TEST_CASE(leading_underscore_hex_illegal)
{
Scanner scanner(CharStream("0x_abc"));
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::IllegalHexDigit);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
@@ -469,7 +472,7 @@ BOOST_AUTO_TEST_CASE(invalid_short_unicode_string_escape)
{
Scanner scanner(CharStream("{ \"\\uFFnicode\""));
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.next(), Token::IllegalStringEscape);
}
// HEX STRING LITERAL
@@ -516,7 +519,7 @@ BOOST_AUTO_TEST_CASE(invalid_multiline_comment_close)
{
// This used to parse as "comment", "identifier"
Scanner scanner(CharStream("/** / x"));
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::IllegalCommentTerminator);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
@@ -524,14 +527,14 @@ BOOST_AUTO_TEST_CASE(multiline_doc_comment_at_eos)
{
// This used to parse as "whitespace"
Scanner scanner(CharStream("/**"));
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::IllegalCommentTerminator);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
BOOST_AUTO_TEST_CASE(multiline_comment_at_eos)
{
Scanner scanner(CharStream("/*"));
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::IllegalCommentTerminator);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
@@ -594,10 +597,10 @@ BOOST_AUTO_TEST_CASE(regular_line_breaks_in_strings)
for (auto const& nl: {"\n", "\r"})
{
Scanner scanner(CharStream("\"abc " + string(nl) + " def\""));
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::IllegalStringEndQuote);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.next(), Token::IllegalStringEndQuote);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
}
@@ -607,12 +610,12 @@ BOOST_AUTO_TEST_CASE(irregular_line_breaks_in_strings)
for (auto const& nl: {"\v", "\f", "\xE2\x80\xA8", "\xE2\x80\xA9"})
{
Scanner scanner(CharStream("\"abc " + string(nl) + " def\""));
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::IllegalStringEndQuote);
for (size_t i = 0; i < string(nl).size(); i++)
BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.next(), Token::IllegalStringEndQuote);
BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
}
}
test/libsolidity/syntaxTests/inlineAssembly/invalid/invalid_number.sol
+1 -1
View File
@@ -7,4 +7,4 @@ contract C {
}
// ----
// ParserError: (72-73): Literal, identifier or instruction expected.
// ParserError: (72-73): Expected primary expression.
// ParserError: (72-73): Octal Numbers not allowed.
test/libsolidity/syntaxTests/parsing/invalid_fixed_conversion_leading_zeroes_check.sol
+1 -1
View File
@@ -4,4 +4,4 @@ contract test {
}
}
// ----
// ParserError: (44-47): Expected primary expression.
// ParserError: (44-47): Digit or Identifier-Start not allowed at end of Number.
test/libsolidity/syntaxTests/string/string_new_line.sol
+1 -1
View File
@@ -6,4 +6,4 @@ contract test {
}
}
// ----
// ParserError: (100-112): Expected primary expression.
// ParserError: (100-112): Expected String end-quote.
test/libsolidity/syntaxTests/string/string_terminated_by_backslash.sol
+1 -1
View File
@@ -5,4 +5,4 @@ contract test {
}
}
// ----
// ParserError: (100-109): Expected primary expression.
// ParserError: (100-109): Expected String end-quote.
test/libsolidity/syntaxTests/string/string_unterminated.sol
+1 -1
View File
@@ -4,4 +4,4 @@ contract test {
}
}
// ----
// ParserError: (100-112): Expected primary expression.
// ParserError: (100-112): Expected String end-quote.
test/libsolidity/syntaxTests/string/string_unterminated_no_new_line.sol
+1 -1
View File
@@ -1,4 +1,4 @@
contract test {
function f() pure public { "abc\
// ----
// ParserError: (47-53): Expected primary expression.
// ParserError: (47-53): Expected String end-quote.
test/libsolidity/syntaxTests/unicode_escape_literals.sol
+1 -1
View File
@@ -28,4 +28,4 @@ contract test {
}
// ----
// ParserError: (678-681): Expected primary expression.
// ParserError: (678-681): Invalid String Escape.