Updated to use pass-by-value where possible

3 files changed, 25 insertions, 24 deletions

diff --git a/src/core.zig b/src/core.zig
index a0f794c..bdd1bf4 100644
--- a/src/core.zig
+++ b/src/core.zig
@@ -99,7 +99,7 @@ pub fn Param(comptime Id: type) type {
         takes_value: bool,
         names: Names,
 
-        pub fn init(id: Id, takes_value: bool, names: *const Names) Self {
+        pub fn init(id: Id, takes_value: bool, names: Names) Self {
             // Assert, that if the param have no name, then it has to take
             // a value.
             debug.assert(names.bare != null or
@@ -110,7 +110,7 @@ pub fn Param(comptime Id: type) type {
             return Self{
                 .id = id,
                 .takes_value = takes_value,
-                .names = names.*,
+                .names = names,
             };
         }
     };
@@ -331,7 +331,7 @@ pub fn Clap(comptime Id: type, comptime ArgError: type) type {
             }
         }
 
-        fn chainging(clap: *Self, state: *const State.Chaining) !?Arg(Id) {
+        fn chainging(clap: *Self, state: State.Chaining) !?Arg(Id) {
             const arg = state.arg;
             const index = state.index;
             const next_index = index + 1;
diff --git a/src/extended.zig b/src/extended.zig
index 09e91dd..f7fc87d 100644
--- a/src/extended.zig
+++ b/src/extended.zig
@@ -13,13 +13,12 @@ const assert = debug.assert;
 pub const Param = struct {
     field: []const u8,
     names: core.Names,
-    settings: Settings,
     kind: Kind,
 
     required: bool,
     position: ?usize,
 
-    pub fn flag(field: []const u8, names: *const core.Names) Param {
+    pub fn flag(field: []const u8, names: core.Names) Param {
         return init(
             field,
             names,
@@ -29,33 +28,33 @@ pub const Param = struct {
 
     pub fn option(
         field: []const u8,
-        names: *const core.Names,
-        comptime parser: *const Parser,
+        names: core.Names,
+        comptime parser: Parser,
     ) Param {
         return init(
             field,
             names,
-            Kind{ .Option = parser.* },
+            Kind{ .Option = parser },
         );
     }
 
     pub fn subcommand(
         field: []const u8,
-        names: *const core.Names,
-        comptime command: *const Command,
+        names: core.Names,
+        comptime command: Command,
     ) Param {
         return init(
             field,
             names,
-            Kind{ .Subcommand = command.* },
+            Kind{ .Subcommand = command },
         );
     }
 
-    pub fn init(field: []const u8, names: *const core.Names, kind: *const Kind) Param {
+    pub fn init(field: []const u8, names: core.Names, kind: Kind) Param {
         return Param{
             .field = field,
-            .names = names.*,
-            .kind = kind.*,
+            .names = names,
+            .kind = kind,
             .required = false,
             .position = null,
         };
@@ -130,6 +129,7 @@ pub fn Clap(comptime Result: type) type {
         default: Result,
         params: []const Param,
 
+        // TODO: pass-by-value
         pub fn parse(
             comptime clap: *const Self,
             comptime Error: type,
@@ -142,6 +142,7 @@ pub fn Clap(comptime Result: type) type {
             return try parseHelper(&top_level_command, Error, &c);
         }
 
+        // TODO: pass-by-value
         fn parseHelper(
             comptime command: *const Command,
             comptime Error: type,
@@ -152,7 +153,7 @@ pub fn Clap(comptime Result: type) type {
             var handled = comptime blk: {
                 var res: [command.params.len]bool = undefined;
                 for (command.params) |p, i| {
-                    res[i] = !p.settings.required;
+                    res[i] = !p.required;
                 }
 
                 break :blk res;
@@ -180,7 +181,7 @@ pub fn Clap(comptime Result: type) type {
 
             arg_loop: while (try clap.next()) |arg| : (pos += 1) {
                 inline for (command.params) |param, i| {
-                    if (arg.param.id == i and (param.settings.position orelse pos) == pos) {
+                    if (arg.param.id == i and (param.position orelse pos) == pos) {
                         handled[i] = true;
 
                         switch (param.kind) {
diff --git a/tests/extended.zig b/tests/extended.zig
index 3dbb87d..9670814 100644
--- a/tests/extended.zig
+++ b/tests/extended.zig
@@ -26,10 +26,10 @@ pub fn Test(comptime Expect: type) type {
             Fail: error,
         };
 
-        pub fn success(args: []const []const u8, expected: *const Expect) Self {
+        pub fn success(args: []const []const u8, expected: Expect) Self {
             return Self{
                 .args = args,
-                .kind = Kind{ .Success = expected.* },
+                .kind = Kind{ .Success = expected },
             };
         }
 
@@ -40,7 +40,7 @@ pub fn Test(comptime Expect: type) type {
             };
         }
 
-        pub fn run(t: *const Self, comptime parser: var) void {
+        pub fn run(t: Self, comptime parser: var) void {
             var iter = ArgSliceIterator.init(t.args);
             const actual = parser.parse(ArgSliceIterator.Error, &iter.iter);
 
@@ -81,7 +81,7 @@ test "clap.extended: short" {
                 res.position = 0;
                 break :p res;
             },
-            Param.option("b", Names.short('b'), &Parser.int(u8, 10)),
+            Param.option("b", Names.short('b'), Parser.int(u8, 10)),
         },
     };
 
@@ -172,12 +172,12 @@ test "clap.extended: long" {
         },
         .params = []Param{
             p: {
-                var res = Param.long("a", Names.short('a'));
+                var res = Param.flag("a", Names.long("a"));
                 res.required = true;
                 res.position = 0;
                 break :p res;
             },
-            Param.option("b", Names.long('b'), &Parser.int(u8, 10)),
+            Param.option("b", Names.long("b"), Parser.int(u8, 10)),
         },
     };
 
@@ -244,12 +244,12 @@ test "clap.extended: bare" {
         },
         .params = []Param{
             p: {
-                var res = Param.bare("a", Names.short('a'));
+                var res = Param.flag("a", Names.bare("a"));
                 res.required = true;
                 res.position = 0;
                 break :p res;
             },
-            Param.option("b", Names.bare('b'), &Parser.int(u8, 10)),
+            Param.option("b", Names.bare("b"), Parser.int(u8, 10)),
         },
     };