Closed generator returns a completed object instead of throwing a error

test/mjsunit/harmony/generators-iteration.js

Index: test/mjsunit/harmony/generators-iteration.js
diff --git a/test/mjsunit/harmony/generators-iteration.js b/test/mjsunit/harmony/generators-iteration.js
index 7fad97e9445ce1f5b4a85180be3e6b013c2789fa..74838149af7ee094e9f07f508f00be55511c6056 100644
--- a/test/mjsunit/harmony/generators-iteration.js
+++ b/test/mjsunit/harmony/generators-iteration.js
@@ -57,7 +57,8 @@ function TestGenerator(g, expected_values_for_next,
                            i == expected_values_for_next.length - 1,
                            iter.next());
     }
-    assertThrows(function() { iter.next(); }, Error);
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });

[wingo, 2014/01/13 13:44:49]

Consider factoring this common double-check out to assertIteratorFinished, and
using that here and below.

[yusukesuzuki, 2014/01/13 14:27:51]

Introduced assertIteratorIsClosed and assertThrownIteratorIsClosed and used
them.
When v8:3096 is fixed, we can remove commented code in
assertThrownIteratorIsClosed.

   }
   function testSend(thunk) {
     var iter = thunk();
@@ -66,7 +67,8 @@ function TestGenerator(g, expected_values_for_next,
                            i == expected_values_for_send.length - 1,
                            iter.next(send_val));
     }
