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

Switch more commands to redirecting blocks (#956)

Browse Source
This commit is contained in:
JT
2022-02-05 21:03:06 -05:00
committed by GitHub
parent 80306f9ba6
commit a911b21256
7 changed files with 151 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/nu-command/src/core_commands/for_.rs
View File

@ -1,4 +1,4 @@
use nu_engine::{eval_block, eval_expression, CallExt};
use nu_engine::{eval_block_with_redirect, eval_expression, CallExt};
use nu_protocol::ast::Call;
use nu_protocol::engine::{CaptureBlock, Command, EngineState, Stack};
use nu_protocol::{
@ -99,7 +99,12 @@ impl Command for For {
);
//let block = engine_state.get_block(block_id);
match eval_block(&engine_state, &mut stack, &block, PipelineData::new(head)) {
match eval_block_with_redirect(
&engine_state,
&mut stack,
&block,
PipelineData::new(head),
) {
Ok(pipeline_data) => pipeline_data.into_value(head),
Err(error) => Value::Error { error },
}
@ -131,7 +136,12 @@ impl Command for For {
);
//let block = engine_state.get_block(block_id);
match eval_block(&engine_state, &mut stack, &block, PipelineData::new(head)) {
match eval_block_with_redirect(
&engine_state,
&mut stack,
&block,
PipelineData::new(head),
) {
Ok(pipeline_data) => pipeline_data.into_value(head),
Err(error) => Value::Error { error },
}
@ -140,7 +150,7 @@ impl Command for For {
x => {
stack.add_var(var_id, x);
eval_block(&engine_state, &mut stack, &block, PipelineData::new(head))
eval_block_with_redirect(&engine_state, &mut stack, &block, PipelineData::new(head))
}
}
}

25
crates/nu-command/src/filters/each.rs
View File

@ -1,4 +1,4 @@
use nu_engine::{eval_block, CallExt};
use nu_engine::{eval_block_with_redirect, CallExt};
use nu_protocol::ast::Call;
use nu_protocol::engine::{CaptureBlock, Command, EngineState, Stack};
use nu_protocol::{
@ -105,7 +105,12 @@ impl Command for Each {
}
}
match eval_block(&engine_state, &mut stack, &block, PipelineData::new(span)) {
match eval_block_with_redirect(
&engine_state,
&mut stack,
&block,
PipelineData::new(span),
) {
Ok(v) => v.into_value(span),
Err(error) => Value::Error { error },
}
@ -145,7 +150,12 @@ impl Command for Each {
}
}
match eval_block(&engine_state, &mut stack, &block, PipelineData::new(span)) {
match eval_block_with_redirect(
&engine_state,
&mut stack,
&block,
PipelineData::new(span),
) {
Ok(v) => v.into_value(span),
Err(error) => Value::Error { error },
}
@ -179,7 +189,12 @@ impl Command for Each {
}
}
match eval_block(&engine_state, &mut stack, &block, PipelineData::new(span))? {
match eval_block_with_redirect(
&engine_state,
&mut stack,
&block,
PipelineData::new(span),
)? {
PipelineData::Value(
Value::Record {
mut cols, mut vals, ..
@ -213,7 +228,7 @@ impl Command for Each {
}
}
eval_block(&engine_state, &mut stack, &block, PipelineData::new(span))
eval_block_with_redirect(&engine_state, &mut stack, &block, PipelineData::new(span))
}
}
}

4
crates/nu-command/src/filters/each_group.rs
View File

@ -1,4 +1,4 @@
use nu_engine::{eval_block, CallExt};
use nu_engine::{eval_block_with_redirect, CallExt};
use nu_protocol::ast::Call;
use nu_protocol::engine::{CaptureBlock, Command, EngineState, Stack};
use nu_protocol::{
@ -142,7 +142,7 @@ pub(crate) fn run_block_on_vec(
}
}
match eval_block(&engine_state, &mut stack, block, PipelineData::new(span)) {
match eval_block_with_redirect(&engine_state, &mut stack, block, PipelineData::new(span)) {
Ok(pipeline) => pipeline,
Err(error) => Value::Error { error }.into_pipeline_data(),
}

39
crates/nu-command/src/filters/par_each.rs
View File

@ -1,4 +1,4 @@
use nu_engine::{eval_block, CallExt};
use nu_engine::{eval_block_with_redirect, CallExt};
use nu_protocol::ast::Call;
use nu_protocol::engine::{CaptureBlock, Command, EngineState, Stack};
use nu_protocol::{
@ -87,7 +87,12 @@ impl Command for ParEach {
}
}
match eval_block(&engine_state, &mut stack, block, PipelineData::new(span)) {
match eval_block_with_redirect(
&engine_state,
&mut stack,
block,
PipelineData::new(span),
) {
Ok(v) => v,
Err(error) => Value::Error { error }.into_pipeline_data(),
}
@ -128,7 +133,12 @@ impl Command for ParEach {
}
}
match eval_block(&engine_state, &mut stack, block, PipelineData::new(span)) {
match eval_block_with_redirect(
&engine_state,
&mut stack,
block,
PipelineData::new(span),
) {
Ok(v) => v,
Err(error) => Value::Error { error }.into_pipeline_data(),
}
@ -168,7 +178,12 @@ impl Command for ParEach {
}
}
match eval_block(&engine_state, &mut stack, block, PipelineData::new(span)) {
match eval_block_with_redirect(
&engine_state,
&mut stack,
block,
PipelineData::new(span),
) {
Ok(v) => v,
Err(error) => Value::Error { error }.into_pipeline_data(),
}
@ -213,7 +228,12 @@ impl Command for ParEach {
}
}
match eval_block(&engine_state, &mut stack, block, PipelineData::new(span)) {
match eval_block_with_redirect(
&engine_state,
&mut stack,
block,
PipelineData::new(span),
) {
Ok(v) => v,
Err(error) => Value::Error { error }.into_pipeline_data(),
}
@ -250,7 +270,12 @@ impl Command for ParEach {
}
}
match eval_block(&engine_state, &mut stack, block, PipelineData::new(span))? {
match eval_block_with_redirect(
&engine_state,
&mut stack,
block,
PipelineData::new(span),
)? {
PipelineData::Value(
Value::Record {
mut cols, mut vals, ..
@ -284,7 +309,7 @@ impl Command for ParEach {
}
}
eval_block(&engine_state, &mut stack, block, PipelineData::new(span))
eval_block_with_redirect(&engine_state, &mut stack, block, PipelineData::new(span))
}
}
}

10
crates/nu-command/src/filters/where_.rs
View File

@ -1,4 +1,4 @@
use nu_engine::{eval_block, CallExt};
use nu_engine::{eval_block_with_redirect, CallExt};
use nu_protocol::ast::Call;
use nu_protocol::engine::{CaptureBlock, Command, EngineState, Stack};
use nu_protocol::{Category, PipelineData, Signature, SyntaxShape};
@ -47,8 +47,12 @@ impl Command for Where {
stack.add_var(*var_id, value.clone());
}
}
let result =
eval_block(&engine_state, &mut stack, &block, PipelineData::new(span));
let result = eval_block_with_redirect(
&engine_state,
&mut stack,
&block,
PipelineData::new(span),
);
match result {
Ok(result) => result.into_value(span).is_true(),