Mark/daisy
1
1
Fork 0
mirror of https://github.com/rm-dr/daisy synced 2025-07-03 17:19:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed variable parse order

Browse Source
This commit is contained in:
Mark
2023-06-17 22:15:58 -07:00
parent 1671bbbade
commit 41bf1954a1
3 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/evaluate/evaluate.rs
View File

@ -59,14 +59,16 @@ pub fn evaluate(t: &Expression, context: &mut Context) -> Result<Expression, Eva
} else {
// Move down the tree
coords.push(0);
let n = root.get_at_coords(&coords[..]);
if let Some(n) = n {
if let Expression::Operator(Operator::Define, _) = n {
// Don't evaluate the first argument of a define.
// This prevents variables from being expanded before a re-assignment.
if let Expression::Operator(Operator::Define, _) = g {
*coords.last_mut().unwrap() += 1;
coords.push(0);
continue;
}
}
coords.push(0);
}
}