fiddlerwoaroof/crawl - Change SDGK6QEAHVCMRJVWSHZUECXXC5ZSJ2PQYTZWN3KX5UQFGAWI4Q3AC

Move more macros and functions to cluautil.cc.

Created by Robert Vollmert on October 21, 2009

SDGK6QEAHVCMRJVWSHZUECXXC5ZSJ2PQYTZWN3KX5UQFGAWI4Q3AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/l_you.cc at line 3 [5.2866]
B:BD[5.2888] → [5.2888:2906]
```
#include "dlua.h"
```
[5.2888]
[5.2906]
```
#include "cluautil.h"
```
Replacement in crawl-ref/source/l_mapmrk.cc at line 3 [6.2870]
B:BD[6.2892] → [6.2892:2910]
```
#include "dlua.h"
```
[6.2892]
[6.2910]
```
#include "cluautil.h"
```
Deletion in crawl-ref/source/l_los.cc at line 9 [7.4668]
B:BD[7.4830] → [8.2971:2989]
```
#include "dlua.h"
```
Insertion in crawl-ref/source/l_los.cc at line 11 [7.4668]
[9.2888]
[9.2888]
```
#include "cluautil.h"
```
Replacement in crawl-ref/source/l_libs.h at line 38 [9.2907]
B:BD[10.3026] → [4.3202:3239]
```
 * TODO: Rename these to dluaopen_*.
```
[10.3026]
[11.2937]
```
 * TODO: Rename these to dluaopen_*?
```

Deletion in crawl-ref/source/l_libs.h at line 65 [9.2907]

B:BD[12.5421] → [3.2964:2965]

∅:D[3.2965] → [11.2988:3034]

∅:D[13.3021] → [11.2988:3034]

∅:D[12.5423] → [11.2988:3034]

B:BD[9.3174] → [11.2988:3034]

B:BD[11.3034] → [4.3240:3283]

∅:D[4.3283] → [11.3034:3712]

B:BD[11.3034] → [11.3034:3712]

B:BD[11.3712] → [14.2919:2994]

B:BD[14.2994] → [3.2966:2967]

∅:D[3.2967] → [15.2911:2985]

B:BD[14.2997] → [15.2911:2985]

∅:D[15.2985] → [11.3712:4312]

∅:D[14.2997] → [11.3712:4312]

B:BD[11.3712] → [11.3712:4312]

∅:D[11.4312] → [16.3111:3112]

B:BD[16.3111] → [16.3111:3112]

B:BD[16.3112] → [11.4313:4646]


/*
 * Macros for processing object arguments.
 * TODO: Collect these in cluautil.{h,cc}.
 */
#define GETCOORD(c, p1, p2, boundfn)                      \
    coord_def c;                                          \
    c.x = luaL_checkint(ls, p1);                          \
    c.y = luaL_checkint(ls, p2);                          \
    if (!boundfn(c))                                        \
        luaL_error(                                             \
            ls,                                                 \
            make_stringf("Point (%d,%d) is out of bounds",      \
                         c.x, c.y).c_str());                    \
    else ;
#define COORDS(c, p1, p2)                                \
    GETCOORD(c, p1, p2, in_bounds)
#define FEAT(f, pos) \
dungeon_feature_type f = check_lua_feature(ls, pos)
#define LUA_ITEM(name, n) \
    item_def *name = clua_check_item(ls, n);
#define LEVEL(lev, br, pos)                                             \
const char *level_name = luaL_checkstring(ls, pos);                 \
level_area_type lev = str_to_level_area_type(level_name);           \
if (lev == NUM_LEVEL_AREA_TYPES)                                    \
luaL_error(ls, "Expected level name");                          \
const char *branch_name = luaL_checkstring(ls, pos);                \
branch_type br = str_to_branch(branch_name);                        \
if (lev == LEVEL_DUNGEON && br == NUM_BRANCHES)                     \
luaL_error(ls, "Expected branch name");
#define MAP(ls, n, var)                             \
map_def *var = *(map_def **) luaL_checkudata(ls, n, MAP_METATABLE)
#define DEVENT(ls, n, var) \
dgn_event *var = *(dgn_event **) luaL_checkudata(ls, n, DEVENT_METATABLE)
#define MAPMARKER(ls, n, var) \
map_marker *var = *(map_marker **) luaL_checkudata(ls, n, MAPMARK_METATABLE)

Deletion in crawl-ref/source/l_libs.h at line 73 [9.2907]

