Modify indexOf to also support the index of a plain argument

Author: cesaref

choc/containers/choc_ArgumentList.h

@@ -229,7 +229,8 @@ inline int ArgumentList::indexOf (std::string_view arg) const
         if (auto singleIndex = indexOf ("-" + std::string (arg)); singleIndex != -1)
             return singleIndex;
 
-        return indexOf ("--" + std::string (arg));
+        if (auto doubleIndex = indexOf ("--" + std::string (arg)); doubleIndex != -1)
+            return doubleIndex;
     }
 
     bool isDoubleDash = isDoubleDashOption (arg);

tests/choc_tests.h

@@ -1403,6 +1403,7 @@ inline void testArgumentList (choc::test::TestProgress& progress)
         CHOC_EXPECT_TRUE (args.contains ("--param3"));
         CHOC_EXPECT_FALSE (args.contains ("--flag3"));
 
+        CHOC_EXPECT_EQ (args.indexOf ("other1"), 0);
         CHOC_EXPECT_EQ (args.indexOf ("--flag1"), 1);
         CHOC_EXPECT_EQ (args.indexOf ("--param1"), 3);
         CHOC_EXPECT_EQ (args.indexOf ("--flag2"), 4);
@@ -1458,6 +1459,7 @@ inline void testArgumentList (choc::test::TestProgress& progress)
         CHOC_EXPECT_TRUE (args.contains ("-param3"));
         CHOC_EXPECT_FALSE (args.contains ("-flag3"));
 
+        CHOC_EXPECT_EQ (args.indexOf ("other1"), 0);
         CHOC_EXPECT_EQ (args.indexOf ("-flag1"), 1);
         CHOC_EXPECT_EQ (args.indexOf ("-param1"), 3);
         CHOC_EXPECT_EQ (args.indexOf ("-flag2"), 5);
@@ -1514,6 +1516,7 @@ inline void testArgumentList (choc::test::TestProgress& progress)
         CHOC_EXPECT_TRUE (args.contains ("param3"));
         CHOC_EXPECT_FALSE (args.contains ("flag3"));
 
+        CHOC_EXPECT_EQ (args.indexOf ("other1"), 0);
         CHOC_EXPECT_EQ (args.indexOf ("flag1"), 1);
         CHOC_EXPECT_EQ (args.indexOf ("param1"), 3);
         CHOC_EXPECT_EQ (args.indexOf ("flag2"), 5);