From 8ff2b3ff8313b260b07115b8a773e40b5c0194c6 Mon Sep 17 00:00:00 2001
From: Jimmi HC
Date: Fri, 1 Jun 2018 08:37:50 +0200
Subject: Id is now gotten through param of arg

---
 src/extended.zig | 4 ++--
 tests/core.zig   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/extended.zig b/src/extended.zig
index 9427b83..b94f6f5 100644
--- a/src/extended.zig
+++ b/src/extended.zig
@@ -167,7 +167,7 @@ pub const Command = struct {
             inline for(command.params) |param, i| {
                 comptime const field = "result." ++ param.field;
 
-                if (arg.id == i and (param.position ?? pos) == pos) {
+                if (arg.param.id == i and (param.position ?? pos) == pos) {
                     if (param.takes_value) |parser| {
                         try parser.parse(getFieldPtr(&result, field), ??arg.value);
                     } else {
@@ -183,7 +183,7 @@ pub const Command = struct {
                 comptime var sub_command = c;
                 sub_command.parent = command;
 
-                if (arg.id == i + command.params.len) {
+                if (arg.param.id == i + command.params.len) {
                     getFieldPtr(&result, field).* = try sub_command.parseHelper(&result, allocator, arg_iter);
                     continue :arg_loop;
                 }
diff --git a/tests/core.zig b/tests/core.zig
index a6a705e..d4304a1 100644
--- a/tests/core.zig
+++ b/tests/core.zig
@@ -18,7 +18,7 @@ fn testNoErr(params: []const Param(u8), args: []const []const u8, ids: []const u
 
     var i: usize = 0;
     while (iter.next() catch unreachable) |arg| : (i += 1) {
-        debug.assert(ids[i] == arg.id);
+        debug.assert(ids[i] == arg.param.id);
         const expected_value = values[i] ?? {
             debug.assert(arg.value == null);
             continue;
-- 
cgit v1.2.3