From 4d95f88c08425184124b701d5203fc6bde162a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bargull?= <andre.bargull@gmail.com>
Date: Tue, 2 May 2017 12:09:23 -0700
Subject: [PATCH] Rename and consolidate tests in keywords directory

---
 test/language/keywords/S7.6.1.1_A1.18.js      | 13 ------------
 .../{S7.6.1.1_A1.1.js => ident-ref-break.js}  |  7 ++++++-
 .../{S7.6.1.1_A1.2.js => ident-ref-case.js}   |  7 ++++++-
 .../{S7.6.1.1_A1.3.js => ident-ref-catch.js}  |  7 ++++++-
 ...S7.6.1.1_A1.4.js => ident-ref-continue.js} |  7 ++++++-
 ...{S7.6.1.1_A1.5.js => ident-ref-default.js} |  7 ++++++-
 .../{S7.6.1.1_A1.6.js => ident-ref-delete.js} |  7 ++++++-
 .../{S7.6.1.1_A1.7.js => ident-ref-do.js}     |  7 ++++++-
 .../{S7.6.1.1_A1.8.js => ident-ref-else.js}   |  7 ++++++-
 ...{S7.6.1.1_A1.9.js => ident-ref-finally.js} |  7 ++++++-
 .../{S7.6.1.1_A1.10.js => ident-ref-for.js}   |  7 ++++++-
 ...7.6.1.1_A1.11.js => ident-ref-function.js} |  7 ++++++-
 .../{S7.6.1.1_A1.12.js => ident-ref-if.js}    |  7 ++++++-
 .../{S7.6.1.1_A1.13.js => ident-ref-in.js}    |  7 ++++++-
 ...6.1.1_A1.14.js => ident-ref-instanceof.js} |  7 ++++++-
 .../{S7.6.1.1_A1.15.js => ident-ref-new.js}   |  7 ++++++-
 ...{S7.6.1.1_A1.16.js => ident-ref-return.js} |  7 ++++++-
 ...{S7.6.1.1_A1.17.js => ident-ref-switch.js} |  7 ++++++-
 test/language/keywords/ident-ref-this.js      | 21 +++++++++++++++++++
 .../{S7.6.1.1_A1.19.js => ident-ref-throw.js} |  7 ++++++-
 .../{S7.6.1.1_A1.20.js => ident-ref-try.js}   |  7 ++++++-
 ...{S7.6.1.1_A1.21.js => ident-ref-typeof.js} |  7 ++++++-
 .../{S7.6.1.1_A1.22.js => ident-ref-var.js}   |  7 ++++++-
 .../{S7.6.1.1_A1.23.js => ident-ref-void.js}  |  7 ++++++-
 .../{S7.6.1.1_A1.24.js => ident-ref-while.js} |  7 ++++++-
 .../{S7.6.1.1_A1.25.js => ident-ref-with.js}  |  7 ++++++-
 26 files changed, 165 insertions(+), 37 deletions(-)
 delete mode 100644 test/language/keywords/S7.6.1.1_A1.18.js
 rename test/language/keywords/{S7.6.1.1_A1.1.js => ident-ref-break.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.2.js => ident-ref-case.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.3.js => ident-ref-catch.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.4.js => ident-ref-continue.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.5.js => ident-ref-default.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.6.js => ident-ref-delete.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.7.js => ident-ref-do.js} (51%)
 rename test/language/keywords/{S7.6.1.1_A1.8.js => ident-ref-else.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.9.js => ident-ref-finally.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.10.js => ident-ref-for.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.11.js => ident-ref-function.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.12.js => ident-ref-if.js} (51%)
 rename test/language/keywords/{S7.6.1.1_A1.13.js => ident-ref-in.js} (51%)
 rename test/language/keywords/{S7.6.1.1_A1.14.js => ident-ref-instanceof.js} (53%)
 rename test/language/keywords/{S7.6.1.1_A1.15.js => ident-ref-new.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.16.js => ident-ref-return.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.17.js => ident-ref-switch.js} (52%)
 create mode 100644 test/language/keywords/ident-ref-this.js
 rename test/language/keywords/{S7.6.1.1_A1.19.js => ident-ref-throw.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.20.js => ident-ref-try.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.21.js => ident-ref-typeof.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.22.js => ident-ref-var.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.23.js => ident-ref-void.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.24.js => ident-ref-while.js} (52%)
 rename test/language/keywords/{S7.6.1.1_A1.25.js => ident-ref-with.js} (52%)

