diff options
author | shennetsind <ind@henn.et> | 2013-11-04 22:45:55 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-04 22:45:55 -0200 |
commit | 5b5618f072a6aaa7a32aae516809bd0671580631 (patch) | |
tree | dd9371afbbd0cfca71673dece4d3352f33ba41a7 /3rdparty/libconfig/extra/gen | |
parent | 0a965aafde882e905ea71f3bcef8f4ff81c1c327 (diff) | |
parent | ba5ca9e100564cecb4a1fb1edabca1c042c10204 (diff) | |
download | hercules-5b5618f072a6aaa7a32aae516809bd0671580631.tar.gz hercules-5b5618f072a6aaa7a32aae516809bd0671580631.tar.bz2 hercules-5b5618f072a6aaa7a32aae516809bd0671580631.tar.xz hercules-5b5618f072a6aaa7a32aae516809bd0671580631.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to '3rdparty/libconfig/extra/gen')
-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, "\\"); } |