From c20bbf13df33d82d27b1d70628d90fe0b489d07e Mon Sep 17 00:00:00 2001
From: Jimmi Holst Christensen
Date: Mon, 3 Oct 2022 12:45:55 +0200
Subject: Add function for getting the prefix of a param name

---
 clap.zig | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/clap.zig b/clap.zig
index 05fa723..9c3b6d1 100644
--- a/clap.zig
+++ b/clap.zig
@@ -40,9 +40,23 @@ pub const Names = struct {
     }
 
     pub const Longest = struct {
-        kind: enum { long, short, positinal },
+        kind: Kind,
         name: []const u8,
     };
+
+    pub const Kind = enum {
+        long,
+        short,
+        positinal,
+
+        pub fn prefix(l: Longest) []const u8 {
+            return switch (l.kind) {
+                .long => "--",
+                .short => "-",
+                .positional => "",
+            };
+        }
+    };
 };
 
 /// Whether a param takes no value (a flag), one value, or can be specified multiple times.
@@ -550,29 +564,19 @@ pub const Diagnostic = struct {
     /// Default diagnostics reporter when all you want is English with no colors.
     /// Use this as a reference for implementing your own if needed.
     pub fn report(diag: Diagnostic, stream: anytype, err: anyerror) !void {
-        const Arg = struct {
-            prefix: []const u8,
-            name: []const u8,
-        };
-        const a = if (diag.name.short) |*c|
-            Arg{ .prefix = "-", .name = @as(*const [1]u8, c)[0..] }
-        else if (diag.name.long) |l|
-            Arg{ .prefix = "--", .name = l }
-        else
-            Arg{ .prefix = "", .name = diag.arg };
-
+        const longest = diag.name.longest();
         switch (err) {
             streaming.Error.DoesntTakeValue => try stream.print(
                 "The argument '{s}{s}' does not take a value\n",
-                .{ a.prefix, a.name },
+                .{ longest.kind.prefix(), longest.name },
             ),
             streaming.Error.MissingValue => try stream.print(
                 "The argument '{s}{s}' requires a value but none was supplied\n",
-                .{ a.prefix, a.name },
+                .{ longest.kind.prefix(), longest.name },
             ),
             streaming.Error.InvalidArgument => try stream.print(
                 "Invalid argument '{s}{s}'\n",
-                .{ a.prefix, a.name },
+                .{ longest.kind.prefix(), longest.name },
             ),
             else => try stream.print("Error while parsing arguments: {s}\n", .{@errorName(err)}),
         }
-- 
cgit v1.2.3