From bf18f2a1f72570aca94a6d3e4703f5f54a2e090b Mon Sep 17 00:00:00 2001
From: Jimmi Holst Christensen
Date: Tue, 6 Aug 2019 18:38:56 +0200
Subject: build with latest version of zig

---
 README.md                  | 24 +++++++-----------------
 example/comptime-clap.zig  |  8 +-------
 example/streaming-clap.zig |  4 +---
 src/comptime.zig           | 19 ++++++-------------
 4 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index c959009..511087d 100644
--- a/README.md
+++ b/README.md
@@ -25,9 +25,7 @@ const clap = @import("clap");
 const debug = std.debug;
 
 pub fn main() !void {
-    var direct_allocator = std.heap.DirectAllocator.init();
-    const allocator = &direct_allocator.allocator;
-    defer direct_allocator.deinit();
+    const allocator = std.heap.direct_allocator;
 
     // First we specify what parameters our program can take.
     const params = [_]clap.Param(u8){
@@ -90,13 +88,7 @@ const clap = @import("clap");
 const debug = std.debug;
 
 pub fn main() !void {
-    const stdout_file = try std.io.getStdOut();
-    var stdout_out_stream = stdout_file.outStream();
-    const stdout = &stdout_out_stream.stream;
-
-    var direct_allocator = std.heap.DirectAllocator.init();
-    const allocator = &direct_allocator.allocator;
-    defer direct_allocator.deinit();
+    const allocator = std.heap.direct_allocator;
 
     // First we specify what parameters our program can take.
     const params = [_]clap.Param([]const u8){
@@ -146,11 +138,9 @@ const std = @import("std");
 const clap = @import("clap");
 
 pub fn main() !void {
-    const params = [_]clap.Param(void){
-        clap.Param(void){
-            .names = clap.Names{ .short = 'h', .long = "help" }
-        },
-    };
+    const params = [_]clap.Param(void){clap.Param(void){
+        .names = clap.Names{ .short = 'h', .long = "help" },
+    }};
 
     var direct_allocator = std.heap.DirectAllocator.init();
     const allocator = &direct_allocator.allocator;
@@ -204,11 +194,11 @@ pub fn main() !void {
         [_]clap.Param([]const u8){
             clap.Param([]const u8){
                 .id = "Display this help and exit.",
-                .names = clap.Names{ .short = 'h', .long = "help" }
+                .names = clap.Names{ .short = 'h', .long = "help" },
             },
             clap.Param([]const u8){
                 .id = "Output version information and exit.",
-                .names = clap.Names{ .short = 'v', .long = "version" }
+                .names = clap.Names{ .short = 'v', .long = "version" },
             },
         },
     );
diff --git a/example/comptime-clap.zig b/example/comptime-clap.zig
index 695fa62..0b6d2c4 100644
--- a/example/comptime-clap.zig
+++ b/example/comptime-clap.zig
@@ -4,13 +4,7 @@ const clap = @import("clap");
 const debug = std.debug;
 
 pub fn main() !void {
-    const stdout_file = try std.io.getStdOut();
-    var stdout_out_stream = stdout_file.outStream();
-    const stdout = &stdout_out_stream.stream;
-
-    var direct_allocator = std.heap.DirectAllocator.init();
-    const allocator = &direct_allocator.allocator;
-    defer direct_allocator.deinit();
+    const allocator = std.heap.direct_allocator;
 
     // First we specify what parameters our program can take.
     const params = [_]clap.Param([]const u8){
diff --git a/example/streaming-clap.zig b/example/streaming-clap.zig
index 71a2fca..d15e5b7 100644
--- a/example/streaming-clap.zig
+++ b/example/streaming-clap.zig
@@ -4,9 +4,7 @@ const clap = @import("clap");
 const debug = std.debug;
 
 pub fn main() !void {
-    var direct_allocator = std.heap.DirectAllocator.init();
-    const allocator = &direct_allocator.allocator;
-    defer direct_allocator.deinit();
+    const allocator = std.heap.direct_allocator;
 
     // First we specify what parameters our program can take.
     const params = [_]clap.Param(u8){
diff --git a/src/comptime.zig b/src/comptime.zig
index d872b82..3220ad6 100644
--- a/src/comptime.zig
+++ b/src/comptime.zig
@@ -11,19 +11,12 @@ pub fn ComptimeClap(comptime Id: type, comptime params: []const clap.Param(Id))
     var options: usize = 0;
     var converted_params: []const clap.Param(usize) = [_]clap.Param(usize){};
     for (params) |param| {
-        const index = blk: {
-            if (param.names.long == null and param.names.short == null)
-                break :blk 0;
-            if (param.takes_value) {
-                const res = options;
-                options += 1;
-                break :blk res;
-            }
-
-            const res = flags;
-            flags += 1;
-            break :blk res;
-        };
+        var index: usize = 0;
+        if (param.names.long != null or param.names.short != null) {
+            const ptr = if (param.takes_value) &options else &flags;
+            index = ptr.*;
+            ptr.* += 1;
+        }
 
         const converted = clap.Param(usize){
             .id = index,
-- 
cgit v1.2.3