-    assertThrows(function() { iter.next(send_val); }, Error);
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(send_val); });
   }
   function testThrow(thunk) {
     for (var i = 0; i < expected_values_for_next.length; i++) {
@@ -78,7 +80,13 @@ function TestGenerator(g, expected_values_for_next,
       }
       function Sentinel() {}
       assertThrows(function () { iter.throw(new Sentinel); }, Sentinel);
-      assertThrows(function () { iter.next(); }, Error);
+      // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+      // following tests are failed.
+      // https://code.google.com/p/v8/issues/detail?id=3096
+      /*
+      assertIteratorResult(undefined, true, iter.next());
+      assertDoesNotThrow(function() { iter.next(); });
+      */

[wingo, 2014/01/13 13:44:49]

The correct check is assertThrows(iter.next.bind(iter), TypeError), no?  (Per
http://people.mozilla.org/~jorendorff/es6-draft.html#sec-generatorresume)

[yusukesuzuki, 2014/01/13 14:27:51]

When iter.throw is executed and inserted error doesn't caught in the generator,
iter.throw propagates the error and iter's status becomes "completed"
(25.3.3.1-4-b and 25.3.3.1-4-d). So after that, `iter.next()` returns { value:
undefined, done: true } since iter's status is "completed". (25.3.3.2-5)

     }
   }
 
@@ -394,20 +402,32 @@ function TestTryCatch(instantiate) {
     assertIteratorResult(2, false, iter.next());
     assertIteratorResult(3, false, iter.next());
     assertIteratorResult(undefined, true, iter.next());
-    assertThrows(function() { iter.next(); }, Error);
+    assertDoesNotThrow(function() { iter.next(); });
   }
   Test1(instantiate(g));
 
   function Test2(iter) {
     assertThrows(function() { iter.throw(new Sentinel); }, Sentinel);
-    assertThrows(function() { iter.next(); }, Error);
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test2(instantiate(g));
 
   function Test3(iter) {
     assertIteratorResult(1, false, iter.next());
     assertThrows(function() { iter.throw(new Sentinel); }, Sentinel);
-    assertThrows(function() { iter.next(); }, Error);
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test3(instantiate(g));
 
@@ -418,7 +438,7 @@ function TestTryCatch(instantiate) {
     assertIteratorResult(exn, false, iter.throw(exn));
     assertIteratorResult(3, false, iter.next());
     assertIteratorResult(undefined, true, iter.next());
-    assertThrows(function() { iter.next(); }, Error);
+    assertDoesNotThrow(function() { iter.next(); });
   }
   Test4(instantiate(g));
 
@@ -429,8 +449,13 @@ function TestTryCatch(instantiate) {
     assertIteratorResult(exn, false, iter.throw(exn));
     assertIteratorResult(3, false, iter.next());
     assertThrows(function() { iter.throw(new Sentinel); }, Sentinel);
-    assertThrows(function() { iter.next(); }, Error);
-
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test5(instantiate(g));
 
@@ -440,7 +465,13 @@ function TestTryCatch(instantiate) {
     var exn = new Sentinel;
     assertIteratorResult(exn, false, iter.throw(exn));
     assertThrows(function() { iter.throw(new Sentinel); }, Sentinel);
-    assertThrows(function() { iter.next(); }, Error);
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test6(instantiate(g));
 
@@ -449,7 +480,7 @@ function TestTryCatch(instantiate) {
     assertIteratorResult(2, false, iter.next());
     assertIteratorResult(3, false, iter.next());
     assertIteratorResult(undefined, true, iter.next());
-    assertThrows(function() { iter.next(); }, Error);
+    assertDoesNotThrow(function() { iter.next(); });
   }
   Test7(instantiate(g));
 }
@@ -467,20 +498,32 @@ function TestTryFinally(instantiate) {
     assertIteratorResult(3, false, iter.next());
     assertIteratorResult(4, false, iter.next());
     assertIteratorResult(undefined, true, iter.next());
-    assertThrows(function() { iter.next(); }, Error);
+    assertDoesNotThrow(function() { iter.next(); });
   }
   Test1(instantiate(g));
 
   function Test2(iter) {
     assertThrows(function() { iter.throw(new Sentinel); }, Sentinel);
-    assertThrows(function() { iter.next(); }, Error);
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test2(instantiate(g));
 
   function Test3(iter) {
     assertIteratorResult(1, false, iter.next());
     assertThrows(function() { iter.throw(new Sentinel); }, Sentinel);
-    assertThrows(function() { iter.next(); }, Error);
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test3(instantiate(g));
 
@@ -489,8 +532,13 @@ function TestTryFinally(instantiate) {
     assertIteratorResult(2, false, iter.next());
     assertIteratorResult(3, false, iter.throw(new Sentinel));
     assertThrows(function() { iter.next(); }, Sentinel);
-    assertThrows(function() { iter.next(); }, Error);
-
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test4(instantiate(g));
 
@@ -499,7 +547,13 @@ function TestTryFinally(instantiate) {
     assertIteratorResult(2, false, iter.next());
     assertIteratorResult(3, false, iter.throw(new Sentinel));
     assertThrows(function() { iter.throw(new Sentinel2); }, Sentinel2);
-    assertThrows(function() { iter.next(); }, Error);
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test5(instantiate(g));
 
@@ -508,7 +562,13 @@ function TestTryFinally(instantiate) {
     assertIteratorResult(2, false, iter.next());
     assertIteratorResult(3, false, iter.next());
     assertThrows(function() { iter.throw(new Sentinel); }, Sentinel);
-    assertThrows(function() { iter.next(); }, Error);
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test6(instantiate(g));
 
@@ -518,7 +578,13 @@ function TestTryFinally(instantiate) {
     assertIteratorResult(3, false, iter.next());
     assertIteratorResult(4, false, iter.next());
     assertThrows(function() { iter.throw(new Sentinel); }, Sentinel);
-    assertThrows(function() { iter.next(); }, Error);
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test7(instantiate(g));
 
@@ -528,8 +594,7 @@ function TestTryFinally(instantiate) {
     assertIteratorResult(3, false, iter.next());
     assertIteratorResult(4, false, iter.next());
     assertIteratorResult(undefined, true, iter.next());
-    assertThrows(function() { iter.next(); }, Error);
-
+    assertDoesNotThrow(function() { iter.next(); });
   }
   Test8(instantiate(g));
 }
@@ -557,13 +622,19 @@ function TestNestedTry(instantiate) {
     assertIteratorResult(4, false, iter.next());
     assertIteratorResult(5, false, iter.next());
     assertIteratorResult(undefined, true, iter.next());
-    assertThrows(function() { iter.next(); }, Error);
+    assertDoesNotThrow(function() { iter.next(); });
   }
   Test1(instantiate(g));
 
   function Test2(iter) {
     assertThrows(function() { iter.throw(new Sentinel); }, Sentinel);
-    assertThrows(function() { iter.next(); }, Error);
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test2(instantiate(g));
 
@@ -571,7 +642,13 @@ function TestNestedTry(instantiate) {
     assertIteratorResult(1, false, iter.next());
     assertIteratorResult(4, false, iter.throw(new Sentinel));
     assertThrows(function() { iter.next(); }, Sentinel);
-    assertThrows(function() { iter.next(); }, Error);
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test3(instantiate(g));
 
@@ -579,7 +656,13 @@ function TestNestedTry(instantiate) {
     assertIteratorResult(1, false, iter.next());
     assertIteratorResult(4, false, iter.throw(new Sentinel));
     assertThrows(function() { iter.throw(new Sentinel2); }, Sentinel2);
-    assertThrows(function() { iter.next(); }, Error);
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test4(instantiate(g));
 
@@ -592,8 +675,7 @@ function TestNestedTry(instantiate) {
     assertIteratorResult(4, false, iter.next());
     assertIteratorResult(5, false, iter.next());
     assertIteratorResult(undefined, true, iter.next());
-    assertThrows(function() { iter.next(); }, Error);
-
+    assertDoesNotThrow(function() { iter.next(); });
   }
   Test5(instantiate(g));
 
@@ -604,7 +686,13 @@ function TestNestedTry(instantiate) {
     assertIteratorResult(exn, false, iter.throw(exn));
     assertIteratorResult(4, false, iter.throw(new Sentinel2));
     assertThrows(function() { iter.next(); }, Sentinel2);
-    assertThrows(function() { iter.next(); }, Error);
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test6(instantiate(g));
 
@@ -616,8 +704,13 @@ function TestNestedTry(instantiate) {
     assertIteratorResult(3, false, iter.next());
     assertIteratorResult(4, false, iter.throw(new Sentinel2));
     assertThrows(function() { iter.next(); }, Sentinel2);
-    assertThrows(function() { iter.next(); }, Error);
-
+    // TODO(yusukesuzuki): Since status of a thrown generator is "executing",
+    // following tests are failed.
+    // https://code.google.com/p/v8/issues/detail?id=3096
+    /*
+    assertIteratorResult(undefined, true, iter.next());
+    assertDoesNotThrow(function() { iter.next(); });
+    */
   }
   Test7(instantiate(g));