diff --git a/crates/nu-cli/src/cli.rs b/crates/nu-cli/src/cli.rs index 04b47813e8..123ab7d515 100644 --- a/crates/nu-cli/src/cli.rs +++ b/crates/nu-cli/src/cli.rs @@ -410,7 +410,7 @@ mod tests { #[quickcheck] fn quickcheck_parse(data: String) -> bool { let (tokens, err) = nu_parser::lex(&data, 0); - let (lite_block, err2) = nu_parser::block(tokens); + let (lite_block, err2) = nu_parser::parse_block(tokens); if err.is_none() && err2.is_none() { let context = basic_evaluation_context().unwrap(); let _ = nu_parser::classify_block(&lite_block, &context.scope); diff --git a/crates/nu-cli/src/completion/engine.rs b/crates/nu-cli/src/completion/engine.rs index b74b2d1052..fe9160d141 100644 --- a/crates/nu-cli/src/completion/engine.rs +++ b/crates/nu-cli/src/completion/engine.rs @@ -256,7 +256,7 @@ pub fn completion_location(line: &str, block: &Block, pos: usize) -> Vec Vec { let (tokens, _) = lex(line, 0); - let (lite_block, _) = block(tokens); + let (lite_block, _) = parse_block(tokens); scope.enter_scope(); let (block, _) = classify_block(&lite_block, scope); diff --git a/crates/nu-cli/src/shell/helper.rs b/crates/nu-cli/src/shell/helper.rs index 4822818956..e9908f98b3 100644 --- a/crates/nu-cli/src/shell/helper.rs +++ b/crates/nu-cli/src/shell/helper.rs @@ -119,7 +119,7 @@ impl rustyline::validate::Validator for NuValidator { } } - let (_, err) = nu_parser::block(tokens); + let (_, err) = nu_parser::parse_block(tokens); if let Some(err) = err { if let nu_errors::ParseErrorReason::Eof { .. } = err.reason() { diff --git a/crates/nu-command/src/examples.rs b/crates/nu-command/src/examples.rs index 220ae063f9..53b82c341f 100644 --- a/crates/nu-command/src/examples.rs +++ b/crates/nu-command/src/examples.rs @@ -215,7 +215,7 @@ fn parse_line(line: &str, ctx: &EvaluationContext) -> Result) -> (LiteBlock, Option) { +pub fn parse_block(tokens: Vec) -> (LiteBlock, Option) { let mut parser = BlockParser::default(); let mut tokens = tokens.iter().peekable(); diff --git a/crates/nu-parser/src/lex/tests.rs b/crates/nu-parser/src/lex/tests.rs index adca671825..edd0f007d6 100644 --- a/crates/nu-parser/src/lex/tests.rs +++ b/crates/nu-parser/src/lex/tests.rs @@ -177,7 +177,7 @@ mod lite_parse { fn pipeline() { let (result, err) = lex("cmd1 | cmd2 ; deploy", 0); assert!(err.is_none()); - let (result, err) = block(result); + let (result, err) = parse_block(result); assert!(err.is_none()); assert_eq!(result.span(), span(0, 20)); assert_eq!(result.block[0].pipelines[0].span(), span(0, 11)); @@ -188,7 +188,7 @@ mod lite_parse { fn simple_1() { let (result, err) = lex("foo", 0); assert!(err.is_none()); - let (result, err) = block(result); + let (result, err) = parse_block(result); assert!(err.is_none()); assert_eq!(result.block.len(), 1); assert_eq!(result.block[0].pipelines.len(), 1); @@ -204,7 +204,7 @@ mod lite_parse { fn simple_offset() { let (result, err) = lex("foo", 10); assert!(err.is_none()); - let (result, err) = block(result); + let (result, err) = parse_block(result); assert!(err.is_none()); assert_eq!(result.block[0].pipelines.len(), 1); assert_eq!(result.block[0].pipelines[0].commands.len(), 1); @@ -222,7 +222,7 @@ mod lite_parse { err.unwrap().reason(), nu_errors::ParseErrorReason::Eof { .. } )); - let (result, _) = block(result); + let (result, _) = parse_block(result); assert_eq!(result.block.len(), 1); assert_eq!(result.block[0].pipelines.len(), 1); @@ -247,7 +247,7 @@ def my_echo [arg] { echo $arg } "#; let (result, err) = lex(code, 0); assert!(err.is_none()); - let (result, err) = block(result); + let (result, err) = parse_block(result); assert!(err.is_none()); assert_eq!(result.block.len(), 1); @@ -281,7 +281,7 @@ echo 42 let (result, err) = lex(code, 0); assert!(err.is_none()); // assert_eq!(format!("{:?}", result), ""); - let (result, err) = block(result); + let (result, err) = parse_block(result); assert!(err.is_none()); assert_eq!(result.block.len(), 1); assert_eq!(result.block[0].pipelines.len(), 1); @@ -301,7 +301,7 @@ echo 42 let (result, err) = lex(code, 0); assert!(err.is_none()); // assert_eq!(format!("{:?}", result), ""); - let (result, err) = block(result); + let (result, err) = parse_block(result); assert!(err.is_none()); assert_eq!(result.block.len(), 1); assert_eq!(result.block[0].pipelines.len(), 1); @@ -335,7 +335,7 @@ echo 42 let (result, err) = lex(code, 0); assert!(err.is_none()); // assert_eq!(format!("{:?}", result), ""); - let (result, err) = block(result); + let (result, err) = parse_block(result); assert!(err.is_none()); assert_eq!(result.block.len(), 1); assert_eq!(result.block[0].pipelines.len(), 1); diff --git a/crates/nu-parser/src/lib.rs b/crates/nu-parser/src/lib.rs index 4935d29b48..724ce9b07e 100644 --- a/crates/nu-parser/src/lib.rs +++ b/crates/nu-parser/src/lib.rs @@ -11,7 +11,7 @@ mod scope; mod shapes; mod signature; -pub use lex::lexer::{block, lex}; +pub use lex::lexer::{lex, parse_block}; pub use lex::tokens::{LiteBlock, LiteCommand, LiteGroup, LitePipeline}; pub use parse::{classify_block, garbage, parse, parse_full_column_path, parse_math_expression}; pub use path::expand_ndots; diff --git a/crates/nu-parser/src/parse.rs b/crates/nu-parser/src/parse.rs index 7ba03f3df9..32e9607144 100644 --- a/crates/nu-parser/src/parse.rs +++ b/crates/nu-parser/src/parse.rs @@ -12,7 +12,7 @@ use nu_protocol::{NamedType, PositionalType, Signature, SyntaxShape, UnspannedPa use nu_source::{HasSpan, Span, Spanned, SpannedItem}; use num_bigint::BigInt; -use crate::lex::lexer::{block, lex}; +use crate::lex::lexer::{lex, parse_block}; use crate::lex::tokens::{LiteBlock, LiteCommand, LitePipeline}; use crate::path::expand_path; use crate::scope::ParserScope; @@ -396,7 +396,7 @@ fn parse_invocation( if err.is_some() { return (garbage(lite_arg.span), err); }; - let (lite_block, err) = block(tokens); + let (lite_block, err) = parse_block(tokens); if err.is_some() { return (garbage(lite_arg.span), err); }; @@ -702,7 +702,7 @@ fn parse_table( return (garbage(lite_inner.span()), err); } - let (lite_header, err) = block(tokens); + let (lite_header, err) = parse_block(tokens); if err.is_some() { return (garbage(lite_inner.span()), err); } @@ -725,7 +725,7 @@ fn parse_table( if err.is_some() { return (garbage(arg.span), err); } - let (lite_cell, err) = block(tokens); + let (lite_cell, err) = parse_block(tokens); if err.is_some() { return (garbage(arg.span), err); } @@ -856,7 +856,7 @@ fn parse_arg( return (garbage(lite_arg.span), err); } - let (lite_block, err) = block(tokens); + let (lite_block, err) = parse_block(tokens); if err.is_some() { return (garbage(lite_arg.span), err); } @@ -911,7 +911,7 @@ fn parse_arg( return (garbage(lite_arg.span), err); } - let (lite_block, err) = block(tokens); + let (lite_block, err) = parse_block(tokens); if err.is_some() { return (garbage(lite_arg.span), err); } @@ -1139,7 +1139,7 @@ fn parse_parenthesized_expression( return (garbage(lite_arg.span), err); } - let (lite_block, err) = block(tokens); + let (lite_block, err) = parse_block(tokens); if err.is_some() { return (garbage(lite_arg.span), err); } @@ -2131,7 +2131,7 @@ pub fn parse( if error.is_some() { return (Block::basic(), error); } - let (lite_block, error) = block(output); + let (lite_block, error) = parse_block(output); if error.is_some() { return (Block::basic(), error); } diff --git a/crates/nu-parser/src/parse/def.rs b/crates/nu-parser/src/parse/def.rs index 1d320cfe31..68dd3da017 100644 --- a/crates/nu-parser/src/parse/def.rs +++ b/crates/nu-parser/src/parse/def.rs @@ -9,7 +9,7 @@ use nu_protocol::hir::Block; use nu_source::{HasSpan, SpannedItem}; //use crate::errors::{ParseError, ParseResult}; -use crate::lex::lexer::{block, lex}; +use crate::lex::lexer::{lex, parse_block}; use crate::ParserScope; @@ -56,7 +56,7 @@ pub(crate) fn parse_definition(call: &LiteCommand, scope: &dyn ParserScope) -> O if err.is_some() { return err; }; - let (lite_block, err) = block(tokens); + let (lite_block, err) = parse_block(tokens); if err.is_some() { return err; };