Merge pull request #200 from bocoup/198

computed-property-names: corrections. Fixes gh-198

test/language/computed-property-names/class/method/constructor-cannot-be-getter.js

@@ -3,7 +3,7 @@
 /*---
 es6id: 14.5.3
 description: >
-    computed property getter names cannot be "constructor"
+    computed property getter names can be called "constructor"
 negative: SyntaxError
 ---*/
 class C4 {

test/language/computed-property-names/class/method/constructor-cannot-be-setter.js

@@ -3,7 +3,7 @@
 /*---
 es6id: 14.5.3
 description: >
-    computed property setter names cannot be "constructor"
+    computed property setter names can be called "constructor"
 negative: SyntaxError
 ---*/
 class C4 {

test/language/computed-property-names/class/method/constructor-no-duplicate-1.js

@@ -3,8 +3,7 @@
 /*---
 es6id: 12.2.5
 description: >
-    computed property names can be "constructor", but duplicates are not allowed, 1
+    computed property names can be "constructor"
-negative: SyntaxError
 ---*/
 class C {
   constructor() {}

test/language/computed-property-names/class/method/constructor-no-duplicate-2.js

@@ -3,8 +3,7 @@
 /*---
 es6id: 12.2.5
 description: >
-    computed property names can be "constructor", but duplicates are not allowed, 2
+    computed property names can be "constructor"
-negative: SyntaxError
 ---*/
 class C {
   ['constructor']() {}

test/language/computed-property-names/class/method/constructor-no-duplicate-3.js

@@ -3,8 +3,7 @@
 /*---
 es6id: 12.2.5
 description: >
-    computed property names can be "constructor", but duplicates are not allowed, 2
+    computed property names can be "constructor"
-negative: SyntaxError
 ---*/
 class C {
   ['constructor']() {}

test/language/computed-property-names/class/static/generator-prototype.js

@@ -1,12 +1,13 @@
 // Copyright (C) Copyright 2014 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-es6id: 12.2.5
+es6id: 14.5.14
 description: >
     In a class, computed property names for static
-    generators cannot be "prototype"
+    generators that are named "prototype" throw a TypeError
-negative: SyntaxError
 ---*/
-class C {
+assert.throws(TypeError, function() {
+  class C {
     static *['prototype']() {}
-}
+  }
+});

test/language/computed-property-names/class/static/getter-prototype.js

@@ -1,12 +1,13 @@
 // Copyright (C) Copyright 2014 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-es6id: 12.2.5
+es6id: 14.5.14
 description: >
     In a class, computed property names for static
-    getters cannot be "prototype"
+    getters that are named "prototype" throw a TypeError
-negative: SyntaxError
 ---*/
-class C {
+assert.throws(TypeError, function() {
+  class C {
     static get ['prototype']() {}
-}
+  }
+});

test/language/computed-property-names/class/static/method-prototype.js

@@ -1,12 +1,14 @@
 // Copyright (C) Copyright 2014 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-es6id: 12.2.5
+es6id: 14.5.14
 description: >
     In a class, computed property names for static
-    methods cannot be "prototype"
+    methods that are named "prototype" throw a TypeError
-negative: SyntaxError
 ---*/
-class C {
+
+assert.throws(TypeError, function() {
+  class C {
     static ['prototype']() {}
-}
+  }
+});

test/language/computed-property-names/class/static/setter-prototype.js

@@ -1,12 +1,14 @@
 // Copyright (C) Copyright 2014 the V8 project authors. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 /*---
-es6id: 12.2.5
+es6id: 14.5.14
 description: >
     In a class, computed property names for static
-    setters cannot be "prototype"
+    setters that are named "prototype" throw a TypeError
-negative: SyntaxError
 ---*/
-class C {
+
+assert.throws(TypeError, function() {
+  class C {
     static set ['prototype'](x) {}
-}
+  }
+});