Fixed testStopAtExpectedArg for PosixParser

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

Author: ebourg

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

@@ -37,6 +37,9 @@ public class PosixParser extends Parser
     /** specifies if bursting should continue */
     private boolean eatTheRest;
 
+    /** holder for the current option */
+    private Option currentOption;
+
     /** the command line Options */
     private Options options;
 
@@ -109,12 +112,14 @@ protected String[] flatten(Options options, String[] arguments, boolean stopAtNo
                 int pos = token.indexOf('=');
                 String opt = pos == -1 ? token : token.substring(0, pos); // --foo
 
-                if (!options.hasOption(opt) && stopAtNonOption)
+                if (!options.hasOption(opt))
                 {
-                    processNonOptionToken(token);
+                    processNonOptionToken(token, stopAtNonOption);
                 }
                 else
                 {
+                    currentOption = options.getOption(opt);
+                    
                     tokens.add(opt);
                     if (pos != -1)
                     {
@@ -130,27 +135,19 @@ else if ("-".equals(token))
             }
             else if (token.startsWith("-"))
             {
-                if (token.length() == 2)
+                if (token.length() == 2 || options.hasOption(token))
                 {
                     processOptionToken(token, stopAtNonOption);
                 }
-                else if (options.hasOption(token))
-                {
-                    tokens.add(token);
-                }
                 // requires bursting
                 else
                 {
                     burstToken(token, stopAtNonOption);
                 }
             }
-            else if (stopAtNonOption)
-            {
-                processNonOptionToken(token);
-            }
             else
             {
-                tokens.add(token);
+                processNonOptionToken(token, stopAtNonOption);
             }
 
             gobble(iter);
@@ -182,10 +179,14 @@ private void gobble(Iterator iter)
      *
      * @param value The current token
      */
-    private void processNonOptionToken(String value)
+    private void processNonOptionToken(String value, boolean stopAtNonOption)
     {
-        eatTheRest = true;
-        tokens.add("--");
+        if (stopAtNonOption && (currentOption == null || !currentOption.hasArg()))
+        {
+            eatTheRest = true;
+            tokens.add("--");
+        }
+
         tokens.add(value);
     }
 
@@ -203,11 +204,16 @@ private void processNonOptionToken(String value)
      */
     private void processOptionToken(String token, boolean stopAtNonOption)
     {
-        if (!options.hasOption(token) && stopAtNonOption)
+        if (stopAtNonOption && !options.hasOption(token))
         {
             eatTheRest = true;
         }
 
+        if (options.hasOption(token))
+        {
+            currentOption = options.getOption(token);
+        }
+
         tokens.add(token);
     }
 
@@ -239,8 +245,6 @@ private void processOptionToken(String token, boolean stopAtNonOption)
      */
     protected void burstToken(String token, boolean stopAtNonOption)
     {
-        Option currentOption;
-
         for (int i = 1; i < token.length(); i++)
         {
             String ch = String.valueOf(token.charAt(i));
@@ -259,7 +263,7 @@ protected void burstToken(String token, boolean stopAtNonOption)
             }
             else if (stopAtNonOption)
             {
-                processNonOptionToken(token.substring(i));
+                processNonOptionToken(token.substring(i), true);
                 break;
             }
             else