Changeset 75

Timestamp:

01/09/07 20:41:38 (2 years ago)

Author:

KirkMcDonald

Message:

Integer argument support.

Files:

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

misc/optparse.d

@@ -28 +28 @@
-import std.string : split, find;
-import std.c.stdlib : exit, EXIT_FAILURE;
+import std.conv : toInt, ConvError;
-
-/*
@@ -67 +68 @@
-}
-
+int toOptInt(char[] s) {
+    int i;
+    try {
+        i = toInt(s);
+    } catch (ConvError e) {
+        error("Could not convert '"~s~"' to an integer.");
+    }
+    return i;
+}
+
+// Thrown if client code tries to set up an improper option.
-class OptionError : Exception {
+    this(char[] msg) { super(msg); }
+}
+// Thrown if client code tries to extract the wrong type from an option.
+class OptionTypeError : Exception {
-    this(char[] msg) { super(msg); }
-}
@@ -84 +100 @@
-        }
-    }
+    int value(char[] opt) {
+        char[][]* o = opt in opts;
+        if (o) {
+            return toInt((*o)[0]);
+        } else {
+            return 0;
+        }
+    }
-    char[][] list(char[] opt) {
-        char[][]* o = opt in opts;
@@ -92 +116 @@
-        }
-    }
+    int[] value_list(char[] opt) {
+        char[][]* o = opt in opts;
+        int[] l;
+        if (o) {
+            l.length = (*o).length;
+            foreach (i, s; *o) {
+                l[i] = toInt(s);
+            }
+        }
+        return l;
+    }
-    int count(char[] opt) {
-        int* c = opt in counted_opts;
@@ -103 +138 @@
-
-alias void delegate(char[]) OptionCallbackArg;
+alias void delegate(int)    OptionCallbackInt;
-alias void delegate() OptionCallback;
-
@@ -115 +151 @@
- * CallbackVoid: dg
-*/
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-class Option {
-    char[][] shortopts, longopts;
-    Action action;
+    ArgType type;
-    char[] name;
-    char[] const_value;
-    OptionCallbackArg callback;
+    OptionCallbackInt int_callback;
-    OptionCallback void_callback;
-    this(
-
+ ArgType type,
-        Action act, char[] name, char[] const_value,
-
+
+
-    ) {
-        this.shortopts = shorts;
-        this.longopts = longs;
-        this.action = act;
+        this.type = type;
-        this.name = name;
-
@@ -138 +190 @@
-        switch (act) {
-            case Action.Store, Action.Append:
+                assert(type != ArgType.None);
-                break;
-            case Action.StoreConst, Action.AppendConst:
+                assert(type == ArgType.None);
-                assert(const_value !is null);
-                break;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        this.const_value = const_value;
-        this.callback = dga;
+        this.int_callback = dgi;
-        this.void_callback = dg;
-    }
-    // Does whatever this option is supposed to do.
-    void perform_action(Options results, char[] arg) {
-
+
+
+
+
+
-        switch (this.action) {
-            case Action.Store:
@@ -166 +233 @@
-            case Action.StoreConst:
-                assert(arg is null, "Got unexpected argument for '"~name~"' option.");
-
-
-
-
+
-                break;
-            case Action.AppendConst:
@@ -179 +243 @@
-                ++results.counted_opts[name];
-                break;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                break;
-            case Action.Help:
@@ -191 +262 @@
-    }
-    bool hasArg() {
-
-
-
-
-
-
+
-    }
-    // Returns true if the passed option string matches this option.
@@ -333 +399 @@
-    }
-
+    //             options  action               name  type                              const_value  dga   dgv   dgi
-    void add_option(char[][] options ...) {
-null,
+       null, defaultType(Action.Store),        null,       
-    }
-    void add_option(char[][] options, char[] name) {
-name,
+       name, defaultType(Action.Store),        null,       
-    }
-    void add_option(char[][] options, Action action) {
-
+
+
+
+
+
+
+
-    }
-    void add_option(char[][] options, char[] name, Action action) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    void add_option(char[][] options, OptionCallbackArg dg) {
-Arg, null, null, dg
+,     null, defaultType(Action.Callback),     null,        dg,   null
-    }
-    void add_option(char[][] options, OptionCallback dg) {
-
-
+
+
+
+
+
+
+
-    void add_option(
-        char[][] options, 
-
-
+
+
+
-    ) {
-        char[][] shortopts;
@@ -383 +474 @@
-                name = shortopts[0][1 .. 2];
-        }
-action, name, const_value, callback, v
-
-
-
+type, action, name, const_value, callback, vcall, i
+
+
+

misc/opttest.d

@@ -4 +4 @@
-
-void print_opts(Options options) {
-
-
-
+
+
+
+
+
-    foreach (a; options.args) {
-
+  
-    }
-}
@@ -19 +21 @@
-        writefln("callback encountered");
-    });
+    parser.add_option(["-n", "--number"], (int i) {
+        writefln("number callback: %d * 2 = %d", i, i*2);
+    });
+    parser.add_option(["-V", "--value"], ArgType.Integer);
+    parser.add_option(["-l", "--list"], Action.Append, ArgType.Integer);
-    parser.add_option(["-v", "--verbose"], Action.Count);
-    auto options = parser.parse_args(args);