diff options
Diffstat (limited to 'crawl-ref/source/prebuilt/levcomp.tab.cc')
-rw-r--r-- | crawl-ref/source/prebuilt/levcomp.tab.cc | 719 |
1 files changed, 368 insertions, 351 deletions
diff --git a/crawl-ref/source/prebuilt/levcomp.tab.cc b/crawl-ref/source/prebuilt/levcomp.tab.cc index 0fd21dd9dd..5c3e88f475 100644 --- a/crawl-ref/source/prebuilt/levcomp.tab.cc +++ b/crawl-ref/source/prebuilt/levcomp.tab.cc @@ -99,16 +99,17 @@ LROCKTILE = 288, FTILE = 289, RTILE = 290, - COMMA = 291, - COLON = 292, - PERC = 293, - INTEGER = 294, - CHARACTER = 295, - STRING = 296, - MAP_LINE = 297, - MONSTER_NAME = 298, - ITEM_INFO = 299, - LUA_LINE = 300 + SUBVAULT = 291, + COMMA = 292, + COLON = 293, + PERC = 294, + INTEGER = 295, + CHARACTER = 296, + STRING = 297, + MAP_LINE = 298, + MONSTER_NAME = 299, + ITEM_INFO = 300, + LUA_LINE = 301 }; #endif /* Tokens. */ @@ -145,16 +146,17 @@ #define LROCKTILE 288 #define FTILE 289 #define RTILE 290 -#define COMMA 291 -#define COLON 292 -#define PERC 293 -#define INTEGER 294 -#define CHARACTER 295 -#define STRING 296 -#define MAP_LINE 297 -#define MONSTER_NAME 298 -#define ITEM_INFO 299 -#define LUA_LINE 300 +#define SUBVAULT 291 +#define COMMA 292 +#define COLON 293 +#define PERC 294 +#define INTEGER 295 +#define CHARACTER 296 +#define STRING 297 +#define MAP_LINE 298 +#define MONSTER_NAME 299 +#define ITEM_INFO 300 +#define LUA_LINE 301 @@ -230,8 +232,8 @@ typedef union YYSTYPE const char *text; raw_range range; } -/* Line 187 of yacc.c. */ -#line 235 "levcomp.tab.c" +/* Line 193 of yacc.c. */ +#line 237 "levcomp.tab.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -244,7 +246,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 248 "levcomp.tab.c" +#line 250 "levcomp.tab.c" #ifdef short # undef short @@ -294,7 +296,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -459,20 +461,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 106 +#define YYLAST 107 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 46 +#define YYNTOKENS 47 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 75 +#define YYNNTS 78 /* YYNRULES -- Number of rules. */ -#define YYNRULES 142 +#define YYNRULES 147 /* YYNRULES -- Number of states. */ -#define YYNSTATES 167 +#define YYNSTATES 174 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 300 +#define YYMAXUTOK 301 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -510,7 +512,7 @@ static const yytype_uint8 yytranslate[] = 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45 + 45, 46 }; #if YYDEBUG @@ -523,56 +525,57 @@ static const yytype_uint16 yyprhs[] = 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, - 103, 104, 107, 109, 112, 113, 116, 118, 121, 122, - 125, 127, 130, 131, 134, 136, 139, 140, 143, 145, - 147, 150, 152, 155, 157, 160, 162, 165, 167, 170, - 173, 175, 179, 181, 184, 185, 188, 190, 193, 196, - 199, 202, 204, 207, 209, 212, 214, 217, 219, 222, - 225, 227, 231, 233, 236, 238, 242, 244, 246, 250, - 252, 255, 257, 261, 263, 266, 268, 272, 274, 276, - 279, 283, 285, 287, 289, 292, 296, 298, 300, 303, - 305, 308, 314, 319, 323, 326, 329, 331, 334, 337, - 339, 342, 344 + 102, 105, 106, 109, 111, 114, 115, 118, 120, 123, + 124, 127, 129, 132, 133, 136, 138, 141, 142, 145, + 147, 149, 152, 154, 157, 159, 162, 164, 167, 169, + 172, 175, 177, 181, 183, 186, 187, 190, 192, 195, + 198, 201, 204, 206, 209, 211, 214, 216, 219, 221, + 224, 227, 229, 233, 235, 238, 240, 244, 246, 248, + 252, 254, 257, 259, 263, 265, 268, 270, 274, 276, + 278, 281, 285, 287, 289, 291, 294, 298, 300, 302, + 305, 307, 310, 316, 321, 325, 328, 331, 333, 336, + 339, 341, 344, 346, 348, 351, 353, 357 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 47, 0, -1, 48, -1, -1, 48, 49, -1, 51, - -1, 53, -1, 40, -1, 52, -1, 58, -1, 3, - 41, -1, 56, 54, -1, -1, 54, 55, -1, 57, - -1, 118, -1, 12, 41, -1, 112, -1, 113, -1, - 114, -1, 115, -1, 116, -1, 117, -1, 109, -1, - 106, -1, 86, -1, 103, -1, 100, -1, 87, -1, - 88, -1, 89, -1, 90, -1, 91, -1, 92, -1, - 95, -1, 78, -1, 81, -1, 84, -1, 85, -1, - 73, -1, 75, -1, 74, -1, 76, -1, 77, -1, - 61, -1, 70, -1, 64, -1, 67, -1, 50, -1, - 23, 59, -1, -1, 59, 60, -1, 45, -1, 23, - 62, -1, -1, 62, 63, -1, 45, -1, 24, 65, - -1, -1, 65, 66, -1, 45, -1, 25, 68, -1, - -1, 68, 69, -1, 45, -1, 22, 71, -1, -1, - 71, 72, -1, 45, -1, 7, -1, 7, 41, -1, - 9, -1, 9, 41, -1, 8, -1, 8, 41, -1, - 10, -1, 10, 41, -1, 11, -1, 11, 41, -1, - 4, 79, -1, 80, -1, 79, 36, 80, -1, 44, - -1, 6, 82, -1, -1, 82, 83, -1, 41, -1, - 28, 41, -1, 29, 41, -1, 20, 41, -1, 21, - 98, -1, 30, -1, 30, 41, -1, 31, -1, 31, - 41, -1, 32, -1, 32, 41, -1, 33, -1, 33, - 41, -1, 34, 93, -1, 94, -1, 93, 36, 94, - -1, 44, -1, 35, 96, -1, 97, -1, 96, 36, - 97, -1, 44, -1, 99, -1, 98, 36, 99, -1, - 44, -1, 26, 101, -1, 102, -1, 101, 36, 102, - -1, 44, -1, 5, 104, -1, 105, -1, 105, 36, - 104, -1, 44, -1, 19, -1, 19, 107, -1, 107, - 36, 108, -1, 108, -1, 44, -1, 18, -1, 18, - 110, -1, 111, 36, 110, -1, 111, -1, 43, -1, - 15, 41, -1, 13, -1, 13, 41, -1, 16, 39, - 37, 39, 38, -1, 16, 39, 37, 39, -1, 16, - 39, 38, -1, 16, 39, -1, 17, 39, -1, 14, - -1, 14, 41, -1, 27, 41, -1, 119, -1, 119, - 120, -1, 120, -1, 42, -1 + 48, 0, -1, 49, -1, -1, 49, 50, -1, 52, + -1, 54, -1, 41, -1, 53, -1, 59, -1, 3, + 42, -1, 57, 55, -1, -1, 55, 56, -1, 58, + -1, 119, -1, 12, 42, -1, 113, -1, 114, -1, + 115, -1, 116, -1, 117, -1, 118, -1, 110, -1, + 107, -1, 87, -1, 104, -1, 101, -1, 88, -1, + 89, -1, 90, -1, 91, -1, 92, -1, 93, -1, + 96, -1, 79, -1, 82, -1, 85, -1, 86, -1, + 74, -1, 76, -1, 75, -1, 77, -1, 78, -1, + 122, -1, 62, -1, 71, -1, 65, -1, 68, -1, + 51, -1, 23, 60, -1, -1, 60, 61, -1, 46, + -1, 23, 63, -1, -1, 63, 64, -1, 46, -1, + 24, 66, -1, -1, 66, 67, -1, 46, -1, 25, + 69, -1, -1, 69, 70, -1, 46, -1, 22, 72, + -1, -1, 72, 73, -1, 46, -1, 7, -1, 7, + 42, -1, 9, -1, 9, 42, -1, 8, -1, 8, + 42, -1, 10, -1, 10, 42, -1, 11, -1, 11, + 42, -1, 4, 80, -1, 81, -1, 80, 37, 81, + -1, 45, -1, 6, 83, -1, -1, 83, 84, -1, + 42, -1, 28, 42, -1, 29, 42, -1, 20, 42, + -1, 21, 99, -1, 30, -1, 30, 42, -1, 31, + -1, 31, 42, -1, 32, -1, 32, 42, -1, 33, + -1, 33, 42, -1, 34, 94, -1, 95, -1, 94, + 37, 95, -1, 45, -1, 35, 97, -1, 98, -1, + 97, 37, 98, -1, 45, -1, 100, -1, 99, 37, + 100, -1, 45, -1, 26, 102, -1, 103, -1, 102, + 37, 103, -1, 45, -1, 5, 105, -1, 106, -1, + 106, 37, 105, -1, 45, -1, 19, -1, 19, 108, + -1, 108, 37, 109, -1, 109, -1, 45, -1, 18, + -1, 18, 111, -1, 112, 37, 111, -1, 112, -1, + 44, -1, 15, 42, -1, 13, -1, 13, 42, -1, + 16, 40, 38, 40, 39, -1, 16, 40, 38, 40, + -1, 16, 40, 39, -1, 16, 40, -1, 17, 40, + -1, 14, -1, 14, 42, -1, 27, 42, -1, 120, + -1, 120, 121, -1, 121, -1, 43, -1, 36, 123, + -1, 124, -1, 123, 37, 124, -1, 42, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -582,17 +585,17 @@ static const yytype_uint16 yyrline[] = 87, 97, 119, 120, 123, 124, 127, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 180, 181, 182, 185, - 187, 188, 191, 196, 198, 199, 202, 207, 209, 210, - 213, 218, 220, 221, 224, 229, 231, 232, 235, 240, - 241, 249, 250, 258, 259, 267, 268, 276, 277, 285, - 288, 289, 292, 300, 303, 304, 307, 316, 325, 334, - 367, 370, 371, 379, 380, 388, 389, 397, 398, 407, - 410, 411, 414, 423, 426, 427, 430, 439, 440, 443, - 452, 455, 456, 459, 468, 471, 472, 475, 484, 485, - 488, 489, 492, 500, 501, 504, 505, 508, 517, 526, - 527, 536, 543, 550, 557, 565, 573, 574, 583, 592, - 595, 596, 599 + 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, + 186, 188, 189, 192, 197, 199, 200, 203, 208, 210, + 211, 214, 219, 221, 222, 225, 230, 232, 233, 236, + 241, 242, 250, 251, 259, 260, 268, 269, 277, 278, + 286, 289, 290, 293, 301, 304, 305, 308, 317, 326, + 335, 368, 371, 372, 380, 381, 389, 390, 398, 399, + 408, 411, 412, 415, 424, 427, 428, 431, 440, 441, + 444, 453, 456, 457, 460, 469, 472, 473, 476, 485, + 486, 489, 490, 493, 501, 502, 505, 506, 509, 518, + 527, 528, 537, 544, 551, 558, 566, 574, 575, 584, + 593, 596, 597, 600, 609, 612, 613, 616 }; #endif @@ -606,12 +609,12 @@ static const char *const yytname[] = "ORIENT", "PLACE", "CHANCE", "WEIGHT", "MONS", "ITEM", "MARKER", "COLOUR", "PRELUDE", "MAIN", "VALIDATE", "VETO", "NSUBST", "WELCOME", "LFLAGS", "BFLAGS", "LFLOORCOL", "LROCKCOL", "LFLOORTILE", "LROCKTILE", - "FTILE", "RTILE", "COMMA", "COLON", "PERC", "INTEGER", "CHARACTER", - "STRING", "MAP_LINE", "MONSTER_NAME", "ITEM_INFO", "LUA_LINE", "$accept", - "file", "definitions", "definition", "error_seq", "def", "defdepth", - "level", "map_specs", "map_spec", "name", "metaline", "global_lua", - "global_lua_lines", "global_lua_line", "main_lua", "main_lua_lines", - "main_lua_line", "validate_lua", "validate_lua_lines", + "FTILE", "RTILE", "SUBVAULT", "COMMA", "COLON", "PERC", "INTEGER", + "CHARACTER", "STRING", "MAP_LINE", "MONSTER_NAME", "ITEM_INFO", + "LUA_LINE", "$accept", "file", "definitions", "definition", "error_seq", + "def", "defdepth", "level", "map_specs", "map_spec", "name", "metaline", + "global_lua", "global_lua_lines", "global_lua_line", "main_lua", + "main_lua_lines", "main_lua_line", "validate_lua", "validate_lua_lines", "validate_lua_line", "veto_lua", "veto_lua_lines", "veto_lua_line", "prelude_lua", "prelude_lua_lines", "prelude_lua_line", "kfeat", "kmons", "kitem", "kmask", "kprop", "shuffle", "shuffle_specifiers", @@ -622,7 +625,8 @@ static const char *const yytname[] = "colour_specifier", "nsubst", "nsubst_specifiers", "nsubst_spec", "subst", "subst_specifiers", "subst_spec", "items", "item_specifiers", "item_specifier", "mons", "mnames", "mname", "place", "depth", "chance", - "weight", "orientation", "welcome", "map_def", "map_lines", "map_line", 0 + "weight", "orientation", "welcome", "map_def", "map_lines", "map_line", + "subvault", "subvault_specifiers", "subvault_specifier", 0 }; #endif @@ -635,28 +639,28 @@ static const yytype_uint16 yytoknum[] = 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300 + 295, 296, 297, 298, 299, 300, 301 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 46, 47, 48, 48, 49, 49, 50, 51, 51, - 52, 53, 54, 54, 55, 55, 56, 57, 57, 57, - 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, - 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, - 57, 57, 57, 57, 57, 57, 57, 57, 57, 58, - 59, 59, 60, 61, 62, 62, 63, 64, 65, 65, - 66, 67, 68, 68, 69, 70, 71, 71, 72, 73, - 73, 74, 74, 75, 75, 76, 76, 77, 77, 78, - 79, 79, 80, 81, 82, 82, 83, 84, 85, 86, - 87, 88, 88, 89, 89, 90, 90, 91, 91, 92, - 93, 93, 94, 95, 96, 96, 97, 98, 98, 99, - 100, 101, 101, 102, 103, 104, 104, 105, 106, 106, - 107, 107, 108, 109, 109, 110, 110, 111, 112, 113, - 113, 114, 114, 114, 114, 115, 116, 116, 117, 118, - 119, 119, 120 + 0, 47, 48, 49, 49, 50, 50, 51, 52, 52, + 53, 54, 55, 55, 56, 56, 57, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 59, 60, 60, 61, 62, 63, 63, 64, 65, 66, + 66, 67, 68, 69, 69, 70, 71, 72, 72, 73, + 74, 74, 75, 75, 76, 76, 77, 77, 78, 78, + 79, 80, 80, 81, 82, 83, 83, 84, 85, 86, + 87, 88, 89, 89, 90, 90, 91, 91, 92, 92, + 93, 94, 94, 95, 96, 97, 97, 98, 99, 99, + 100, 101, 102, 102, 103, 104, 105, 105, 106, 107, + 107, 108, 108, 109, 110, 110, 111, 111, 112, 113, + 114, 114, 115, 115, 115, 115, 116, 117, 117, 118, + 119, 120, 120, 121, 122, 123, 123, 124 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -666,17 +670,17 @@ static const yytype_uint8 yyr2[] = 2, 2, 0, 2, 1, 1, 2, 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, - 0, 2, 1, 2, 0, 2, 1, 2, 0, 2, - 1, 2, 0, 2, 1, 2, 0, 2, 1, 1, - 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, - 1, 3, 1, 2, 0, 2, 1, 2, 2, 2, - 2, 1, 2, 1, 2, 1, 2, 1, 2, 2, - 1, 3, 1, 2, 1, 3, 1, 1, 3, 1, - 2, 1, 3, 1, 2, 1, 3, 1, 1, 2, - 3, 1, 1, 1, 2, 3, 1, 1, 2, 1, - 2, 5, 4, 3, 2, 2, 1, 2, 2, 1, - 2, 1, 1 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 2, 0, 2, 1, 2, 0, 2, 1, 2, 0, + 2, 1, 2, 0, 2, 1, 2, 0, 2, 1, + 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, + 2, 1, 3, 1, 2, 0, 2, 1, 2, 2, + 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, + 2, 1, 3, 1, 2, 1, 3, 1, 1, 3, + 1, 2, 1, 3, 1, 2, 1, 3, 1, 1, + 2, 3, 1, 1, 1, 2, 3, 1, 1, 2, + 1, 2, 5, 4, 3, 2, 2, 1, 2, 2, + 1, 2, 1, 1, 2, 1, 3, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -684,73 +688,75 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 3, 0, 2, 1, 0, 0, 50, 4, 5, 8, - 6, 12, 9, 10, 16, 49, 11, 52, 51, 0, - 0, 84, 69, 73, 71, 75, 77, 129, 136, 0, - 0, 0, 123, 118, 0, 0, 66, 54, 58, 62, - 0, 0, 0, 0, 91, 93, 95, 97, 0, 0, - 7, 142, 48, 13, 14, 44, 46, 47, 45, 39, - 41, 40, 42, 43, 35, 36, 37, 38, 25, 28, - 29, 30, 31, 32, 33, 34, 27, 26, 24, 23, - 17, 18, 19, 20, 21, 22, 15, 139, 141, 82, - 79, 80, 117, 114, 115, 83, 70, 74, 72, 76, - 78, 130, 137, 128, 134, 135, 127, 124, 126, 122, - 119, 121, 89, 109, 90, 107, 65, 53, 57, 61, - 113, 110, 111, 138, 87, 88, 92, 94, 96, 98, - 102, 99, 100, 106, 103, 104, 140, 0, 0, 86, - 85, 0, 133, 0, 0, 0, 68, 67, 56, 55, - 60, 59, 64, 63, 0, 0, 0, 81, 116, 132, - 125, 120, 108, 112, 101, 105, 131 + 3, 0, 2, 1, 0, 0, 51, 4, 5, 8, + 6, 12, 9, 10, 16, 50, 11, 53, 52, 0, + 0, 85, 70, 74, 72, 76, 78, 130, 137, 0, + 0, 0, 124, 119, 0, 0, 67, 55, 59, 63, + 0, 0, 0, 0, 92, 94, 96, 98, 0, 0, + 0, 7, 143, 49, 13, 14, 45, 47, 48, 46, + 39, 41, 40, 42, 43, 35, 36, 37, 38, 25, + 28, 29, 30, 31, 32, 33, 34, 27, 26, 24, + 23, 17, 18, 19, 20, 21, 22, 15, 140, 142, + 44, 83, 80, 81, 118, 115, 116, 84, 71, 75, + 73, 77, 79, 131, 138, 129, 135, 136, 128, 125, + 127, 123, 120, 122, 90, 110, 91, 108, 66, 54, + 58, 62, 114, 111, 112, 139, 88, 89, 93, 95, + 97, 99, 103, 100, 101, 107, 104, 105, 147, 144, + 145, 141, 0, 0, 87, 86, 0, 134, 0, 0, + 0, 69, 68, 57, 56, 61, 60, 65, 64, 0, + 0, 0, 0, 82, 117, 133, 126, 121, 109, 113, + 102, 106, 146, 132 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 7, 52, 8, 9, 10, 16, 53, - 11, 54, 12, 15, 18, 55, 117, 149, 56, 118, - 151, 57, 119, 153, 58, 116, 147, 59, 60, 61, - 62, 63, 64, 90, 91, 65, 95, 140, 66, 67, - 68, 69, 70, 71, 72, 73, 74, 131, 132, 75, - 134, 135, 114, 115, 76, 121, 122, 77, 93, 94, - 78, 110, 111, 79, 107, 108, 80, 81, 82, 83, - 84, 85, 86, 87, 88 + -1, 1, 2, 7, 53, 8, 9, 10, 16, 54, + 11, 55, 12, 15, 18, 56, 119, 154, 57, 120, + 156, 58, 121, 158, 59, 118, 152, 60, 61, 62, + 63, 64, 65, 92, 93, 66, 97, 145, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 133, 134, 76, + 136, 137, 116, 117, 77, 123, 124, 78, 95, 96, + 79, 112, 113, 80, 109, 110, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 139, 140 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -89 +#define YYPACT_NINF -93 static const yytype_int8 yypact[] = { - -89, 8, 29, -89, -8, -2, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -5, -4, -89, -89, -7, - -1, -89, 1, 3, 4, 5, 6, 7, 9, 10, - 14, 15, 12, 13, 17, 16, -89, -89, -89, -89, - 18, 20, 22, 23, 24, 25, 26, 27, 28, 30, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, 31, -89, -89, - 33, -89, -89, -89, 34, 35, -89, -89, -89, -89, - -89, -89, -89, -89, -3, -89, -89, -89, 39, -89, - 41, -89, -89, -89, 42, -89, 11, 36, 37, 38, - -89, 43, -89, -89, -89, -89, -89, -89, -89, -89, - -89, 44, -89, -89, 48, -89, -89, -7, -1, -89, - -89, 32, -89, 12, 13, 16, -89, -89, -89, -89, - -89, -89, -89, -89, 18, 28, 30, -89, -89, 21, - -89, -89, -89, -89, -89, -89, -89 + -93, 8, 30, -93, -8, -2, -93, -93, -93, -93, + -93, -93, -93, -93, -93, -5, -4, -93, -93, -7, + -1, -93, 1, 3, 4, 5, 6, 7, 9, 10, + 14, 15, 12, 13, 17, 16, -93, -93, -93, -93, + 18, 20, 22, 23, 24, 25, 26, 27, 28, 29, + 33, -93, -93, -93, -93, -93, -93, -93, -93, -93, + -93, -93, -93, -93, -93, -93, -93, -93, -93, -93, + -93, -93, -93, -93, -93, -93, -93, -93, -93, -93, + -93, -93, -93, -93, -93, -93, -93, -93, 34, -93, + -93, -93, 35, -93, -93, -93, 39, 36, -93, -93, + -93, -93, -93, -93, -93, -93, -3, -93, -93, -93, + 42, -93, 43, -93, -93, -93, 44, -93, 11, 37, + 38, 40, -93, 45, -93, -93, -93, -93, -93, -93, + -93, -93, -93, 48, -93, -93, 50, -93, -93, 51, + -93, -93, -7, -1, -93, -93, 31, -93, 12, 13, + 16, -93, -93, -93, -93, -93, -93, -93, -93, 18, + 28, 29, 33, -93, -93, 21, -93, -93, -93, -93, + -93, -93, -93, -93 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -88, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -70, -89, - -89, -69, -89, -59, -89, -89, -66, -89, -49, -89, - -89, -89, -54, -89, -52, -89, -89, -89, -89, -89, - -89, -89, -89, -89, 19 + -93, -93, -93, -93, -93, -93, -93, -93, -93, -93, + -93, -93, -93, -93, -93, -93, -93, -93, -93, -93, + -93, -93, -93, -93, -93, -93, -93, -93, -93, -93, + -93, -93, -93, -93, -92, -93, -93, -93, -93, -93, + -93, -93, -93, -93, -93, -93, -93, -93, -90, -93, + -93, -72, -93, -60, -93, -93, -68, -93, -51, -93, + -93, -93, -56, -93, -54, -93, -93, -93, -93, -93, + -93, -93, -93, -93, 19, -93, -93, -67 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -763,14 +769,14 @@ static const yytype_uint8 yytable[] = 19, 20, 21, 22, 23, 24, 25, 26, 3, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 4, 13, 141, 142, 50, 89, 51, 14, - 17, 5, 96, 92, 97, 98, 99, 100, 101, 157, - 102, 103, 6, 104, 105, 106, 146, 109, 112, 166, - 113, 123, 120, 124, 125, 126, 127, 128, 129, 137, - 138, 159, 130, 51, 133, 143, 139, 144, 145, 154, - 155, 148, 150, 152, 156, 164, 162, 165, 163, 158, - 161, 160, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 136 + 48, 49, 50, 4, 13, 146, 147, 51, 91, 52, + 14, 17, 5, 98, 94, 99, 100, 101, 102, 103, + 163, 104, 105, 6, 106, 107, 108, 151, 111, 114, + 173, 115, 125, 122, 126, 127, 128, 129, 130, 131, + 170, 165, 142, 132, 135, 138, 143, 52, 144, 148, + 149, 150, 159, 153, 155, 160, 157, 161, 162, 171, + 168, 169, 164, 167, 166, 172, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 141 }; static const yytype_int16 yycheck[] = @@ -778,37 +784,38 @@ static const yytype_int16 yycheck[] = 4, 5, 6, 7, 8, 9, 10, 11, 0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 3, 41, 37, 38, 40, 44, 42, 41, - 45, 12, 41, 44, 41, 41, 41, 41, 41, 137, - 41, 41, 23, 39, 39, 43, 45, 44, 41, 38, - 44, 41, 44, 41, 41, 41, 41, 41, 41, 36, - 36, 39, 44, 42, 44, 36, 41, 36, 36, 36, - 36, 45, 45, 45, 36, 155, 145, 156, 154, 138, - 144, 143, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 87 + 34, 35, 36, 3, 42, 38, 39, 41, 45, 43, + 42, 46, 12, 42, 45, 42, 42, 42, 42, 42, + 142, 42, 42, 23, 40, 40, 44, 46, 45, 42, + 39, 45, 42, 45, 42, 42, 42, 42, 42, 42, + 160, 40, 37, 45, 45, 42, 37, 43, 42, 37, + 37, 37, 37, 46, 46, 37, 46, 37, 37, 161, + 150, 159, 143, 149, 148, 162, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 88 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 47, 48, 0, 3, 12, 23, 49, 51, 52, - 53, 56, 58, 41, 41, 59, 54, 45, 60, 4, + 0, 48, 49, 0, 3, 12, 23, 50, 52, 53, + 54, 57, 59, 42, 42, 60, 55, 46, 61, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 40, 42, 50, 55, 57, 61, 64, 67, 70, 73, - 74, 75, 76, 77, 78, 81, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 95, 100, 103, 106, 109, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 44, - 79, 80, 44, 104, 105, 82, 41, 41, 41, 41, - 41, 41, 41, 41, 39, 39, 43, 110, 111, 44, - 107, 108, 41, 44, 98, 99, 71, 62, 65, 68, - 44, 101, 102, 41, 41, 41, 41, 41, 41, 41, - 44, 93, 94, 44, 96, 97, 120, 36, 36, 41, - 83, 37, 38, 36, 36, 36, 45, 72, 45, 63, - 45, 66, 45, 69, 36, 36, 36, 80, 104, 39, - 110, 108, 99, 102, 94, 97, 38 + 36, 41, 43, 51, 56, 58, 62, 65, 68, 71, + 74, 75, 76, 77, 78, 79, 82, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 96, 101, 104, 107, + 110, 113, 114, 115, 116, 117, 118, 119, 120, 121, + 122, 45, 80, 81, 45, 105, 106, 83, 42, 42, + 42, 42, 42, 42, 42, 42, 40, 40, 44, 111, + 112, 45, 108, 109, 42, 45, 99, 100, 72, 63, + 66, 69, 45, 102, 103, 42, 42, 42, 42, 42, + 42, 42, 45, 94, 95, 45, 97, 98, 42, 123, + 124, 121, 37, 37, 42, 84, 38, 39, 37, 37, + 37, 46, 73, 46, 64, 46, 67, 46, 70, 37, + 37, 37, 37, 81, 105, 40, 111, 109, 100, 103, + 95, 98, 124, 39 }; #define yyerrok (yyerrstatus = 0) @@ -882,7 +889,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -1743,18 +1750,13 @@ yyreduce: } break; - case 48: -#line 182 "levcomp.ypp" - {} - break; - case 49: -#line 185 "levcomp.ypp" - { } +#line 183 "levcomp.ypp" + {} break; case 50: -#line 187 "levcomp.ypp" +#line 186 "levcomp.ypp" { } break; @@ -1764,19 +1766,19 @@ yyreduce: break; case 52: -#line 192 "levcomp.ypp" - { - lc_global_prelude.add(yylineno, (yyvsp[(1) - (1)].text)); - } +#line 189 "levcomp.ypp" + { } break; case 53: -#line 196 "levcomp.ypp" - { } +#line 193 "levcomp.ypp" + { + lc_global_prelude.add(yylineno, (yyvsp[(1) - (1)].text)); + } break; case 54: -#line 198 "levcomp.ypp" +#line 197 "levcomp.ypp" { } break; @@ -1786,19 +1788,19 @@ yyreduce: break; case 56: -#line 203 "levcomp.ypp" - { - lc_map.main.add(yylineno, (yyvsp[(1) - (1)].text)); - } +#line 200 "levcomp.ypp" + { } break; case 57: -#line 207 "levcomp.ypp" - { } +#line 204 "levcomp.ypp" + { + lc_map.main.add(yylineno, (yyvsp[(1) - (1)].text)); + } break; case 58: -#line 209 "levcomp.ypp" +#line 208 "levcomp.ypp" { } break; @@ -1808,19 +1810,19 @@ yyreduce: break; case 60: -#line 214 "levcomp.ypp" - { - lc_map.validate.add(yylineno, (yyvsp[(1) - (1)].text)); - } +#line 211 "levcomp.ypp" + { } break; case 61: -#line 218 "levcomp.ypp" - { } +#line 215 "levcomp.ypp" + { + lc_map.validate.add(yylineno, (yyvsp[(1) - (1)].text)); + } break; case 62: -#line 220 "levcomp.ypp" +#line 219 "levcomp.ypp" { } break; @@ -1830,19 +1832,19 @@ yyreduce: break; case 64: -#line 225 "levcomp.ypp" - { - lc_map.veto.add(yylineno, (yyvsp[(1) - (1)].text)); - } +#line 222 "levcomp.ypp" + { } break; case 65: -#line 229 "levcomp.ypp" - { } +#line 226 "levcomp.ypp" + { + lc_map.veto.add(yylineno, (yyvsp[(1) - (1)].text)); + } break; case 66: -#line 231 "levcomp.ypp" +#line 230 "levcomp.ypp" { } break; @@ -1852,19 +1854,24 @@ yyreduce: break; case 68: -#line 236 "levcomp.ypp" +#line 233 "levcomp.ypp" + { } + break; + + case 69: +#line 237 "levcomp.ypp" { lc_map.prelude.add(yylineno, (yyvsp[(1) - (1)].text)); } break; - case 69: -#line 240 "levcomp.ypp" + case 70: +#line 241 "levcomp.ypp" { } break; - case 70: -#line 242 "levcomp.ypp" + case 71: +#line 243 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1873,13 +1880,13 @@ yyreduce: } break; - case 71: -#line 249 "levcomp.ypp" + case 72: +#line 250 "levcomp.ypp" { } break; - case 72: -#line 251 "levcomp.ypp" + case 73: +#line 252 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1888,13 +1895,13 @@ yyreduce: } break; - case 73: -#line 258 "levcomp.ypp" + case 74: +#line 259 "levcomp.ypp" { } break; - case 74: -#line 260 "levcomp.ypp" + case 75: +#line 261 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1903,13 +1910,13 @@ yyreduce: } break; - case 75: -#line 267 "levcomp.ypp" + case 76: +#line 268 "levcomp.ypp" { } break; - case 76: -#line 269 "levcomp.ypp" + case 77: +#line 270 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1918,13 +1925,13 @@ yyreduce: } break; - case 77: -#line 276 "levcomp.ypp" + case 78: +#line 277 "levcomp.ypp" { } break; - case 78: -#line 278 "levcomp.ypp" + case 79: +#line 279 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1933,13 +1940,13 @@ yyreduce: } break; - case 79: -#line 285 "levcomp.ypp" + case 80: +#line 286 "levcomp.ypp" {} break; - case 82: -#line 293 "levcomp.ypp" + case 83: +#line 294 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1948,13 +1955,13 @@ yyreduce: } break; - case 83: -#line 300 "levcomp.ypp" + case 84: +#line 301 "levcomp.ypp" {} break; - case 86: -#line 308 "levcomp.ypp" + case 87: +#line 309 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1963,8 +1970,8 @@ yyreduce: } break; - case 87: -#line 317 "levcomp.ypp" + case 88: +#line 318 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1973,8 +1980,8 @@ yyreduce: } break; - case 88: -#line 326 "levcomp.ypp" + case 89: +#line 327 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1983,8 +1990,8 @@ yyreduce: } break; - case 89: -#line 335 "levcomp.ypp" + case 90: +#line 336 "levcomp.ypp" { std::string key, arg; int sep(0); @@ -2017,18 +2024,18 @@ yyreduce: } break; - case 90: -#line 367 "levcomp.ypp" + case 91: +#line 368 "levcomp.ypp" { } break; - case 91: -#line 370 "levcomp.ypp" + case 92: +#line 371 "levcomp.ypp" { } break; - case 92: -#line 372 "levcomp.ypp" + case 93: +#line 373 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2037,13 +2044,13 @@ yyreduce: } break; - case 93: -#line 379 "levcomp.ypp" + case 94: +#line 380 "levcomp.ypp" { } break; - case 94: -#line 381 "levcomp.ypp" + case 95: +#line 382 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2052,13 +2059,13 @@ yyreduce: } break; - case 95: -#line 388 "levcomp.ypp" + case 96: +#line 389 "levcomp.ypp" { } break; - case 96: -#line 390 "levcomp.ypp" + case 97: +#line 391 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2067,13 +2074,13 @@ yyreduce: } break; - case 97: -#line 397 "levcomp.ypp" + case 98: +#line 398 "levcomp.ypp" { } break; - case 98: -#line 399 "levcomp.ypp" + case 99: +#line 400 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2082,8 +2089,8 @@ yyreduce: } break; - case 102: -#line 415 "levcomp.ypp" + case 103: +#line 416 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2092,8 +2099,8 @@ yyreduce: } break; - case 106: -#line 431 "levcomp.ypp" + case 107: +#line 432 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2102,18 +2109,18 @@ yyreduce: } break; - case 107: -#line 439 "levcomp.ypp" - { } - break; - case 108: #line 440 "levcomp.ypp" { } break; case 109: -#line 444 "levcomp.ypp" +#line 441 "levcomp.ypp" + { } + break; + + case 110: +#line 445 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2122,13 +2129,8 @@ yyreduce: } break; - case 110: -#line 452 "levcomp.ypp" - { } - break; - case 111: -#line 455 "levcomp.ypp" +#line 453 "levcomp.ypp" { } break; @@ -2138,7 +2140,12 @@ yyreduce: break; case 113: -#line 460 "levcomp.ypp" +#line 457 "levcomp.ypp" + { } + break; + + case 114: +#line 461 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2147,13 +2154,13 @@ yyreduce: } break; - case 114: -#line 468 "levcomp.ypp" + case 115: +#line 469 "levcomp.ypp" { } break; - case 117: -#line 476 "levcomp.ypp" + case 118: +#line 477 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2162,18 +2169,18 @@ yyreduce: } break; - case 118: -#line 484 "levcomp.ypp" + case 119: +#line 485 "levcomp.ypp" {} break; - case 119: -#line 485 "levcomp.ypp" + case 120: +#line 486 "levcomp.ypp" {} break; - case 122: -#line 493 "levcomp.ypp" + case 123: +#line 494 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2182,18 +2189,18 @@ yyreduce: } break; - case 123: -#line 500 "levcomp.ypp" + case 124: +#line 501 "levcomp.ypp" {} break; - case 124: -#line 501 "levcomp.ypp" + case 125: +#line 502 "levcomp.ypp" {} break; - case 127: -#line 509 "levcomp.ypp" + case 128: +#line 510 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2202,8 +2209,8 @@ yyreduce: } break; - case 128: -#line 518 "levcomp.ypp" + case 129: +#line 519 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2212,13 +2219,13 @@ yyreduce: } break; - case 129: -#line 526 "levcomp.ypp" + case 130: +#line 527 "levcomp.ypp" {} break; - case 130: -#line 528 "levcomp.ypp" + case 131: +#line 529 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2227,8 +2234,8 @@ yyreduce: } break; - case 131: -#line 537 "levcomp.ypp" + case 132: +#line 538 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2236,8 +2243,8 @@ yyreduce: } break; - case 132: -#line 544 "levcomp.ypp" + case 133: +#line 545 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2245,8 +2252,8 @@ yyreduce: } break; - case 133: -#line 551 "levcomp.ypp" + case 134: +#line 552 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2254,8 +2261,8 @@ yyreduce: } break; - case 134: -#line 558 "levcomp.ypp" + case 135: +#line 559 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2263,8 +2270,8 @@ yyreduce: } break; - case 135: -#line 566 "levcomp.ypp" + case 136: +#line 567 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2272,13 +2279,13 @@ yyreduce: } break; - case 136: -#line 573 "levcomp.ypp" + case 137: +#line 574 "levcomp.ypp" {} break; - case 137: -#line 575 "levcomp.ypp" + case 138: +#line 576 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2287,8 +2294,8 @@ yyreduce: } break; - case 138: -#line 584 "levcomp.ypp" + case 139: +#line 585 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2297,8 +2304,8 @@ yyreduce: } break; - case 142: -#line 600 "levcomp.ypp" + case 143: +#line 601 "levcomp.ypp" { lc_map.mapchunk.add( yylineno, @@ -2307,9 +2314,19 @@ yyreduce: } break; + case 147: +#line 617 "levcomp.ypp" + { + lc_map.main.add( + yylineno, + make_stringf("subvault(\"%s\")", + quote_lua_string((yyvsp[(1) - (1)].text)).c_str())); + } + break; + /* Line 1267 of yacc.c. */ -#line 2313 "levcomp.tab.c" +#line 2330 "levcomp.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2523,6 +2540,6 @@ yyreturn: } -#line 608 "levcomp.ypp" +#line 625 "levcomp.ypp" |