Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-09-21 07:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fail more gently for bad list/table parses

Browse source
This commit is contained in:
JT 2021-09-07 15:56:30 +12:00
parent b8e8061787
commit e00da070fd
2 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/nu-parser/src/lex.rs
View file

@ -161,15 +161,14 @@ pub fn lex_item(
let span = Span::new(span_offset + token_start, span_offset + *curr_offset); let span = Span::new(span_offset + token_start, span_offset + *curr_offset);
// If there is still unclosed opening delimiters, close them and add // If there is still unclosed opening delimiters, remember they were missing
// synthetic closing characters to the accumulated token.
if let Some(block) = block_level.last() { if let Some(block) = block_level.last() {
let delim = block.closing(); let delim = block.closing();
let cause = ParseError::UnexpectedEof( let cause = ParseError::UnexpectedEof(
(delim as char).to_string(), (delim as char).to_string(),
Span { Span {
start: span.end - 1, start: span.end,
end: span.end, end: span.end + 1,
}, },
); );

50
crates/nu-parser/src/parser.rs
View file

@ -2050,26 +2050,40 @@ pub fn parse_value(
} }
} }
SyntaxShape::Any => { SyntaxShape::Any => {
let shapes = [ if bytes.starts_with(b"[") {
SyntaxShape::Int, let shapes = [SyntaxShape::Table];
SyntaxShape::Number, for shape in shapes.iter() {
SyntaxShape::Range, if let (s, None) = parse_value(working_set, span, shape) {
SyntaxShape::Filesize, return (s, None);
SyntaxShape::Duration, }
SyntaxShape::Block,
SyntaxShape::Table,
SyntaxShape::List(Box::new(SyntaxShape::Any)),
SyntaxShape::String,
];
for shape in shapes.iter() {
if let (s, None) = parse_value(working_set, span, shape) {
return (s, None);
} }
parse_value(
working_set,
span,
&SyntaxShape::List(Box::new(SyntaxShape::Any)),
)
} else {
let shapes = [
SyntaxShape::Int,
SyntaxShape::Number,
SyntaxShape::Range,
SyntaxShape::Filesize,
SyntaxShape::Duration,
SyntaxShape::Block,
SyntaxShape::Table,
SyntaxShape::List(Box::new(SyntaxShape::Any)),
SyntaxShape::String,
];
for shape in shapes.iter() {
if let (s, None) = parse_value(working_set, span, shape) {
return (s, None);
}
}
(
garbage(span),
Some(ParseError::Expected("any shape".into(), span)),
)
} }
(
garbage(span),
Some(ParseError::Expected("any shape".into(), span)),
)
} }
_ => (garbage(span), Some(ParseError::IncompleteParser(span))), _ => (garbage(span), Some(ParseError::IncompleteParser(span))),
} }