Refactor lmathlib

Author: khvzak

src/lapi.rs

@@ -541,6 +541,23 @@ pub unsafe extern "C" fn lua_tointegerx(
     return res;
 }
 
+/*
+@@ lua_numbertointeger converts a float number to an integer, or
+** returns 0 if float is not within the range of a lua_Integer.
+** (The range comparisons are tricky because of rounding. The tests
+** here assume a two-complement representation, where MININTEGER always
+** has an exact representation as a float; MAXINTEGER may not have one,
+** and therefore its conversion to float may have an ill-defined value.)
+*/
+#[inline]
+pub fn lua_numbertointeger(n: lua_Number) -> Option<lua_Integer> {
+    if n >= lua_Integer::MIN as lua_Number && n < -(lua_Integer::MIN as lua_Number) {
+        Some(n as lua_Integer)
+    } else {
+        None
+    }
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn lua_toboolean(L: *mut lua_State, idx: c_int) -> c_int {
     let o: *const TValue = index2addr(L, idx);

src/lauxlib.rs

@@ -88,6 +88,16 @@ pub unsafe fn luaL_newlib(L: *mut lua_State, l: *const luaL_Reg) {
     luaL_setfuncs(L, l, 0);
 }
 
+#[inline(always)]
+pub unsafe fn luaL_argcheck(
+    L: *mut lua_State,
+    cond: bool,
+    arg: c_int,
+    extramsg: *const c_char,
+) -> bool {
+    cond || luaL_argerror(L, arg, extramsg) != 0
+}
+
 pub unsafe fn luaL_loadfile(L: *mut lua_State, filename: *const c_char) -> c_int {
     luaL_loadfilex(L, filename, ptr::null())
 }
@@ -369,7 +379,7 @@ pub unsafe extern "C" fn luaL_argerror(
         i_ci: 0 as *mut CallInfo,
     };
     if lua_getstack(L, 0 as libc::c_int, &mut ar) == 0 {
-        return luaL_error(
+        luaL_error(
             L,
             b"bad argument #%d (%s)\0" as *const u8 as *const libc::c_char,
             arg,
@@ -380,7 +390,7 @@ pub unsafe extern "C" fn luaL_argerror(
     if strcmp(ar.namewhat, b"method\0" as *const u8 as *const libc::c_char) == 0 as libc::c_int {
         arg -= 1;
         if arg == 0 as libc::c_int {
-            return luaL_error(
+            luaL_error(
                 L,
                 b"calling '%s' on bad self (%s)\0" as *const u8 as *const libc::c_char,
                 ar.name,
@@ -395,7 +405,7 @@ pub unsafe extern "C" fn luaL_argerror(
             b"?\0" as *const u8 as *const libc::c_char
         };
     }
-    return luaL_error(
+    luaL_error(
         L,
         b"bad argument #%d to '%s' (%s)\0" as *const u8 as *const libc::c_char,
         arg,
@@ -478,11 +488,7 @@ pub unsafe extern "C" fn luaL_where(L: *mut lua_State, level: libc::c_int) {
 ** an error with "stack overflow" instead of the given message.)
 */
 #[no_mangle]
-pub unsafe extern "C" fn luaL_error(
-    L: *mut lua_State,
-    fmt: *const libc::c_char,
-    args: ...
-) -> c_int {
+pub unsafe extern "C" fn luaL_error(L: *mut lua_State, fmt: *const libc::c_char, args: ...) -> ! {
     let mut argp: ::core::ffi::VaListImpl;
     argp = args.clone();
     luaL_where(L, 1 as libc::c_int);

src/lbaselib.rs

@@ -50,7 +50,7 @@ unsafe extern "C" fn luaB_print(L: *mut lua_State) -> c_int {
         lua_call(L, 1, 1);
         let s: *const c_char = lua_tolstring(L, -1, &mut l); /* get result */
         if s.is_null() {
-            return luaL_error(L, cstr!("'tostring' must return a string to 'print'"));
+            luaL_error(L, cstr!("'tostring' must return a string to 'print'"));
         }
         if i > 1 as c_int {
             lua_writestring(cstr!("\t"), 1);
@@ -170,7 +170,7 @@ unsafe extern "C" fn luaB_setmetatable(L: *mut lua_State) -> c_int {
     // TODO: FIX
     luaL_checktype(L, 1, LUA_TTABLE); // FIXME? t is unused?
     if luaL_getmetafield(L, 1, cstr!("__metatable")) != LUA_TNIL {
-        return luaL_error(L, cstr!("cannot change a protected metatable"));
+        luaL_error(L, cstr!("cannot change a protected metatable"));
     }
     lua_settop(L, 2);
     lua_setmetatable(L, 1);

src/lib.rs

@@ -25,7 +25,6 @@ pub(crate) mod libs;
 pub(crate) mod linit;
 pub(crate) mod llex;
 pub(crate) mod llimits;
-pub(crate) mod lmathlib;
 pub(crate) mod lmem;
 pub(crate) mod loadlib;
 pub(crate) mod lopcodes;