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

Simplify expectIdentifierToken by using expectToken

Browse Source
This commit is contained in:
Alex Beregszaszi
2018-05-03 22:10:51 +01:00
parent 73c99d15cd
commit ed9f80690b
13 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/SolidityParser.cpp
+1 -1
View File
@@ -992,7 +992,7 @@ BOOST_AUTO_TEST_CASE(keyword_is_reserved)
for (const auto& keyword: keywords)
{
auto text = std::string("contract ") + keyword + " {}";
CHECK_PARSE_ERROR(text.c_str(), "Expected identifier");
CHECK_PARSE_ERROR(text.c_str(), "Expected token Identifier got reserved keyword");
}
}
test/libsolidity/StandardCompiler.cpp
+2 -2
View File
@@ -326,8 +326,8 @@ BOOST_AUTO_TEST_CASE(compilation_error)
{
BOOST_CHECK_EQUAL(
dev::jsonCompactPrint(error),
"{\"component\":\"general\",\"formattedMessage\":\"fileA:1:23: ParserError: Expected identifier, got 'RBrace'\\n"
"contract A { function }\\n ^\\n\",\"message\":\"Expected identifier, got 'RBrace'\","
"{\"component\":\"general\",\"formattedMessage\":\"fileA:1:23: ParserError: Expected token Identifier got 'RBrace'\\n"
"contract A { function }\\n ^\\n\",\"message\":\"Expected token Identifier got 'RBrace'\","
"\"severity\":\"error\",\"sourceLocation\":{\"end\":22,\"file\":\"fileA\",\"start\":22},\"type\":\"ParserError\"}"
);
}
test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol
+1 -1
View File
@@ -2,4 +2,4 @@ contract Foo {
uint constant = 4;
}
// ----
// ParserError: (30-30): Expected identifier, got 'Assign'
// ParserError: (30-30): Expected token Identifier got 'Assign'
test/libsolidity/syntaxTests/parsing/external_variable.sol
+1 -1
View File
@@ -2,4 +2,4 @@ contract c {
uint external x;
}
// ----
// ParserError: (19-19): Expected identifier, got 'External'
// ParserError: (19-19): Expected token Identifier got 'External'
test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol
+1 -1
View File
@@ -2,4 +2,4 @@ contract Foo {
uint[] memory x;
}
// ----
// ParserError: (23-23): Expected identifier, got 'Memory'
// ParserError: (23-23): Expected token Identifier got 'Memory'
test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol
+1 -1
View File
@@ -3,4 +3,4 @@ contract test {
function b() returns (uint r) { r = a({: 1, : 2, : 3}); }
}
// ----
// ParserError: (143-143): Expected identifier, got 'Colon'
// ParserError: (143-143): Expected token Identifier got 'Colon'
test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol
+1 -1
View File
@@ -2,4 +2,4 @@ contract test {
uint256 ;
}
// ----
// ParserError: (28-28): Expected identifier, got 'Semicolon'
// ParserError: (28-28): Expected token Identifier got 'Semicolon'
test/libsolidity/syntaxTests/parsing/payable_accessor.sol
+1 -1
View File
@@ -2,4 +2,4 @@ contract test {
uint payable x;
}
// ----
// ParserError: (22-22): Expected identifier, got 'Payable'
// ParserError: (22-22): Expected token Identifier got 'Payable'
test/libsolidity/syntaxTests/parsing/var_array.sol
+1 -1
View File
@@ -2,4 +2,4 @@ contract Foo {
function f() { var[] a; }
}
// ----
// ParserError: (34-34): Expected identifier, got 'LBrack'
// ParserError: (34-34): Expected token Identifier got 'LBrack'