Implement ECMAScript 2022 class static block (#4841)

Co-authored-by: Martin Negyokru negyokru@inf.u-szeged.hu JerryScript-DCO-1.0-Signed-off-by: Adam Szilagyi aszilagy@inf.u-szeged.hu
2021-12-15 15:45:53 +01:00
parent c51b268276
commit 53b61c1f6f
15 changed files with 381 additions and 46 deletions
@@ -0,0 +1,147 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+function check_syntax_error(code) {
+  try {
+    eval(code)
+    assert(false)
+  } catch (e) {
+    assert(e instanceof SyntaxError)
+  }
+}
+
+check_syntax_error("static {}");
+check_syntax_error("class C { #static {} }");
+check_syntax_error("function foo() { static {} }");
+check_syntax_error("class C { static { return; } }");
+check_syntax_error("class C { static { break; } }");
+check_syntax_error("class C { static { continue; } }");
+check_syntax_error("class C { static { await => 0; } }");
+check_syntax_error("class C { static { yield } }");
+check_syntax_error("class C { static { super(); } }");
+check_syntax_error("class C { static { let a; let a; } }");
+check_syntax_error("class C { static { label: label: 0 } }");
+check_syntax_error("class C { static { let #a; } }");
+check_syntax_error("class C { static { (class { [arguments]() { } }); } }");
+check_syntax_error("class C { static {x: while (false) {continue y; } } }");
+check_syntax_error("function* g() { class C { static { yield; } } }");
+
+try {
+  class C {
+    static {
+      function foo() {
+        return this.a
+      };
+
+      foo()
+    }
+  }
+  assert(false)
+} catch (e) {
+  assert(e instanceof TypeError)
+}
+
+class Parent {
+  static fieldP = 'fieldP'
+}
+
+class C1 extends Parent{
+  static a = 0;
+  static #privateField = 1;
+
+  static {
+    assert(this.a === 0)
+    assert(this.#privateField === 1)
+
+    this.a = 1
+    this.b = super.fieldP
+    this.c = new.target
+
+    assert(this.a === 1)
+    assert(this.b === 'fieldP')
+    assert(this.c === undefined)
+    assert(this.d === undefined)
+  }
+
+  static d = 2
+
+  static {
+    assert(this.b === 'fieldP')
+    assert(this.d === 2)
+  }
+
+  static {
+    function f() {
+      assert(this === undefined)
+    }
+
+    let a = 11
+    assert (this.a !== a)
+  }
+
+}
+
+class C2 {
+  getPrivateField;
+  static getPrivateField2;
+  static invalidAccess;
+}
+
+let getPrivateField;
+
+class C3 {
+  #privateField = 'invalid';
+  static #staticPrivateField = 'private';
+
+  constructor(p) {
+    this.#privateField = p;
+  }
+
+  static {
+    getPrivateField = (d) => d.#privateField;
+    C2.getPrivateField = () => this.#staticPrivateField;
+    C2.getPrivateField2 = () => this.#staticPrivateField;
+    C2.invalidAccess = () => this.#privateField;
+  }
+}
+
+assert(getPrivateField(new C3('private field')) == 'private field');
+assert(C2.getPrivateField() === 'private')
+assert(C2.getPrivateField2() === 'private')
+
+try {
+  C2.invalidAccess()
+  assert(false)
+} catch (e) {
+  assert(e instanceof TypeError)
+}
+
+let a = 'outter'
+let b, c
+
+class C5 {
+  static {
+    let a = 'first block'
+    b = a
+  }
+
+  static {
+    let a = "second block"
+    c = a
+  }
+}
+
+assert(a === "outter")
+assert(b === "first block")
+assert(c === "second block")
@@ -79,19 +79,6 @@
  <test id="language/eval-code/indirect/var-env-func-init-global-new.js"><reason></reason></test>
  <test id="language/eval-code/indirect/var-env-func-init-global-update-configurable.js"><reason></reason></test>
  <test id="language/eval-code/indirect/var-env-var-init-global-new.js"><reason></reason></test>
-  <test id="language/expressions/class/static-init-await-reference.js"><reason></reason></test>
-  <test id="language/expressions/function/static-init-await-binding.js"><reason></reason></test>
-  <test id="language/expressions/function/static-init-await-reference.js"><reason></reason></test>
-  <test id="language/expressions/generators/static-init-await-binding.js"><reason></reason></test>
-  <test id="language/expressions/generators/static-init-await-reference.js"><reason></reason></test>
-  <test id="language/expressions/object/ident-name-prop-name-literal-await-static-init.js"><reason></reason></test>
-  <test id="language/expressions/object/identifier-shorthand-static-init-await-valid.js"><reason></reason></test>
-  <test id="language/expressions/object/method-definition/static-init-await-binding-accessor.js"><reason></reason></test>
-  <test id="language/expressions/object/method-definition/static-init-await-binding-generator.js"><reason></reason></test>
-  <test id="language/expressions/object/method-definition/static-init-await-binding-normal.js"><reason></reason></test>
-  <test id="language/expressions/object/method-definition/static-init-await-reference-accessor.js"><reason></reason></test>
-  <test id="language/expressions/object/method-definition/static-init-await-reference-generator.js"><reason></reason></test>
-  <test id="language/expressions/object/method-definition/static-init-await-reference-normal.js"><reason></reason></test>
  <test id="language/expressions/arrow-function/param-dflt-yield-expr.js"><reason></reason></test>
  <test id="language/expressions/assignment/S11.13.1_A5_T1.js"><reason></reason></test>
  <test id="language/expressions/assignment/S11.13.1_A5_T2.js"><reason></reason></test>
@@ -509,13 +496,6 @@
  <test id="language/statements/class/private-non-static-setter-static-getter-early-error.js"><reason></reason></test>
  <test id="language/statements/class/private-static-getter-non-static-setter-early-error.js"><reason></reason></test>
  <test id="language/statements/class/private-static-setter-non-static-getter-early-error.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-abrupt.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-expr-new-target.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-scope-lex-close.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-scope-lex-open.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-scope-var-close.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-scope-var-open.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-sequence.js"><reason></reason></test>
  <test id="language/statements/for-await-of/head-lhs-async.js"><reason></reason></test>
  <test id="language/statements/for-of/head-lhs-async-parens.js"><reason></reason></test>
  <test id="language/statements/function/unscopables-with-in-nested-fn.js"><reason></reason></test>
@@ -526,22 +506,6 @@
  <test id="language/statements/switch/scope-lex-async-generator.js"><reason></reason></test>
  <test id="language/statements/switch/scope-lex-generator.js"><reason></reason></test>
  <test id="language/statements/try/completion-values.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-arguments-functions.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-arguments-methods.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-await-binding-valid.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-expr-this.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-scope-lex-derived.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-scope-private.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-scope-var-derived.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-statement-list-optional.js"><reason></reason></test>
-  <test id="language/statements/class/static-init-super-property.js"><reason></reason></test>
-  <test id="language/statements/const/static-init-await-binding-valid.js"><reason></reason></test>
-  <test id="language/statements/function/static-init-await-binding-valid.js"><reason></reason></test>
-  <test id="language/statements/let/static-init-await-binding-valid.js"><reason></reason></test>
-  <test id="language/statements/try/static-init-await-binding-valid.js"><reason></reason></test>
-  <test id="language/statements/variable/dstr/ary-ptrn-elem-id-static-init-await-valid.js"><reason></reason></test>
-  <test id="language/statements/variable/dstr/obj-ptrn-elem-id-static-init-await-valid.js"><reason></reason></test>
-  <test id="language/statements/variable/static-init-await-binding-valid.js"><reason></reason></test>
  <test id="language/white-space/after-regular-expression-literal-em-quad.js"><reason></reason></test>
  <test id="language/white-space/after-regular-expression-literal-em-space.js"><reason></reason></test>
  <test id="language/white-space/after-regular-expression-literal-en-quad.js"><reason></reason></test>