Changeset 79

Timestamp:

01/13/07 02:21:43 (2 years ago)

Author:

KirkMcDonald

Message:

Flag options and more powerful callbacks.

Files:

• misc/optparse.d (modified) (16 diffs)
• misc/opttest.d (modified) (2 diffs)

misc/optparse.d

@@ -141 +141 @@
-        }
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-alias void delegate(char[]) OptionCallbackArg;
-alias void delegate(int)    OptionCallbackInt;
-
+      
-
-/*
@@ -157 +170 @@
- * CallbackVoid: dg
-*/
-Callback
+SetTrue, SetFalse, Callback, CallbackFancy
-enum ArgType { None, String, Integer }
-
-ArgType defaultType(Action action) {
-    switch (action) {
-
+, Action.CallbackFancy
-            return ArgType.String;
-            break;
@@ -180 +193 @@
-    OptionCallbackInt int_callback;
-    OptionCallback void_callback;
+
+    OptionCallbackFancyArg fancy_callback;
+    OptionCallbackFancyInt fancy_int_callback;
+    OptionCallbackFancy fancy_void_callback;
-    char[] helptext;
-    this(
@@ -186 +203 @@
-        OptionCallbackArg dga, OptionCallback dg,
-        OptionCallbackInt dgi,
-
+
+
+
-    ) {
-        this.shortopts = shorts;
@@ -194 +213 @@
-        this.name = name;
-        this.argname = toupper(name);
-        this.helptext = help;
-
-        // Perform sanity checks.
@@ -217 +235 @@
-                    case ArgType.None:
-                        assert(dg !is null);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            default:
-                break;
@@ -226 +257 @@
-        this.int_callback = dgi;
-        this.void_callback = dg;
+        this.fancy_callback = fdga;
+        this.fancy_int_callback = fdgi;
+        this.fancy_void_callback = fdg;
-    }
-    char[] toString() {
@@ -242 +276 @@
-    }
-    // Does whatever this option is supposed to do.
-
+inout char[][] args, inout int idx, 
-        int i;
-        if (this.type == ArgType.Integer) {
@@ -267 +301 @@
-                ++results.counted_opts[name];
-                break;
+            case Action.SetTrue:
+                results.opts[name] = ["1"];
+                break;
+            case Action.SetFalse:
+                results.opts[name] = ["0"];
+                break;
-            case Action.Callback:
-                switch (type) {
@@ -277 +317 @@
-                    case ArgType.None:
-                        void_callback();
+                        break;
+                }
+                break;
+            case Action.CallbackFancy:
+                switch (type) {
+                    case ArgType.String:
+                        fancy_callback(results, args, idx, name, arg);
+                        break;
+                    case ArgType.Integer:
+                        fancy_int_callback(results, args, idx, name, i);
+                        break;
+                    case ArgType.None:
+                        fancy_void_callback(results, args, idx, name);
-                        break;
-                }
@@ -462 +515 @@
-                    arg = null;
-                }
-
+s, i, arg
-            } else if (opt.startswith("-")) {
-                if (opt.length >= 2) {
@@ -483 +536 @@
-                            } else {
-                                arg = toUTF8(opt32[j+1 .. $]);
-
+s, i, arg
-                                break;
-                            }
@@ -489 +542 @@
-                            arg = null;
-                        }
-
+s, i, arg
-                    }
-                } else {
@@ -512 +565 @@
-        return option;
-    }
-  name  type                              const_value  dga   dgv   dgi   help
+name  type                       const_value  dga   dgv   dgi   fdga  fdgi  fdg
-    Option add_option(char[][] options ...) {
-  null, defaultType(Action.Store),        null,       
+null, defaultType(Action.Store), null,        null, null,
-    }
-    Option add_option(char[][] options, char[] name) {
-  name, defaultType(Action.Store),        null,       
+name, defaultType(Action.Store), null,        null, null,
-    }
-    Option add_option(char[][] options, Action action) {
-  null, defaultType(action),              null,       
+null, defaultType(action),       null,        null, null,
-    }
-    Option add_option(char[][] options, ArgType type) {
-  null, type,                             null,       
+null, type,                      null,        null, null,
-    }
-    Option add_option(char[][] options, Action action, ArgType type) {
-  null, type,                             null,       
+null, type,                      null,        null, null,
-    }
-    Option add_option(char[][] options, char[] name, Action action) {
-  name, defaultType(action),              null,       
+name, defaultType(action),       null,        null, null,
-    }
-    Option add_option(char[][] options, char[] name, Action action, ArgType type) {
-  name, type,                             null,       
+name, type,                      null,        null, null,
-    }
-    Option add_option(char[][] options, Action action, char[] const_value) {
-  null, defaultType(action),              const_value
+null, defaultType(action),       const_value, null, null
-    }
-    Option add_option(char[][] options, char[] name, char[] const_value) {
-  name, defaultType(Action.Store),        const_value
+name, defaultType(Action.Store), const_value, null, null
-    }
-    Option add_option(char[][] options, char[] name, Action action, char[] const_value) {
-  name, defaultType(action),              const_value
+name, defaultType(action),       const_value, null, null
-    }
-    Option add_option(char[][] options, OptionCallbackArg dg) {
-  null, defaultType(Action.Callback),     null,        dg,  
+null, ArgType.String,            null,        dg,   null, null,
-    }
-    Option add_option(char[][] options, OptionCallback dg) {
-  null, ArgType.None,                     null,        null, dg,  
+null, ArgType.None,              null,        null, dg,   null, null,
-    }
-    Option add_option(char[][] options, OptionCallbackInt dg) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    // Although users certainly /can/ call this, all those overloads are there
@@ -559 +630 @@
-        OptionCallbackArg callback, OptionCallback vcall,
-        OptionCallbackInt icall,
-
+
+
+
-    ) {
-        char[][] shortopts;
@@ -599 +672 @@
-                );
-        }
-help
+fdga, fdgi, fdg
-        this.options ~= option;
-        return option;

misc/opttest.d

@@ -9 +9 @@
-    writefln("value:       ", options.value("value"));
-    writefln("number list: ", options.value_list("list"));
+    writefln("switch:      ", options.flag("switch"));
-    writefln("args:        ", options.args);
-}
@@ -22 +23 @@
-        writefln("number callback: %d * 2 = %d", i, i*2);
-    }).help("Calls a callback with a number.");
+    // A fancy callback
+    parser.add_option(["--fancy"], "a callback", (Options opts, inout char[][] a, inout int i, char[] name) {
+        writefln("Current file: %s", opts["file"]);
+        writefln("Remaining args: %s", a[i+1 .. $]);
+        // Skip the next arg
+        ++i;
+        writefln("This arg's name: %s", name);
+    }).help("Tests optparse's fancy callbacks.");
+    parser.add_option(["--enable"], "switch", Action.SetTrue).help("Enables the switch.");
+    parser.add_option(["--disable"], "switch", Action.SetFalse).help("Disables the switch.");
-    parser.add_option(["-V", "--value"], ArgType.Integer).help("Stores a single number").argName("NUMBER");
-    parser.add_option(["-l", "--list"], Action.Append, ArgType.Integer).help("Adds numbers to a list.").argName("NUMBER");