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

one parser function

Browse Source
This commit is contained in:
Fernando Herrera
2021-09-06 21:41:30 +01:00
parent c027a14b9b
commit f7a19d37c6
5 changed files with 35 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-parser/src/lib.rs
View File

@ -9,4 +9,4 @@ pub use errors::ParseError;
pub use flatten::{flatten_block, FlatShape};
pub use lex::{lex, Token, TokenContents};
pub use lite_parse::{lite_parse, LiteBlock};
pub use parser::{parse_file, parse_source, Import, VarDecl};
pub use parser::{parse, Import, VarDecl};

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

@ -2443,9 +2443,12 @@ pub fn parse_block(
(block, error)
}
pub fn parse_file(
// Parses a vector of u8 to create an AST Block. If a file name is given, then
// the name is stored in the working set. When parsing a source without a file
// name, the source of bytes is stored as "source"
pub fn parse(
working_set: &mut StateWorkingSet,
fname: &str,
fname: Option<&str>,
contents: &[u8],
scoped: bool,
) -> (Block, Option<ParseError>) {
@ -2453,7 +2456,12 @@ pub fn parse_file(
let span_offset = working_set.next_span_start();
working_set.add_file(fname.into(), contents);
let name = match fname {
Some(fname) => fname.to_string(),
None => "source".to_string(),
};
working_set.add_file(name, contents);
let (output, err) = lex(contents, span_offset, &[], &[]);
error = error.or(err);
@ -2466,26 +2474,3 @@ pub fn parse_file(
(output, error)
}
pub fn parse_source(
working_set: &mut StateWorkingSet,
source: &[u8],
scoped: bool,
) -> (Block, Option<ParseError>) {
let mut error = None;
let span_offset = working_set.next_span_start();
working_set.add_file("source".into(), source);
let (output, err) = lex(source, span_offset, &[], &[]);
error = error.or(err);
let (output, err) = lite_parse(&output);
error = error.or(err);
let (output, err) = parse_block(working_set, &output, scoped);
error = error.or(err);
(output, error)
}