fiddlerwoaroof/crawl - Change B3SRWSFITQMJRVEBHGQQJARETYPSSDV6XKMQSSUTXEHTXRZKIQJQC

Hackily rewrite Lua chunk errors to reflect line numbers from the original

.des file so that level-designers can find the lines that are causing the problem.

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

Created by dshaligram on June 24, 2007

B3SRWSFITQMJRVEBHGQQJARETYPSSDV6XKMQSSUTXEHTXRZKIQJQC

Dependencies

In channels

main

Change contents

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

∅:D[3.46] → [4.75742:75811]

B:BD[4.75742] → [4.75742:75811]

    fprintf(stderr, "%s:%d: %s\n", lc_desfile.c_str(), yylineno, e);

[4.75742]

[4.75811]

    if (strstr(e, lc_desfile.c_str()) == e)
        fprintf(stderr, "%s\n", e);
    else
        fprintf(stderr, "%s:%d: %s\n", lc_desfile.c_str(), yylineno, e);

Insertion in crawl-ref/source/util/levcomp.ypp at line 106 [4.75608]
[4.77121]
[5.695]
```
                    lc_map.set_file(lc_desfile);
```
Deletion in crawl-ref/source/util/levcomp.ypp at line 113 [4.75608]
B:BD[6.900] → [2.142:191]
```
                    lc_map.set_file(lc_desfile);
```
Deletion in crawl-ref/source/mapdef.h at line 440 [4.591249]
B:BD[5.7599] → [5.7599:7629]
B:BD[5.7629] → [2.5976:5999]
```
    void run_strip_prelude();
    void strip_main();
```
Insertion in crawl-ref/source/mapdef.h at line 482 [4.591249]
[2.6079]
[2.6079]
```
    std::string rewrite_chunk_errors(const std::string &s) const;
```

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

B:BD[5.12660] → [5.12660:12721]

      map(), mons(), items(), keyspecs(), prelude(), main(),

[5.12660]

[5.12721]

      map(), mons(), items(), keyspecs(), prelude("dlprelude"), main("dlmain"),

Deletion in crawl-ref/source/mapdef.cc at line 938 [4.594797]
∅:D[2.9161] → [5.13051:13131]
B:BD[5.13051] → [5.13051:13131]
```
}
void map_def::run_strip_prelude()
{
    run_lua(false);
    prelude.clear();
```
Deletion in crawl-ref/source/mapdef.cc at line 940 [4.594797]
B:BD[5.13134] → [2.9162:9189]
∅:D[2.9189] → [5.13160:13162]
B:BD[5.13160] → [5.13160:13162]
B:BD[5.13183] → [5.13183:13201]
B:BD[5.13201] → [2.9190:9213]
∅:D[2.9213] → [5.13201:13204]
B:BD[5.13201] → [5.13201:13204]
```
void map_def::strip_main()
{
    main.clear();
    index_only = true;
}
```
Replacement in crawl-ref/source/mapdef.cc at line 961 [4.594797]
B:BD[5.13697] → [5.13697:13731]
```
        return (dlua.error);
    
```
[5.13697]
[5.13731]
```
        return rewrite_chunk_errors(dlua.error);
```

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

[5.13828]

std::string map_def::rewrite_chunk_errors(const std::string &s) const
{
    std::string res = s;
    if (prelude.rewrite_chunk_errors(res))
        return (res);
    main.rewrite_chunk_errors(res);
    return (res);
}

Insertion in crawl-ref/source/luadgn.h at line 21 [7.228]
[7.576]
[7.576]
```
    std::string context;
```

Insertion in crawl-ref/source/luadgn.h at line 26 [7.228]

[7.690]

    std::string rewrite_chunk_prefix(const std::string &line) const;
    std::string get_chunk_prefix(const std::string &s) const;

Replacement in crawl-ref/source/luadgn.h at line 33 [7.228]
B:BD[7.735] → [7.735:753]
```
    dlua_chunk();
```
[7.735]
[7.753]
```
    dlua_chunk(const std::string &_context = "dlua_chunk");
```
Replacement in crawl-ref/source/luadgn.h at line 44 [7.228]
B:BD[7.1046] → [7.1046:1047]
[7.1046]
[7.1047]
```
    bool rewrite_chunk_errors(std::string &err) const;
    
```

Replacement in crawl-ref/source/luadgn.cc at line 41 [7.1232]

B:BD[7.2192] → [7.2192:2269]

dlua_chunk::dlua_chunk()
    : file(), chunk(), first(-1), last(-1), error()

[7.2192]

[7.2269]

dlua_chunk::dlua_chunk(const std::string &_context)
    : file(), chunk(), context(_context), first(-1), last(-1), error()

Replacement in crawl-ref/source/luadgn.cc at line 66 [7.1232]
B:BD[7.2598] → [7.2598:2621]
```
        chunk += "\n";
```
[7.2598]
[7.2621]
```
        while (last++ < line)
            chunk += '\n';
```

Replacement in crawl-ref/source/luadgn.cc at line 90 [7.1232]

B:BD[7.2902] → [7.2902:2972]

                    interp->loadstring(chunk.c_str(), "dlua_chunk"));

