fiddlerwoaroof/crawl - Change RZHJQU3Y6KKMNJKGL6P4IXBJTKWFO4YARAQSWYCETXXNSZG4BN7QC

Allow continuation lines in .des files (dpeg).

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

Created by dshaligram on October 19, 2008

RZHJQU3Y6KKMNJKGL6P4IXBJTKWFO4YARAQSWYCETXXNSZG4BN7QC

Dependencies

In channels

main

Change contents

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

[4.81550]

[5.971]

// Enter a new state, first clearing yylval of junk.
#define CBEGIN(x) do { BEGIN(x); clean(); } while (0)
static void post_proc_text(char *text, bool trim_right, int strip_trailing)
{
    char *s = NULL;
    if (trim_right)
    {
        s = text + strlen(text) - 1;
        while (s >= text && isspace(*s))
            *s-- = 0;
    }
    if (strip_trailing)
    {
        if (!s)
            s = text + strlen(text) - 1;
        while (s >= text && --strip_trailing >= 0)
            *s-- = 0;
    }
}

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

B:BD[6.4153] → [6.4153:4557]

        char *s = NULL;
        if (trim_right)
        {
            s = newstring + strlen(newstring) - 1;
            while (isspace(*s) && s >= newstring)
                *s-- = 0;
        }
        if (strip_trailing)
        {
            if (!s)
                s = newstring + strlen(newstring) - 1;
            while (s >= newstring && --strip_trailing >= 0)
                *s-- = 0;
        }

[4.81651]

[6.4557]

        post_proc_text(newstring, trim_right, strip_trailing);

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

