[strong] Implement static restrictions on switch statement

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 5787 matching lines @@
   RunParserSyncTest(sloppy_context_data, let_declarations, kError, NULL, 0,
                     always_flags, arraysize(always_flags));
 }
 
 
 TEST(StrongEmptySubStatements) {
   const char* sloppy_context_data[][2] = {{"", ""}, {NULL}};
   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);",
       "do; while (1);",
       "for (;;);",
       "for (x in []);",
       "for (x of []);",
       "for (const x = 0;;);",
       "for (const x in []);",
       "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));
 }
 
 
 TEST(StrongForIn) {
   const char* sloppy_context_data[][2] = {{"", ""}, {NULL}};
   const char* strict_context_data[][2] = {{"'use strict';", ""}, {NULL}};
   const char* strong_context_data[][2] = {{"'use strong';", ""}, {NULL}};
 
   const char* data[] = {
       "for (x in []) {}",
@@ skipping 128 matching lines @@
   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, local_strong, kError, NULL, 0,
                     always_flags, arraysize(always_flags));
 }
 
 
 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));
+}
+
 
 TEST(ArrowFunctionASIErrors) {
   const char* context_data[][2] = {{"'use strict';", ""}, {"", ""},
                                    {NULL, NULL}};
 
   const char* data[] = {
       "(a\n=> a)(1)",
       "(a/*\n*/=> a)(1)",
       "((a)\n=> a)(1)",
       "((a)/*\n*/=> a)(1)",
@@ skipping 147 matching lines @@
     v8::Script::Compile(v8_str(script3));
     CHECK(try_catch2.HasCaught());
     v8::String::Utf8Value exception(try_catch2.Exception());
     CHECK_EQ(0,
              strcmp(
                  "ReferenceError: In strong mode, using an undeclared global "
                  "variable 'not_there3' is not allowed",
                  *exception));
   }
 }