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

[yul-phaser] Phaser: Extract preparation of option description into a separate function

Browse Source
This commit is contained in:
Kamil Śliwak 2020-02-21 19:23:33 +01:00
parent 2d177c7623
commit 7cf5c4e266
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/yulPhaser/Phaser.cpp
View File

@ -158,9 +158,12 @@ int Phaser::main(int _argc, char** _argv)
return 0; return 0;
} }
Phaser::CommandLineParsingResult Phaser::parseCommandLine(int _argc, char** _argv) Phaser::CommandLineDescription Phaser::buildCommandLineDescription()
{ {
po::options_description description( size_t const lineLength = po::options_description::m_default_line_length;
size_t const minDescriptionLength = lineLength - 23;
po::options_description keywordDescription(
"yul-phaser, a tool for finding the best sequence of Yul optimisation phases.\n" "yul-phaser, a tool for finding the best sequence of Yul optimisation phases.\n"
"\n" "\n"
"Usage: yul-phaser [options] <file>\n" "Usage: yul-phaser [options] <file>\n"
@ -170,11 +173,10 @@ Phaser::CommandLineParsingResult Phaser::parseCommandLine(int _argc, char** _arg
"yul-phaser program.yul\n" "yul-phaser program.yul\n"
"\n" "\n"
"Allowed options", "Allowed options",
po::options_description::m_default_line_length, lineLength,
po::options_description::m_default_line_length - 23 minDescriptionLength
); );
keywordDescription.add_options()
description.add_options()
("help", "Show help message and exit.") ("help", "Show help message and exit.")
("input-file", po::value<string>()->required(), "Input file") ("input-file", po::value<string>()->required(), "Input file")
("seed", po::value<uint32_t>(), "Seed for the random number generator") ("seed", po::value<uint32_t>(), "Seed for the random number generator")
@ -186,14 +188,22 @@ Phaser::CommandLineParsingResult Phaser::parseCommandLine(int _argc, char** _arg
; ;
po::positional_options_description positionalDescription; po::positional_options_description positionalDescription;
po::variables_map arguments;
positionalDescription.add("input-file", 1); positionalDescription.add("input-file", 1);
return {keywordDescription, positionalDescription};
}
Phaser::CommandLineParsingResult Phaser::parseCommandLine(int _argc, char** _argv)
{
auto [keywordDescription, positionalDescription] = buildCommandLineDescription();
po::variables_map arguments;
po::notify(arguments); po::notify(arguments);
try try
{ {
po::command_line_parser parser(_argc, _argv); po::command_line_parser parser(_argc, _argv);
parser.options(description).positional(positionalDescription); parser.options(keywordDescription).positional(positionalDescription);
po::store(parser.run(), arguments); po::store(parser.run(), arguments);
} }
catch (po::error const & _exception) catch (po::error const & _exception)
@ -204,7 +214,7 @@ Phaser::CommandLineParsingResult Phaser::parseCommandLine(int _argc, char** _arg
if (arguments.count("help") > 0) if (arguments.count("help") > 0)
{ {
cout << description << endl; cout << keywordDescription << endl;
return {2, move(arguments)}; return {2, move(arguments)};
} }

7
tools/yulPhaser/Phaser.h
View File

@ -131,12 +131,19 @@ public:
static int main(int argc, char** argv); static int main(int argc, char** argv);
private: private:
struct CommandLineDescription
{
boost::program_options::options_description keywordDescription;
boost::program_options::positional_options_description positionalDescription;
};
struct CommandLineParsingResult struct CommandLineParsingResult
{ {
int exitCode; int exitCode;
boost::program_options::variables_map arguments; boost::program_options::variables_map arguments;
}; };
static CommandLineDescription buildCommandLineDescription();
static CommandLineParsingResult parseCommandLine(int _argc, char** _argv); static CommandLineParsingResult parseCommandLine(int _argc, char** _argv);
static void initialiseRNG(boost::program_options::variables_map const& _arguments); static void initialiseRNG(boost::program_options::variables_map const& _arguments);