Merge pull request from ethereum/substitution

Substitution
This commit is contained in:
Yoichi Hirai 2017-12-06 11:12:06 +01:00 committed by GitHub
commit c2109436de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 102 additions and 7 deletions

View File

@ -56,6 +56,8 @@ public:
Statement operator()(ForLoop const&);
Statement operator()(Block const& _block);
virtual Statement translate(Statement const& _statement);
protected:
template <typename T>
std::vector<T> translateVector(std::vector<T> const& _values);
@ -65,7 +67,6 @@ protected:
{
return _v ? std::make_shared<T>(translate(*_v)) : nullptr;
}
Statement translate(Statement const& _statement);
Block translate(Block const& _block);
Case translate(Case const& _case);
Identifier translate(Identifier const& _identifier);

View File

@ -104,24 +104,24 @@ void ASTModifier::operator()(Assignment& _assignment)
{
for (auto& name: _assignment.variableNames)
(*this)(name);
boost::apply_visitor(*this, *_assignment.value);
visit(*_assignment.value);
}
void ASTModifier::operator()(VariableDeclaration& _varDecl)
{
if (_varDecl.value)
boost::apply_visitor(*this, *_varDecl.value);
visit(*_varDecl.value);
}
void ASTModifier::operator()(If& _if)
{
boost::apply_visitor(*this, *_if.condition);
visit(*_if.condition);
(*this)(_if.body);
}
void ASTModifier::operator()(Switch& _switch)
{
boost::apply_visitor(*this, *_switch.expression);
visit(*_switch.expression);
for (auto& _case: _switch.cases)
{
if (_case.value)
@ -138,7 +138,7 @@ void ASTModifier::operator()(FunctionDefinition& _fun)
void ASTModifier::operator()(ForLoop& _for)
{
(*this)(_for.pre);
boost::apply_visitor(*this, *_for.condition);
visit(*_for.condition);
(*this)(_for.post);
(*this)(_for.body);
}

View File

@ -92,7 +92,11 @@ protected:
void walkVector(T&& _statements)
{
for (auto& st: _statements)
boost::apply_visitor(*this, st);
visit(st);
}
virtual void visit(Statement& _st)
{
boost::apply_visitor(*this, _st);
}
};

View File

@ -0,0 +1,39 @@
/*
This file is part of solidity.
solidity is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
solidity is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with solidity. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* Specific AST copier that replaces certain identifiers with expressions.
*/
#include <libjulia/optimiser/Substitution.h>
#include <libsolidity/inlineasm/AsmData.h>
using namespace std;
using namespace dev;
using namespace dev::julia;
Statement Substitution::translate(Statement const& _statement)
{
if (_statement.type() == typeid(Identifier))
{
string const& name = boost::get<Identifier>(_statement).name;
if (m_substitutions.count(name))
// No recursive substitution
return ASTCopier().translate(*m_substitutions.at(name));
}
return ASTCopier::translate(_statement);
}

View File

@ -0,0 +1,51 @@
/*
This file is part of solidity.
solidity is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
solidity is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with solidity. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* Specific AST copier that replaces certain identifiers with expressions.
*/
#pragma once
#include <libjulia/optimiser/ASTCopier.h>
#include <string>
#include <map>
#include <set>
namespace dev
{
namespace julia
{
/**
* Specific AST copier that replaces certain identifiers with expressions.
* Only works on ASTs that are expressions.
*/
class Substitution: public ASTCopier
{
public:
Substitution(std::map<std::string, Statement const*> const& _substitutions):
m_substitutions(_substitutions)
{}
virtual Statement translate(Statement const& _statement) override;
private:
std::map<std::string, Statement const*> const& m_substitutions;
};
}
}