fiddlerwoaroof/crawl - Change KOV7DK4RJENUCQBY76QRQ2ZDCRFLOMCDVUJ7NEGBSVY3TAYKDI3QC

Move library "options" from clua.cc to l_option.cc.

Created by Robert Vollmert on October 20, 2009

KOV7DK4RJENUCQBY76QRQ2ZDCRFLOMCDVUJ7NEGBSVY3TAYKDI3QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/makefile.obj at line 57 [4.79]
[2.2843]
[3.2830]
```
l_option.o \
```

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

[5.24]

#include "AppHdr.h"
#include "clua.h"
#include "l_libs.h"
////////////////////////////////////////////////////////////////
// Option handling
typedef int (*ohandler)(lua_State *ls, const char *name, void *data, bool get);
struct option_handler
{
    const char *option;
    void       *data;
    ohandler    handler;
};
static int option_hboolean(lua_State *ls, const char *name, void *data,
                           bool get)
{
    if (get)
    {
        lua_pushboolean(ls, *static_cast<bool*>( data ));
        return (1);
    }
    else
    {
        if (lua_isboolean(ls, 3))
            *static_cast<bool*>( data ) = lua_toboolean(ls, 3);
        return (0);
    }
}
static option_handler handlers[] =
{
    // Boolean options come first
    { "easy_open",     &Options.easy_open, option_hboolean },
    { "colour_map",    &Options.colour_map, option_hboolean },
    { "clean_map",     &Options.clean_map, option_hboolean },
    { "show_uncursed", &Options.show_uncursed, option_hboolean },
    { "easy_open",     &Options.easy_open, option_hboolean },
    { "easy_armour",   &Options.easy_unequip, option_hboolean },
    { "easy_unequip",  &Options.easy_unequip, option_hboolean },
    { "easy_butcher",  &Options.easy_butcher, option_hboolean },
    { "always_confirm_butcher", &Options.always_confirm_butcher, option_hboolean },
    { "default_target",       &Options.default_target, option_hboolean },
    { "autopickup_no_burden", &Options.autopickup_no_burden, option_hboolean },
    { "note_skill_max",       &Options.note_skill_max, option_hboolean },
    { "delay_message_clear",  &Options.delay_message_clear, option_hboolean },
    { "no_dark_brand",   &Options.no_dark_brand, option_hboolean },
    { "auto_list",       &Options.auto_list, option_hboolean },
    { "pickup_thrown",   &Options.pickup_thrown, option_hboolean },
    { "pickup_dropped",  &Options.pickup_dropped, option_hboolean },
    { "show_waypoints",  &Options.show_waypoints, option_hboolean },
    { "item_colour",     &Options.item_colour, option_hboolean },
    { "target_zero_exp", &Options.target_zero_exp, option_hboolean },
    { "target_wrap",     &Options.target_wrap, option_hboolean },
    { "easy_exit_menu",  &Options.easy_exit_menu, option_hboolean },
    { "dos_use_background_intensity", &Options.dos_use_background_intensity,
                                      option_hboolean },
    { "menu_colour_prefix_class", &Options.menu_colour_prefix_class,
                                  option_hboolean }
};
static const option_handler *get_handler(const char *optname)
{
    if (optname)
    {
        for (int i = 0, count = sizeof(handlers) / sizeof(*handlers);
             i < count; ++i)
        {
            if (!strcmp(handlers[i].option, optname))
                return &handlers[i];
        }
    }
    return (NULL);
}
static int option_get(lua_State *ls)
{
    const char *opt = luaL_checkstring(ls, 2);
    if (!opt)
        return (0);
    // Is this a Lua named option?
    game_options::opt_map::iterator i = Options.named_options.find(opt);
    if (i != Options.named_options.end())
    {
        const std::string &ov = i->second;
        lua_pushstring(ls, ov.c_str());
        return (1);
    }
    const option_handler *oh = get_handler(opt);
    if (oh)
        return (oh->handler(ls, opt, oh->data, true));
    return (0);
}
static int option_set(lua_State *ls)
{
    const char *opt = luaL_checkstring(ls, 2);
    if (!opt)
        return (0);
    const option_handler *oh = get_handler(opt);
    if (oh)
        oh->handler(ls, opt, oh->data, false);
    return (0);
}
#define OPT_METATABLE "clua_metatable_optaccess"
void cluaopen_options(lua_State *ls)
{
    int top = lua_gettop(ls);
    luaL_newmetatable(ls, OPT_METATABLE);
    lua_pushstring(ls, "__index");
    lua_pushcfunction(ls, option_get);
    lua_settable(ls, -3);
    luaL_getmetatable(ls, OPT_METATABLE);
    lua_pushstring(ls, "__newindex");
    lua_pushcfunction(ls, option_set);
    lua_settable(ls, -3);
    lua_settop(ls, top);
    // Create dummy userdata to front for our metatable
    int *dummy = static_cast<int *>( lua_newuserdata(ls, sizeof(int)) );
    // Mystic number
    *dummy = 42;
    luaL_getmetatable(ls, OPT_METATABLE);
    lua_setmetatable(ls, -2);
    lua_setglobal(ls, "options");
}

