Ticket #688: ArgParser.diff

tango/util/ArgParser.d

@@ -38 +38 @@
-*/
-alias void delegate () ArgParserSimpleCallback;
-
+
-/**
+    A struct that represents a "{Prefix}{Identifier}" string.
+*/
+struct Argument {
+    char[] prefix;
+    char[] identifier;
+
+    /**
+        Creates a new Argument instance with given prefix and identifier.
+    */
+    static Argument opCall ( char[] prefix, char[] identifier ) {
+        Argument result;
+
+        result.prefix = prefix;
+        result.identifier = identifier;
+
+        return result;
+    }
+}
+
+/**
+    Alias for for the lazy people.
+*/
+alias Argument Arg;
+
+
+/**
-    A utility class to parse and handle your command line arguments.
-*/
-class ArgParser{
@@ -153 +180 @@
-    }
-
-    /**
+        Binds a delegate callback to an argument.
+
+        Params:
+            argument = argument to respond to
+            callback = the delegate that should be called when the argument is found
+    */
+    public void bind (Argument argument, ArgParserCallback callback) {
+        bind(argument.prefix, argument.identifier, callback);
+    }
+
+    /**
+        Binds a delegate callback to a couple of arguments.
+
+        Params:
+            arguments = an array of Argument struct instances
+            callback = the delegate that should be called when one of the arguments is found
+    */
+    public void bind ( Argument[] arguments, void delegate(char[]) callback ) {
+        foreach (argument; arguments) { bind(argument, callback); }
+    }
+
+    /**
+        Binds a delegate callback to an identifier, the sloppy way. This means,
+        it binds for both prefixes "-" and "--", as well as identifier with, and
+        without a delimiting "=" between identifier and value.
+
+        Params:
+            identifier = argument identifier
+            callback = the delegate that should be called when one of the arguments is found
+    */
+    public void bindSimilar ( char[] identifier, ArgParserCallback callback ) {
+        bind([ Argument("-", identifier ~ "="), Argument("-", identifier),
+               Argument("--", identifier ~ "="), Argument("--", identifier) ], callback);
+    }
+
+    /**
+        Binds a delegate callback to a bunch of identifiers, the sloppy way. 
+        See bindSimilar(identifier, callback).
+
+        Params:
+            arguments = an array of argument identifiers
+            callback = the delegate that should be called when one of the arguments is found
+    */
+    public void bindSimilar ( char[][] identifiers, ArgParserCallback callback ) {
+        foreach (identifier; identifiers) { bindSimilar(identifier, callback); }
+    }
+
+    /**
-        Parses the arguments provided by the parameter. The bound
-        callbacks are called as arguments are recognized.
-
@@ -162 +237 @@
-    */
-    public void parse(char[][] arguments, bool resetOrdinals = false){
-        if (bindings.length == 0) return;
+
-        if (resetOrdinals) {
-            defaultOrdinal = 0;
-            foreach (key; prefixOrdinals.keys) {
@@ -171 +247 @@
-
-        foreach (char[] arg; arguments) {
-            char[] argData = arg;
+            char[] argOrig = argData;
-            bool found = false;
-
+
-            foreach (char[] prefix; prefixSearchOrder) {
-                if(argData.length < prefix.length) continue; 
-
-
-
-
-
-
+
+
+
+
-                if (prefix in bindings) {
+                    PrefixCallback[] candidates;
+
-                    foreach (PrefixCallback cb; bindings[prefix]) {
-                        if (argData.length < cb.id.length) continue;
+                        
-                        uint cbil = cb.id.length;
+
-                        if (cb.id == argData[0..cbil]) {
-                            found = true;
-
-
-
+
-                        }
-                    }
+
+                    if (found) {
+                        // Find the longest matching callback identifier from the candidates.
+                        uint indexLongestMatch = 0;
+
+                        if (candidates.length > 1) {
+                            foreach (i, candidate; candidates) {
+                                if (candidate.id.length > candidates[indexLongestMatch].id.length) {
+                                    indexLongestMatch = i;
+                                }
+                            }
+                        }
+
+                        // Call the best matching callback.
+                        with(candidates[indexLongestMatch]) { cb(argData[id.length..$]); }
+                    }
-                }
-                if (found) {
-                    break;