Changeset 98

Timestamp:

02/07/07 19:30:19 (2 years ago)

Author:

KirkMcDonald

Message:

Added default argument features to Tango version of optparse.

Files:

• misc/tango/optparse.d (modified) (6 diffs)

misc/tango/optparse.d

@@ -31 +31 @@
-import tango.text.Ascii : toUpper;
-import tango.stdc.stdlib : exit, EXIT_FAILURE, EXIT_SUCCESS;
-
+, toString = toUtf8
-import tango.text.convert.Utf : toUtf8, toUtf32;
-
@@ -212 +212 @@
-    char[] name, argname;
-    char[] const_value;
+
+    char[] default_string;
+    int default_value;
+    bool default_flag, has_default;
+
-    OptionCallbackArg callback;
-    OptionCallbackInt int_callback;
@@ -235 +240 @@
-        this.name = name;
-        this.argname = toUpper(name.dup);
+        this.default_string = "";
+        this.default_value = 0;
+        this.default_flag = false;
-
-        // Perform sanity checks.
@@ -297 +305 @@
-        return result;
-    }
+    //enum Action { Store, StoreConst, Append, AppendConst, Count, SetTrue, SetFalse, Callback, CallbackFancy, Help }
+    void issue_default(Options results) {
+        // Only set the default if the option doesn't already have a value.
+        char[][]* val = this.name in results.opts;
+        switch (this.action) {
+            case Action.Store, Action.Append:
+                if (val !is null) return;
+                if (this.type == ArgType.String) {
+                    results.opts[name] = [default_string];
+                } else {
+                    results.opts[name] = [.toString(default_value)];
+                }
+                break;
+            case Action.StoreConst, Action.AppendConst:
+                if (val !is null) return;
+                results.opts[name] = [default_string];
+                break;
+            case Action.SetTrue, Action.SetFalse:
+                if (val !is null) return;
+                if (default_flag) {
+                    results.opts[name] = ["1"];
+                } else {
+                    results.opts[name] = ["0"];
+                }
+                break;
+            default:
+                return;
+        }
+    }
-    // Does whatever this option is supposed to do.
-    void performAction(OptionParser parser, Options results, inout char[][] args, inout int idx, char[] arg) {
@@ -373 +410 @@
-    Option argName(char[] argname) {
-        this.argname = argname;
+        return this;
+    }
+    Option def(char[] val) {
+        if (
+            (this.type != ArgType.String || (this.action != Action.Store && this.action != Action.Append)) &&
+            this.action != Action.StoreConst && this.action != Action.AppendConst
+        )
+            throw new OptionError("Cannot specify string default for non-string option '"~this.name~"'");
+        this.has_default = true;
+        this.default_string = val;
+        return this;
+    }
+    Option def(int val) {
+        if (this.type != ArgType.Integer || (this.action != Action.Store && this.action != Action.Append))
+            throw new OptionError("Cannot specify integer default for non-integer option '"~this.name~"'");
+        this.has_default = true;
+        this.default_value = val;
+        return this;
+    }
+    Option def(bool val) {
+        if (this.action != Action.SetTrue && this.action != Action.SetFalse)
+            throw new OptionError("Cannot specify boolean default for non-flag option '"~this.name~"'");
+        this.has_default = true;
+        this.default_flag = val;
-        return this;
-    }
@@ -606 +667 @@
-                }
-            }
+        }
+        foreach (o; this.options) {
+            o.issue_default(options);
-        }
-        return options;