Skip to content

Commit

Permalink
Merge pull request #319 from schungx/master
Browse files Browse the repository at this point in the history
Fix no_module feature.
  • Loading branch information
schungx committed Dec 30, 2020
2 parents f58d793 + 386e34a commit 253e43d
Showing 1 changed file with 41 additions and 38 deletions.
79 changes: 41 additions & 38 deletions src/bin/rhai-repl.rs
Expand Up @@ -66,53 +66,56 @@ fn main() {

// Load init scripts

let mut contents = String::new();
let mut has_init_scripts = false;

for filename in env::args().skip(1) {
{
contents.clear();

let mut f = match File::open(&filename) {
Err(err) => {
eprintln!("Error reading script file: {}\n{}", filename, err);
#[cfg(not(feature = "no_module"))]
{
let mut contents = String::new();
let mut has_init_scripts = false;

for filename in env::args().skip(1) {
{
contents.clear();

let mut f = match File::open(&filename) {
Err(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);
}
Ok(f) => f,
};

if let Err(err) = f.read_to_string(&mut contents) {
println!("Error reading script file: {}\n{}", filename, err);
exit(1);
}
}

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!("");
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,
};
print_error(&contents, *err);
exit(1);
}
Ok(m) => m,
};

engine.register_global_module(module.into());
engine.register_global_module(module.into());

has_init_scripts = true;
has_init_scripts = true;

println!("Script '{}' loaded.", filename);
}
println!("Script '{}' loaded.", filename);
}

if has_init_scripts {
println!();
if has_init_scripts {
println!();
}
}

// Setup Engine
Expand Down

0 comments on commit 253e43d

Please sign in to comment.