Detect invalid short options in aggregations

Author: lefou

de.tototec.cmdoption/src/main/java/de/tototec/cmdoption/CmdlineParser.java

@@ -401,7 +401,7 @@ public String apply() {
 					debugMode = true;
 					debug("Enabled debug mode\n" + debugState(""));
 				}
-
+				continue;
 			} else if (parseOptions && quickOptionMap.containsKey(param)) {
 				// Found an option
 				final OptionHandle optionHandle = quickOptionMap.get(param);
@@ -450,6 +450,7 @@ public String apply() {
 						throw new CmdlineParserException(msg.notr(), e, msg.tr());
 					}
 				}
+				continue;
 			} else if (parseOptions && quickCommandMap.containsKey(param)) {
 				// Found a command
 				final CommandHandle commandHandle = quickCommandMap.get(param);
@@ -461,19 +462,29 @@ public String apply() {
 						Arrays.copyOfRange(rest, index + 1, rest.length));
 				// Stop parsing
 				break;
-			} else if (parseOptions
+			}
+
+			if (parseOptions
 					&& aggregateShortOptionsWithPrefix.isDefined()
 					&& param.startsWith(aggregatePrefix)
 					&& param.length() > aggregatePrefixSize + 1) {
+
 				// Found an aggregated short option
+
+				// if true, the match is not a valid option aggrgation and
+				// should later be handled as normal parameter
+				boolean failed = false;
+
 				final char[] singleOptions = param.substring(aggregatePrefixSize).toCharArray();
 				// rewrite the cmdline
 				final List<String> rewritten = new LinkedList<String>();
 				int procCount = 1;
 				for (final char c : singleOptions) {
 					final OptionHandle oh = shortOptionMap.get(String.valueOf(c));
 					if (oh == null) {
-						// FIXME: unsupported aggregation found
+						// unsupported aggregation found
+						failed = true;
+						break;
 					}
 					if (rest.length < procCount + oh.getArgsCount()) {
 						// FIXME: missing args detected
@@ -495,15 +506,18 @@ public String apply() {
 						++procCount;
 					}
 				}
-				// re-interate parsing with the modified command line
-				// (backtracking)
-				final String[] newRest = Arrays.copyOfRange(rest, procCount, rest.length);
-				rewritten.addAll(Arrays.asList(newRest));
-				rest = rewritten.toArray(new String[0]);
-				index = -1;
-				continue;
+				if (!failed) {
+					// re-interate parsing with the modified command line
+					// (backtracking)
+					final String[] newRest = Arrays.copyOfRange(rest, procCount, rest.length);
+					rewritten.addAll(Arrays.asList(newRest));
+					rest = rewritten.toArray(new String[0]);
+					index = -1;
+					continue;
+				}
+			}
 
-			} else if (parameter == null && defaultCommandName != null
+			if (parameter == null && defaultCommandName != null
 					&& quickCommandMap.containsKey(defaultCommandName)) {
 				// Assume a default command inserted here
 				debug("Unsupported option '" + param + "' found, assuming default command: " + defaultCommandName);

de.tototec.cmdoption/src/test/java/de/tototec/cmdoption/AggregateShortOptionsTest.java

@@ -19,6 +19,11 @@ public static class Config {
 		boolean showSize = false;
 	}
 
+	public static class Param {
+		@CmdOption(args = { "PARAMETER" })
+		String param;
+	}
+
 	public AggregateShortOptionsTest() {
 
 		test("Setting all short options separate should work (reference test)", () -> {
@@ -74,11 +79,34 @@ public AggregateShortOptionsTest() {
 			final Config config = new Config();
 			final CmdlineParser cp = new CmdlineParser(config);
 			cp.setAggregateShortOptionsWithPrefix("-");
-			intercept(CmdlineParserException.class, "\\QMissing argument(s): FILE. Option \"-f\" requires 1 arguments, but you gave 0.\\E", () -> {
-				cp.parse(new String[] { "-lfs" });
+			intercept(CmdlineParserException.class,
+					"\\QMissing argument(s): FILE. Option \"-f\" requires 1 arguments, but you gave 0.\\E", () -> {
+						cp.parse(new String[] { "-lfs" });
+					});
+		});
+
+		test("Comnbining unknown short options should fail", () -> {
+			final Config config = new Config();
+			final CmdlineParser cp = new CmdlineParser(config);
+			cp.setAggregateShortOptionsWithPrefix("-");
+			intercept(CmdlineParserException.class, "\\QUnsupported option or parameter found: -lsa\\E", () -> {
+				// "-a" is an unknown option
+				cp.parse(new String[] { "-lsa" });
 			});
 		});
 
+		test("Comnbining unknown short options should result in combined options parsed as main parameter", () -> {
+			final Config config = new Config();
+			final Param param = new Param();
+			final CmdlineParser cp = new CmdlineParser(config, param);
+			cp.setAggregateShortOptionsWithPrefix("-");
+			// "-a" is an unknown option
+			cp.parse(new String[] { "-lsa" });
+			expectFalse(config.formatLong);
+			expectFalse(config.showSize);
+			expectEquals(config.file, null);
+			expectEquals(param.param, "-lsa");
+		});
 
 	}