Merge branch 'function-info-nparams-and-isvararg' into for/crank

Author: psentee

src/function.rs

@@ -8,7 +8,8 @@ use crate::table::Table;
 use crate::traits::{FromLuaMulti, IntoLua, IntoLuaMulti, LuaNativeFn, LuaNativeFnMut};
 use crate::types::{Callback, LuaType, MaybeSend, ValueRef};
 use crate::util::{
-    assert_stack, check_stack, linenumber_to_usize, pop_error, ptr_to_lossy_str, ptr_to_str, StackGuard,
+    assert_stack, check_stack, linenumber_to_usize, pop_error, ptr_to_lossy_str, ptr_to_str,
+    StackGuard,
 };
 use crate::value::Value;
 
@@ -50,6 +51,15 @@ pub struct FunctionInfo {
     pub line_defined: Option<usize>,
     /// The line number where the definition of the function ends (not set by Luau).
     pub last_line_defined: Option<usize>,
+    /// Number of function parameters
+    #[cfg(any(not(any(feature = "lua51", feature = "luajit")), doc))]
+    pub num_params: usize,
+    /// True if function accepts variable args
+    #[cfg(any(not(any(feature = "lua51", feature = "luajit")), doc))]
+    pub is_vararg: bool,
+    /// Number of upvalues
+    #[cfg(any(not(feature = "luau"), doc))]
+    pub nups: usize,
 }
 
 /// Luau function coverage snapshot.
@@ -343,7 +353,8 @@ impl Function {
 
     /// Returns information about the function.
     ///
-    /// Corresponds to the `>Sn` what mask for [`lua_getinfo`] when applied to the function.
+    /// Corresponds to the `>Snu` (`>Sn` for Luau) what mask for
+    /// [`lua_getinfo`] when applied to the function.
     ///
     /// [`lua_getinfo`]: https://www.lua.org/manual/5.4/manual.html#lua_getinfo
     pub fn info(&self) -> FunctionInfo {
@@ -356,7 +367,7 @@ impl Function {
             let mut ar: ffi::lua_Debug = mem::zeroed();
             lua.push_ref(&self.0);
             #[cfg(not(feature = "luau"))]
-            let res = ffi::lua_getinfo(state, cstr!(">Sn"), &mut ar);
+            let res = ffi::lua_getinfo(state, cstr!(">Snu"), &mut ar);
             #[cfg(feature = "luau")]
             let res = ffi::lua_getinfo(state, -1, cstr!("sn"), &mut ar);
             mlua_assert!(res != 0, "lua_getinfo failed with `>Sn`");
@@ -381,6 +392,12 @@ impl Function {
                 last_line_defined: linenumber_to_usize(ar.lastlinedefined),
                 #[cfg(feature = "luau")]
                 last_line_defined: None,
+                #[cfg(not(any(feature = "lua51", feature = "luajit")))]
+                num_params: ar.nparams as usize,
+                #[cfg(not(any(feature = "lua51", feature = "luajit")))]
+                is_vararg: ar.isvararg != 0,
+                #[cfg(not(feature = "luau"))]
+                nups: ar.nups as usize,
             }
         }
     }
@@ -548,7 +565,9 @@ impl Function {
     {
         let func = RefCell::new(func);
         WrappedFunction(Box::new(move |lua, nargs| unsafe {
-            let mut func = func.try_borrow_mut().map_err(|_| Error::RecursiveMutCallback)?;
+            let mut func = func
+                .try_borrow_mut()
+                .map_err(|_| Error::RecursiveMutCallback)?;
             let args = A::from_stack_args(nargs, 1, None, lua)?;
             func.call(args)?.push_into_stack_multi(lua)
         }))
@@ -583,7 +602,9 @@ impl Function {
     {
         let func = RefCell::new(func);
         WrappedFunction(Box::new(move |lua, nargs| unsafe {
-            let mut func = func.try_borrow_mut().map_err(|_| Error::RecursiveMutCallback)?;
+            let mut func = func
+                .try_borrow_mut()
+                .map_err(|_| Error::RecursiveMutCallback)?;
             let args = A::from_stack_args(nargs, 1, None, lua)?;
             func.call(args).push_into_stack_multi(lua)
         }))
@@ -645,7 +666,9 @@ impl IntoLua for WrappedFunction {
 impl IntoLua for WrappedAsyncFunction {
     #[inline]
     fn into_lua(self, lua: &Lua) -> Result<Value> {
-        lua.lock().create_async_callback(self.0).map(Value::Function)
+        lua.lock()
+            .create_async_callback(self.0)
+            .map(Value::Function)
     }
 }