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, 379 insertions, 340 deletions
diff --git a/crawl-ref/source/prebuilt/levcomp.tab.cc b/crawl-ref/source/prebuilt/levcomp.tab.cc index 2cd8cb7ea1..2dab681405 100644 --- a/crawl-ref/source/prebuilt/levcomp.tab.cc +++ b/crawl-ref/source/prebuilt/levcomp.tab.cc @@ -92,20 +92,22 @@ WELCOME = 281, LFLAGS = 282, BFLAGS = 283, - FLOORCOL = 284, - ROCKCOL = 285, - FLOORTILE = 286, - ROCKTILE = 287, - COMMA = 288, - COLON = 289, - PERC = 290, - INTEGER = 291, - CHARACTER = 292, - STRING = 293, - MAP_LINE = 294, - MONSTER_NAME = 295, - ITEM_INFO = 296, - LUA_LINE = 297 + LFLOORCOL = 284, + LROCKCOL = 285, + LFLOORTILE = 286, + LROCKTILE = 287, + FTILE = 288, + RTILE = 289, + COMMA = 290, + COLON = 291, + PERC = 292, + INTEGER = 293, + CHARACTER = 294, + STRING = 295, + MAP_LINE = 296, + MONSTER_NAME = 297, + ITEM_INFO = 298, + LUA_LINE = 299 }; #endif /* Tokens. */ @@ -135,20 +137,22 @@ #define WELCOME 281 #define LFLAGS 282 #define BFLAGS 283 -#define FLOORCOL 284 -#define ROCKCOL 285 -#define FLOORTILE 286 -#define ROCKTILE 287 -#define COMMA 288 -#define COLON 289 -#define PERC 290 -#define INTEGER 291 -#define CHARACTER 292 -#define STRING 293 -#define MAP_LINE 294 -#define MONSTER_NAME 295 -#define ITEM_INFO 296 -#define LUA_LINE 297 +#define LFLOORCOL 284 +#define LROCKCOL 285 +#define LFLOORTILE 286 +#define LROCKTILE 287 +#define FTILE 288 +#define RTILE 289 +#define COMMA 290 +#define COLON 291 +#define PERC 292 +#define INTEGER 293 +#define CHARACTER 294 +#define STRING 295 +#define MAP_LINE 296 +#define MONSTER_NAME 297 +#define ITEM_INFO 298 +#define LUA_LINE 299 @@ -226,7 +230,7 @@ typedef union YYSTYPE raw_range range; } /* Line 193 of yacc.c. */ -#line 230 "levcomp.tab.c" +#line 234 "levcomp.tab.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -239,7 +243,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 243 "levcomp.tab.c" +#line 247 "levcomp.tab.c" #ifdef short # undef short @@ -454,20 +458,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 91 +#define YYLAST 95 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 43 +#define YYNTOKENS 45 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 68 +#define YYNNTS 74 /* YYNRULES -- Number of rules. */ -#define YYNRULES 129 +#define YYNRULES 139 /* YYNRULES -- Number of states. */ -#define YYNSTATES 150 +#define YYNSTATES 164 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 297 +#define YYMAXUTOK 299 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -504,7 +508,7 @@ static const yytype_uint8 yytranslate[] = 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 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 + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 }; #if YYDEBUG @@ -516,52 +520,55 @@ static const yytype_uint16 yyprhs[] = 19, 22, 25, 26, 29, 31, 33, 36, 38, 40, 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, 97, 98, 101, - 103, 106, 107, 110, 112, 115, 116, 119, 121, 124, - 125, 128, 130, 133, 134, 137, 139, 141, 144, 146, - 149, 151, 154, 156, 159, 162, 164, 168, 170, 173, - 174, 177, 179, 182, 185, 188, 191, 193, 196, 198, - 201, 203, 206, 208, 211, 213, 217, 219, 222, 224, - 228, 230, 233, 235, 239, 241, 243, 246, 250, 252, - 254, 256, 259, 263, 265, 267, 270, 272, 275, 281, - 286, 290, 293, 296, 298, 301, 304, 306, 309, 311 + 82, 84, 86, 88, 90, 92, 94, 96, 98, 101, + 102, 105, 107, 110, 111, 114, 116, 119, 120, 123, + 125, 128, 129, 132, 134, 137, 138, 141, 143, 145, + 148, 150, 153, 155, 158, 160, 163, 166, 168, 172, + 174, 177, 178, 181, 183, 186, 189, 192, 195, 197, + 200, 202, 205, 207, 210, 212, 215, 218, 220, 224, + 226, 229, 231, 235, 237, 239, 243, 245, 248, 250, + 254, 256, 259, 261, 265, 267, 269, 272, 276, 278, + 280, 282, 285, 289, 291, 293, 296, 298, 301, 307, + 312, 316, 319, 322, 324, 327, 330, 332, 335, 337 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 44, 0, -1, 45, -1, -1, 45, 46, -1, 48, - -1, 50, -1, 37, -1, 49, -1, 55, -1, 3, - 38, -1, 53, 51, -1, -1, 51, 52, -1, 54, - -1, 108, -1, 11, 38, -1, 102, -1, 103, -1, - 104, -1, 105, -1, 106, -1, 107, -1, 99, -1, - 96, -1, 82, -1, 93, -1, 90, -1, 83, -1, - 84, -1, 85, -1, 86, -1, 87, -1, 74, -1, - 77, -1, 80, -1, 81, -1, 70, -1, 72, -1, - 71, -1, 73, -1, 58, -1, 67, -1, 61, -1, - 64, -1, 47, -1, 22, 56, -1, -1, 56, 57, - -1, 42, -1, 22, 59, -1, -1, 59, 60, -1, - 42, -1, 23, 62, -1, -1, 62, 63, -1, 42, - -1, 24, 65, -1, -1, 65, 66, -1, 42, -1, - 21, 68, -1, -1, 68, 69, -1, 42, -1, 7, - -1, 7, 38, -1, 9, -1, 9, 38, -1, 8, - -1, 8, 38, -1, 10, -1, 10, 38, -1, 4, - 75, -1, 76, -1, 75, 33, 76, -1, 41, -1, - 6, 78, -1, -1, 78, 79, -1, 38, -1, 27, - 38, -1, 28, 38, -1, 19, 38, -1, 20, 88, - -1, 29, -1, 29, 38, -1, 30, -1, 30, 38, - -1, 31, -1, 31, 38, -1, 32, -1, 32, 38, - -1, 89, -1, 88, 33, 89, -1, 41, -1, 25, - 91, -1, 92, -1, 91, 33, 92, -1, 41, -1, - 5, 94, -1, 95, -1, 95, 33, 94, -1, 41, - -1, 18, -1, 18, 97, -1, 97, 33, 98, -1, - 98, -1, 41, -1, 17, -1, 17, 100, -1, 101, - 33, 100, -1, 101, -1, 40, -1, 14, 38, -1, - 12, -1, 12, 38, -1, 15, 36, 34, 36, 35, - -1, 15, 36, 34, 36, -1, 15, 36, 35, -1, - 15, 36, -1, 16, 36, -1, 13, -1, 13, 38, - -1, 26, 38, -1, 109, -1, 109, 110, -1, 110, - -1, 39, -1 + 46, 0, -1, 47, -1, -1, 47, 48, -1, 50, + -1, 52, -1, 39, -1, 51, -1, 57, -1, 3, + 40, -1, 55, 53, -1, -1, 53, 54, -1, 56, + -1, 116, -1, 11, 40, -1, 110, -1, 111, -1, + 112, -1, 113, -1, 114, -1, 115, -1, 107, -1, + 104, -1, 84, -1, 101, -1, 98, -1, 85, -1, + 86, -1, 87, -1, 88, -1, 89, -1, 90, -1, + 93, -1, 76, -1, 79, -1, 82, -1, 83, -1, + 72, -1, 74, -1, 73, -1, 75, -1, 60, -1, + 69, -1, 63, -1, 66, -1, 49, -1, 22, 58, + -1, -1, 58, 59, -1, 44, -1, 22, 61, -1, + -1, 61, 62, -1, 44, -1, 23, 64, -1, -1, + 64, 65, -1, 44, -1, 24, 67, -1, -1, 67, + 68, -1, 44, -1, 21, 70, -1, -1, 70, 71, + -1, 44, -1, 7, -1, 7, 40, -1, 9, -1, + 9, 40, -1, 8, -1, 8, 40, -1, 10, -1, + 10, 40, -1, 4, 77, -1, 78, -1, 77, 35, + 78, -1, 43, -1, 6, 80, -1, -1, 80, 81, + -1, 40, -1, 27, 40, -1, 28, 40, -1, 19, + 40, -1, 20, 96, -1, 29, -1, 29, 40, -1, + 30, -1, 30, 40, -1, 31, -1, 31, 40, -1, + 32, -1, 32, 40, -1, 33, 91, -1, 92, -1, + 91, 35, 92, -1, 43, -1, 34, 94, -1, 95, + -1, 94, 35, 95, -1, 43, -1, 97, -1, 96, + 35, 97, -1, 43, -1, 25, 99, -1, 100, -1, + 99, 35, 100, -1, 43, -1, 5, 102, -1, 103, + -1, 103, 35, 102, -1, 43, -1, 18, -1, 18, + 105, -1, 105, 35, 106, -1, 106, -1, 43, -1, + 17, -1, 17, 108, -1, 109, 35, 108, -1, 109, + -1, 42, -1, 14, 40, -1, 12, -1, 12, 40, + -1, 15, 38, 36, 38, 37, -1, 15, 38, 36, + 38, -1, 15, 38, 37, -1, 15, 38, -1, 16, + 38, -1, 13, -1, 13, 40, -1, 26, 40, -1, + 117, -1, 117, 118, -1, 118, -1, 41, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -571,15 +578,16 @@ static const yytype_uint16 yyrline[] = 88, 98, 120, 121, 124, 125, 128, 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, 183, 185, 186, 189, - 194, 196, 197, 200, 205, 207, 208, 211, 216, 218, - 219, 222, 227, 229, 230, 233, 238, 239, 247, 248, - 256, 257, 265, 266, 274, 277, 278, 281, 289, 292, - 293, 296, 305, 314, 323, 356, 359, 360, 368, 369, - 377, 378, 386, 387, 395, 396, 399, 408, 411, 412, - 415, 424, 427, 428, 431, 440, 441, 444, 445, 448, - 456, 457, 460, 461, 464, 473, 482, 483, 492, 499, - 506, 513, 521, 529, 530, 539, 548, 551, 552, 555 + 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, 279, 280, 283, + 291, 294, 295, 298, 307, 316, 325, 358, 361, 362, + 370, 371, 379, 380, 388, 389, 398, 401, 402, 405, + 414, 417, 418, 421, 430, 431, 434, 443, 446, 447, + 450, 459, 462, 463, 466, 475, 476, 479, 480, 483, + 491, 492, 495, 496, 499, 508, 517, 518, 527, 534, + 541, 548, 556, 564, 565, 574, 583, 586, 587, 590 }; #endif @@ -592,9 +600,9 @@ static const char *const yytname[] = "TAGS", "KFEAT", "KITEM", "KMONS", "KMASK", "NAME", "DEPTH", "ORIENT", "PLACE", "CHANCE", "WEIGHT", "MONS", "ITEM", "MARKER", "COLOUR", "PRELUDE", "MAIN", "VALIDATE", "VETO", "NSUBST", "WELCOME", "LFLAGS", - "BFLAGS", "FLOORCOL", "ROCKCOL", "FLOORTILE", "ROCKTILE", "COMMA", - "COLON", "PERC", "INTEGER", "CHARACTER", "STRING", "MAP_LINE", - "MONSTER_NAME", "ITEM_INFO", "LUA_LINE", "$accept", "file", + "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", @@ -603,12 +611,13 @@ static const char *const yytname[] = "prelude_lua", "prelude_lua_lines", "prelude_lua_line", "kfeat", "kmons", "kitem", "kmask", "shuffle", "shuffle_specifiers", "shuffle_spec", "tags", "tagstrings", "tagstring", "lflags", "bflags", "marker", - "colour", "floorcol", "rockcol", "floortile", "rocktile", - "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", "weight", "orientation", "welcome", "map_def", - "map_lines", "map_line", 0 + "colour", "lfloorcol", "lrockcol", "lfloortile", "lrocktile", "ftile", + "ftile_specifiers", "ftile_specifier", "rtile", "rtile_specifiers", + "rtile_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", "weight", "orientation", + "welcome", "map_def", "map_lines", "map_line", 0 }; #endif @@ -621,26 +630,27 @@ 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 + 295, 296, 297, 298, 299 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 43, 44, 45, 45, 46, 46, 47, 48, 48, - 49, 50, 51, 51, 52, 52, 53, 54, 54, 54, - 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, - 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, - 54, 54, 54, 54, 54, 54, 55, 56, 56, 57, - 58, 59, 59, 60, 61, 62, 62, 63, 64, 65, - 65, 66, 67, 68, 68, 69, 70, 70, 71, 71, - 72, 72, 73, 73, 74, 75, 75, 76, 77, 78, - 78, 79, 80, 81, 82, 83, 84, 84, 85, 85, - 86, 86, 87, 87, 88, 88, 89, 90, 91, 91, - 92, 93, 94, 94, 95, 96, 96, 97, 97, 98, - 99, 99, 100, 100, 101, 102, 103, 103, 104, 104, - 104, 104, 105, 106, 106, 107, 108, 109, 109, 110 + 0, 45, 46, 47, 47, 48, 48, 49, 50, 50, + 51, 52, 53, 53, 54, 54, 55, 56, 56, 56, + 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, + 56, 56, 56, 56, 56, 56, 56, 56, 57, 58, + 58, 59, 60, 61, 61, 62, 63, 64, 64, 65, + 66, 67, 67, 68, 69, 70, 70, 71, 72, 72, + 73, 73, 74, 74, 75, 75, 76, 77, 77, 78, + 79, 80, 80, 81, 82, 83, 84, 85, 86, 86, + 87, 87, 88, 88, 89, 89, 90, 91, 91, 92, + 93, 94, 94, 95, 96, 96, 97, 98, 99, 99, + 100, 101, 102, 102, 103, 104, 104, 105, 105, 106, + 107, 107, 108, 108, 109, 110, 111, 111, 112, 112, + 112, 112, 113, 114, 114, 115, 116, 117, 117, 118 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -650,12 +660,13 @@ 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, 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, 2, 1, 3, 1, 2, 0, - 2, 1, 2, 2, 2, 2, 1, 2, 1, 2, - 1, 2, 1, 2, 1, 3, 1, 2, 1, 3, + 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, 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 @@ -666,67 +677,73 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 3, 0, 2, 1, 0, 0, 47, 4, 5, 8, - 6, 12, 9, 10, 16, 46, 11, 49, 48, 0, - 0, 79, 66, 70, 68, 72, 116, 123, 0, 0, - 0, 110, 105, 0, 0, 63, 51, 55, 59, 0, - 0, 0, 0, 86, 88, 90, 92, 7, 129, 45, - 13, 14, 41, 43, 44, 42, 37, 39, 38, 40, - 33, 34, 35, 36, 25, 28, 29, 30, 31, 32, - 27, 26, 24, 23, 17, 18, 19, 20, 21, 22, - 15, 126, 128, 77, 74, 75, 104, 101, 102, 78, - 67, 71, 69, 73, 117, 124, 115, 121, 122, 114, - 111, 113, 109, 106, 108, 84, 96, 85, 94, 62, - 50, 54, 58, 100, 97, 98, 125, 82, 83, 87, - 89, 91, 93, 127, 0, 0, 81, 80, 0, 120, - 0, 0, 0, 65, 64, 53, 52, 57, 56, 61, - 60, 0, 76, 103, 119, 112, 107, 95, 99, 118 + 3, 0, 2, 1, 0, 0, 49, 4, 5, 8, + 6, 12, 9, 10, 16, 48, 11, 51, 50, 0, + 0, 81, 68, 72, 70, 74, 126, 133, 0, 0, + 0, 120, 115, 0, 0, 65, 53, 57, 61, 0, + 0, 0, 0, 88, 90, 92, 94, 0, 0, 7, + 139, 47, 13, 14, 43, 45, 46, 44, 39, 41, + 40, 42, 35, 36, 37, 38, 25, 28, 29, 30, + 31, 32, 33, 34, 27, 26, 24, 23, 17, 18, + 19, 20, 21, 22, 15, 136, 138, 79, 76, 77, + 114, 111, 112, 80, 69, 73, 71, 75, 127, 134, + 125, 131, 132, 124, 121, 123, 119, 116, 118, 86, + 106, 87, 104, 64, 52, 56, 60, 110, 107, 108, + 135, 84, 85, 89, 91, 93, 95, 99, 96, 97, + 103, 100, 101, 137, 0, 0, 83, 82, 0, 130, + 0, 0, 0, 67, 66, 55, 54, 59, 58, 63, + 62, 0, 0, 0, 78, 113, 129, 122, 117, 105, + 109, 98, 102, 128 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 7, 49, 8, 9, 10, 16, 50, - 11, 51, 12, 15, 18, 52, 110, 136, 53, 111, - 138, 54, 112, 140, 55, 109, 134, 56, 57, 58, - 59, 60, 84, 85, 61, 89, 127, 62, 63, 64, - 65, 66, 67, 68, 69, 107, 108, 70, 114, 115, - 71, 87, 88, 72, 103, 104, 73, 100, 101, 74, - 75, 76, 77, 78, 79, 80, 81, 82 + -1, 1, 2, 7, 51, 8, 9, 10, 16, 52, + 11, 53, 12, 15, 18, 54, 114, 146, 55, 115, + 148, 56, 116, 150, 57, 113, 144, 58, 59, 60, + 61, 62, 88, 89, 63, 93, 137, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 128, 129, 73, 131, + 132, 111, 112, 74, 118, 119, 75, 91, 92, 76, + 107, 108, 77, 104, 105, 78, 79, 80, 81, 82, + 83, 84, 85, 86 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -72 +#define YYPACT_NINF -85 static const yytype_int8 yypact[] = { - -72, 7, 26, -72, -8, -2, -72, -72, -72, -72, - -72, -72, -72, -72, -72, -1, -4, -72, -72, -7, - 1, -72, 0, 2, 5, 6, 8, 9, 11, 3, - 14, 12, 4, 13, 15, -72, -72, -72, -72, 16, - 17, 20, 21, 22, 23, 24, 25, -72, -72, -72, - -72, -72, -72, -72, -72, -72, -72, -72, -72, -72, - -72, -72, -72, -72, -72, -72, -72, -72, -72, -72, - -72, -72, -72, -72, -72, -72, -72, -72, -72, -72, - -72, 27, -72, -72, 31, -72, -72, -72, 32, 29, - -72, -72, -72, -72, -72, -72, -72, -3, -72, -72, - -72, 35, -72, 36, -72, -72, -72, 37, -72, 30, - 33, 34, 38, -72, 40, -72, -72, -72, -72, -72, - -72, -72, -72, -72, -7, 1, -72, -72, 18, -72, - 12, 4, 15, -72, -72, -72, -72, -72, -72, -72, - -72, 16, -72, -72, 39, -72, -72, -72, -72, -72 + -85, 7, 28, -85, -8, -2, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -1, -4, -85, -85, -7, + 1, -85, 0, 2, 5, 6, 8, 9, 11, 3, + 14, 12, 4, 13, 15, -85, -85, -85, -85, 16, + 17, 20, 21, 22, 23, 24, 25, 26, 27, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, 30, -85, -85, 31, -85, + -85, -85, 32, 33, -85, -85, -85, -85, -85, -85, + -85, -3, -85, -85, -85, 37, -85, 39, -85, -85, + -85, 40, -85, 34, 35, 36, 38, -85, 41, -85, + -85, -85, -85, -85, -85, -85, -85, -85, 42, -85, + -85, 46, -85, -85, -7, 1, -85, -85, 18, -85, + 12, 4, 15, -85, -85, -85, -85, -85, -85, -85, + -85, 16, 26, 27, -85, -85, 47, -85, -85, -85, + -85, -85, -85, -85 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -72, -72, -72, -72, -72, -72, -72, -72, -72, -72, - -72, -72, -72, -72, -72, -72, -72, -72, -72, -72, - -72, -72, -72, -72, -72, -72, -72, -72, -72, -72, - -72, -72, -72, -71, -72, -72, -72, -72, -72, -72, - -72, -72, -72, -72, -72, -72, -61, -72, -72, -64, - -72, -47, -72, -72, -72, -52, -72, -49, -72, -72, - -72, -72, -72, -72, -72, -72, -72, 10 + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -79, -85, -85, -85, -85, -85, -85, + -85, -85, -85, -85, -85, -85, -85, -84, -85, -85, + -70, -85, -57, -85, -85, -65, -85, -48, -85, -85, + -85, -53, -85, -51, -85, -85, -85, -85, -85, -85, + -85, -85, -85, 10 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -738,49 +755,51 @@ static const yytype_uint8 yytable[] = { 19, 20, 21, 22, 23, 24, 25, 3, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 4, - 13, 128, 129, 47, 83, 48, 14, 5, 90, 97, - 91, 17, 86, 92, 93, 102, 94, 95, 6, 96, - 98, 105, 99, 142, 144, 116, 106, 113, 117, 118, - 119, 120, 121, 122, 124, 125, 48, 126, 130, 131, - 132, 147, 133, 141, 149, 135, 137, 148, 143, 146, - 139, 145, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 123 + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, + 48, 4, 13, 138, 139, 49, 87, 50, 14, 5, + 94, 101, 95, 17, 90, 96, 97, 106, 98, 99, + 6, 100, 102, 109, 103, 154, 156, 120, 110, 117, + 121, 122, 123, 124, 125, 126, 134, 135, 161, 127, + 130, 50, 140, 136, 141, 142, 151, 152, 143, 145, + 147, 153, 149, 162, 163, 159, 160, 155, 158, 157, + 0, 0, 0, 0, 0, 133 }; static const yytype_int16 yycheck[] = { 4, 5, 6, 7, 8, 9, 10, 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 3, - 38, 34, 35, 37, 41, 39, 38, 11, 38, 36, - 38, 42, 41, 38, 38, 41, 38, 38, 22, 38, - 36, 38, 40, 124, 36, 38, 41, 41, 38, 38, - 38, 38, 38, 38, 33, 33, 39, 38, 33, 33, - 33, 132, 42, 33, 35, 42, 42, 141, 125, 131, - 42, 130, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 81 + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 3, 40, 36, 37, 39, 43, 41, 40, 11, + 40, 38, 40, 44, 43, 40, 40, 43, 40, 40, + 22, 40, 38, 40, 42, 134, 38, 40, 43, 43, + 40, 40, 40, 40, 40, 40, 35, 35, 152, 43, + 43, 41, 35, 40, 35, 35, 35, 35, 44, 44, + 44, 35, 44, 153, 37, 142, 151, 135, 141, 140, + -1, -1, -1, -1, -1, 85 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 44, 45, 0, 3, 11, 22, 46, 48, 49, - 50, 53, 55, 38, 38, 56, 51, 42, 57, 4, + 0, 46, 47, 0, 3, 11, 22, 48, 50, 51, + 52, 55, 57, 40, 40, 58, 53, 44, 59, 4, 5, 6, 7, 8, 9, 10, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 37, 39, 47, - 52, 54, 58, 61, 64, 67, 70, 71, 72, 73, - 74, 77, 80, 81, 82, 83, 84, 85, 86, 87, - 90, 93, 96, 99, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 41, 75, 76, 41, 94, 95, 78, - 38, 38, 38, 38, 38, 38, 38, 36, 36, 40, - 100, 101, 41, 97, 98, 38, 41, 88, 89, 68, - 59, 62, 65, 41, 91, 92, 38, 38, 38, 38, - 38, 38, 38, 110, 33, 33, 38, 79, 34, 35, - 33, 33, 33, 42, 69, 42, 60, 42, 63, 42, - 66, 33, 76, 94, 36, 100, 98, 89, 92, 35 + 26, 27, 28, 29, 30, 31, 32, 33, 34, 39, + 41, 49, 54, 56, 60, 63, 66, 69, 72, 73, + 74, 75, 76, 79, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 93, 98, 101, 104, 107, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 43, 77, 78, + 43, 102, 103, 80, 40, 40, 40, 40, 40, 40, + 40, 38, 38, 42, 108, 109, 43, 105, 106, 40, + 43, 96, 97, 70, 61, 64, 67, 43, 99, 100, + 40, 40, 40, 40, 40, 40, 40, 43, 91, 92, + 43, 94, 95, 118, 35, 35, 40, 81, 36, 37, + 35, 35, 35, 44, 71, 44, 62, 44, 65, 44, + 68, 35, 35, 35, 78, 102, 38, 108, 106, 97, + 100, 92, 95, 37 }; #define yyerrok (yyerrstatus = 0) @@ -1715,128 +1734,128 @@ yyreduce: } break; - case 45: -#line 180 "levcomp.ypp" + case 47: +#line 182 "levcomp.ypp" {} break; - case 46: -#line 183 "levcomp.ypp" + case 48: +#line 185 "levcomp.ypp" { } break; - case 47: -#line 185 "levcomp.ypp" + case 49: +#line 187 "levcomp.ypp" { } break; - case 48: -#line 186 "levcomp.ypp" + case 50: +#line 188 "levcomp.ypp" { } break; - case 49: -#line 190 "levcomp.ypp" + case 51: +#line 192 "levcomp.ypp" { lc_global_prelude.add(yylineno, (yyvsp[(1) - (1)].text)); } break; - case 50: -#line 194 "levcomp.ypp" + case 52: +#line 196 "levcomp.ypp" { } break; - case 51: -#line 196 "levcomp.ypp" + case 53: +#line 198 "levcomp.ypp" { } break; - case 52: -#line 197 "levcomp.ypp" + case 54: +#line 199 "levcomp.ypp" { } break; - case 53: -#line 201 "levcomp.ypp" + case 55: +#line 203 "levcomp.ypp" { lc_map.main.add(yylineno, (yyvsp[(1) - (1)].text)); } break; - case 54: -#line 205 "levcomp.ypp" + case 56: +#line 207 "levcomp.ypp" { } break; - case 55: -#line 207 "levcomp.ypp" + case 57: +#line 209 "levcomp.ypp" { } break; - case 56: -#line 208 "levcomp.ypp" + case 58: +#line 210 "levcomp.ypp" { } break; - case 57: -#line 212 "levcomp.ypp" + case 59: +#line 214 "levcomp.ypp" { lc_map.validate.add(yylineno, (yyvsp[(1) - (1)].text)); } break; - case 58: -#line 216 "levcomp.ypp" + case 60: +#line 218 "levcomp.ypp" { } break; - case 59: -#line 218 "levcomp.ypp" + case 61: +#line 220 "levcomp.ypp" { } break; - case 60: -#line 219 "levcomp.ypp" + case 62: +#line 221 "levcomp.ypp" { } break; - case 61: -#line 223 "levcomp.ypp" + case 63: +#line 225 "levcomp.ypp" { lc_map.veto.add(yylineno, (yyvsp[(1) - (1)].text)); } break; - case 62: -#line 227 "levcomp.ypp" + case 64: +#line 229 "levcomp.ypp" { } break; - case 63: -#line 229 "levcomp.ypp" + case 65: +#line 231 "levcomp.ypp" { } break; - case 64: -#line 230 "levcomp.ypp" + case 66: +#line 232 "levcomp.ypp" { } break; - case 65: -#line 234 "levcomp.ypp" + case 67: +#line 236 "levcomp.ypp" { lc_map.prelude.add(yylineno, (yyvsp[(1) - (1)].text)); } break; - case 66: -#line 238 "levcomp.ypp" + case 68: +#line 240 "levcomp.ypp" { } break; - case 67: -#line 240 "levcomp.ypp" + case 69: +#line 242 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1845,13 +1864,13 @@ yyreduce: } break; - case 68: -#line 247 "levcomp.ypp" + case 70: +#line 249 "levcomp.ypp" { } break; - case 69: -#line 249 "levcomp.ypp" + case 71: +#line 251 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1860,13 +1879,13 @@ yyreduce: } break; - case 70: -#line 256 "levcomp.ypp" + case 72: +#line 258 "levcomp.ypp" { } break; - case 71: -#line 258 "levcomp.ypp" + case 73: +#line 260 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1875,13 +1894,13 @@ yyreduce: } break; - case 72: -#line 265 "levcomp.ypp" + case 74: +#line 267 "levcomp.ypp" { } break; - case 73: -#line 267 "levcomp.ypp" + case 75: +#line 269 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1890,13 +1909,13 @@ yyreduce: } break; - case 74: -#line 274 "levcomp.ypp" + case 76: +#line 276 "levcomp.ypp" {} break; - case 77: -#line 282 "levcomp.ypp" + case 79: +#line 284 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1905,13 +1924,13 @@ yyreduce: } break; - case 78: -#line 289 "levcomp.ypp" + case 80: +#line 291 "levcomp.ypp" {} break; - case 81: -#line 297 "levcomp.ypp" + case 83: +#line 299 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1920,8 +1939,8 @@ yyreduce: } break; - case 82: -#line 306 "levcomp.ypp" + case 84: +#line 308 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1930,8 +1949,8 @@ yyreduce: } break; - case 83: -#line 315 "levcomp.ypp" + case 85: +#line 317 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1940,8 +1959,8 @@ yyreduce: } break; - case 84: -#line 324 "levcomp.ypp" + case 86: +#line 326 "levcomp.ypp" { std::string key, arg; int sep(0); @@ -1974,83 +1993,103 @@ yyreduce: } break; - case 85: -#line 356 "levcomp.ypp" + case 87: +#line 358 "levcomp.ypp" { } break; - case 86: -#line 359 "levcomp.ypp" + case 88: +#line 361 "levcomp.ypp" { } break; - case 87: -#line 361 "levcomp.ypp" + case 89: +#line 363 "levcomp.ypp" { lc_map.main.add( yylineno, - make_stringf("floorcol(\"%s\")", + make_stringf("lfloorcol(\"%s\")", quote_lua_string((yyvsp[(2) - (2)].text)).c_str())); } break; - case 88: -#line 368 "levcomp.ypp" + case 90: +#line 370 "levcomp.ypp" { } break; - case 89: -#line 370 "levcomp.ypp" + case 91: +#line 372 "levcomp.ypp" { lc_map.main.add( yylineno, - make_stringf("rockcol(\"%s\")", + make_stringf("lrockcol(\"%s\")", quote_lua_string((yyvsp[(2) - (2)].text)).c_str())); } break; - case 90: -#line 377 "levcomp.ypp" + case 92: +#line 379 "levcomp.ypp" { } break; - case 91: -#line 379 "levcomp.ypp" + case 93: +#line 381 "levcomp.ypp" { lc_map.main.add( yylineno, - make_stringf("floortile(\"%s\")", + make_stringf("lfloortile(\"%s\")", quote_lua_string((yyvsp[(2) - (2)].text)).c_str())); } break; - case 92: -#line 386 "levcomp.ypp" + case 94: +#line 388 "levcomp.ypp" { } break; - case 93: -#line 388 "levcomp.ypp" + case 95: +#line 390 "levcomp.ypp" { lc_map.main.add( yylineno, - make_stringf("rocktile(\"%s\")", + make_stringf("lrocktile(\"%s\")", quote_lua_string((yyvsp[(2) - (2)].text)).c_str())); } break; - case 94: -#line 395 "levcomp.ypp" + case 99: +#line 406 "levcomp.ypp" + { + lc_map.main.add( + yylineno, + make_stringf("ftile(\"%s\")", + quote_lua_string((yyvsp[(1) - (1)].text)).c_str())); + } + break; + + case 103: +#line 422 "levcomp.ypp" + { + lc_map.main.add( + yylineno, + make_stringf("rtile(\"%s\")", + quote_lua_string((yyvsp[(1) - (1)].text)).c_str())); + } + break; + + case 104: +#line 430 "levcomp.ypp" { } break; - case 95: -#line 396 "levcomp.ypp" + case 105: +#line 431 "levcomp.ypp" { } break; - case 96: -#line 400 "levcomp.ypp" + case 106: +#line 435 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2059,23 +2098,23 @@ yyreduce: } break; - case 97: -#line 408 "levcomp.ypp" + case 107: +#line 443 "levcomp.ypp" { } break; - case 98: -#line 411 "levcomp.ypp" + case 108: +#line 446 "levcomp.ypp" { } break; - case 99: -#line 412 "levcomp.ypp" + case 109: +#line 447 "levcomp.ypp" { } break; - case 100: -#line 416 "levcomp.ypp" + case 110: +#line 451 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2084,13 +2123,13 @@ yyreduce: } break; - case 101: -#line 424 "levcomp.ypp" + case 111: +#line 459 "levcomp.ypp" { } break; - case 104: -#line 432 "levcomp.ypp" + case 114: +#line 467 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2099,18 +2138,18 @@ yyreduce: } break; - case 105: -#line 440 "levcomp.ypp" + case 115: +#line 475 "levcomp.ypp" {} break; - case 106: -#line 441 "levcomp.ypp" + case 116: +#line 476 "levcomp.ypp" {} break; - case 109: -#line 449 "levcomp.ypp" + case 119: +#line 484 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2119,18 +2158,18 @@ yyreduce: } break; - case 110: -#line 456 "levcomp.ypp" + case 120: +#line 491 "levcomp.ypp" {} break; - case 111: -#line 457 "levcomp.ypp" + case 121: +#line 492 "levcomp.ypp" {} break; - case 114: -#line 465 "levcomp.ypp" + case 124: +#line 500 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2139,8 +2178,8 @@ yyreduce: } break; - case 115: -#line 474 "levcomp.ypp" + case 125: +#line 509 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2149,13 +2188,13 @@ yyreduce: } break; - case 116: -#line 482 "levcomp.ypp" + case 126: +#line 517 "levcomp.ypp" {} break; - case 117: -#line 484 "levcomp.ypp" + case 127: +#line 519 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2164,8 +2203,8 @@ yyreduce: } break; - case 118: -#line 493 "levcomp.ypp" + case 128: +#line 528 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2173,8 +2212,8 @@ yyreduce: } break; - case 119: -#line 500 "levcomp.ypp" + case 129: +#line 535 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2182,8 +2221,8 @@ yyreduce: } break; - case 120: -#line 507 "levcomp.ypp" + case 130: +#line 542 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2191,8 +2230,8 @@ yyreduce: } break; - case 121: -#line 514 "levcomp.ypp" + case 131: +#line 549 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2200,8 +2239,8 @@ yyreduce: } break; - case 122: -#line 522 "levcomp.ypp" + case 132: +#line 557 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2209,13 +2248,13 @@ yyreduce: } break; - case 123: -#line 529 "levcomp.ypp" + case 133: +#line 564 "levcomp.ypp" {} break; - case 124: -#line 531 "levcomp.ypp" + case 134: +#line 566 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2224,8 +2263,8 @@ yyreduce: } break; - case 125: -#line 540 "levcomp.ypp" + case 135: +#line 575 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2234,8 +2273,8 @@ yyreduce: } break; - case 129: -#line 556 "levcomp.ypp" + case 139: +#line 591 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -2246,7 +2285,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2250 "levcomp.tab.c" +#line 2289 "levcomp.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2460,6 +2499,6 @@ yyreturn: } -#line 564 "levcomp.ypp" +#line 599 "levcomp.ypp" |