[5.1231]

}
static void str_check()
{
    if (!yylval.text)
    {
        char *buf = (char *) malloc(1);
        if (buf)
        {
            yylval.text = buf;
            *buf = 0;
            alloced = true;
        }
    }

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

[5.1234]

[4.81654]

static void cattext(bool trim_right = false, int strip_trailing = 0)
{
    if (!yylval.text)
        settext(trim_right, strip_trailing);
    else
    {
        bool was_alloced = alloced;
        char *newbuf = (char*) malloc(strlen(yylval.text) + strlen(yytext) + 1);
        if (!newbuf)
            end(1, "Out of memory");
        alloced = true;
        strcpy(newbuf, yylval.text);
        strcat(newbuf, yytext);
        post_proc_text(newbuf, trim_right, strip_trailing);
        if (was_alloced)
            free((void*) yylval.text);
        yylval.text = newbuf;
    }
}

Insertion in crawl-ref/source/util/levcomp.lpp at line 131 [4.81193]
[4.81765]
[4.81765]
```
SPACE [\ \t\r]
```
Insertion in crawl-ref/source/util/levcomp.lpp at line 171 [4.81193]
[7.1279]
[7.1279]
```
<KEYWORDS>{SPACE}*\\{SPACE}*\n   ;
```

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

B:BD[7.1345] → [2.1816:1861]

∅:D[2.1861] → [8.761:838]

B:BD[8.761] → [8.761:838]

<ITEM_LIST>[^, \t\r\n][^,\r\n]*[^, \t\r\n] {
                        settext();
                        return ITEM_INFO;

[7.1345]

[8.838]

<ITEM_LIST>[^,\ \t\r\n][^,\r\n]*\\{SPACE}*\n {
                        cattext(true, 1);

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

B:BD[8.861] → [8.861:886]

∅:D[8.886] → [7.1391:1426]

B:BD[7.1391] → [7.1391:1426]

<ITEM_LIST>[^, \t\r\n] {
                        settext();

[8.861]

[7.1426]

<ITEM_LIST>{SPACE}*\\{SPACE}*\n   ;
<ITEM_LIST>[^, \t\r\n][^,\r\n]*[^, \t\r\n] {
                        cattext();

Replacement in crawl-ref/source/util/levcomp.lpp at line 186 [4.81193]
B:BD[7.1491] → [7.1491:1529]
```
<ITEM_LIST>,            return COMMA;
```
[7.1491]
[7.1529]
```
<ITEM_LIST>,            { clean(); return COMMA; }
```

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

B:BD[7.1641] → [2.1862:1905]

∅:D[2.1905] → [7.1685:1720]

B:BD[7.1685] → [7.1685:1720]

<MNAME>[^,\ \t\r\n][^,\r\n]+[^,\ \t\r\n] {
                        settext();

[7.1641]

[2.1906]

<MNAME>[^,\ \t\r\n][^,\r\n]*\\{SPACE}*\n {
                        cattext(true, 1);
                    }
<MNAME>{SPACE}*\\{SPACE}*\n   ;
<MNAME>[^,\ \t\r\n][^,\r\n]*[^,\ \t\r\n] {
                        cattext();

Replacement in crawl-ref/source/util/levcomp.lpp at line 203 [4.81193]
B:BD[4.81981] → [7.1767:1801]
```
<MNAME>,            return COMMA;
```
[4.81981]
[7.1801]
```
<MNAME>,            { clean(); return COMMA; }
```

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

[7.1824]

[2.1952]

<ARGUMENT>{NSPACE}.*\\{SPACE}*\n {
                        cattext(true, 1);
                    }
<ARGUMENT>{SPACE}*\\{SPACE}*\n   ;

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

∅:D[2.1983] → [7.1856:1931]

B:BD[7.1856] → [7.1856:1931]

B:BD[7.1931] → [2.1984:2023]

                        BEGIN(INITIAL);
                        settext();
                        return STRING;

[2.1983]

[7.1971]

                        cattext();

Replacement in crawl-ref/source/util/levcomp.lpp at line 216 [4.81193]
B:BD[7.1994] → [7.1994:2034]
```
<ARGUMENT>\r?\n     { BEGIN(INITIAL); }
```
[7.1994]
[7.2034]
```
<ARGUMENT>{SPACE}*$ { BEGIN(INITIAL); str_check(); return STRING; }
```

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

∅:D[9.984] → [4.82047:82101]

∅:D[6.5165] → [4.82047:82101]

B:BD[4.82047] → [4.82047:82101]

B:BD[4.82101] → [6.5166:5340]

∅:D[6.5340] → [4.82212:82267]

B:BD[4.82212] → [4.82212:82267]

B:BD[4.82267] → [10.647:704]

NAME:               { BEGIN(ARGUMENT); return NAME; }
default-depth:      { BEGIN(ARGUMENT); return DEFAULT_DEPTH; }
DEPTH:              { BEGIN(ARGUMENT); return DEPTH; }
ORIENT:             { BEGIN(ARGUMENT); return ORIENT; }
PLACE:              { BEGIN(ARGUMENT); return PLACE; }
WELCOME:            { BEGIN(ARGUMENT); return WELCOME; }

[9.984]

[4.82267]

NAME:               { CBEGIN(ARGUMENT); return NAME; }
default-depth:      { CBEGIN(ARGUMENT); return DEFAULT_DEPTH; }
DEPTH:              { CBEGIN(ARGUMENT); return DEPTH; }
ORIENT:             { CBEGIN(ARGUMENT); return ORIENT; }
PLACE:              { CBEGIN(ARGUMENT); return PLACE; }
WELCOME:            { CBEGIN(ARGUMENT); return WELCOME; }

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

B:BD[6.5376] → [6.5376:5430]

∅:D[6.5430] → [4.82336:82390]

B:BD[4.82336] → [4.82336:82390]

B:BD[4.82390] → [11.1669:1781]

∅:D[11.1781] → [8.887:943]

B:BD[4.82390] → [8.887:943]

B:BD[8.943] → [12.803:860]

B:BD[12.860] → [13.818:875]

B:BD[13.875] → [14.799:914]

∅:D[15.544] → [4.82446:82497]

∅:D[12.860] → [4.82446:82497]

∅:D[13.875] → [4.82446:82497]

∅:D[14.914] → [4.82446:82497]

∅:D[8.943] → [4.82446:82497]

B:BD[4.82446] → [4.82446:82497]

B:BD[4.82497] → [7.2059:2114]

B:BD[7.2114] → [5.1531:1584]

∅:D[16.815] → [8.944:1002]

∅:D[5.1584] → [8.944:1002]

B:BD[7.2114] → [8.944:1002]

FLAGS:              { BEGIN(KEYWORDS); return TAGS; }
TAGS:               { BEGIN(KEYWORDS); return TAGS; }
LFLAGS:             { BEGIN(ARGUMENT); return LFLAGS; }
BFLAGS:             { BEGIN(ARGUMENT); return BFLAGS; }
SUBST:              { BEGIN(ITEM_LIST); return SUBST; }
NSUBST:             { BEGIN(ITEM_LIST); return NSUBST; }
COLOUR:             { BEGIN(ITEM_LIST); return COLOUR; }
FLOORCOL:           { BEGIN(ARGUMENT); return FLOORCOL; }
ROCKCOL:            { BEGIN(ARGUMENT); return ROCKCOL; }
MONS:               { BEGIN(MNAME); return MONS; }
ITEM:               { BEGIN(ITEM_LIST); return ITEM; }
MARKER:             { BEGIN(TOEOL); return MARKER; }
SHUFFLE:            { BEGIN(ITEM_LIST); return SHUFFLE; }

[6.5376]

[17.1235]

FLAGS:              { CBEGIN(KEYWORDS); return TAGS; }
TAGS:               { CBEGIN(KEYWORDS); return TAGS; }
LFLAGS:             { CBEGIN(ARGUMENT); return LFLAGS; }
BFLAGS:             { CBEGIN(ARGUMENT); return BFLAGS; }
SUBST:              { CBEGIN(ITEM_LIST); return SUBST; }
NSUBST:             { CBEGIN(ITEM_LIST); return NSUBST; }
COLOUR:             { CBEGIN(ITEM_LIST); return COLOUR; }
FLOORCOL:           { CBEGIN(ARGUMENT); return FLOORCOL; }
ROCKCOL:            { CBEGIN(ARGUMENT); return ROCKCOL; }
MONS:               { CBEGIN(MNAME); return MONS; }
ITEM:               { CBEGIN(ITEM_LIST); return ITEM; }
MARKER:             { CBEGIN(TOEOL); return MARKER; }
SHUFFLE:            { CBEGIN(ITEM_LIST); return SHUFFLE; }

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

B:BD[17.1236] → [17.1236:1401]

B:BD[17.1401] → [11.1782:1837]

KFEAT:              { BEGIN(ARGUMENT); return KFEAT; }
KITEM:              { BEGIN(ARGUMENT); return KITEM; }
KMONS:              { BEGIN(ARGUMENT); return KMONS; }
KMASK:              { BEGIN(ARGUMENT); return KMASK; }

[17.1236]

[4.84005]

KFEAT:              { CBEGIN(ARGUMENT); return KFEAT; }
KITEM:              { CBEGIN(ARGUMENT); return KITEM; }
KMONS:              { CBEGIN(ARGUMENT); return KMONS; }
KMASK:              { CBEGIN(ARGUMENT); return KMASK; }

Replacement in crawl-ref/source/dat/mini.des at line 227 [19.75280]

B:BD[18.7902] → [18.7902:8059]

MONS:  gnoll ; potion of healing | potion of heal wounds . whip ego:reaching |whip good_item no_uniq | spear ego:reaching | glaive . scale mail | chain mail

[18.7902]

[18.8059]

MONS:  gnoll ; potion of healing | potion of heal wounds \ 
    . whip ego:reaching |whip good_item no_uniq | spear ego:reaching \
        | glaive \
    . scale mail | chain mail

Insertion in crawl-ref/docs/level_design.txt at line 805 [21.350]

[3.4027]

[20.3347]


For most map headers, you can split long lines by ending the line that
will be continued on the next line with \ as:
KMONS: * = orc ; katana | quick blade . chain mail | scale mail / \
           goblin ; dagger
If you're using continuation lines for comma-separated lists of items
or monsters, split your line after the comma, not before. For example:
Wrong:
        ITEM: potion of healing \
              , potion of speed
Right:
        ITEM: potion of healing, \
              potion of speed

Insertion in crawl-ref/docs/level_design.txt at line 822 [21.350]

[20.3348]

[3.4028]

But in general, it is preferable to use multiple ITEM or MONS lines if
you're splitting comma-separated values:

Insertion in crawl-ref/docs/level_design.txt at line 825 [21.350]

[3.4029]

Preferred:
        ITEM: potion of healing
        ITEM: potion of speed

Insertion in crawl-ref/docs/level_design.txt at line 829 [21.350]

[3.4030]