Changeset 3699

Timestamp:

07/02/08 17:12:10 (3 months ago)

Author:

jascha

Message:

- fixed #1019 #1061 #1075 #1078 #1101

Files:

• trunk/tango/text/Regex.d (modified) (6 diffs)

trunk/tango/text/Regex.d

@@ -1951 +1951 @@
-
-        char_t  last;
-
+
+
-        for ( ; !endOfPattern && peekPattern != ']'; )
-        {
@@ -1958 +1959 @@
-            {
-                case '-':
+                    if ( first_char ) {
+                        trans.predicate.appendInput(range_t(c));
+                        break;
+                    }
-                    if ( !have_range_start )
-
+f
-                    else if ( endOfPattern || peekPattern == ']' )
-
+f
-                    else {
-                        c = readPattern;
@@ -1992 +1997 @@
-                    have_range_start = true;
-            }
+            first_char = false;
-        }
-        if ( !endOfPattern )
@@ -2657 +2663 @@
-        }
-
+        debug
+        {
+            foreach ( ref v; registers )
+            {
+                if ( (v in regNums) !is null )
+                    v = regNums[v];
+            }
+        }
+
-        minimizeDFA;
-
@@ -3347 +3362 @@
-                if ( te.nfa_state.index != fe.nfa_state.index )
-                    continue;
+                if ( fe.tags.length != te.tags.length )
+                    return false;
-                foreach ( tag, findex; fe.tags )
-                {
@@ -3976 +3993 @@
-        char_t[] tmp = input;
-        if ( output_buffer.length <= 0 )
-
++replacement.length
-        output_buffer.length = 0;
-
-        foreach ( r; search(input) )
+        {
+            tmp = pre;
+            if ( tmp.length > last_start_ )
+                output_buffer ~= tmp[last_start_ .. $];
+            output_buffer ~= replacement;
+            tmp = post;
+        }
+        output_buffer ~= tmp;
+        return output_buffer;
+    }
+
+    /**********************************************************************************************
+        Returns a copy of the input with the last match replaced by replacement.
+    **********************************************************************************************/
+    char_t[] replaceLast(char_t[] input, char_t[] replacement, char_t[] output_buffer=null)
+    {
+        char_t[] tmp_pre, tmp_post;
+        if ( output_buffer.length <= 0 )
+            output_buffer = new char_t[input.length+replacement.length];
+        output_buffer.length = 0;
+
+        foreach ( r; search(input) ) {
+            tmp_pre = pre;
+            tmp_post = post;
+        }
+
+        if ( tmp_pre !is null || tmp_post !is null ) {
+            output_buffer ~= tmp_pre;
+            output_buffer ~= replacement;
+            output_buffer ~= tmp_post;
+        }
+        else
+            output_buffer ~= input;
+
+        return output_buffer;
+    }
+
+    /**********************************************************************************************
+        Returns a copy of the input with the first match replaced by replacement.
+    **********************************************************************************************/
+    char_t[] replaceFirst(char_t[] input, char_t[] replacement, char_t[] output_buffer=null)
+    {
+        char_t[] tmp = input;
+        if ( output_buffer.length <= 0 )
+            output_buffer = new char_t[input.length+replacement.length];
+        output_buffer.length = 0;
+
+        if ( test(input) )
-        {
-            tmp = pre;