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

Merge branch 'named-args' of https://github.com/guanqun/cpp-ethereum into guanqun-named-args

Browse Source
This commit is contained in:
Gav Wood
2015-02-03 11:57:36 -08:00
parent e321b956a1 5c828dc8b2
commit 04164b612c
5 changed files with 116 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ExpressionCompiler.cpp
+30 -2
View File
@@ -195,6 +195,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
{
//@todo struct construction
solAssert(_functionCall.getArguments().size() == 1, "");
solAssert(_functionCall.getNames().empty(), "");
Expression const& firstArgument = *_functionCall.getArguments().front();
firstArgument.accept(*this);
appendTypeConversion(*firstArgument.getType(), *_functionCall.getType());
@@ -202,8 +203,35 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
else
{
FunctionType const& function = dynamic_cast<FunctionType const&>(*_functionCall.getExpression().getType());
vector<ASTPointer<Expression const>> arguments = _functionCall.getArguments();
solAssert(arguments.size() == function.getParameterTypes().size(), "");
TypePointers const& parameterTypes = function.getParameterTypes();
vector<string> const& parameterNames = function.getParameterNames();
vector<ASTPointer<Expression const>> const& callArguments = _functionCall.getArguments();
vector<string> const& callArgumentNames = _functionCall.getNames();
solAssert(callArguments.size() == parameterTypes.size(), "");
vector<ASTPointer<Expression const>> arguments;
if (callArgumentNames.empty())
{
// normal arguments
arguments = {callArguments.begin(), callArguments.end()};
}
else
{
// named arguments
for (size_t i = 0; i < parameterNames.size(); i++) {
bool found = false;
for (size_t j = 0; j < callArgumentNames.size(); j++) {
if (parameterNames[i] == callArgumentNames[j]) {
// we found the actual parameter position
arguments.push_back(callArguments[j]);
found = true;
break;
}
}
solAssert(found, "");
}
}
switch (function.getLocation())
{