fiddlerwoaroof/crawl - Change 3A5FX3Y4RPKWQEHKKXZKXZJ7RKV6RKWT7GTR4WFE5UBWKV2HT4RQC

Split file_lib out.

Move lua library headers to separate l_libs.h, fixing another compilation error…

Created by Robert Vollmert on October 19, 2009

3A5FX3Y4RPKWQEHKKXZKXZJ7RKV6RKWT7GTR4WFE5UBWKV2HT4RQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/makefile.obj at line 43 [5.79]
[3.2945]
[4.3022]
```
l_file.o \
```
Deletion in crawl-ref/source/l_los.cc at line 9 [4.4668]
B:BD[4.4813] → [4.4813:4830]
```
#include "los.h"
```
Insertion in crawl-ref/source/l_los.cc at line 10 [4.4668]
[3.2989]
[4.4850]
```
#include "l_libs.h"
#include "los.h"
```

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

[6.24]

#include "clua.h"
extern const struct luaL_reg crawl_lib[];
extern const struct luaL_reg dgn_lib[];
extern const struct luaL_reg file_lib[];
extern const struct luaL_reg los_lib[];
void luaopen_ray(lua_State *ls);
void register_mapdef_tables(lua_State *ls);

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

[6.24]

#include "AppHdr.h"
#include "dlua.h"
#include "l_libs.h"
#include "tags.h"
static int file_marshall(lua_State *ls)
{
    if (lua_gettop(ls) != 2)
        luaL_error(ls, "Need two arguments: tag header and value");
    writer &th(*static_cast<writer*>( lua_touserdata(ls, 1) ));
    if (lua_isnumber(ls, 2))
        marshallLong(th, luaL_checklong(ls, 2));
    else if (lua_isboolean(ls, 2))
        marshallByte(th, lua_toboolean(ls, 2));
    else if (lua_isstring(ls, 2))
        marshallString(th, lua_tostring(ls, 2));
    else if (lua_isfunction(ls, 2))
    {
        dlua_chunk chunk(ls);
        marshallString(th, chunk.compiled_chunk());
    }
    return (0);
}
static int file_unmarshall_boolean(lua_State *ls)
{
    if (lua_gettop(ls) != 1)
        luaL_error(ls, "Need reader as one argument");
    reader &th(*static_cast<reader*>( lua_touserdata(ls, 1) ));
    lua_pushboolean(ls, unmarshallByte(th));
    return (1);
}
static int file_unmarshall_number(lua_State *ls)
{
    if (lua_gettop(ls) != 1)
        luaL_error(ls, "Need reader as one argument");
    reader &th(*static_cast<reader*>( lua_touserdata(ls, 1) ));
    lua_pushnumber(ls, unmarshallLong(th));
    return (1);
}
static int file_unmarshall_string(lua_State *ls)
{
    if (lua_gettop(ls) != 1)
        luaL_error(ls, "Need reader as one argument");
    reader &th(*static_cast<reader*>( lua_touserdata(ls, 1) ));
    lua_pushstring(ls, unmarshallString(th).c_str());
    return (1);
}
static int file_unmarshall_fn(lua_State *ls)
{
    if (lua_gettop(ls) != 1)
        luaL_error(ls, "Need reader as one argument");
    reader &th(*static_cast<reader*>( lua_touserdata(ls, 1) ));
    const std::string s(unmarshallString(th, LUA_CHUNK_MAX_SIZE));
    dlua_chunk chunk = dlua_chunk::precompiled(s);
    if (chunk.load(dlua))
        lua_pushnil(ls);
    return (1);
}
enum lua_persist_type
{
    LPT_NONE,
    LPT_NUMBER,
    LPT_STRING,
    LPT_FUNCTION,
    LPT_NIL,
    LPT_BOOLEAN
};
static int file_marshall_meta(lua_State *ls)
{
    if (lua_gettop(ls) != 2)
        luaL_error(ls, "Need two arguments: tag header and value");
    
    writer &th(*static_cast<writer*>( lua_touserdata(ls, 1) ));
    
    lua_persist_type ptype = LPT_NONE;
    if (lua_isnumber(ls, 2))
        ptype = LPT_NUMBER;
    else if (lua_isboolean(ls, 2))
        ptype = LPT_BOOLEAN;
    else if (lua_isstring(ls, 2))
        ptype = LPT_STRING;
    else if (lua_isfunction(ls, 2))
        ptype = LPT_FUNCTION;
    else if (lua_isnil(ls, 2))
        ptype = LPT_NIL;
    else
        luaL_error(ls,
                   make_stringf("Cannot marshall %s",
                                lua_typename(ls, lua_type(ls, 2))).c_str());
    marshallByte(th, ptype);
    if (ptype != LPT_NIL)
        file_marshall(ls);
    return (0);
}
static int file_unmarshall_meta(lua_State *ls)
{
    reader &th(*static_cast<reader*>( lua_touserdata(ls, 1) ));
    const lua_persist_type ptype =
    static_cast<lua_persist_type>(unmarshallByte(th));
    switch (ptype)
    {
        case LPT_BOOLEAN:
            return file_unmarshall_boolean(ls);
        case LPT_NUMBER:
            return file_unmarshall_number(ls);
        case LPT_STRING:
            return file_unmarshall_string(ls);
        case LPT_FUNCTION:
            return file_unmarshall_fn(ls);
        case LPT_NIL:
            lua_pushnil(ls);
            return (1);
        default:
            luaL_error(ls, "Unexpected type signature.");
    }
    // Never get here.
    return (0);
}
const struct luaL_reg file_lib[] =
{
{ "marshall",   file_marshall },
{ "marshall_meta", file_marshall_meta },
{ "unmarshall_meta", file_unmarshall_meta },
{ "unmarshall_number", file_unmarshall_number },
{ "unmarshall_string", file_unmarshall_string },
{ "unmarshall_fn", file_unmarshall_fn },
{ NULL, NULL }
};

