RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 08:47:44 +00:00
Code Issues Activity Actions

ArgsParser: Style fixup

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

94
AK/ArgsParser.cpp
View file

@ -5,32 +5,35 @@
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) 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)
{ {
ArgsParserResult res; ArgsParserResult res;
// We should have at least one parameter // We should have at least one parameter
@ -45,10 +48,10 @@ namespace AK {
return {}; return {};
return res; return res;
} }
int ArgsParser::parse_next_param(const int index, const char** argv, const int params_left, ArgsParserResult& res) int ArgsParser::parse_next_param(const int index, const char** argv, const int params_left, ArgsParserResult& res)
{ {
if (params_left == 0) if (params_left == 0)
return 0; return 0;
@ -83,29 +86,26 @@ 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);
} }
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))
@ -113,20 +113,20 @@ namespace AK {
} }
} }
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 : ");
@ -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,20 +159,23 @@ 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");
} }
return sb.to_string(); return sb.to_string();
} }
void ArgsParser::print_usage() const void ArgsParser::print_usage() const
{ {
printf("%s\n", get_usage().characters()); printf("%s\n", get_usage().characters());
} }
} }

18
AK/ArgsParser.h
View file

@ -14,21 +14,22 @@
*/ */
namespace AK { namespace AK {
class ArgsParserResult {
public: class ArgsParserResult {
public:
bool is_present(const String& arg_name) const; bool is_present(const String& arg_name) const;
String get(const String& arg_name) const; String get(const String& arg_name) const;
const Vector<String>& get_single_values() const; const Vector<String>& get_single_values() const;
private: private:
HashMap<String, String> m_args; HashMap<String, String> m_args;
Vector<String> m_single_values; Vector<String> m_single_values;
friend class ArgsParser; friend class ArgsParser;
}; };
class ArgsParser { class ArgsParser {
public: public:
ArgsParser(const String& program_name, const String& prefix); ArgsParser(const String& program_name, const String& prefix);
ArgsParserResult parse(const int argc, const char** argv); ArgsParserResult parse(const int argc, const char** argv);
@ -38,7 +39,7 @@ namespace AK {
String get_usage() const; String get_usage() const;
void print_usage() const; void print_usage() const;
private: private:
struct Arg { struct Arg {
inline Arg() {} inline Arg() {}
Arg(const String& name, const String& description, bool required); Arg(const String& name, const String& description, bool required);
@ -57,5 +58,6 @@ namespace AK {
String m_program_name; String m_program_name;
String m_prefix; String m_prefix;
HashMap<String, Arg> m_args; HashMap<String, Arg> m_args;
}; };
} }