From 7b918a7bc7a3c619682266b1c2566dacb9dcc765 Mon Sep 17 00:00:00 2001 From: RJ Catalano Date: Mon, 8 Feb 2016 15:43:22 -0600 Subject: changes to redefine the token list, the scanner, and the parser and how they pass around variable types of different sizes not ready for change to FixedPoint just yet made this more const correct and added a switch statement for easier reading --- libsolidity/parsing/Scanner.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libsolidity/parsing/Scanner.h') diff --git a/libsolidity/parsing/Scanner.h b/libsolidity/parsing/Scanner.h index a1a5c9c1..fa1f118b 100644 --- a/libsolidity/parsing/Scanner.h +++ b/libsolidity/parsing/Scanner.h @@ -122,6 +122,7 @@ public: SourceLocation currentLocation() const { return m_currentToken.location; } std::string const& currentLiteral() const { return m_currentToken.literal; } + std::string const& currentTokenInfo() const { return m_currentToken.extendedTokenInfo; } ///@} ///@{ @@ -160,6 +161,7 @@ private: Token::Value token; SourceLocation location; std::string literal; + std::string extendedTokenInfo; }; ///@{ @@ -190,7 +192,7 @@ private: void scanDecimalDigits(); Token::Value scanNumber(char _charSeen = 0); - Token::Value scanIdentifierOrKeyword(); + std::tuple scanIdentifierOrKeyword(); Token::Value scanString(); Token::Value scanSingleLineDocComment(); -- cgit v1.2.3