Changeset 1558

Timestamp:

05/26/10 06:00:04 (15 years ago)

Author:

rsinfu

Message:

Fixed unittest failure in regex and regexp.

Recent druntime embeds backtrace information in Exception.toString(). So the actual error message will not be identical to the argument passed to error().

Files:

• trunk/phobos/std/regex.d (modified) (1 diff)
• trunk/phobos/std/regexp.d (modified) (1 diff)

trunk/phobos/std/regex.d

@@ -282 +282 @@
-        try
-        {
-            auto r2 = Regex("hello", "q");
-            assert(0);
-        }
-        catch (Exception ree)
-        {
-            msg = ree.toString();
-            //writefln("message: %s", ree);
-        }
-msg == "object.Exception: unrecognized attribute"
+indexOf(msg, "unrecognized attribute") >= 0
-    }
-
-/**
-Returns the number of parenthesized captures
-*/
-    uint captures() const
-    {
-        return re_nsub;
-    }
-

trunk/phobos/std/regexp.d

@@ -669 +669 @@
-        try
-        {
-            auto r2 = RegExp("hello", "q");
-            assert(0);
-        }
-        catch (RegExpException ree)
-        {
-            msg = ree.toString();
-            //writefln("message: %s", ree);
-        }
-msg == "std.regexp.RegExpException: unrecognized attribute"
+indexOf(msg, "unrecognized attribute") >= 0
-    }
-
-    /************************************
-     * Set up for start of foreach loop.
-     * Returns:
-     *  search() returns instance of RegExp set up to _search string[].
-     * Example:
-     * ---
-     * import std.stdio;
-     * import std.regexp;