diff --git a/js/rhino/org/mozilla/javascript/Interpreter.java b/js/rhino/org/mozilla/javascript/Interpreter.java index 4dd559d0aa7f..4552192564fb 100644 --- a/js/rhino/org/mozilla/javascript/Interpreter.java +++ b/js/rhino/org/mozilla/javascript/Interpreter.java @@ -80,7 +80,7 @@ public class Interpreter extends LabelTable { Node regexp = (Node) regexps.elementAt(i); Node left = regexp.getFirstChild(); Node right = regexp.getLastChild(); - result[i] = rep.newRegExp(scope, left.getString(), + result[i] = rep.newRegExp(cx, scope, left.getString(), (left != right) ? right.getString() : null); regexp.putProp(Node.REGEXP_PROP, new Integer(i)); } diff --git a/js/rhino/org/mozilla/javascript/RegExpProxy.java b/js/rhino/org/mozilla/javascript/RegExpProxy.java index 54e23af2e5c1..182302d07aba 100644 --- a/js/rhino/org/mozilla/javascript/RegExpProxy.java +++ b/js/rhino/org/mozilla/javascript/RegExpProxy.java @@ -31,7 +31,7 @@ public interface RegExpProxy { public boolean isRegExp(Object obj); - public Object newRegExp(Scriptable scope, String source, String global); + public Object newRegExp(Context cx, Scriptable scope, String source, String global); public Object match(Context cx, Scriptable thisObj, Object[] args, Function funObj) diff --git a/js/rhino/src/org/mozilla/javascript/Interpreter.java b/js/rhino/src/org/mozilla/javascript/Interpreter.java index 4dd559d0aa7f..4552192564fb 100644 --- a/js/rhino/src/org/mozilla/javascript/Interpreter.java +++ b/js/rhino/src/org/mozilla/javascript/Interpreter.java @@ -80,7 +80,7 @@ public class Interpreter extends LabelTable { Node regexp = (Node) regexps.elementAt(i); Node left = regexp.getFirstChild(); Node right = regexp.getLastChild(); - result[i] = rep.newRegExp(scope, left.getString(), + result[i] = rep.newRegExp(cx, scope, left.getString(), (left != right) ? right.getString() : null); regexp.putProp(Node.REGEXP_PROP, new Integer(i)); } diff --git a/js/rhino/src/org/mozilla/javascript/RegExpProxy.java b/js/rhino/src/org/mozilla/javascript/RegExpProxy.java index 54e23af2e5c1..182302d07aba 100644 --- a/js/rhino/src/org/mozilla/javascript/RegExpProxy.java +++ b/js/rhino/src/org/mozilla/javascript/RegExpProxy.java @@ -31,7 +31,7 @@ public interface RegExpProxy { public boolean isRegExp(Object obj); - public Object newRegExp(Scriptable scope, String source, String global); + public Object newRegExp(Context cx, Scriptable scope, String source, String global); public Object match(Context cx, Scriptable thisObj, Object[] args, Function funObj)