fiddlerwoaroof/crawl - Change IGUSSYANPKGMX5YDQC7AI5ZWZLEQPIXA4KG3RZHNPMERL554HQWQC

Move utility functions from clua.cc to cluautil.cc.

cluautil.cc should eventually contain all of the functions for passing objects from and to lua, at least the shared ones.

Also cut down on clua.cc include list.

Created by Robert Vollmert on October 21, 2009

IGUSSYANPKGMX5YDQC7AI5ZWZLEQPIXA4KG3RZHNPMERL554HQWQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mapmark.cc at line 14 [6.13502]
[4.6558]
[5.5821]
```
#include "cluautil.h"
```
Insertion in crawl-ref/source/mapmark.cc at line 18 [6.13502]
[6.13772]
[6.13792]
```
#include "l_libs.h"
```
Replacement in crawl-ref/source/makefile.obj at line 118 [8.79]
B:BD[7.272899] → [7.272899:272906]
```
clua.o
```
[7.272899]
```
clua.o \
cluautil.o
```
Insertion in crawl-ref/source/l_you.cc at line 19 [10.2866]
[9.3089]
[9.3089]
```
#include "stuff.h"
```
Insertion in crawl-ref/source/l_los.cc at line 14 [11.4668]
[11.4867]
[11.4867]
```
#include "stuff.h"
```

Insertion in crawl-ref/source/l_libs.h at line 27 [13.2907]

[12.3240]

[3.2957]

 * (Shared) metatable names.
 */
