From cdaa64ed3fce6558537b64558f264fd07a4c2937 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 24 Jul 2025 01:23:31 -0500 Subject: [PATCH] [ox/clargs] Fix arg parsing for first '-' --- deps/ox/src/ox/clargs/clargs.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deps/ox/src/ox/clargs/clargs.cpp b/deps/ox/src/ox/clargs/clargs.cpp index ddeebe23..854a88ee 100644 --- a/deps/ox/src/ox/clargs/clargs.cpp +++ b/deps/ox/src/ox/clargs/clargs.cpp @@ -15,7 +15,7 @@ ClArgs::ClArgs(int argc, const char **args) noexcept: ClArgs({args, static_cast< ClArgs::ClArgs(ox::SpanView args) noexcept { for (auto i = 0u; i < args.size(); ++i) { - auto arg = StringView(args[i]); + auto arg = StringView{args[i]}; if (arg[0] == '-') { while (arg[0] == '-' && arg.len()) { arg = substr(arg, 1); @@ -23,8 +23,8 @@ ClArgs::ClArgs(ox::SpanView args) noexcept { m_bools[arg] = true; // parse additional arguments if (i < args.size() && args[i + 1]) { - auto val = String(args[i + 1]); - if (val.len() && val[i] != '-') { + auto const val = StringView{args[i + 1]}; + if (val.len() && val[0] != '-') { if (val == "false") { m_bools[arg] = false; } @@ -40,17 +40,17 @@ ClArgs::ClArgs(ox::SpanView args) noexcept { } bool ClArgs::getBool(ox::StringViewCR arg, bool defaultValue) const noexcept { - auto [value, err] = m_ints.at(arg); + auto const [value, err] = m_ints.at(arg); return !err ? *value : defaultValue; } String ClArgs::getString(ox::StringViewCR arg, ox::StringView defaultValue) const noexcept { - auto [value, err] = m_strings.at(arg); + auto const [value, err] = m_strings.at(arg); return !err ? ox::String(*value) : ox::String(defaultValue); } int ClArgs::getInt(ox::StringViewCR arg, int defaultValue) const noexcept { - auto [value, err] = m_ints.at(arg); + auto const [value, err] = m_ints.at(arg); return !err ? *value : defaultValue; }