diff options
author | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
commit | d56017e3d1bf783cfdc67a702d2b70a0a27c8863 (patch) | |
tree | a47bd0ef6340ce1d011d198f430c7d96d620afe0 /3rdparty/libconfig/extra | |
parent | 5c94e76753c0cdb4ffb7dabbd6e135f1f7d42ef2 (diff) | |
parent | 3a3d2297068809d25ca43e19fd2977f97b2728f5 (diff) | |
download | hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.gz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.bz2 hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.xz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.zip |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/pc.c
Diffstat (limited to '3rdparty/libconfig/extra')
-rw-r--r-- | 3rdparty/libconfig/extra/gen/scanner.l | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/3rdparty/libconfig/extra/gen/scanner.l b/3rdparty/libconfig/extra/gen/scanner.l index bdc57a8d4..4b3048fab 100644 --- a/3rdparty/libconfig/extra/gen/scanner.l +++ b/3rdparty/libconfig/extra/gen/scanner.l @@ -100,7 +100,7 @@ float ([-+]?([0-9]*)?\.[0-9]*([eE][-+]?[0-9]+)?)|([-+]?([0-9]+)(\.[0 comment (#|\/\/).*$ include_open ^[ \t]*@include[ \t]+\" -%x COMMENT STRING INCLUDE +%x COMMENT STRING INCLUDE SCRIPTBLOCK %% @@ -129,6 +129,14 @@ include_open ^[ \t]*@include[ \t]+\" return(TOK_STRING); } +\<\" { BEGIN SCRIPTBLOCK; } +<SCRIPTBLOCK>([^\"]|\"[^\>])+ { scanctx_append_string(yyextra, yytext); } +<SCRIPTBLOCK>\"\> { + yylval->sval = scanctx_take_string(yyextra); + BEGIN INITIAL; + return(TOK_STRING); + } + {include_open} { BEGIN INCLUDE; } <INCLUDE>[^\"\\]+ { scanctx_append_string(yyextra, yytext); } <INCLUDE>\\\\ { scanctx_append_string(yyextra, "\\"); } |