diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-02-19 18:54:42 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-02-19 18:54:42 +0000 |
| commit | a191a19ff4afeae3cbc76f120463152c5ebfc2ea (patch) | |
| tree | b6cb038b12e26ba5b1b3f69867ef1701ae60d533 /crawl-ref/source/util/levcomp.lpp | |
| parent | e9b1a504be1d94eab7a724ba5935aaf48fe9e4cb (diff) | |
| download | crawl-ref-a191a19ff4afeae3cbc76f120463152c5ebfc2ea.tar.gz crawl-ref-a191a19ff4afeae3cbc76f120463152c5ebfc2ea.zip | |
Updated entry vaults (David).
Level compiler is stricter with MAP sections.
Block SHUFFLE: now uses / as a separator to avoid confusion.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@955 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/util/levcomp.lpp')
| -rw-r--r-- | crawl-ref/source/util/levcomp.lpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/crawl-ref/source/util/levcomp.lpp b/crawl-ref/source/util/levcomp.lpp index 3556c7cb87..faf61d7f7c 100644 --- a/crawl-ref/source/util/levcomp.lpp +++ b/crawl-ref/source/util/levcomp.lpp @@ -47,7 +47,7 @@ static void settext() %} -%s MAPDEF +%x MAPDEF %s ARGUMENT %s MNAME %s KEYWORDS @@ -62,14 +62,17 @@ NSPACE [^\ \t\r\n] <MAPDEF>^\s*ENDMAP { BEGIN(INITIAL); } -<MAPDEF>^#.*\r?\n ; - -<MAPDEF>[a-zA-Z_&0-9|$+.@^~#()\[\]=<>{}%*\-?]* { +<MAPDEF>^[a-zA-Z_&0-9|$+.@^~()\[\]=<>{}%*\-?]+ { settext(); return MAP_LINE; } + +<MAPDEF>^[ ]*\r?\n return CHARACTER; +<MAPDEF># return CHARACTER; <MAPDEF>[\ ][^\ \r\n] return CHARACTER; +<MAPDEF>[ ]*\r?\n ; + <KEYWORDS>[A-Za-z_0-9\-]+ { settext(); return STRING; |