fiddlerwoaroof/crawl - Change XALTSNKCNAFBIEBXUD5KFMCTYH65XHKY436W5OR5JNBAKEEUZVAAC

Report the right line numbers for Lua errors in .crawlrc Lua.

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

Created by dshaligram on August 9, 2008

XALTSNKCNAFBIEBXUD5KFMCTYH65XHKY436W5OR5JNBAKEEUZVAAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/luadgn.h at line 39 [4.228]
B:BD[3.794] → [3.794:799]
```
    
```
[3.794]
[4.650]
Replacement in crawl-ref/source/luadgn.h at line 54 [4.228]
B:BD[5.13030] → [5.13030:13035]
```
    
```
[5.13030]
[4.753]
Replacement in crawl-ref/source/luadgn.h at line 58 [4.228]
∅:D[6.9379] → [4.820:825]
B:BD[4.820] → [4.820:825]
```
    
```
[6.9379]
[7.2539]
Insertion in crawl-ref/source/luadgn.h at line 60 [4.228]
[7.2567]
[7.2567]
```
    int run(CLua &interp);
```
Replacement in crawl-ref/source/luadgn.h at line 67 [4.228]
B:BD[8.1132] → [8.1132:1137]
```
    
```
[8.1132]
[4.1047]
Replacement in crawl-ref/source/luadgn.h at line 71 [4.228]
B:BD[5.13103] → [5.13103:13108]
```
    
```
[5.13103]
[9.13361]

Insertion in crawl-ref/source/luadgn.cc at line 210 [4.1232]

[4.2975]

[7.3222]

int dlua_chunk::run(CLua &interp)
{
    int err = load(interp);
    if (err)
        return (err);
    // callfn returns true on success, but we want to return 0 on success.
    return (check_op(interp, !interp.callfn(NULL, 0, 0)));
}

Insertion in crawl-ref/source/initfile.cc at line 27 [12.2957258]
[10.390989]
[11.785034]
```
#include "luadgn.h"
```
Insertion in crawl-ref/source/initfile.cc at line 1340 [12.2957258]
[13.699]
[14.5943]
```
    dlua_chunk luacond(filename);
    dlua_chunk luacode(filename);
```
Deletion in crawl-ref/source/initfile.cc at line 1344 [12.2957258]
∅:D[15.172] → [10.400246:400296]
∅:D[14.5944] → [10.400246:400296]
B:BD[12.2969337] → [10.400246:400296]
```
    std::string luacond;
    std::string luacode;
```

Replacement in crawl-ref/source/initfile.cc at line 1364 [12.2957258]

B:BD[16.586] → [16.586:634]

                if (luacond.length() && l_init)

[16.586]

[16.634]

                if (!luacond.empty() && l_init)

Replacement in crawl-ref/source/initfile.cc at line 1366 [12.2957258]

B:BD[16.652] → [16.652:693]

                    luacond += "]] )\n";

[16.652]

[16.693]

                    luacond.add(line - 1, "]] )");

Replacement in crawl-ref/source/initfile.cc at line 1369 [12.2957258]
B:BD[16.747] → [16.747:786]
```
                luacond += str + "\n";
```
[16.747]
[16.786]
```
                luacond.add(line, str);
```
Replacement in crawl-ref/source/initfile.cc at line 1390 [12.2957258]
B:BD[10.401212] → [10.401212:401260]
```
                if (luacond.length() && l_init)
```
[10.401212]
[12.2970200]
```
                if (!luacond.empty() && l_init)
```

Replacement in crawl-ref/source/initfile.cc at line 1392 [12.2957258]

B:BD[12.2970218] → [10.401261:401302]

                    luacond += "]] )\n";

[12.2970218]

[10.401302]

                    luacond.add(line - 1, "]] )");

