From 7e248a309cc3129a2e790fd413dea80eaa03db56 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 4 Nov 2013 14:37:04 +0100 Subject: Follow-up to 3b0cd11f980a48b903262c857fde1cd9c784c2e0 - Changed to <" "> after some further brainstorming. Special thanks to Yommy. Signed-off-by: Haru --- 3rdparty/libconfig/extra/gen/scanner.l | 6 +- 3rdparty/libconfig/scanner.c | 153 ++++++++++++++++----------------- 2 files changed, 79 insertions(+), 80 deletions(-) (limited to '3rdparty') diff --git a/3rdparty/libconfig/extra/gen/scanner.l b/3rdparty/libconfig/extra/gen/scanner.l index a7befd11d..4b3048fab 100644 --- a/3rdparty/libconfig/extra/gen/scanner.l +++ b/3rdparty/libconfig/extra/gen/scanner.l @@ -129,9 +129,9 @@ include_open ^[ \t]*@include[ \t]+\" return(TOK_STRING); } -\<\? { BEGIN SCRIPTBLOCK; } -([^\?]|\?[^\>])+ { scanctx_append_string(yyextra, yytext); } -\?\> { +\<\" { BEGIN SCRIPTBLOCK; } +([^\"]|\"[^\>])+ { scanctx_append_string(yyextra, yytext); } +\"\> { yylval->sval = scanctx_take_string(yyextra); BEGIN INITIAL; return(TOK_STRING); diff --git a/3rdparty/libconfig/scanner.c b/3rdparty/libconfig/scanner.c index 171cef89d..6de72c2fd 100644 --- a/3rdparty/libconfig/scanner.c +++ b/3rdparty/libconfig/scanner.c @@ -399,14 +399,14 @@ static yyconst flex_int32_t yy_ec[256] = 1, 2, 1, 6, 7, 1, 1, 1, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 18, 18, 18, 18, 18, 18, 18, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 27, 27, 27, 28, 29, - 30, 30, 30, 30, 30, 31, 30, 30, 30, 30, - 30, 32, 33, 34, 35, 30, 30, 36, 30, 30, - 37, 38, 39, 1, 8, 1, 26, 27, 40, 41, - - 42, 43, 30, 30, 44, 30, 30, 45, 30, 46, - 30, 30, 30, 47, 33, 48, 49, 30, 30, 36, - 30, 30, 50, 1, 51, 1, 1, 1, 1, 1, + 22, 23, 1, 24, 25, 26, 26, 26, 27, 28, + 29, 29, 29, 29, 29, 30, 29, 29, 29, 29, + 29, 31, 32, 33, 34, 29, 29, 35, 29, 29, + 36, 37, 38, 1, 8, 1, 25, 26, 39, 40, + + 41, 42, 29, 29, 43, 29, 29, 44, 29, 45, + 29, 29, 29, 46, 32, 47, 48, 29, 29, 35, + 29, 29, 49, 1, 50, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -423,32 +423,31 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[52] = +static yyconst flex_int32_t yy_meta[51] = { 0, 1, 1, 1, 1, 1, 2, 1, 3, 1, 1, 3, 1, 1, 3, 1, 1, 4, 4, 1, 1, - 1, 1, 1, 1, 1, 4, 4, 4, 4, 3, - 3, 3, 3, 3, 3, 3, 1, 2, 1, 4, - 4, 4, 4, 3, 3, 3, 3, 3, 3, 1, - 1 + 1, 1, 1, 1, 4, 4, 4, 4, 3, 3, + 3, 3, 3, 3, 3, 1, 2, 1, 4, 4, + 4, 4, 3, 3, 3, 3, 3, 3, 1, 1 } ; static yyconst flex_int16_t yy_base[124] = { 0, - 0, 50, 50, 51, 49, 50, 51, 52, 197, 196, - 219, 222, 216, 222, 222, 222, 214, 222, 222, 0, - 48, 222, 42, 53, 63, 78, 222, 222, 192, 189, - 35, 222, 222, 222, 222, 72, 170, 222, 222, 197, - 0, 222, 65, 0, 222, 62, 182, 179, 175, 173, - 222, 0, 97, 101, 105, 123, 222, 172, 110, 132, - 143, 0, 222, 41, 72, 77, 128, 125, 222, 0, - 222, 0, 222, 222, 222, 222, 222, 0, 222, 222, - 146, 133, 222, 59, 113, 136, 143, 141, 145, 222, - 120, 112, 82, 102, 0, 148, 150, 105, 106, 0, - - 81, 222, 222, 0, 68, 63, 56, 90, 167, 222, - 222, 178, 182, 186, 190, 194, 196, 200, 204, 208, - 81, 79, 69 + 0, 49, 49, 50, 48, 49, 50, 51, 214, 213, + 218, 221, 215, 221, 221, 221, 213, 221, 221, 0, + 47, 221, 41, 55, 62, 66, 221, 221, 209, 189, + 32, 221, 221, 221, 221, 67, 170, 221, 221, 196, + 0, 221, 64, 0, 221, 61, 205, 187, 207, 205, + 221, 0, 77, 97, 99, 111, 221, 204, 103, 119, + 170, 0, 221, 46, 71, 98, 153, 126, 221, 0, + 221, 0, 221, 221, 221, 221, 221, 0, 221, 221, + 164, 146, 221, 57, 117, 124, 131, 129, 135, 221, + 138, 135, 123, 127, 0, 137, 139, 132, 131, 0, + + 117, 221, 221, 0, 112, 99, 91, 111, 157, 221, + 221, 172, 176, 180, 184, 188, 190, 194, 198, 202, + 104, 98, 68 } ; static yyconst flex_int16_t yy_def[124] = @@ -469,72 +468,72 @@ static yyconst flex_int16_t yy_def[124] = 111, 111, 111 } ; -static yyconst flex_int16_t yy_nxt[274] = +static yyconst flex_int16_t yy_nxt[272] = { 0, 12, 13, 14, 15, 15, 16, 17, 12, 18, 19, 20, 21, 22, 21, 23, 24, 25, 26, 27, 28, - 29, 27, 12, 12, 12, 20, 20, 20, 30, 20, - 20, 20, 20, 31, 20, 20, 32, 12, 33, 20, - 20, 20, 30, 20, 20, 20, 20, 31, 20, 34, - 35, 36, 39, 39, 42, 42, 45, 45, 55, 55, - 40, 40, 53, 57, 54, 54, 65, 79, 58, 56, - 71, 92, 102, 66, 37, 85, 85, 59, 66, 54, - 54, 65, 95, 56, 91, 92, 43, 43, 46, 46, - 60, 109, 59, 61, 54, 54, 67, 108, 62, 80, - - 72, 67, 73, 107, 60, 60, 93, 74, 61, 100, - 75, 76, 77, 55, 55, 59, 106, 54, 54, 60, - 93, 55, 55, 100, 56, 105, 86, 86, 60, 85, - 85, 61, 56, 104, 84, 103, 84, 87, 56, 85, - 85, 101, 60, 88, 99, 88, 56, 104, 89, 89, - 98, 87, 86, 86, 96, 111, 96, 89, 89, 97, - 97, 89, 89, 87, 97, 97, 97, 97, 109, 82, - 94, 68, 110, 90, 51, 51, 49, 87, 38, 38, - 38, 38, 41, 41, 41, 41, 44, 44, 44, 44, - 47, 47, 47, 47, 50, 50, 50, 50, 52, 52, - - 70, 83, 70, 70, 78, 82, 78, 78, 81, 81, - 81, 81, 69, 68, 64, 63, 51, 49, 111, 48, - 48, 11, 111, 111, 111, 111, 111, 111, 111, 111, + 29, 27, 12, 12, 20, 20, 20, 30, 20, 20, + 20, 20, 31, 20, 20, 32, 12, 33, 20, 20, + 20, 30, 20, 20, 20, 20, 31, 20, 34, 35, + 36, 39, 39, 42, 42, 45, 45, 55, 55, 40, + 40, 53, 65, 54, 54, 57, 79, 56, 66, 71, + 58, 102, 37, 85, 85, 92, 59, 65, 54, 54, + 59, 56, 54, 54, 43, 43, 46, 46, 60, 92, + 67, 61, 60, 55, 55, 61, 62, 80, 72, 66, + + 73, 95, 60, 56, 93, 74, 60, 91, 75, 76, + 77, 59, 109, 54, 54, 55, 55, 56, 93, 86, + 86, 67, 84, 60, 84, 56, 61, 85, 85, 87, + 88, 108, 88, 85, 85, 89, 89, 60, 107, 56, + 86, 86, 96, 87, 96, 89, 89, 97, 97, 100, + 87, 89, 89, 97, 97, 97, 97, 104, 109, 106, + 105, 103, 110, 100, 87, 101, 99, 98, 111, 82, + 94, 104, 38, 38, 38, 38, 41, 41, 41, 41, + 44, 44, 44, 44, 47, 47, 47, 47, 50, 50, + 50, 50, 52, 52, 70, 68, 70, 70, 78, 90, + + 78, 78, 81, 81, 81, 81, 51, 51, 49, 83, + 82, 69, 68, 64, 63, 51, 49, 111, 48, 48, + 11, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, - 111, 111, 111 + 111 } ; -static yyconst flex_int16_t yy_chk[274] = +static yyconst flex_int16_t yy_chk[272] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 3, 4, 5, 6, 7, 8, 23, 23, - 3, 4, 21, 24, 21, 21, 31, 46, 24, 23, - 43, 64, 123, 36, 2, 84, 84, 25, 66, 25, - 25, 31, 122, 23, 121, 64, 5, 6, 7, 8, - 25, 108, 26, 25, 26, 26, 36, 107, 25, 46, - - 43, 66, 43, 106, 25, 26, 65, 43, 26, 93, - 43, 43, 43, 53, 53, 54, 105, 54, 54, 26, - 65, 55, 55, 93, 53, 101, 59, 59, 54, 85, - 85, 54, 55, 99, 56, 98, 56, 59, 53, 56, - 56, 94, 54, 60, 92, 60, 55, 99, 60, 60, - 91, 59, 86, 86, 87, 82, 87, 88, 88, 87, - 87, 89, 89, 86, 96, 96, 97, 97, 109, 81, - 68, 67, 109, 61, 58, 50, 49, 86, 112, 112, - 112, 112, 113, 113, 113, 113, 114, 114, 114, 114, - 115, 115, 115, 115, 116, 116, 116, 116, 117, 117, - - 118, 48, 118, 118, 119, 47, 119, 119, 120, 120, - 120, 120, 40, 37, 30, 29, 17, 13, 11, 10, - 9, 111, 111, 111, 111, 111, 111, 111, 111, 111, + 2, 3, 4, 5, 6, 7, 8, 23, 23, 3, + 4, 21, 31, 21, 21, 24, 46, 23, 36, 43, + 24, 123, 2, 84, 84, 64, 25, 31, 25, 25, + 26, 23, 26, 26, 5, 6, 7, 8, 25, 64, + 36, 25, 26, 53, 53, 26, 25, 46, 43, 66, + + 43, 122, 25, 53, 65, 43, 26, 121, 43, 43, + 43, 54, 108, 54, 54, 55, 55, 53, 65, 59, + 59, 66, 56, 54, 56, 55, 54, 56, 56, 59, + 60, 107, 60, 85, 85, 60, 60, 54, 106, 55, + 86, 86, 87, 59, 87, 88, 88, 87, 87, 93, + 86, 89, 89, 96, 96, 97, 97, 99, 109, 105, + 101, 98, 109, 93, 86, 94, 92, 91, 82, 81, + 68, 99, 112, 112, 112, 112, 113, 113, 113, 113, + 114, 114, 114, 114, 115, 115, 115, 115, 116, 116, + 116, 116, 117, 117, 118, 67, 118, 118, 119, 61, + + 119, 119, 120, 120, 120, 120, 58, 50, 49, 48, + 47, 40, 37, 30, 29, 17, 13, 11, 10, 9, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, - 111, 111, 111 + 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, + 111 } ; /* Table of booleans, true if rule could match eol. */ @@ -627,7 +626,7 @@ static unsigned long long fromhex(const char *s) } -#line 631 "scanner.c" +#line 630 "scanner.c" #define INITIAL 0 #define COMMENT 1 @@ -862,7 +861,7 @@ YY_DECL #line 105 "scanner.l" -#line 866 "scanner.c" +#line 865 "scanner.c" yylval = yylval_param; @@ -1242,7 +1241,7 @@ YY_RULE_SETUP #line 205 "scanner.l" ECHO; YY_BREAK -#line 1246 "scanner.c" +#line 1245 "scanner.c" case YY_END_OF_BUFFER: { -- cgit v1.2.3-60-g2f50