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

Check for left-unbounded range before external cmd

Browse Source
This commit is contained in:
Jakub Žádník 2021-09-12 15:48:19 +03:00
parent 78054a5352
commit 8577d3ff41
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crates/nu-parser/src/parser.rs
View File

@ -469,15 +469,6 @@ pub fn parse_call(
spans: &[Span], spans: &[Span],
expand_aliases: bool, expand_aliases: bool,
) -> (Expression, Option<ParseError>) { ) -> (Expression, Option<ParseError>) {
// We might be parsing left-unbounded range ("..10")
let bytes = working_set.get_span_contents(spans[0]);
if let (Some(b'.'), Some(b'.')) = (bytes.get(0), bytes.get(1)) {
let (range_expr, range_err) = parse_range(working_set, spans[0]);
if range_err.is_none() {
return (range_expr, range_err);
}
}
// assume spans.len() > 0? // assume spans.len() > 0?
let mut pos = 0; let mut pos = 0;
let mut shorthand = vec![]; let mut shorthand = vec![];
@ -601,6 +592,14 @@ pub fn parse_call(
err, err,
) )
} else { } else {
// We might be parsing left-unbounded range ("..10")
let bytes = working_set.get_span_contents(spans[0]);
if let (Some(b'.'), Some(b'.')) = (bytes.get(0), bytes.get(1)) {
let (range_expr, range_err) = parse_range(working_set, spans[0]);
if range_err.is_none() {
return (range_expr, range_err);
}
}
parse_external_call(working_set, spans) parse_external_call(working_set, spans)
} }
} }