Mirrors/rink-rs
2
0
Fork 0
mirror of https://github.com/tiffany352/rink-rs synced 2024-11-10 13:44:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix precedence of / in GNU units

Browse source
This commit is contained in:
Tiffany Bennett 2016-08-21 09:53:14 -04:00
parent 6aac7bab8c
commit ef2362f6bc
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
definitions.units
View file

@ -782,10 +782,10 @@ degR degrankine
tempR degrankine
temprankine degrankine
reaumur_absolute 10/8 kelvin
romer_absolute 40/21 kelvin
delisle_absolute -2/3 kelvin
newton_absolute 100/33 kelvin
reaumur_absolute 10|8 kelvin
romer_absolute 40|21 kelvin
delisle_absolute -2|3 kelvin
newton_absolute 100|33 kelvin
zerocelsius 273.15 K
zerofahrenheit zerocelsius - 32 degR

28
src/gnu_units.rs
View file

@ -196,17 +196,8 @@ fn parse_pow(mut iter: &mut Iter) -> Expr {
fn parse_mul(mut iter: &mut Iter) -> Expr {
let mut terms = vec![parse_pow(iter)];
loop { match iter.peek().cloned().unwrap() {
Token::Plus | Token::Dash | Token::RPar | Token::Newline | Token::Eof => break,
Token::Slash => {
iter.next();
let right = parse_pow(iter);
let left = if terms.len() == 1 {
terms.pop().unwrap()
} else {
Expr::Mul(terms)
};
terms = vec![Expr::Frac(Box::new(left), Box::new(right))]
},
Token::Slash | Token::Plus | Token::Dash | Token::RPar | Token::Newline | Token::Eof =>
break,
Token::Asterisk => {
iter.next();
},
@ -219,8 +210,21 @@ fn parse_mul(mut iter: &mut Iter) -> Expr {
}
}
fn parse_div(mut iter: &mut Iter) -> Expr {
let mut left = parse_mul(iter);
loop { match *iter.peek().unwrap() {
Token::Slash => {
iter.next();
let right = parse_mul(iter);
left = Expr::Frac(Box::new(left), Box::new(right));
},
_ => break
}}
left
}
fn parse_add(mut iter: &mut Iter) -> Expr {
let left = parse_mul(iter);
let left = parse_div(iter);
match *iter.peek().unwrap() {
Token::Plus => {
iter.next();