forked from extern/nushell
Continuation of #8229 and #8326 # Description The `ShellError` enum at the moment is kind of messy. Many variants are basic tuple structs where you always have to reference the implementation with its macro invocation to know which field serves which purpose. Furthermore we have both variants that are kind of redundant or either overly broad to be useful for the user to match on or overly specific with few uses. So I set out to start fixing the lacking documentation and naming to make it feasible to critically review the individual usages and fix those. Furthermore we can decide to join or split up variants that don't seem to be fit for purpose. # Call to action **Everyone:** Feel free to add review comments if you spot inconsistent use of `ShellError` variants. # User-Facing Changes (None now, end goal more explicit and consistent error messages) # Tests + Formatting (No additional tests needed so far) # Commits (so far) - Remove `ShellError::FeatureNotEnabled` - Name fields on `SE::ExternalNotSupported` - Name field on `SE::InvalidProbability` - Name fields on `SE::NushellFailed` variants - Remove unused `SE::NushellFailedSpannedHelp` - Name field on `SE::VariableNotFoundAtRuntime` - Name fields on `SE::EnvVarNotFoundAtRuntime` - Name fields on `SE::ModuleNotFoundAtRuntime` - Remove usused `ModuleOrOverlayNotFoundAtRuntime` - Name fields on `SE::OverlayNotFoundAtRuntime` - Name field on `SE::NotFound`
169 lines
4.9 KiB
Rust
169 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<PipelineData, 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 {
|
|
to_type: "float".to_string(),
|
|
from_type: reason.to_string(),
|
|
span: *span,
|
|
help: 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 {
|
|
exp_input_type: "string, integer or bool".into(),
|
|
wrong_type: other.get_type().to_string(),
|
|
dst_span: head,
|
|
src_span: 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);
|
|
}
|
|
}
|