cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added two functions in Token to handle long identifiers, redid fromIdentifierOrKeyword, and made complementary changes in scanner and parser

Browse Source
This commit is contained in:
RJ Catalano
2016-02-18 11:22:58 -06:00
parent f4da126018
commit 84f2eb461b
7 changed files with 253 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/parsing/Scanner.cpp
+8 -6
View File
@@ -381,12 +381,14 @@ Token::Value Scanner::scanSlash()
void Scanner::scanToken()
{
m_nextToken.literal.clear();
m_nextToken.extendedTokenInfo.clear();
m_nextToken.extendedTokenInfo = make_tuple(0, 0);
m_nextSkippedComment.literal.clear();
m_nextSkippedComment.extendedTokenInfo.clear();
m_nextSkippedComment.extendedTokenInfo = make_tuple(0, 0);
Token::Value token;
string tokenExtension;
// M and N are for the purposes of grabbing different type sizes
unsigned M;
unsigned N;
do
{
// Remember the position of the next token
@@ -554,7 +556,7 @@ void Scanner::scanToken()
break;
default:
if (isIdentifierStart(m_char))
tie(token, tokenExtension) = scanIdentifierOrKeyword();
tie(token, M, N) = scanIdentifierOrKeyword();
else if (isDecimalDigit(m_char))
token = scanNumber();
else if (skipWhitespace())
@@ -571,7 +573,7 @@ void Scanner::scanToken()
while (token == Token::Whitespace);
m_nextToken.location.end = sourcePos();
m_nextToken.token = token;
m_nextToken.extendedTokenInfo = tokenExtension;
m_nextToken.extendedTokenInfo = make_tuple(M,N);
}
bool Scanner::scanEscape()
@@ -709,7 +711,7 @@ Token::Value Scanner::scanNumber(char _charSeen)
return Token::Number;
}
tuple<Token::Value, string> Scanner::scanIdentifierOrKeyword()
tuple<Token::Value, unsigned, unsigned> Scanner::scanIdentifierOrKeyword()
{
solAssert(isIdentifierStart(m_char), "");
LiteralScope literal(this, LITERAL_TYPE_STRING);