Replacement in crawl-ref/source/initfile.cc at line 1395 [12.2957258]
B:BD[12.2970352] → [10.401339:401378]
```
                luacond += str + "\n";
```
[12.2970352]
[12.2970352]
```
                luacond.add(line, str);
```
Replacement in crawl-ref/source/initfile.cc at line 1405 [12.2957258]
B:BD[10.401633] → [10.401633:401672]
```
                luacond += str + "\n";
```
[10.401633]
[10.401672]
```
                luacond.add(line, str);
```
Replacement in crawl-ref/source/initfile.cc at line 1411 [12.2957258]
B:BD[10.401754] → [10.401754:401791]
```
                luacond += s + "\n";
```
[10.401754]
[10.401791]
```
                luacond.add(line, s);
```
Insertion in crawl-ref/source/initfile.cc at line 1420 [12.2957258]
[10.401988]
[10.401988]
```
            luacode.set_file(filename);
```
Replacement in crawl-ref/source/initfile.cc at line 1432 [12.2957258]
B:BD[10.402306] → [10.402306:402345]
```
                luacode += str + "\n";
```
[10.402306]
[10.402345]
```
                luacode.add(line, str);
```

Replacement in crawl-ref/source/initfile.cc at line 1437 [12.2957258]

B:BD[10.402426] → [10.402426:402476]

B:BD[10.402476] → [17.266:307]

B:BD[17.307] → [2.2645:2721]

                clua.execstring(luacode.c_str());
                if (!clua.error.empty())
                    mprf(MSGCH_ERROR, "Lua error: %s", clua.error.c_str());

[10.402426]

[10.402593]

                if (luacode.run(clua))
                    mprf(MSGCH_ERROR, "Lua error: %s",
                         luacode.orig_error().c_str());

Replacement in crawl-ref/source/initfile.cc at line 1452 [12.2957258]

B:BD[10.402846] → [10.402846:402896]

B:BD[10.402896] → [17.385:426]

B:BD[17.426] → [2.2722:2798]

                clua.execstring(luacode.c_str());
                if (!clua.error.empty())
                    mprf(MSGCH_ERROR, "Lua error: %s", clua.error.c_str());

[10.402846]

[10.403041]

                if (luacode.run(clua))
                    mprf(MSGCH_ERROR, "Lua error: %s",
                         luacode.orig_error().c_str());

Replacement in crawl-ref/source/initfile.cc at line 1462 [12.2957258]
B:BD[12.2971209] → [10.403147:403180]
```
            luacode += s + "\n";
```
[12.2971209]
[10.403180]
```
            luacode.add(line, s);
```

Replacement in crawl-ref/source/initfile.cc at line 1470 [12.2957258]

B:BD[10.403284] → [10.403284:403333]

                luacond += "crawl.setopt( [[\n";

[10.403284]

[10.403333]

                luacond.add(line, "crawl.setopt( [[");

Replacement in crawl-ref/source/initfile.cc at line 1474 [12.2957258]
B:BD[10.403379] → [10.403379:403412]
```
            luacond += s + "\n";
```
[10.403379]
[10.403412]
```
            luacond.add(line, s);
```

Replacement in crawl-ref/source/initfile.cc at line 1485 [12.2957258]

B:BD[10.403572] → [10.403572:403647]

B:BD[10.403647] → [17.504:537]

B:BD[17.537] → [2.2799:2867]

            luacond += "]] )\n";
        clua.execstring(luacond.c_str());
        if (!clua.error.empty())
            mprf(MSGCH_ERROR, "Lua error: %s", clua.error.c_str());

[10.403572]

[10.403739]

            luacond.add(line, "]] )");
        if (luacond.run(clua))
            mprf(MSGCH_ERROR, "Lua error: %s", luacond.orig_error().c_str());

Report the right line numbers for Lua errors in .crawlrc Lua.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/luadgn.h at line 39 [4.228]

Replacement in crawl-ref/source/luadgn.h at line 54 [4.228]

Replacement in crawl-ref/source/luadgn.h at line 58 [4.228]

Insertion in crawl-ref/source/luadgn.h at line 60 [4.228]

Replacement in crawl-ref/source/luadgn.h at line 67 [4.228]

Replacement in crawl-ref/source/luadgn.h at line 71 [4.228]

Insertion in crawl-ref/source/luadgn.cc at line 210 [4.1232]

Insertion in crawl-ref/source/initfile.cc at line 27 [12.2957258]

Insertion in crawl-ref/source/initfile.cc at line 1340 [12.2957258]

Deletion in crawl-ref/source/initfile.cc at line 1344 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1364 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1366 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1369 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1390 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1392 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1395 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1405 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1411 [12.2957258]

Insertion in crawl-ref/source/initfile.cc at line 1420 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1432 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1437 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1452 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1462 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1470 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1474 [12.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1485 [12.2957258]