From c06c93608cb3befe77c78ba25c70b14db6f7b319 Mon Sep 17 00:00:00 2001
From: Jimmi Holst Christensen
Date: Fri, 25 Feb 2022 19:44:52 +0100
Subject: Revert "Change clap into generating a struct"

This reverts commit cfaac64c404fb1c2e892880410aa3b7dd881ea58.
---
 example/simple.zig | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'example/simple.zig')

diff --git a/example/simple.zig b/example/simple.zig
index c37e896..ff6d301 100644
--- a/example/simple.zig
+++ b/example/simple.zig
@@ -8,29 +8,29 @@ pub fn main() !void {
     // First we specify what parameters our program can take.
     // We can use `parseParam` to parse a string to a `Param(Help)`
     const params = comptime [_]clap.Param(clap.Help){
-        clap.untyped.parseParam("-h, --help             Display this help and exit.") catch unreachable,
-        clap.untyped.parseParam("-n, --number <NUM>     An option parameter, which takes a value.") catch unreachable,
-        clap.untyped.parseParam("-s, --string <STR>...  An option parameter which can be specified multiple times.") catch unreachable,
-        clap.untyped.parseParam("<POS>...") catch unreachable,
+        clap.parseParam("-h, --help             Display this help and exit.              ") catch unreachable,
+        clap.parseParam("-n, --number <NUM>     An option parameter, which takes a value.") catch unreachable,
+        clap.parseParam("-s, --string <STR>...  An option parameter which can be specified multiple times.") catch unreachable,
+        clap.parseParam("<POS>...") catch unreachable,
     };
 
     // Initalize our diagnostics, which can be used for reporting useful errors.
     // This is optional. You can also pass `.{}` to `clap.parse` if you don't
     // care about the extra information `Diagnostics` provides.
     var diag = clap.Diagnostic{};
-    var res = clap.untyped.parse(clap.Help, &params, .{ .diagnostic = &diag }) catch |err| {
+    var args = clap.parse(clap.Help, &params, .{ .diagnostic = &diag }) catch |err| {
         // Report useful error and exit
         diag.report(io.getStdErr().writer(), err) catch {};
         return err;
     };
-    defer res.deinit();
+    defer args.deinit();
 
-    if (res.args.help)
+    if (args.flag("--help"))
         debug.print("--help\n", .{});
-    if (res.args.number) |n|
+    if (args.option("--number")) |n|
         debug.print("--number = {s}\n", .{n});
-    for (res.args.string) |s|
+    for (args.options("--string")) |s|
         debug.print("--string = {s}\n", .{s});
-    for (res.positionals) |pos|
+    for (args.positionals()) |pos|
         debug.print("{s}\n", .{pos});
 }
-- 
cgit v1.2.3