pull request for port luvi to Lua 5.3

CMakeLists.txt

@@ -92,9 +92,14 @@ else (WithSharedLibluv)
   set(BUILD_MODULE OFF CACHE STRING "Build luv as static library")
   include_directories(deps/luv/src)
   include_directories(deps/luv/deps/libuv/include)
-  include_directories(deps/luv/deps/luajit/src)
+  if (WITH_LUA_ENGINE STREQUAL Lua)
+    include_directories(deps/luv/deps/lua/src)
+    set(LUVI_LIBRARIES luv lualib uv)
+  else()
+    include_directories(deps/luv/deps/luajit/src)
+    set(LUVI_LIBRARIES luv luajit-5.1 uv)
+  endif()
   add_subdirectory(deps/luv)
-  set(LUVI_LIBRARIES luv luajit-5.1 uv)
 endif (WithSharedLibluv)
 
 
@@ -118,7 +123,8 @@ add_definitions( -DLUVI_VERSION="${LUVI_VERSION}" )
 
 if(MSVC)
   set(winsvc src/winsvc.h src/winsvcaux.h src/winsvc.c src/winsvcaux.c)
-  add_definitions( -DWITH_WINSVC -DLUA_BUILD_AS_DLL -DLUA_LIB -DBUILDING_UV_SHARED )
+  add_definitions( -DWITH_WINSVC -DLUA_BUILD_AS_DLL -DBUILDING_UV_SHARED )
+  add_definitions( -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS )
 
   add_library (luvi_renamed src/luvi_renamed.c)
 endif()
@@ -127,7 +133,11 @@ if(UNIX)
   add_definitions(-Wall)
 endif()
 
