fiddlerwoaroof/crawl - Change 77MES6I23O3FEVX45F5L7LGABFIDYZA2CLESQBXALSVIHS5E2G6AC

Lua marker code is now converted into an anonymous function in the same scope as the rest of the map Lua code so that locals defined in the map Lua are visible to the marker code.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7479 c06c8d41-db1a-0410-9941-cceddc491573

Created by dshaligram on November 18, 2008

77MES6I23O3FEVX45F5L7LGABFIDYZA2CLESQBXALSVIHS5E2G6AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/util/levcomp.ypp at line 19 [4.75608]
B:BD[4.75711] → [5.270:313]
```
static bool start_marker_segment = false;
```
Replacement in crawl-ref/source/util/levcomp.ypp at line 320 [4.75608]
B:BD[6.1667] → [7.909:934]
```
marker          : MARKER
```
[6.1667]
[5.340]
```
marker          : MARKER STRING
```

Replacement in crawl-ref/source/util/levcomp.ypp at line 322 [4.75608]

B:BD[5.358] → [5.358:601]

∅:D[5.601] → [8.299:317]

B:BD[8.299] → [8.299:317]

                    lc_map.main.add(yylineno, "marker(");
                    start_marker_segment = true;
                }
                  marker_spec
                {
                    lc_map.main.add(yylineno, ")");
                }
                ;

[5.358]

[8.317]

                    std::string key, arg;
                    int sep(0);

Replacement in crawl-ref/source/util/levcomp.ypp at line 325 [4.75608]

B:BD[8.318] → [5.602:635]

marker_spec     : mspec_segments

[8.318]

[5.635]

                    const std::string err =
                      mapdef_split_key_item($2, &key, &sep, &arg);

Replacement in crawl-ref/source/util/levcomp.ypp at line 328 [4.75608]

B:BD[5.636] → [5.636:715]

∅:D[8.430] → [9.375:393]

∅:D[5.715] → [9.375:393]

B:BD[4.78001] → [9.375:393]

mspec_segments  : /* nothing */
                | mspec_segments mspec_segment
                ;

[5.636]

[9.393]

                    if (!err.empty())
                      yyerror(err.c_str());

Replacement in crawl-ref/source/util/levcomp.ypp at line 331 [4.75608]

B:BD[9.394] → [5.716:741]

∅:D[5.741] → [8.459:514]

B:BD[8.459] → [8.459:514]

B:BD[8.514] → [7.935:969]

∅:D[7.969] → [5.777:918]

B:BD[5.777] → [5.777:918]

∅:D[5.918] → [8.603:663]

B:BD[8.603] → [8.603:663]

B:BD[8.663] → [5.919:969]

