From d0054a8d294901a0107e37d19ab6cb858d3a72f1 Mon Sep 17 00:00:00 2001 From: RJ Catalano Date: Thu, 10 Mar 2016 13:25:14 -0600 Subject: added keyword type and some tests, changes in lexical cast --- libsolidity/parsing/Token.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libsolidity/parsing/Token.h') 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 fromIdentifierOrKeyword(std::string const& _literal); + static std::tuple 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]; -- cgit v1.2.3