github/ValueScript
1
1
Fork 0
mirror of https://github.com/voltrevo/ValueScript.git synced 2026-04-18 03:00:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix missed substitution bug

Browse Source
This commit is contained in:
Andrew Morris
2023-07-02 08:59:49 +10:00
parent edecfeeb1f
commit 74ed734847
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
valuescript_compiler/src/optimization/kal.rs
View File

@@ -641,8 +641,14 @@ impl FnState {
dst: &Register,
op: fn(left: &Val, right: &Val) -> Result<Val, Val>,
) -> Option<()> {
let left = self.eval_arg(left).try_to_val()?;
let right = self.eval_arg(right).try_to_val()?;
// It's important that the eval happens on both args (left shouldn't emit None early) because
// eval_arg also substitutes the Value using knowledge
let left = self.eval_arg(left);
let right = self.eval_arg(right);
let left = left.try_to_val()?;
let right = right.try_to_val()?;
let kal = op(&left, &right).ok()?.try_to_kal()?;
self.set(dst.name.clone(), kal);