mspec_segment   : STRING
                {
                    lc_map.main.add(
                        yylineno,
                        make_stringf(
                            "%s\"%s\"",
                            start_marker_segment? "" : " .. ",
                            quote_lua_string($1).c_str()));
                    start_marker_segment = false;

[9.394]

[8.663]

                    // Special treatment for Lua markers.
                    if (arg.find("lua:") == 0)
                    {
                       arg = arg.substr(4);
                       lc_map.main.add(
                         yylineno,
                         make_stringf("lua_marker(\"%s\", function () "
                                      "  return %s "
                                      "end)",
                                      quote_lua_string(key).c_str(),
                                      arg.c_str()));
                    }
                    else
                    {
                       lc_map.main.add(
                         yylineno,
                         make_stringf("marker(\"%s\")",
                                      quote_lua_string($2).c_str()));
                    }

Deletion in crawl-ref/source/util/levcomp.lpp at line 125 [4.81193]
B:BD[9.714] → [5.1235:1244]
```
%x TOEOL
```
Insertion in crawl-ref/source/util/levcomp.lpp at line 215 [4.81193]
[10.1994]
[3.2342]
```
<ARGUMENT>{NSPACE}  cattext();
```

Deletion in crawl-ref/source/util/levcomp.lpp at line 219 [4.81193]

B:BD[10.2035] → [11.317:340]

∅:D[11.340] → [5.1267:1433]

B:BD[5.1267] → [5.1267:1433]

B:BD[5.1433] → [11.341:380]

∅:D[11.380] → [5.1468:1529]

B:BD[5.1468] → [5.1468:1529]

B:BD[5.1529] → [12.124:146]

∅:D[12.146] → [5.1529:1530]

B:BD[5.1529] → [5.1529:1530]

<TOEOL>.*\\[ \t\r]*$ {
                        settext(true, 1);
                        return STRING;
                    }
<TOEOL>.+$          {
                        BEGIN(INITIAL);
                        settext(true);
                        return STRING;
                    }
<TOEOL>\r?\n        ;

Replacement in crawl-ref/source/util/levcomp.lpp at line 251 [4.81193]
B:BD[3.3380] → [3.3380:3434]
```
MARKER:             { CBEGIN(TOEOL); return MARKER; }
```
[3.3380]
[3.3434]
```
MARKER:             { CBEGIN(ARGUMENT); return MARKER; }
```
Insertion in crawl-ref/source/mapmark.h at line 101 [14.10602]
[5.6136]
[13.230]
```
    map_lua_marker(const lua_datum &function);
```

Insertion in crawl-ref/source/mapmark.cc at line 168 [14.13502]

[14.16979]

[13.344]

map_lua_marker::map_lua_marker(const lua_datum &fn)
    : map_marker(MAT_LUA_MARKER, coord_def())
{
    lua_stack_cleaner clean(dlua);
    fn.push();
    if (!dlua.callfn("dgn_run_map", 1, 1))
        mprf(MSGCH_ERROR, "lua_marker exec error: %s", dlua.error.c_str());
    else
        check_register_table();
}

Insertion in crawl-ref/source/mapdef.h at line 18 [4.591249]
[15.5646]
[4.591552]
```
#include <memory>
```
Replacement in crawl-ref/source/mapdef.h at line 206 [4.591249]
B:BD[8.5013] → [16.5143:5152]
```
 public:
```
[8.5013]
[8.5013]
```
public:
```

Insertion in crawl-ref/source/mapdef.h at line 209 [4.591249]

[14.24198]

[8.5057]


    // Special handling for Lua markers:
    std::auto_ptr<lua_datum> lua_fn;

Replacement in crawl-ref/source/mapdef.h at line 214 [4.591249]

B:BD[14.24254] → [14.24254:24292]

        : key(_key), marker(mark) { }

[14.24254]

[8.5158]

        : key(_key), marker(mark), lua_fn() { }
    map_marker_spec(int _key, const lua_datum &fn)
        : key(_key), marker(), lua_fn(new lua_datum(fn)) { }

Insertion in crawl-ref/source/mapdef.h at line 222 [4.591249]
[8.5274]
[8.5310]
```
private:
    map_marker *create_marker();
```

Insertion in crawl-ref/source/mapdef.h at line 280 [4.591249]

[8.5592]

[2.3007]

    std::string add_lua_marker(const std::string &key,
                               const lua_datum &fn);

Insertion in crawl-ref/source/mapdef.h at line 758 [4.591249]

[4.594754]

[17.7919]


std::string mapdef_split_key_item(const std::string &s,
                                  std::string *key,
                                  int *separator,
                                  std::string *arg,
                                  int key_max_len = 1);

Replacement in crawl-ref/source/mapdef.cc at line 66 [4.594797]
B:BD[18.3858] → [18.3858:3914]
```
static std::string split_key_item(const std::string &s,
```
[18.3858]
[19.2137]
```
std::string mapdef_split_key_item(const std::string &s,
```

Replacement in crawl-ref/source/mapdef.cc at line 70 [4.594797]

B:BD[19.2242] → [19.2242:2297]

                                  int key_max_len = 1)

[19.2242]

[18.4060]

                                  int key_max_len)

Replacement in crawl-ref/source/mapdef.cc at line 386 [4.594797]
∅:D[19.2486] → [8.6920:6979]
B:BD[8.6920] → [8.6920:6979]
```
    std::string err = split_key_item(s, &key, &sep, &arg);
```
[19.2486]
[8.6979]
```
    std::string err = mapdef_split_key_item(s, &key, &sep, &arg);
```

Insertion in crawl-ref/source/mapdef.cc at line 394 [4.594797]

[8.7274]

std::string map_lines::add_lua_marker(const std::string &key,
                                      const lua_datum &function)
{
    transforms.push_back(new map_marker_spec(key[0], function));
    return ("");
}

Replacement in crawl-ref/source/mapdef.cc at line 556 [4.594797]

B:BD[20.4276] → [20.4276:4344]

    std::string err = split_key_item(sub, &key, &sep, &substitute);

[20.4276]

[20.4344]

    std::string err = mapdef_split_key_item(sub, &key, &sep, &substitute);

Replacement in crawl-ref/source/mapdef.cc at line 580 [4.594797]

B:BD[21.3692] → [18.4768:4836]

    std::string err = split_key_item(sub, &key, &sep, &substitute);

[21.3692]

[18.4836]

    std::string err = mapdef_split_key_item(sub, &key, &sep, &substitute);

Replacement in crawl-ref/source/mapdef.cc at line 599 [4.594797]

B:BD[19.2837] → [19.2837:2896]

    std::string err = split_key_item(s, &key, &sep, &arg);

