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

helper function in scanner and corresponding edits to parserBase

Browse Source
This commit is contained in:
VoR0220
2016-03-30 13:09:38 -05:00
parent 427b9557d6
commit 9404600b3f
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/parsing/ParserBase.cpp
+3 -12
View File
@@ -49,10 +49,7 @@ void ParserBase::expectToken(Token::Value _value)
{
if (Token::isElementaryTypeName(tok)) //for the sake of accuracy in reporting
{
unsigned firstSize;
unsigned secondSize;
tie(firstSize, secondSize) = m_scanner->currentTokenInfo();
ElementaryTypeNameToken elemTypeName(tok, firstSize, secondSize);
ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken();
fatalParserError(
string("Expected token ") +
string(Token::name(_value)) +
@@ -80,10 +77,7 @@ Token::Value ParserBase::expectAssignmentOperator()
{
if (Token::isElementaryTypeName(op)) //for the sake of accuracy in reporting
{
unsigned firstSize;
unsigned secondSize;
tie(firstSize, secondSize) = m_scanner->currentTokenInfo();
ElementaryTypeNameToken elemTypeName(op, firstSize, secondSize);
ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken();
fatalParserError(
string("Expected assignment operator, got '") +
elemTypeName.toString() +
@@ -108,10 +102,7 @@ ASTPointer<ASTString> ParserBase::expectIdentifierToken()
{
if (Token::isElementaryTypeName(id)) //for the sake of accuracy in reporting
{
unsigned firstSize;
unsigned secondSize;
tie(firstSize, secondSize) = m_scanner->currentTokenInfo();
ElementaryTypeNameToken elemTypeName(id, firstSize, secondSize);
ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken();
fatalParserError(
string("Expected identifier, got '") +
elemTypeName.toString() +