diff options
| author | Yoichi Hirai <i@yoichihirai.com> | 2016-12-01 22:37:45 +0800 |
|---|---|---|
| committer | Yoichi Hirai <i@yoichihirai.com> | 2016-12-02 18:52:11 +0800 |
| commit | 43b56a61aa734b1abae7dba589b82266cba0fd74 (patch) | |
| tree | 787f660f0c957e330b42ab90b6ddae9569551b0a | |
| parent | 50bcc60e6ee492cfbdb06bcf0ae82b918fddc0ac (diff) | |
| download | dexon-solidity-43b56a61aa734b1abae7dba589b82266cba0fd74.tar.gz dexon-solidity-43b56a61aa734b1abae7dba589b82266cba0fd74.tar.zst dexon-solidity-43b56a61aa734b1abae7dba589b82266cba0fd74.zip | |
parsing: `default` and `null` are reserved keywords
| -rw-r--r-- | docs/miscellaneous.rst | 2 | ||||
| -rw-r--r-- | libsolidity/parsing/Token.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/miscellaneous.rst b/docs/miscellaneous.rst index 1754752d..e479d5f6 100644 --- a/docs/miscellaneous.rst +++ b/docs/miscellaneous.rst @@ -510,7 +510,7 @@ Reserved Keywords These keywords are reserved in Solidity. They might become part of the syntax in the future: -``abstract``, ``after``, ``case``, ``catch``, ``final``, ``in``, ``inline``, ``interface``, ``let``, ``match``, +``abstract``, ``after``, ``case``, ``catch``, ``default``, ``final``, ``in``, ``inline``, ``interface``, ``let``, ``match``, ``null``, ``of``, ``pure``, ``relocatable``, ``static``, ``switch``, ``try``, ``type``, ``typeof``, ``view``. Language Grammar diff --git a/libsolidity/parsing/Token.h b/libsolidity/parsing/Token.h index 3ce0f424..c6d050bb 100644 --- a/libsolidity/parsing/Token.h +++ b/libsolidity/parsing/Token.h @@ -147,7 +147,6 @@ namespace solidity K(Const, "constant", 0) \ K(Continue, "continue", 0) \ K(Contract, "contract", 0) \ - K(Default, "default", 0) \ K(Do, "do", 0) \ K(Else, "else", 0) \ K(Enum, "enum", 0) \ @@ -208,7 +207,6 @@ namespace solidity T(TypesEnd, NULL, 0) /* used as type enum end marker */ \ \ /* Literals */ \ - K(NullLiteral, "null", 0) \ K(TrueLiteral, "true", 0) \ K(FalseLiteral, "false", 0) \ T(Number, NULL, 0) \ @@ -223,12 +221,14 @@ namespace solidity K(After, "after", 0) \ K(Case, "case", 0) \ K(Catch, "catch", 0) \ + K(Default, "default", 0) \ K(Final, "final", 0) \ K(In, "in", 0) \ K(Inline, "inline", 0) \ K(Interface, "interface", 0) \ K(Let, "let", 0) \ K(Match, "match", 0) \ + K(NullLiteral, "null", 0) \ K(Of, "of", 0) \ K(Pure, "pure", 0) \ K(Relocatable, "relocatable", 0) \ |