Don't force bool value string to "0" or "1" until after all transform actions have run.

Author: gknowles

docs/guide.adoc

@@ -1202,15 +1202,14 @@ Action to take immediately before each source value is parsed. Any
 number of transform actions can be added.
 
 The function should:
-* Inspect, and/or change the source value via cli.newValue().
+* Inspect, then optionally change the source value via cli.newValue().
 * Call cli.badUsage() with an error message if there's a problem.
 * Call cli.parseExit() if the program should stop without an error. This could
   be due to an early out like "--version" and "--help".
 
 The argument is set, so you can use opt.from() and opt.pos() to get the
 option name that the value was matched with on the command line and its
-position in argv[]. For bool arguments the val string will always be
-either "0" or "1".
+position in argv[].
 
 allow
 deny

libs/dimcli/cli.cpp

@@ -167,6 +167,7 @@ struct RawValue {
     enum Type { kOperand, kOption, kCommand } type;
     Cli::OptBase * opt;
     string name;
+    unsigned nameFlags;
     size_t pos;
     const char * ptr;
     Cli::ArgSrc src;
@@ -776,17 +777,7 @@ void Cli::newValue(const string & value) {
         assert(!"Bad context, not called from transform action callback.");
         return;
     }
-    auto & opt = *m_cfg->curOpt;
-    if (!opt.m_bool) {
-        m_cfg->newValue = value;
-    } else {
-        bool v;
-        if (parseBool(v, value)) {
-            m_cfg->newValue = v ? "1" : "0";
-        } else {
-             badUsage(opt);
-        }
-    }
+    m_cfg->newValue = value;
 }
 
 //===========================================================================
@@ -2147,6 +2138,7 @@ static bool matchOperands(
         }
         auto & oprName = ndx.m_oprNames[ipos];
         val->opt = oprName.opt;
+        val->nameFlags = oprName.flags;
         val->name = oprName.name;
         imatch += 1;
     }
@@ -2222,8 +2214,9 @@ bool Cli::OptIndex::parseOperandValue(
     st.numOprs += 1;
     out->push_back({
         RawValue::kOperand,
-        nullptr,
-        string{},
+        nullptr,    // opt
+        string{},   // opt name
+        0,          // opt name flags
         st.argPos,
         st.ptr,
         *args[st.argPos].src
@@ -2246,6 +2239,7 @@ static void addOptionMatch(
         RawValue::kOption,
         st.optName.opt,
         st.name,
+        st.optName.flags,
         st.argPos,
         ptr,
         ptr ? *args[st.argPos].src : src
@@ -2361,12 +2355,7 @@ bool Cli::OptIndex::parseToRawValues(
 
                 // Found bool short name, record and continue processing any
                 // additional short names in this same argument.
-                addOptionMatch(
-                    out,
-                    st,
-                    (st.optName.flags & fNameInvert) ? "0" : "1",
-                    args
-                );
+                addOptionMatch(out, st, "1", args);
             }
             if (!*st.ptr) {
             NEXT_ARG:
@@ -2411,22 +2400,13 @@ bool Cli::OptIndex::parseToRawValues(
             }
 
             // Found bool long name.
-            auto val = true;
-            if (st.ptr
-                && (st.optName.opt->m_flagValue || !parseBool(val, st.ptr))
-            ) {
-                // Only regular bool opts support values, and those values
-                // must be valid: true, false, 1, 0, y, n, etc.
+            if (st.ptr && st.optName.opt->m_flagValue) {
+                // Only regular bool opts support values.
                 cli.badUsage("Invalid '" + st.name + "' value", st.ptr);
                 return false;
             }
             // Record and advance to the next argument.
-            addOptionMatch(
-                out,
-                st,
-                val == bool(st.optName.flags & fNameInvert) ? "0" : "1",
-                args
-            );
+            addOptionMatch(out, st, st.ptr ? st.ptr : "1", args);
             continue;
         }
 
@@ -2577,6 +2557,7 @@ static bool parse(Cli & cli, vector<string> & rawArgs) {
         if (!cli.parseValue(
             *val.opt,
             val.name,
+            val.nameFlags,
             val.pos,
             val.src.type,
             val.src.name,
@@ -2755,7 +2736,7 @@ bool Cli::parseValue(
     size_t pos,
     const char ptr[]
 ) {
-    return parseValue(opt, name, pos, ArgSrc::kArgv, {}, ptr);
+    return parseValue(opt, name, 0, pos, ArgSrc::kArgv, {}, ptr);
 }
 
 //===========================================================================
@@ -2765,13 +2746,14 @@ bool Cli::parseValue(
     const std::string & srcName,    // use {} if unsure
     const char ptr[]
 ) {
-    return parseValue(opt, opt.defaultFrom(), 0, srcType, srcName, ptr);
+    return parseValue(opt, opt.defaultFrom(), 0, 0, srcType, srcName, ptr);
 }
 
 //===========================================================================
 bool Cli::parseValue(
     OptBase & opt,
     const string & name,
+    unsigned nameFlags,
     size_t pos,
     ArgSrc::Type srcType,
     const string & srcName,
@@ -2795,8 +2777,19 @@ bool Cli::parseValue(
         m_cfg->curOpt = &opt;
         opt.doTransforms(*this);
         m_cfg->curOpt = {};
-        if (!parseAborted())
+        if (!parseAborted()) {
+            if (opt.m_bool) {
+                bool val = false;
+                if (!parseBool(val, newValue())) {
+                    badUsage(opt);
+                    return false;
+                }
+                if (nameFlags & fNameInvert)
+                    val = !val;
+                m_cfg->newValue = val ? "1" : "0";
+            }
             opt.doParse(*this);
+        }
         if (!parseAborted())
             opt.doChecks(*this);
     } else {

libs/dimcli/cli.h

@@ -692,6 +692,7 @@ class DIMCLI_LIB_DECL Cli {
     [[nodiscard]] bool parseValue(
         OptBase & out,
         const std::string & name,       // use opt.defaultFrom() if unsure
+        unsigned nameFlags,             // use 0 if unsure
         size_t pos,                     // use 0 if unsure
         ArgSrc::Type srcType,           // use kArgv if unsure (not kNone!)
         const std::string & srcName,    // use {} if unsure
@@ -2005,8 +2006,7 @@ class Cli::OptShim : public OptBase {
     //
     // The argument is set, so you can use opt.from() and opt.pos() to get the
     // option name that the value was matched with on the command line and its
-    // position in argv[]. For bool arguments the val string will always be
-    // either "0" or "1".
+    // position in argv[].
     A & transform(std::function<ActionFn> fn, int priority = 1);
 
     // Action to update the option value from a string taken from the
@@ -2022,7 +2022,7 @@ class Cli::OptShim : public OptBase {
     // All opt.from(), opt.pos(), opt.srcType(), opt.srcName() are available.
     // For bool arguments the val string will always be either "0" or "1".
     //
-    // You could use this action to combined values into the final result, such
+    // You can use this action to combined values into the final result, such
     // as via addition or appending to a string, instead of replacing it by
     // assignment.
     //