Rename and consolidate tests in keywords directory

test/language/keywords/S7.6.1.1_A1.18.js

@@ -1,13 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: The "this" token can not be used as identifier
-es5id: 7.6.1.1_A1.18
-description: Checking if execution of "this=1" fails
-negative:
-  phase: early
-  type: ReferenceError
----*/
-
-this = 1;

test/language/keywords/ident-ref-break.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "break" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.1
 description: Checking if execution of "break=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-case.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "case" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.2
 description: Checking if execution of "case=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-catch.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "catch" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.3
 description: Checking if execution of "catch=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-continue.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "continue" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.4
 description: Checking if execution of "contunue=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-default.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "default" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.5
 description: Checking if execution of "default=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-delete.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "delete" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.6
 description: Checking if execution of "delete=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-do.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "do" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.7
 description: Checking if execution of "do=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-else.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "else" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.8
 description: Checking if execution of "else=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-finally.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "finally" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.9
 description: Checking if execution of "finally=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-for.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "for" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.10
 description: Checking if execution of "for=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-function.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "function" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.11
 description: Checking if execution of "function=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-if.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "if" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.12
 description: Checking if execution of "if=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-in.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "in" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.13
 description: Checking if execution of "in=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-instanceof.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "instanceof" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.14
 description: Checking if execution of "instanceof=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-new.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "new" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.15
 description: Checking if execution of "new=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-return.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "return" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.16
 description: Checking if execution of "return=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-switch.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "switch" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.17
 description: Checking if execution of "switch=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-this.js

@@ -0,0 +1,21 @@
+// Copyright 2009 the Sputnik authors.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-identifiers-static-semantics-early-errors
+es5id: 7.6.1.1_A1.18
+description: Checking if execution of "this=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
+negative:
+  phase: early
+  type: SyntaxError
+---*/
+
+// It's tempting to write `this = 0`, but that'd be a test to validate `this`
+// is not a valid simple assignment target, cf. tests in language/expressions/assignment.
+// Also see: sec-semantics-static-semantics-isvalidsimpleassignmenttarget
+({this});

test/language/keywords/ident-ref-throw.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "throw" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.19
 description: Checking if execution of "throw=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-try.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "try" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.20
 description: Checking if execution of "try=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-typeof.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "typeof" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.21
 description: Checking if execution of "typeof=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-var.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "var" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.22
 description: Checking if execution of "var=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-void.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "void" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.23
 description: Checking if execution of "void=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-while.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "while" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.24
 description: Checking if execution of "while=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError

test/language/keywords/ident-ref-with.js

@@ -2,9 +2,14 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-info: The "with" token can not be used as identifier
+esid: sec-identifiers-static-semantics-early-errors
 es5id: 7.6.1.1_A1.25
 description: Checking if execution of "with=1" fails
+info: |
+  Identifier : IdentifierName but not ReservedWord
+
+  It is a Syntax Error if StringValue of IdentifierName is the same String
+  value as the StringValue of any ReservedWord except for yield.
 negative:
   phase: early
   type: SyntaxError