[strong] Implement static restrictions on switch statement

test/cctest/test-parsing.cc

Index: test/cctest/test-parsing.cc
diff --git a/test/cctest/test-parsing.cc b/test/cctest/test-parsing.cc
index 487a7bff5fb7ab3cb800037246add55f939d6fb8..9b9e5ccdd2fda57c0e7af840e6f7977f9fd87fda 100644
--- a/test/cctest/test-parsing.cc
+++ b/test/cctest/test-parsing.cc
@@ -5805,7 +5805,7 @@ TEST(StrongEmptySubStatements) {
   const char* strict_context_data[][2] = {{"'use strict';", ""}, {NULL}};
   const char* strong_context_data[][2] = {{"'use strong';", ""}, {NULL}};
 
-  const char* data[] = {
+  const char* data_error[] = {
       "if (1);",
       "if (1) {} else;",
       "while (1);",
@@ -5818,15 +5818,24 @@ TEST(StrongEmptySubStatements) {
       "for (const x of []);",
       NULL};
 
+  const char* data_success[] =  {
+      "if (1) {} else {}",
+      "switch(1) {}",
+      "1+1;;",
+      "1+1; ;",
+      NULL};
+
   static const ParserFlag always_flags[] = {
       kAllowStrongMode,
   };
-  RunParserSyncTest(sloppy_context_data, data, kSuccess, NULL, 0, always_flags,
-                    arraysize(always_flags));
-  RunParserSyncTest(strict_context_data, data, kSuccess, NULL, 0, always_flags,
-                    arraysize(always_flags));
-  RunParserSyncTest(strong_context_data, data, kError, NULL, 0, always_flags,
-                    arraysize(always_flags));
+  RunParserSyncTest(sloppy_context_data, data_error, kSuccess, NULL, 0,
+                    always_flags, arraysize(always_flags));
+  RunParserSyncTest(strict_context_data, data_error, kSuccess, NULL, 0,
+                    always_flags, arraysize(always_flags));
+  RunParserSyncTest(strong_context_data, data_error, kError, NULL, 0,
+                    always_flags, arraysize(always_flags));
+  RunParserSyncTest(strong_context_data, data_success, kSuccess, NULL, 0,
+                    always_flags, arraysize(always_flags));
 }
 
 
@@ -5975,31 +5984,87 @@ TEST(StrongUndefinedArrow) {
 
 
 TEST(StrongDirectEval) {
-  const char* context_data[][2] = {{"", ""}, {NULL}};
+  const char* sloppy_context_data[][2] = {{"", ""}, {NULL}};
+  const char* strong_context_data[][2] = {{"'use strong';", ""}, {NULL}};
 
   const char* error_data[] = {
-      "'use strong'; eval();",
-      "'use strong'; eval([]);",
-      "'use strong'; (eval)();",
-      "'use strong'; (((eval)))();",
-      "'use strong'; eval('function f() {}');",
-      "'use strong'; function f() {eval()}",
+      "eval();",
+      "eval([]);",
+      "(eval)();",
+      "(((eval)))();",
+      "eval('function f() {}');",
+      "function f() {eval()}",
       NULL};
 
   const char* success_data[] = {
-      "'use strong'; eval;",
-      "'use strong'; eval`foo`;",
-      "'use strong'; let foo = eval; foo();",
-      "'use strong'; (1, eval)();",
+      "eval;",
+      "eval`foo`;",
+      "let foo = eval; foo();",
+      "(1, eval)();",
       NULL};
 
   static const ParserFlag always_flags[] = {
       kAllowStrongMode
   };
 
-  RunParserSyncTest(context_data, error_data, kError, NULL, 0,
+  RunParserSyncTest(sloppy_context_data, error_data, kSuccess, NULL, 0,
                     always_flags, arraysize(always_flags));
-  RunParserSyncTest(context_data, success_data, kSuccess, NULL, 0,
+  RunParserSyncTest(strong_context_data, error_data, kError, NULL, 0,
+                    always_flags, arraysize(always_flags));
+  RunParserSyncTest(strong_context_data, success_data, kSuccess, NULL, 0,
+                    always_flags, arraysize(always_flags));
+}
+
+
+TEST(StrongSwitchFallthrough) {
+  const char* sloppy_context_data[][2] = {
+      {"function f() { for(;;) { switch(1) {", "};}}"},
+      {NULL, NULL}
+  };
+  const char* strong_context_data[][2] = {
+      {"function f() { 'use strong'; for(;;) { switch(1) {", "};}}"},
+      {NULL, NULL}
+  };
+
+  const char* data_success[] = {
+      "",
+      "case 1:",
+      "case 1: case 2:",
+      "case 1: break;",
+      "default: throw new TypeError();",
+      "case 1: case 2: null",
+      "case 1: case 2: default: 1+1",
+      "case 1: break; case 2: return; default:",
+      "case 1: case 2: break; case 3: continue; case 4: default:",
+      "case 1: case 2: {{return;}} case 3: default:",
+      "case 1: case 2: case 3: default: {1+1;{continue;}}",
+      "case 1: case 2: {1+1;{1+1;{continue;}}} case 3: default:",
+      "case 1: if (1) break; else continue; case 2: case 3: default:",
+      "case 1: case 2: if (1) {{break;}} else break; case 3: default:",
+      NULL};

[rossberg, 2015/04/16 12:01:16]

Can you add cases with break/continue to label, e.g. by labelling the outer for
loop?

Also, one example of a nested if (if inside if).

[conradw, 2015/04/16 12:34:20]

Done.

+
+  const char* data_error[] = {
+      "case 1: case 2: (function(){return}); default:",
+      "case 1: 1+1; case 2:",
+      "case 1: foo: break foo; case 2: break;",
+      "case 1: foo:return; case 2:",
+      "case 1: foo:{ continue;} case 2:",
+      "case 1: break; case 2: foo:{ throw new TypeError() } default:",
+      "case 1: case 2: { foo:{ { break;} } } default: break;",
+      "case 1: if (1) break; else {}; case 2: default:",
+      "case 1: case 2: if (1) break; default:",

[rossberg, 2015/04/16 12:01:16]

Also add

  if (1) break else 0
  if (1) 0 else break

[conradw, 2015/04/16 12:34:20]

Done.

+      "case 1: case 2: case 3: if (1) {} default:",
+      "case 1: foo:if (1) break; else continue; case 2: case 3: default:",
+      NULL};
+
+  static const ParserFlag always_flags[] = {
+      kAllowStrongMode
+  };
+  RunParserSyncTest(strong_context_data, data_success, kSuccess, NULL, 0,
+                    always_flags, arraysize(always_flags));
+  RunParserSyncTest(sloppy_context_data, data_error, kSuccess, NULL, 0,
+                    always_flags, arraysize(always_flags));
+  RunParserSyncTest(strong_context_data, data_error, kError, NULL, 0,
                     always_flags, arraysize(always_flags));
 }