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

Use explicit yul namespace in WasmCodeTransform

Browse Source
This commit is contained in:
Alex Beregszaszi 2020-07-14 11:22:11 +01:00
parent fdf68a9525
commit dd44fc1f06
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libyul/backends/wasm/WasmCodeTransform.cpp
View File

@ -90,7 +90,7 @@ wasm::Expression WasmCodeTransform::generateMultiAssignment(
return { std::move(block) }; return { std::move(block) };
} }
wasm::Expression WasmCodeTransform::operator()(VariableDeclaration const& _varDecl) wasm::Expression WasmCodeTransform::operator()(yul::VariableDeclaration const& _varDecl)
{ {
vector<string> variableNames; vector<string> variableNames;
for (auto const& var: _varDecl.variables) for (auto const& var: _varDecl.variables)
@ -105,7 +105,7 @@ wasm::Expression WasmCodeTransform::operator()(VariableDeclaration const& _varDe
return wasm::BuiltinCall{"nop", {}}; return wasm::BuiltinCall{"nop", {}};
} }
wasm::Expression WasmCodeTransform::operator()(Assignment const& _assignment) wasm::Expression WasmCodeTransform::operator()(yul::Assignment const& _assignment)
{ {
vector<string> variableNames; vector<string> variableNames;
for (auto const& var: _assignment.variableNames) for (auto const& var: _assignment.variableNames)
@ -113,12 +113,12 @@ wasm::Expression WasmCodeTransform::operator()(Assignment const& _assignment)
return generateMultiAssignment(move(variableNames), visit(*_assignment.value)); return generateMultiAssignment(move(variableNames), visit(*_assignment.value));
} }
wasm::Expression WasmCodeTransform::operator()(ExpressionStatement const& _statement) wasm::Expression WasmCodeTransform::operator()(yul::ExpressionStatement const& _statement)
{ {
return visitReturnByValue(_statement.expression); return visitReturnByValue(_statement.expression);
} }
wasm::Expression WasmCodeTransform::operator()(FunctionCall const& _call) wasm::Expression WasmCodeTransform::operator()(yul::FunctionCall const& _call)
{ {
if (BuiltinFunction const* builtin = m_dialect.builtin(_call.functionName.name)) if (BuiltinFunction const* builtin = m_dialect.builtin(_call.functionName.name))
{ {
@ -164,17 +164,17 @@ wasm::Expression WasmCodeTransform::operator()(FunctionCall const& _call)
return wasm::FunctionCall{_call.functionName.name.str(), visit(_call.arguments)}; return wasm::FunctionCall{_call.functionName.name.str(), visit(_call.arguments)};
} }
wasm::Expression WasmCodeTransform::operator()(Identifier const& _identifier) wasm::Expression WasmCodeTransform::operator()(yul::Identifier const& _identifier)
{ {
return wasm::LocalVariable{_identifier.name.str()}; return wasm::LocalVariable{_identifier.name.str()};
} }
wasm::Expression WasmCodeTransform::operator()(Literal const& _literal) wasm::Expression WasmCodeTransform::operator()(yul::Literal const& _literal)
{ {
return makeLiteral(translatedType(_literal.type), valueOfLiteral(_literal)); return makeLiteral(translatedType(_literal.type), valueOfLiteral(_literal));
} }
wasm::Expression WasmCodeTransform::operator()(If const& _if) wasm::Expression WasmCodeTransform::operator()(yul::If const& _if)
{ {
yul::Type conditionType = m_typeInfo.typeOf(*_if.condition); yul::Type conditionType = m_typeInfo.typeOf(*_if.condition);
@ -196,7 +196,7 @@ wasm::Expression WasmCodeTransform::operator()(If const& _if)
return wasm::If{make_unique<wasm::Expression>(move(condition)), visit(_if.body.statements), {}}; return wasm::If{make_unique<wasm::Expression>(move(condition)), visit(_if.body.statements), {}};
} }
wasm::Expression WasmCodeTransform::operator()(Switch const& _switch) wasm::Expression WasmCodeTransform::operator()(yul::Switch const& _switch)
{ {
yul::Type expressionType = m_typeInfo.typeOf(*_switch.expression); yul::Type expressionType = m_typeInfo.typeOf(*_switch.expression);
YulString eq_instruction = YulString(expressionType.str() + ".eq"); YulString eq_instruction = YulString(expressionType.str() + ".eq");
@ -240,13 +240,13 @@ wasm::Expression WasmCodeTransform::operator()(Switch const& _switch)
return { std::move(block) }; return { std::move(block) };
} }
wasm::Expression WasmCodeTransform::operator()(FunctionDefinition const&) wasm::Expression WasmCodeTransform::operator()(yul::FunctionDefinition const&)
{ {
yulAssert(false, "Should not have visited here."); yulAssert(false, "Should not have visited here.");
return {}; return {};
} }
wasm::Expression WasmCodeTransform::operator()(ForLoop const& _for) wasm::Expression WasmCodeTransform::operator()(yul::ForLoop const& _for)
{ {
string breakLabel = newLabel(); string breakLabel = newLabel();
string continueLabel = newLabel(); string continueLabel = newLabel();
@ -273,25 +273,25 @@ wasm::Expression WasmCodeTransform::operator()(ForLoop const& _for)
return wasm::Block{breakLabel, move(statements)}; return wasm::Block{breakLabel, move(statements)};
} }
wasm::Expression WasmCodeTransform::operator()(Break const&) wasm::Expression WasmCodeTransform::operator()(yul::Break const&)
{ {
yulAssert(m_breakContinueLabelNames.size() > 0, ""); yulAssert(m_breakContinueLabelNames.size() > 0, "");
return wasm::Branch{wasm::Label{m_breakContinueLabelNames.top().first}}; return wasm::Branch{wasm::Label{m_breakContinueLabelNames.top().first}};
} }
wasm::Expression WasmCodeTransform::operator()(Continue const&) wasm::Expression WasmCodeTransform::operator()(yul::Continue const&)
{ {
yulAssert(m_breakContinueLabelNames.size() > 0, ""); yulAssert(m_breakContinueLabelNames.size() > 0, "");
return wasm::Branch{wasm::Label{m_breakContinueLabelNames.top().second}}; return wasm::Branch{wasm::Label{m_breakContinueLabelNames.top().second}};
} }
wasm::Expression WasmCodeTransform::operator()(Leave const&) wasm::Expression WasmCodeTransform::operator()(yul::Leave const&)
{ {
yulAssert(!m_functionBodyLabel.empty(), ""); yulAssert(!m_functionBodyLabel.empty(), "");
return wasm::Branch{wasm::Label{m_functionBodyLabel}}; return wasm::Branch{wasm::Label{m_functionBodyLabel}};
} }
wasm::Expression WasmCodeTransform::operator()(Block const& _block) wasm::Expression WasmCodeTransform::operator()(yul::Block const& _block)
{ {
return wasm::Block{{}, visit(_block.statements)}; return wasm::Block{{}, visit(_block.statements)};
} }