Insertion in crawl-ref/source/l_dgn.cc at line 4 [8.1232]
[3.3063]
[7.73700]
```
#include "l_libs.h"
```
Insertion in crawl-ref/source/l_crawl.cc at line 2 [2.2870]
[2.2891]
[2.2891]
Insertion in crawl-ref/source/l_crawl.cc at line 4 [2.2870]
[2.2909]
[2.2909]
```
#include "l_libs.h"
```
Deletion in crawl-ref/source/dlua.h at line 121 [8.228]
B:BD[3.19263] → [3.19263:19264]
B:BD[3.19264] → [2.3908:3950]
∅:D[2.3950] → [3.19264:19344]
B:BD[3.19264] → [3.19264:19344]
∅:D[3.19344] → [4.3974:3975]
B:BD[4.3974] → [4.3974:3975]
B:BD[4.3975] → [2.3951:3985]
∅:D[2.3985] → [3.19345:19389]
B:BD[4.3975] → [3.19345:19389]
```
extern const struct luaL_reg crawl_lib[];
extern const struct luaL_reg dgn_lib[];
extern const struct luaL_reg los_lib[];
void luaopen_ray(lua_State *ls);
void register_mapdef_tables(lua_State *ls);
```
Insertion in crawl-ref/source/dlua.cc at line 14 [3.19392]
[3.19630]
[3.19630]
```
#include "dlua.h"
#include "l_libs.h"
```
Deletion in crawl-ref/source/dlua.cc at line 23 [3.19392]
B:BD[3.19752] → [3.19752:19770]
```
#include "dlua.h"
```

Deletion in crawl-ref/source/dlua.cc at line 322 [3.19392]

B:BD[3.26945] → [3.26945:26948]

