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

Use scope offset for variable access.

Browse Source
This commit is contained in:
Stephen Chung
2020-04-28 23:05:03 +08:00
parent 9ad9dd52ab
commit 304c658f89
6 changed files with 328 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api.rs
View File

@@ -1,7 +1,7 @@
//! Module that defines the extern API of `Engine`.
use crate::any::{Dynamic, Variant};
use crate::engine::{make_getter, make_setter, Engine, Map};
use crate::engine::{make_getter, make_setter, Engine, Map, State};
use crate::error::ParseError;
use crate::fn_call::FuncArgs;
use crate::fn_register::RegisterFn;
@@ -795,10 +795,12 @@ impl Engine {
scope: &mut Scope,
ast: &AST,
) -> Result<Dynamic, Box<EvalAltResult>> {
let mut state = State::new();
ast.0
.iter()
.try_fold(().into(), |_, stmt| {
self.eval_stmt(scope, ast.1.as_ref(), stmt, 0)
self.eval_stmt(scope, &mut state, ast.1.as_ref(), stmt, 0)
})
.or_else(|err| match *err {
EvalAltResult::Return(out, _) => Ok(out),
@@ -858,10 +860,12 @@ impl Engine {
scope: &mut Scope,
ast: &AST,
) -> Result<(), Box<EvalAltResult>> {
let mut state = State::new();
ast.0
.iter()
.try_fold(().into(), |_, stmt| {
self.eval_stmt(scope, ast.1.as_ref(), stmt, 0)
self.eval_stmt(scope, &mut state, ast.1.as_ref(), stmt, 0)
})
.map_or_else(
|err| match *err {