Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-29 14:33:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add loading module from file

Browse source 
Currently, `use spam.nu` creates a module `spam`. Therefore, after the
first `use`, it is possible to call both `use spam.nu` and `use spam`
with the same effect.
This commit is contained in:
Jakub Žádník 2021-10-20 00:23:59 +03:00
parent 75b3b3e090
commit a240aead8c
1 changed files with 46 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
crates/nu-parser/src/parse_keywords.rs
View file

@ -1,5 +1,5 @@
use nu_protocol::{ use nu_protocol::{
ast::{Block, Call, Expr, Expression, ImportPatternMember, Pipeline, Statement}, ast::{Block, Call, Expr, Expression, ImportPattern, ImportPatternMember, Pipeline, Statement},
engine::StateWorkingSet, engine::StateWorkingSet,
span, DeclId, Span, SyntaxShape, Type, span, DeclId, Span, SyntaxShape, Type,
}; };
@ -349,8 +349,7 @@ pub fn parse_module_block(
(stmt, err) (stmt, err)
} }
b"export" => { b"export" => {
let (stmt, err) = let (stmt, err) = parse_export(working_set, &pipeline.commands[0].parts);
parse_export(working_set, &pipeline.commands[0].parts);
if err.is_none() { if err.is_none() {
let decl_name = let decl_name =
@ -499,8 +498,18 @@ pub fn parse_use(
let (import_pattern, err) = parse_import_pattern(working_set, spans[1]); let (import_pattern, err) = parse_import_pattern(working_set, spans[1]);
error = error.or(err); error = error.or(err);
let exports = if let Some(block_id) = working_set.find_module(&import_pattern.head) { let (import_pattern, exports) =
working_set.get_block(block_id).exports.clone() if let Some(block_id) = working_set.find_module(&import_pattern.head) {
(
import_pattern,
working_set.get_block(block_id).exports.clone(),
)
} else {
// It could be a file
let module_filename = String::from_utf8_lossy(&import_pattern.head).to_string();
let module_path = Path::new(&module_filename);
let module_name = if let Some(stem) = module_path.file_stem() {
stem.to_string_lossy().to_string()
} else { } else {
return ( return (
garbage_statement(spans), garbage_statement(spans),
@ -508,6 +517,32 @@ pub fn parse_use(
); );
}; };
if let Ok(contents) = std::fs::read(module_path) {
let span_start = working_set.next_span_start();
working_set.add_file(module_filename, &contents);
let span_end = working_set.next_span_start();
let (block, err) =
parse_module_block(working_set, &[Span::new(span_start, span_end)]);
error = error.or(err);
let block_id = working_set.add_module(&module_name, block);
(
ImportPattern {
head: module_name.into(),
members: import_pattern.members,
},
working_set.get_block(block_id).exports.clone(),
)
} else {
return (
garbage_statement(spans),
Some(ParseError::ModuleNotFound(spans[1])),
);
}
};
let exports = if import_pattern.members.is_empty() { let exports = if import_pattern.members.is_empty() {
exports exports
.into_iter() .into_iter()