From ed061fe91e164c8fb8516768d5b233a9c4b0aa06 Mon Sep 17 00:00:00 2001 From: gumi Date: Tue, 31 Mar 2020 16:46:01 -0400 Subject: libconfig: rebuild libconfig --- .gitattributes | 8 +- 3rdparty/libconfig/extra/.gitignore | 2 + 3rdparty/libconfig/extra/gen/Makefile | 4 +- 3rdparty/libconfig/extra/gen/clangwarnings.patch | 14 +- 3rdparty/libconfig/grammar.c | 321 ++++--- 3rdparty/libconfig/grammar.h | 76 +- 3rdparty/libconfig/scanner.c | 1071 ++++++++++++++-------- 3rdparty/libconfig/scanner.h | 457 ++++++++- 8 files changed, 1344 insertions(+), 609 deletions(-) diff --git a/.gitattributes b/.gitattributes index a839a28c9..d565bc7ac 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,4 +2,10 @@ *.c diff=cpp *.sln merge=union *.vcproj merge=union -*.vcxproj merge=union \ No newline at end of file +*.vcxproj merge=union + +# libconfig generated files +3rdparty/libconfig/grammar.c linguist-generated=true +3rdparty/libconfig/grammar.h linguist-generated=true +3rdparty/libconfig/scanner.c linguist-generated=true +3rdparty/libconfig/scanner.h linguist-generated=true diff --git a/3rdparty/libconfig/extra/.gitignore b/3rdparty/libconfig/extra/.gitignore index 03f1609a0..abc0e5b2d 100644 --- a/3rdparty/libconfig/extra/.gitignore +++ b/3rdparty/libconfig/extra/.gitignore @@ -2,4 +2,6 @@ /config.status /gen/*.c /gen/*.h +/gen/*.orig +/gen/*.rej /autom4te.cache diff --git a/3rdparty/libconfig/extra/gen/Makefile b/3rdparty/libconfig/extra/gen/Makefile index 0b2e0655e..2e952e221 100644 --- a/3rdparty/libconfig/extra/gen/Makefile +++ b/3rdparty/libconfig/extra/gen/Makefile @@ -19,9 +19,9 @@ LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) YLWRAP = ../aux-build/ylwrap YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) LEX = flex -LEXLIB = -ll +LEXLIB = -lfl LEX_OUTPUT_ROOT = lex.yy -SHELL = /bin/sh +SHELL = /bin/bash YACC = bison -y YFLAGS = diff --git a/3rdparty/libconfig/extra/gen/clangwarnings.patch b/3rdparty/libconfig/extra/gen/clangwarnings.patch index 0270dfc44..ecae69c0e 100644 --- a/3rdparty/libconfig/extra/gen/clangwarnings.patch +++ b/3rdparty/libconfig/extra/gen/clangwarnings.patch @@ -10,7 +10,7 @@ index 3595578..26444f8 100644 - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + YY_SYMBOL_PRINT (yymsg != NULL ? yymsg : "Deleting", yytype, yyvaluep, yylocationp); - + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN YYUSE (yytype); diff --git a/scanner.c b/scanner.c @@ -22,15 +22,15 @@ index 60882db..8b8af33 100644 #include #include +#include - + /* end standard C headers. */ - + @@ -1702,6 +1703,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner) - libconfig_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - + + assert(YY_CURRENT_BUFFER != NULL); // Fixes compiler warning -Wnull-dereference on gcc-6 and -O3 + - libconfig_yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); - libconfig_yy_load_buffer_state(yyscanner ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file , yyscanner); + yy_load_buffer_state( yyscanner ); } diff --git a/3rdparty/libconfig/grammar.c b/3rdparty/libconfig/grammar.c index a1b099678..9e7e298f0 100644 --- a/3rdparty/libconfig/grammar.c +++ b/3rdparty/libconfig/grammar.c @@ -158,46 +158,50 @@ extern int libconfig_yydebug; TOK_BOOLEAN = 258, TOK_INTEGER = 259, TOK_HEX = 260, - TOK_INTEGER64 = 261, - TOK_HEX64 = 262, - TOK_FLOAT = 263, - TOK_STRING = 264, - TOK_NAME = 265, - TOK_EQUALS = 266, - TOK_NEWLINE = 267, - TOK_ARRAY_START = 268, - TOK_ARRAY_END = 269, - TOK_LIST_START = 270, - TOK_LIST_END = 271, - TOK_COMMA = 272, - TOK_GROUP_START = 273, - TOK_GROUP_END = 274, - TOK_SEMICOLON = 275, - TOK_GARBAGE = 276, - TOK_ERROR = 277 + TOK_BIN = 261, + TOK_INTEGER64 = 262, + TOK_HEX64 = 263, + TOK_BIN64 = 264, + TOK_FLOAT = 265, + TOK_STRING = 266, + TOK_NAME = 267, + TOK_EQUALS = 268, + TOK_NEWLINE = 269, + TOK_ARRAY_START = 270, + TOK_ARRAY_END = 271, + TOK_LIST_START = 272, + TOK_LIST_END = 273, + TOK_COMMA = 274, + TOK_GROUP_START = 275, + TOK_GROUP_END = 276, + TOK_SEMICOLON = 277, + TOK_GARBAGE = 278, + TOK_ERROR = 279 }; #endif /* Tokens. */ #define TOK_BOOLEAN 258 #define TOK_INTEGER 259 #define TOK_HEX 260 -#define TOK_INTEGER64 261 -#define TOK_HEX64 262 -#define TOK_FLOAT 263 -#define TOK_STRING 264 -#define TOK_NAME 265 -#define TOK_EQUALS 266 -#define TOK_NEWLINE 267 -#define TOK_ARRAY_START 268 -#define TOK_ARRAY_END 269 -#define TOK_LIST_START 270 -#define TOK_LIST_END 271 -#define TOK_COMMA 272 -#define TOK_GROUP_START 273 -#define TOK_GROUP_END 274 -#define TOK_SEMICOLON 275 -#define TOK_GARBAGE 276 -#define TOK_ERROR 277 +#define TOK_BIN 261 +#define TOK_INTEGER64 262 +#define TOK_HEX64 263 +#define TOK_BIN64 264 +#define TOK_FLOAT 265 +#define TOK_STRING 266 +#define TOK_NAME 267 +#define TOK_EQUALS 268 +#define TOK_NEWLINE 269 +#define TOK_ARRAY_START 270 +#define TOK_ARRAY_END 271 +#define TOK_LIST_START 272 +#define TOK_LIST_END 273 +#define TOK_COMMA 274 +#define TOK_GROUP_START 275 +#define TOK_GROUP_END 276 +#define TOK_SEMICOLON 277 +#define TOK_GARBAGE 278 +#define TOK_ERROR 279 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED @@ -211,7 +215,7 @@ union YYSTYPE double fval; char *sval; -#line 215 "grammar.c" /* yacc.c:355 */ +#line 219 "grammar.c" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -227,7 +231,7 @@ int libconfig_yyparse (void *scanner, struct parse_context *ctx, struct scan_con /* Copy the second part of user declarations. */ -#line 231 "grammar.c" /* yacc.c:358 */ +#line 235 "grammar.c" /* yacc.c:358 */ #ifdef short # undef short @@ -469,21 +473,21 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 6 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 37 +#define YYLAST 40 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 23 +#define YYNTOKENS 25 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 23 /* YYNRULES -- Number of rules. */ -#define YYNRULES 43 +#define YYNRULES 45 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 51 +#define YYNSTATES 53 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 277 +#define YYMAXUTOK 279 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -519,7 +523,7 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22 + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 }; #if YYDEBUG @@ -529,8 +533,8 @@ static const yytype_uint16 yyrline[] = 0, 101, 101, 103, 107, 108, 111, 113, 116, 118, 119, 122, 124, 129, 128, 148, 147, 171, 170, 193, 194, 195, 196, 200, 201, 205, 225, 247, 269, 291, - 313, 331, 359, 360, 364, 367, 369, 373, 374, 378, - 381, 383, 388, 387 + 313, 335, 357, 375, 403, 404, 408, 411, 413, 417, + 418, 422, 425, 427, 432, 431 }; #endif @@ -540,15 +544,16 @@ static const yytype_uint16 yyrline[] = static const char *const yytname[] = { "$end", "error", "$undefined", "TOK_BOOLEAN", "TOK_INTEGER", "TOK_HEX", - "TOK_INTEGER64", "TOK_HEX64", "TOK_FLOAT", "TOK_STRING", "TOK_NAME", - "TOK_EQUALS", "TOK_NEWLINE", "TOK_ARRAY_START", "TOK_ARRAY_END", - "TOK_LIST_START", "TOK_LIST_END", "TOK_COMMA", "TOK_GROUP_START", - "TOK_GROUP_END", "TOK_SEMICOLON", "TOK_GARBAGE", "TOK_ERROR", "$accept", - "configuration", "setting_list", "setting_list_optional", - "setting_terminator", "comma_optional", "setting", "$@1", "array", "$@2", - "list", "$@3", "value", "string", "simple_value", "value_list_sub", - "value_list", "value_list_optional", "simple_value_list_sub", - "simple_value_list", "simple_value_list_optional", "group", "$@4", YY_NULLPTR + "TOK_BIN", "TOK_INTEGER64", "TOK_HEX64", "TOK_BIN64", "TOK_FLOAT", + "TOK_STRING", "TOK_NAME", "TOK_EQUALS", "TOK_NEWLINE", "TOK_ARRAY_START", + "TOK_ARRAY_END", "TOK_LIST_START", "TOK_LIST_END", "TOK_COMMA", + "TOK_GROUP_START", "TOK_GROUP_END", "TOK_SEMICOLON", "TOK_GARBAGE", + "TOK_ERROR", "$accept", "configuration", "setting_list", + "setting_list_optional", "setting_terminator", "comma_optional", + "setting", "$@1", "array", "$@2", "list", "$@3", "value", "string", + "simple_value", "value_list_sub", "value_list", "value_list_optional", + "simple_value_list_sub", "simple_value_list", + "simple_value_list_optional", "group", "$@4", YY_NULLPTR }; #endif @@ -559,14 +564,14 @@ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277 + 275, 276, 277, 278, 279 }; # endif -#define YYPACT_NINF -26 +#define YYPACT_NINF -28 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-26))) + (!!((Yystate) == (-28))) #define YYTABLE_NINF -1 @@ -577,12 +582,12 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int8 yypact[] = { - 2, -26, 10, 2, -26, 5, -26, -26, 0, -26, - -26, -26, -26, -26, -26, -26, -26, -26, -26, -26, - -26, -6, 8, -26, -26, 18, 0, 2, -26, -26, - -26, -26, -26, 11, -26, 15, -26, 13, -26, 16, - 2, 12, 18, -26, -26, 0, -26, -26, -26, -26, - -26 + 1, -28, 17, 1, -28, 5, -28, -28, -1, -28, + -28, -28, -28, -28, -28, -28, -28, -28, -28, -28, + -28, -28, -28, -7, 10, -28, -28, 26, -1, 1, + -28, -28, -28, -28, -28, 3, -28, 7, -28, 6, + -28, 8, 1, 19, 26, -28, -28, -1, -28, -28, + -28, -28, -28 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -591,27 +596,27 @@ static const yytype_int8 yypact[] = static const yytype_uint8 yydefact[] = { 2, 13, 0, 3, 4, 0, 1, 5, 0, 25, - 26, 28, 27, 29, 30, 23, 15, 17, 42, 20, - 21, 8, 31, 19, 22, 40, 35, 6, 10, 9, - 14, 24, 37, 11, 41, 0, 32, 11, 36, 0, - 7, 0, 12, 39, 16, 12, 34, 18, 43, 38, - 33 + 26, 28, 30, 27, 29, 31, 32, 23, 15, 17, + 44, 20, 21, 8, 33, 19, 22, 42, 37, 6, + 10, 9, 14, 24, 39, 11, 43, 0, 34, 11, + 38, 0, 7, 0, 12, 41, 16, 12, 36, 18, + 45, 40, 35 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -26, -26, 6, -26, -26, -2, -3, -26, -26, -26, - -26, -26, -25, -26, -23, -26, -26, -26, -26, -26, - -26, -26, -26 + -28, -28, -5, -28, -28, -12, -3, -28, -28, -28, + -28, -28, -27, -28, -16, -28, -28, -28, -28, -28, + -28, -28, -28 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 2, 3, 41, 30, 43, 4, 5, 19, 25, - 20, 26, 21, 22, 23, 37, 38, 39, 33, 34, - 35, 24, 27 + -1, 2, 3, 43, 32, 45, 4, 5, 21, 27, + 22, 28, 23, 24, 25, 39, 40, 41, 35, 36, + 37, 26, 29 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -619,40 +624,42 @@ static const yytype_int8 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint8 yytable[] = { - 7, 36, 32, 9, 10, 11, 12, 13, 14, 15, - 6, 28, 1, 16, 29, 17, 8, 31, 18, 49, - 50, 9, 10, 11, 12, 13, 14, 15, 42, 44, - 45, 48, 47, 40, 0, 46, 0, 7 + 7, 38, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 34, 30, 1, 18, 31, 19, 6, 8, 20, + 52, 33, 44, 46, 42, 47, 49, 48, 51, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 0, 7, + 50 }; static const yytype_int8 yycheck[] = { - 3, 26, 25, 3, 4, 5, 6, 7, 8, 9, - 0, 17, 10, 13, 20, 15, 11, 9, 18, 42, - 45, 3, 4, 5, 6, 7, 8, 9, 17, 14, - 17, 19, 16, 27, -1, 37, -1, 40 + 3, 28, 3, 4, 5, 6, 7, 8, 9, 10, + 11, 27, 19, 12, 15, 22, 17, 0, 13, 20, + 47, 11, 19, 16, 29, 19, 18, 39, 44, 3, + 4, 5, 6, 7, 8, 9, 10, 11, -1, 42, + 21 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 10, 24, 25, 29, 30, 0, 29, 11, 3, - 4, 5, 6, 7, 8, 9, 13, 15, 18, 31, - 33, 35, 36, 37, 44, 32, 34, 45, 17, 20, - 27, 9, 37, 41, 42, 43, 35, 38, 39, 40, - 25, 26, 17, 28, 14, 17, 28, 16, 19, 37, - 35 + 0, 12, 26, 27, 31, 32, 0, 31, 13, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 15, 17, + 20, 33, 35, 37, 38, 39, 46, 34, 36, 47, + 19, 22, 29, 11, 39, 43, 44, 45, 37, 40, + 41, 42, 27, 28, 19, 30, 16, 19, 30, 18, + 21, 39, 37 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 23, 24, 24, 25, 25, 26, 26, 27, 27, - 27, 28, 28, 30, 29, 32, 31, 34, 33, 35, - 35, 35, 35, 36, 36, 37, 37, 37, 37, 37, - 37, 37, 38, 38, 39, 40, 40, 41, 41, 42, - 43, 43, 45, 44 + 0, 25, 26, 26, 27, 27, 28, 28, 29, 29, + 29, 30, 30, 32, 31, 34, 33, 36, 35, 37, + 37, 37, 37, 38, 38, 39, 39, 39, 39, 39, + 39, 39, 39, 39, 40, 40, 41, 42, 42, 43, + 43, 44, 45, 45, 47, 46 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -661,8 +668,8 @@ static const yytype_uint8 yyr2[] = 0, 2, 0, 1, 1, 2, 0, 1, 0, 1, 1, 0, 1, 0, 5, 0, 4, 0, 4, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, - 1, 1, 1, 3, 2, 0, 1, 1, 3, 2, - 0, 1, 0, 4 + 1, 1, 1, 1, 1, 3, 2, 0, 1, 1, + 3, 2, 0, 1, 0, 4 }; @@ -1347,7 +1354,7 @@ yyreduce: switch (yyn) { case 13: -#line 129 "grammar.y" /* yacc.c:1661 */ +#line 129 "grammar.y" /* yacc.c:1646 */ { ctx->setting = config_setting_add(ctx->parent, (yyvsp[0].sval), CONFIG_TYPE_NONE); @@ -1361,11 +1368,11 @@ yyreduce: CAPTURE_PARSE_POS(ctx->setting); } } -#line 1367 "grammar.c" /* yacc.c:1661 */ +#line 1374 "grammar.c" /* yacc.c:1646 */ break; case 15: -#line 148 "grammar.y" /* yacc.c:1661 */ +#line 148 "grammar.y" /* yacc.c:1646 */ { if(IN_LIST()) { @@ -1379,20 +1386,20 @@ yyreduce: ctx->setting = NULL; } } -#line 1385 "grammar.c" /* yacc.c:1661 */ +#line 1392 "grammar.c" /* yacc.c:1646 */ break; case 16: -#line 163 "grammar.y" /* yacc.c:1661 */ +#line 163 "grammar.y" /* yacc.c:1646 */ { if(ctx->parent) ctx->parent = ctx->parent->parent; } -#line 1394 "grammar.c" /* yacc.c:1661 */ +#line 1401 "grammar.c" /* yacc.c:1646 */ break; case 17: -#line 171 "grammar.y" /* yacc.c:1661 */ +#line 171 "grammar.y" /* yacc.c:1646 */ { if(IN_LIST()) { @@ -1406,32 +1413,32 @@ yyreduce: ctx->setting = NULL; } } -#line 1412 "grammar.c" /* yacc.c:1661 */ +#line 1419 "grammar.c" /* yacc.c:1646 */ break; case 18: -#line 186 "grammar.y" /* yacc.c:1661 */ +#line 186 "grammar.y" /* yacc.c:1646 */ { if(ctx->parent) ctx->parent = ctx->parent->parent; } -#line 1421 "grammar.c" /* yacc.c:1661 */ +#line 1428 "grammar.c" /* yacc.c:1646 */ break; case 23: -#line 200 "grammar.y" /* yacc.c:1661 */ +#line 200 "grammar.y" /* yacc.c:1646 */ { parsectx_append_string(ctx, (yyvsp[0].sval)); free((yyvsp[0].sval)); } -#line 1427 "grammar.c" /* yacc.c:1661 */ +#line 1434 "grammar.c" /* yacc.c:1646 */ break; case 24: -#line 201 "grammar.y" /* yacc.c:1661 */ +#line 201 "grammar.y" /* yacc.c:1646 */ { parsectx_append_string(ctx, (yyvsp[0].sval)); free((yyvsp[0].sval)); } -#line 1433 "grammar.c" /* yacc.c:1661 */ +#line 1440 "grammar.c" /* yacc.c:1646 */ break; case 25: -#line 206 "grammar.y" /* yacc.c:1661 */ +#line 206 "grammar.y" /* yacc.c:1646 */ { if(IN_ARRAY() || IN_LIST()) { @@ -1451,11 +1458,11 @@ yyreduce: else config_setting_set_bool(ctx->setting, (int)(yyvsp[0].ival)); } -#line 1457 "grammar.c" /* yacc.c:1661 */ +#line 1464 "grammar.c" /* yacc.c:1646 */ break; case 26: -#line 226 "grammar.y" /* yacc.c:1661 */ +#line 226 "grammar.y" /* yacc.c:1646 */ { if(IN_ARRAY() || IN_LIST()) { @@ -1477,11 +1484,11 @@ yyreduce: config_setting_set_format(ctx->setting, CONFIG_FORMAT_DEFAULT); } } -#line 1483 "grammar.c" /* yacc.c:1661 */ +#line 1490 "grammar.c" /* yacc.c:1646 */ break; case 27: -#line 248 "grammar.y" /* yacc.c:1661 */ +#line 248 "grammar.y" /* yacc.c:1646 */ { if(IN_ARRAY() || IN_LIST()) { @@ -1503,11 +1510,11 @@ yyreduce: config_setting_set_format(ctx->setting, CONFIG_FORMAT_DEFAULT); } } -#line 1509 "grammar.c" /* yacc.c:1661 */ +#line 1516 "grammar.c" /* yacc.c:1646 */ break; case 28: -#line 270 "grammar.y" /* yacc.c:1661 */ +#line 270 "grammar.y" /* yacc.c:1646 */ { if(IN_ARRAY() || IN_LIST()) { @@ -1529,11 +1536,11 @@ yyreduce: config_setting_set_format(ctx->setting, CONFIG_FORMAT_HEX); } } -#line 1535 "grammar.c" /* yacc.c:1661 */ +#line 1542 "grammar.c" /* yacc.c:1646 */ break; case 29: -#line 292 "grammar.y" /* yacc.c:1661 */ +#line 292 "grammar.y" /* yacc.c:1646 */ { if(IN_ARRAY() || IN_LIST()) { @@ -1555,11 +1562,63 @@ yyreduce: config_setting_set_format(ctx->setting, CONFIG_FORMAT_HEX); } } -#line 1561 "grammar.c" /* yacc.c:1661 */ +#line 1568 "grammar.c" /* yacc.c:1646 */ break; case 30: -#line 314 "grammar.y" /* yacc.c:1661 */ +#line 314 "grammar.y" /* yacc.c:1646 */ + { + if(IN_ARRAY() || IN_LIST()) + { + struct config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, (yyvsp[0].ival)); + if(! e) + { + libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type); + YYABORT; + } + else + { + config_setting_set_format(e, CONFIG_FORMAT_BIN); + CAPTURE_PARSE_POS(e); + } + } + else + { + config_setting_set_int(ctx->setting, (yyvsp[0].ival)); + config_setting_set_format(ctx->setting, CONFIG_FORMAT_BIN); + } + } +#line 1594 "grammar.c" /* yacc.c:1646 */ + break; + + case 31: +#line 336 "grammar.y" /* yacc.c:1646 */ + { + if(IN_ARRAY() || IN_LIST()) + { + struct config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, (yyvsp[0].llval)); + if(! e) + { + libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type); + YYABORT; + } + else + { + config_setting_set_format(e, CONFIG_FORMAT_BIN); + CAPTURE_PARSE_POS(e); + } + } + else + { + config_setting_set_int64(ctx->setting, (yyvsp[0].llval)); + config_setting_set_format(ctx->setting, CONFIG_FORMAT_BIN); + } + } +#line 1620 "grammar.c" /* yacc.c:1646 */ + break; + + case 32: +#line 358 "grammar.y" /* yacc.c:1646 */ { if(IN_ARRAY() || IN_LIST()) { @@ -1577,11 +1636,11 @@ yyreduce: else config_setting_set_float(ctx->setting, (yyvsp[0].fval)); } -#line 1583 "grammar.c" /* yacc.c:1661 */ +#line 1642 "grammar.c" /* yacc.c:1646 */ break; - case 31: -#line 332 "grammar.y" /* yacc.c:1661 */ + case 33: +#line 376 "grammar.y" /* yacc.c:1646 */ { if(IN_ARRAY() || IN_LIST()) { @@ -1606,11 +1665,11 @@ yyreduce: _delete(s); } } -#line 1612 "grammar.c" /* yacc.c:1661 */ +#line 1671 "grammar.c" /* yacc.c:1646 */ break; - case 42: -#line 388 "grammar.y" /* yacc.c:1661 */ + case 44: +#line 432 "grammar.y" /* yacc.c:1646 */ { if(IN_LIST()) { @@ -1624,20 +1683,20 @@ yyreduce: ctx->setting = NULL; } } -#line 1630 "grammar.c" /* yacc.c:1661 */ +#line 1689 "grammar.c" /* yacc.c:1646 */ break; - case 43: -#line 403 "grammar.y" /* yacc.c:1661 */ + case 45: +#line 447 "grammar.y" /* yacc.c:1646 */ { if(ctx->parent) ctx->parent = ctx->parent->parent; } -#line 1639 "grammar.c" /* yacc.c:1661 */ +#line 1698 "grammar.c" /* yacc.c:1646 */ break; -#line 1643 "grammar.c" /* yacc.c:1661 */ +#line 1702 "grammar.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -1865,5 +1924,5 @@ yyreturn: #endif return yyresult; } -#line 409 "grammar.y" /* yacc.c:1906 */ +#line 453 "grammar.y" /* yacc.c:1906 */ diff --git a/3rdparty/libconfig/grammar.h b/3rdparty/libconfig/grammar.h index 09e7ae0b4..63839b2d0 100644 --- a/3rdparty/libconfig/grammar.h +++ b/3rdparty/libconfig/grammar.h @@ -48,60 +48,64 @@ extern int libconfig_yydebug; TOK_BOOLEAN = 258, TOK_INTEGER = 259, TOK_HEX = 260, - TOK_INTEGER64 = 261, - TOK_HEX64 = 262, - TOK_FLOAT = 263, - TOK_STRING = 264, - TOK_NAME = 265, - TOK_EQUALS = 266, - TOK_NEWLINE = 267, - TOK_ARRAY_START = 268, - TOK_ARRAY_END = 269, - TOK_LIST_START = 270, - TOK_LIST_END = 271, - TOK_COMMA = 272, - TOK_GROUP_START = 273, - TOK_GROUP_END = 274, - TOK_SEMICOLON = 275, - TOK_GARBAGE = 276, - TOK_ERROR = 277 + TOK_BIN = 261, + TOK_INTEGER64 = 262, + TOK_HEX64 = 263, + TOK_BIN64 = 264, + TOK_FLOAT = 265, + TOK_STRING = 266, + TOK_NAME = 267, + TOK_EQUALS = 268, + TOK_NEWLINE = 269, + TOK_ARRAY_START = 270, + TOK_ARRAY_END = 271, + TOK_LIST_START = 272, + TOK_LIST_END = 273, + TOK_COMMA = 274, + TOK_GROUP_START = 275, + TOK_GROUP_END = 276, + TOK_SEMICOLON = 277, + TOK_GARBAGE = 278, + TOK_ERROR = 279 }; #endif /* Tokens. */ #define TOK_BOOLEAN 258 #define TOK_INTEGER 259 #define TOK_HEX 260 -#define TOK_INTEGER64 261 -#define TOK_HEX64 262 -#define TOK_FLOAT 263 -#define TOK_STRING 264 -#define TOK_NAME 265 -#define TOK_EQUALS 266 -#define TOK_NEWLINE 267 -#define TOK_ARRAY_START 268 -#define TOK_ARRAY_END 269 -#define TOK_LIST_START 270 -#define TOK_LIST_END 271 -#define TOK_COMMA 272 -#define TOK_GROUP_START 273 -#define TOK_GROUP_END 274 -#define TOK_SEMICOLON 275 -#define TOK_GARBAGE 276 -#define TOK_ERROR 277 +#define TOK_BIN 261 +#define TOK_INTEGER64 262 +#define TOK_HEX64 263 +#define TOK_BIN64 264 +#define TOK_FLOAT 265 +#define TOK_STRING 266 +#define TOK_NAME 267 +#define TOK_EQUALS 268 +#define TOK_NEWLINE 269 +#define TOK_ARRAY_START 270 +#define TOK_ARRAY_END 271 +#define TOK_LIST_START 272 +#define TOK_LIST_END 273 +#define TOK_COMMA 274 +#define TOK_GROUP_START 275 +#define TOK_GROUP_END 276 +#define TOK_SEMICOLON 277 +#define TOK_GARBAGE 278 +#define TOK_ERROR 279 /* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED union YYSTYPE { -#line 86 "grammar.y" /* yacc.c:1915 */ +#line 86 "grammar.y" /* yacc.c:1909 */ int ival; long long llval; double fval; char *sval; -#line 105 "grammar.h" /* yacc.c:1915 */ +#line 109 "grammar.h" /* yacc.c:1909 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/3rdparty/libconfig/scanner.c b/3rdparty/libconfig/scanner.c index 1914142c4..af9bc00e2 100644 --- a/3rdparty/libconfig/scanner.c +++ b/3rdparty/libconfig/scanner.c @@ -1,6 +1,6 @@ -#line 1 "scanner.c" +#line 2 "scanner.c" -#line 3 "scanner.c" +#line 4 "scanner.c" #define YY_INT_ALIGNED short int @@ -9,11 +9,233 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 2 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yy_create_buffer +#define libconfig_yy_create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer libconfig_yy_create_buffer +#endif + +#ifdef yy_delete_buffer +#define libconfig_yy_delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer libconfig_yy_delete_buffer +#endif + +#ifdef yy_scan_buffer +#define libconfig_yy_scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer libconfig_yy_scan_buffer +#endif + +#ifdef yy_scan_string +#define libconfig_yy_scan_string_ALREADY_DEFINED +#else +#define yy_scan_string libconfig_yy_scan_string +#endif + +#ifdef yy_scan_bytes +#define libconfig_yy_scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes libconfig_yy_scan_bytes +#endif + +#ifdef yy_init_buffer +#define libconfig_yy_init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer libconfig_yy_init_buffer +#endif + +#ifdef yy_flush_buffer +#define libconfig_yy_flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer libconfig_yy_flush_buffer +#endif + +#ifdef yy_load_buffer_state +#define libconfig_yy_load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state libconfig_yy_load_buffer_state +#endif + +#ifdef yy_switch_to_buffer +#define libconfig_yy_switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer libconfig_yy_switch_to_buffer +#endif + +#ifdef yypush_buffer_state +#define libconfig_yypush_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state libconfig_yypush_buffer_state +#endif + +#ifdef yypop_buffer_state +#define libconfig_yypop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state libconfig_yypop_buffer_state +#endif + +#ifdef yyensure_buffer_stack +#define libconfig_yyensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack libconfig_yyensure_buffer_stack +#endif + +#ifdef yylex +#define libconfig_yylex_ALREADY_DEFINED +#else +#define yylex libconfig_yylex +#endif + +#ifdef yyrestart +#define libconfig_yyrestart_ALREADY_DEFINED +#else +#define yyrestart libconfig_yyrestart +#endif + +#ifdef yylex_init +#define libconfig_yylex_init_ALREADY_DEFINED +#else +#define yylex_init libconfig_yylex_init +#endif + +#ifdef yylex_init_extra +#define libconfig_yylex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra libconfig_yylex_init_extra +#endif + +#ifdef yylex_destroy +#define libconfig_yylex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy libconfig_yylex_destroy +#endif + +#ifdef yyget_debug +#define libconfig_yyget_debug_ALREADY_DEFINED +#else +#define yyget_debug libconfig_yyget_debug +#endif + +#ifdef yyset_debug +#define libconfig_yyset_debug_ALREADY_DEFINED +#else +#define yyset_debug libconfig_yyset_debug +#endif + +#ifdef yyget_extra +#define libconfig_yyget_extra_ALREADY_DEFINED +#else +#define yyget_extra libconfig_yyget_extra +#endif + +#ifdef yyset_extra +#define libconfig_yyset_extra_ALREADY_DEFINED +#else +#define yyset_extra libconfig_yyset_extra +#endif + +#ifdef yyget_in +#define libconfig_yyget_in_ALREADY_DEFINED +#else +#define yyget_in libconfig_yyget_in +#endif + +#ifdef yyset_in +#define libconfig_yyset_in_ALREADY_DEFINED +#else +#define yyset_in libconfig_yyset_in +#endif + +#ifdef yyget_out +#define libconfig_yyget_out_ALREADY_DEFINED +#else +#define yyget_out libconfig_yyget_out +#endif + +#ifdef yyset_out +#define libconfig_yyset_out_ALREADY_DEFINED +#else +#define yyset_out libconfig_yyset_out +#endif + +#ifdef yyget_leng +#define libconfig_yyget_leng_ALREADY_DEFINED +#else +#define yyget_leng libconfig_yyget_leng +#endif + +#ifdef yyget_text +#define libconfig_yyget_text_ALREADY_DEFINED +#else +#define yyget_text libconfig_yyget_text +#endif + +#ifdef yyget_lineno +#define libconfig_yyget_lineno_ALREADY_DEFINED +#else +#define yyget_lineno libconfig_yyget_lineno +#endif + +#ifdef yyset_lineno +#define libconfig_yyset_lineno_ALREADY_DEFINED +#else +#define yyset_lineno libconfig_yyset_lineno +#endif + +#ifdef yyget_column +#define libconfig_yyget_column_ALREADY_DEFINED +#else +#define yyget_column libconfig_yyget_column +#endif + +#ifdef yyset_column +#define libconfig_yyset_column_ALREADY_DEFINED +#else +#define yyset_column libconfig_yyset_column +#endif + +#ifdef yywrap +#define libconfig_yywrap_ALREADY_DEFINED +#else +#define yywrap libconfig_yywrap +#endif + +#ifdef yyget_lval +#define libconfig_yyget_lval_ALREADY_DEFINED +#else +#define yyget_lval libconfig_yyget_lval +#endif + +#ifdef yyset_lval +#define libconfig_yyset_lval_ALREADY_DEFINED +#else +#define yyset_lval libconfig_yyset_lval +#endif + +#ifdef yyalloc +#define libconfig_yyalloc_ALREADY_DEFINED +#else +#define yyalloc libconfig_yyalloc +#endif + +#ifdef yyrealloc +#define libconfig_yyrealloc_ALREADY_DEFINED +#else +#define yyrealloc libconfig_yyrealloc +#endif + +#ifdef yyfree +#define libconfig_yyfree_ALREADY_DEFINED +#else +#define yyfree libconfig_yyfree +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -35,7 +257,7 @@ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. + * if you want the limit (max/min) macros for int types. */ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1 @@ -52,7 +274,7 @@ typedef uint32_t flex_uint32_t; typedef signed char flex_int8_t; typedef short int flex_int16_t; typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; +typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; @@ -85,10 +307,16 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ +/* begin standard C++ headers. */ + /* TODO: this is always defined, so inline it */ #define yyconst const @@ -137,7 +365,7 @@ typedef void* yyscan_t; /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE libconfig_yyrestart(yyin ,yyscanner ) +#define YY_NEW_FILE yyrestart( yyin , yyscanner ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -170,10 +398,10 @@ typedef size_t yy_size_t; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE libconfig_yylex. + * existing scanners that call yyless() from OUTSIDE yylex. * One obvious solution it to make yy_act a global. I tried that, and saw * a 5% performance hit in a non-yylineno scanner, because yy_act is * normally declared as a register variable-- so it is not worth it. @@ -192,7 +420,7 @@ typedef size_t yy_size_t; if ( *p == '\n' )\ --yylineno;\ }while(0) - + /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ @@ -248,7 +476,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -265,7 +493,7 @@ struct yy_buffer_state * possible backing-up. * * When we actually see the EOF, we change the status to "new" - * (via libconfig_yyrestart()), so that the user can continue scanning by + * (via yyrestart()), so that the user can continue scanning by * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 @@ -287,43 +515,43 @@ struct yy_buffer_state */ #define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] -void libconfig_yyrestart ( FILE *input_file , yyscan_t yyscanner ); -void libconfig_yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -YY_BUFFER_STATE libconfig_yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); -void libconfig_yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void libconfig_yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void libconfig_yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -void libconfig_yypop_buffer_state ( yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -static void libconfig_yyensure_buffer_stack ( yyscan_t yyscanner ); -static void libconfig_yy_load_buffer_state ( yyscan_t yyscanner ); -static void libconfig_yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner ); -#define YY_FLUSH_BUFFER libconfig_yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner) +static void yyensure_buffer_stack ( yyscan_t yyscanner ); +static void yy_load_buffer_state ( yyscan_t yyscanner ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER , yyscanner) -YY_BUFFER_STATE libconfig_yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); -YY_BUFFER_STATE libconfig_yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); -YY_BUFFER_STATE libconfig_yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -void *libconfig_yyalloc ( yy_size_t , yyscan_t yyscanner ); -void *libconfig_yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); -void libconfig_yyfree ( void * , yyscan_t yyscanner ); +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); -#define yy_new_buffer libconfig_yy_create_buffer +#define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ - libconfig_yyensure_buffer_stack (yyscanner); \ + yyensure_buffer_stack (yyscanner); \ YY_CURRENT_BUFFER_LVALUE = \ - libconfig_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ - libconfig_yyensure_buffer_stack (yyscanner); \ + yyensure_buffer_stack (yyscanner); \ YY_CURRENT_BUFFER_LVALUE = \ - libconfig_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } @@ -351,8 +579,8 @@ static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner ); yyg->yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 45 -#define YY_END_OF_BUFFER 46 +#define YY_NUM_RULES 47 +#define YY_END_OF_BUFFER 48 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -360,22 +588,22 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[123] = +static const flex_int16_t yy_accept[127] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 46, 44, 25, 24, 24, 5, 44, 40, 41, 37, - 44, 27, 32, 44, 33, 33, 26, 42, 44, 37, - 37, 38, 39, 28, 29, 25, 44, 3, 4, 3, - 6, 15, 14, 20, 23, 45, 17, 45, 25, 0, - 43, 37, 32, 33, 32, 0, 1, 0, 32, 33, - 37, 34, 37, 16, 37, 37, 25, 0, 0, 2, - 6, 12, 0, 11, 10, 7, 8, 9, 20, 22, - 21, 17, 0, 18, 32, 0, 34, 0, 32, 32, - 37, 0, 37, 32, 34, 35, 37, 37, 0, 0, - - 32, 0, 32, 34, 0, 37, 32, 36, 37, 30, - 0, 13, 32, 36, 31, 0, 0, 0, 0, 0, - 19, 0 + 48, 46, 25, 24, 24, 5, 46, 42, 43, 39, + 46, 27, 32, 46, 33, 33, 26, 44, 46, 39, + 39, 40, 41, 28, 29, 25, 46, 3, 4, 3, + 6, 15, 14, 20, 23, 47, 17, 47, 25, 0, + 45, 39, 32, 33, 32, 0, 1, 0, 32, 33, + 39, 39, 34, 39, 16, 39, 39, 25, 0, 0, + 2, 6, 12, 0, 11, 10, 7, 8, 9, 20, + 22, 21, 17, 0, 18, 32, 0, 34, 0, 32, + 32, 39, 37, 0, 39, 32, 34, 35, 39, 39, + + 0, 0, 32, 0, 32, 34, 0, 39, 32, 38, + 36, 39, 30, 0, 13, 32, 38, 36, 31, 0, + 0, 0, 0, 0, 19, 0 } ; static const YY_CHAR yy_ec[256] = @@ -384,16 +612,16 @@ static const YY_CHAR yy_ec[256] = 1, 4, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 6, 7, 1, 1, 1, 1, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 17, - 17, 17, 17, 17, 17, 17, 17, 18, 19, 20, - 21, 22, 1, 23, 24, 25, 25, 25, 26, 27, - 28, 28, 28, 28, 28, 29, 28, 28, 28, 28, - 28, 30, 31, 32, 33, 28, 28, 34, 28, 28, - 35, 36, 37, 1, 38, 1, 24, 25, 39, 40, - - 41, 42, 28, 28, 43, 28, 28, 44, 28, 45, - 28, 28, 28, 46, 31, 47, 48, 28, 28, 34, - 28, 28, 49, 1, 50, 1, 1, 1, 1, 1, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 18, 18, 18, 18, 18, 18, 18, 19, 20, 21, + 22, 23, 1, 24, 25, 26, 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, 40, 1, 25, 26, 41, 42, + + 43, 44, 30, 30, 45, 30, 30, 46, 30, 47, + 30, 30, 30, 48, 33, 49, 50, 30, 30, 36, + 30, 30, 51, 1, 52, 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, @@ -410,135 +638,144 @@ static const YY_CHAR yy_ec[256] = 1, 1, 1, 1, 1 } ; -static const YY_CHAR yy_meta[51] = +static const YY_CHAR yy_meta[53] = { 0, 1, 1, 1, 1, 1, 2, 1, 1, 1, 3, - 1, 1, 3, 3, 1, 4, 4, 1, 1, 1, - 1, 1, 1, 4, 4, 4, 4, 3, 3, 3, - 3, 3, 3, 3, 1, 2, 1, 3, 4, 4, - 4, 4, 3, 3, 3, 3, 3, 3, 1, 1 + 1, 1, 3, 3, 1, 4, 4, 4, 1, 1, + 1, 1, 1, 1, 4, 4, 4, 4, 4, 3, + 3, 3, 3, 3, 3, 3, 1, 2, 1, 3, + 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, + 1, 1 } ; -static const flex_int16_t yy_base[134] = +static const flex_int16_t yy_base[138] = { 0, - 0, 49, 49, 50, 48, 49, 50, 51, 244, 243, - 248, 251, 245, 251, 251, 251, 243, 251, 251, 0, - 47, 251, 49, 52, 54, 211, 251, 251, 238, 219, - 28, 251, 251, 251, 251, 71, 199, 251, 251, 226, - 0, 251, 63, 0, 251, 70, 234, 217, 236, 234, - 251, 0, 75, 86, 97, 108, 251, 233, 113, 201, - 115, 205, 139, 251, 49, 48, 75, 190, 187, 251, - 0, 251, 0, 251, 251, 251, 251, 251, 0, 251, - 251, 225, 202, 251, 117, 124, 191, 101, 128, 131, - 157, 133, 135, 143, 0, 156, 152, 63, 138, 0, - - 145, 171, 159, 251, 173, 175, 177, 140, 81, 0, - 123, 251, 179, 0, 0, 105, 96, 79, 109, 140, - 251, 251, 196, 200, 204, 208, 212, 214, 218, 222, - 226, 78, 75 + 0, 51, 51, 52, 50, 51, 52, 53, 282, 281, + 286, 289, 283, 289, 289, 289, 281, 289, 289, 0, + 49, 289, 52, 61, 82, 38, 289, 289, 277, 257, + 45, 289, 289, 289, 289, 58, 236, 289, 289, 265, + 0, 289, 67, 0, 289, 66, 273, 249, 266, 236, + 289, 0, 69, 103, 110, 119, 289, 218, 123, 58, + 62, 131, 189, 151, 289, 61, 74, 99, 173, 165, + 289, 0, 289, 0, 289, 289, 289, 289, 289, 0, + 289, 289, 195, 177, 289, 142, 139, 160, 145, 155, + 170, 186, 158, 165, 189, 192, 0, 159, 151, 168, + + 124, 0, 198, 206, 211, 289, 214, 217, 220, 133, + 123, 197, 0, 99, 289, 226, 0, 0, 0, 93, + 91, 86, 120, 100, 289, 289, 244, 248, 252, 256, + 260, 262, 266, 270, 274, 79, 77 } ; -static const flex_int16_t yy_def[134] = +static const flex_int16_t yy_def[138] = { 0, - 122, 1, 123, 123, 124, 124, 125, 125, 126, 126, - 122, 122, 122, 122, 122, 122, 127, 122, 122, 128, - 122, 122, 122, 122, 128, 25, 122, 122, 122, 128, - 128, 122, 122, 122, 122, 122, 122, 122, 122, 122, - 129, 122, 122, 130, 122, 122, 131, 131, 122, 127, - 122, 128, 122, 122, 122, 122, 122, 127, 128, 25, - 128, 128, 128, 122, 128, 128, 122, 122, 122, 122, - 129, 122, 132, 122, 122, 122, 122, 122, 130, 122, - 122, 131, 131, 122, 122, 122, 122, 122, 122, 128, - 128, 122, 128, 128, 128, 63, 128, 128, 122, 133, - - 122, 122, 122, 122, 122, 128, 128, 128, 128, 128, - 122, 122, 122, 128, 128, 122, 122, 122, 122, 122, - 122, 0, 122, 122, 122, 122, 122, 122, 122, 122, - 122, 122, 122 + 126, 1, 127, 127, 128, 128, 129, 129, 130, 130, + 126, 126, 126, 126, 126, 126, 131, 126, 126, 132, + 126, 126, 126, 126, 132, 25, 126, 126, 126, 132, + 132, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 133, 126, 126, 134, 126, 126, 135, 135, 126, 131, + 126, 132, 126, 126, 126, 126, 126, 131, 132, 25, + 132, 132, 132, 132, 126, 132, 132, 126, 126, 126, + 126, 133, 126, 136, 126, 126, 126, 126, 126, 134, + 126, 126, 135, 135, 126, 126, 126, 126, 126, 126, + 132, 132, 132, 126, 132, 132, 132, 64, 132, 132, + + 126, 137, 126, 126, 126, 126, 126, 132, 132, 132, + 132, 132, 132, 126, 126, 126, 132, 132, 132, 126, + 126, 126, 126, 126, 126, 0, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126 } ; -static const flex_int16_t yy_nxt[302] = +static const flex_int16_t yy_nxt[342] = { 0, 12, 13, 14, 15, 15, 16, 17, 18, 19, 20, - 21, 22, 21, 23, 24, 25, 26, 27, 28, 29, - 27, 12, 12, 20, 20, 20, 30, 20, 20, 20, - 20, 31, 20, 20, 32, 12, 33, 12, 20, 20, - 20, 30, 20, 20, 20, 20, 31, 20, 34, 35, - 36, 39, 39, 42, 42, 45, 45, 66, 40, 40, - 53, 57, 54, 54, 55, 55, 58, 59, 72, 60, - 60, 37, 67, 66, 56, 80, 67, 97, 112, 61, - 98, 100, 62, 43, 43, 46, 46, 63, 110, 56, - 55, 55, 97, 68, 61, 98, 73, 68, 74, 85, - - 56, 54, 54, 110, 75, 81, 115, 76, 77, 78, - 120, 86, 55, 55, 87, 56, 89, 89, 88, 119, - 88, 115, 56, 89, 89, 92, 86, 93, 90, 90, - 94, 94, 101, 101, 92, 118, 92, 56, 91, 103, - 103, 120, 102, 89, 89, 121, 90, 90, 103, 103, - 94, 94, 117, 91, 96, 96, 91, 102, 94, 94, - 101, 101, 96, 96, 96, 96, 116, 105, 114, 106, - 102, 91, 107, 107, 103, 103, 111, 96, 96, 96, - 96, 105, 109, 105, 108, 102, 113, 113, 113, 113, - 107, 107, 107, 107, 113, 113, 38, 38, 38, 38, - - 41, 41, 41, 41, 44, 44, 44, 44, 47, 47, - 47, 47, 50, 50, 50, 50, 52, 52, 71, 104, - 71, 71, 79, 122, 79, 79, 82, 82, 82, 82, - 83, 99, 69, 95, 52, 51, 51, 49, 84, 83, - 70, 69, 65, 64, 52, 51, 49, 122, 48, 48, - 11, 122, 122, 122, 122, 122, 122, 122, 122, 122, - 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, - 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, - 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, - 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, - - 122 + 21, 22, 21, 23, 24, 25, 26, 26, 27, 28, + 29, 27, 12, 12, 20, 20, 20, 20, 30, 20, + 20, 20, 20, 31, 20, 20, 32, 12, 33, 12, + 20, 20, 20, 30, 20, 20, 20, 20, 31, 20, + 34, 35, 36, 39, 39, 42, 42, 45, 45, 68, + 40, 40, 53, 52, 54, 54, 54, 55, 55, 55, + 57, 81, 73, 52, 37, 58, 67, 93, 93, 56, + 115, 69, 102, 52, 55, 55, 55, 43, 43, 46, + 46, 99, 67, 52, 56, 59, 56, 60, 60, 60, + + 68, 124, 74, 82, 75, 125, 99, 61, 100, 62, + 76, 56, 63, 77, 78, 79, 86, 64, 54, 54, + 54, 124, 69, 100, 62, 55, 55, 55, 123, 89, + 87, 89, 122, 88, 90, 90, 90, 56, 91, 91, + 91, 94, 121, 95, 120, 87, 96, 96, 96, 94, + 92, 94, 56, 118, 105, 105, 105, 103, 103, 103, + 90, 90, 90, 117, 114, 92, 98, 98, 98, 104, + 90, 90, 90, 93, 93, 98, 98, 98, 98, 98, + 105, 105, 105, 112, 104, 91, 91, 91, 110, 111, + 106, 98, 98, 98, 98, 113, 107, 92, 108, 126, + + 84, 109, 109, 109, 96, 96, 96, 96, 96, 96, + 113, 101, 92, 103, 103, 103, 107, 70, 107, 97, + 51, 116, 116, 116, 119, 104, 105, 105, 105, 116, + 116, 116, 109, 109, 109, 109, 109, 109, 51, 119, + 104, 116, 116, 116, 38, 38, 38, 38, 41, 41, + 41, 41, 44, 44, 44, 44, 47, 47, 47, 47, + 50, 50, 50, 50, 52, 52, 72, 49, 72, 72, + 80, 85, 80, 80, 83, 83, 83, 83, 84, 71, + 70, 66, 65, 51, 49, 126, 48, 48, 11, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126 } ; -static const flex_int16_t yy_chk[302] = +static const flex_int16_t yy_chk[342] = { 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, - 2, 3, 4, 5, 6, 7, 8, 31, 3, 4, - 21, 24, 21, 21, 23, 23, 24, 25, 43, 25, - 25, 2, 36, 31, 23, 46, 67, 65, 133, 25, - 66, 132, 25, 5, 6, 7, 8, 25, 98, 23, - 53, 53, 65, 36, 25, 66, 43, 67, 43, 54, - - 53, 54, 54, 98, 43, 46, 109, 43, 43, 43, - 119, 54, 55, 55, 54, 53, 88, 88, 56, 118, - 56, 109, 55, 56, 56, 61, 54, 61, 59, 59, - 61, 61, 85, 85, 86, 117, 86, 55, 59, 86, - 86, 120, 85, 89, 89, 120, 90, 90, 92, 92, - 93, 93, 116, 59, 63, 63, 90, 85, 94, 94, - 101, 101, 63, 63, 63, 63, 111, 91, 108, 91, - 101, 90, 91, 91, 103, 103, 99, 63, 63, 63, - 63, 102, 97, 102, 96, 101, 102, 102, 105, 105, - 106, 106, 107, 107, 113, 113, 123, 123, 123, 123, - - 124, 124, 124, 124, 125, 125, 125, 125, 126, 126, - 126, 126, 127, 127, 127, 127, 128, 128, 129, 87, - 129, 129, 130, 83, 130, 130, 131, 131, 131, 131, - 82, 69, 68, 62, 60, 58, 50, 49, 48, 47, - 40, 37, 30, 29, 26, 17, 13, 11, 10, 9, - 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, - 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, - 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, - 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, - 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, - - 122 + 1, 1, 2, 3, 4, 5, 6, 7, 8, 36, + 3, 4, 21, 26, 21, 21, 21, 23, 23, 23, + 24, 46, 43, 26, 2, 24, 31, 61, 61, 23, + 137, 36, 136, 60, 53, 53, 53, 5, 6, 7, + 8, 66, 31, 60, 23, 25, 53, 25, 25, 25, + + 68, 124, 43, 46, 43, 124, 66, 25, 67, 25, + 43, 53, 25, 43, 43, 43, 54, 25, 54, 54, + 54, 123, 68, 67, 25, 55, 55, 55, 122, 56, + 54, 56, 121, 54, 56, 56, 56, 55, 59, 59, + 59, 62, 120, 62, 114, 54, 62, 62, 62, 87, + 59, 87, 55, 111, 87, 87, 87, 86, 86, 86, + 89, 89, 89, 110, 101, 59, 64, 64, 64, 86, + 90, 90, 90, 93, 93, 64, 64, 64, 64, 64, + 94, 94, 94, 99, 86, 91, 91, 91, 93, 98, + 88, 64, 64, 64, 64, 100, 92, 91, 92, 84, + + 83, 92, 92, 92, 95, 95, 95, 96, 96, 96, + 100, 70, 91, 103, 103, 103, 104, 69, 104, 63, + 58, 104, 104, 104, 112, 103, 105, 105, 105, 107, + 107, 107, 108, 108, 108, 109, 109, 109, 50, 112, + 103, 116, 116, 116, 127, 127, 127, 127, 128, 128, + 128, 128, 129, 129, 129, 129, 130, 130, 130, 130, + 131, 131, 131, 131, 132, 132, 133, 49, 133, 133, + 134, 48, 134, 134, 135, 135, 135, 135, 47, 40, + 37, 30, 29, 17, 13, 11, 10, 9, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126 } ; /* Table of booleans, true if rule could match eol. */ -static const flex_int32_t yy_rule_can_match_eol[46] = +static const flex_int32_t yy_rule_can_match_eol[48] = { 0, -0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, - 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, }; +0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, + 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, }; /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. @@ -623,9 +860,43 @@ static unsigned long long fromhex(const char *s) #endif /* __MINGW32__ */ } -#line 625 "scanner.c" +static unsigned long long frombin(const char *s) +{ +#ifdef __MINGW32__ + + /* MinGW's strtoull() seems to be broken; it only returns the lower + * 32 bits... + */ + + const char *p = s; + unsigned long long val = 0; + + if (*p != '0') + return(0); + + ++p; + + if (*p != 'b' && *p != 'B') + return(0); + + for (++p; *p == '0' || *p == '1'; ++p) + { + val <<= 1; + val |= *p == '0' ? 0 : 1; + } -#line 627 "scanner.c" + return(val); + +#else /* ! __MINGW32__ */ + + return(strtoull(s + 2, NULL, 2)); + +#endif /* __MINGW32__ */ +} + +#line 897 "scanner.c" + +#line 899 "scanner.c" #define INITIAL 0 #define COMMENT 1 @@ -676,47 +947,47 @@ static int yy_init_globals ( yyscan_t yyscanner ); /* This must go here because YYSTYPE and YYLTYPE are included * from bison output in section 1.*/ # define yylval yyg->yylval_r - -int libconfig_yylex_init (yyscan_t* scanner); -int libconfig_yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); +int yylex_init (yyscan_t* scanner); + +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int libconfig_yylex_destroy ( yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); -int libconfig_yyget_debug ( yyscan_t yyscanner ); +int yyget_debug ( yyscan_t yyscanner ); -void libconfig_yyset_debug ( int debug_flag , yyscan_t yyscanner ); +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -YY_EXTRA_TYPE libconfig_yyget_extra ( yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void libconfig_yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -FILE *libconfig_yyget_in ( yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void libconfig_yyset_in ( FILE * _in_str , yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *libconfig_yyget_out ( yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void libconfig_yyset_out ( FILE * _out_str , yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); - int libconfig_yyget_leng ( yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -char *libconfig_yyget_text ( yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -int libconfig_yyget_lineno ( yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -void libconfig_yyset_lineno ( int _line_number , yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int libconfig_yyget_column ( yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void libconfig_yyset_column ( int _column_no , yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); -YYSTYPE * libconfig_yyget_lval ( yyscan_t yyscanner ); +YYSTYPE * yyget_lval ( yyscan_t yyscanner ); -void libconfig_yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); +void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -724,14 +995,14 @@ void libconfig_yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int libconfig_yywrap ( yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int libconfig_yywrap ( yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif #ifndef YY_NO_UNPUT - + #endif #ifndef yytext_ptr @@ -831,10 +1102,10 @@ static int input ( yyscan_t yyscanner ); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int libconfig_yylex \ +extern int yylex \ (YYSTYPE * yylval_param , yyscan_t yyscanner); -#define YY_DECL int libconfig_yylex \ +#define YY_DECL int yylex \ (YYSTYPE * yylval_param , yyscan_t yyscanner) #endif /* !YY_DECL */ @@ -885,19 +1156,19 @@ YY_DECL yyout = stdout; if ( ! YY_CURRENT_BUFFER ) { - libconfig_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); YY_CURRENT_BUFFER_LVALUE = - libconfig_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - libconfig_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); } { -#line 103 "scanner.l" +#line 139 "scanner.l" -#line 899 "scanner.c" +#line 1171 "scanner.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -925,13 +1196,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 123 ) + if ( yy_current_state >= 127 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_current_state != 122 ); + while ( yy_current_state != 126 ); yy_cp = yyg->yy_last_accepting_cpos; yy_current_state = yyg->yy_last_accepting_state; @@ -945,7 +1216,7 @@ yy_find_action: int yyl; for ( yyl = 0; yyl < yyleng; ++yyl ) if ( yytext[yyl] == '\n' ) - + do{ yylineno++; yycolumn=0; }while(0) @@ -965,69 +1236,69 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 105 "scanner.l" +#line 141 "scanner.l" { BEGIN COMMENT; } YY_BREAK case 2: YY_RULE_SETUP -#line 106 "scanner.l" +#line 142 "scanner.l" { BEGIN INITIAL; } YY_BREAK case 3: YY_RULE_SETUP -#line 107 "scanner.l" +#line 143 "scanner.l" { /* ignore */ } YY_BREAK case 4: /* rule 4 can match eol */ YY_RULE_SETUP -#line 108 "scanner.l" +#line 144 "scanner.l" { /* ignore */ } YY_BREAK case 5: YY_RULE_SETUP -#line 110 "scanner.l" +#line 146 "scanner.l" { BEGIN STRING; } YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 111 "scanner.l" +#line 147 "scanner.l" { scanctx_append_string(yyextra, yytext); } YY_BREAK case 7: YY_RULE_SETUP -#line 112 "scanner.l" +#line 148 "scanner.l" { scanctx_append_string(yyextra, "\n"); } YY_BREAK case 8: YY_RULE_SETUP -#line 113 "scanner.l" +#line 149 "scanner.l" { scanctx_append_string(yyextra, "\r"); } YY_BREAK case 9: YY_RULE_SETUP -#line 114 "scanner.l" +#line 150 "scanner.l" { scanctx_append_string(yyextra, "\t"); } YY_BREAK case 10: YY_RULE_SETUP -#line 115 "scanner.l" +#line 151 "scanner.l" { scanctx_append_string(yyextra, "\f"); } YY_BREAK case 11: YY_RULE_SETUP -#line 116 "scanner.l" +#line 152 "scanner.l" { scanctx_append_string(yyextra, "\\"); } YY_BREAK case 12: YY_RULE_SETUP -#line 117 "scanner.l" +#line 153 "scanner.l" { scanctx_append_string(yyextra, "\""); } YY_BREAK case 13: YY_RULE_SETUP -#line 118 "scanner.l" +#line 154 "scanner.l" { char c[2] = { (char)(strtol(yytext + 2, NULL, 16) & 0xFF), 0 }; @@ -1036,12 +1307,12 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 123 "scanner.l" +#line 159 "scanner.l" { scanctx_append_string(yyextra, "\\"); } YY_BREAK case 15: YY_RULE_SETUP -#line 124 "scanner.l" +#line 160 "scanner.l" { yylval->sval = scanctx_take_string(yyextra); BEGIN INITIAL; @@ -1050,18 +1321,18 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 130 "scanner.l" +#line 166 "scanner.l" { BEGIN SCRIPTBLOCK; } YY_BREAK case 17: /* rule 17 can match eol */ YY_RULE_SETUP -#line 131 "scanner.l" +#line 167 "scanner.l" { scanctx_append_string(yyextra, yytext); } YY_BREAK case 18: YY_RULE_SETUP -#line 132 "scanner.l" +#line 168 "scanner.l" { yylval->sval = scanctx_take_string(yyextra); BEGIN INITIAL; @@ -1070,28 +1341,28 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 138 "scanner.l" +#line 174 "scanner.l" { BEGIN INCLUDE; } YY_BREAK case 20: /* rule 20 can match eol */ YY_RULE_SETUP -#line 139 "scanner.l" +#line 175 "scanner.l" { scanctx_append_string(yyextra, yytext); } YY_BREAK case 21: YY_RULE_SETUP -#line 140 "scanner.l" +#line 176 "scanner.l" { scanctx_append_string(yyextra, "\\"); } YY_BREAK case 22: YY_RULE_SETUP -#line 141 "scanner.l" +#line 177 "scanner.l" { scanctx_append_string(yyextra, "\""); } YY_BREAK case 23: YY_RULE_SETUP -#line 142 "scanner.l" +#line 178 "scanner.l" { const char *error; FILE *fp = scanctx_push_include(yyextra, @@ -1100,8 +1371,8 @@ YY_RULE_SETUP if(fp) { yyin = fp; - libconfig_yy_switch_to_buffer( - libconfig_yy_create_buffer(yyin, YY_BUF_SIZE, yyscanner), + yy_switch_to_buffer( + yy_create_buffer(yyin, YY_BUF_SIZE, yyscanner), yyscanner); } else @@ -1119,52 +1390,52 @@ YY_RULE_SETUP case 24: /* rule 24 can match eol */ YY_RULE_SETUP -#line 166 "scanner.l" +#line 202 "scanner.l" { /* ignore */ } YY_BREAK case 25: YY_RULE_SETUP -#line 167 "scanner.l" +#line 203 "scanner.l" { /* ignore */ } YY_BREAK case 26: YY_RULE_SETUP -#line 169 "scanner.l" +#line 205 "scanner.l" { return(TOK_EQUALS); } YY_BREAK case 27: YY_RULE_SETUP -#line 170 "scanner.l" +#line 206 "scanner.l" { return(TOK_COMMA); } YY_BREAK case 28: YY_RULE_SETUP -#line 171 "scanner.l" +#line 207 "scanner.l" { return(TOK_GROUP_START); } YY_BREAK case 29: YY_RULE_SETUP -#line 172 "scanner.l" +#line 208 "scanner.l" { return(TOK_GROUP_END); } YY_BREAK case 30: YY_RULE_SETUP -#line 173 "scanner.l" +#line 209 "scanner.l" { yylval->ival = 1; return(TOK_BOOLEAN); } YY_BREAK case 31: YY_RULE_SETUP -#line 174 "scanner.l" +#line 210 "scanner.l" { yylval->ival = 0; return(TOK_BOOLEAN); } YY_BREAK case 32: YY_RULE_SETUP -#line 175 "scanner.l" +#line 211 "scanner.l" { yylval->fval = atof(yytext); return(TOK_FLOAT); } YY_BREAK case 33: YY_RULE_SETUP -#line 176 "scanner.l" +#line 212 "scanner.l" { long long llval; llval = atoll(yytext); @@ -1182,12 +1453,12 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 190 "scanner.l" +#line 226 "scanner.l" { yylval->llval = atoll(yytext); return(TOK_INTEGER64); } YY_BREAK case 35: YY_RULE_SETUP -#line 191 "scanner.l" +#line 227 "scanner.l" { unsigned long ulval = strtoul(yytext, NULL, 16); if (ulval > INT32_MAX) @@ -1198,50 +1469,66 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 198 "scanner.l" +#line 234 "scanner.l" { yylval->llval = fromhex(yytext); return(TOK_HEX64); } YY_BREAK case 37: YY_RULE_SETUP -#line 199 "scanner.l" -{ yylval->sval = yytext; return(TOK_NAME); } +#line 235 "scanner.l" +{ + unsigned long ulval = strtoul(yytext + 2, NULL, 2); + if (ulval > INT32_MAX) + ulval &= INT32_MAX; + yylval->ival = (int)ulval; + return(TOK_BIN); + } YY_BREAK case 38: YY_RULE_SETUP -#line 200 "scanner.l" -{ return(TOK_ARRAY_START); } +#line 242 "scanner.l" +{ yylval->llval = frombin(yytext); return(TOK_BIN64); } YY_BREAK case 39: YY_RULE_SETUP -#line 201 "scanner.l" -{ return(TOK_ARRAY_END); } +#line 243 "scanner.l" +{ yylval->sval = yytext; return(TOK_NAME); } YY_BREAK case 40: YY_RULE_SETUP -#line 202 "scanner.l" -{ return(TOK_LIST_START); } +#line 244 "scanner.l" +{ return(TOK_ARRAY_START); } YY_BREAK case 41: YY_RULE_SETUP -#line 203 "scanner.l" -{ return(TOK_LIST_END); } +#line 245 "scanner.l" +{ return(TOK_ARRAY_END); } YY_BREAK case 42: YY_RULE_SETUP -#line 204 "scanner.l" -{ return(TOK_SEMICOLON); } +#line 246 "scanner.l" +{ return(TOK_LIST_START); } YY_BREAK case 43: +YY_RULE_SETUP +#line 247 "scanner.l" +{ return(TOK_LIST_END); } + YY_BREAK +case 44: +YY_RULE_SETUP +#line 248 "scanner.l" +{ return(TOK_SEMICOLON); } + YY_BREAK +case 45: *yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ yyg->yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 205 "scanner.l" +#line 249 "scanner.l" { /* ignore */ } YY_BREAK -case 44: +case 46: YY_RULE_SETUP -#line 206 "scanner.l" +#line 250 "scanner.l" { return(TOK_GARBAGE); } YY_BREAK case YY_STATE_EOF(INITIAL): @@ -1249,25 +1536,25 @@ case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(STRING): case YY_STATE_EOF(INCLUDE): case YY_STATE_EOF(SCRIPTBLOCK): -#line 208 "scanner.l" +#line 252 "scanner.l" { YY_BUFFER_STATE buf = (YY_BUFFER_STATE)scanctx_pop_include( yyextra); if(buf) { - libconfig_yy_delete_buffer(YY_CURRENT_BUFFER, yyscanner); - libconfig_yy_switch_to_buffer(buf, yyscanner); + yy_delete_buffer(YY_CURRENT_BUFFER, yyscanner); + yy_switch_to_buffer(buf, yyscanner); } else yyterminate(); } YY_BREAK -case 45: +case 47: YY_RULE_SETUP -#line 219 "scanner.l" +#line 263 "scanner.l" ECHO; YY_BREAK -#line 1269 "scanner.c" +#line 1557 "scanner.c" case YY_END_OF_BUFFER: { @@ -1283,7 +1570,7 @@ ECHO; /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called - * libconfig_yylex(). If so, then we have to assure + * yylex(). If so, then we have to assure * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a @@ -1344,7 +1631,7 @@ ECHO; { yyg->yy_did_buffer_switch_on_eof = 0; - if ( libconfig_yywrap(yyscanner ) ) + if ( yywrap( yyscanner ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1398,7 +1685,7 @@ ECHO; } /* end of action switch */ } /* end of scanning one token */ } /* end of user's declarations */ -} /* end of libconfig_yylex */ +} /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -1477,7 +1764,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - libconfig_yyrealloc((void *) b->yy_ch_buf,(yy_size_t) (b->yy_buf_size + 2) ,yyscanner ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); } else /* Can't grow it, we don't own it. */ @@ -1509,7 +1797,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - libconfig_yyrestart(yyin ,yyscanner); + yyrestart( yyin , yyscanner); } else @@ -1526,9 +1814,12 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ((yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) libconfig_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,(yy_size_t) new_size ,yyscanner ); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size , yyscanner ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } yyg->yy_n_chars += number_to_move; @@ -1562,7 +1853,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 123 ) + if ( yy_current_state >= 127 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -1591,11 +1882,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 123 ) + if ( yy_current_state >= 127 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 122); + yy_is_jam = (yy_current_state == 126); (void)yyg; return yy_is_jam ? 0 : yy_current_state; @@ -1647,13 +1938,13 @@ static int yy_get_next_buffer (yyscan_t yyscanner) */ /* Reset buffer status. */ - libconfig_yyrestart(yyin ,yyscanner); + yyrestart( yyin , yyscanner); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( libconfig_yywrap(yyscanner ) ) + if ( yywrap( yyscanner ) ) return 0; if ( ! yyg->yy_did_buffer_switch_on_eof ) @@ -1678,7 +1969,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n'); if ( YY_CURRENT_BUFFER_LVALUE->yy_at_bol ) - + do{ yylineno++; yycolumn=0; }while(0) @@ -1693,36 +1984,36 @@ static int yy_get_next_buffer (yyscan_t yyscanner) * @param yyscanner The scanner object. * @note This function does not reset the start condition to @c INITIAL . */ - void libconfig_yyrestart (FILE * input_file , yyscan_t yyscanner) + void yyrestart (FILE * input_file , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( ! YY_CURRENT_BUFFER ){ - libconfig_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); YY_CURRENT_BUFFER_LVALUE = - libconfig_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } assert(YY_CURRENT_BUFFER != NULL); // Fixes compiler warning -Wnull-dereference on gcc-6 and -O3 - libconfig_yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); - libconfig_yy_load_buffer_state(yyscanner ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file , yyscanner); + yy_load_buffer_state( yyscanner ); } /** Switch to a different input buffer. * @param new_buffer The new input buffer. * @param yyscanner The scanner object. */ - void libconfig_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* TODO. We should be able to replace this entire function body * with - * libconfig_yypop_buffer_state(); - * libconfig_yypush_buffer_state(new_buffer); + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); */ - libconfig_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); if ( YY_CURRENT_BUFFER == new_buffer ) return; @@ -1735,17 +2026,17 @@ static int yy_get_next_buffer (yyscan_t yyscanner) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - libconfig_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); /* We don't actually know whether we did this switch during - * EOF (libconfig_yywrap()) processing, but the only time this flag - * is looked at is after libconfig_yywrap() is called, so it's safe + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ yyg->yy_did_buffer_switch_on_eof = 1; } -static void libconfig_yy_load_buffer_state (yyscan_t yyscanner) +static void yy_load_buffer_state (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; @@ -1760,35 +2051,35 @@ static void libconfig_yy_load_buffer_state (yyscan_t yyscanner) * @param yyscanner The scanner object. * @return the allocated buffer state. */ - YY_BUFFER_STATE libconfig_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) libconfig_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in libconfig_yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_buf_size = size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) libconfig_yyalloc((yy_size_t) (b->yy_buf_size + 2) ,yyscanner ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in libconfig_yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - libconfig_yy_init_buffer(b,file ,yyscanner); + yy_init_buffer( b, file , yyscanner); return b; } /** Destroy the buffer. - * @param b a buffer created with libconfig_yy_create_buffer() + * @param b a buffer created with yy_create_buffer() * @param yyscanner The scanner object. */ - void libconfig_yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) + void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -1799,28 +2090,28 @@ static void libconfig_yy_load_buffer_state (yyscan_t yyscanner) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - libconfig_yyfree((void *) b->yy_ch_buf ,yyscanner ); + yyfree( (void *) b->yy_ch_buf , yyscanner ); - libconfig_yyfree((void *) b ,yyscanner ); + yyfree( (void *) b , yyscanner ); } /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, - * such as during a libconfig_yyrestart() or at EOF. + * such as during a yyrestart() or at EOF. */ - static void libconfig_yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) { int oerrno = errno; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - libconfig_yy_flush_buffer(b ,yyscanner); + yy_flush_buffer( b , yyscanner); b->yy_input_file = file; b->yy_fill_buffer = 1; - /* If b is the current buffer, then libconfig_yy_init_buffer was _probably_ - * called from libconfig_yyrestart() or through yy_get_next_buffer. + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. * In that case, we don't want to reset the lineno or column. */ if (b != YY_CURRENT_BUFFER){ @@ -1829,7 +2120,7 @@ static void libconfig_yy_load_buffer_state (yyscan_t yyscanner) } b->yy_is_interactive = 0; - + errno = oerrno; } @@ -1837,7 +2128,7 @@ static void libconfig_yy_load_buffer_state (yyscan_t yyscanner) * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. * @param yyscanner The scanner object. */ - void libconfig_yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) + void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( ! b ) @@ -1858,7 +2149,7 @@ static void libconfig_yy_load_buffer_state (yyscan_t yyscanner) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - libconfig_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); } /** Pushes the new state onto the stack. The new state becomes @@ -1867,15 +2158,15 @@ static void libconfig_yy_load_buffer_state (yyscan_t yyscanner) * @param new_buffer The new state. * @param yyscanner The scanner object. */ -void libconfig_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (new_buffer == NULL) return; - libconfig_yyensure_buffer_stack(yyscanner); + yyensure_buffer_stack(yyscanner); - /* This block is copied from libconfig_yy_switch_to_buffer. */ + /* This block is copied from yy_switch_to_buffer. */ if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ @@ -1889,8 +2180,8 @@ void libconfig_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscan yyg->yy_buffer_stack_top++; YY_CURRENT_BUFFER_LVALUE = new_buffer; - /* copied from libconfig_yy_switch_to_buffer. */ - libconfig_yy_load_buffer_state(yyscanner ); + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( yyscanner ); yyg->yy_did_buffer_switch_on_eof = 1; } @@ -1898,19 +2189,19 @@ void libconfig_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscan * The next element becomes the new top. * @param yyscanner The scanner object. */ -void libconfig_yypop_buffer_state (yyscan_t yyscanner) +void yypop_buffer_state (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!YY_CURRENT_BUFFER) return; - libconfig_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner); + yy_delete_buffer(YY_CURRENT_BUFFER , yyscanner); YY_CURRENT_BUFFER_LVALUE = NULL; if (yyg->yy_buffer_stack_top > 0) --yyg->yy_buffer_stack_top; if (YY_CURRENT_BUFFER) { - libconfig_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); yyg->yy_did_buffer_switch_on_eof = 1; } } @@ -1918,7 +2209,7 @@ void libconfig_yypop_buffer_state (yyscan_t yyscanner) /* Allocates the stack if it does not exist. * Guarantees space for at least one push. */ -static void libconfig_yyensure_buffer_stack (yyscan_t yyscanner) +static void yyensure_buffer_stack (yyscan_t yyscanner) { yy_size_t num_to_alloc; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -1930,14 +2221,14 @@ static void libconfig_yyensure_buffer_stack (yyscan_t yyscanner) * immediate realloc on the next call. */ num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ - yyg->yy_buffer_stack = (struct yy_buffer_state**)libconfig_yyalloc + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in libconfig_yyensure_buffer_stack()" ); - + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + yyg->yy_buffer_stack_max = num_to_alloc; yyg->yy_buffer_stack_top = 0; return; @@ -1949,12 +2240,12 @@ static void libconfig_yyensure_buffer_stack (yyscan_t yyscanner) yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = yyg->yy_buffer_stack_max + grow_size; - yyg->yy_buffer_stack = (struct yy_buffer_state**)libconfig_yyrealloc + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc (yyg->yy_buffer_stack, num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in libconfig_yyensure_buffer_stack()" ); + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); /* zero only the new slots.*/ memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); @@ -1966,21 +2257,21 @@ static void libconfig_yyensure_buffer_stack (yyscan_t yyscanner) * @param base the character buffer * @param size the size in bytes of the character buffer * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE libconfig_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ return NULL; - b = (YY_BUFFER_STATE) libconfig_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in libconfig_yy_scan_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; @@ -1992,53 +2283,53 @@ YY_BUFFER_STATE libconfig_yy_scan_buffer (char * base, yy_size_t size , yyscan b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - libconfig_yy_switch_to_buffer(b ,yyscanner ); + yy_switch_to_buffer( b , yyscanner ); return b; } -/** Setup the input buffer state to scan a string. The next call to libconfig_yylex() will +/** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan * @param yyscanner The scanner object. * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use - * libconfig_yy_scan_bytes() instead. + * yy_scan_bytes() instead. */ -YY_BUFFER_STATE libconfig_yy_scan_string (const char * yystr , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner) { - - return libconfig_yy_scan_bytes(yystr,(int) strlen(yystr) ,yyscanner); + + return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner); } -/** Setup the input buffer state to scan the given bytes. The next call to libconfig_yylex() will +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. * @param yybytes the byte buffer to scan * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE libconfig_yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan_t yyscanner) { YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = (yy_size_t) (_yybytes_len + 2); - buf = (char *) libconfig_yyalloc(n ,yyscanner ); + buf = (char *) yyalloc( n , yyscanner ); if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in libconfig_yy_scan_bytes()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); for ( i = 0; i < _yybytes_len; ++i ) buf[i] = yybytes[i]; buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = libconfig_yy_scan_buffer(buf,n ,yyscanner); + b = yy_scan_buffer( buf, n , yyscanner); if ( ! b ) - YY_FATAL_ERROR( "bad buffer in libconfig_yy_scan_bytes()" ); + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. @@ -2056,7 +2347,7 @@ static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -2082,7 +2373,7 @@ static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner) /** Get the user-defined data for this scanner. * @param yyscanner The scanner object. */ -YY_EXTRA_TYPE libconfig_yyget_extra (yyscan_t yyscanner) +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyextra; @@ -2091,33 +2382,33 @@ YY_EXTRA_TYPE libconfig_yyget_extra (yyscan_t yyscanner) /** Get the current line number. * @param yyscanner The scanner object. */ -int libconfig_yyget_lineno (yyscan_t yyscanner) +int yyget_lineno (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; - + return yylineno; } /** Get the current column number. * @param yyscanner The scanner object. */ -int libconfig_yyget_column (yyscan_t yyscanner) +int yyget_column (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; - + return yycolumn; } /** Get the input stream. * @param yyscanner The scanner object. */ -FILE *libconfig_yyget_in (yyscan_t yyscanner) +FILE *yyget_in (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyin; @@ -2126,7 +2417,7 @@ FILE *libconfig_yyget_in (yyscan_t yyscanner) /** Get the output stream. * @param yyscanner The scanner object. */ -FILE *libconfig_yyget_out (yyscan_t yyscanner) +FILE *yyget_out (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyout; @@ -2135,7 +2426,7 @@ FILE *libconfig_yyget_out (yyscan_t yyscanner) /** Get the length of the current token. * @param yyscanner The scanner object. */ -int libconfig_yyget_leng (yyscan_t yyscanner) +int yyget_leng (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyleng; @@ -2145,7 +2436,7 @@ int libconfig_yyget_leng (yyscan_t yyscanner) * @param yyscanner The scanner object. */ -char *libconfig_yyget_text (yyscan_t yyscanner) +char *yyget_text (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yytext; @@ -2155,7 +2446,7 @@ char *libconfig_yyget_text (yyscan_t yyscanner) * @param user_defined The data to be associated with this scanner. * @param yyscanner The scanner object. */ -void libconfig_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) +void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyextra = user_defined ; @@ -2165,14 +2456,14 @@ void libconfig_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) * @param _line_number line number * @param yyscanner The scanner object. */ -void libconfig_yyset_lineno (int _line_number , yyscan_t yyscanner) +void yyset_lineno (int _line_number , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* lineno is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "libconfig_yyset_lineno called with no buffer" ); - + YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); + yylineno = _line_number; } @@ -2180,14 +2471,14 @@ void libconfig_yyset_lineno (int _line_number , yyscan_t yyscanner) * @param _column_no column number * @param yyscanner The scanner object. */ -void libconfig_yyset_column (int _column_no , yyscan_t yyscanner) +void yyset_column (int _column_no , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* column is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "libconfig_yyset_column called with no buffer" ); - + YY_FATAL_ERROR( "yyset_column called with no buffer" ); + yycolumn = _column_no; } @@ -2195,27 +2486,27 @@ void libconfig_yyset_column (int _column_no , yyscan_t yyscanner) * input buffer. * @param _in_str A readable stream. * @param yyscanner The scanner object. - * @see libconfig_yy_switch_to_buffer + * @see yy_switch_to_buffer */ -void libconfig_yyset_in (FILE * _in_str , yyscan_t yyscanner) +void yyset_in (FILE * _in_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyin = _in_str ; } -void libconfig_yyset_out (FILE * _out_str , yyscan_t yyscanner) +void yyset_out (FILE * _out_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyout = _out_str ; } -int libconfig_yyget_debug (yyscan_t yyscanner) +int yyget_debug (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yy_flex_debug; } -void libconfig_yyset_debug (int _bdebug , yyscan_t yyscanner) +void yyset_debug (int _bdebug , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yy_flex_debug = _bdebug ; @@ -2223,13 +2514,13 @@ void libconfig_yyset_debug (int _bdebug , yyscan_t yyscanner) /* Accessor methods for yylval and yylloc */ -YYSTYPE * libconfig_yyget_lval (yyscan_t yyscanner) +YYSTYPE * yyget_lval (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yylval; } -void libconfig_yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) +void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yylval = yylval_param; @@ -2237,18 +2528,18 @@ void libconfig_yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) /* User-visible API */ -/* libconfig_yylex_init is special because it creates the scanner itself, so it is +/* yylex_init is special because it creates the scanner itself, so it is * the ONLY reentrant function that doesn't take the scanner as the last argument. * That's why we explicitly handle the declaration, instead of using our macros. */ -int libconfig_yylex_init(yyscan_t* ptr_yy_globals) +int yylex_init(yyscan_t* ptr_yy_globals) { if (ptr_yy_globals == NULL){ errno = EINVAL; return 1; } - *ptr_yy_globals = (yyscan_t) libconfig_yyalloc ( sizeof( struct yyguts_t ), NULL ); + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); if (*ptr_yy_globals == NULL){ errno = ENOMEM; @@ -2261,37 +2552,37 @@ int libconfig_yylex_init(yyscan_t* ptr_yy_globals) return yy_init_globals ( *ptr_yy_globals ); } -/* libconfig_yylex_init_extra has the same functionality as libconfig_yylex_init, but follows the +/* yylex_init_extra has the same functionality as yylex_init, but follows the * convention of taking the scanner as the last argument. Note however, that * this is a *pointer* to a scanner, as it will be allocated by this call (and * is the reason, too, why this function also must handle its own declaration). - * The user defined value in the first argument will be available to libconfig_yyalloc in + * The user defined value in the first argument will be available to yyalloc in * the yyextra field. */ -int libconfig_yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) +int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals ) { struct yyguts_t dummy_yyguts; - libconfig_yyset_extra (yy_user_defined, &dummy_yyguts); + yyset_extra (yy_user_defined, &dummy_yyguts); if (ptr_yy_globals == NULL){ errno = EINVAL; return 1; } - - *ptr_yy_globals = (yyscan_t) libconfig_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - + + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); + if (*ptr_yy_globals == NULL){ errno = ENOMEM; return 1; } - + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - libconfig_yyset_extra (yy_user_defined, *ptr_yy_globals); - + + yyset_extra (yy_user_defined, *ptr_yy_globals); + return yy_init_globals ( *ptr_yy_globals ); } @@ -2299,7 +2590,7 @@ static int yy_init_globals (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* Initialization is the same as for the non-reentrant scanner. - * This function is called from libconfig_yylex_destroy(), so don't allocate here. + * This function is called from yylex_destroy(), so don't allocate here. */ yyg->yy_buffer_stack = NULL; @@ -2323,37 +2614,37 @@ static int yy_init_globals (yyscan_t yyscanner) #endif /* For future reference: Set errno on error, since we are called by - * libconfig_yylex_init() + * yylex_init() */ return 0; } -/* libconfig_yylex_destroy is for both reentrant and non-reentrant scanners. */ -int libconfig_yylex_destroy (yyscan_t yyscanner) +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - libconfig_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); + yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner ); YY_CURRENT_BUFFER_LVALUE = NULL; - libconfig_yypop_buffer_state(yyscanner); + yypop_buffer_state(yyscanner); } /* Destroy the stack itself. */ - libconfig_yyfree(yyg->yy_buffer_stack ,yyscanner); + yyfree(yyg->yy_buffer_stack , yyscanner); yyg->yy_buffer_stack = NULL; /* Destroy the start condition stack. */ - libconfig_yyfree(yyg->yy_start_stack ,yyscanner ); + yyfree( yyg->yy_start_stack , yyscanner ); yyg->yy_start_stack = NULL; /* Reset the globals. This is important in a non-reentrant scanner so the next time - * libconfig_yylex() is called, initialization will occur. */ + * yylex() is called, initialization will occur. */ yy_init_globals( yyscanner); /* Destroy the main struct (reentrant only). */ - libconfig_yyfree ( yyscanner , yyscanner ); + yyfree ( yyscanner , yyscanner ); yyscanner = NULL; return 0; } @@ -2385,14 +2676,14 @@ static int yy_flex_strlen (const char * s , yyscan_t yyscanner) } #endif -void *libconfig_yyalloc (yy_size_t size , yyscan_t yyscanner) +void *yyalloc (yy_size_t size , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; return malloc(size); } -void *libconfig_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) +void *yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; @@ -2407,13 +2698,13 @@ void *libconfig_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) return realloc(ptr, size); } -void libconfig_yyfree (void * ptr , yyscan_t yyscanner) +void yyfree (void * ptr , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; (void)yyg; - free( (char *) ptr ); /* see libconfig_yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" -#line 219 "scanner.l" +#line 263 "scanner.l" diff --git a/3rdparty/libconfig/scanner.h b/3rdparty/libconfig/scanner.h index c1d295594..cf3a2e0b8 100644 --- a/3rdparty/libconfig/scanner.h +++ b/3rdparty/libconfig/scanner.h @@ -2,9 +2,9 @@ #define libconfig_yyHEADER_H 1 #define libconfig_yyIN_HEADER 1 -#line 5 "scanner.h" +#line 6 "scanner.h" -#line 7 "scanner.h" +#line 8 "scanner.h" #define YY_INT_ALIGNED short int @@ -13,11 +13,233 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 2 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yy_create_buffer +#define libconfig_yy_create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer libconfig_yy_create_buffer +#endif + +#ifdef yy_delete_buffer +#define libconfig_yy_delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer libconfig_yy_delete_buffer +#endif + +#ifdef yy_scan_buffer +#define libconfig_yy_scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer libconfig_yy_scan_buffer +#endif + +#ifdef yy_scan_string +#define libconfig_yy_scan_string_ALREADY_DEFINED +#else +#define yy_scan_string libconfig_yy_scan_string +#endif + +#ifdef yy_scan_bytes +#define libconfig_yy_scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes libconfig_yy_scan_bytes +#endif + +#ifdef yy_init_buffer +#define libconfig_yy_init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer libconfig_yy_init_buffer +#endif + +#ifdef yy_flush_buffer +#define libconfig_yy_flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer libconfig_yy_flush_buffer +#endif + +#ifdef yy_load_buffer_state +#define libconfig_yy_load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state libconfig_yy_load_buffer_state +#endif + +#ifdef yy_switch_to_buffer +#define libconfig_yy_switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer libconfig_yy_switch_to_buffer +#endif + +#ifdef yypush_buffer_state +#define libconfig_yypush_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state libconfig_yypush_buffer_state +#endif + +#ifdef yypop_buffer_state +#define libconfig_yypop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state libconfig_yypop_buffer_state +#endif + +#ifdef yyensure_buffer_stack +#define libconfig_yyensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack libconfig_yyensure_buffer_stack +#endif + +#ifdef yylex +#define libconfig_yylex_ALREADY_DEFINED +#else +#define yylex libconfig_yylex +#endif + +#ifdef yyrestart +#define libconfig_yyrestart_ALREADY_DEFINED +#else +#define yyrestart libconfig_yyrestart +#endif + +#ifdef yylex_init +#define libconfig_yylex_init_ALREADY_DEFINED +#else +#define yylex_init libconfig_yylex_init +#endif + +#ifdef yylex_init_extra +#define libconfig_yylex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra libconfig_yylex_init_extra +#endif + +#ifdef yylex_destroy +#define libconfig_yylex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy libconfig_yylex_destroy +#endif + +#ifdef yyget_debug +#define libconfig_yyget_debug_ALREADY_DEFINED +#else +#define yyget_debug libconfig_yyget_debug +#endif + +#ifdef yyset_debug +#define libconfig_yyset_debug_ALREADY_DEFINED +#else +#define yyset_debug libconfig_yyset_debug +#endif + +#ifdef yyget_extra +#define libconfig_yyget_extra_ALREADY_DEFINED +#else +#define yyget_extra libconfig_yyget_extra +#endif + +#ifdef yyset_extra +#define libconfig_yyset_extra_ALREADY_DEFINED +#else +#define yyset_extra libconfig_yyset_extra +#endif + +#ifdef yyget_in +#define libconfig_yyget_in_ALREADY_DEFINED +#else +#define yyget_in libconfig_yyget_in +#endif + +#ifdef yyset_in +#define libconfig_yyset_in_ALREADY_DEFINED +#else +#define yyset_in libconfig_yyset_in +#endif + +#ifdef yyget_out +#define libconfig_yyget_out_ALREADY_DEFINED +#else +#define yyget_out libconfig_yyget_out +#endif + +#ifdef yyset_out +#define libconfig_yyset_out_ALREADY_DEFINED +#else +#define yyset_out libconfig_yyset_out +#endif + +#ifdef yyget_leng +#define libconfig_yyget_leng_ALREADY_DEFINED +#else +#define yyget_leng libconfig_yyget_leng +#endif + +#ifdef yyget_text +#define libconfig_yyget_text_ALREADY_DEFINED +#else +#define yyget_text libconfig_yyget_text +#endif + +#ifdef yyget_lineno +#define libconfig_yyget_lineno_ALREADY_DEFINED +#else +#define yyget_lineno libconfig_yyget_lineno +#endif + +#ifdef yyset_lineno +#define libconfig_yyset_lineno_ALREADY_DEFINED +#else +#define yyset_lineno libconfig_yyset_lineno +#endif + +#ifdef yyget_column +#define libconfig_yyget_column_ALREADY_DEFINED +#else +#define yyget_column libconfig_yyget_column +#endif + +#ifdef yyset_column +#define libconfig_yyset_column_ALREADY_DEFINED +#else +#define yyset_column libconfig_yyset_column +#endif + +#ifdef yywrap +#define libconfig_yywrap_ALREADY_DEFINED +#else +#define yywrap libconfig_yywrap +#endif + +#ifdef yyget_lval +#define libconfig_yyget_lval_ALREADY_DEFINED +#else +#define yyget_lval libconfig_yyget_lval +#endif + +#ifdef yyset_lval +#define libconfig_yyset_lval_ALREADY_DEFINED +#else +#define yyset_lval libconfig_yyset_lval +#endif + +#ifdef yyalloc +#define libconfig_yyalloc_ALREADY_DEFINED +#else +#define yyalloc libconfig_yyalloc +#endif + +#ifdef yyrealloc +#define libconfig_yyrealloc_ALREADY_DEFINED +#else +#define yyrealloc libconfig_yyrealloc +#endif + +#ifdef yyfree +#define libconfig_yyfree_ALREADY_DEFINED +#else +#define yyfree libconfig_yyfree +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -88,10 +310,16 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ +/* begin standard C++ headers. */ + /* TODO: this is always defined, so inline it */ #define yyconst const @@ -181,7 +409,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -192,21 +420,21 @@ struct yy_buffer_state }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -void libconfig_yyrestart ( FILE *input_file , yyscan_t yyscanner ); -void libconfig_yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -YY_BUFFER_STATE libconfig_yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); -void libconfig_yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void libconfig_yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void libconfig_yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -void libconfig_yypop_buffer_state ( yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -YY_BUFFER_STATE libconfig_yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); -YY_BUFFER_STATE libconfig_yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); -YY_BUFFER_STATE libconfig_yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -void *libconfig_yyalloc ( yy_size_t , yyscan_t yyscanner ); -void *libconfig_yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); -void libconfig_yyfree ( void * , yyscan_t yyscanner ); +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); #define libconfig_yywrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP @@ -224,46 +452,46 @@ void libconfig_yyfree ( void * , yyscan_t yyscanner ); #define YY_EXTRA_TYPE struct scan_context * -int libconfig_yylex_init (yyscan_t* scanner); +int yylex_init (yyscan_t* scanner); -int libconfig_yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int libconfig_yylex_destroy ( yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); -int libconfig_yyget_debug ( yyscan_t yyscanner ); +int yyget_debug ( yyscan_t yyscanner ); -void libconfig_yyset_debug ( int debug_flag , yyscan_t yyscanner ); +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -YY_EXTRA_TYPE libconfig_yyget_extra ( yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void libconfig_yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -FILE *libconfig_yyget_in ( yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void libconfig_yyset_in ( FILE * _in_str , yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *libconfig_yyget_out ( yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void libconfig_yyset_out ( FILE * _out_str , yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); - int libconfig_yyget_leng ( yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -char *libconfig_yyget_text ( yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -int libconfig_yyget_lineno ( yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -void libconfig_yyset_lineno ( int _line_number , yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int libconfig_yyget_column ( yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void libconfig_yyset_column ( int _column_no , yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); -YYSTYPE * libconfig_yyget_lval ( yyscan_t yyscanner ); +YYSTYPE * yyget_lval ( yyscan_t yyscanner ); -void libconfig_yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); +void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -271,9 +499,9 @@ void libconfig_yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int libconfig_yywrap ( yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int libconfig_yywrap ( yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif @@ -310,10 +538,10 @@ static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int libconfig_yylex \ +extern int yylex \ (YYSTYPE * yylval_param , yyscan_t yyscanner); -#define YY_DECL int libconfig_yylex \ +#define YY_DECL int yylex \ (YYSTYPE * yylval_param , yyscan_t yyscanner) #endif /* !YY_DECL */ @@ -331,8 +559,153 @@ extern int libconfig_yylex \ #undef YY_DECL #endif -#line 219 "scanner.l" +#ifndef libconfig_yy_create_buffer_ALREADY_DEFINED +#undef yy_create_buffer +#endif +#ifndef libconfig_yy_delete_buffer_ALREADY_DEFINED +#undef yy_delete_buffer +#endif +#ifndef libconfig_yy_scan_buffer_ALREADY_DEFINED +#undef yy_scan_buffer +#endif +#ifndef libconfig_yy_scan_string_ALREADY_DEFINED +#undef yy_scan_string +#endif +#ifndef libconfig_yy_scan_bytes_ALREADY_DEFINED +#undef yy_scan_bytes +#endif +#ifndef libconfig_yy_init_buffer_ALREADY_DEFINED +#undef yy_init_buffer +#endif +#ifndef libconfig_yy_flush_buffer_ALREADY_DEFINED +#undef yy_flush_buffer +#endif +#ifndef libconfig_yy_load_buffer_state_ALREADY_DEFINED +#undef yy_load_buffer_state +#endif +#ifndef libconfig_yy_switch_to_buffer_ALREADY_DEFINED +#undef yy_switch_to_buffer +#endif +#ifndef libconfig_yypush_buffer_state_ALREADY_DEFINED +#undef yypush_buffer_state +#endif +#ifndef libconfig_yypop_buffer_state_ALREADY_DEFINED +#undef yypop_buffer_state +#endif +#ifndef libconfig_yyensure_buffer_stack_ALREADY_DEFINED +#undef yyensure_buffer_stack +#endif +#ifndef libconfig_yylex_ALREADY_DEFINED +#undef yylex +#endif +#ifndef libconfig_yyrestart_ALREADY_DEFINED +#undef yyrestart +#endif +#ifndef libconfig_yylex_init_ALREADY_DEFINED +#undef yylex_init +#endif +#ifndef libconfig_yylex_init_extra_ALREADY_DEFINED +#undef yylex_init_extra +#endif +#ifndef libconfig_yylex_destroy_ALREADY_DEFINED +#undef yylex_destroy +#endif +#ifndef libconfig_yyget_debug_ALREADY_DEFINED +#undef yyget_debug +#endif +#ifndef libconfig_yyset_debug_ALREADY_DEFINED +#undef yyset_debug +#endif +#ifndef libconfig_yyget_extra_ALREADY_DEFINED +#undef yyget_extra +#endif +#ifndef libconfig_yyset_extra_ALREADY_DEFINED +#undef yyset_extra +#endif +#ifndef libconfig_yyget_in_ALREADY_DEFINED +#undef yyget_in +#endif +#ifndef libconfig_yyset_in_ALREADY_DEFINED +#undef yyset_in +#endif +#ifndef libconfig_yyget_out_ALREADY_DEFINED +#undef yyget_out +#endif +#ifndef libconfig_yyset_out_ALREADY_DEFINED +#undef yyset_out +#endif +#ifndef libconfig_yyget_leng_ALREADY_DEFINED +#undef yyget_leng +#endif +#ifndef libconfig_yyget_text_ALREADY_DEFINED +#undef yyget_text +#endif +#ifndef libconfig_yyget_lineno_ALREADY_DEFINED +#undef yyget_lineno +#endif +#ifndef libconfig_yyset_lineno_ALREADY_DEFINED +#undef yyset_lineno +#endif +#ifndef libconfig_yyget_column_ALREADY_DEFINED +#undef yyget_column +#endif +#ifndef libconfig_yyset_column_ALREADY_DEFINED +#undef yyset_column +#endif +#ifndef libconfig_yywrap_ALREADY_DEFINED +#undef yywrap +#endif +#ifndef libconfig_yyget_lval_ALREADY_DEFINED +#undef yyget_lval +#endif +#ifndef libconfig_yyset_lval_ALREADY_DEFINED +#undef yyset_lval +#endif +#ifndef libconfig_yyget_lloc_ALREADY_DEFINED +#undef yyget_lloc +#endif +#ifndef libconfig_yyset_lloc_ALREADY_DEFINED +#undef yyset_lloc +#endif +#ifndef libconfig_yyalloc_ALREADY_DEFINED +#undef yyalloc +#endif +#ifndef libconfig_yyrealloc_ALREADY_DEFINED +#undef yyrealloc +#endif +#ifndef libconfig_yyfree_ALREADY_DEFINED +#undef yyfree +#endif +#ifndef libconfig_yytext_ALREADY_DEFINED +#undef yytext +#endif +#ifndef libconfig_yyleng_ALREADY_DEFINED +#undef yyleng +#endif +#ifndef libconfig_yyin_ALREADY_DEFINED +#undef yyin +#endif +#ifndef libconfig_yyout_ALREADY_DEFINED +#undef yyout +#endif +#ifndef libconfig_yy_flex_debug_ALREADY_DEFINED +#undef yy_flex_debug +#endif +#ifndef libconfig_yylineno_ALREADY_DEFINED +#undef yylineno +#endif +#ifndef libconfig_yytables_fload_ALREADY_DEFINED +#undef yytables_fload +#endif +#ifndef libconfig_yytables_destroy_ALREADY_DEFINED +#undef yytables_destroy +#endif +#ifndef libconfig_yyTABLES_NAME_ALREADY_DEFINED +#undef yyTABLES_NAME +#endif + +#line 263 "scanner.l" -#line 336 "scanner.h" +#line 710 "scanner.h" #undef libconfig_yyIN_HEADER #endif /* libconfig_yyHEADER_H */ -- cgit v1.2.3-70-g09d2