forked from extern/nushell
# Description * I was dismayed to discover recently that UnsupportedInput and TypeMismatch are used *extremely* inconsistently across the codebase. UnsupportedInput is sometimes used for input type-checks (as per the name!!), but *also* used for argument type-checks. TypeMismatch is also used for both. I thus devised the following standard: input type-checking *only* uses UnsupportedInput, and argument type-checking *only* uses TypeMismatch. Moreover, to differentiate them, UnsupportedInput now has *two* error arrows (spans), one pointing at the command and the other at the input origin, while TypeMismatch only has the one (because the command should always be nearby) * In order to apply that standard, a very large number of UnsupportedInput uses were changed so that the input's span could be retrieved and delivered to it. * Additionally, I noticed many places where **errors are not propagated correctly**: there are lots of `match` sites which take a Value::Error, then throw it away and replace it with a new Value::Error with less/misleading information (such as reporting the error as an "incorrect type"). I believe that the earliest errors are the most important, and should always be propagated where possible. * Also, to standardise one broad subset of UnsupportedInput error messages, who all used slightly different wordings of "expected `<type>`, got `<type>`", I created OnlySupportsThisInputType as a variant of it. * Finally, a bunch of error sites that had "repeated spans" - i.e. where an error expected two spans, but `call.head` was given for both - were fixed to use different spans. # Example BEFORE ``` 〉20b | str starts-with 'a' Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #31:1:1] 1 │ 20b | str starts-with 'a' · ┬ · ╰── Input's type is filesize. This command only works with strings. ╰──── 〉'a' | math cos Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #33:1:1] 1 │ 'a' | math cos · ─┬─ · ╰── Only numerical values are supported, input type: String ╰──── 〉0x[12] | encode utf8 Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #38:1:1] 1 │ 0x[12] | encode utf8 · ───┬── · ╰── non-string input ╰──── ``` AFTER ``` 〉20b | str starts-with 'a' Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #1:1:1] 1 │ 20b | str starts-with 'a' · ┬ ───────┬─────── · │ ╰── only string input data is supported · ╰── input type: filesize ╰──── 〉'a' | math cos Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #2:1:1] 1 │ 'a' | math cos · ─┬─ ────┬─── · │ ╰── only numeric input data is supported · ╰── input type: string ╰──── 〉0x[12] | encode utf8 Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #3:1:1] 1 │ 0x[12] | encode utf8 · ───┬── ───┬── · │ ╰── only string input data is supported · ╰── input type: binary ╰──── ``` # User-Facing Changes Various error messages suddenly make more sense (i.e. have two arrows instead of one). # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
170 lines
4.9 KiB
Rust
170 lines
4.9 KiB
Rust
use crate::input_handler::{operate, CellPathOnlyArgs};
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::{
|
|
ast::{Call, CellPath},
|
|
engine::{Command, EngineState, Stack},
|
|
Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"into decimal"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("into decimal")
|
|
.input_output_types(vec![
|
|
(Type::String, Type::Number),
|
|
(Type::Bool, Type::Number),
|
|
])
|
|
.rest(
|
|
"rest",
|
|
SyntaxShape::CellPath,
|
|
"for a data structure input, convert data at the given cell paths",
|
|
)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Convert text into a decimal"
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["convert", "number", "floating"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
|
let args = CellPathOnlyArgs::from(cell_paths);
|
|
operate(action, args, input, call.head, engine_state.ctrlc.clone())
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Convert string to decimal in table",
|
|
example: "[[num]; ['5.01']] | into decimal num",
|
|
result: Some(Value::List {
|
|
vals: vec![Value::Record {
|
|
cols: vec!["num".to_string()],
|
|
vals: vec![Value::test_float(5.01)],
|
|
span: Span::test_data(),
|
|
}],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
Example {
|
|
description: "Convert string to decimal",
|
|
example: "'1.345' | into decimal",
|
|
result: Some(Value::test_float(1.345)),
|
|
},
|
|
Example {
|
|
description: "Convert decimal to decimal",
|
|
example: "'-5.9' | into decimal",
|
|
result: Some(Value::test_float(-5.9)),
|
|
},
|
|
Example {
|
|
description: "Convert boolean to decimal",
|
|
example: "true | into decimal",
|
|
result: Some(Value::test_float(1.0)),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn action(input: &Value, _args: &CellPathOnlyArgs, head: Span) -> Value {
|
|
match input {
|
|
Value::String { val: s, span } => {
|
|
let other = s.trim();
|
|
|
|
match other.parse::<f64>() {
|
|
Ok(x) => Value::float(x, head),
|
|
Err(reason) => Value::Error {
|
|
error: ShellError::CantConvert(
|
|
"float".to_string(),
|
|
reason.to_string(),
|
|
*span,
|
|
None,
|
|
),
|
|
},
|
|
}
|
|
}
|
|
Value::Int { val: v, span } => Value::float(*v as f64, *span),
|
|
Value::Bool { val: b, span } => Value::Float {
|
|
val: match b {
|
|
true => 1.0,
|
|
false => 0.0,
|
|
},
|
|
span: *span,
|
|
},
|
|
// Propagate errors by explicitly matching them before the final case.
|
|
Value::Error { .. } => input.clone(),
|
|
other => Value::Error {
|
|
error: ShellError::OnlySupportsThisInputType(
|
|
"string, integer or bool".into(),
|
|
other.get_type().to_string(),
|
|
head,
|
|
// This line requires the Value::Error match above.
|
|
other.expect_span(),
|
|
),
|
|
},
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use nu_protocol::Type::Error;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
|
|
#[test]
|
|
#[allow(clippy::approx_constant)]
|
|
fn string_to_decimal() {
|
|
let word = Value::test_string("3.1415");
|
|
let expected = Value::test_float(3.1415);
|
|
|
|
let actual = action(&word, &CellPathOnlyArgs::from(vec![]), Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn communicates_parsing_error_given_an_invalid_decimallike_string() {
|
|
let decimal_str = Value::test_string("11.6anra");
|
|
|
|
let actual = action(
|
|
&decimal_str,
|
|
&CellPathOnlyArgs::from(vec![]),
|
|
Span::test_data(),
|
|
);
|
|
|
|
assert_eq!(actual.get_type(), Error);
|
|
}
|
|
|
|
#[test]
|
|
fn int_to_decimal() {
|
|
let decimal_str = Value::test_int(10);
|
|
let expected = Value::test_float(10.0);
|
|
let actual = action(
|
|
&decimal_str,
|
|
&CellPathOnlyArgs::from(vec![]),
|
|
Span::test_data(),
|
|
);
|
|
|
|
assert_eq!(actual, expected);
|
|
}
|
|
}
|