Changeset 80

Timestamp:

01/13/07 05:56:16 (2 years ago)

Author:

KirkMcDonald

Message:

Refactored error(). error() now calls help_text().

Files:

• misc/optparse.d (modified) (4 diffs)

misc/optparse.d

@@ -72 +72 @@
-    if (s.length < end.length) return false;
-    return s[$ - end.length .. $] == end;
-}
-
-int toOptInt(char[] s) {
-    int i;
-    try {
-        i = toInt(s);
-    } catch (ConvError e) {
-        error("Could not convert '"~s~"' to an integer.");
-    }
-    return i;
-}
-
@@ -280 +270 @@
-        if (this.type == ArgType.Integer) {
-            // Verify that it's an int.
-
+parser.
-        }
-        switch (this.action) {
@@ -377 +367 @@
-}
-
-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~"'");
-}
-void expected_arg_error(char[] opt) {
-    error("'"~opt~"' option expects an argument.");
-}
-void error(char[] err) {
-    if (error_callback !is null) {
-        error_callback(err);
-    } else {
-        writefln(err);
-    }
-    exit(EXIT_FAILURE);
-}
-
-class OptionParser {
-    OptionCallbackArg leftover_cb;
-    Option[] options;
-    char[] name, desc, argdesc;
+    private void delegate(char[]) error_callback;
-
-    this(char[] desc="") {
@@ -406 +377 @@
-        this.desc = desc;
-        this.argdesc = "[options] args...";
+    }
+
+    void set_error_callback(void delegate(char[]) dg) {
+        error_callback = dg;
+    }
+    void unknown_opt_error(char[] opt) {
+        error("Unknown argument '"~opt~"'");
+    }
+    void expected_arg_error(char[] opt) {
+        error("'"~opt~"' option expects an argument.");
+    }
+    void error(char[] err) {
+        if (error_callback !is null) {
+            error_callback(err);
+        } else {
+            this.help_text();
+            writefln(err);
+        }
+        exit(EXIT_FAILURE);
+    }
+    int toOptInt(char[] s) {
+        int i;
+        try {
+            i = toInt(s);
+        } catch (ConvError e) {
+            error("Could not convert '"~s~"' to an integer.");
+        }
+        return i;
-    }
-