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

Use fluent style.

Browse Source
This commit is contained in:
Stephen Chung 2022-12-09 10:04:44 +08:00
parent a391f26920
commit 3d5908480a
6 changed files with 92 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/api/call_fn.rs
View File

@ -171,7 +171,7 @@ impl Engine {
let mut arg_values = StaticVec::new_const(); let mut arg_values = StaticVec::new_const();
args.parse(&mut arg_values); args.parse(&mut arg_values);
let result = self._call_fn( self._call_fn(
options, options,
scope, scope,
&mut GlobalRuntimeState::new(self), &mut GlobalRuntimeState::new(self),
@ -179,19 +179,20 @@ impl Engine {
ast, ast,
name.as_ref(), name.as_ref(),
arg_values.as_mut(), arg_values.as_mut(),
)?; )
.and_then(|result| {
// Bail out early if the return type needs no cast
if TypeId::of::<T>() == TypeId::of::<Dynamic>() {
return Ok(reify!(result => T));
}
// Bail out early if the return type needs no cast // Cast return type
if TypeId::of::<T>() == TypeId::of::<Dynamic>() { let typ = self.map_type_name(result.type_name());
return Ok(reify!(result => T));
}
// Cast return type result.try_cast().ok_or_else(|| {
let typ = self.map_type_name(result.type_name()); let t = self.map_type_name(type_name::<T>()).into();
ERR::ErrorMismatchOutputType(t, typ.into(), Position::NONE).into()
result.try_cast().ok_or_else(|| { })
let t = self.map_type_name(type_name::<T>()).into();
ERR::ErrorMismatchOutputType(t, typ.into(), Position::NONE).into()
}) })
} }
/// Call a script function defined in an [`AST`] with multiple [`Dynamic`] arguments. /// Call a script function defined in an [`AST`] with multiple [`Dynamic`] arguments.

45
src/api/eval.rs
View File

@ -233,34 +233,29 @@ impl Engine {
ast.resolver().cloned(), ast.resolver().cloned(),
); );
let statements = ast.statements(); auto_restore!(global => move |g| {
#[cfg(not(feature = "no_module"))]
{
g.embedded_module_resolver = orig_embedded_module_resolver;
}
if statements.is_empty() { #[cfg(not(feature = "no_function"))]
return Ok(Dynamic::UNIT); g.lib.truncate(orig_lib_len);
}
let result = self.eval_global_statements(global, caches, scope, statements); g.source = orig_source;
});
#[cfg(feature = "debugging")] self.eval_global_statements(global, caches, scope, ast.statements())
if self.is_debugger_registered() { .and_then(|r| {
global.debugger_mut().status = crate::eval::DebuggerStatus::Terminate; #[cfg(feature = "debugging")]
let mut this = Dynamic::NULL; if self.is_debugger_registered() {
let node = &crate::ast::Stmt::Noop(Position::NONE); global.debugger_mut().status = crate::eval::DebuggerStatus::Terminate;
let mut this = Dynamic::NULL;
self.run_debugger(global, caches, scope, &mut this, node)?; let node = &crate::ast::Stmt::Noop(Position::NONE);
} self.run_debugger(global, caches, scope, &mut this, node)?;
}
#[cfg(not(feature = "no_module"))] Ok(r)
{ })
global.embedded_module_resolver = orig_embedded_module_resolver;
}
#[cfg(not(feature = "no_function"))]
global.lib.truncate(orig_lib_len);
global.source = orig_source;
result
} }
} }

29
src/api/run.rs
View File

@ -126,24 +126,17 @@ impl Engine {
global.embedded_module_resolver = ast.resolver().cloned(); global.embedded_module_resolver = ast.resolver().cloned();
} }
let statements = ast.statements(); self.eval_global_statements(global, caches, scope, ast.statements())
.and_then(|_| {
let result = if !statements.is_empty() { #[cfg(feature = "debugging")]
self.eval_global_statements(global, caches, scope, statements) if self.is_debugger_registered() {
.map(|_| ()) global.debugger_mut().status = crate::eval::DebuggerStatus::Terminate;
} else { let mut this = crate::Dynamic::NULL;
Ok(()) let node = &crate::ast::Stmt::Noop(crate::Position::NONE);
}; self.run_debugger(global, caches, scope, &mut this, node)?;
}
#[cfg(feature = "debugging")] Ok(())
if self.is_debugger_registered() { })
global.debugger_mut().status = crate::eval::DebuggerStatus::Terminate;
let mut this = crate::Dynamic::NULL;
let node = &crate::ast::Stmt::Noop(crate::Position::NONE);
self.run_debugger(global, caches, scope, &mut this, node)?;
}
result
} }
} }

46
src/func/native.rs
View File

