Changeset 76

Timestamp:

01/11/07 06:45:53 (2 years ago)

Author:

KirkMcDonald

Message:

Built-in help support. '--' now terminates the option list. Can add callback for "leftover" args. Can add hook for "error" calls.

Files:

• misc/optparse.d (modified) (15 diffs)
• misc/opttest.d (modified) (1 diff)

misc/optparse.d

@@ -25 +25 @@
-module optparse;
-
-
-
-
+, writef
+, toupper
+, EXIT_SUCCESS
-import std.conv : toInt, ConvError;
+import std.path : getName, getBaseName;
-
-/*
@@ -169 +170 @@
-    Action action;
-    ArgType type;
-
+, argname
-    char[] const_value;
-    OptionCallbackArg callback;
-    OptionCallbackInt int_callback;
-    OptionCallback void_callback;
+    char[] helptext;
-    this(
-        char[][] shorts, char[][] longs, ArgType type,
-        Action act, char[] name, char[] const_value,
-        OptionCallbackArg dga, OptionCallback dg,
-
+
+
-    ) {
-        this.shortopts = shorts;
@@ -185 +188 @@
-        this.type = type;
-        this.name = name;
+        this.argname = toupper(name);
+        this.helptext = help;
-
-        // Perform sanity checks.
@@ -217 +222 @@
-        this.void_callback = dg;
-    }
+    char[] toString() {
+        int optCount = this.shortopts.length + this.longopts.length;
+        char[] result;
+        bool printed_arg = false;
+        foreach(i, opt; this.shortopts ~ this.longopts) {
+            result ~= opt;
+            if (i < optCount-1) {
+                result ~= ", ";
+            } else if (this.hasArg()) {
+                result ~= "=" ~ toupper(this.argname);
+            }
+        }
+        return result;
+    }
-    // Does whatever this option is supposed to do.
-
+Parser parser, Option
-        int i;
-        if (this.type == ArgType.Integer) {
@@ -257 +276 @@
-                break;
-            case Action.Help:
-
+
+
-                break;
-        }
@@ -263 +283 @@
-    bool hasArg() {
-        return this.type != ArgType.None;
+    }
+    Option help(char[] help) {
+        this.helptext = help;
+        return this;
+    }
+    Option argName(char[] argname) {
+        this.argname = argname;
+        return this;
-    }
-    // Returns true if the passed option string matches this option.
@@ -290 +318 @@
-}
-
+private void delegate(char[]) error_callback;
+void set_error_callback(void delegate(char[]) dg) {
+    error_callback = dg;
+}
+
-void unknown_opt_error(char[] opt) {
-    error("Unknown argument '"~opt~"'");
@@ -297 +330 @@
-}
-void error(char[] err) {
-
+
+
+
+
+
-    exit(EXIT_FAILURE);
-}
-
-class OptionParser {
+    OptionCallbackArg leftover_cb;
-    Option[] options;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // Checks the passed arg against all the options in the parser.
-    // Returns null if no match is found.
@@ -314 +382 @@
-        return null;
-    }
+    char[] get_program_name(char[] path) {
+        char[] result;
+        version(Windows) {
+            assert(path[$-4 .. $] == ".exe");
+            result = path[0 .. $-4];
+        }
+        return getBaseName(result);
+    }
-    Options parse_args(char[][] args) {
+        this.name = get_program_name(args[0]);
-        args = args[1 .. $];
-        Options options = new Options;
@@ -343 +420 @@
-        for (int i=0; i<args.length; ++i) {
-            opt = args[i];
-
+
+
+
+
+
-                idx = find(opt, '=');
-                if (idx != -1) {
@@ -363 +444 @@
-                    arg = null;
-                }
-
+this, 
-            } else if (opt.startswith("-")) {
-                if (opt.length >= 2) {
@@ -383 +464 @@
-                            } else {
-                                arg = opt[j+2 .. $];
-
+this, 
-                                break;
-                            }
@@ -389 +470 @@
-                            arg = null;
-                        }
-
+this, 
-                    }
-                }
-            } else {
-
+
+
+
+
+
-            }
-        }
@@ -399 +484 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    // Although users certainly /can/ call this, all those overloads are there
-    // for a reason.
-void
+Option
-        char[][] options, 
-        Action action, char[] name, ArgType type, char[] const_value,
-        OptionCallbackArg callback, OptionCallback vcall,
-
+
+
-    ) {
-        char[][] shortopts;
-        char[][] longopts;
+        Option option;
-        foreach (opt; options) {
-            if (opt.length < 2) {
@@ -471 +565 @@
-            if (longopts.length > 0)
-                name = longopts[0][2 .. $];
+            else if (shortopts.length > 0)
+                name = shortopts[0][1 .. 2];
-            else
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+

misc/opttest.d

@@ -9 +9 @@
-    writefln("value:       ", options.value("value"));
-    writefln("number list: ", options.value_list("list"));
-
-
-
+
-}
-
-int main(char[][] args) {
-
-
-
+("A test suite for optparser.")
+.help("Stores a single argument.")
+.help("Adds arguments to a list.")
-    parser.add_option(["-c", "--callback"], {
-        writefln("callback encountered");
-
+.help("Calls a callback.")
-    parser.add_option(["-n", "--number"], (int i) {
-        writefln("number callback: %d * 2 = %d", i, i*2);
-
-
-
-
+
+
+
+
+
-    auto options = parser.parse_args(args);
-