Changeset 126

Timestamp:

08/16/07 18:20:08 (1 year ago)

Author:

KirkMcDonald

Message:

* Fixed default arguments in optparse.
* Added comboparse and combotest. (Will add docs later.)

Files:

• misc/comboparse.d (added)
• misc/combotest.d (added)
• misc/configparse.d (modified) (4 diffs)
• misc/optparse.d (modified) (11 diffs)

misc/configparse.d

@@ -39 +39 @@
-
-version (Tango) {
+    // Although I've placed these Tango imports here, Tango support is
+    // incomplete.
-    import tango.io.FileSystem : FileSystem;
-    import tango.io.FilePath : FilePath;
@@ -55 +57 @@
-    import std.conv : toInt, toReal, ConvError;
-    import std.path : getBaseName, getDirName, join, pathsep;
-
+
+
-}
-
@@ -132 +135 @@
-            char[][] paths = split(env("PATH"), SystemPathSeparator);
-            foreach (path; paths) {
-new FileProxy(bin_name.join(path
+(new FileProxy(bin_name.join(path)
-                    return file.join(path).toUtf8();
-            }
@@ -228 +231 @@
-    /// Requests if a section exists in the parser.
-    bool has_section(char[] name) {
-name in config
+(name in config)
-    }
-    private void no_section(char[] section) {

misc/optparse.d

@@ -211 +211 @@
-enum Action { /+++/Store, /+++/StoreConst, /+++/Append, /+++/AppendConst, /+++/Count, /+++/SetTrue, /+++/SetFalse, /+++/Callback, /+++/CallbackFancy, /+++/Help /+++/}
-///
-
+, /+++/Bool
-
-/++
@@ -275 +275 @@
-    }
-    //enum Action { Store, StoreConst, Append, AppendConst, Count, SetTrue, SetFalse, Callback, CallbackFancy, Help }
+    bool supports_default() {
+        return false;
+    }
+    ArgType def_type() {
+        throw new OptionError("Option "~name~" does not support default arguments.");
+    }
+    bool has_default() {
+        throw new OptionError("Option "~name~" does not support default arguments.");
+    }
-    void issue_default(Options results) {
-        return;
@@ -333 +342 @@
-    static const ArgType default_type = ArgType.String;
-    ArgType type;
-
+_
-    char[] default_string;
-    this(char[][] options, char[] name, ArgType type) {
-        super(options, name);
+        if (type != ArgType.Integer && type != ArgType.String) {
+            throw new OptionError("Argument type for Store and Append must be Integer or String.");
+        }
-        this.type = type;
-    }
@@ -345 +357 @@
-        }
-    }
+    override ArgType def_type() {
+        return this.type;
+    }
-    override Option def(char[] val) {
-        if (this.type != ArgType.String)
-            super.def(val);
-
+_
-        this.default_string = val;
-        return this;
@@ -355 +370 @@
-        if (this.type != ArgType.Integer)
-            super.def(val);
-
+_
-        this.default_string = .toString(val);
-        return this;
-    }
+    override bool supports_default() {
+        return true;
+    }
+    override bool has_default() {
+        return _has_default;
+    }
-    override void issue_default(Options results) {
-
+_
-    }
-    override bool hasArg() {
@@ -386 +407 @@
-}
-abstract class ConstOption : Option {
-
+_
-    char[] default_value;
-    char[] const_value;
@@ -394 +415 @@
-    }
-    override Option def(char[] val) {
-
+_
-        this.default_value = val;
-        return this;
-    }
+    override ArgType def_type() {
+        return ArgType.String;
+    }
+    override bool supports_default() {
+        return true;
+    }
+    override bool has_default() {
+        return _has_default;
+    }
-    override void issue_default(Options results) {
-
+_
-    }
-}
@@ -419 +449 @@
-}
-abstract class SetBool : Option {
-
+_
-    bool default_flag = false;
-    this(char[][] options, char[] name) {
@@ -425 +455 @@
-    }
-    override Option def(bool val) {
-
+_
-        this.default_flag = val;
-        return this;
-    }
+    override ArgType def_type() {
+        return ArgType.Bool;
+    }
+    override bool supports_default() {
+        return true;
+    }
+    override bool has_default() {
+        return _has_default;
+    }
-    override void issue_default(Options results) {
-
+_
-    }
-}
@@ -703 +742 @@
-        int idx;
-        Option match;
+
+        foreach (o; this.options) {
+            o.issue_default(options);
+        }
-
-        for (int i=0; i<args.length; ++i) {
@@ -778 +821 @@
-            }
-        }
-        foreach (o; this.options) {
-            o.issue_default(options);
-        }
-        return options;
-    }