do not replace String.prototype.match.

tokuhirom · Aug 29, 2012 · e741449 · e741449
1 parent 1d07f60
commit e741449
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/runtime.js b/src/runtime.js
@@ -55,11 +55,12 @@
     }
 
     // TODO: optimize
-    var origStringPrototypeMatch = String.prototype.match;
     var lastMatch = [];
-    String.prototype.match = function () {
-        lastMatch = origStringPrototypeMatch.apply(this, Array.prototype.slice.call(arguments));
-        return lastMatch;
+    global.Kuma.Runtime = {
+        match: function (str, re) {
+            lastMatch = str.match(re);
+            return lastMatch;
+        }
     };
 
     var glob_cache;

diff --git a/src/translator.js b/src/translator.js
@@ -474,7 +474,7 @@
                 return ret;
             }).call(this);
         case Parser.NODE_REGEXP_MATCH:
-            return "((" + this._translate(ast[ND_DATAS][0]) + ").match(" + this._translate(ast[ND_DATAS][1]) + "))";
+            return "(Kuma.Runtime.match((" + this._translate(ast[ND_DATAS][0]) + "),(" + this._translate(ast[ND_DATAS][1]) + ")))";
         case Parser.NODE_REGEXP_NOT_MATCH:
             return "(!((" + this._translate(ast[ND_DATAS][0]) + ").match(" + this._translate(ast[ND_DATAS][1]) + ")))";
         case Parser.NODE_DOTDOTDOT: