cerc-io/solidity
10
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

Remove duplicate code

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-05-26 21:00:08 +01:00
parent 9337003d5e
commit 48f58aa3f9
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libsolidity/parsing/Parser.cpp
View File

@ -1442,21 +1442,20 @@ Token::Value Parser::expectAssignmentOperator()
Token::Value op = m_scanner->currentToken(); Token::Value op = m_scanner->currentToken();
if (!Token::isAssignmentOp(op)) if (!Token::isAssignmentOp(op))
{ {
string tokenName;
if (Token::isElementaryTypeName(op)) //for the sake of accuracy in reporting if (Token::isElementaryTypeName(op)) //for the sake of accuracy in reporting
{ {
ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken(); ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken();
fatalParserError( tokenName = elemTypeName.toString();
string("Expected assignment operator, got '") +
elemTypeName.toString() +
string("'")
);
} }
else else
fatalParserError( tokenName = Token::name(m_scanner->currentToken());
string("Expected assignment operator, got '") +
string(Token::name(m_scanner->currentToken())) + fatalParserError(
string("'") string("Expected assignment operator, got '") +
); tokenName +
string("'")
);
} }
m_scanner->next(); m_scanner->next();
return op; return op;
@ -1467,21 +1466,20 @@ ASTPointer<ASTString> Parser::expectIdentifierToken()
Token::Value id = m_scanner->currentToken(); Token::Value id = m_scanner->currentToken();
if (id != Token::Identifier) if (id != Token::Identifier)
{ {
string tokenName;
if (Token::isElementaryTypeName(id)) //for the sake of accuracy in reporting if (Token::isElementaryTypeName(id)) //for the sake of accuracy in reporting
{ {
ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken(); ElementaryTypeNameToken elemTypeName = m_scanner->currentElementaryTypeNameToken();
fatalParserError( tokenName = elemTypeName.toString();
string("Expected identifier, got '") +
elemTypeName.toString() +
string("'")
);
} }
else else
fatalParserError( tokenName = Token::name(id);
string("Expected identifier, got '") +
string(Token::name(id)) + fatalParserError(
string("'") string("Expected identifier, got '") +
); tokenName +
string("'")
);
} }
return getLiteralAndAdvance(); return getLiteralAndAdvance();
} }