Fix switch tests

voltrevo · Jul 6, 2023 · 9000487 · 9000487
1 parent ced2b3c
commit 9000487
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/inputs/failing/switch/defaultMiddle.ts → inputs/passing/switch/defaultMiddle.ts b/inputs/failing/switch/defaultMiddle.ts → inputs/passing/switch/defaultMiddle.ts
@@ -1,5 +1,4 @@
-//! test_output(["default","matched 42"])
-// Should be: ["matched 42"]
+//! test_output(["matched 42"])
 
 export default function foo() {
   let logs: string[] = [];

diff --git a/inputs/failing/switch/evalOrder.ts → inputs/passing/switch/evalOrder.ts b/inputs/failing/switch/evalOrder.ts → inputs/passing/switch/evalOrder.ts
@@ -1,5 +1,4 @@
-//! test_output(["c1","default"])
-// Should be: ["c1","c2","default"]
+//! test_output(["c1","c2","default"])
 
 export default function foo() {
   let logs = [];

diff --git a/valuescript_compiler/src/function_compiler.rs b/valuescript_compiler/src/function_compiler.rs
@@ -673,7 +673,7 @@ impl FunctionCompiler {
       .collect::<Vec<Label>>();
 
     let cond_reg = ec.fnc.allocate_numbered_reg("_sw_cond");
-    let mut has_default = false;
+    let mut default_i: Option<usize> = None;
 
     for (i, case) in switch.cases.iter().enumerate() {
       match &case.test {
@@ -694,15 +694,23 @@ impl FunctionCompiler {
         }
         // default:
         None => {
-          has_default = true;
-          ec.fnc.push(Instruction::Jmp(case_labels[i].ref_()));
+          if default_i.is_some() {
+            ec.fnc.diagnostics.push(Diagnostic {
+              level: DiagnosticLevel::Error,
+              message: "A switch can only have one default".to_string(),
+              span: case.span,
+            });
+          }
+
+          default_i = Some(i);
         }
       };
     }
 
-    if !has_default {
-      ec.fnc.push(Instruction::Jmp(end_label.ref_()));
-    }
+    ec.fnc.push(Instruction::Jmp(match default_i {
+      Some(default_i) => case_labels[default_i].ref_(),
+      None => end_label.ref_(),
+    }));
 
     for (i, case) in switch.cases.iter().enumerate() {
       ec.fnc.label(case_labels[i].clone());