diff options
| author | chriseth <c@ethdev.com> | 2016-07-21 20:34:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 20:34:22 +0800 |
| commit | 6610add63eee23d8a86037a8af4266020b2aa532 (patch) | |
| tree | 64cbbe6334b419cf37c4bb482cb7be0924708d93 /libsolidity | |
| parent | f5ffb56f2d63ea61827fc3604e6c6ddd3f8d1106 (diff) | |
| parent | 8fbe994075ce36bec66645aa7eb389dda71754cf (diff) | |
| download | dexon-solidity-6610add63eee23d8a86037a8af4266020b2aa532.tar.gz dexon-solidity-6610add63eee23d8a86037a8af4266020b2aa532.tar.zst dexon-solidity-6610add63eee23d8a86037a8af4266020b2aa532.zip | |
Merge pull request #731 from Denton-L/move-token
Move `in` as a keyword to reserved word section
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/parsing/Token.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libsolidity/parsing/Token.h b/libsolidity/parsing/Token.h index 703e88f6..581df3a5 100644 --- a/libsolidity/parsing/Token.h +++ b/libsolidity/parsing/Token.h @@ -129,7 +129,6 @@ namespace solidity T(GreaterThan, ">", 7) \ T(LessThanOrEqual, "<=", 7) \ T(GreaterThanOrEqual, ">=", 7) \ - K(In, "in", 7) \ \ /* Unary operators. */ \ /* IsUnaryOp() relies on this block of enum values */ \ @@ -220,6 +219,7 @@ namespace solidity K(Case, "case", 0) \ K(Catch, "catch", 0) \ K(Final, "final", 0) \ + K(In, "in", 0) \ K(Inline, "inline", 0) \ K(Let, "let", 0) \ K(Match, "match", 0) \ @@ -267,7 +267,7 @@ public: static bool isCommutativeOp(Value op) { return op == BitOr || op == BitXor || op == BitAnd || op == Add || op == Mul || op == Equal || op == NotEqual; } static bool isArithmeticOp(Value op) { return Add <= op && op <= Exp; } - static bool isCompareOp(Value op) { return Equal <= op && op <= In; } + static bool isCompareOp(Value op) { return Equal <= op && op <= GreaterThanOrEqual; } static Value AssignmentToBinaryOp(Value op) { |