[19.2837]

[19.2896]

    std::string err = mapdef_split_key_item(s, &key, &sep, &arg);

Replacement in crawl-ref/source/mapdef.cc at line 622 [4.594797]

B:BD[19.3406] → [19.3406:3465]

    std::string err = split_key_item(s, &key, &sep, &arg);

[19.3406]

[19.3465]

    std::string err = mapdef_split_key_item(s, &key, &sep, &arg);

Replacement in crawl-ref/source/mapdef.cc at line 1779 [4.594797]

B:BD[18.5367] → [18.5367:5432]

    std::string err = split_key_item(s, &key, &separator, &arg);

[18.5367]

[18.5432]

    std::string err = mapdef_split_key_item(s, &key, &separator, &arg);

Replacement in crawl-ref/source/mapdef.cc at line 2820 [4.594797]

B:BD[14.24598] → [5.12619:12700]

            map_marker *mark =
                map_marker::parse_marker(marker);

[14.24598]

[14.24663]

            map_marker *mark = create_marker();

Insertion in crawl-ref/source/mapdef.cc at line 2833 [4.594797]

[5.12757]

[8.10495]

}
map_marker *map_marker_spec::create_marker()
{
    return lua_fn.get()
        ? new map_lua_marker(*lua_fn.get())
        : map_marker::parse_marker(marker);

Insertion in crawl-ref/source/luadgn.cc at line 762 [22.1232]

[22.11556]

    if (!err.empty())
        luaL_error(ls, err.c_str());
    return (0);
}
static int dgn_lua_marker(lua_State *ls)
{
    MAP(ls, 1, map);
    if (lua_gettop(ls) != 3 || !lua_isstring(ls, 2) || !lua_isfunction(ls, 3))
        luaL_error(ls, "Expected marker key and marker function.");
    CLua &lvm(CLua::get_vm(ls));
    std::string key = lua_tostring(ls, 2);
    lua_datum function(lvm, 3, false);
    const std::string err = map->map.add_lua_marker(key, function);

Insertion in crawl-ref/source/luadgn.cc at line 780 [22.1232]
[22.11615]
[8.10962]
Insertion in crawl-ref/source/luadgn.cc at line 2126 [22.1232]
[8.15321]
[22.12767]
```
    { "lua_marker", dgn_lua_marker },
```
Insertion in crawl-ref/source/clua.h at line 95 [23.481234]
[23.481551]
[23.481551]
```
    static CLua &get_vm(lua_State *);
```
Insertion in crawl-ref/source/clua.h at line 174 [23.481234]
[24.1667]
[23.482712]
```
    static void _getregistry(lua_State *, const char *name);
```

Insertion in crawl-ref/source/clua.cc at line 132 [23.483969]

[23.485738]

}
void CLua::_getregistry(lua_State *ls, const char *name)
{
    lua_pushstring(ls, name);
    lua_gettable(ls, LUA_REGISTRYINDEX);

Replacement in crawl-ref/source/clua.cc at line 142 [23.483969]

B:BD[23.485785] → [23.485785:485866]

    lua_pushstring(state(), name);
    lua_gettable(state(), LUA_REGISTRYINDEX);

[23.485785]

[23.485866]

    _getregistry(state(), name);

Insertion in crawl-ref/source/clua.cc at line 647 [23.483969]

[5.36541]


    lua_pushlightuserdata(_state, this);
    setregistry("__clua");
}
CLua &CLua::get_vm(lua_State *ls)
{
    _getregistry(ls, "__clua");
    CLua *vm = util_get_userdata<CLua>(ls, -1);
    if (!vm)
        end(1, false, "Failed to find CLua for lua state %p", ls);
    return (*vm);

Lua marker code is now converted into an anonymous function in the same scope as the rest of the map Lua code so that locals defined in the map Lua are visible to the marker code.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/util/levcomp.ypp at line 19 [4.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 320 [4.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 322 [4.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 325 [4.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 328 [4.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 331 [4.75608]

Deletion in crawl-ref/source/util/levcomp.lpp at line 125 [4.81193]

Insertion in crawl-ref/source/util/levcomp.lpp at line 215 [4.81193]

Deletion in crawl-ref/source/util/levcomp.lpp at line 219 [4.81193]

Replacement in crawl-ref/source/util/levcomp.lpp at line 251 [4.81193]

Insertion in crawl-ref/source/mapmark.h at line 101 [14.10602]

Insertion in crawl-ref/source/mapmark.cc at line 168 [14.13502]

Insertion in crawl-ref/source/mapdef.h at line 18 [4.591249]

Replacement in crawl-ref/source/mapdef.h at line 206 [4.591249]