diff options
Diffstat (limited to 'crawl-ref/source/prebuilt/levcomp.tab.cc')
-rw-r--r-- | crawl-ref/source/prebuilt/levcomp.tab.cc | 752 |
1 files changed, 388 insertions, 364 deletions
diff --git a/crawl-ref/source/prebuilt/levcomp.tab.cc b/crawl-ref/source/prebuilt/levcomp.tab.cc index 5c3e88f475..c725141f18 100644 --- a/crawl-ref/source/prebuilt/levcomp.tab.cc +++ b/crawl-ref/source/prebuilt/levcomp.tab.cc @@ -99,17 +99,18 @@ LROCKTILE = 288, FTILE = 289, RTILE = 290, - 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 + TILE = 291, + SUBVAULT = 292, + COMMA = 293, + COLON = 294, + PERC = 295, + INTEGER = 296, + CHARACTER = 297, + STRING = 298, + MAP_LINE = 299, + MONSTER_NAME = 300, + ITEM_INFO = 301, + LUA_LINE = 302 }; #endif /* Tokens. */ @@ -146,17 +147,18 @@ #define LROCKTILE 288 #define FTILE 289 #define RTILE 290 -#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 +#define TILE 291 +#define SUBVAULT 292 +#define COMMA 293 +#define COLON 294 +#define PERC 295 +#define INTEGER 296 +#define CHARACTER 297 +#define STRING 298 +#define MAP_LINE 299 +#define MONSTER_NAME 300 +#define ITEM_INFO 301 +#define LUA_LINE 302 @@ -232,8 +234,8 @@ typedef union YYSTYPE const char *text; raw_range range; } -/* Line 193 of yacc.c. */ -#line 237 "levcomp.tab.c" +/* Line 187 of yacc.c. */ +#line 239 "levcomp.tab.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -246,7 +248,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 250 "levcomp.tab.c" +#line 252 "levcomp.tab.c" #ifdef short # undef short @@ -296,7 +298,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if defined YYENABLE_NLS && YYENABLE_NLS +# if YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -461,20 +463,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 107 +#define YYLAST 109 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 47 +#define YYNTOKENS 48 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 78 +#define YYNNTS 81 /* YYNRULES -- Number of rules. */ -#define YYNRULES 147 +#define YYNRULES 152 /* YYNRULES -- Number of states. */ -#define YYNSTATES 174 +#define YYNSTATES 181 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 301 +#define YYMAXUTOK 302 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -512,7 +514,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, 46 + 45, 46, 47 }; #if YYDEBUG @@ -525,57 +527,60 @@ 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, - 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 + 102, 104, 107, 108, 111, 113, 116, 117, 120, 122, + 125, 126, 129, 131, 134, 135, 138, 140, 143, 144, + 147, 149, 151, 154, 156, 159, 161, 164, 166, 169, + 171, 174, 177, 179, 183, 185, 188, 189, 192, 194, + 197, 200, 203, 206, 208, 211, 213, 216, 218, 221, + 223, 226, 229, 231, 235, 237, 240, 242, 246, 248, + 251, 253, 257, 259, 261, 265, 267, 270, 272, 276, + 278, 281, 283, 287, 289, 291, 294, 298, 300, 302, + 304, 307, 311, 313, 315, 318, 320, 323, 329, 334, + 338, 341, 344, 346, 349, 352, 354, 357, 359, 361, + 364, 366, 370 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = +static const yytype_int16 yyrhs[] = { - 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 + 49, 0, -1, 50, -1, -1, 50, 51, -1, 53, + -1, 55, -1, 42, -1, 54, -1, 60, -1, 3, + 43, -1, 58, 56, -1, -1, 56, 57, -1, 59, + -1, 123, -1, 12, 43, -1, 117, -1, 118, -1, + 119, -1, 120, -1, 121, -1, 122, -1, 114, -1, + 111, -1, 88, -1, 108, -1, 105, -1, 89, -1, + 90, -1, 91, -1, 92, -1, 93, -1, 94, -1, + 97, -1, 100, -1, 80, -1, 83, -1, 86, -1, + 87, -1, 75, -1, 77, -1, 76, -1, 78, -1, + 79, -1, 126, -1, 63, -1, 72, -1, 66, -1, + 69, -1, 52, -1, 23, 61, -1, -1, 61, 62, + -1, 47, -1, 23, 64, -1, -1, 64, 65, -1, + 47, -1, 24, 67, -1, -1, 67, 68, -1, 47, + -1, 25, 70, -1, -1, 70, 71, -1, 47, -1, + 22, 73, -1, -1, 73, 74, -1, 47, -1, 7, + -1, 7, 43, -1, 9, -1, 9, 43, -1, 8, + -1, 8, 43, -1, 10, -1, 10, 43, -1, 11, + -1, 11, 43, -1, 4, 81, -1, 82, -1, 81, + 38, 82, -1, 46, -1, 6, 84, -1, -1, 84, + 85, -1, 43, -1, 28, 43, -1, 29, 43, -1, + 20, 43, -1, 21, 103, -1, 30, -1, 30, 43, + -1, 31, -1, 31, 43, -1, 32, -1, 32, 43, + -1, 33, -1, 33, 43, -1, 34, 95, -1, 96, + -1, 95, 38, 96, -1, 46, -1, 35, 98, -1, + 99, -1, 98, 38, 99, -1, 46, -1, 36, 101, + -1, 102, -1, 101, 38, 102, -1, 46, -1, 104, + -1, 103, 38, 104, -1, 46, -1, 26, 106, -1, + 107, -1, 106, 38, 107, -1, 46, -1, 5, 109, + -1, 110, -1, 110, 38, 109, -1, 46, -1, 19, + -1, 19, 112, -1, 112, 38, 113, -1, 113, -1, + 46, -1, 18, -1, 18, 115, -1, 116, 38, 115, + -1, 116, -1, 45, -1, 15, 43, -1, 13, -1, + 13, 43, -1, 16, 41, 39, 41, 40, -1, 16, + 41, 39, 41, -1, 16, 41, 40, -1, 16, 41, + -1, 17, 41, -1, 14, -1, 14, 43, -1, 27, + 43, -1, 124, -1, 124, 125, -1, 125, -1, 44, + -1, 37, 127, -1, 128, -1, 127, 38, 128, -1, + 43, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -586,16 +591,17 @@ static const yytype_uint16 yyrline[] = 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, 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 + 184, 187, 189, 190, 193, 198, 200, 201, 204, 209, + 211, 212, 215, 220, 222, 223, 226, 231, 233, 234, + 237, 242, 243, 251, 252, 260, 261, 269, 270, 278, + 279, 287, 290, 291, 294, 302, 305, 306, 309, 318, + 327, 336, 369, 372, 373, 381, 382, 390, 391, 399, + 400, 409, 412, 413, 416, 425, 428, 429, 432, 441, + 444, 445, 448, 458, 459, 462, 471, 474, 475, 478, + 487, 490, 491, 494, 503, 504, 507, 508, 511, 519, + 520, 523, 524, 527, 536, 545, 546, 555, 562, 569, + 576, 584, 592, 593, 602, 611, 614, 615, 618, 627, + 630, 631, 634 }; #endif @@ -609,19 +615,20 @@ 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", "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", - "shuffle_spec", "tags", "tagstrings", "tagstring", "lflags", "bflags", - "marker", "colour", "lfloorcol", "lrockcol", "lfloortile", "lrocktile", - "ftile", "ftile_specifiers", "ftile_specifier", "rtile", - "rtile_specifiers", "rtile_specifier", "colour_specifiers", + "FTILE", "RTILE", "TILE", "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", "shuffle_spec", "tags", "tagstrings", "tagstring", + "lflags", "bflags", "marker", "colour", "lfloorcol", "lrockcol", + "lfloortile", "lrocktile", "ftile", "ftile_specifiers", + "ftile_specifier", "rtile", "rtile_specifiers", "rtile_specifier", + "tile", "tile_specifiers", "tile_specifier", "colour_specifiers", "colour_specifier", "nsubst", "nsubst_specifiers", "nsubst_spec", "subst", "subst_specifiers", "subst_spec", "items", "item_specifiers", "item_specifier", "mons", "mnames", "mname", "place", "depth", "chance", @@ -639,28 +646,29 @@ 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, 301 + 295, 296, 297, 298, 299, 300, 301, 302 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 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 + 0, 48, 49, 50, 50, 51, 51, 52, 53, 53, + 54, 55, 56, 56, 57, 57, 58, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 60, 61, 61, 62, 63, 64, 64, 65, 66, + 67, 67, 68, 69, 70, 70, 71, 72, 73, 73, + 74, 75, 75, 76, 76, 77, 77, 78, 78, 79, + 79, 80, 81, 81, 82, 83, 84, 84, 85, 86, + 87, 88, 89, 90, 90, 91, 91, 92, 92, 93, + 93, 94, 95, 95, 96, 97, 98, 98, 99, 100, + 101, 101, 102, 103, 103, 104, 105, 106, 106, 107, + 108, 109, 109, 110, 111, 111, 112, 112, 113, 114, + 114, 115, 115, 116, 117, 118, 118, 119, 119, 119, + 119, 120, 121, 121, 122, 123, 124, 124, 125, 126, + 127, 127, 128 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -671,16 +679,17 @@ static const yytype_uint8 yyr2[] = 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, 2, 1, 3, 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, 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 @@ -688,75 +697,79 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 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 + 3, 0, 2, 1, 0, 0, 52, 4, 5, 8, + 6, 12, 9, 10, 16, 51, 11, 54, 53, 0, + 0, 86, 71, 75, 73, 77, 79, 135, 142, 0, + 0, 0, 129, 124, 0, 0, 68, 56, 60, 64, + 0, 0, 0, 0, 93, 95, 97, 99, 0, 0, + 0, 0, 7, 148, 50, 13, 14, 46, 48, 49, + 47, 40, 42, 41, 43, 44, 36, 37, 38, 39, + 25, 28, 29, 30, 31, 32, 33, 34, 35, 27, + 26, 24, 23, 17, 18, 19, 20, 21, 22, 15, + 145, 147, 45, 84, 81, 82, 123, 120, 121, 85, + 72, 76, 74, 78, 80, 136, 143, 134, 140, 141, + 133, 130, 132, 128, 125, 127, 91, 115, 92, 113, + 67, 55, 59, 63, 119, 116, 117, 144, 89, 90, + 94, 96, 98, 100, 104, 101, 102, 108, 105, 106, + 112, 109, 110, 152, 149, 150, 146, 0, 0, 88, + 87, 0, 139, 0, 0, 0, 70, 69, 58, 57, + 62, 61, 66, 65, 0, 0, 0, 0, 0, 83, + 122, 138, 131, 126, 114, 118, 103, 107, 111, 151, + 137 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -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 + -1, 1, 2, 7, 54, 8, 9, 10, 16, 55, + 11, 56, 12, 15, 18, 57, 121, 159, 58, 122, + 161, 59, 123, 163, 60, 120, 157, 61, 62, 63, + 64, 65, 66, 94, 95, 67, 99, 150, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 135, 136, 77, + 138, 139, 78, 141, 142, 118, 119, 79, 125, 126, + 80, 97, 98, 81, 114, 115, 82, 111, 112, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 144, + 145 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -93 +#define YYPACT_NINF -97 static const yytype_int8 yypact[] = { - -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, + -97, 8, 31, -97, -8, -2, -97, -97, -97, -97, + -97, -97, -97, -97, -97, -5, -4, -97, -97, -7, + -1, -97, 1, 3, 4, 5, 6, 7, 9, 10, + 14, 15, 12, 13, 17, 16, -97, -97, -97, -97, 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 + 30, 34, -97, -97, -97, -97, -97, -97, -97, -97, + -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, + -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, + -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, + 35, -97, -97, -97, 33, -97, -97, -97, 40, 37, + -97, -97, -97, -97, -97, -97, -97, -97, -3, -97, + -97, -97, 43, -97, 44, -97, -97, -97, 45, -97, + 11, 38, 39, 41, -97, 46, -97, -97, -97, -97, + -97, -97, -97, -97, -97, 49, -97, -97, 51, -97, + -97, 52, -97, -97, 53, -97, -97, -7, -1, -97, + -97, 32, -97, 12, 13, 16, -97, -97, -97, -97, + -97, -97, -97, -97, 18, 28, 29, 30, 34, -97, + -97, 21, -97, -97, -97, -97, -97, -97, -97, -97, + -97 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -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 + -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, + -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, + -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, + -97, -97, -97, -97, -96, -97, -97, -97, -97, -97, + -97, -97, -97, -97, -97, -97, -97, -97, -93, -97, + -97, -74, -97, -97, -73, -97, -62, -97, -97, -69, + -97, -52, -97, -97, -97, -57, -97, -55, -97, -97, + -97, -97, -97, -97, -97, -97, -97, 19, -97, -97, + -68 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -769,14 +782,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, 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 + 48, 49, 50, 51, 4, 13, 151, 152, 52, 93, + 53, 14, 17, 5, 100, 96, 101, 102, 103, 104, + 105, 169, 106, 107, 6, 108, 109, 110, 156, 113, + 116, 180, 117, 127, 124, 128, 129, 130, 131, 132, + 133, 147, 176, 171, 134, 137, 140, 143, 148, 53, + 149, 153, 154, 155, 164, 158, 160, 165, 162, 166, + 167, 168, 177, 174, 178, 175, 170, 173, 172, 0, + 179, 0, 0, 0, 0, 0, 0, 0, 0, 146 }; static const yytype_int16 yycheck[] = @@ -784,38 +797,39 @@ 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, 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 + 34, 35, 36, 37, 3, 43, 39, 40, 42, 46, + 44, 43, 47, 12, 43, 46, 43, 43, 43, 43, + 43, 147, 43, 43, 23, 41, 41, 45, 47, 46, + 43, 40, 46, 43, 46, 43, 43, 43, 43, 43, + 43, 38, 165, 41, 46, 46, 46, 43, 38, 44, + 43, 38, 38, 38, 38, 47, 47, 38, 47, 38, + 38, 38, 166, 155, 167, 164, 148, 154, 153, -1, + 168, -1, -1, -1, -1, -1, -1, -1, -1, 90 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 48, 49, 0, 3, 12, 23, 50, 52, 53, - 54, 57, 59, 42, 42, 60, 55, 46, 61, 4, + 0, 49, 50, 0, 3, 12, 23, 51, 53, 54, + 55, 58, 60, 43, 43, 61, 56, 47, 62, 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, - 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 + 36, 37, 42, 44, 52, 57, 59, 63, 66, 69, + 72, 75, 76, 77, 78, 79, 80, 83, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 97, 100, 105, + 108, 111, 114, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 46, 81, 82, 46, 109, 110, 84, + 43, 43, 43, 43, 43, 43, 43, 43, 41, 41, + 45, 115, 116, 46, 112, 113, 43, 46, 103, 104, + 73, 64, 67, 70, 46, 106, 107, 43, 43, 43, + 43, 43, 43, 43, 46, 95, 96, 46, 98, 99, + 46, 101, 102, 43, 127, 128, 125, 38, 38, 43, + 85, 39, 40, 38, 38, 38, 47, 74, 47, 65, + 47, 68, 47, 71, 38, 38, 38, 38, 38, 82, + 109, 41, 115, 113, 104, 107, 96, 99, 102, 128, + 40 }; #define yyerrok (yyerrstatus = 0) @@ -889,7 +903,7 @@ while (YYID (0)) we won't break user code: when these are the locations we know. */ #ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# if YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ (Loc).first_line, (Loc).first_column, \ @@ -1750,18 +1764,13 @@ yyreduce: } break; - case 49: -#line 183 "levcomp.ypp" - {} - break; - case 50: -#line 186 "levcomp.ypp" - { } +#line 184 "levcomp.ypp" + {} break; case 51: -#line 188 "levcomp.ypp" +#line 187 "levcomp.ypp" { } break; @@ -1771,19 +1780,19 @@ yyreduce: break; case 53: -#line 193 "levcomp.ypp" - { - lc_global_prelude.add(yylineno, (yyvsp[(1) - (1)].text)); - } +#line 190 "levcomp.ypp" + { } break; case 54: -#line 197 "levcomp.ypp" - { } +#line 194 "levcomp.ypp" + { + lc_global_prelude.add(yylineno, (yyvsp[(1) - (1)].text)); + } break; case 55: -#line 199 "levcomp.ypp" +#line 198 "levcomp.ypp" { } break; @@ -1793,19 +1802,19 @@ yyreduce: break; case 57: -#line 204 "levcomp.ypp" - { - lc_map.main.add(yylineno, (yyvsp[(1) - (1)].text)); - } +#line 201 "levcomp.ypp" + { } break; case 58: -#line 208 "levcomp.ypp" - { } +#line 205 "levcomp.ypp" + { + lc_map.main.add(yylineno, (yyvsp[(1) - (1)].text)); + } break; case 59: -#line 210 "levcomp.ypp" +#line 209 "levcomp.ypp" { } break; @@ -1815,19 +1824,19 @@ yyreduce: break; case 61: -#line 215 "levcomp.ypp" - { - lc_map.validate.add(yylineno, (yyvsp[(1) - (1)].text)); - } +#line 212 "levcomp.ypp" + { } break; case 62: -#line 219 "levcomp.ypp" - { } +#line 216 "levcomp.ypp" + { + lc_map.validate.add(yylineno, (yyvsp[(1) - (1)].text)); + } break; case 63: -#line 221 "levcomp.ypp" +#line 220 "levcomp.ypp" { } break; @@ -1837,19 +1846,19 @@ yyreduce: break; case 65: -#line 226 "levcomp.ypp" - { - lc_map.veto.add(yylineno, (yyvsp[(1) - (1)].text)); - } +#line 223 "levcomp.ypp" + { } break; case 66: -#line 230 "levcomp.ypp" - { } +#line 227 "levcomp.ypp" + { + lc_map.veto.add(yylineno, (yyvsp[(1) - (1)].text)); + } break; case 67: -#line 232 "levcomp.ypp" +#line 231 "levcomp.ypp" { } break; @@ -1859,19 +1868,24 @@ yyreduce: break; case 69: -#line 237 "levcomp.ypp" +#line 234 "levcomp.ypp" + { } + break; + + case 70: +#line 238 "levcomp.ypp" { lc_map.prelude.add(yylineno, (yyvsp[(1) - (1)].text)); } break; - case 70: -#line 241 "levcomp.ypp" + case 71: +#line 242 "levcomp.ypp" { } break; - case 71: -#line 243 "levcomp.ypp" + case 72: +#line 244 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1880,13 +1894,13 @@ yyreduce: } break; - case 72: -#line 250 "levcomp.ypp" + case 73: +#line 251 "levcomp.ypp" { } break; - case 73: -#line 252 "levcomp.ypp" + case 74: +#line 253 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1895,13 +1909,13 @@ yyreduce: } break; - case 74: -#line 259 "levcomp.ypp" + case 75: +#line 260 "levcomp.ypp" { } break; - case 75: -#line 261 "levcomp.ypp" + case 76: +#line 262 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1910,13 +1924,13 @@ yyreduce: } break; - case 76: -#line 268 "levcomp.ypp" + case 77: +#line 269 "levcomp.ypp" { } break; - case 77: -#line 270 "levcomp.ypp" + case 78: +#line 271 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1925,13 +1939,13 @@ yyreduce: } break; - case 78: -#line 277 "levcomp.ypp" + case 79: +#line 278 "levcomp.ypp" { } break; - case 79: -#line 279 "levcomp.ypp" + case 80: +#line 280 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1940,13 +1954,13 @@ yyreduce: } break; - case 80: -#line 286 "levcomp.ypp" + case 81: +#line 287 "levcomp.ypp" {} break; - case 83: -#line 294 "levcomp.ypp" + case 84: +#line 295 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1955,13 +1969,13 @@ yyreduce: } break; - case 84: -#line 301 "levcomp.ypp" + case 85: +#line 302 "levcomp.ypp" {} break; - case 87: -#line 309 "levcomp.ypp" + case 88: +#line 310 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1970,8 +1984,8 @@ yyreduce: } break; - case 88: -#line 318 "levcomp.ypp" + case 89: +#line 319 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1980,8 +1994,8 @@ yyreduce: } break; - case 89: -#line 327 "levcomp.ypp" + case 90: +#line 328 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1990,8 +2004,8 @@ yyreduce: } break; - case 90: -#line 336 "levcomp.ypp" + case 91: +#line 337 "levcomp.ypp" { std::string key, arg; int sep(0); @@ -2024,18 +2038,18 @@ yyreduce: } break; - case 91: -#line 368 "levcomp.ypp" + case 92: +#line 369 "levcomp.ypp" { } break; - case 92: -#line 371 "levcomp.ypp" + case 93: +#line 372 "levcomp.ypp" { } break; - case 93: -#line 373 "levcomp.ypp" + case 94: +#line 374 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2044,13 +2058,13 @@ yyreduce: } break; - case 94: -#line 380 "levcomp.ypp" + case 95: +#line 381 "levcomp.ypp" { } break; - case 95: -#line 382 "levcomp.ypp" + case 96: +#line 383 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2059,13 +2073,13 @@ yyreduce: } break; - case 96: -#line 389 "levcomp.ypp" + case 97: +#line 390 "levcomp.ypp" { } break; - case 97: -#line 391 "levcomp.ypp" + case 98: +#line 392 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2074,13 +2088,13 @@ yyreduce: } break; - case 98: -#line 398 "levcomp.ypp" + case 99: +#line 399 "levcomp.ypp" { } break; - case 99: -#line 400 "levcomp.ypp" + case 100: +#line 401 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2089,8 +2103,8 @@ yyreduce: } break; - case 103: -#line 416 "levcomp.ypp" + case 104: +#line 417 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2099,8 +2113,8 @@ yyreduce: } break; - case 107: -#line 432 "levcomp.ypp" + case 108: +#line 433 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2109,18 +2123,28 @@ yyreduce: } break; - case 108: -#line 440 "levcomp.ypp" + case 112: +#line 449 "levcomp.ypp" + { + lc_map.main.add( + yylineno, + make_stringf("tile(\"%s\")", + quote_lua_string((yyvsp[(1) - (1)].text)).c_str())); + } + break; + + case 113: +#line 458 "levcomp.ypp" { } break; - case 109: -#line 441 "levcomp.ypp" + case 114: +#line 459 "levcomp.ypp" { } break; - case 110: -#line 445 "levcomp.ypp" + case 115: +#line 463 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2129,23 +2153,23 @@ yyreduce: } break; - case 111: -#line 453 "levcomp.ypp" + case 116: +#line 471 "levcomp.ypp" { } break; - case 112: -#line 456 "levcomp.ypp" + case 117: +#line 474 "levcomp.ypp" { } break; - case 113: -#line 457 "levcomp.ypp" + case 118: +#line 475 "levcomp.ypp" { } break; - case 114: -#line 461 "levcomp.ypp" + case 119: +#line 479 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2154,13 +2178,13 @@ yyreduce: } break; - case 115: -#line 469 "levcomp.ypp" + case 120: +#line 487 "levcomp.ypp" { } break; - case 118: -#line 477 "levcomp.ypp" + case 123: +#line 495 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2169,18 +2193,18 @@ yyreduce: } break; - case 119: -#line 485 "levcomp.ypp" + case 124: +#line 503 "levcomp.ypp" {} break; - case 120: -#line 486 "levcomp.ypp" + case 125: +#line 504 "levcomp.ypp" {} break; - case 123: -#line 494 "levcomp.ypp" + case 128: +#line 512 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2189,18 +2213,18 @@ yyreduce: } break; - case 124: -#line 501 "levcomp.ypp" + case 129: +#line 519 "levcomp.ypp" {} break; - case 125: -#line 502 "levcomp.ypp" + case 130: +#line 520 "levcomp.ypp" {} break; - case 128: -#line 510 "levcomp.ypp" + case 133: +#line 528 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2209,8 +2233,8 @@ yyreduce: } break; - case 129: -#line 519 "levcomp.ypp" + case 134: +#line 537 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2219,13 +2243,13 @@ yyreduce: } break; - case 130: -#line 527 "levcomp.ypp" + case 135: +#line 545 "levcomp.ypp" {} break; - case 131: -#line 529 "levcomp.ypp" + case 136: +#line 547 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2234,8 +2258,8 @@ yyreduce: } break; - case 132: -#line 538 "levcomp.ypp" + case 137: +#line 556 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2243,8 +2267,8 @@ yyreduce: } break; - case 133: -#line 545 "levcomp.ypp" + case 138: +#line 563 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2252,8 +2276,8 @@ yyreduce: } break; - case 134: -#line 552 "levcomp.ypp" + case 139: +#line 570 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2261,8 +2285,8 @@ yyreduce: } break; - case 135: -#line 559 "levcomp.ypp" + case 140: +#line 577 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2270,8 +2294,8 @@ yyreduce: } break; - case 136: -#line 567 "levcomp.ypp" + case 141: +#line 585 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2279,13 +2303,13 @@ yyreduce: } break; - case 137: -#line 574 "levcomp.ypp" + case 142: +#line 592 "levcomp.ypp" {} break; - case 138: -#line 576 "levcomp.ypp" + case 143: +#line 594 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2294,8 +2318,8 @@ yyreduce: } break; - case 139: -#line 585 "levcomp.ypp" + case 144: +#line 603 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2304,8 +2328,8 @@ yyreduce: } break; - case 143: -#line 601 "levcomp.ypp" + case 148: +#line 619 "levcomp.ypp" { lc_map.mapchunk.add( yylineno, @@ -2314,8 +2338,8 @@ yyreduce: } break; - case 147: -#line 617 "levcomp.ypp" + case 152: +#line 635 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2326,7 +2350,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2330 "levcomp.tab.c" +#line 2354 "levcomp.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2540,6 +2564,6 @@ yyreturn: } -#line 625 "levcomp.ypp" +#line 643 "levcomp.ypp" |