fiddlerwoaroof/crawl - Change 3OJMIMC6SKRBTPL2KMTTRG6KANSBNXK3CIMLFCONFKVLLPNCRPWAC

Move userdata templates to cluautil.h.

Created by Robert Vollmert on October 21, 2009

3OJMIMC6SKRBTPL2KMTTRG6KANSBNXK3CIMLFCONFKVLLPNCRPWAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/l_mons.cc at line 3 [3.2870]
B:BD[3.2892] → [3.2892:2910]
```
#include "clua.h"
```
[3.2892]
[3.2910]
```
#include "cluautil.h"
```
Replacement in crawl-ref/source/l_mapgrd.cc at line 3 [4.2873]
B:BD[4.2895] → [4.2895:2913]
```
#include "dlua.h"
```
[4.2895]
[4.2913]
```
#include "cluautil.h"
```

Deletion in crawl-ref/source/dlua.h at line 81 [6.228]

B:BD[5.10959] → [5.10959:10960]

B:BD[5.10960] → [7.13109:13269]


template <typename T>
inline void dlua_push_userdata(lua_State *ls, T udata, const char *meta)
{
    T *de = clua_new_userdata<T>(ls, meta);
    *de = udata;
}

Deletion in crawl-ref/source/dlua.h at line 82 [6.228]

B:BD[8.3152] → [9.12077:12254]

template <class T>
static void dlua_push_object_type(lua_State *ls, const char *meta, const T &data)
{
    T **ptr = clua_new_userdata<T*>(ls, meta);
    *ptr = new T(data);
}

Insertion in crawl-ref/source/cluautil.h at line 18 [10.3609]
[2.3505]
[2.3505]

Insertion in crawl-ref/source/cluautil.h at line 20 [10.3609]

[2.3556]

#define LUAWRAP(name, wrapexpr) \
    static int name(lua_State *ls) \
    {   \
        wrapexpr; \
        return (0); \
    }
#define PLUARET(type, val) \
        lua_push##type(ls, val); \
        return (1);
#define LUARET1(name, type, val) \
    static int name(lua_State *ls) \
    { \
        lua_push##type(ls, val); \
        return (1); \
    }
#define LUARET2(name, type, val1, val2)  \
    static int name(lua_State *ls) \
    { \
        lua_push##type(ls, val1); \
        lua_push##type(ls, val2); \
        return (2); \
    }
#define ASSERT_DLUA \
    do {                                                            \
        if (CLua::get_vm(ls).managed_vm)                            \
            luaL_error(ls, "Operation forbidden in end-user script");   \
    } while (false)

Insertion in crawl-ref/source/cluautil.h at line 61 [10.3609]

[2.3725]

 * User-data templates.
 * TODO: Consolidate these.
 */
template <class T>
inline static T *util_get_userdata(lua_State *ls, int ndx)
{
    return (lua_islightuserdata(ls, ndx))?
            static_cast<T *>( lua_touserdata(ls, ndx) )
          : NULL;
}
template <class T>
inline static T *clua_get_userdata(lua_State *ls, const char *mt, int ndx = 1)
{
    return static_cast<T*>( luaL_checkudata( ls, ndx, mt ) );
}
template <class T>
static int lua_object_gc(lua_State *ls)
{
    T **pptr = static_cast<T**>( lua_touserdata(ls, 1) );
    if (pptr)
        delete *pptr;
    return (0);
}
template <class T> T *clua_new_userdata(
        lua_State *ls, const char *mt)
{
    void *udata = lua_newuserdata( ls, sizeof(T) );
    luaL_getmetatable(ls, mt);
    lua_setmetatable(ls, -2);
    return static_cast<T*>( udata );
}
template <typename T>
inline void dlua_push_userdata(lua_State *ls, T udata, const char *meta)
{
    T *de = clua_new_userdata<T>(ls, meta);
    *de = udata;
}
template <class T>
static void dlua_push_object_type(lua_State *ls, const char *meta, const T &data)
{
    T **ptr = clua_new_userdata<T*>(ls, meta);
    *ptr = new T(data);
}
/*

Deletion in crawl-ref/source/cluautil.h at line 114 [10.3609]
B:BD[10.3667] → [10.3667:3668]

Deletion in crawl-ref/source/clua.h at line 234 [11.481234]

B:BD[11.483903] → [12.18448:18807]

∅:D[12.18807] → [11.483928:483929]

B:BD[11.483928] → [11.483928:483929]

B:BD[11.483929] → [12.18808:18996]

B:BD[12.18996] → [13.6919:7176]

∅:D[13.7176] → [12.18996:19216]

B:BD[12.18996] → [12.18996:19216]

B:BD[12.19216] → [14.9773:9978]

∅:D[14.9978] → [12.19282:19284]

B:BD[12.19282] → [12.19282:19284]

B:BD[12.19284] → [14.9979:10089]

∅:D[14.10089] → [12.19344:19346]

B:BD[12.19344] → [12.19344:19346]


#define LUAWRAP(name, wrapexpr) \
    static int name(lua_State *ls) \
    {   \
        wrapexpr; \
        return (0); \
    }
#define PLUARET(type, val) \
        lua_push##type(ls, val); \
        return (1);
#define LUARET1(name, type, val) \
    static int name(lua_State *ls) \
    { \
        lua_push##type(ls, val); \
        return (1); \
    }
#define LUARET2(name, type, val1, val2)  \
    static int name(lua_State *ls) \
    { \
        lua_push##type(ls, val1); \
        lua_push##type(ls, val2); \
        return (2); \
    }
#define ASSERT_DLUA \
    do {                                                            \
        if (CLua::get_vm(ls).managed_vm)                            \
            luaL_error(ls, "Operation forbidden in end-user script");   \
    } while (false)
template <class T>
inline static T *util_get_userdata(lua_State *ls, int ndx)
{
    return (lua_islightuserdata(ls, ndx))?
            static_cast<T *>( lua_touserdata(ls, ndx) )
          : NULL;
}
template <class T>
inline static T *clua_get_userdata(lua_State *ls, const char *mt, int ndx = 1)
{
    return static_cast<T*>( luaL_checkudata( ls, ndx, mt ) );
}
template <class T>
static int lua_object_gc(lua_State *ls)
{
    T **pptr = static_cast<T**>( lua_touserdata(ls, 1) );
    if (pptr)
        delete *pptr;
    return (0);
}

Deletion in crawl-ref/source/clua.h at line 236 [11.481234]

B:BD[7.35587] → [15.18331:18332]

B:BD[16.13661] → [7.35588:35822]


template <class T> T *clua_new_userdata(
        lua_State *ls, const char *mt)
{
    void *udata = lua_newuserdata( ls, sizeof(T) );
    luaL_getmetatable(ls, mt);
    lua_setmetatable(ls, -2);
    return static_cast<T*>( udata );
}