fix isinteger

21 files changed, 46 insertions, 37 deletions

diff --git a/core/src/xmake/base64/encode.c b/core/src/xmake/base64/encode.c
index 0bb3ec339..8bb4d8be3 100644
--- a/core/src/xmake/base64/encode.c
+++ b/core/src/xmake/base64/encode.c
@@ -41,8 +41,8 @@ tb_int_t xm_base64_encode(lua_State* lua)
     // get data and size
     tb_size_t        size = 0;
     tb_byte_t const* data = tb_null;
-    if (lua_isinteger(lua, 1)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 1);
-    if (lua_isinteger(lua, 2)) size = (tb_size_t)lua_tointeger(lua, 2);
+    if (xm_lua_isinteger(lua, 1)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 1);
+    if (xm_lua_isinteger(lua, 2)) size = (tb_size_t)lua_tointeger(lua, 2);
     if (!data || !size)
     {
         lua_pushnil(lua);
diff --git a/core/src/xmake/bloom_filter/bloom_filter_data_set.c b/core/src/xmake/bloom_filter/bloom_filter_data_set.c
index 116d1900c..cbf1cafda 100644
--- a/core/src/xmake/bloom_filter/bloom_filter_data_set.c
+++ b/core/src/xmake/bloom_filter/bloom_filter_data_set.c
@@ -49,8 +49,8 @@ tb_int_t xm_bloom_filter_data_set(lua_State* lua)
     // get data and size
     tb_size_t        size = 0;
     tb_byte_t const* data = tb_null;
-    if (lua_isinteger(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
-    if (lua_isinteger(lua, 3)) size = (tb_size_t)lua_tointeger(lua, 3);
+    if (xm_lua_isinteger(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
+    if (xm_lua_isinteger(lua, 3)) size = (tb_size_t)lua_tointeger(lua, 3);
     if (!data || !size)
     {
         lua_pushinteger(lua, -1);
diff --git a/core/src/xmake/hash/md5.c b/core/src/xmake/hash/md5.c
index 5d388306c..d24ca7e53 100644
--- a/core/src/xmake/hash/md5.c
+++ b/core/src/xmake/hash/md5.c
@@ -39,7 +39,7 @@ tb_int_t xm_hash_md5(lua_State* lua)
     tb_assert_and_check_return_val(lua, 0);
 
     // is bytes? get data and size
-    if (lua_isinteger(lua, 1) && lua_isinteger(lua, 2))
+    if (xm_lua_isinteger(lua, 1) && xm_lua_isinteger(lua, 2))
     {
         tb_byte_t const* data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 1);
         tb_size_t size = (tb_size_t)lua_tointeger(lua, 2);
diff --git a/core/src/xmake/hash/sha.c b/core/src/xmake/hash/sha.c
index 00de5d078..a4c0356fb 100644
--- a/core/src/xmake/hash/sha.c
+++ b/core/src/xmake/hash/sha.c
@@ -42,7 +42,7 @@ tb_int_t xm_hash_sha(lua_State* lua)
     tb_size_t mode = (tb_size_t)lua_tointeger(lua, 1);
 
     // is bytes? get data and size
-    if (lua_isinteger(lua, 2) && lua_isinteger(lua, 3))
+    if (xm_lua_isinteger(lua, 2) && xm_lua_isinteger(lua, 3))
     {
         tb_byte_t const* data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
         tb_size_t size = (tb_size_t)lua_tointeger(lua, 3);
diff --git a/core/src/xmake/hash/xxhash.c b/core/src/xmake/hash/xxhash.c
index f2b73a695..232e9c2f8 100644
--- a/core/src/xmake/hash/xxhash.c
+++ b/core/src/xmake/hash/xxhash.c
@@ -52,7 +52,7 @@ tb_int_t xm_hash_xxhash(lua_State* lua)
     }
 
     // is bytes? get data and size
-    if (lua_isinteger(lua, 2) && lua_isinteger(lua, 3))
+    if (xm_lua_isinteger(lua, 2) && xm_lua_isinteger(lua, 3))
     {
         tb_assert_static(sizeof(lua_Integer) == sizeof(tb_pointer_t));
         tb_byte_t const* data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
diff --git a/core/src/xmake/io/file_write.c b/core/src/xmake/io/file_write.c
index 9504e188b..d11cb0259 100644
--- a/core/src/xmake/io/file_write.c
+++ b/core/src/xmake/io/file_write.c
@@ -166,14 +166,14 @@ tb_int_t xm_io_file_write(lua_State* lua)
                 // get bytes data
                 lua_pushstring(lua, "data");
                 lua_gettable(lua, i);
-                if (lua_isinteger(lua, -1))
+                if (xm_lua_isinteger(lua, -1))
                     data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, -1);
                 lua_pop(lua, 1);
                 tb_assert_static(sizeof(lua_Integer) == sizeof(tb_pointer_t));
 
                 lua_pushstring(lua, "size");
                 lua_gettable(lua, i);
-                if (lua_isinteger(lua, -1))
+                if (xm_lua_isinteger(lua, -1))
                     datasize = (tb_size_t)lua_tointeger(lua, -1);
                 lua_pop(lua, 1);
 
diff --git a/core/src/xmake/io/pipe_read.c b/core/src/xmake/io/pipe_read.c
index 7553f89dd..76b245ff8 100644
--- a/core/src/xmake/io/pipe_read.c
+++ b/core/src/xmake/io/pipe_read.c
@@ -54,7 +54,7 @@ tb_int_t xm_io_pipe_read(lua_State* lua)
 
     // get data
     tb_byte_t* data = tb_null;
-    if (lua_isinteger(lua, 2))
+    if (xm_lua_isinteger(lua, 2))
         data = (tb_byte_t*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
     if (!data)
     {
@@ -66,7 +66,7 @@ tb_int_t xm_io_pipe_read(lua_State* lua)
 
     // get size
     tb_long_t size = 0;
-    if (lua_isinteger(lua, 3)) size = (tb_long_t)lua_tointeger(lua, 3);
+    if (xm_lua_isinteger(lua, 3)) size = (tb_long_t)lua_tointeger(lua, 3);
     if (size <= 0)
     {
         lua_pushinteger(lua, -1);
diff --git a/core/src/xmake/io/pipe_write.c b/core/src/xmake/io/pipe_write.c
index 54b82339b..6089c5807 100644
--- a/core/src/xmake/io/pipe_write.c
+++ b/core/src/xmake/io/pipe_write.c
@@ -55,8 +55,8 @@ tb_int_t xm_io_pipe_write(lua_State* lua)
     // get data and size
     tb_size_t        size = 0;
     tb_byte_t const* data = tb_null;
-    if (lua_isinteger(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
-    if (lua_isinteger(lua, 3)) size = (tb_size_t)lua_tointeger(lua, 3);
+    if (xm_lua_isinteger(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
+    if (xm_lua_isinteger(lua, 3)) size = (tb_size_t)lua_tointeger(lua, 3);
     if (!data || !size)
     {
         lua_pushinteger(lua, -1);
diff --git a/core/src/xmake/io/socket_recv.c b/core/src/xmake/io/socket_recv.c
index 8b5bfdf0e..71113b6f2 100644
--- a/core/src/xmake/io/socket_recv.c
+++ b/core/src/xmake/io/socket_recv.c
@@ -54,7 +54,7 @@ tb_int_t xm_io_socket_recv(lua_State* lua)
 
     // get data
     tb_byte_t* data = tb_null;
-    if (lua_isinteger(lua, 2))
+    if (xm_lua_isinteger(lua, 2))
         data = (tb_byte_t*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
     if (!data)
     {
@@ -66,7 +66,7 @@ tb_int_t xm_io_socket_recv(lua_State* lua)
 
     // get size
     tb_long_t size = 0;
-    if (lua_isinteger(lua, 3)) size = (tb_long_t)lua_tointeger(lua, 3);
+    if (xm_lua_isinteger(lua, 3)) size = (tb_long_t)lua_tointeger(lua, 3);
     if (size <= 0)
     {
         lua_pushinteger(lua, -1);
diff --git a/core/src/xmake/io/socket_recvfrom.c b/core/src/xmake/io/socket_recvfrom.c
index 2558ebaf4..9ca9da239 100644
--- a/core/src/xmake/io/socket_recvfrom.c
+++ b/core/src/xmake/io/socket_recvfrom.c
@@ -54,7 +54,7 @@ tb_int_t xm_io_socket_recvfrom(lua_State* lua)
 
     // get data
     tb_byte_t* data = tb_null;
-    if (lua_isinteger(lua, 2))
+    if (xm_lua_isinteger(lua, 2))
         data = (tb_byte_t*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
     if (!data)
     {
@@ -66,7 +66,7 @@ tb_int_t xm_io_socket_recvfrom(lua_State* lua)
 
     // get size
     tb_long_t size = 0;
-    if (lua_isinteger(lua, 3)) size = (tb_long_t)lua_tointeger(lua, 3);
+    if (xm_lua_isinteger(lua, 3)) size = (tb_long_t)lua_tointeger(lua, 3);
     if (size <= 0)
     {
         lua_pushinteger(lua, -1);
diff --git a/core/src/xmake/io/socket_send.c b/core/src/xmake/io/socket_send.c
index 3cf69f298..4efc7cde6 100644
--- a/core/src/xmake/io/socket_send.c
+++ b/core/src/xmake/io/socket_send.c
@@ -55,8 +55,8 @@ tb_int_t xm_io_socket_send(lua_State* lua)
     // get data and size
     tb_size_t        size = 0;
     tb_byte_t const* data = tb_null;
-    if (lua_isinteger(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
-    if (lua_isinteger(lua, 3)) size = (tb_size_t)lua_tointeger(lua, 3);
+    if (xm_lua_isinteger(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
+    if (xm_lua_isinteger(lua, 3)) size = (tb_size_t)lua_tointeger(lua, 3);
     if (!data || !size)
     {
         lua_pushinteger(lua, -1);
diff --git a/core/src/xmake/io/socket_sendto.c b/core/src/xmake/io/socket_sendto.c
index c8e315b48..ad1a09856 100644
--- a/core/src/xmake/io/socket_sendto.c
+++ b/core/src/xmake/io/socket_sendto.c
@@ -55,8 +55,8 @@ tb_int_t xm_io_socket_sendto(lua_State* lua)
     // get data and size
     tb_size_t        size = 0;
     tb_byte_t const* data = tb_null;
-    if (lua_isinteger(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
-    if (lua_isinteger(lua, 3)) size = (tb_size_t)lua_tointeger(lua, 3);
+    if (xm_lua_isinteger(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
+    if (xm_lua_isinteger(lua, 3)) size = (tb_size_t)lua_tointeger(lua, 3);
     if (!data || !size)
     {
         lua_pushinteger(lua, -1);
diff --git a/core/src/xmake/lz4/block_compress.c b/core/src/xmake/lz4/block_compress.c
index 46201ef22..1748e9cdf 100644
--- a/core/src/xmake/lz4/block_compress.c
+++ b/core/src/xmake/lz4/block_compress.c
@@ -41,8 +41,8 @@ tb_int_t xm_lz4_block_compress(lua_State* lua)
     // get data and size
     tb_int_t         size = 0;
     tb_byte_t const* data = tb_null;
-    if (lua_isinteger(lua, 1)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 1);
-    if (lua_isinteger(lua, 2)) size = (tb_int_t)lua_tointeger(lua, 2);
+    if (xm_lua_isinteger(lua, 1)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 1);
+    if (xm_lua_isinteger(lua, 2)) size = (tb_int_t)lua_tointeger(lua, 2);
     if (!data || !size || size > LZ4_MAX_INPUT_SIZE)
     {
         lua_pushnil(lua);
diff --git a/core/src/xmake/lz4/block_decompress.c b/core/src/xmake/lz4/block_decompress.c
index 5df99eba6..713e4c4ec 100644
--- a/core/src/xmake/lz4/block_decompress.c
+++ b/core/src/xmake/lz4/block_decompress.c
@@ -41,8 +41,8 @@ tb_int_t xm_lz4_block_decompress(lua_State* lua)
     // get data and size
     tb_size_t        size = 0;
     tb_byte_t const* data = tb_null;
-    if (lua_isinteger(lua, 1)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 1);
-    if (lua_isinteger(lua, 2)) size = (tb_size_t)lua_tointeger(lua, 2);
+    if (xm_lua_isinteger(lua, 1)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 1);
+    if (xm_lua_isinteger(lua, 2)) size = (tb_size_t)lua_tointeger(lua, 2);
     if (!data || !size)
     {
         lua_pushnil(lua);
diff --git a/core/src/xmake/lz4/compress.c b/core/src/xmake/lz4/compress.c
index 5e77191b1..daeef656d 100644
--- a/core/src/xmake/lz4/compress.c
+++ b/core/src/xmake/lz4/compress.c
@@ -41,8 +41,8 @@ tb_int_t xm_lz4_compress(lua_State* lua)
     // get data and size
     tb_size_t        size = 0;
     tb_byte_t const* data = tb_null;
-    if (lua_isinteger(lua, 1)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 1);
-    if (lua_isinteger(lua, 2)) size = (tb_size_t)lua_tointeger(lua, 2);
+    if (xm_lua_isinteger(lua, 1)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 1);
+    if (xm_lua_isinteger(lua, 2)) size = (tb_size_t)lua_tointeger(lua, 2);
     if (!data || !size)
     {
         lua_pushnil(lua);
diff --git a/core/src/xmake/lz4/compress_stream_read.c b/core/src/xmake/lz4/compress_stream_read.c
index 06dadef3c..f9b9e7f13 100644
--- a/core/src/xmake/lz4/compress_stream_read.c
+++ b/core/src/xmake/lz4/compress_stream_read.c
@@ -53,7 +53,7 @@ tb_int_t xm_lz4_compress_stream_read(lua_State* lua)
 
     // get data
     tb_byte_t* data = tb_null;
-    if (lua_isinteger(lua, 2))
+    if (xm_lua_isinteger(lua, 2))
         data = (tb_byte_t*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
     if (!data)
     {
@@ -65,7 +65,7 @@ tb_int_t xm_lz4_compress_stream_read(lua_State* lua)
 
     // get size
     tb_long_t size = 0;
-    if (lua_isinteger(lua, 3)) size = (tb_long_t)lua_tointeger(lua, 3);
+    if (xm_lua_isinteger(lua, 3)) size = (tb_long_t)lua_tointeger(lua, 3);
     if (size <= 0)
     {
         lua_pushinteger(lua, -1);
diff --git a/core/src/xmake/lz4/compress_stream_write.c b/core/src/xmake/lz4/compress_stream_write.c
index 3f584d0a8..5e588e1ab 100644
--- a/core/src/xmake/lz4/compress_stream_write.c
+++ b/core/src/xmake/lz4/compress_stream_write.c
@@ -54,8 +54,8 @@ tb_int_t xm_lz4_compress_stream_write(lua_State* lua)
     // get data and size
     tb_size_t        size = 0;
     tb_byte_t const* data = tb_null;
-    if (lua_isinteger(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
-    if (lua_isinteger(lua, 3)) size = (tb_size_t)lua_tointeger(lua, 3);
+    if (xm_lua_isinteger(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
+    if (xm_lua_isinteger(lua, 3)) size = (tb_size_t)lua_tointeger(lua, 3);
     if (!data || !size)
     {
         lua_pushinteger(lua, -1);
diff --git a/core/src/xmake/lz4/decompress.c b/core/src/xmake/lz4/decompress.c
index 8e08e8f2a..fd3a77543 100644
--- a/core/src/xmake/lz4/decompress.c
+++ b/core/src/xmake/lz4/decompress.c
@@ -41,8 +41,8 @@ tb_int_t xm_lz4_decompress(lua_State* lua)
     // get data and size
     tb_size_t        size = 0;
     tb_byte_t const* data = tb_null;
-    if (lua_isinteger(lua, 1)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 1);
-    if (lua_isinteger(lua, 2)) size = (tb_size_t)lua_tointeger(lua, 2);
+    if (xm_lua_isinteger(lua, 1)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 1);
+    if (xm_lua_isinteger(lua, 2)) size = (tb_size_t)lua_tointeger(lua, 2);
     if (!data || !size)
     {
         lua_pushnil(lua);
diff --git a/core/src/xmake/lz4/decompress_stream_read.c b/core/src/xmake/lz4/decompress_stream_read.c
index 6b54336ca..bb9f8306d 100644
--- a/core/src/xmake/lz4/decompress_stream_read.c
+++ b/core/src/xmake/lz4/decompress_stream_read.c
@@ -53,7 +53,7 @@ tb_int_t xm_lz4_decompress_stream_read(lua_State* lua)
 
     // get data
     tb_byte_t* data = tb_null;
-    if (lua_isinteger(lua, 2))
+    if (xm_lua_isinteger(lua, 2))
         data = (tb_byte_t*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
     if (!data)
     {
@@ -65,7 +65,7 @@ tb_int_t xm_lz4_decompress_stream_read(lua_State* lua)
 
     // get size
     tb_long_t size = 0;
-    if (lua_isinteger(lua, 3)) size = (tb_long_t)lua_tointeger(lua, 3);
+    if (xm_lua_isinteger(lua, 3)) size = (tb_long_t)lua_tointeger(lua, 3);
     if (size <= 0)
     {
         lua_pushinteger(lua, -1);
diff --git a/core/src/xmake/lz4/decompress_stream_write.c b/core/src/xmake/lz4/decompress_stream_write.c
index 60fbb4f58..74fe0dae1 100644
--- a/core/src/xmake/lz4/decompress_stream_write.c
+++ b/core/src/xmake/lz4/decompress_stream_write.c
@@ -54,8 +54,8 @@ tb_int_t xm_lz4_decompress_stream_write(lua_State* lua)
     // get data and size
     tb_size_t        size = 0;
     tb_byte_t const* data = tb_null;
-    if (lua_isinteger(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
-    if (lua_isinteger(lua, 3)) size = (tb_size_t)lua_tointeger(lua, 3);
+    if (xm_lua_isinteger(lua, 2)) data = (tb_byte_t const*)(tb_size_t)(tb_long_t)lua_tointeger(lua, 2);
+    if (xm_lua_isinteger(lua, 3)) size = (tb_size_t)lua_tointeger(lua, 3);
     if (!data || !size)
     {
         lua_pushinteger(lua, -1);
diff --git a/core/src/xmake/prefix.h b/core/src/xmake/prefix.h
index fabb775fb..5d6fba582 100644
--- a/core/src/xmake/prefix.h
+++ b/core/src/xmake/prefix.h
@@ -130,6 +130,15 @@ static __tb_inline__ tb_void_t xm_lua_register(lua_State *lua, tb_char_t const*
 #endif
 }
 
+static __tb_inline__ tb_int_t xm_lua_isinteger(lua_State* lua, int idx)
+{
+#ifdef USE_LUAJIT
+    return lua_isnumber(lua, idx);
+#else
+    return lua_isinteger(lua, idx);
+#endif
+}
+
 #endif