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

Linelocation fixes

pull/2/head
Mark 2023-08-03 13:55:26 -07:00
parent 7cb9dbf2e0
commit 522917da63
Signed by: Mark
GPG Key ID: AD62BB059C2AAEE4
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/parser/stage/groupify.rs
View File

@ -111,39 +111,41 @@ fn lookback(
match (&a, &b) { match (&a, &b) {
// Insert ImplicitMultiply // Insert ImplicitMultiply
(Token::Group(_,_), Token::Group(l ,_)) (Token::Group(la,_), Token::Group(lb,_))
| (Token::Group(_,_), Token::Quantity(l,_)) | (Token::Group(la,_), Token::Quantity(lb,_))
| (Token::Quantity(_,_), Token::Group(l,_)) | (Token::Quantity(la,_), Token::Group(lb,_))
| (Token::Group(_,_), Token::Word(l,_)) | (Token::Group(la,_), Token::Word(lb,_))
| (Token::Word(_,_), Token::Group(l,_)) | (Token::Word(la,_), Token::Group(lb,_))
| (Token::Quantity(_,_), Token::Word(l,_)) | (Token::Quantity(la,_), Token::Word(lb,_))
| (Token::Word(_,_), Token::Quantity(l,_)) | (Token::Word(la,_), Token::Quantity(lb,_))
| (Token::Word(_,_), Token::Word(l,_)) | (Token::Word(la,_), Token::Word(lb,_))
=> { => {
let loc = LineLocation{pos: l.pos-1, len: 0}; let la = la.clone();
let lb = lb.clone();
g.insert(i-1, b); g.insert(i-1, b);
g.insert(i-1, Token::Operator( g.insert(i-1, Token::Operator(
loc, la + lb,
String::from("i*") String::from("i*")
)); ));
g.insert(i-1, a); g.insert(i-1, a);
}, },
// Insert implicit multiplications for right-unary operators // Insert implicit multiplications for right-unary operators
(Token::Quantity(_,_), Token::Operator(l,s)) (Token::Quantity(la,_), Token::Operator(lb,s))
| (Token::Group(_,_), Token::Operator(l,s)) | (Token::Group(la,_), Token::Operator(lb,s))
| (Token::Word(_,_), Token::Operator(l,s)) | (Token::Word(la,_), Token::Operator(lb,s))
=> { => {
let la = la.clone();
let lb = lb.clone();
let o = Operator::from_string(s); let o = Operator::from_string(s);
let loc = LineLocation{pos: l.pos-1, len: 0};
g.insert(i-1, b); g.insert(i-1, b);
if o.is_some() { if o.is_some() {
let o = o.unwrap(); let o = o.unwrap();
if (!o.is_binary()) && (!o.is_left_associative()) { if (!o.is_binary()) && (!o.is_left_associative()) {
g.insert(i-1, Token::Operator( g.insert(i-1, Token::Operator(
loc, la + lb,
String::from("i*") String::from("i*")
)); ));
} }
@ -152,19 +154,20 @@ fn lookback(
}, },
// Insert implicit multiplications for left-unary operators. // Insert implicit multiplications for left-unary operators.
(Token::Operator(_,s), Token::Quantity(l,_)) (Token::Operator(la,s), Token::Quantity(lb,_))
| (Token::Operator(_,s), Token::Group(l,_)) | (Token::Operator(la,s), Token::Group(lb,_))
| (Token::Operator(_,s), Token::Word(l,_)) | (Token::Operator(la,s), Token::Word(lb,_))
=> { => {
let la = la.clone();
let lb = lb.clone();
let o = Operator::from_string(s); let o = Operator::from_string(s);
let loc = LineLocation{pos: l.pos-1, len: 0};
g.insert(i-1, b); g.insert(i-1, b);
if o.is_some() { if o.is_some() {
let o = o.unwrap(); let o = o.unwrap();
if (!o.is_binary()) && o.is_left_associative() { if (!o.is_binary()) && o.is_left_associative() {
g.insert(i-1, Token::Operator( g.insert(i-1, Token::Operator(
loc, la + lb,
String::from("i*") String::from("i*")
)); ));
} }