B:BD[11.4810] → [11.4810:4861]

B:BD[11.4861] → [17.2920:2968]

B:BD[17.2968] → [18.2920:2984]

B:BD[18.2984] → [15.2986:3035]

unsigned int get_tile_idx(lua_State *ls, int arg);
level_id dlua_level_id(lua_State *ls, int ndx);
dungeon_feature_type check_lua_feature(lua_State *ls, int idx);
item_def *clua_check_item(lua_State *ls, int n);

Replacement in crawl-ref/source/l_food.cc at line 3 [2.4275]
B:BD[2.4297] → [2.4297:4315]
```
#include "clua.h"
```
[2.4297]
[2.4315]
```
#include "cluautil.h"
```
Replacement in crawl-ref/source/l_dgntil.cc at line 8 [19.2861]
B:BD[19.2978] → [19.2978:2996]
```
#include "dlua.h"
```
[19.2978]
[19.2996]
```
#include "cluautil.h"
```
Replacement in crawl-ref/source/l_dgnlvl.cc at line 8 [17.2973]
B:BD[17.3086] → [17.3086:3104]
```
#include "dlua.h"
```
[17.3086]
[17.3104]
```
#include "cluautil.h"
```
Replacement in crawl-ref/source/l_dgngrd.cc at line 8 [14.3004]
B:BD[14.3122] → [14.3122:3140]
```
#include "dlua.h"
```
[14.3122]
[14.3140]
```
#include "clua.h"
#include "cluautil.h"
```
Replacement in crawl-ref/source/l_dgnevt.cc at line 3 [20.2919]
B:BD[20.2941] → [20.2941:2959]
```
#include "dlua.h"
```
[20.2941]
[20.2959]
```
#include "cluautil.h"
```
Replacement in crawl-ref/source/l_dgnbld.cc at line 10 [18.2992]
B:BD[18.3117] → [18.3117:3135]
```
#include "dlua.h"
```
[18.3117]
[18.3135]
```
#include "cluautil.h"
```
Replacement in crawl-ref/source/l_dgn_bf.cc at line 8 [21.3071]
B:BD[21.3171] → [21.3171:3189]
```
#include "dlua.h"
```
[21.3171]
[21.3189]
```
#include "cluautil.h"
```
Replacement in crawl-ref/source/l_debug.cc at line 8 [22.3308]
B:BD[22.3407] → [22.3407:3425]
```
#include "dlua.h"
```
[22.3407]
[22.3425]
```
#include "cluautil.h"
```
Deletion in crawl-ref/source/l_crawl.cc at line 8 [24.2870]
B:BD[9.7101] → [23.4461:4479]
```
#include "clua.h"
```
Insertion in crawl-ref/source/l_crawl.cc at line 9 [24.2870]
[24.2909]
[9.7102]
```
#include "cluautil.h"
```

Deletion in crawl-ref/source/dlua.h at line 98 [26.228]

B:BD[25.13270] → [7.3084:3299]

B:BD[7.3877] → [7.3877:3878]

void luaopen_setmeta(lua_State *ls,
                     const char *global,
                     const luaL_reg *lua_lib,
                     const char *meta);
#define LUAFN(name) static int name(lua_State *ls)

Deletion in crawl-ref/source/dlua.cc at line 287 [8.19392]

B:BD[8.33230] → [8.33230:33233]

