From 45f7cee0194cfec7186f5b272a449357c8801864 Mon Sep 17 00:00:00 2001
From: Mark Miller <erights@gmail.com>
Date: Sun, 25 Sep 2011 11:21:54 -0700
Subject: [PATCH] Fixes https://bugs.ecmascript.org/show_bug.cgi?id=15
---
test/config/excludelist.xml | 2 --
.../S11.8.2_A2.3_T1.js | 17 ++++++++---------
.../S11.8.3_A2.3_T1.js | 17 ++++++++---------
3 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/test/config/excludelist.xml b/test/config/excludelist.xml
index cdd67f2fc9..42427f3c2a 100644
--- a/test/config/excludelist.xml
+++ b/test/config/excludelist.xml
@@ -92,8 +92,6 @@
<test id="S9.9_A2">https://bugs.ecmascript.org/show_bug.cgi?id=13</test>
<test id="S11.1.5_A4.1">https://bugs.ecmascript.org/show_bug.cgi?id=14</test>
<test id="S11.1.5_A4.2">https://bugs.ecmascript.org/show_bug.cgi?id=14</test>
- <test id="S11.8.2_A2.3_T1">https://bugs.ecmascript.org/show_bug.cgi?id=15</test>
- <test id="S11.8.3_A2.3_T1">https://bugs.ecmascript.org/show_bug.cgi?id=15</test>
<!-- Still invalid after a fix from Google. ES5 doesn't state Chapter 16 extensions
regarding FunctionDeclaration are invalid per-se -->
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.8_Relational_Operators/11.8.2_The_Greater_than_Operator/S11.8.2_A2.3_T1.js b/test/suite/sputnik/Conformance/11_Expressions/11.8_Relational_Operators/11.8.2_The_Greater_than_Operator/S11.8.2_A2.3_T1.js
index a81613eb63..c4a96cc85d 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.8_Relational_Operators/11.8.2_The_Greater_than_Operator/S11.8.2_A2.3_T1.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.8_Relational_Operators/11.8.2_The_Greater_than_Operator/S11.8.2_A2.3_T1.js
@@ -2,24 +2,23 @@
// This code is governed by the BSD license found in the LICENSE file.
/**
- * @name: S11.8.2_A2.3_T1;
- * @section: 11.8.2;
- * @assertion: ToNumber(second expression) is called first, and then ToNumber(first expression);
+ * In ES5, First expression should be evaluated first.
+ *
* @description: Checking with "throw";
-*/
+ */
//CHECK#1
var x = { valueOf: function () { throw "x"; } };
var y = { valueOf: function () { throw "y"; } };
try {
x > y;
- $ERROR('#1.1: var x = { valueOf: function () { throw "x"; } }; var y = { valueOf: function () { throw "y"; } }; x > y throw "y". Actual: ' + (x > y));
+ $ERROR('#1.1: Should have thrown');
} catch (e) {
- if (e === "x") {
- $ERROR('#1.2: ToNumber(second expression) is called first, and then ToNumber(first expression)');
+ if (e === "y") {
+ $ERROR('#1.2: First expression should be evaluated first');
} else {
- if (e !== "y") {
- $ERROR('#1.3: var x = { valueOf: function () { throw "x"; } }; var y = { valueOf: function () { throw "y"; } }; x > y throw "y". Actual: ' + (e));
+ if (e !== "x") {
+ $ERROR('#1.3: Failed with: ' + e);
}
}
}
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.8_Relational_Operators/11.8.3_The_Less_than_or_equal_Operator/S11.8.3_A2.3_T1.js b/test/suite/sputnik/Conformance/11_Expressions/11.8_Relational_Operators/11.8.3_The_Less_than_or_equal_Operator/S11.8.3_A2.3_T1.js
index ccf7e8adc8..32b5df2a70 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.8_Relational_Operators/11.8.3_The_Less_than_or_equal_Operator/S11.8.3_A2.3_T1.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.8_Relational_Operators/11.8.3_The_Less_than_or_equal_Operator/S11.8.3_A2.3_T1.js
@@ -2,24 +2,23 @@
// This code is governed by the BSD license found in the LICENSE file.
/**
- * @name: S11.8.3_A2.3_T1;
- * @section: 11.8.3;
- * @assertion: ToNumber(second expression) is called first, and then ToNumber(first expression);
+ * In ES5, First expression should be evaluated first.
+ *
* @description: Checking with "throw";
-*/
+ */
//CHECK#1
var x = { valueOf: function () { throw "x"; } };
var y = { valueOf: function () { throw "y"; } };
try {
x <= y;
- $ERROR('#1.1: var x = { valueOf: function () { throw "x"; } }; var y = { valueOf: function () { throw "y"; } }; x <= y throw "y". Actual: ' + (x <= y));
+ $ERROR('#1.1: Should have thrown');
} catch (e) {
- if (e === "x") {
- $ERROR('#1.2: ToNumber(second expression) is called first, and then ToNumber(first expression)');
+ if (e === "y") {
+ $ERROR('#1.2: First expression should be evaluated first');
} else {
- if (e !== "y") {
- $ERROR('#1.3: var x = { valueOf: function () { throw "x"; } }; var y = { valueOf: function () { throw "y"; } }; x <= y throw "y". Actual: ' + (e));
+ if (e !== "x") {
+ $ERROR('#1.3: Failed with: ' + e);
}
}
}