Fix a bug in parsing occa cli options

libocca · Nov 1, 2024 · 2f93eb2 · 2f93eb2
1 parent 9ab654f
commit 2f93eb2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/occa/internal/utils/cli.cpp b/src/occa/internal/utils/cli.cpp
@@ -405,6 +405,7 @@ namespace occa {
     }
 
     occa::json parser::parseArgs(const strVector &args_,
+                                 const std::vector<command> &commands,
                                  const bool supressErrors) {
       strVector args = splitShortOptionArgs(args_);
       const int argc = (int) args.size();
@@ -445,7 +446,12 @@ namespace occa {
 
         // No option
         if (!opt) {
-          checkOptions = (arg == "==");
+          for (auto cmd : commands) {
+            if (arg == cmd.name) {
+              checkOptions = 0;
+              break;
+            }
+          }
           jArguments += arg;
           continue;
         }
@@ -779,7 +785,7 @@ namespace occa {
 
       const bool hasCommands = commands.size();
 
-      json parsedArgs = parseArgs(shellArgs, supressErrors);
+      json parsedArgs = parseArgs(shellArgs, commands, supressErrors);
       lastCommandArgs = parsedArgs;
 
       json &jArguments = parsedArgs["arguments"];

diff --git a/src/occa/internal/utils/cli.hpp b/src/occa/internal/utils/cli.hpp
@@ -120,6 +120,8 @@ namespace occa {
     };
     //==================================
 
+    class command;
+
     //---[ Parser ]---------------------
     class parser : public printable {
     public:
@@ -157,6 +159,7 @@ namespace occa {
 
       occa::json parseArgs(const int argc, const char **argv);
       occa::json parseArgs(const strVector &args_,
+                           const std::vector<command> &commands = {},
                            const bool supressErrors = false);
 
       bool hasCustomHelpOption();