caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 17:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Always evaluate for loop to template 🔁

Browse Source
This commit is contained in:
Laurenz 2021-01-27 13:55:04 +01:00
parent ce8138c685
commit 2641c2d20e
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/eval/mod.rs
View File

@ -388,11 +388,7 @@ impl Eval for Spanned<&ExprFor> {
fn eval(self, ctx: &mut EvalContext) -> Self::Output { fn eval(self, ctx: &mut EvalContext) -> Self::Output {
let iter = self.v.iter.eval(ctx); let iter = self.v.iter.eval(ctx);
let mut output = if let Expr::Template(_) = self.v.body.v { let mut output = vec![];
Value::Template(vec![])
} else {
Value::None
};
macro_rules! iterate { macro_rules! iterate {
(for ($($binding:ident => $value:ident),*) in $iter:expr) => { (for ($($binding:ident => $value:ident),*) in $iter:expr) => {
@ -400,16 +396,12 @@ impl Eval for Spanned<&ExprFor> {
for ($($value),*) in $iter { for ($($value),*) in $iter {
$(ctx.scopes.define($binding.as_str(), $value);)* $(ctx.scopes.define($binding.as_str(), $value);)*
let value = self.v.body.eval(ctx); if let Value::Template(new) = self.v.body.eval(ctx) {
output.extend(new);
if let Value::Template(prev) = &mut output {
if let Value::Template(new) = value {
prev.extend(new);
}
} }
} }
return output; return Value::Template(output);
}; };
} }