[es6] Fix parsing of 'yield' in function and generator expressions

test/cctest/test-parsing.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 2203 matching lines @@
 
   const char* statement_data[] = {
     "var yield;",
     "var foo, yield;",
     "try { } catch (yield) { }",
     "function yield() { }",
     "(function yield() { })",
     "function foo(yield) { }",
     "function foo(bar, yield) { }",
     "function * yield() { }",
-    "(function * yield() { })",
     "yield = 1;",
     "var foo = yield = 1;",
     "yield * 2;",
     "++yield;",
     "yield++;",
     "yield: 34",
     "function yield(yield) { yield: yield (yield + yield(0)); }",
     "({ yield: 1 })",
     "({ get yield() { 1 } })",
     "yield(100)",
@@ skipping 40 matching lines @@
     "yield: 34;",
     NULL
   };
 
   static const ParserFlag always_flags[] = {kAllowStrongMode};
   RunParserSyncTest(context_data, statement_data, kError, NULL, 0, always_flags,
                     arraysize(always_flags));
 }
 
 
+TEST(ErrorsYieldSloppy) {
+  const char* context_data[][2] = {
+    { "", "" },
+    { "function not_gen() {", "}" },
+    { "(function not_gen() {", "})" },
+    { NULL, NULL }
+  };
+
+  const char* statement_data[] = {
+    "(function * yield() { })",
+    NULL
+  };
+
+  RunParserSyncTest(context_data, statement_data, kError);
+}
+
+
 TEST(NoErrorsGenerator) {
   const char* context_data[][2] = {
     { "function * gen() {", "}" },
     { "(function * gen() {", "})" },
     { "(function * () {", "})" },
     { NULL, NULL }
   };
 
   const char* statement_data[] = {
     // A generator without a body is valid.
     ""
     // Valid yield expressions inside generators.
     "yield 2;",
     "yield * 2;",
     "yield * \n 2;",
     "yield yield 1;",
     "yield * yield * 1;",
     "yield 3 + (yield 4);",
     "yield * 3 + (yield * 4);",
     "(yield * 3) + (yield * 4);",
     "yield 3; yield 4;",
     "yield * 3; yield * 4;",
     "(function (yield) { })",
+    "(function yield() { })",
     "yield { yield: 12 }",
     "yield /* comment */ { yield: 12 }",
     "yield * \n { yield: 12 }",
     "yield /* comment */ * \n { yield: 12 }",
     // You can return in a generator.
     "yield 1; return",
     "yield * 1; return",
     "yield 1; return 37",
     "yield * 1; return 37",
     "yield 1; return 37; yield 'dead';",
@@ skipping 29 matching lines @@
     { "\"use strict\"; function * gen() {", "}" },
     { NULL, NULL }
   };
 
   const char* statement_data[] = {
     // Invalid yield expressions inside generators.
     "var yield;",
     "var foo, yield;",
     "try { } catch (yield) { }",
     "function yield() { }",
-    // The name of the NFE is let-bound in the generator, which does not permit
+    // The name of the NFE is bound in the generator, which does not permit
     // yield to be an identifier.
-    "(function yield() { })",
     "(function * yield() { })",
     // Yield isn't valid as a formal parameter for generators.
     "function * foo(yield) { }",
     "(function * foo(yield) { })",
     "yield = 1;",
     "var foo = yield = 1;",
     "++yield;",
     "yield++;",
     "yield *",
     "(yield *)",
@@ skipping 5094 matching lines @@
                               "var publ\\u0069c = 1;",
                               "var { publ\\u0069c } = {};",
                               NULL};
   RunParserSyncTest(sloppy_context_data, valid_data, kSuccess, NULL, 0,
                     always_flags, arraysize(always_flags));
   RunParserSyncTest(strict_context_data, valid_data, kError, NULL, 0,
                     always_flags, arraysize(always_flags));
   RunModuleParserSyncTest(strict_context_data, valid_data, kError, NULL, 0,
                           always_flags, arraysize(always_flags));
 }