1
Fork 0
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 2019-05-17 12:46:51 +02:00 committed by Andreas Kling
parent 3ec625067a
commit 5cad215919
2 changed files with 213 additions and 205 deletions

View file

@ -21,13 +21,16 @@ namespace AK {
} }
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) 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) {} : name(name), description(description), value_name(value_name), required(required)
{}
ArgsParser::ArgsParser(const String& program_name, const String& prefix) ArgsParser::ArgsParser(const String& program_name, const String& prefix)
: m_program_name(program_name), m_prefix(prefix) {} : m_program_name(program_name), m_prefix(prefix)
{}
ArgsParserResult ArgsParser::parse(const int argc, const char** argv) ArgsParserResult ArgsParser::parse(const int argc, const char** argv)
{ {
@ -83,19 +86,16 @@ namespace AK {
} }
res.m_args.set(arg->value.name, next); res.m_args.set(arg->value.name, next);
return parse_next_param(index + 2, argv, params_left - 2, res); return parse_next_param(index + 2, argv, params_left - 2, res);
} }
// Single argument, not followed by a value // Single argument, not followed by a value
res.m_args.set(arg->value.name, ""); res.m_args.set(arg->value.name, "");
return parse_next_param(index + 1, argv, params_left - 1, res); return parse_next_param(index + 1, argv, params_left - 1, res);
} }
// Else, it's a value alone, a file name parameter for example // Else, it's a value alone, a file name parameter for example
res.m_single_values.append(param); 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);
} }
@ -138,12 +138,15 @@ namespace AK {
sb.append("<"); sb.append("<");
else else
sb.append("["); sb.append("[");
sb.append(m_prefix); sb.append(m_prefix);
sb.append(it.value.name); sb.append(it.value.name);
if (!it.value.value_name.is_null()) { if (!it.value.value_name.is_null()) {
sb.append(" "); sb.append(" ");
sb.append(it.value.value_name); sb.append(it.value.value_name);
} }
if (it.value.required) if (it.value.required)
sb.append("> "); sb.append("> ");
else else
@ -156,10 +159,12 @@ namespace AK {
sb.append(" "); sb.append(" ");
sb.append(m_prefix); sb.append(m_prefix);
sb.append(it.value.name); sb.append(it.value.name);
if (!it.value.value_name.is_null()) { if (!it.value.value_name.is_null()) {
sb.append(" "); sb.append(" ");
sb.append(it.value.value_name); sb.append(it.value.value_name);
} }
sb.append(" : "); sb.append(" : ");
sb.append(it.value.description); sb.append(it.value.description);
sb.append("\n"); sb.append("\n");
@ -172,4 +177,5 @@ namespace AK {
{ {
printf("%s\n", get_usage().characters()); printf("%s\n", get_usage().characters());
} }
} }

View file

@ -14,6 +14,7 @@
*/ */
namespace AK { namespace AK {
class ArgsParserResult { class ArgsParserResult {
public: public:
bool is_present(const String& arg_name) const; bool is_present(const String& arg_name) const;
@ -58,4 +59,5 @@ namespace AK {
String m_prefix; String m_prefix;
HashMap<String, Arg> m_args; HashMap<String, Arg> m_args;
}; };
} }