cerc-io/solidity
10
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

Merge pull request #9466 from ethereum/fixTokens

Browse Source 
Properly sort token list.
This commit is contained in:
chriseth 2020-07-27 10:42:31 +02:00 committed by GitHub
commit 1a1960ede0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
liblangutil/Token.h
View File

@ -148,6 +148,7 @@ namespace solidity::langutil
K(As, "as", 0) \
K(Assembly, "assembly", 0) \
K(Break, "break", 0) \
K(Catch, "catch", 0) \
K(Constant, "constant", 0) \
K(Constructor, "constructor", 0) \
K(Continue, "continue", 0) \
@ -187,6 +188,7 @@ namespace solidity::langutil
K(CallData, "calldata", 0) \
K(Struct, "struct", 0) \
K(Throw, "throw", 0) \
K(Try, "try", 0) \
K(Type, "type", 0) \
K(Using, "using", 0) \
K(View, "view", 0) \
@ -237,7 +239,6 @@ namespace solidity::langutil
K(Apply, "apply", 0) \
K(Auto, "auto", 0) \
K(Case, "case", 0) \
K(Catch, "catch", 0) \
K(CopyOf, "copyof", 0) \
K(Default, "default", 0) \
K(Define, "define", 0) \
@ -260,7 +261,6 @@ namespace solidity::langutil
K(Static, "static", 0) \
K(Supports, "supports", 0) \
K(Switch, "switch", 0) \
K(Try, "try", 0) \
K(Typedef, "typedef", 0) \
K(TypeOf, "typeof", 0) \
K(Unchecked, "unchecked", 0) \

2
test/libsolidity/SolidityParser.cpp
View File

@ -535,7 +535,6 @@ BOOST_AUTO_TEST_CASE(keyword_is_reserved)
"apply",
"auto",
"case",
"catch",
"copyof",
"default",
"define",
@ -558,7 +557,6 @@ BOOST_AUTO_TEST_CASE(keyword_is_reserved)
"static",
"supports",
"switch",
"try",
"typedef",
"typeof",
"unchecked"

2
test/libsolidity/syntaxTests/tryCatch/no_catch.sol
View File

@ -5,4 +5,4 @@ contract C {
}
}
// ----
// ParserError 2314: (97-98): Expected reserved keyword 'catch' but got '}'
// ParserError 2314: (97-98): Expected 'catch' but got '}'