Update backports.

The backports of lstrlib.c, ltablib.c, and lutf8lib.c have been updated
to Lua version 5.3.2.

1 files changed, 43 insertions, 15 deletions

diff --git a/lprefix.h b/lprefix.h
index aa1350b..cba5bbc 100644
--- a/lprefix.h
+++ b/lprefix.h
@@ -48,6 +48,7 @@
 #undef LUAMOD_API
 #define LUAMOD_API extern
 
+
 #ifdef lutf8lib_c
 #  define luaopen_utf8 luaopen_compat53_utf8
 #  include <stdarg.h>
@@ -81,24 +82,18 @@ static const char *compat53_utf8_escape (lua_State* L, ...) {
   compat53_utf8_escape(L, l)
 #endif
 
+
 #ifdef ltablib_c
 #  define luaopen_table luaopen_compat53_table
-/* lua_rawgeti in compat53.h is implemented as a macro, so the
- * function signature doesn't match when you use a function pointer
- */
-static int compat53_rawgeti (lua_State *L, int i, lua_Integer n) {
-  return lua_rawgeti(L, i, n);
-}
-#  undef lua_rawgeti
-#  define lua_rawgeti compat53_rawgeti
-static void compat53_rawseti (lua_State *L, int i, lua_Integer n) {
-  lua_rawseti(L, i, (int)n);
-}
-#  undef lua_rawseti
-#  define lua_rawseti compat53_rawseti
+#  ifndef LUA_MAXINTEGER
+/* conservative estimate: */
+#    define LUA_MAXINTEGER INT_MAX
+#  endif
 #endif /* ltablib_c */
 
+
 #ifdef lstrlib_c
+#include <locale.h>
 #include <lualib.h>
 /* move the string library open function out of the way (we only take
  * the string packing functions)!
@@ -112,8 +107,33 @@ static void compat53_rawseti (lua_State *L, int i, lua_Integer n) {
 #  if LUA_VERSION_NUM < 503
 /* lstrlib assumes that lua_Integer and lua_Unsigned have the same
  * size, so we use the unsigned equivalent of ptrdiff_t! */
-#  define lua_Unsigned size_t
+#    define lua_Unsigned size_t
 #  endif
+#  ifndef l_mathlim
+#    ifdef LUA_NUMBER_DOUBLE
+#      define l_mathlim(n) (DBL_##n)
+#    else
+#      define l_mathlim(n) (FLT_##n)
+#    endif
+#  endif
+#  ifndef l_mathop
+#    ifdef LUA_NUMBER_DOUBLE
+#      define l_mathop(op) op
+#    else
+#      define l_mathop(op) op##f
+#    endif
+#  endif
+#  ifndef lua_getlocaledecpoint
+#    define lua_getlocaledecpoint() (localeconv()->decimal_point[0])
+#  endif
+#  ifndef l_sprintf
+#    if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#      define l_sprintf(s,sz,f,i) (snprintf(s, sz, f, i))
+#    else
+#      define l_sprintf(s,sz,f,i) ((void)(sz), sprintf(s, f, i))
+#    endif
+#  endif
+
 static int str_pack (lua_State *L);
 static int str_packsize (lua_State *L);
 static int str_unpack (lua_State *L);
@@ -127,12 +147,20 @@ LUAMOD_API int luaopen_compat53_string (lua_State *L) {
   luaL_newlib(L, funcs);
   return 1;
 }
+/* fake CLANG feature detection on other compilers */
+#  ifndef __has_attribute
+#    define __has_attribute(x) 0
+#  endif
 /* make luaopen_string(_XXX) static, so it (and all other referenced
  * string functions) won't be included in the resulting dll
  * (hopefully).
  */
 #  undef LUAMOD_API
-#  define LUAMOD_API static
+#  if defined(__GNUC__) || __has_attribute(__unused__)
+#    define LUAMOD_API __attribute__((__unused__)) static
+#  else
+#    define LUAMOD_API static
+#  endif
 #endif /* lstrlib.c */
 
 #endif