Changeset 1545

Timestamp:

05/23/10 11:52:53 (15 years ago)

Author:

rsinfu

Message:

Fixed bugzilla 3880: std.regex functions with const/immutable Regex object.

- Passing const/immutable/shared Regex object to match() and replace() is perfectly safe. Just the template constraints were unaware of the qualifiers.
- Example for splitter() was a bit wrong (compare with the correct one in the unittest around line 2990.)

Files:

• trunk/docsrc/changelog.dd (modified) (1 diff)
• trunk/phobos/std/regex.d (modified) (3 diffs)

trunk/docsrc/changelog.dd

@@ -7 +7 @@
-
-    $(WHATSNEW
-    $(LI std.functional: toDelegate now accepts callable(function pointers, delegates and objects implement opCall) )
-    $(LI std.traits: Added templates to get compile-time information about functions.)
-    $(LI std.typecons: Added tie and AutoImplement.)
-    )
-    $(BUGSFIXED
-    $(LI $(BUGZILLA 2835): std.socket.TcpSocket doesn't actually connect)
-    $(LI $(BUGZILLA 3200): std.xml doesn't follow spec for Tag.text)
-    $(LI $(BUGZILLA 3873): std.range.repeat should have popBack defined)
+    $(LI $(BUGZILLA 3880): std.regex functions with const/immutable Regex object)
-    $(LI $(BUGZILLA 4202): Changset 1517 doesn't compile)
-    )
-)
-
-<div id=version>
-$(UL
-    $(NEW 047)
-    $(NEW 046)
-    $(NEW 045)
-    $(NEW 044)

trunk/phobos/std/regex.d

@@ -2699 +2699 @@
-//------------------------------------------------------------------------------
-
-/**
-Matches a string against a regular expression. This is the main entry
-to the module's functionality. A call to $(D match(input, regex))
-returns a $(D RegexMatch) object that can be used for direct
-inspection or for iterating over all matches (if the regular
-expression was built with the "g" option).
- */
-RegexMatch!(Range) match(Range, Engine)(Range r, Engine engine)
-
+Unqual!
-{
-    return typeof(return)(engine, r);
-}
-
-RegexMatch!(Range) match(Range, E)(Range r, E[] engine, string opt = null)
-//if (is(Engine == Regex!(Unqual!(ElementType!(Range)))))
-{
-    return typeof(return)(regex(engine, opt), r);
-}
-
@@ -2781 +2781 @@
-
-The replacement format can reference the matches using the $&, $$,
-$', $`, $0 .. $99 notation:
-
----
-assert(replace("noon", regex("^n"), "[$&]") == "[n]oon");
----
- */
-
-Range replace(Range, Engine, String)(Range input, Engine regex, String format)
-
+Unqual!
-{
-    return RegexMatch!(Range)(regex, input).replaceAll(format);
-}
-
-unittest
-{
-    debug(regex) printf("regex.sub.unittest\n");
-    assert(replace("hello", regex("ll"), "ss") == "hesso");
-    assert(replace("barat", regex("a"), "A") == "bArat");
-    assert(replace("barat", regex("a", "g"), "A") == "bArAt");
@@ -2900 +2900 @@
-//------------------------------------------------------------------------------
-
-/**
-Range that splits another range using a regular expression as a
-separator.
-
-Example:
-----
-auto s1 = ", abc, de,  fg, hi, ";
-assert(equal(splitter(s1, regex(", *")),
-
+, ""
-----
- */
-struct Splitter(Range)
-{
-    Range _input;
-    size_t _offset;
-    alias Regex!(Unqual!(typeof(Range.init[0]))) Rx;
-    // Rx _rx;
-    RegexMatch!(Range) _match;
-