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

Improve $in handling (#5137)

Browse Source 
* Simplify in logic

* Add tests

* more tests, and fixes
This commit is contained in:
JT
2022-04-09 09:41:05 +12:00
committed by GitHub
parent 0892a16a3d
commit 97eb8492a3
5 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1776,7 +1776,8 @@ pub fn parse_full_cell_path(
let (output, err) = lite_parse(&output);
error = error.or(err);
let (output, err) = parse_block(working_set, &output, true, expand_aliases_denylist);
let (output, err) =
parse_block(working_set, &output, true, expand_aliases_denylist, true);
error = error.or(err);
let block_id = working_set.add_block(output);
@ -3660,7 +3661,8 @@ pub fn parse_block_expression(
}
}
let (mut output, err) = parse_block(working_set, &output, false, expand_aliases_denylist);
let (mut output, err) =
parse_block(working_set, &output, false, expand_aliases_denylist, false);
error = error.or(err);
if let Some(signature) = signature {
@ -4570,6 +4572,7 @@ pub fn parse_block(
lite_block: &LiteBlock,
scoped: bool,
expand_aliases_denylist: &[usize],
is_subexpression: bool,
) -> (Block, Option<ParseError>) {
trace!("parsing block: {:?}", lite_block);
@ -4614,9 +4617,17 @@ pub fn parse_block(
})
.collect::<Vec<Expression>>();
for expr in output.iter_mut().skip(1) {
if expr.has_in_variable(working_set) {
*expr = wrap_expr_with_collect(working_set, expr);
if is_subexpression {
for expr in output.iter_mut().skip(1) {
if expr.has_in_variable(working_set) {
*expr = wrap_expr_with_collect(working_set, expr);
}
}
} else {
for expr in output.iter_mut() {
if expr.has_in_variable(working_set) {
*expr = wrap_expr_with_collect(working_set, expr);
}
}
}
@ -4656,7 +4667,12 @@ pub fn parse_block(
}
}
continue;
} else if expr.has_in_variable(working_set) && !is_subexpression
{
*expr = wrap_expr_with_collect(working_set, expr);
}
} else if expr.has_in_variable(working_set) && !is_subexpression {
*expr = wrap_expr_with_collect(working_set, expr);
}
}
}
@ -5026,7 +5042,8 @@ pub fn parse(
let (output, err) = lite_parse(&output);
error = error.or(err);
let (mut output, err) = parse_block(working_set, &output, scoped, expand_aliases_denylist);
let (mut output, err) =
parse_block(working_set, &output, scoped, expand_aliases_denylist, false);
error = error.or(err);
let mut seen = vec![];