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

OptimiserSuite: Allow validating the optimisation sequence without executing it

Browse Source 
- Create a separate validateSequence() that can be used independently.
- Tweak the exception messages a bit to be usable as command-line errors
This commit is contained in:
Kamil Śliwak 2020-04-24 14:15:45 +02:00
parent e2c0e6331c
commit 69b79f848b
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libyul/optimiser/Suite.cpp
View File

@ -253,22 +253,21 @@ map<char, string> const& OptimiserSuite::stepAbbreviationToNameMap()
return lookupTable; return lookupTable;
} }
void OptimiserSuite::runSequence(string const& _stepAbbreviations, Block& _ast) void OptimiserSuite::validateSequence(string const& _stepAbbreviations)
{ {
string input = _stepAbbreviations;
boost::remove_erase(input, ' ');
boost::remove_erase(input, '\n');
bool insideLoop = false; bool insideLoop = false;
for (char abbreviation: input) for (char abbreviation: _stepAbbreviations)
switch (abbreviation) switch (abbreviation)
{ {
case ' ':
case '\n':
break;
case '[': case '[':
assertThrow(!insideLoop, OptimizerException, "Nested brackets not supported"); assertThrow(!insideLoop, OptimizerException, "Nested brackets are not supported");
insideLoop = true; insideLoop = true;
break; break;
case ']': case ']':
assertThrow(insideLoop, OptimizerException, "Unbalanced bracket"); assertThrow(insideLoop, OptimizerException, "Unbalanced brackets");
insideLoop = false; insideLoop = false;
break; break;
default: default:
@ -279,10 +278,19 @@ void OptimiserSuite::runSequence(string const& _stepAbbreviations, Block& _ast)
assertThrow( assertThrow(
stepAbbreviationToNameMap().find(abbreviation) != stepAbbreviationToNameMap().end(), stepAbbreviationToNameMap().find(abbreviation) != stepAbbreviationToNameMap().end(),
OptimizerException, OptimizerException,
"Invalid optimisation step abbreviation" "'"s + abbreviation + "' is not a valid step abbreviation"
); );
} }
assertThrow(!insideLoop, OptimizerException, "Unbalanced bracket"); assertThrow(!insideLoop, OptimizerException, "Unbalanced brackets");
}
void OptimiserSuite::runSequence(string const& _stepAbbreviations, Block& _ast)
{
validateSequence(_stepAbbreviations);
string input = _stepAbbreviations;
boost::remove_erase(input, ' ');
boost::remove_erase(input, '\n');
auto abbreviationsToSteps = [](string const& _sequence) -> vector<string> auto abbreviationsToSteps = [](string const& _sequence) -> vector<string>
{ {

4
libyul/optimiser/Suite.h
View File

@ -65,6 +65,10 @@ public:
std::set<YulString> const& _externallyUsedIdentifiers = {} std::set<YulString> const& _externallyUsedIdentifiers = {}
); );
/// Ensures that specified sequence of step abbreviations is well-formed and can be executed.
/// @throw OptimizerException if the sequence is invalid
static void validateSequence(std::string const& _stepAbbreviations);
void runSequence(std::vector<std::string> const& _steps, Block& _ast); void runSequence(std::vector<std::string> const& _steps, Block& _ast);
void runSequence(std::string const& _stepAbbreviations, Block& _ast); void runSequence(std::string const& _stepAbbreviations, Block& _ast);
void runSequenceUntilStable( void runSequenceUntilStable(