fill in all the other operators in lua

Author: makspll

crates/languages/bevy_mod_scripting_lua/src/bindings/reference.rs

@@ -23,7 +23,7 @@ use bevy_mod_scripting_core::{
         pretty_print::{DisplayWithWorld, ReflectReferencePrinter},
         script_value::ScriptValue,
         ReflectAllocator, ReflectRefIter, ReflectReference, ReflectionPathExt, TypeIdSource,
-        WorldCallbackAccess,
+        WorldCallbackAccess, WorldGuard,
     },
     error::{InteropError, ScriptError, ScriptResult},
     reflection_extensions::{PartialReflectExt, TypeIdExtensions},
@@ -130,6 +130,27 @@ fn iter_dynamic_function_overloads(
         .into_iter()
 }
 
+fn try_call_overloads(
+    lua: &Lua,
+    key: &str,
+    type_id: TypeId,
+    args: Vec<ScriptValue>,
+    world: WorldGuard,
+) -> Result<LuaScriptValue, InteropError> {
+    let overloads = iter_dynamic_function_overloads(lua, key, type_id);
+    let mut last_error = None;
+    for overload in overloads {
+        match overload.call_script_function(args.clone(), world.clone(), lua_caller_context()) {
+            Ok(out) => return Ok(out.into()),
+            Err(e) => last_error = Some(e),
+        }
+    }
+
+    Err(last_error
+        .unwrap_or_else(|| InteropError::missing_function(type_id, key.to_string()).into())
+        .into())
+}
+
 impl UserData for LuaReflectReference {
     fn add_methods<T: UserDataMethods<Self>>(m: &mut T) {
         m.add_meta_function(
@@ -190,28 +211,101 @@ impl UserData for LuaReflectReference {
                 let world = lua.get_world();
                 let self_: ReflectReference = self_.into();
                 let other: ScriptValue = other.into();
+                let target_type_id = self_.tail_type_id(world.clone())?.or_fake_id();
+                let args = vec![ScriptValue::Reference(self_), other];
+                Ok(try_call_overloads(lua, "sub", target_type_id, args, world)?)
+            },
+        );
 
+        m.add_meta_function(
+            MetaMethod::Add,
+            |lua, (self_, other): (LuaReflectReference, LuaScriptValue)| {
+                let world = lua.get_world();
+                let self_: ReflectReference = self_.into();
+                let other: ScriptValue = other.into();
                 let target_type_id = self_.tail_type_id(world.clone())?.or_fake_id();
+                let args = vec![ScriptValue::Reference(self_), other];
+                Ok(try_call_overloads(lua, "add", target_type_id, args, world)?)
+            },
+        );
 
-                let overloads = iter_dynamic_function_overloads(lua, "sub", target_type_id);
-                let mut last_error = None;
-                let call_args = vec![ScriptValue::Reference(self_), other];
-                for overload in overloads {
-                    match overload.call_script_function(
-                        call_args.clone(),
-                        world.clone(),
-                        lua_caller_context(),
-                    ) {
-                        Ok(out) => return LuaScriptValue::from(out).into_lua(lua),
-                        Err(e) => last_error = Some(e),
-                    }
-                }
+        m.add_meta_function(
+            MetaMethod::Mul,
+            |lua, (self_, other): (LuaReflectReference, LuaScriptValue)| {
+                let world = lua.get_world();
+                let self_: ReflectReference = self_.into();
+                let other: ScriptValue = other.into();
+                let target_type_id = self_.tail_type_id(world.clone())?.or_fake_id();
+                let args = vec![ScriptValue::Reference(self_), other];
+                Ok(try_call_overloads(lua, "mul", target_type_id, args, world)?)
+            },
+        );
+
+        m.add_meta_function(
+            MetaMethod::Div,
+            |lua, (self_, other): (LuaReflectReference, LuaScriptValue)| {
+                let world = lua.get_world();
+                let self_: ReflectReference = self_.into();
+                let other: ScriptValue = other.into();
+                let target_type_id = self_.tail_type_id(world.clone())?.or_fake_id();
+                let args = vec![ScriptValue::Reference(self_), other];
+                Ok(try_call_overloads(lua, "div", target_type_id, args, world)?)
+            },
+        );
 
-                Err(last_error
-                    .unwrap_or_else(|| {
-                        InteropError::missing_function(target_type_id, "sub".to_string()).into()
-                    })
-                    .into())
+        m.add_meta_function(
+            MetaMethod::Mod,
+            |lua, (self_, other): (LuaReflectReference, LuaScriptValue)| {
+                let world = lua.get_world();
+                let self_: ReflectReference = self_.into();
+                let other: ScriptValue = other.into();
+                let target_type_id = self_.tail_type_id(world.clone())?.or_fake_id();
+                let args = vec![ScriptValue::Reference(self_), other];
+                Ok(try_call_overloads(lua, "rem", target_type_id, args, world)?)
+            },
+        );
+
+        m.add_meta_function(MetaMethod::Unm, |lua, self_: LuaReflectReference| {
+            let world = lua.get_world();
+            let self_: ReflectReference = self_.into();
+            let target_type_id = self_.tail_type_id(world.clone())?.or_fake_id();
+            let args = vec![ScriptValue::Reference(self_)];
+            Ok(try_call_overloads(lua, "neg", target_type_id, args, world)?)
+        });
+
+        m.add_meta_function(
+            MetaMethod::Pow,
+            |lua, (self_, other): (LuaReflectReference, LuaScriptValue)| {
+                let world = lua.get_world();
+                let self_: ReflectReference = self_.into();
+                let other: ScriptValue = other.into();
+                let target_type_id = self_.tail_type_id(world.clone())?.or_fake_id();
+                let args = vec![ScriptValue::Reference(self_), other];
+                Ok(try_call_overloads(lua, "pow", target_type_id, args, world)?)
+            },
+        );
+
+        m.add_meta_function(
+            MetaMethod::Eq,
+            |lua, (self_, other): (LuaReflectReference, LuaScriptValue)| {
+                let world = lua.get_world();
+                let self_: ReflectReference = self_.into();
+                let other: ScriptValue = other.into();
+                let target_type_id = self_.tail_type_id(world.clone())?.or_fake_id();
+                let args = vec![ScriptValue::Reference(self_), other];
+                Ok(try_call_overloads(lua, "eq", target_type_id, args, world)?)
+            },
+        );
+
+        m.add_meta_function(
+            MetaMethod::Lt,
+            |lua, (self_, other): (LuaReflectReference, LuaScriptValue)| {
+                let world = lua.get_world();
+                let self_: ReflectReference = self_.into();
+                let other: ScriptValue = other.into();
+                let target_type_id = self_.tail_type_id(world.clone())?.or_fake_id();
+                let args = vec![ScriptValue::Reference(self_), other];
+                Ok(try_call_overloads(lua, "lt", target_type_id, args, world)?)
             },
         );
 

crates/languages/bevy_mod_scripting_lua/tests/data/add/vec3.lua

@@ -0,0 +1,11 @@
+local a = Vec3.new(1.0, 2.0, 3.0)
+local b = Vec3.new(4.0, 5.0, 6.0)
+
+assert((a + 1).x == 2.0, "Addition did not work")
+assert((a + 1).y == 3.0, "Addition did not work")
+assert((a + 1).z == 4.0, "Addition did not work")
+
+assert((a + b).x == 5.0, "Addition did not work")
+assert((a + b).y == 7.0, "Addition did not work")
+assert((a + b).z == 9.0, "Addition did not work")
+

crates/languages/bevy_mod_scripting_lua/tests/data/div/vec3.lua

@@ -0,0 +1,10 @@
+local a = Vec3.new(2.0, 4.0, 6.0)
+local b = Vec3.new(1.0, 2.0, 3.0)
+
+assert((a / 2).x == 1.0, "Division did not work")
+assert((a / 2).y == 2.0, "Division did not work")
+assert((a / 2).z == 3.0, "Division did not work")
+
+assert((a / b).x == 2.0, "Division did not work")
+assert((a / b).y == 2.0, "Division did not work")
+assert((a / b).z == 2.0, "Division did not work")

crates/languages/bevy_mod_scripting_lua/tests/data/eq/vec3.lua

@@ -0,0 +1,7 @@
+local a = Vec3.new(2.0, -4.0, 6.0)
+local b = Vec3.new(4.0, 5.0, 6.0)
+
+
+assert((a == b) == false, "Equality did not work")
+assert((a ~= b) == true, "Inequality did not work")
+assert((a == a) == true, "Equality did not work")

crates/languages/bevy_mod_scripting_lua/tests/data/mod/vec3.lua

@@ -0,0 +1,10 @@
+local a = Vec3.new(2.0, 5.0, 6.0)
+local b = Vec3.new(1.0, 2.0, 3.0)
+
+assert((a % 2).x == 0.0, "Modulus did not work")
+assert((a % 2).y == 1.0, "Modulus did not work")
+assert((a % 2).z == 0.0, "Modulus did not work")
+
+assert((a % b).x == 0.0, "Modulus did not work")
+assert((a % b).y == 1.0, "Modulus did not work")
+assert((a % b).z == 0.0, "Modulus did not work")

crates/languages/bevy_mod_scripting_lua/tests/data/mul/vec3.lua

@@ -0,0 +1,10 @@
+local a = Vec3.new(1.0, 2.0, 3.0)
+local b = Vec3.new(4.0, 5.0, 6.0)
+
+assert((a * 2).x == 2.0, "Multiplication did not work")
+assert((a * 2).y == 4.0, "Multiplication did not work")
+assert((a * 2).z == 6.0, "Multiplication did not work")
+
+assert((a * b).x == 4.0, "Multiplication did not work")
+assert((a * b).y == 10.0, "Multiplication did not work")
+assert((a * b).z == 18.0, "Multiplication did not work")

crates/languages/bevy_mod_scripting_lua/tests/data/unm/vec3.lua

@@ -0,0 +1,5 @@
+local a = Vec3.new(2.0, -4.0, 6.0)
+
+assert(-a.x == -2.0, "Negation did not work")
+assert(-a.y == 4.0, "Negation did not work")
+assert(-a.z == -6.0, "Negation did not work")