mirror of
https://github.com/nushell/nushell.git
synced 2025-01-09 07:48:14 +01:00
7ec5f2f2eb
# Description Adds `|` patterns to `match`, allowing you to try multiple patterns for the same case. Example: ``` match {b: 1} { {a: $b} | {b: $b} => { print $b } } ``` Variables that don't bind are set to `$nothing` so that they can be later checked. This PR also: fixes #8631 Creates a set of integration tests for pattern matching also # User-Facing Changes Adds `|` to `match`. Fixes variable binding scope. # 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 > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` # 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.
249 lines
6.4 KiB
Rust
249 lines
6.4 KiB
Rust
use nu_protocol::{
|
|
ast::{Expr, Expression, MatchPattern, Pattern},
|
|
engine::StateWorkingSet,
|
|
Span, SyntaxShape, Type,
|
|
};
|
|
|
|
use crate::{
|
|
lex, lite_parse,
|
|
parser::{is_variable, parse_value},
|
|
LiteElement, ParseError,
|
|
};
|
|
|
|
pub fn garbage(span: Span) -> MatchPattern {
|
|
MatchPattern {
|
|
pattern: Pattern::Garbage,
|
|
span,
|
|
}
|
|
}
|
|
|
|
pub fn parse_match_pattern(
|
|
working_set: &mut StateWorkingSet,
|
|
span: Span,
|
|
) -> (Expression, Option<ParseError>) {
|
|
working_set.enter_scope();
|
|
let (output, err) = parse_pattern(working_set, span);
|
|
working_set.exit_scope();
|
|
|
|
(
|
|
Expression {
|
|
expr: Expr::MatchPattern(Box::new(output)),
|
|
span,
|
|
ty: Type::Any,
|
|
custom_completion: None,
|
|
},
|
|
err,
|
|
)
|
|
}
|
|
|
|
pub fn parse_pattern(
|
|
working_set: &mut StateWorkingSet,
|
|
span: Span,
|
|
) -> (MatchPattern, Option<ParseError>) {
|
|
let bytes = working_set.get_span_contents(span);
|
|
|
|
if bytes.starts_with(b"$") {
|
|
// Variable pattern
|
|
parse_variable_pattern(working_set, span)
|
|
} else if bytes.starts_with(b"{") {
|
|
// Record pattern
|
|
parse_record_pattern(working_set, span)
|
|
} else if bytes.starts_with(b"[") {
|
|
// List pattern
|
|
parse_list_pattern(working_set, span)
|
|
} else if bytes == b"_" {
|
|
(
|
|
MatchPattern {
|
|
pattern: Pattern::IgnoreValue,
|
|
span,
|
|
},
|
|
None,
|
|
)
|
|
} else {
|
|
// Literal value
|
|
let (value, error) = parse_value(working_set, span, &SyntaxShape::Any, &[]);
|
|
(
|
|
MatchPattern {
|
|
pattern: Pattern::Value(value),
|
|
span,
|
|
},
|
|
error,
|
|
)
|
|
}
|
|
}
|
|
|
|
pub fn parse_variable_pattern(
|
|
working_set: &mut StateWorkingSet,
|
|
span: Span,
|
|
) -> (MatchPattern, Option<ParseError>) {
|
|
let bytes = working_set.get_span_contents(span);
|
|
|
|
if is_variable(bytes) {
|
|
if let Some(var_id) = working_set.find_variable_in_current_frame(bytes) {
|
|
(
|
|
MatchPattern {
|
|
pattern: Pattern::Variable(var_id),
|
|
span,
|
|
},
|
|
None,
|
|
)
|
|
} else {
|
|
let var_id = working_set.add_variable(bytes.to_vec(), span, Type::Any, false);
|
|
|
|
(
|
|
MatchPattern {
|
|
pattern: Pattern::Variable(var_id),
|
|
span,
|
|
},
|
|
None,
|
|
)
|
|
}
|
|
} else {
|
|
(
|
|
garbage(span),
|
|
Some(ParseError::Expected("valid variable name".into(), span)),
|
|
)
|
|
}
|
|
}
|
|
|
|
pub fn parse_list_pattern(
|
|
working_set: &mut StateWorkingSet,
|
|
span: Span,
|
|
) -> (MatchPattern, Option<ParseError>) {
|
|
let bytes = working_set.get_span_contents(span);
|
|
|
|
let mut error = None;
|
|
|
|
let mut start = span.start;
|
|
let mut end = span.end;
|
|
|
|
if bytes.starts_with(b"[") {
|
|
start += 1;
|
|
}
|
|
if bytes.ends_with(b"]") {
|
|
end -= 1;
|
|
} else {
|
|
error = error.or_else(|| Some(ParseError::Unclosed("]".into(), Span::new(end, end))));
|
|
}
|
|
|
|
let inner_span = Span::new(start, end);
|
|
let source = working_set.get_span_contents(inner_span);
|
|
|
|
let (output, err) = lex(source, inner_span.start, &[b'\n', b'\r', b','], &[], true);
|
|
error = error.or(err);
|
|
|
|
let (output, err) = lite_parse(&output);
|
|
error = error.or(err);
|
|
|
|
let mut args = vec![];
|
|
|
|
if !output.block.is_empty() {
|
|
for arg in &output.block[0].commands {
|
|
let mut spans_idx = 0;
|
|
|
|
if let LiteElement::Command(_, command) = arg {
|
|
while spans_idx < command.parts.len() {
|
|
let (arg, err) = parse_pattern(working_set, command.parts[spans_idx]);
|
|
error = error.or(err);
|
|
|
|
args.push(arg);
|
|
|
|
spans_idx += 1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
(
|
|
MatchPattern {
|
|
pattern: Pattern::List(args),
|
|
span,
|
|
},
|
|
error,
|
|
)
|
|
}
|
|
|
|
pub fn parse_record_pattern(
|
|
working_set: &mut StateWorkingSet,
|
|
span: Span,
|
|
) -> (MatchPattern, Option<ParseError>) {
|
|
let bytes = working_set.get_span_contents(span);
|
|
|
|
let mut error = None;
|
|
let mut start = span.start;
|
|
let mut end = span.end;
|
|
|
|
if bytes.starts_with(b"{") {
|
|
start += 1;
|
|
} else {
|
|
error = error.or_else(|| {
|
|
Some(ParseError::Expected(
|
|
"{".into(),
|
|
Span::new(start, start + 1),
|
|
))
|
|
});
|
|
}
|
|
|
|
if bytes.ends_with(b"}") {
|
|
end -= 1;
|
|
} else {
|
|
error = error.or_else(|| Some(ParseError::Unclosed("}".into(), Span::new(end, end))));
|
|
}
|
|
|
|
let inner_span = Span::new(start, end);
|
|
let source = working_set.get_span_contents(inner_span);
|
|
|
|
let (tokens, err) = lex(source, start, &[b'\n', b'\r', b','], &[b':'], true);
|
|
error = error.or(err);
|
|
|
|
let mut output = vec![];
|
|
let mut idx = 0;
|
|
|
|
while idx < tokens.len() {
|
|
let bytes = working_set.get_span_contents(tokens[idx].span);
|
|
let (field, pattern) = if !bytes.is_empty() && bytes[0] == b'$' {
|
|
// If this is a variable, treat it as both the name of the field and the pattern
|
|
let field = String::from_utf8_lossy(&bytes[1..]).to_string();
|
|
|
|
let (pattern, err) = parse_variable_pattern(working_set, tokens[idx].span);
|
|
error = error.or(err);
|
|
|
|
(field, pattern)
|
|
} else {
|
|
let field = String::from_utf8_lossy(bytes).to_string();
|
|
|
|
idx += 1;
|
|
if idx == tokens.len() {
|
|
return (
|
|
garbage(span),
|
|
Some(ParseError::Expected("record".into(), span)),
|
|
);
|
|
}
|
|
let colon = working_set.get_span_contents(tokens[idx].span);
|
|
idx += 1;
|
|
if idx == tokens.len() || colon != b":" {
|
|
//FIXME: need better error
|
|
return (
|
|
garbage(span),
|
|
Some(ParseError::Expected("record".into(), span)),
|
|
);
|
|
}
|
|
let (pattern, err) = parse_pattern(working_set, tokens[idx].span);
|
|
error = error.or(err);
|
|
|
|
(field, pattern)
|
|
};
|
|
idx += 1;
|
|
|
|
output.push((field, pattern));
|
|
}
|
|
|
|
(
|
|
MatchPattern {
|
|
pattern: Pattern::Record(output),
|
|
span,
|
|
},
|
|
error,
|
|
)
|
|
}
|