fixup! refactor(utilities): Rewrite semver in Rust and wrap as Lua type

sile-typesetter · Oct 13, 2024 · 1aa3019 · 1aa3019
1 parent 56a063e
commit 1aa3019
Showing 1 changed file with 43 additions and 27 deletions.
diff --git a/src/types/semver.rs b/src/types/semver.rs
@@ -20,6 +20,48 @@ pub fn semver(version: String) -> crate::Result<Semver> {
     Ok(Semver::new(&version)?)
 }
 
+fn use_registered_metatable(lua: &Lua) -> LuaResult<LuaTable> {
+    let key = "semver_type_metatable";
+    let metatable: LuaTable = match lua.named_registry_value(key)? {
+        LuaValue::Table(metatable) => metatable,
+        LuaValue::Nil => {
+            let metatable = lua.create_table()?;
+            let to_string = lua.create_function(|_, luaself: LuaTable| {
+                let major: u8 = luaself.get("major")?;
+                let minor: u8 = luaself.get("minor")?;
+                let patch: u8 = luaself.get("patch")?;
+                Ok(format!("{}.{}.{}", major, minor, patch))
+            })?;
+            metatable.set("__tostring", to_string)?;
+            let equal = lua.create_function(|_, args: (LuaTable, LuaTable)| {
+                dbg!(args);
+                //let major: u8 = args.0.get("major")?;
+                //let minor: u8 = args.0.get("minor")?;
+                //let patch: u8 = args.0.get("patch")?;
+                Ok(false)
+            })?;
+            metatable.set("__eq", equal)?;
+            let less_equal = lua.create_function(|_, args: (LuaTable, LuaTable)| {
+                dbg!(args);
+                Ok(false)
+            })?;
+            metatable.set("__le", less_equal)?;
+            let less_than = lua.create_function(|_, args: (LuaTable, LuaTable)| {
+                dbg!(args);
+                Ok(false)
+                //let major1: u8 = args.0.get("major")?;
+                //let major2: u8 = args.1.get("major")?;
+                //Ok(major1 < major2)
+            })?;
+            metatable.set("__lt", less_than)?;
+            lua.set_named_registry_value(key, &metatable)?;
+            metatable
+        }
+        _ => panic!("Unexpected type return from registry lookup"),
+    };
+    Ok(metatable)
+}
+
 impl Deref for Semver {
     type Target = Version;
     fn deref(&self) -> &Version {
@@ -34,33 +76,7 @@ impl IntoLua for Semver {
         semver.set("major", self.version.major)?;
         semver.set("minor", self.version.minor)?;
         semver.set("patch", self.version.patch)?;
-        let metatable = lua.create_table()?;
-        let to_string = lua.create_function(|_, luaself: LuaTable| {
-            let major: u8 = luaself.get("major")?;
-            let minor: u8 = luaself.get("minor")?;
-            let patch: u8 = luaself.get("patch")?;
-            Ok(format!("{}.{}.{}", major, minor, patch))
-        })?;
-        metatable.set("__tostring", to_string)?;
-        let equal = lua.create_function(|_, args: (LuaTable, LuaTable)| {
-            dbg!(args);
-            panic!("No passiy");
-            //let major: u8 = args.0.get("major")?;
-            //let minor: u8 = args.0.get("minor")?;
-            //let patch: u8 = args.0.get("patch")?;
-            Ok(false)
-        })?;
-        metatable.set("__eq", equal)?;
-        let less_equal = lua.create_function(|_, args: (LuaTable, LuaTable)| {
-            dbg!(args);
-            Ok(false)
-        })?;
-        metatable.set("__le", less_equal)?;
-        let less_than = lua.create_function(|_, args: (LuaTable, LuaTable)| {
-            dbg!(args);
-            Ok(false)
-        })?;
-        metatable.set("__lt", less_than)?;
+        let metatable: mlua::Table = use_registered_metatable(&lua)?;
         semver.set_metatable(Some(metatable));
         Ok(LuaValue::Table(semver))
     }