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

[yulopti] Print options in column-wise rather than row-wise

Browse Source
This commit is contained in:
Kamil Śliwak 2021-01-13 13:57:09 +01:00
parent 055c4b4d44
commit 18c0e70ccf
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test/tools/yulopti.cpp
View File

@ -43,14 +43,20 @@
#include <libsolutil/JSON.h> #include <libsolutil/JSON.h>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <range/v3/view/concat.hpp>
#include <range/v3/view/drop.hpp>
#include <range/v3/view/stride.hpp>
#include <string> #include <string>
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include <variant> #include <variant>
using namespace std; using namespace std;
using namespace ranges;
using namespace solidity; using namespace solidity;
using namespace solidity::util; using namespace solidity::util;
using namespace solidity::langutil; using namespace solidity::langutil;
@ -102,24 +108,14 @@ public:
size_t _columns size_t _columns
) )
{ {
auto hasShorterString = [](auto const& a, auto const& b){ return a.second.size() < b.second.size(); }; yulAssert(_columns > 0, "");
size_t longestDescriptionLength = max(
auto hasShorterString = [](auto const& a, auto const& b) { return a.second.size() < b.second.size(); };
size_t longestDescriptionLength = std::max(
max_element(_optimizationSteps.begin(), _optimizationSteps.end(), hasShorterString)->second.size(), max_element(_optimizationSteps.begin(), _optimizationSteps.end(), hasShorterString)->second.size(),
max_element(_extraOptions.begin(), _extraOptions.end(), hasShorterString)->second.size() max_element(_extraOptions.begin(), _extraOptions.end(), hasShorterString)->second.size()
); );
size_t index = 0;
auto printPair = [&](auto const& optionAndDescription)
{
cout << optionAndDescription.first << ": ";
cout << setw(static_cast<int>(longestDescriptionLength)) << setiosflags(ios::left);
cout << optionAndDescription.second << " ";
++index;
if (index % _columns == 0)
cout << endl;
};
for (auto const& optionAndDescription: _extraOptions) for (auto const& optionAndDescription: _extraOptions)
{ {
yulAssert( yulAssert(
@ -131,11 +127,19 @@ public:
"OptimiserSuite::stepNameToAbbreviationMap() and not realizing that it's used by yulopti.\n" "OptimiserSuite::stepNameToAbbreviationMap() and not realizing that it's used by yulopti.\n"
"Please update the code to use a different character and recompile yulopti." "Please update the code to use a different character and recompile yulopti."
); );
printPair(optionAndDescription);
} }
for (auto const& abbreviationAndName: _optimizationSteps) vector<tuple<char, string>> sortedOptions = views::concat(_optimizationSteps, _extraOptions);
printPair(abbreviationAndName);
yulAssert(sortedOptions.size() > 0, "");
size_t rows = (sortedOptions.size() - 1) / _columns + 1;
for (size_t row = 0; row < rows; ++row)
{
for (auto const& [key, name]: sortedOptions | views::drop(row) | views::stride(rows))
cout << key << ": " << setw(static_cast<int>(longestDescriptionLength)) << setiosflags(ios::left) << name << " ";
cout << endl;
}
} }
void runInteractive(string source) void runInteractive(string source)