holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If command and touchups (#2106)

Browse Source
This commit is contained in:
Jonathan Turner
2020-07-04 12:40:04 -07:00
committed by GitHub
parent 0629c896eb
commit e75c44c95b
7 changed files with 227 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1019,6 +1019,7 @@ fn parse_positional_argument(
idx: usize,
lite_cmd: &LiteCommand,
positional_type: &PositionalType,
remaining_positionals: usize,
registry: &dyn SignatureRegistry,
) -> (usize, SpannedExpression, Option<ParseError>) {
let mut idx = idx;
@ -1038,8 +1039,12 @@ fn parse_positional_argument(
}
arg
} else {
let (new_idx, arg, err) =
parse_math_expression(idx, &lite_cmd.args[idx..], registry, true);
let (new_idx, arg, err) = parse_math_expression(
idx,
&lite_cmd.args[idx..(lite_cmd.args.len() - remaining_positionals)],
registry,
true,
);
let span = arg.span;
let mut commands = hir::Commands::new(span);
@ -1049,7 +1054,7 @@ fn parse_positional_argument(
let arg = SpannedExpression::new(Expression::Block(block), span);
idx = new_idx;
idx = new_idx - 1;
if error.is_none() {
error = err;
}
@ -1165,6 +1170,7 @@ fn parse_internal_command(
idx,
&lite_cmd,
&signature.positional[current_positional].0,
signature.positional.len() - current_positional - 1,
registry,
);
idx = new_idx;