mirror of
https://github.com/nushell/nushell.git
synced 2025-04-26 14:18:19 +02:00
# Description This PR adds two new `ParseError` and `ShellError` cases for type errors relating to operators. - `OperatorUnsupportedType` is used when a type is not supported by an operator in any way, shape, or form. E.g., `+` does not support `bool`. - `OperatorIncompatibleTypes` is used when a operator is used with types it supports, but the combination of types provided cannot be used together. E.g., `filesize + duration` is not a valid combination. The other preexisting error cases related to operators have been removed and replaced with the new ones above. Namely: - `ShellError::OperatorMismatch` - `ShellError::UnsupportedOperator` - `ParseError::UnsupportedOperationLHS` - `ParseError::UnsupportedOperationRHS` - `ParseError::UnsupportedOperationTernary` # User-Facing Changes - `help operators` now lists the precedence of `not` as 55 instead of 0 (above the other boolean operators). Fixes #13675. - `math median` and `math mode` now ignore NaN values so that `[NaN NaN] | math median` and `[NaN NaN] | math mode` no longer trigger a type error. Instead, it's now an empty input error. Fixing this in earnest can be left for a future PR. - Comparisons with `nan` now return false instead of causing an error. E.g., `1 == nan` is now `false`. - All the operator type errors have been standardized and reworked. In particular, they can now have a help message, which is currently used for types errors relating to `++`. ```nu [1] ++ 2 ``` ``` Error: nu::parser::operator_unsupported_type × The '++' operator does not work on values of type 'int'. ╭─[entry #1:1:5] 1 │ [1] ++ 2 · ─┬ ┬ · │ ╰── int · ╰── does not support 'int' ╰──── help: if you meant to append a value to a list or a record to a table, use the `append` command or wrap the value in a list. For example: `$list ++ $value` should be `$list ++ [$value]` or `$list | append $value`. ```
189 lines
5.7 KiB
Rust
189 lines
5.7 KiB
Rust
use crate::math::utils::run_with_function;
|
|
use nu_engine::command_prelude::*;
|
|
use std::{cmp::Ordering, collections::HashMap};
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
#[derive(Hash, Eq, PartialEq, Debug)]
|
|
enum NumberTypes {
|
|
Float,
|
|
Int,
|
|
Duration,
|
|
Filesize,
|
|
}
|
|
|
|
#[derive(Hash, Eq, PartialEq, Debug)]
|
|
struct HashableType {
|
|
bytes: [u8; 8],
|
|
original_type: NumberTypes,
|
|
}
|
|
|
|
impl HashableType {
|
|
fn new(bytes: [u8; 8], original_type: NumberTypes) -> HashableType {
|
|
HashableType {
|
|
bytes,
|
|
original_type,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"math mode"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("math mode")
|
|
.input_output_types(vec![
|
|
(
|
|
Type::List(Box::new(Type::Number)),
|
|
Type::List(Box::new(Type::Number)),
|
|
),
|
|
(
|
|
Type::List(Box::new(Type::Duration)),
|
|
Type::List(Box::new(Type::Duration)),
|
|
),
|
|
(
|
|
Type::List(Box::new(Type::Filesize)),
|
|
Type::List(Box::new(Type::Filesize)),
|
|
),
|
|
(Type::table(), Type::record()),
|
|
])
|
|
.allow_variants_without_examples(true)
|
|
.category(Category::Math)
|
|
}
|
|
|
|
fn description(&self) -> &str {
|
|
"Returns the most frequent element(s) from a list of numbers or tables."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["common", "often"]
|
|
}
|
|
|
|
fn is_const(&self) -> bool {
|
|
true
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
_engine_state: &EngineState,
|
|
_stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
run_with_function(call, input, mode)
|
|
}
|
|
|
|
fn run_const(
|
|
&self,
|
|
_working_set: &StateWorkingSet,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
run_with_function(call, input, mode)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Compute the mode(s) of a list of numbers",
|
|
example: "[3 3 9 12 12 15] | math mode",
|
|
result: Some(Value::test_list(vec![
|
|
Value::test_int(3),
|
|
Value::test_int(12),
|
|
])),
|
|
},
|
|
Example {
|
|
description: "Compute the mode(s) of the columns of a table",
|
|
example: "[{a: 1 b: 3} {a: 2 b: -1} {a: 1 b: 5}] | math mode",
|
|
result: Some(Value::test_record(record! {
|
|
"a" => Value::list(vec![Value::test_int(1)], Span::test_data()),
|
|
"b" => Value::list(
|
|
vec![Value::test_int(-1), Value::test_int(3), Value::test_int(5)],
|
|
Span::test_data(),
|
|
),
|
|
})),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
pub fn mode(values: &[Value], _span: Span, head: Span) -> Result<Value, ShellError> {
|
|
//In e-q, Value doesn't implement Hash or Eq, so we have to get the values inside
|
|
// But f64 doesn't implement Hash, so we get the binary representation to use as
|
|
// key in the HashMap
|
|
let hashable_values = values
|
|
.iter()
|
|
.filter(|x| !x.as_float().is_ok_and(f64::is_nan))
|
|
.map(|val| match val {
|
|
Value::Int { val, .. } => Ok(HashableType::new(val.to_ne_bytes(), NumberTypes::Int)),
|
|
Value::Duration { val, .. } => {
|
|
Ok(HashableType::new(val.to_ne_bytes(), NumberTypes::Duration))
|
|
}
|
|
Value::Float { val, .. } => {
|
|
Ok(HashableType::new(val.to_ne_bytes(), NumberTypes::Float))
|
|
}
|
|
Value::Filesize { val, .. } => Ok(HashableType::new(
|
|
val.get().to_ne_bytes(),
|
|
NumberTypes::Filesize,
|
|
)),
|
|
Value::Error { error, .. } => Err(*error.clone()),
|
|
other => Err(ShellError::UnsupportedInput {
|
|
msg: "Unable to give a result with this input".to_string(),
|
|
input: "value originates from here".into(),
|
|
msg_span: head,
|
|
input_span: other.span(),
|
|
}),
|
|
})
|
|
.collect::<Result<Vec<HashableType>, ShellError>>()?;
|
|
|
|
let mut frequency_map = HashMap::new();
|
|
for v in hashable_values {
|
|
let counter = frequency_map.entry(v).or_insert(0);
|
|
*counter += 1;
|
|
}
|
|
|
|
let mut max_freq = -1;
|
|
let mut modes = Vec::<Value>::new();
|
|
for (value, frequency) in &frequency_map {
|
|
match max_freq.cmp(frequency) {
|
|
Ordering::Less => {
|
|
max_freq = *frequency;
|
|
modes.clear();
|
|
modes.push(recreate_value(value, head));
|
|
}
|
|
Ordering::Equal => {
|
|
modes.push(recreate_value(value, head));
|
|
}
|
|
Ordering::Greater => (),
|
|
}
|
|
}
|
|
|
|
modes.sort_by(|a, b| a.partial_cmp(b).unwrap_or(Ordering::Equal));
|
|
Ok(Value::list(modes, head))
|
|
}
|
|
|
|
fn recreate_value(hashable_value: &HashableType, head: Span) -> Value {
|
|
let bytes = hashable_value.bytes;
|
|
match &hashable_value.original_type {
|
|
NumberTypes::Int => Value::int(i64::from_ne_bytes(bytes), head),
|
|
NumberTypes::Float => Value::float(f64::from_ne_bytes(bytes), head),
|
|
NumberTypes::Duration => Value::duration(i64::from_ne_bytes(bytes), head),
|
|
NumberTypes::Filesize => Value::filesize(i64::from_ne_bytes(bytes), head),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|