Merge pull request #1404 from jugglinmike/refactor-for-parsers-function

Refactor function literal tests for parsers

test/language/statements/function/13.1-3-8.js → test/language/expressions/function/name-arguments-non-strict.js

@@ -9,4 +9,4 @@ description: >
 flags: [noStrict]
 ---*/
 
-    eval("(function arguments (){});");
+(function arguments (){});

test/language/statements/function/13.1-42-s.js → test/language/expressions/function/name-arguments-strict-body.js

@@ -7,10 +7,12 @@ description: >
     StrictMode - SyntaxError is thrown if 'arguments' occurs as the
     Identifier of a FunctionExpression whose FunctionBody is contained
     in strict code
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [noStrict]
 ---*/
 
-        var _13_1_42_s = {};
-assert.throws(SyntaxError, function() {
-            eval("_13_1_42_s.x = function arguments() {'use strict';};");
-});
+throw "Test262: This statement should not be evaluated.";
+
+(function arguments() {'use strict';});

test/language/statements/function/13.1-14-s.js → test/language/expressions/function/name-arguments-strict.js

@@ -6,10 +6,12 @@ es5id: 13.1-14-s
 description: >
     StrictMode - SyntaxError is thrown if 'arguments' occurs as the
     Identifier of a FunctionExpression in strict mode
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [onlyStrict]
 ---*/
 
-        var _13_1_14_s = {};
-assert.throws(SyntaxError, function() {
-            eval("_13_1_14_s.x = function arguments() {};");
-});
+throw "Test262: This statement should not be evaluated.";
+
+(function arguments() {});

test/language/statements/function/13.1-3-2.js → test/language/expressions/function/name-eval-non-strict.js

@@ -9,4 +9,4 @@ description: >
 flags: [noStrict]
 ---*/
 
-    eval("(function eval(){});");
+(function eval(){});

test/language/statements/function/13.1-38-s.js → test/language/expressions/function/name-eval-strict-body.js

@@ -7,10 +7,12 @@ description: >
     StrictMode - SyntaxError is thrown if 'eval' occurs as the
     Identifier of a FunctionExpression whose FunctionBody is contained
     in strict code
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [noStrict]
 ---*/
 
-        var _13_1_38_s = {};
-assert.throws(SyntaxError, function() {
-            eval("_13_1_38_s.x = function eval() {'use strict'; };");
-});
+throw "Test262: This statement should not be evaluated.";
+
+(function eval() {'use strict';});

test/language/statements/function/13.1-12-s.js → test/language/expressions/function/name-eval-strict.js

@@ -6,10 +6,12 @@ es5id: 13.1-12-s
 description: >
     StrictMode - SyntaxError is thrown if 'eval' occurs as the
     Identifier of a FunctionExpression in strict mode
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [onlyStrict]
 ---*/
 
-        var _13_1_12_s = {};
-assert.throws(SyntaxError, function() {
-            eval("_13_1_12_s.x = function eval() {};");
-});
+throw "Test262: This statement should not be evaluated.";
+
+(function eval() {});

test/language/statements/function/13.1-2-6.js → test/language/expressions/function/param-arguments-non-strict.js

@@ -9,4 +9,4 @@ description: >
 flags: [noStrict]
 ---*/
 
-    eval("(function foo(arguments){});");
+(function foo(arguments){});

test/language/statements/function/13.1-1-2.js → test/language/expressions/function/param-duplicated-non-strict.js

@@ -9,4 +9,4 @@ description: >
 flags: [noStrict]
 ---*/
 
-    eval('(function foo(a,a){})');
+(function foo(a,a){});

test/language/statements/function/13.1-8-s.js → test/language/expressions/function/param-duplicated-strict-1.js

@@ -11,10 +11,12 @@ description: >
     Strict Mode - SyntaxError is thrown if a function is created in
     'strict mode' using a FunctionExpression and the function has two
     identical parameters
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [onlyStrict]
 ---*/
 
+throw "Test262: This statement should not be evaluated.";
 
-assert.throws(SyntaxError, function() {
-            eval("var _13_1_8_fun = function (param, param) { };");
-});
+(function (param, param) { });

test/language/statements/function/13.1-9-s.js → test/language/expressions/function/param-duplicated-strict-2.js

@@ -12,10 +12,12 @@ description: >
     'strict mode' using a FunctionExpression and the function has two
     identical parameters, which are separated by a unique parameter
     name
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [onlyStrict]
 ---*/
 
+throw "Test262: This statement should not be evaluated.";
 
-assert.throws(SyntaxError, function() {
-            eval("var _13_1_9_fun = function (param1, param2, param1) { };");
-});
+(function (param1, param2, param1) { });

test/language/statements/function/13.1-10-s.js → test/language/expressions/function/param-duplicated-strict-3.js

@@ -11,10 +11,12 @@ description: >
     Strict Mode - SyntaxError is thrown if a function is created in
     'strict mode' using a FunctionExpression and the function has
     three identical parameters
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [onlyStrict]
 ---*/
 
+throw "Test262: This statement should not be evaluated.";
 
