aboutsummaryrefslogtreecommitdiffstats
path: root/Token.h
diff options
context:
space:
mode:
authorGav Wood <i@gavwood.com>2015-03-26 01:33:20 +0800
committerGav Wood <i@gavwood.com>2015-03-26 01:33:20 +0800
commit6b50386763142c0619e58e511a57bbaab0867bdc (patch)
treefd81fda140cacd4d80de8b854a0f416b154b698a /Token.h
parent8f8e407306172ab75f5b200c1f1df87bb55fa2a6 (diff)
downloaddexon-solidity-6b50386763142c0619e58e511a57bbaab0867bdc.tar
dexon-solidity-6b50386763142c0619e58e511a57bbaab0867bdc.tar.gz
dexon-solidity-6b50386763142c0619e58e511a57bbaab0867bdc.tar.bz2
dexon-solidity-6b50386763142c0619e58e511a57bbaab0867bdc.tar.lz
dexon-solidity-6b50386763142c0619e58e511a57bbaab0867bdc.tar.xz
dexon-solidity-6b50386763142c0619e58e511a57bbaab0867bdc.tar.zst
dexon-solidity-6b50386763142c0619e58e511a57bbaab0867bdc.zip
Clean up some code redundancy.
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Diffstat (limited to 'Token.h')
-rw-r--r--Token.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/Token.h b/Token.h
index b2951e93..1435dcc5 100644
--- a/Token.h
+++ b/Token.h
@@ -143,7 +143,6 @@ namespace solidity
\
/* Keywords */ \
K(Break, "break", 0) \
- K(Case, "case", 0) \
K(Const, "constant", 0) \
K(Anonymous, "anonymous", 0) \
K(Continue, "continue", 0) \
@@ -168,7 +167,6 @@ namespace solidity
K(Return, "return", 0) \
K(Returns, "returns", 0) \
K(Struct, "struct", 0) \
- K(Switch, "switch", 0) \
K(Var, "var", 0) \
K(While, "while", 0) \
K(Enum, "enum", 0) \
@@ -290,7 +288,6 @@ namespace solidity
K(Byte, "byte", 0) \
K(Address, "address", 0) \
K(Bool, "bool", 0) \
- K(StringType, "string", 0) \
K(Real, "real", 0) \
K(UReal, "ureal", 0) \
T(TypesEnd, NULL, 0) /* used as type enum end marker */ \
@@ -306,6 +303,16 @@ namespace solidity
/* Identifiers (not keywords or future reserved words). */ \
T(Identifier, NULL, 0) \
\
+ /* Keywords reserved for future. use*/ \
+ T(String, "string", 0) \
+ K(Case, "case", 0) \
+ K(Switch, "switch", 0) \
+ K(Throw, "throw", 0) \
+ K(Try, "try", 0) \
+ K(Catch, "catch", 0) \
+ K(Using, "using", 0) \
+ K(Type, "type", 0) \
+ K(TypeOf, "typeof", 0) \
/* Illegal token - not able to scan. */ \
T(Illegal, "ILLEGAL", 0) \
\