Fix for positional argument name (#71)

* Positional argument name fix * Add unit tests
andrey-zherikov · Aug 29, 2022 · 415c1b5 · 415c1b5
1 parent 18c1598
commit 415c1b5
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/source/argparse/help.d b/source/argparse/help.d
@@ -658,7 +658,7 @@ unittest
 
         @(NamedArgument.AllowedValues!([1,4,16,8])) int i;
 
-        @(PositionalArgument(0).Description("This is a help text for param0. Very very very very very very very very very very very very very very very very very very very long text")) string param0;
+        @(PositionalArgument(0, "param0").Description("This is a help text for param0. Very very very very very very very very very very very very very very very very very very very long text")) string _param0;
         @(PositionalArgument(1).AllowedValues!(["q","a"])) string param1;
 
         @TrailingArguments string[] args;

diff --git a/source/argparse/package.d b/source/argparse/package.d
@@ -416,9 +416,7 @@ auto PositionalArgument(uint pos)
 
 auto PositionalArgument(uint pos, string name)
 {
-    auto arg = ArgumentUDA!(ValueParseFunctions!(void, void, void, void, void, void))(ArgumentInfo([name])).Required();
-    arg.info.position = pos;
-    return arg;
+    return PositionalArgument(pos).Placeholder(name);
 }
 
 auto NamedArgument(string[] name...)
@@ -433,6 +431,40 @@ auto NamedArgument(string name)
 
 struct TrailingArguments {}
 
+
+unittest
+{
+    auto arg = PositionalArgument(3, "foo");
+    assert(arg.info.required);
+    assert(arg.info.positional);
+    assert(arg.info.position == 3);
+    assert(arg.info.placeholder == "foo");
+}
+
+unittest
+{
+    auto arg = NamedArgument("foo");
+    assert(!arg.info.required);
+    assert(!arg.info.positional);
+    assert(arg.info.names == ["foo"]);
+}
+
+unittest
+{
+    auto arg = NamedArgument(["foo","bar"]);
+    assert(!arg.info.required);
+    assert(!arg.info.positional);
+    assert(arg.info.names == ["foo","bar"]);
+}
+
+unittest
+{
+    auto arg = NamedArgument("foo","bar");
+    assert(!arg.info.required);
+    assert(!arg.info.positional);
+    assert(arg.info.names == ["foo","bar"]);
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 package struct Group