B:BD[8.33970] → [8.33970:34368]

}
void luaopen_setmeta(lua_State *ls,
                     const char *global,
                     const luaL_reg *lua_lib,
                     const char *meta)
{
    luaL_newmetatable(ls, meta);
    lua_setglobal(ls, global);
    luaL_openlib(ls, global, lua_lib, 0);
    // Do <global>.__index = <global>
    lua_pushstring(ls, "__index");
    lua_pushvalue(ls, -2);
    lua_settable(ls, -3);

Insertion in crawl-ref/source/cluautil.h at line 1 [4.3609]

[4.3609]

[4.3610]

/*
 * File:      cluautil.h
 * Summary:   Utility functions and macros for Lua bindings.
 */

Insertion in crawl-ref/source/cluautil.h at line 8 [4.3609]

[4.3648]


/*
 * Function definitions.
 */
#define LUAFN(name) static int name(lua_State *ls)
void luaopen_setmeta(lua_State *ls,
                     const char *global,
                     const luaL_reg *lua_lib,
                     const char *meta);

Insertion in crawl-ref/source/cluautil.h at line 20 [4.3609]
[4.3649]
[4.3649]
```
/*
 * Passing objects from and to Lua.
 */
```
Replacement in crawl-ref/source/cluautil.h at line 36 [4.3609]
B:BD[4.3980] → [4.3980:4027]
```
// XXX: currently defined outside cluautil.cc.
```
[4.3980]
[4.4027]
```
// XXX: These are currently defined outside cluautil.cc.
```

Insertion in crawl-ref/source/cluautil.h at line 40 [4.3609]

[4.4139]

dungeon_feature_type check_lua_feature(lua_State *ls, int idx);
item_def *clua_check_item(lua_State *ls, int n);
unsigned int get_tile_idx(lua_State *ls, int arg);
level_id dlua_level_id(lua_State *ls, int ndx);
#define GETCOORD(c, p1, p2, boundfn)                      \
    coord_def c;                                          \
    c.x = luaL_checkint(ls, p1);                          \
    c.y = luaL_checkint(ls, p2);                          \
    if (!boundfn(c))                                        \
        luaL_error(                                             \
            ls,                                                 \
            make_stringf("Point (%d,%d) is out of bounds",      \
                         c.x, c.y).c_str());                    \
    else ;
#define COORDS(c, p1, p2)                                \
    GETCOORD(c, p1, p2, in_bounds)
#define FEAT(f, pos) \
dungeon_feature_type f = check_lua_feature(ls, pos)
#define LUA_ITEM(name, n) \
    item_def *name = clua_check_item(ls, n);
#define LEVEL(lev, br, pos)                                             \
const char *level_name = luaL_checkstring(ls, pos);                 \
level_area_type lev = str_to_level_area_type(level_name);           \
if (lev == NUM_LEVEL_AREA_TYPES)                                    \
luaL_error(ls, "Expected level name");                          \
const char *branch_name = luaL_checkstring(ls, pos);                \
branch_type br = str_to_branch(branch_name);                        \
if (lev == LEVEL_DUNGEON && br == NUM_BRANCHES)                     \
luaL_error(ls, "Expected branch name");
#define MAP(ls, n, var)                             \
map_def *var = *(map_def **) luaL_checkudata(ls, n, MAP_METATABLE)
#define DEVENT(ls, n, var) \
dgn_event *var = *(dgn_event **) luaL_checkudata(ls, n, DEVENT_METATABLE)
#define MAPMARKER(ls, n, var) \
map_marker *var = *(map_marker **) luaL_checkudata(ls, n, MAPMARK_METATABLE)

Insertion in crawl-ref/source/cluautil.cc at line 61 [4.4184]

[4.5510]


void luaopen_setmeta(lua_State *ls,
                     const char *global,
                     const luaL_reg *lua_lib,
                     const char *meta)
{
    luaL_newmetatable(ls, meta);
    lua_setglobal(ls, global);
 
    luaL_openlib(ls, global, lua_lib, 0);
    // Do <global>.__index = <global>
    lua_pushstring(ls, "__index");
    lua_pushvalue(ls, -2);
    lua_settable(ls, -3);
}

Move more macros and functions to cluautil.cc.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/l_you.cc at line 3 [5.2866]

Replacement in crawl-ref/source/l_mapmrk.cc at line 3 [6.2870]

Deletion in crawl-ref/source/l_los.cc at line 9 [7.4668]

Insertion in crawl-ref/source/l_los.cc at line 11 [7.4668]

Replacement in crawl-ref/source/l_libs.h at line 38 [9.2907]

Deletion in crawl-ref/source/l_libs.h at line 65 [9.2907]

Deletion in crawl-ref/source/l_libs.h at line 73 [9.2907]

Replacement in crawl-ref/source/l_food.cc at line 3 [2.4275]

Replacement in crawl-ref/source/l_dgntil.cc at line 8 [19.2861]

Replacement in crawl-ref/source/l_dgnlvl.cc at line 8 [17.2973]

Replacement in crawl-ref/source/l_dgngrd.cc at line 8 [14.3004]

Replacement in crawl-ref/source/l_dgnevt.cc at line 3 [20.2919]

Replacement in crawl-ref/source/l_dgnbld.cc at line 10 [18.2992]

Replacement in crawl-ref/source/l_dgn_bf.cc at line 8 [21.3071]

Replacement in crawl-ref/source/l_debug.cc at line 8 [22.3308]

Deletion in crawl-ref/source/l_crawl.cc at line 8 [24.2870]

Insertion in crawl-ref/source/l_crawl.cc at line 9 [24.2870]