Added tests for negative numbers and fixed the interference between argument names and negative positional numeric values.

Author: michaelvlach

include/cppcommandline.h

@@ -337,7 +337,7 @@ class Option
     {
         KeyValue keyValue;
         std::cmatch m;
-        if(std::regex_match(argument.c_str(), m, std::regex("^(--|-)([a-zA-Z\\d]+)((=(.*))|)")))
+        if(std::regex_match(argument.c_str(), m, std::regex("^(--|-)([a-zA-Z][a-zA-Z\\d]*)((=(.*))|)")))
         {
             keyValue.key = m.size() > 2 ? std::string(m[2]) : "";
             keyValue.value = m.size() > 4 ? std::string(m[5]) : "";
@@ -354,12 +354,12 @@ class Option
 
     bool isLongNameArgument(std::string argument) const
     {
-        return std::regex_match(argument, std::regex("^--[a-zA-Z\\d]+$"));
+        return std::regex_match(argument, std::regex("^--[a-zA-Z][a-zA-Z\\d]+$"));
     }
 
     bool isShortNameArgument(std::string argument) const
     {
-        return std::regex_match(argument, std::regex("^-[a-zA-Z\\d]$"));
+        return std::regex_match(argument, std::regex("^-[a-zA-Z]$"));
     }
 
     bool isInteger(std::string argument) const

test/cppcommandlinetest.cpp

@@ -184,6 +184,16 @@ void CppCommandLineTest::match()
     QCOMPARE(10, value);
     }
 
+    {
+    SCENARIO("Option match negative `int` argument")
+    std::vector<std::string> arguments{"-10"};
+    int value = 0;
+    cppcommandline::Option option;
+    option.bindTo(value);
+    QCOMPARE(arguments.cend(), option.match(arguments.cbegin(), arguments.cend()));
+    QCOMPARE(-10, value);
+    }
+
     {
     SCENARIO("Option match `double` argument")
     std::vector<std::string> arguments{"5.5"};
@@ -194,6 +204,16 @@ void CppCommandLineTest::match()
     QCOMPARE(double(5.5), value);
     }
 
+    {
+    SCENARIO("Option match negative `double` argument")
+    std::vector<std::string> arguments{"-5.5"};
+    double value = 0;
+    cppcommandline::Option option;
+    option.bindTo(value);
+    QCOMPARE(arguments.cend(), option.match(arguments.cbegin(), arguments.cend()));
+    QCOMPARE(double(-5.5), value);
+    }
+
     {
     SCENARIO("Option match `long long` argument")
     std::vector<std::string> arguments{"999999999999"};
@@ -203,6 +223,16 @@ void CppCommandLineTest::match()
     QCOMPARE(arguments.cend(), option.match(arguments.cbegin(), arguments.cend()));
     QCOMPARE(qint64(999999999999), value);
     }
+
+    {
+    SCENARIO("Option match negative `long long` argument")
+    std::vector<std::string> arguments{"-999999999999"};
+    qint64 value = 0;
+    cppcommandline::Option option;
+    option.bindTo(value);
+    QCOMPARE(arguments.cend(), option.match(arguments.cbegin(), arguments.cend()));
+    QCOMPARE(qint64(-999999999999), value);
+    }
 }
 
 void CppCommandLineTest::ParserOption()