diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-06-12 23:33:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-12 23:33:26 +0800 |
| commit | d1e7e9ef5e3dfbf49045976da91a6a88dd28bbd3 (patch) | |
| tree | 1ba75f1db43bc443449fa34ee3de5b9134d8c235 /libsolidity | |
| parent | e2f4a9fcf409df1108d355824de12ff43682a728 (diff) | |
| parent | e4b7b2160e0f98670d39c9651e7ceafd6b1aea32 (diff) | |
| download | dexon-solidity-d1e7e9ef5e3dfbf49045976da91a6a88dd28bbd3.tar.gz dexon-solidity-d1e7e9ef5e3dfbf49045976da91a6a88dd28bbd3.tar.zst dexon-solidity-d1e7e9ef5e3dfbf49045976da91a6a88dd28bbd3.zip | |
Merge pull request #3627 from ethereum/additional-keywords
[BREAKING] Add new reserved keywords.
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/parsing/Token.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/libsolidity/parsing/Token.h b/libsolidity/parsing/Token.h index 845a97bc..cb855cbe 100644 --- a/libsolidity/parsing/Token.h +++ b/libsolidity/parsing/Token.h @@ -223,22 +223,41 @@ namespace solidity /* Keywords reserved for future use. */ \ K(Abstract, "abstract", 0) \ K(After, "after", 0) \ + K(Alias, "alias", 0) \ + 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) \ K(Final, "final", 0) \ + K(Immutable, "immutable", 0) \ + K(Implements, "implements", 0) \ K(In, "in", 0) \ K(Inline, "inline", 0) \ K(Let, "let", 0) \ + K(Macro, "macro", 0) \ K(Match, "match", 0) \ + K(Mutable, "mutable", 0) \ K(NullLiteral, "null", 0) \ K(Of, "of", 0) \ + K(Override, "override", 0) \ + K(Partial, "partial", 0) \ + K(Promise, "promise", 0) \ + K(Reference, "reference", 0) \ K(Relocatable, "relocatable", 0) \ + K(Sealed, "sealed", 0) \ + K(Sizeof, "sizeof", 0) \ K(Static, "static", 0) \ + K(Supports, "supports", 0) \ K(Switch, "switch", 0) \ K(Try, "try", 0) \ K(Type, "type", 0) \ + K(Typedef, "typedef", 0) \ K(TypeOf, "typeof", 0) \ + K(Unchecked, "unchecked", 0) \ + \ /* Illegal token - not able to scan. */ \ T(Illegal, "ILLEGAL", 0) \ \ @@ -295,7 +314,7 @@ public: static bool isStateMutabilitySpecifier(Value op) { return op == Pure || op == Constant || op == View || op == Payable; } static bool isEtherSubdenomination(Value op) { return op == SubWei || op == SubSzabo || op == SubFinney || op == SubEther; } static bool isTimeSubdenomination(Value op) { return op == SubSecond || op == SubMinute || op == SubHour || op == SubDay || op == SubWeek || op == SubYear; } - static bool isReservedKeyword(Value op) { return (Abstract <= op && op <= TypeOf); } + static bool isReservedKeyword(Value op) { return (Abstract <= op && op <= Unchecked); } // @returns a string corresponding to the JS token string // (.e., "<" for the token LT) or NULL if the token doesn't |