diff options
| author | Gav Wood <i@gavwood.com> | 2015-01-09 21:57:59 +0800 |
|---|---|---|
| committer | Gav Wood <i@gavwood.com> | 2015-01-09 21:57:59 +0800 |
| commit | 875ec9d47178637bc8608204a8520c1487c064e4 (patch) | |
| tree | 807733064093302876ee25e8e88599aa4f86bd13 /Scanner.cpp | |
| parent | 23eff4d24a18b6a82565dbf5074c4e1ed313bb9e (diff) | |
| parent | 852267e60f7a1d2b19b0dbddb3c0cf173f989526 (diff) | |
| download | dexon-solidity-875ec9d47178637bc8608204a8520c1487c064e4.tar dexon-solidity-875ec9d47178637bc8608204a8520c1487c064e4.tar.gz dexon-solidity-875ec9d47178637bc8608204a8520c1487c064e4.tar.bz2 dexon-solidity-875ec9d47178637bc8608204a8520c1487c064e4.tar.lz dexon-solidity-875ec9d47178637bc8608204a8520c1487c064e4.tar.xz dexon-solidity-875ec9d47178637bc8608204a8520c1487c064e4.tar.zst dexon-solidity-875ec9d47178637bc8608204a8520c1487c064e4.zip | |
Merge branch 'sol_integerConstants' of https://github.com/chriseth/cpp-ethereum into chriseth-sol_integerConstants
Diffstat (limited to 'Scanner.cpp')
| -rw-r--r-- | Scanner.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Scanner.cpp b/Scanner.cpp index 6433b526..6e3d04bc 100644 --- a/Scanner.cpp +++ b/Scanner.cpp @@ -455,7 +455,7 @@ void Scanner::scanToken() token = Token::ADD; break; case '-': - // - -- -= Number + // - -- -= advance(); if (m_char == '-') { @@ -464,8 +464,6 @@ void Scanner::scanToken() } else if (m_char == '=') token = selectToken(Token::ASSIGN_SUB); - else if (m_char == '.' || isDecimalDigit(m_char)) - token = scanNumber('-'); else token = Token::SUB; break; @@ -650,8 +648,7 @@ Token::Value Scanner::scanNumber(char _charSeen) } else { - if (_charSeen == '-') - addLiteralChar('-'); + solAssert(_charSeen == 0, ""); // if the first character is '0' we must check for octals and hex if (m_char == '0') { |