Insertion in crawl-ref/source/l_libs.h at line 17 [7.2907]
[2.8774]
[6.10679]
```
void cluaopen_options(lua_State *ls);
```
Deletion in crawl-ref/source/clua.cc at line 597 [9.483969]
B:BD[8.20137] → [8.20137:20174]
```
void luaopen_options(lua_State *ls);
```
Replacement in crawl-ref/source/clua.cc at line 624 [9.483969]
B:BD[8.20407] → [8.20407:20436]
```
    luaopen_options(_state);
```
[8.20407]
[2.8959]
```
    cluaopen_options(_state);
```

Deletion in crawl-ref/source/clua.cc at line 1573 [9.483969]

B:BD[9.528304] → [9.528304:528568]


////////////////////////////////////////////////////////////////
// Option handling
typedef int (*ohandler)(lua_State *ls, const char *name, void *data, bool get);
struct option_handler
{
    const char *option;
    void       *data;
    ohandler    handler;
};

Deletion in crawl-ref/source/clua.cc at line 1574 [9.483969]

B:BD[9.528569] → [10.16500:16572]

∅:D[10.16572] → [9.528642:528997]

B:BD[9.528642] → [9.528642:528997]

B:BD[9.528997] → [11.6993:7180]

∅:D[11.7180] → [9.529313:529379]

B:BD[9.529313] → [9.529313:529379]

B:BD[9.529379] → [11.7181:7438]

∅:D[11.7438] → [12.999:1083]

B:BD[9.529627] → [12.999:1083]

B:BD[12.1083] → [11.7439:7513]

∅:D[11.7513] → [13.1574:1654]

B:BD[14.1206722] → [13.1574:1654]

B:BD[13.1654] → [11.7514:8071]

∅:D[11.8071] → [9.530256:530326]

B:BD[9.530256] → [9.530256:530326]

B:BD[9.530326] → [11.8072:8207]

∅:D[11.8207] → [10.16573:16650]

B:BD[9.530456] → [10.16573:16650]

B:BD[10.16650] → [11.8208:8265]

∅:D[11.8265] → [15.2792:2861]

B:BD[15.2792] → [15.2792:2861]

B:BD[15.2861] → [16.21531:21583]

∅:D[11.8319] → [9.530573:530734]

∅:D[16.21583] → [9.530573:530734]

B:BD[9.530573] → [9.530573:530734]

B:BD[9.530734] → [16.21584:21613]

∅:D[16.21613] → [9.530766:531291]

B:BD[9.530766] → [9.530766:531291]

B:BD[9.531291] → [10.16651:16652]

∅:D[10.16652] → [9.531296:531681]

B:BD[9.531296] → [9.531296:531681]

B:BD[9.531681] → [17.3325:3374]

∅:D[17.3374] → [8.20667:20703]

B:BD[9.531723] → [8.20667:20703]

∅:D[8.20703] → [9.531760:532348]

B:BD[9.531760] → [9.531760:532348]

B:BD[9.532348] → [17.3375:3409]

B:BD[18.5181] → [18.5181:5184]

