fiddlerwoaroof/crawl - Change SLL3SBE2LEJOAKMZL4KQSBJKP7ZFH2VLR652YOQTBVPA5IN6ROJAC

Append currently processed init filename and line number to the end of init

file parsing error/warning messages.

Created by Matthew Cline on October 13, 2009

SLL3SBE2LEJOAKMZL4KQSBJKP7ZFH2VLR652YOQTBVPA5IN6ROJAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/initfile.cc at line 478 [8.2957258]
∅:D[6.5446] → [7.1585:1628]
B:BD[9.393438] → [7.1585:1628]
```
            crawl_state.add_startup_error(
```
[6.5446]
[7.1628]
```
            Options.report_error(
```
Replacement in crawl-ref/source/initfile.cc at line 486 [8.2957258]
∅:D[6.5464] → [7.1707:1746]
B:BD[10.312] → [7.1707:1746]
```
        crawl_state.add_startup_error(
```
[6.5464]
[7.1746]
```
        Options.report_error(
```
Replacement in crawl-ref/source/initfile.cc at line 582 [8.2957258]
B:BD[11.789636] → [7.1814:1857]
```
            crawl_state.add_startup_error(
```
[11.789636]
[7.1857]
```
            report_error (
```
Replacement in crawl-ref/source/initfile.cc at line 600 [8.2957258]
B:BD[11.790083] → [7.1932:1971]
```
        crawl_state.add_startup_error(
```
[11.790083]
[7.1971]
```
        report_error (
```
Replacement in crawl-ref/source/initfile.cc at line 617 [8.2957258]
B:BD[11.790553] → [7.2092:2131]
```
        crawl_state.add_startup_error(
```
[11.790553]
[7.2131]
```
        report_error (
```

Insertion in crawl-ref/source/initfile.cc at line 650 [8.2957258]

[11.791069]

    filename     = "unkown";
    basefilename = "unknown";
    line_num     = -1;

Replacement in crawl-ref/source/initfile.cc at line 1127 [8.2957258]
B:BD[12.373] → [12.373:412]
```
        crawl_state.add_startup_error(
```
[12.373]
[12.412]
```
        report_error (
```

Insertion in crawl-ref/source/initfile.cc at line 1309 [8.2957258]

[13.5185]

[11.797175]

    Options.line_num = 0;
#ifdef MULTIUSER
    Options.basefilename = "~/.crawlrc";
#else
    Options.basefilename = "init.txt";
#endif

Insertion in crawl-ref/source/initfile.cc at line 1317 [8.2957258]

[9.397290]

[13.5186]


    Options.filename    = "unknown";
    Options.basefilename = "unknown";
    Options.line_num    = -1;

Insertion in crawl-ref/source/initfile.cc at line 1466 [8.2957258]
[9.400324]
[9.400324]
```
        line_num++;
```

Replacement in crawl-ref/source/initfile.cc at line 1944 [8.2957258]

