Make loops and functions react to control flow

2 files changed, 52 insertions, 3 deletions

diff --git a/tests/typ/code/break-continue.typ b/tests/typ/code/break-continue.typ
index 2b38cf77..e54651f1 100644
--- a/tests/typ/code/break-continue.typ
+++ b/tests/typ/code/break-continue.typ
@@ -2,13 +2,55 @@
 // Ref: false
 
 ---
+// Test break.
+
+#let error = false
+#let var = 0
+
 #for i in range(10) {
+  var += i
   if i > 5 {
-    // Error: 5-10 break is not yet implemented
     break
+    error = true
+  }
+}
+
+#test(error, false)
+#test(var, 21)
+
+---
+// Test continue.
+
+#let x = 0
+#let i = 0
+
+#while x < 8 {
+  i += 1
+
+  if mod(i, 3) == 0 {
+    continue
   }
+  x += i
 }
 
+// If continue did not work, this would equal 10.
+#test(x, 12)
+
+---
+// Test break outside of loop.
+
+#let f() = {
+  // Error: 3-8 cannot break outside of loop
+  break
+}
+#f()
+
+---
+// Test continue outside of loop.
+
+// Error: 12-20 cannot continue outside of loop
+#let x = { continue }
+
 ---
 // Error: 1-10 unexpected keyword `continue`
 #continue
diff --git a/tests/typ/code/return.typ b/tests/typ/code/return.typ
index bd30c46f..46ff190c 100644
--- a/tests/typ/code/return.typ
+++ b/tests/typ/code/return.typ
@@ -3,8 +3,15 @@
 
 ---
 #let f(x) = {
-  // Error: 3-15 return is not yet implemented
   return x + 1
 }
 
-#f(1)
+#test(f(1), 2)
+
+---
+// Test return outside of function.
+
+#for x in range(5) {
+  // Error: 3-9 cannot return outside of function
+  return
+}