Provide strict lua_tointegerx for Lua 5.2 as well.

Closes #40.

2 files changed, 19 insertions, 19 deletions

diff --git a/c-api/compat-5.3.c b/c-api/compat-5.3.c
index ebaf03f..370027a 100644
--- a/c-api/compat-5.3.c
+++ b/c-api/compat-5.3.c
@@ -204,22 +204,6 @@ COMPAT53_API void lua_rawsetp (lua_State *L, int i, const void *p) {
 }
 
 
-COMPAT53_API lua_Integer lua_tointegerx (lua_State *L, int i, int *isnum) {
-  int ok = 0;
-  lua_Number n = lua_tonumberx(L, i, &ok);
-  lua_Integer j = (lua_tointeger)(L, i); /* native lua_tointeger */
-  if (isnum == NULL)
-    isnum = &ok;
-  if (ok && n == j) {
-    *isnum = 1;
-    return j;
-  } else {
-    *isnum = 0;
-    return 0;
-  }
-}
-
-
 COMPAT53_API lua_Number lua_tonumberx (lua_State *L, int i, int *isnum) {
   lua_Number n = lua_tonumber(L, i);
   if (isnum != NULL) {
@@ -747,6 +731,22 @@ COMPAT53_API int lua_isinteger (lua_State *L, int index) {
 }
 
 
+COMPAT53_API lua_Integer lua_tointegerx (lua_State *L, int i, int *isnum) {
+  int ok = 0;
+  lua_Number n = lua_tonumberx(L, i, &ok);
+  if (ok) {
+    if (n == (lua_Integer)n) {
+      if (isnum)
+        *isnum = 1;
+      return (lua_Integer)n;
+    }
+  }
+  if (isnum)
+    *isnum = 0;
+  return 0;
+}
+
+
 static void compat53_reverse (lua_State *L, int a, int b) {
   for (; a < b; ++a, --b) {
     lua_pushvalue(L, a);
diff --git a/c-api/compat-5.3.h b/c-api/compat-5.3.h
index 6b6e35c..8e10893 100644
--- a/c-api/compat-5.3.h
+++ b/c-api/compat-5.3.h
@@ -167,9 +167,6 @@ COMPAT53_API void lua_rawsetp(lua_State *L, int i, const void *p);
 
 #define lua_tointeger(L, i) lua_tointegerx((L), (i), NULL)
 
-#define lua_tointegerx COMPAT53_CONCAT(COMPAT53_PREFIX, _tointegerx)
-COMPAT53_API lua_Integer lua_tointegerx (lua_State *L, int i, int *isnum);
-
 #define lua_tonumberx COMPAT53_CONCAT(COMPAT53_PREFIX, _tonumberx)
 COMPAT53_API lua_Number lua_tonumberx (lua_State *L, int i, int *isnum);
 
@@ -299,6 +296,9 @@ COMPAT53_API int lua_geti (lua_State *L, int index, lua_Integer i);
 #define lua_isinteger COMPAT53_CONCAT(COMPAT53_PREFIX, _isinteger)
 COMPAT53_API int lua_isinteger (lua_State *L, int index);
 
+#define lua_tointegerx COMPAT53_CONCAT(COMPAT53_PREFIX, _tointegerx_53)
+COMPAT53_API lua_Integer lua_tointegerx (lua_State *L, int i, int *isnum);
+
 #define lua_numbertointeger(n, p) \
   ((*(p) = (lua_Integer)(n)), 1)