B:BD[14.4260] → [14.4260:4334]

            crawl_state.add_startup_error(                              \

[14.4260]

[14.4334]

            report_error (                                              \

Replacement in crawl-ref/source/initfile.cc at line 1963 [8.2957258]

B:BD[15.15062] → [15.15062:15136]

            crawl_state.add_startup_error(                              \

[15.15062]

[15.15136]

            report_error (                                              \

Replacement in crawl-ref/source/initfile.cc at line 1967 [8.2957258]

B:BD[15.15360] → [15.15360:15434]

            crawl_state.add_startup_error(                              \

[15.15360]

[15.15434]

            report_error (                                              \

Replacement in crawl-ref/source/initfile.cc at line 2111 [8.2957258]
B:BD[8.2972724] → [2.284:331]
```
                crawl_state.add_startup_error(
```
[8.2972724]
[2.331]
```
                report_error (
```
Replacement in crawl-ref/source/initfile.cc at line 2559 [8.2957258]
∅:D[16.12822] → [7.2388:2431]
B:BD[9.417351] → [7.2388:2431]
```
            crawl_state.add_startup_error(
```
[16.12822]
[7.2431]
```
            report_error (
```

Replacement in crawl-ref/source/initfile.cc at line 2600 [8.2957258]

B:BD[5.3103] → [5.3103:3178]

            crawl_state.add_startup_error("Autoinscirbe string is empty");

[5.3103]

[5.3178]

            report_error("Autoinscirbe string is empty");

Replacement in crawl-ref/source/initfile.cc at line 2608 [8.2957258]
B:BD[5.3385] → [5.3385:3428]
```
            crawl_state.add_startup_error(
```
[5.3385]
[5.3428]
```
            report_error (
```
Replacement in crawl-ref/source/initfile.cc at line 2616 [8.2957258]
B:BD[5.3628] → [5.3628:3671]
```
            crawl_state.add_startup_error(
```
[5.3628]
[5.3671]
```
            report_error (
```
Replacement in crawl-ref/source/initfile.cc at line 2624 [8.2957258]
B:BD[5.3866] → [5.3866:3909]
```
            crawl_state.add_startup_error(
```
[5.3866]
[5.3909]
```
            report_error (
```
Replacement in crawl-ref/source/initfile.cc at line 2634 [8.2957258]
B:BD[5.4099] → [5.4099:4142]
```
            crawl_state.add_startup_error(
```
[5.4099]
[5.4142]
```
            report_error (
```
Replacement in crawl-ref/source/initfile.cc at line 2660 [8.2957258]
B:BD[17.1959] → [7.2511:2558]
```
                crawl_state.add_startup_error(
```
[17.1959]
[7.2558]
```
                report_error (
```
Replacement in crawl-ref/source/initfile.cc at line 2684 [8.2957258]
B:BD[17.2805] → [7.2639:2686]
```
                crawl_state.add_startup_error(
```
[17.2805]
[7.2686]
```
                report_error (
```

Replacement in crawl-ref/source/initfile.cc at line 2707 [8.2957258]

B:BD[4.9091] → [4.9091:9220]

                crawl_state.add_startup_error(
                    make_stringf("Bad stat_colour string: %s\n", field.c_str()));

[4.9091]

[4.9220]

                report_error (
                    make_stringf("Bad stat_colour string: %s\n",
                                 field.c_str()));

Replacement in crawl-ref/source/initfile.cc at line 2731 [8.2957258]
B:BD[17.3306] → [7.2767:2814]
```
                crawl_state.add_startup_error(
```
[17.3306]
[7.2814]
```
                report_error (
```
Insertion in crawl-ref/source/initfile.cc at line 3407 [8.2957258]
[13.9679]
[3.2645]
```
    unwind_var<std::string> basefile(this->basefilename, rawfilename);
```

Insertion in crawl-ref/source/initfile.cc at line 3409 [8.2957258]

[3.2646]

    // Save current line number
    unwind_var<int> currlinenum(this->line_num, 0);

Replacement in crawl-ref/source/initfile.cc at line 3429 [8.2957258]

B:BD[13.10032] → [18.4809:4866]

        mprf(MSGCH_ERROR, "Warning: %s", error.c_str());

[13.10032]

[13.10088]

    {
        mprf(MSGCH_ERROR, "Warning: %s (%s:%d)", error.c_str(),
             basefilename.c_str(), line_num);
    }

Replacement in crawl-ref/source/initfile.cc at line 3434 [8.2957258]

B:BD[13.10097] → [13.10097:10143]

        crawl_state.add_startup_error(error);

[13.10097]

[13.10143]

    {
        crawl_state.add_startup_error(make_stringf("%s (%s:%d)",
                                                   error.c_str(),
                                                   basefilename.c_str(),
                                                   line_num));
    }

Replacement in crawl-ref/source/externs.h at line 1902 [8.3270163]

B:BD[11.898495] → [13.14996:15067]

    std::string filename;  // The name of the file containing options.

[11.898495]

[13.15067]

    std::string filename;     // The name of the file containing options.
    std::string basefilename; // Base (pathless) file name
    int         line_num;     // Current line number being processed.

Append currently processed init filename and line number to the end of init

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/initfile.cc at line 478 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 486 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 582 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 600 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 617 [8.2957258]

Insertion in crawl-ref/source/initfile.cc at line 650 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1127 [8.2957258]

Insertion in crawl-ref/source/initfile.cc at line 1309 [8.2957258]

Insertion in crawl-ref/source/initfile.cc at line 1317 [8.2957258]

Insertion in crawl-ref/source/initfile.cc at line 1466 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1944 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1963 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 1967 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2111 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2559 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2600 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2608 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2616 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2624 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2634 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2660 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2684 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2707 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 2731 [8.2957258]

Insertion in crawl-ref/source/initfile.cc at line 3407 [8.2957258]

Insertion in crawl-ref/source/initfile.cc at line 3409 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 3429 [8.2957258]

Replacement in crawl-ref/source/initfile.cc at line 3434 [8.2957258]

Replacement in crawl-ref/source/externs.h at line 1902 [8.3270163]