Mark/daisy
1
1
Fork 0
mirror of https://github.com/rm-dr/daisy synced 2025-08-02 09:44:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improved tuple parsing

Browse Source
This commit is contained in:
Mark
2023-08-05 09:29:59 -07:00
parent c0b0402a7d
commit fbd984c36e
7 changed files with 116 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/evaluate/operator.rs
View File

@ -1,4 +1,3 @@
use std::collections::VecDeque;
use crate::parser::LineLocation;
use crate::quantity::Quantity;
use crate::parser::Operator;
@ -59,32 +58,6 @@ pub fn eval_operator(g: &Expression, context: &mut Context) -> Result<Option<Exp
return Ok(Some(r));
},
Operator::Tuple => {
if args.len() != 2 { panic!() };
let a = &args[0];
let b = &args[1];
let mut loc = *op_loc;
let mut vec: VecDeque<Expression> = VecDeque::new();
if let Expression::Tuple(l, v) = a {
loc += *l;
for i in v { vec.push_back(i.clone()) }
} else {
loc += a.get_linelocation();
vec.push_back(a.clone())
}
if let Expression::Tuple(l, v) = b {
loc += *l;
for i in v { vec.push_back(i.clone()) }
} else {
loc += b.get_linelocation();
vec.push_back(b.clone())
}
return Ok(Some(Expression::Tuple(loc, vec)))
}
Operator::Negative => {
if args.len() != 1 { panic!() };
let args = &args[0];