#define MAP_METATABLE "dgn.mtmap"
#define DEVENT_METATABLE "dgn.devent"
#define MAPMARK_METATABLE "dgn.mapmark"
#define MAPGRD_METATABLE "dgn.mapgrd"
#define MAPGRD_COL_METATABLE "dgn.mapgrdcol"
/*

Replacement in crawl-ref/source/l_libs.h at line 38 [13.2907]
B:BD[3.3026] → [3.3026:3061]
```
 * TODO: Move these to dluaopen_*.
```
[3.3026]
[14.2937]
```
 * TODO: Rename these to dluaopen_*.
```
Insertion in crawl-ref/source/l_libs.h at line 68 [13.2907]
[14.3034]
[14.3034]
```
 * TODO: Collect these in cluautil.{h,cc}.
```
Replacement in crawl-ref/source/l_item.cc at line 5 [15.3037]
B:BD[15.3079] → [15.3079:3097]
```
#include "clua.h"
```
[15.3079]
[15.3097]
```
#include "cluautil.h"
```
Replacement in crawl-ref/source/l_dgnmon.cc at line 8 [16.3115]
B:BD[16.3231] → [16.3231:3249]
```
#include "dlua.h"
```
[16.3231]
[16.3249]
```
#include "cluautil.h"
```
Replacement in crawl-ref/source/l_dgnit.cc at line 8 [16.9944]
B:BD[16.10056] → [16.10056:10074]
```
#include "dlua.h"
```
[16.10056]
[16.10074]
```
#include "cluautil.h"
```
Insertion in crawl-ref/source/l_dgngrd.cc at line 12 [17.3004]
[17.3182]
[17.3182]
```
#include "stuff.h"
```
Deletion in crawl-ref/source/l_dgn.cc at line 3 [18.1232]
B:BD[18.1415] → [19.3045:3063]
```
#include "dlua.h"
```
Insertion in crawl-ref/source/l_dgn.cc at line 4 [18.1232]
[13.7098]
[20.73700]
```
#include "cluautil.h"
```
Replacement in crawl-ref/source/dlua.h at line 7 [18.228]
B:BD[18.410] → [18.410:444]
```
#ifndef LUADGN_H
#define LUADGN_H
```
[18.410]
[18.444]
```
#ifndef DLUA_H
#define DLUA_H
```
Deletion in crawl-ref/source/dlua.h at line 11 [18.228]
B:BD[18.483] → [11.3042:3081]
```
#include "stuff.h" // for COORDS macro
```

File addition: cluautil.h (----------)

[21.24]

#ifndef CLUAUTIL_H
#define CLUAUTIL_H
struct lua_State;
struct activity_interrupt_data;
int push_activity_interrupt(lua_State *ls, activity_interrupt_data *t);
class map_def;
void clua_push_map(lua_State *ls, map_def *map);
void clua_push_coord(lua_State *ls, const coord_def &c);
class dgn_event;
void clua_push_dgn_event(lua_State *ls, const dgn_event *devent);
// XXX: currently defined outside cluautil.cc.
class monsters;
void push_monster(lua_State *ls, monsters* mons);
void lua_push_items(lua_State *ls, int link);
#endif

File addition: cluautil.cc (----------)

[21.24]

#include "AppHdr.h"
#include "cluautil.h"
#include "clua.h"
#include "l_libs.h"
#include "delay.h"
int push_activity_interrupt(lua_State *ls, activity_interrupt_data *t)
{
    if (!t->data)
    {
        lua_pushnil(ls);
        return 0;
    }
    switch (t->apt)
    {
    case AIP_HP_LOSS:
        {
            const ait_hp_loss *ahl = (const ait_hp_loss *) t->data;
            lua_pushnumber(ls, ahl->hp);
            lua_pushnumber(ls, ahl->hurt_type);
            return 1;
        }
    case AIP_INT:
        lua_pushnumber(ls, *(const int *) t->data);
        break;
    case AIP_STRING:
        lua_pushstring(ls, (const char *) t->data);
        break;
    case AIP_MONSTER:
        // FIXME: We're casting away the const...
        push_monster(ls, (monsters *) t->data);
        break;
    default:
        lua_pushnil(ls);
        break;
    }
    return 0;
}
void clua_push_map(lua_State *ls, map_def *map)
{
    map_def **mapref = clua_new_userdata<map_def *>(ls, MAP_METATABLE);
    *mapref = map;
}
void clua_push_coord(lua_State *ls, const coord_def &c)
{
    lua_pushnumber(ls, c.x);
    lua_pushnumber(ls, c.y);
}
void clua_push_dgn_event(lua_State *ls, const dgn_event *devent)
{
    const dgn_event **de =
        clua_new_userdata<const dgn_event *>(ls, DEVENT_METATABLE);
    *de = devent;
}

Deletion in crawl-ref/source/clua.h at line 22 [7.481234]
B:BD[7.481462] → [7.481462:481504]
B:BD[7.481504] → [22.421:422]
```
#include "libutil.h"
#include "externs.h"
```
Deletion in crawl-ref/source/clua.h at line 291 [7.481234]
B:BD[23.19399] → [23.19399:19400]
B:BD[23.19400] → [24.13596:13611]
B:BD[24.13611] → [4.35503:35520]
∅:D[4.35520] → [24.13611:13660]
B:BD[24.13611] → [24.13611:13660]
B:BD[24.13660] → [25.12967:13024]
∅:D[25.13024] → [4.35521:35587]
B:BD[24.13660] → [4.35521:35587]
```
class map_def;
class dgn_event;
void clua_push_map(lua_State *ls, map_def *map);
void clua_push_coord(lua_State *ls, const coord_def &c);
void clua_push_dgn_event(lua_State *ls, const dgn_event *devent);
```
Deletion in crawl-ref/source/clua.h at line 292 [7.481234]
B:BD[26.18332] → [26.18332:18378]
∅:D[26.18378] → [24.13660:13661]
∅:D[4.35587] → [24.13660:13661]
B:BD[24.13660] → [24.13660:13661]
```
void lua_push_items(lua_State *ls, int link);
```
Deletion in crawl-ref/source/clua.h at line 301 [7.481234]
B:BD[27.125901] → [27.125901:125951]
B:BD[27.125951] → [28.10090:10091]
```
void push_monster(lua_State *ls, monsters *mons);
```
Deletion in crawl-ref/source/clua.h at line 307 [7.481234]
∅:D[24.13661] → [23.19400:19434]
∅:D[4.35823] → [23.19400:19434]
B:BD[23.19400] → [23.19400:19434]
B:BD[23.19434] → [4.35824:35902]
B:BD[4.35902] → [2.5711:5794]
∅:D[2.5794] → [23.19434:19435]
∅:D[29.17712] → [23.19434:19435]
∅:D[4.35902] → [23.19434:19435]
B:BD[23.19434] → [23.19434:19435]
```
#define MAP_METATABLE "dgn.mtmap"
#define DEVENT_METATABLE "dgn.devent"
#define MAPMARK_METATABLE "dgn.mapmark"
#define MAPGRD_METATABLE "dgn.mapgrd"
#define MAPGRD_COL_METATABLE "dgn.mapgrdcol"
```
Replacement in crawl-ref/source/clua.cc at line 8 [7.483969]
B:BD[30.15828] → [30.15828:15849]
B:BD[30.15849] → [31.2884:2903]
```
#include <algorithm>
#include <sstream>
```
[30.15828]
[7.484012]
```
#include "clua.h"
```
Replacement in crawl-ref/source/clua.cc at line 10 [7.483969]
B:BD[7.484013] → [7.484013:484031]
```
#include "clua.h"
```
[7.484013]
[12.20131]
```
#include "cluautil.h"
#include "dlua.h"
```
Deletion in crawl-ref/source/clua.cc at line 14 [7.483969]
B:BD[7.484032] → [7.484032:484054]
B:BD[7.484054] → [32.43723:43745]
∅:D[32.43745] → [7.484054:484097]
B:BD[7.484054] → [7.484054:484097]
B:BD[7.484097] → [33.10448:10465]
∅:D[33.10465] → [34.1205730:1205749]
B:BD[7.484097] → [34.1205730:1205749]
B:BD[34.1205749] → [4.35904:35926]
B:BD[4.35926] → [35.3776:3797]
```
#include "abl-show.h"
#include "artefact.h"
#include "command.h"
#include "chardump.h"
#include "cio.h"
#include "delay.h"
#include "dgnevent.h"
#include "dungeon.h"
```
Deletion in crawl-ref/source/clua.cc at line 15 [7.483969]
∅:D[22.566] → [7.484097:484179]
∅:D[34.1205749] → [7.484097:484179]
B:BD[7.484097] → [7.484097:484179]
B:BD[7.484179] → [34.1205750:1205772]
∅:D[34.1205772] → [7.484179:484220]
B:BD[7.484179] → [7.484179:484220]
∅:D[20.101606] → [7.484220:484260]
B:BD[7.484220] → [7.484220:484260]
B:BD[7.484260] → [23.19437:19457]
∅:D[23.19457] → [7.484260:484281]
B:BD[7.484260] → [7.484260:484281]
B:BD[7.484281] → [26.18380:18402]
∅:D[26.18402] → [7.484281:484303]
B:BD[7.484281] → [7.484281:484303]
B:BD[7.484303] → [36.15531:15552]
B:BD[36.15552] → [37.3014:3033]
∅:D[37.3033] → [7.484303:484343]
∅:D[36.15552] → [7.484303:484343]
B:BD[7.484303] → [7.484303:484343]
B:BD[7.484364] → [38.2405:2427]
∅:D[38.2427] → [7.484364:484407]
B:BD[7.484364] → [7.484364:484407]
```
#include "food.h"
#include "invent.h"
#include "initfile.h"
#include "itemname.h"
#include "itemprop.h"
#include "items.h"
#include "item_use.h"
#include "libutil.h"
#include "macro.h"
#include "mapdef.h"
#include "message.h"
#include "monstuff.h"
#include "mon-util.h"
#include "newgame.h"
#include "notes.h"
#include "output.h"
#include "player.h"
#include "religion.h"
#include "skills2.h"
#include "spl-util.h"
```
Deletion in crawl-ref/source/clua.cc at line 17 [7.483969]
B:BD[7.484426] → [20.101627:101649]
∅:D[20.101649] → [39.3712:3732]
B:BD[7.484426] → [39.3712:3732]
```
#include "transfor.h"
#include "travel.h"
```
Deletion in crawl-ref/source/clua.cc at line 18 [7.483969]
B:BD[7.484449] → [7.484449:484468]
B:BD[7.484468] → [22.567:582]
∅:D[22.582] → [7.484618:484637]
B:BD[7.484618] → [7.484618:484637]
```
#include <cstring>
#include <map>
#include <cctype>
```
Deletion in crawl-ref/source/clua.cc at line 361 [7.483969]
∅:D[23.19834] → [34.1205773:1205852]
B:BD[7.490072] → [34.1205773:1205852]
```
static int push_activity_interrupt(lua_State *ls, activity_interrupt_data *t);
```

Deletion in crawl-ref/source/clua.cc at line 678 [7.483969]

B:BD[7.518531] → [7.518531:518537]

B:BD[7.519762] → [7.519762:519765]

B:BD[40.20818] → [40.20818:20819]

B:BD[40.21063] → [40.21063:21064]

B:BD[41.5184] → [42.8991:9019]

∅:D[42.9019] → [41.5300:5301]

B:BD[41.5300] → [41.5300:5301]

B:BD[7.533974] → [30.16653:16731]

∅:D[30.16731] → [7.534050:534125]

∅:D[34.1207056] → [7.534050:534125]

B:BD[7.534050] → [7.534050:534125]

B:BD[7.534125] → [30.16732:16733]

∅:D[30.16733] → [7.534130:534738]

B:BD[7.534130] → [7.534130:534738]

    }
}
// Pushing various objects.
static int push_activity_interrupt(lua_State *ls, activity_interrupt_data *t)
{
    if (!t->data)
    {
        lua_pushnil(ls);
        return 0;
    }
    switch (t->apt)
    {
    case AIP_HP_LOSS:
        {
            const ait_hp_loss *ahl = (const ait_hp_loss *) t->data;
            lua_pushnumber(ls, ahl->hp);
            lua_pushnumber(ls, ahl->hurt_type);
            return 1;
        }
    case AIP_INT:
        lua_pushnumber(ls, *(const int *) t->data);
        break;
    case AIP_STRING:
        lua_pushstring(ls, (const char *) t->data);
        break;
    case AIP_MONSTER:
        // FIXME: We're casting away the const...
        push_monster(ls, (monsters *) t->data);
        break;
    default:
        lua_pushnil(ls);
        break;

Deletion in crawl-ref/source/clua.cc at line 679 [7.483969]
B:BD[7.534744] → [7.534744:534758]
```
    return 0;
```

Deletion in crawl-ref/source/clua.cc at line 681 [7.483969]

B:BD[7.534949] → [24.13889:13937]

∅:D[24.13937] → [23.20754:20847]

B:BD[23.20754] → [23.20754:20847]

B:BD[23.20847] → [25.13538:13657]

∅:D[25.13657] → [4.37365:37548]

B:BD[23.20847] → [4.37365:37548]

∅:D[22.1131] → [7.535882:535885]

B:BD[7.535882] → [7.535882:535885]

B:BD[7.536013] → [7.536013:536014]

B:BD[7.536097] → [7.536097:536098]

void clua_push_map(lua_State *ls, map_def *map)
{
    map_def **mapref = clua_new_userdata<map_def *>(ls, MAP_METATABLE);
    *mapref = map;
}
void clua_push_coord(lua_State *ls, const coord_def &c)
{
    lua_pushnumber(ls, c.x);
    lua_pushnumber(ls, c.y);
}
void clua_push_dgn_event(lua_State *ls, const dgn_event *devent)
{
    const dgn_event **de =
        clua_new_userdata<const dgn_event *>(ls, DEVENT_METATABLE);
    *de = devent;
}

Move utility functions from clua.cc to cluautil.cc.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/mapmark.cc at line 14 [6.13502]

Insertion in crawl-ref/source/mapmark.cc at line 18 [6.13502]

Replacement in crawl-ref/source/makefile.obj at line 118 [8.79]

Insertion in crawl-ref/source/l_you.cc at line 19 [10.2866]

Insertion in crawl-ref/source/l_los.cc at line 14 [11.4668]

Insertion in crawl-ref/source/l_libs.h at line 27 [13.2907]

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

Insertion in crawl-ref/source/l_libs.h at line 68 [13.2907]

Replacement in crawl-ref/source/l_item.cc at line 5 [15.3037]

Replacement in crawl-ref/source/l_dgnmon.cc at line 8 [16.3115]

Replacement in crawl-ref/source/l_dgnit.cc at line 8 [16.9944]

Insertion in crawl-ref/source/l_dgngrd.cc at line 12 [17.3004]

Deletion in crawl-ref/source/l_dgn.cc at line 3 [18.1232]

Insertion in crawl-ref/source/l_dgn.cc at line 4 [18.1232]

Replacement in crawl-ref/source/dlua.h at line 7 [18.228]

Deletion in crawl-ref/source/dlua.h at line 11 [18.228]

File addition: cluautil.h (----------)

File addition: cluautil.cc (----------)

Deletion in crawl-ref/source/clua.h at line 22 [7.481234]

Deletion in crawl-ref/source/clua.h at line 291 [7.481234]

Deletion in crawl-ref/source/clua.h at line 292 [7.481234]

Deletion in crawl-ref/source/clua.h at line 301 [7.481234]

Deletion in crawl-ref/source/clua.h at line 307 [7.481234]

Replacement in crawl-ref/source/clua.cc at line 8 [7.483969]

Replacement in crawl-ref/source/clua.cc at line 10 [7.483969]

Deletion in crawl-ref/source/clua.cc at line 14 [7.483969]

Deletion in crawl-ref/source/clua.cc at line 15 [7.483969]

Deletion in crawl-ref/source/clua.cc at line 17 [7.483969]

Deletion in crawl-ref/source/clua.cc at line 18 [7.483969]

Deletion in crawl-ref/source/clua.cc at line 361 [7.483969]

Deletion in crawl-ref/source/clua.cc at line 678 [7.483969]

Deletion in crawl-ref/source/clua.cc at line 679 [7.483969]

Deletion in crawl-ref/source/clua.cc at line 681 [7.483969]