mirror of
https://github.com/nushell/nushell
synced 2025-01-24 19:05:22 +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:
![image](https://github.com/nushell/nushell/assets/17511668/f9fbabb2-3cfd-43f9-ba9e-ece76d80043c)
After:
![image](https://github.com/nushell/nushell/assets/17511668/21867596-2075-437f-9c85-45563ac70083)
Another example:
Before:
![image](https://github.com/nushell/nushell/assets/17511668/efdbc5ca-5227-45a4-ac5b-532cdc2bbf5f)
After:
![image](https://github.com/nushell/nushell/assets/17511668/2907d5c5-aa93-404d-af1c-21cdc3d44646)
# Tests + Formatting
Added test reproducing some variants of original issue.
116 lines
3.5 KiB
Rust
116 lines
3.5 KiB
Rust
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 variance"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("math variance")
|
|
.input_output_types(vec![(Type::List(Box::new(Type::Number)), Type::Number)])
|
|
.switch(
|
|
"sample",
|
|
"calculate sample variance (i.e. using N-1 as the denominator)",
|
|
Some('s'),
|
|
)
|
|
.category(Category::Math)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Returns the variance of a list of numbers or of each column in a table."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["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_variance(sample))
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Get the variance of a list of numbers",
|
|
example: "[1 2 3 4 5] | math variance",
|
|
result: Some(Value::test_float(2.0)),
|
|
},
|
|
Example {
|
|
description: "Get the sample variance of a list of numbers",
|
|
example: "[1 2 3 4 5] | math variance --sample",
|
|
result: Some(Value::test_float(2.5)),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn sum_of_squares(values: &[Value], span: Span) -> Result<Value, ShellError> {
|
|
let n = Value::int(values.len() as i64, span);
|
|
let mut sum_x = Value::int(0, span);
|
|
let mut sum_x2 = Value::int(0, span);
|
|
for value in values {
|
|
let v = match &value {
|
|
Value::Int { .. } | Value::Float { .. } => Ok(value),
|
|
Value::Error { error, .. } => Err(*error.clone()),
|
|
_ => Err(ShellError::UnsupportedInput {
|
|
msg: "Attempted to compute the sum of squares of a non-int, non-float value"
|
|
.to_string(),
|
|
input: "value originates from here".into(),
|
|
msg_span: span,
|
|
input_span: value.span(),
|
|
}),
|
|
}?;
|
|
let v_squared = &v.mul(span, v, span)?;
|
|
sum_x2 = sum_x2.add(span, v_squared, span)?;
|
|
sum_x = sum_x.add(span, v, span)?;
|
|
}
|
|
|
|
let sum_x_squared = sum_x.mul(span, &sum_x, span)?;
|
|
let sum_x_squared_div_n = sum_x_squared.div(span, &n, span)?;
|
|
|
|
let ss = sum_x2.sub(span, &sum_x_squared_div_n, span)?;
|
|
|
|
Ok(ss)
|
|
}
|
|
|
|
pub fn compute_variance(
|
|
sample: bool,
|
|
) -> impl Fn(&[Value], Span, Span) -> Result<Value, ShellError> {
|
|
move |values: &[Value], span: Span, head: Span| {
|
|
let n = if sample {
|
|
values.len() - 1
|
|
} else {
|
|
values.len()
|
|
};
|
|
// sum_of_squares() needs the span of the original value, not the call head.
|
|
let ss = sum_of_squares(values, span)?;
|
|
let n = Value::int(n as i64, head);
|
|
ss.div(head, &n, head)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|