static int option_hboolean(lua_State *ls, const char *name, void *data,
                           bool get)
{
    if (get)
    {
        lua_pushboolean(ls, *static_cast<bool*>( data ));
        return (1);
    }
    else
    {
        if (lua_isboolean(ls, 3))
            *static_cast<bool*>( data ) = lua_toboolean(ls, 3);
        return (0);
    }
}
static option_handler handlers[] =
{
    // Boolean options come first
    { "easy_open",     &Options.easy_open, option_hboolean },
    { "colour_map",    &Options.colour_map, option_hboolean },
    { "clean_map",     &Options.clean_map, option_hboolean },
    { "show_uncursed", &Options.show_uncursed, option_hboolean },
    { "easy_open",     &Options.easy_open, option_hboolean },
    { "easy_armour",   &Options.easy_unequip, option_hboolean },
    { "easy_unequip",  &Options.easy_unequip, option_hboolean },
    { "easy_butcher",  &Options.easy_butcher, option_hboolean },
    { "always_confirm_butcher", &Options.always_confirm_butcher, option_hboolean },
    { "default_target",       &Options.default_target, option_hboolean },
    { "autopickup_no_burden", &Options.autopickup_no_burden, option_hboolean },
    { "note_skill_max",       &Options.note_skill_max, option_hboolean },
    { "delay_message_clear",  &Options.delay_message_clear, option_hboolean },
    { "no_dark_brand",   &Options.no_dark_brand, option_hboolean },
    { "auto_list",       &Options.auto_list, option_hboolean },
    { "pickup_thrown",   &Options.pickup_thrown, option_hboolean },
    { "pickup_dropped",  &Options.pickup_dropped, option_hboolean },
    { "show_waypoints",  &Options.show_waypoints, option_hboolean },
    { "item_colour",     &Options.item_colour, option_hboolean },
    { "target_zero_exp", &Options.target_zero_exp, option_hboolean },
    { "target_wrap",     &Options.target_wrap, option_hboolean },
    { "easy_exit_menu",  &Options.easy_exit_menu, option_hboolean },
    { "dos_use_background_intensity", &Options.dos_use_background_intensity,
                                      option_hboolean },
    { "menu_colour_prefix_class", &Options.menu_colour_prefix_class,
                                  option_hboolean }
};
static const option_handler *get_handler(const char *optname)
{
    if (optname)
    {
        for (int i = 0, count = sizeof(handlers) / sizeof(*handlers);
             i < count; ++i)
        {
            if (!strcmp(handlers[i].option, optname))
                return &handlers[i];
        }
    }
    return (NULL);
}
static int option_get(lua_State *ls)
{
    const char *opt = luaL_checkstring(ls, 2);
    if (!opt)
        return (0);
    // Is this a Lua named option?
    game_options::opt_map::iterator i = Options.named_options.find(opt);
    if (i != Options.named_options.end())
    {
        const std::string &ov = i->second;
        lua_pushstring(ls, ov.c_str());
        return (1);
    }
    const option_handler *oh = get_handler(opt);
    if (oh)
        return (oh->handler(ls, opt, oh->data, true));
    return (0);
}
static int option_set(lua_State *ls)
{
    const char *opt = luaL_checkstring(ls, 2);
    if (!opt)
        return (0);
    const option_handler *oh = get_handler(opt);
    if (oh)
        oh->handler(ls, opt, oh->data, false);
    return (0);
}
#define OPT_METATABLE "clua_metatable_optaccess"
void luaopen_options(lua_State *ls)
{
    int top = lua_gettop(ls);
    luaL_newmetatable(ls, OPT_METATABLE);
    lua_pushstring(ls, "__index");
    lua_pushcfunction(ls, option_get);
    lua_settable(ls, -3);
    luaL_getmetatable(ls, OPT_METATABLE);
    lua_pushstring(ls, "__newindex");
    lua_pushcfunction(ls, option_set);
    lua_settable(ls, -3);
    lua_settop(ls, top);
    // Create dummy userdata to front for our metatable
    int *dummy = static_cast<int *>( lua_newuserdata(ls, sizeof(int)) );
    // Mystic number
    *dummy = 42;
    luaL_getmetatable(ls, OPT_METATABLE);
    lua_setmetatable(ls, -2);
    lua_setglobal(ls, "options");
}

Move library "options" from clua.cc to l_option.cc.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/makefile.obj at line 57 [4.79]

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

Insertion in crawl-ref/source/l_libs.h at line 17 [7.2907]

Deletion in crawl-ref/source/clua.cc at line 597 [9.483969]

Replacement in crawl-ref/source/clua.cc at line 624 [9.483969]

Deletion in crawl-ref/source/clua.cc at line 1573 [9.483969]

Deletion in crawl-ref/source/clua.cc at line 1574 [9.483969]