mirror of
https://github.com/nushell/nushell
synced 2025-01-09 19:59:02 +00:00
1867bb1a88
# Description
Possible fix of #11456
This PR fixes a bug where builtin commands did not respect the logic of
dynamically passed boolean flags. The reason is
[has_flag](6f59abaf43/crates/nu-protocol/src/ast/call.rs (L204C5-L212C6))
method did not evaluate and take into consideration expression used with
flag.
To address this issue a solution is proposed:
1. `has_flag` method is moved to `CallExt` and new logic to evaluate
expression and check if it is a boolean value is added
2. `has_flag_const` method is added to `CallExt` which is a constant
version of `has_flag`
3. `has_named` method is added to `Call` which is basically the old
logic of `has_flag`
4. All usages of `has_flag` in code are updated, mostly to pass
`engine_state` and `stack` to new `has_flag`. In `run_const` commands it
is replaced with `has_flag_const`. And in a few select places: parser,
`to nuon` and `into string` old logic via `has_named` is used.
# User-Facing Changes
Explicit values of boolean flags are now respected in builtin commands.
Before:
After:
Another example:
Before:
After:
# Tests + Formatting
Added test reproducing some variants of original issue.
92 lines
2.8 KiB
Rust
92 lines
2.8 KiB
Rust
use super::variance::compute_variance as variance;
|
|
use crate::math::utils::run_with_function;
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Span, Type, Value};
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"math stddev"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("math stddev")
|
|
.input_output_types(vec![(Type::List(Box::new(Type::Number)), Type::Number)])
|
|
.switch(
|
|
"sample",
|
|
"calculate sample standard deviation (i.e. using N-1 as the denominator)",
|
|
Some('s'),
|
|
)
|
|
.category(Category::Math)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Returns the standard deviation of a list of numbers, or of each column in a table."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec![
|
|
"SD",
|
|
"standard",
|
|
"deviation",
|
|
"dispersion",
|
|
"variation",
|
|
"statistics",
|
|
]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let sample = call.has_flag(engine_state, stack, "sample")?;
|
|
run_with_function(call, input, compute_stddev(sample))
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Compute the standard deviation of a list of numbers",
|
|
example: "[1 2 3 4 5] | math stddev",
|
|
result: Some(Value::test_float(std::f64::consts::SQRT_2)),
|
|
},
|
|
Example {
|
|
description: "Compute the sample standard deviation of a list of numbers",
|
|
example: "[1 2 3 4 5] | math stddev --sample",
|
|
result: Some(Value::test_float(1.5811388300841898)),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
pub fn compute_stddev(sample: bool) -> impl Fn(&[Value], Span, Span) -> Result<Value, ShellError> {
|
|
move |values: &[Value], span: Span, head: Span| {
|
|
// variance() produces its own usable error, so we can use `?` to propagated the error.
|
|
let variance = variance(sample)(values, span, head)?;
|
|
let val_span = variance.span();
|
|
match variance {
|
|
Value::Float { val, .. } => Ok(Value::float(val.sqrt(), val_span)),
|
|
Value::Int { val, .. } => Ok(Value::float((val as f64).sqrt(), val_span)),
|
|
other => Ok(other),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|