Port str to-decimal to into decimal command. (#408)

* Port str to-decimal to into decimal command. Add also a Value::test_float function for tests only

* Add support for handling integers into decimals and fix issues with error span
This commit is contained in:
onthebridgetonowhere 2021-12-03 03:01:19 +01:00 committed by GitHub
parent bf82417d52
commit 349e83abd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 177 additions and 0 deletions

View File

@ -0,0 +1,166 @@
use nu_engine::CallExt;
use nu_protocol::{
ast::{Call, CellPath},
engine::{Command, EngineState, Stack},
Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Value,
};
#[derive(Clone)]
pub struct SubCommand;
impl Command for SubCommand {
fn name(&self) -> &str {
"into decimal"
}
fn signature(&self) -> Signature {
Signature::build("into decimal").rest(
"rest",
SyntaxShape::CellPath,
"optionally convert text into decimal by column paths",
)
}
fn usage(&self) -> &str {
"converts text into decimal"
}
fn run(
&self,
engine_state: &EngineState,
stack: &mut Stack,
call: &Call,
input: PipelineData,
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
operate(engine_state, stack, call, input)
}
fn examples(&self) -> Vec<Example> {
vec![
Example {
description: "Convert string to integer 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::unknown(),
}],
span: Span::unknown(),
}),
},
Example {
description: "Convert string to integer",
example: "'1.345' | into decimal",
result: Some(Value::test_float(1.345)),
},
Example {
description: "Convert decimal to integer",
example: "'-5.9' | into decimal",
result: Some(Value::test_float(-5.9)),
},
]
}
}
fn operate(
engine_state: &EngineState,
stack: &mut Stack,
call: &Call,
input: PipelineData,
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
let head = call.head;
let column_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
input.map(
move |v| {
if column_paths.is_empty() {
action(&v, head)
} else {
let mut ret = v;
for path in &column_paths {
let r =
ret.update_cell_path(&path.members, Box::new(move |old| action(old, head)));
if let Err(error) = r {
return Value::Error { error };
}
}
ret
}
},
engine_state.ctrlc.clone(),
)
}
fn action(input: &Value, head: Span) -> Value {
match input {
Value::String { val: s, span } => {
let other = s.trim();
match other.parse::<f64>() {
Ok(x) => Value::Float { val: x, span: head },
Err(reason) => Value::Error {
error: ShellError::CantConvert("float".to_string(), reason.to_string(), *span),
},
}
}
Value::Int { val: v, span } => Value::Float {
val: *v as f64,
span: *span,
},
other => {
let span = other.span();
match span {
Ok(s) => {
let got = format!("Expected a string, got {} instead", other.get_type());
Value::Error {
error: ShellError::UnsupportedInput(got, s),
}
}
Err(e) => Value::Error { error: e },
}
}
}
}
#[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, Span::unknown());
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, Span::unknown());
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, Span::unknown());
assert_eq!(actual, expected);
}
}

View File

@ -1,5 +1,6 @@
mod binary; mod binary;
mod command; mod command;
mod decimal;
mod filesize; mod filesize;
mod int; mod int;
mod string; mod string;
@ -7,5 +8,6 @@ mod string;
pub use self::filesize::SubCommand as IntoFilesize; pub use self::filesize::SubCommand as IntoFilesize;
pub use binary::SubCommand as IntoBinary; pub use binary::SubCommand as IntoBinary;
pub use command::Into; pub use command::Into;
pub use decimal::SubCommand as IntoDecimal;
pub use int::SubCommand as IntoInt; pub use int::SubCommand as IntoInt;
pub use string::SubCommand as IntoString; pub use string::SubCommand as IntoString;

View File

@ -81,6 +81,7 @@ pub fn create_default_context() -> EngineState {
If, If,
Into, Into,
IntoBinary, IntoBinary,
IntoDecimal,
IntoFilesize, IntoFilesize,
IntoInt, IntoInt,
IntoString, IntoString,

View File

@ -631,6 +631,14 @@ impl Value {
span: Span::unknown(), span: Span::unknown(),
} }
} }
// Only use these for test data. Span::unknown() should not be used in user data
pub fn test_float(val: f64) -> Value {
Value::Float {
val,
span: Span::unknown(),
}
}
} }
impl Default for Value { impl Default for Value {