ES6: Implement generator method shorthand

test/mjsunit/harmony/object-literals-method.js

Index: test/mjsunit/harmony/object-literals-method.js
diff --git a/test/mjsunit/harmony/object-literals-method.js b/test/mjsunit/harmony/object-literals-method.js
index 2af0859424e9c6265a7ff42e530d8637d3b4384b..71f44d10bc7ea65679699b904a1e1c02cd6a6ddc 100644
--- a/test/mjsunit/harmony/object-literals-method.js
+++ b/test/mjsunit/harmony/object-literals-method.js
@@ -5,7 +5,7 @@
 // Flags: --harmony-object-literals --allow-natives-syntax
 
 
-(function TestDescriptor() {
+(function TestBasics() {
   var object = {
     method() {
       return 42;
@@ -15,6 +15,16 @@
 })();
 
 
+(function TestThis() {
+  var object = {
+    method() {
+      assertEquals(object, this);
+    }
+  };
+  object.method();
+})();
+
+
 (function TestDescriptor() {
   var object = {
     method() {
@@ -34,9 +44,7 @@
 
 (function TestProto() {
   var object = {
-    method() {
-      return 42;
-    }
+    method() {}
   };
 
   assertEquals(Function.prototype, Object.getPrototypeOf(object.method));
@@ -45,9 +53,7 @@
 
 (function TestNotConstructable() {
   var object = {
-    method() {
-      return 42;
-    }
+    method() {}
   };
 
   assertThrows(function() {
@@ -58,9 +64,7 @@
 
 (function TestFunctionName() {
   var object = {
-    method() {
-      return 42;
-    },
+    method() {},
     1() {},
     2.0() {}
   };
@@ -68,7 +72,6 @@
   assertEquals('method', f.name);
   var g = object[1];
   assertEquals('1', g.name);
-
   var h = object[2];
   assertEquals('2', h.name);
 })();
@@ -90,9 +93,7 @@
 
 (function TestNoPrototype() {
   var object = {
-    method() {
-      return 42;
-    }
+    method() {}
   };
   var f = object.method;
   assertFalse(f.hasOwnProperty('prototype'));
@@ -121,3 +122,127 @@
   assertEquals(42, object.method());
   assertFalse(object.method.hasOwnProperty('prototype'));
 })();
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+
+var GeneratorFunction = function*() {}.__proto__.constructor;
+
+
+function assertIteratorResult(value, done, result) {
+  assertEquals({value: value, done: done}, result);
+}
+
+
+(function TestGeneratorBasics() {
+  var object = {
+    *method() {
+      yield 1;
+    }
+  };
+  var g = object.method();
+  assertIteratorResult(1, false, g.next());
+  assertIteratorResult(undefined, true, g.next());
+})();
+
+
+(function TestGeneratorThis() {
+  var object = {
+    *method() {
+      yield this;
+    }
+  };
+  var g = object.method();
+  assertIteratorResult(object, false, g.next());
+  assertIteratorResult(undefined, true, g.next());
+})();
+
+
+(function TestGeneratorSymbolIterator() {
+  var object = {
+    *method() {}
+  };
+  var g = object.method();
+  assertEquals(g, g[Symbol.iterator]());
+})();
+
+
+(function TestGeneratorDescriptor() {
+  var object = {
+    *method() {
+      yield 1;
+    }
+  };
+
+  var desc = Object.getOwnPropertyDescriptor(object, 'method');
+  assertTrue(desc.enumerable);
+  assertTrue(desc.configurable);
+  assertTrue(desc.writable);
+  assertEquals('function', typeof desc.value);
+
+  var g = desc.value();
+  assertIteratorResult(1, false, g.next());
+  assertIteratorResult(undefined, true, g.next());
+})();
+
+
+(function TestGeneratorProto() {
+  var object = {
+    *method() {}
+  };
+
+  assertEquals(GeneratorFunction.prototype,
+               Object.getPrototypeOf(object.method));
+})();
+
+
+(function TestGeneratorConstructable() {
+  var object = {
+    *method() {
+      yield 1;
+    }
+  };
+
+  var g = new object.method();
+  assertIteratorResult(1, false, g.next());
+  assertIteratorResult(undefined, true, g.next());
+})();
+
+
+(function TestGeneratorName() {
+  var object = {
+    *method() {},
+    *1() {},
+    *2.0() {}
+  };
+  var f = object.method;
+  assertEquals('method', f.name);
+  var g = object[1];
+  assertEquals('1', g.name);
+  var h = object[2];
+  assertEquals('2', h.name);
+})();
+
+
+(function TestGeneratorNoBinding() {
+  var method = 'local';
+  var calls = 0;
+  var object = {
+    *method() {
+      calls++;
+      assertEquals('local', method);
+    }
+  };
+  var g = object.method();
+  assertIteratorResult(undefined, true, g.next());
+  assertEquals(1, calls);
+})();
+
+
+(function TestGeneratorToString() {
+  var object = {
+    *method() { yield 1; }
+  };
+  assertEquals('*method() { yield 1; }', object.method.toString());
+})();