diff options
| author | chriseth <c@ethdev.com> | 2014-12-19 05:24:44 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2014-12-19 05:24:44 +0800 |
| commit | 59835e9df19332397d6e16b25bfe0dac4807996c (patch) | |
| tree | e8ea7f92887d3ba49c03c7aca9cfe8799eaf9b21 | |
| parent | 1da53d1681cbccbb18d08659787042d53438b5c3 (diff) | |
| parent | b0037eddfd9bc2a0473b7bab4630495fd14a0546 (diff) | |
| download | dexon-solidity-59835e9df19332397d6e16b25bfe0dac4807996c.tar dexon-solidity-59835e9df19332397d6e16b25bfe0dac4807996c.tar.gz dexon-solidity-59835e9df19332397d6e16b25bfe0dac4807996c.tar.bz2 dexon-solidity-59835e9df19332397d6e16b25bfe0dac4807996c.tar.lz dexon-solidity-59835e9df19332397d6e16b25bfe0dac4807996c.tar.xz dexon-solidity-59835e9df19332397d6e16b25bfe0dac4807996c.tar.zst dexon-solidity-59835e9df19332397d6e16b25bfe0dac4807996c.zip | |
Merge pull request #655 from chriseth/sol_precedence
Bit operators should bind more strongly than comparison operators.
| -rw-r--r-- | Token.h | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -107,9 +107,9 @@ namespace solidity T(COMMA, ",", 1) \ T(OR, "||", 4) \ T(AND, "&&", 5) \ - T(BIT_OR, "|", 6) \ - T(BIT_XOR, "^", 7) \ - T(BIT_AND, "&", 8) \ + T(BIT_OR, "|", 8) \ + T(BIT_XOR, "^", 9) \ + T(BIT_AND, "&", 10) \ T(SHL, "<<", 11) \ T(SAR, ">>", 11) \ T(SHR, ">>>", 11) \ @@ -122,13 +122,13 @@ namespace solidity /* Compare operators sorted by precedence. */ \ /* IsCompareOp() relies on this block of enum values */ \ /* being contiguous and sorted in the same order! */ \ - T(EQ, "==", 9) \ - T(NE, "!=", 9) \ - T(LT, "<", 10) \ - T(GT, ">", 10) \ - T(LTE, "<=", 10) \ - T(GTE, ">=", 10) \ - K(IN, "in", 10) \ + T(EQ, "==", 6) \ + T(NE, "!=", 6) \ + T(LT, "<", 7) \ + T(GT, ">", 7) \ + T(LTE, "<=", 7) \ + T(GTE, ">=", 7) \ + K(IN, "in", 7) \ \ /* Unary operators. */ \ /* IsUnaryOp() relies on this block of enum values */ \ |