aboutsummaryrefslogtreecommitdiffstats
path: root/c-api
diff options
context:
space:
mode:
Diffstat (limited to 'c-api')
-rw-r--r--c-api/compat-5.3.c29
-rw-r--r--c-api/compat-5.3.h6
2 files changed, 22 insertions, 13 deletions
diff --git a/c-api/compat-5.3.c b/c-api/compat-5.3.c
index b82c654..bf81673 100644
--- a/c-api/compat-5.3.c
+++ b/c-api/compat-5.3.c
@@ -37,8 +37,8 @@
#endif /* strerror_r */
#ifndef COMPAT53_HAVE_STRERROR_S
-# if defined(_MSC_VER) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || \
- (defined(__STDC_LIB_EXT1__) && __STDC_LIB_EXT1__)
+# if defined(_MSC_VER) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \
+ defined(__STDC_LIB_EXT1__) && __STDC_LIB_EXT1__)
# define COMPAT53_HAVE_STRERROR_S 1
# else /* not VC++ or C11 */
# define COMPAT53_HAVE_STRERROR_S 0
@@ -204,15 +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) {
- lua_Integer n = lua_tointeger(L, i);
- if (isnum != NULL) {
- *isnum = (n != 0 || lua_isnumber(L, i));
- }
- return n;
-}
-
-
COMPAT53_API lua_Number lua_tonumberx (lua_State *L, int i, int *isnum) {
lua_Number n = lua_tonumber(L, i);
if (isnum != NULL) {
@@ -740,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 755c23e..8e10893 100644
--- a/c-api/compat-5.3.h
+++ b/c-api/compat-5.3.h
@@ -165,8 +165,7 @@ COMPAT53_API void lua_rawsetp(lua_State *L, int i, const void *p);
#define lua_rawlen(L, i) lua_objlen((L), (i))
-#define lua_tointegerx COMPAT53_CONCAT(COMPAT53_PREFIX, _tointegerx)
-COMPAT53_API lua_Integer lua_tointegerx (lua_State *L, int i, int *isnum);
+#define lua_tointeger(L, i) lua_tointegerx((L), (i), NULL)
#define lua_tonumberx COMPAT53_CONCAT(COMPAT53_PREFIX, _tonumberx)
COMPAT53_API lua_Number lua_tonumberx (lua_State *L, int i, int *isnum);
@@ -297,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)