Merge pull request #65 from typst/control-flow

Add break, continue, and return

1 files changed, 5 insertions, 2 deletions

diff --git a/src/eval/func.rs b/src/eval/func.rs
index cd54a140..451dcbbb 100644
--- a/src/eval/func.rs
+++ b/src/eval/func.rs
@@ -2,7 +2,7 @@ use std::fmt::{self, Debug, Formatter, Write};
 use std::hash::{Hash, Hasher};
 use std::sync::Arc;
 
-use super::{Cast, Eval, Scope, Scopes, Value};
+use super::{Cast, Control, Eval, Scope, Scopes, Value};
 use crate::diag::{At, TypResult};
 use crate::syntax::ast::Expr;
 use crate::syntax::{Span, Spanned};
@@ -138,7 +138,10 @@ impl Closure {
         }
 
         // Evaluate the body.
-        let value = self.body.eval(ctx, &mut scp)?;
+        let value = match self.body.eval(ctx, &mut scp) {
+            Err(Control::Return(value, _, _)) => value,
+            other => other?,
+        };
 
         Ok(value)
     }