konevsa/typst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove an unnecessary clone in loop evaluation (#3297)

Browse Source
This commit is contained in:
Leedehai 2024-01-30 04:30:34 -05:00 committed by GitHub
parent a434cbb64e
commit a603729336
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/typst-syntax/src/ast.rs
View File

@ -1967,7 +1967,7 @@ impl<'a> ForLoop<'a> {
}
/// The expression to iterate over.
pub fn iter(self) -> Expr<'a> {
pub fn iterable(self) -> Expr<'a> {
self.0
.children()
.skip_while(|&c| c.kind() != SyntaxKind::In)

2
crates/typst/src/eval/call.rs
View File

@ -467,7 +467,7 @@ impl<'a> CapturesVisitor<'a> {
// active after the iterable is evaluated but before the body is
// evaluated.
Some(ast::Expr::For(expr)) => {
self.visit(expr.iter().to_untyped());
self.visit(expr.iterable().to_untyped());
self.internal.enter();
let pattern = expr.pattern();

9
crates/typst/src/eval/flow.rs
View File

@ -134,10 +134,11 @@ impl Eval for ast::ForLoop<'_> {
}};
}
let iter = self.iter().eval(vm)?;
let iterable = self.iterable().eval(vm)?;
let iterable_type = iterable.ty();
let pattern = self.pattern();
match (&pattern, iter.clone()) {
match (&pattern, iterable) {
(ast::Pattern::Normal(_), Value::Str(string)) => {
// Iterate over graphemes of string.
iter!(for pattern in string.as_str().graphemes(true));
@ -151,10 +152,10 @@ impl Eval for ast::ForLoop<'_> {
iter!(for pattern in array);
}
(ast::Pattern::Normal(_), _) => {
bail!(self.iter().span(), "cannot loop over {}", iter.ty());
bail!(self.iterable().span(), "cannot loop over {}", iterable_type);
}
(_, _) => {
bail!(pattern.span(), "cannot destructure values of {}", iter.ty())
bail!(pattern.span(), "cannot destructure values of {}", iterable_type)
}
}