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

Refactor to do more pre-calculation work.

Browse Source
This commit is contained in:
Stephen Chung
2023-02-12 21:50:32 +08:00
parent 9f18d6519d
commit d0a47d7f66
11 changed files with 65 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/eval/expr.rs
View File

@@ -74,7 +74,7 @@ impl Engine {
if let Some(module) = self.search_imports(global, ns) {
return module.get_qualified_var(*hash_var).map_or_else(
|| {
let sep = crate::tokenizer::Token::DoubleColon.literal_syntax();
let sep = crate::engine::NAMESPACE_SEPARATOR;
Err(ERR::ErrorVariableNotFound(
format!("{ns}{sep}{var_name}"),
@@ -104,7 +104,7 @@ impl Engine {
}
}
let sep = crate::tokenizer::Token::DoubleColon.literal_syntax();
let sep = crate::engine::NAMESPACE_SEPARATOR;
return Err(ERR::ErrorVariableNotFound(
format!("{ns}{sep}{var_name}"),

20
src/eval/stmt.rs
View File

@@ -127,21 +127,20 @@ impl Engine {
let pos = op_info.position();
if let Some((hash1, hash2, op_assign, op)) = op_info.get_op_assignment_info() {
if let Some((hash_x, hash, op_x, op_x_str, op, op_str)) = op_info.get_op_assignment_info() {
let mut lock_guard = target.write_lock::<Dynamic>().unwrap();
let args = &mut [&mut *lock_guard, &mut new_val];
if self.fast_operators() {
if let Some((func, need_context)) =
get_builtin_op_assignment_fn(op_assign, args[0], args[1])
get_builtin_op_assignment_fn(op_x, args[0], args[1])
{
// Built-in found
auto_restore! { let orig_level = global.level; global.level += 1 }
let context = if need_context {
let op = op_assign.literal_syntax();
let source = global.source();
Some((self, op, source, &*global, pos).into())
Some((self, op_x_str, source, &*global, pos).into())
} else {
None
};
@@ -149,20 +148,17 @@ impl Engine {
}
}
let token = Some(op_assign);
let op_assign = op_assign.literal_syntax();
let opx = Some(op_x);
match self.exec_native_fn_call(global, caches, op_assign, token, hash1, args, true, pos)
{
match self.exec_native_fn_call(global, caches, op_x_str, opx, hash_x, args, true, pos) {
Ok(_) => (),
Err(err) if matches!(*err, ERR::ErrorFunctionNotFound(ref f, ..) if f.starts_with(op_assign)) =>
Err(err) if matches!(*err, ERR::ErrorFunctionNotFound(ref f, ..) if f.starts_with(op_x_str)) =>
{
// Expand to `var = var op rhs`
let token = Some(op);
let op = op.literal_syntax();
let op = Some(op);
*args[0] = self
.exec_native_fn_call(global, caches, op, token, hash2, args, true, pos)?
.exec_native_fn_call(global, caches, op_str, op, hash, args, true, pos)?
.0;
}
Err(err) => return Err(err),