[parser] Skipping inner funcs: produce the same scopes / variables for loops.

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 9193 matching lines @@
   int suffix_len = Utf8LengthHelper(suffix);
 
   // The scope start positions must match; note the extra space in lazy_inner.
   const char* lazy_inner = " function inner(%s) { %s }";
   const char* eager_inner = "(function inner(%s) { %s })()";
 
   struct {
     const char* params;
     const char* source;
   } inners[] = {
+      // Simple cases
       {"", "var1;"},
       {"", "var1 = 5;"},
       {"", "if (true) {}"},
       {"", "function f1() {}"},
 
+      // Var declarations and assignments.
       {"", "var var1;"},
       {"", "var var1; var1 = 5;"},
       {"", "if (true) { var var1; }"},
       {"", "if (true) { var var1; var1 = 5; }"},
       {"", "var var1; function f() { var1; }"},
       {"", "var var1; var1 = 5; function f() { var1; }"},
       {"", "var var1; function f() { var1 = 5; }"},
 
+      // Let declarations and assignments.
       {"", "let var1;"},
       {"", "let var1; var1 = 5;"},
       {"", "if (true) { let var1; }"},
       {"", "if (true) { let var1; var1 = 5; }"},
       {"", "let var1; function f() { var1; }"},
       {"", "let var1; var1 = 5; function f() { var1; }"},
       {"", "let var1; function f() { var1 = 5; }"},
 
+      // Const declarations.
       {"", "const var1 = 5;"},
       {"", "if (true) { const var1 = 5; }"},
       {"", "const var1 = 5; function f() { var1; }"},
 
+      // Redeclarations.
       {"", "var var1; var var1;"},
       {"", "var var1; var var1; var1 = 5;"},
       {"", "var var1; if (true) { var var1; }"},
       {"", "if (true) { var var1; var var1; }"},
       {"", "var var1; if (true) { var var1; var1 = 5; }"},
       {"", "if (true) { var var1; var var1; var1 = 5; }"},
       {"", "var var1; var var1; function f() { var1; }"},
       {"", "var var1; var var1; function f() { var1 = 5; }"},
 
+      // Shadowing declarations.
       {"", "var var1; if (true) { var var1; }"},
       {"", "var var1; if (true) { let var1; }"},
       {"", "let var1; if (true) { let var1; }"},
 
       {"", "var var1; if (true) { const var1 = 0; }"},
       {"", "const var1 = 0; if (true) { const var1 = 0; }"},
 
+      // Variable called "arguments"
       {"", "arguments;"},
       {"", "arguments = 5;"},
       {"", "function f() { arguments; }"},
       {"", "function f() { arguments = 5; }"},
 
       {"", "var arguments;"},
       {"", "var arguments; arguments = 5;"},
       {"", "if (true) { var arguments; }"},
       {"", "if (true) { var arguments; arguments = 5; }"},
       {"", "var arguments; function f() { arguments; }"},
       {"", "var arguments; arguments = 5; function f() { arguments; }"},
       {"", "var arguments; function f() { arguments = 5; }"},
 
       {"", "let arguments;"},
       {"", "let arguments; arguments = 5;"},
       {"", "if (true) { let arguments; }"},
       {"", "if (true) { let arguments; arguments = 5; }"},
       {"", "let arguments; function f() { arguments; }"},
       {"", "let arguments; arguments = 5; function f() { arguments; }"},
       {"", "let arguments; function f() { arguments = 5; }"},
 
       {"", "const arguments = 5;"},
       {"", "if (true) { const arguments = 5; }"},
       {"", "const arguments = 5; function f() { arguments; }"},
 
+      // Destructuring declarations.
       {"", "var [var1, var2] = [1, 2];"},
       {"", "var [var1, var2, [var3, var4]] = [1, 2, [3, 4]];"},
       {"", "var [{var1: var2}, {var3: var4}] = [{var1: 1}, {var3: 2}];"},
       {"", "var [var1, ...var2] = [1, 2, 3];"},
 
       {"", "var {var1: var2, var3: var4} = {var1: 1, var3: 2};"},
       {"",
        "var {var1: var2, var3: {var4: var5}} = {var1: 1, var3: {var4: 2}};"},
       {"", "var {var1: var2, var3: [var4, var5]} = {var1: 1, var3: [2, 3]};"},
 
@@ skipping 10 matching lines @@
       {"", "const [var1, var2] = [1, 2];"},
       {"", "const [var1, var2, [var3, var4]] = [1, 2, [3, 4]];"},
       {"", "const [{var1: var2}, {var3: var4}] = [{var1: 1}, {var3: 2}];"},
       {"", "const [var1, ...var2] = [1, 2, 3];"},
 
       {"", "const {var1: var2, var3: var4} = {var1: 1, var3: 2};"},
       {"",
        "const {var1: var2, var3: {var4: var5}} = {var1: 1, var3: {var4: 2}};"},
       {"", "const {var1: var2, var3: [var4, var5]} = {var1: 1, var3: [2, 3]};"},
 
+      // Referencing the function variable.
       {"", "inner;"},
       {"", "function f1() { f1; }"},
       {"", "function f1() { inner; }"},
       {"", "function f1() { function f2() { f1; } }"},
       {"", "function arguments() {}"},
       {"", "function f1() {} function f1() {}"},
       {"", "var f1; function f1() {}"},
 
+      // Assigning to the function variable.
       {"", "inner = 3;"},
       {"", "function f1() { f1 = 3; }"},
       {"", "function f1() { f1; } f1 = 3;"},
       {"", "function arguments() {} arguments = 8"},
       {"", "function f1() {} f1 = 3; function f1() {}"},
 
+      // Evals.
       {"", "var var1; eval('');"},
       {"", "var var1; function f1() { eval(''); }"},
       {"", "let var1; eval('');"},
       {"", "let var1; function f1() { eval(''); }"},
       {"", "const var1 = 10; eval('');"},
       {"", "const var1 = 10; function f1() { eval(''); }"},
 
+      // Standard for loops.
       {"", "for (var var1 = 0; var1 < 10; ++var1) { }"},
       {"", "for (let var1 = 0; var1 < 10; ++var1) { }"},
       {"", "for (const var1 = 0; var1 < 10; ++var1) { }"},
 
       {"",
        "for (var var1 = 0; var1 < 10; ++var1) { function foo() { var1; } }"},
       {"",
        "for (let var1 = 0; var1 < 10; ++var1) { function foo() { var1; } }"},
       {"",
        "for (const var1 = 0; var1 < 10; ++var1) { function foo() { var1; } }"},
       {"",
        "'use strict'; for (var var1 = 0; var1 < 10; ++var1) { function foo() { "
        "var1; } }"},
       {"",
        "'use strict'; for (let var1 = 0; var1 < 10; ++var1) { function foo() { "
        "var1; } }"},
       {"",
        "'use strict'; for (const var1 = 0; var1 < 10; ++var1) { function foo() "
        "{ var1; } }"},
 
+      // For of loops
+      {"", "for (var1 of [1, 2]) { }"},
+      {"", "for (var var1 of [1, 2]) { }"},
+      {"", "for (let var1 of [1, 2]) { }"},
+      {"", "for (const var1 of [1, 2]) { }"},
+
+      {"", "for (var1 of [1, 2]) { var1; }"},
+      {"", "for (var var1 of [1, 2]) { var1; }"},
+      {"", "for (let var1 of [1, 2]) { var1; }"},
+      {"", "for (const var1 of [1, 2]) { var1; }"},
+
+      {"", "for (var1 of [1, 2]) { var1 = 0; }"},
+      {"", "for (var var1 of [1, 2]) { var1 = 0; }"},
+      {"", "for (let var1 of [1, 2]) { var1 = 0; }"},
+      {"", "for (const var1 of [1, 2]) { var1 = 0; }"},
+
+      {"", "for (var1 of [1, 2]) { function foo() { var1; } }"},
+      {"", "for (var var1 of [1, 2]) { function foo() { var1; } }"},
+      {"", "for (let var1 of [1, 2]) { function foo() { var1; } }"},
+      {"", "for (const var1 of [1, 2]) { function foo() { var1; } }"},
+
+      {"", "for (var1 of [1, 2]) { function foo() { var1 = 0; } }"},
+      {"", "for (var var1 of [1, 2]) { function foo() { var1 = 0; } }"},
+      {"", "for (let var1 of [1, 2]) { function foo() { var1 = 0; } }"},
+      {"", "for (const var1 of [1, 2]) { function foo() { var1 = 0; } }"},
+
+      // For in loops
+      {"", "for (var1 in {a: 6}) { }"},
+      {"", "for (var var1 in {a: 6}) { }"},
+      {"", "for (let var1 in {a: 6}) { }"},
+      {"", "for (const var1 in {a: 6}) { }"},
+
+      {"", "for (var1 in {a: 6}) { var1; }"},
+      {"", "for (var var1 in {a: 6}) { var1; }"},
+      {"", "for (let var1 in {a: 6}) { var1; }"},
+      {"", "for (const var1 in {a: 6}) { var1; }"},
+
+      {"", "for (var1 in {a: 6}) { var1 = 0; }"},
+      {"", "for (var var1 in {a: 6}) { var1 = 0; }"},
+      {"", "for (let var1 in {a: 6}) { var1 = 0; }"},
+      {"", "for (const var1 in {a: 6}) { var1 = 0; }"},
+
+      {"", "for (var1 in {a: 6}) { function foo() { var1; } }"},
+      {"", "for (var var1 in {a: 6}) { function foo() { var1; } }"},
+      {"", "for (let var1 in {a: 6}) { function foo() { var1; } }"},
+      {"", "for (const var1 in {a: 6}) { function foo() { var1; } }"},
+
+      {"", "for (var1 in {a: 6}) { function foo() { var1 = 0; } }"},
+      {"", "for (var var1 in {a: 6}) { function foo() { var1 = 0; } }"},
+      {"", "for (let var1 in {a: 6}) { function foo() { var1 = 0; } }"},
+      {"", "for (const var1 in {a: 6}) { function foo() { var1 = 0; } }"},
+
+      {"", "for (var1 in {a: 6}) { function foo() { var1 = 0; } }"},
+      {"", "for (var var1 in {a: 6}) { function foo() { var1 = 0; } }"},
+      {"", "for (let var1 in {a: 6}) { function foo() { var1 = 0; } }"},
+      {"", "for (const var1 in {a: 6}) { function foo() { var1 = 0; } }"},
+
+      // Loops without declarations
+      {"", "var var1 = 0; for ( ; var1 < 2; ++var1) { }"},
+      {"",
+       "var var1 = 0; for ( ; var1 < 2; ++var1) { function foo() { var1; } }"},
+      {"", "var var1 = 0; for ( ; var1 > 2; ) { }"},
+      {"", "var var1 = 0; for ( ; var1 > 2; ) { function foo() { var1; } }"},
+      {"",
+       "var var1 = 0; for ( ; var1 > 2; ) { function foo() { var1 = 6; } }"},
+
+      {"", "var var1 = 0; for(var1; var1 < 2; ++var1) { }"},
+      {"",
+       "var var1 = 0; for (var1; var1 < 2; ++var1) { function foo() { var1; } "
+       "}"},
+      {"", "var var1 = 0; for (var1; var1 > 2; ) { }"},
+      {"", "var var1 = 0; for (var1; var1 > 2; ) { function foo() { var1; } }"},
+      {"",
+       "var var1 = 0; for (var1; var1 > 2; ) { function foo() { var1 = 6; } }"},
+
+      // FIXME(marja): Add test cases for special variables (this, arguments
+      // etc) referred to in the for loop conditions.
+
+      // Sloppy block functions.
       {"", "if (true) { function f1() {} }"},
       {"", "if (true) { function f1() {} function f1() {} }"},
       {"", "if (true) { if (true) { function f1() {} } }"},
       {"", "if (true) { if (true) { function f1() {} function f1() {} } }"},
       {"", "if (true) { function f1() {} f1 = 3; }"},
 
       {"", "if (true) { function f1() {} function foo() { f1; } }"},
       {"", "if (true) { function f1() {} } function foo() { f1; }"},
       {"",
        "if (true) { function f1() {} function f1() {} function foo() { f1; } "
@@ skipping 76 matching lines @@
         eager_info.literal()->scope()->inner_scope()->inner_scope();
     DCHECK_NOT_NULL(scope);
     DCHECK_NULL(scope->sibling());
     DCHECK(scope->is_function_scope());
 
     size_t index = 0;
     i::ScopeTestHelper::CompareScopeToData(
         scope, lazy_info.preparsed_scope_data(), index);
   }
 }