handle switch-with-default in JS impl

bakkot · Jan 23, 2021 · c98f28a · c98f28a
1 parent 77a09a0
commit c98f28a
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/ends-in-iteration-or-declaration/impl.js b/ends-in-iteration-or-declaration/impl.js
@@ -5,6 +5,7 @@ foo: {
   switch (0) {
     case 0:
       while (false);
+    default:
     case 2: {
       // fall through
     }
@@ -122,6 +123,27 @@ function EndsInIterationOrDeclaration(node, labelSet, isLast) {
       }
       return false;
     }
+    case 'SwitchStatementWithDefault': {
+      let newLabelSet;
+      if (isLast) {
+        newLabelSet = labelSet.concat([EMPTY]);
+      } else {
+        newLabelSet = labelSet.filter(l => l !== EMPTY);
+      }
+      let clauses = [...node.preDefaultCases, node.defaultCase, ...node.postDefaultCases];
+      for (let clause of clauses.reverse()) {
+        if (!IsEmpty(clause, [])) {
+          if (EndsInIterationOrDeclaration(clause, newLabelSet, isLast)) {
+            return true;
+          }
+          if (IsBreak(clause, newLabelSet)) {
+            isLast = true;
+          } else {
+            isLast = false;
+          }
+        }
+      }
+    }
     case 'SwitchCase':
     case 'SwitchDefault': {
       if (node.consequent.length === 0) {