feat: Add MiniCLI.setPositionalArgCount

Author: MarcellPerger1

src/main/java/net/marcellperger/mathexpr/IntRange.java

@@ -0,0 +1,33 @@
+package net.marcellperger.mathexpr;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+public class IntRange {
+    int lo, hi;
+
+    protected IntRange(int min, int max, int ignoredMarker) {
+        if(min > max) throw new IllegalArgumentException("min must be grater than max");
+        lo = min;
+        hi = max;
+    }
+    public IntRange(@Nullable Integer min, @Nullable Integer max) {
+        this(Objects.requireNonNullElse(min, Integer.MIN_VALUE),
+            Objects.requireNonNullElse(max, Integer.MAX_VALUE), /*marker*/0);
+    }
+    public IntRange() {
+        this(null, null);
+    }
+
+    public int getMin() {
+        return lo;
+    }
+    public int getMax() {
+        return hi;
+    }
+
+    public boolean includes(int v) {
+        return lo <= v && v <= hi;
+    }
+}

src/main/java/net/marcellperger/mathexpr/UIntRange.java

@@ -0,0 +1,36 @@
+package net.marcellperger.mathexpr;
+
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+
+public class UIntRange extends IntRange {
+    protected UIntRange(int min, int max, int ignoredMarker) {
+        super(workaround(() -> {
+            if(min < 0 || max < 0) throw new IllegalArgumentException();
+        }, min), max, ignoredMarker);
+    }
+
+    public UIntRange(@Nullable Integer min, @Nullable Integer max) {
+        this(Objects.requireNonNullElse(min, 0),
+            Objects.requireNonNullElse(max, Integer.MAX_VALUE), /*marker*/0);
+    }
+
+    public UIntRange() {
+        this(null, null);
+    }
+
+    /**
+     * Workaround to allow us to run code before super() call.
+     * This is required because java insists that super() be this first statement!
+     * So not even static stuff can be ran!
+     */
+    @Contract("_, _ -> param2")
+    private static <T> T workaround(@NotNull Runnable r, T returnValue) {
+        r.run();
+        return returnValue;
+    }
+
+}

src/main/java/net/marcellperger/mathexpr/cli/minicli/BooleanCLIOption.java

@@ -4,7 +4,7 @@
 
 import java.util.List;
 
-public class BooleanCLIOption extends CLIOption<Boolean> {
+class BooleanCLIOption extends CLIOption<Boolean> {
     public BooleanCLIOption(List<String> optionNames) {
         super(Boolean.class, optionNames);
     }

src/main/java/net/marcellperger/mathexpr/cli/minicli/MiniCLI.java

@@ -1,5 +1,7 @@
 package net.marcellperger.mathexpr.cli.minicli;
 
+import net.marcellperger.mathexpr.IntRange;
+import net.marcellperger.mathexpr.UIntRange;
 import net.marcellperger.mathexpr.util.Pair;
 import net.marcellperger.mathexpr.util.Util;
 import org.jetbrains.annotations.Contract;
@@ -10,16 +12,29 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 
 public class MiniCLI {
     Map<String, CLIOption<?>> options = new HashMap<>();
+    UIntRange nPositionalArgs = new UIntRange();
     List<String> positionalArgs = new ArrayList<>();
 
     public MiniCLI() {
 
     }
 
+    public void setPositionalArgCount(UIntRange range) {
+        nPositionalArgs = range;
+    }
+    public void setPositionalArgCount(@Nullable Integer min, @Nullable Integer max) {
+        setPositionalArgCount(new UIntRange(min, max));
+    }
+    public void setPositionalArgCount(@Nullable /*null=any*/ Integer value) {
+        if(value == null) setPositionalArgCount(new UIntRange());
+        else setPositionalArgCount(value, value);
+    }
+
     @Contract("_ -> new")
     public CLIOption<String> addStringOption(String @NotNull ... names) {
         return addOptionFromFactory(names, StringCLIOption::new);
@@ -89,7 +104,7 @@ public void pumpSingleArg(String arg) {
             switch (argT) {
                 case NORMAL -> {
                     if (prev != null) flushPrevWithValue(arg);
-                    else positionalArgs.add(arg);
+                    else addPositionalArg(arg);
                 }
                 case SINGLE -> {
                     if(prev != null) flushPrev();
@@ -132,6 +147,13 @@ private void flushPrevWithValue(String value) {
             prev.setValueFromString(value);
             prev = null;
         }
+
+        private void addPositionalArg(String arg) {
+            int newSize = positionalArgs.size() + 1;
+            int maxArgc = nPositionalArgs.getMax();
+            if(newSize > maxArgc)
+                throw new CLIParseException("Too many positional args (expected max %d, got %d)".formatted(maxArgc, newSize));
+        }
     }
     private enum ArgType {
         NORMAL, SINGLE, DOUBLE;

src/main/java/net/marcellperger/mathexpr/cli/minicli/StringCLIOption.java

@@ -4,7 +4,7 @@
 
 import java.util.List;
 
-public class StringCLIOption extends CLIOption<String> {
+class StringCLIOption extends CLIOption<String> {
     public StringCLIOption(List<String> keys) {
         super(String.class, keys);
     }