aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/inlineasm/AsmScopeFiller.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libsolidity/inlineasm/AsmScopeFiller.cpp')
-rw-r--r--libsolidity/inlineasm/AsmScopeFiller.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/libsolidity/inlineasm/AsmScopeFiller.cpp b/libsolidity/inlineasm/AsmScopeFiller.cpp
index 86f3809c..d1f98083 100644
--- a/libsolidity/inlineasm/AsmScopeFiller.cpp
+++ b/libsolidity/inlineasm/AsmScopeFiller.cpp
@@ -57,7 +57,7 @@ bool ScopeFiller::operator()(Label const& _item)
//@TODO secondary location
m_errorReporter.declarationError(
_item.location,
- "Label name " + _item.name + " already taken in this scope."
+ "Label name " + _item.name.str() + " already taken in this scope."
);
return false;
}
@@ -75,18 +75,18 @@ bool ScopeFiller::operator()(assembly::VariableDeclaration const& _varDecl)
bool ScopeFiller::operator()(assembly::FunctionDefinition const& _funDef)
{
bool success = true;
- vector<Scope::JuliaType> arguments;
+ vector<Scope::YulType> arguments;
for (auto const& _argument: _funDef.parameters)
- arguments.push_back(_argument.type);
- vector<Scope::JuliaType> returns;
+ arguments.emplace_back(_argument.type.str());
+ vector<Scope::YulType> returns;
for (auto const& _return: _funDef.returnVariables)
- returns.push_back(_return.type);
+ returns.emplace_back(_return.type.str());
if (!m_currentScope->registerFunction(_funDef.name, arguments, returns))
{
//@TODO secondary location
m_errorReporter.declarationError(
_funDef.location,
- "Function name " + _funDef.name + " already taken in this scope."
+ "Function name " + _funDef.name.str() + " already taken in this scope."
);
success = false;
}
@@ -164,7 +164,7 @@ bool ScopeFiller::registerVariable(TypedName const& _name, SourceLocation const&
//@TODO secondary location
m_errorReporter.declarationError(
_location,
- "Variable name " + _name.name + " already taken in this scope."
+ "Variable name " + _name.name.str() + " already taken in this scope."
);
return false;
}