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

Expose hex literal to the Yul parser

Browse Source 
This allows nicer error messages.
This commit is contained in:
Alex Beregszaszi
2020-08-28 19:34:52 +01:00
parent 26a76c18d4
commit 7ef9591e64
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/liblangutil/Scanner.cpp
+4 -7
View File
@@ -652,9 +652,8 @@ BOOST_AUTO_TEST_CASE(hex_prefix_only)
BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalToken);
scanner.reset(CharStream("{ hex", ""));
scanner.setScannerMode(ScannerKind::Yul);
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.currentLiteral(), "hex");
BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalToken);
}
BOOST_AUTO_TEST_CASE(hex_invalid_space)
@@ -674,10 +673,8 @@ BOOST_AUTO_TEST_CASE(hex_invalid_token)
scanner.reset(CharStream("{ hex test", ""));
scanner.setScannerMode(ScannerKind::Yul);
BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.currentLiteral(), "hex");
BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
BOOST_CHECK_EQUAL(scanner.currentLiteral(), "test");
BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalToken);
}
BOOST_AUTO_TEST_CASE(valid_hex_literal)
test/libsolidity/syntaxTests/inlineAssembly/hex_assignment.sol
+1 -1
View File
@@ -6,4 +6,4 @@ contract C {
}
}
// ----
// ParserError 6913: (86-87): Call or assignment expected.
// ParserError 3772: (72-81): Hex literals are not valid in this context.
test/libsolidity/syntaxTests/inlineAssembly/hex_expression.sol
+1 -1
View File
@@ -6,4 +6,4 @@ contract C {
}
}
// ----
// ParserError 2314: (70-76): Expected ',' but got 'StringLiteral'
// ParserError 3772: (67-76): Hex literals are not valid in this context.
test/libsolidity/syntaxTests/inlineAssembly/hex_switch_case.sol
+1 -1
View File
@@ -8,4 +8,4 @@ contract C {
}
}
// ----
// ParserError 4805: (95-99): Literal expected.
// ParserError 3772: (92-99): Hex literals are not valid in this context.
test/libsolidity/syntaxTests/inlineAssembly/solidity_keywords.sol
+2 -2
View File
@@ -21,7 +21,7 @@ contract C {
let fallback := 1
// for is a Yul keyword
// function is a Yul keyword
let hex := 1
// hex is a Yul keyword
// if is a Yul keyword
let indexed := 1
let interface := 1
@@ -110,4 +110,4 @@ contract C {
}
}
// ----
// Warning 5740: (944-2157): Unreachable code.
// Warning 5740: (955-2168): Unreachable code.
test/libyul/yulSyntaxTests/hex_assignment.yul
+1 -1
View File
@@ -2,4 +2,4 @@
let x := hex"0011"
}
// ----
// ParserError 6913: (25-26): Call or assignment expected.
// ParserError 3772: (15-24): Hex literals are not valid in this context.
test/libyul/yulSyntaxTests/hex_expression.yul
+1 -1
View File
@@ -2,4 +2,4 @@
pop(hex"2233")
}
// ----
// ParserError 2314: (13-19): Expected ',' but got 'StringLiteral'
// ParserError 3772: (10-19): Hex literals are not valid in this context.
test/libyul/yulSyntaxTests/hex_switch_case.yul
+1 -1
View File
@@ -4,4 +4,4 @@
case hex"1122" {}
}
// ----
// ParserError 4805: (36-40): Literal expected.
// ParserError 3772: (33-40): Hex literals are not valid in this context.
test/libyul/yulSyntaxTests/solidity_keywords.yul
+1 -1
View File
@@ -19,7 +19,7 @@
let fallback := 1
// for is a Yul keyword
// function is a Yul keyword
let hex := 1
// hex is a Yul keyword
// if is a Yul keyword
let indexed := 1
let interface := 1