From aa334d8c1df252f48960e0253eb25544678a6023 Mon Sep 17 00:00:00 2001
From: Komari Spaghetti
Date: Mon, 26 Apr 2021 16:23:15 +0200
Subject: Refactor Diagnostic (and others) into a ParseOption struct

This allows for default arguments, which we can also extend without
breaking peoples code in the future. This is a breaking change right now
though.
---
 example/streaming-clap.zig | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'example/streaming-clap.zig')

diff --git a/example/streaming-clap.zig b/example/streaming-clap.zig
index 941070f..f8d873d 100644
--- a/example/streaming-clap.zig
+++ b/example/streaming-clap.zig
@@ -1,5 +1,5 @@
-const std = @import("std");
 const clap = @import("clap");
+const std = @import("std");
 
 const debug = std.debug;
 
@@ -28,19 +28,18 @@ pub fn main() !void {
     var iter = try clap.args.OsIterator.init(allocator);
     defer iter.deinit();
 
-    // Initialize our streaming parser.
+    // Initalize our diagnostics, which can be used for reporting useful errors.
+    // This is optional. You can also leave the `diagnostic` field unset if you
+    // don't care about the extra information `Diagnostic` provides.
+    var diag = clap.Diagnostic{};
     var parser = clap.StreamingClap(u8, clap.args.OsIterator){
         .params = &params,
         .iter = &iter,
+        .diagnostic = &diag,
     };
 
-    // Initalize our diagnostics, which can be used for reporting useful errors.
-    // This is optional. You can also just pass `null` to `parser.next` if you
-    // don't care about the extra information `Diagnostics` provides.
-    var diag: clap.Diagnostic = undefined;
-
     // Because we use a streaming parser, we have to consume each argument parsed individually.
-    while (parser.next(&diag) catch |err| {
+    while (parser.next() catch |err| {
         // Report useful error and exit
         diag.report(std.io.getStdErr().outStream(), err) catch {};
         return err;
-- 
cgit v1.2.3


From 4c14bfd5188bb61d7076bc33fccbcc6a5e9dac01 Mon Sep 17 00:00:00 2001
From: Komari Spaghetti
Date: Sat, 8 May 2021 18:08:52 +0200
Subject: Modernize codebase

* Better naming for variables
* Follow naming style of enums
* Use `writer()` instead of `outStream()`
* Change many initializers to be a one liner
* Don't explicitly initialize fields to their default value
---
 example/streaming-clap.zig | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'example/streaming-clap.zig')

diff --git a/example/streaming-clap.zig b/example/streaming-clap.zig
index f8d873d..41efd1f 100644
--- a/example/streaming-clap.zig
+++ b/example/streaming-clap.zig
@@ -2,25 +2,23 @@ const clap = @import("clap");
 const std = @import("std");
 
 const debug = std.debug;
+const io = std.io;
 
 pub fn main() !void {
     const allocator = std.heap.page_allocator;
 
     // First we specify what parameters our program can take.
     const params = [_]clap.Param(u8){
-        clap.Param(u8){
+        .{
             .id = 'h',
-            .names = clap.Names{ .short = 'h', .long = "help" },
+            .names = .{ .short = 'h', .long = "help" },
         },
-        clap.Param(u8){
+        .{
             .id = 'n',
-            .names = clap.Names{ .short = 'n', .long = "number" },
-            .takes_value = .One,
-        },
-        clap.Param(u8){
-            .id = 'f',
-            .takes_value = .One,
+            .names = .{ .short = 'n', .long = "number" },
+            .takes_value = .one,
         },
+        .{ .id = 'f', .takes_value = .one },
     };
 
     // We then initialize an argument iterator. We will use the OsIterator as it nicely
@@ -41,7 +39,7 @@ pub fn main() !void {
     // Because we use a streaming parser, we have to consume each argument parsed individually.
     while (parser.next() catch |err| {
         // Report useful error and exit
-        diag.report(std.io.getStdErr().outStream(), err) catch {};
+        diag.report(io.getStdErr().writer(), err) catch {};
         return err;
     }) |arg| {
         // arg.param will point to the parameter which matched the argument.
-- 
cgit v1.2.3