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

Move row condition to block (#368)

Browse Source
This commit is contained in:
JT
2021-11-26 16:49:03 +13:00
committed by GitHub
parent 8043516d75
commit f052b3313d
7 changed files with 65 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/nu-protocol/src/ast/expression.rs
View File

@ -182,10 +182,9 @@ impl Expression {
}
false
}
Expr::RowCondition(_, expr) => expr.has_in_variable(working_set),
Expr::Signature(_) => false,
Expr::String(_) => false,
Expr::Subexpression(block_id) => {
Expr::RowCondition(block_id) | Expr::Subexpression(block_id) => {
let block = working_set.get_block(*block_id);
if let Some(Statement::Pipeline(pipeline)) = block.stmts.get(0) {
@ -311,10 +310,9 @@ impl Expression {
field_value.replace_in_variable(working_set, new_var_id);
}
}
Expr::RowCondition(_, expr) => expr.replace_in_variable(working_set, new_var_id),
Expr::Signature(_) => {}
Expr::String(_) => {}
Expr::Subexpression(block_id) => {
Expr::RowCondition(block_id) | Expr::Subexpression(block_id) => {
let block = working_set.get_block(*block_id);
let new_expr = if let Some(Statement::Pipeline(pipeline)) = block.stmts.get(0) {