cerc-io/solidity
16
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 pull request #5186 from ethereum/renameBreaker

Browse Source 
Rename ExpressionBreaker to ExpressionSplitter.
This commit is contained in:
chriseth 2018-10-10 16:36:55 +02:00 committed by GitHub
commit dd4acda73a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libjulia/optimiser/ExpressionBreaker.cpp → libjulia/optimiser/ExpressionSplitter.cpp
View File

@ -19,7 +19,7 @@
* declarations.
*/
#include <libjulia/optimiser/ExpressionBreaker.h>
#include <libjulia/optimiser/ExpressionSplitter.h>
#include <libjulia/optimiser/ASTWalker.h>
@ -34,25 +34,25 @@ using namespace dev;
using namespace dev::julia;
using namespace dev::solidity;
void ExpressionBreaker::operator()(FunctionalInstruction& _instruction)
void ExpressionSplitter::operator()(FunctionalInstruction& _instruction)
{
for (auto& arg: _instruction.arguments | boost::adaptors::reversed)
outlineExpression(arg);
}
void ExpressionBreaker::operator()(FunctionCall& _funCall)
void ExpressionSplitter::operator()(FunctionCall& _funCall)
{
for (auto& arg: _funCall.arguments | boost::adaptors::reversed)
outlineExpression(arg);
}
void ExpressionBreaker::operator()(If& _if)
void ExpressionSplitter::operator()(If& _if)
{
outlineExpression(*_if.condition);
(*this)(_if.body);
}
void ExpressionBreaker::operator()(Switch& _switch)
void ExpressionSplitter::operator()(Switch& _switch)
{
outlineExpression(*_switch.expression);
for (auto& _case: _switch.cases)
@ -60,7 +60,7 @@ void ExpressionBreaker::operator()(Switch& _switch)
(*this)(_case.body);
}
void ExpressionBreaker::operator()(ForLoop& _loop)
void ExpressionSplitter::operator()(ForLoop& _loop)
{
(*this)(_loop.pre);
// Do not visit the condition because we cannot break expressions there.
@ -68,7 +68,7 @@ void ExpressionBreaker::operator()(ForLoop& _loop)
(*this)(_loop.body);
}
void ExpressionBreaker::operator()(Block& _block)
void ExpressionSplitter::operator()(Block& _block)
{
vector<Statement> saved;
swap(saved, m_statementsToPrefix);
@ -87,7 +87,7 @@ void ExpressionBreaker::operator()(Block& _block)
swap(saved, m_statementsToPrefix);
}
void ExpressionBreaker::outlineExpression(Expression& _expr)
void ExpressionSplitter::outlineExpression(Expression& _expr)
{
if (_expr.type() != typeid(FunctionalInstruction) && _expr.type() != typeid(FunctionCall))
return;

4
libjulia/optimiser/ExpressionBreaker.h → libjulia/optimiser/ExpressionSplitter.h
View File

@ -56,10 +56,10 @@ class NameCollector;
* function calls can only appear in the right-hand side of a variable declaration,
* assignments or expression statements and all arguments have to be constants or variables.
*/
class ExpressionBreaker: public ASTModifier
class ExpressionSplitter: public ASTModifier
{
public:
explicit ExpressionBreaker(NameDispenser& _nameDispenser):
explicit ExpressionSplitter(NameDispenser& _nameDispenser):
m_nameDispenser(_nameDispenser)
{ }

6
test/libjulia/ExpressionBreaker.cpp → test/libjulia/ExpressionSplitter.cpp
View File

@ -20,7 +20,7 @@
#include <test/libjulia/Common.h>
#include <libjulia/optimiser/ExpressionBreaker.h>
#include <libjulia/optimiser/ExpressionSplitter.h>
#include <libjulia/optimiser/NameCollector.h>
#include <libsolidity/inlineasm/AsmPrinter.h>
@ -43,12 +43,12 @@ do\
auto result = parse(_original, false);\
NameDispenser nameDispenser;\
nameDispenser.m_usedNames = NameCollector(*result.first).names();\
ExpressionBreaker{nameDispenser}(*result.first);\
ExpressionSplitter{nameDispenser}(*result.first);\
BOOST_CHECK_EQUAL(assembly::AsmPrinter{}(*result.first), format(_expectation, false));\
}\
while(false)
BOOST_AUTO_TEST_SUITE(YulExpressionBreaker)
BOOST_AUTO_TEST_SUITE(YulExpressionSplitter)
BOOST_AUTO_TEST_CASE(smoke_test)
{