Scripting: Fix Lua 5.1/LuaJIT and Lua 5.2 problems

This commit is contained in:
Nuive 2024-12-16 22:41:10 +01:00
parent 1983d0f42c
commit 2afea18df0
3 changed files with 423 additions and 6 deletions

View File

@ -768,7 +768,9 @@ endif()
if(ENABLE_SCRIPTING) if(ENABLE_SCRIPTING)
list(APPEND ENABLES SCRIPTING) list(APPEND ENABLES SCRIPTING)
find_feature(USE_JSON_C "json-c") find_feature(USE_JSON_C "json-c")
if(NOT USE_LUA VERSION_LESS 5.1) if(USE_LUA STREQUAL "JIT")
find_feature(USE_LUA "Lua${USE_LUA}")
elseif(NOT USE_LUA VERSION_LESS 5.1)
find_feature(USE_LUA "Lua" ${USE_LUA}) find_feature(USE_LUA "Lua" ${USE_LUA})
else() else()
find_feature(USE_LUA "Lua") find_feature(USE_LUA "Lua")
@ -799,11 +801,18 @@ if(ENABLE_SCRIPTING)
endif() endif()
if(USE_LUA) if(USE_LUA)
list(APPEND FEATURE_DEFINES USE_LUA) list(APPEND FEATURE_DEFINES USE_LUA)
if(USE_LUA STREQUAL "JIT")
include_directories(AFTER ${LUAJIT_INCLUDE_DIR})
list(APPEND FEATURE_DEFINES LUA_VERSION_ONLY=\"${LUAJIT_VERSION_MAJOR}.${LUAJIT_VERSION_MINOR}\")
list(APPEND DEPENDENCY_LIB ${LUAJIT_LIBRARY})
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},libluajit${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}-0")
else()
include_directories(AFTER ${LUA_INCLUDE_DIR}) include_directories(AFTER ${LUA_INCLUDE_DIR})
list(APPEND FEATURE_DEFINES LUA_VERSION_ONLY=\"${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}\") list(APPEND FEATURE_DEFINES LUA_VERSION_ONLY=\"${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}\")
list(APPEND DEPENDENCY_LIB ${LUA_LIBRARY}) list(APPEND DEPENDENCY_LIB ${LUA_LIBRARY})
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},liblua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}-0") set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},liblua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}-0")
endif() endif()
endif()
if(BUILD_PYTHON) if(BUILD_PYTHON)
find_package(PythonLibs ${USE_PYTHON_VERSION}) find_package(PythonLibs ${USE_PYTHON_VERSION})
@ -1308,7 +1317,9 @@ if(NOT QUIET AND NOT LIBMGBA_ONLY)
message(STATUS " OpenGL support: ${SUMMARY_GL}") message(STATUS " OpenGL support: ${SUMMARY_GL}")
message(STATUS "Scripting support: ${ENABLE_SCRIPTING}") message(STATUS "Scripting support: ${ENABLE_SCRIPTING}")
if(ENABLE_SCRIPTING) if(ENABLE_SCRIPTING)
if(LUA_VERSION_STRING) if(LUAJIT_VERSION_STRING)
message(STATUS " Lua: JIT ${LUAJIT_VERSION_STRING}")
elseif(LUA_VERSION_STRING)
message(STATUS " Lua: ${LUA_VERSION_STRING}") message(STATUS " Lua: ${LUA_VERSION_STRING}")
else() else()
message(STATUS " Lua: ${USE_LUA}") message(STATUS " Lua: ${USE_LUA}")

View File

