extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 03:34:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix up calls and pipelines

Browse Source
This commit is contained in:
JT
2021-09-03 14:15:01 +12:00
parent 7c8504ea24
commit df63490266
14 changed files with 145 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/nu-parser/src/flatten.rs
View File

@ -29,7 +29,6 @@ pub fn flatten_statement(
stmt: &Statement,
) -> Vec<(Span, FlatShape)> {
match stmt {
Statement::Expression(expr) => flatten_expression(working_set, expr),
Statement::Pipeline(pipeline) => flatten_pipeline(working_set, pipeline),
_ => vec![],
}

30
crates/nu-parser/src/parser.rs
View File

@ -2066,30 +2066,30 @@ pub fn parse_def(
});
(
Statement::Expression(Expression {
Statement::Pipeline(Pipeline::from_vec(vec![Expression {
expr: Expr::Call(call),
span: span(spans),
ty: Type::Unknown,
}),
}])),
error,
)
}
_ => (
Statement::Expression(Expression {
Statement::Pipeline(Pipeline::from_vec(vec![Expression {
expr: Expr::Garbage,
span: span(spans),
ty: Type::Unknown,
}),
}])),
error,
),
}
} else {
(
Statement::Expression(Expression {
Statement::Pipeline(Pipeline::from_vec(vec![Expression {
expr: Expr::Garbage,
span: span(spans),
ty: Type::Unknown,
}),
}])),
Some(ParseError::UnknownState(
"internal error: definition unparseable".into(),
span(spans),
@ -2130,22 +2130,22 @@ pub fn parse_alias(
}
return (
Statement::Expression(Expression {
Statement::Pipeline(Pipeline::from_vec(vec![Expression {
expr: Expr::Call(call),
span: call_span,
ty: Type::Unknown,
}),
}])),
None,
);
}
}
(
Statement::Expression(Expression {
Statement::Pipeline(Pipeline::from_vec(vec![Expression {
expr: Expr::Garbage,
span: span(spans),
ty: Type::Unknown,
}),
}])),
Some(ParseError::UnknownState(
"internal error: let statement unparseable".into(),
span(spans),
@ -2175,21 +2175,21 @@ pub fn parse_let(
}
return (
Statement::Expression(Expression {
Statement::Pipeline(Pipeline::from_vec(vec![Expression {
expr: Expr::Call(call),
span: call_span,
ty: Type::Unknown,
}),
}])),
err,
);
}
}
(
Statement::Expression(Expression {
Statement::Pipeline(Pipeline::from_vec(vec![Expression {
expr: Expr::Garbage,
span: span(spans),
ty: Type::Unknown,
}),
}])),
Some(ParseError::UnknownState(
"internal error: let statement unparseable".into(),
span(spans),
@ -2210,7 +2210,7 @@ pub fn parse_statement(
(stmt, None)
} else {
let (expr, err) = parse_expression(working_set, spans);
(Statement::Expression(expr), err)
(Statement::Pipeline(Pipeline::from_vec(vec![expr])), err)
}
}