diff options
| -rw-r--r-- | libjulia/backends/evm/EVMCodeTransform.cpp | 11 | ||||
| -rw-r--r-- | libjulia/backends/evm/EVMCodeTransform.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libjulia/backends/evm/EVMCodeTransform.cpp b/libjulia/backends/evm/EVMCodeTransform.cpp index a50af9af..c543a507 100644 --- a/libjulia/backends/evm/EVMCodeTransform.cpp +++ b/libjulia/backends/evm/EVMCodeTransform.cpp @@ -345,8 +345,7 @@ void CodeTransform::operator()(ForLoop const& _forLoop) m_scope = m_info.scopes.at(&_forLoop.pre).get(); int stackStartHeight = m_assembly.stackHeight(); - for (auto const& statement: _forLoop.pre.statements) - boost::apply_visitor(*this, statement); + visitStatements(_forLoop.pre.statements); // TODO: When we implement break and continue, the labels and the stack heights at that point // have to be stored in a stack. @@ -382,7 +381,7 @@ void CodeTransform::operator()(Block const& _block) m_scope = m_info.scopes.at(&_block).get(); int blockStartStackHeight = m_assembly.stackHeight(); - std::for_each(_block.statements.begin(), _block.statements.end(), boost::apply_visitor(*this)); + visitStatements(_block.statements); finalizeBlock(_block, blockStartStackHeight); m_scope = originalScope; @@ -426,6 +425,12 @@ void CodeTransform::visitExpression(Statement const& _expression) expectDeposit(1, height); } +void CodeTransform::visitStatements(vector<Statement> const& _statements) +{ + for (auto const& statement: _statements) + boost::apply_visitor(*this, statement); +} + void CodeTransform::finalizeBlock(Block const& _block, int blockStartStackHeight) { m_assembly.setSourceLocation(_block.location); diff --git a/libjulia/backends/evm/EVMCodeTransform.h b/libjulia/backends/evm/EVMCodeTransform.h index 57bd4ca5..d09ee87b 100644 --- a/libjulia/backends/evm/EVMCodeTransform.h +++ b/libjulia/backends/evm/EVMCodeTransform.h @@ -110,6 +110,8 @@ private: /// Generates code for an expression that is supposed to return a single value. void visitExpression(solidity::assembly::Statement const& _expression); + void visitStatements(std::vector<solidity::assembly::Statement> const& _statements); + /// Pops all variables declared in the block and checks that the stack height is equal /// to @a _blackStartStackHeight. void finalizeBlock(solidity::assembly::Block const& _block, int _blockStartStackHeight); |