Fix precedence of 'not' operator (#11672)

<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx

you can also mention related issues, PRs or discussions!
-->

# Description

A bit hackish but this fixes the precedence of the `not` operator.

Before: `not false and false` => true

Now: `not false and false` => false

Fixes #11633

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` to run the tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->

---------

Co-authored-by: Jakub Žádník <kubouch@gmail.com>
This commit is contained in:
Sophia June Turner 2024-01-30 08:42:27 +13:00 committed by GitHub
parent f879c00f9d
commit 798ae7b251
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 91 additions and 13 deletions

View File

@ -3025,6 +3025,14 @@ pub fn expand_to_cell_path(
*expression = new_expression; *expression = new_expression;
} }
if let Expression {
expr: Expr::UnaryNot(inner),
..
} = expression
{
expand_to_cell_path(working_set, inner, var_id);
}
} }
pub fn parse_input_output_types( pub fn parse_input_output_types(
@ -4846,6 +4854,8 @@ pub fn parse_math_expression(
let first_span = working_set.get_span_contents(spans[0]); let first_span = working_set.get_span_contents(spans[0]);
let mut not_start_spans = vec![];
if first_span == b"if" || first_span == b"match" { if first_span == b"if" || first_span == b"match" {
// If expression // If expression
if spans.len() > 1 { if spans.len() > 1 {
@ -4858,24 +4868,40 @@ pub fn parse_math_expression(
return garbage(spans[0]); return garbage(spans[0]);
} }
} else if first_span == b"not" { } else if first_span == b"not" {
if spans.len() > 1 { not_start_spans.push(spans[idx].start);
let remainder = parse_math_expression(working_set, &spans[1..], lhs_row_var_id); idx += 1;
return Expression { while idx < spans.len() {
expr: Expr::UnaryNot(Box::new(remainder)), let next_value = working_set.get_span_contents(spans[idx]);
span: span(spans),
ty: Type::Bool, if next_value == b"not" {
custom_completion: None, not_start_spans.push(spans[idx].start);
}; idx += 1;
} else { } else {
working_set.error(ParseError::Expected( break;
"expression",
Span::new(spans[0].end, spans[0].end),
));
return garbage(spans[0]);
} }
} }
let mut lhs = parse_value(working_set, spans[0], &SyntaxShape::Any); if idx == spans.len() {
working_set.error(ParseError::Expected(
"expression",
Span::new(spans[idx - 1].end, spans[idx - 1].end),
));
return garbage(spans[idx - 1]);
}
}
let mut lhs = parse_value(working_set, spans[idx], &SyntaxShape::Any);
for not_start_span in not_start_spans.iter().rev() {
lhs = Expression {
expr: Expr::UnaryNot(Box::new(lhs)),
span: Span::new(*not_start_span, spans[idx].end),
ty: Type::Bool,
custom_completion: None,
};
}
not_start_spans.clear();
idx += 1; idx += 1;
if idx >= spans.len() { if idx >= spans.len() {
@ -4906,13 +4932,45 @@ pub fn parse_math_expression(
let content = working_set.get_span_contents(spans[idx]); let content = working_set.get_span_contents(spans[idx]);
// allow `if` to be a special value for assignment. // allow `if` to be a special value for assignment.
if content == b"if" || content == b"match" { if content == b"if" || content == b"match" {
let rhs = parse_call(working_set, &spans[idx..], spans[0], false); let rhs = parse_call(working_set, &spans[idx..], spans[0], false);
expr_stack.push(op); expr_stack.push(op);
expr_stack.push(rhs); expr_stack.push(rhs);
break; break;
} else if content == b"not" {
not_start_spans.push(spans[idx].start);
idx += 1;
while idx < spans.len() {
let next_value = working_set.get_span_contents(spans[idx]);
if next_value == b"not" {
not_start_spans.push(spans[idx].start);
idx += 1;
} else {
break;
} }
let rhs = parse_value(working_set, spans[idx], &SyntaxShape::Any); }
if idx == spans.len() {
working_set.error(ParseError::Expected(
"expression",
Span::new(spans[idx - 1].end, spans[idx - 1].end),
));
return garbage(spans[idx - 1]);
}
}
let mut rhs = parse_value(working_set, spans[idx], &SyntaxShape::Any);
for not_start_span in not_start_spans.iter().rev() {
rhs = Expression {
expr: Expr::UnaryNot(Box::new(rhs)),
span: Span::new(*not_start_span, spans[idx].end),
ty: Type::Bool,
custom_completion: None,
};
}
not_start_spans.clear();
while op_prec <= last_prec && expr_stack.len() > 1 { while op_prec <= last_prec && expr_stack.len() > 1 {
// Collapse the right associated operations first // Collapse the right associated operations first

View File

@ -105,6 +105,26 @@ fn not_contains() -> TestResult {
run_test("'testme' !~ 'test'", "false") run_test("'testme' !~ 'test'", "false")
} }
#[test]
fn not_precedence() -> TestResult {
run_test("not false and false", "false")
}
#[test]
fn not_precedence2() -> TestResult {
run_test("(not false) and false", "false")
}
#[test]
fn not_precedence3() -> TestResult {
run_test("not not true and true", "true")
}
#[test]
fn not_precedence4() -> TestResult {
run_test("not not true and not not true", "true")
}
#[test] #[test]
fn floating_add() -> TestResult { fn floating_add() -> TestResult {
run_test("10.1 + 0.8", "10.9") run_test("10.1 + 0.8", "10.9")