Changeset 7260 in orxonox.OLD for trunk/src/lib/parser

Timestamp:

Mar 30, 2006, 5:44:37 PM (19 years ago)

Author:

rennerc

Message:

 

File:

• trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc (modified) (3 diffs)

trunk/src/lib/parser/cmdline_parser/cmdline_parser.cc

@@ -68 +68 @@
     if ( s.find( "=" ) == std::string::npos )
     {
-      args.push_back(s);
+      if ( s.length() > 2 && s[0] == '-' && s[1] != '-' )
+      {
+        for ( int j = 1; j < s.length(); j++ )
+        {
+          std::string t = "-";
+          t += s[j];
+          args.push_back( t );
+        }
+      }
+      else
+      {
+        args.push_back(s);
+      }
     }
     else
@@ -98 +110 @@
         found = true;
         
-        if ( it->numArgs + i >= args.size() )
+        int posArgs = 1;
+        
+        while ( i + posArgs < args.size() )
+        {
+          if ( args[ i + posArgs ].length() > 0 && args[ i + posArgs ][0] == '-' )
+            break;
+          else
+            posArgs++;
+        }
+        
+        posArgs--;
+        
+        if ( it->numArgs > posArgs )
         {
           PRINTF(1)( "%s needs %d arguments!\n", args[i].c_str(), it->numArgs );
@@ -176 +200 @@
     }
   }
+  else
+    return false;
 }