diff options
| author | RJ Catalano <rcatalano@macsales.com> | 2016-03-11 03:25:14 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2016-03-12 00:50:09 +0800 |
| commit | d0054a8d294901a0107e37d19ab6cb858d3a72f1 (patch) | |
| tree | 07d9f524454b5cd70607f88b4232fb5da9469729 /libsolidity/parsing/Token.h | |
| parent | d0bb87ae88602f4afc091d9cda1be352258a6df9 (diff) | |
| download | dexon-solidity-d0054a8d294901a0107e37d19ab6cb858d3a72f1.tar.gz dexon-solidity-d0054a8d294901a0107e37d19ab6cb858d3a72f1.tar.zst dexon-solidity-d0054a8d294901a0107e37d19ab6cb858d3a72f1.zip | |
added keyword type and some tests, changes in lexical cast
Diffstat (limited to 'libsolidity/parsing/Token.h')
| -rw-r--r-- | libsolidity/parsing/Token.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libsolidity/parsing/Token.h b/libsolidity/parsing/Token.h index 64a3447a..b8ad7471 100644 --- a/libsolidity/parsing/Token.h +++ b/libsolidity/parsing/Token.h @@ -231,6 +231,7 @@ namespace solidity K(Type, "type", 0) \ K(TypeOf, "typeof", 0) \ K(Using, "using", 0) \ + T(Timestamp, "timestamp", 0) \ /* Illegal token - not able to scan. */ \ T(Illegal, "ILLEGAL", 0) \ \ @@ -304,11 +305,11 @@ public: return m_precedence[tok]; } - static std::tuple<Token::Value, unsigned short, unsigned short> fromIdentifierOrKeyword(std::string const& _literal); + static std::tuple<Token::Value, unsigned int, unsigned int> fromIdentifierOrKeyword(std::string const& _literal); private: - // @returns 0 on error (invalid digit or number too large) - static unsigned extractUnsigned(std::string::const_iterator _begin, std::string::const_iterator _end); + // @returns -1 on error (invalid digit or number too large) + static int parseSize(std::string::const_iterator _begin, std::string::const_iterator _end); // @returns the keyword with name @a _name or Token::Identifier of no such keyword exists. static Token::Value keywordByName(std::string const& _name); static char const* const m_name[NUM_TOKENS]; |