Index: test/webkit/eval-and-with.js |
diff --git a/test/webkit/concat-while-having-a-bad-time.js b/test/webkit/eval-and-with.js |
similarity index 59% |
copy from test/webkit/concat-while-having-a-bad-time.js |
copy to test/webkit/eval-and-with.js |
index dfda1e08a0b36194b787a44ee12a9693acd8aeaf..28c65985ebb7052d0c68cc4ff3f18678b2f8a613 100644 |
--- a/test/webkit/concat-while-having-a-bad-time.js |
+++ b/test/webkit/eval-and-with.js |
@@ -22,10 +22,36 @@ |
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
description( |
-"Tests the behavior of Array.prototype.concat while the array is having a bad time due to one of the elements we are concatenating." |
+"This test case checks variable resolution in the presence of both eval and with." |
); |
-Object.defineProperty(Array.prototype, 0, { writable: false }); |
-shouldBe("[42].concat()", "[42]"); |
+// Direct non-strict eval inside a with. |
+function freeVarInsideEvalAndWith(o, str) |
+{ |
+ with (o) |
+ { |
+ return function () { return eval(str); } |
+ } |
+} |
+shouldBeTrue('freeVarInsideEvalAndWith({}, "true")()') |
+shouldBeFalse('freeVarInsideEvalAndWith({}, "false")()') |
+shouldBeTrue('freeVarInsideEvalAndWith({}, "var x = 10; x")() == 10') |
+shouldBeTrue('freeVarInsideEvalAndWith({}, "var x = 10; (function (){return x;})")()() == 10') |
+ |
+function localVarInsideEvalAndWith(o, str) |
+{ |
+ with (o) |
+ { |
+ return eval(str); |
+ } |
+} |
+ |
+shouldBeTrue('localVarInsideEvalAndWith({}, "true")') |
+shouldBeFalse('localVarInsideEvalAndWith({}, "false")') |
+shouldBeTrue('localVarInsideEvalAndWith({}, "var x = true; x")') |
+shouldBeTrue('localVarInsideEvalAndWith({}, "var x = 10; (function (){return x;})")() == 10') |
+ |
+var y; |
+shouldBeTrue('localVarInsideEvalAndWith(y={x:false}, "var x = true; x && y.x")') |