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: Use brackets instead of parentheses as syntax for repeating abbreviation sequences

Browse Source 
- We want to start accepting abbreviation sequences on the command line and parentheses would always have to be escaped in that context.
- There wasn't any important reason behind choosing () rather than [] or {} and it still isn't too late to switch.
This commit is contained in:
Kamil Śliwak 2020-04-16 17:13:56 +02:00
parent dd7aebe7f1
commit 5a515240ac
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libyul/optimiser/Suite.cpp
View File

@ -95,7 +95,7 @@ void OptimiserSuite::run(
suite.runSequence( suite.runSequence(
"dhfoDgvulfnTUtnIf" // None of these can make stack problems worse "dhfoDgvulfnTUtnIf" // None of these can make stack problems worse
"(" "["
"xarrscLM" // Turn into SSA and simplify "xarrscLM" // Turn into SSA and simplify
"cCTUtTOntnfDIul" // Perform structural simplification "cCTUtTOntnfDIul" // Perform structural simplification
"Lcul" // Simplify again "Lcul" // Simplify again
@ -108,7 +108,7 @@ void OptimiserSuite::run(
"xarrcL" // Turn into SSA again and simplify "xarrcL" // Turn into SSA again and simplify
"gvif" // Run full inliner "gvif" // Run full inliner
"CTUcarrLsTOtfDncarrIulc" // SSA plus simplify "CTUcarrLsTOtfDncarrIulc" // SSA plus simplify
")" "]"
"jmuljuljul VcTOcul jmul", // Make source short and pretty "jmuljuljul VcTOcul jmul", // Make source short and pretty
ast ast
); );
@ -256,12 +256,12 @@ void OptimiserSuite::runSequence(string const& _stepAbbreviations, Block& _ast)
for (char abbreviation: input) for (char abbreviation: input)
switch (abbreviation) switch (abbreviation)
{ {
case '(': case '[':
assertThrow(!insideLoop, OptimizerException, "Nested parentheses not supported"); assertThrow(!insideLoop, OptimizerException, "Nested brackets not supported");
insideLoop = true; insideLoop = true;
break; break;
case ')': case ']':
assertThrow(insideLoop, OptimizerException, "Unbalanced parenthesis"); assertThrow(insideLoop, OptimizerException, "Unbalanced bracket");
insideLoop = false; insideLoop = false;
break; break;
default: default:
@ -271,7 +271,7 @@ void OptimiserSuite::runSequence(string const& _stepAbbreviations, Block& _ast)
"Invalid optimisation step abbreviation" "Invalid optimisation step abbreviation"
); );
} }
assertThrow(!insideLoop, OptimizerException, "Unbalanced parenthesis"); assertThrow(!insideLoop, OptimizerException, "Unbalanced bracket");
auto abbreviationsToSteps = [](string const& _sequence) -> vector<string> auto abbreviationsToSteps = [](string const& _sequence) -> vector<string>
{ {
@ -281,21 +281,21 @@ void OptimiserSuite::runSequence(string const& _stepAbbreviations, Block& _ast)
return steps; return steps;
}; };
// The sequence has now been validated and must consist of pairs of segments that look like this: `aaa(bbb)` // The sequence has now been validated and must consist of pairs of segments that look like this: `aaa[bbb]`
// `aaa` or `(bbb)` can be empty. For example we consider a sequence like `fgo(aaf)Oo` to have // `aaa` or `[bbb]` can be empty. For example we consider a sequence like `fgo[aaf]Oo` to have
// four segments, the last of which is an empty parenthesis. // four segments, the last of which is an empty bracket.
size_t currentPairStart = 0; size_t currentPairStart = 0;
while (currentPairStart < input.size()) while (currentPairStart < input.size())
{ {
size_t openingParenthesis = input.find('(', currentPairStart); size_t openingBracket = input.find('[', currentPairStart);
size_t closingParenthesis = input.find(')', openingParenthesis); size_t closingBracket = input.find(']', openingBracket);
size_t firstCharInside = (openingParenthesis == string::npos ? input.size() : openingParenthesis + 1); size_t firstCharInside = (openingBracket == string::npos ? input.size() : openingBracket + 1);
yulAssert((openingParenthesis == string::npos) == (closingParenthesis == string::npos), ""); yulAssert((openingBracket == string::npos) == (closingBracket == string::npos), "");
runSequence(abbreviationsToSteps(input.substr(currentPairStart, openingParenthesis - currentPairStart)), _ast); runSequence(abbreviationsToSteps(input.substr(currentPairStart, openingBracket - currentPairStart)), _ast);
runSequenceUntilStable(abbreviationsToSteps(input.substr(firstCharInside, closingParenthesis - firstCharInside)), _ast); runSequenceUntilStable(abbreviationsToSteps(input.substr(firstCharInside, closingBracket - firstCharInside)), _ast);
currentPairStart = (closingParenthesis == string::npos ? input.size() : closingParenthesis + 1); currentPairStart = (closingBracket == string::npos ? input.size() : closingBracket + 1);
} }
} }