fiddlerwoaroof/crawl - Change AUYQDKLMOG4FGH2T3LACX4TH632DPKVXBNV5VU6PIVUEWSIO4LQQC

Allow SUBST and SHUFFLE specs to be comma-separated.

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

Created by dshaligram on March 27, 2007

AUYQDKLMOG4FGH2T3LACX4TH632DPKVXBNV5VU6PIVUEWSIO4LQQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/util/levcomp.ypp at line 164 [4.75608]
∅:D[3.191] → [4.77657:77682]
B:BD[4.77657] → [4.77657:77682]
```
                | symbol
```
[3.191]
[4.77682]
```
                | subst
```

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

[2.1232]


shuffle         : SHUFFLE shuffle_specifiers {} 
                ;

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

∅:D[2.1233] → [5.86:149]

B:BD[4.77724] → [5.86:149]

shuffle         : SHUFFLE { }
                | SHUFFLE STRING

[2.1233]

[5.149]

shuffle_specifiers : shuffle_spec
                   | shuffle_spec COMMA shuffle_specifiers
                   ;
shuffle_spec    : ITEM_INFO

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

B:BD[5.167] → [6.58:124]

                    std::string err = lc_map.map.add_shuffle($2);

[5.167]

[7.70]

                    std::string err = lc_map.map.add_shuffle($1);

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

B:BD[7.250] → [7.250:311]

                                $2, err.c_str() ).c_str() );

[7.250]

[5.211]

                                $1, err.c_str() ).c_str() );

Insertion in crawl-ref/source/util/levcomp.ypp at line 229 [4.75608]
[4.78001]
[4.78001]
```
                ;
subst           : SUBST subst_specifiers { }
```

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

[4.78019]


subst_specifiers : subst_spec
                 | subst_spec COMMA subst_specifiers
                 ;

Replacement in crawl-ref/source/util/levcomp.ypp at line 238 [4.75608]
B:BD[4.78020] → [6.125:183]
```
symbol          : SUBST {}
                | SUBST STRING
```
[4.78020]
[4.78080]
```
subst_spec      : ITEM_INFO
```

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

B:BD[4.78098] → [6.184:248]

                    std::string err = lc_map.map.add_subst($2);

[4.78098]

[6.248]

                    std::string err = lc_map.map.add_subst($1);

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

B:BD[6.426] → [6.426:487]

                                $2, err.c_str() ).c_str() );

[6.426]

[4.78146]

                                $1, err.c_str() ).c_str() );

Replacement in crawl-ref/source/util/levcomp.lpp at line 54 [4.81193]
B:BD[4.81701] → [3.1115:1128]
```
%s ITEM_LIST
```
[4.81701]
[4.81701]
```
%x ITEM_LIST
```

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

B:BD[3.1345] → [3.1345:1391]

<ITEM_LIST>[^, \t\r\n][^,\r\n]+[^, \t\r\n] {

[3.1345]

[3.1391]

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

Replacement in crawl-ref/source/util/levcomp.lpp at line 129 [4.81193]
B:BD[4.82390] → [6.489:544]
```
SUBST:              { BEGIN(ARGUMENT); return SUBST; }
```
[4.82390]
[4.82446]
```
SUBST:              { BEGIN(ITEM_LIST); return SUBST; }
```

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

B:BD[3.2114] → [5.232:289]

SHUFFLE:            { BEGIN(ARGUMENT); return SHUFFLE; }

[3.2114]

[2.1235]

SHUFFLE:            { BEGIN(ITEM_LIST); return SHUFFLE; }

Replacement in crawl-ref/source/dungeon.cc at line 5526 [9.3429798]

B:BD[8.482] → [8.482:487]

[8.482]

[10.5558]


    if (place.map.has_tag("no_monster_gen"))
        no_monster_zones.push_back(
            dgn_region( place.x, place.y, place.width, place.height ) );
    if (place.map.has_tag("no_item_gen"))
        no_item_zones.push_back( 
            dgn_region( place.x, place.y, place.width, place.height ) );