mirror of
https://github.com/nushell/nushell.git
synced 2025-05-27 22:20:50 +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>
183 lines
5.0 KiB
Rust
183 lines
5.0 KiB
Rust
use crate::{grapheme_flags, grapheme_flags_const};
|
|
use nu_cmd_base::input_handler::{operate, CmdArgument};
|
|
use nu_engine::command_prelude::*;
|
|
use nu_protocol::engine::StateWorkingSet;
|
|
use unicode_segmentation::UnicodeSegmentation;
|
|
|
|
struct Arguments {
|
|
cell_paths: Option<Vec<CellPath>>,
|
|
graphemes: bool,
|
|
}
|
|
|
|
impl CmdArgument for Arguments {
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
|
|
self.cell_paths.take()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"str length"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("str length")
|
|
.input_output_types(vec![
|
|
(Type::String, Type::Int),
|
|
(Type::List(Box::new(Type::String)), Type::List(Box::new(Type::Int))),
|
|
(Type::table(), Type::table()),
|
|
(Type::record(), Type::record()),
|
|
])
|
|
.allow_variants_without_examples(true)
|
|
.switch(
|
|
"grapheme-clusters",
|
|
"count length using grapheme clusters (all visible chars have length 1)",
|
|
Some('g'),
|
|
)
|
|
.switch(
|
|
"utf-8-bytes",
|
|
"count length using UTF-8 bytes (default; all non-ASCII chars have length 2+)",
|
|
Some('b'),
|
|
)
|
|
.rest(
|
|
"rest",
|
|
SyntaxShape::CellPath,
|
|
"For a data structure input, replace strings at the given cell paths with their length.",
|
|
)
|
|
.category(Category::Strings)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Output the length of any strings in the pipeline."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["size", "count"]
|
|
}
|
|
|
|
fn is_const(&self) -> bool {
|
|
true
|
|
}
|
|
|
|
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)?;
|
|
run(
|
|
cell_paths,
|
|
engine_state,
|
|
call,
|
|
input,
|
|
grapheme_flags(engine_state, stack, call)?,
|
|
)
|
|
}
|
|
|
|
fn run_const(
|
|
&self,
|
|
working_set: &StateWorkingSet,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let cell_paths: Vec<CellPath> = call.rest_const(working_set, 0)?;
|
|
run(
|
|
cell_paths,
|
|
working_set.permanent(),
|
|
call,
|
|
input,
|
|
grapheme_flags_const(working_set, call)?,
|
|
)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Return the lengths of a string",
|
|
example: "'hello' | str length",
|
|
result: Some(Value::test_int(5)),
|
|
},
|
|
Example {
|
|
description: "Count length using grapheme clusters",
|
|
example: "'🇯🇵ほげ ふが ぴよ' | str length --grapheme-clusters",
|
|
result: Some(Value::test_int(9)),
|
|
},
|
|
Example {
|
|
description: "Return the lengths of multiple strings",
|
|
example: "['hi' 'there'] | str length",
|
|
result: Some(Value::list(
|
|
vec![Value::test_int(2), Value::test_int(5)],
|
|
Span::test_data(),
|
|
)),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn run(
|
|
cell_paths: Vec<CellPath>,
|
|
engine_state: &EngineState,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
graphemes: bool,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let args = Arguments {
|
|
cell_paths: (!cell_paths.is_empty()).then_some(cell_paths),
|
|
graphemes,
|
|
};
|
|
operate(action, args, input, call.head, engine_state.ctrlc.clone())
|
|
}
|
|
|
|
fn action(input: &Value, arg: &Arguments, head: Span) -> Value {
|
|
match input {
|
|
Value::String { val, .. } => Value::int(
|
|
if arg.graphemes {
|
|
val.graphemes(true).count()
|
|
} else {
|
|
val.len()
|
|
} as i64,
|
|
head,
|
|
),
|
|
Value::Error { .. } => input.clone(),
|
|
_ => Value::error(
|
|
ShellError::OnlySupportsThisInputType {
|
|
exp_input_type: "string".into(),
|
|
wrong_type: input.get_type().to_string(),
|
|
dst_span: head,
|
|
src_span: input.span(),
|
|
},
|
|
head,
|
|
),
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn use_utf8_bytes() {
|
|
let word = Value::string(String::from("🇯🇵ほげ ふが ぴよ"), Span::test_data());
|
|
|
|
let options = Arguments {
|
|
cell_paths: None,
|
|
graphemes: false,
|
|
};
|
|
|
|
let actual = action(&word, &options, Span::test_data());
|
|
assert_eq!(actual, Value::test_int(28));
|
|
}
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|