Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: introduce a gen_save_call function to reduce duplicate code (#10852)

Browse Source 
make a little refactor on relative code to make it more
readable.
This commit is contained in:
WindSoilder 2023-10-31 10:45:36 +08:00 committed by GitHub
parent 72cb4b6032
commit cf7040a215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 57 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
crates/nu-engine/src/eval.rs
View File

@ -6,8 +6,8 @@ use nu_protocol::{
Expression, Math, Operator, PathMember, PipelineElement, Redirection, Expression, Math, Operator, PathMember, PipelineElement, Redirection,
}, },
engine::{Closure, EngineState, Stack}, engine::{Closure, EngineState, Stack},
IntoInterruptiblePipelineData, IntoPipelineData, PipelineData, Range, Record, ShellError, Span, DeclId, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData, Range, Record,
Spanned, Unit, Value, VarId, ENV_VARIABLE_ID, ShellError, Span, Spanned, Unit, Value, VarId, ENV_VARIABLE_ID,
}; };
use std::collections::HashMap; use std::collections::HashMap;
@ -773,38 +773,8 @@ fn eval_element_with_input(
}; };
if let Some(save_command) = engine_state.find_decl(b"save", &[]) { if let Some(save_command) = engine_state.find_decl(b"save", &[]) {
eval_call( let save_call = gen_save_call(save_command, (*span, expr.clone()), None);
engine_state, eval_call(engine_state, stack, &save_call, input).map(|_| {
stack,
&Call {
decl_id: save_command,
head: *span,
arguments: vec![
Argument::Positional(expr.clone()),
Argument::Named((
Spanned {
item: "raw".into(),
span: *span,
},
None,
None,
)),
Argument::Named((
Spanned {
item: "force".into(),
span: *span,
},
None,
None,
)),
],
redirect_stdout: false,
redirect_stderr: false,
parser_info: HashMap::new(),
},
input,
)
.map(|_| {
// save is internal command, normally it exists with non-ExternalStream // save is internal command, normally it exists with non-ExternalStream
// but here in redirection context, we make it returns ExternalStream // but here in redirection context, we make it returns ExternalStream
// So nu handles exit_code correctly // So nu handles exit_code correctly
@ -845,46 +815,13 @@ fn eval_element_with_input(
PipelineData::ExternalStream { exit_code, .. } => exit_code.take(), PipelineData::ExternalStream { exit_code, .. } => exit_code.take(),
_ => None, _ => None,
}; };
eval_call( let save_call = gen_save_call(
engine_state, save_command,
stack, (*out_span, out_expr.clone()),
&Call { Some((*err_span, err_expr.clone())),
decl_id: save_command, );
head: *out_span,
arguments: vec![ eval_call(engine_state, stack, &save_call, input).map(|_| {
Argument::Positional(out_expr.clone()),
Argument::Named((
Spanned {
item: "stderr".into(),
span: *err_span,
},
None,
Some(err_expr.clone()),
)),
Argument::Named((
Spanned {
item: "raw".into(),
span: *out_span,
},
None,
None,
)),
Argument::Named((
Spanned {
item: "force".into(),
span: *out_span,
},
None,
None,
)),
],
redirect_stdout: false,
redirect_stderr: false,
parser_info: HashMap::new(),
},
input,
)
.map(|_| {
// save is internal command, normally it exists with non-ExternalStream // save is internal command, normally it exists with non-ExternalStream
// but here in redirection context, we make it returns ExternalStream // but here in redirection context, we make it returns ExternalStream
// So nu handles exit_code correctly // So nu handles exit_code correctly
@ -1167,3 +1104,49 @@ pub fn eval_variable(
fn compute(size: i64, unit: Unit, span: Span) -> Result<Value, ShellError> { fn compute(size: i64, unit: Unit, span: Span) -> Result<Value, ShellError> {
unit.to_value(size, span) unit.to_value(size, span)
} }
fn gen_save_call(
save_decl_id: DeclId,
out_info: (Span, Expression),
err_info: Option<(Span, Expression)>,
) -> Call {
let (out_span, out_expr) = out_info;
let mut args = vec![
Argument::Positional(out_expr),
Argument::Named((
Spanned {
item: "raw".into(),
span: out_span,
},
None,
None,
)),
Argument::Named((
Spanned {
item: "force".into(),
span: out_span,
},
None,
None,
)),
];
if let Some((err_span, err_expr)) = err_info {
args.push(Argument::Named((
Spanned {
item: "stderr".into(),
span: err_span,
},
None,
Some(err_expr),
)))
}
Call {
decl_id: save_decl_id,
head: out_span,
arguments: args,
redirect_stdout: false,
redirect_stderr: false,
parser_info: HashMap::new(),
}
}