-luajit_add_executable(luvi
+if (WITH_LUA_ENGINE STREQUAL Lua)
+  add_definitions(-DWITH_PLAIN_LUA)
+endif ()
+
+lua_add_executable(luvi
   ${winsvc}
   src/main.c
   src/lua/init.lua

deps/bit.c

@@ -0,0 +1,192 @@
+/*
+** Lua BitOp -- a bit operations library for Lua 5.1/5.2.
+** http://bitop.luajit.org/
+**
+** Copyright (C) 2008-2012 Mike Pall. All rights reserved.
+**
+** Permission is hereby granted, free of charge, to any person obtaining
+** a copy of this software and associated documentation files (the
+** "Software"), to deal in the Software without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Software, and to
+** permit persons to whom the Software is furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be
+** included in all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+**
+** [ MIT license: http://www.opensource.org/licenses/mit-license.php ]
+*/
+
+#define LUA_BITOP_VERSION	"1.0.2"
+
+#define LUA_LIB
+#include "lua.h"
+#include "lauxlib.h"
+
+#ifdef _MSC_VER
+/* MSVC is stuck in the last century and doesn't have C99's stdint.h. */
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <stdint.h>
+#endif
+
+typedef int32_t SBits;
+typedef uint32_t UBits;
+
+typedef union {
+  lua_Number n;
+#ifdef LUA_NUMBER_DOUBLE
+  uint64_t b;
+#else
+  UBits b;
+#endif
+} BitNum;
+
+/* Convert argument to bit type. */
+static UBits barg(lua_State *L, int idx)
+{
+  BitNum bn;
+  UBits b;
+#if LUA_VERSION_NUM < 502
+  bn.n = lua_tonumber(L, idx);
+#elif LUA_VERSION_NUM >= 503
+  (void)bn;
+  b = (UBits)luaL_checkinteger(L, idx);
+#else
+  bn.n = luaL_checknumber(L, idx);
+#if defined(LUA_NUMBER_DOUBLE)
+  bn.n += 6755399441055744.0;  /* 2^52+2^51 */
+#ifdef SWAPPED_DOUBLE
+  b = (UBits)(bn.b >> 32);
+#else
+  b = (UBits)bn.b;
+#endif
+#elif defined(LUA_NUMBER_INT) || defined(LUA_NUMBER_LONG) || \
+      defined(LUA_NUMBER_LONGLONG) || defined(LUA_NUMBER_LONG_LONG) || \
+      defined(LUA_NUMBER_LLONG)
+  if (sizeof(UBits) == sizeof(lua_Number))
+    b = bn.b;
+  else
+    b = (UBits)(SBits)bn.n;
+#elif defined(LUA_NUMBER_FLOAT)
+#error "A 'float' lua_Number type is incompatible with this library"
+#else
+#error "Unknown number type, check LUA_NUMBER_* in luaconf.h"
+#endif
+#if LUA_VERSION_NUM < 502
+  if (b == 0 && !lua_isnumber(L, idx)) {
+    luaL_typerror(L, idx, "number");
+  }
+#endif
+#endif
+  return b;
+}
+
+/* Return bit type. */
+#define BRET(b)  lua_pushnumber(L, (lua_Number)(SBits)(b)); return 1;
+
+static int bit_tobit(lua_State *L) { BRET(barg(L, 1)) }
+static int bit_bnot(lua_State *L) { BRET(~barg(L, 1)) }
+
+#define BIT_OP(func, opr) \
+  static int func(lua_State *L) { int i; UBits b = barg(L, 1); \
+    for (i = lua_gettop(L); i > 1; i--) b opr barg(L, i); BRET(b) }
+BIT_OP(bit_band, &=)
+BIT_OP(bit_bor, |=)
+BIT_OP(bit_bxor, ^=)
+
+#define bshl(b, n)  (b << n)
+#define bshr(b, n)  (b >> n)
+#define bsar(b, n)  ((SBits)b >> n)
+#define brol(b, n)  ((b << n) | (b >> (32-n)))
+#define bror(b, n)  ((b << (32-n)) | (b >> n))
+#define BIT_SH(func, fn) \
+  static int func(lua_State *L) { \
+    UBits b = barg(L, 1); UBits n = barg(L, 2) & 31; BRET(fn(b, n)) }
+BIT_SH(bit_lshift, bshl)
+BIT_SH(bit_rshift, bshr)
+BIT_SH(bit_arshift, bsar)
+BIT_SH(bit_rol, brol)
+BIT_SH(bit_ror, bror)
+
+static int bit_bswap(lua_State *L)
+{
+  UBits b = barg(L, 1);
+  b = (b >> 24) | ((b >> 8) & 0xff00) | ((b & 0xff00) << 8) | (b << 24);
+  BRET(b)
+}
+
+static int bit_tohex(lua_State *L)
+{
+  UBits b = barg(L, 1);
+  SBits n = lua_isnone(L, 2) ? 8 : (SBits)barg(L, 2);
+  const char *hexdigits = "0123456789abcdef";
+  char buf[8];
+  int i;
+  if (n < 0) { n = -n; hexdigits = "0123456789ABCDEF"; }
+  if (n > 8) n = 8;
+  for (i = (int)n; --i >= 0; ) { buf[i] = hexdigits[b & 15]; b >>= 4; }
+  lua_pushlstring(L, buf, (size_t)n);
+  return 1;
+}
+
+static const struct luaL_Reg bit_funcs[] = {
+  { "tobit",	bit_tobit },
+  { "bnot",	bit_bnot },
+  { "band",	bit_band },
+  { "bor",	bit_bor },
+  { "bxor",	bit_bxor },
+  { "lshift",	bit_lshift },
+  { "rshift",	bit_rshift },
+  { "arshift",	bit_arshift },
+  { "rol",	bit_rol },
+  { "ror",	bit_ror },
+  { "bswap",	bit_bswap },
+  { "tohex",	bit_tohex },
+  { NULL, NULL }
+};
+
+/* Signed right-shifts are implementation-defined per C89/C99.
+** But the de facto standard are arithmetic right-shifts on two's
+** complement CPUs. This behaviour is required here, so test for it.
+*/
+#define BAD_SAR		(bsar(-8, 2) != (SBits)-2)
+
+LUALIB_API int luaopen_bit(lua_State *L)
+{
+  UBits b;
+  lua_pushnumber(L, (lua_Number)1437217655L);
+  b = barg(L, -1);
+  if (b != (UBits)1437217655L || BAD_SAR) {  /* Perform a simple self-test. */
+    const char *msg = "compiled with incompatible luaconf.h";
+#ifdef LUA_NUMBER_DOUBLE
+#ifdef _WIN32
+    if (b == (UBits)1610612736L)
+      msg = "use D3DCREATE_FPU_PRESERVE with DirectX";
+#endif
+    if (b == (UBits)1127743488L)
+      msg = "not compiled with SWAPPED_DOUBLE";
+#endif
+    if (BAD_SAR)
+      msg = "arithmetic right-shift broken";
+    luaL_error(L, "bit library self-test failed (%s)", msg);
+  }
+#if LUA_VERSION_NUM < 502
+  luaL_register(L, "bit", bit_funcs);
+#else
+  luaL_newlib(L, bit_funcs);
+#endif
+  return 1;
+}
+

deps/lrexlib.cmake

@@ -4,16 +4,14 @@ include_directories(
   ${LREXLIB_DIR}/src
 )
 
-add_definitions(
-  -DVERSION="2.8.0"
-)
-
 add_library(lrexlib
   ${LREXLIB_DIR}/src/common.c
   ${LREXLIB_DIR}/src/pcre/lpcre.c
   ${LREXLIB_DIR}/src/pcre/lpcre_f.c
 )
 
+set_target_properties(lrexlib PROPERTIES
+    COMPILE_FLAGS "-DLUA_LIB -DLUA_COMPAT_APIINTCASTS -DVERSION=\\\"2.8.0\\\"")
 target_link_libraries(lrexlib pcre)
 
 set(EXTRA_LIBS ${EXTRA_LIBS} lrexlib)

deps/lua-openssl.cmake

@@ -5,9 +5,10 @@ include_directories(
   ${LUA_OPENSSL_DIR}/src
 )
 
-add_definitions(
-  -DCOMPAT52_IS_LUAJIT
-)
+find_package(Threads)
+if (CMAKE_THREAD_LIBS_INIT)
+    add_definitions(-DPTHREADS)
+endif (CMAKE_THREAD_LIBS_INIT)
 
 add_library(lua_openssl
   ${LUA_OPENSSL_DIR}/src/asn1.c                       
@@ -49,6 +50,9 @@ add_library(lua_openssl
   ${LUA_OPENSSL_DIR}/src/xstore.c                     
 )
 
+set_target_properties(lua_openssl PROPERTIES
+    COMPILE_FLAGS "-DLUA_LIB -DCOMPAT52_IS_LUAJIT")
+
 if (WithSharedOpenSSL)
   target_link_libraries(lua_openssl ssl crypto)
 else (WithSharedOpenSSL)

deps/lua-zlib.cmake

@@ -14,6 +14,8 @@ add_library(lua_zlib
   ${LUA_ZLIB_DIR}/zlib.def
 )
 
+set_target_properties(lua_zlib PROPERTIES COMPILE_FLAGS -DLUA_LIB)
+
 target_link_libraries(lua_zlib ${LUA_ZLIB_LIB})
 
 set(EXTRA_LIBS ${EXTRA_LIBS} lua_zlib)

src/lenv.c

@@ -229,5 +229,39 @@ static const luaL_Reg lenv_f[] = {
 
 LUALIB_API int luaopen_env(lua_State *L) {
   luaL_newlib(L, lenv_f);
+#if defined(_WIN32) && !defined(_XBOX_VER)
+  lua_pushstring(L, "Windows");
+#elif defined(__linux__)
+  lua_pushstring(L, "Linux");
+#elif defined(__MACH__) && defined(__APPLE__)
+  lua_pushstring(L, "OSX");
+#elif (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
+       defined(__NetBSD__) || defined(__OpenBSD__) || \
+       defined(__DragonFly__)) && !defined(__ORBIS__)
+  lua_pushstring(L, "BSD");
+#elif (defined(__sun__) && defined(__svr4__)) || defined(__CYGWIN__)
+  lua_pushstring(L, "POSIX");
+#else
+  lua_pushstring(L, "Other");
+#endif
+  lua_setfield(L, -2, "os");
+
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
+  lua_pushstring(L, "x86");
+#elif defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
+  lua_pushstring(L, "x64");
+#elif defined(__arm__) || defined(__arm) || defined(__ARM__) || defined(__ARM)
+  lua_pushstring(L, "arm");
+#elif defined(__aarch64__)
+  lua_pushstring(L, "arm64");
+#elif defined(__ppc__) || defined(__ppc) || defined(__PPC__) || defined(__PPC) || defined(__powerpc__) || defined(__powerpc) || defined(__POWERPC__) || defined(__POWERPC) || defined(_M_PPC)
+  lua_pushstring(L, "ppc");
+#elif defined(__mips__) || defined(__mips) || defined(__MIPS__) || defined(__MIPS)
+  lua_pushstring(L, "mips");
+#else
+  lua_pushstring(L, "other");
+#endif
+  lua_setfield(L, -2, "arch");
+
   return 1;
 }

src/lminiz.c

@@ -91,7 +91,7 @@ static int lmz_reader_locate_file(lua_State *L) {
 
 static int lmz_reader_stat(lua_State* L) {
   lmz_file_t* zip = luaL_checkudata(L, 1, "miniz_reader");
-  mz_uint file_index = luaL_checkinteger(L, 2) - 1;
+  mz_uint file_index = (mz_uint)luaL_checkinteger(L, 2) - 1;
   mz_zip_archive_file_stat stat;
   if (!mz_zip_reader_file_stat(&(zip->archive), file_index, &stat)) {
     lua_pushnil(L);
@@ -130,7 +130,7 @@ static int lmz_reader_stat(lua_State* L) {
 
 static int lmz_reader_get_filename(lua_State* L) {
   lmz_file_t* zip = luaL_checkudata(L, 1, "miniz_reader");
-  mz_uint file_index = luaL_checkinteger(L, 2) - 1;
+  mz_uint file_index = (mz_uint)luaL_checkinteger(L, 2) - 1;
   char pFilename[PATH_MAX];
   mz_uint filename_buf_size = PATH_MAX;
   if (!mz_zip_reader_get_filename(&(zip->archive), file_index, pFilename, filename_buf_size)) {
@@ -144,14 +144,14 @@ static int lmz_reader_get_filename(lua_State* L) {
 
 static int lmz_reader_is_file_a_directory(lua_State  *L) {
   lmz_file_t* zip = luaL_checkudata(L, 1, "miniz_reader");
-  mz_uint file_index = luaL_checkinteger(L, 2) - 1;
+  mz_uint file_index = (mz_uint)luaL_checkinteger(L, 2) - 1;
   lua_pushboolean(L, mz_zip_reader_is_file_a_directory(&(zip->archive), file_index));
   return 1;
 }
 
 static int lmz_reader_extract(lua_State *L) {
   lmz_file_t* zip = luaL_checkudata(L, 1, "miniz_reader");
-  mz_uint file_index = luaL_checkinteger(L, 2) - 1;
+  mz_uint file_index = (mz_uint)luaL_checkinteger(L, 2) - 1;
   mz_uint flags = luaL_optint(L, 3, 0);
   size_t out_len;
   char* out_buf = mz_zip_reader_extract_to_heap(&(zip->archive), file_index, &out_len, flags);
@@ -185,7 +185,7 @@ static int lmz_writer_init(lua_State *L) {
 static int lmz_writer_add_from_zip_reader(lua_State *L) {
   lmz_file_t* zip = luaL_checkudata(L, 1, "miniz_writer");
   lmz_file_t* source = luaL_checkudata(L, 2, "miniz_reader");
-  mz_uint file_index = luaL_checkinteger(L, 3) - 1;
+  mz_uint file_index = (mz_uint)luaL_checkinteger(L, 3) - 1;
   if (!mz_zip_writer_add_from_zip_reader(&(zip->archive), &(source->archive), file_index)) {
     return luaL_error(L, "Failure to copy file between zips");
   }

src/lua/luvibundle.lua

@@ -5,6 +5,9 @@ local luviPath = require('luvipath')
 local pathJoin = luviPath.pathJoin
 local getenv = require('os').getenv
 
+loadstring = loadstring or load
+unpack     = unpack     or table.unpack
+
 local tmpBase = luviPath.isWindows and (getenv("TMP") or uv.cwd()) or
                                        (getenv("TMPDIR") or '/tmp')