summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarmist2012-03-26 18:48:24 +0300
committerWarmist2012-03-26 18:48:24 +0300
commit3761426ef5ce79696ef942547b3fbcd7b4f3fcae (patch)
tree5586f5ecae14439a975682c26a58307e82232a53
parent18c94f8000ab0f395d7897b0f33a5665d1a77b9d (diff)
downloaddfhack-3761426ef5ce79696ef942547b3fbcd7b4f3fcae.tar.gz
dfhack-3761426ef5ce79696ef942547b3fbcd7b4f3fcae.tar.bz2
dfhack-3761426ef5ce79696ef942547b3fbcd7b4f3fcae.tar.xz
Extern "C" mess fixed, bitlib mess fixed, bitlib added to autoload.
-rw-r--r--depends/lua/CMakeLists.txt1
-rw-r--r--depends/lua/src/linit.c3
-rw-r--r--plugins/Dfusion/include/bit.h17
-rw-r--r--plugins/Dfusion/include/lua_Misc.h1
-rw-r--r--plugins/Dfusion/include/luamain.h4
-rw-r--r--plugins/Dfusion/include/luaxx.hpp5
-rw-r--r--plugins/Dfusion/include/lune.h4
-rw-r--r--plugins/Dfusion/src/bit.c181
-rw-r--r--plugins/Dfusion/src/lua_Misc.cpp1
9 files changed, 10 insertions, 207 deletions
diff --git a/depends/lua/CMakeLists.txt b/depends/lua/CMakeLists.txt
index aa0a1b91..3770986d 100644
--- a/depends/lua/CMakeLists.txt
+++ b/depends/lua/CMakeLists.txt
@@ -76,6 +76,7 @@ src/ltm.c
src/lundump.c
src/lvm.c
src/lzio.c
+src/bit.c
)
# compile with C++ compiler
set_source_files_properties(${SRC_LIBLUA} PROPERTIES LANGUAGE CXX)
diff --git a/depends/lua/src/linit.c b/depends/lua/src/linit.c
index c1f90dfa..198d786e 100644
--- a/depends/lua/src/linit.c
+++ b/depends/lua/src/linit.c
@@ -12,7 +12,7 @@
#include "lualib.h"
#include "lauxlib.h"
-
+#include "bit.h"
static const luaL_Reg lualibs[] = {
{"", luaopen_base},
@@ -23,6 +23,7 @@ static const luaL_Reg lualibs[] = {
{LUA_STRLIBNAME, luaopen_string},
{LUA_MATHLIBNAME, luaopen_math},
{LUA_DBLIBNAME, luaopen_debug},
+ {"bit",luaopen_bit},
{NULL, NULL}
};
diff --git a/plugins/Dfusion/include/bit.h b/plugins/Dfusion/include/bit.h
deleted file mode 100644
index b75fdf05..00000000
--- a/plugins/Dfusion/include/bit.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef BIT_H
-#define BIT_H
-
-#define LUA_BITOP_VERSION "1.0.1"
-
-#define LUA_LIB
-#include "lua.h"
-#include "lauxlib.h"
-#ifdef __cplusplus
- extern "C" {
-#endif
-LUALIB_API int luaopen_bit(lua_State *L);
-#ifdef __cplusplus
- }
-#endif
-#endif // BIT_H
-
diff --git a/plugins/Dfusion/include/lua_Misc.h b/plugins/Dfusion/include/lua_Misc.h
index 8bada83c..4df1f362 100644
--- a/plugins/Dfusion/include/lua_Misc.h
+++ b/plugins/Dfusion/include/lua_Misc.h
@@ -7,7 +7,6 @@
#include <MemAccess.h>
#include "luamain.h"
#include "OutFile.h"
-#include "bit.h"
#include "functioncall.h"
namespace lua
diff --git a/plugins/Dfusion/include/luamain.h b/plugins/Dfusion/include/luamain.h
index 89524a52..eaff9758 100644
--- a/plugins/Dfusion/include/luamain.h
+++ b/plugins/Dfusion/include/luamain.h
@@ -5,11 +5,11 @@ using std::string;
-extern "C" {
+
#include "lua.h"
#include "lauxlib.h"
#include "lualib.h"
-}
+
#include "lune.h"
#include "luaxx.hpp"
diff --git a/plugins/Dfusion/include/luaxx.hpp b/plugins/Dfusion/include/luaxx.hpp
index 40e26e37..3ba8d31d 100644
--- a/plugins/Dfusion/include/luaxx.hpp
+++ b/plugins/Dfusion/include/luaxx.hpp
@@ -28,11 +28,12 @@
#define lua_Integer_long 1
#define lua_Integer_int 1
-extern "C" {
+
#include "lua.h"
#include "lauxlib.h"
#include "lualib.h"
-}
+
+
#include <string>
#include <vector>
#include <new>
diff --git a/plugins/Dfusion/include/lune.h b/plugins/Dfusion/include/lune.h
index 631ba169..b48a594a 100644
--- a/plugins/Dfusion/include/lune.h
+++ b/plugins/Dfusion/include/lune.h
@@ -1,11 +1,11 @@
#ifndef LUNE_H
#define LUNE_H
-extern "C" {
+
#include "lua.h"
#include "lauxlib.h"
#include "lualib.h"
-}
+
#include "luaxx.hpp"
#include <string>
diff --git a/plugins/Dfusion/src/bit.c b/plugins/Dfusion/src/bit.c
deleted file mode 100644
index 9f2d6f5a..00000000
--- a/plugins/Dfusion/src/bit.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-** Lua BitOp -- a bit operations library for Lua 5.1.
-** http://bitop.luajit.org/
-**
-** Copyright (C) 2008-2009 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 ]
-*/
-
-#include "bit.h"
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-#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;
- bn.n = lua_tonumber(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 (b == 0 && !lua_isnumber(L, idx))
- luaL_typerror(L, idx, "number");
- 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);
- }
- luaL_register(L, "bit", bit_funcs);
- return 1;
-}
-#ifdef __cplusplus
- }
-#endif
-
-
diff --git a/plugins/Dfusion/src/lua_Misc.cpp b/plugins/Dfusion/src/lua_Misc.cpp
index 194b9a6e..0e1bfac0 100644
--- a/plugins/Dfusion/src/lua_Misc.cpp
+++ b/plugins/Dfusion/src/lua_Misc.cpp
@@ -236,5 +236,4 @@ void lua::RegisterMisc(lua::state &st)
}
lua::RegFunctionsLocal(st, lua_misc_func);
st.setglobal("engine");
- luaopen_bit(st);
}