Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-26 04:53:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve expr parse (#3584)

Browse source 
* Require '-' to be a number for math

* Add test

* improve parse logic, add test
This commit is contained in:
JT 2021-06-10 05:17:45 +12:00 committed by GitHub
parent 440e12abc4
commit e8a2250ef8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/nu-parser/src/parse.rs
View file

@ -1577,7 +1577,7 @@ fn parse_internal_command(
let arg = {
let (new_idx, expr, err) = parse_positional_argument(
idx,
&lite_cmd,
lite_cmd,
&signature.positional[current_positional].0,
signature.positional.len() - current_positional - 1,
scope,
@ -1802,7 +1802,14 @@ fn parse_call(
} else if lite_cmd.parts[0].item.starts_with('$')
|| lite_cmd.parts[0].item.starts_with('\"')
|| lite_cmd.parts[0].item.starts_with('\'')
|| lite_cmd.parts[0].item.starts_with('-')
|| (lite_cmd.parts[0].item.starts_with('-')
&& parse_arg(SyntaxShape::Number, scope, &lite_cmd.parts[0])
.1
.is_none())
|| (lite_cmd.parts[0].item.starts_with('-')
&& parse_arg(SyntaxShape::Range, scope, &lite_cmd.parts[0])
.1
.is_none())
|| lite_cmd.parts[0].item.starts_with('0')
|| lite_cmd.parts[0].item.starts_with('1')
|| lite_cmd.parts[0].item.starts_with('2')

23
tests/shell/pipeline/commands/internal.rs
View file

@ -618,6 +618,29 @@ fn index_out_of_bounds() {
assert!(actual.err.contains("unknown row"));
}
#[test]
fn dash_def() {
let actual = nu!(
cwd: ".",
r#"
def - [x, y] { $x - $y }; - 4 1
"#
);
assert_eq!(actual.out, "3");
}
#[test]
fn negative_decimal_start() {
let actual = nu!(
cwd: ".",
r#"
-1.3 + 4
"#
);
assert_eq!(actual.out, "2.7");
}
#[test]
fn index_row() {
let actual = nu!(