#249 fix --eval command line switch

Author: LADSoft

src/omake/MakeMain.cpp

@@ -47,8 +47,7 @@ CmdSwitchBool MakeMain::touch(switchParser, 't');
 CmdSwitchBool MakeMain::query(switchParser, 'q');
 CmdSwitchBool MakeMain::keepGoing(switchParser, 'k');
 CmdSwitchBool MakeMain::ignoreErrors(switchParser, 'i');
-CmdSwitchDefine MakeMain::defines(switchParser, 'D');
-CmdSwitchDefine MakeMain::evals(switchParser, '-');
+CmdSwitchDefine MakeMain::defines(switchParser, 'D', "eval");
 CmdSwitchBool MakeMain::rebuild(switchParser, 'B');
 CmdSwitchCombineString MakeMain::newFiles(switchParser, 'W', ' ');
 CmdSwitchCombineString MakeMain::oldFiles(switchParser, 'o', ' ');
@@ -304,17 +303,7 @@ void MakeMain::LoadCmdDefines()
     for (int i = 0; i < defines.GetCount(); i++)
     {
         const CmdSwitchDefine::define* def = defines.GetValue(i);
-        SetVariable(def->name, def->value, Variable::o_command_line, false);
-    }
-    for (int i = 0; i < evals.GetCount(); i++)
-    {
-        const CmdSwitchDefine::define* def = evals.GetValue(i);
-        if (std::string(def->name) != "eval")
-        {
-            Eval::error(std::string("Invalid switch --") + def->name);
-            exit(1);
-        }
-        Parser p(def->value, "<eval>", 1, false, Variable::o_default);
+        Parser p(def->name + "=" + def->value, "<eval>", 1, false, Variable::o_default);
         p.SetAutoExport();
         p.Parse();
     }

src/util/CmdSwitch.cpp

@@ -137,8 +137,13 @@ CmdSwitchDefine::~CmdSwitchDefine()
 }
 int CmdSwitchDefine::Parse(const char* data)
 {
+    if (!data[0])
+        return INT_MAX;
+    int str=0;
     int rv = strlen(data);
     char name[10000], *p = name;
+    if (data[0] == '"')
+        str = *data++;
     if (!isalpha(*data) && *data != '_')
         return -1;
     while (*data && (isalnum(*data) || *data == '_'))
@@ -154,11 +159,13 @@ int CmdSwitchDefine::Parse(const char* data)
     {
         data++;
         p = name;
-        while (*data)
+        while (*data && *data != str)
         {
             *p++ = *data++;
         }
         *p = 0;
+        if (*data)
+            data++;
         newDefine->value = name;
     }
     else
@@ -276,6 +283,9 @@ CmdSwitchBase* CmdSwitchParser::Find(const char *name, bool useLongName)
     {
         std::string bigmatch = "";
         int max = strlen(name);
+        const char *s = strchr(name,'=');
+        if (s && s - name < max)
+            max = s - name;
         for (int i = max; i >= 1; i--)
         {
             for (auto s : switches)
@@ -333,7 +343,11 @@ bool CmdSwitchParser::Parse(int* argc, char* argv[])
                 if (longName)
                 {
                     b = Find(data, true);
-                    data += strlen(data);
+                    const char *p = strchr(data, '=');
+                    if (p)
+                        data = p+1;
+                    else
+                        data += strlen(data);
                 }
                 else
                 {