mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Disambiguator.
This commit is contained in:
chriseth
@@ -0,0 +1,179 @@
|
||||
/*
|
||||
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/>.
|
||||
*/
|
||||
/**
|
||||
* Creates an independent copy of an AST, renaming identifiers to be unique.
|
||||
*/
|
||||
|
||||
#include <libjulia/optimiser/ASTCopier.h>
|
||||
|
||||
#include <libsolidity/inlineasm/AsmData.h>
|
||||
|
||||
#include <libsolidity/interface/Exceptions.h>
|
||||
|
||||
#include <libdevcore/Common.h>
|
||||
|
||||
using namespace std;
|
||||
using namespace dev;
|
||||
using namespace dev::julia;
|
||||
|
||||
|
||||
shared_ptr<Block> ASTCopier::run()
|
||||
{
|
||||
return make_shared<Block>(translate(m_block));
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(Instruction const& _instruction)
|
||||
{
|
||||
return _instruction;
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(VariableDeclaration const& _varDecl)
|
||||
{
|
||||
return VariableDeclaration{
|
||||
_varDecl.location,
|
||||
translateVector(_varDecl.variables),
|
||||
translate(_varDecl.value)
|
||||
};
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(Assignment const& _assignment)
|
||||
{
|
||||
return Assignment{
|
||||
_assignment.location,
|
||||
translateVector(_assignment.variableNames),
|
||||
translate(_assignment.value)
|
||||
};
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(StackAssignment const&)
|
||||
{
|
||||
solAssert(false, "Invalid operation.");
|
||||
return {};
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(Label const&)
|
||||
{
|
||||
solAssert(false, "Invalid operation.");
|
||||
return {};
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(FunctionCall const& _call)
|
||||
{
|
||||
return FunctionCall{
|
||||
_call.location,
|
||||
translate(_call.functionName),
|
||||
translateVector(_call.arguments)
|
||||
};
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(FunctionalInstruction const& _instruction)
|
||||
{
|
||||
return FunctionalInstruction{
|
||||
_instruction.location,
|
||||
_instruction.instruction,
|
||||
translateVector(_instruction.arguments)
|
||||
};
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(Identifier const& _identifier)
|
||||
{
|
||||
return Identifier{_identifier.location, translateIdentifier(_identifier.name)};
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(Literal const& _literal)
|
||||
{
|
||||
return translate(_literal);
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(If const& _if)
|
||||
{
|
||||
return If{_if.location, translate(_if.condition), translate(_if.body)};
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(Switch const& _switch)
|
||||
{
|
||||
return Switch{_switch.location, translate(_switch.expression), translateVector(_switch.cases)};
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(FunctionDefinition const& _function)
|
||||
{
|
||||
string translatedName = translateIdentifier(_function.name);
|
||||
|
||||
enterFunction(_function);
|
||||
ScopeGuard g([&]() { this->leaveFunction(_function); });
|
||||
|
||||
return FunctionDefinition{
|
||||
_function.location,
|
||||
move(translatedName),
|
||||
translateVector(_function.parameters),
|
||||
translateVector(_function.returnVariables),
|
||||
translate(_function.body)
|
||||
};
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator()(ForLoop const& _forLoop)
|
||||
{
|
||||
enterScope(_forLoop.pre);
|
||||
ScopeGuard g([&]() { this->leaveScope(_forLoop.pre); });
|
||||
|
||||
return ForLoop{
|
||||
_forLoop.location,
|
||||
translate(_forLoop.pre),
|
||||
translate(_forLoop.condition),
|
||||
translate(_forLoop.post),
|
||||
translate(_forLoop.body)
|
||||
};
|
||||
}
|
||||
|
||||
Statement ASTCopier::operator ()(Block const& _block)
|
||||
{
|
||||
return translate(_block);
|
||||
}
|
||||
|
||||
Statement ASTCopier::translate(Statement const& _statement)
|
||||
{
|
||||
return boost::apply_visitor(*this, _statement);
|
||||
}
|
||||
|
||||
Block ASTCopier::translate(Block const& _block)
|
||||
{
|
||||
enterScope(_block);
|
||||
ScopeGuard g([&]() { this->leaveScope(_block); });
|
||||
|
||||
return Block{_block.location, translateVector(_block.statements)};
|
||||
}
|
||||
|
||||
Case ASTCopier::translate(Case const& _case)
|
||||
{
|
||||
return Case{_case.location, translate(_case.value), translate(_case.body)};
|
||||
}
|
||||
|
||||
Identifier ASTCopier::translate(Identifier const& _identifier)
|
||||
{
|
||||
return Identifier{_identifier.location, translateIdentifier(_identifier.name)};
|
||||
}
|
||||
|
||||
Literal ASTCopier::translate(Literal const& _literal)
|
||||
{
|
||||
return _literal;
|
||||
}
|
||||
|
||||
TypedName ASTCopier::translate(TypedName const& _typedName)
|
||||
{
|
||||
return TypedName{_typedName.location, translateIdentifier(_typedName.name), _typedName.type};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
/*
|
||||
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/>.
|
||||
*/
|
||||
/**
|
||||
* Creates an independent copy of an AST, renaming identifiers to be unique.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <libjulia/ASTDataForward.h>
|
||||
|
||||
#include <boost/variant.hpp>
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
#include <vector>
|
||||
#include <set>
|
||||
|
||||
namespace dev
|
||||
{
|
||||
namespace julia
|
||||
{
|
||||
|
||||
/**
|
||||
* Creates a copy of a iulia AST potentially replacing identifier names.
|
||||
* Base class to be extended.
|
||||
*/
|
||||
class ASTCopier: public boost::static_visitor<Statement>
|
||||
{
|
||||
public:
|
||||
ASTCopier(Block const& _block):
|
||||
m_block(_block)
|
||||
{}
|
||||
|
||||
std::shared_ptr<Block> run();
|
||||
|
||||
public:
|
||||
Statement operator()(Literal const& _literal);
|
||||
Statement operator()(Instruction const& _instruction);
|
||||
Statement operator()(Identifier const& _identifier);
|
||||
Statement operator()(FunctionalInstruction const& _instr);
|
||||
Statement operator()(FunctionCall const&);
|
||||
Statement operator()(Label const& _label);
|
||||
Statement operator()(StackAssignment const& _assignment);
|
||||
Statement operator()(Assignment const& _assignment);
|
||||
Statement operator()(VariableDeclaration const& _varDecl);
|
||||
Statement operator()(If const& _if);
|
||||
Statement operator()(Switch const& _switch);
|
||||
Statement operator()(FunctionDefinition const&);
|
||||
Statement operator()(ForLoop const&);
|
||||
Statement operator()(Block const& _block);
|
||||
|
||||
protected:
|
||||
template <typename T>
|
||||
std::vector<T> translateVector(std::vector<T> const& _values);
|
||||
|
||||
template <typename T>
|
||||
std::shared_ptr<T> translate(std::shared_ptr<T> const& _v)
|
||||
{
|
||||
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);
|
||||
Literal translate(Literal const& _literal);
|
||||
TypedName translate(TypedName const& _typedName);
|
||||
|
||||
virtual void enterScope(Block const& _block) = 0;
|
||||
virtual void leaveScope(Block const& _block) = 0;
|
||||
virtual void enterFunction(FunctionDefinition const& _function) = 0;
|
||||
virtual void leaveFunction(FunctionDefinition const& _function) = 0;
|
||||
virtual std::string translateIdentifier(std::string const& _name) { return _name; }
|
||||
|
||||
Block const& m_block;
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
std::vector<T> ASTCopier::translateVector(std::vector<T> const& _values)
|
||||
{
|
||||
std::vector<T> translated;
|
||||
for (auto const& v: _values)
|
||||
translated.emplace_back(translate(v));
|
||||
return translated;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
/*
|
||||
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/>.
|
||||
*/
|
||||
/**
|
||||
* Optimiser component that makes all identifiers unique.
|
||||
*/
|
||||
|
||||
#include <libjulia/optimiser/Disambiguator.h>
|
||||
|
||||
#include <libsolidity/inlineasm/AsmData.h>
|
||||
#include <libsolidity/inlineasm/AsmScope.h>
|
||||
|
||||
#include <libsolidity/interface/Exceptions.h>
|
||||
|
||||
using namespace std;
|
||||
using namespace dev;
|
||||
using namespace dev::julia;
|
||||
using namespace dev::solidity;
|
||||
|
||||
using Scope = dev::solidity::assembly::Scope;
|
||||
|
||||
string Disambiguator::translateIdentifier(string const& _originalName)
|
||||
{
|
||||
solAssert(!m_scopes.empty() && m_scopes.back(), "");
|
||||
Scope::Identifier const* id = m_scopes.back()->lookup(_originalName);
|
||||
solAssert(id, "");
|
||||
if (!m_translations.count(id))
|
||||
{
|
||||
string translated = _originalName;
|
||||
size_t suffix = 0;
|
||||
while (m_usedNames.count(translated))
|
||||
{
|
||||
suffix++;
|
||||
translated = _originalName + "_" + std::to_string(suffix);
|
||||
}
|
||||
m_usedNames.insert(translated);
|
||||
m_translations[id] = translated;
|
||||
}
|
||||
return m_translations.at(id);
|
||||
}
|
||||
|
||||
void Disambiguator::enterScope(Block const& _block)
|
||||
{
|
||||
enterScopeInternal(*m_info.scopes.at(&_block));
|
||||
}
|
||||
|
||||
void Disambiguator::leaveScope(Block const& _block)
|
||||
{
|
||||
leaveScopeInternal(*m_info.scopes.at(&_block));
|
||||
}
|
||||
|
||||
void Disambiguator::enterFunction(FunctionDefinition const& _function)
|
||||
{
|
||||
enterScopeInternal(*m_info.scopes.at(m_info.virtualBlocks.at(&_function).get()));
|
||||
}
|
||||
|
||||
void Disambiguator::leaveFunction(FunctionDefinition const& _function)
|
||||
{
|
||||
leaveScopeInternal(*m_info.scopes.at(m_info.virtualBlocks.at(&_function).get()));
|
||||
}
|
||||
|
||||
void Disambiguator::enterScopeInternal(Scope& _scope)
|
||||
{
|
||||
m_scopes.push_back(&_scope);
|
||||
}
|
||||
|
||||
void Disambiguator::leaveScopeInternal(Scope& _scope)
|
||||
{
|
||||
solAssert(!m_scopes.empty(), "");
|
||||
solAssert(m_scopes.back() == &_scope, "");
|
||||
m_scopes.pop_back();
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
/*
|
||||
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/>.
|
||||
*/
|
||||
/**
|
||||
* Optimiser component that makes all identifiers unique.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <libjulia/ASTDataForward.h>
|
||||
|
||||
#include <libjulia/optimiser/ASTCopier.h>
|
||||
|
||||
#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
|
||||
|
||||
#include <boost/variant.hpp>
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
#include <set>
|
||||
|
||||
namespace dev
|
||||
{
|
||||
namespace julia
|
||||
{
|
||||
class EVMAssembly;
|
||||
|
||||
/**
|
||||
* Creates a copy of a iulia AST replacing all identifiers by unique names.
|
||||
*/
|
||||
class Disambiguator: public ASTCopier
|
||||
{
|
||||
public:
|
||||
Disambiguator(
|
||||
Block const& _block,
|
||||
solidity::assembly::AsmAnalysisInfo const& _analysisInfo
|
||||
): ASTCopier(_block), m_info(_analysisInfo)
|
||||
{}
|
||||
|
||||
protected:
|
||||
virtual void enterScope(Block const& _block) override;
|
||||
virtual void leaveScope(Block const& _block) override;
|
||||
virtual void enterFunction(FunctionDefinition const& _function) override;
|
||||
virtual void leaveFunction(FunctionDefinition const& _function) override;
|
||||
virtual std::string translateIdentifier(std::string const& _name) override;
|
||||
|
||||
void enterScopeInternal(solidity::assembly::Scope& _scope);
|
||||
void leaveScopeInternal(solidity::assembly::Scope& _scope);
|
||||
|
||||
solidity::assembly::AsmAnalysisInfo const& m_info;
|
||||
|
||||
std::vector<solidity::assembly::Scope*> m_scopes;
|
||||
std::map<void const*, std::string> m_translations;
|
||||
std::set<std::string> m_usedNames;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user