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

Wrap file module functions in ErrorInModule.

Browse Source
This commit is contained in:
Stephen Chung 2020-09-25 20:24:03 +08:00
parent 39bbff878c
commit da9aa60256
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASES.md
View File

@ -21,6 +21,7 @@ Breaking changes
* `EvalAltResult` has a new variant `ErrorInModule` which holds errors when loading an external module. * `EvalAltResult` has a new variant `ErrorInModule` which holds errors when loading an external module.
* `Module::eval_ast_as_new` now takes an extra boolean parameter, indicating whether to encapsulate the entire module into a separate namespace. * `Module::eval_ast_as_new` now takes an extra boolean parameter, indicating whether to encapsulate the entire module into a separate namespace.
* Functions in `FileModuleResolver` loaded modules now can cross-call each other, but cannot access the global namespace. For the old behavior, use `MergingFileModuleResolver` instead. * Functions in `FileModuleResolver` loaded modules now can cross-call each other, but cannot access the global namespace. For the old behavior, use `MergingFileModuleResolver` instead.
* New `EvalAltResult::ErrorInModule` variant capturing errors when loading a module from a script file.
New features New features
------------ ------------

23
src/module/mod.rs
View File

@ -1280,13 +1280,22 @@ impl Module {
name, name,
num_args, num_args,
move |engine: &Engine, _, args: &mut [&mut Dynamic]| { move |engine: &Engine, _, args: &mut [&mut Dynamic]| {
engine.call_fn_dynamic_raw( engine
&mut Scope::new(), .call_fn_dynamic_raw(
&ast_lib, &mut Scope::new(),
&fn_name, &ast_lib,
&mut None, &fn_name,
args, &mut None,
) args,
)
.map_err(|err| {
// Wrap the error in a module-error
Box::new(EvalAltResult::ErrorInModule(
"".to_string(),
err,
Position::none(),
))
})
}, },
); );
} }

7
src/result.rs
View File

@ -182,9 +182,12 @@ impl fmt::Display for EvalAltResult {
Self::ErrorParsing(p, _) => write!(f, "Syntax error: {}", p)?, Self::ErrorParsing(p, _) => write!(f, "Syntax error: {}", p)?,
Self::ErrorInFunctionCall(s, err, _) => { Self::ErrorInFunctionCall(s, err, _) => {
write!(f, "Error in call to function '{}' : {}", s, err)? write!(f, "Error in call to function '{}': {}", s, err)?
} }
Self::ErrorInModule(s, err, _) => write!(f, "Error in module '{}' : {}", s, err)?, Self::ErrorInModule(s, err, _) if s.is_empty() => {
write!(f, "Error in module: {}", err)?
}
Self::ErrorInModule(s, err, _) => write!(f, "Error in module '{}': {}", s, err)?,
Self::ErrorFunctionNotFound(s, _) Self::ErrorFunctionNotFound(s, _)
| Self::ErrorVariableNotFound(s, _) | Self::ErrorVariableNotFound(s, _)