@ -303,19 +303,20 @@ impl<'a> NativeCallContext<'a> {
let mut args: StaticVec<_> = arg_values.iter_mut().collect(); let mut args: StaticVec<_> = arg_values.iter_mut().collect();
let result = self._call_fn_raw(fn_name, &mut args, false, false, false)?; self._call_fn_raw(fn_name, &mut args, false, false, false)
.and_then(|result| {
// Bail out early if the return type needs no cast
if TypeId::of::<T>() == TypeId::of::<Dynamic>() {
return Ok(reify!(result => T));
}
// Bail out early if the return type needs no cast let typ = self.engine().map_type_name(result.type_name());
if TypeId::of::<T>() == TypeId::of::<Dynamic>() {
return Ok(reify!(result => T));
}
let typ = self.engine().map_type_name(result.type_name()); result.try_cast().ok_or_else(|| {
let t = self.engine().map_type_name(type_name::<T>()).into();
result.try_cast().ok_or_else(|| { ERR::ErrorMismatchOutputType(t, typ.into(), Position::NONE).into()
let t = self.engine().map_type_name(type_name::<T>()).into(); })
ERR::ErrorMismatchOutputType(t, typ.into(), Position::NONE).into() })
})
} }
/// Call a registered native Rust function inside the call context with the provided arguments. /// Call a registered native Rust function inside the call context with the provided arguments.
/// ///
@ -333,19 +334,20 @@ impl<'a> NativeCallContext<'a> {
let mut args: StaticVec<_> = arg_values.iter_mut().collect(); let mut args: StaticVec<_> = arg_values.iter_mut().collect();
let result = self._call_fn_raw(fn_name, &mut args, true, false, false)?; self._call_fn_raw(fn_name, &mut args, true, false, false)
.and_then(|result| {
// Bail out early if the return type needs no cast
if TypeId::of::<T>() == TypeId::of::<Dynamic>() {
return Ok(reify!(result => T));
}
// Bail out early if the return type needs no cast let typ = self.engine().map_type_name(result.type_name());
if TypeId::of::<T>() == TypeId::of::<Dynamic>() {
return Ok(reify!(result => T));
}
let typ = self.engine().map_type_name(result.type_name()); result.try_cast().ok_or_else(|| {
let t = self.engine().map_type_name(type_name::<T>()).into();
result.try_cast().ok_or_else(|| { ERR::ErrorMismatchOutputType(t, typ.into(), Position::NONE).into()
let t = self.engine().map_type_name(type_name::<T>()).into(); })
ERR::ErrorMismatchOutputType(t, typ.into(), Position::NONE).into() })
})
} }
/// Call a function (native Rust or scripted) inside the call context. /// Call a function (native Rust or scripted) inside the call context.
/// ///

8
src/func/script.rs
View File

@ -205,12 +205,12 @@ impl Engine {
} }
// First check script-defined functions // First check script-defined functions
let result = global.lib.iter().any(|m| m.contains_fn(hash_script)) let r = global.lib.iter().any(|m| m.contains_fn(hash_script))
// Then check the global namespace and packages // Then check the global namespace and packages
|| self.global_modules.iter().any(|m| m.contains_fn(hash_script)); || self.global_modules.iter().any(|m| m.contains_fn(hash_script));
#[cfg(not(feature = "no_module"))] #[cfg(not(feature = "no_module"))]
let result = result || let r = r ||
// Then check imported modules // Then check imported modules
global.contains_qualified_fn(hash_script) global.contains_qualified_fn(hash_script)
// Then check sub-modules // Then check sub-modules
@ -218,11 +218,11 @@ impl Engine {
m.values().any(|m| m.contains_qualified_fn(hash_script)) m.values().any(|m| m.contains_qualified_fn(hash_script))
}); });
if !result && !cache.filter.is_absent_and_set(hash_script) { if !r && !cache.filter.is_absent_and_set(hash_script) {
// Do not cache "one-hit wonders" // Do not cache "one-hit wonders"
cache.map.insert(hash_script, None); cache.map.insert(hash_script, None);
} }
result r
} }
} }

40
src/types/fn_ptr.rs
View File

@ -158,18 +158,18 @@ impl FnPtr {
let ctx = (engine, self.fn_name(), None, &*global, Position::NONE).into(); let ctx = (engine, self.fn_name(), None, &*global, Position::NONE).into();
let result = self.call_raw(&ctx, None, arg_values)?; self.call_raw(&ctx, None, arg_values).and_then(|result| {
// Bail out early if the return type needs no cast
if TypeId::of::<T>() == TypeId::of::<Dynamic>() {
return Ok(reify!(result => T));
}
// Bail out early if the return type needs no cast let typ = engine.map_type_name(result.type_name());
if TypeId::of::<T>() == TypeId::of::<Dynamic>() {
return Ok(reify!(result => T));
}
let typ = engine.map_type_name(result.type_name()); result.try_cast().ok_or_else(|| {
let t = engine.map_type_name(type_name::<T>()).into();
result.try_cast().ok_or_else(|| { ERR::ErrorMismatchOutputType(t, typ.into(), Position::NONE).into()
let t = engine.map_type_name(type_name::<T>()).into(); })
ERR::ErrorMismatchOutputType(t, typ.into(), Position::NONE).into()
}) })
} }
/// Call the function pointer with curried arguments (if any). /// Call the function pointer with curried arguments (if any).
@ -187,18 +187,18 @@ impl FnPtr {
let mut arg_values = crate::StaticVec::new_const(); let mut arg_values = crate::StaticVec::new_const();
args.parse(&mut arg_values); args.parse(&mut arg_values);
let result = self.call_raw(context, None, arg_values)?; self.call_raw(context, None, arg_values).and_then(|result| {
// Bail out early if the return type needs no cast
if TypeId::of::<T>() == TypeId::of::<Dynamic>() {
return Ok(reify!(result => T));
}
// Bail out early if the return type needs no cast let typ = context.engine().map_type_name(result.type_name());
if TypeId::of::<T>() == TypeId::of::<Dynamic>() {
return Ok(reify!(result => T));
}
let typ = context.engine().map_type_name(result.type_name()); result.try_cast().ok_or_else(|| {
let t = context.engine().map_type_name(type_name::<T>()).into();
result.try_cast().ok_or_else(|| { ERR::ErrorMismatchOutputType(t, typ.into(), Position::NONE).into()
let t = context.engine().map_type_name(type_name::<T>()).into(); })
ERR::ErrorMismatchOutputType(t, typ.into(), Position::NONE).into()
}) })
} }
/// Call the function pointer with curried arguments (if any). /// Call the function pointer with curried arguments (if any).