kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #319 from schungx/master

Browse Source 
Fix no_module feature.
This commit is contained in:
Stephen Chung 2020-12-30 15:57:50 +08:00 committed by GitHub
commit 253e43da30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/bin/rhai-repl.rs
View File

@ -66,53 +66,56 @@ fn main() {
// Load init scripts // Load init scripts
let mut contents = String::new(); #[cfg(not(feature = "no_module"))]
let mut has_init_scripts = false; {
let mut contents = String::new();
let mut has_init_scripts = false;
for filename in env::args().skip(1) { for filename in env::args().skip(1) {
{ {
contents.clear(); contents.clear();
let mut f = match File::open(&filename) { let mut f = match File::open(&filename) {
Err(err) => { Err(err) => {
eprintln!("Error reading script file: {}\n{}", filename, err); eprintln!("Error reading script file: {}\n{}", filename, err);
exit(1);
}
Ok(f) => f,
};
if let Err(err) = f.read_to_string(&mut contents) {
println!("Error reading script file: {}\n{}", filename, err);
exit(1); exit(1);
} }
Ok(f) => f, }
let module = match engine
.compile(&contents)
.map_err(|err| err.into())
.and_then(|ast| Module::eval_ast_as_new(Default::default(), &ast, &engine))
{
Err(err) => {
eprintln!("{:=<1$}", "", filename.len());
eprintln!("{}", filename);
eprintln!("{:=<1$}", "", filename.len());
eprintln!("");
print_error(&contents, *err);
exit(1);
}
Ok(m) => m,
}; };
if let Err(err) = f.read_to_string(&mut contents) { engine.register_global_module(module.into());
println!("Error reading script file: {}\n{}", filename, err);
exit(1); has_init_scripts = true;
}
println!("Script '{}' loaded.", filename);
} }
let module = match engine if has_init_scripts {
.compile(&contents) println!();
.map_err(|err| err.into()) }
.and_then(|ast| Module::eval_ast_as_new(Default::default(), &ast, &engine))
{
Err(err) => {
eprintln!("{:=<1$}", "", filename.len());
eprintln!("{}", filename);
eprintln!("{:=<1$}", "", filename.len());
eprintln!("");
print_error(&contents, *err);
exit(1);
}
Ok(m) => m,
};
engine.register_global_module(module.into());
has_init_scripts = true;
println!("Script '{}' loaded.", filename);
}
if has_init_scripts {
println!();
} }
// Setup Engine // Setup Engine