Mark
/
daisy
mirror of https://github.com/rm-dr/daisy
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from rm-dr/dev 

Merge v1.1.4
pull/10/head
Mark 2023-09-22 11:01:55 -07:00 committed by GitHub
parent 63d4a01095 be28669416
commit 39ab47530e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -28,7 +28,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "daisycalc"
version = "1.1.3"
version = "1.1.4"
dependencies = [
"cfg-if",
"num",

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "daisycalc"
version = "1.1.3"
version = "1.1.4"
edition = "2021"
build = "buildscript/main.rs"
license = "GPL-3.0-only"

14
src/evaluate/operator.rs
View File

@ -19,6 +19,7 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
if args.len() != 1 {panic!()};
let a = &args[0];
let mut args_ll = op_loc.clone();
if sh_vars.len() == 1 {
if let Expression::Tuple(l, v) = a {
@ -28,6 +29,7 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
))
};
args_ll += a.get_linelocation();
context.add_shadow(sh_vars[0].clone(), Some(a.clone()));
} else {
let Expression::Tuple(l, v) = a else {
@ -46,18 +48,28 @@ pub fn eval_operator(context: &mut Context, g: &Expression) -> Result<Option<Exp
let mut i = 0;
while i < sh_vars.len() {
args_ll += v[i].get_linelocation();
context.add_shadow(sh_vars[i].clone(), Some(v[i].clone()));
i += 1;
}
}
let r = evaluate(context, &exp)?;
let r = evaluate(context, &exp);
context.clear_shadow();
match r {
Ok(mut r) => {
r.set_linelocation(&args_ll);
return Ok(Some(r));
},
Err( (_, err) ) => {
return Err((args_ll, err));
}
}
},
Operator::Negative => {
if args.len() != 1 { panic!() };
let args = &args[0];