Remove the LuaJIT 2.0 compatibility shims.

diff --git a/README b/README
index 85a86f70dcd511f6af890b41baa8c5990a324c04..cd85e54fa12759449cdb77893ac0e5ccef4bd375 100644 (file)
--- a/README
+++ b/README
@@ -70,7 +70,7 @@ Nageru currently needs:
  - libzita-resampler, for resampling sound sources so that they are in sync
    between sources, and also for oversampling for the peak meter.
 
- - LuaJIT, for driving the theme engine.
+ - LuaJIT, for driving the theme engine. You will need at least version 2.1.
 
  - SQLite, for storing Futatabi state.
 
@@ -237,27 +237,3 @@ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
-
-
-Marked parts of theme.cpp (Lua shims):
-
-The MIT License (MIT)
-
-Copyright (c) 2013 Hisham Muhammad
-
-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.

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index ca4de4fdb22029037438bcedde53769ae03276c6..c926dd4591a63180f36c77d3a45afb17cc39b407 100644 (file)
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -38,67 +38,6 @@
 #include "input_state.h"
 #include "pbo_frame_allocator.h"
 
-#if !defined LUA_VERSION_NUM || LUA_VERSION_NUM==501
-
-// Compatibility shims for LuaJIT 2.0 (LuaJIT 2.1 implements the entire Lua 5.2 API).
-// Adapted from https://github.com/keplerproject/lua-compat-5.2/blob/master/c-api/compat-5.2.c
-// and licensed as follows:
-//
-// The MIT License (MIT)
-//
-// Copyright (c) 2013 Hisham Muhammad
-//
-// 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.
-
-/*
-** Adapted from Lua 5.2.0
-*/
-void luaL_setfuncs(lua_State *L, const luaL_Reg *l, int nup) {
-       luaL_checkstack(L, nup+1, "too many upvalues");
-       for (; l->name != NULL; l++) {  /* fill the table with given functions */
-               int i;
-               lua_pushstring(L, l->name);
-               for (i = 0; i < nup; i++)  /* copy upvalues to the top */
-                       lua_pushvalue(L, -(nup + 1));
-               lua_pushcclosure(L, l->func, nup);  /* closure with those upvalues */
-               lua_settable(L, -(nup + 3)); /* table must be below the upvalues, the name and the closure */
-       }
-       lua_pop(L, nup);  /* remove upvalues */
-}
-
-void *luaL_testudata(lua_State *L, int i, const char *tname) {
-       void *p = lua_touserdata(L, i);
-       luaL_checkstack(L, 2, "not enough stack slots");
-       if (p == NULL || !lua_getmetatable(L, i))
-               return NULL;
-       else {
-               int res = 0;
-               luaL_getmetatable(L, tname);
-               res = lua_rawequal(L, -1, -2);
-               lua_pop(L, 2);
-               if (!res)
-                       p = NULL;
-       }
-       return p;
-}
-
-#endif
-
 class Mixer;
 
 namespace movit {