5 files changed, 47 insertions, 496 deletions

diff --git a/build.zig b/build.zig
index a32c0bd..29792ee 100644
--- a/build.zig
+++ b/build.zig
@@ -5,10 +5,7 @@ pub fn build(b: *Builder) void {
 
     {
         const example_step = b.step("examples", "Build all examples");
-        const examples = [][]const u8 {
-            "core",
-            "extended",
-        };
+        const examples = [][]const u8 {};
 
         b.default_step.dependOn(example_step);
         inline for (examples) |example| {
diff --git a/examples/core.zig b/examples/core.zig
deleted file mode 100644
index 4335ff2..0000000
--- a/examples/core.zig
+++ /dev/null
@@ -1,446 +0,0 @@
-const std = @import("std");
-const clap = @import("clap").core;
-
-const debug = std.debug;
-const mem = std.mem;
-
-const Names = clap.Names;
-const Param = clap.Param;
-
-const ArgError = clap.OsArgIterator.Error;
-
-// TODO: More specific error in this func type.
-const Command = fn(*mem.Allocator, *clap.ArgIterator(ArgError)) error!void;
-
-const params = []Param(Command){
-    Param(Command).init(help, false, Names.prefix("help")),
-    Param(Command).init(cmdBuild, false, Names.bare("build")),
-    Param(Command).init(cmdBuildExe, false, Names.bare("build-exe")),
-    Param(Command).init(cmdBuildLib, false, Names.bare("build-lib")),
-    Param(Command).init(cmdBuildObj, false, Names.bare("build-obj")),
-    Param(Command).init(cmdFmt, false, Names.bare("fmt")),
-    Param(Command).init(cmdRun, false, Names.bare("run")),
-    Param(Command).init(cmdTargets, false, Names.bare("targets")),
-    Param(Command).init(cmdTest, false, Names.bare("test")),
-    Param(Command).init(cmdVersion, false, Names.bare("version")),
-    Param(Command).init(cmdZen, false, Names.bare("zen")),
-};
-
-const usage =
-    \\usage: zig [command] [options]
-    \\
-    \\Commands:
-    \\
-    \\  build                        Build project from build.zig
-    \\  build-exe   [source]         Create executable from source or object files
-    \\  build-lib   [source]         Create library from source or object files
-    \\  build-obj   [source]         Create object from source or assembly
-    \\  fmt         [source]         Parse file and render in canonical zig format
-    \\  run         [source]         Create executable and run immediately
-    \\  targets                      List available compilation targets
-    \\  test        [source]         Create and run a test build
-    \\  translate-c [source]         Convert c code to zig code
-    \\  version                      Print version number and exit
-    \\  zen                          Print zen of zig and exit
-    \\
-    \\
-;
-
-pub fn main() !void {
-    var direct_allocator = std.heap.DirectAllocator.init();
-    defer direct_allocator.deinit();
-    var arena = std.heap.ArenaAllocator.init(&direct_allocator.allocator);
-    defer arena.deinit();
-
-    const allocator = &arena.allocator;
-
-    var args = clap.OsArgIterator.init(allocator);
-    defer args.deinit();
-
-    const exe = try args.iter.next();
-    var parser = clap.Clap(Command, ArgError).init(params, &args.iter);
-
-    const maybe_arg = parser.next() catch |err| b: {
-        debug.warn("{}.\n", @errorName(err));
-        // debug.warn(usage); TODO: error: evaluation exceeded 1000 backwards branches
-        return err;
-    };
-    const arg = maybe_arg ?? {
-        debug.warn("No command found.\n");
-        // debug.warn(usage); TODO: error: evaluation exceeded 1000 backwards branches
-        return error.NoCommandFound;
-    };
-
-    try arg.param.id(allocator, parser.iter);
-}
-
-pub fn help(allocator: *mem.Allocator, args: *clap.ArgIterator(ArgError)) (error{}!void) {
-    // debug.warn(usage); TODO: error: evaluation exceeded 1000 backwards branches
-}
-
-// cmd:build ///////////////////////////////////////////////////////////////////////////////////////
-
-const Build = enum {
-    Help,
-    Init,
-    BuildFile,
-    CacheDir,
-    Verbose,
-    Prefix,
-    VerboseTokenize,
-    VerboseAst,
-    VerboseLink,
-    VerboseIr,
-    VerboseLlvmIr,
-    VerboseCImport,
-};
-
-const build_params = []Param(Build){
-    Param(Build).init(Build.Help, false, Names.prefix("help")),
-    Param(Build).init(Build.Init, false, Names.long("init")),
-    Param(Build).init(Build.BuildFile, true, Names.long("build-file")),
-    Param(Build).init(Build.CacheDir, true, Names.long("cache-dir")),
-    Param(Build).init(Build.Verbose, false, Names.prefix("verbose")),
-    Param(Build).init(Build.Prefix, true, Names.long("prefix")),
-
-    Param(Build).init(Build.VerboseTokenize, false, Names.prefix("verbose-tokenize")),
-    Param(Build).init(Build.VerboseAst, false, Names.prefix("verbose-ast")),
-    Param(Build).init(Build.VerboseLink, false, Names.prefix("verbose-link")),
-    Param(Build).init(Build.VerboseIr, false, Names.prefix("verbose-ir")),
-    Param(Build).init(Build.VerboseLlvmIr, false, Names.prefix("verbose-llvm-ir")),
-    Param(Build).init(Build.VerboseCImport, false, Names.prefix("verbose-cimport")),
-};
-
-const build_usage =
-    \\usage: zig build <options>
-    \\
-    \\General Options:
-    \\   -h, --help                   Print this help and exit
-    \\       --init                   Generate a build.zig template
-    \\       --build-file [file]      Override path to build.zig
-    \\       --cache-dir [path]       Override path to cache directory
-    \\   -v, --verbose                Print commands before executing them
-    \\       --prefix [path]          Override default install prefix
-    \\
-    \\Project-Specific Options:
-    \\
-    \\   Project-specific options become available when the build file is found.
-    \\
-    \\Advanced Options:
-    \\       --verbose-tokenize       Enable compiler debug output for tokenization
-    \\       --verbose-ast            Enable compiler debug output for parsing into an AST
-    \\       --verbose-link           Enable compiler debug output for linking
-    \\       --verbose-ir             Enable compiler debug output for Zig IR
-    \\       --verbose-llvm-ir        Enable compiler debug output for LLVM IR
-    \\       --verbose-cimport        Enable compiler debug output for C imports
-    \\
-    \\
-;
-
-const missing_build_file =
-    \\No 'build.zig' file found.
-    \\
-    \\Initialize a 'build.zig' template file with `zig build --init`,
-    \\or build an executable directly with `zig build-exe $FILENAME.zig`.
-    \\
-    \\See: `zig build --help` or `zig help` for more options.
-    \\
-;
-
-fn cmdBuild(allocator: *mem.Allocator, args: *clap.ArgIterator(ArgError)) !void {
-    var init = false;
-    var build_file: []const u8 = "build.zig";
-    var cache_dir: []const u8 = "zig-cache";
-    var verbose = false;
-    var prefix: []const u8 = "";
-    var verbose_tokenize = false;
-    var verbose_ast = false;
-    var verbose_link = false;
-    var verbose_ir = false;
-    var verbose_llvm_ir = false;
-    var verbose_cimport = false;
-
-    var parser = clap.Clap(Build, ArgError).init(build_params, args);
-
-    while (parser.next() catch |err| {
-        debug.warn("{}.\n", @errorName(err));
-        // debug.warn(build_usage); TODO: error: evaluation exceeded 1000 backwards branches
-        return err;
-    }) |arg| switch (arg.param.id) {
-        Build.Help => return, // debug.warn(build_usage) TODO: error: evaluation exceeded 1000 backwards branches,
-        Build.Init => init = true,
-        Build.BuildFile => build_file = ??arg.value,
-        Build.CacheDir => cache_dir = ??arg.value,
-        Build.Verbose => verbose = true,
-        Build.Prefix => prefix = ??arg.value,
-        Build.VerboseTokenize => verbose_tokenize = true,
-        Build.VerboseAst => verbose_ast = true,
-        Build.VerboseLink => verbose_link = true,
-        Build.VerboseIr => verbose_ir = true,
-        Build.VerboseLlvmIr => verbose_llvm_ir = true,
-        Build.VerboseCImport => verbose_cimport = true,
-    };
-
-    debug.warn("command: build\n");
-    debug.warn("init             = {}\n", init);
-    debug.warn("build_file       = {}\n", build_file);
-    debug.warn("cache_dir        = {}\n", cache_dir);
-    debug.warn("verbose          = {}\n", verbose);
-    debug.warn("prefix           = {}\n", prefix);
-    debug.warn("verbose_tokenize = {}\n", verbose_tokenize);
-    debug.warn("verbose_ast      = {}\n", verbose_ast);
-    debug.warn("verbose_link     = {}\n", verbose_link);
-    debug.warn("verbose_ir       = {}\n", verbose_ir);
-    debug.warn("verbose_llvm_ir  = {}\n", verbose_llvm_ir);
-    debug.warn("verbose_cimport  = {}\n", verbose_cimport);
-}
-
-// cmd:build-exe ///////////////////////////////////////////////////////////////////////////////////
-
-const BuildGeneric = enum {
-    File,
-    Help,
-    Color,
-
-    Assembly,
-    CacheDir,
-    Emit,
-    EnableTimingInfo,
-    LibCDir,
-    Name,
-    Output,
-    OutputH,
-    PkgBegin,
-    PkgEnd,
-    ReleaseFast,
-    ReleaseSafe,
-    Static,
-    Strip,
-    TargetArch,
-    TargetEnviron,
-    TargetOs,
-    VerboseTokenize,
-    VerboseAst,
-    VerboseLink,
-    VerboseIr,
-    VerboseLlvmIr,
-    VerboseCImport,
-    DirAfter,
-    ISystem,
-    MLlvm,
-
-    ArPath,
-    DynamicLinker,
-    EachLibRPath,
-    LibcLibDir,
-    LibcStaticLibDir,
-    MsvcLibDir,
-    Kernel32LibDir,
-    Library,
-    ForbidLibrary,
-    LibraryPath,
-    LinkerScript,
-    Object,
-    RDynamic,
-    RPath,
-    MConsole,
-    MWindows,
-    Framework,
-    MiOsVersionMin,
-    MMacOsXVersonMin,
-    VerMajor,
-    VerMinor,
-    VerPatch,
-};
-
-const build_generic_params = []Param(BuildGeneric){
-    Param(BuildGeneric).init(BuildGeneric.Help, false, Names.prefix("help")),
-};
-
-const build_generic_usage =
-    \\usage: zig build-exe <options> [file]
-    \\       zig build-lib <options> [file]
-    \\       zig build-obj <options> [file]
-    \\
-    \\General Options:
-    \\  -h, --help                       Print this help and exit
-    \\  -c, --color [auto|off|on]        Enable or disable colored error messages
-    \\
-    \\Compile Options:
-    \\  --assembly [source]          Add assembly file to build
-    \\  --cache-dir [path]           Override the cache directory
-    \\  --emit [filetype]            Emit a specific file format as compilation output
-    \\  --enable-timing-info         Print timing diagnostics
-    \\  --libc-include-dir [path]    Directory where libc stdlib.h resides
-    \\  --name [name]                Override output name
-    \\  --output [file]              Override destination path
-    \\  --output-h [file]            Override generated header file path
-    \\  --pkg-begin [name] [path]    Make package available to import and push current pkg
-    \\  --pkg-end                    Pop current pkg
-    \\  --release-fast               Build with optimizations on and safety off
-    \\  --release-safe               Build with optimizations on and safety on
-    \\  --static                     Output will be statically linked
-    \\  --strip                      Exclude debug symbols
-    \\  --target-arch [name]         Specify target architecture
-    \\  --target-environ [name]      Specify target environment
-    \\  --target-os [name]           Specify target operating system
-    \\  --verbose-tokenize           Turn on compiler debug output for tokenization
-    \\  --verbose-ast-tree           Turn on compiler debug output for parsing into an AST (tree view)
-    \\  --verbose-ast-fmt            Turn on compiler debug output for parsing into an AST (render source)
-    \\  --verbose-link               Turn on compiler debug output for linking
-    \\  --verbose-ir                 Turn on compiler debug output for Zig IR
-    \\  --verbose-llvm-ir            Turn on compiler debug output for LLVM IR
-    \\  --verbose-cimport            Turn on compiler debug output for C imports
-    \\  --dirafter [dir]             Same as --isystem but do it last
-    \\  --isystem [dir]              Add additional search path for other .h files
-    \\  --mllvm [arg]                Additional arguments to forward to LLVM's option processing
-    \\
-    \\Link Options:
-    \\  --ar-path [path]             Set the path to ar
-    \\  --dynamic-linker [path]      Set the path to ld.so
-    \\  --each-lib-rpath             Add rpath for each used dynamic library
-    \\  --libc-lib-dir [path]        Directory where libc crt1.o resides
-    \\  --libc-static-lib-dir [path] Directory where libc crtbegin.o resides
-    \\  --msvc-lib-dir [path]        (windows) directory where vcruntime.lib resides
-    \\  --kernel32-lib-dir [path]    (windows) directory where kernel32.lib resides
-    \\  --library [lib]              Link against lib
-    \\  --forbid-library [lib]       Make it an error to link against lib
-    \\  --library-path [dir]         Add a directory to the library search path
-    \\  --linker-script [path]       Use a custom linker script
-    \\  --object [obj]               Add object file to build
-    \\  --rdynamic                   Add all symbols to the dynamic symbol table
-    \\  --rpath [path]               Add directory to the runtime library search path
-    \\  --mconsole                   (windows) --subsystem console to the linker
-    \\  --mwindows                   (windows) --subsystem windows to the linker
-    \\  --framework [name]           (darwin) link against framework
-    \\  --mios-version-min [ver]     (darwin) set iOS deployment target
-    \\  --mmacosx-version-min [ver]  (darwin) set Mac OS X deployment target
-    \\  --ver-major [ver]            Dynamic library semver major version
-    \\  --ver-minor [ver]            Dynamic library semver minor version
-    \\  --ver-patch [ver]            Dynamic library semver patch version
-    \\
-    \\
-;
-
-
-fn cmdBuildExe(allocator: *mem.Allocator, args: *clap.ArgIterator(ArgError)) (error{}!void) {
-}
-
-// cmd:build-lib ///////////////////////////////////////////////////////////////////////////////////
-
-fn cmdBuildLib(allocator: *mem.Allocator, args: *clap.ArgIterator(ArgError)) (error{}!void) {
-}
-
-// cmd:build-obj ///////////////////////////////////////////////////////////////////////////////////
-
-fn cmdBuildObj(allocator: *mem.Allocator, args: *clap.ArgIterator(ArgError)) (error{}!void) {
-}
-
-// cmd:fmt /////////////////////////////////////////////////////////////////////////////////////////
-
-const usage_fmt =
-    \\usage: zig fmt [file]...
-    \\
-    \\   Formats the input files and modifies them in-place.
-    \\
-    \\Options:
-    \\   --help                 Print this help and exit
-    \\   --color [auto|off|on]  Enable or disable colored error messages
-    \\
-    \\
-;
-
-fn cmdFmt(allocator: *mem.Allocator, args: *clap.ArgIterator(ArgError)) (error{}!void) {
-}
-
-// cmd:targets /////////////////////////////////////////////////////////////////////////////////////
-
-fn cmdTargets(allocator: *mem.Allocator, args: *clap.ArgIterator(ArgError)) (error{}!void) {
-}
-
-// cmd:version /////////////////////////////////////////////////////////////////////////////////////
-
-fn cmdVersion(allocator: *mem.Allocator, args: *clap.ArgIterator(ArgError)) (error{}!void) {
-}
-
-// cmd:test ////////////////////////////////////////////////////////////////////////////////////////
-
-const usage_test =
-    \\usage: zig test [file]...
-    \\
-    \\Options:
-    \\   --help                 Print this help and exit
-    \\
-    \\
-;
-
-fn cmdTest(allocator: *mem.Allocator, args: *clap.ArgIterator(ArgError)) (error{}!void) {
-}
-
-// cmd:run /////////////////////////////////////////////////////////////////////////////////////////
-
-// Run should be simple and not expose the full set of arguments provided by build-exe. If specific
-// build requirements are need, the user should `build-exe` then `run` manually.
-const usage_run =
-    \\usage: zig run [file] -- <runtime args>
-    \\
-    \\Options:
-    \\   --help                 Print this help and exit
-    \\
-    \\
-;
-
-fn cmdRun(allocator: *mem.Allocator, args: *clap.ArgIterator(ArgError)) (error{}!void) {
-}
-
-// cmd:translate-c /////////////////////////////////////////////////////////////////////////////////
-
-const usage_translate_c =
-    \\usage: zig translate-c [file]
-    \\
-    \\Options:
-    \\  --help                       Print this help and exit
-    \\  --enable-timing-info         Print timing diagnostics
-    \\  --output [path]              Output file to write generated zig file (default: stdout)
-    \\
-    \\
-;
-
-fn cmdTranslateC(allocator: &mem.Allocator, args: &clap.ArgIterator(ArgError)) (error{}!void) {
-}
-
-// cmd:zen /////////////////////////////////////////////////////////////////////////////////////////
-
-const info_zen =
-    \\
-    \\ * Communicate intent precisely.
-    \\ * Edge cases matter.
-    \\ * Favor reading code over writing code.
-    \\ * Only one obvious way to do things.
-    \\ * Runtime crashes are better than bugs.
-    \\ * Compile errors are better than runtime crashes.
-    \\ * Incremental improvements.
-    \\ * Avoid local maximums.
-    \\ * Reduce the amount one must remember.
-    \\ * Minimize energy spent on coding style.
-    \\ * Together we serve end users.
-    \\
-    \\
-;
-
-fn cmdZen(allocator: *mem.Allocator, args: *clap.ArgIterator(ArgError)) (error{}!void) {
-}
-
-// cmd:internal ////////////////////////////////////////////////////////////////////////////////////
-
-const usage_internal =
-    \\usage: zig internal [subcommand]
-    \\
-    \\Sub-Commands:
-    \\  build-info                   Print static compiler build-info
-    \\
-    \\
-;
-
-fn cmdInternal(allocator: *mem.Allocator, args: *clap.ArgIterator(ArgError)) (error{}!void) {
-}
diff --git a/examples/extended.zig b/examples/extended.zig
deleted file mode 100644
index c21d254..0000000
--- a/examples/extended.zig
+++ /dev/null
@@ -1,2 +0,0 @@
-
-pub fn main() void {}
diff --git a/src/extended.zig b/src/extended.zig
index 5fd019d..ec8310e 100644
--- a/src/extended.zig
+++ b/src/extended.zig
@@ -16,40 +16,48 @@ pub const Param = struct {
     settings: Settings,
     kind: Kind,
 
-    pub fn flag(field: []const u8, names: *const core.Names, settings: *const Settings) Param {
-        return Param{
-            .field = field,
-            .names = names.*,
-            .settings = settings.*,
-            .kind = Kind.Flag,
-        };
+    required: bool,
+    position: ?usize,
+
+    pub fn flag(field: []const u8, names: *const core.Names) Param {
+        return init(
+            field,
+            names,
+            Kind.Flag,
+        );
     }
 
     pub fn option(
         field: []const u8,
         names: *const core.Names,
-        settings: *const Settings,
         comptime parser: *const Parser,
     ) Param {
-        return Param{
-            .field = field,
-            .names = names.*,
-            .settings = settings.*,
-            .kind = Kind{ .Option = parser.* },
-        };
+        return init(
+            field,
+            names,
+            Kind{ .Option = parser.* },
+        );
     }
 
     pub fn subcommand(
         field: []const u8,
         names: *const core.Names,
-        settings: *const Settings,
         comptime command: *const Command,
     ) Param {
+        return init(
+            field,
+            names,
+            Kind{ .Subcommand = command.* },
+        );
+    }
+
+    pub fn init(field: []const u8, names: *const core.Names, kind: *const Kind) Param {
         return Param{
             .field = field,
             .names = names.*,
-            .settings = settings.*,
-            .kind = Kind{ .Subcommand = Command.* },
+            .kind = kind.*,
+            .required = false,
+            .position = null,
         };
     }
 
@@ -58,18 +66,6 @@ pub const Param = struct {
         Option: Parser,
         Subcommand: Command,
     };
-
-    pub const Settings = struct {
-        required: bool,
-        position: ?usize,
-
-        pub fn default() Settings {
-            return Settings{
-                .required = false,
-                .position = null,
-            };
-        }
-    };
 };
 
 const Opaque = @OpaqueType();
diff --git a/tests/extended.zig b/tests/extended.zig
index 97b817e..78c319e 100644
--- a/tests/extended.zig
+++ b/tests/extended.zig
@@ -79,11 +79,13 @@ test "clap.extended: short" {
             .b = 0,
         },
         .params = []Param{
-            Param.flag("a", Names.short('a'), Param.Settings{
-                .required = true,
-                .position = 0,
-            }),
-            Param.option("b", Names.short('b'), Param.Settings.default(), &Parser.int(u8, 10)),
+            p: {
+                var res = Param.flag("a", Names.short('a'));
+                res.required = true;
+                res.position = 0;
+                break :p res;
+            },
+            Param.option("b", Names.short('b'), &Parser.int(u8, 10)),
         }
     };
 
@@ -173,11 +175,13 @@ test "clap.extended: long" {
             .b = 0,
         },
         .params = []Param{
-            Param.flag("a", Names.long("a"), Param.Settings{
-                .required = true,
-                .position = 0,
-            }),
-            Param.option("b", Names.long("b"), Param.Settings.default(), &Parser.int(u8, 10)),
+            p: {
+                var res = Param.long("a", Names.short('a'));
+                res.required = true;
+                res.position = 0;
+                break :p res;
+            },
+            Param.option("b", Names.long('b'), &Parser.int(u8, 10)),
         }
     };
 
@@ -243,11 +247,13 @@ test "clap.extended: bare" {
             .b = 0,
         },
         .params = []Param{
-            Param.flag("a", Names.bare("a"), Param.Settings{
-                .required = true,
-                .position = 0,
-            }),
-            Param.option("b", Names.bare("b"), Param.Settings.default(), &Parser.int(u8, 10)),
+            p: {
+                var res = Param.bare("a", Names.short('a'));
+                res.required = true;
+                res.position = 0;
+                break :p res;
+            },
+            Param.option("b", Names.bare('b'), &Parser.int(u8, 10)),
         }
     };