jaroslaw/bevy_scriptum
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

Ruby support #1

Open
jaroslaw wants to merge 165 commits from ruby into main
pull from: ruby
merge into: jaroslaw:main
Conversation 0 Commits 165 Files changed 93 +11 -11
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1ea7e30c63 - Show all commits

10
src/runtimes/lua.rs
View file

@ -187,7 +187,7 @@ impl Runtime for LuaRuntime {
.expect("Error clearing entity global variable"); .expect("Error clearing entity global variable");
result result
}) })
.map_err(|e| ScriptingError::RuntimeError(Box::new(e)))?; .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?;
Ok(LuaScriptData) Ok(LuaScriptData)
} }
@ -236,14 +236,14 @@ impl Runtime for LuaRuntime {
let func = engine let func = engine
.globals() .globals()
.get::<_, Function>(name) .get::<_, Function>(name)
.map_err(|e| ScriptingError::RuntimeError(Box::new(e)))?; .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?;
let args = args let args = args
.parse(engine) .parse(engine)
.into_iter() .into_iter()
.map(|a| engine.registry_value::<mlua::Value>(&a.0).unwrap()); .map(|a| engine.registry_value::<mlua::Value>(&a.0).unwrap());
let result = func let result = func
.call::<_, mlua::Value>(Variadic::from_iter(args)) .call::<_, mlua::Value>(Variadic::from_iter(args))
.map_err(|e| ScriptingError::RuntimeError(Box::new(e)))?; .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?;
engine engine
.globals() .globals()
.set(ENTITY_VAR_NAME, mlua::Value::Nil) .set(ENTITY_VAR_NAME, mlua::Value::Nil)
@ -261,13 +261,13 @@ impl Runtime for LuaRuntime {
self.with_engine(|engine| { self.with_engine(|engine| {
let val = engine let val = engine
.registry_value::<Function>(&value.0) .registry_value::<Function>(&value.0)
.map_err(|e| ScriptingError::RuntimeError(Box::new(e)))?; .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?;
let args = args let args = args
.into_iter() .into_iter()
.map(|a| engine.registry_value::<mlua::Value>(&a.0).unwrap()); .map(|a| engine.registry_value::<mlua::Value>(&a.0).unwrap());
let result = val let result = val
.call::<_, mlua::Value>(Variadic::from_iter(args)) .call::<_, mlua::Value>(Variadic::from_iter(args))
.map_err(|e| ScriptingError::RuntimeError(Box::new(e)))?; .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?;
Ok(LuaValue::new(engine, result)) Ok(LuaValue::new(engine, result))
}) })
} }

8
src/runtimes/rhai.rs
View file

@ -105,7 +105,7 @@ impl Runtime for RhaiRuntime {
engine engine
.run_ast_with_scope(&mut scope, &ast) .run_ast_with_scope(&mut scope, &ast)
.map_err(|e| ScriptingError::RuntimeError(Box::new(e)))?; .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?;
scope.remove::<BevyEntity>(ENTITY_VAR_NAME).unwrap(); scope.remove::<BevyEntity>(ENTITY_VAR_NAME).unwrap();
@ -156,7 +156,7 @@ impl Runtime for RhaiRuntime {
scope.remove::<BevyEntity>(ENTITY_VAR_NAME).unwrap(); scope.remove::<BevyEntity>(ENTITY_VAR_NAME).unwrap();
match result { match result {
Ok(val) => Ok(RhaiValue(val)), Ok(val) => Ok(RhaiValue(val)),
Err(e) => Err(ScriptingError::RuntimeError(Box::new(e))), Err(e) => Err(ScriptingError::RuntimeError(e.to_string(), "".to_string())),
} }
} }
@ -173,11 +173,11 @@ impl Runtime for RhaiRuntime {
let result = if args.len() == 1 && args.first().unwrap().0.is_unit() { let result = if args.len() == 1 && args.first().unwrap().0.is_unit() {
f.call_raw(ctx, None, []) f.call_raw(ctx, None, [])
.map_err(|e| ScriptingError::RuntimeError(e))? .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?
} else { } else {
let args = args.into_iter().map(|a| a.0).collect::<Vec<Dynamic>>(); let args = args.into_iter().map(|a| a.0).collect::<Vec<Dynamic>>();
f.call_raw(ctx, None, args) f.call_raw(ctx, None, args)
.map_err(|e| ScriptingError::RuntimeError(e))? .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?
}; };
Ok(RhaiValue(result)) Ok(RhaiValue(result))

4
src/systems.rs
View file

@ -107,7 +107,7 @@ pub(crate) fn init_callbacks<R: Runtime>(world: &mut World) -> Result<(), Script
}, },
); );
if let Err(e) = result { if let Err(e) = result {
tracing::error!("error registering function: {:?}", e); tracing::error!("error registering function: {}", e);
} }
} }
} }
@ -158,7 +158,7 @@ pub(crate) fn process_calls<R: Runtime>(world: &mut World) -> Result<(), Scripti
match result { match result {
Ok(_) => {} Ok(_) => {}
Err(e) => { Err(e) => {
tracing::error!("error resolving call: {} {:?}", callback.name, e); tracing::error!("error resolving call: {} {}", callback.name, e);
} }
} }
} }