https://bugs.ecmascript.org/show_bug.cgi?id=294 partially fixed. Still

need to move some tests over to best practices.

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js

@@ -16,6 +16,6 @@ f();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js

@@ -19,6 +19,6 @@ new f();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js

@@ -19,6 +19,6 @@ new f();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js

@@ -18,6 +18,6 @@ var obj = new (function () {
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js

@@ -19,6 +19,6 @@ f();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js

@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js

@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js

@@ -21,6 +21,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js

@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js

@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js

@@ -21,6 +21,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js

@@ -21,6 +21,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js

@@ -21,6 +21,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js

@@ -20,6 +20,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js

@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js

@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js

@@ -21,6 +21,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js

@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js

@@ -22,6 +22,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js

@@ -21,6 +21,6 @@ f1();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js

@@ -21,6 +21,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js

@@ -21,6 +21,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js

@@ -20,6 +20,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js

@@ -16,6 +16,6 @@ o.foo;
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js

@@ -19,6 +19,6 @@ f();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js

@@ -16,6 +16,6 @@ o.foo = 8;
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js

@@ -6,7 +6,7 @@
 /**
  * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js
  * @description Strict mode - checking access to strict function caller from non-strict function (Injected getter includes strict directive prologue)
- * @onlyStrict
+ * @noStrict
  * @negative TypeError
  */
 
@@ -17,6 +17,6 @@ o.foo;
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js

@@ -17,6 +17,6 @@ o.foo = 10;
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js

@@ -17,6 +17,6 @@ foo();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js

@@ -16,6 +16,6 @@ eval("f();");
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js

@@ -16,6 +16,6 @@ Function("return f();")();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js

@@ -16,6 +16,6 @@ new Function("return f();")();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js

@@ -16,6 +16,6 @@ f.apply();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js

@@ -16,6 +16,6 @@ f.apply(null);
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js

@@ -16,6 +16,6 @@ f.apply(undefined);
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js

@@ -17,6 +17,6 @@ f.apply(o);
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js

@@ -16,6 +16,6 @@ f.apply(fnGlobalObject());
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js

@@ -16,6 +16,6 @@ f.call();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js

@@ -16,6 +16,6 @@ f.call(null);
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js

@@ -16,6 +16,6 @@ f.call(undefined);
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js

@@ -17,6 +17,6 @@ f.call(o);
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js

@@ -16,6 +16,6 @@ f.call(fnGlobalObject());
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js

@@ -18,6 +18,6 @@
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js

@@ -16,6 +16,6 @@ f.bind()();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js

@@ -16,6 +16,6 @@ f.bind(null)();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js

@@ -16,6 +16,6 @@ f.bind(undefined)();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js

@@ -17,6 +17,6 @@ f.bind(o)();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js

@@ -16,6 +16,6 @@ f.bind(fnGlobalObject())();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js

@@ -16,6 +16,6 @@ f();
 
 
 function gNonStrict() {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js

@@ -11,7 +11,7 @@
  */
 
 var gNonStrict = function () {
-    return gNonStrict.caller;
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
 }
 
 function f() {

test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js

@@ -10,7 +10,7 @@
  * @negative TypeError
  */
 
-var gNonStrict = Function("return gNonStrict.caller;");
+var gNonStrict = Function("return gNonStrict.caller || gNonStrict.caller.throwTypeError;");
 
 function f() {
     "use strict";

website/json/default.json

@@ -1 +1 @@
-{"date":"2012-03-06","numTests":11563,"testSuite":["json/ch07.json","json/ch08.json","json/ch09.json","json/ch10.json","json/ch11.json","json/ch12.json","json/ch13.json","json/ch14.json","json/ch15.json"],"version":"ES5.1"}
+{"date":"2012-03-08","numTests":11563,"testSuite":["json/ch07.json","json/ch08.json","json/ch09.json","json/ch10.json","json/ch11.json","json/ch12.json","json/ch13.json","json/ch14.json","json/ch15.json"],"version":"ES5.1"}

website/json/testcases_bestPractice.json

@@ -1 +1 @@
-{"date":"2012-03-06","numTests":20,"testSuite":["json/bestPractice.json"],"version":"ES5.1"}
+{"date":"2012-03-08","numTests":20,"testSuite":["json/bestPractice.json"],"version":"ES5.1"}

website/json/testcases_ch07.json

@@ -1 +1 @@
-{"date":"2012-03-06","numTests":715,"testSuite":["json/ch07.json"],"version":"ES5.1"}
+{"date":"2012-03-08","numTests":715,"testSuite":["json/ch07.json"],"version":"ES5.1"}

website/json/testcases_ch08.json

@@ -1 +1 @@
-{"date":"2012-03-06","numTests":182,"testSuite":["json/ch08.json"],"version":"ES5.1"}
+{"date":"2012-03-08","numTests":182,"testSuite":["json/ch08.json"],"version":"ES5.1"}

website/json/testcases_ch09.json

@@ -1 +1 @@
-{"date":"2012-03-06","numTests":128,"testSuite":["json/ch09.json"],"version":"ES5.1"}
+{"date":"2012-03-08","numTests":128,"testSuite":["json/ch09.json"],"version":"ES5.1"}

website/json/testcases_ch10.json

@@ -1 +1 @@
-{"date":"2012-03-06","numTests":372,"testSuite":["json/ch10.json"],"version":"ES5.1"}
+{"date":"2012-03-08","numTests":372,"testSuite":["json/ch10.json"],"version":"ES5.1"}

website/json/testcases_ch11.json

@@ -1 +1 @@
-{"date":"2012-03-06","numTests":1320,"testSuite":["json/ch11.json"],"version":"ES5.1"}
+{"date":"2012-03-08","numTests":1320,"testSuite":["json/ch11.json"],"version":"ES5.1"}

website/json/testcases_ch12.json

@@ -1 +1 @@
-{"date":"2012-03-06","numTests":521,"testSuite":["json/ch12.json"],"version":"ES5.1"}
+{"date":"2012-03-08","numTests":521,"testSuite":["json/ch12.json"],"version":"ES5.1"}

website/json/testcases_ch13.json

@@ -1 +1 @@
-{"date":"2012-03-06","numTests":230,"testSuite":["json/ch13.json"],"version":"ES5.1"}
+{"date":"2012-03-08","numTests":230,"testSuite":["json/ch13.json"],"version":"ES5.1"}

website/json/testcases_ch14.json

@@ -1 +1 @@
-{"date":"2012-03-06","numTests":24,"testSuite":["json/ch14.json"],"version":"ES5.1"}
+{"date":"2012-03-08","numTests":24,"testSuite":["json/ch14.json"],"version":"ES5.1"}

website/json/testcases_ch15.json

@@ -1 +1 @@
-{"date":"2012-03-06","numTests":8071,"testSuite":["json/ch15.json"],"version":"ES5.1"}
+{"date":"2012-03-08","numTests":8071,"testSuite":["json/ch15.json"],"version":"ES5.1"}

website/json/testcases_intl402.json

@@ -1 +1 @@
-{"date":"2012-03-06","numTests":1,"testSuite":["json/intl402.json"],"version":"ES5.1"}
+{"date":"2012-03-08","numTests":1,"testSuite":["json/intl402.json"],"version":"ES5.1"}