-assert.throws(SyntaxError, function() {
-            eval("var _13_1_10_fun = function (param, param, param) { };")
-});
+(function (param, param, param) { });

test/language/statements/function/13.1-30-s.js → test/language/expressions/function/param-duplicated-strict-body-1.js

@@ -11,10 +11,12 @@ description: >
     Strict Mode - SyntaxError is thrown if a function is created using
     a FunctionExpression whose FunctionBody is contained in strict
     code and the function has two identical parameters
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [noStrict]
 ---*/
 
+throw "Test262: This statement should not be evaluated.";
 
-assert.throws(SyntaxError, function() {
-            eval("var _13_1_30_fun = function (param, param) { 'use strict'; };");
-});
+(function (param, param) { 'use strict'; });

test/language/statements/function/13.1-32-s.js → test/language/expressions/function/param-duplicated-strict-body-2.js

@@ -12,10 +12,12 @@ description: >
     a FunctionExpression whose FunctionBody is strict and the function
     has two identical parameters, which are separated by a unique
     parameter name
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [noStrict]
 ---*/
 
+throw "Test262: This statement should not be evaluated.";
 
-assert.throws(SyntaxError, function() {
-            eval("var _13_1_32_fun = function (param1, param2, param1) { 'use strict'; };");
-});
+(function (param1, param2, param1) { 'use strict'; });

test/language/statements/function/13.1-34-s.js → test/language/expressions/function/param-duplicated-strict-body-3.js

@@ -10,10 +10,12 @@ es5id: 13.1-34-s
 description: >
     Strict Mode - SyntaxError is thrown if a function declaration has
     three identical parameters with a strict mode body
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [noStrict]
 ---*/
 
+throw "Test262: This statement should not be evaluated.";
 
-assert.throws(SyntaxError, function() {
-            eval("var _13_1_34_fun = function (param, param, param) { 'use strict'; };")
-});
+(function (param, param, param) { 'use strict'; });

test/language/statements/function/13.1-2-2.js → test/language/expressions/function/param-eval-non-strict.js

@@ -9,4 +9,4 @@ description: >
 flags: [noStrict]
 ---*/
 
-    eval("(function foo(eval){});");
+(function foo(eval){});

test/language/statements/function/13.1-18-s.js → test/language/expressions/function/param-eval-strict-body.js

@@ -11,10 +11,12 @@ description: >
     StrictMode - SyntaxError is thrown if the identifier 'eval'
     appears within a FormalParameterList of a strict mode
     FunctionExpression when FuctionBody is strict code
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [noStrict]
 ---*/
 
+throw "Test262: This statement should not be evaluated.";
 
-assert.throws(SyntaxError, function() {
-            eval("var _13_1_18_fun = function (eval) { 'use strict'; }");
-});
+(function (eval) { 'use strict'; });

test/language/statements/function/S13_A7_T2.js

-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: The FunctionBody must be SourceElements
-es5id: 13_A7_T2
-description: >
-    Inserting elements that is different from SourceElements into the
-    FunctionBody
----*/
-
-//////////////////////////////////////////////////////////////////////////////
-//CHECK#1
-try{
-	eval("function __func(){/ ABC}");
-	$ERROR('#1: eval("function __func(){/ ABC}") lead to throwing exception');
-} catch(e){
-	if(!(e instanceof SyntaxError)){
-		$ERROR('#1.1: eval("function __func(){/ ABC}") lead to throwing exception of SyntaxError. Actual: exception is '+e);
-	}
-}
-//
-//////////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////////
-//CHECK#3
-try{
-	eval("function __func(){&1}");
-	$ERROR('#3: eval("function __func(){&1}") lead to throwing exception');
-} catch(e){
-	if(!(e instanceof SyntaxError)){
-		$ERROR('#3.1: eval("function __func(){&1}") lead to throwing exception of SyntaxError. Actual: exception is '+e);
-	}
-}
-//
-//////////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////////
-//CHECK#4
-try{
-	eval("function __func(){# ABC}");
-	$ERROR('#4: eval("function __func(){# ABC}") lead to throwing exception');
-} catch(e){
-	if(!(e instanceof SyntaxError)){
-		$ERROR('#4.1: eval("function __func(){# ABC}") lead to throwing exception of SyntaxError. Actual: exception is '+e);
-	}
-}
-//
-//////////////////////////////////////////////////////////////////////////////

test/language/statements/function/13.0-10-s.js → test/language/statements/function/enable-strict-via-body.js

@@ -10,16 +10,17 @@ description: >
     Strict Mode - SourceElements is evaluated as strict mode code when
     the code of this FunctionBody with an inner function contains a
     Use Strict Directive
+negative:
+  phase: parse
+  type: SyntaxError
 flags: [noStrict]
 ---*/
 
-        function _13_0_10_fun() {
-            function _13_0_10_inner() {
-                "use strict";
-                eval("eval = 42;");
-            }
-            _13_0_10_inner();
-        };
-assert.throws(SyntaxError, function() {
-            _13_0_10_fun();
-});
+throw "Test262: This statement should not be evaluated.";
+
+function _13_0_10_fun() {
+    function _13_0_10_inner() {
+        "use strict";
+        eval = 42;
+    }
+}