Fixed the handling of unrecognized options starting with '-' by PosixParser (CLI-164)

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x@680287 13f79535-47bb-0310-9956-ffa450edef68

Author: ebourg

src/java/org/apache/commons/cli/PosixParser.java

@@ -125,13 +125,11 @@ protected String[] flatten(Options options, String[] arguments, boolean stopAtNo
             // single hyphen
             else if ("-".equals(token))
             {
-                processSingleHyphen(token);
+                tokens.add(token);
             }
             else if (token.startsWith("-"))
             {
-                int tokenLength = token.length();
-
-                if (tokenLength == 2)
+                if (token.length() == 2)
                 {
                     processOptionToken(token, stopAtNonOption);
                 }
@@ -145,16 +143,13 @@ else if (options.hasOption(token))
                     burstToken(token, stopAtNonOption);
                 }
             }
+            else if (stopAtNonOption)
+            {
+                process(token);
+            }
             else
             {
-                if (stopAtNonOption)
-                {
-                    process(token);
-                }
-                else
-                {
-                    tokens.add(token);
-                }
+                tokens.add(token);
             }
 
             gobble(iter);
@@ -216,17 +211,6 @@ else if (currentOption.hasArgs())
         }
     }
 
-    /**
-     * If it is a hyphen then add the hyphen directly to
-     * the processed tokens list.
-     *
-     * @param hyphen The hyphen token
-     */
-    private void processSingleHyphen(String hyphen)
-    {
-        tokens.add(hyphen);
-    }
-
     /**
      * <p>If an {@link Option} exists for <code>token</code> then
      * set the current option and add the token to the processed 
@@ -242,14 +226,15 @@ private void processSingleHyphen(String hyphen)
      */
     private void processOptionToken(String token, boolean stopAtNonOption)
     {
-        if (this.options.hasOption(token))
+        if (options.hasOption(token))
         {
-            currentOption = this.options.getOption(token);
+            currentOption = options.getOption(token);
             tokens.add(token);
         }
         else if (stopAtNonOption)
         {
             eatTheRest = true;
+            tokens.add(token);
         }
     }
 

src/test/org/apache/commons/cli/PosixParserTest.java

@@ -130,6 +130,17 @@ public void testStop() throws Exception
         assertTrue( "Confirm  2 extra args: " + cl.getArgList().size(), cl.getArgList().size() == 2);
     }
 
+    public void testStop2() throws Exception
+    {
+        String[] args = new String[]{"-z",
+                                     "-a",
+                                     "-btoast"};
+
+        CommandLine cl = parser.parse(options, args, true);
+        assertFalse("Confirm -a is not set", cl.hasOption("a"));
+        assertTrue("Confirm  3 extra args: " + cl.getArgList().size(), cl.getArgList().size() == 3);
+    }
+
     public void testStopBursting() throws Exception
     {
         String[] args = new String[] { "-azc" };