From d361aaadb82d8c197ce6470f88ba5fd40792a7b5 Mon Sep 17 00:00:00 2001
From: Valerie R Young <valerie@bocoup.com>
Date: Tue, 31 Oct 2017 14:19:30 -0400
Subject: [PATCH] Fixes for forbidden property names

# Conflicts:
#	src/class-fields/propname-error/cls-decl-variable-name.template
#	src/class-fields/propname-error/cls-expr-variable-name.template
---
 .../propname-error/cls-decl-variable-name.template         | 3 +--
 .../propname-error/cls-expr-variable-name.template         | 7 +++----
 src/class-fields/static-propname-constructor.case          | 2 +-
 src/class-fields/static-propname-prototype.case            | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/class-fields/propname-error/cls-decl-variable-name.template b/src/class-fields/propname-error/cls-decl-variable-name.template
index ade7741a30..cbda5b8319 100644
--- a/src/class-fields/propname-error/cls-decl-variable-name.template
+++ b/src/class-fields/propname-error/cls-decl-variable-name.template
@@ -14,10 +14,9 @@ info: |
 
 var /*{ propname }*/ = 'foo';
 class C {
-  [/*{ propname }*/];
+  /*{ static }*/ [/*{ propname }*/];
 }
 
 var c = new C();
 
 assert.sameValue(c.hasOwnProperty("foo"), true);
-assert.sameValue(C.hasOwnProperty("foo"), false);
diff --git a/src/class-fields/propname-error/cls-expr-variable-name.template b/src/class-fields/propname-error/cls-expr-variable-name.template
index 1435862de5..50b255197f 100644
--- a/src/class-fields/propname-error/cls-expr-variable-name.template
+++ b/src/class-fields/propname-error/cls-expr-variable-name.template
@@ -14,10 +14,9 @@ info: |
 
 var /*{ propname }*/ = 'foo';
 var C = class {
-  [/*{ propname }*/];
-};
+  /*{ static }*/ [/*{ propname }*/];
+}
 
 var c = new C();
-assert.sameValue(c.hasOwnProperty("foo"), true);
 
-assert.sameValue(C.hasOwnProperty("foo"), false);
+assert.sameValue(c.hasOwnProperty("foo"), true);
diff --git a/src/class-fields/static-propname-constructor.case b/src/class-fields/static-propname-constructor.case
index ffa6754e20..ff3d00af6a 100644
--- a/src/class-fields/static-propname-constructor.case
+++ b/src/class-fields/static-propname-constructor.case
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-desc: Static class field cannot have PropName 'constructor'
+desc: static class field forbid PropName 'constructor'
 info: |
 
   // This test file tests the following early error:
diff --git a/src/class-fields/static-propname-prototype.case b/src/class-fields/static-propname-prototype.case
index 9b2e9ab331..99d85ff64a 100644
--- a/src/class-fields/static-propname-prototype.case
+++ b/src/class-fields/static-propname-prototype.case
@@ -2,7 +2,7 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-desc: Static class fields cannot have PropName 'prototype'
+desc: static class fields forbid PropName 'prototype'
 info: |
 
   // This test file tests the following early error: