Corrections to sec-web-compat-evaldeclarationinstantiation and...

Corrections to sec-web-compat-evaldeclarationinstantiation and sec-web-compat-functiondeclarationinstantiation tests. Fixes gh-1364 (#1509)

test/language/eval-code/direct/block-decl-strict-source.js → test/language/eval-code/direct/block-decl-eval-source-is-strict-nostrict.js

 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-description: AnnexB extension not honored in strict mode
-es6id: B.3.3.2
+esid: sec-web-compat-evaldeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Block statement
+    in eval code containing a function declaration
 info: |
-    Block statement in eval code containing a function declaration
-
     B.3.3.3 Changes to EvalDeclarationInstantiation
 
     1. If strict is false, then
+      ...
+
+flags: [noStrict]
 ---*/
 
 var err;

test/language/eval-code/direct/block-decl-eval-source-is-strict-onlystrict.js

+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-web-compat-evaldeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Block statement
+    in eval code containing a function declaration
+info: |
+    B.3.3.3 Changes to EvalDeclarationInstantiation
+
+    1. If strict is false, then
+      ...
+
+flags: [onlyStrict]
+---*/
+
+var err;
+
+eval('"use strict";{ function f() {} }');
+
+try {
+  f;
+} catch (exception) {
+  err = exception;
+}
+
+assert.sameValue(err.constructor, ReferenceError);
+

test/language/eval-code/direct/block-decl-nostrict.js

+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-web-compat-evaldeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Block statement
+    in eval code containing a function declaration
+info: |
+    B.3.3.3 Changes to EvalDeclarationInstantiation
+
+    1. If strict is false, then
+      ...
+
+flags: [noStrict]
+---*/
+
+var err;
+
+eval('{ function f() {} }');
+
+try {
+  f;
+} catch (exception) {
+  err = exception;
+}
+
+assert.sameValue(err, undefined);

test/language/eval-code/direct/block-decl-strict-caller.js → test/language/eval-code/direct/block-decl-onlystrict.js

 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-description: AnnexB extension not honored in strict mode
-es6id: B.3.3.2
-flags: [onlyStrict]
+esid: sec-web-compat-evaldeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Block statement
+    in eval code containing a function declaration
 info: |
-    Block statement in eval code containing a function declaration
-
     B.3.3.3 Changes to EvalDeclarationInstantiation
 
     1. If strict is false, then
+      ...
+
+flags: [onlyStrict]
 ---*/
 
 var err;

test/language/eval-code/direct/switch-case-decl-strict-source.js → test/language/eval-code/direct/switch-case-decl-eval-source-is-strict-nostrict.js

 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-description: AnnexB extension not honored in strict mode
-es6id: B.3.3.3
+esid: sec-web-compat-evaldeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Function declaration
+    in the `case` clause of a `switch` statement in eval code
 info: |
-    Function declaration in the `case` clause of a `switch` statement in eval
-    code
-
     B.3.3.3 Changes to EvalDeclarationInstantiation
 
     1. If strict is false, then
+      ...
+
+flags: [noStrict]
 ---*/
 
 var err;

test/language/eval-code/direct/switch-case-decl-eval-source-is-strict-onlystrict.js

+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-web-compat-evaldeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Function declaration
+    in the `case` clause of a `switch` statement in eval code
+info: |
+    B.3.3.3 Changes to EvalDeclarationInstantiation
+
+    1. If strict is false, then
+      ...
+
+flags: [onlyStrict]
+---*/
+
+var err;
+
+eval('\
+  "use strict";\
+  switch (1) {\
+    case 1:\
+      function f() {  }\
+  }\
+');
+
+try {
+  f;
+} catch (exception) {
+  err = exception;
+}
+
+assert.sameValue(err.constructor, ReferenceError);

test/language/eval-code/direct/switch-case-decl-nostrict.js

+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-web-compat-evaldeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Function declaration
+    in the `case` clause of a `switch` statement in eval code
+info: |
+    B.3.3.3 Changes to EvalDeclarationInstantiation
+
+    1. If strict is false, then
+      ...
+
+flags: [noStrict]
+---*/
+
+var err;
+
+eval('\
+  switch (1) {\
+    case 1:\
+      function f() {  }\
+  }\
+');
+
+try {
+  f;
+} catch (exception) {
+  err = exception;
+}
+
+assert.sameValue(err, undefined);

test/language/eval-code/direct/switch-case-decl-strict-caller.js → test/language/eval-code/direct/switch-case-decl-onlystrict.js

 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-description: AnnexB extension not honored in strict mode
-es6id: B.3.3.3
-flags: [onlyStrict]
+esid: sec-web-compat-evaldeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Function declaration
+    in the `case` clause of a `switch` statement in eval code
 info: |
-    Function declaration in the `case` clause of a `switch` statement in eval
-    code
-
     B.3.3.3 Changes to EvalDeclarationInstantiation
 
     1. If strict is false, then
+      ...
+
+flags: [onlyStrict]
 ---*/
 
 var err;

test/language/eval-code/direct/switch-dflt-decl-strict-source.js → test/language/eval-code/direct/switch-dflt-decl-eval-source-is-strict-nostrict.js

 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-description: AnnexB extension not honored in strict mode
-es6id: B.3.3.3
+esid: sec-web-compat-evaldeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Function declaration
+    in the `default` clause of a `switch` statement in eval code
 info: |
-    Function declaration in the `default` clause of a `switch` statement in
-    eval code
-
     B.3.3.3 Changes to EvalDeclarationInstantiation
 
     1. If strict is false, then
+      ...
+
+flags: [noStrict]
 ---*/
 
 var err;

test/language/eval-code/direct/switch-dflt-decl-eval-source-is-strict-onlystrict.js

+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-web-compat-evaldeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Function declaration
+    in the `default` clause of a `switch` statement in eval code
+info: |
+    B.3.3.3 Changes to EvalDeclarationInstantiation
+
+    1. If strict is false, then
+      ...
+
+flags: [onlyStrict]
+---*/
+
+var err;
+
+eval('\
+  "use strict";\
+  switch (1) {\
+    default:\
+      function f() {  }\
+  }\
+');
+
+try {
+  f;
+} catch (exception) {
+  err = exception;
+}
+
+assert.sameValue(err.constructor, ReferenceError);

test/language/eval-code/direct/switch-dflt-decl-nostrict.js

+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-web-compat-evaldeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Function declaration
+    in the `default` clause of a `switch` statement in eval code
+info: |
+    B.3.3.3 Changes to EvalDeclarationInstantiation
+
+    1. If strict is false, then
+      ...
+
+flags: [noStrict]
+---*/
+
+var err;
+
+eval('\
+  switch (1) {\
+    default:\
+      function f() {  }\
+  }\
+');
+
+try {
+  f;
+} catch (exception) {
+  err = exception;
+}
+
+assert.sameValue(err, undefined);

test/language/eval-code/direct/switch-dflt-decl-strict-caller.js → test/language/eval-code/direct/switch-dflt-decl-onlystrict.js

 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-description: AnnexB extension not honored in strict mode
-es6id: B.3.3.3
-flags: [onlyStrict]
+esid: sec-web-compat-evaldeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode: Function declaration
+    in the `default` clause of a `switch` statement in eval code
 info: |
-    Function declaration in the `default` clause of a `switch` statement in
-    eval code
-
     B.3.3.3 Changes to EvalDeclarationInstantiation
 
     1. If strict is false, then
+      ...
+
+flags: [onlyStrict]
 ---*/
 
 var err;

test/language/function-code/block-decl-nostrict.js

+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-web-compat-functiondeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Block statement
+    in function code containing a function declaration
+info: |
+    B.3.3.1 Changes to FunctionDeclarationInstantiation
+
+    1. If strict is false, then
+      ...
+
+flags: [noStrict]
+---*/
+
+var err1, err2;
+
+(function() {
+  try {
+    f;
+  } catch (exception) {
+    err1 = exception;
+  }
+
+  {
+    function f() {  }
+  }
+
+  try {
+    f;
+  } catch (exception) {
+    err2 = exception;
+  }
+}());
+
+assert.sameValue(err1, undefined);
+assert.sameValue(err2, undefined);

test/language/function-code/block-decl-strict.js → test/language/function-code/block-decl-onlystrict.js

 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-description: AnnexB extension not honored in strict mode
-es6id: B.3.3.1
-flags: [onlyStrict]
+esid: sec-web-compat-functiondeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Block statement
+    in function code containing a function declaration
 info: |
-    Block statement in function code containing a function declaration
-
     B.3.3.1 Changes to FunctionDeclarationInstantiation
 
     1. If strict is false, then
+      ...
+
+flags: [onlyStrict]
 ---*/
 
 var err1, err2;

test/language/function-code/switch-case-decl-nostrict.js

+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-web-compat-functiondeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Function declaration
+    in the `case` clause of a `switch` statement in function code
+info: |
+    B.3.3.1 Changes to FunctionDeclarationInstantiation
+
+    1. If strict is false, then
+      ...
+
+flags: [noStrict]
+---*/
+
+var err1, err2;
+
+(function() {
+  try {
+    f;
+  } catch (exception) {
+    err1 = exception;
+  }
+
+  switch (1) {
+    case 1:
+      function f() {  }
+  }
+
+  try {
+    f;
+  } catch (exception) {
+    err2 = exception;
+  }
+}());
+
+assert.sameValue(err1, undefined);
+assert.sameValue(err2, undefined);

test/language/function-code/switch-case-decl-strict.js → test/language/function-code/switch-case-decl-onlystrict.js

 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-description: AnnexB extension not honored in strict mode
-es6id: B.3.3.1
-flags: [onlyStrict]
+esid: sec-web-compat-functiondeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Function declaration
+    in the `case` clause of a `switch` statement in function code
 info: |
-    Function declaration in the `case` clause of a `switch` statement in
-    function code
-
     B.3.3.1 Changes to FunctionDeclarationInstantiation
 
     1. If strict is false, then
+      ...
+
+flags: [onlyStrict]
 ---*/
 
 var err1, err2;

test/language/function-code/switch-dflt-decl-nostrict.js

+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-web-compat-functiondeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Function declaration
+    in the `default` clause of a `switch` statement in function code
+info: |
+    B.3.3.1 Changes to FunctionDeclarationInstantiation
+
+    1. If strict is false, then
+      ...
+
+flags: [noStrict]
+---*/
+
+var err1, err2;
+
+(function() {
+  try {
+    f;
+  } catch (exception) {
+    err1 = exception;
+  }
+
+  switch (1) {
+    default:
+      function f() {  }
+  }
+
+  try {
+    f;
+  } catch (exception) {
+    err2 = exception;
+  }
+}());
+
+assert.sameValue(err1, undefined);
+assert.sameValue(err2, undefined);

test/language/function-code/switch-dflt-decl-strict.js → test/language/function-code/switch-dflt-decl-onlystrict.js

 // Copyright (C) 2016 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-description: AnnexB extension not honored in strict mode
-es6id: B.3.3.1
-flags: [onlyStrict]
+esid: sec-web-compat-functiondeclarationinstantiation
+description: >
+    AnnexB extension not honored in strict mode, Function declaration
+    in the `default` clause of a `switch` statement in function code
 info: |
-    Function declaration in the `default` clause of a `switch` statement in
-    function code
-
     B.3.3.1 Changes to FunctionDeclarationInstantiation
 
     1. If strict is false, then
+      ...
+
+flags: [onlyStrict]
 ---*/
 
 var err1, err2;