6 files changed, 221 insertions, 0 deletions
diff --git a/js/src/tests/js1_4/Eval/browser.js b/js/src/tests/js1_4/Eval/browser.js
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/js/src/tests/js1_4/Eval/browser.js
diff --git a/js/src/tests/js1_4/Eval/eval-001.js b/js/src/tests/js1_4/Eval/eval-001.js
new file mode 100644
index 000000000..3c4ef94f0
--- /dev/null
+++ b/js/src/tests/js1_4/Eval/eval-001.js
@@ -0,0 +1,57 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:   eval-001.js
+ *  Original Description: (SEE REVISED DESCRIPTION FURTHER BELOW)
+ *
+ *  The global eval function may not be accessed indirectly and then called.
+ *  This feature will continue to work in JavaScript 1.3 but will result in an
+ *  error in JavaScript 1.4. This restriction is also in place for the With and
+ *  Closure constructors.
+ *
+ *  http://scopus.mcom.com/bugsplat/show_bug.cgi?id=324451
+ *
+ *  Author:          christine@netscape.com
+ *  Date:               11 August 1998
+ *
+ *
+ *  REVISION:    05  February 2001
+ *  Author:          pschwartau@netscape.com
+ * 
+ *  Indirect eval IS NOT ILLEGAL per ECMA3!!!  See
+ *
+ *  http://bugzilla.mozilla.org/show_bug.cgi?id=38512
+ *
+ *  ------- Additional Comments From Brendan Eich 2001-01-30 17:12 -------
+ * ECMA-262 Edition 3 doesn't require implementations to throw EvalError,
+ * see the short, section-less Chapter 16.  It does say an implementation that
+ * doesn't throw EvalError must allow assignment to eval and indirect calls
+ * of the evalnative method.
+ *
+ */
+var SECTION = "eval-001.js";
+var VERSION = "JS1_4";
+var TITLE   = "Calling eval indirectly should NOT fail in version 140";
+var BUGNUMBER="38512";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var MY_EVAL = eval;
+var RESULT = "";
+var EXPECT = "abcdefg";
+
+MY_EVAL( "RESULT = EXPECT" );
+
+new TestCase(
+  SECTION,
+  "Call eval indirectly",
+  EXPECT,
+  RESULT );
+
+test();
+
diff --git a/js/src/tests/js1_4/Eval/eval-002.js b/js/src/tests/js1_4/Eval/eval-002.js
new file mode 100644
index 000000000..9f96f6e5b
--- /dev/null
+++ b/js/src/tests/js1_4/Eval/eval-002.js
@@ -0,0 +1,63 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:   eval-002.js
+ *  Description:  (SEE REVISED DESCRIPTION FURTHER BELOW)
+ *
+ *  The global eval function may not be accessed indirectly and then called.
+ *  This feature will continue to work in JavaScript 1.3 but will result in an
+ *  error in JavaScript 1.4. This restriction is also in place for the With and
+ *  Closure constructors.
+ *
+ *  http://scopus.mcom.com/bugsplat/show_bug.cgi?id=324451
+ *
+ *  Author:          christine@netscape.com
+ *  Date:               11 August 1998
+ *
+ *
+ *  REVISION:    05  February 2001
+ *  Author:          pschwartau@netscape.com
+ * 
+ *  Indirect eval IS NOT ILLEGAL per ECMA3!!!  See
+ *
+ *  http://bugzilla.mozilla.org/show_bug.cgi?id=38512
+ *
+ *  ------- Additional Comments From Brendan Eich 2001-01-30 17:12 -------
+ * ECMA-262 Edition 3 doesn't require implementations to throw EvalError,
+ * see the short, section-less Chapter 16.  It does say an implementation that
+ * doesn't throw EvalError must allow assignment to eval and indirect calls
+ * of the evalnative method.
+ *
+ */
+var SECTION = "eval-002.js";
+var VERSION = "JS1_4";
+var TITLE   = "Calling eval indirectly should NOT fail in version 140";
+var BUGNUMBER="38512";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var MY_EVAL = eval;
+var RESULT = "";
+var EXPECT = 1 + "testString"
+
+  EvalTest();
+
+test();
+
+
+function EvalTest()
+{   
+  MY_EVAL( "RESULT = EXPECT" );
+
+  new TestCase(
+    SECTION,
+    "Call eval indirectly",
+    EXPECT,
+    RESULT );
+}
+
diff --git a/js/src/tests/js1_4/Eval/eval-003.js b/js/src/tests/js1_4/Eval/eval-003.js
new file mode 100644
index 000000000..d7957d323
--- /dev/null
+++ b/js/src/tests/js1_4/Eval/eval-003.js
@@ -0,0 +1,67 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+
+/**
+ *  File Name:    eval-003.js
+ *  Description:  (SEE REVISED DESCRIPTION FURTHER BELOW)
+ *
+ *  The global eval function may not be accessed indirectly and then called.
+ *  This feature will continue to work in JavaScript 1.3 but will result in an
+ *  error in JavaScript 1.4. This restriction is also in place for the With and
+ *  Closure constructors.
+ *
+ *  http://scopus.mcom.com/bugsplat/show_bug.cgi?id=324451
+ *
+ *  Author:          christine@netscape.com
+ *  Date:               11 August 1998
+ *
+ *
+ *  REVISION:    05  February 2001
+ *  Author:          pschwartau@netscape.com
+ * 
+ *  Indirect eval IS NOT ILLEGAL per ECMA3!!!  See
+ *
+ *  http://bugzilla.mozilla.org/show_bug.cgi?id=38512
+ *
+ *  ------- Additional Comments From Brendan Eich 2001-01-30 17:12 -------
+ * ECMA-262 Edition 3 doesn't require implementations to throw EvalError,
+ * see the short, section-less Chapter 16.  It does say an implementation that
+ * doesn't throw EvalError must allow assignment to eval and indirect calls
+ * of the evalnative method.
+ *
+ */
+var SECTION = "eval-003.js";
+var VERSION = "JS1_4";
+var TITLE   = "Calling eval indirectly should NOT fail in version 140";
+var BUGNUMBER="38512";
+
+startTest();
+writeHeaderToLog( SECTION + " "+ TITLE);
+
+var MY_EVAL = eval;
+var RESULT = "";
+var EXPECT= "";
+var h = function f(x,y){var g = function(z){return Math.exp(z);}; return g(x+y);};
+   
+
+new EvalTest();
+
+test();
+
+function EvalTest()
+{
+  with( this ) {
+    MY_EVAL( "RESULT = h(-1, 1)" );
+    EXPECT = 1;  //The base e to the power (-1 + 1),  i.e. the power 0,  equals 1 ....
+
+    new TestCase(
+      SECTION,
+      "Call eval indirectly",
+      EXPECT,
+      RESULT );
+  }
+}
+
diff --git a/js/src/tests/js1_4/Eval/regress-531682.js b/js/src/tests/js1_4/Eval/regress-531682.js
new file mode 100644
index 000000000..2969b9817
--- /dev/null
+++ b/js/src/tests/js1_4/Eval/regress-531682.js
@@ -0,0 +1,34 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */
+/*
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/licenses/publicdomain/
+ */
+
+//-----------------------------------------------------------------------------
+var BUGNUMBER = 531682;
+var summary = 'Checking proper wrapping of scope in  eval(source, scope)';
+var actual;
+var expect;
+
+//-----------------------------------------------------------------------------
+var x = 0;
+
+test();
+//-----------------------------------------------------------------------------
+
+function scope1() {
+    eval('var x = 1;');
+    return function() { return x; }
+}
+
+function test() {
+    enterFunc ('test');
+    printBugNumber(BUGNUMBER);
+    printStatus (summary);
+
+    // The scope chain in eval should be just scope1() and the global object.
+    actual = eval('x', scope1());
+    expect = 0;
+    reportCompare(expect, actual, summary);
+    exitFunc ('test');
+}
diff --git a/js/src/tests/js1_4/Eval/shell.js b/js/src/tests/js1_4/Eval/shell.js
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/js/src/tests/js1_4/Eval/shell.js