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

Fixes for named-args.

Browse Source
This commit is contained in:
Gav Wood
2015-02-03 12:25:08 -08:00
parent 04164b612c
commit 2ff4a80b62
5 changed files with 19 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Parser.cpp
+8 -16
View File
@@ -592,7 +592,6 @@ ASTPointer<Expression> Parser::parseBinaryExpression(int _minPrecedence)
ASTPointer<Expression> expression = parseUnaryExpression();
int precedence = Token::precedence(m_scanner->getCurrentToken());
for (; precedence >= _minPrecedence; --precedence)
{
while (Token::precedence(m_scanner->getCurrentToken()) == precedence)
{
Token::Value op = m_scanner->getCurrentToken();
@@ -601,7 +600,6 @@ ASTPointer<Expression> Parser::parseBinaryExpression(int _minPrecedence)
nodeFactory.setEndPositionFromNode(right);
expression = nodeFactory.createNode<BinaryOperation>(expression, op, right);
}
}
return expression;
}
@@ -668,8 +666,8 @@ ASTPointer<Expression> Parser::parseLeftHandSideExpression()
{
m_scanner->next();
vector<ASTPointer<Expression>> arguments;
vector<string> names;
parseFunctionCallArguments(arguments, names);
vector<ASTPointer<ASTString>> names;
std::tie(arguments, names) = parseFunctionCallArguments();
nodeFactory.markEndPosition();
expectToken(Token::RPAREN);
expression = nodeFactory.createNode<FunctionCall>(expression, arguments, names);
@@ -740,8 +738,9 @@ vector<ASTPointer<Expression>> Parser::parseFunctionCallListArguments()
return arguments;
}
void Parser::parseFunctionCallArguments(vector<ASTPointer<Expression>>& _arguments, vector<string>& _names)
pair<vector<ASTPointer<Expression>>, vector<ASTPointer<ASTString>>> Parser::parseFunctionCallArguments()
{
pair<vector<ASTPointer<Expression>>, vector<ASTPointer<ASTString>>> ret;
Token::Value token = m_scanner->getCurrentToken();
if (token == Token::LBRACE)
{
@@ -749,28 +748,21 @@ void Parser::parseFunctionCallArguments(vector<ASTPointer<Expression>>& _argumen
expectToken(Token::LBRACE);
while (m_scanner->getCurrentToken() != Token::RBRACE)
{
string identifier = *expectIdentifierToken();
expectToken(Token::COLON);
ASTPointer<Expression> expression = parseExpression();
_arguments.push_back(expression);
_names.push_back(identifier);
ret.first.push_back(parseExpression());
ret.second.push_back(expectIdentifierToken());
if (m_scanner->getCurrentToken() == Token::COMMA)
{
expectToken(Token::COMMA);
}
else
{
break;
}
}
expectToken(Token::RBRACE);
}
else
{
_arguments = parseFunctionCallListArguments();
}
ret.first = parseFunctionCallListArguments();
return ret;
}