mirror of
https://github.com/nushell/nushell.git
synced 2025-07-08 02:17:22 +02:00
# 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.
175 lines
5.6 KiB
Rust
175 lines
5.6 KiB
Rust
use super::{get_number_bytes, NumberBytes};
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"bits not"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("bits not")
|
|
.input_output_types(vec![(Type::Int, Type::Int)])
|
|
.vectorizes_over_list(true)
|
|
.switch(
|
|
"signed",
|
|
"always treat input number as a signed number",
|
|
Some('s'),
|
|
)
|
|
.named(
|
|
"number-bytes",
|
|
SyntaxShape::String,
|
|
"the size of unsigned number in bytes, it can be 1, 2, 4, 8, auto",
|
|
Some('n'),
|
|
)
|
|
.category(Category::Bits)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Performs logical negation on each bit"
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["negation"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
let head = call.head;
|
|
let signed = call.has_flag("signed");
|
|
let number_bytes: Option<Spanned<String>> =
|
|
call.get_flag(engine_state, stack, "number-bytes")?;
|
|
let bytes_len = get_number_bytes(&number_bytes);
|
|
if let NumberBytes::Invalid = bytes_len {
|
|
if let Some(val) = number_bytes {
|
|
return Err(ShellError::UnsupportedInput(
|
|
"Only 1, 2, 4, 8, or 'auto' bytes are supported as word sizes".to_string(),
|
|
"value originates from here".to_string(),
|
|
head,
|
|
val.span,
|
|
));
|
|
}
|
|
}
|
|
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(ShellError::PipelineEmpty(head));
|
|
}
|
|
input.map(
|
|
move |value| operate(value, head, signed, bytes_len),
|
|
engine_state.ctrlc.clone(),
|
|
)
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Apply logical negation to a list of numbers",
|
|
example: "[4 3 2] | bits not",
|
|
result: Some(Value::List {
|
|
vals: vec![
|
|
Value::test_int(140737488355323),
|
|
Value::test_int(140737488355324),
|
|
Value::test_int(140737488355325),
|
|
],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
Example {
|
|
description:
|
|
"Apply logical negation to a list of numbers, treat input as 2 bytes number",
|
|
example: "[4 3 2] | bits not -n 2",
|
|
result: Some(Value::List {
|
|
vals: vec![
|
|
Value::test_int(65531),
|
|
Value::test_int(65532),
|
|
Value::test_int(65533),
|
|
],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
Example {
|
|
description:
|
|
"Apply logical negation to a list of numbers, treat input as signed number",
|
|
example: "[4 3 2] | bits not -s",
|
|
result: Some(Value::List {
|
|
vals: vec![
|
|
Value::test_int(-5),
|
|
Value::test_int(-4),
|
|
Value::test_int(-3),
|
|
],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn operate(value: Value, head: Span, signed: bool, number_size: NumberBytes) -> Value {
|
|
match value {
|
|
Value::Int { val, span } => {
|
|
if signed || val < 0 {
|
|
Value::Int { val: !val, span }
|
|
} else {
|
|
use NumberBytes::*;
|
|
let out_val = match number_size {
|
|
One => !val & 0x00_00_00_00_00_FF,
|
|
Two => !val & 0x00_00_00_00_FF_FF,
|
|
Four => !val & 0x00_00_FF_FF_FF_FF,
|
|
Eight => !val & 0x7F_FF_FF_FF_FF_FF,
|
|
Auto => {
|
|
if val <= 0xFF {
|
|
!val & 0x00_00_00_00_00_FF
|
|
} else if val <= 0xFF_FF {
|
|
!val & 0x00_00_00_00_FF_FF
|
|
} else if val <= 0xFF_FF_FF_FF {
|
|
!val & 0x00_00_FF_FF_FF_FF
|
|
} else {
|
|
!val & 0x7F_FF_FF_FF_FF_FF
|
|
}
|
|
}
|
|
// This case shouldn't happen here, as it's handled before
|
|
Invalid => 0,
|
|
};
|
|
Value::Int { val: out_val, span }
|
|
}
|
|
}
|
|
other => match other {
|
|
// Propagate errors inside the value
|
|
Value::Error { .. } => other,
|
|
_ => Value::Error {
|
|
error: ShellError::OnlySupportsThisInputType(
|
|
"numeric".into(),
|
|
other.get_type().to_string(),
|
|
head,
|
|
other.expect_span(),
|
|
),
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|