Move NameDispenser into its own file.

This commit is contained in:
chriseth 2018-02-08 16:55:03 +01:00
parent 78945e81e4
commit d3c11a49e5
4 changed files with 76 additions and 20 deletions

View File

@ -252,16 +252,3 @@ string BodyCopier::translateIdentifier(string const& _name)
else
return _name;
}
string NameDispenser::newName(string const& _prefix)
{
string name = _prefix;
size_t suffix = 0;
while (name.empty() || m_usedNames.count(name))
{
suffix++;
name = _prefix + "_" + std::to_string(suffix);
}
m_usedNames.insert(name);
return name;
}

View File

@ -23,6 +23,7 @@
#include <libjulia/optimiser/ASTCopier.h>
#include <libjulia/optimiser/ASTWalker.h>
#include <libjulia/optimiser/NameDispenser.h>
#include <libsolidity/interface/Exceptions.h>
@ -38,13 +39,6 @@ namespace julia
class NameCollector;
struct NameDispenser
{
std::string newName(std::string const& _prefix);
std::set<std::string> m_usedNames;
};
/**
* Optimiser component that modifies an AST in place, inlining arbitrary functions.

View File

@ -0,0 +1,38 @@
/*
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 can create new unique names.
*/
#include <libjulia/optimiser/NameDispenser.h>
using namespace std;
using namespace dev;
using namespace dev::julia;
string NameDispenser::newName(string const& _prefix)
{
string name = _prefix;
size_t suffix = 0;
while (name.empty() || m_usedNames.count(name))
{
suffix++;
name = _prefix + "_" + std::to_string(suffix);
}
m_usedNames.insert(name);
return name;
}

View File

@ -0,0 +1,37 @@
/*
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 can create new unique names.
*/
#pragma once
#include <set>
#include <string>
namespace dev
{
namespace julia
{
struct NameDispenser
{
std::string newName(std::string const& _prefix);
std::set<std::string> m_usedNames;
};
}
}