diff --git a/test/language/keywords/S7.6.1.1_A1.18.js b/test/language/keywords/S7.6.1.1_A1.18.js
deleted file mode 100644
index 60c5f94317..0000000000
--- a/test/language/keywords/S7.6.1.1_A1.18.js
+++ /dev/null
@@ -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;
diff --git a/test/language/keywords/S7.6.1.1_A1.1.js b/test/language/keywords/ident-ref-break.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.1.js
rename to test/language/keywords/ident-ref-break.js
index b272cb85dd..77fe435224 100644
--- a/test/language/keywords/S7.6.1.1_A1.1.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.2.js b/test/language/keywords/ident-ref-case.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.2.js
rename to test/language/keywords/ident-ref-case.js
index 9d1416c61a..142d6a5e96 100644
--- a/test/language/keywords/S7.6.1.1_A1.2.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.3.js b/test/language/keywords/ident-ref-catch.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.3.js
rename to test/language/keywords/ident-ref-catch.js
index 38ea1915d7..3418056d44 100644
--- a/test/language/keywords/S7.6.1.1_A1.3.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.4.js b/test/language/keywords/ident-ref-continue.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.4.js
rename to test/language/keywords/ident-ref-continue.js
index 65c97315ce..ae5ea45f8d 100644
--- a/test/language/keywords/S7.6.1.1_A1.4.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.5.js b/test/language/keywords/ident-ref-default.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.5.js
rename to test/language/keywords/ident-ref-default.js
index 1c6f9c5e88..e5a24239bb 100644
--- a/test/language/keywords/S7.6.1.1_A1.5.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.6.js b/test/language/keywords/ident-ref-delete.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.6.js
rename to test/language/keywords/ident-ref-delete.js
index e8eeac7647..755068558f 100644
--- a/test/language/keywords/S7.6.1.1_A1.6.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.7.js b/test/language/keywords/ident-ref-do.js
similarity index 51%
rename from test/language/keywords/S7.6.1.1_A1.7.js
rename to test/language/keywords/ident-ref-do.js
index 310e6476b3..18cf089e64 100644
--- a/test/language/keywords/S7.6.1.1_A1.7.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.8.js b/test/language/keywords/ident-ref-else.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.8.js
rename to test/language/keywords/ident-ref-else.js
index 8c5817b86d..63b3b2b971 100644
--- a/test/language/keywords/S7.6.1.1_A1.8.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.9.js b/test/language/keywords/ident-ref-finally.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.9.js
rename to test/language/keywords/ident-ref-finally.js
index e4fe13f21d..110271698b 100644
--- a/test/language/keywords/S7.6.1.1_A1.9.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.10.js b/test/language/keywords/ident-ref-for.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.10.js
rename to test/language/keywords/ident-ref-for.js
index b3d6b9eab5..58538df962 100644
--- a/test/language/keywords/S7.6.1.1_A1.10.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.11.js b/test/language/keywords/ident-ref-function.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.11.js
rename to test/language/keywords/ident-ref-function.js
index 6e1479e5f4..c6a6046ae8 100644
--- a/test/language/keywords/S7.6.1.1_A1.11.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.12.js b/test/language/keywords/ident-ref-if.js
similarity index 51%
rename from test/language/keywords/S7.6.1.1_A1.12.js
rename to test/language/keywords/ident-ref-if.js
index ce3672ffd6..02e3614ef0 100644
--- a/test/language/keywords/S7.6.1.1_A1.12.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.13.js b/test/language/keywords/ident-ref-in.js
similarity index 51%
rename from test/language/keywords/S7.6.1.1_A1.13.js
rename to test/language/keywords/ident-ref-in.js
index 4e9d4f00c9..a3cf5c79b0 100644
--- a/test/language/keywords/S7.6.1.1_A1.13.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.14.js b/test/language/keywords/ident-ref-instanceof.js
similarity index 53%
rename from test/language/keywords/S7.6.1.1_A1.14.js
rename to test/language/keywords/ident-ref-instanceof.js
index 9331350253..26bb6b3199 100644
--- a/test/language/keywords/S7.6.1.1_A1.14.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.15.js b/test/language/keywords/ident-ref-new.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.15.js
rename to test/language/keywords/ident-ref-new.js
index 6c0865e11d..aef6ecd1d3 100644
--- a/test/language/keywords/S7.6.1.1_A1.15.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.16.js b/test/language/keywords/ident-ref-return.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.16.js
rename to test/language/keywords/ident-ref-return.js
index 693b32ec07..33b6c8b6ac 100644
--- a/test/language/keywords/S7.6.1.1_A1.16.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.17.js b/test/language/keywords/ident-ref-switch.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.17.js
rename to test/language/keywords/ident-ref-switch.js
index d388331d06..a4b7b0586a 100644
--- a/test/language/keywords/S7.6.1.1_A1.17.js
+++ b/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
diff --git a/test/language/keywords/ident-ref-this.js b/test/language/keywords/ident-ref-this.js
new file mode 100644
index 0000000000..825c816317
--- /dev/null
+++ b/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});
diff --git a/test/language/keywords/S7.6.1.1_A1.19.js b/test/language/keywords/ident-ref-throw.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.19.js
rename to test/language/keywords/ident-ref-throw.js
index 6f74ed30df..6bde82398a 100644
--- a/test/language/keywords/S7.6.1.1_A1.19.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.20.js b/test/language/keywords/ident-ref-try.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.20.js
rename to test/language/keywords/ident-ref-try.js
index cde696e305..acf2564fd8 100644
--- a/test/language/keywords/S7.6.1.1_A1.20.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.21.js b/test/language/keywords/ident-ref-typeof.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.21.js
rename to test/language/keywords/ident-ref-typeof.js
index e7728c46ca..828411a58a 100644
--- a/test/language/keywords/S7.6.1.1_A1.21.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.22.js b/test/language/keywords/ident-ref-var.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.22.js
rename to test/language/keywords/ident-ref-var.js
index 91f643325d..0d7e5730e2 100644
--- a/test/language/keywords/S7.6.1.1_A1.22.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.23.js b/test/language/keywords/ident-ref-void.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.23.js
rename to test/language/keywords/ident-ref-void.js
index c1e3120051..e038f917ee 100644
--- a/test/language/keywords/S7.6.1.1_A1.23.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.24.js b/test/language/keywords/ident-ref-while.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.24.js
rename to test/language/keywords/ident-ref-while.js
index 9fb3767f18..4637dedad0 100644
--- a/test/language/keywords/S7.6.1.1_A1.24.js
+++ b/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
diff --git a/test/language/keywords/S7.6.1.1_A1.25.js b/test/language/keywords/ident-ref-with.js
similarity index 52%
rename from test/language/keywords/S7.6.1.1_A1.25.js
rename to test/language/keywords/ident-ref-with.js
index 869d56d519..da3e4e749b 100644
--- a/test/language/keywords/S7.6.1.1_A1.25.js
+++ b/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
-- 
GitLab