From 58f39fd36ab51e8a1c1df778a24e07d12d83edab Mon Sep 17 00:00:00 2001 From: Leo Balter Date: Mon, 10 Sep 2018 14:12:19 -0400 Subject: [PATCH 1/2] Apply fixes on recent class element tests Ref https://github.com/tc39/test262/pull/1711#issuecomment-419973158 --- .../grammar-special-meth-ctor-set.case | 2 +- .../grammar-static-ctor-accessor-meth-valid.case | 2 +- .../grammar-static-private-ctor-meth-valid.case | 16 ---------------- .../grammar-static-set-meth-prototype.case | 2 +- 4 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 src/class-elements/grammar-static-private-ctor-meth-valid.case diff --git a/src/class-elements/grammar-special-meth-ctor-set.case b/src/class-elements/grammar-special-meth-ctor-set.case index d7855ad3ce..b65654212b 100644 --- a/src/class-elements/grammar-special-meth-ctor-set.case +++ b/src/class-elements/grammar-special-meth-ctor-set.case @@ -12,4 +12,4 @@ template: syntax/invalid ---*/ //- elements -set constructor() {} +set constructor(_) {} diff --git a/src/class-elements/grammar-static-ctor-accessor-meth-valid.case b/src/class-elements/grammar-static-ctor-accessor-meth-valid.case index d161900eb1..4e0cba9bc7 100644 --- a/src/class-elements/grammar-static-ctor-accessor-meth-valid.case +++ b/src/class-elements/grammar-static-ctor-accessor-meth-valid.case @@ -17,7 +17,7 @@ template: syntax/valid //- elements static get constructor() {} -static set constructor() {} +static set constructor(_) {} constructor() {} // stacks with a valid constructor //- teardown assert(C.hasOwnProperty('constructor')); diff --git a/src/class-elements/grammar-static-private-ctor-meth-valid.case b/src/class-elements/grammar-static-private-ctor-meth-valid.case deleted file mode 100644 index f4db2766d0..0000000000 --- a/src/class-elements/grammar-static-private-ctor-meth-valid.case +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (C) 2018 Leo Balter. All rights reserved. -// This code is governed by the BSD license found in the LICENSE file. - -/*--- -desc: Static Methods can be named constructor -info: | - Class Definitions / Static Semantics: Early Errors - - ClassElement : static MethodDefinition - It is a Syntax Error if PropName of MethodDefinition is "prototype" -template: syntax/invalid ----*/ - -//- elements -static constructor() {} -constructor() {} // stacks with a valid constructor diff --git a/src/class-elements/grammar-static-set-meth-prototype.case b/src/class-elements/grammar-static-set-meth-prototype.case index 6c814a1142..6403e4f0e4 100644 --- a/src/class-elements/grammar-static-set-meth-prototype.case +++ b/src/class-elements/grammar-static-set-meth-prototype.case @@ -12,4 +12,4 @@ template: syntax/invalid ---*/ //- elements -static set prototype() {} +static set prototype(_) {} From 5cdbf084a7ebd798e94c37721eab44b91e94092f Mon Sep 17 00:00:00 2001 From: Leo Balter Date: Mon, 10 Sep 2018 14:13:39 -0400 Subject: [PATCH 2/2] Generate tests --- .../grammar-special-meth-ctor-set.js | 2 +- .../grammar-static-private-ctor-meth-valid.js | 26 ------------------- .../grammar-static-set-meth-prototype.js | 2 +- ...grammar-static-ctor-accessor-meth-valid.js | 2 +- .../grammar-special-meth-ctor-set.js | 2 +- .../grammar-static-private-ctor-meth-valid.js | 26 ------------------- .../grammar-static-set-meth-prototype.js | 2 +- ...grammar-static-ctor-accessor-meth-valid.js | 2 +- 8 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 test/language/expressions/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js delete mode 100644 test/language/statements/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js diff --git a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-set.js b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-set.js index d024b1729a..c00b6ebee7 100644 --- a/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-set.js +++ b/test/language/expressions/class/syntax/early-errors/grammar-special-meth-ctor-set.js @@ -21,5 +21,5 @@ info: | throw "Test262: This statement should not be evaluated."; var C = class { - set constructor() {} + set constructor(_) {} }; diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js b/test/language/expressions/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js deleted file mode 100644 index 1b5f2e7eab..0000000000 --- a/test/language/expressions/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js +++ /dev/null @@ -1,26 +0,0 @@ -// This file was procedurally generated from the following sources: -// - src/class-elements/grammar-static-private-ctor-meth-valid.case -// - src/class-elements/syntax/invalid/cls-expr-elements-invalid-syntax.template -/*--- -description: Static Methods can be named constructor (class expression) -esid: prod-ClassElement -features: [class] -flags: [generated] -negative: - phase: parse - type: SyntaxError -info: | - Class Definitions / Static Semantics: Early Errors - - ClassElement : static MethodDefinition - It is a Syntax Error if PropName of MethodDefinition is "prototype" - ----*/ - - -throw "Test262: This statement should not be evaluated."; - -var C = class { - static constructor() {} - constructor() {} // stacks with a valid constructor -}; diff --git a/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-prototype.js b/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-prototype.js index 0e675f4a87..a49baf5f2c 100644 --- a/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-prototype.js +++ b/test/language/expressions/class/syntax/early-errors/grammar-static-set-meth-prototype.js @@ -21,5 +21,5 @@ info: | throw "Test262: This statement should not be evaluated."; var C = class { - static set prototype() {} + static set prototype(_) {} }; diff --git a/test/language/expressions/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js b/test/language/expressions/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js index 86f0bb41fe..87f7659bad 100644 --- a/test/language/expressions/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js +++ b/test/language/expressions/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js @@ -21,7 +21,7 @@ info: | var C = class { static get constructor() {} - static set constructor() {} + static set constructor(_) {} constructor() {} // stacks with a valid constructor }; diff --git a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-set.js b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-set.js index 8e6097701b..7567981c19 100644 --- a/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-set.js +++ b/test/language/statements/class/syntax/early-errors/grammar-special-meth-ctor-set.js @@ -21,5 +21,5 @@ info: | throw "Test262: This statement should not be evaluated."; class C { - set constructor() {} + set constructor(_) {} } diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js b/test/language/statements/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js deleted file mode 100644 index 2ec596b364..0000000000 --- a/test/language/statements/class/syntax/early-errors/grammar-static-private-ctor-meth-valid.js +++ /dev/null @@ -1,26 +0,0 @@ -// This file was procedurally generated from the following sources: -// - src/class-elements/grammar-static-private-ctor-meth-valid.case -// - src/class-elements/syntax/invalid/cls-decl-elements-invalid-syntax.template -/*--- -description: Static Methods can be named constructor (class declaration) -esid: prod-ClassElement -features: [class] -flags: [generated] -negative: - phase: parse - type: SyntaxError -info: | - Class Definitions / Static Semantics: Early Errors - - ClassElement : static MethodDefinition - It is a Syntax Error if PropName of MethodDefinition is "prototype" - ----*/ - - -throw "Test262: This statement should not be evaluated."; - -class C { - static constructor() {} - constructor() {} // stacks with a valid constructor -} diff --git a/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-prototype.js b/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-prototype.js index 1de086e4f4..222486686e 100644 --- a/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-prototype.js +++ b/test/language/statements/class/syntax/early-errors/grammar-static-set-meth-prototype.js @@ -21,5 +21,5 @@ info: | throw "Test262: This statement should not be evaluated."; class C { - static set prototype() {} + static set prototype(_) {} } diff --git a/test/language/statements/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js b/test/language/statements/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js index 6ff13c7427..ef89e5b175 100644 --- a/test/language/statements/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js +++ b/test/language/statements/class/syntax/valid/grammar-static-ctor-accessor-meth-valid.js @@ -21,7 +21,7 @@ info: | class C { static get constructor() {} - static set constructor() {} + static set constructor(_) {} constructor() {} // stacks with a valid constructor }