mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 08:47:44 +00:00
ArgsParser: Style fixup
Remove tabs, make whitespace lines a little more in fitting with the rest of the codebase.
This commit is contained in:
Robin Burchell
Andreas Kling
parent
3ec625067a
commit
5cad215919
2 changed files with 213 additions and 205 deletions
|
|
@ -5,171 +5,177 @@
|
||||||
|
|
||||||
namespace AK {
|
namespace AK {
|
||||||
|
|
||||||
bool ArgsParserResult::is_present(const String& arg_name) const
|
bool ArgsParserResult::is_present(const String& arg_name) const
|
||||||
{
|
{
|
||||||
return m_args.contains(arg_name);
|
return m_args.contains(arg_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
String ArgsParserResult::get(const String& arg_name) const
|
String ArgsParserResult::get(const String& arg_name) const
|
||||||
{
|
{
|
||||||
return m_args.get(arg_name);
|
return m_args.get(arg_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
const Vector<String>& ArgsParserResult::get_single_values() const
|
const Vector<String>& ArgsParserResult::get_single_values() const
|
||||||
{
|
{
|
||||||
return m_single_values;
|
return m_single_values;
|
||||||
}
|
}
|
||||||
|
|
||||||
ArgsParser::Arg::Arg(const String& name, const String& description, bool required)
|
ArgsParser::Arg::Arg(const String& name, const String& description, bool required)
|
||||||
: name(name), description(description), required(required) {}
|
: name(name), description(description), required(required)
|
||||||
|
{}
|
||||||
ArgsParser::Arg::Arg(const String& name, const String& value_name, const String& description, bool required)
|
|
||||||
: name(name), description(description), value_name(value_name), required(required) {}
|
ArgsParser::Arg::Arg(const String& name, const String& value_name, const String& description, bool required)
|
||||||
|
: name(name), description(description), value_name(value_name), required(required)
|
||||||
ArgsParser::ArgsParser(const String& program_name, const String& prefix)
|
{}
|
||||||
: m_program_name(program_name), m_prefix(prefix) {}
|
|
||||||
|
ArgsParser::ArgsParser(const String& program_name, const String& prefix)
|
||||||
ArgsParserResult ArgsParser::parse(const int argc, const char** argv)
|
: m_program_name(program_name), m_prefix(prefix)
|
||||||
{
|
{}
|
||||||
ArgsParserResult res;
|
|
||||||
|
ArgsParserResult ArgsParser::parse(const int argc, const char** argv)
|
||||||
// We should have at least one parameter
|
{
|
||||||
if (argc < 2)
|
ArgsParserResult res;
|
||||||
return {};
|
|
||||||
|
// We should have at least one parameter
|
||||||
// We parse the first parameter at the index 1
|
if (argc < 2)
|
||||||
if (parse_next_param(1, argv, argc - 1, res) != 0)
|
return {};
|
||||||
return {};
|
|
||||||
|
// We parse the first parameter at the index 1
|
||||||
if (!check_required_args(res))
|
if (parse_next_param(1, argv, argc - 1, res) != 0)
|
||||||
return {};
|
return {};
|
||||||
|
|
||||||
return res;
|
if (!check_required_args(res))
|
||||||
}
|
return {};
|
||||||
|
|
||||||
int ArgsParser::parse_next_param(const int index, const char** argv, const int params_left, ArgsParserResult& res)
|
return res;
|
||||||
{
|
}
|
||||||
if (params_left == 0)
|
|
||||||
return 0;
|
int ArgsParser::parse_next_param(const int index, const char** argv, const int params_left, ArgsParserResult& res)
|
||||||
|
{
|
||||||
String param = argv[index];
|
if (params_left == 0)
|
||||||
|
return 0;
|
||||||
// We check if the prefix is found at the beginning of the param name
|
|
||||||
if (is_param_valid(param)) {
|
String param = argv[index];
|
||||||
auto prefix_length = m_prefix.length();
|
|
||||||
String param_name = param.substring(prefix_length, param.length() - prefix_length);
|
// We check if the prefix is found at the beginning of the param name
|
||||||
|
if (is_param_valid(param)) {
|
||||||
auto arg = m_args.find(param_name);
|
auto prefix_length = m_prefix.length();
|
||||||
if (arg == m_args.end()) {
|
String param_name = param.substring(prefix_length, param.length() - prefix_length);
|
||||||
printf("Unknown arg \"");
|
|
||||||
if (!param_name.is_null())
|
auto arg = m_args.find(param_name);
|
||||||
printf("%s", param_name.characters());
|
if (arg == m_args.end()) {
|
||||||
printf("\"\n");
|
printf("Unknown arg \"");
|
||||||
return -1;
|
if (!param_name.is_null())
|
||||||
}
|
printf("%s", param_name.characters());
|
||||||
|
printf("\"\n");
|
||||||
// If this parameter must be followed by a value, we look for it
|
return -1;
|
||||||
if (!arg->value.value_name.is_null()) {
|
}
|
||||||
if (params_left < 1) {
|
|
||||||
printf("Missing value for argument %s\n", arg->value.name.characters());
|
// If this parameter must be followed by a value, we look for it
|
||||||
return -1;
|
if (!arg->value.value_name.is_null()) {
|
||||||
}
|
if (params_left < 1) {
|
||||||
|
printf("Missing value for argument %s\n", arg->value.name.characters());
|
||||||
String next = String(argv[index + 1]);
|
return -1;
|
||||||
|
}
|
||||||
if (is_param_valid(next)) {
|
|
||||||
printf("Missing value for argument %s\n", arg->value.name.characters());
|
String next = String(argv[index + 1]);
|
||||||
return -1;
|
|
||||||
}
|
if (is_param_valid(next)) {
|
||||||
|
printf("Missing value for argument %s\n", arg->value.name.characters());
|
||||||
res.m_args.set(arg->value.name, next);
|
return -1;
|
||||||
|
}
|
||||||
return parse_next_param(index + 2, argv, params_left - 2, res);
|
|
||||||
}
|
res.m_args.set(arg->value.name, next);
|
||||||
|
return parse_next_param(index + 2, argv, params_left - 2, res);
|
||||||
// Single argument, not followed by a value
|
}
|
||||||
res.m_args.set(arg->value.name, "");
|
|
||||||
|
// Single argument, not followed by a value
|
||||||
return parse_next_param(index + 1, argv, params_left - 1, res);
|
res.m_args.set(arg->value.name, "");
|
||||||
}
|
return parse_next_param(index + 1, argv, params_left - 1, res);
|
||||||
|
}
|
||||||
// Else, it's a value alone, a file name parameter for example
|
|
||||||
res.m_single_values.append(param);
|
// Else, it's a value alone, a file name parameter for example
|
||||||
|
res.m_single_values.append(param);
|
||||||
return parse_next_param(index + 1, argv, params_left - 1, res);
|
return parse_next_param(index + 1, argv, params_left - 1, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ArgsParser::is_param_valid(const String& param_name)
|
bool ArgsParser::is_param_valid(const String& param_name)
|
||||||
{
|
{
|
||||||
return param_name.substring(0, m_prefix.length()) == m_prefix;
|
return param_name.substring(0, m_prefix.length()) == m_prefix;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ArgsParser::check_required_args(const ArgsParserResult& res)
|
bool ArgsParser::check_required_args(const ArgsParserResult& res)
|
||||||
{
|
{
|
||||||
for (auto& it : m_args) {
|
for (auto& it : m_args) {
|
||||||
if (it.value.required) {
|
if (it.value.required) {
|
||||||
if (!res.is_present(it.value.name))
|
if (!res.is_present(it.value.name))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ArgsParser::add_arg(const String& name, const String& description, bool required)
|
void ArgsParser::add_arg(const String& name, const String& description, bool required)
|
||||||
{
|
{
|
||||||
m_args.set(name, Arg(name, description, required));
|
m_args.set(name, Arg(name, description, required));
|
||||||
}
|
}
|
||||||
|
|
||||||
void ArgsParser::add_arg(const String& name, const String& value_name, const String& description, bool required)
|
void ArgsParser::add_arg(const String& name, const String& value_name, const String& description, bool required)
|
||||||
{
|
{
|
||||||
m_args.set(name, Arg(name, value_name, description, required));
|
m_args.set(name, Arg(name, value_name, description, required));
|
||||||
}
|
}
|
||||||
|
|
||||||
String ArgsParser::get_usage() const
|
String ArgsParser::get_usage() const
|
||||||
{
|
{
|
||||||
StringBuilder sb;
|
StringBuilder sb;
|
||||||
|
|
||||||
sb.append("usage : ");
|
sb.append("usage : ");
|
||||||
sb.append(m_program_name);
|
sb.append(m_program_name);
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
|
|
||||||
for (auto& it : m_args) {
|
for (auto& it : m_args) {
|
||||||
if (it.value.required)
|
if (it.value.required)
|
||||||
sb.append("<");
|
sb.append("<");
|
||||||
else
|
else
|
||||||
sb.append("[");
|
sb.append("[");
|
||||||
sb.append(m_prefix);
|
|
||||||
sb.append(it.value.name);
|
sb.append(m_prefix);
|
||||||
if (!it.value.value_name.is_null()) {
|
sb.append(it.value.name);
|
||||||
sb.append(" ");
|
|
||||||
sb.append(it.value.value_name);
|
if (!it.value.value_name.is_null()) {
|
||||||
}
|
sb.append(" ");
|
||||||
if (it.value.required)
|
sb.append(it.value.value_name);
|
||||||
sb.append("> ");
|
}
|
||||||
else
|
|
||||||
sb.append("] ");
|
if (it.value.required)
|
||||||
}
|
sb.append("> ");
|
||||||
|
else
|
||||||
sb.append("\n");
|
sb.append("] ");
|
||||||
|
}
|
||||||
for (auto& it : m_args) {
|
|
||||||
sb.append(" ");
|
sb.append("\n");
|
||||||
sb.append(m_prefix);
|
|
||||||
sb.append(it.value.name);
|
for (auto& it : m_args) {
|
||||||
if (!it.value.value_name.is_null()) {
|
sb.append(" ");
|
||||||
sb.append(" ");
|
sb.append(m_prefix);
|
||||||
sb.append(it.value.value_name);
|
sb.append(it.value.name);
|
||||||
}
|
|
||||||
sb.append(" : ");
|
if (!it.value.value_name.is_null()) {
|
||||||
sb.append(it.value.description);
|
sb.append(" ");
|
||||||
sb.append("\n");
|
sb.append(it.value.value_name);
|
||||||
}
|
}
|
||||||
|
|
||||||
return sb.to_string();
|
sb.append(" : ");
|
||||||
}
|
sb.append(it.value.description);
|
||||||
|
sb.append("\n");
|
||||||
void ArgsParser::print_usage() const
|
}
|
||||||
{
|
|
||||||
printf("%s\n", get_usage().characters());
|
return sb.to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ArgsParser::print_usage() const
|
||||||
|
{
|
||||||
|
printf("%s\n", get_usage().characters());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,48 +14,50 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace AK {
|
namespace AK {
|
||||||
class ArgsParserResult {
|
|
||||||
public:
|
|
||||||
bool is_present(const String& arg_name) const;
|
|
||||||
String get(const String& arg_name) const;
|
|
||||||
const Vector<String>& get_single_values() const;
|
|
||||||
|
|
||||||
private:
|
class ArgsParserResult {
|
||||||
HashMap<String, String> m_args;
|
public:
|
||||||
Vector<String> m_single_values;
|
bool is_present(const String& arg_name) const;
|
||||||
|
String get(const String& arg_name) const;
|
||||||
|
const Vector<String>& get_single_values() const;
|
||||||
|
|
||||||
friend class ArgsParser;
|
private:
|
||||||
|
HashMap<String, String> m_args;
|
||||||
|
Vector<String> m_single_values;
|
||||||
|
|
||||||
|
friend class ArgsParser;
|
||||||
|
};
|
||||||
|
|
||||||
|
class ArgsParser {
|
||||||
|
public:
|
||||||
|
ArgsParser(const String& program_name, const String& prefix);
|
||||||
|
|
||||||
|
ArgsParserResult parse(const int argc, const char** argv);
|
||||||
|
|
||||||
|
void add_arg(const String& name, const String& description, bool required);
|
||||||
|
void add_arg(const String& name, const String& value_name, const String& description, bool required);
|
||||||
|
String get_usage() const;
|
||||||
|
void print_usage() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
struct Arg {
|
||||||
|
inline Arg() {}
|
||||||
|
Arg(const String& name, const String& description, bool required);
|
||||||
|
Arg(const String& name, const String& value_name, const String& description, bool required);
|
||||||
|
|
||||||
|
String name;
|
||||||
|
String description;
|
||||||
|
String value_name;
|
||||||
|
bool required;
|
||||||
};
|
};
|
||||||
|
|
||||||
class ArgsParser {
|
int parse_next_param(const int index, const char** argv, const int params_left, ArgsParserResult& res);
|
||||||
public:
|
bool is_param_valid(const String& param_name);
|
||||||
ArgsParser(const String& program_name, const String& prefix);
|
bool check_required_args(const ArgsParserResult& res);
|
||||||
|
|
||||||
ArgsParserResult parse(const int argc, const char** argv);
|
String m_program_name;
|
||||||
|
String m_prefix;
|
||||||
|
HashMap<String, Arg> m_args;
|
||||||
|
};
|
||||||
|
|
||||||
void add_arg(const String& name, const String& description, bool required);
|
|
||||||
void add_arg(const String& name, const String& value_name, const String& description, bool required);
|
|
||||||
String get_usage() const;
|
|
||||||
void print_usage() const;
|
|
||||||
|
|
||||||
private:
|
|
||||||
struct Arg {
|
|
||||||
inline Arg() {}
|
|
||||||
Arg(const String& name, const String& description, bool required);
|
|
||||||
Arg(const String& name, const String& value_name, const String& description, bool required);
|
|
||||||
|
|
||||||
String name;
|
|
||||||
String description;
|
|
||||||
String value_name;
|
|
||||||
bool required;
|
|
||||||
};
|
|
||||||
|
|
||||||
int parse_next_param(const int index, const char** argv, const int params_left, ArgsParserResult& res);
|
|
||||||
bool is_param_valid(const String& param_name);
|
|
||||||
bool check_required_args(const ArgsParserResult& res);
|
|
||||||
|
|
||||||
String m_program_name;
|
|
||||||
String m_prefix;
|
|
||||||
HashMap<String, Arg> m_args;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue