From 02af6a5552c44b678e899c59280649b5c5543f94 Mon Sep 17 00:00:00 2001
From: Leo Balter <leonardo.balter@gmail.com>
Date: Tue, 18 Dec 2018 15:01:19 -0200
Subject: [PATCH] Regenerate tests
---
...unction-name-redeclaration-attempt-with-async-function.js} | 2 +-
...nction-name-redeclaration-attempt-with-async-generator.js} | 2 +-
...> async-function-name-redeclaration-attempt-with-class.js} | 4 ++--
...> async-function-name-redeclaration-attempt-with-const.js} | 4 ++--
...sync-function-name-redeclaration-attempt-with-function.js} | 2 +-
...ync-function-name-redeclaration-attempt-with-generator.js} | 2 +-
... => async-function-name-redeclaration-attempt-with-let.js} | 4 ++--
... => async-function-name-redeclaration-attempt-with-var.js} | 4 ++--
...nerator-name-redeclaration-attempt-with-async-function.js} | 2 +-
...erator-name-redeclaration-attempt-with-async-generator.js} | 2 +-
... async-generator-name-redeclaration-attempt-with-class.js} | 4 ++--
... async-generator-name-redeclaration-attempt-with-const.js} | 4 ++--
...ync-generator-name-redeclaration-attempt-with-function.js} | 2 +-
...nc-generator-name-redeclaration-attempt-with-generator.js} | 2 +-
...=> async-generator-name-redeclaration-attempt-with-let.js} | 4 ++--
...=> async-generator-name-redeclaration-attempt-with-var.js} | 4 ++--
...> class-name-redeclaration-attempt-with-async-function.js} | 2 +-
... class-name-redeclaration-attempt-with-async-generator.js} | 2 +-
...tion.js => class-name-redeclaration-attempt-with-class.js} | 4 ++--
...tion.js => class-name-redeclaration-attempt-with-const.js} | 4 ++--
...n.js => class-name-redeclaration-attempt-with-function.js} | 2 +-
....js => class-name-redeclaration-attempt-with-generator.js} | 2 +-
...ration.js => class-name-redeclaration-attempt-with-let.js} | 4 ++--
...ration.js => class-name-redeclaration-attempt-with-var.js} | 4 ++--
...> const-name-redeclaration-attempt-with-async-function.js} | 2 +-
... const-name-redeclaration-attempt-with-async-generator.js} | 2 +-
...tion.js => const-name-redeclaration-attempt-with-class.js} | 4 ++--
...tion.js => const-name-redeclaration-attempt-with-const.js} | 4 ++--
...n.js => const-name-redeclaration-attempt-with-function.js} | 2 +-
....js => const-name-redeclaration-attempt-with-generator.js} | 2 +-
...ration.js => const-name-redeclaration-attempt-with-let.js} | 4 ++--
...ration.js => const-name-redeclaration-attempt-with-var.js} | 4 ++--
...ope-var-name-redeclaration-attempt-with-async-function.js} | 2 +-
...pe-var-name-redeclaration-attempt-with-async-generator.js} | 2 +-
... => fn-scope-var-name-redeclaration-attempt-with-class.js} | 4 ++--
... => fn-scope-var-name-redeclaration-attempt-with-const.js} | 4 ++--
... fn-scope-var-name-redeclaration-attempt-with-function.js} | 2 +-
...fn-scope-var-name-redeclaration-attempt-with-generator.js} | 2 +-
...js => fn-scope-var-name-redeclaration-attempt-with-let.js} | 4 ++--
...js => fn-scope-var-name-redeclaration-attempt-with-var.js} | 4 ++--
...unction-name-redeclaration-attempt-with-async-function.js} | 2 +-
...nction-name-redeclaration-attempt-with-async-generator.js} | 2 +-
...n.js => function-name-redeclaration-attempt-with-class.js} | 4 ++--
...n.js => function-name-redeclaration-attempt-with-const.js} | 4 ++--
...s => function-name-redeclaration-attempt-with-function.js} | 2 +-
... => function-name-redeclaration-attempt-with-generator.js} | 2 +-
...ion.js => function-name-redeclaration-attempt-with-let.js} | 4 ++--
...ion.js => function-name-redeclaration-attempt-with-var.js} | 4 ++--
...nerator-name-redeclaration-attempt-with-async-function.js} | 2 +-
...erator-name-redeclaration-attempt-with-async-generator.js} | 2 +-
....js => generator-name-redeclaration-attempt-with-class.js} | 4 ++--
....js => generator-name-redeclaration-attempt-with-const.js} | 4 ++--
... => generator-name-redeclaration-attempt-with-function.js} | 2 +-
...=> generator-name-redeclaration-attempt-with-generator.js} | 2 +-
...on.js => generator-name-redeclaration-attempt-with-let.js} | 4 ++--
...on.js => generator-name-redeclaration-attempt-with-var.js} | 4 ++--
...ock-var-name-redeclaration-attempt-with-async-function.js} | 2 +-
...ck-var-name-redeclaration-attempt-with-async-generator.js} | 2 +-
... inner-block-var-name-redeclaration-attempt-with-class.js} | 4 ++--
... inner-block-var-name-redeclaration-attempt-with-const.js} | 4 ++--
...ner-block-var-name-redeclaration-attempt-with-function.js} | 2 +-
...er-block-var-name-redeclaration-attempt-with-generator.js} | 2 +-
...=> inner-block-var-name-redeclaration-attempt-with-let.js} | 4 ++--
...=> inner-block-var-name-redeclaration-attempt-with-var.js} | 4 ++--
...r-block-var-redeclaration-attempt-after-async-function.js} | 2 +-
...-block-var-redeclaration-attempt-after-async-generator.js} | 2 +-
...s => inner-block-var-redeclaration-attempt-after-class.js} | 4 ++--
...s => inner-block-var-redeclaration-attempt-after-const.js} | 4 ++--
...> inner-block-var-redeclaration-attempt-after-function.js} | 2 +-
... inner-block-var-redeclaration-attempt-after-generator.js} | 2 +-
....js => inner-block-var-redeclaration-attempt-after-let.js} | 4 ++--
... => let-name-redeclaration-attempt-with-async-function.js} | 2 +-
...=> let-name-redeclaration-attempt-with-async-generator.js} | 2 +-
...ration.js => let-name-redeclaration-attempt-with-class.js} | 4 ++--
...ration.js => let-name-redeclaration-attempt-with-const.js} | 4 ++--
...ion.js => let-name-redeclaration-attempt-with-function.js} | 2 +-
...on.js => let-name-redeclaration-attempt-with-generator.js} | 2 +-
...laration.js => let-name-redeclaration-attempt-with-let.js} | 4 ++--
...laration.js => let-name-redeclaration-attempt-with-var.js} | 4 ++--
... => var-name-redeclaration-attempt-with-async-function.js} | 2 +-
...=> var-name-redeclaration-attempt-with-async-generator.js} | 2 +-
...ration.js => var-name-redeclaration-attempt-with-class.js} | 4 ++--
...ration.js => var-name-redeclaration-attempt-with-const.js} | 4 ++--
...ion.js => var-name-redeclaration-attempt-with-function.js} | 2 +-
...on.js => var-name-redeclaration-attempt-with-generator.js} | 2 +-
...laration.js => var-name-redeclaration-attempt-with-let.js} | 4 ++--
...laration.js => var-name-redeclaration-attempt-with-var.js} | 4 ++--
...n.js => var-redeclaration-attempt-after-async-function.js} | 2 +-
....js => var-redeclaration-attempt-after-async-generator.js} | 2 +-
...eclaration.js => var-redeclaration-attempt-after-class.js} | 4 ++--
...eclaration.js => var-redeclaration-attempt-after-const.js} | 4 ++--
...aration.js => var-redeclaration-attempt-after-function.js} | 2 +-
...ration.js => var-redeclaration-attempt-after-generator.js} | 2 +-
...-declaration.js => var-redeclaration-attempt-after-let.js} | 4 ++--
...unction-name-redeclaration-attempt-with-async-function.js} | 2 +-
...nction-name-redeclaration-attempt-with-async-generator.js} | 2 +-
...> async-function-name-redeclaration-attempt-with-class.js} | 4 ++--
...> async-function-name-redeclaration-attempt-with-const.js} | 4 ++--
...sync-function-name-redeclaration-attempt-with-function.js} | 2 +-
...ync-function-name-redeclaration-attempt-with-generator.js} | 2 +-
... => async-function-name-redeclaration-attempt-with-let.js} | 4 ++--
... => async-function-name-redeclaration-attempt-with-var.js} | 4 ++--
...nerator-name-redeclaration-attempt-with-async-function.js} | 2 +-
...erator-name-redeclaration-attempt-with-async-generator.js} | 2 +-
... async-generator-name-redeclaration-attempt-with-class.js} | 4 ++--
... async-generator-name-redeclaration-attempt-with-const.js} | 4 ++--
...ync-generator-name-redeclaration-attempt-with-function.js} | 2 +-
...nc-generator-name-redeclaration-attempt-with-generator.js} | 2 +-
...=> async-generator-name-redeclaration-attempt-with-let.js} | 4 ++--
...=> async-generator-name-redeclaration-attempt-with-var.js} | 4 ++--
...> class-name-redeclaration-attempt-with-async-function.js} | 2 +-
... class-name-redeclaration-attempt-with-async-generator.js} | 2 +-
...tion.js => class-name-redeclaration-attempt-with-class.js} | 4 ++--
...tion.js => class-name-redeclaration-attempt-with-const.js} | 4 ++--
...n.js => class-name-redeclaration-attempt-with-function.js} | 2 +-
....js => class-name-redeclaration-attempt-with-generator.js} | 2 +-
...ration.js => class-name-redeclaration-attempt-with-let.js} | 4 ++--
...ration.js => class-name-redeclaration-attempt-with-var.js} | 4 ++--
...> const-name-redeclaration-attempt-with-async-function.js} | 2 +-
... const-name-redeclaration-attempt-with-async-generator.js} | 2 +-
...tion.js => const-name-redeclaration-attempt-with-class.js} | 4 ++--
...tion.js => const-name-redeclaration-attempt-with-const.js} | 4 ++--
...n.js => const-name-redeclaration-attempt-with-function.js} | 2 +-
....js => const-name-redeclaration-attempt-with-generator.js} | 2 +-
...ration.js => const-name-redeclaration-attempt-with-let.js} | 4 ++--
...ration.js => const-name-redeclaration-attempt-with-var.js} | 4 ++--
...unction-name-redeclaration-attempt-with-async-function.js} | 2 +-
...nction-name-redeclaration-attempt-with-async-generator.js} | 2 +-
...n.js => function-name-redeclaration-attempt-with-class.js} | 4 ++--
...n.js => function-name-redeclaration-attempt-with-const.js} | 4 ++--
...s => function-name-redeclaration-attempt-with-function.js} | 2 +-
... => function-name-redeclaration-attempt-with-generator.js} | 2 +-
...ion.js => function-name-redeclaration-attempt-with-let.js} | 4 ++--
...ion.js => function-name-redeclaration-attempt-with-var.js} | 4 ++--
...nerator-name-redeclaration-attempt-with-async-function.js} | 2 +-
...erator-name-redeclaration-attempt-with-async-generator.js} | 2 +-
....js => generator-name-redeclaration-attempt-with-class.js} | 4 ++--
....js => generator-name-redeclaration-attempt-with-const.js} | 4 ++--
... => generator-name-redeclaration-attempt-with-function.js} | 2 +-
...=> generator-name-redeclaration-attempt-with-generator.js} | 2 +-
...on.js => generator-name-redeclaration-attempt-with-let.js} | 4 ++--
...on.js => generator-name-redeclaration-attempt-with-var.js} | 4 ++--
... => let-name-redeclaration-attempt-with-async-function.js} | 2 +-
...=> let-name-redeclaration-attempt-with-async-generator.js} | 2 +-
...ration.js => let-name-redeclaration-attempt-with-class.js} | 4 ++--
...ration.js => let-name-redeclaration-attempt-with-const.js} | 4 ++--
...ion.js => let-name-redeclaration-attempt-with-function.js} | 2 +-
...on.js => let-name-redeclaration-attempt-with-generator.js} | 2 +-
...laration.js => let-name-redeclaration-attempt-with-let.js} | 4 ++--
...laration.js => let-name-redeclaration-attempt-with-var.js} | 4 ++--
... => var-name-redeclaration-attempt-with-async-function.js} | 2 +-
...=> var-name-redeclaration-attempt-with-async-generator.js} | 2 +-
...ration.js => var-name-redeclaration-attempt-with-class.js} | 4 ++--
...ration.js => var-name-redeclaration-attempt-with-const.js} | 4 ++--
...ion.js => var-name-redeclaration-attempt-with-function.js} | 2 +-
...on.js => var-name-redeclaration-attempt-with-generator.js} | 2 +-
...laration.js => var-name-redeclaration-attempt-with-let.js} | 4 ++--
...laration.js => var-name-redeclaration-attempt-with-var.js} | 4 ++--
158 files changed, 236 insertions(+), 236 deletions(-)
rename test/language/block-scope/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js => async-function-name-redeclaration-attempt-with-async-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js => async-function-name-redeclaration-attempt-with-async-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-class-declaration.js => async-function-name-redeclaration-attempt-with-class.js} (85%)
rename test/language/block-scope/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-const-declaration.js => async-function-name-redeclaration-attempt-with-const.js} (85%)
rename test/language/block-scope/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-function-declaration.js => async-function-name-redeclaration-attempt-with-function.js} (91%)
rename test/language/block-scope/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-generator-declaration.js => async-function-name-redeclaration-attempt-with-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-let-declaration.js => async-function-name-redeclaration-attempt-with-let.js} (86%)
rename test/language/block-scope/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-var-declaration.js => async-function-name-redeclaration-attempt-with-var.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js => async-generator-name-redeclaration-attempt-with-async-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js => async-generator-name-redeclaration-attempt-with-async-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-class-declaration.js => async-generator-name-redeclaration-attempt-with-class.js} (85%)
rename test/language/block-scope/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-const-declaration.js => async-generator-name-redeclaration-attempt-with-const.js} (85%)
rename test/language/block-scope/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-function-declaration.js => async-generator-name-redeclaration-attempt-with-function.js} (91%)
rename test/language/block-scope/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js => async-generator-name-redeclaration-attempt-with-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-let-declaration.js => async-generator-name-redeclaration-attempt-with-let.js} (86%)
rename test/language/block-scope/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-var-declaration.js => async-generator-name-redeclaration-attempt-with-var.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-async-function-declaration.js => class-name-redeclaration-attempt-with-async-function.js} (89%)
rename test/language/block-scope/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-async-generator-declaration.js => class-name-redeclaration-attempt-with-async-generator.js} (89%)
rename test/language/block-scope/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-class-declaration.js => class-name-redeclaration-attempt-with-class.js} (85%)
rename test/language/block-scope/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-const-declaration.js => class-name-redeclaration-attempt-with-const.js} (85%)
rename test/language/block-scope/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-function-declaration.js => class-name-redeclaration-attempt-with-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-generator-declaration.js => class-name-redeclaration-attempt-with-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-let-declaration.js => class-name-redeclaration-attempt-with-let.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-var-declaration.js => class-name-redeclaration-attempt-with-var.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-async-function-declaration.js => const-name-redeclaration-attempt-with-async-function.js} (89%)
rename test/language/block-scope/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-async-generator-declaration.js => const-name-redeclaration-attempt-with-async-generator.js} (89%)
rename test/language/block-scope/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-class-declaration.js => const-name-redeclaration-attempt-with-class.js} (85%)
rename test/language/block-scope/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-const-declaration.js => const-name-redeclaration-attempt-with-const.js} (85%)
rename test/language/block-scope/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-function-declaration.js => const-name-redeclaration-attempt-with-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-generator-declaration.js => const-name-redeclaration-attempt-with-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-let-declaration.js => const-name-redeclaration-attempt-with-let.js} (86%)
rename test/language/block-scope/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-var-declaration.js => const-name-redeclaration-attempt-with-var.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{fn-scope-var-declaration-attempt-to-redeclare-with-async-function-declaration.js => fn-scope-var-name-redeclaration-attempt-with-async-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{fn-scope-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js => fn-scope-var-name-redeclaration-attempt-with-async-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{fn-scope-var-declaration-attempt-to-redeclare-with-class-declaration.js => fn-scope-var-name-redeclaration-attempt-with-class.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{fn-scope-var-declaration-attempt-to-redeclare-with-const-declaration.js => fn-scope-var-name-redeclaration-attempt-with-const.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{fn-scope-var-declaration-attempt-to-redeclare-with-function-declaration.js => fn-scope-var-name-redeclaration-attempt-with-function.js} (91%)
rename test/language/block-scope/syntax/redeclaration/{fn-scope-var-declaration-attempt-to-redeclare-with-generator-declaration.js => fn-scope-var-name-redeclaration-attempt-with-generator.js} (91%)
rename test/language/block-scope/syntax/redeclaration/{fn-scope-var-declaration-attempt-to-redeclare-with-let-declaration.js => fn-scope-var-name-redeclaration-attempt-with-let.js} (88%)
rename test/language/block-scope/syntax/redeclaration/{fn-scope-var-declaration-attempt-to-redeclare-with-var-declaration.js => fn-scope-var-name-redeclaration-attempt-with-var.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-async-function-declaration.js => function-name-redeclaration-attempt-with-async-function.js} (89%)
rename test/language/block-scope/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-async-generator-declaration.js => function-name-redeclaration-attempt-with-async-generator.js} (89%)
rename test/language/block-scope/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-class-declaration.js => function-name-redeclaration-attempt-with-class.js} (85%)
rename test/language/block-scope/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-const-declaration.js => function-name-redeclaration-attempt-with-const.js} (85%)
rename test/language/block-scope/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-function-declaration.js => function-name-redeclaration-attempt-with-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-generator-declaration.js => function-name-redeclaration-attempt-with-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-let-declaration.js => function-name-redeclaration-attempt-with-let.js} (86%)
rename test/language/block-scope/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-var-declaration.js => function-name-redeclaration-attempt-with-var.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-async-function-declaration.js => generator-name-redeclaration-attempt-with-async-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js => generator-name-redeclaration-attempt-with-async-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-class-declaration.js => generator-name-redeclaration-attempt-with-class.js} (85%)
rename test/language/block-scope/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-const-declaration.js => generator-name-redeclaration-attempt-with-const.js} (85%)
rename test/language/block-scope/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-function-declaration.js => generator-name-redeclaration-attempt-with-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-generator-declaration.js => generator-name-redeclaration-attempt-with-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-let-declaration.js => generator-name-redeclaration-attempt-with-let.js} (86%)
rename test/language/block-scope/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-var-declaration.js => generator-name-redeclaration-attempt-with-var.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-to-redeclare-with-async-function-declaration.js => inner-block-var-name-redeclaration-attempt-with-async-function.js} (93%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js => inner-block-var-name-redeclaration-attempt-with-async-generator.js} (93%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-to-redeclare-with-class-declaration.js => inner-block-var-name-redeclaration-attempt-with-class.js} (91%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-to-redeclare-with-const-declaration.js => inner-block-var-name-redeclaration-attempt-with-const.js} (91%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-to-redeclare-with-function-declaration.js => inner-block-var-name-redeclaration-attempt-with-function.js} (94%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-to-redeclare-with-generator-declaration.js => inner-block-var-name-redeclaration-attempt-with-generator.js} (94%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-to-redeclare-with-let-declaration.js => inner-block-var-name-redeclaration-attempt-with-let.js} (92%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-to-redeclare-with-var-declaration.js => inner-block-var-name-redeclaration-attempt-with-var.js} (92%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js => inner-block-var-redeclaration-attempt-after-async-function.js} (93%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js => inner-block-var-redeclaration-attempt-after-async-generator.js} (93%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-2-to-redeclare-with-class-declaration.js => inner-block-var-redeclaration-attempt-after-class.js} (91%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-2-to-redeclare-with-const-declaration.js => inner-block-var-redeclaration-attempt-after-const.js} (91%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-2-to-redeclare-with-function-declaration.js => inner-block-var-redeclaration-attempt-after-function.js} (94%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-2-to-redeclare-with-generator-declaration.js => inner-block-var-redeclaration-attempt-after-generator.js} (94%)
rename test/language/block-scope/syntax/redeclaration/{inner-block-var-declaration-attempt-2-to-redeclare-with-let-declaration.js => inner-block-var-redeclaration-attempt-after-let.js} (92%)
rename test/language/block-scope/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-async-function-declaration.js => let-name-redeclaration-attempt-with-async-function.js} (89%)
rename test/language/block-scope/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-async-generator-declaration.js => let-name-redeclaration-attempt-with-async-generator.js} (89%)
rename test/language/block-scope/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-class-declaration.js => let-name-redeclaration-attempt-with-class.js} (86%)
rename test/language/block-scope/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-const-declaration.js => let-name-redeclaration-attempt-with-const.js} (86%)
rename test/language/block-scope/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-function-declaration.js => let-name-redeclaration-attempt-with-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-generator-declaration.js => let-name-redeclaration-attempt-with-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-let-declaration.js => let-name-redeclaration-attempt-with-let.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-var-declaration.js => let-name-redeclaration-attempt-with-var.js} (88%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-async-function-declaration.js => var-name-redeclaration-attempt-with-async-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-async-generator-declaration.js => var-name-redeclaration-attempt-with-async-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-class-declaration.js => var-name-redeclaration-attempt-with-class.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-const-declaration.js => var-name-redeclaration-attempt-with-const.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-function-declaration.js => var-name-redeclaration-attempt-with-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-generator-declaration.js => var-name-redeclaration-attempt-with-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-let-declaration.js => var-name-redeclaration-attempt-with-let.js} (88%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-var-declaration.js => var-name-redeclaration-attempt-with-var.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js => var-redeclaration-attempt-after-async-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js => var-redeclaration-attempt-after-async-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-2-to-redeclare-with-class-declaration.js => var-redeclaration-attempt-after-class.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-2-to-redeclare-with-const-declaration.js => var-redeclaration-attempt-after-const.js} (87%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-2-to-redeclare-with-function-declaration.js => var-redeclaration-attempt-after-function.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-2-to-redeclare-with-generator-declaration.js => var-redeclaration-attempt-after-generator.js} (90%)
rename test/language/block-scope/syntax/redeclaration/{var-declaration-attempt-2-to-redeclare-with-let-declaration.js => var-redeclaration-attempt-after-let.js} (88%)
rename test/language/statements/switch/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js => async-function-name-redeclaration-attempt-with-async-function.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js => async-function-name-redeclaration-attempt-with-async-generator.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-class-declaration.js => async-function-name-redeclaration-attempt-with-class.js} (82%)
rename test/language/statements/switch/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-const-declaration.js => async-function-name-redeclaration-attempt-with-const.js} (82%)
rename test/language/statements/switch/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-function-declaration.js => async-function-name-redeclaration-attempt-with-function.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-generator-declaration.js => async-function-name-redeclaration-attempt-with-generator.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-let-declaration.js => async-function-name-redeclaration-attempt-with-let.js} (83%)
rename test/language/statements/switch/syntax/redeclaration/{async-function-declaration-attempt-to-redeclare-with-var-declaration.js => async-function-name-redeclaration-attempt-with-var.js} (84%)
rename test/language/statements/switch/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js => async-generator-name-redeclaration-attempt-with-async-function.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js => async-generator-name-redeclaration-attempt-with-async-generator.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-class-declaration.js => async-generator-name-redeclaration-attempt-with-class.js} (82%)
rename test/language/statements/switch/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-const-declaration.js => async-generator-name-redeclaration-attempt-with-const.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-function-declaration.js => async-generator-name-redeclaration-attempt-with-function.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js => async-generator-name-redeclaration-attempt-with-generator.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-let-declaration.js => async-generator-name-redeclaration-attempt-with-let.js} (83%)
rename test/language/statements/switch/syntax/redeclaration/{async-generator-declaration-attempt-to-redeclare-with-var-declaration.js => async-generator-name-redeclaration-attempt-with-var.js} (84%)
rename test/language/statements/switch/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-async-function-declaration.js => class-name-redeclaration-attempt-with-async-function.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-async-generator-declaration.js => class-name-redeclaration-attempt-with-async-generator.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-class-declaration.js => class-name-redeclaration-attempt-with-class.js} (83%)
rename test/language/statements/switch/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-const-declaration.js => class-name-redeclaration-attempt-with-const.js} (83%)
rename test/language/statements/switch/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-function-declaration.js => class-name-redeclaration-attempt-with-function.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-generator-declaration.js => class-name-redeclaration-attempt-with-generator.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-let-declaration.js => class-name-redeclaration-attempt-with-let.js} (84%)
rename test/language/statements/switch/syntax/redeclaration/{class-declaration-attempt-to-redeclare-with-var-declaration.js => class-name-redeclaration-attempt-with-var.js} (84%)
rename test/language/statements/switch/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-async-function-declaration.js => const-name-redeclaration-attempt-with-async-function.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-async-generator-declaration.js => const-name-redeclaration-attempt-with-async-generator.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-class-declaration.js => const-name-redeclaration-attempt-with-class.js} (83%)
rename test/language/statements/switch/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-const-declaration.js => const-name-redeclaration-attempt-with-const.js} (83%)
rename test/language/statements/switch/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-function-declaration.js => const-name-redeclaration-attempt-with-function.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-generator-declaration.js => const-name-redeclaration-attempt-with-generator.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-let-declaration.js => const-name-redeclaration-attempt-with-let.js} (84%)
rename test/language/statements/switch/syntax/redeclaration/{const-declaration-attempt-to-redeclare-with-var-declaration.js => const-name-redeclaration-attempt-with-var.js} (84%)
rename test/language/statements/switch/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-async-function-declaration.js => function-name-redeclaration-attempt-with-async-function.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-async-generator-declaration.js => function-name-redeclaration-attempt-with-async-generator.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-class-declaration.js => function-name-redeclaration-attempt-with-class.js} (82%)
rename test/language/statements/switch/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-const-declaration.js => function-name-redeclaration-attempt-with-const.js} (82%)
rename test/language/statements/switch/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-function-declaration.js => function-name-redeclaration-attempt-with-function.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-generator-declaration.js => function-name-redeclaration-attempt-with-generator.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-let-declaration.js => function-name-redeclaration-attempt-with-let.js} (83%)
rename test/language/statements/switch/syntax/redeclaration/{function-declaration-attempt-to-redeclare-with-var-declaration.js => function-name-redeclaration-attempt-with-var.js} (84%)
rename test/language/statements/switch/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-async-function-declaration.js => generator-name-redeclaration-attempt-with-async-function.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js => generator-name-redeclaration-attempt-with-async-generator.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-class-declaration.js => generator-name-redeclaration-attempt-with-class.js} (83%)
rename test/language/statements/switch/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-const-declaration.js => generator-name-redeclaration-attempt-with-const.js} (83%)
rename test/language/statements/switch/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-function-declaration.js => generator-name-redeclaration-attempt-with-function.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-generator-declaration.js => generator-name-redeclaration-attempt-with-generator.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-let-declaration.js => generator-name-redeclaration-attempt-with-let.js} (84%)
rename test/language/statements/switch/syntax/redeclaration/{generator-declaration-attempt-to-redeclare-with-var-declaration.js => generator-name-redeclaration-attempt-with-var.js} (84%)
rename test/language/statements/switch/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-async-function-declaration.js => let-name-redeclaration-attempt-with-async-function.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-async-generator-declaration.js => let-name-redeclaration-attempt-with-async-generator.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-class-declaration.js => let-name-redeclaration-attempt-with-class.js} (83%)
rename test/language/statements/switch/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-const-declaration.js => let-name-redeclaration-attempt-with-const.js} (83%)
rename test/language/statements/switch/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-function-declaration.js => let-name-redeclaration-attempt-with-function.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-generator-declaration.js => let-name-redeclaration-attempt-with-generator.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-let-declaration.js => let-name-redeclaration-attempt-with-let.js} (84%)
rename test/language/statements/switch/syntax/redeclaration/{let-declaration-attempt-to-redeclare-with-var-declaration.js => let-name-redeclaration-attempt-with-var.js} (85%)
rename test/language/statements/switch/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-async-function-declaration.js => var-name-redeclaration-attempt-with-async-function.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-async-generator-declaration.js => var-name-redeclaration-attempt-with-async-generator.js} (90%)
rename test/language/statements/switch/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-class-declaration.js => var-name-redeclaration-attempt-with-class.js} (84%)
rename test/language/statements/switch/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-const-declaration.js => var-name-redeclaration-attempt-with-const.js} (84%)
rename test/language/statements/switch/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-function-declaration.js => var-name-redeclaration-attempt-with-function.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-generator-declaration.js => var-name-redeclaration-attempt-with-generator.js} (91%)
rename test/language/statements/switch/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-let-declaration.js => var-name-redeclaration-attempt-with-let.js} (85%)
rename test/language/statements/switch/syntax/redeclaration/{var-declaration-attempt-to-redeclare-with-var-declaration.js => var-name-redeclaration-attempt-with-var.js} (84%)
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js
index 50b4648e44..70768839f0 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (AsyncFunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js
index 44431fc5bf..57e8439d8c 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (AsyncFunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js
index b9d883f5c8..d6dfaf55f5 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with ClassDeclaration (AsyncFunctionDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-{ async function f() {} class f {}; }
+{ async function f() {} class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js
index 059360f2ca..81abd90ed1 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (AsyncFunctionDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-{ async function f() {} const f = 0; }
+{ async function f() {} const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js
index c4d8f05392..22a8bf0a69 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with FunctionDeclaration (AsyncFunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js
index 312af3f794..454719b941 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (AsyncFunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js
index 5ad2adc297..1e1a9c0c5a 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/block-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (AsyncFunctionDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-{ async function f() {} let f; }
+{ async function f() {} let f }
diff --git a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js
index d03c5cf34f..6d58d4fa01 100644
--- a/test/language/block-scope/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with VariableDeclaration (AsyncFunctionDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-{ async function f() {} var f; }
+{ async function f() {} var f }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js
index 9692820199..3f9be5f54a 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (AsyncGeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js
index 7e71084a68..6ac3b9c43f 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (AsyncGeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js
index 2c3d5d2249..7fbf6e2ac3 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with ClassDeclaration (AsyncGeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-{ async function* f() {} class f {}; }
+{ async function* f() {} class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js
index 0f7b46243b..3a70e56917 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (AsyncGeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-{ async function* f() {} const f = 0; }
+{ async function* f() {} const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js
index 3068f8581c..ae4a8d5626 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with FunctionDeclaration (AsyncGeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js
index 296e17fb80..198b7c5a76 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (AsyncGeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js
index 7c680f9232..7378d81548 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/block-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (AsyncGeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-{ async function* f() {} let f; }
+{ async function* f() {} let f }
diff --git a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js
index 055ae92b60..b52a4fe83c 100644
--- a/test/language/block-scope/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with VariableDeclaration (AsyncGeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-{ async function* f() {} var f; }
+{ async function* f() {} var f }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js
index 2908d5b6ad..58a58a87a9 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (ClassDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js
index a1844dbf07..614460249f 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (ClassDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js
index c16b14569b..583ea3eadb 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with ClassDeclaration (ClassDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ class f {} class f {}; }
+{ class f {} class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js
index a411858cb0..d2aa0256f3 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (ClassDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ class f {} const f = 0; }
+{ class f {} const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js
index 099f6d9695..bba8cc353b 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with FunctionDeclaration (ClassDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js
index 260c1b00d0..f9ec353901 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (ClassDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js
index ce3d5d376f..f84d522600 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/block-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (ClassDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ class f {} let f; }
+{ class f {} let f }
diff --git a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js
index 4930ad2f2c..7de9c0fb87 100644
--- a/test/language/block-scope/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with VariableDeclaration (ClassDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ class f {} var f; }
+{ class f {} var f }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js
index 9e029ee136..acafe8cc0e 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (LexicalDeclaration (const) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js
index 7f4b7c9b80..c806aec01b 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (LexicalDeclaration (const) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js
index 108b912af9..5ffef47d40 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with ClassDeclaration (LexicalDeclaration (const) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ const f = 0; class f {}; }
+{ const f = 0; class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js
index bb05fc3e21..83b2f906e5 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (LexicalDeclaration (const) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ const f = 0; const f = 0; }
+{ const f = 0; const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js
index 3a1e3aa126..8d04baa454 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with FunctionDeclaration (LexicalDeclaration (const) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js
index 4bb6eb1723..d241d9fbc3 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (LexicalDeclaration (const) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js
index 0c71133aa5..ec9d3c314a 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/block-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (LexicalDeclaration (const) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ const f = 0; let f; }
+{ const f = 0; let f }
diff --git a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js
index f395e4ff9d..71d12c5714 100644
--- a/test/language/block-scope/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with VariableDeclaration (LexicalDeclaration (const) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ const f = 0; var f; }
+{ const f = 0; var f }
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-function.js
index 2d3d86932f..6dde22bb43 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/fn-block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (VariableDeclaration in BlockStatement inside a function)
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-generator.js
index 9a4548aefd..25f480d3ec 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/fn-block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (VariableDeclaration in BlockStatement inside a function)
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-class.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-class.js
index 7166809d0c..2a8a416eab 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/fn-block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with ClassDeclaration (VariableDeclaration in BlockStatement inside a function)
@@ -20,5 +20,5 @@ info: |
$DONOTEVALUATE();
function x() {
- { class f {};; var f; }
+ { class f {}; var f; }
}
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-const.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-const.js
index 9421881282..54dd9b63f5 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/fn-block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (VariableDeclaration in BlockStatement inside a function)
@@ -20,5 +20,5 @@ info: |
$DONOTEVALUATE();
function x() {
- { const f = 0;; var f; }
+ { const f = 0; var f; }
}
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-function.js
index 36f267afd9..6bf4898873 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/fn-block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with FunctionDeclaration (VariableDeclaration in BlockStatement inside a function)
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-generator.js
index 171f77a727..0f3a5a1d44 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/fn-block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (VariableDeclaration in BlockStatement inside a function)
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-let.js
similarity index 88%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-let.js
index 5abab8fe76..bb8edb65b2 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/fn-block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (VariableDeclaration in BlockStatement inside a function)
@@ -20,5 +20,5 @@ info: |
$DONOTEVALUATE();
function x() {
- { let f;; var f; }
+ { let f; var f; }
}
diff --git a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-var.js
index 02a8d0d73d..6d03148c1b 100644
--- a/test/language/block-scope/syntax/redeclaration/fn-scope-var-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/fn-scope-var-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/fn-block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with VariableDeclaration (VariableDeclaration in BlockStatement inside a function)
@@ -14,5 +14,5 @@ info: |
function x() {
- { var f; var f; }
+ { var f; var f }
}
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js
index f4590510d0..92e30355e0 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (FunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js
index a08e9c90c3..4ba5d9906e 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (FunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js
index 0bafed5390..b597b89225 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with ClassDeclaration (FunctionDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ function f() {} class f {}; }
+{ function f() {} class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js
index e62c69975c..cbcd8d8bf2 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (FunctionDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ function f() {} const f = 0; }
+{ function f() {} const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js
index dd26dfbd5a..4f7d8a286e 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with FunctionDeclaration (FunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js
index 3d68bdea5b..674ecc75c9 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (FunctionDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js
index ee1f8a78cf..13d0913c86 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/block-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (FunctionDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ function f() {} let f; }
+{ function f() {} let f }
diff --git a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js
index 2a2a1738f2..1e2c1279e1 100644
--- a/test/language/block-scope/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with VariableDeclaration (FunctionDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ function f() {} var f; }
+{ function f() {} var f }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js
index 9929143735..723e5a625b 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (GeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js
index 4c19ed7d9e..81b95f7ed0 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (GeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js
index 1c48927aed..6a6ba72d5b 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with ClassDeclaration (GeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-{ function* f() {} class f {}; }
+{ function* f() {} class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js
similarity index 85%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js
index 35b3a51e54..508b0737e7 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (GeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-{ function* f() {} const f = 0; }
+{ function* f() {} const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js
index cf69c1852b..a675b8cf51 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with FunctionDeclaration (GeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js
index b6a58ed72f..783dc3c44f 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (GeneratorDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js
index 87d41926c4..f7959e3a40 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/block-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (GeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-{ function* f() {} let f; }
+{ function* f() {} let f }
diff --git a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js
index bb5569ae3c..52a377ab00 100644
--- a/test/language/block-scope/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with VariableDeclaration (GeneratorDeclaration in BlockStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-{ function* f() {} var f; }
+{ function* f() {} var f }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-function.js
similarity index 93%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-function.js
index 3317b38324..bd659d5b3c 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-generator.js
similarity index 93%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-generator.js
index 2b415d621c..175658db53 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-class.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-class.js
index 4228a9fb60..5f93752ee4 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration.template
/*---
description: redeclaration with ClassDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -35,4 +35,4 @@ info: |
$DONOTEVALUATE();
-{ { var f; } class f {};; }
+{ { var f; } class f {}; }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-const.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-const.js
index 75ccab9d66..e490724236 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -35,4 +35,4 @@ info: |
$DONOTEVALUATE();
-{ { var f; } const f = 0;; }
+{ { var f; } const f = 0; }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-function.js
similarity index 94%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-function.js
index 66944239aa..36eb41cbfd 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-inner-block-var-declaration.template
/*---
description: redeclaration with FunctionDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-generator.js
similarity index 94%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-generator.js
index e7d5a06bd6..45f3de2143 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-let.js
similarity index 92%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-let.js
index 6ca093c2b3..13fe7e4f12 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -35,4 +35,4 @@ info: |
$DONOTEVALUATE();
-{ { var f; } let f;; }
+{ { var f; } let f; }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-var.js
similarity index 92%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-var.js
index 54f30facfd..443dd5ff98 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-inner-block-var-declaration.template
/*---
description: redeclaration with VariableDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -29,4 +29,4 @@ info: |
---*/
-{ { var f; } var f; }
+{ { var f; } var f }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-function.js
similarity index 93%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-function.js
index 6c02c629dd..b36721b3d2 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration-after.template
/*---
description: redeclaration with AsyncFunctionDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-generator.js
similarity index 93%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-generator.js
index 77b7cb8c08..fb1d140ee4 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration-after.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-class.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-class.js
index 1c0981466a..7c5c179c1d 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration-after.template
/*---
description: redeclaration with ClassDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -35,4 +35,4 @@ info: |
$DONOTEVALUATE();
-{ class f {};; { var f; } }
+{ class f {}; { var f; } }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-const.js
similarity index 91%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-const.js
index eb18aff1ae..10ff104d2c 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration-after.template
/*---
description: redeclaration with const-LexicalDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -35,4 +35,4 @@ info: |
$DONOTEVALUATE();
-{ const f = 0;; { var f; } }
+{ const f = 0; { var f; } }
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-function.js
similarity index 94%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-function.js
index 4420b7424d..99c65d0eb0 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-inner-block-var-declaration-after.template
/*---
description: redeclaration with FunctionDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-generator.js
similarity index 94%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-generator.js
index 1b259081e6..2211f0ce26 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration-after.template
/*---
description: redeclaration with GeneratorDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-let.js
similarity index 92%
rename from test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-let.js
index 117707dcd4..c0b537f2ef 100644
--- a/test/language/block-scope/syntax/redeclaration/inner-block-var-declaration-attempt-2-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/inner-block-var-redeclaration-attempt-after-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/block-attempt-to-redeclare-inner-block-var-declaration-after.template
/*---
description: redeclaration with let-LexicalDeclaration (VariableDeclaration in a BlockStatement inside a BlockStatement)
@@ -35,4 +35,4 @@ info: |
$DONOTEVALUATE();
-{ let f;; { var f; } }
+{ let f; { var f; } }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js
index 53cc42b601..fcd29298f7 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (LexicalDeclaration (let) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js
similarity index 89%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js
index be65ee63ae..9fa4154321 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (LexicalDeclaration (let) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js
index 91c6af10c7..f44a789d5d 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with ClassDeclaration (LexicalDeclaration (let) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ let f; class f {}; }
+{ let f; class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js
similarity index 86%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js
index 9a93b8f756..737db517e2 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (LexicalDeclaration (let) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ let f; const f = 0; }
+{ let f; const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js
index dfed6fe1a1..f226dbdac9 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with FunctionDeclaration (LexicalDeclaration (let) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js
index 4e5946ae12..7a96390465 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (LexicalDeclaration (let) in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js
index c359f11494..a332e9cf23 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/block-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (LexicalDeclaration (let) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ let f; let f; }
+{ let f; let f }
diff --git a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js
similarity index 88%
rename from test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js
index 5c0ac1da15..7ab6a776cd 100644
--- a/test/language/block-scope/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with VariableDeclaration (LexicalDeclaration (let) in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ let f; var f; }
+{ let f; var f }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js
index d8b22505fa..23e4499f1d 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js
index 1ca82eb119..df9d2efdfa 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js
index b191619e95..3b80ef422e 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with ClassDeclaration (VariableDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ var f; class f {}; }
+{ var f; class f {} }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js
index a0f8dda0cc..f9758ba3c2 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (VariableDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ var f; const f = 0; }
+{ var f; const f = 0 }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js
index 5cf2218320..7e324b4034 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with FunctionDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js
index 27183853ff..1db5e83a5a 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js
similarity index 88%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js
index f115d5895d..63f3cb6fe4 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (VariableDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ var f; let f; }
+{ var f; let f }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-var.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-var.js
index 9212e34414..5f7303e809 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/block-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with VariableDeclaration (VariableDeclaration in BlockStatement)
@@ -13,4 +13,4 @@ info: |
---*/
-{ var f; var f; }
+{ var f; var f }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-function.js
index 18c2724200..c287697796 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-async-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration-after.template
/*---
description: redeclaration with AsyncFunctionDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-generator.js
index 1a52d72b69..c56398ba32 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration-after.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-class-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-class.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-class-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-class.js
index 39815f4cc9..b2a77d26c8 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-class-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration-after.template
/*---
description: redeclaration with ClassDeclaration (VariableDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ class f {};; var f; }
+{ class f {}; var f; }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-const-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-const.js
similarity index 87%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-const-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-const.js
index db02e9604b..696cea7a6d 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-const-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration-after.template
/*---
description: redeclaration with const-LexicalDeclaration (VariableDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ const f = 0;; var f; }
+{ const f = 0; var f; }
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-function-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-function.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-function-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-function.js
index 2251147f29..6bd084d2e4 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-function-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/block-attempt-to-redeclare-var-declaration-after.template
/*---
description: redeclaration with FunctionDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-generator-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-generator.js
similarity index 90%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-generator-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-generator.js
index 0ef11aebe2..4bf5382d87 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-generator-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration-after.template
/*---
description: redeclaration with GeneratorDeclaration (VariableDeclaration in BlockStatement)
diff --git a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-let-declaration.js b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-let.js
similarity index 88%
rename from test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-let-declaration.js
rename to test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-let.js
index 21882bdbc2..91ea879222 100644
--- a/test/language/block-scope/syntax/redeclaration/var-declaration-attempt-2-to-redeclare-with-let-declaration.js
+++ b/test/language/block-scope/syntax/redeclaration/var-redeclaration-attempt-after-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/block-attempt-to-redeclare-var-declaration-after.template
/*---
description: redeclaration with let-LexicalDeclaration (VariableDeclaration in BlockStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-{ let f;; var f; }
+{ let f; var f; }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js
index bd8e77ef6b..cd80fcaa69 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (AsyncFunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js
index 6098287ba5..962b672bc8 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (AsyncFunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js
similarity index 82%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js
index da33064208..15400ec6d9 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with ClassDeclaration (AsyncFunctionDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: async function f() {} default: class f {}; }
+switch (0) { case 1: async function f() {} default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js
similarity index 82%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js
index 836892ea22..d95f93b0fd 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (AsyncFunctionDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: async function f() {} default: const f = 0; }
+switch (0) { case 1: async function f() {} default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js
index c9b8546845..a29009b78d 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with FunctionDeclaration (AsyncFunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js
index 083f8d363e..b421c2820f 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (AsyncFunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js
index 9ef2ba2e2a..e289955d56 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (AsyncFunctionDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: async function f() {} default: let f; }
+switch (0) { case 1: async function f() {} default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js
index 73fe7bd0bc..95b9c6acbf 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-function-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-function-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-async-function-declaration.template
/*---
description: redeclaration with VariableDeclaration (AsyncFunctionDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: async function f() {} default: var f; }
+switch (0) { case 1: async function f() {} default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js
index 55be8d639f..b9d093c626 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js
index 3a634f1190..babf87e4cc 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js
similarity index 82%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js
index 35694ef3d4..ee5fb1c346 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with ClassDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: async function* f() {} default: class f {}; }
+switch (0) { case 1: async function* f() {} default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js
index 32415daa6e..01127a251f 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: async function* f() {} default: const f = 0; }
+switch (0) { case 1: async function* f() {} default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js
index ed563f0196..06f3230dfb 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with FunctionDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js
index 725dcf1d0e..fd96990ed1 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js
index 28c8184f4e..17ee481338 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: async function* f() {} default: let f; }
+switch (0) { case 1: async function* f() {} default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js
index 0281f3cddc..8fbdd529a2 100644
--- a/test/language/statements/switch/syntax/redeclaration/async-generator-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/async-generator-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-async-generator-declaration.template
/*---
description: redeclaration with VariableDeclaration (AsyncGeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: async function* f() {} default: var f; }
+switch (0) { case 1: async function* f() {} default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js
index 5178f3edba..b25b3dca99 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (ClassDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js
index 4db0ed845c..84ff4cc8ff 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (ClassDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js
index 50aa4cdd5e..ee0a3b95dc 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with ClassDeclaration (ClassDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: class f {} default: class f {}; }
+switch (0) { case 1: class f {} default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js
index dcca5fa4e0..3ebac73187 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (ClassDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: class f {} default: const f = 0; }
+switch (0) { case 1: class f {} default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js
index 6f6ea32f17..31abdea42e 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with FunctionDeclaration (ClassDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js
index 5d035983da..ed786cfd9d 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (ClassDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js
index 00552af97c..65128a851c 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (ClassDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: class f {} default: let f; }
+switch (0) { case 1: class f {} default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js
index dd35a925cc..9749bd52dd 100644
--- a/test/language/statements/switch/syntax/redeclaration/class-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/class-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-class-declaration.template
/*---
description: redeclaration with VariableDeclaration (ClassDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: class f {} default: var f; }
+switch (0) { case 1: class f {} default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js
index 1a84de956e..0d73fff032 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (LexicalDeclaration (const) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js
index c1d6b37b13..2b4b02968e 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (LexicalDeclaration (const) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js
index 55c492f193..d4e7c0b8c5 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with ClassDeclaration (LexicalDeclaration (const) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: const f = 0; default: class f {}; }
+switch (0) { case 1: const f = 0; default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js
index 1c35408a95..692968d57a 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (LexicalDeclaration (const) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: const f = 0; default: const f = 0; }
+switch (0) { case 1: const f = 0; default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js
index c5c16513f4..bb406471ed 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with FunctionDeclaration (LexicalDeclaration (const) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js
index bf70693802..03c3b96d4b 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (LexicalDeclaration (const) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js
index cab2d7ba83..78c4e00efd 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (LexicalDeclaration (const) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: const f = 0; default: let f; }
+switch (0) { case 1: const f = 0; default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js
index 9aa3667c62..2749011000 100644
--- a/test/language/statements/switch/syntax/redeclaration/const-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/const-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-const-declaration.template
/*---
description: redeclaration with VariableDeclaration (LexicalDeclaration (const) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: const f = 0; default: var f; }
+switch (0) { case 1: const f = 0; default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js
index cb5c6de837..b4aa30f1bf 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (FunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js
index 6cae1a9f81..7d8c75fc7b 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (FunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js
similarity index 82%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js
index 48eb323a3b..62fc2c5741 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with ClassDeclaration (FunctionDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: function f() {} default: class f {}; }
+switch (0) { case 1: function f() {} default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js
similarity index 82%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js
index 84bf72fba4..52dd04ffdf 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (FunctionDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: function f() {} default: const f = 0; }
+switch (0) { case 1: function f() {} default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js
index 75c43a0137..e019b85cf4 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with FunctionDeclaration (FunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js
index da46e8bcd0..10fab82acd 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (FunctionDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js
index 4ca757f0df..c6c7a16c47 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (FunctionDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: function f() {} default: let f; }
+switch (0) { case 1: function f() {} default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js
index efa90415f8..a3154d1cf3 100644
--- a/test/language/statements/switch/syntax/redeclaration/function-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/function-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-function-declaration.template
/*---
description: redeclaration with VariableDeclaration (FunctionDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: function f() {} default: var f; }
+switch (0) { case 1: function f() {} default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js
index d87b260f69..3787fdb626 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (GeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js
index 4b70e514b9..65947ae385 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (GeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js
index 393c2343a2..4a8086b6ac 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with ClassDeclaration (GeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: function* f() {} default: class f {}; }
+switch (0) { case 1: function* f() {} default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js
index 52b8147df7..3fe5fbf435 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (GeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: function* f() {} default: const f = 0; }
+switch (0) { case 1: function* f() {} default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js
index 72a68f8276..ba5d94b93f 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with FunctionDeclaration (GeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js
index 9119f0994f..53d173bf48 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (GeneratorDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js
index 2149cff066..f741189002 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (GeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: function* f() {} default: let f; }
+switch (0) { case 1: function* f() {} default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js
index 0fe4925156..438d933bed 100644
--- a/test/language/statements/switch/syntax/redeclaration/generator-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/generator-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-generator-declaration.template
/*---
description: redeclaration with VariableDeclaration (GeneratorDeclaration in SwitchStatement)
@@ -20,4 +20,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: function* f() {} default: var f; }
+switch (0) { case 1: function* f() {} default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js
index a1408a5d05..2ff0738a73 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (LexicalDeclaration (let) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js
index b8f667a00f..35ae7c5457 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (LexicalDeclaration (let) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js
index e09b73cf01..e5eab50dbf 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with ClassDeclaration (LexicalDeclaration (let) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: let f; default: class f {}; }
+switch (0) { case 1: let f; default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js
similarity index 83%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js
index 85b658b2a2..91669791a3 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (LexicalDeclaration (let) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: let f; default: const f = 0; }
+switch (0) { case 1: let f; default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js
index 9186b43cb4..be5068f524 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with FunctionDeclaration (LexicalDeclaration (let) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js
index 3536efc5e1..4c7d448de1 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (LexicalDeclaration (let) in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js
index 56a9f055ad..967f9249fc 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (LexicalDeclaration (let) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: let f; default: let f; }
+switch (0) { case 1: let f; default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js
similarity index 85%
rename from test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js
index 646d2f36ca..da46c7ca48 100644
--- a/test/language/statements/switch/syntax/redeclaration/let-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/let-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-let-declaration.template
/*---
description: redeclaration with VariableDeclaration (LexicalDeclaration (let) in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: let f; default: var f; }
+switch (0) { case 1: let f; default: var f }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js
index ab27b6fa45..7b9d9111a0 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-function-declaration.case
+// - src/declarations/async-function.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with AsyncFunctionDeclaration (VariableDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js
similarity index 90%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js
index 52971bb3ee..b1b9e1ca00 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-async-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-async-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-async-generator-declaration.case
+// - src/declarations/async-generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with AsyncGeneratorDeclaration (VariableDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js
index e457e72148..17fb0f085b 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-class-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-class.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-class-declaration.case
+// - src/declarations/class.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with ClassDeclaration (VariableDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: var f; default: class f {}; }
+switch (0) { case 1: var f; default: class f {} }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js
index 426f9708db..6f1f85f9d6 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-const-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-const.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-const-declaration.case
+// - src/declarations/const.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with const-LexicalDeclaration (VariableDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: var f; default: const f = 0; }
+switch (0) { case 1: var f; default: const f = 0 }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js
index 86b3f9e75c..6b415943b9 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-function-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-function.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-function-declaration.case
+// - src/declarations/function.case
// - src/declarations/redeclare-allow-sloppy-function/switch-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with FunctionDeclaration (VariableDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js
similarity index 91%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js
index 640a12a798..68aab21e3f 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-generator-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-generator.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-generator-declaration.case
+// - src/declarations/generator.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with GeneratorDeclaration (VariableDeclaration in SwitchStatement)
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js
similarity index 85%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js
index 91d4c3b088..13002c45c4 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-let-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-let.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-let-declaration.case
+// - src/declarations/let.case
// - src/declarations/redeclare/switch-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with let-LexicalDeclaration (VariableDeclaration in SwitchStatement)
@@ -19,4 +19,4 @@ info: |
$DONOTEVALUATE();
-switch (0) { case 1: var f; default: let f; }
+switch (0) { case 1: var f; default: let f }
diff --git a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-var-declaration.js b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-var.js
similarity index 84%
rename from test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-var-declaration.js
rename to test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-var.js
index 7fa10706a3..d4d646569e 100644
--- a/test/language/statements/switch/syntax/redeclaration/var-declaration-attempt-to-redeclare-with-var-declaration.js
+++ b/test/language/statements/switch/syntax/redeclaration/var-name-redeclaration-attempt-with-var.js
@@ -1,5 +1,5 @@
// This file was procedurally generated from the following sources:
-// - src/declarations/redeclare-with-var-declaration.case
+// - src/declarations/var.case
// - src/declarations/redeclare-allow-var/switch-attempt-to-redeclare-var-declaration.template
/*---
description: redeclaration with VariableDeclaration (VariableDeclaration in SwitchStatement)
@@ -13,4 +13,4 @@ info: |
---*/
-switch (0) { case 1: var f; default: var f; }
+switch (0) { case 1: var f; default: var f }
--
GitLab