B:BD[3.27854] → [3.27854:31233]

}
static int file_marshall(lua_State *ls)
{
    if (lua_gettop(ls) != 2)
        luaL_error(ls, "Need two arguments: tag header and value");
    writer &th(*static_cast<writer*>( lua_touserdata(ls, 1) ));
    if (lua_isnumber(ls, 2))
        marshallLong(th, luaL_checklong(ls, 2));
    else if (lua_isboolean(ls, 2))
        marshallByte(th, lua_toboolean(ls, 2));
    else if (lua_isstring(ls, 2))
        marshallString(th, lua_tostring(ls, 2));
    else if (lua_isfunction(ls, 2))
    {
        dlua_chunk chunk(ls);
        marshallString(th, chunk.compiled_chunk());
    }
    return (0);
}
static int file_unmarshall_boolean(lua_State *ls)
{
    if (lua_gettop(ls) != 1)
        luaL_error(ls, "Need reader as one argument");
    reader &th(*static_cast<reader*>( lua_touserdata(ls, 1) ));
    lua_pushboolean(ls, unmarshallByte(th));
    return (1);
}
static int file_unmarshall_number(lua_State *ls)
{
    if (lua_gettop(ls) != 1)
        luaL_error(ls, "Need reader as one argument");
    reader &th(*static_cast<reader*>( lua_touserdata(ls, 1) ));
    lua_pushnumber(ls, unmarshallLong(th));
    return (1);
}
static int file_unmarshall_string(lua_State *ls)
{
    if (lua_gettop(ls) != 1)
        luaL_error(ls, "Need reader as one argument");
    reader &th(*static_cast<reader*>( lua_touserdata(ls, 1) ));
    lua_pushstring(ls, unmarshallString(th).c_str());
    return (1);
}
static int file_unmarshall_fn(lua_State *ls)
{
    if (lua_gettop(ls) != 1)
        luaL_error(ls, "Need reader as one argument");
    reader &th(*static_cast<reader*>( lua_touserdata(ls, 1) ));
    const std::string s(unmarshallString(th, LUA_CHUNK_MAX_SIZE));
    dlua_chunk chunk = dlua_chunk::precompiled(s);
    if (chunk.load(dlua))
        lua_pushnil(ls);
    return (1);
}
enum lua_persist_type
{
    LPT_NONE,
    LPT_NUMBER,
    LPT_STRING,
    LPT_FUNCTION,
    LPT_NIL,
    LPT_BOOLEAN
};
static int file_marshall_meta(lua_State *ls)
{
    if (lua_gettop(ls) != 2)
        luaL_error(ls, "Need two arguments: tag header and value");
    writer &th(*static_cast<writer*>( lua_touserdata(ls, 1) ));
    lua_persist_type ptype = LPT_NONE;
    if (lua_isnumber(ls, 2))
        ptype = LPT_NUMBER;
    else if (lua_isboolean(ls, 2))
        ptype = LPT_BOOLEAN;
    else if (lua_isstring(ls, 2))
        ptype = LPT_STRING;
    else if (lua_isfunction(ls, 2))
        ptype = LPT_FUNCTION;
    else if (lua_isnil(ls, 2))
        ptype = LPT_NIL;
    else
        luaL_error(ls,
                   make_stringf("Cannot marshall %s",
                                lua_typename(ls, lua_type(ls, 2))).c_str());
    marshallByte(th, ptype);
    if (ptype != LPT_NIL)
        file_marshall(ls);
    return (0);
}
static int file_unmarshall_meta(lua_State *ls)
{
    reader &th(*static_cast<reader*>( lua_touserdata(ls, 1) ));
    const lua_persist_type ptype =
        static_cast<lua_persist_type>(unmarshallByte(th));
    switch (ptype)
    {
    case LPT_BOOLEAN:
        return file_unmarshall_boolean(ls);
    case LPT_NUMBER:
        return file_unmarshall_number(ls);
    case LPT_STRING:
        return file_unmarshall_string(ls);
    case LPT_FUNCTION:
        return file_unmarshall_fn(ls);
    case LPT_NIL:
        lua_pushnil(ls);
        return (1);
    default:
        luaL_error(ls, "Unexpected type signature.");
    }
    // Never get here.
    return (0);

Deletion in crawl-ref/source/dlua.cc at line 324 [3.19392]

B:BD[3.31236] → [3.31236:31585]

static const struct luaL_reg file_lib[] =
{
    { "marshall",   file_marshall },
    { "marshall_meta", file_marshall_meta },
    { "unmarshall_meta", file_unmarshall_meta },
    { "unmarshall_number", file_unmarshall_number },
    { "unmarshall_string", file_unmarshall_string },
    { "unmarshall_fn", file_unmarshall_fn },
    { NULL, NULL }
};

Split file_lib out.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/makefile.obj at line 43 [5.79]

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

Insertion in crawl-ref/source/l_los.cc at line 10 [4.4668]

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

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

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

Insertion in crawl-ref/source/l_crawl.cc at line 2 [2.2870]

Insertion in crawl-ref/source/l_crawl.cc at line 4 [2.2870]

Deletion in crawl-ref/source/dlua.h at line 121 [8.228]

Insertion in crawl-ref/source/dlua.cc at line 14 [3.19392]

Deletion in crawl-ref/source/dlua.cc at line 23 [3.19392]

Deletion in crawl-ref/source/dlua.cc at line 322 [3.19392]

Deletion in crawl-ref/source/dlua.cc at line 324 [3.19392]