mirror of
https://github.com/nushell/nushell.git
synced 2025-06-14 14:06:50 +02:00
No associated issue, but follows up #15135. See also discussion on [discord](https://discord.com/channels/601130461678272522/1349139634281513093/1349139639356624966) with @sholderbach # Description ### Math commands `range -> list<number>` This enables the following math commands: - abs - ceil - floor - log - round to work with ranges. When a range is given, the command will apply the command on each item of the range, thus producing a list of number as output. Example  The commands still do not work work with unbounded ranges:  And I left out the "mode" command because I think it does not make sense to use it on ranges... ### Math commands `range -> number` This was the topic of my previous PR, but for whatever reason I didn't do `math variance` and `math stddev`. I had to use `input.try_expand_range` to convert the range into a list before computing the variance/stddev.  And same, does not work in infinite ranges:  ### Also done: - find link in documentation # User-Facing Changes - Command signatures changes - ability to use some commands with unbounded ranges - ability to use variance and stddev with bounded ranges # Tests + Formatting Cargo fmt and clippy OK Tests OK # After Submitting I guess nothing, or maybe release notes?
138 lines
3.8 KiB
Rust
138 lines
3.8 KiB
Rust
use crate::math::utils::ensure_bounded;
|
|
use nu_engine::command_prelude::*;
|
|
use nu_protocol::Range;
|
|
|
|
#[derive(Clone)]
|
|
pub struct MathCeil;
|
|
|
|
impl Command for MathCeil {
|
|
fn name(&self) -> &str {
|
|
"math ceil"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("math ceil")
|
|
.input_output_types(vec![
|
|
(Type::Number, Type::Int),
|
|
(
|
|
Type::List(Box::new(Type::Number)),
|
|
Type::List(Box::new(Type::Int)),
|
|
),
|
|
(Type::Range, Type::List(Box::new(Type::Number))),
|
|
])
|
|
.allow_variants_without_examples(true)
|
|
.category(Category::Math)
|
|
}
|
|
|
|
fn description(&self) -> &str {
|
|
"Returns the ceil of a number (smallest integer greater than or equal to that number)."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["ceiling", "round up", "rounding", "integer"]
|
|
}
|
|
|
|
fn is_const(&self) -> bool {
|
|
true
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
_stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(ShellError::PipelineEmpty { dst_span: head });
|
|
}
|
|
if let PipelineData::Value(
|
|
Value::Range {
|
|
ref val,
|
|
internal_span,
|
|
},
|
|
..,
|
|
) = input
|
|
{
|
|
match &**val {
|
|
Range::IntRange(range) => ensure_bounded(range.end(), internal_span, head)?,
|
|
Range::FloatRange(range) => ensure_bounded(range.end(), internal_span, head)?,
|
|
}
|
|
}
|
|
input.map(move |value| operate(value, head), engine_state.signals())
|
|
}
|
|
|
|
fn run_const(
|
|
&self,
|
|
working_set: &StateWorkingSet,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(ShellError::PipelineEmpty { dst_span: head });
|
|
}
|
|
if let PipelineData::Value(
|
|
Value::Range {
|
|
ref val,
|
|
internal_span,
|
|
},
|
|
..,
|
|
) = input
|
|
{
|
|
match &**val {
|
|
Range::IntRange(range) => ensure_bounded(range.end(), internal_span, head)?,
|
|
Range::FloatRange(range) => ensure_bounded(range.end(), internal_span, head)?,
|
|
}
|
|
}
|
|
input.map(
|
|
move |value| operate(value, head),
|
|
working_set.permanent().signals(),
|
|
)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![Example {
|
|
description: "Apply the ceil function to a list of numbers",
|
|
example: "[1.5 2.3 -3.1] | math ceil",
|
|
result: Some(Value::list(
|
|
vec![Value::test_int(2), Value::test_int(3), Value::test_int(-3)],
|
|
Span::test_data(),
|
|
)),
|
|
}]
|
|
}
|
|
}
|
|
|
|
fn operate(value: Value, head: Span) -> Value {
|
|
let span = value.span();
|
|
match value {
|
|
Value::Int { .. } => value,
|
|
Value::Float { val, .. } => Value::int(val.ceil() as i64, span),
|
|
Value::Error { .. } => value,
|
|
other => Value::error(
|
|
ShellError::OnlySupportsThisInputType {
|
|
exp_input_type: "numeric".into(),
|
|
wrong_type: other.get_type().to_string(),
|
|
dst_span: head,
|
|
src_span: other.span(),
|
|
},
|
|
head,
|
|
),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(MathCeil {})
|
|
}
|
|
}
|