extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-05-30 14:50:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

enable lazy closure evaluation by default

Browse Source
This commit is contained in:
Firegem 2025-04-29 17:07:10 -04:00
parent 82d429d204
commit 3046341643
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/nu-command/src/filters/default.rs
View File

@ -30,14 +30,14 @@ impl Command for Default {
Some('e'), Some('e'),
) )
.switch( .switch(
"lazy", "no-eval",
"if default value is a closure, evaluate it", "if default value is a closure, pass it as-is",
Some('l'), Some('n'),
) )
.switch( .switch(
"lazy-once", "eval-once",
"evaluate the closure only once, even for lists (no closure input)", "evaluate default value closure only once, even for lists (no closure input)",
Some('L'), Some('o'),
) )
.category(Category::Filters) .category(Category::Filters)
} }
@ -54,9 +54,23 @@ impl Command for Default {
input: PipelineData, input: PipelineData,
) -> Result<PipelineData, ShellError> { ) -> Result<PipelineData, ShellError> {
let empty = call.has_flag(engine_state, stack, "empty")?; let empty = call.has_flag(engine_state, stack, "empty")?;
let lazy = call.has_flag(engine_state, stack, "lazy")?; let no_eval = call.has_flag(engine_state, stack, "no-eval")?;
let lazy_once = call.has_flag(engine_state, stack, "lazy-once")?; let eval_once = call.has_flag(engine_state, stack, "eval-once")?;
default(engine_state, stack, call, input, empty, lazy, lazy_once)
if no_eval && eval_once {
Err(ShellError::IncompatibleParameters {
left_message: String::from("incompatible flag"),
left_span: call
.get_flag_span(stack, "no-eval")
.unwrap_or_else(Span::unknown),
right_message: String::from("cannot be used with --no-eval"),
right_span: call
.get_flag_span(stack, "eval-once")
.unwrap_or_else(Span::unknown),
})
} else {
default(engine_state, stack, call, input, empty, !no_eval, eval_once)
}
} }
fn examples(&self) -> Vec<Example> { fn examples(&self) -> Vec<Example> {
@ -115,12 +129,12 @@ impl Command for Default {
}, },
Example { Example {
description: r#"Generate a default value from a closure"#, description: r#"Generate a default value from a closure"#,
example: "null | default --lazy { 1 + 2 }", example: "null | default { 1 + 2 }",
result: Some(Value::test_int(3)), result: Some(Value::test_int(3)),
}, },
Example { Example {
description: r#"Generate missing values in a column from a closure"#, description: r#"Generate missing values in a column from a closure"#,
example: "[{a:1 b:2} {b:1}] | default -l { $in.b + 1 } a", example: "[{a:1 b:2} {b:1}] | default { $in.b + 1 } a",
result: Some(Value::test_list(vec![ result: Some(Value::test_list(vec![
Value::test_record(record! { Value::test_record(record! {
"a" => Value::test_int(1), "a" => Value::test_int(1),