MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix support for integer fields in Lua 5.3

develop
lethosor 2016-07-28 16:36:02 -04:00
parent afde73a673
commit 7b7f7a1b79
4 changed files with 103 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
library/DataStaticsFields.cpp
Unescape Escape View File

@ -17,28 +17,30 @@
#pragma GCC diagnostic ignored "-Winvalid-offsetof" #pragma GCC diagnostic ignored "-Winvalid-offsetof"
namespace df { namespace df {
#define NUMBER_IDENTITY_TRAITS(type) \ #define NUMBER_IDENTITY_TRAITS(category, type) \
number_identity<type> identity_traits<type>::identity(#type); category##_identity<type> identity_traits<type>::identity(#type);
#define INTEGER_IDENTITY_TRAITS(type) NUMBER_IDENTITY_TRAITS(integer, type)
#define FLOAT_IDENTITY_TRAITS(type) NUMBER_IDENTITY_TRAITS(float, type)
#ifndef STATIC_FIELDS_GROUP #ifndef STATIC_FIELDS_GROUP
NUMBER_IDENTITY_TRAITS(char); INTEGER_IDENTITY_TRAITS(char);
NUMBER_IDENTITY_TRAITS(int8_t); INTEGER_IDENTITY_TRAITS(int8_t);
NUMBER_IDENTITY_TRAITS(uint8_t); INTEGER_IDENTITY_TRAITS(uint8_t);
NUMBER_IDENTITY_TRAITS(int16_t); INTEGER_IDENTITY_TRAITS(int16_t);
NUMBER_IDENTITY_TRAITS(uint16_t); INTEGER_IDENTITY_TRAITS(uint16_t);
NUMBER_IDENTITY_TRAITS(int32_t); INTEGER_IDENTITY_TRAITS(int32_t);
NUMBER_IDENTITY_TRAITS(uint32_t); INTEGER_IDENTITY_TRAITS(uint32_t);
NUMBER_IDENTITY_TRAITS(int64_t); INTEGER_IDENTITY_TRAITS(int64_t);
NUMBER_IDENTITY_TRAITS(uint64_t); INTEGER_IDENTITY_TRAITS(uint64_t);
#ifdef _WIN32 #ifdef _WIN32
NUMBER_IDENTITY_TRAITS(long); INTEGER_IDENTITY_TRAITS(long);
NUMBER_IDENTITY_TRAITS(unsigned long); INTEGER_IDENTITY_TRAITS(unsigned long);
#else #else
NUMBER_IDENTITY_TRAITS(intptr_t); INTEGER_IDENTITY_TRAITS(intptr_t);
NUMBER_IDENTITY_TRAITS(uintptr_t); INTEGER_IDENTITY_TRAITS(uintptr_t);
#endif #endif
NUMBER_IDENTITY_TRAITS(float); FLOAT_IDENTITY_TRAITS(float);
NUMBER_IDENTITY_TRAITS(double); FLOAT_IDENTITY_TRAITS(double);
bool_identity identity_traits<bool>::identity; bool_identity identity_traits<bool>::identity;
stl_string_identity identity_traits<std::string>::identity; stl_string_identity identity_traits<std::string>::identity;
@ -60,6 +62,8 @@ namespace df {
buffer_container_identity buffer_container_identity::base_instance; buffer_container_identity buffer_container_identity::base_instance;
#endif #endif
#undef NUMBER_IDENTITY_TRAITS #undef NUMBER_IDENTITY_TRAITS
#undef INTEGER_IDENTITY_TRAITS
#undef FLOAT_IDENTITY_TRAITS
} }
#define TID(type) (&identity_traits< type >::identity) #define TID(type) (&identity_traits< type >::identity)

17
library/LuaTypes.cpp
Unescape Escape View File

@ -115,12 +115,25 @@ void enum_identity::lua_write(lua_State *state, int fname_idx, void *ptr, int va
base_type->lua_write(state, fname_idx, ptr, val_index); base_type->lua_write(state, fname_idx, ptr, val_index);
} }
void df::number_identity_base::lua_read(lua_State *state, int fname_idx, void *ptr) void df::integer_identity_base::lua_read(lua_State *state, int fname_idx, void *ptr)
{
lua_pushinteger(state, read(ptr));
}
void df::integer_identity_base::lua_write(lua_State *state, int fname_idx, void *ptr, int val_index)
{
if (!lua_isinteger(state, val_index))
field_error(state, fname_idx, "integer expected", "write");
write(ptr, lua_tointeger(state, val_index));
}
void df::float_identity_base::lua_read(lua_State *state, int fname_idx, void *ptr)
{ {
lua_pushnumber(state, read(ptr)); lua_pushnumber(state, read(ptr));
} }
void df::number_identity_base::lua_write(lua_State *state, int fname_idx, void *ptr, int val_index) void df::float_identity_base::lua_write(lua_State *state, int fname_idx, void *ptr, int val_index)
{ {
if (!lua_isnumber(state, val_index)) if (!lua_isnumber(state, val_index))
field_error(state, fname_idx, "number expected", "write"); field_error(state, fname_idx, "number expected", "write");

83
library/include/DataIdentity.h
Unescape Escape View File

@ -196,6 +196,29 @@ namespace df
std::string getFullName() { return name; } std::string getFullName() { return name; }
virtual void lua_read(lua_State *state, int fname_idx, void *ptr) = 0;
virtual void lua_write(lua_State *state, int fname_idx, void *ptr, int val_index) = 0;
};
class DFHACK_EXPORT integer_identity_base : public number_identity_base {
public:
integer_identity_base(size_t size, const char *name)
: number_identity_base(size, name) {}
virtual void lua_read(lua_State *state, int fname_idx, void *ptr);
virtual void lua_write(lua_State *state, int fname_idx, void *ptr, int val_index);
protected:
virtual int64_t read(void *ptr) = 0;
virtual void write(void *ptr, int64_t val) = 0;
};
class DFHACK_EXPORT float_identity_base : public number_identity_base {
public:
float_identity_base(size_t size, const char *name)
: number_identity_base(size, name) {}
virtual void lua_read(lua_State *state, int fname_idx, void *ptr); virtual void lua_read(lua_State *state, int fname_idx, void *ptr);
virtual void lua_write(lua_State *state, int fname_idx, void *ptr, int val_index); virtual void lua_write(lua_State *state, int fname_idx, void *ptr, int val_index);
@ -205,9 +228,20 @@ namespace df
}; };
template<class T> template<class T>
class number_identity : public number_identity_base { class integer_identity : public integer_identity_base {
public:
integer_identity(const char *name) : integer_identity_base(sizeof(T), name) {}
protected:
virtual int64_t read(void *ptr) { return int64_t(*(T*)ptr); }
virtual void write(void *ptr, int64_t val) { *(T*)ptr = T(val); }
};
template<class T>
class float_identity : public float_identity_base {
public: public:
number_identity(const char *name) : number_identity_base(sizeof(T), name) {} float_identity(const char *name) : float_identity_base(sizeof(T), name) {}
protected: protected:
virtual double read(void *ptr) { return double(*(T*)ptr); } virtual double read(void *ptr) { return double(*(T*)ptr); }
virtual void write(void *ptr, double val) { *(T*)ptr = T(val); } virtual void write(void *ptr, double val) { *(T*)ptr = T(val); }
@ -472,30 +506,33 @@ namespace df
}; };
#endif #endif
#define NUMBER_IDENTITY_TRAITS(type) \ #define NUMBER_IDENTITY_TRAITS(category, type) \
template<> struct DFHACK_EXPORT identity_traits<type> { \ template<> struct DFHACK_EXPORT identity_traits<type> { \
static number_identity<type> identity; \ static category##_identity<type> identity; \
static number_identity_base *get() { return &identity; } \ static category##_identity_base *get() { return &identity; } \
}; };
NUMBER_IDENTITY_TRAITS(char); #define INTEGER_IDENTITY_TRAITS(type) NUMBER_IDENTITY_TRAITS(integer, type)
NUMBER_IDENTITY_TRAITS(int8_t); #define FLOAT_IDENTITY_TRAITS(type) NUMBER_IDENTITY_TRAITS(float, type)
NUMBER_IDENTITY_TRAITS(uint8_t);
NUMBER_IDENTITY_TRAITS(int16_t); INTEGER_IDENTITY_TRAITS(char);
NUMBER_IDENTITY_TRAITS(uint16_t); INTEGER_IDENTITY_TRAITS(int8_t);
NUMBER_IDENTITY_TRAITS(int32_t); INTEGER_IDENTITY_TRAITS(uint8_t);
NUMBER_IDENTITY_TRAITS(uint32_t); INTEGER_IDENTITY_TRAITS(int16_t);
NUMBER_IDENTITY_TRAITS(int64_t); INTEGER_IDENTITY_TRAITS(uint16_t);
NUMBER_IDENTITY_TRAITS(uint64_t); INTEGER_IDENTITY_TRAITS(int32_t);
INTEGER_IDENTITY_TRAITS(uint32_t);
INTEGER_IDENTITY_TRAITS(int64_t);
INTEGER_IDENTITY_TRAITS(uint64_t);
#ifdef _WIN32 #ifdef _WIN32
NUMBER_IDENTITY_TRAITS(long); INTEGER_IDENTITY_TRAITS(long);
NUMBER_IDENTITY_TRAITS(unsigned long); INTEGER_IDENTITY_TRAITS(unsigned long);
#else #else
NUMBER_IDENTITY_TRAITS(intptr_t); INTEGER_IDENTITY_TRAITS(intptr_t);
NUMBER_IDENTITY_TRAITS(uintptr_t); INTEGER_IDENTITY_TRAITS(uintptr_t);
#endif #endif
NUMBER_IDENTITY_TRAITS(float); FLOAT_IDENTITY_TRAITS(float);
NUMBER_IDENTITY_TRAITS(double); FLOAT_IDENTITY_TRAITS(double);
template<> struct DFHACK_EXPORT identity_traits<bool> { template<> struct DFHACK_EXPORT identity_traits<bool> {
static bool_identity identity; static bool_identity identity;
@ -538,6 +575,8 @@ namespace df
}; };
#undef NUMBER_IDENTITY_TRAITS #undef NUMBER_IDENTITY_TRAITS
#undef INTEGER_IDENTITY_TRAITS
#undef FLOAT_IDENTITY_TRAITS
// Container declarations // Container declarations

6
library/include/LuaTools.h
Unescape Escape View File

@ -286,6 +286,12 @@ namespace DFHack {namespace Lua {
#undef NUMBER_PUSH #undef NUMBER_PUSH
#else #else
template<class T> inline void Push(lua_State *state, T value) { template<class T> inline void Push(lua_State *state, T value) {
lua_pushinteger(state, lua_Number(value));
}
inline void Push(lua_State *state, float value) {
lua_pushnumber(state, lua_Number(value));
}
inline void Push(lua_State *state, double value) {
lua_pushnumber(state, lua_Number(value)); lua_pushnumber(state, lua_Number(value));
} }
#endif #endif