2 files changed, 20 insertions, 9 deletions

diff --git a/clap.zig b/clap.zig
index 8624c88..4548a48 100644
--- a/clap.zig
+++ b/clap.zig
@@ -303,7 +303,7 @@ test "Diagnostic.report" {
 pub fn Args(comptime Id: type, comptime params: []const Param(Id)) type {
     return struct {
         arena: std.heap.ArenaAllocator,
-        clap: ComptimeClap(Id, args.OsIterator, params),
+        clap: ComptimeClap(Id, params),
         exe_arg: ?[]const u8,
 
         pub fn deinit(a: *@This()) void {
@@ -329,8 +329,7 @@ pub fn Args(comptime Id: type, comptime params: []const Param(Id)) type {
     };
 }
 
-/// Parses the command line arguments passed into the program based on an
-/// array of `Param`s.
+/// Same as `parseEx` but uses the `args.OsIterator` by default.
 pub fn parse(
     comptime Id: type,
     comptime params: []const Param(Id),
@@ -338,8 +337,7 @@ pub fn parse(
     diag: ?*Diagnostic,
 ) !Args(Id, params) {
     var iter = try args.OsIterator.init(allocator);
-    const Clap = ComptimeClap(Id, args.OsIterator, params);
-    const clap = try Clap.parse(allocator, &iter, diag);
+    const clap = try parseEx(Id, params, allocator, &iter, diag);
     return Args(Id, params){
         .arena = iter.arena,
         .clap = clap,
@@ -347,6 +345,19 @@ pub fn parse(
     };
 }
 
+/// Parses the command line arguments passed into the program based on an
+/// array of `Param`s.
+pub fn parseEx(
+    comptime Id: type,
+    comptime params: []const Param(Id),
+    allocator: *mem.Allocator,
+    iter: anytype,
+    diag: ?*Diagnostic,
+) !ComptimeClap(Id, params) {
+    const Clap = ComptimeClap(Id, params);
+    return try Clap.parse(allocator, iter, diag);
+}
+
 /// Will print a help message in the following format:
 ///     -s, --long <valueText> helpText
 ///     -s,                    helpText
diff --git a/clap/comptime.zig b/clap/comptime.zig
index 80eb428..8ab61cb 100644
--- a/clap/comptime.zig
+++ b/clap/comptime.zig
@@ -6,9 +6,9 @@ const heap = std.heap;
 const mem = std.mem;
 const debug = std.debug;
 
+/// Deprecated: Use `parseEx` instead
 pub fn ComptimeClap(
     comptime Id: type,
-    comptime ArgIter: type,
     comptime params: []const clap.Param(Id),
 ) type {
     var flags: usize = 0;
@@ -42,7 +42,7 @@ pub fn ComptimeClap(
         pos: []const []const u8,
         allocator: *mem.Allocator,
 
-        pub fn parse(allocator: *mem.Allocator, iter: *ArgIter, diag: ?*clap.Diagnostic) !@This() {
+        pub fn parse(allocator: *mem.Allocator, iter: anytype, diag: ?*clap.Diagnostic) !@This() {
             var multis = [_]std.ArrayList([]const u8){undefined} ** multi_options;
             for (multis) |*multi| {
                 multi.* = std.ArrayList([]const u8).init(allocator);
@@ -58,7 +58,7 @@ pub fn ComptimeClap(
                 .allocator = allocator,
             };
 
-            var stream = clap.StreamingClap(usize, ArgIter){
+            var stream = clap.StreamingClap(usize, @typeInfo(@TypeOf(iter)).Pointer.child){
                 .params = converted_params,
                 .iter = iter,
             };
@@ -147,7 +147,7 @@ pub fn ComptimeClap(
 }
 
 test "" {
-    const Clap = ComptimeClap(clap.Help, clap.args.SliceIterator, comptime &[_]clap.Param(clap.Help){
+    const Clap = ComptimeClap(clap.Help, comptime &[_]clap.Param(clap.Help){
         clap.parseParam("-a, --aa    ") catch unreachable,
         clap.parseParam("-b, --bb    ") catch unreachable,
         clap.parseParam("-c, --cc <V>") catch unreachable,