extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-30 22:50:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Speed up the parser and nuon parser a bit more (#4626)

Browse Source
This commit is contained in:
JT
2022-02-24 07:58:53 -05:00
committed by GitHub
parent c3979ef1cf
commit 308ab91aff
2 changed files with 96 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
crates/nu-command/src/formats/from/nuon.rs
View File

@ -89,7 +89,7 @@ impl Command for FromNuon {
let (lite_block, err) = nu_parser::lite_parse(&lexed);
error = error.or(err);
let (block, err) = nu_parser::parse_block(&mut working_set, &lite_block, true);
let (mut block, err) = nu_parser::parse_block(&mut working_set, &lite_block, true);
error = error.or(err);
if let Some(pipeline) = block.pipelines.get(1) {
@ -119,7 +119,16 @@ impl Command for FromNuon {
}
}
let expr = if let Some(pipeline) = block.pipelines.get(0) {
let expr = if block.pipelines.is_empty() {
Expression {
expr: Expr::Nothing,
span: head,
custom_completion: None,
ty: Type::Nothing,
}
} else {
let mut pipeline = block.pipelines.remove(0);
if let Some(expr) = pipeline.expressions.get(1) {
return Err(ShellError::SpannedLabeledErrorRelated(
"error when loading nuon text".into(),
@ -134,22 +143,15 @@ impl Command for FromNuon {
));
}
if let Some(expr) = pipeline.expressions.get(0) {
expr.clone()
} else {
if pipeline.expressions.is_empty() {
Expression {
expr: Expr::Nothing,
span: head,
custom_completion: None,
ty: Type::Nothing,
}
}
} else {
Expression {
expr: Expr::Nothing,
span: head,
custom_completion: None,
ty: Type::Nothing,
} else {
pipeline.expressions.remove(0)
}
};