From 7c976817983bf6358df8227e9a64c2dbb4999f30 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Mon, 9 Jun 2008 14:45:02 +0000 Subject: [PATCH] AsmParser support for immediate constant aggregate values. llvm-svn: 52149 --- lib/AsmParser/llvmAsmParser.cpp.cvs | 1691 +++++++++++++++------------ lib/AsmParser/llvmAsmParser.h.cvs | 2 +- lib/AsmParser/llvmAsmParser.y | 82 +- lib/AsmParser/llvmAsmParser.y.cvs | 82 +- utils/llvm.grm | 7 + 5 files changed, 1070 insertions(+), 794 deletions(-) diff --git a/lib/AsmParser/llvmAsmParser.cpp.cvs b/lib/AsmParser/llvmAsmParser.cpp.cvs index c4dd86be980..9f58529133f 100644 --- a/lib/AsmParser/llvmAsmParser.cpp.cvs +++ b/lib/AsmParser/llvmAsmParser.cpp.cvs @@ -1396,7 +1396,7 @@ typedef union YYSTYPE llvm::ICmpInst::Predicate IPredicate; llvm::FCmpInst::Predicate FPredicate; } -/* Line 193 of yacc.c. */ +/* Line 187 of yacc.c. */ #line 1401 "llvmAsmParser.tab.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -1460,7 +1460,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 /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -1625,16 +1625,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 44 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2191 +#define YYLAST 2339 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 170 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 86 /* YYNRULES -- Number of rules. */ -#define YYNRULES 333 +#define YYNRULES 340 /* YYNRULES -- Number of states. */ -#define YYNSTATES 683 +#define YYNSTATES 699 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -1721,14 +1721,15 @@ static const yytype_uint16 yyprhs[] = 649, 652, 656, 658, 662, 666, 670, 674, 676, 677, 683, 687, 689, 693, 695, 696, 707, 709, 711, 716, 718, 720, 723, 727, 728, 730, 732, 734, 736, 738, - 740, 742, 744, 746, 750, 752, 758, 760, 762, 764, - 766, 768, 770, 773, 775, 779, 782, 785, 789, 792, - 793, 795, 798, 801, 805, 815, 825, 834, 849, 851, - 853, 860, 866, 869, 876, 884, 889, 894, 901, 908, - 909, 910, 914, 917, 921, 924, 926, 932, 938, 945, - 952, 959, 966, 971, 978, 983, 988, 995, 1002, 1005, - 1014, 1016, 1018, 1019, 1023, 1030, 1034, 1041, 1044, 1050, - 1058, 1064, 1069, 1074 + 740, 742, 744, 746, 750, 754, 757, 760, 764, 767, + 773, 778, 780, 786, 788, 790, 792, 794, 796, 798, + 801, 803, 807, 810, 813, 817, 820, 821, 823, 826, + 829, 833, 843, 853, 862, 877, 879, 881, 888, 894, + 897, 904, 912, 917, 922, 929, 936, 937, 938, 942, + 945, 949, 952, 954, 960, 966, 973, 980, 987, 994, + 999, 1006, 1011, 1016, 1023, 1030, 1033, 1042, 1044, 1046, + 1047, 1051, 1058, 1062, 1069, 1072, 1078, 1086, 1092, 1097, + 1102 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -1809,40 +1810,42 @@ static const yytype_int16 yyrhs[] = 242, 233, -1, 188, 187, 230, -1, -1, 61, -1, 3, -1, 4, -1, 9, -1, 26, -1, 27, -1, 40, -1, 41, -1, 25, -1, 165, 212, 166, -1, - 211, -1, 59, 236, 22, 159, 22, -1, 7, -1, - 8, -1, 178, -1, 182, -1, 238, -1, 237, -1, - 204, 239, -1, 240, -1, 241, 159, 240, -1, 242, - 243, -1, 232, 243, -1, 244, 181, 245, -1, 244, - 247, -1, -1, 21, -1, 69, 241, -1, 69, 10, - -1, 70, 17, 239, -1, 70, 11, 239, 159, 17, - 239, 159, 17, 239, -1, 71, 176, 239, 159, 17, - 239, 162, 246, 164, -1, 71, 176, 239, 159, 17, - 239, 162, 164, -1, 72, 191, 206, 239, 156, 249, - 157, 195, 38, 17, 239, 73, 17, 239, -1, 73, - -1, 74, -1, 246, 176, 237, 159, 17, 239, -1, - 176, 237, 159, 17, 239, -1, 181, 253, -1, 204, - 162, 239, 159, 239, 164, -1, 248, 159, 162, 239, - 159, 239, 164, -1, 204, 193, 239, 193, -1, 17, - 193, 239, 193, -1, 249, 159, 204, 193, 239, 193, - -1, 249, 159, 17, 193, 239, 193, -1, -1, -1, - 250, 159, 240, -1, 159, 4, -1, 251, 159, 4, - -1, 58, 57, -1, 57, -1, 171, 204, 239, 159, - 239, -1, 172, 204, 239, 159, 239, -1, 90, 174, - 204, 239, 159, 239, -1, 91, 175, 204, 239, 159, - 239, -1, 92, 174, 204, 239, 159, 239, -1, 93, - 175, 204, 239, 159, 239, -1, 173, 240, 38, 204, - -1, 133, 240, 159, 240, 159, 240, -1, 134, 240, - 159, 204, -1, 135, 240, 159, 240, -1, 136, 240, - 159, 240, 159, 240, -1, 137, 240, 159, 240, 159, - 240, -1, 132, 248, -1, 252, 191, 206, 239, 156, - 249, 157, 195, -1, 255, -1, 36, -1, -1, 114, - 204, 198, -1, 114, 204, 159, 11, 239, 198, -1, - 115, 204, 198, -1, 115, 204, 159, 11, 239, 198, - -1, 116, 240, -1, 254, 117, 204, 239, 198, -1, - 254, 118, 240, 159, 204, 239, 198, -1, 138, 204, - 239, 159, 4, -1, 119, 204, 239, 250, -1, 139, - 204, 239, 251, -1, 140, 204, 239, 159, 204, 239, - 251, -1 + 162, 212, 164, -1, 162, 164, -1, 169, 22, -1, + 167, 212, 168, -1, 167, 168, -1, 165, 167, 212, + 168, 166, -1, 165, 167, 168, 166, -1, 211, -1, + 59, 236, 22, 159, 22, -1, 7, -1, 8, -1, + 178, -1, 182, -1, 238, -1, 237, -1, 204, 239, + -1, 240, -1, 241, 159, 240, -1, 242, 243, -1, + 232, 243, -1, 244, 181, 245, -1, 244, 247, -1, + -1, 21, -1, 69, 241, -1, 69, 10, -1, 70, + 17, 239, -1, 70, 11, 239, 159, 17, 239, 159, + 17, 239, -1, 71, 176, 239, 159, 17, 239, 162, + 246, 164, -1, 71, 176, 239, 159, 17, 239, 162, + 164, -1, 72, 191, 206, 239, 156, 249, 157, 195, + 38, 17, 239, 73, 17, 239, -1, 73, -1, 74, + -1, 246, 176, 237, 159, 17, 239, -1, 176, 237, + 159, 17, 239, -1, 181, 253, -1, 204, 162, 239, + 159, 239, 164, -1, 248, 159, 162, 239, 159, 239, + 164, -1, 204, 193, 239, 193, -1, 17, 193, 239, + 193, -1, 249, 159, 204, 193, 239, 193, -1, 249, + 159, 17, 193, 239, 193, -1, -1, -1, 250, 159, + 240, -1, 159, 4, -1, 251, 159, 4, -1, 58, + 57, -1, 57, -1, 171, 204, 239, 159, 239, -1, + 172, 204, 239, 159, 239, -1, 90, 174, 204, 239, + 159, 239, -1, 91, 175, 204, 239, 159, 239, -1, + 92, 174, 204, 239, 159, 239, -1, 93, 175, 204, + 239, 159, 239, -1, 173, 240, 38, 204, -1, 133, + 240, 159, 240, 159, 240, -1, 134, 240, 159, 204, + -1, 135, 240, 159, 240, -1, 136, 240, 159, 240, + 159, 240, -1, 137, 240, 159, 240, 159, 240, -1, + 132, 248, -1, 252, 191, 206, 239, 156, 249, 157, + 195, -1, 255, -1, 36, -1, -1, 114, 204, 198, + -1, 114, 204, 159, 11, 239, 198, -1, 115, 204, + 198, -1, 115, 204, 159, 11, 239, 198, -1, 116, + 240, -1, 254, 117, 204, 239, 198, -1, 254, 118, + 240, 159, 204, 239, 198, -1, 138, 204, 239, 159, + 4, -1, 119, 204, 239, 250, -1, 139, 204, 239, + 251, -1, 140, 204, 239, 159, 204, 239, 251, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -1874,14 +1877,15 @@ static const yytype_uint16 yyrline[] = 2183, 2186, 2192, 2202, 2206, 2211, 2213, 2218, 2223, 2232, 2242, 2253, 2257, 2266, 2275, 2280, 2409, 2409, 2411, 2420, 2420, 2422, 2427, 2439, 2443, 2448, 2452, 2456, 2460, 2464, - 2468, 2472, 2476, 2480, 2508, 2512, 2522, 2526, 2530, 2535, - 2542, 2542, 2548, 2557, 2562, 2567, 2571, 2580, 2589, 2598, - 2602, 2610, 2617, 2621, 2626, 2637, 2656, 2665, 2751, 2755, - 2762, 2773, 2786, 2796, 2807, 2817, 2828, 2836, 2846, 2853, - 2856, 2857, 2865, 2871, 2880, 2884, 2889, 2905, 2922, 2936, - 2950, 2964, 2978, 2990, 2998, 3005, 3011, 3017, 3023, 3038, - 3128, 3133, 3137, 3144, 3151, 3161, 3168, 3178, 3186, 3200, - 3217, 3225, 3240, 3255 + 2468, 2472, 2476, 2480, 2502, 2524, 2528, 2541, 2553, 2558, + 2570, 2576, 2580, 2590, 2594, 2598, 2603, 2610, 2610, 2616, + 2625, 2630, 2635, 2639, 2648, 2657, 2666, 2670, 2678, 2685, + 2689, 2694, 2705, 2724, 2733, 2819, 2823, 2830, 2841, 2854, + 2864, 2875, 2885, 2896, 2904, 2914, 2921, 2924, 2925, 2933, + 2939, 2948, 2952, 2957, 2973, 2990, 3004, 3018, 3032, 3046, + 3058, 3066, 3073, 3079, 3085, 3091, 3106, 3196, 3201, 3205, + 3212, 3219, 3229, 3236, 3246, 3254, 3268, 3285, 3293, 3308, + 3323 }; #endif @@ -1992,14 +1996,15 @@ static const yytype_uint8 yyr1[] = 218, 218, 224, 225, 225, 226, 227, 227, 227, 228, 228, 229, 229, 229, 229, 230, 231, 231, 232, 233, 233, 234, 235, 236, 236, 237, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 238, 238, 238, 238, - 239, 239, 240, 241, 241, 242, 242, 243, 244, 244, - 244, 245, 245, 245, 245, 245, 245, 245, 245, 245, - 246, 246, 247, 248, 248, 249, 249, 249, 249, 249, - 250, 250, 251, 251, 252, 252, 253, 253, 253, 253, - 253, 253, 253, 253, 253, 253, 253, 253, 253, 253, - 253, 254, 254, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255 + 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, + 237, 237, 237, 238, 238, 238, 238, 239, 239, 240, + 241, 241, 242, 242, 243, 244, 244, 244, 245, 245, + 245, 245, 245, 245, 245, 245, 245, 246, 246, 247, + 248, 248, 249, 249, 249, 249, 249, 250, 250, 251, + 251, 252, 252, 253, 253, 253, 253, 253, 253, 253, + 253, 253, 253, 253, 253, 253, 253, 253, 254, 254, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2031,14 +2036,15 @@ static const yytype_uint8 yyr2[] = 2, 3, 1, 3, 3, 3, 3, 1, 0, 5, 3, 1, 3, 1, 0, 10, 1, 1, 4, 1, 1, 2, 3, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 3, 1, 5, 1, 1, 1, 1, - 1, 1, 2, 1, 3, 2, 2, 3, 2, 0, - 1, 2, 2, 3, 9, 9, 8, 14, 1, 1, - 6, 5, 2, 6, 7, 4, 4, 6, 6, 0, - 0, 3, 2, 3, 2, 1, 5, 5, 6, 6, - 6, 6, 4, 6, 4, 4, 6, 6, 2, 8, - 1, 1, 0, 3, 6, 3, 6, 2, 5, 7, - 5, 4, 4, 7 + 1, 1, 1, 3, 3, 2, 2, 3, 2, 5, + 4, 1, 5, 1, 1, 1, 1, 1, 1, 2, + 1, 3, 2, 2, 3, 2, 0, 1, 2, 2, + 3, 9, 9, 8, 14, 1, 1, 6, 5, 2, + 6, 7, 4, 4, 6, 6, 0, 0, 3, 2, + 3, 2, 1, 5, 5, 6, 6, 6, 6, 4, + 6, 4, 4, 6, 6, 2, 8, 1, 1, 0, + 3, 6, 3, 6, 2, 5, 7, 5, 4, 4, + 7 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2051,174 +2057,176 @@ static const yytype_uint16 yydefact[] = 91, 0, 0, 230, 0, 0, 68, 0, 74, 75, 77, 76, 78, 81, 79, 82, 80, 83, 85, 86, 87, 84, 84, 209, 1, 215, 89, 90, 84, 219, - 92, 93, 94, 95, 84, 279, 217, 279, 0, 0, - 238, 231, 232, 220, 266, 267, 222, 139, 140, 141, - 144, 143, 142, 145, 146, 0, 0, 0, 0, 268, - 269, 147, 221, 149, 209, 209, 96, 208, 0, 99, - 99, 280, 276, 69, 249, 250, 251, 275, 233, 234, + 92, 93, 94, 95, 84, 286, 217, 286, 0, 0, + 238, 231, 232, 220, 273, 274, 222, 139, 140, 141, + 144, 143, 142, 145, 146, 0, 0, 0, 0, 275, + 276, 147, 221, 149, 209, 209, 96, 208, 0, 99, + 99, 287, 283, 69, 249, 250, 251, 282, 233, 234, 237, 0, 167, 150, 0, 0, 0, 0, 156, 168, 0, 0, 167, 0, 0, 0, 98, 97, 0, 206, 207, 0, 0, 100, 101, 102, 103, 104, 0, 252, - 0, 322, 278, 0, 235, 166, 116, 162, 164, 0, + 0, 329, 285, 0, 235, 166, 116, 162, 164, 0, 0, 0, 0, 0, 0, 155, 0, 0, 148, 0, 0, 161, 0, 160, 0, 229, 139, 140, 141, 144, 143, 142, 0, 0, 67, 67, 105, 0, 246, 247, - 248, 321, 305, 0, 0, 0, 0, 99, 288, 289, + 248, 328, 312, 0, 0, 0, 0, 99, 295, 296, 2, 3, 4, 5, 6, 7, 8, 9, 10, 14, 15, 16, 11, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 277, 99, 292, - 0, 320, 236, 159, 0, 124, 67, 67, 158, 0, + 0, 0, 0, 0, 0, 0, 0, 284, 99, 299, + 0, 327, 236, 159, 0, 124, 67, 67, 158, 0, 169, 0, 124, 67, 67, 0, 210, 187, 188, 183, 185, 184, 186, 189, 182, 178, 179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 181, 180, 223, 0, 304, - 282, 67, 273, 281, 0, 0, 55, 0, 0, 29, + 0, 0, 0, 0, 0, 181, 180, 223, 0, 311, + 289, 67, 280, 288, 0, 0, 55, 0, 0, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 0, 53, 54, 49, 50, 51, 52, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, 130, - 130, 327, 67, 67, 318, 0, 0, 0, 0, 0, + 130, 334, 67, 67, 325, 0, 0, 0, 0, 0, 67, 67, 67, 67, 67, 0, 0, 0, 0, 0, 107, 109, 108, 106, 110, 111, 112, 113, 114, 117, 165, 163, 152, 153, 154, 157, 66, 151, 225, 227, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 171, 205, 0, 0, 0, 175, 0, 172, 0, 0, 0, 135, 244, 255, 256, 257, 262, 258, - 259, 260, 261, 253, 0, 264, 271, 270, 272, 0, - 0, 283, 0, 0, 67, 67, 67, 67, 0, 323, - 0, 325, 300, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 67, 0, 115, - 121, 120, 118, 119, 122, 123, 125, 135, 135, 0, - 0, 0, 0, 0, 300, 0, 0, 0, 0, 0, - 0, 0, 170, 156, 168, 0, 173, 174, 0, 0, - 0, 0, 224, 243, 116, 241, 0, 254, 0, 0, - 274, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 331, 0, 0, 0, 314, 315, 0, 0, 0, - 0, 332, 0, 0, 0, 312, 0, 130, 0, 226, - 228, 67, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 204, 177, 0, 0, 0, 0, 0, - 0, 137, 135, 65, 0, 124, 0, 263, 0, 0, - 299, 0, 0, 0, 0, 130, 131, 130, 0, 0, - 0, 0, 0, 0, 330, 302, 0, 67, 306, 307, - 299, 0, 328, 67, 211, 0, 0, 0, 0, 191, - 0, 0, 0, 0, 202, 0, 176, 0, 0, 67, - 132, 138, 136, 64, 240, 242, 116, 133, 0, 0, - 0, 116, 116, 0, 308, 309, 310, 311, 324, 326, - 301, 0, 0, 313, 316, 317, 303, 0, 0, 130, - 0, 0, 0, 0, 0, 199, 0, 0, 0, 193, - 194, 190, 65, 134, 128, 265, 0, 0, 0, 0, - 124, 0, 293, 0, 333, 124, 329, 195, 196, 197, - 198, 0, 0, 0, 203, 239, 0, 126, 0, 286, - 0, 0, 107, 109, 116, 116, 0, 116, 116, 294, - 319, 192, 200, 201, 129, 0, 245, 284, 0, 285, - 0, 296, 295, 0, 0, 0, 127, 0, 0, 0, - 116, 116, 0, 0, 0, 298, 297, 291, 0, 0, - 290, 0, 287 + 259, 260, 261, 253, 0, 0, 0, 0, 271, 278, + 277, 279, 0, 0, 290, 0, 0, 67, 67, 67, + 67, 0, 330, 0, 332, 307, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 67, 0, 115, 121, 120, 118, 119, 122, 123, 125, + 135, 135, 0, 0, 0, 0, 0, 307, 0, 0, + 0, 0, 0, 0, 0, 170, 156, 168, 0, 173, + 174, 0, 0, 0, 0, 224, 243, 116, 241, 0, + 254, 0, 265, 0, 0, 0, 268, 0, 266, 281, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 338, 0, 0, 0, 321, 322, 0, 0, 0, 0, + 339, 0, 0, 0, 319, 0, 130, 0, 226, 228, + 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 204, 177, 0, 0, 0, 0, 0, 0, + 137, 135, 65, 0, 124, 0, 264, 156, 0, 263, + 267, 0, 0, 306, 0, 0, 0, 0, 130, 131, + 130, 0, 0, 0, 0, 0, 0, 337, 309, 0, + 67, 313, 314, 306, 0, 335, 67, 211, 0, 0, + 0, 0, 191, 0, 0, 0, 0, 202, 0, 176, + 0, 0, 67, 132, 138, 136, 64, 240, 242, 116, + 133, 0, 270, 0, 0, 0, 116, 116, 0, 315, + 316, 317, 318, 331, 333, 308, 0, 0, 320, 323, + 324, 310, 0, 0, 130, 0, 0, 0, 0, 0, + 199, 0, 0, 0, 193, 194, 190, 65, 134, 128, + 272, 269, 0, 0, 0, 0, 124, 0, 300, 0, + 340, 124, 336, 195, 196, 197, 198, 0, 0, 0, + 203, 239, 0, 126, 0, 293, 0, 0, 107, 109, + 116, 116, 0, 116, 116, 301, 326, 192, 200, 201, + 129, 0, 245, 291, 0, 292, 0, 303, 302, 0, + 0, 0, 127, 0, 0, 0, 116, 116, 0, 0, + 0, 305, 304, 298, 0, 0, 297, 0, 294 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 272, 273, 274, 299, 316, 162, 163, 79, 574, + -1, 272, 273, 274, 299, 316, 162, 163, 79, 587, 113, 12, 80, 14, 15, 41, 42, 43, 48, 54, - 118, 128, 349, 233, 436, 352, 656, 637, 409, 521, - 614, 462, 522, 81, 164, 137, 154, 138, 139, 110, - 373, 395, 374, 121, 88, 155, 16, 17, 18, 20, - 19, 383, 437, 438, 63, 23, 61, 101, 465, 466, - 129, 170, 55, 96, 56, 49, 468, 396, 83, 398, - 282, 283, 57, 92, 93, 227, 641, 132, 324, 583, - 481, 491, 228, 229, 230, 231 + 118, 128, 349, 233, 439, 352, 672, 653, 412, 530, + 629, 465, 531, 81, 164, 137, 154, 138, 139, 110, + 373, 398, 374, 121, 88, 155, 16, 17, 18, 20, + 19, 383, 440, 441, 63, 23, 61, 101, 468, 469, + 129, 170, 55, 96, 56, 49, 471, 399, 83, 401, + 282, 283, 57, 92, 93, 227, 657, 132, 324, 598, + 490, 500, 228, 229, 230, 231 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -611 +#define YYPACT_NINF -622 static const yytype_int16 yypact[] = { - 645, -611, -611, -611, -611, -611, -611, -611, -11, -112, - 3, -74, 83, -41, 26, -611, 111, 692, -611, -17, - 199, -19, 54, -611, 21, 124, -611, 1670, -611, -611, - -611, -611, -611, -611, -611, -611, -611, -611, -611, -611, - -611, 17, 17, 72, -611, -611, -611, -611, 17, -611, - -611, -611, -611, -611, 17, 137, -611, -5, 196, 204, - 215, -611, -611, -611, -611, -611, 65, -611, -611, -611, - -611, -611, -611, -611, -611, 262, 265, 2, 322, -611, - -611, -611, -40, -611, 240, 240, 219, -611, 319, 193, - 193, -611, -611, 257, -611, -611, -611, -611, -611, -611, - -611, 52, 1252, -611, 120, 131, 671, 65, -611, -40, - -101, 132, 1252, 139, 319, 319, -611, -611, 1359, -611, - -611, 1711, 299, -611, -611, -611, -611, -611, 1772, -611, - -16, 2051, -611, 287, -611, -611, -40, -611, 154, 160, - 1831, 1831, 159, -77, 1831, -611, 316, 183, -611, 1711, - 1831, 65, 175, -40, 278, -611, 248, 334, 338, 356, - 357, 358, 244, 359, 1310, 314, -611, 36, -611, -611, - -611, -611, -611, 313, 1872, 34, 360, 193, -611, -611, - -611, -611, -611, -611, -611, -611, -611, -611, -611, -611, - -611, -611, -611, -611, -611, 324, 522, 324, 522, 1831, - 1831, 1831, 1831, -611, -611, -611, -611, -611, -611, -611, - -611, -611, -611, -611, -611, 1831, 1831, 1831, 1831, 1831, - 1831, 1831, 1831, 1831, 1831, 1831, 1831, -611, 193, -611, - 236, -611, -611, 174, 1548, -611, -12, -23, -611, 208, - -40, 218, -611, 314, -22, 1359, -611, -611, -611, -611, - -611, -611, -611, -611, -611, -611, -611, 324, 522, 324, - 522, 220, 221, 222, 224, 227, 229, 230, 1589, 1890, - 931, 366, 241, 251, 252, -611, -611, -611, 253, -611, - 65, 881, -611, 237, 1025, 1025, -611, 1025, 1772, -611, - -611, -611, -611, -611, -611, -611, -611, -611, -611, 1831, - -611, -611, -611, -611, -611, -611, -611, -611, -611, -611, - -611, -611, -611, -611, -611, -611, 1831, 1831, 1831, -6, - 8, -611, 881, -7, 239, 269, 272, 277, 279, 280, - 881, 881, 881, 881, 881, 372, 1772, 1831, 1831, 433, - -611, -611, -611, -611, -611, -611, -611, -611, -611, -611, - -611, -611, -47, -611, -611, -611, -611, -47, -611, 139, - 403, 286, 288, 289, 290, 1711, 1711, 1711, 1711, 1711, - 1711, 1711, -611, -611, 58, 972, -54, -611, 46, -611, - 1711, 1711, 1711, 291, 1611, -611, -611, -611, -611, -611, - -611, -611, -611, 386, 1711, -611, -611, -611, -611, 1831, - 292, -611, 293, 1025, 881, 881, 881, 881, 24, -611, - 25, -611, -611, 1025, 294, 1831, 1831, 1831, 1831, 1831, - 296, 303, 304, 305, 306, 1831, 1025, 881, 309, -611, - -611, -611, -611, -611, -611, -611, -611, 291, 291, 1831, - 1711, 1711, 1711, 1711, -611, 310, 311, 312, 315, 303, - 320, 1711, -611, 307, 1159, 56, -611, -611, 321, 323, - 415, 10, -611, -611, -40, 326, 331, -611, 459, -53, - -611, 474, 477, 339, 337, 340, 341, 342, 1025, 493, - 1025, 343, 344, 1025, 346, -40, -611, 347, 348, 504, - 505, 351, 1831, 1025, 1025, -40, 355, 354, 1831, -611, - -611, 45, 362, 363, 367, 368, -69, 1711, 1711, 1711, - 1711, 121, 1711, -611, -611, 352, 1711, 1711, 1831, 492, - 521, -611, 291, 123, 1652, -611, 369, -611, 1025, 1025, - 1934, 1025, 1025, 1025, 1025, 354, -611, 354, 1831, 1025, - 370, 1831, 1831, 1831, -611, -611, 531, 881, -611, -611, - 1934, 482, -611, 881, -611, 1711, 1711, 1711, 1711, -611, - 378, 381, 382, 387, -611, 303, -611, 393, 398, 53, - -611, -611, -611, -611, -611, -611, -40, -14, 534, 399, - 395, 6, -40, 125, -611, -611, -611, -611, -611, -611, - -611, 396, 1025, -611, -611, -611, -611, 303, 167, 354, - 402, 404, 405, 406, 1711, -611, 1711, 1711, 191, -611, - -611, -611, 123, -611, 510, -611, 550, -4, 734, 734, - -611, 1952, -611, 407, 351, -611, -611, -611, -611, -611, - -611, 411, 412, 417, -611, -611, 568, 423, 1025, -611, - 1455, -3, 420, 421, -611, -611, -20, 6, -40, -611, - -47, -611, -611, -611, -611, 556, -611, -611, 422, -611, - 1455, 174, 174, 563, 734, 734, -611, 566, 425, 1025, - -611, -611, 1025, 569, 512, 174, 174, -611, 1025, 570, - -611, 1025, -611 + 805, -622, -622, -622, -622, -622, -622, -622, -6, -112, + 23, -97, 91, -94, 24, -622, 126, 1385, -622, 135, + 257, 48, 77, -622, 3, 216, -622, 1807, -622, -622, + -622, -622, -622, -622, -622, -622, -622, -622, -622, -622, + -622, 49, 49, 187, -622, -622, -622, -622, 49, -622, + -622, -622, -622, -622, 49, 218, -622, 16, 220, 239, + 243, -622, -622, -622, -622, -622, 110, -622, -622, -622, + -622, -622, -622, -622, -622, 267, 271, 1, 691, -622, + -622, -622, -28, -622, 246, 246, 206, -622, 46, 215, + 215, -622, -622, 343, -622, -622, -622, -622, -622, -622, + -622, -59, 1537, -622, 121, 130, 880, 110, -622, -28, + -110, 138, 1537, 142, 46, 46, -622, -622, 1555, -622, + -622, 1830, 302, -622, -622, -622, -622, -622, 1848, -622, + -14, 2199, -622, 293, -622, -622, -28, -622, 160, 165, + 1877, 1877, 168, -103, 1877, -622, 334, 189, -622, 1830, + 1877, 110, 191, -28, 221, -622, 85, 341, 342, 345, + 354, 355, 323, 360, 1373, 315, -622, 28, -622, -622, + -622, -622, -622, 316, 1921, 42, 361, 215, -622, -622, + -622, -622, -622, -622, -622, -622, -622, -622, -622, -622, + -622, -622, -622, -622, -622, 393, 529, 393, 529, 1877, + 1877, 1877, 1877, -622, -622, -622, -622, -622, -622, -622, + -622, -622, -622, -622, -622, 1877, 1877, 1877, 1877, 1877, + 1877, 1877, 1877, 1877, 1877, 1877, 1877, -622, 215, -622, + 70, -622, -622, 176, 1578, -622, -39, -46, -622, 208, + -28, 223, -622, 315, 5, 1555, -622, -622, -622, -622, + -622, -622, -622, -622, -622, -622, -622, 393, 529, 393, + 529, 219, 227, 228, 234, 235, 241, 242, 1596, 2009, + 993, 356, 244, 245, 251, -622, -622, -622, 254, -622, + 110, 792, -622, 240, 943, 943, -622, 943, 1848, -622, + -622, -622, -622, -622, -622, -622, -622, -622, -622, 1877, + -622, -622, -622, -622, -622, -622, -622, -622, -622, -622, + -622, -622, -622, -622, -622, -622, 1877, 1877, 1877, 26, + 58, -622, 792, -35, 252, 256, 258, 259, 260, 263, + 792, 792, 792, 792, 792, 389, 1848, 1877, 1877, 375, + -622, -622, -622, -622, -622, -622, -622, -622, -622, -622, + -622, -622, 202, -622, -622, -622, -622, 202, -622, 142, + 390, 273, 274, 276, 277, 1830, 1830, 1830, 1830, 1830, + 1830, 1830, -622, -622, 57, 1268, -82, -622, -64, -622, + 1830, 1830, 1830, 275, 1628, -622, -622, -622, -622, -622, + -622, -622, -622, 374, 1757, 2041, 1313, 414, -622, -622, + -622, -622, 1877, 278, -622, 279, 943, 792, 792, 792, + 792, 31, -622, 33, -622, -622, 943, 280, 1877, 1877, + 1877, 1877, 1877, 281, 282, 284, 285, 287, 1877, 943, + 792, 288, -622, -622, -622, -622, -622, -622, -622, -622, + 275, 275, 1877, 1830, 1830, 1830, 1830, -622, 290, 291, + 292, 294, 282, 295, 1830, -622, 286, 1222, -62, -622, + -622, 301, 307, 429, 20, -622, -622, -28, 309, 312, + -622, 448, -622, 87, 1508, -10, -622, -61, -622, -622, + 455, 456, 318, 317, 319, 320, 321, 943, 473, 943, + 338, 339, 943, 340, -28, -622, 344, 346, 478, 496, + 351, 1877, 943, 943, -28, 348, 352, 1877, -622, -622, + -5, 353, 357, 359, 362, 115, 1830, 1830, 1830, 1830, + 146, 1830, -622, -622, 336, 1830, 1830, 1877, 493, 515, + -622, 275, 530, 1789, -622, 363, -622, 358, -60, -622, + -622, 943, 943, 2082, 943, 943, 943, 943, 352, -622, + 352, 1877, 943, 364, 1877, 1877, 1877, -622, -622, 516, + 792, -622, -622, 2082, 472, -622, 792, -622, 1830, 1830, + 1830, 1830, -622, 368, 377, 372, 376, -622, 282, -622, + 379, 381, 2, -622, -622, -622, -622, -622, -622, -28, + 4, 517, -622, 380, 382, 378, -16, -28, 157, -622, + -622, -622, -622, -622, -622, -622, 384, 943, -622, -622, + -622, -622, 282, 178, 352, 386, 388, 394, 396, 1830, + -622, 1830, 1830, 198, -622, -622, -622, 530, -622, 507, + -622, -622, 533, -7, 641, 641, -622, 2100, -622, 398, + 351, -622, -622, -622, -622, -622, -622, 406, 408, 409, + -622, -622, 564, 417, 943, -622, 1088, 7, 415, 416, + -622, -622, -12, -16, -28, -622, 202, -622, -622, -622, + -622, 548, -622, -622, 418, -622, 1088, 176, 176, 557, + 641, 641, -622, 558, 419, 943, -622, -622, 943, 562, + 508, 176, 176, -622, 943, 563, -622, 943, -622 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -611, 457, 458, 463, -176, -171, -174, -611, 0, -15, - -146, 503, 11, -611, -611, -611, -611, 12, -611, -611, - -611, -143, -611, -441, -611, -238, -611, -611, -310, 22, - -611, -412, -611, -611, -26, 364, -123, -611, 488, 495, - 35, -161, -256, 242, 276, 361, -611, -611, 585, -611, - -611, -611, -611, -611, -611, -611, -611, -611, -611, -611, - 513, -611, -611, -611, -611, -611, -611, -610, -99, 127, - -179, -611, -611, 547, -611, -611, -611, -611, -611, 59, - 164, -440, -611, -611, -611, -611 + -622, 451, 452, 454, -163, -157, -174, -622, 0, -41, + -102, 494, 13, -622, -622, -622, -622, 222, -622, -622, + -622, -145, -622, -427, -622, -227, -622, -622, -301, -2, + -622, -412, -622, -622, -26, 369, -116, -622, 477, 484, + -113, -161, -259, 8, 147, 347, -622, -622, 574, -622, + -622, -622, -622, -622, -622, -622, -622, -622, -622, -622, + 503, -622, -622, -622, -622, -622, -622, -621, -121, 55, + -195, -622, -622, 537, -622, -622, -622, -622, -622, 32, + 151, -445, -622, -622, -622, -622 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -2228,416 +2236,451 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -214 static const yytype_int16 yytable[] = { - 11, 82, 287, 275, 357, 167, 105, 286, 286, 511, - 411, 13, 168, 376, 378, 111, 91, 11, 663, 277, - 519, 317, 321, 523, 94, 499, 500, 318, 13, 46, - 658, 47, 111, 111, 288, 478, 480, 325, 326, 327, - 328, 329, 21, 111, 519, 284, 24, 335, 111, 111, - 668, 285, 109, 84, 85, 246, 2, 22, 144, 4, - 89, -145, 25, 111, 520, 276, 90, 145, 29, 30, - 31, 32, 33, 34, 35, 36, 136, 37, 479, 479, - 109, 361, 144, 363, 26, 336, 136, 362, 559, 364, - 538, 239, 153, 11, 430, 431, 432, 358, 359, 433, - 111, 27, 153, 434, 435, 451, 451, 86, 111, 87, - 572, 44, 456, 527, 236, 237, 112, 28, 240, 455, - -67, 430, 431, 432, 244, 608, 433, 430, 431, 432, - 434, 435, 433, 112, 112, 612, 434, 435, 469, 58, - 618, 619, 1, 354, 112, 3, 62, 5, 281, 112, - 112, 169, 353, 408, -67, 413, 165, 624, 91, 428, - 639, 659, -145, 95, 112, 403, -145, 410, -67, 106, - 38, 39, 40, 319, 320, 281, 322, 339, 278, 38, - 39, 40, 397, 60, 243, 397, 397, 552, 397, 323, + 11, 82, 287, 275, 286, 105, 321, 520, 165, 111, + 376, 378, 167, 13, 168, 357, 111, 11, 286, 414, + 111, 325, 326, 327, 328, 329, 679, 111, 508, 509, + 13, 335, 288, 246, 317, 674, 243, 91, 528, -145, + 532, 318, 487, 276, 489, 94, 24, 21, 2, 144, + 111, 4, 109, 284, 528, 684, 144, 111, 145, 285, + 111, 26, 22, 277, 28, 239, 29, 30, 31, 32, + 33, 34, 35, 36, 529, 37, 136, 454, 119, 120, + 109, 111, 25, 336, 459, 488, 136, 488, -55, -55, + -55, -55, 153, 11, 361, 454, 363, 454, 454, 454, + 133, 362, 153, 364, 460, 134, 524, 540, 593, 27, + 112, 247, 248, 111, 236, 237, 458, 112, 240, 585, + 354, 112, 149, 150, 244, 353, 44, 416, 112, 433, + 434, 435, -67, 623, 436, 473, 475, 477, 437, 438, + -145, 358, 359, 431, -145, 433, 434, 435, 281, 454, + 436, 112, 567, 169, 437, 438, 539, 655, 112, 626, + 400, 112, 627, 400, 400, 60, 400, 640, 106, 634, + 635, 675, 406, 319, 320, 281, 322, 38, 39, 40, + 278, 46, 112, 47, 95, 411, -67, 337, 338, 323, 281, 281, 281, 281, 281, 330, 331, 332, 333, 334, - 281, 112, 554, 661, 662, 451, 664, 665, 136, 112, - 611, 133, 59, 426, 457, 451, 134, 451, 98, 153, - 470, 102, 452, 397, 515, 588, 99, 589, 339, 675, - 676, 397, 397, 397, 397, 397, 484, 100, 486, 487, - 488, 50, 51, 52, 340, 341, 53, 249, 250, 251, - 252, -55, -55, -55, -55, 122, 123, 124, 125, 126, - 127, 116, 153, 117, 342, 343, 103, 344, 345, 104, - 346, 347, 348, 404, 247, 248, 1, 87, 564, 3, - 546, 5, 620, 140, 621, 64, 65, 577, 146, 626, - 405, 406, 407, 275, 141, 340, 341, 1, 2, 148, - 3, 4, 5, 166, 397, 397, 397, 397, 397, 232, - 153, 427, 281, 234, 397, 342, 343, 235, 344, 345, - 241, 346, 347, 348, 625, 238, 621, 397, 397, 64, - 65, 245, 107, 67, 68, 69, 70, 71, 72, 73, - 242, 1, 2, -56, 3, 4, 5, -57, 634, 454, - 546, 119, 120, 337, 338, 276, 149, 150, 464, 590, - 114, 115, 593, 594, 595, -60, -59, -58, 253, 111, - 279, 286, 74, 281, 355, 356, 365, 366, 367, 397, - 368, 397, 646, 369, 397, 370, 371, 650, 379, 281, - 485, 281, 281, 281, 397, 397, 399, 380, 414, 495, - 444, 445, 446, 447, 448, 449, 450, 381, 382, 384, - 425, 400, 401, 501, 402, 458, 459, 460, 289, 290, - 291, 292, 293, 294, 295, 296, 297, 298, 415, 397, - 397, 416, 397, 397, 397, 397, 417, 429, 418, 419, - 397, 439, 440, 640, 441, 442, 443, 467, 397, 412, - 461, 471, 472, 518, 397, 489, 483, 420, 421, 422, - 423, 424, 490, 492, 493, 494, 547, 660, 498, 507, - 508, 509, 553, 514, 510, 502, 503, 504, 505, 512, - 516, 526, 517, 75, 76, 524, 513, 77, 525, 78, - 108, 528, 569, 397, 529, 530, 531, 536, 576, 532, - 533, 534, 538, 539, 582, 541, 542, 543, 544, 545, - 546, 550, 281, 551, 570, 281, 281, 281, 566, 397, - 397, 555, 556, 573, 582, 571, 557, 558, 578, 592, - 473, 474, 475, 476, 477, 596, 479, 604, 605, 397, - 482, 606, 560, 561, 562, 563, 607, 565, 300, 301, - 609, 567, 568, 496, 497, 610, 615, 617, 616, 627, - 622, 628, 629, 630, 636, 397, 397, 638, 651, 652, - 397, 649, 654, 397, 653, 655, -18, -19, 666, 397, - 669, 667, 397, 672, 673, 679, 678, 681, 224, 225, - 600, 601, 602, 603, 226, 648, 131, 635, 351, 613, - 147, 143, 45, 130, 97, 535, 360, 537, 506, 598, - 540, 0, 573, 0, 0, 0, 0, 0, 0, 0, - 548, 549, 302, 303, 304, 305, 306, 307, 308, 309, - 310, 311, 312, 313, 314, 315, 0, 0, 0, 631, - 0, 632, 633, 0, 0, -213, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 579, 580, 0, 584, 585, - 586, 587, 0, -69, 1, 2, 591, 3, 4, 5, - 0, 0, 0, 0, 597, 6, 7, 0, 64, 65, - 599, 107, 67, 68, 69, 70, 71, 72, 73, 0, - 1, 2, -212, 3, 4, 5, 0, 8, 0, 0, - 0, 9, 0, 0, 0, 10, 0, 0, 0, 0, - -69, 1, 2, 0, 3, 4, 5, 0, 0, 623, - 0, 74, 6, 7, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 385, 386, 0, - 0, 64, 65, 387, 8, 644, 645, 0, 9, 0, - 0, 0, 10, 1, 2, 0, 3, 4, 5, 388, - 389, 390, 0, 0, 0, 657, 0, 0, 0, 0, - 0, 0, 0, 0, 391, 392, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 339, 0, - 0, 670, 671, 393, 0, 0, 674, 0, 0, 677, - 0, 0, 0, 0, 0, 680, 0, 0, 682, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, - 191, 192, 193, 194, 257, 258, 259, 260, 0, 0, - 0, 0, 75, 76, 0, 0, 77, 0, 78, 142, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 261, 203, 642, 643, 206, 207, 208, - 209, 210, 211, 212, 213, 214, 0, 262, 0, 263, - 264, 265, 0, 266, 267, 342, 343, 0, 344, 345, - 0, 346, 347, 348, 385, 386, 0, 0, 64, 65, - 387, 0, 0, 0, 0, 0, 0, 0, 0, 394, - 1, 2, 0, 3, 4, 5, 388, 389, 390, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 391, 392, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 111, 0, 64, 65, - 393, 107, 156, 157, 158, 159, 160, 161, 73, 0, + 281, 400, 38, 39, 40, 565, 58, 479, 136, 400, + 400, 400, 400, 400, 112, 538, 454, 413, -67, 153, + 429, 455, 86, 493, 87, 495, 496, 497, 64, 65, + 339, 114, 115, 677, 678, 59, 680, 681, 62, 91, + 1, 2, 98, 3, 4, 5, 454, 603, 116, 604, + 117, 536, 447, 448, 449, 450, 451, 452, 453, 691, + 692, 99, 153, 84, 85, 100, 102, 461, 462, 463, + 89, 103, 572, 407, 551, 104, 90, 122, 123, 124, + 125, 126, 127, 87, 140, 400, 400, 400, 400, 400, + 408, 409, 410, 141, 146, 400, 275, 340, 341, 50, + 51, 52, 148, 577, 53, 559, 166, 590, 400, 400, + 153, 430, 281, 642, 636, 232, 637, 342, 343, 234, + 344, 345, 235, 346, 347, 348, 249, 250, 251, 252, + 511, 512, 513, 514, 238, 641, 276, 637, 241, 403, + 404, 522, 405, 433, 434, 435, 242, 245, 436, 457, + -56, -57, 437, 438, -60, 650, 605, 559, 467, 608, + 609, 610, 1, -59, -58, 3, 400, 5, 400, 253, + 111, 400, 286, 279, 355, 365, 281, 415, 379, 432, + 356, 400, 400, 366, 367, 423, 424, 425, 426, 427, + 368, 369, 281, 494, 281, 281, 281, 370, 371, 402, + 380, 381, 504, 573, 574, 575, 576, 382, 578, 662, + 384, 417, 580, 581, 666, 418, 510, 419, 420, 421, + 400, 400, 422, 400, 400, 400, 400, 428, 442, 443, + 444, 400, 445, 446, 464, 470, 478, 480, 481, 400, + 498, 499, 492, 501, 502, 400, 503, 507, 457, 516, + 517, 518, 523, 519, 521, 615, 616, 617, 618, 656, + 525, 482, 483, 484, 485, 486, 526, 527, 533, 534, + 535, 491, 541, 542, 543, 560, 544, 549, 545, 546, + 547, 566, 557, 676, 505, 506, 400, 289, 290, 291, + 292, 293, 294, 295, 296, 297, 298, 551, 552, 554, + 558, 582, 579, 555, 563, 556, 647, 589, 648, 649, + 559, 564, 568, 400, 400, 583, 569, 597, 570, 584, + 611, 571, 591, 607, 592, 281, 488, 619, 281, 281, + 281, 621, 586, 400, 620, 622, 624, 597, 625, 630, + 633, 632, 548, 643, 550, 644, 631, 553, 638, 1, + 654, 645, 3, 646, 5, 300, 301, 561, 562, 400, + 400, 652, 665, 667, 400, 668, 669, 400, 670, 671, + 682, -18, -19, 400, 685, 688, 400, 683, 689, 694, + 697, 695, 224, 225, 339, 226, 651, 131, 628, 147, + 143, 45, 360, 130, 97, 613, 594, 595, 515, 599, + 600, 601, 602, 351, 0, 0, 0, 606, 0, 0, + 0, 664, 0, 0, 0, 612, 0, 0, 0, 0, + 0, 614, 0, 0, 0, 0, 0, 586, 0, 302, + 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, + 313, 314, 315, 0, 385, 386, 0, 0, 64, 65, + 387, 340, 341, 0, 0, 0, 0, 0, 0, 0, + 1, 2, 639, 3, 4, 5, 388, 389, 390, 0, + 0, 342, 343, 0, 344, 345, 0, 346, 347, 348, + 0, 391, 392, 0, 0, 0, 0, 0, 0, 660, + 661, 0, 0, 0, 0, 339, 0, 0, 64, 65, + 393, 107, 67, 68, 69, 70, 71, 72, 73, 673, 1, 2, 0, 3, 4, 5, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, - 194, 257, 258, 259, 260, 0, 0, 0, 0, 64, - 65, 74, 107, 156, 157, 158, 159, 160, 161, 73, - 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, - 261, 203, 204, 205, 206, 207, 208, 209, 210, 211, + 194, 257, 258, 259, 260, 686, 687, 0, 0, 0, + 690, 74, 0, 693, 0, 0, 0, 0, 0, 696, + 0, 0, 698, 0, 0, 0, 0, 0, 0, 0, + 261, 203, 658, 659, 206, 207, 208, 209, 210, 211, 212, 213, 214, 0, 262, 0, 263, 264, 265, 0, - 266, 267, 74, 0, 0, 0, 0, 0, 385, 386, - 0, 0, 64, 65, 387, 0, 0, 112, 0, 0, - 0, 0, 0, 0, 1, 2, 394, 3, 4, 5, - 388, 389, 390, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 391, 392, 0, 0, 0, + 266, 267, 342, 343, 0, 344, 345, 0, 346, 347, + 348, 0, 0, 0, 0, 385, 386, 0, 0, 64, + 65, 387, 0, 394, 0, -213, 395, 0, 396, 0, + 397, 1, 2, 0, 3, 4, 5, 388, 389, 390, + 0, 0, 0, -69, 1, 2, 0, 3, 4, 5, + 0, 0, 391, 392, 0, 6, 7, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 111, 0, 0, + 0, 393, 75, 76, 0, 0, 77, 8, 78, 108, + 0, 9, 0, 0, 0, 10, 0, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 194, 257, 258, 259, 260, 0, 64, 65, 0, + 107, 67, 68, 69, 70, 71, 72, 73, 0, 1, + 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, + 0, 261, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 213, 214, 0, 262, 0, 263, 264, 265, + 74, 266, 267, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 385, 386, 112, 0, + 64, 65, 387, 0, 394, 0, 0, 395, 0, 396, + 0, 397, 1, 2, 0, 3, 4, 5, 388, 389, + 390, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 391, 392, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 393, 0, 0, 0, 0, 0, - 0, 0, 75, 76, 0, 0, 77, 0, 78, 377, - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, - 190, 191, 192, 193, 194, 257, 258, 259, 260, 0, + 64, 65, 393, 107, 156, 157, 158, 159, 160, 161, + 73, 0, 1, 2, 0, 3, 4, 5, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 257, 258, 259, 260, 0, 0, 0, + 0, 75, 76, 74, 0, 77, 0, 78, 142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 75, 76, 0, 0, 77, 0, 78, - 453, 0, 0, 0, 261, 203, 204, 205, 206, 207, - 208, 209, 210, 211, 212, 213, 214, 0, 262, 0, - 263, 264, 265, 0, 266, 267, 64, 65, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, - 0, 3, 4, 5, 254, 0, 0, 0, 0, 0, - 394, 0, 0, 0, 0, 0, 0, 0, 0, 255, - 256, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 111, 0, 0, 0, 0, 0, + 0, 0, 261, 203, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 0, 262, 0, 263, 264, + 265, 0, 266, 267, 0, 0, 0, 0, 0, 0, + 0, 385, 386, 0, 0, 0, 0, 387, 0, 0, + 0, 0, 0, 0, 0, 394, 0, 0, 395, 0, + 396, 0, 397, 388, 389, 390, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 391, 392, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 180, 181, 182, 183, 184, 185, - 186, 187, 188, 189, 190, 191, 192, 193, 194, 257, - 258, 259, 260, 0, 0, 0, 0, 0, 0, 64, - 65, 0, 107, 67, 68, 69, 70, 71, 72, 73, - 0, 1, 2, 0, 3, 4, 5, 0, 261, 203, - 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, - 214, 135, 262, 0, 263, 264, 265, 0, 266, 267, - 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 112, 0, 64, 65, -67, - 0, 268, 0, 0, 269, 0, 270, 0, 271, 1, - 2, 0, 3, 4, 5, 254, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 393, 0, 0, + 0, 0, 0, 0, 75, 76, 0, 0, 77, 0, + 78, 377, 0, 180, 181, 182, 183, 184, 185, 186, + 187, 188, 189, 190, 191, 192, 193, 194, 257, 258, + 259, 260, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 255, 256, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 111, 64, 65, 0, 151, - 67, 68, 69, 70, 71, 72, 73, 0, 1, 2, - 0, 3, 4, 5, 0, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, - 257, 258, 259, 260, 0, 0, 0, 0, 0, 74, - 0, 0, 0, 75, 76, 0, 0, 77, 0, 78, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 261, - 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, - 213, 214, 0, 262, 0, 263, 264, 265, 0, 266, - 267, 0, 0, 0, 0, 0, 0, 0, 385, 386, - 0, 0, 0, 0, 387, 0, 112, 0, 0, 0, - 0, 0, 268, 0, 0, 269, 0, 270, 0, 271, - 388, 389, 390, 0, 152, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 391, 392, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 393, 0, 0, 0, 0, 0, - 75, 76, 0, 0, 77, 0, 78, 0, 0, 0, - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, - 190, 191, 192, 193, 194, 257, 258, 259, 260, 0, - 0, 0, 0, 0, 0, 64, 65, 0, 107, 67, + 0, 0, 0, 0, 0, 0, 0, 261, 203, 204, + 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, + 0, 262, 0, 263, 264, 265, 0, 266, 267, 64, + 65, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 2, 0, 3, 4, 5, 254, 0, 0, + 394, 0, 0, 395, 0, 396, 0, 397, 0, 0, + 0, 0, 255, 256, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 64, 65, 111, 107, 156, + 157, 158, 159, 160, 161, 73, 0, 1, 2, 0, + 3, 4, 5, 0, 0, 0, 0, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 194, 257, 258, 259, 260, 0, 0, 74, 0, + 64, 65, 0, 107, 156, 157, 158, 159, 160, 161, + 73, 0, 1, 2, 0, 3, 4, 5, 0, 0, + 0, 261, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 213, 214, 0, 262, 0, 263, 264, 265, + 0, 266, 267, 74, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 112, 0, + 64, 65, -67, 0, 268, -212, 0, 269, 0, 270, + 0, 271, 1, 2, 0, 3, 4, 5, 254, 0, + 0, 0, 0, -69, 1, 2, 0, 3, 4, 5, + 0, 0, 0, 255, 256, 6, 7, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 111, 75, + 76, 0, 0, 77, 0, 78, 456, 8, 0, 0, + 0, 9, 0, 0, 0, 10, 0, 0, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 194, 257, 258, 259, 260, 0, 0, 0, + 0, 0, 0, 0, 75, 76, 0, 0, 77, 0, + 78, 476, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 261, 203, 204, 205, 206, 207, 208, 209, + 210, 211, 212, 213, 214, 0, 262, 0, 263, 264, + 265, 0, 266, 267, 0, 64, 65, 0, 107, 156, + 157, 158, 159, 160, 161, 73, 0, 1, 2, 112, + 3, 4, 5, 0, 0, 268, 0, 0, 269, 0, + 270, 0, 271, 0, 64, 65, 0, 107, 67, 68, + 69, 70, 71, 72, 73, 0, 1, 2, 74, 3, + 4, 5, 64, 65, 0, 151, 67, 68, 69, 70, + 71, 72, 73, 0, 1, 2, 135, 3, 4, 5, + 0, 0, 0, 0, 0, 64, 65, 74, 107, 67, 68, 69, 70, 71, 72, 73, 0, 1, 2, 0, - 3, 4, 5, 0, 261, 203, 204, 205, 206, 207, - 208, 209, 210, 211, 212, 213, 214, 350, 262, 0, - 263, 264, 265, 0, 266, 267, 64, 65, 74, 107, - 156, 157, 158, 159, 160, 161, 73, 0, 1, 2, - 0, 3, 4, 5, 0, 0, 0, 0, 64, 65, - 394, 107, 67, 68, 69, 70, 71, 72, 73, 0, - 1, 2, 0, 3, 4, 5, 0, 0, 0, 74, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 463, 0, 0, 0, 0, 0, 0, 0, 0, 64, - 65, 74, 107, 67, 68, 69, 70, 71, 72, 73, - 0, 1, 2, 0, 3, 4, 5, 64, 65, 0, - 66, 67, 68, 69, 70, 71, 72, 73, 0, 1, - 2, 575, 3, 4, 5, 0, 0, 0, 0, 0, - 0, 0, 74, 0, 0, 0, 0, 0, 0, 75, - 76, 0, 0, 77, 0, 78, 0, 0, 64, 65, - 74, 107, 156, 157, 158, 159, 160, 161, 73, 0, - 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 75, 76, 0, 372, 77, 0, 78, 0, 0, 0, - 0, 74, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 75, 76, 0, 0, 77, 0, 78, 64, - 65, 0, 151, 67, 68, 69, 70, 71, 72, 73, - 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 75, 76, 0, 0, 77, 0, 78, - 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, - 0, 75, 76, 0, 0, 77, 0, 78, 64, 65, - 0, 107, 67, 68, 69, 70, 71, 72, 73, 0, - 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 75, 76, 0, 0, 77, 0, 78, 64, - 65, 74, 280, 67, 68, 69, 70, 71, 72, 73, - 0, 1, 2, 0, 3, 4, 5, 64, 65, 0, + 3, 4, 5, 64, 65, 74, 107, 156, 157, 158, + 159, 160, 161, 73, 0, 1, 2, 350, 3, 4, + 5, 0, 0, 0, 0, 0, 0, 0, 74, 0, + 0, 0, 0, 0, 0, 64, 65, 0, 107, 67, + 68, 69, 70, 71, 72, 73, 74, 1, 2, 0, + 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 466, 0, 75, + 76, 0, 0, 77, 0, 78, 537, 0, 74, 0, + 152, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 75, 76, + 0, 0, 77, 0, 78, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 75, 76, 0, 0, + 77, 0, 78, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, + 76, 0, 0, 77, 0, 78, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 75, 76, 0, + 372, 77, 0, 78, 64, 65, 0, 107, 156, 157, + 158, 159, 160, 161, 73, 0, 1, 2, 0, 3, + 4, 5, 0, 0, 0, 0, 0, 0, 0, 75, + 76, 0, 0, 77, 0, 78, 64, 65, 0, 107, + 67, 68, 69, 70, 71, 72, 73, 74, 1, 2, + 0, 3, 4, 5, 64, 65, 0, 66, 67, 68, + 69, 70, 71, 72, 73, 0, 1, 2, 588, 3, + 4, 5, 0, 0, 0, 0, 0, 64, 65, 74, 107, 156, 157, 158, 159, 160, 161, 73, 0, 1, + 2, 0, 3, 4, 5, 64, 65, 74, 151, 67, + 68, 69, 70, 71, 72, 73, 0, 1, 2, 0, + 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, + 74, 0, 0, 0, 64, 65, 0, 107, 67, 68, + 69, 70, 71, 72, 73, 0, 1, 2, 74, 3, + 4, 5, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 75, 76, + 0, 472, 77, 0, 78, 0, 0, 74, 64, 65, + 0, 280, 67, 68, 69, 70, 71, 72, 73, 0, + 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, + 75, 76, 0, 0, 77, 0, 78, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 75, 76, + 0, 74, 77, 0, 78, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 75, 76, 0, 0, 77, 0, 78, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, + 76, 0, 0, 77, 0, 78, 64, 65, 0, 107, + 156, 157, 158, 159, 160, 161, 73, 0, 1, 2, + 0, 3, 4, 5, 0, 0, 0, 0, 75, 76, + 0, 0, 77, 0, 78, 0, 0, 0, 64, 65, + 0, 107, 156, 157, 158, 159, 160, 161, 73, 74, + 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 75, 76, 0, 0, 77, 0, 78, 64, + 65, 74, 107, 67, 68, 69, 70, 71, 72, 596, + 0, 1, 2, 0, 3, 4, 5, 64, 65, 0, + 107, 67, 68, 69, 70, 71, 72, 663, 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 74, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 75, 76, 0, 0, 77, 0, 375, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 75, 76, 0, 0, 77, 0, 474, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 171, 0, 0, 0, 0, 0, 0, 0, 75, 76, 0, 0, 77, 0, 78, - 74, 64, 65, 0, 107, 67, 68, 69, 70, 71, - 72, 581, 0, 1, 2, 0, 3, 4, 5, 64, - 65, 0, 107, 67, 68, 69, 70, 71, 72, 647, - 0, 1, 2, 0, 3, 4, 5, 0, 0, 0, - 0, 0, 0, 0, 74, 0, 0, 0, 0, 0, - 0, 0, 75, 76, 0, 0, 77, 0, 78, 0, - 0, 0, 74, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 172, 173, 0, 0, + 0, 75, 76, 0, 0, 77, 0, 78, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, + 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, + 196, 197, 198, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 75, 76, 0, 0, 77, 0, 78, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 75, 76, 0, 0, 77, 0, 375, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 171, 0, 0, - 0, 0, 0, 0, 0, 75, 76, 0, 0, 77, - 0, 78, 0, 0, 0, 0, 0, 0, 172, 173, - 0, 0, 0, 75, 76, 0, 0, 77, 0, 78, - 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, - 194, 195, 196, 197, 198, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 199, 200, 201, 0, 0, - 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, - 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, - 222, 223 + 0, 0, 0, 199, 200, 201, 0, 0, 202, 203, + 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, + 214, 215, 216, 217, 218, 219, 220, 221, 222, 223 }; static const yytype_int16 yycheck[] = { - 0, 27, 176, 164, 242, 128, 4, 11, 11, 449, - 320, 0, 28, 269, 270, 55, 21, 17, 38, 165, - 34, 197, 201, 464, 29, 437, 438, 198, 17, 46, - 640, 48, 55, 55, 177, 11, 11, 216, 217, 218, - 219, 220, 53, 55, 34, 11, 158, 226, 55, 55, - 660, 17, 78, 41, 42, 154, 20, 68, 159, 23, - 48, 55, 59, 55, 54, 164, 54, 168, 42, 43, - 44, 45, 46, 47, 48, 49, 102, 51, 54, 54, - 106, 257, 159, 259, 158, 228, 112, 258, 157, 260, - 159, 168, 118, 93, 141, 142, 143, 243, 244, 146, - 55, 18, 128, 150, 151, 159, 159, 35, 55, 37, - 522, 0, 166, 166, 140, 141, 156, 158, 144, 375, - 160, 141, 142, 143, 150, 565, 146, 141, 142, 143, - 150, 151, 146, 156, 156, 576, 150, 151, 394, 158, - 581, 582, 19, 166, 156, 22, 22, 24, 174, 156, - 156, 167, 164, 159, 160, 162, 121, 597, 21, 338, - 164, 164, 156, 168, 156, 288, 160, 159, 160, 167, - 153, 154, 155, 199, 200, 201, 202, 54, 167, 153, - 154, 155, 281, 162, 149, 284, 285, 497, 287, 215, + 0, 27, 176, 164, 11, 4, 201, 452, 121, 55, + 269, 270, 128, 0, 28, 242, 55, 17, 11, 320, + 55, 216, 217, 218, 219, 220, 38, 55, 440, 441, + 17, 226, 177, 154, 197, 656, 149, 21, 34, 55, + 467, 198, 11, 164, 11, 29, 158, 53, 20, 159, + 55, 23, 78, 11, 34, 676, 159, 55, 168, 17, + 55, 158, 68, 165, 158, 168, 42, 43, 44, 45, + 46, 47, 48, 49, 54, 51, 102, 159, 32, 33, + 106, 55, 59, 228, 166, 54, 112, 54, 3, 4, + 5, 6, 118, 93, 257, 159, 259, 159, 159, 159, + 159, 258, 128, 260, 168, 164, 168, 168, 168, 18, + 156, 26, 27, 55, 140, 141, 375, 156, 144, 531, + 166, 156, 114, 115, 150, 164, 0, 162, 156, 141, + 142, 143, 160, 578, 146, 394, 395, 396, 150, 151, + 156, 243, 244, 338, 160, 141, 142, 143, 174, 159, + 146, 156, 157, 167, 150, 151, 166, 164, 156, 157, + 281, 156, 589, 284, 285, 162, 287, 612, 167, 596, + 597, 164, 288, 199, 200, 201, 202, 153, 154, 155, + 167, 46, 156, 48, 168, 159, 160, 117, 118, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, - 226, 156, 157, 644, 645, 159, 647, 648, 234, 156, - 157, 159, 158, 336, 168, 159, 164, 159, 22, 245, - 399, 156, 164, 322, 168, 535, 22, 537, 54, 670, - 671, 330, 331, 332, 333, 334, 415, 22, 417, 418, - 419, 42, 43, 44, 121, 122, 47, 3, 4, 5, - 6, 3, 4, 5, 6, 62, 63, 64, 65, 66, - 67, 42, 288, 44, 141, 142, 4, 144, 145, 4, - 147, 148, 149, 299, 26, 27, 19, 37, 157, 22, - 159, 24, 157, 163, 159, 7, 8, 525, 156, 599, - 316, 317, 318, 454, 163, 121, 122, 19, 20, 160, - 22, 23, 24, 4, 403, 404, 405, 406, 407, 22, - 336, 337, 338, 159, 413, 141, 142, 157, 144, 145, - 4, 147, 148, 149, 157, 166, 159, 426, 427, 7, - 8, 156, 10, 11, 12, 13, 14, 15, 16, 17, - 157, 19, 20, 9, 22, 23, 24, 9, 157, 375, - 159, 32, 33, 117, 118, 454, 114, 115, 384, 538, - 84, 85, 541, 542, 543, 9, 9, 9, 9, 55, - 57, 11, 50, 399, 166, 157, 156, 156, 156, 478, - 156, 480, 620, 156, 483, 156, 156, 625, 22, 415, - 416, 417, 418, 419, 493, 494, 159, 156, 159, 425, - 365, 366, 367, 368, 369, 370, 371, 156, 156, 156, - 38, 284, 285, 439, 287, 380, 381, 382, 94, 95, - 96, 97, 98, 99, 100, 101, 102, 103, 159, 528, - 529, 159, 531, 532, 533, 534, 159, 4, 159, 159, - 539, 38, 156, 617, 156, 156, 156, 61, 547, 322, - 159, 159, 159, 38, 553, 159, 162, 330, 331, 332, - 333, 334, 159, 159, 159, 159, 492, 641, 159, 159, - 159, 159, 498, 166, 159, 440, 441, 442, 443, 159, - 159, 22, 159, 161, 162, 159, 451, 165, 157, 167, - 168, 17, 518, 592, 17, 156, 159, 4, 524, 159, - 159, 159, 159, 159, 530, 159, 159, 159, 4, 4, - 159, 156, 538, 159, 22, 541, 542, 543, 166, 618, - 619, 159, 159, 523, 550, 4, 159, 159, 159, 159, - 403, 404, 405, 406, 407, 4, 54, 159, 157, 638, - 413, 159, 507, 508, 509, 510, 159, 512, 26, 27, - 157, 516, 517, 426, 427, 157, 22, 162, 159, 157, - 164, 157, 157, 157, 54, 664, 665, 17, 157, 157, - 669, 164, 4, 672, 157, 152, 156, 156, 22, 678, - 17, 159, 681, 17, 159, 73, 17, 17, 131, 131, - 555, 556, 557, 558, 131, 621, 93, 612, 234, 577, - 112, 106, 17, 90, 57, 478, 245, 480, 444, 550, - 483, -1, 612, -1, -1, -1, -1, -1, -1, -1, - 493, 494, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, -1, -1, -1, 604, - -1, 606, 607, -1, -1, 0, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 528, 529, -1, 531, 532, - 533, 534, -1, 18, 19, 20, 539, 22, 23, 24, - -1, -1, -1, -1, 547, 30, 31, -1, 7, 8, - 553, 10, 11, 12, 13, 14, 15, 16, 17, -1, - 19, 20, 0, 22, 23, 24, -1, 52, -1, -1, - -1, 56, -1, -1, -1, 60, -1, -1, -1, -1, - 18, 19, 20, -1, 22, 23, 24, -1, -1, 592, - -1, 50, 30, 31, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 3, 4, -1, - -1, 7, 8, 9, 52, 618, 619, -1, 56, -1, - -1, -1, 60, 19, 20, -1, 22, 23, 24, 25, - 26, 27, -1, -1, -1, 638, -1, -1, -1, -1, - -1, -1, -1, -1, 40, 41, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 54, -1, - -1, 664, 665, 59, -1, -1, 669, -1, -1, 672, - -1, -1, -1, -1, -1, 678, -1, -1, 681, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, -1, -1, - -1, -1, 161, 162, -1, -1, 165, -1, 167, 168, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 119, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 131, -1, 133, -1, 135, - 136, 137, -1, 139, 140, 141, 142, -1, 144, 145, - -1, 147, 148, 149, 3, 4, -1, -1, 7, 8, - 9, -1, -1, -1, -1, -1, -1, -1, -1, 165, - 19, 20, -1, 22, 23, 24, 25, 26, 27, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 40, 41, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 55, -1, 7, 8, - 59, 10, 11, 12, 13, 14, 15, 16, 17, -1, + 226, 322, 153, 154, 155, 506, 158, 402, 234, 330, + 331, 332, 333, 334, 156, 474, 159, 159, 160, 245, + 336, 164, 35, 418, 37, 420, 421, 422, 7, 8, + 54, 84, 85, 660, 661, 158, 663, 664, 22, 21, + 19, 20, 22, 22, 23, 24, 159, 548, 42, 550, + 44, 164, 365, 366, 367, 368, 369, 370, 371, 686, + 687, 22, 288, 41, 42, 22, 156, 380, 381, 382, + 48, 4, 157, 299, 159, 4, 54, 62, 63, 64, + 65, 66, 67, 37, 163, 406, 407, 408, 409, 410, + 316, 317, 318, 163, 156, 416, 457, 121, 122, 42, + 43, 44, 160, 157, 47, 159, 4, 534, 429, 430, + 336, 337, 338, 614, 157, 22, 159, 141, 142, 159, + 144, 145, 157, 147, 148, 149, 3, 4, 5, 6, + 443, 444, 445, 446, 166, 157, 457, 159, 4, 284, + 285, 454, 287, 141, 142, 143, 157, 156, 146, 375, + 9, 9, 150, 151, 9, 157, 551, 159, 384, 554, + 555, 556, 19, 9, 9, 22, 487, 24, 489, 9, + 55, 492, 11, 57, 166, 156, 402, 322, 22, 4, + 157, 502, 503, 156, 156, 330, 331, 332, 333, 334, + 156, 156, 418, 419, 420, 421, 422, 156, 156, 159, + 156, 156, 428, 516, 517, 518, 519, 156, 521, 636, + 156, 159, 525, 526, 641, 159, 442, 159, 159, 159, + 541, 542, 159, 544, 545, 546, 547, 38, 38, 156, + 156, 552, 156, 156, 159, 61, 22, 159, 159, 560, + 159, 159, 162, 159, 159, 566, 159, 159, 474, 159, + 159, 159, 166, 159, 159, 568, 569, 570, 571, 633, + 159, 406, 407, 408, 409, 410, 159, 38, 159, 157, + 22, 416, 17, 17, 156, 501, 159, 4, 159, 159, + 159, 507, 4, 657, 429, 430, 607, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 103, 159, 159, 159, + 4, 527, 166, 159, 156, 159, 619, 533, 621, 622, + 159, 159, 159, 634, 635, 22, 159, 543, 159, 4, + 4, 159, 159, 159, 166, 551, 54, 159, 554, 555, + 556, 159, 532, 654, 157, 159, 157, 563, 157, 22, + 162, 159, 487, 157, 489, 157, 166, 492, 164, 19, + 17, 157, 22, 157, 24, 26, 27, 502, 503, 680, + 681, 54, 164, 157, 685, 157, 157, 688, 4, 152, + 22, 156, 156, 694, 17, 17, 697, 159, 159, 17, + 17, 73, 131, 131, 54, 131, 627, 93, 590, 112, + 106, 17, 245, 90, 57, 563, 541, 542, 447, 544, + 545, 546, 547, 234, -1, -1, -1, 552, -1, -1, + -1, 637, -1, -1, -1, 560, -1, -1, -1, -1, + -1, 566, -1, -1, -1, -1, -1, 627, -1, 100, + 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, + 111, 112, 113, -1, 3, 4, -1, -1, 7, 8, + 9, 121, 122, -1, -1, -1, -1, -1, -1, -1, + 19, 20, 607, 22, 23, 24, 25, 26, 27, -1, + -1, 141, 142, -1, 144, 145, -1, 147, 148, 149, + -1, 40, 41, -1, -1, -1, -1, -1, -1, 634, + 635, -1, -1, -1, -1, 54, -1, -1, 7, 8, + 59, 10, 11, 12, 13, 14, 15, 16, 17, 654, 19, 20, -1, 22, 23, 24, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 93, -1, -1, -1, -1, 7, - 8, 50, 10, 11, 12, 13, 14, 15, 16, 17, - -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + 89, 90, 91, 92, 93, 680, 681, -1, -1, -1, + 685, 50, -1, 688, -1, -1, -1, -1, -1, 694, + -1, -1, 697, -1, -1, -1, -1, -1, -1, -1, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, -1, 133, -1, 135, 136, 137, -1, - 139, 140, 50, -1, -1, -1, -1, -1, 3, 4, - -1, -1, 7, 8, 9, -1, -1, 156, -1, -1, - -1, -1, -1, -1, 19, 20, 165, 22, 23, 24, - 25, 26, 27, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 40, 41, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 59, -1, -1, -1, -1, -1, - -1, -1, 161, 162, -1, -1, 165, -1, 167, 168, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 161, 162, -1, -1, 165, -1, 167, - 168, -1, -1, -1, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131, -1, 133, -1, - 135, 136, 137, -1, 139, 140, 7, 8, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 19, 20, - -1, 22, 23, 24, 25, -1, -1, -1, -1, -1, - 165, -1, -1, -1, -1, -1, -1, -1, -1, 40, - 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 55, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 91, 92, 93, -1, -1, -1, -1, -1, -1, 7, - 8, -1, 10, 11, 12, 13, 14, 15, 16, 17, - -1, 19, 20, -1, 22, 23, 24, -1, 119, 120, - 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 131, 39, 133, -1, 135, 136, 137, -1, 139, 140, - -1, -1, 50, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 156, -1, 7, 8, 160, - -1, 162, -1, -1, 165, -1, 167, -1, 169, 19, - 20, -1, 22, 23, 24, 25, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 40, 41, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 55, 7, 8, -1, 10, - 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, - -1, 22, 23, 24, -1, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 90, 91, 92, 93, -1, -1, -1, -1, -1, 50, - -1, -1, -1, 161, 162, -1, -1, 165, -1, 167, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 119, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, -1, 133, -1, 135, 136, 137, -1, 139, - 140, -1, -1, -1, -1, -1, -1, -1, 3, 4, - -1, -1, -1, -1, 9, -1, 156, -1, -1, -1, - -1, -1, 162, -1, -1, 165, -1, 167, -1, 169, - 25, 26, 27, -1, 125, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 40, 41, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 59, -1, -1, -1, -1, -1, - 161, 162, -1, -1, 165, -1, 167, -1, -1, -1, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, -1, - -1, -1, -1, -1, -1, 7, 8, -1, 10, 11, - 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, - 22, 23, 24, -1, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 130, 131, 39, 133, -1, - 135, 136, 137, -1, 139, 140, 7, 8, 50, 10, - 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, - -1, 22, 23, 24, -1, -1, -1, -1, 7, 8, - 165, 10, 11, 12, 13, 14, 15, 16, 17, -1, - 19, 20, -1, 22, 23, 24, -1, -1, -1, 50, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 39, -1, -1, -1, -1, -1, -1, -1, -1, 7, - 8, 50, 10, 11, 12, 13, 14, 15, 16, 17, - -1, 19, 20, -1, 22, 23, 24, 7, 8, -1, + 139, 140, 141, 142, -1, 144, 145, -1, 147, 148, + 149, -1, -1, -1, -1, 3, 4, -1, -1, 7, + 8, 9, -1, 162, -1, 0, 165, -1, 167, -1, + 169, 19, 20, -1, 22, 23, 24, 25, 26, 27, + -1, -1, -1, 18, 19, 20, -1, 22, 23, 24, + -1, -1, 40, 41, -1, 30, 31, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 55, -1, -1, + -1, 59, 161, 162, -1, -1, 165, 52, 167, 168, + -1, 56, -1, -1, -1, 60, -1, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, -1, 7, 8, -1, 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, - 20, 39, 22, 23, 24, -1, -1, -1, -1, -1, - -1, -1, 50, -1, -1, -1, -1, -1, -1, 161, - 162, -1, -1, 165, -1, 167, -1, -1, 7, 8, - 50, 10, 11, 12, 13, 14, 15, 16, 17, -1, - 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, + 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, + -1, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 131, -1, 133, -1, 135, 136, 137, + 50, 139, 140, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 3, 4, 156, -1, + 7, 8, 9, -1, 162, -1, -1, 165, -1, 167, + -1, 169, 19, 20, -1, 22, 23, 24, 25, 26, + 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 40, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 161, 162, -1, 164, 165, -1, 167, -1, -1, -1, - -1, 50, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 161, 162, -1, -1, 165, -1, 167, 7, - 8, -1, 10, 11, 12, 13, 14, 15, 16, 17, - -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + 7, 8, 59, 10, 11, 12, 13, 14, 15, 16, + 17, -1, 19, 20, -1, 22, 23, 24, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, -1, -1, -1, + -1, 161, 162, 50, -1, 165, -1, 167, 168, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 161, 162, -1, -1, 165, -1, 167, - -1, -1, 50, -1, -1, -1, -1, -1, -1, -1, - -1, 161, 162, -1, -1, 165, -1, 167, 7, 8, + -1, -1, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, -1, 133, -1, 135, 136, + 137, -1, 139, 140, -1, -1, -1, -1, -1, -1, + -1, 3, 4, -1, -1, -1, -1, 9, -1, -1, + -1, -1, -1, -1, -1, 162, -1, -1, 165, -1, + 167, -1, 169, 25, 26, 27, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 40, 41, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 59, -1, -1, + -1, -1, -1, -1, 161, 162, -1, -1, 165, -1, + 167, 168, -1, 75, 76, 77, 78, 79, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, -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, 119, 120, 121, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, + -1, 133, -1, 135, 136, 137, -1, 139, 140, 7, + 8, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 19, 20, -1, 22, 23, 24, 25, -1, -1, + 162, -1, -1, 165, -1, 167, -1, 169, -1, -1, + -1, -1, 40, 41, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 7, 8, 55, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, + 22, 23, 24, -1, -1, -1, -1, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, -1, -1, 50, -1, + 7, 8, -1, 10, 11, 12, 13, 14, 15, 16, + 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, + -1, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 130, 131, -1, 133, -1, 135, 136, 137, + -1, 139, 140, 50, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 156, -1, + 7, 8, 160, -1, 162, 0, -1, 165, -1, 167, + -1, 169, 19, 20, -1, 22, 23, 24, 25, -1, + -1, -1, -1, 18, 19, 20, -1, 22, 23, 24, + -1, -1, -1, 40, 41, 30, 31, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 55, 161, + 162, -1, -1, 165, -1, 167, 168, 52, -1, -1, + -1, 56, -1, -1, -1, 60, -1, -1, 75, 76, + 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, -1, -1, -1, + -1, -1, -1, -1, 161, 162, -1, -1, 165, -1, + 167, 168, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 119, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, -1, 133, -1, 135, 136, + 137, -1, 139, 140, -1, 7, 8, -1, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, 156, + 22, 23, 24, -1, -1, 162, -1, -1, 165, -1, + 167, -1, 169, -1, 7, 8, -1, 10, 11, 12, + 13, 14, 15, 16, 17, -1, 19, 20, 50, 22, + 23, 24, 7, 8, -1, 10, 11, 12, 13, 14, + 15, 16, 17, -1, 19, 20, 39, 22, 23, 24, + -1, -1, -1, -1, -1, 7, 8, 50, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, + 22, 23, 24, 7, 8, 50, 10, 11, 12, 13, + 14, 15, 16, 17, -1, 19, 20, 39, 22, 23, + 24, -1, -1, -1, -1, -1, -1, -1, 50, -1, + -1, -1, -1, -1, -1, 7, 8, -1, 10, 11, + 12, 13, 14, 15, 16, 17, 50, 19, 20, -1, + 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 39, -1, 161, + 162, -1, -1, 165, -1, 167, 168, -1, 50, -1, + 125, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 161, 162, + -1, -1, 165, -1, 167, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 161, 162, -1, -1, + 165, -1, 167, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 161, + 162, -1, -1, 165, -1, 167, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 161, 162, -1, + 164, 165, -1, 167, 7, 8, -1, 10, 11, 12, + 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, + 23, 24, -1, -1, -1, -1, -1, -1, -1, 161, + 162, -1, -1, 165, -1, 167, 7, 8, -1, 10, + 11, 12, 13, 14, 15, 16, 17, 50, 19, 20, + -1, 22, 23, 24, 7, 8, -1, 10, 11, 12, + 13, 14, 15, 16, 17, -1, 19, 20, 39, 22, + 23, 24, -1, -1, -1, -1, -1, 7, 8, 50, + 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, + 20, -1, 22, 23, 24, 7, 8, 50, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, + 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, + 50, -1, -1, -1, 7, 8, -1, 10, 11, 12, + 13, 14, 15, 16, 17, -1, 19, 20, 50, 22, + 23, 24, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 161, 162, + -1, 164, 165, -1, 167, -1, -1, 50, 7, 8, -1, 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, + 161, 162, -1, -1, 165, -1, 167, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 161, 162, + -1, 50, 165, -1, 167, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 161, 162, -1, -1, 165, -1, 167, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 161, + 162, -1, -1, 165, -1, 167, 7, 8, -1, 10, + 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, + -1, 22, 23, 24, -1, -1, -1, -1, 161, 162, + -1, -1, 165, -1, 167, -1, -1, -1, 7, 8, + -1, 10, 11, 12, 13, 14, 15, 16, 17, 50, + 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 161, 162, -1, -1, 165, -1, 167, 7, 8, 50, 10, 11, 12, 13, 14, 15, 16, 17, @@ -2645,33 +2688,26 @@ static const yytype_int16 yycheck[] = 10, 11, 12, 13, 14, 15, 16, 17, -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, -1, -1, -1, -1, 50, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 161, 162, -1, -1, 165, -1, 167, - 50, 7, 8, -1, 10, 11, 12, 13, 14, 15, - 16, 17, -1, 19, 20, -1, 22, 23, 24, 7, - 8, -1, 10, 11, 12, 13, 14, 15, 16, 17, - -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, - -1, -1, -1, -1, 50, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 50, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 161, 162, -1, -1, 165, -1, 167, -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, 161, 162, -1, -1, 165, -1, 167, -1, - -1, -1, 50, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, 161, 162, -1, -1, 165, -1, 167, + -1, -1, -1, -1, -1, -1, 57, 58, -1, -1, + -1, 161, 162, -1, -1, 165, -1, 167, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 91, 92, 93, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 161, 162, -1, -1, 165, -1, 167, -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, 36, -1, -1, - -1, -1, -1, -1, -1, 161, 162, -1, -1, 165, - -1, 167, -1, -1, -1, -1, -1, -1, 57, 58, - -1, -1, -1, 161, 162, -1, -1, 165, -1, 167, - 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 93, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 114, 115, 116, -1, -1, - 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140 + -1, -1, -1, 114, 115, 116, -1, -1, 119, 120, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 139, 140 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -2717,36 +2753,37 @@ static const yytype_uint8 yystos[] = 215, 174, 175, 174, 175, 156, 156, 156, 156, 156, 156, 156, 164, 210, 212, 167, 212, 168, 212, 22, 156, 156, 156, 221, 156, 3, 4, 9, 25, 26, - 27, 40, 41, 59, 165, 211, 237, 238, 239, 159, - 239, 239, 239, 206, 204, 204, 204, 204, 159, 198, - 159, 198, 239, 162, 159, 159, 159, 159, 159, 159, - 239, 239, 239, 239, 239, 38, 206, 204, 240, 4, - 141, 142, 143, 146, 150, 151, 194, 222, 223, 38, - 156, 156, 156, 156, 210, 210, 210, 210, 210, 210, - 210, 159, 164, 168, 204, 212, 166, 168, 210, 210, - 210, 159, 201, 39, 204, 228, 229, 61, 236, 212, - 240, 159, 159, 239, 239, 239, 239, 239, 11, 54, - 11, 250, 239, 162, 240, 204, 240, 240, 240, 159, - 159, 251, 159, 159, 159, 204, 239, 239, 159, 201, - 201, 204, 210, 210, 210, 210, 250, 159, 159, 159, - 159, 251, 159, 210, 166, 168, 159, 159, 38, 34, - 54, 199, 202, 193, 159, 157, 22, 166, 17, 17, - 156, 159, 159, 159, 159, 239, 4, 239, 159, 159, - 239, 159, 159, 159, 4, 4, 159, 204, 239, 239, - 156, 159, 198, 204, 157, 159, 159, 159, 159, 157, - 210, 210, 210, 210, 157, 210, 166, 210, 210, 204, - 22, 4, 201, 178, 179, 39, 204, 195, 159, 239, - 239, 17, 204, 249, 239, 239, 239, 239, 198, 198, - 240, 239, 159, 240, 240, 240, 4, 239, 249, 239, - 210, 210, 210, 210, 159, 157, 159, 159, 251, 157, - 157, 157, 193, 199, 200, 22, 159, 162, 193, 193, - 157, 159, 164, 239, 251, 157, 198, 157, 157, 157, - 157, 210, 210, 210, 157, 179, 54, 197, 17, 164, - 176, 246, 121, 122, 239, 239, 195, 17, 204, 164, - 195, 157, 157, 157, 4, 152, 196, 239, 237, 164, - 176, 193, 193, 38, 193, 193, 22, 159, 237, 17, - 239, 239, 17, 159, 239, 193, 193, 239, 17, 73, - 239, 17, 239 + 27, 40, 41, 59, 162, 165, 167, 169, 211, 237, + 238, 239, 159, 239, 239, 239, 206, 204, 204, 204, + 204, 159, 198, 159, 198, 239, 162, 159, 159, 159, + 159, 159, 159, 239, 239, 239, 239, 239, 38, 206, + 204, 240, 4, 141, 142, 143, 146, 150, 151, 194, + 222, 223, 38, 156, 156, 156, 156, 210, 210, 210, + 210, 210, 210, 210, 159, 164, 168, 204, 212, 166, + 168, 210, 210, 210, 159, 201, 39, 204, 228, 229, + 61, 236, 164, 212, 167, 212, 168, 212, 22, 240, + 159, 159, 239, 239, 239, 239, 239, 11, 54, 11, + 250, 239, 162, 240, 204, 240, 240, 240, 159, 159, + 251, 159, 159, 159, 204, 239, 239, 159, 201, 201, + 204, 210, 210, 210, 210, 250, 159, 159, 159, 159, + 251, 159, 210, 166, 168, 159, 159, 38, 34, 54, + 199, 202, 193, 159, 157, 22, 164, 168, 212, 166, + 168, 17, 17, 156, 159, 159, 159, 159, 239, 4, + 239, 159, 159, 239, 159, 159, 159, 4, 4, 159, + 204, 239, 239, 156, 159, 198, 204, 157, 159, 159, + 159, 159, 157, 210, 210, 210, 210, 157, 210, 166, + 210, 210, 204, 22, 4, 201, 178, 179, 39, 204, + 195, 159, 166, 168, 239, 239, 17, 204, 249, 239, + 239, 239, 239, 198, 198, 240, 239, 159, 240, 240, + 240, 4, 239, 249, 239, 210, 210, 210, 210, 159, + 157, 159, 159, 251, 157, 157, 157, 193, 199, 200, + 22, 166, 159, 162, 193, 193, 157, 159, 164, 239, + 251, 157, 198, 157, 157, 157, 157, 210, 210, 210, + 157, 179, 54, 197, 17, 164, 176, 246, 121, 122, + 239, 239, 195, 17, 204, 164, 195, 157, 157, 157, + 4, 152, 196, 239, 237, 164, 176, 193, 193, 38, + 193, 193, 22, 159, 237, 17, 239, 239, 17, 159, + 239, 193, 193, 239, 17, 73, 239, 17, 239 }; #define yyerrok (yyerrstatus = 0) @@ -2820,7 +2857,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, \ @@ -5614,13 +5651,7 @@ yyreduce: GEN_ERROR("Invalid vector element type: " + ETy->getDescription()); VectorType* pt = VectorType::get(ETy, NumElements); - PATypeHolder* PTy = new PATypeHolder( - HandleUpRefs( - VectorType::get( - ETy, - NumElements) - ) - ); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt)); // Verify all elements are correct type! for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) { @@ -5637,15 +5668,117 @@ yyreduce: break; case 264: -#line 2508 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" +#line 2502 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { // Nonempty unsized arr + const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType(); + int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); + + if (!ETy->isFirstClassType()) + GEN_ERROR("Invalid array element type: " + ETy->getDescription()); + + ArrayType *ATy = ArrayType::get(ETy, NumElements); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(ATy)); + + // Verify all elements are correct type! + for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) { + if (ETy != (*(yyvsp[(2) - (3)].ConstVector))[i]->getType()) + GEN_ERROR("Element #" + utostr(i) + " is not of type '" + + ETy->getDescription() +"' as required!\nIt is of type '"+ + (*(yyvsp[(2) - (3)].ConstVector))[i]->getType()->getDescription() + "'."); + } + + (yyval.ValIDVal) = ValID::create(ConstantArray::get(ATy, *(yyvsp[(2) - (3)].ConstVector))); + delete PTy; delete (yyvsp[(2) - (3)].ConstVector); + CHECK_FOR_ERROR + ;} + break; + + case 265: +#line 2524 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + (yyval.ValIDVal) = ValID::createUndef(); + CHECK_FOR_ERROR + ;} + break; + + case 266: +#line 2528 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + int NumElements = (yyvsp[(2) - (2)].StrVal)->length(); + const Type *ETy = Type::Int8Ty; + + ArrayType *ATy = ArrayType::get(ETy, NumElements); + + std::vector Vals; + for (unsigned i = 0; i < (yyvsp[(2) - (2)].StrVal)->length(); ++i) + Vals.push_back(ConstantInt::get(ETy, (*(yyvsp[(2) - (2)].StrVal))[i])); + delete (yyvsp[(2) - (2)].StrVal); + (yyval.ValIDVal) = ValID::create(ConstantArray::get(ATy, Vals)); + CHECK_FOR_ERROR + ;} + break; + + case 267: +#line 2541 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + std::vector Elements((yyvsp[(2) - (3)].ConstVector)->size()); + for (unsigned i = 0, e = (yyvsp[(2) - (3)].ConstVector)->size(); i != e; ++i) + Elements[i] = (*(yyvsp[(2) - (3)].ConstVector))[i]->getType(); + + const StructType *STy = StructType::get(Elements); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(STy)); + + (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, *(yyvsp[(2) - (3)].ConstVector))); + delete PTy; delete (yyvsp[(2) - (3)].ConstVector); + CHECK_FOR_ERROR + ;} + break; + + case 268: +#line 2553 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + const StructType *STy = StructType::get(std::vector()); + (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, std::vector())); + CHECK_FOR_ERROR + ;} + break; + + case 269: +#line 2558 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + std::vector Elements((yyvsp[(3) - (5)].ConstVector)->size()); + for (unsigned i = 0, e = (yyvsp[(3) - (5)].ConstVector)->size(); i != e; ++i) + Elements[i] = (*(yyvsp[(3) - (5)].ConstVector))[i]->getType(); + + const StructType *STy = StructType::get(Elements, /*isPacked=*/true); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(STy)); + + (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, *(yyvsp[(3) - (5)].ConstVector))); + delete PTy; delete (yyvsp[(3) - (5)].ConstVector); + CHECK_FOR_ERROR + ;} + break; + + case 270: +#line 2570 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + { + const StructType *STy = StructType::get(std::vector(), + /*isPacked=*/true); + (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, std::vector())); + CHECK_FOR_ERROR + ;} + break; + + case 271: +#line 2576 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal)); CHECK_FOR_ERROR ;} break; - case 265: -#line 2512 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 272: +#line 2580 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createInlineAsm(*(yyvsp[(3) - (5)].StrVal), *(yyvsp[(5) - (5)].StrVal), (yyvsp[(2) - (5)].BoolVal)); delete (yyvsp[(3) - (5)].StrVal); @@ -5654,24 +5787,24 @@ yyreduce: ;} break; - case 266: -#line 2522 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 273: +#line 2590 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Is it an integer reference...? (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal)); CHECK_FOR_ERROR ;} break; - case 267: -#line 2526 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 274: +#line 2594 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal)); CHECK_FOR_ERROR ;} break; - case 268: -#line 2530 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 275: +#line 2598 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Is it a named reference...? (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -5679,8 +5812,8 @@ yyreduce: ;} break; - case 269: -#line 2535 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 276: +#line 2603 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Is it a named reference...? (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal)); delete (yyvsp[(1) - (1)].StrVal); @@ -5688,8 +5821,8 @@ yyreduce: ;} break; - case 272: -#line 2548 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 279: +#line 2616 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription()); @@ -5699,8 +5832,8 @@ yyreduce: ;} break; - case 273: -#line 2557 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 280: +#line 2625 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = new std::vector(); (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal)); @@ -5708,32 +5841,32 @@ yyreduce: ;} break; - case 274: -#line 2562 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 281: +#line 2630 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal)); CHECK_FOR_ERROR ;} break; - case 275: -#line 2567 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 282: +#line 2635 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR ;} break; - case 276: -#line 2571 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 283: +#line 2639 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Do not allow functions with 0 basic blocks (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal); CHECK_FOR_ERROR ;} break; - case 277: -#line 2580 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 284: +#line 2648 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal)); CHECK_FOR_ERROR @@ -5744,8 +5877,8 @@ yyreduce: ;} break; - case 278: -#line 2589 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 285: +#line 2657 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (CastInst *CI1 = dyn_cast((yyvsp[(2) - (2)].InstVal))) if (CastInst *CI2 = dyn_cast(CI1->getOperand(0))) @@ -5757,16 +5890,16 @@ yyreduce: ;} break; - case 279: -#line 2598 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 286: +#line 2666 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Empty space between instruction lists (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum)); CHECK_FOR_ERROR ;} break; - case 280: -#line 2602 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 287: +#line 2670 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Labelled (named) basic block (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal))); delete (yyvsp[(1) - (1)].StrVal); @@ -5775,8 +5908,8 @@ yyreduce: ;} break; - case 281: -#line 2610 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 288: +#line 2678 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Return with a result... ValueList &VL = *(yyvsp[(2) - (2)].ValueList); assert(!VL.empty() && "Invalid ret operands!"); @@ -5786,16 +5919,16 @@ yyreduce: ;} break; - case 282: -#line 2617 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 289: +#line 2685 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Return with no result... (yyval.TermInstVal) = ReturnInst::Create(); CHECK_FOR_ERROR ;} break; - case 283: -#line 2621 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 290: +#line 2689 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Unconditional Branch... BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal)); CHECK_FOR_ERROR @@ -5803,8 +5936,8 @@ yyreduce: ;} break; - case 284: -#line 2626 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 291: +#line 2694 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (cast((yyvsp[(2) - (9)].PrimType))->getBitWidth() != 1) GEN_ERROR("Branch condition must have type i1"); @@ -5818,8 +5951,8 @@ yyreduce: ;} break; - case 285: -#line 2637 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 292: +#line 2705 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal)); CHECK_FOR_ERROR @@ -5841,8 +5974,8 @@ yyreduce: ;} break; - case 286: -#line 2656 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 293: +#line 2724 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal)); CHECK_FOR_ERROR @@ -5854,8 +5987,8 @@ yyreduce: ;} break; - case 287: -#line 2666 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 294: +#line 2734 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Handle the short syntax @@ -5943,24 +6076,24 @@ yyreduce: ;} break; - case 288: -#line 2751 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 295: +#line 2819 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TermInstVal) = new UnwindInst(); CHECK_FOR_ERROR ;} break; - case 289: -#line 2755 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 296: +#line 2823 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.TermInstVal) = new UnreachableInst(); CHECK_FOR_ERROR ;} break; - case 290: -#line 2762 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 297: +#line 2830 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable); Constant *V = cast(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal))); @@ -5974,8 +6107,8 @@ yyreduce: ;} break; - case 291: -#line 2773 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 298: +#line 2841 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.JumpTable) = new std::vector >(); Constant *V = cast(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal))); @@ -5990,8 +6123,8 @@ yyreduce: ;} break; - case 292: -#line 2786 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 299: +#line 2854 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Is this definition named?? if so, assign the name... setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal)); @@ -6002,8 +6135,8 @@ yyreduce: ;} break; - case 293: -#line 2796 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 300: +#line 2864 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Used for PHI nodes if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription()); @@ -6017,8 +6150,8 @@ yyreduce: ;} break; - case 294: -#line 2807 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 301: +#line 2875 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList); Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList)->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal)); @@ -6029,8 +6162,8 @@ yyreduce: ;} break; - case 295: -#line 2817 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 302: +#line 2885 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) @@ -6044,8 +6177,8 @@ yyreduce: ;} break; - case 296: -#line 2828 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 303: +#line 2896 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 // Labels are only valid in ASMs @@ -6056,8 +6189,8 @@ yyreduce: ;} break; - case 297: -#line 2836 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 304: +#line 2904 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 if (!UpRefs.empty()) @@ -6070,8 +6203,8 @@ yyreduce: ;} break; - case 298: -#line 2846 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 305: +#line 2914 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0 (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList); @@ -6081,18 +6214,18 @@ yyreduce: ;} break; - case 299: -#line 2853 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 306: +#line 2921 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ParamList) = new ParamList(); ;} break; - case 300: -#line 2856 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 307: +#line 2924 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = new std::vector(); ;} break; - case 301: -#line 2857 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 308: +#line 2925 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList); (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal)); @@ -6100,8 +6233,8 @@ yyreduce: ;} break; - case 302: -#line 2865 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 309: +#line 2933 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ConstantList) = new std::vector(); if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val)) @@ -6110,8 +6243,8 @@ yyreduce: ;} break; - case 303: -#line 2871 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 310: +#line 2939 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.ConstantList) = (yyvsp[(1) - (3)].ConstantList); if ((unsigned)(yyvsp[(3) - (3)].UInt64Val) != (yyvsp[(3) - (3)].UInt64Val)) @@ -6121,24 +6254,24 @@ yyreduce: ;} break; - case 304: -#line 2880 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 311: +#line 2948 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR ;} break; - case 305: -#line 2884 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 312: +#line 2952 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR ;} break; - case 306: -#line 2889 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 313: +#line 2957 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription()); @@ -6157,8 +6290,8 @@ yyreduce: ;} break; - case 307: -#line 2905 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 314: +#line 2973 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription()); @@ -6178,8 +6311,8 @@ yyreduce: ;} break; - case 308: -#line 2922 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 315: +#line 2990 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); @@ -6196,8 +6329,8 @@ yyreduce: ;} break; - case 309: -#line 2936 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 316: +#line 3004 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); @@ -6214,8 +6347,8 @@ yyreduce: ;} break; - case 310: -#line 2950 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 317: +#line 3018 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); @@ -6232,8 +6365,8 @@ yyreduce: ;} break; - case 311: -#line 2964 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 318: +#line 3032 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription()); @@ -6250,8 +6383,8 @@ yyreduce: ;} break; - case 312: -#line 2978 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 319: +#line 3046 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription()); @@ -6266,8 +6399,8 @@ yyreduce: ;} break; - case 313: -#line 2990 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 320: +#line 3058 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if ((yyvsp[(2) - (6)].ValueVal)->getType() != Type::Int1Ty) GEN_ERROR("select condition must be boolean"); @@ -6278,8 +6411,8 @@ yyreduce: ;} break; - case 314: -#line 2998 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 321: +#line 3066 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription()); @@ -6289,8 +6422,8 @@ yyreduce: ;} break; - case 315: -#line 3005 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 322: +#line 3073 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal))) GEN_ERROR("Invalid extractelement operands"); @@ -6299,8 +6432,8 @@ yyreduce: ;} break; - case 316: -#line 3011 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 323: +#line 3079 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal))) GEN_ERROR("Invalid insertelement operands"); @@ -6309,8 +6442,8 @@ yyreduce: ;} break; - case 317: -#line 3017 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 324: +#line 3085 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal))) GEN_ERROR("Invalid shufflevector operands"); @@ -6319,8 +6452,8 @@ yyreduce: ;} break; - case 318: -#line 3023 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 325: +#line 3091 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType(); if (!Ty->isFirstClassType()) @@ -6338,8 +6471,8 @@ yyreduce: ;} break; - case 319: -#line 3039 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 326: +#line 3107 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { // Handle the short syntax @@ -6431,32 +6564,32 @@ yyreduce: ;} break; - case 320: -#line 3128 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 327: +#line 3196 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal); CHECK_FOR_ERROR ;} break; - case 321: -#line 3133 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 328: +#line 3201 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = true; CHECK_FOR_ERROR ;} break; - case 322: -#line 3137 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 329: +#line 3205 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { (yyval.BoolVal) = false; CHECK_FOR_ERROR ;} break; - case 323: -#line 3144 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 330: +#line 3212 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription()); @@ -6466,8 +6599,8 @@ yyreduce: ;} break; - case 324: -#line 3151 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 331: +#line 3219 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription()); @@ -6480,8 +6613,8 @@ yyreduce: ;} break; - case 325: -#line 3161 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 332: +#line 3229 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription()); @@ -6491,8 +6624,8 @@ yyreduce: ;} break; - case 326: -#line 3168 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 333: +#line 3236 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription()); @@ -6505,8 +6638,8 @@ yyreduce: ;} break; - case 327: -#line 3178 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 334: +#line 3246 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!isa((yyvsp[(2) - (2)].ValueVal)->getType())) GEN_ERROR("Trying to free nonpointer type " + @@ -6516,8 +6649,8 @@ yyreduce: ;} break; - case 328: -#line 3186 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 335: +#line 3254 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription()); @@ -6534,8 +6667,8 @@ yyreduce: ;} break; - case 329: -#line 3200 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 336: +#line 3268 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription()); @@ -6555,8 +6688,8 @@ yyreduce: ;} break; - case 330: -#line 3217 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 337: +#line 3285 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { Value *TmpVal = getVal((yyvsp[(2) - (5)].TypeVal)->get(), (yyvsp[(3) - (5)].ValIDVal)); if (!GetResultInst::isValidOperands(TmpVal, (yyvsp[(5) - (5)].UInt64Val))) @@ -6567,8 +6700,8 @@ yyreduce: ;} break; - case 331: -#line 3225 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 338: +#line 3293 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription()); @@ -6586,8 +6719,8 @@ yyreduce: ;} break; - case 332: -#line 3240 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 339: +#line 3308 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription()); @@ -6605,8 +6738,8 @@ yyreduce: ;} break; - case 333: -#line 3255 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" + case 340: +#line 3323 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" { if (!UpRefs.empty()) GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (7)].TypeVal))->getDescription()); @@ -6628,7 +6761,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 6632 "llvmAsmParser.tab.c" +#line 6765 "llvmAsmParser.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -6842,7 +6975,7 @@ yyreturn: } -#line 3274 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" +#line 3342 "/Users/gohman/LLVM/llvm/lib/AsmParser/llvmAsmParser.y" // common code from the two 'RunVMAsmParser' functions diff --git a/lib/AsmParser/llvmAsmParser.h.cvs b/lib/AsmParser/llvmAsmParser.h.cvs index 0eb12c41485..5e85c30d0e8 100644 --- a/lib/AsmParser/llvmAsmParser.h.cvs +++ b/lib/AsmParser/llvmAsmParser.h.cvs @@ -402,7 +402,7 @@ typedef union YYSTYPE llvm::ICmpInst::Predicate IPredicate; llvm::FCmpInst::Predicate FPredicate; } -/* Line 1529 of yacc.c. */ +/* Line 1489 of yacc.c. */ #line 407 "llvmAsmParser.tab.h" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index fd1fe41a1ef..ea3aef3a0bc 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -2485,13 +2485,7 @@ ConstValueRef : ESINT64VAL { // A reference to a direct constant GEN_ERROR("Invalid vector element type: " + ETy->getDescription()); VectorType* pt = VectorType::get(ETy, NumElements); - PATypeHolder* PTy = new PATypeHolder( - HandleUpRefs( - VectorType::get( - ETy, - NumElements) - ) - ); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt)); // Verify all elements are correct type! for (unsigned i = 0; i < $2->size(); i++) { @@ -2505,6 +2499,80 @@ ConstValueRef : ESINT64VAL { // A reference to a direct constant delete PTy; delete $2; CHECK_FOR_ERROR } + | '[' ConstVector ']' { // Nonempty unsized arr + const Type *ETy = (*$2)[0]->getType(); + int NumElements = $2->size(); + + if (!ETy->isFirstClassType()) + GEN_ERROR("Invalid array element type: " + ETy->getDescription()); + + ArrayType *ATy = ArrayType::get(ETy, NumElements); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(ATy)); + + // Verify all elements are correct type! + for (unsigned i = 0; i < $2->size(); i++) { + if (ETy != (*$2)[i]->getType()) + GEN_ERROR("Element #" + utostr(i) + " is not of type '" + + ETy->getDescription() +"' as required!\nIt is of type '"+ + (*$2)[i]->getType()->getDescription() + "'."); + } + + $$ = ValID::create(ConstantArray::get(ATy, *$2)); + delete PTy; delete $2; + CHECK_FOR_ERROR + } + | '[' ']' { + $$ = ValID::createUndef(); + CHECK_FOR_ERROR + } + | 'c' STRINGCONSTANT { + int NumElements = $2->length(); + const Type *ETy = Type::Int8Ty; + + ArrayType *ATy = ArrayType::get(ETy, NumElements); + + std::vector Vals; + for (unsigned i = 0; i < $2->length(); ++i) + Vals.push_back(ConstantInt::get(ETy, (*$2)[i])); + delete $2; + $$ = ValID::create(ConstantArray::get(ATy, Vals)); + CHECK_FOR_ERROR + } + | '{' ConstVector '}' { + std::vector Elements($2->size()); + for (unsigned i = 0, e = $2->size(); i != e; ++i) + Elements[i] = (*$2)[i]->getType(); + + const StructType *STy = StructType::get(Elements); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(STy)); + + $$ = ValID::create(ConstantStruct::get(STy, *$2)); + delete PTy; delete $2; + CHECK_FOR_ERROR + } + | '{' '}' { + const StructType *STy = StructType::get(std::vector()); + $$ = ValID::create(ConstantStruct::get(STy, std::vector())); + CHECK_FOR_ERROR + } + | '<' '{' ConstVector '}' '>' { + std::vector Elements($3->size()); + for (unsigned i = 0, e = $3->size(); i != e; ++i) + Elements[i] = (*$3)[i]->getType(); + + const StructType *STy = StructType::get(Elements, /*isPacked=*/true); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(STy)); + + $$ = ValID::create(ConstantStruct::get(STy, *$3)); + delete PTy; delete $3; + CHECK_FOR_ERROR + } + | '<' '{' '}' '>' { + const StructType *STy = StructType::get(std::vector(), + /*isPacked=*/true); + $$ = ValID::create(ConstantStruct::get(STy, std::vector())); + CHECK_FOR_ERROR + } | ConstExpr { $$ = ValID::create($1); CHECK_FOR_ERROR diff --git a/lib/AsmParser/llvmAsmParser.y.cvs b/lib/AsmParser/llvmAsmParser.y.cvs index fd1fe41a1ef..ea3aef3a0bc 100644 --- a/lib/AsmParser/llvmAsmParser.y.cvs +++ b/lib/AsmParser/llvmAsmParser.y.cvs @@ -2485,13 +2485,7 @@ ConstValueRef : ESINT64VAL { // A reference to a direct constant GEN_ERROR("Invalid vector element type: " + ETy->getDescription()); VectorType* pt = VectorType::get(ETy, NumElements); - PATypeHolder* PTy = new PATypeHolder( - HandleUpRefs( - VectorType::get( - ETy, - NumElements) - ) - ); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt)); // Verify all elements are correct type! for (unsigned i = 0; i < $2->size(); i++) { @@ -2505,6 +2499,80 @@ ConstValueRef : ESINT64VAL { // A reference to a direct constant delete PTy; delete $2; CHECK_FOR_ERROR } + | '[' ConstVector ']' { // Nonempty unsized arr + const Type *ETy = (*$2)[0]->getType(); + int NumElements = $2->size(); + + if (!ETy->isFirstClassType()) + GEN_ERROR("Invalid array element type: " + ETy->getDescription()); + + ArrayType *ATy = ArrayType::get(ETy, NumElements); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(ATy)); + + // Verify all elements are correct type! + for (unsigned i = 0; i < $2->size(); i++) { + if (ETy != (*$2)[i]->getType()) + GEN_ERROR("Element #" + utostr(i) + " is not of type '" + + ETy->getDescription() +"' as required!\nIt is of type '"+ + (*$2)[i]->getType()->getDescription() + "'."); + } + + $$ = ValID::create(ConstantArray::get(ATy, *$2)); + delete PTy; delete $2; + CHECK_FOR_ERROR + } + | '[' ']' { + $$ = ValID::createUndef(); + CHECK_FOR_ERROR + } + | 'c' STRINGCONSTANT { + int NumElements = $2->length(); + const Type *ETy = Type::Int8Ty; + + ArrayType *ATy = ArrayType::get(ETy, NumElements); + + std::vector Vals; + for (unsigned i = 0; i < $2->length(); ++i) + Vals.push_back(ConstantInt::get(ETy, (*$2)[i])); + delete $2; + $$ = ValID::create(ConstantArray::get(ATy, Vals)); + CHECK_FOR_ERROR + } + | '{' ConstVector '}' { + std::vector Elements($2->size()); + for (unsigned i = 0, e = $2->size(); i != e; ++i) + Elements[i] = (*$2)[i]->getType(); + + const StructType *STy = StructType::get(Elements); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(STy)); + + $$ = ValID::create(ConstantStruct::get(STy, *$2)); + delete PTy; delete $2; + CHECK_FOR_ERROR + } + | '{' '}' { + const StructType *STy = StructType::get(std::vector()); + $$ = ValID::create(ConstantStruct::get(STy, std::vector())); + CHECK_FOR_ERROR + } + | '<' '{' ConstVector '}' '>' { + std::vector Elements($3->size()); + for (unsigned i = 0, e = $3->size(); i != e; ++i) + Elements[i] = (*$3)[i]->getType(); + + const StructType *STy = StructType::get(Elements, /*isPacked=*/true); + PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(STy)); + + $$ = ValID::create(ConstantStruct::get(STy, *$3)); + delete PTy; delete $3; + CHECK_FOR_ERROR + } + | '<' '{' '}' '>' { + const StructType *STy = StructType::get(std::vector(), + /*isPacked=*/true); + $$ = ValID::create(ConstantStruct::get(STy, std::vector())); + CHECK_FOR_ERROR + } | ConstExpr { $$ = ValID::create($1); CHECK_FOR_ERROR diff --git a/utils/llvm.grm b/utils/llvm.grm index 6d6cbe00ea1..bec33edff9c 100644 --- a/utils/llvm.grm +++ b/utils/llvm.grm @@ -295,6 +295,13 @@ ConstValueRef ::= ESINT64VAL | undef | zeroinitializer | "<" ConstVector ">" + | "[" ConstVector "]" + | "[" "]" + | "c" ^ STRINGCONSTANT + | "{" ConstVector "}" + | "{" "}" + | "<" ^ "{" ConstVector "}" ^ ">" + | "<" ^ "{" "}" ^ ">" | ConstExpr | asm OptSideEffect STRINGCONSTANT ^ "," STRINGCONSTANT ;