mirror of
https://github.com/nushell/nushell.git
synced 2025-03-31 19:27:09 +02:00
# Description Continuing from #12568, this PR further reduces the size of `Expr` from 64 to 40 bytes. It also reduces `Expression` from 128 to 96 bytes and `Type` from 32 to 24 bytes. This was accomplished by: - for `Expr` with multiple fields (e.g., `Expr::Thing(A, B, C)`), merging the fields into new AST struct types and then boxing this struct (e.g. `Expr::Thing(Box<ABC>)`). - replacing `Vec<T>` with `Box<[T]>` in multiple places. `Expr`s and `Expression`s should rarely be mutated, if at all, so this optimization makes sense. By reducing the size of these types, I didn't notice a large performance improvement (at least compared to #12568). But this PR does reduce the memory usage of nushell. My config is somewhat light so I only noticed a difference of 1.4MiB (38.9MiB vs 37.5MiB). --------- Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
176 lines
5.2 KiB
Rust
176 lines
5.2 KiB
Rust
use nu_cmd_base::input_handler::{operate, CellPathOnlyArgs};
|
|
use nu_engine::command_prelude::*;
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"into float"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("into float")
|
|
.input_output_types(vec![
|
|
(Type::Int, Type::Float),
|
|
(Type::String, Type::Float),
|
|
(Type::Bool, Type::Float),
|
|
(Type::Float, Type::Float),
|
|
(Type::table(), Type::table()),
|
|
(Type::record(), Type::record()),
|
|
(
|
|
Type::List(Box::new(Type::Any)),
|
|
Type::List(Box::new(Type::Float)),
|
|
),
|
|
])
|
|
.rest(
|
|
"rest",
|
|
SyntaxShape::CellPath,
|
|
"For a data structure input, convert data at the given cell paths.",
|
|
)
|
|
.allow_variants_without_examples(true)
|
|
.category(Category::Conversions)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Convert data into floating point number."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["convert", "number", "floating", "decimal"]
|
|
}
|
|
|
|
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 float in table",
|
|
example: "[[num]; ['5.01']] | into float num",
|
|
result: Some(Value::test_list(vec![Value::test_record(record! {
|
|
"num" => Value::test_float(5.01),
|
|
})])),
|
|
},
|
|
Example {
|
|
description: "Convert string to floating point number",
|
|
example: "'1.345' | into float",
|
|
result: Some(Value::test_float(1.345)),
|
|
},
|
|
Example {
|
|
description: "Coerce list of ints and floats to float",
|
|
example: "[4 -5.9] | into float",
|
|
result: Some(Value::test_list(vec![
|
|
Value::test_float(4.0),
|
|
Value::test_float(-5.9),
|
|
])),
|
|
},
|
|
Example {
|
|
description: "Convert boolean to float",
|
|
example: "true | into float",
|
|
result: Some(Value::test_float(1.0)),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn action(input: &Value, _args: &CellPathOnlyArgs, head: Span) -> Value {
|
|
let span = input.span();
|
|
match input {
|
|
Value::Float { .. } => input.clone(),
|
|
Value::String { val: s, .. } => {
|
|
let other = s.trim();
|
|
|
|
match other.parse::<f64>() {
|
|
Ok(x) => Value::float(x, head),
|
|
Err(reason) => Value::error(
|
|
ShellError::CantConvert {
|
|
to_type: "float".to_string(),
|
|
from_type: reason.to_string(),
|
|
span,
|
|
help: None,
|
|
},
|
|
span,
|
|
),
|
|
}
|
|
}
|
|
Value::Int { val: v, .. } => Value::float(*v as f64, span),
|
|
Value::Bool { val: b, .. } => Value::float(
|
|
match b {
|
|
true => 1.0,
|
|
false => 0.0,
|
|
},
|
|
span,
|
|
),
|
|
// Propagate errors by explicitly matching them before the final case.
|
|
Value::Error { .. } => input.clone(),
|
|
other => Value::error(
|
|
ShellError::OnlySupportsThisInputType {
|
|
exp_input_type: "string, int or bool".into(),
|
|
wrong_type: other.get_type().to_string(),
|
|
dst_span: head,
|
|
src_span: other.span(),
|
|
},
|
|
head,
|
|
),
|
|
}
|
|
}
|
|
|
|
#[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_float() {
|
|
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_floatlike_string() {
|
|
let invalid_str = Value::test_string("11.6anra");
|
|
|
|
let actual = action(
|
|
&invalid_str,
|
|
&CellPathOnlyArgs::from(vec![]),
|
|
Span::test_data(),
|
|
);
|
|
|
|
assert_eq!(actual.get_type(), Error);
|
|
}
|
|
|
|
#[test]
|
|
fn int_to_float() {
|
|
let input_int = Value::test_int(10);
|
|
let expected = Value::test_float(10.0);
|
|
let actual = action(
|
|
&input_int,
|
|
&CellPathOnlyArgs::from(vec![]),
|
|
Span::test_data(),
|
|
);
|
|
|
|
assert_eq!(actual, expected);
|
|
}
|
|
}
|