Merge pull request #2267 from mkubilayk/static-private-method-inner

Add tests for static private method access inside nested functions

src/class-elements/static-private-method-access-on-inner-arrow-function.case

@@ -0,0 +1,38 @@
+// Copyright (C) 2019 Kubilay Kahveci (Bloomberg LP). All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: Static private method access inside of an arrow function
+info: |
+  PrivateFieldGet (P, O)
+    1. Assert: P is a Private Name.
+    2. If O is not an object, throw a TypeError exception.
+    3. If P.[[Kind]] is "field",
+        ...
+    4. Perform ? PrivateBrandCheck(O, P).
+    5. If P.[[Kind]] is "method",
+      a. Return P.[[Value]].
+    ...
+
+  PrivateBrandCheck(O, P)
+    1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true,
+      a. Throw a TypeError exception.
+template: default
+features: [class-static-methods-private]
+---*/
+
+//- elements
+static #f() { return 42; }
+static g() {
+  const arrowFunction = () => {
+    return this.#f();
+  };
+
+  return arrowFunction();
+}
+
+//- assertions
+assert.sameValue(C.g(), 42);
+assert.throws(TypeError, function() {
+  C.g.call({});
+}, 'Accessed static private method from an object which did not contain it');

src/class-elements/static-private-method-access-on-inner-function.case

@@ -0,0 +1,40 @@
+// Copyright (C) 2019 Kubilay Kahveci (Bloomberg LP). All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+desc: Static private method access inside of a nested function
+info: |
+  PrivateFieldGet (P, O)
+    1. Assert: P is a Private Name.
+    2. If O is not an object, throw a TypeError exception.
+    3. If P.[[Kind]] is "field",
+        ...
+    4. Perform ? PrivateBrandCheck(O, P).
+    5. If P.[[Kind]] is "method",
+      a. Return P.[[Value]].
+    ...
+
+  PrivateBrandCheck(O, P)
+    1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true,
+      a. Throw a TypeError exception.
+template: default
+features: [class-static-methods-private]
+---*/
+
+//- elements
+static #f() { return 42; }
+static g() {
+  const self = this;
+
+  function innerFunction() {
+    return self.#f();
+  }
+
+  return innerFunction();
+}
+
+//- assertions
+assert.sameValue(C.g(), 42);
+assert.throws(TypeError, function() {
+  C.g.call({});
+}, 'Accessed static private method from an object which did not contain it');

test/language/expressions/class/elements/static-private-method-access-on-inner-arrow-function.js

@@ -0,0 +1,42 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/static-private-method-access-on-inner-arrow-function.case
+// - src/class-elements/default/cls-expr.template
+/*---
+description: Static private method access inside of an arrow function (field definitions in a class expression)
+esid: prod-FieldDefinition
+features: [class-static-methods-private, class]
+flags: [generated]
+info: |
+    PrivateFieldGet (P, O)
+      1. Assert: P is a Private Name.
+      2. If O is not an object, throw a TypeError exception.
+      3. If P.[[Kind]] is "field",
+          ...
+      4. Perform ? PrivateBrandCheck(O, P).
+      5. If P.[[Kind]] is "method",
+        a. Return P.[[Value]].
+      ...
+
+    PrivateBrandCheck(O, P)
+      1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true,
+        a. Throw a TypeError exception.
+
+---*/
+
+
+var C = class {
+  static #f() { return 42; }
+  static g() {
+    const arrowFunction = () => {
+      return this.#f();
+    };
+
+    return arrowFunction();
+  }
+
+}
+
+assert.sameValue(C.g(), 42);
+assert.throws(TypeError, function() {
+  C.g.call({});
+}, 'Accessed static private method from an object which did not contain it');

test/language/expressions/class/elements/static-private-method-access-on-inner-function.js

@@ -0,0 +1,44 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/static-private-method-access-on-inner-function.case
+// - src/class-elements/default/cls-expr.template
+/*---
+description: Static private method access inside of a nested function (field definitions in a class expression)
+esid: prod-FieldDefinition
+features: [class-static-methods-private, class]
+flags: [generated]
+info: |
+    PrivateFieldGet (P, O)
+      1. Assert: P is a Private Name.
+      2. If O is not an object, throw a TypeError exception.
+      3. If P.[[Kind]] is "field",
+          ...
+      4. Perform ? PrivateBrandCheck(O, P).
+      5. If P.[[Kind]] is "method",
+        a. Return P.[[Value]].
+      ...
+
+    PrivateBrandCheck(O, P)
+      1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true,
+        a. Throw a TypeError exception.
+
+---*/
+
+
+var C = class {
+  static #f() { return 42; }
+  static g() {
+    const self = this;
+
+    function innerFunction() {
+      return self.#f();
+    }
+
+    return innerFunction();
+  }
+
+}
+
+assert.sameValue(C.g(), 42);
+assert.throws(TypeError, function() {
+  C.g.call({});
+}, 'Accessed static private method from an object which did not contain it');

test/language/statements/class/elements/static-private-method-access-on-inner-arrow-function.js

@@ -0,0 +1,42 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/static-private-method-access-on-inner-arrow-function.case
+// - src/class-elements/default/cls-decl.template
+/*---
+description: Static private method access inside of an arrow function (field definitions in a class declaration)
+esid: prod-FieldDefinition
+features: [class-static-methods-private, class]
+flags: [generated]
+info: |
+    PrivateFieldGet (P, O)
+      1. Assert: P is a Private Name.
+      2. If O is not an object, throw a TypeError exception.
+      3. If P.[[Kind]] is "field",
+          ...
+      4. Perform ? PrivateBrandCheck(O, P).
+      5. If P.[[Kind]] is "method",
+        a. Return P.[[Value]].
+      ...
+
+    PrivateBrandCheck(O, P)
+      1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true,
+        a. Throw a TypeError exception.
+
+---*/
+
+
+class C {
+  static #f() { return 42; }
+  static g() {
+    const arrowFunction = () => {
+      return this.#f();
+    };
+
+    return arrowFunction();
+  }
+
+}
+
+assert.sameValue(C.g(), 42);
+assert.throws(TypeError, function() {
+  C.g.call({});
+}, 'Accessed static private method from an object which did not contain it');

test/language/statements/class/elements/static-private-method-access-on-inner-function.js

@@ -0,0 +1,44 @@
+// This file was procedurally generated from the following sources:
+// - src/class-elements/static-private-method-access-on-inner-function.case
+// - src/class-elements/default/cls-decl.template
+/*---
+description: Static private method access inside of a nested function (field definitions in a class declaration)
+esid: prod-FieldDefinition
+features: [class-static-methods-private, class]
+flags: [generated]
+info: |
+    PrivateFieldGet (P, O)
+      1. Assert: P is a Private Name.
+      2. If O is not an object, throw a TypeError exception.
+      3. If P.[[Kind]] is "field",
+          ...
+      4. Perform ? PrivateBrandCheck(O, P).
+      5. If P.[[Kind]] is "method",
+        a. Return P.[[Value]].
+      ...
+
+    PrivateBrandCheck(O, P)
+      1. If O.[[PrivateBrands]] does not contain an entry e such that SameValue(e, P.[[Brand]]) is true,
+        a. Throw a TypeError exception.
+
+---*/
+
+
+class C {
+  static #f() { return 42; }
+  static g() {
+    const self = this;
+
+    function innerFunction() {
+      return self.#f();
+    }
+
+    return innerFunction();
+  }
+
+}
+
+assert.sameValue(C.g(), 42);
+assert.throws(TypeError, function() {
+  C.g.call({});
+}, 'Accessed static private method from an object which did not contain it');