@ -0,0 +1,319 @@
#[=======================================================================[.rst:
FindLuaJIT
-------
Locate LuaJIT library.
This module defines:
``LUAJIT_FOUND``
if false, do not try to link to LuaJIT
``LUAJIT_LIBRARIES``
both luajit and luajitlib
``LUAJIT_INCLUDE_DIR``
where to find lua.h
``LUAJIT_VERSION_STRING``
the version of LuaJIT found
``LUAJIT_VERSION_MAJOR``
the major version of LuaJIT
``LUAJIT_VERSION_MINOR``
the minor version of LuaJIT
``LUAJIT_VERSION_PATCH``
the patch version of LuaJIT
Note that the expected include convention is
::
#include "lua.h"
and not
::
#include <lua/lua.h>
This is because, the lua location is not standardized and may exist in
locations other than lua/
#]=======================================================================]
cmake_policy(PUSH) # Policies apply to functions at definition-time
cmake_policy(SET CMP0012 NEW) # For while(TRUE)
unset(_luajit_include_subdirs)
unset(_luajit_library_names)
unset(_luajit_append_versions)
# this is a function only to have all the variables inside go away automatically
function(_lua_get_versions)
set(LUA_VERSIONS5 5.4 5.3 5.2 5.1 5.0)
if (Lua_FIND_VERSION_EXACT)
if (Lua_FIND_VERSION_COUNT GREATER 1)
set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
endif ()
elseif (Lua_FIND_VERSION)
# once there is a different major version supported this should become a loop
if (NOT Lua_FIND_VERSION_MAJOR GREATER 5)
if (Lua_FIND_VERSION_COUNT EQUAL 1)
set(_lua_append_versions ${LUA_VERSIONS5})
else ()
foreach (subver IN LISTS LUA_VERSIONS5)
if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
list(APPEND _lua_append_versions ${subver})
endif ()
endforeach ()
# New version -> Search for it (heuristic only! Defines in include might have changed)
if (NOT _lua_append_versions)
set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
endif()
endif ()
endif ()
else ()
# once there is a different major version supported this should become a loop
set(_lua_append_versions ${LUA_VERSIONS5})
endif ()
if (LUA_Debug)
message(STATUS "Considering following Lua versions: ${_lua_append_versions}")
endif()
set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE)
endfunction()
function(_luajit_get_versions)
set(LUAJIT_VERSIONS2 2.1 2.0)
if (LuaJIT_FIND_VERSION_EXACT)
if (LuaJIT_FIND_VERSION_COUNT GREATER 1)
set(_luajit_append_versions ${LuaJIT_FIND_VERSION_MAJOR}.${LuaJIT_FIND_VERSION_MINOR})
endif ()
elseif (LuaJIT_FIND_VERSION)
# once there is a different major version supported this should become a loop
if (NOT LuaJIT_FIND_VERSION_MAJOR GREATER 2)
if (LuaJIT_FIND_VERSION_COUNT EQUAL 1)
set(_luajit_append_versions ${LUAJIT_VERSIONS2})
else ()
foreach (subver IN LISTS LUAJIT_VERSIONS2)
if (NOT subver VERSION_LESS ${LuaJIT_FIND_VERSION})
list(APPEND _luajit_append_versions ${subver})
endif ()
endforeach ()
# New version -> Search for it (heuristic only! Defines in include might have changed)
if (NOT _luajit_append_versions)
set(_luajit_append_versions ${LuaJIT_FIND_VERSION_MAJOR}.${LuaJIT_FIND_VERSION_MINOR})
endif()
endif ()
endif ()
else ()
# once there is a different major version supported this should become a loop
set(_luajit_append_versions ${LUAJIT_VERSIONS2})
endif ()
if (LUAJIT_Debug)
message(STATUS "Considering following LuaJIT versions: ${_luajit_append_versions}")
endif()
set(_luajit_append_versions "${_luajit_append_versions}" PARENT_SCOPE)
endfunction()
function(_luajit_set_version_vars)
set(_luajit_include_subdirs_raw "luajit")
foreach (ver IN LISTS _luajit_append_versions)
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
if (_ver)
string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)$" "\\1" _version_major "${ver}")
string(REGEX REPLACE "^([0-9]+)\\.([0-9]+)$" "\\2" _version_minor "${ver}")
list(APPEND _luajit_include_subdirs_raw
luajit${_version_major}${_version_minor}
luajit${_version_major}.${_version_minor}
luajit-${_version_major}.${_version_minor}
)
endif ()
endforeach ()
# Prepend "include/" to each path directly after the path
set(_luajit_include_subdirs "include")
foreach (dir IN LISTS _luajit_include_subdirs_raw)
list(APPEND _luajit_include_subdirs "${dir}" "include/${dir}")
endforeach ()
set(_luajit_include_subdirs "${_luajit_include_subdirs}" PARENT_SCOPE)
endfunction(_luajit_set_version_vars)
function(_lua_get_header_version)
unset(LUA_VERSION_STRING PARENT_SCOPE)
set(_hdr_file "${LUAJIT_INCLUDE_DIR}/lua.h")
if (NOT EXISTS "${_hdr_file}")
return()
endif ()
# At least 5.[012] have different ways to express the version
# so all of them need to be tested. Lua 5.2 defines LUA_VERSION
# and LUA_RELEASE as joined by the C preprocessor, so avoid those.
file(STRINGS "${_hdr_file}" lua_version_strings
REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*")
string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};")
if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$")
string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};")
string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};")
set(LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}")
else ()
string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$")
string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
endif ()
string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}")
endif ()
foreach (ver IN LISTS _lua_append_versions)
if (ver STREQUAL "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}")
set(LUA_VERSION_MAJOR ${LUA_VERSION_MAJOR} PARENT_SCOPE)
set(LUA_VERSION_MINOR ${LUA_VERSION_MINOR} PARENT_SCOPE)
set(LUA_VERSION_PATCH ${LUA_VERSION_PATCH} PARENT_SCOPE)
set(LUA_VERSION_STRING ${LUA_VERSION_STRING} PARENT_SCOPE)
return()
endif ()
endforeach ()
endfunction(_lua_get_header_version)
function(_luajit_get_header_version)
unset(LUAJIT_VERSION_STRING PARENT_SCOPE)
set(_hdr_file "${LUAJIT_INCLUDE_DIR}/luajit.h")
if (NOT EXISTS "${_hdr_file}")
return()
endif ()
file(STRINGS "${_hdr_file}" luajit_version_strings
REGEX "^#define[ \t]+LUAJIT_VERSION[ \t]+\"LuaJIT [0-9].*")
string(REGEX REPLACE ".*;#define[ \t]+LUAJIT_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUAJIT_VERSION_MAJOR ";${luajit_version_strings};")
if (LUAJIT_VERSION_MAJOR MATCHES "^[0-9]+$")
string(REGEX REPLACE ".*;#define[ \t]+LUAJIT_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUAJIT_VERSION_MINOR ";${luajit_version_strings};")
string(REGEX REPLACE ".*;#define[ \t]+LUAJIT_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUAJIT_VERSION_PATCH ";${luajit_version_strings};")
set(LUAJIT_VERSION_STRING "${LUAJIT_VERSION_MAJOR}.${LUAJIT_VERSION_MINOR}.${LUAJIT_VERSION_PATCH}")
else ()
string(REGEX REPLACE ".*;#define[ \t]+LUAJIT_VERSION[ \t]+\"LuaJIT ([0-9.]+[^\"]*)\"[ \t]*;.*" "\\1" LUAJIT_VERSION_STRING ";${luajit_version_strings};")
string(REGEX REPLACE "^([0-9]+)\\.[^\"]*$" "\\1" LUAJIT_VERSION_MAJOR "${LUAJIT_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[^\"]*$" "\\1" LUAJIT_VERSION_MINOR "${LUAJIT_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUAJIT_VERSION_PATCH "${LUAJIT_VERSION_STRING}")
endif ()
foreach (ver IN LISTS _luajit_append_versions)
if (ver STREQUAL "${LUAJIT_VERSION_MAJOR}.${LUAJIT_VERSION_MINOR}")
set(LUAJIT_VERSION_MAJOR ${LUAJIT_VERSION_MAJOR} PARENT_SCOPE)
set(LUAJIT_VERSION_MINOR ${LUAJIT_VERSION_MINOR} PARENT_SCOPE)
set(LUAJIT_VERSION_PATCH ${LUAJIT_VERSION_PATCH} PARENT_SCOPE)
set(LUAJIT_VERSION_STRING ${LUAJIT_VERSION_STRING} PARENT_SCOPE)
return()
endif ()
endforeach ()
endfunction(_luajit_get_header_version)
function(_luajit_find_header)
_luajit_set_version_vars()
# Initialize as local variable
set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH})
while (TRUE)
# Find the next header to test. Check each possible subdir in order
# This prefers e.g. higher versions as they are earlier in the list
foreach (subdir IN LISTS _luajit_include_subdirs)
find_path(LUAJIT_INCLUDE_DIR luajit.h
HINTS ENV LUAJIT_DIR
PATH_SUFFIXES ${subdir}
)
if (LUAJIT_INCLUDE_DIR)
break()
endif()
endforeach()
# Did not found header -> Fail
if (NOT LUAJIT_INCLUDE_DIR)
return()
endif()
_luajit_get_header_version()
# Found accepted version -> Ok
if (LUAJIT_VERSION_STRING)
if (LUAJIT_Debug)
message(STATUS "Found suitable version ${LUAJIT_VERSION_STRING} in ${LUAJIT_INCLUDE_DIR}/lua.h")
endif()
return()
endif()
# Found wrong version -> Ignore this path and retry
if (LUAJIT_Debug)
message(STATUS "Ignoring unsuitable version in ${LUAJIT_INCLUDE_DIR}")
endif()
list(APPEND CMAKE_IGNORE_PATH "${LUAJIT_INCLUDE_DIR}")
unset(LUAJIT_INCLUDE_DIR CACHE)
unset(LUAJIT_INCLUDE_DIR)
unset(LUAJIT_INCLUDE_DIR PARENT_SCOPE)
endwhile ()
endfunction()
_lua_get_versions()
_luajit_get_versions()
_luajit_find_header()
_lua_get_header_version()
_luajit_get_header_version()
unset(_lua_append_versions)
unset(_luajit_append_versions)
if (LUAJIT_VERSION_STRING)
set(_luajit_library_names
luajit${LUAJIT_VERSION_MAJOR}${LUAJIT_VERSION_MINOR}
luajit${LUAJIT_VERSION_MAJOR}.${LUAJIT_VERSION_MINOR}
luajit-${LUAJIT_VERSION_MAJOR}.${LUAJIT_VERSION_MINOR}
luajit.${LUAJIT_VERSION_MAJOR}.${LUAJIT_VERSION_MINOR}
)
endif ()
if (LUA_VERSION_STRING)
list(APPEND _luajit_library_names
lua${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}
lua${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
lua-${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
lua.${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}
)
endif ()
find_library(LUAJIT_LIBRARY
NAMES ${_luajit_library_names} luajit
NAMES_PER_DIR
HINTS
ENV LUAJIT_DIR
PATH_SUFFIXES lib
)
unset(_luajit_library_names)
if (LUAJIT_LIBRARY)
# include the math library for Unix
if (UNIX AND NOT APPLE AND NOT BEOS)
find_library(LUAJIT_MATH_LIBRARY m)
mark_as_advanced(LUAJIT_MATH_LIBRARY)
set(LUAJIT_LIBRARIES "${LUAJIT_LIBRARY};${LUAJIT_MATH_LIBRARY}")
# include dl library for statically-linked Lua library
get_filename_component(LUAJIT_LIB_EXT ${LUAJIT_LIBRARY} EXT)
if(LUAJIT_LIB_EXT STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX)
list(APPEND LUAJIT_LIBRARIES ${CMAKE_DL_LIBS})
endif()
# For Windows and Mac, don't need to explicitly include the math library
else ()
set(LUAJIT_LIBRARIES "${LUAJIT_LIBRARY}")
endif ()
endif ()
# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if
# all listed variables are TRUE
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LuaJIT
REQUIRED_VARS LUAJIT_LIBRARIES LUAJIT_INCLUDE_DIR
VERSION_VAR LUAJIT_VERSION_STRING)
mark_as_advanced(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARY)
cmake_policy(POP)

View File

@ -215,6 +215,66 @@ static const int _mScriptSocketNumErrors = sizeof(_mScriptSocketErrors) / sizeof
#if LUA_VERSION_NUM < 503 #if LUA_VERSION_NUM < 503
#define lua_pushinteger lua_pushnumber #define lua_pushinteger lua_pushnumber
static int _luaPairs(lua_State* lua) {
luaL_checkany(lua, 1);
if (luaL_getmetafield(lua, 1, "__pairs") == LUA_TNIL) {
lua_getglobal(lua, "next");
lua_pushvalue(lua, 1);
lua_pushnil(lua);
} else {
lua_pushvalue(lua, 1);
lua_call(lua, 1, 3);
}
return 3;
}
static int _luaIpairsIter(lua_State* lua) {
lua_Integer i = luaL_checkinteger(lua, 2) + 1;
lua_pushinteger(lua, i);
lua_pushvalue(lua, -1);
lua_gettable(lua, 1);
return (lua_type(lua, -1) == LUA_TNIL) ? 1 : 2;
}
static int _luaIpairs(lua_State* lua) {
luaL_checkany(lua, 1);
lua_pushcfunction(lua, _luaIpairsIter);
lua_pushvalue(lua, 1);
lua_pushinteger(lua, 0);
return 3;
}
const char* luaL_tolstring (lua_State* lua, int idx, size_t* len) {
if (luaL_callmeta(lua, idx, "__tostring")) {
if (!lua_isstring(lua, -1)) {
luaL_error(lua, "'__tostring' must return a string");
}
} else {
switch (lua_type(lua, idx)) {
case LUA_TNUMBER:
case LUA_TSTRING:
lua_pushvalue(lua, idx);
break;
case LUA_TBOOLEAN:
lua_pushstring(lua, (lua_toboolean(lua, idx) ? "true" : "false"));
break;
case LUA_TNIL:
lua_pushliteral(lua, "nil");
break;
default:
luaL_getmetafield(lua, idx, "__name");
int tt = lua_type(lua, -1);
const char* name = (tt == LUA_TSTRING) ? lua_tostring(lua, -1) :
luaL_typename(lua, idx);
lua_pushfstring(lua, "%s: %p", name, lua_topointer(lua, idx));
if (tt != LUA_TNIL)
lua_remove(lua, -2);
break;
}
}
return lua_tolstring(lua, -1, len);
}
#endif #endif
#ifndef LUA_OK #ifndef LUA_OK
@ -226,6 +286,7 @@ static const int _mScriptSocketNumErrors = sizeof(_mScriptSocketErrors) / sizeof
#define lua_pushglobaltable(L) lua_pushvalue(L, LUA_GLOBALSINDEX) #define lua_pushglobaltable(L) lua_pushvalue(L, LUA_GLOBALSINDEX)
#endif #endif
const struct mScriptType mSTLuaFunc; const struct mScriptType mSTLuaFunc;
mSCRIPT_DECLARE_DOC_STRUCT(LUA_NAME, socket); mSCRIPT_DECLARE_DOC_STRUCT(LUA_NAME, socket);
@ -390,6 +451,8 @@ struct mScriptEngineContext* _luaCreate(struct mScriptEngine2* engine, struct mS
luaL_newmetatable(luaContext->lua, "mSTStruct"); luaL_newmetatable(luaContext->lua, "mSTStruct");
#if LUA_VERSION_NUM < 502 #if LUA_VERSION_NUM < 502
lua_pushliteral(luaContext->lua, "mSTStruct");
lua_setfield(luaContext->lua, -2, "__name");
luaL_register(luaContext->lua, NULL, _mSTStruct); luaL_register(luaContext->lua, NULL, _mSTStruct);
#else #else
luaL_setfuncs(luaContext->lua, _mSTStruct, 0); luaL_setfuncs(luaContext->lua, _mSTStruct, 0);
@ -398,6 +461,8 @@ struct mScriptEngineContext* _luaCreate(struct mScriptEngine2* engine, struct mS
luaL_newmetatable(luaContext->lua, "mSTTable"); luaL_newmetatable(luaContext->lua, "mSTTable");
#if LUA_VERSION_NUM < 502 #if LUA_VERSION_NUM < 502
lua_pushliteral(luaContext->lua, "mSTTable");
lua_setfield(luaContext->lua, -2, "__name");
luaL_register(luaContext->lua, NULL, _mSTTable); luaL_register(luaContext->lua, NULL, _mSTTable);
#else #else
luaL_setfuncs(luaContext->lua, _mSTTable, 0); luaL_setfuncs(luaContext->lua, _mSTTable, 0);
@ -406,6 +471,8 @@ struct mScriptEngineContext* _luaCreate(struct mScriptEngine2* engine, struct mS
luaL_newmetatable(luaContext->lua, "mSTList"); luaL_newmetatable(luaContext->lua, "mSTList");
#if LUA_VERSION_NUM < 502 #if LUA_VERSION_NUM < 502
lua_pushliteral(luaContext->lua, "mSTList");
lua_setfield(luaContext->lua, -2, "__name");
luaL_register(luaContext->lua, NULL, _mSTList); luaL_register(luaContext->lua, NULL, _mSTList);
#else #else
luaL_setfuncs(luaContext->lua, _mSTList, 0); luaL_setfuncs(luaContext->lua, _mSTList, 0);
@ -415,6 +482,14 @@ struct mScriptEngineContext* _luaCreate(struct mScriptEngine2* engine, struct mS
lua_getglobal(luaContext->lua, "require"); lua_getglobal(luaContext->lua, "require");
luaContext->require = luaL_ref(luaContext->lua, LUA_REGISTRYINDEX); luaContext->require = luaL_ref(luaContext->lua, LUA_REGISTRYINDEX);
#if LUA_VERSION_NUM < 503
lua_pushcfunction(luaContext->lua, _luaIpairs);
lua_setglobal(luaContext->lua, "ipairs");
lua_pushcfunction(luaContext->lua, _luaPairs);
lua_setglobal(luaContext->lua, "pairs");
#endif
lua_pushliteral(luaContext->lua, "log"); lua_pushliteral(luaContext->lua, "log");
lua_pushcclosure(luaContext->lua, _luaPrintShim, 1); lua_pushcclosure(luaContext->lua, _luaPrintShim, 1);
lua_setglobal(luaContext->lua, "print"); lua_setglobal(luaContext->lua, "print");
@ -976,11 +1051,19 @@ bool _luaLoad(struct mScriptEngineContext* ctx, const char* filename, struct VFi
// Make the old _ENV the __index in the metatable // Make the old _ENV the __index in the metatable
lua_newtable(luaContext->lua); lua_newtable(luaContext->lua);
lua_pushliteral(luaContext->lua, "__index"); lua_pushliteral(luaContext->lua, "__index");
#if LUA_VERSION_NUM >= 502
lua_getupvalue(luaContext->lua, -4, 1); lua_getupvalue(luaContext->lua, -4, 1);
#else
lua_getfenv(luaContext->lua, -4);
#endif
lua_rawset(luaContext->lua, -3); lua_rawset(luaContext->lua, -3);
lua_pushliteral(luaContext->lua, "__newindex"); lua_pushliteral(luaContext->lua, "__newindex");
#if LUA_VERSION_NUM >= 502
lua_getupvalue(luaContext->lua, -4, 1); lua_getupvalue(luaContext->lua, -4, 1);
#else
lua_getfenv(luaContext->lua, -4);
#endif
lua_rawset(luaContext->lua, -3); lua_rawset(luaContext->lua, -3);
lua_setmetatable(luaContext->lua, -2); lua_setmetatable(luaContext->lua, -2);
@ -1006,7 +1089,11 @@ bool _luaLoad(struct mScriptEngineContext* ctx, const char* filename, struct VFi
} }
lua_rawset(luaContext->lua, -3); lua_rawset(luaContext->lua, -3);
#if LUA_VERSION_NUM >= 502
lua_setupvalue(luaContext->lua, -2, 1); lua_setupvalue(luaContext->lua, -2, 1);
#else
lua_setfenv(luaContext->lua, -2);
#endif
luaContext->func = luaL_ref(luaContext->lua, LUA_REGISTRYINDEX); luaContext->func = luaL_ref(luaContext->lua, LUA_REGISTRYINDEX);
return true; return true;
case LUA_ERRSYNTAX: case LUA_ERRSYNTAX: