Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-09-20 14:42:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix operator precedence parser (#4947)

Browse source
This commit is contained in:
JT 2022-03-25 16:23:08 +13:00 committed by GitHub
parent b007290a4e
commit d122827a30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
crates/nu-command/tests/commands/math/mod.rs
View file

@ -67,6 +67,30 @@ fn precedence_of_operators2() {
assert_eq!(actual.out, "6");
}
#[test]
fn precedence_of_operators3() {
let actual = nu!(
cwd: "tests/fixtures/formats", pipeline(
r#"
5 - 5 * 10 + 5
"#
));
assert_eq!(actual.out, "-40");
}
#[test]
fn precedence_of_operators4() {
let actual = nu!(
cwd: "tests/fixtures/formats", pipeline(
r#"
5 - (5 * 10) + 5
"#
));
assert_eq!(actual.out, "-40");
}
#[test]
fn division_of_ints() {
let actual = nu!(

10
crates/nu-parser/src/parser.rs
View file

@ -4019,7 +4019,7 @@ pub fn parse_math_expression(
);
error = error.or(err);
if op_prec <= last_prec && expr_stack.len() > 1 {
while op_prec <= last_prec && expr_stack.len() > 1 {
// Collapse the right associated operations first
// so that we can get back to a stack with a lower precedence
let mut rhs = expr_stack
@ -4029,6 +4029,14 @@ pub fn parse_math_expression(
.pop()
.expect("internal error: expression stack empty");
last_prec = op.precedence();
if last_prec < op_prec {
expr_stack.push(op);
expr_stack.push(rhs);
break;
}
let mut lhs = expr_stack
.pop()
.expect("internal error: expression stack empty");