Changeset 2813

Timestamp:

11/08/07 18:32:27 (1 year ago)

Author:

Jim Panic

Message:

closes #688

Files:

• trunk/tango/util/ArgParser.d (modified) (4 diffs)

trunk/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;
+
-
-/**
@@ -154 +181 @@
-
-    /**
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        Params:
@@ -163 +240 @@
-    public void parse(char[][] arguments, bool resetOrdinals = false){
-        if (bindings.length == 0) return;
+
-        if (resetOrdinals) {
-            defaultOrdinal = 0;
@@ -172 +250 @@
-        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..$]); }
-                    }
-                }