[7.2902]

[7.2972]

                    interp->loadstring(chunk.c_str(), context.c_str()));

Insertion in crawl-ref/source/luadgn.cc at line 112 [7.1232]

[7.3340]

}
bool dlua_chunk::rewrite_chunk_errors(std::string &s) const
{
    if (s.find(context) == std::string::npos)
        return (false);
    // Our chunk is mentioned, go back through and rewrite lines.
    std::vector<std::string> lines = split_string("\n", s);
    std::string newmsg = lines[0];
    bool wrote_prefix = false;
    for (int i = 2, size = lines.size() - 1; i < size; ++i)
    {
        const std::string &st = lines[i];
        if (st.find(context) != std::string::npos)
        {
            if (!wrote_prefix)
            {
                newmsg = get_chunk_prefix(st) + ": " + newmsg;
                wrote_prefix = true;
            }
            else
                newmsg += "\n" + rewrite_chunk_prefix(st);
        }
    }
    s = newmsg;
    return (true);

Insertion in crawl-ref/source/luadgn.cc at line 141 [7.1232]

[7.3343]

std::string dlua_chunk::rewrite_chunk_prefix(const std::string &line) const
{
    std::string s = line;
    const std::string contextm = "[string \"" + context + "\"]:";
    const std::string::size_type ps = s.find(contextm);
    if (ps == std::string::npos)
        return (s);
    std::string::size_type pe = s.find(':', ps + contextm.length());
    if (pe != std::string::npos)
    {
        const std::string::size_type lns = ps + contextm.length();
        const std::string line_num = s.substr(lns, pe - lns);
        const int lnum = atoi(line_num.c_str());
        s = s.substr(0, lns) + make_stringf("%d", lnum + first - 1)
            + s.substr(pe);
    }
    return s.substr(0, ps) + (file.empty()? context : file) + ":"
        + s.substr(ps + contextm.length());
}
std::string dlua_chunk::get_chunk_prefix(const std::string &sorig) const
{
    std::string s = rewrite_chunk_prefix(sorig);
    const std::string::size_type cpos = s.find(':');
    if (cpos == std::string::npos)
        return (s);
    const std::string::size_type cnpos = s.find(':', cpos + 1);
    if (cnpos == std::string::npos)
        return (s);
    return s.substr(0, cnpos);
}

Insertion in crawl-ref/source/luadgn.cc at line 575 [7.1232]
[7.12939]
[7.12939]
```
    luaopen_debug(dlua);
```

Replacement in crawl-ref/source/dat/clua/dungeon.lua at line 14 [5.17172]

B:BD[5.17721] → [5.17721:17762]

                    return val(obj, ...)

[5.17721]

[5.17762]

                    return crawl.err_trace(val, obj, ...)

Replacement in crawl-ref/source/dat/clua/dungeon.lua at line 41 [5.17172]
B:BD[5.18311] → [5.18311:18314]
```
end
```
[5.18311]
```
end
```

Insertion in crawl-ref/source/clua.cc at line 1816 [8.483969]

[8.526862]

}
LUARET1(crawl_game_started, boolean, crawl_state.need_save)
static int crawl_err_trace(lua_State *ls)
{
    const int nargs = lua_gettop(ls);
    const int err = lua_pcall(ls, nargs - 1, LUA_MULTRET, 0);
    if (err)
    {
        // This code from lua.c:traceback() (mostly)
        const char *errs = lua_tostring(ls, 1);
        std::string errstr = errs? errs : "";
        lua_getfield(ls, LUA_GLOBALSINDEX, "debug");
        if (!lua_istable(ls, -1))
        {
            lua_pop(ls, 1);
            return lua_error(ls);
        }
        lua_getfield(ls, -1, "traceback");
        if (!lua_isfunction(ls, -1))
        {
            lua_pop(ls, 2);
            return lua_error(ls);
        }
        lua_pushvalue(ls, 1);
        lua_pushinteger(ls, 2); // Skip crawl_err_trace and traceback.
        lua_call(ls, 2, 1);
        // What's on top should be the error.
        lua_error(ls);
    }
    
    return (lua_gettop(ls));

Insertion in crawl-ref/source/clua.cc at line 1875 [8.483969]

[8.527706]

    { "game_started",   crawl_game_started },
    { "err_trace",      crawl_err_trace },

Hackily rewrite Lua chunk errors to reflect line numbers from the original

Dependencies

In channels

Change contents

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

Insertion in crawl-ref/source/util/levcomp.ypp at line 106 [4.75608]

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

Deletion in crawl-ref/source/mapdef.h at line 440 [4.591249]

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

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

Deletion in crawl-ref/source/mapdef.cc at line 938 [4.594797]

Deletion in crawl-ref/source/mapdef.cc at line 940 [4.594797]

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

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

Insertion in crawl-ref/source/luadgn.h at line 21 [7.228]

Insertion in crawl-ref/source/luadgn.h at line 26 [7.228]

Replacement in crawl-ref/source/luadgn.h at line 33 [7.228]

Replacement in crawl-ref/source/luadgn.h at line 44 [7.228]