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

Move fn_lib into State, and use StaticVec for function call arguments in dotting/indexing chains.

Browse Source
This commit is contained in:
Stephen Chung
2020-05-07 10:00:10 +08:00
parent 8e60976cfa
commit fb64adca93
3 changed files with 123 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api.rs
View File

@@ -867,12 +867,12 @@ impl Engine {
scope: &mut Scope,
ast: &AST,
) -> Result<Dynamic, Box<EvalAltResult>> {
let mut state = State::new();
let mut state = State::new(ast.fn_lib());
ast.statements()
.iter()
.try_fold(().into(), |_, stmt| {
self.eval_stmt(scope, &mut state, ast.fn_lib(), stmt, 0)
self.eval_stmt(scope, &mut state, stmt, 0)
})
.or_else(|err| match *err {
EvalAltResult::Return(out, _) => Ok(out),
@@ -932,12 +932,12 @@ impl Engine {
scope: &mut Scope,
ast: &AST,
) -> Result<(), Box<EvalAltResult>> {
let mut state = State::new();
let mut state = State::new(ast.fn_lib());
ast.statements()
.iter()
.try_fold(().into(), |_, stmt| {
self.eval_stmt(scope, &mut state, ast.fn_lib(), stmt, 0)
self.eval_stmt(scope, &mut state, stmt, 0)
})
.map_or_else(
|err| match *err {
@@ -1000,7 +1000,9 @@ impl Engine {
.get_function(name, args.len())
.ok_or_else(|| Box::new(EvalAltResult::ErrorFunctionNotFound(name.to_string(), pos)))?;
let result = self.call_fn_from_lib(Some(scope), fn_lib, fn_def, &mut args, pos, 0)?;
let state = State::new(fn_lib);
let result = self.call_script_fn(Some(scope), &state, fn_def, &mut args, pos, 0)?;
let return_type = self.map_type_name(result.type_name());