From 380b0d0e5d53bfc6f2a84ffbeb4e30c42065cc18 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Fri, 29 May 2009 16:57:28 -0700
Subject: [PATCH] Bring back the Rhino regex patch to use native Java regex.

---
 Objective-J/Tools/objj/lib/objj/objjc.js            |  2 ++
 .../Tools/objj/lib/objj/regexp-rhino-patch.js       | 13 +++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)
 rename Tools/Utilities/regex-bridge.js => Objective-J/Tools/objj/lib/objj/regexp-rhino-patch.js (83%)

diff --git a/Objective-J/Tools/objj/lib/objj/objjc.js b/Objective-J/Tools/objj/lib/objj/objjc.js
index debff871b..9d9357f1c 100644
--- a/Objective-J/Tools/objj/lib/objj/objjc.js
+++ b/Objective-J/Tools/objj/lib/objj/objjc.js
@@ -1,6 +1,8 @@
 var File = require("file");
 var window = require("browser/window");
 
+require("./regexp-rhino-patch");
+
 var exported = ["OBJJ_HOME", "objj_preprocess",
     "FRAGMENT_FILE", "FRAGMENT_LOCAL",
     "MARKER_CODE", "MARKER_IMPORT_STD", "MARKER_IMPORT_LOCAL",
diff --git a/Tools/Utilities/regex-bridge.js b/Objective-J/Tools/objj/lib/objj/regexp-rhino-patch.js
similarity index 83%
rename from Tools/Utilities/regex-bridge.js
rename to Objective-J/Tools/objj/lib/objj/regexp-rhino-patch.js
index 7f3afe76c..9b0c15e03 100644
--- a/Tools/Utilities/regex-bridge.js
+++ b/Objective-J/Tools/objj/lib/objj/regexp-rhino-patch.js
@@ -1,9 +1,3 @@
-importClass(java.util.ArrayList);
-importClass(java.util.List);
-importClass(java.util.regex.Matcher);
-importClass(java.util.regex.Pattern);
-importClass(java.util.regex.PatternSyntaxException);
-
 var CachedRegexData = [];
 
 function regexDataFromRegex(aRegex)
@@ -37,10 +31,10 @@ function regexDataFromRegex(aRegex)
     source = source.replace("(?<!\\\\)\\{(?!\\d)", "\\\\{", "g");
     source = source.replace("(?<!(\\d,?|\\\\))\\}", "\\\\}", "g");
             
-    return CachedRegexData[string] = { pattern:Pattern.compile(source, 0), flags:flags };
+    return CachedRegexData[string] = { pattern:java.util.regex.Pattern.compile(source, 0), flags:flags };
 }
 
-String.prototype.match = function(regex)
+function newMatch(regex)
 {
     var regexData = regexDataFromRegex(regex);
     
@@ -74,3 +68,6 @@ String.prototype.match = function(regex)
     
     return groups;
 }
+
+if (system.platform === "rhino")
+    String.prototype.match = newMatch;