Fix last from empty statements bug in CPSTransformer (#871)

b-studios · web-flow · commit a445cc5bc94e · 2025-03-08T23:06:05.000+01:00
diff --git a/effekt/shared/src/main/scala/effekt/generator/js/TransformerCps.scala b/effekt/shared/src/main/scala/effekt/generator/js/TransformerCps.scala
@@ -250,8 +250,8 @@ object TransformerCps extends Transformer {
 
           val stmts = binding.stmts
 
-          stmts.last match {
-            case terminator : (js.Stmt.Return | js.Stmt.Break | js.Stmt.Continue) => (e, stmts)
+          stmts.lastOption match {
+            case Some(terminator : (js.Stmt.Return | js.Stmt.Break | js.Stmt.Continue)) => (e, stmts)
             case other => (e, stmts :+ js.Break())
           }
         },

Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,8 @@ object TransformerCps extends Transformer {`
`250`	`250`
`251`	`251`	`val stmts = binding.stmts`
`252`	`252`
`253`		`- stmts.last match {`
`254`		`- case terminator : (js.Stmt.Return \| js.Stmt.Break \| js.Stmt.Continue) => (e, stmts)`
	`253`	`+ stmts.lastOption match {`
	`254`	`+ case Some(terminator : (js.Stmt.Return \| js.Stmt.Break \| js.Stmt.Continue)) => (e, stmts)`
`255`	`255`	`case other => (e, stmts :+ js.Break())`
`256`	`256`	`}`
`257`	`257`	`},`