extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-30 14:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad operator (#3479)

Browse Source
This commit is contained in:
JT
2021-05-24 17:27:10 +12:00
committed by GitHub
parent 3bcc2aad80
commit 5fcc7f2328
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/nu-engine/src/evaluate/evaluator.rs
View File

@ -59,7 +59,11 @@ pub fn evaluate_baseline_expr(
)),
}
}
_ => unreachable!(),
_ => Err(ShellError::labeled_error(
"Unknown operator",
"unknown operator",
binary.op.span,
)),
}
}
Expression::Range(range) => {

7
crates/nu-parser/src/parse.rs
View File

@ -907,7 +907,10 @@ fn parse_arg(
}
SyntaxShape::Range => parse_range(&lite_arg, scope),
SyntaxShape::Operator => parse_operator(&lite_arg),
SyntaxShape::Operator => (
garbage(lite_arg.span),
Some(ParseError::mismatch("operator", lite_arg.clone())),
),
SyntaxShape::Filesize => parse_filesize(&lite_arg),
SyntaxShape::Duration => parse_duration(&lite_arg),
SyntaxShape::FilePath => {
@ -1230,7 +1233,7 @@ pub fn parse_math_expression(
prec.push(0);
while idx < lite_args.len() {
let (op, err) = parse_arg(SyntaxShape::Operator, scope, &lite_args[idx]);
let (op, err) = parse_operator(&lite_args[idx]);
if error.is_none() {
error = err;
}

2
crates/nu-parser/src/shapes.rs
View File

@ -59,7 +59,7 @@ pub fn expression_to_flat_shape(e: &SpannedExpression) -> Vec<Spanned<FlatShape>
Expression::Binary(binary) => {
let mut output = vec![];
output.append(&mut expression_to_flat_shape(&binary.left));
output.push(FlatShape::Operator.spanned(binary.op.span));
output.append(&mut expression_to_flat_shape(&binary.op));
output.append(&mut expression_to_flat_shape(&binary.right));
output
}