holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix empty table and missing spans (#1614)

Browse Source
This commit is contained in:
Jonathan Turner
2020-04-20 19:44:19 +12:00
committed by GitHub
parent eec94e4016
commit 2ffb14c7d0
7 changed files with 17 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/nu-parser/src/parse.rs
View File

@ -422,7 +422,13 @@ fn parse_arg(
Err(e) => return (garbage(lite_arg.span), Some(e)),
};
if lite_block.block.len() != 1 {
if lite_block.block.is_empty() {
return (
SpannedExpression::new(Expression::List(vec![]), lite_arg.span),
error,
);
}
if lite_block.block.len() > 1 {
return (
garbage(lite_arg.span),
Some(ParseError::mismatch("table", lite_arg.clone())),
@ -1006,7 +1012,7 @@ fn classify_pipeline(
.name
.clone()
.map(|v| v.chars().skip(1).collect::<String>());
let name_span = name.span;
// TODO this is the same as the `else` branch below, only the name differs. Find a way
// to share this functionality.
let name_iter = std::iter::once(name);
@ -1015,11 +1021,11 @@ fn classify_pipeline(
commands.push(ClassifiedCommand::Internal(InternalCommand {
name: "run_external".to_string(),
name_span: Span::unknown(),
name_span,
args: hir::Call {
head: Box::new(SpannedExpression {
expr: Expression::string("run_external".to_string()),
span: Span::unknown(),
span: name_span,
}),
positional: Some(args),
named: None,
@ -1052,6 +1058,7 @@ fn classify_pipeline(
let trimmed = trim_quotes(&v);
expand_path(&trimmed)
});
let name_span = name.span;
let name_iter = std::iter::once(name);
let args = name_iter.chain(lite_cmd.args.clone().into_iter());
@ -1059,11 +1066,11 @@ fn classify_pipeline(
commands.push(ClassifiedCommand::Internal(InternalCommand {
name: "run_external".to_string(),
name_span: Span::unknown(),
name_span,
args: hir::Call {
head: Box::new(SpannedExpression {
expr: Expression::string("run_external".to_string()),
span: Span::unknown(),
span: name_span,
}),
positional: Some(args),
named: None,

6
crates/nu-parser/src/shapes.rs
View File

@ -92,12 +92,6 @@ pub fn shapes(commands: &Block) -> Vec<Spanned<FlatShape>> {
}
}
}
ClassifiedCommand::External(external) => {
output.push(FlatShape::ExternalCommand.spanned(external.name_tag.span));
for arg in external.args.iter() {
output.push(FlatShape::ExternalWord.spanned(arg.tag.span));
}
}
ClassifiedCommand::Expr(expr) => output.append(&mut expression_to_flat_shape(expr)),
_ => {}
}