diff options
| author | RJ Catalano <rcatalano@macsales.com> | 2016-02-13 05:01:27 +0800 |
|---|---|---|
| committer | RJ Catalano <rcatalano@macsales.com> | 2016-02-19 01:22:58 +0800 |
| commit | 84f2eb461b62a2d36d6784068842b4aa0a5c220a (patch) | |
| tree | 29d16e4249fcbc6643f69ffb51df9a3f1625f784 /libsolidity/parsing/Scanner.h | |
| parent | f4da1260184d5695287c30181734cff4d7e3d737 (diff) | |
| download | dexon-solidity-84f2eb461b62a2d36d6784068842b4aa0a5c220a.tar.gz dexon-solidity-84f2eb461b62a2d36d6784068842b4aa0a5c220a.tar.zst dexon-solidity-84f2eb461b62a2d36d6784068842b4aa0a5c220a.zip | |
added two functions in Token to handle long identifiers, redid fromIdentifierOrKeyword, and made complementary changes in scanner and parser
Diffstat (limited to 'libsolidity/parsing/Scanner.h')
| -rw-r--r-- | libsolidity/parsing/Scanner.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/parsing/Scanner.h b/libsolidity/parsing/Scanner.h index fa1f118b..8dde922d 100644 --- a/libsolidity/parsing/Scanner.h +++ b/libsolidity/parsing/Scanner.h @@ -122,7 +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; } + std::tuple<unsigned, unsigned> const& currentTokenInfo() const { return m_currentToken.extendedTokenInfo; } ///@} ///@{ @@ -161,7 +161,7 @@ private: Token::Value token; SourceLocation location; std::string literal; - std::string extendedTokenInfo; + std::tuple<unsigned, unsigned> extendedTokenInfo; }; ///@{ @@ -192,7 +192,7 @@ private: void scanDecimalDigits(); Token::Value scanNumber(char _charSeen = 0); - std::tuple<Token::Value, std::string> scanIdentifierOrKeyword(); + std::tuple<Token::Value, unsigned, unsigned> scanIdentifierOrKeyword(); Token::Value scanString(); Token::Value scanSingleLineDocComment(); |