From 29ddbaa8c9d573fe0ad35d7bfbbcfb16f0d0ca92 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Tue, 18 Nov 2008 18:51:13 +0000 Subject: [PATCH] Revert 37416 because it does not build on all machines. svn path=/trunk/; revision=37446 --- reactos/media/doc/README.WINE | 2 +- reactos/tools/widl/parser.l | 2 +- reactos/tools/widl/parser.tab.c | 2850 +++++++++++++++---------------- reactos/tools/widl/parser.tab.h | 2 +- reactos/tools/widl/parser.y | 110 +- reactos/tools/widl/parser.yy.c | 7 +- reactos/tools/widl/typegen.c | 174 +- reactos/tools/widl/typelib.c | 1 - reactos/tools/widl/widltypes.h | 3 - 9 files changed, 1525 insertions(+), 1626 deletions(-) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index bda1b2f44a6..607fbd1f621 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -26,7 +26,7 @@ reactos/tools/wpp # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/winebuild # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wmc # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wrc # Synced to Wine-20081105 (~Wine-1.1.7) -reactos/tools/widl # Synced to Wine-1_1_1 +reactos/tools/widl # Synced to Wine-1_1_0 The following libraries are shared with Wine. diff --git a/reactos/tools/widl/parser.l b/reactos/tools/widl/parser.l index 1953a270da9..437007f186b 100644 --- a/reactos/tools/widl/parser.l +++ b/reactos/tools/widl/parser.l @@ -19,7 +19,7 @@ */ %option stack -%option noinput nounput noyy_top_state +%option nounput noyy_top_state %option 8bit never-interactive prefix="parser_" nl \r?\n diff --git a/reactos/tools/widl/parser.tab.c b/reactos/tools/widl/parser.tab.c index 6f5c3032e94..99423d7e571 100644 --- a/reactos/tools/widl/parser.tab.c +++ b/reactos/tools/widl/parser.tab.c @@ -501,8 +501,7 @@ static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type); static type_t *reg_type(type_t *type, const char *name, int t); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); -static type_t *find_type_or_error(const char *name, int t); -static type_t *find_type_or_error2(char *name, int t); +static type_t *find_type2(char *name, int t); static type_t *get_type(unsigned char type, char *name, int t); static type_t *get_typev(unsigned char type, var_t *name, int t); static int get_struct_type(var_list_t *fields); @@ -530,7 +529,6 @@ static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(func_t *func); -static void check_def(const type_t *t); static statement_t *make_statement(enum statement_type type); static statement_t *make_statement_type_decl(type_t *type); @@ -569,7 +567,7 @@ static func_list_t *append_func_from_statement(func_list_t *list, statement_t *s #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 179 "parser.y" +#line 177 "parser.y" typedef union YYSTYPE { attr_t *attr; attr_list_t *attr_list; @@ -599,7 +597,7 @@ typedef union YYSTYPE { enum storage_class stgclass; } YYSTYPE; /* Line 196 of yacc.c. */ -#line 603 "parser.tab.c" +#line 601 "parser.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -611,7 +609,7 @@ typedef union YYSTYPE { /* Line 219 of yacc.c. */ -#line 615 "parser.tab.c" +#line 613 "parser.tab.c" #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -762,16 +760,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2092 +#define YYLAST 2015 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 176 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 88 +#define YYNNTS 87 /* YYNRULES -- Number of rules. */ -#define YYNRULES 309 +#define YYNRULES 308 /* YYNRULES -- Number of states. */ -#define YYNSTATES 545 +#define YYNSTATES 546 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -834,169 +832,169 @@ static const unsigned short int yyprhs[] = 0, 0, 3, 5, 6, 9, 12, 16, 19, 22, 25, 28, 29, 32, 35, 39, 42, 45, 48, 51, 54, 55, 58, 59, 61, 63, 66, 69, 71, 74, - 76, 78, 80, 85, 89, 93, 99, 102, 106, 111, - 112, 114, 116, 118, 122, 124, 128, 131, 135, 139, - 140, 142, 146, 148, 152, 157, 159, 163, 164, 166, - 168, 170, 172, 174, 176, 181, 186, 188, 190, 192, - 194, 196, 198, 203, 205, 207, 212, 214, 219, 224, - 226, 228, 233, 238, 243, 248, 253, 255, 260, 262, - 267, 269, 275, 277, 279, 284, 289, 291, 293, 295, - 297, 299, 301, 303, 305, 307, 312, 314, 316, 318, - 320, 327, 329, 331, 333, 335, 340, 342, 344, 346, - 351, 356, 361, 366, 368, 370, 375, 380, 382, 384, - 386, 388, 390, 392, 394, 395, 398, 403, 407, 408, - 411, 413, 415, 419, 423, 425, 431, 433, 437, 438, - 440, 442, 444, 446, 448, 450, 452, 454, 456, 458, - 464, 468, 472, 476, 480, 484, 488, 492, 496, 500, - 504, 508, 512, 516, 520, 524, 528, 532, 536, 539, - 542, 545, 548, 551, 554, 558, 562, 567, 572, 577, - 581, 583, 587, 589, 591, 592, 595, 600, 604, 607, - 610, 611, 614, 617, 619, 623, 627, 631, 634, 635, - 637, 638, 640, 642, 644, 646, 648, 650, 652, 655, - 658, 660, 662, 664, 666, 668, 670, 672, 673, 675, - 677, 680, 682, 685, 688, 690, 692, 695, 698, 701, - 707, 708, 711, 714, 717, 720, 723, 726, 730, 733, - 737, 743, 749, 750, 753, 756, 759, 762, 769, 778, - 781, 784, 787, 790, 793, 796, 802, 804, 806, 808, - 810, 812, 813, 816, 819, 823, 824, 826, 829, 832, - 835, 839, 842, 844, 846, 850, 853, 858, 860, 864, - 866, 870, 872, 874, 876, 882, 884, 886, 888, 890, - 893, 895, 898, 900, 903, 908, 913, 919, 930, 932 + 77, 80, 85, 89, 93, 99, 102, 106, 111, 112, + 114, 116, 118, 122, 124, 128, 131, 135, 139, 140, + 142, 146, 148, 152, 157, 159, 163, 164, 166, 168, + 170, 172, 174, 176, 181, 186, 188, 190, 192, 194, + 196, 198, 203, 205, 207, 212, 214, 219, 224, 226, + 228, 233, 238, 243, 248, 253, 255, 260, 262, 267, + 269, 275, 277, 279, 284, 289, 291, 293, 295, 297, + 299, 301, 303, 305, 307, 312, 314, 316, 318, 320, + 327, 329, 331, 333, 335, 340, 342, 344, 346, 351, + 356, 361, 366, 368, 370, 375, 380, 382, 384, 386, + 388, 390, 392, 394, 395, 398, 403, 407, 408, 411, + 413, 415, 419, 423, 425, 431, 433, 437, 438, 440, + 442, 444, 446, 448, 450, 452, 454, 456, 458, 464, + 468, 472, 476, 480, 484, 488, 492, 496, 500, 504, + 508, 512, 516, 520, 524, 528, 532, 536, 539, 542, + 545, 548, 551, 554, 558, 562, 567, 572, 577, 581, + 583, 587, 589, 591, 592, 595, 600, 604, 607, 610, + 611, 614, 617, 619, 623, 627, 631, 634, 635, 637, + 638, 640, 642, 644, 646, 648, 650, 652, 655, 658, + 660, 662, 664, 666, 668, 670, 672, 673, 675, 677, + 680, 682, 685, 688, 690, 692, 695, 698, 701, 707, + 708, 711, 714, 717, 720, 723, 726, 730, 733, 737, + 743, 749, 750, 753, 756, 759, 762, 769, 778, 781, + 784, 787, 790, 793, 796, 802, 804, 806, 808, 810, + 812, 813, 816, 819, 823, 824, 826, 829, 832, 835, + 839, 842, 844, 846, 850, 853, 858, 860, 864, 866, + 870, 872, 874, 876, 882, 884, 886, 888, 890, 893, + 895, 898, 900, 903, 908, 913, 919, 930, 932 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const short int yyrhs[] = { - 177, 0, -1, 178, -1, -1, 178, 243, -1, 178, - 242, -1, 178, 229, 170, -1, 178, 231, -1, 178, - 246, -1, 178, 190, -1, 178, 182, -1, -1, 179, - 243, -1, 179, 242, -1, 179, 229, 170, -1, 179, - 231, -1, 179, 246, -1, 179, 182, -1, 179, 187, - -1, 179, 190, -1, -1, 180, 182, -1, -1, 170, - -1, 184, -1, 183, 170, -1, 222, 170, -1, 186, - -1, 261, 170, -1, 208, -1, 259, -1, 262, -1, - 45, 171, 8, 172, -1, 78, 8, 170, -1, 185, + 177, 0, -1, 178, -1, -1, 178, 242, -1, 178, + 241, -1, 178, 228, 170, -1, 178, 230, -1, 178, + 245, -1, 178, 189, -1, 178, 182, -1, -1, 179, + 242, -1, 179, 241, -1, 179, 228, 170, -1, 179, + 230, -1, 179, 245, -1, 179, 182, -1, 179, 186, + -1, 179, 189, -1, -1, 180, 182, -1, -1, 170, + -1, 183, -1, 207, 170, -1, 221, 170, -1, 185, + -1, 258, 170, -1, 260, 170, -1, 261, 170, -1, + 45, 171, 8, 172, -1, 78, 8, 170, -1, 184, 179, 11, -1, 79, 171, 8, 172, 181, -1, 89, - 3, -1, 197, 188, 173, -1, 189, 179, 174, 181, - -1, -1, 193, -1, 144, -1, 194, -1, 193, 147, - 194, -1, 192, -1, 197, 251, 254, -1, 251, 254, - -1, 168, 210, 169, -1, 168, 157, 169, -1, -1, - 197, -1, 168, 198, 169, -1, 200, -1, 198, 147, - 200, -1, 198, 169, 168, 200, -1, 8, -1, 199, + 3, -1, 196, 187, 173, -1, 188, 179, 174, 181, + -1, -1, 192, -1, 144, -1, 193, -1, 192, 147, + 193, -1, 191, -1, 196, 250, 253, -1, 250, 253, + -1, 168, 209, 169, -1, 168, 157, 169, -1, -1, + 196, -1, 168, 197, 169, -1, 199, -1, 197, 147, + 199, -1, 197, 169, 168, 199, -1, 8, -1, 198, 147, 8, -1, -1, 21, -1, 23, -1, 24, -1, - 26, -1, 27, -1, 29, -1, 32, 171, 225, 172, - -1, 34, 171, 212, 172, -1, 41, -1, 42, -1, + 26, -1, 27, -1, 29, -1, 32, 171, 224, 172, + -1, 34, 171, 211, 172, -1, 41, -1, 42, -1, 43, -1, 44, -1, 46, -1, 47, -1, 48, 171, - 214, 172, -1, 49, -1, 50, -1, 52, 171, 8, - 172, -1, 54, -1, 55, 171, 199, 172, -1, 56, - 171, 214, 172, -1, 59, -1, 64, -1, 66, 171, - 213, 172, -1, 67, 171, 8, 172, -1, 68, 171, - 8, 172, -1, 69, 171, 213, 172, -1, 70, 171, - 8, 172, -1, 71, -1, 73, 171, 213, 172, -1, - 74, -1, 75, 171, 211, 172, -1, 76, -1, 77, + 213, 172, -1, 49, -1, 50, -1, 52, 171, 8, + 172, -1, 54, -1, 55, 171, 198, 172, -1, 56, + 171, 213, 172, -1, 59, -1, 64, -1, 66, 171, + 212, 172, -1, 67, 171, 8, 172, -1, 68, 171, + 8, 172, -1, 69, 171, 212, 172, -1, 70, 171, + 8, 172, -1, 71, -1, 73, 171, 212, 172, -1, + 74, -1, 75, 171, 210, 172, -1, 76, -1, 77, 171, 65, 3, 172, -1, 80, -1, 83, -1, 88, - 171, 209, 172, -1, 87, 171, 213, 172, -1, 90, + 171, 208, 172, -1, 87, 171, 212, 172, -1, 90, -1, 94, -1, 95, -1, 96, -1, 98, -1, 99, - -1, 100, -1, 101, -1, 102, -1, 104, 171, 258, + -1, 100, -1, 101, -1, 102, -1, 104, 171, 257, 172, -1, 106, -1, 107, -1, 108, -1, 110, -1, - 111, 171, 213, 147, 213, 172, -1, 112, -1, 115, - -1, 116, -1, 117, -1, 122, 171, 209, 172, -1, - 125, -1, 128, -1, 129, -1, 132, 171, 211, 172, - -1, 133, 171, 260, 172, -1, 134, 171, 260, 172, - -1, 140, 171, 201, 172, -1, 141, -1, 142, -1, - 143, 171, 263, 172, -1, 146, 171, 260, 172, -1, - 258, -1, 10, -1, 8, -1, 35, -1, 62, -1, - 103, -1, 127, -1, -1, 203, 204, -1, 34, 213, - 149, 219, -1, 46, 149, 219, -1, -1, 206, 147, - -1, 206, -1, 207, -1, 206, 147, 207, -1, 225, - 175, 213, -1, 225, -1, 57, 224, 173, 205, 174, - -1, 210, -1, 209, 147, 210, -1, -1, 211, -1, + 111, 171, 212, 147, 212, 172, -1, 112, -1, 115, + -1, 116, -1, 117, -1, 122, 171, 208, 172, -1, + 125, -1, 128, -1, 129, -1, 132, 171, 210, 172, + -1, 133, 171, 259, 172, -1, 134, 171, 259, 172, + -1, 140, 171, 200, 172, -1, 141, -1, 142, -1, + 143, 171, 262, 172, -1, 146, 171, 259, 172, -1, + 257, -1, 10, -1, 8, -1, 35, -1, 62, -1, + 103, -1, 127, -1, -1, 202, 203, -1, 34, 212, + 149, 218, -1, 46, 149, 218, -1, -1, 205, 147, + -1, 205, -1, 206, -1, 205, 147, 206, -1, 224, + 175, 212, -1, 224, -1, 57, 223, 173, 204, 174, + -1, 209, -1, 208, 147, 209, -1, -1, 210, -1, 5, -1, 6, -1, 7, -1, 61, -1, 97, -1, - 135, -1, 8, -1, 9, -1, 3, -1, 211, 148, - 211, 149, 211, -1, 211, 19, 211, -1, 211, 20, - 211, -1, 211, 150, 211, -1, 211, 151, 211, -1, - 211, 152, 211, -1, 211, 15, 211, -1, 211, 16, - 211, -1, 211, 154, 211, -1, 211, 153, 211, -1, - 211, 17, 211, -1, 211, 18, 211, -1, 211, 12, - 211, -1, 211, 13, 211, -1, 211, 156, 211, -1, - 211, 155, 211, -1, 211, 159, 211, -1, 211, 157, - 211, -1, 211, 158, 211, -1, 160, 211, -1, 161, - 211, -1, 156, 211, -1, 155, 211, -1, 152, 211, - -1, 157, 211, -1, 211, 14, 3, -1, 211, 167, - 3, -1, 171, 260, 172, 211, -1, 123, 171, 260, - 172, -1, 211, 168, 211, 169, -1, 171, 211, 172, - -1, 213, -1, 212, 147, 213, -1, 211, -1, 211, - -1, -1, 215, 216, -1, 196, 251, 256, 170, -1, - 196, 262, 170, -1, 220, 170, -1, 197, 170, -1, - -1, 218, 217, -1, 220, 170, -1, 170, -1, 196, - 251, 254, -1, 196, 251, 254, -1, 197, 251, 257, - -1, 251, 257, -1, -1, 225, -1, -1, 3, -1, + 135, -1, 8, -1, 9, -1, 3, -1, 210, 148, + 210, 149, 210, -1, 210, 19, 210, -1, 210, 20, + 210, -1, 210, 150, 210, -1, 210, 151, 210, -1, + 210, 152, 210, -1, 210, 15, 210, -1, 210, 16, + 210, -1, 210, 154, 210, -1, 210, 153, 210, -1, + 210, 17, 210, -1, 210, 18, 210, -1, 210, 12, + 210, -1, 210, 13, 210, -1, 210, 156, 210, -1, + 210, 155, 210, -1, 210, 159, 210, -1, 210, 157, + 210, -1, 210, 158, 210, -1, 160, 210, -1, 161, + 210, -1, 156, 210, -1, 155, 210, -1, 152, 210, + -1, 157, 210, -1, 210, 14, 3, -1, 210, 167, + 3, -1, 171, 259, 172, 210, -1, 123, 171, 259, + 172, -1, 210, 168, 210, 169, -1, 171, 210, 172, + -1, 212, -1, 211, 147, 212, -1, 210, -1, 210, + -1, -1, 214, 215, -1, 195, 250, 255, 170, -1, + 195, 261, 170, -1, 219, 170, -1, 196, 170, -1, + -1, 217, 216, -1, 219, 170, -1, 170, -1, 195, + 250, 253, -1, 195, 250, 253, -1, 196, 250, 256, + -1, 250, 256, -1, -1, 224, -1, -1, 3, -1, 4, -1, 3, -1, 4, -1, 30, -1, 145, -1, - 228, -1, 120, 228, -1, 139, 228, -1, 139, -1, + 227, -1, 120, 227, -1, 139, 227, -1, 139, -1, 63, -1, 121, -1, 53, -1, 28, -1, 58, -1, - 65, -1, -1, 84, -1, 84, -1, 119, 227, -1, - 124, -1, 91, 227, -1, 72, 227, -1, 85, -1, - 36, -1, 37, 3, -1, 37, 4, -1, 197, 229, - -1, 230, 173, 232, 174, 181, -1, -1, 232, 233, - -1, 196, 243, -1, 51, 3, -1, 51, 4, -1, - 197, 234, -1, 105, 149, -1, 236, 220, 170, -1, - 92, 149, -1, 237, 221, 170, -1, 235, 173, 236, - 237, 174, -1, 235, 173, 240, 170, 174, -1, -1, - 149, 4, -1, 86, 3, -1, 86, 4, -1, 197, - 240, -1, 241, 239, 173, 180, 174, 181, -1, 241, - 149, 3, 173, 186, 180, 174, 181, -1, 238, 181, - -1, 240, 170, -1, 234, 170, -1, 93, 3, -1, - 93, 4, -1, 197, 244, -1, 245, 173, 180, 174, + 65, -1, -1, 84, -1, 84, -1, 119, 226, -1, + 124, -1, 91, 226, -1, 72, 226, -1, 85, -1, + 36, -1, 37, 3, -1, 37, 4, -1, 196, 228, + -1, 229, 173, 231, 174, 181, -1, -1, 231, 232, + -1, 195, 242, -1, 51, 3, -1, 51, 4, -1, + 196, 233, -1, 105, 149, -1, 235, 219, 170, -1, + 92, 149, -1, 236, 220, 170, -1, 234, 173, 235, + 236, 174, -1, 234, 173, 239, 170, 174, -1, -1, + 149, 4, -1, 86, 3, -1, 86, 4, -1, 196, + 239, -1, 240, 238, 173, 180, 174, 181, -1, 240, + 149, 3, 173, 185, 180, 174, 181, -1, 237, 181, + -1, 239, 170, -1, 233, 170, -1, 93, 3, -1, + 93, 4, -1, 196, 243, -1, 244, 173, 180, 174, 181, -1, 60, -1, 126, -1, 114, -1, 82, -1, - 40, -1, -1, 250, 249, -1, 260, 252, -1, 253, - 260, 252, -1, -1, 253, -1, 249, 252, -1, 248, - 252, -1, 247, 252, -1, 157, 250, 254, -1, 202, - 254, -1, 255, -1, 225, -1, 171, 254, 172, -1, - 255, 195, -1, 255, 171, 191, 172, -1, 254, -1, - 256, 147, 254, -1, 254, -1, 254, 175, 214, -1, - 113, -1, 138, -1, 109, -1, 130, 224, 173, 215, - 174, -1, 144, -1, 4, -1, 226, -1, 208, -1, - 57, 3, -1, 259, -1, 130, 3, -1, 262, -1, - 137, 3, -1, 118, 171, 260, 172, -1, 136, 196, - 251, 256, -1, 137, 224, 173, 218, 174, -1, 137, - 224, 131, 171, 220, 172, 223, 173, 203, 174, -1, + 40, -1, -1, 249, 248, -1, 259, 251, -1, 252, + 259, 251, -1, -1, 252, -1, 248, 251, -1, 247, + 251, -1, 246, 251, -1, 157, 249, 253, -1, 201, + 253, -1, 254, -1, 224, -1, 171, 253, 172, -1, + 254, 194, -1, 254, 171, 190, 172, -1, 253, -1, + 255, 147, 253, -1, 253, -1, 253, 175, 213, -1, + 113, -1, 138, -1, 109, -1, 130, 223, 173, 214, + 174, -1, 144, -1, 4, -1, 225, -1, 207, -1, + 57, 3, -1, 258, -1, 130, 3, -1, 261, -1, + 137, 3, -1, 118, 171, 259, 172, -1, 136, 195, + 250, 255, -1, 137, 223, 173, 217, 174, -1, 137, + 223, 131, 171, 219, 172, 222, 173, 202, 174, -1, 5, -1, 5, 167, 5, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 351, 351, 360, 361, 362, 363, 367, 372, 375, - 376, 379, 380, 381, 382, 383, 388, 389, 390, 391, - 394, 395, 398, 399, 403, 404, 410, 413, 414, 418, - 419, 420, 423, 425, 433, 440, 444, 446, 453, 461, - 462, 465, 468, 469, 470, 474, 481, 489, 490, 493, - 494, 498, 504, 505, 506, 509, 510, 513, 514, 515, - 516, 517, 518, 519, 520, 521, 522, 523, 524, 525, - 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, - 536, 537, 538, 539, 540, 541, 542, 543, 544, 545, - 546, 547, 548, 549, 550, 551, 552, 553, 554, 555, - 556, 557, 558, 559, 560, 561, 562, 563, 564, 565, - 566, 570, 571, 572, 573, 574, 575, 576, 577, 578, - 579, 580, 581, 582, 583, 584, 585, 586, 590, 591, - 596, 597, 598, 599, 602, 603, 606, 610, 616, 617, - 618, 621, 625, 634, 638, 643, 652, 653, 666, 667, - 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, - 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, - 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, - 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, - 712, 713, 716, 722, 728, 729, 732, 737, 744, 745, - 748, 749, 753, 754, 757, 765, 774, 780, 786, 787, - 790, 791, 792, 795, 797, 800, 801, 802, 803, 804, - 820, 821, 822, 823, 824, 825, 826, 829, 830, 833, - 834, 835, 836, 837, 838, 839, 842, 843, 851, 861, - 868, 869, 873, 876, 877, 880, 894, 895, 898, 899, - 902, 912, 922, 923, 926, 927, 930, 943, 957, 970, - 974, 975, 978, 979, 982, 987, 995, 996, 997, 1001, - 1005, 1008, 1009, 1012, 1013, 1017, 1018, 1022, 1023, 1024, - 1028, 1030, 1031, 1035, 1036, 1037, 1038, 1045, 1046, 1050, - 1051, 1055, 1056, 1057, 1060, 1072, 1073, 1074, 1075, 1076, - 1077, 1078, 1079, 1080, 1081, 1084, 1090, 1097, 1115, 1116 + 0, 349, 349, 358, 359, 360, 361, 365, 370, 373, + 374, 377, 378, 379, 380, 381, 386, 387, 388, 389, + 392, 393, 396, 397, 401, 402, 408, 411, 412, 418, + 419, 427, 429, 437, 444, 448, 450, 457, 465, 466, + 469, 472, 473, 474, 478, 485, 493, 494, 497, 498, + 502, 508, 509, 510, 513, 514, 517, 518, 519, 520, + 521, 522, 523, 524, 525, 526, 527, 528, 529, 530, + 531, 532, 533, 534, 535, 536, 537, 538, 539, 540, + 541, 542, 543, 544, 545, 546, 547, 548, 549, 550, + 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, + 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, + 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, + 584, 585, 586, 587, 588, 589, 590, 594, 595, 600, + 601, 602, 603, 606, 607, 610, 614, 620, 621, 622, + 625, 629, 638, 642, 647, 656, 657, 670, 671, 674, + 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, + 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, + 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, + 705, 706, 707, 708, 709, 710, 711, 712, 713, 716, + 717, 720, 726, 732, 733, 736, 741, 748, 749, 752, + 753, 757, 758, 761, 769, 778, 784, 790, 791, 794, + 795, 796, 799, 801, 804, 805, 806, 807, 808, 824, + 825, 826, 827, 828, 829, 830, 833, 834, 837, 838, + 839, 840, 841, 842, 843, 846, 847, 853, 862, 869, + 870, 874, 877, 878, 881, 895, 896, 899, 900, 903, + 913, 923, 924, 927, 928, 931, 944, 958, 971, 975, + 976, 979, 980, 983, 988, 996, 997, 998, 1002, 1006, + 1009, 1010, 1013, 1014, 1018, 1019, 1023, 1024, 1025, 1029, + 1031, 1032, 1036, 1037, 1038, 1039, 1046, 1047, 1051, 1052, + 1056, 1057, 1058, 1061, 1072, 1073, 1074, 1075, 1076, 1077, + 1078, 1079, 1080, 1081, 1084, 1090, 1096, 1113, 1114 }; #endif @@ -1037,9 +1035,9 @@ static const char *const yytname[] = "ADDRESSOF", "NEG", "POS", "PPTR", "CAST", "'.'", "'['", "']'", "';'", "'('", "')'", "'{'", "'}'", "'='", "$accept", "input", "gbl_statements", "imp_statements", "int_statements", "semicolon_opt", "statement", - "typedecl", "cppquote", "import_start", "import", "importlib", - "libraryhdr", "library_start", "librarydef", "m_args", "no_args", "args", - "arg", "array", "m_attributes", "attributes", "attrib_list", "str_list", + "cppquote", "import_start", "import", "importlib", "libraryhdr", + "library_start", "librarydef", "m_args", "no_args", "args", "arg", + "array", "m_attributes", "attributes", "attrib_list", "str_list", "attribute", "uuid_string", "callconv", "cases", "case", "enums", "enum_list", "enum", "enumdef", "m_exprs", "m_expr", "expr", "expr_list_int_const", "expr_int_const", "expr_const", "fields", "field", @@ -1088,35 +1086,35 @@ static const unsigned short int yyr1[] = { 0, 176, 177, 178, 178, 178, 178, 178, 178, 178, 178, 179, 179, 179, 179, 179, 179, 179, 179, 179, - 180, 180, 181, 181, 182, 182, 182, 182, 182, 183, - 183, 183, 184, 185, 186, 187, 188, 189, 190, 191, - 191, 192, 193, 193, 193, 194, 194, 195, 195, 196, - 196, 197, 198, 198, 198, 199, 199, 200, 200, 200, - 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 200, 200, 200, 200, 200, 201, 201, - 202, 202, 202, 202, 203, 203, 204, 204, 205, 205, - 205, 206, 206, 207, 207, 208, 209, 209, 210, 210, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 212, 212, 213, 214, 215, 215, 216, 216, 217, 217, - 218, 218, 219, 219, 220, 221, 222, 222, 223, 223, - 224, 224, 224, 225, 225, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 227, 227, 228, - 228, 228, 228, 228, 228, 228, 229, 229, 230, 231, - 232, 232, 233, 234, 234, 235, 236, 236, 237, 237, - 238, 238, 239, 239, 240, 240, 241, 242, 242, 242, - 243, 243, 244, 244, 245, 246, 247, 247, 247, 248, - 249, 250, 250, 251, 251, 252, 252, 253, 253, 253, - 254, 254, 254, 255, 255, 255, 255, 256, 256, 257, - 257, 258, 258, 258, 259, 260, 260, 260, 260, 260, - 260, 260, 260, 260, 260, 261, 262, 262, 263, 263 + 180, 180, 181, 181, 182, 182, 182, 182, 182, 182, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 190, + 191, 192, 192, 192, 193, 193, 194, 194, 195, 195, + 196, 197, 197, 197, 198, 198, 199, 199, 199, 199, + 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, + 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, + 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, + 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, + 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, + 199, 199, 199, 199, 199, 199, 199, 199, 199, 199, + 199, 199, 199, 199, 199, 199, 199, 200, 200, 201, + 201, 201, 201, 202, 202, 203, 203, 204, 204, 204, + 205, 205, 206, 206, 207, 208, 208, 209, 209, 210, + 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, + 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, + 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, + 210, 210, 210, 210, 210, 210, 210, 210, 210, 211, + 211, 212, 213, 214, 214, 215, 215, 216, 216, 217, + 217, 218, 218, 219, 220, 221, 221, 222, 222, 223, + 223, 223, 224, 224, 225, 225, 225, 225, 225, 225, + 225, 225, 225, 225, 225, 225, 226, 226, 227, 227, + 227, 227, 227, 227, 227, 228, 228, 229, 230, 231, + 231, 232, 233, 233, 234, 235, 235, 236, 236, 237, + 237, 238, 238, 239, 239, 240, 241, 241, 241, 242, + 242, 243, 243, 244, 245, 246, 246, 246, 247, 248, + 249, 249, 250, 250, 251, 251, 252, 252, 252, 253, + 253, 253, 254, 254, 254, 254, 255, 255, 256, 256, + 257, 257, 257, 258, 259, 259, 259, 259, 259, 259, + 259, 259, 259, 259, 260, 261, 261, 262, 262 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1124,35 +1122,35 @@ static const unsigned char yyr2[] = { 0, 2, 1, 0, 2, 2, 3, 2, 2, 2, 2, 0, 2, 2, 3, 2, 2, 2, 2, 2, - 0, 2, 0, 1, 1, 2, 2, 1, 2, 1, - 1, 1, 4, 3, 3, 5, 2, 3, 4, 0, - 1, 1, 1, 3, 1, 3, 2, 3, 3, 0, - 1, 3, 1, 3, 4, 1, 3, 0, 1, 1, - 1, 1, 1, 1, 4, 4, 1, 1, 1, 1, - 1, 1, 4, 1, 1, 4, 1, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 1, 4, 1, 4, - 1, 5, 1, 1, 4, 4, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, - 6, 1, 1, 1, 1, 4, 1, 1, 1, 4, - 4, 4, 4, 1, 1, 4, 4, 1, 1, 1, - 1, 1, 1, 1, 0, 2, 4, 3, 0, 2, - 1, 1, 3, 3, 1, 5, 1, 3, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, + 0, 2, 0, 1, 1, 2, 2, 1, 2, 2, + 2, 4, 3, 3, 5, 2, 3, 4, 0, 1, + 1, 1, 3, 1, 3, 2, 3, 3, 0, 1, + 3, 1, 3, 4, 1, 3, 0, 1, 1, 1, + 1, 1, 1, 4, 4, 1, 1, 1, 1, 1, + 1, 4, 1, 1, 4, 1, 4, 4, 1, 1, + 4, 4, 4, 4, 4, 1, 4, 1, 4, 1, + 5, 1, 1, 4, 4, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 4, 1, 1, 1, 1, 6, + 1, 1, 1, 1, 4, 1, 1, 1, 4, 4, + 4, 4, 1, 1, 4, 4, 1, 1, 1, 1, + 1, 1, 1, 0, 2, 4, 3, 0, 2, 1, + 1, 3, 3, 1, 5, 1, 3, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, - 2, 2, 2, 2, 3, 3, 4, 4, 4, 3, - 1, 3, 1, 1, 0, 2, 4, 3, 2, 2, - 0, 2, 2, 1, 3, 3, 3, 2, 0, 1, - 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, - 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, - 2, 1, 2, 2, 1, 1, 2, 2, 2, 5, - 0, 2, 2, 2, 2, 2, 2, 3, 2, 3, - 5, 5, 0, 2, 2, 2, 2, 6, 8, 2, - 2, 2, 2, 2, 2, 5, 1, 1, 1, 1, - 1, 0, 2, 2, 3, 0, 1, 2, 2, 2, - 3, 2, 1, 1, 3, 2, 4, 1, 3, 1, - 3, 1, 1, 1, 5, 1, 1, 1, 1, 2, - 1, 2, 1, 2, 4, 4, 5, 10, 1, 3 + 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, + 2, 2, 2, 3, 3, 4, 4, 4, 3, 1, + 3, 1, 1, 0, 2, 4, 3, 2, 2, 0, + 2, 2, 1, 3, 3, 3, 2, 0, 1, 0, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, + 1, 1, 1, 1, 1, 1, 0, 1, 1, 2, + 1, 2, 2, 1, 1, 2, 2, 2, 5, 0, + 2, 2, 2, 2, 2, 2, 3, 2, 3, 5, + 5, 0, 2, 2, 2, 2, 6, 8, 2, 2, + 2, 2, 2, 2, 5, 1, 1, 1, 1, 1, + 0, 2, 2, 3, 0, 1, 2, 2, 2, 3, + 2, 1, 1, 3, 2, 4, 1, 3, 1, 3, + 1, 1, 1, 5, 1, 1, 1, 1, 2, 1, + 2, 1, 2, 4, 4, 5, 10, 1, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -1160,584 +1158,568 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned short int yydefact[] = { - 3, 0, 2, 1, 296, 224, 215, 235, 0, 270, - 0, 0, 223, 210, 225, 266, 221, 226, 227, 0, - 269, 229, 234, 0, 227, 268, 0, 227, 0, 222, - 231, 267, 210, 49, 210, 220, 295, 216, 57, 10, - 0, 24, 11, 27, 11, 9, 0, 298, 0, 297, - 217, 0, 0, 7, 0, 0, 22, 0, 252, 5, - 4, 0, 8, 275, 275, 275, 0, 0, 300, 275, - 0, 302, 236, 237, 0, 243, 244, 299, 212, 0, - 228, 233, 0, 254, 255, 232, 0, 230, 218, 301, - 0, 0, 50, 303, 0, 219, 58, 59, 60, 61, - 62, 63, 0, 0, 66, 67, 68, 69, 70, 71, - 0, 73, 74, 0, 76, 0, 0, 79, 80, 0, - 0, 0, 0, 0, 86, 0, 88, 0, 90, 0, - 92, 93, 0, 0, 96, 97, 98, 99, 100, 101, - 102, 103, 104, 0, 106, 107, 108, 293, 109, 0, - 111, 291, 112, 113, 114, 0, 116, 117, 118, 0, - 0, 0, 292, 0, 123, 124, 0, 0, 0, 52, - 127, 25, 0, 0, 0, 0, 0, 298, 238, 245, - 256, 264, 0, 300, 302, 26, 6, 240, 261, 0, - 23, 259, 260, 0, 0, 20, 279, 276, 278, 277, - 213, 214, 130, 131, 132, 133, 271, 0, 0, 283, - 289, 282, 207, 275, 273, 28, 0, 138, 33, 0, - 194, 0, 0, 200, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 148, - 0, 0, 148, 0, 0, 0, 0, 0, 0, 57, - 51, 34, 0, 17, 18, 19, 0, 15, 13, 12, - 16, 22, 36, 262, 263, 37, 206, 49, 0, 49, - 0, 0, 253, 20, 0, 0, 0, 281, 0, 148, - 39, 285, 274, 32, 0, 140, 141, 144, 304, 49, - 287, 305, 49, 49, 0, 158, 150, 151, 152, 156, - 157, 153, 154, 0, 155, 0, 0, 0, 0, 0, - 0, 0, 192, 0, 190, 193, 0, 0, 55, 0, + 3, 0, 2, 1, 295, 223, 214, 234, 0, 269, + 0, 0, 222, 209, 224, 265, 220, 225, 226, 0, + 268, 228, 233, 0, 226, 267, 0, 226, 0, 221, + 230, 266, 209, 48, 209, 219, 294, 215, 56, 10, + 24, 11, 27, 11, 9, 0, 297, 0, 296, 216, + 0, 0, 7, 0, 0, 22, 0, 251, 5, 4, + 0, 8, 274, 274, 274, 0, 0, 299, 274, 0, + 301, 235, 236, 0, 242, 243, 298, 211, 0, 227, + 232, 0, 253, 254, 231, 0, 229, 217, 300, 0, + 0, 49, 302, 0, 218, 57, 58, 59, 60, 61, + 62, 0, 0, 65, 66, 67, 68, 69, 70, 0, + 72, 73, 0, 75, 0, 0, 78, 79, 0, 0, + 0, 0, 0, 85, 0, 87, 0, 89, 0, 91, + 92, 0, 0, 95, 96, 97, 98, 99, 100, 101, + 102, 103, 0, 105, 106, 107, 292, 108, 0, 110, + 290, 111, 112, 113, 0, 115, 116, 117, 0, 0, + 0, 291, 0, 122, 123, 0, 0, 0, 51, 126, + 0, 0, 0, 0, 0, 297, 237, 244, 255, 263, + 0, 299, 301, 25, 26, 6, 239, 260, 0, 23, + 258, 259, 0, 0, 20, 278, 275, 277, 276, 212, + 213, 129, 130, 131, 132, 270, 0, 0, 282, 288, + 281, 206, 274, 28, 272, 29, 30, 0, 137, 32, + 0, 193, 0, 0, 199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 146, 149, 0, 0, 0, 0, 0, 0, 129, - 128, 0, 308, 0, 0, 53, 57, 0, 14, 38, - 22, 0, 241, 246, 0, 0, 0, 49, 0, 0, - 0, 22, 21, 0, 272, 280, 284, 290, 0, 0, - 295, 0, 44, 40, 42, 0, 0, 145, 139, 0, - 294, 0, 195, 0, 0, 306, 50, 201, 0, 64, - 0, 182, 181, 180, 183, 178, 179, 0, 0, 0, + 147, 0, 0, 147, 0, 0, 0, 0, 0, 0, + 56, 50, 33, 0, 17, 18, 19, 0, 15, 13, + 12, 16, 22, 35, 261, 262, 36, 205, 48, 0, + 48, 0, 0, 252, 20, 0, 0, 0, 280, 0, + 147, 38, 284, 273, 31, 0, 139, 140, 143, 303, + 48, 286, 304, 48, 48, 0, 157, 149, 150, 151, + 155, 156, 152, 153, 0, 154, 0, 0, 0, 0, + 0, 0, 0, 191, 0, 189, 192, 0, 0, 54, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 145, 148, 0, 0, 0, 0, 0, 0, + 128, 127, 0, 307, 0, 0, 52, 56, 0, 14, + 37, 22, 0, 240, 245, 0, 0, 0, 48, 0, + 0, 0, 22, 21, 0, 271, 279, 283, 289, 0, + 0, 294, 0, 43, 39, 41, 0, 0, 144, 138, + 0, 293, 0, 194, 0, 0, 305, 49, 200, 0, + 63, 0, 181, 180, 179, 182, 177, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 65, 72, 75, 0, 77, 78, 81, 82, - 83, 84, 85, 87, 89, 0, 95, 148, 94, 105, - 0, 115, 119, 120, 121, 122, 0, 125, 126, 54, - 0, 239, 242, 248, 0, 247, 250, 0, 0, 251, - 20, 22, 265, 48, 47, 286, 0, 0, 46, 142, - 143, 0, 302, 288, 208, 199, 198, 0, 189, 0, - 171, 172, 184, 165, 166, 169, 170, 160, 161, 0, - 162, 163, 164, 168, 167, 174, 173, 176, 177, 175, - 185, 0, 191, 56, 91, 147, 0, 309, 22, 204, - 0, 249, 0, 257, 43, 45, 0, 197, 0, 209, - 187, 186, 0, 188, 110, 35, 205, 22, 196, 134, - 159, 258, 0, 0, 0, 307, 135, 0, 49, 49, - 203, 137, 0, 136, 202 + 0, 0, 0, 64, 71, 74, 0, 76, 77, 80, + 81, 82, 83, 84, 86, 88, 0, 94, 147, 93, + 104, 0, 114, 118, 119, 120, 121, 0, 124, 125, + 53, 0, 238, 241, 247, 0, 246, 249, 0, 0, + 250, 20, 22, 264, 47, 46, 285, 0, 0, 45, + 141, 142, 0, 301, 287, 207, 198, 197, 0, 188, + 0, 170, 171, 183, 164, 165, 168, 169, 159, 160, + 0, 161, 162, 163, 167, 166, 173, 172, 175, 176, + 174, 184, 0, 190, 55, 90, 146, 0, 308, 22, + 203, 0, 248, 0, 256, 42, 44, 0, 196, 0, + 208, 186, 185, 0, 187, 109, 34, 204, 22, 195, + 133, 158, 257, 0, 0, 0, 306, 134, 0, 48, + 48, 202, 136, 0, 135, 201 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short int yydefgoto[] = { - -1, 1, 2, 172, 274, 191, 362, 40, 41, 42, - 43, 254, 176, 44, 255, 371, 372, 373, 374, 281, - 355, 92, 168, 319, 169, 341, 208, 532, 536, 284, - 285, 286, 177, 330, 331, 312, 313, 314, 316, 289, - 382, 387, 293, 541, 542, 458, 48, 518, 79, 209, - 49, 81, 50, 256, 52, 257, 267, 352, 54, 55, - 269, 357, 56, 194, 57, 58, 258, 259, 181, 61, - 260, 63, 64, 65, 275, 66, 196, 67, 210, 211, - 291, 212, 170, 183, 69, 70, 184, 343 + -1, 1, 2, 170, 275, 190, 363, 40, 41, 42, + 255, 174, 43, 256, 372, 373, 374, 375, 282, 356, + 91, 167, 320, 168, 342, 207, 533, 537, 285, 286, + 287, 175, 331, 332, 313, 314, 315, 317, 290, 383, + 388, 294, 542, 543, 459, 47, 519, 78, 208, 48, + 80, 49, 257, 51, 258, 268, 353, 53, 54, 270, + 358, 55, 193, 56, 57, 259, 260, 179, 60, 261, + 62, 63, 64, 276, 65, 195, 66, 209, 210, 292, + 211, 169, 181, 68, 69, 182, 344 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -271 +#define YYPACT_NINF -267 static const short int yypact[] = { - -271, 69, 1074, -271, -271, -271, -271, -271, 58, -271, - -62, 123, -271, 126, -271, -271, -271, -271, 53, 107, - -271, -271, -271, 128, 53, -271, -26, 53, -17, -271, - -271, -271, 130, -22, 132, -17, -271, -271, 1946, -271, - -21, -271, -271, -271, -271, -271, 1708, -19, -10, -271, - -271, -9, -25, -271, -4, -23, -1, 6, 4, -271, - -271, -18, -271, -6, -6, -6, 35, 1821, 32, -6, - 37, 40, -271, -271, 156, -271, -271, -5, -271, 15, - -271, -271, 41, -271, -271, -271, 1821, -271, -271, -5, - 39, 1751, -271, -96, -87, -271, -271, -271, -271, -271, - -271, -271, 34, 43, -271, -271, -271, -271, -271, -271, - 44, -271, -271, 47, -271, 48, 51, -271, -271, 54, - 56, 57, 60, 61, -271, 62, -271, 63, -271, 65, - -271, -271, 66, 73, -271, -271, -271, -271, -271, -271, - -271, -271, -271, 74, -271, -271, -271, -271, -271, 77, - -271, -271, -271, -271, -271, 78, -271, -271, -271, 79, - 80, 82, -271, 83, -271, -271, 85, 88, -105, -271, - -271, -271, 979, 402, 205, 136, 67, -271, -271, -271, - -271, -271, 35, -271, -271, -271, -271, -271, -271, -15, - -271, -271, -271, 138, 89, -271, -271, -271, -271, -271, - -271, -271, -271, -271, -271, -271, -271, 35, 35, -271, - 49, -70, -271, -6, -271, -271, 95, 140, -271, 96, - -271, 35, 92, -271, 140, 443, 443, 252, 261, 443, - 443, 262, 265, 443, 269, 443, 443, 216, 443, 443, - -57, 443, 443, 443, 1821, 1821, 111, 277, 1821, 1946, - 116, -271, 114, -271, -271, -271, 117, -271, -271, -271, - -271, -1, -271, -271, -271, -271, -271, -123, 137, -68, - 118, 142, -271, -271, 497, 25, 147, -271, 443, 843, - 1149, -271, -271, -271, 115, 143, -271, 134, -271, -69, - -271, 173, -22, -58, 153, -271, -271, -271, -271, -271, - -271, -271, -271, 150, -271, 443, 443, 443, 443, 443, - 443, 782, 1444, -100, -271, 1444, 154, 155, -271, -97, - 162, 163, 166, 174, 175, 176, 177, 1283, 325, 178, - -90, -271, 1444, 179, 190, -89, 1326, 184, 185, -271, - -271, 187, 194, 191, 192, -271, 1946, 358, -271, -271, - -1, -8, -271, -271, 218, 1751, 198, -56, 195, 292, - 592, -1, -271, 1751, -271, -271, -271, -271, 86, 202, - -84, 200, -271, 226, -271, 1751, 35, -271, 140, 443, - -271, 1751, -271, 35, 203, -271, 204, -271, 206, -271, - 1821, 27, 27, 27, 27, 27, 27, 1349, 207, 443, - 443, 374, 443, 443, 443, 443, 443, 443, 443, 443, - 443, 443, 443, 443, 443, 443, 443, 443, 443, 375, - 443, 443, -271, -271, -271, 372, -271, -271, -271, -271, - -271, -271, -271, -271, -271, 210, -271, 443, -271, -271, - 443, -271, -271, -271, -271, -271, 378, -271, -271, -271, - 212, -271, -271, -271, 35, -271, -271, 1751, 215, -271, - -271, -1, -271, -271, -271, -271, 1192, 35, -271, -271, - -271, 35, 238, -271, 140, -271, -271, 237, -271, 443, - 149, 149, -271, 186, 186, 144, 144, 1551, 1474, 1394, - 1497, 1520, 1567, 144, 144, 165, 165, 27, 27, 27, - -271, 1372, -271, -271, -271, -271, 239, -271, -1, -271, - 35, -271, 687, -271, -271, -271, -74, -271, 240, -271, - -271, 27, 443, -271, -271, -271, -271, -1, -271, -271, - 1444, -271, -20, 443, 266, -271, -271, 267, -46, -46, - -271, -271, 244, -271, -271 + -267, 42, 1020, -267, -267, -267, -267, -267, 47, -267, + -94, 86, -267, 144, -267, -267, -267, -267, 40, 137, + -267, -267, -267, 150, 40, -267, -20, 40, 199, -267, + -267, -267, 161, -7, 194, 199, -267, -267, 1869, -267, + -267, -267, -267, -267, -267, 1631, -14, 4, -267, -267, + 10, -6, -267, 12, 21, 38, 43, 73, -267, -267, + 59, -267, -3, -3, -3, 52, 1744, 55, -3, 56, + 63, -267, -267, 226, -267, -267, 65, -267, 66, -267, + -267, 70, -267, -267, -267, 1744, -267, -267, 65, 69, + 1674, -267, -110, -108, -267, -267, -267, -267, -267, -267, + -267, 77, 78, -267, -267, -267, -267, -267, -267, 79, + -267, -267, 81, -267, 82, 83, -267, -267, 87, 89, + 91, 93, 98, -267, 99, -267, 101, -267, 110, -267, + -267, 115, 116, -267, -267, -267, -267, -267, -267, -267, + -267, -267, 117, -267, -267, -267, -267, -267, 118, -267, + -267, -267, -267, -267, 120, -267, -267, -267, 129, 130, + 131, -267, 138, -267, -267, 139, 140, -107, -267, -267, + 925, 403, 233, 203, 95, -267, -267, -267, -267, -267, + 52, -267, -267, -267, -267, -267, -267, -267, -12, -267, + -267, -267, 208, 135, -267, -267, -267, -267, -267, -267, + -267, -267, -267, -267, -267, -267, 52, 52, -267, 84, + -42, -267, -3, -267, -267, -267, -267, 113, 212, -267, + 141, -267, 52, 151, -267, 212, 749, 749, 311, 313, + 749, 749, 316, 317, 749, 318, 749, 749, 262, 749, + 749, -79, 749, 749, 749, 1744, 1744, 97, 323, 1744, + 1869, 165, -267, 158, -267, -267, -267, 164, -267, -267, + -267, -267, 38, -267, -267, -267, -267, -267, -114, 186, + -65, 166, 174, -267, -267, 13, 32, 167, -267, 749, + 789, 1095, -267, -267, -267, 163, 201, -267, 175, -267, + -82, -267, 202, -7, -46, 179, -267, -267, -267, -267, + -267, -267, -267, -267, 181, -267, 749, 749, 749, 749, + 749, 749, 688, 1390, -103, -267, 1390, 185, 188, -267, + -66, 190, 192, 193, 195, 196, 197, 198, 1229, 355, + 200, -64, -267, 1390, 204, 224, -63, 1272, 205, 206, + -267, -267, 207, 213, 209, 211, -267, 1869, 365, -267, + -267, 38, -22, -267, -267, 225, 1674, 214, -38, 215, + 297, 498, 38, -267, 1674, -267, -267, -267, -267, 444, + 216, -59, 237, -267, 239, -267, 1674, 52, -267, 212, + 749, -267, 1674, -267, 52, 238, -267, 241, -267, 242, + -267, 1744, 25, 25, 25, 25, 25, 25, 1295, 243, + 749, 749, 410, 749, 749, 749, 749, 749, 749, 749, + 749, 749, 749, 749, 749, 749, 749, 749, 749, 749, + 413, 749, 749, -267, -267, -267, 409, -267, -267, -267, + -267, -267, -267, -267, -267, -267, 246, -267, 749, -267, + -267, 749, -267, -267, -267, -267, -267, 414, -267, -267, + -267, 248, -267, -267, -267, 52, -267, -267, 1674, 251, + -267, -267, 38, -267, -267, -267, -267, 1138, 52, -267, + -267, -267, 52, 252, -267, 212, -267, -267, 254, -267, + 749, 148, 148, -267, 187, 187, 88, 88, 1497, 1420, + 1340, 1443, 1466, 864, 88, 88, 61, 61, 25, 25, + 25, -267, 1318, -267, -267, -267, -267, 255, -267, 38, + -267, 52, -267, 593, -267, -267, -267, -102, -267, 256, + -267, -267, 25, 749, -267, -267, -267, -267, 38, -267, + -267, 1390, -267, -8, 749, 275, -267, -267, 279, -28, + -28, -267, -267, 260, -267, -267 }; /* YYPGOTO[NTERM-NUM]. */ static const short int yypgoto[] = { - -271, -271, -271, 344, -267, -244, 18, -271, -271, -271, - 59, -271, -271, -271, 408, -271, -271, -271, -49, -271, - -28, -2, -271, -271, -233, -271, -271, -271, -271, -271, - -271, 42, 2, 180, -270, -13, -271, -220, -193, -271, - -271, -271, -271, -120, -189, -271, -271, -271, 91, -194, - -271, 87, 31, 38, -271, 421, -271, -271, 379, -271, - -271, -271, -271, -271, -24, -271, 424, 1, -271, -271, - 425, -271, -271, 158, -271, -45, -16, -32, -196, -271, - -43, 247, 196, 5, -59, -271, 0, -271 + -267, -267, -267, 389, -266, -252, 7, -267, -267, 74, + -267, -267, -267, 433, -267, -267, -267, -31, -267, -27, + -2, -267, -267, -235, -267, -267, -267, -267, -267, -267, + 58, 2, 219, -247, -13, -267, -220, -199, -267, -267, + -267, -267, -99, -174, -267, -267, -267, 112, -193, -267, + 114, 90, 16, -267, 436, -267, -267, 397, -267, -267, + -267, -267, -267, -25, -267, 442, 1, -267, -267, 443, + -267, -267, 170, -267, -44, -16, 53, -194, -267, -17, + 277, 217, 5, -61, -267, 0, -267 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -212 +#define YYTABLE_NINF -211 static const short int yytable[] = { - 46, 182, 71, 60, 47, 91, 360, 68, 213, 369, - 321, 276, 277, 324, 533, 326, 345, 349, 329, 7, - 39, 334, 180, 287, 354, 290, 534, 219, 200, 201, - 294, 197, 197, 197, 9, -211, 320, 197, 200, 201, - 51, 401, 249, 11, 222, 38, 221, 421, 198, 199, - 425, 350, 147, 214, 15, 18, 151, 437, 437, 88, - 202, 72, 73, -41, 250, 9, 95, 21, 22, 3, - 202, 23, 422, 383, 24, 426, 20, -211, 23, 365, - 356, 162, 438, 441, 178, 367, 223, 203, -41, 295, - 268, 296, 297, 298, 299, 300, 528, 203, 279, 38, - 38, 280, 27, 384, 388, 380, 451, 30, 25, 74, - 38, 85, 38, 449, 87, 82, 385, 462, 456, 339, - 31, 340, 38, 90, 540, 94, 75, 76, 204, 77, - 78, 83, 84, 89, 78, 93, 78, 80, 204, 263, - 264, 271, 272, 200, 201, 86, 38, 301, 187, 171, - 189, -29, 205, 193, 535, 195, 399, 400, 401, 470, - 185, 186, 205, 401, 216, 270, 188, 505, -211, 190, - 46, 46, 71, 71, 47, 47, 192, 68, 68, 401, - 468, 197, 206, 302, 287, 337, 338, 473, 217, 344, - 253, 253, 206, 512, 419, 420, 207, 282, 399, 400, - 401, 502, -30, 404, 405, 224, 207, 215, 262, 303, - -31, 218, 220, 315, 225, 226, 315, 513, 227, 228, - 506, 304, 229, 327, 278, 230, 332, 231, 232, 332, - 336, 233, 234, 235, 236, 376, 237, 238, 305, 351, - 265, 306, 307, 308, 239, 240, 309, 310, 241, 242, - 243, 244, 398, 245, 246, 463, 247, 311, 509, 248, - 317, 381, 273, 292, 525, 315, 332, 283, 288, 318, - 322, 515, 363, 323, 71, 290, 47, 325, 375, 68, - 519, 328, 342, 531, 346, 347, 353, 348, 358, 377, - 378, 386, 391, 392, 393, 394, 395, 396, 397, 414, - 415, 416, 417, 418, 414, 415, 416, 417, 418, 379, - 454, 419, 420, 537, 526, 359, 419, 420, 182, 366, - 383, 390, 416, 417, 418, 389, 423, 424, 435, 457, - 467, 477, 419, 420, 427, 428, 471, 440, 429, 412, - 413, 414, 415, 416, 417, 418, 430, 431, 432, 433, - 436, 439, 452, 419, 420, 394, 443, 444, 363, 445, - 71, 446, 47, 447, 448, 68, 450, 453, 455, 459, - 19, 464, 465, 466, 475, 474, 476, 482, 500, 479, - 503, 472, 504, 507, 508, 511, 480, 481, 173, 483, + 45, 180, 70, 59, 46, 212, 90, 67, 361, 39, + 350, 322, 277, 278, 325, 346, 327, 4, 50, 330, + 178, -210, 335, 223, 220, 288, 534, 355, 291, 11, + 146, 321, 295, 370, 150, 199, 200, 9, 535, 402, + 250, 5, 3, 6, 422, 384, 222, 197, 198, 7, + 71, 72, 214, 9, 38, 199, 200, 15, 10, 161, + 351, 176, 251, -210, 23, 224, 12, 201, 529, 423, + 13, 14, 9, 15, 23, 402, 16, 73, 17, 20, + 368, 426, 366, 438, 438, 18, 38, 201, -40, 74, + 75, 19, 381, 269, 202, 20, 357, 21, 22, 452, + 400, 401, 402, 38, 24, 340, 427, 341, 439, 442, + 463, 25, 450, -40, 202, 196, 196, 196, 87, 385, + 389, 196, 38, 31, 79, 94, 280, 25, 386, 281, + 38, 26, 27, 28, 29, 203, 457, 30, 84, 31, + 38, 86, 541, 32, 89, 81, 93, 76, 77, 33, + 34, 85, 35, 82, 83, 203, 183, 36, 37, 204, + 471, 38, 402, 271, 88, 77, 536, 186, 45, 45, + 70, 70, 46, 46, 184, 67, 67, 254, 254, 204, + 185, 38, 187, 469, 338, 339, 288, 362, 345, 205, + 474, 506, 420, 421, 188, 513, 283, 92, 77, 400, + 401, 402, 503, 206, 405, 406, 264, 265, 189, 205, + 514, 272, 273, 191, 316, 199, 200, 316, 417, 418, + 419, 507, 192, 206, 328, 213, 215, 333, 420, 421, + 333, 337, 194, 216, 217, 7, 263, 377, -210, 218, + 219, 352, 221, 415, 416, 417, 418, 419, 225, 226, + 227, 399, 228, 229, 230, 420, 421, 526, 231, 279, + 232, 510, 233, 382, 234, 196, 316, 333, 266, 235, + 236, 18, 237, 364, 516, 70, 532, 46, 291, 376, + 67, 238, 520, 21, 22, 284, 239, 240, 241, 242, + 24, 243, 387, 392, 393, 394, 395, 396, 397, 398, + 244, 245, 246, 415, 416, 417, 418, 419, 274, 247, + 248, 249, 455, 289, 538, 420, 421, 527, 27, 318, + 180, 319, 293, 30, 323, 324, 326, 329, 343, 348, + 478, 458, 468, 347, 349, 354, 359, 378, 472, 367, + 413, 414, 415, 416, 417, 418, 419, 360, 379, 384, + 380, 390, 391, 453, 420, 421, 395, 424, 436, 364, + 425, 70, 428, 46, 429, 430, 67, 431, 432, 433, + 434, 441, 437, 451, 454, 19, 440, 444, 445, 446, + 447, 448, 473, 449, 456, 465, 467, 481, 482, 460, 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, - 494, 495, 496, 497, 498, 499, 4, 501, 517, 520, - 45, 524, 510, 529, 544, 538, 539, 514, 460, 543, - 469, 376, 335, 53, 332, 179, 59, 62, 516, 266, - 5, 0, 6, 364, 0, 0, 333, 0, 7, 8, - 0, 0, 9, 0, 0, 0, 295, 10, 296, 297, - 298, 299, 300, 11, 0, 12, 0, 0, 0, 13, - 14, 0, 15, 0, 375, 16, 521, 17, 0, 0, - 0, 0, 0, 0, 18, 0, 0, 0, 0, 0, - 19, 252, 0, 0, 20, 0, 21, 22, 23, 0, - 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, - 0, 4, 0, 0, 301, 0, 0, 0, 0, 530, - 363, 0, 71, 0, 47, 0, 25, 68, 0, 0, - 26, 27, 28, 29, 0, 5, 30, 6, 31, 0, - 0, 0, 32, 7, 0, 0, 0, 9, 33, 34, - 302, 35, 10, 0, 0, 0, 36, 37, 0, 0, - 12, 0, 0, 0, 13, 14, 0, 15, 0, 0, - 16, 0, 17, 0, 0, 0, 303, 0, 0, 18, - 38, 0, 0, 0, 0, 19, 261, 0, 304, 20, - 0, 21, 22, 0, 0, 0, 0, 0, 24, 0, - 0, 0, 0, 0, 0, 305, 4, 0, 306, 307, - 308, 0, 0, 309, 310, 0, 0, 0, 0, 0, - 0, 25, 0, 0, 311, 26, 27, 28, 29, 0, - 5, 30, 6, 31, 0, 0, 0, 32, 7, 0, - 0, 0, 9, 33, 34, 0, 35, 10, 0, 0, - 0, 36, 37, 0, 0, 12, 0, 0, 0, 13, - 14, 0, 15, 0, 0, 16, 0, 17, 0, 0, - 0, 0, 0, 0, 18, 38, 0, 0, 0, 0, - 19, 361, 0, 0, 20, 0, 21, 22, 0, 0, - 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, - 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, - 26, 27, 28, 29, 0, 5, 30, 6, 31, 0, - 0, 0, 32, 7, 0, 0, 0, 9, 33, 34, - 0, 35, 10, 0, 0, 0, 36, 37, 0, 0, - 12, 0, 0, 0, 13, 14, 0, 15, 0, 0, - 16, 0, 17, 0, 0, 0, 0, 0, 0, 18, - 38, 0, 0, 0, 0, 19, 461, 0, 0, 20, - 0, 21, 22, 0, 0, 0, 0, 0, 24, 0, - 0, 0, 0, 0, 0, 295, 4, 296, 297, 298, - 299, 300, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 25, 0, 0, 0, 26, 27, 28, 29, 0, - 5, 30, 6, 31, 0, 0, 0, 32, 7, 0, - 0, 0, 0, 33, 34, 0, 35, 0, 0, 0, - 0, 36, 37, 0, 0, 12, 0, 0, 0, 13, - 14, 0, 0, 301, 0, 16, 295, 17, 296, 297, - 298, 299, 300, 0, 18, 38, 0, 0, 0, 0, - 0, 527, 0, 0, 0, 0, 21, 22, 0, 0, - 0, 0, 0, 24, 0, 0, 0, 0, 0, 302, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 26, 27, 28, 29, 301, 303, 30, 0, 0, 0, - 0, 0, 32, 0, 0, 0, 0, 304, 0, 34, - 0, 35, 0, 0, 0, 0, 36, 37, 0, 0, - 0, 0, 0, 0, 305, 0, 0, 306, 307, 308, - 302, 0, 309, 310, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 311, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 303, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 304, 0, - 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, - 251, 0, 0, 0, 0, 305, 0, 0, 306, 307, - 368, 0, 0, 309, 310, 0, 0, 5, 0, 6, - 0, 0, 0, 0, 311, 7, 8, 0, 0, 9, - 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, - 11, 0, 12, 0, 0, 0, 13, 14, 0, 15, - 0, 0, 16, 0, 17, 0, 0, 0, 0, 0, - 0, 18, 0, 0, 0, 0, 0, 19, 252, 0, - 0, 20, 0, 21, 22, 23, 0, 0, 0, 0, - 24, 0, 0, 0, 0, 0, 0, 0, 4, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 25, 0, 0, 0, 26, 27, 28, - 29, 0, 5, 30, 6, 31, 0, 0, 0, 32, - 7, 8, 0, 0, 9, 33, 34, 0, 35, 10, - 0, 0, 0, 36, 37, 11, 0, 12, 0, 0, - 0, 13, 14, 0, 15, 0, 0, 16, 0, 17, - 0, 0, 0, 0, 0, 0, 18, 38, 0, 0, - 0, 0, 19, 4, 0, 0, 20, 0, 21, 22, - 23, 0, 0, 0, 0, 24, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 5, 0, 6, - 0, 0, 0, 0, 0, 7, 0, 0, 25, 9, - 0, 0, 26, 27, 28, 29, 4, 0, 30, 0, - 31, 0, 12, 0, 32, 0, 13, 14, 0, 15, - 33, 34, 16, 35, 17, 0, 0, 0, 36, 37, - 5, 18, 6, 0, 0, 0, 0, 0, 7, 0, - 0, 20, 9, 21, 22, 0, 0, 0, 0, 0, - 24, 0, 38, 0, 0, 12, 0, 0, 0, 13, - 14, 0, 15, 0, 0, 16, 0, 17, 0, 0, - 0, 0, 0, 25, 18, 0, 0, 26, 27, 28, - 29, 0, 0, 30, 20, 31, 21, 22, 0, 32, - 0, 0, 0, 24, 0, 0, 34, 0, 35, 0, - 0, 0, 0, 370, 37, 399, 400, 401, 402, 403, - 404, 405, 406, 407, 0, 0, 25, 0, 0, 0, - 26, 27, 28, 29, 0, 0, 30, 38, 31, 0, - 0, 0, 32, 0, 0, 0, 0, 0, 0, 34, - 0, 35, 0, 0, 0, 0, 36, 37, 399, 400, - 401, 402, 403, 404, 405, 406, 407, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 38, 399, 400, 401, 402, 403, 404, 405, 406, 407, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 399, 400, 401, 402, 403, 404, - 405, 406, 407, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 399, 400, 401, 402, - 403, 404, 405, 406, 407, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 408, 0, 409, 410, 411, 412, 413, 414, 415, - 416, 417, 418, 0, 0, 0, 0, 0, 0, 0, - 419, 420, 0, 0, 0, 434, 399, 400, 401, 402, - 403, 404, 405, 406, 407, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 408, 0, 409, 410, 411, 412, - 413, 414, 415, 416, 417, 418, 399, 400, 401, 402, - 403, 404, 405, 419, 420, 0, 0, 408, 442, 409, - 410, 411, 412, 413, 414, 415, 416, 417, 418, 399, - 400, 401, 402, 403, 404, 405, 419, 420, 0, 0, - 408, 478, 409, 410, 411, 412, 413, 414, 415, 416, - 417, 418, 399, 400, 401, 402, 403, 404, 405, 419, - 420, 523, 408, 522, 409, 410, 411, 412, 413, 414, - 415, 416, 417, 418, 0, 0, 0, 0, 0, 0, - 0, 419, 420, 399, 400, 401, 402, 403, 404, 405, - 0, 407, 0, 0, 0, 0, 0, 0, 0, 399, - 400, 401, 402, 403, 404, 405, 0, 0, 0, 0, - 0, 0, 408, 0, 409, 410, 411, 412, 413, 414, - 415, 416, 417, 418, 0, 0, 0, 0, 0, 0, - 0, 419, 420, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 409, 410, 411, 412, 413, 414, - 415, 416, 417, 418, 0, 0, 0, 0, 0, 0, - 0, 419, 420, 0, 0, 0, 0, 0, 410, 411, - 412, 413, 414, 415, 416, 417, 418, 0, 0, 0, - 0, 0, 0, 0, 419, 420, 0, 0, 0, 0, - 0, 0, 411, 412, 413, 414, 415, 416, 417, 418, - 0, 0, 0, 0, 0, 0, 0, 419, 420, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 409, 410, 411, 412, 413, 414, 415, 416, 417, - 418, 0, 4, 0, 0, 0, 0, 0, 419, 420, - 412, 413, 414, 415, 416, 417, 418, 0, 0, 0, - 0, 0, 0, 0, 419, 420, 5, 0, 6, 0, - 0, 0, 0, 0, 7, 8, 0, 0, 9, 0, - 0, 0, 0, 0, 0, 4, 0, 0, 0, 11, + 494, 495, 496, 497, 498, 499, 500, 4, 502, 466, + 475, 476, 477, 483, 511, 480, 501, 504, 505, 508, + 509, 512, 518, 377, 539, 333, 521, 525, 540, 530, + 545, 5, 171, 6, 461, 44, 515, 470, 52, 7, + 8, 544, 177, 9, 58, 61, 365, 296, 10, 297, + 298, 299, 300, 301, 11, 517, 12, 267, 334, 0, + 13, 14, 336, 15, 0, 376, 16, 522, 17, 0, + 0, 0, 0, 0, 0, 18, 0, 0, 0, 0, + 0, 19, 253, 0, 0, 20, 0, 21, 22, 23, + 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, + 0, 0, 4, 0, 0, 302, 0, 0, 0, 0, + 531, 364, 0, 70, 0, 46, 0, 25, 67, 0, + 0, 26, 27, 28, 29, 0, 5, 30, 6, 31, + 0, 0, 0, 32, 7, 0, 0, 0, 9, 33, + 34, 303, 35, 10, 0, 0, 0, 36, 37, 0, 0, 12, 0, 0, 0, 13, 14, 0, 15, 0, - 0, 16, 0, 17, 0, 0, 0, 0, 0, 5, - 18, 6, 0, 0, 0, 0, 0, 7, 0, 0, - 20, 9, 21, 22, 23, 0, 0, 174, 0, 24, - 0, 175, 0, 0, 12, 0, 0, 0, 13, 14, - 0, 15, 0, 0, 16, 0, 17, 0, 0, 0, - 0, 0, 25, 18, 0, 4, 26, 27, 28, 29, - 0, 0, 30, 20, 31, 21, 22, 0, 32, 0, - 0, 0, 24, 0, 0, 34, 0, 35, 0, 5, - 0, 6, 36, 37, 0, 0, 0, 7, 0, 0, - 0, 0, 0, 0, 0, 25, 0, 0, 0, 26, - 27, 28, 29, 0, 12, 30, 0, 31, 13, 14, - 0, 32, 0, 0, 16, 0, 17, 0, 34, 0, - 35, 0, 0, 18, 0, 36, 37, 0, 0, 0, - 0, 0, 0, 0, 0, 21, 22, 0, 0, 0, - 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, + 0, 16, 0, 17, 0, 0, 0, 304, 0, 0, + 18, 38, 0, 0, 0, 0, 19, 262, 0, 305, + 20, 0, 21, 22, 0, 0, 0, 0, 0, 24, + 0, 0, 0, 0, 0, 0, 306, 4, 0, 307, + 308, 309, 0, 0, 310, 311, 0, 0, 0, 0, + 0, 0, 25, 464, 0, 312, 26, 27, 28, 29, + 0, 5, 30, 6, 31, 0, 0, 0, 32, 7, + 0, 0, 0, 9, 33, 34, 0, 35, 10, 0, + 0, 0, 36, 37, 0, 0, 12, 0, 0, 0, + 13, 14, 0, 15, 0, 0, 16, 0, 17, 0, + 0, 0, 0, 0, 0, 18, 38, 0, 0, 0, + 0, 19, 462, 0, 0, 20, 0, 21, 22, 0, + 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, + 0, 296, 4, 297, 298, 299, 300, 301, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 25, 0, 0, + 0, 26, 27, 28, 29, 0, 5, 30, 6, 31, + 0, 0, 0, 32, 7, 0, 0, 0, 0, 33, + 34, 0, 35, 0, 0, 0, 0, 36, 37, 0, + 0, 12, 0, 0, 0, 13, 14, 0, 0, 302, + 0, 16, 296, 17, 297, 298, 299, 300, 301, 0, + 18, 38, 0, 0, 0, 0, 0, 528, 0, 0, + 0, 0, 21, 22, 0, 0, 0, 0, 0, 24, + 0, 0, 0, 0, 0, 303, 0, 0, 0, 0, + 0, 0, 296, 0, 297, 298, 299, 300, 301, 0, + 0, 0, 0, 0, 0, 0, 26, 27, 28, 29, + 302, 304, 30, 0, 0, 0, 0, 0, 32, 0, + 0, 0, 0, 305, 0, 34, 0, 35, 0, 0, + 0, 0, 36, 37, 0, 0, 0, 0, 0, 0, + 306, 0, 0, 307, 308, 309, 303, 0, 310, 311, + 302, 0, 0, 0, 0, 0, 0, 0, 0, 312, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 26, - 27, 28, 29, 0, 0, 30, 0, 0, 0, 0, - 0, 32, 0, 0, 0, 0, 0, 0, 34, 0, - 35, 0, 0, 0, 0, 36, 37, 96, 0, 97, - 98, 0, 99, 100, 0, 101, 0, 0, 102, 0, - 103, 0, 0, 0, 0, 0, 0, 104, 105, 106, - 107, 0, 108, 109, 110, 111, 112, 0, 113, 0, - 114, 115, 116, 0, 0, 117, 0, 0, 0, 0, - 118, 0, 119, 120, 121, 122, 123, 124, 0, 125, - 126, 127, 128, 129, 0, 0, 130, 0, 0, 131, - 0, 0, 0, 132, 133, 0, 134, 0, 0, 0, - 135, 136, 137, 0, 138, 139, 140, 141, 142, 0, - 143, 0, 144, 145, 146, 147, 148, 149, 150, 151, - 0, 152, 153, 154, 0, 0, 0, 0, 155, 0, - 0, 156, 0, 0, 157, 158, 0, 0, 159, 160, - 161, 0, 0, 0, 162, 0, 163, 164, 165, 166, - 0, 0, 167 + 0, 0, 304, 0, 0, 0, 400, 401, 402, 403, + 404, 405, 406, 0, 305, 0, 303, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 306, 0, 0, 307, 308, 309, 0, 0, 310, + 311, 0, 304, 0, 0, 0, 0, 0, 0, 0, + 312, 0, 0, 0, 305, 0, 0, 0, 0, 4, + 0, 0, 0, 0, 0, 0, 252, 0, 0, 0, + 0, 306, 0, 0, 307, 308, 369, 0, 0, 310, + 311, 0, 0, 5, 0, 6, 0, 0, 0, 0, + 312, 7, 8, 0, 0, 9, 0, 0, 0, 0, + 10, 0, 0, 0, 0, 0, 11, 0, 12, 0, + 0, 0, 13, 14, 0, 15, 0, 0, 16, 0, + 17, 0, 0, 0, 0, 0, 0, 18, 0, 0, + 0, 0, 0, 19, 253, 0, 0, 20, 0, 21, + 22, 23, 0, 0, 0, 0, 24, 413, 414, 415, + 416, 417, 418, 419, 4, 0, 0, 0, 0, 0, + 0, 420, 421, 0, 0, 0, 0, 0, 0, 25, + 0, 0, 0, 26, 27, 28, 29, 0, 5, 30, + 6, 31, 0, 0, 0, 32, 7, 8, 0, 0, + 9, 33, 34, 0, 35, 10, 0, 0, 0, 36, + 37, 11, 0, 12, 0, 0, 0, 13, 14, 0, + 15, 0, 0, 16, 0, 17, 0, 0, 0, 0, + 0, 0, 18, 38, 0, 0, 0, 0, 19, 4, + 0, 0, 20, 0, 21, 22, 23, 0, 0, 0, + 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 5, 0, 6, 0, 0, 0, 0, + 0, 7, 0, 0, 25, 9, 0, 0, 26, 27, + 28, 29, 4, 0, 30, 0, 31, 0, 12, 0, + 32, 0, 13, 14, 0, 15, 33, 34, 16, 35, + 17, 0, 0, 0, 36, 37, 5, 18, 6, 0, + 0, 0, 0, 0, 7, 0, 0, 20, 9, 21, + 22, 0, 0, 0, 0, 0, 24, 0, 38, 0, + 0, 12, 0, 0, 0, 13, 14, 0, 15, 0, + 0, 16, 0, 17, 0, 0, 0, 0, 0, 25, + 18, 0, 0, 26, 27, 28, 29, 0, 0, 30, + 20, 31, 21, 22, 0, 32, 0, 0, 0, 24, + 0, 0, 34, 0, 35, 0, 0, 0, 0, 371, + 37, 400, 401, 402, 403, 404, 405, 406, 407, 408, + 0, 0, 25, 0, 0, 0, 26, 27, 28, 29, + 0, 0, 30, 38, 31, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 34, 0, 35, 0, 0, + 0, 0, 36, 37, 400, 401, 402, 403, 404, 405, + 406, 407, 408, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 38, 400, 401, 402, + 403, 404, 405, 406, 407, 408, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 400, 401, 402, 403, 404, 405, 406, 407, 408, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 400, 401, 402, 403, 404, 405, 406, 407, + 408, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 409, 0, 410, + 411, 412, 413, 414, 415, 416, 417, 418, 419, 0, + 0, 0, 0, 0, 0, 0, 420, 421, 0, 0, + 0, 435, 400, 401, 402, 403, 404, 405, 406, 407, + 408, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 409, 0, 410, 411, 412, 413, 414, 415, 416, 417, + 418, 419, 400, 401, 402, 403, 404, 405, 406, 420, + 421, 0, 0, 409, 443, 410, 411, 412, 413, 414, + 415, 416, 417, 418, 419, 400, 401, 402, 403, 404, + 405, 406, 420, 421, 0, 0, 409, 479, 410, 411, + 412, 413, 414, 415, 416, 417, 418, 419, 400, 401, + 402, 403, 404, 405, 406, 420, 421, 524, 409, 523, + 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, + 0, 0, 0, 0, 0, 0, 0, 420, 421, 400, + 401, 402, 403, 404, 405, 406, 0, 408, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 409, 0, + 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, + 0, 0, 0, 0, 0, 0, 0, 420, 421, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, + 0, 0, 0, 0, 0, 0, 0, 420, 421, 0, + 0, 0, 0, 0, 411, 412, 413, 414, 415, 416, + 417, 418, 419, 0, 0, 0, 0, 0, 0, 0, + 420, 421, 0, 0, 0, 0, 0, 0, 412, 413, + 414, 415, 416, 417, 418, 419, 0, 0, 0, 0, + 0, 0, 0, 420, 421, 4, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 410, 411, 412, + 413, 414, 415, 416, 417, 418, 419, 0, 0, 5, + 0, 6, 0, 0, 420, 421, 0, 7, 8, 0, + 0, 9, 0, 0, 0, 0, 0, 0, 4, 0, + 0, 0, 11, 0, 12, 0, 0, 0, 13, 14, + 0, 15, 0, 0, 16, 0, 17, 0, 0, 0, + 0, 0, 5, 18, 6, 0, 0, 0, 0, 0, + 7, 0, 0, 20, 9, 21, 22, 23, 0, 0, + 172, 0, 24, 0, 173, 0, 0, 12, 0, 0, + 0, 13, 14, 0, 15, 0, 0, 16, 0, 17, + 0, 0, 0, 0, 0, 25, 18, 0, 4, 26, + 27, 28, 29, 0, 0, 30, 20, 31, 21, 22, + 0, 32, 0, 0, 0, 24, 0, 0, 34, 0, + 35, 0, 5, 0, 6, 36, 37, 0, 0, 0, + 7, 0, 0, 0, 0, 0, 0, 0, 25, 0, + 0, 0, 26, 27, 28, 29, 0, 12, 30, 0, + 31, 13, 14, 0, 32, 0, 0, 16, 0, 17, + 0, 34, 0, 35, 0, 0, 18, 0, 36, 37, + 0, 0, 0, 0, 0, 0, 0, 0, 21, 22, + 0, 0, 0, 0, 0, 24, 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, 26, 27, 28, 29, 0, 0, 30, 0, + 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, + 0, 34, 0, 35, 0, 0, 0, 0, 36, 37, + 95, 0, 96, 97, 0, 98, 99, 0, 100, 0, + 0, 101, 0, 102, 0, 0, 0, 0, 0, 0, + 103, 104, 105, 106, 0, 107, 108, 109, 110, 111, + 0, 112, 0, 113, 114, 115, 0, 0, 116, 0, + 0, 0, 0, 117, 0, 118, 119, 120, 121, 122, + 123, 0, 124, 125, 126, 127, 128, 0, 0, 129, + 0, 0, 130, 0, 0, 0, 131, 132, 0, 133, + 0, 0, 0, 134, 135, 136, 0, 137, 138, 139, + 140, 141, 0, 142, 0, 143, 144, 145, 146, 147, + 148, 149, 150, 0, 151, 152, 153, 0, 0, 0, + 0, 154, 0, 0, 155, 0, 0, 156, 157, 0, + 0, 158, 159, 160, 0, 0, 0, 161, 0, 162, + 163, 164, 165, 0, 0, 166 }; static const short int yycheck[] = { - 2, 46, 2, 2, 2, 33, 273, 2, 67, 279, - 230, 207, 208, 233, 34, 235, 249, 261, 238, 36, - 2, 241, 46, 217, 92, 221, 46, 86, 3, 4, - 224, 63, 64, 65, 40, 131, 229, 69, 3, 4, - 2, 14, 147, 51, 131, 168, 91, 147, 64, 65, - 147, 174, 109, 69, 60, 72, 113, 147, 147, 28, - 35, 3, 4, 147, 169, 40, 35, 84, 85, 0, - 35, 86, 172, 147, 91, 172, 82, 173, 86, 275, - 269, 138, 172, 172, 46, 278, 173, 62, 172, 3, - 105, 5, 6, 7, 8, 9, 170, 62, 168, 168, - 168, 171, 119, 292, 293, 174, 350, 124, 114, 171, - 168, 24, 168, 346, 27, 8, 174, 361, 174, 8, - 126, 10, 168, 32, 170, 34, 3, 4, 103, 3, - 4, 3, 4, 3, 4, 3, 4, 84, 103, 3, - 4, 3, 4, 3, 4, 171, 168, 61, 173, 170, - 173, 170, 127, 149, 174, 173, 12, 13, 14, 379, - 170, 170, 127, 14, 8, 189, 170, 437, 173, 170, - 172, 173, 172, 173, 172, 173, 170, 172, 173, 14, - 376, 213, 157, 97, 378, 244, 245, 383, 173, 248, - 172, 173, 157, 460, 167, 168, 171, 213, 12, 13, - 14, 421, 170, 17, 18, 171, 171, 170, 3, 123, - 170, 170, 173, 226, 171, 171, 229, 461, 171, 171, - 440, 135, 171, 236, 175, 171, 239, 171, 171, 242, - 243, 171, 171, 171, 171, 280, 171, 171, 152, 267, - 173, 155, 156, 157, 171, 171, 160, 161, 171, 171, - 171, 171, 311, 171, 171, 169, 171, 171, 454, 171, - 8, 289, 173, 171, 508, 278, 279, 172, 172, 8, - 8, 467, 274, 8, 274, 471, 274, 8, 280, 274, - 474, 65, 5, 527, 168, 171, 149, 170, 170, 174, - 147, 293, 305, 306, 307, 308, 309, 310, 311, 155, - 156, 157, 158, 159, 155, 156, 157, 158, 159, 175, - 355, 167, 168, 533, 510, 173, 167, 168, 363, 172, - 147, 171, 157, 158, 159, 172, 172, 172, 3, 357, - 375, 390, 167, 168, 172, 172, 381, 147, 172, 153, - 154, 155, 156, 157, 158, 159, 172, 172, 172, 172, - 172, 172, 351, 167, 168, 368, 172, 172, 360, 172, - 360, 167, 360, 172, 172, 360, 8, 149, 170, 174, - 78, 169, 172, 147, 170, 172, 170, 3, 3, 172, - 8, 381, 172, 5, 172, 170, 399, 400, 44, 402, + 2, 45, 2, 2, 2, 66, 33, 2, 274, 2, + 262, 231, 206, 207, 234, 250, 236, 4, 2, 239, + 45, 131, 242, 131, 85, 218, 34, 92, 222, 51, + 109, 230, 225, 280, 113, 3, 4, 40, 46, 14, + 147, 28, 0, 30, 147, 147, 90, 63, 64, 36, + 3, 4, 68, 40, 168, 3, 4, 60, 45, 138, + 174, 45, 169, 173, 86, 173, 53, 35, 170, 172, + 57, 58, 40, 60, 86, 14, 63, 171, 65, 82, + 279, 147, 276, 147, 147, 72, 168, 35, 147, 3, + 4, 78, 174, 105, 62, 82, 270, 84, 85, 351, + 12, 13, 14, 168, 91, 8, 172, 10, 172, 172, + 362, 114, 347, 172, 62, 62, 63, 64, 28, 293, + 294, 68, 168, 126, 84, 35, 168, 114, 174, 171, + 168, 118, 119, 120, 121, 103, 174, 124, 24, 126, + 168, 27, 170, 130, 32, 8, 34, 3, 4, 136, + 137, 171, 139, 3, 4, 103, 170, 144, 145, 127, + 380, 168, 14, 188, 3, 4, 174, 173, 170, 171, + 170, 171, 170, 171, 170, 170, 171, 170, 171, 127, + 170, 168, 170, 377, 245, 246, 379, 174, 249, 157, + 384, 438, 167, 168, 173, 461, 212, 3, 4, 12, + 13, 14, 422, 171, 17, 18, 3, 4, 170, 157, + 462, 3, 4, 170, 227, 3, 4, 230, 157, 158, + 159, 441, 149, 171, 237, 170, 170, 240, 167, 168, + 243, 244, 173, 170, 8, 36, 3, 281, 173, 173, + 170, 268, 173, 155, 156, 157, 158, 159, 171, 171, + 171, 312, 171, 171, 171, 167, 168, 509, 171, 175, + 171, 455, 171, 290, 171, 212, 279, 280, 173, 171, + 171, 72, 171, 275, 468, 275, 528, 275, 472, 281, + 275, 171, 475, 84, 85, 172, 171, 171, 171, 171, + 91, 171, 294, 306, 307, 308, 309, 310, 311, 312, + 171, 171, 171, 155, 156, 157, 158, 159, 173, 171, + 171, 171, 356, 172, 534, 167, 168, 511, 119, 8, + 364, 8, 171, 124, 8, 8, 8, 65, 5, 171, + 391, 358, 376, 168, 170, 149, 170, 174, 382, 172, + 153, 154, 155, 156, 157, 158, 159, 173, 147, 147, + 175, 172, 171, 352, 167, 168, 369, 172, 3, 361, + 172, 361, 172, 361, 172, 172, 361, 172, 172, 172, + 172, 147, 172, 8, 149, 78, 172, 172, 172, 172, + 167, 172, 382, 172, 170, 169, 147, 400, 401, 174, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, - 413, 414, 415, 416, 417, 418, 4, 420, 170, 172, - 2, 172, 457, 173, 170, 149, 149, 466, 359, 539, - 378, 466, 242, 2, 437, 46, 2, 2, 471, 182, - 28, -1, 30, 275, -1, -1, 240, -1, 36, 37, - -1, -1, 40, -1, -1, -1, 3, 45, 5, 6, - 7, 8, 9, 51, -1, 53, -1, -1, -1, 57, - 58, -1, 60, -1, 466, 63, 479, 65, -1, -1, - -1, -1, -1, -1, 72, -1, -1, -1, -1, -1, - 78, 79, -1, -1, 82, -1, 84, 85, 86, -1, - -1, -1, -1, 91, -1, -1, -1, -1, -1, -1, - -1, 4, -1, -1, 61, -1, -1, -1, -1, 522, - 512, -1, 512, -1, 512, -1, 114, 512, -1, -1, - 118, 119, 120, 121, -1, 28, 124, 30, 126, -1, - -1, -1, 130, 36, -1, -1, -1, 40, 136, 137, - 97, 139, 45, -1, -1, -1, 144, 145, -1, -1, - 53, -1, -1, -1, 57, 58, -1, 60, -1, -1, - 63, -1, 65, -1, -1, -1, 123, -1, -1, 72, - 168, -1, -1, -1, -1, 78, 174, -1, 135, 82, - -1, 84, 85, -1, -1, -1, -1, -1, 91, -1, - -1, -1, -1, -1, -1, 152, 4, -1, 155, 156, - 157, -1, -1, 160, 161, -1, -1, -1, -1, -1, - -1, 114, -1, -1, 171, 118, 119, 120, 121, -1, - 28, 124, 30, 126, -1, -1, -1, 130, 36, -1, - -1, -1, 40, 136, 137, -1, 139, 45, -1, -1, - -1, 144, 145, -1, -1, 53, -1, -1, -1, 57, - 58, -1, 60, -1, -1, 63, -1, 65, -1, -1, - -1, -1, -1, -1, 72, 168, -1, -1, -1, -1, - 78, 174, -1, -1, 82, -1, 84, 85, -1, -1, - -1, -1, -1, 91, -1, -1, -1, -1, -1, -1, - -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 114, -1, -1, -1, - 118, 119, 120, 121, -1, 28, 124, 30, 126, -1, - -1, -1, 130, 36, -1, -1, -1, 40, 136, 137, - -1, 139, 45, -1, -1, -1, 144, 145, -1, -1, - 53, -1, -1, -1, 57, 58, -1, 60, -1, -1, - 63, -1, 65, -1, -1, -1, -1, -1, -1, 72, - 168, -1, -1, -1, -1, 78, 174, -1, -1, 82, - -1, 84, 85, -1, -1, -1, -1, -1, 91, -1, - -1, -1, -1, -1, -1, 3, 4, 5, 6, 7, - 8, 9, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 114, -1, -1, -1, 118, 119, 120, 121, -1, - 28, 124, 30, 126, -1, -1, -1, 130, 36, -1, - -1, -1, -1, 136, 137, -1, 139, -1, -1, -1, - -1, 144, 145, -1, -1, 53, -1, -1, -1, 57, - 58, -1, -1, 61, -1, 63, 3, 65, 5, 6, - 7, 8, 9, -1, 72, 168, -1, -1, -1, -1, - -1, 174, -1, -1, -1, -1, 84, 85, -1, -1, - -1, -1, -1, 91, -1, -1, -1, -1, -1, 97, + 413, 414, 415, 416, 417, 418, 419, 4, 421, 172, + 172, 170, 170, 3, 458, 172, 3, 8, 172, 5, + 172, 170, 170, 467, 149, 438, 172, 172, 149, 173, + 170, 28, 43, 30, 360, 2, 467, 379, 2, 36, + 37, 540, 45, 40, 2, 2, 276, 3, 45, 5, + 6, 7, 8, 9, 51, 472, 53, 180, 241, -1, + 57, 58, 243, 60, -1, 467, 63, 480, 65, -1, + -1, -1, -1, -1, -1, 72, -1, -1, -1, -1, + -1, 78, 79, -1, -1, 82, -1, 84, 85, 86, + -1, -1, -1, -1, 91, -1, -1, -1, -1, -1, + -1, -1, 4, -1, -1, 61, -1, -1, -1, -1, + 523, 513, -1, 513, -1, 513, -1, 114, 513, -1, + -1, 118, 119, 120, 121, -1, 28, 124, 30, 126, + -1, -1, -1, 130, 36, -1, -1, -1, 40, 136, + 137, 97, 139, 45, -1, -1, -1, 144, 145, -1, + -1, 53, -1, -1, -1, 57, 58, -1, 60, -1, + -1, 63, -1, 65, -1, -1, -1, 123, -1, -1, + 72, 168, -1, -1, -1, -1, 78, 174, -1, 135, + 82, -1, 84, 85, -1, -1, -1, -1, -1, 91, + -1, -1, -1, -1, -1, -1, 152, 4, -1, 155, + 156, 157, -1, -1, 160, 161, -1, -1, -1, -1, + -1, -1, 114, 169, -1, 171, 118, 119, 120, 121, + -1, 28, 124, 30, 126, -1, -1, -1, 130, 36, + -1, -1, -1, 40, 136, 137, -1, 139, 45, -1, + -1, -1, 144, 145, -1, -1, 53, -1, -1, -1, + 57, 58, -1, 60, -1, -1, 63, -1, 65, -1, + -1, -1, -1, -1, -1, 72, 168, -1, -1, -1, + -1, 78, 174, -1, -1, 82, -1, 84, 85, -1, + -1, -1, -1, -1, 91, -1, -1, -1, -1, -1, + -1, 3, 4, 5, 6, 7, 8, 9, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 114, -1, -1, + -1, 118, 119, 120, 121, -1, 28, 124, 30, 126, + -1, -1, -1, 130, 36, -1, -1, -1, -1, 136, + 137, -1, 139, -1, -1, -1, -1, 144, 145, -1, + -1, 53, -1, -1, -1, 57, 58, -1, -1, 61, + -1, 63, 3, 65, 5, 6, 7, 8, 9, -1, + 72, 168, -1, -1, -1, -1, -1, 174, -1, -1, + -1, -1, 84, 85, -1, -1, -1, -1, -1, 91, + -1, -1, -1, -1, -1, 97, -1, -1, -1, -1, + -1, -1, 3, -1, 5, 6, 7, 8, 9, -1, + -1, -1, -1, -1, -1, -1, 118, 119, 120, 121, + 61, 123, 124, -1, -1, -1, -1, -1, 130, -1, + -1, -1, -1, 135, -1, 137, -1, 139, -1, -1, + -1, -1, 144, 145, -1, -1, -1, -1, -1, -1, + 152, -1, -1, 155, 156, 157, 97, -1, 160, 161, + 61, -1, -1, -1, -1, -1, -1, -1, -1, 171, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 123, -1, -1, -1, 12, 13, 14, 15, + 16, 17, 18, -1, 135, -1, 97, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 118, 119, 120, 121, 61, 123, 124, -1, -1, -1, - -1, -1, 130, -1, -1, -1, -1, 135, -1, 137, - -1, 139, -1, -1, -1, -1, 144, 145, -1, -1, - -1, -1, -1, -1, 152, -1, -1, 155, 156, 157, - 97, -1, 160, 161, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 171, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 123, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 135, -1, - -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, - 11, -1, -1, -1, -1, 152, -1, -1, 155, 156, - 157, -1, -1, 160, 161, -1, -1, 28, -1, 30, - -1, -1, -1, -1, 171, 36, 37, -1, -1, 40, - -1, -1, -1, -1, 45, -1, -1, -1, -1, -1, - 51, -1, 53, -1, -1, -1, 57, 58, -1, 60, - -1, -1, 63, -1, 65, -1, -1, -1, -1, -1, - -1, 72, -1, -1, -1, -1, -1, 78, 79, -1, - -1, 82, -1, 84, 85, 86, -1, -1, -1, -1, - 91, -1, -1, -1, -1, -1, -1, -1, 4, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 114, -1, -1, -1, 118, 119, 120, - 121, -1, 28, 124, 30, 126, -1, -1, -1, 130, - 36, 37, -1, -1, 40, 136, 137, -1, 139, 45, - -1, -1, -1, 144, 145, 51, -1, 53, -1, -1, - -1, 57, 58, -1, 60, -1, -1, 63, -1, 65, - -1, -1, -1, -1, -1, -1, 72, 168, -1, -1, - -1, -1, 78, 4, -1, -1, 82, -1, 84, 85, - 86, -1, -1, -1, -1, 91, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 28, -1, 30, - -1, -1, -1, -1, -1, 36, -1, -1, 114, 40, - -1, -1, 118, 119, 120, 121, 4, -1, 124, -1, - 126, -1, 53, -1, 130, -1, 57, 58, -1, 60, - 136, 137, 63, 139, 65, -1, -1, -1, 144, 145, - 28, 72, 30, -1, -1, -1, -1, -1, 36, -1, - -1, 82, 40, 84, 85, -1, -1, -1, -1, -1, - 91, -1, 168, -1, -1, 53, -1, -1, -1, 57, - 58, -1, 60, -1, -1, 63, -1, 65, -1, -1, - -1, -1, -1, 114, 72, -1, -1, 118, 119, 120, - 121, -1, -1, 124, 82, 126, 84, 85, -1, 130, - -1, -1, -1, 91, -1, -1, 137, -1, 139, -1, - -1, -1, -1, 144, 145, 12, 13, 14, 15, 16, - 17, 18, 19, 20, -1, -1, 114, -1, -1, -1, - 118, 119, 120, 121, -1, -1, 124, 168, 126, -1, - -1, -1, 130, -1, -1, -1, -1, -1, -1, 137, - -1, 139, -1, -1, -1, -1, 144, 145, 12, 13, - 14, 15, 16, 17, 18, 19, 20, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 168, 12, 13, 14, 15, 16, 17, 18, 19, 20, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 12, 13, 14, 15, 16, 17, + -1, 152, -1, -1, 155, 156, 157, -1, -1, 160, + 161, -1, 123, -1, -1, -1, -1, -1, -1, -1, + 171, -1, -1, -1, 135, -1, -1, -1, -1, 4, + -1, -1, -1, -1, -1, -1, 11, -1, -1, -1, + -1, 152, -1, -1, 155, 156, 157, -1, -1, 160, + 161, -1, -1, 28, -1, 30, -1, -1, -1, -1, + 171, 36, 37, -1, -1, 40, -1, -1, -1, -1, + 45, -1, -1, -1, -1, -1, 51, -1, 53, -1, + -1, -1, 57, 58, -1, 60, -1, -1, 63, -1, + 65, -1, -1, -1, -1, -1, -1, 72, -1, -1, + -1, -1, -1, 78, 79, -1, -1, 82, -1, 84, + 85, 86, -1, -1, -1, -1, 91, 153, 154, 155, + 156, 157, 158, 159, 4, -1, -1, -1, -1, -1, + -1, 167, 168, -1, -1, -1, -1, -1, -1, 114, + -1, -1, -1, 118, 119, 120, 121, -1, 28, 124, + 30, 126, -1, -1, -1, 130, 36, 37, -1, -1, + 40, 136, 137, -1, 139, 45, -1, -1, -1, 144, + 145, 51, -1, 53, -1, -1, -1, 57, 58, -1, + 60, -1, -1, 63, -1, 65, -1, -1, -1, -1, + -1, -1, 72, 168, -1, -1, -1, -1, 78, 4, + -1, -1, 82, -1, 84, 85, 86, -1, -1, -1, + -1, 91, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 28, -1, 30, -1, -1, -1, -1, + -1, 36, -1, -1, 114, 40, -1, -1, 118, 119, + 120, 121, 4, -1, 124, -1, 126, -1, 53, -1, + 130, -1, 57, 58, -1, 60, 136, 137, 63, 139, + 65, -1, -1, -1, 144, 145, 28, 72, 30, -1, + -1, -1, -1, -1, 36, -1, -1, 82, 40, 84, + 85, -1, -1, -1, -1, -1, 91, -1, 168, -1, + -1, 53, -1, -1, -1, 57, 58, -1, 60, -1, + -1, 63, -1, 65, -1, -1, -1, -1, -1, 114, + 72, -1, -1, 118, 119, 120, 121, -1, -1, 124, + 82, 126, 84, 85, -1, 130, -1, -1, -1, 91, + -1, -1, 137, -1, 139, -1, -1, -1, -1, 144, + 145, 12, 13, 14, 15, 16, 17, 18, 19, 20, + -1, -1, 114, -1, -1, -1, 118, 119, 120, 121, + -1, -1, 124, 168, 126, -1, -1, -1, 130, -1, + -1, -1, -1, -1, -1, 137, -1, 139, -1, -1, + -1, -1, 144, 145, 12, 13, 14, 15, 16, 17, 18, 19, 20, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 12, 13, 14, 15, - 16, 17, 18, 19, 20, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 168, 12, 13, 14, + 15, 16, 17, 18, 19, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 148, -1, 150, 151, 152, 153, 154, 155, 156, - 157, 158, 159, -1, -1, -1, -1, -1, -1, -1, - 167, 168, -1, -1, -1, 172, 12, 13, 14, 15, - 16, 17, 18, 19, 20, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 148, -1, 150, 151, 152, 153, - 154, 155, 156, 157, 158, 159, 12, 13, 14, 15, - 16, 17, 18, 167, 168, -1, -1, 148, 172, 150, - 151, 152, 153, 154, 155, 156, 157, 158, 159, 12, - 13, 14, 15, 16, 17, 18, 167, 168, -1, -1, - 148, 172, 150, 151, 152, 153, 154, 155, 156, 157, + 12, 13, 14, 15, 16, 17, 18, 19, 20, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 12, 13, 14, 15, 16, 17, 18, 19, + 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 148, -1, 150, + 151, 152, 153, 154, 155, 156, 157, 158, 159, -1, + -1, -1, -1, -1, -1, -1, 167, 168, -1, -1, + -1, 172, 12, 13, 14, 15, 16, 17, 18, 19, + 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 148, -1, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 12, 13, 14, 15, 16, 17, 18, 167, - 168, 169, 148, 149, 150, 151, 152, 153, 154, 155, - 156, 157, 158, 159, -1, -1, -1, -1, -1, -1, - -1, 167, 168, 12, 13, 14, 15, 16, 17, 18, - -1, 20, -1, -1, -1, -1, -1, -1, -1, 12, - 13, 14, 15, 16, 17, 18, -1, -1, -1, -1, - -1, -1, 148, -1, 150, 151, 152, 153, 154, 155, - 156, 157, 158, 159, -1, -1, -1, -1, -1, -1, - -1, 167, 168, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 150, 151, 152, 153, 154, 155, - 156, 157, 158, 159, -1, -1, -1, -1, -1, -1, - -1, 167, 168, -1, -1, -1, -1, -1, 151, 152, - 153, 154, 155, 156, 157, 158, 159, -1, -1, -1, - -1, -1, -1, -1, 167, 168, -1, -1, -1, -1, - -1, -1, 152, 153, 154, 155, 156, 157, 158, 159, + 168, -1, -1, 148, 172, 150, 151, 152, 153, 154, + 155, 156, 157, 158, 159, 12, 13, 14, 15, 16, + 17, 18, 167, 168, -1, -1, 148, 172, 150, 151, + 152, 153, 154, 155, 156, 157, 158, 159, 12, 13, + 14, 15, 16, 17, 18, 167, 168, 169, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + -1, -1, -1, -1, -1, -1, -1, 167, 168, 12, + 13, 14, 15, 16, 17, 18, -1, 20, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 148, -1, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, -1, -1, -1, -1, -1, -1, -1, 167, 168, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 150, 151, 152, 153, 154, 155, 156, 157, 158, - 159, -1, 4, -1, -1, -1, -1, -1, 167, 168, - 153, 154, 155, 156, 157, 158, 159, -1, -1, -1, - -1, -1, -1, -1, 167, 168, 28, -1, 30, -1, - -1, -1, -1, -1, 36, 37, -1, -1, 40, -1, - -1, -1, -1, -1, -1, 4, -1, -1, -1, 51, - -1, 53, -1, -1, -1, 57, 58, -1, 60, -1, - -1, 63, -1, 65, -1, -1, -1, -1, -1, 28, - 72, 30, -1, -1, -1, -1, -1, 36, -1, -1, - 82, 40, 84, 85, 86, -1, -1, 89, -1, 91, - -1, 93, -1, -1, 53, -1, -1, -1, 57, 58, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + -1, -1, -1, -1, -1, -1, -1, 167, 168, -1, + -1, -1, -1, -1, 151, 152, 153, 154, 155, 156, + 157, 158, 159, -1, -1, -1, -1, -1, -1, -1, + 167, 168, -1, -1, -1, -1, -1, -1, 152, 153, + 154, 155, 156, 157, 158, 159, -1, -1, -1, -1, + -1, -1, -1, 167, 168, 4, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 150, 151, 152, + 153, 154, 155, 156, 157, 158, 159, -1, -1, 28, + -1, 30, -1, -1, 167, 168, -1, 36, 37, -1, + -1, 40, -1, -1, -1, -1, -1, -1, 4, -1, + -1, -1, 51, -1, 53, -1, -1, -1, 57, 58, -1, 60, -1, -1, 63, -1, 65, -1, -1, -1, - -1, -1, 114, 72, -1, 4, 118, 119, 120, 121, - -1, -1, 124, 82, 126, 84, 85, -1, 130, -1, - -1, -1, 91, -1, -1, 137, -1, 139, -1, 28, - -1, 30, 144, 145, -1, -1, -1, 36, -1, -1, - -1, -1, -1, -1, -1, 114, -1, -1, -1, 118, - 119, 120, 121, -1, 53, 124, -1, 126, 57, 58, - -1, 130, -1, -1, 63, -1, 65, -1, 137, -1, - 139, -1, -1, 72, -1, 144, 145, -1, -1, -1, - -1, -1, -1, -1, -1, 84, 85, -1, -1, -1, - -1, -1, 91, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 28, 72, 30, -1, -1, -1, -1, -1, + 36, -1, -1, 82, 40, 84, 85, 86, -1, -1, + 89, -1, 91, -1, 93, -1, -1, 53, -1, -1, + -1, 57, 58, -1, 60, -1, -1, 63, -1, 65, + -1, -1, -1, -1, -1, 114, 72, -1, 4, 118, + 119, 120, 121, -1, -1, 124, 82, 126, 84, 85, + -1, 130, -1, -1, -1, 91, -1, -1, 137, -1, + 139, -1, 28, -1, 30, 144, 145, -1, -1, -1, + 36, -1, -1, -1, -1, -1, -1, -1, 114, -1, + -1, -1, 118, 119, 120, 121, -1, 53, 124, -1, + 126, 57, 58, -1, 130, -1, -1, 63, -1, 65, + -1, 137, -1, 139, -1, -1, 72, -1, 144, 145, + -1, -1, -1, -1, -1, -1, -1, -1, 84, 85, + -1, -1, -1, -1, -1, 91, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 118, - 119, 120, 121, -1, -1, 124, -1, -1, -1, -1, - -1, 130, -1, -1, -1, -1, -1, -1, 137, -1, - 139, -1, -1, -1, -1, 144, 145, 21, -1, 23, - 24, -1, 26, 27, -1, 29, -1, -1, 32, -1, - 34, -1, -1, -1, -1, -1, -1, 41, 42, 43, - 44, -1, 46, 47, 48, 49, 50, -1, 52, -1, - 54, 55, 56, -1, -1, 59, -1, -1, -1, -1, - 64, -1, 66, 67, 68, 69, 70, 71, -1, 73, - 74, 75, 76, 77, -1, -1, 80, -1, -1, 83, - -1, -1, -1, 87, 88, -1, 90, -1, -1, -1, - 94, 95, 96, -1, 98, 99, 100, 101, 102, -1, - 104, -1, 106, 107, 108, 109, 110, 111, 112, 113, - -1, 115, 116, 117, -1, -1, -1, -1, 122, -1, - -1, 125, -1, -1, 128, 129, -1, -1, 132, 133, - 134, -1, -1, -1, 138, -1, 140, 141, 142, 143, - -1, -1, 146 + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 118, 119, 120, 121, -1, -1, 124, -1, + -1, -1, -1, -1, 130, -1, -1, -1, -1, -1, + -1, 137, -1, 139, -1, -1, -1, -1, 144, 145, + 21, -1, 23, 24, -1, 26, 27, -1, 29, -1, + -1, 32, -1, 34, -1, -1, -1, -1, -1, -1, + 41, 42, 43, 44, -1, 46, 47, 48, 49, 50, + -1, 52, -1, 54, 55, 56, -1, -1, 59, -1, + -1, -1, -1, 64, -1, 66, 67, 68, 69, 70, + 71, -1, 73, 74, 75, 76, 77, -1, -1, 80, + -1, -1, 83, -1, -1, -1, 87, 88, -1, 90, + -1, -1, -1, 94, 95, 96, -1, 98, 99, 100, + 101, 102, -1, 104, -1, 106, 107, 108, 109, 110, + 111, 112, 113, -1, 115, 116, 117, -1, -1, -1, + -1, 122, -1, -1, 125, -1, -1, 128, 129, -1, + -1, 132, 133, 134, -1, -1, -1, 138, -1, 140, + 141, 142, 143, -1, -1, 146 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1748,57 +1730,57 @@ static const unsigned short int yystos[] = 45, 51, 53, 57, 58, 60, 63, 65, 72, 78, 82, 84, 85, 86, 91, 114, 118, 119, 120, 121, 124, 126, 130, 136, 137, 139, 144, 145, 168, 182, - 183, 184, 185, 186, 189, 190, 197, 208, 222, 226, - 228, 229, 230, 231, 234, 235, 238, 240, 241, 242, - 243, 245, 246, 247, 248, 249, 251, 253, 259, 260, - 261, 262, 3, 4, 171, 3, 4, 3, 4, 224, - 84, 227, 8, 3, 4, 227, 171, 227, 228, 3, - 224, 196, 197, 3, 224, 228, 21, 23, 24, 26, - 27, 29, 32, 34, 41, 42, 43, 44, 46, 47, - 48, 49, 50, 52, 54, 55, 56, 59, 64, 66, - 67, 68, 69, 70, 71, 73, 74, 75, 76, 77, - 80, 83, 87, 88, 90, 94, 95, 96, 98, 99, - 100, 101, 102, 104, 106, 107, 108, 109, 110, 111, - 112, 113, 115, 116, 117, 122, 125, 128, 129, 132, - 133, 134, 138, 140, 141, 142, 143, 146, 198, 200, - 258, 170, 179, 179, 89, 93, 188, 208, 229, 234, - 240, 244, 251, 259, 262, 170, 170, 173, 170, 173, - 170, 181, 170, 149, 239, 173, 252, 253, 252, 252, - 3, 4, 35, 62, 103, 127, 157, 171, 202, 225, - 254, 255, 257, 260, 252, 170, 8, 173, 170, 260, - 173, 251, 131, 173, 171, 171, 171, 171, 171, 171, + 183, 184, 185, 188, 189, 196, 207, 221, 225, 227, + 228, 229, 230, 233, 234, 237, 239, 240, 241, 242, + 244, 245, 246, 247, 248, 250, 252, 258, 259, 260, + 261, 3, 4, 171, 3, 4, 3, 4, 223, 84, + 226, 8, 3, 4, 226, 171, 226, 227, 3, 223, + 195, 196, 3, 223, 227, 21, 23, 24, 26, 27, + 29, 32, 34, 41, 42, 43, 44, 46, 47, 48, + 49, 50, 52, 54, 55, 56, 59, 64, 66, 67, + 68, 69, 70, 71, 73, 74, 75, 76, 77, 80, + 83, 87, 88, 90, 94, 95, 96, 98, 99, 100, + 101, 102, 104, 106, 107, 108, 109, 110, 111, 112, + 113, 115, 116, 117, 122, 125, 128, 129, 132, 133, + 134, 138, 140, 141, 142, 143, 146, 197, 199, 257, + 179, 179, 89, 93, 187, 207, 228, 233, 239, 243, + 250, 258, 261, 170, 170, 170, 173, 170, 173, 170, + 181, 170, 149, 238, 173, 251, 252, 251, 251, 3, + 4, 35, 62, 103, 127, 157, 171, 201, 224, 253, + 254, 256, 259, 170, 251, 170, 170, 8, 173, 170, + 259, 173, 250, 131, 173, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, 171, 147, - 169, 11, 79, 182, 187, 190, 229, 231, 242, 243, - 246, 174, 3, 3, 4, 173, 257, 232, 105, 236, - 240, 3, 4, 173, 180, 250, 254, 254, 175, 168, - 171, 195, 252, 172, 205, 206, 207, 225, 172, 215, - 254, 256, 171, 218, 225, 3, 5, 6, 7, 8, - 9, 61, 97, 123, 135, 152, 155, 156, 157, 160, - 161, 171, 211, 212, 213, 211, 214, 8, 8, 199, - 214, 213, 8, 8, 213, 8, 213, 211, 65, 213, - 209, 210, 211, 258, 213, 209, 211, 260, 260, 8, - 10, 201, 5, 263, 260, 200, 168, 171, 170, 181, - 174, 196, 233, 149, 92, 196, 220, 237, 170, 173, - 180, 174, 182, 197, 249, 254, 172, 214, 157, 210, - 144, 191, 192, 193, 194, 197, 251, 174, 147, 175, - 174, 196, 216, 147, 220, 174, 197, 217, 220, 172, - 171, 211, 211, 211, 211, 211, 211, 211, 260, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 148, 150, - 151, 152, 153, 154, 155, 156, 157, 158, 159, 167, - 168, 147, 172, 172, 172, 147, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 3, 172, 147, 172, 172, - 147, 172, 172, 172, 172, 172, 167, 172, 172, 200, - 8, 181, 243, 149, 251, 170, 174, 196, 221, 174, - 186, 174, 181, 169, 169, 172, 147, 251, 254, 207, - 213, 251, 262, 254, 172, 170, 170, 260, 172, 172, - 211, 211, 3, 211, 211, 211, 211, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, - 3, 211, 213, 8, 172, 210, 213, 5, 172, 254, - 251, 170, 180, 181, 194, 254, 256, 170, 223, 225, - 172, 211, 149, 169, 172, 181, 254, 174, 170, 173, - 211, 181, 203, 34, 46, 174, 204, 213, 149, 149, - 170, 219, 220, 219, 170 + 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, + 147, 169, 11, 79, 182, 186, 189, 228, 230, 241, + 242, 245, 174, 3, 3, 4, 173, 256, 231, 105, + 235, 239, 3, 4, 173, 180, 249, 253, 253, 175, + 168, 171, 194, 251, 172, 204, 205, 206, 224, 172, + 214, 253, 255, 171, 217, 224, 3, 5, 6, 7, + 8, 9, 61, 97, 123, 135, 152, 155, 156, 157, + 160, 161, 171, 210, 211, 212, 210, 213, 8, 8, + 198, 213, 212, 8, 8, 212, 8, 212, 210, 65, + 212, 208, 209, 210, 257, 212, 208, 210, 259, 259, + 8, 10, 200, 5, 262, 259, 199, 168, 171, 170, + 181, 174, 195, 232, 149, 92, 195, 219, 236, 170, + 173, 180, 174, 182, 196, 248, 253, 172, 213, 157, + 209, 144, 190, 191, 192, 193, 196, 250, 174, 147, + 175, 174, 195, 215, 147, 219, 174, 196, 216, 219, + 172, 171, 210, 210, 210, 210, 210, 210, 210, 259, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 148, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + 167, 168, 147, 172, 172, 172, 147, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 3, 172, 147, 172, + 172, 147, 172, 172, 172, 172, 172, 167, 172, 172, + 199, 8, 181, 242, 149, 250, 170, 174, 195, 220, + 174, 185, 174, 181, 169, 169, 172, 147, 250, 253, + 206, 212, 250, 261, 253, 172, 170, 170, 259, 172, + 172, 210, 210, 3, 210, 210, 210, 210, 210, 210, + 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, + 210, 3, 210, 212, 8, 172, 209, 212, 5, 172, + 253, 250, 170, 180, 181, 193, 253, 255, 170, 222, + 224, 172, 210, 149, 169, 172, 181, 253, 174, 170, + 173, 210, 181, 202, 34, 46, 174, 203, 212, 149, + 149, 170, 218, 219, 218, 170 }; #define yyerrok (yyerrstatus = 0) @@ -2468,7 +2450,7 @@ yyreduce: switch (yyn) { case 2: -#line 351 "parser.y" +#line 349 "parser.y" { fix_incomplete(); check_all_user_types((yyvsp[0].stmt_list)); write_proxies((yyvsp[0].stmt_list)); @@ -2479,22 +2461,22 @@ yyreduce: break; case 3: -#line 360 "parser.y" +#line 358 "parser.y" { (yyval.stmt_list) = NULL; ;} break; case 4: -#line 361 "parser.y" +#line 359 "parser.y" { (yyval.stmt_list) = (yyvsp[-1].stmt_list); ;} break; case 5: -#line 362 "parser.y" +#line 360 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_type_decl((yyvsp[0].type))); ;} break; case 6: -#line 363 "parser.y" +#line 361 "parser.y" { (yyval.stmt_list) = (yyvsp[-2].stmt_list); reg_type((yyvsp[-1].type), (yyvsp[-1].type)->name, 0); if (!parse_only && do_header) write_coclass_forward((yyvsp[-1].type)); @@ -2502,7 +2484,7 @@ yyreduce: break; case 7: -#line 367 "parser.y" +#line 365 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_type_decl((yyvsp[0].type))); add_typelib_entry((yyvsp[0].type)); reg_type((yyvsp[0].type), (yyvsp[0].type)->name, 0); @@ -2511,44 +2493,44 @@ yyreduce: break; case 8: -#line 372 "parser.y" +#line 370 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_module((yyvsp[0].type))); add_typelib_entry((yyvsp[0].type)); ;} break; case 9: -#line 375 "parser.y" +#line 373 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_library((yyvsp[0].typelib))); ;} break; case 10: -#line 376 "parser.y" +#line 374 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), (yyvsp[0].statement)); ;} break; case 11: -#line 379 "parser.y" +#line 377 "parser.y" { (yyval.stmt_list) = NULL; ;} break; case 12: -#line 380 "parser.y" +#line 378 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_reference((yyvsp[0].type))); if (!parse_only) add_typelib_entry((yyvsp[0].type)); ;} break; case 13: -#line 381 "parser.y" +#line 379 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_type_decl((yyvsp[0].type))); if (!parse_only) add_typelib_entry((yyvsp[0].type)); ;} break; case 14: -#line 382 "parser.y" +#line 380 "parser.y" { (yyval.stmt_list) = (yyvsp[-2].stmt_list); reg_type((yyvsp[-1].type), (yyvsp[-1].type)->name, 0); if (!parse_only && do_header) write_coclass_forward((yyvsp[-1].type)); ;} break; case 15: -#line 383 "parser.y" +#line 381 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_type_decl((yyvsp[0].type))); if (!parse_only) add_typelib_entry((yyvsp[0].type)); reg_type((yyvsp[0].type), (yyvsp[0].type)->name, 0); @@ -2557,42 +2539,42 @@ yyreduce: break; case 16: -#line 388 "parser.y" +#line 386 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_module((yyvsp[0].type))); if (!parse_only) add_typelib_entry((yyvsp[0].type)); ;} break; case 17: -#line 389 "parser.y" +#line 387 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), (yyvsp[0].statement)); ;} break; case 18: -#line 390 "parser.y" +#line 388 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_importlib((yyvsp[0].str))); ;} break; case 19: -#line 391 "parser.y" +#line 389 "parser.y" { (yyval.stmt_list) = append_statement((yyvsp[-1].stmt_list), make_statement_library((yyvsp[0].typelib))); ;} break; case 20: -#line 394 "parser.y" +#line 392 "parser.y" { (yyval.func_list) = NULL; ;} break; case 21: -#line 395 "parser.y" +#line 393 "parser.y" { (yyval.func_list) = append_func_from_statement( (yyvsp[-1].func_list), (yyvsp[0].statement) ); ;} break; case 24: -#line 403 "parser.y" +#line 401 "parser.y" { (yyval.statement) = make_statement_cppquote((yyvsp[0].str)); ;} break; case 25: -#line 404 "parser.y" +#line 402 "parser.y" { (yyval.statement) = make_statement_type_decl((yyvsp[-1].type)); if (!parse_only && do_header) { write_type_def_or_decl(header, (yyvsp[-1].type), FALSE, NULL); @@ -2602,29 +2584,49 @@ yyreduce: break; case 26: -#line 410 "parser.y" +#line 408 "parser.y" { (yyval.statement) = make_statement_declaration((yyvsp[-1].var)); if (!parse_only && do_header) write_declaration((yyvsp[-1].var), is_in_interface); ;} break; case 27: -#line 413 "parser.y" +#line 411 "parser.y" { (yyval.statement) = make_statement_import((yyvsp[0].str)); ;} break; case 28: -#line 414 "parser.y" +#line 412 "parser.y" + { (yyval.statement) = make_statement_type_decl((yyvsp[-1].type)); + if (!parse_only && do_header) { + write_type_def_or_decl(header, (yyvsp[-1].type), FALSE, NULL); + fprintf(header, ";\n\n"); + } + ;} + break; + + case 29: +#line 418 "parser.y" { (yyval.statement) = (yyvsp[-1].statement); ;} break; - case 32: -#line 423 "parser.y" + case 30: +#line 419 "parser.y" + { (yyval.statement) = make_statement_type_decl((yyvsp[-1].type)); + if (!parse_only && do_header) { + write_type_def_or_decl(header, (yyvsp[-1].type), FALSE, NULL); + fprintf(header, ";\n\n"); + } + ;} + break; + + case 31: +#line 427 "parser.y" { (yyval.str) = (yyvsp[-1].str); if (!parse_only && do_header) fprintf(header, "%s\n", (yyvsp[-1].str)); ;} break; - case 33: -#line 425 "parser.y" + case 32: +#line 429 "parser.y" { assert(yychar == YYEMPTY); (yyval.import) = xmalloc(sizeof(struct _import_t)); (yyval.import)->name = (yyvsp[-1].str); @@ -2633,8 +2635,8 @@ yyreduce: ;} break; - case 34: -#line 433 "parser.y" + case 33: +#line 437 "parser.y" { (yyval.str) = (yyvsp[-2].import)->name; if ((yyvsp[-2].import)->import_performed) pop_import(); free((yyvsp[-2].import)); @@ -2642,18 +2644,18 @@ yyreduce: ;} break; - case 35: -#line 441 "parser.y" + case 34: +#line 445 "parser.y" { (yyval.str) = (yyvsp[-2].str); if(!parse_only) add_importlib((yyvsp[-2].str)); ;} break; - case 36: -#line 444 "parser.y" + case 35: +#line 448 "parser.y" { (yyval.str) = (yyvsp[0].str); ;} break; - case 37: -#line 446 "parser.y" + case 36: +#line 450 "parser.y" { (yyval.typelib) = make_library((yyvsp[-1].str), check_library_attrs((yyvsp[-1].str), (yyvsp[-2].attr_list))); if (!parse_only) start_typelib((yyval.typelib)); if (!parse_only && do_header) write_library((yyval.typelib)); @@ -2662,8 +2664,8 @@ yyreduce: ;} break; - case 38: -#line 454 "parser.y" + case 37: +#line 458 "parser.y" { (yyval.typelib) = (yyvsp[-3].typelib); (yyval.typelib)->stmts = (yyvsp[-2].stmt_list); if (!parse_only) end_typelib(); @@ -2671,28 +2673,28 @@ yyreduce: ;} break; - case 39: -#line 461 "parser.y" - { (yyval.var_list) = NULL; ;} - break; - - case 41: + case 38: #line 465 "parser.y" { (yyval.var_list) = NULL; ;} break; - case 42: -#line 468 "parser.y" + case 40: +#line 469 "parser.y" + { (yyval.var_list) = NULL; ;} + break; + + case 41: +#line 472 "parser.y" { check_arg((yyvsp[0].var)); (yyval.var_list) = append_var( NULL, (yyvsp[0].var) ); ;} break; - case 43: -#line 469 "parser.y" + case 42: +#line 473 "parser.y" { check_arg((yyvsp[0].var)); (yyval.var_list) = append_var( (yyvsp[-2].var_list), (yyvsp[0].var)); ;} break; - case 45: -#line 474 "parser.y" + case 44: +#line 478 "parser.y" { (yyval.var) = (yyvsp[0].declarator)->var; (yyval.var)->attrs = (yyvsp[-2].attr_list); if ((yyvsp[-1].declspec)->stgclass != STG_NONE && (yyvsp[-1].declspec)->stgclass != STG_REGISTER) @@ -2702,8 +2704,8 @@ yyreduce: ;} break; - case 46: -#line 481 "parser.y" + case 45: +#line 485 "parser.y" { (yyval.var) = (yyvsp[0].declarator)->var; if ((yyvsp[-1].declspec)->stgclass != STG_NONE && (yyvsp[-1].declspec)->stgclass != STG_REGISTER) error_loc("invalid storage class for function parameter\n"); @@ -2712,484 +2714,484 @@ yyreduce: ;} break; - case 47: -#line 489 "parser.y" + case 46: +#line 493 "parser.y" { (yyval.expr) = (yyvsp[-1].expr); ;} break; - case 48: -#line 490 "parser.y" + case 47: +#line 494 "parser.y" { (yyval.expr) = make_expr(EXPR_VOID); ;} break; - case 49: -#line 493 "parser.y" + case 48: +#line 497 "parser.y" { (yyval.attr_list) = NULL; ;} break; - case 51: -#line 498 "parser.y" + case 50: +#line 502 "parser.y" { (yyval.attr_list) = (yyvsp[-1].attr_list); if (!(yyval.attr_list)) error_loc("empty attribute lists unsupported\n"); ;} break; - case 52: -#line 504 "parser.y" + case 51: +#line 508 "parser.y" { (yyval.attr_list) = append_attr( NULL, (yyvsp[0].attr) ); ;} break; - case 53: -#line 505 "parser.y" + case 52: +#line 509 "parser.y" { (yyval.attr_list) = append_attr( (yyvsp[-2].attr_list), (yyvsp[0].attr) ); ;} break; - case 54: -#line 506 "parser.y" + case 53: +#line 510 "parser.y" { (yyval.attr_list) = append_attr( (yyvsp[-3].attr_list), (yyvsp[0].attr) ); ;} break; - case 55: -#line 509 "parser.y" + case 54: +#line 513 "parser.y" { (yyval.str_list) = append_str( NULL, (yyvsp[0].str) ); ;} break; - case 56: -#line 510 "parser.y" + case 55: +#line 514 "parser.y" { (yyval.str_list) = append_str( (yyvsp[-2].str_list), (yyvsp[0].str) ); ;} break; - case 57: -#line 513 "parser.y" + case 56: +#line 517 "parser.y" { (yyval.attr) = NULL; ;} break; - case 58: -#line 514 "parser.y" + case 57: +#line 518 "parser.y" { (yyval.attr) = make_attr(ATTR_AGGREGATABLE); ;} break; - case 59: -#line 515 "parser.y" + case 58: +#line 519 "parser.y" { (yyval.attr) = make_attr(ATTR_APPOBJECT); ;} break; - case 60: -#line 516 "parser.y" + case 59: +#line 520 "parser.y" { (yyval.attr) = make_attr(ATTR_ASYNC); ;} break; - case 61: -#line 517 "parser.y" + case 60: +#line 521 "parser.y" { (yyval.attr) = make_attr(ATTR_AUTO_HANDLE); ;} break; - case 62: -#line 518 "parser.y" + case 61: +#line 522 "parser.y" { (yyval.attr) = make_attr(ATTR_BINDABLE); ;} break; - case 63: -#line 519 "parser.y" + case 62: +#line 523 "parser.y" { (yyval.attr) = make_attr(ATTR_BROADCAST); ;} break; - case 64: -#line 520 "parser.y" + case 63: +#line 524 "parser.y" { (yyval.attr) = make_attrp(ATTR_CALLAS, (yyvsp[-1].var)); ;} break; - case 65: -#line 521 "parser.y" + case 64: +#line 525 "parser.y" { (yyval.attr) = make_attrp(ATTR_CASE, (yyvsp[-1].expr_list)); ;} break; - case 66: -#line 522 "parser.y" + case 65: +#line 526 "parser.y" { (yyval.attr) = make_attrv(ATTR_CONTEXTHANDLE, 0); ;} break; - case 67: -#line 523 "parser.y" + case 66: +#line 527 "parser.y" { (yyval.attr) = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_DONT_SERIALIZE */ ;} break; - case 68: -#line 524 "parser.y" + case 67: +#line 528 "parser.y" { (yyval.attr) = make_attrv(ATTR_CONTEXTHANDLE, 0); /* RPC_CONTEXT_HANDLE_SERIALIZE */ ;} break; - case 69: -#line 525 "parser.y" + case 68: +#line 529 "parser.y" { (yyval.attr) = make_attr(ATTR_CONTROL); ;} break; - case 70: -#line 526 "parser.y" + case 69: +#line 530 "parser.y" { (yyval.attr) = make_attr(ATTR_DEFAULT); ;} break; - case 71: -#line 527 "parser.y" + case 70: +#line 531 "parser.y" { (yyval.attr) = make_attr(ATTR_DEFAULTCOLLELEM); ;} break; - case 72: -#line 528 "parser.y" + case 71: +#line 532 "parser.y" { (yyval.attr) = make_attrp(ATTR_DEFAULTVALUE, (yyvsp[-1].expr)); ;} break; - case 73: -#line 529 "parser.y" + case 72: +#line 533 "parser.y" { (yyval.attr) = make_attr(ATTR_DEFAULTVTABLE); ;} break; - case 74: -#line 530 "parser.y" + case 73: +#line 534 "parser.y" { (yyval.attr) = make_attr(ATTR_DISPLAYBIND); ;} break; - case 75: -#line 531 "parser.y" + case 74: +#line 535 "parser.y" { (yyval.attr) = make_attrp(ATTR_DLLNAME, (yyvsp[-1].str)); ;} break; - case 76: -#line 532 "parser.y" + case 75: +#line 536 "parser.y" { (yyval.attr) = make_attr(ATTR_DUAL); ;} break; - case 77: -#line 533 "parser.y" + case 76: +#line 537 "parser.y" { (yyval.attr) = make_attrp(ATTR_ENDPOINT, (yyvsp[-1].str_list)); ;} break; - case 78: -#line 534 "parser.y" + case 77: +#line 538 "parser.y" { (yyval.attr) = make_attrp(ATTR_ENTRY, (yyvsp[-1].expr)); ;} break; - case 79: -#line 535 "parser.y" + case 78: +#line 539 "parser.y" { (yyval.attr) = make_attr(ATTR_EXPLICIT_HANDLE); ;} break; - case 80: -#line 536 "parser.y" + case 79: +#line 540 "parser.y" { (yyval.attr) = make_attr(ATTR_HANDLE); ;} break; - case 81: -#line 537 "parser.y" + case 80: +#line 541 "parser.y" { (yyval.attr) = make_attrp(ATTR_HELPCONTEXT, (yyvsp[-1].expr)); ;} break; - case 82: -#line 538 "parser.y" + case 81: +#line 542 "parser.y" { (yyval.attr) = make_attrp(ATTR_HELPFILE, (yyvsp[-1].str)); ;} break; - case 83: -#line 539 "parser.y" + case 82: +#line 543 "parser.y" { (yyval.attr) = make_attrp(ATTR_HELPSTRING, (yyvsp[-1].str)); ;} break; - case 84: -#line 540 "parser.y" + case 83: +#line 544 "parser.y" { (yyval.attr) = make_attrp(ATTR_HELPSTRINGCONTEXT, (yyvsp[-1].expr)); ;} break; - case 85: -#line 541 "parser.y" + case 84: +#line 545 "parser.y" { (yyval.attr) = make_attrp(ATTR_HELPSTRINGDLL, (yyvsp[-1].str)); ;} break; - case 86: -#line 542 "parser.y" + case 85: +#line 546 "parser.y" { (yyval.attr) = make_attr(ATTR_HIDDEN); ;} break; - case 87: -#line 543 "parser.y" + case 86: +#line 547 "parser.y" { (yyval.attr) = make_attrp(ATTR_ID, (yyvsp[-1].expr)); ;} break; - case 88: -#line 544 "parser.y" + case 87: +#line 548 "parser.y" { (yyval.attr) = make_attr(ATTR_IDEMPOTENT); ;} break; - case 89: -#line 545 "parser.y" + case 88: +#line 549 "parser.y" { (yyval.attr) = make_attrp(ATTR_IIDIS, (yyvsp[-1].expr)); ;} break; - case 90: -#line 546 "parser.y" + case 89: +#line 550 "parser.y" { (yyval.attr) = make_attr(ATTR_IMMEDIATEBIND); ;} break; - case 91: -#line 547 "parser.y" + case 90: +#line 551 "parser.y" { (yyval.attr) = make_attrp(ATTR_IMPLICIT_HANDLE, (yyvsp[-1].str)); ;} break; - case 92: -#line 548 "parser.y" + case 91: +#line 552 "parser.y" { (yyval.attr) = make_attr(ATTR_IN); ;} break; - case 93: -#line 549 "parser.y" + case 92: +#line 553 "parser.y" { (yyval.attr) = make_attr(ATTR_INPUTSYNC); ;} break; - case 94: -#line 550 "parser.y" + case 93: +#line 554 "parser.y" { (yyval.attr) = make_attrp(ATTR_LENGTHIS, (yyvsp[-1].expr_list)); ;} break; - case 95: -#line 551 "parser.y" + case 94: +#line 555 "parser.y" { (yyval.attr) = make_attrp(ATTR_LIBLCID, (yyvsp[-1].expr)); ;} break; - case 96: -#line 552 "parser.y" + case 95: +#line 556 "parser.y" { (yyval.attr) = make_attr(ATTR_LOCAL); ;} break; - case 97: -#line 553 "parser.y" + case 96: +#line 557 "parser.y" { (yyval.attr) = make_attr(ATTR_NONBROWSABLE); ;} break; - case 98: -#line 554 "parser.y" + case 97: +#line 558 "parser.y" { (yyval.attr) = make_attr(ATTR_NONCREATABLE); ;} break; - case 99: -#line 555 "parser.y" + case 98: +#line 559 "parser.y" { (yyval.attr) = make_attr(ATTR_NONEXTENSIBLE); ;} break; - case 100: -#line 556 "parser.y" + case 99: +#line 560 "parser.y" { (yyval.attr) = make_attr(ATTR_OBJECT); ;} break; - case 101: -#line 557 "parser.y" + case 100: +#line 561 "parser.y" { (yyval.attr) = make_attr(ATTR_ODL); ;} break; - case 102: -#line 558 "parser.y" + case 101: +#line 562 "parser.y" { (yyval.attr) = make_attr(ATTR_OLEAUTOMATION); ;} break; - case 103: -#line 559 "parser.y" + case 102: +#line 563 "parser.y" { (yyval.attr) = make_attr(ATTR_OPTIONAL); ;} break; - case 104: -#line 560 "parser.y" + case 103: +#line 564 "parser.y" { (yyval.attr) = make_attr(ATTR_OUT); ;} break; - case 105: -#line 561 "parser.y" + case 104: +#line 565 "parser.y" { (yyval.attr) = make_attrv(ATTR_POINTERDEFAULT, (yyvsp[-1].num)); ;} break; - case 106: -#line 562 "parser.y" + case 105: +#line 566 "parser.y" { (yyval.attr) = make_attr(ATTR_PROPGET); ;} break; - case 107: -#line 563 "parser.y" + case 106: +#line 567 "parser.y" { (yyval.attr) = make_attr(ATTR_PROPPUT); ;} break; - case 108: -#line 564 "parser.y" + case 107: +#line 568 "parser.y" { (yyval.attr) = make_attr(ATTR_PROPPUTREF); ;} break; - case 109: -#line 565 "parser.y" + case 108: +#line 569 "parser.y" { (yyval.attr) = make_attr(ATTR_PUBLIC); ;} break; - case 110: -#line 567 "parser.y" + case 109: +#line 571 "parser.y" { expr_list_t *list = append_expr( NULL, (yyvsp[-3].expr) ); list = append_expr( list, (yyvsp[-1].expr) ); (yyval.attr) = make_attrp(ATTR_RANGE, list); ;} break; - case 111: -#line 570 "parser.y" + case 110: +#line 574 "parser.y" { (yyval.attr) = make_attr(ATTR_READONLY); ;} break; - case 112: -#line 571 "parser.y" + case 111: +#line 575 "parser.y" { (yyval.attr) = make_attr(ATTR_REQUESTEDIT); ;} break; - case 113: -#line 572 "parser.y" + case 112: +#line 576 "parser.y" { (yyval.attr) = make_attr(ATTR_RESTRICTED); ;} break; - case 114: -#line 573 "parser.y" + case 113: +#line 577 "parser.y" { (yyval.attr) = make_attr(ATTR_RETVAL); ;} break; - case 115: -#line 574 "parser.y" + case 114: +#line 578 "parser.y" { (yyval.attr) = make_attrp(ATTR_SIZEIS, (yyvsp[-1].expr_list)); ;} break; - case 116: -#line 575 "parser.y" + case 115: +#line 579 "parser.y" { (yyval.attr) = make_attr(ATTR_SOURCE); ;} break; - case 117: -#line 576 "parser.y" + case 116: +#line 580 "parser.y" { (yyval.attr) = make_attr(ATTR_STRICTCONTEXTHANDLE); ;} break; - case 118: -#line 577 "parser.y" + case 117: +#line 581 "parser.y" { (yyval.attr) = make_attr(ATTR_STRING); ;} break; - case 119: -#line 578 "parser.y" + case 118: +#line 582 "parser.y" { (yyval.attr) = make_attrp(ATTR_SWITCHIS, (yyvsp[-1].expr)); ;} break; - case 120: -#line 579 "parser.y" + case 119: +#line 583 "parser.y" { (yyval.attr) = make_attrp(ATTR_SWITCHTYPE, (yyvsp[-1].type)); ;} break; - case 121: -#line 580 "parser.y" + case 120: +#line 584 "parser.y" { (yyval.attr) = make_attrp(ATTR_TRANSMITAS, (yyvsp[-1].type)); ;} break; - case 122: -#line 581 "parser.y" + case 121: +#line 585 "parser.y" { (yyval.attr) = make_attrp(ATTR_UUID, (yyvsp[-1].uuid)); ;} break; - case 123: -#line 582 "parser.y" + case 122: +#line 586 "parser.y" { (yyval.attr) = make_attr(ATTR_V1ENUM); ;} break; - case 124: -#line 583 "parser.y" + case 123: +#line 587 "parser.y" { (yyval.attr) = make_attr(ATTR_VARARG); ;} break; - case 125: -#line 584 "parser.y" + case 124: +#line 588 "parser.y" { (yyval.attr) = make_attrv(ATTR_VERSION, (yyvsp[-1].num)); ;} break; - case 126: -#line 585 "parser.y" + case 125: +#line 589 "parser.y" { (yyval.attr) = make_attrp(ATTR_WIREMARSHAL, (yyvsp[-1].type)); ;} break; - case 127: -#line 586 "parser.y" + case 126: +#line 590 "parser.y" { (yyval.attr) = make_attrv(ATTR_POINTERTYPE, (yyvsp[0].num)); ;} break; - case 129: -#line 591 "parser.y" + case 128: +#line 595 "parser.y" { if (!is_valid_uuid((yyvsp[0].str))) error_loc("invalid UUID: %s\n", (yyvsp[0].str)); (yyval.uuid) = parse_uuid((yyvsp[0].str)); ;} break; + case 129: +#line 600 "parser.y" + { (yyval.str) = (yyvsp[0].str); ;} + break; + case 130: -#line 596 "parser.y" +#line 601 "parser.y" { (yyval.str) = (yyvsp[0].str); ;} break; case 131: -#line 597 "parser.y" +#line 602 "parser.y" { (yyval.str) = (yyvsp[0].str); ;} break; case 132: -#line 598 "parser.y" +#line 603 "parser.y" { (yyval.str) = (yyvsp[0].str); ;} break; case 133: -#line 599 "parser.y" - { (yyval.str) = (yyvsp[0].str); ;} - break; - - case 134: -#line 602 "parser.y" +#line 606 "parser.y" { (yyval.var_list) = NULL; ;} break; - case 135: -#line 603 "parser.y" + case 134: +#line 607 "parser.y" { (yyval.var_list) = append_var( (yyvsp[-1].var_list), (yyvsp[0].var) ); ;} break; - case 136: -#line 606 "parser.y" + case 135: +#line 610 "parser.y" { attr_t *a = make_attrp(ATTR_CASE, append_expr( NULL, (yyvsp[-2].expr) )); (yyval.var) = (yyvsp[0].var); if (!(yyval.var)) (yyval.var) = make_var(NULL); (yyval.var)->attrs = append_attr( (yyval.var)->attrs, a ); ;} break; - case 137: -#line 610 "parser.y" + case 136: +#line 614 "parser.y" { attr_t *a = make_attr(ATTR_DEFAULT); (yyval.var) = (yyvsp[0].var); if (!(yyval.var)) (yyval.var) = make_var(NULL); (yyval.var)->attrs = append_attr( (yyval.var)->attrs, a ); ;} break; - case 138: -#line 616 "parser.y" + case 137: +#line 620 "parser.y" { (yyval.var_list) = NULL; ;} break; - case 139: -#line 617 "parser.y" + case 138: +#line 621 "parser.y" { (yyval.var_list) = (yyvsp[-1].var_list); ;} break; - case 141: -#line 621 "parser.y" + case 140: +#line 625 "parser.y" { if (!(yyvsp[0].var)->eval) (yyvsp[0].var)->eval = make_exprl(EXPR_NUM, 0 /* default for first enum entry */); (yyval.var_list) = append_var( NULL, (yyvsp[0].var) ); ;} break; - case 142: -#line 625 "parser.y" + case 141: +#line 629 "parser.y" { if (!(yyvsp[0].var)->eval) { var_t *last = LIST_ENTRY( list_tail((yyval.var_list)), var_t, entry ); @@ -3199,23 +3201,23 @@ yyreduce: ;} break; - case 143: -#line 634 "parser.y" + case 142: +#line 638 "parser.y" { (yyval.var) = reg_const((yyvsp[-2].var)); (yyval.var)->eval = (yyvsp[0].expr); (yyval.var)->type = make_int(0); ;} break; - case 144: -#line 638 "parser.y" + case 143: +#line 642 "parser.y" { (yyval.var) = reg_const((yyvsp[0].var)); (yyval.var)->type = make_int(0); ;} break; - case 145: -#line 643 "parser.y" + case 144: +#line 647 "parser.y" { (yyval.type) = get_typev(RPC_FC_ENUM16, (yyvsp[-3].var), tsENUM); (yyval.type)->kind = TKIND_ENUM; (yyval.type)->fields_or_args = (yyvsp[-1].var_list); @@ -3225,305 +3227,305 @@ yyreduce: ;} break; - case 146: -#line 652 "parser.y" + case 145: +#line 656 "parser.y" { (yyval.expr_list) = append_expr( NULL, (yyvsp[0].expr) ); ;} break; + case 146: +#line 657 "parser.y" + { (yyval.expr_list) = append_expr( (yyvsp[-2].expr_list), (yyvsp[0].expr) ); ;} + break; + case 147: -#line 653 "parser.y" - { (yyval.expr_list) = append_expr( (yyvsp[-2].expr_list), (yyvsp[0].expr) ); ;} - break; - - case 148: -#line 666 "parser.y" +#line 670 "parser.y" { (yyval.expr) = make_expr(EXPR_VOID); ;} break; - case 150: -#line 670 "parser.y" + case 149: +#line 674 "parser.y" { (yyval.expr) = make_exprl(EXPR_NUM, (yyvsp[0].num)); ;} break; - case 151: -#line 671 "parser.y" + case 150: +#line 675 "parser.y" { (yyval.expr) = make_exprl(EXPR_HEXNUM, (yyvsp[0].num)); ;} break; - case 152: -#line 672 "parser.y" + case 151: +#line 676 "parser.y" { (yyval.expr) = make_exprd(EXPR_DOUBLE, (yyvsp[0].dbl)); ;} break; - case 153: -#line 673 "parser.y" + case 152: +#line 677 "parser.y" { (yyval.expr) = make_exprl(EXPR_TRUEFALSE, 0); ;} break; - case 154: -#line 674 "parser.y" + case 153: +#line 678 "parser.y" { (yyval.expr) = make_exprl(EXPR_NUM, 0); ;} break; - case 155: -#line 675 "parser.y" + case 154: +#line 679 "parser.y" { (yyval.expr) = make_exprl(EXPR_TRUEFALSE, 1); ;} break; - case 156: -#line 676 "parser.y" + case 155: +#line 680 "parser.y" { (yyval.expr) = make_exprs(EXPR_STRLIT, (yyvsp[0].str)); ;} break; - case 157: -#line 677 "parser.y" + case 156: +#line 681 "parser.y" { (yyval.expr) = make_exprs(EXPR_WSTRLIT, (yyvsp[0].str)); ;} break; - case 158: -#line 678 "parser.y" + case 157: +#line 682 "parser.y" { (yyval.expr) = make_exprs(EXPR_IDENTIFIER, (yyvsp[0].str)); ;} break; - case 159: -#line 679 "parser.y" + case 158: +#line 683 "parser.y" { (yyval.expr) = make_expr3(EXPR_COND, (yyvsp[-4].expr), (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 160: -#line 680 "parser.y" + case 159: +#line 684 "parser.y" { (yyval.expr) = make_expr2(EXPR_LOGOR, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 161: -#line 681 "parser.y" + case 160: +#line 685 "parser.y" { (yyval.expr) = make_expr2(EXPR_LOGAND, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 162: -#line 682 "parser.y" + case 161: +#line 686 "parser.y" { (yyval.expr) = make_expr2(EXPR_OR , (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 163: -#line 683 "parser.y" + case 162: +#line 687 "parser.y" { (yyval.expr) = make_expr2(EXPR_XOR, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 164: -#line 684 "parser.y" + case 163: +#line 688 "parser.y" { (yyval.expr) = make_expr2(EXPR_AND, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 165: -#line 685 "parser.y" + case 164: +#line 689 "parser.y" { (yyval.expr) = make_expr2(EXPR_EQUALITY, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 166: -#line 686 "parser.y" + case 165: +#line 690 "parser.y" { (yyval.expr) = make_expr2(EXPR_INEQUALITY, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 167: -#line 687 "parser.y" + case 166: +#line 691 "parser.y" { (yyval.expr) = make_expr2(EXPR_GTR, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 168: -#line 688 "parser.y" + case 167: +#line 692 "parser.y" { (yyval.expr) = make_expr2(EXPR_LESS, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 169: -#line 689 "parser.y" + case 168: +#line 693 "parser.y" { (yyval.expr) = make_expr2(EXPR_GTREQL, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 170: -#line 690 "parser.y" + case 169: +#line 694 "parser.y" { (yyval.expr) = make_expr2(EXPR_LESSEQL, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 171: -#line 691 "parser.y" + case 170: +#line 695 "parser.y" { (yyval.expr) = make_expr2(EXPR_SHL, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 172: -#line 692 "parser.y" + case 171: +#line 696 "parser.y" { (yyval.expr) = make_expr2(EXPR_SHR, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 173: -#line 693 "parser.y" + case 172: +#line 697 "parser.y" { (yyval.expr) = make_expr2(EXPR_ADD, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 174: -#line 694 "parser.y" + case 173: +#line 698 "parser.y" { (yyval.expr) = make_expr2(EXPR_SUB, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 175: -#line 695 "parser.y" + case 174: +#line 699 "parser.y" { (yyval.expr) = make_expr2(EXPR_MOD, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 176: -#line 696 "parser.y" + case 175: +#line 700 "parser.y" { (yyval.expr) = make_expr2(EXPR_MUL, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 177: -#line 697 "parser.y" + case 176: +#line 701 "parser.y" { (yyval.expr) = make_expr2(EXPR_DIV, (yyvsp[-2].expr), (yyvsp[0].expr)); ;} break; - case 178: -#line 698 "parser.y" + case 177: +#line 702 "parser.y" { (yyval.expr) = make_expr1(EXPR_LOGNOT, (yyvsp[0].expr)); ;} break; - case 179: -#line 699 "parser.y" + case 178: +#line 703 "parser.y" { (yyval.expr) = make_expr1(EXPR_NOT, (yyvsp[0].expr)); ;} break; - case 180: -#line 700 "parser.y" + case 179: +#line 704 "parser.y" { (yyval.expr) = make_expr1(EXPR_POS, (yyvsp[0].expr)); ;} break; - case 181: -#line 701 "parser.y" + case 180: +#line 705 "parser.y" { (yyval.expr) = make_expr1(EXPR_NEG, (yyvsp[0].expr)); ;} break; - case 182: -#line 702 "parser.y" + case 181: +#line 706 "parser.y" { (yyval.expr) = make_expr1(EXPR_ADDRESSOF, (yyvsp[0].expr)); ;} break; - case 183: -#line 703 "parser.y" + case 182: +#line 707 "parser.y" { (yyval.expr) = make_expr1(EXPR_PPTR, (yyvsp[0].expr)); ;} break; - case 184: -#line 704 "parser.y" + case 183: +#line 708 "parser.y" { (yyval.expr) = make_expr2(EXPR_MEMBER, make_expr1(EXPR_PPTR, (yyvsp[-2].expr)), make_exprs(EXPR_IDENTIFIER, (yyvsp[0].str))); ;} break; - case 185: -#line 705 "parser.y" + case 184: +#line 709 "parser.y" { (yyval.expr) = make_expr2(EXPR_MEMBER, (yyvsp[-2].expr), make_exprs(EXPR_IDENTIFIER, (yyvsp[0].str))); ;} break; - case 186: -#line 706 "parser.y" + case 185: +#line 710 "parser.y" { (yyval.expr) = make_exprt(EXPR_CAST, (yyvsp[-2].type), (yyvsp[0].expr)); ;} break; - case 187: -#line 707 "parser.y" + case 186: +#line 711 "parser.y" { (yyval.expr) = make_exprt(EXPR_SIZEOF, (yyvsp[-1].type), NULL); ;} break; - case 188: -#line 708 "parser.y" + case 187: +#line 712 "parser.y" { (yyval.expr) = make_expr2(EXPR_ARRAY, (yyvsp[-3].expr), (yyvsp[-1].expr)); ;} break; - case 189: -#line 709 "parser.y" + case 188: +#line 713 "parser.y" { (yyval.expr) = (yyvsp[-1].expr); ;} break; - case 190: -#line 712 "parser.y" + case 189: +#line 716 "parser.y" { (yyval.expr_list) = append_expr( NULL, (yyvsp[0].expr) ); ;} break; - case 191: -#line 713 "parser.y" + case 190: +#line 717 "parser.y" { (yyval.expr_list) = append_expr( (yyvsp[-2].expr_list), (yyvsp[0].expr) ); ;} break; - case 192: -#line 716 "parser.y" + case 191: +#line 720 "parser.y" { (yyval.expr) = (yyvsp[0].expr); if (!(yyval.expr)->is_const) error_loc("expression is not an integer constant\n"); ;} break; - case 193: -#line 722 "parser.y" + case 192: +#line 726 "parser.y" { (yyval.expr) = (yyvsp[0].expr); if (!(yyval.expr)->is_const && (yyval.expr)->type != EXPR_STRLIT && (yyval.expr)->type != EXPR_WSTRLIT) error_loc("expression is not constant\n"); ;} break; - case 194: -#line 728 "parser.y" + case 193: +#line 732 "parser.y" { (yyval.var_list) = NULL; ;} break; - case 195: -#line 729 "parser.y" + case 194: +#line 733 "parser.y" { (yyval.var_list) = append_var_list((yyvsp[-1].var_list), (yyvsp[0].var_list)); ;} break; - case 196: -#line 733 "parser.y" + case 195: +#line 737 "parser.y" { const char *first = LIST_ENTRY(list_head((yyvsp[-1].declarator_list)), declarator_t, entry)->var->name; check_field_attrs(first, (yyvsp[-3].attr_list)); (yyval.var_list) = set_var_types((yyvsp[-3].attr_list), (yyvsp[-2].declspec), (yyvsp[-1].declarator_list)); ;} break; - case 197: -#line 737 "parser.y" + case 196: +#line 741 "parser.y" { var_t *v = make_var(NULL); v->type = (yyvsp[-1].type); v->attrs = (yyvsp[-2].attr_list); (yyval.var_list) = append_var(NULL, v); ;} break; - case 198: -#line 744 "parser.y" + case 197: +#line 748 "parser.y" { (yyval.var) = (yyvsp[-1].var); ;} break; - case 199: -#line 745 "parser.y" + case 198: +#line 749 "parser.y" { (yyval.var) = make_var(NULL); (yyval.var)->attrs = (yyvsp[-1].attr_list); ;} break; - case 200: -#line 748 "parser.y" + case 199: +#line 752 "parser.y" { (yyval.var_list) = NULL; ;} break; - case 201: -#line 749 "parser.y" + case 200: +#line 753 "parser.y" { (yyval.var_list) = append_var( (yyvsp[-1].var_list), (yyvsp[0].var) ); ;} break; - case 202: -#line 753 "parser.y" + case 201: +#line 757 "parser.y" { (yyval.var) = (yyvsp[-1].var); ;} break; - case 203: -#line 754 "parser.y" + case 202: +#line 758 "parser.y" { (yyval.var) = NULL; ;} break; - case 204: -#line 757 "parser.y" + case 203: +#line 761 "parser.y" { (yyval.var) = (yyvsp[0].declarator)->var; (yyval.var)->attrs = check_field_attrs((yyval.var)->name, (yyvsp[-2].attr_list)); set_type((yyval.var), (yyvsp[-1].declspec), (yyvsp[0].declarator), FALSE); @@ -3531,8 +3533,8 @@ yyreduce: ;} break; - case 205: -#line 765 "parser.y" + case 204: +#line 769 "parser.y" { var_t *v = (yyvsp[0].declarator)->var; v->attrs = check_function_attrs(v->name, (yyvsp[-2].attr_list)); set_type(v, (yyvsp[-1].declspec), (yyvsp[0].declarator), FALSE); @@ -3541,8 +3543,8 @@ yyreduce: ;} break; - case 206: -#line 775 "parser.y" + case 205: +#line 779 "parser.y" { (yyval.var) = (yyvsp[0].declarator)->var; (yyval.var)->attrs = (yyvsp[-2].attr_list); set_type((yyval.var), (yyvsp[-1].declspec), (yyvsp[0].declarator), FALSE); @@ -3550,61 +3552,61 @@ yyreduce: ;} break; - case 207: -#line 780 "parser.y" + case 206: +#line 784 "parser.y" { (yyval.var) = (yyvsp[0].declarator)->var; set_type((yyval.var), (yyvsp[-1].declspec), (yyvsp[0].declarator), FALSE); free((yyvsp[0].declarator)); ;} break; - case 208: -#line 786 "parser.y" - { (yyval.var) = NULL; ;} - break; - - case 210: + case 207: #line 790 "parser.y" { (yyval.var) = NULL; ;} break; - case 211: -#line 791 "parser.y" - { (yyval.var) = make_var((yyvsp[0].str)); ;} + case 209: +#line 794 "parser.y" + { (yyval.var) = NULL; ;} break; - case 212: -#line 792 "parser.y" - { (yyval.var) = make_var((yyvsp[0].str)); ;} - break; - - case 213: + case 210: #line 795 "parser.y" { (yyval.var) = make_var((yyvsp[0].str)); ;} break; - case 214: -#line 797 "parser.y" + case 211: +#line 796 "parser.y" { (yyval.var) = make_var((yyvsp[0].str)); ;} break; - case 215: -#line 800 "parser.y" - { (yyval.type) = make_builtin((yyvsp[0].str)); ;} + case 212: +#line 799 "parser.y" + { (yyval.var) = make_var((yyvsp[0].str)); ;} break; - case 216: + case 213: #line 801 "parser.y" + { (yyval.var) = make_var((yyvsp[0].str)); ;} + break; + + case 214: +#line 804 "parser.y" { (yyval.type) = make_builtin((yyvsp[0].str)); ;} break; - case 218: -#line 803 "parser.y" + case 215: +#line 805 "parser.y" + { (yyval.type) = make_builtin((yyvsp[0].str)); ;} + break; + + case 217: +#line 807 "parser.y" { (yyval.type) = (yyvsp[0].type); (yyval.type)->sign = 1; ;} break; - case 219: -#line 804 "parser.y" + case 218: +#line 808 "parser.y" { (yyval.type) = (yyvsp[0].type); (yyval.type)->sign = -1; switch ((yyval.type)->type) { case RPC_FC_CHAR: break; @@ -3623,95 +3625,92 @@ yyreduce: ;} break; - case 220: -#line 820 "parser.y" + case 219: +#line 824 "parser.y" { (yyval.type) = make_int(-1); ;} break; - case 221: -#line 821 "parser.y" - { (yyval.type) = make_builtin((yyvsp[0].str)); ;} - break; - - case 222: -#line 822 "parser.y" - { (yyval.type) = find_type("float", 0); ;} - break; - - case 223: -#line 823 "parser.y" - { (yyval.type) = make_builtin((yyvsp[0].str)); ;} - break; - - case 224: -#line 824 "parser.y" - { (yyval.type) = make_builtin((yyvsp[0].str)); ;} - break; - - case 225: + case 220: #line 825 "parser.y" { (yyval.type) = make_builtin((yyvsp[0].str)); ;} break; - case 226: + case 221: #line 826 "parser.y" + { (yyval.type) = duptype(find_type("float", 0), 1); ;} + break; + + case 222: +#line 827 "parser.y" + { (yyval.type) = make_builtin((yyvsp[0].str)); ;} + break; + + case 223: +#line 828 "parser.y" + { (yyval.type) = make_builtin((yyvsp[0].str)); ;} + break; + + case 224: +#line 829 "parser.y" + { (yyval.type) = make_builtin((yyvsp[0].str)); ;} + break; + + case 225: +#line 830 "parser.y" + { (yyval.type) = make_builtin((yyvsp[0].str)); ;} + break; + + case 228: +#line 837 "parser.y" { (yyval.type) = make_builtin((yyvsp[0].str)); ;} break; case 229: -#line 833 "parser.y" - { (yyval.type) = make_builtin((yyvsp[0].str)); ;} +#line 838 "parser.y" + { (yyval.type) = make_builtin((yyvsp[-1].str)); ;} break; case 230: -#line 834 "parser.y" - { (yyval.type) = make_builtin((yyvsp[-1].str)); ;} - break; - - case 231: -#line 835 "parser.y" - { (yyval.type) = make_builtin((yyvsp[0].str)); ;} - break; - - case 232: -#line 836 "parser.y" - { (yyval.type) = make_builtin((yyvsp[-1].str)); ;} - break; - - case 233: -#line 837 "parser.y" - { (yyval.type) = make_builtin((yyvsp[-1].str)); ;} - break; - - case 234: -#line 838 "parser.y" - { (yyval.type) = make_builtin((yyvsp[0].str)); ;} - break; - - case 235: #line 839 "parser.y" { (yyval.type) = make_builtin((yyvsp[0].str)); ;} break; - case 236: + case 231: +#line 840 "parser.y" + { (yyval.type) = make_builtin((yyvsp[-1].str)); ;} + break; + + case 232: +#line 841 "parser.y" + { (yyval.type) = make_builtin((yyvsp[-1].str)); ;} + break; + + case 233: #line 842 "parser.y" + { (yyval.type) = make_builtin((yyvsp[0].str)); ;} + break; + + case 234: +#line 843 "parser.y" + { (yyval.type) = make_builtin((yyvsp[0].str)); ;} + break; + + case 235: +#line 846 "parser.y" { (yyval.type) = make_class((yyvsp[0].str)); ;} break; - case 237: -#line 843 "parser.y" + case 236: +#line 847 "parser.y" { (yyval.type) = find_type((yyvsp[0].str), 0); - if ((yyval.type)->kind != TKIND_COCLASS) - error_loc("%s was not declared a coclass at %s:%d\n", - (yyvsp[0].str), (yyval.type)->loc_info.input_name, - (yyval.type)->loc_info.line_number); + if ((yyval.type)->defined) error_loc("multiple definition error\n"); + if ((yyval.type)->kind != TKIND_COCLASS) error_loc("%s was not declared a coclass\n", (yyvsp[0].str)); ;} break; - case 238: -#line 851 "parser.y" + case 237: +#line 853 "parser.y" { (yyval.type) = (yyvsp[0].type); - check_def((yyval.type)); (yyval.type)->attrs = check_coclass_attrs((yyvsp[0].type)->name, (yyvsp[-1].attr_list)); if (!parse_only && do_header) write_coclass((yyval.type)); @@ -3720,46 +3719,46 @@ yyreduce: ;} break; - case 239: -#line 862 "parser.y" + case 238: +#line 863 "parser.y" { (yyval.type) = (yyvsp[-4].type); (yyval.type)->ifaces = (yyvsp[-2].ifref_list); (yyval.type)->defined = TRUE; ;} break; - case 240: -#line 868 "parser.y" + case 239: +#line 869 "parser.y" { (yyval.ifref_list) = NULL; ;} break; - case 241: -#line 869 "parser.y" + case 240: +#line 870 "parser.y" { (yyval.ifref_list) = append_ifref( (yyvsp[-1].ifref_list), (yyvsp[0].ifref) ); ;} break; - case 242: -#line 873 "parser.y" + case 241: +#line 874 "parser.y" { (yyval.ifref) = make_ifref((yyvsp[0].type)); (yyval.ifref)->attrs = (yyvsp[-1].attr_list); ;} break; - case 243: -#line 876 "parser.y" - { (yyval.type) = get_type(RPC_FC_IP, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_DISPATCH; ;} - break; - - case 244: + case 242: #line 877 "parser.y" { (yyval.type) = get_type(RPC_FC_IP, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_DISPATCH; ;} break; - case 245: -#line 880 "parser.y" + case 243: +#line 878 "parser.y" + { (yyval.type) = get_type(RPC_FC_IP, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_DISPATCH; ;} + break; + + case 244: +#line 881 "parser.y" { attr_t *attrs; is_in_interface = TRUE; is_object_interface = TRUE; (yyval.type) = (yyvsp[0].type); - check_def((yyval.type)); + if ((yyval.type)->defined) error_loc("multiple definition error\n"); attrs = make_attr(ATTR_DISPINTERFACE); (yyval.type)->attrs = append_attr( check_dispiface_attrs((yyvsp[0].type)->name, (yyvsp[-1].attr_list)), attrs ); (yyval.type)->ref = find_type("IDispatch", 0); @@ -3769,28 +3768,28 @@ yyreduce: ;} break; - case 246: -#line 894 "parser.y" + case 245: +#line 895 "parser.y" { (yyval.var_list) = NULL; ;} break; - case 247: -#line 895 "parser.y" + case 246: +#line 896 "parser.y" { (yyval.var_list) = append_var( (yyvsp[-2].var_list), (yyvsp[-1].var) ); ;} break; - case 248: -#line 898 "parser.y" + case 247: +#line 899 "parser.y" { (yyval.func_list) = NULL; ;} break; - case 249: -#line 899 "parser.y" + case 248: +#line 900 "parser.y" { (yyval.func_list) = append_func( (yyvsp[-2].func_list), (yyvsp[-1].func) ); ;} break; - case 250: -#line 905 "parser.y" + case 249: +#line 906 "parser.y" { (yyval.type) = (yyvsp[-4].type); (yyval.type)->fields_or_args = (yyvsp[-2].var_list); (yyval.type)->funcs = (yyvsp[-1].func_list); @@ -3800,8 +3799,8 @@ yyreduce: ;} break; - case 251: -#line 913 "parser.y" + case 250: +#line 914 "parser.y" { (yyval.type) = (yyvsp[-4].type); (yyval.type)->fields_or_args = (yyvsp[-2].type)->fields_or_args; (yyval.type)->funcs = (yyvsp[-2].type)->funcs; @@ -3811,43 +3810,43 @@ yyreduce: ;} break; - case 252: -#line 922 "parser.y" + case 251: +#line 923 "parser.y" { (yyval.type) = NULL; ;} break; + case 252: +#line 924 "parser.y" + { (yyval.type) = find_type2((yyvsp[0].str), 0); ;} + break; + case 253: -#line 923 "parser.y" - { (yyval.type) = find_type_or_error2((yyvsp[0].str), 0); ;} - break; - - case 254: -#line 926 "parser.y" - { (yyval.type) = get_type(RPC_FC_IP, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_INTERFACE; ;} - break; - - case 255: #line 927 "parser.y" { (yyval.type) = get_type(RPC_FC_IP, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_INTERFACE; ;} break; - case 256: -#line 930 "parser.y" + case 254: +#line 928 "parser.y" + { (yyval.type) = get_type(RPC_FC_IP, (yyvsp[0].str), 0); (yyval.type)->kind = TKIND_INTERFACE; ;} + break; + + case 255: +#line 931 "parser.y" { (yyval.ifinfo).interface = (yyvsp[0].type); (yyval.ifinfo).old_pointer_default = pointer_default; if (is_attr((yyvsp[-1].attr_list), ATTR_POINTERDEFAULT)) pointer_default = get_attrv((yyvsp[-1].attr_list), ATTR_POINTERDEFAULT); is_object_interface = is_object((yyvsp[-1].attr_list)); is_in_interface = TRUE; - check_def((yyvsp[0].type)); + if ((yyvsp[0].type)->defined) error_loc("multiple definition error\n"); (yyvsp[0].type)->attrs = check_iface_attrs((yyvsp[0].type)->name, (yyvsp[-1].attr_list)); (yyvsp[0].type)->defined = TRUE; if (!parse_only && do_header) write_forward((yyvsp[0].type)); ;} break; - case 257: -#line 944 "parser.y" + case 256: +#line 945 "parser.y" { (yyval.type) = (yyvsp[-5].ifinfo).interface; (yyval.type)->ref = (yyvsp[-4].type); (yyval.type)->funcs = (yyvsp[-2].func_list); @@ -3861,10 +3860,10 @@ yyreduce: ;} break; - case 258: -#line 959 "parser.y" + case 257: +#line 960 "parser.y" { (yyval.type) = (yyvsp[-7].ifinfo).interface; - (yyval.type)->ref = find_type_or_error2((yyvsp[-5].str), 0); + (yyval.type)->ref = find_type2((yyvsp[-5].str), 0); if (!(yyval.type)->ref) error_loc("base class '%s' not found in import\n", (yyvsp[-5].str)); (yyval.type)->funcs = (yyvsp[-2].func_list); compute_method_indexes((yyval.type)); @@ -3876,184 +3875,183 @@ yyreduce: ;} break; - case 259: -#line 970 "parser.y" + case 258: +#line 971 "parser.y" { (yyval.type) = (yyvsp[-1].type); ;} break; - case 260: -#line 974 "parser.y" - { (yyval.type) = (yyvsp[-1].type); if (!parse_only && do_header) write_forward((yyval.type)); ;} - break; - - case 261: + case 259: #line 975 "parser.y" { (yyval.type) = (yyvsp[-1].type); if (!parse_only && do_header) write_forward((yyval.type)); ;} break; - case 262: -#line 978 "parser.y" - { (yyval.type) = make_type(0, NULL); (yyval.type)->name = (yyvsp[0].str); (yyval.type)->kind = TKIND_MODULE; ;} + case 260: +#line 976 "parser.y" + { (yyval.type) = (yyvsp[-1].type); if (!parse_only && do_header) write_forward((yyval.type)); ;} break; - case 263: + case 261: #line 979 "parser.y" { (yyval.type) = make_type(0, NULL); (yyval.type)->name = (yyvsp[0].str); (yyval.type)->kind = TKIND_MODULE; ;} break; - case 264: -#line 982 "parser.y" + case 262: +#line 980 "parser.y" + { (yyval.type) = make_type(0, NULL); (yyval.type)->name = (yyvsp[0].str); (yyval.type)->kind = TKIND_MODULE; ;} + break; + + case 263: +#line 983 "parser.y" { (yyval.type) = (yyvsp[0].type); (yyval.type)->attrs = check_module_attrs((yyvsp[0].type)->name, (yyvsp[-1].attr_list)); ;} break; - case 265: -#line 988 "parser.y" + case 264: +#line 989 "parser.y" { (yyval.type) = (yyvsp[-4].type); (yyval.type)->funcs = (yyvsp[-2].func_list); /* FIXME: if (!parse_only && do_header) write_module($$); */ ;} break; - case 266: -#line 995 "parser.y" + case 265: +#line 996 "parser.y" { (yyval.stgclass) = STG_EXTERN; ;} break; - case 267: -#line 996 "parser.y" + case 266: +#line 997 "parser.y" { (yyval.stgclass) = STG_STATIC; ;} break; - case 268: -#line 997 "parser.y" + case 267: +#line 998 "parser.y" { (yyval.stgclass) = STG_REGISTER; ;} break; - case 269: -#line 1001 "parser.y" + case 268: +#line 1002 "parser.y" { (yyval.attr) = make_attr(ATTR_INLINE); ;} break; - case 270: -#line 1005 "parser.y" + case 269: +#line 1006 "parser.y" { (yyval.attr) = make_attr(ATTR_CONST); ;} break; - case 271: -#line 1008 "parser.y" + case 270: +#line 1009 "parser.y" { (yyval.attr_list) = NULL; ;} break; - case 272: -#line 1009 "parser.y" + case 271: +#line 1010 "parser.y" { (yyval.attr_list) = append_attr((yyvsp[-1].attr_list), (yyvsp[0].attr)); ;} break; - case 273: -#line 1012 "parser.y" + case 272: +#line 1013 "parser.y" { (yyval.declspec) = make_decl_spec((yyvsp[-1].type), (yyvsp[0].declspec), NULL, NULL, STG_NONE); ;} break; - case 274: -#line 1014 "parser.y" + case 273: +#line 1015 "parser.y" { (yyval.declspec) = make_decl_spec((yyvsp[-1].type), (yyvsp[-2].declspec), (yyvsp[0].declspec), NULL, STG_NONE); ;} break; - case 275: -#line 1017 "parser.y" + case 274: +#line 1018 "parser.y" { (yyval.declspec) = NULL; ;} break; - case 277: -#line 1022 "parser.y" - { (yyval.declspec) = make_decl_spec(NULL, (yyvsp[0].declspec), NULL, (yyvsp[-1].attr), STG_NONE); ;} - break; - - case 278: + case 276: #line 1023 "parser.y" { (yyval.declspec) = make_decl_spec(NULL, (yyvsp[0].declspec), NULL, (yyvsp[-1].attr), STG_NONE); ;} break; - case 279: + case 277: #line 1024 "parser.y" + { (yyval.declspec) = make_decl_spec(NULL, (yyvsp[0].declspec), NULL, (yyvsp[-1].attr), STG_NONE); ;} + break; + + case 278: +#line 1025 "parser.y" { (yyval.declspec) = make_decl_spec(NULL, (yyvsp[0].declspec), NULL, NULL, (yyvsp[-1].stgclass)); ;} break; - case 280: -#line 1029 "parser.y" + case 279: +#line 1030 "parser.y" { (yyval.declarator) = (yyvsp[0].declarator); (yyval.declarator)->type = append_ptrchain_type((yyval.declarator)->type, make_pointer_type(NULL, (yyvsp[-1].attr_list))); ;} break; - case 281: -#line 1030 "parser.y" + case 280: +#line 1031 "parser.y" { (yyval.declarator) = (yyvsp[0].declarator); (yyval.declarator)->type->attrs = append_attr((yyval.declarator)->type->attrs, make_attrp(ATTR_CALLCONV, (yyvsp[-1].str))); ;} break; - case 283: -#line 1035 "parser.y" + case 282: +#line 1036 "parser.y" { (yyval.declarator) = make_declarator((yyvsp[0].var)); ;} break; - case 284: -#line 1036 "parser.y" + case 283: +#line 1037 "parser.y" { (yyval.declarator) = (yyvsp[-1].declarator); ;} break; - case 285: -#line 1037 "parser.y" + case 284: +#line 1038 "parser.y" { (yyval.declarator) = (yyvsp[-1].declarator); (yyval.declarator)->array = append_array((yyval.declarator)->array, (yyvsp[0].expr)); ;} break; - case 286: -#line 1038 "parser.y" + case 285: +#line 1039 "parser.y" { (yyval.declarator) = (yyvsp[-3].declarator); (yyval.declarator)->func_type = append_ptrchain_type((yyval.declarator)->type, make_func_type((yyvsp[-1].var_list))); (yyval.declarator)->type = NULL; ;} break; - case 287: -#line 1045 "parser.y" + case 286: +#line 1046 "parser.y" { (yyval.declarator_list) = append_declarator( NULL, (yyvsp[0].declarator) ); ;} break; - case 288: -#line 1046 "parser.y" + case 287: +#line 1047 "parser.y" { (yyval.declarator_list) = append_declarator( (yyvsp[-2].declarator_list), (yyvsp[0].declarator) ); ;} break; - case 289: -#line 1050 "parser.y" + case 288: +#line 1051 "parser.y" { (yyval.declarator) = (yyvsp[0].declarator); ;} break; - case 290: -#line 1051 "parser.y" + case 289: +#line 1052 "parser.y" { (yyval.declarator) = (yyvsp[-2].declarator); (yyvsp[-2].declarator)->var->eval = (yyvsp[0].expr); ;} break; - case 291: -#line 1055 "parser.y" + case 290: +#line 1056 "parser.y" { (yyval.num) = RPC_FC_RP; ;} break; - case 292: -#line 1056 "parser.y" + case 291: +#line 1057 "parser.y" { (yyval.num) = RPC_FC_UP; ;} break; - case 293: -#line 1057 "parser.y" + case 292: +#line 1058 "parser.y" { (yyval.num) = RPC_FC_FP; ;} break; - case 294: -#line 1060 "parser.y" + case 293: +#line 1061 "parser.y" { (yyval.type) = get_typev(RPC_FC_STRUCT, (yyvsp[-3].var), tsSTRUCT); /* overwrite RPC_FC_STRUCT with a more exact type */ - check_def((yyval.type)); (yyval.type)->type = get_struct_type( (yyvsp[-1].var_list) ); (yyval.type)->kind = TKIND_RECORD; (yyval.type)->fields_or_args = (yyvsp[-1].var_list); @@ -4063,78 +4061,76 @@ yyreduce: ;} break; - case 295: + case 294: #line 1072 "parser.y" - { (yyval.type) = find_type_or_error("void", 0); ;} + { (yyval.type) = duptype(find_type("void", 0), 1); ;} + break; + + case 295: +#line 1073 "parser.y" + { (yyval.type) = find_type((yyvsp[0].str), 0); ;} break; case 296: -#line 1073 "parser.y" - { (yyval.type) = find_type_or_error((yyvsp[0].str), 0); ;} - break; - - case 297: #line 1074 "parser.y" { (yyval.type) = (yyvsp[0].type); ;} break; - case 298: + case 297: #line 1075 "parser.y" { (yyval.type) = (yyvsp[0].type); ;} break; - case 299: + case 298: #line 1076 "parser.y" - { (yyval.type) = find_type_or_error2((yyvsp[0].str), tsENUM); ;} + { (yyval.type) = find_type2((yyvsp[0].str), tsENUM); ;} break; - case 300: + case 299: #line 1077 "parser.y" { (yyval.type) = (yyvsp[0].type); ;} break; - case 301: + case 300: #line 1078 "parser.y" { (yyval.type) = get_type(RPC_FC_STRUCT, (yyvsp[0].str), tsSTRUCT); ;} break; - case 302: + case 301: #line 1079 "parser.y" { (yyval.type) = (yyvsp[0].type); ;} break; - case 303: + case 302: #line 1080 "parser.y" - { (yyval.type) = find_type_or_error2((yyvsp[0].str), tsUNION); ;} + { (yyval.type) = find_type2((yyvsp[0].str), tsUNION); ;} break; - case 304: + case 303: #line 1081 "parser.y" { (yyval.type) = make_safearray((yyvsp[-1].type)); ;} break; - case 305: + case 304: #line 1085 "parser.y" { reg_typedefs((yyvsp[-1].declspec), (yyvsp[0].declarator_list), check_typedef_attrs((yyvsp[-2].attr_list))); (yyval.statement) = process_typedefs((yyvsp[0].declarator_list)); ;} break; - case 306: + case 305: #line 1091 "parser.y" { (yyval.type) = get_typev(RPC_FC_NON_ENCAPSULATED_UNION, (yyvsp[-3].var), tsUNION); - check_def((yyval.type)); (yyval.type)->kind = TKIND_UNION; (yyval.type)->fields_or_args = (yyvsp[-1].var_list); (yyval.type)->defined = TRUE; ;} break; - case 307: -#line 1099 "parser.y" + case 306: +#line 1098 "parser.y" { var_t *u = (yyvsp[-3].var); (yyval.type) = get_typev(RPC_FC_ENCAPSULATED_UNION, (yyvsp[-8].var), tsUNION); - check_def((yyval.type)); (yyval.type)->kind = TKIND_UNION; if (!u) u = make_var( xstrdup("tagged_union") ); u->type = make_type(RPC_FC_NON_ENCAPSULATED_UNION, NULL); @@ -4147,13 +4143,13 @@ yyreduce: ;} break; - case 308: -#line 1115 "parser.y" + case 307: +#line 1113 "parser.y" { (yyval.num) = MAKEVERSION((yyvsp[0].num), 0); ;} break; - case 309: -#line 1116 "parser.y" + case 308: +#line 1114 "parser.y" { (yyval.num) = MAKEVERSION((yyvsp[-2].num), (yyvsp[0].num)); ;} break; @@ -4162,7 +4158,7 @@ yyreduce: } /* Line 1126 of yacc.c. */ -#line 4166 "parser.tab.c" +#line 4162 "parser.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -4430,7 +4426,7 @@ yyreturn: } -#line 1119 "parser.y" +#line 1117 "parser.y" static void decl_builtin(const char *name, unsigned char type) @@ -4443,14 +4439,14 @@ static void decl_builtin(const char *name, unsigned char type) static type_t *make_builtin(char *name) { /* NAME is strdup'd in the lexer */ - type_t *t = duptype(find_type_or_error(name, 0), 0); + type_t *t = duptype(find_type(name, 0), 0); t->name = name; return t; } static type_t *make_int(int sign) { - type_t *t = duptype(find_type_or_error("int", 0), 1); + type_t *t = duptype(find_type("int", 0), 1); t->sign = sign; if (sign < 0) @@ -4707,7 +4703,6 @@ type_t *make_type(unsigned char type, type_t *ref) t->tfswrite = FALSE; t->checked = FALSE; t->typelib_idx = -1; - init_loc_info(&t->loc_info); return t; } @@ -5019,7 +5014,9 @@ static var_t *make_var(char *name) v->attrs = NULL; v->eval = NULL; v->stgclass = STG_NONE; - init_loc_info(&v->loc_info); + v->loc_info.input_name = input_name ? input_name : "stdin"; + v->loc_info.line_number = line_number; + v->loc_info.near_text = parser_text; return v; } @@ -5076,7 +5073,7 @@ static type_t *make_class(char *name) static type_t *make_safearray(type_t *type) { - type_t *sa = find_type_or_error("SAFEARRAY", 0); + type_t *sa = duptype(find_type("SAFEARRAY", 0), 1); sa->ref = type; return make_type(pointer_default, sa); } @@ -5210,12 +5207,6 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at if (name->name) { type_t *cur; - cur = find_type(name->name, 0); - if (cur) - error_loc("%s: redefinition error; original definition was at %s:%d\n", - cur->name, cur->loc_info.input_name, - cur->loc_info.line_number); - /* set the attributes to allow set_type to do some checks on them */ name->attrs = attrs; set_type(name, decl_spec, decl, 0); @@ -5230,7 +5221,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at return type; } -type_t *find_type(const char *name, int t) +static type_t *find_type_helper(const char *name, int t) { struct rtype *cur = type_hash[hash_ident(name)]; while (cur && (cur->t != t || strcmp(cur->name, name))) @@ -5238,9 +5229,9 @@ type_t *find_type(const char *name, int t) return cur ? cur->type : NULL; } -static type_t *find_type_or_error(const char *name, int t) +type_t *find_type(const char *name, int t) { - type_t *type = find_type(name, t); + type_t *type = find_type_helper(name, t); if (!type) { error_loc("type '%s' not found\n", name); return NULL; @@ -5248,23 +5239,23 @@ static type_t *find_type_or_error(const char *name, int t) return type; } -static type_t *find_type_or_error2(char *name, int t) +static type_t *find_type2(char *name, int t) { - type_t *tp = find_type_or_error(name, t); + type_t *tp = find_type(name, t); free(name); return tp; } int is_type(const char *name) { - return find_type(name, 0) != NULL; + return find_type_helper(name, 0) != NULL; } static type_t *get_type(unsigned char type, char *name, int t) { type_t *tp; if (name) { - tp = find_type(name, t); + tp = find_type_helper(name, t); if (tp) { free(name); return tp; @@ -5933,12 +5924,7 @@ static void check_remoting_fields(const var_t *var, type_t *type) type->checked = TRUE; if (is_struct(type->type)) - { - if (type->defined) - fields = type->fields_or_args; - else - error_loc_info(&var->loc_info, "undefined type declaration %s\n", type->name); - } + fields = type->fields_or_args; else if (is_union(type->type)) { if (type->type == RPC_FC_ENCAPSULATED_UNION) @@ -6020,7 +6006,7 @@ static void add_explicit_handle_if_necessary(func_t *func) * function */ var_t *idl_handle = make_var(xstrdup("IDL_handle")); idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); - idl_handle->type = find_type_or_error("handle_t", 0); + idl_handle->type = find_type("handle_t", 0); if (!func->def->type->fields_or_args) { func->def->type->fields_or_args = xmalloc( sizeof(*func->def->type->fields_or_args) ); @@ -6175,7 +6161,7 @@ static statement_t *process_typedefs(declarator_list_t *decls) LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) { var_t *var = decl->var; - type_t *type = find_type_or_error(var->name, 0); + type_t *type = find_type(var->name, 0); *type_list = xmalloc(sizeof(type_list_t)); (*type_list)->type = type; (*type_list)->next = NULL; @@ -6219,17 +6205,3 @@ static func_list_t *append_func_from_statement(func_list_t *list, statement_t *s return list; } -void init_loc_info(loc_info_t *i) -{ - i->input_name = input_name ? input_name : "stdin"; - i->line_number = line_number; - i->near_text = parser_text; -} - -static void check_def(const type_t *t) -{ - if (t->defined) - error_loc("%s: redefinition error; original definition was at %s:%d\n", - t->name, t->loc_info.input_name, t->loc_info.line_number); -} - diff --git a/reactos/tools/widl/parser.tab.h b/reactos/tools/widl/parser.tab.h index 486bafe3c87..56a57a7af4a 100644 --- a/reactos/tools/widl/parser.tab.h +++ b/reactos/tools/widl/parser.tab.h @@ -335,7 +335,7 @@ #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 179 "parser.y" +#line 177 "parser.y" typedef union YYSTYPE { attr_t *attr; attr_list_t *attr_list; diff --git a/reactos/tools/widl/parser.y b/reactos/tools/widl/parser.y index d044c07c5f4..3c0a5fe5780 100644 --- a/reactos/tools/widl/parser.y +++ b/reactos/tools/widl/parser.y @@ -128,8 +128,7 @@ static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type); static type_t *reg_type(type_t *type, const char *name, int t); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); -static type_t *find_type_or_error(const char *name, int t); -static type_t *find_type_or_error2(char *name, int t); +static type_t *find_type2(char *name, int t); static type_t *get_type(unsigned char type, char *name, int t); static type_t *get_typev(unsigned char type, var_t *name, int t); static int get_struct_type(var_list_t *fields); @@ -157,7 +156,6 @@ static attr_list_t *check_module_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_coclass_attrs(const char *name, attr_list_t *attrs); const char *get_attr_display_name(enum attr_type type); static void add_explicit_handle_if_necessary(func_t *func); -static void check_def(const type_t *t); static statement_t *make_statement(enum statement_type type); static statement_t *make_statement_type_decl(type_t *type); @@ -311,7 +309,7 @@ static func_list_t *append_func_from_statement(func_list_t *list, statement_t *s %type dispinterface dispinterfacehdr dispinterfacedef %type module modulehdr moduledef %type base_type int_std -%type enumdef structdef uniondef typedecl +%type enumdef structdef uniondef %type type %type coclass_int %type coclass_ints @@ -401,7 +399,7 @@ semicolon_opt: statement: cppquote { $$ = make_statement_cppquote($1); } - | typedecl ';' { $$ = make_statement_type_decl($1); + | enumdef ';' { $$ = make_statement_type_decl($1); if (!parse_only && do_header) { write_type_def_or_decl(header, $1, FALSE, NULL); fprintf(header, ";\n\n"); @@ -411,13 +409,19 @@ statement: if (!parse_only && do_header) write_declaration($1, is_in_interface); } | import { $$ = make_statement_import($1); } + | structdef ';' { $$ = make_statement_type_decl($1); + if (!parse_only && do_header) { + write_type_def_or_decl(header, $1, FALSE, NULL); + fprintf(header, ";\n\n"); + } + } | typedef ';' { $$ = $1; } - ; - -typedecl: - enumdef - | structdef - | uniondef + | uniondef ';' { $$ = make_statement_type_decl($1); + if (!parse_only && do_header) { + write_type_def_or_decl(header, $1, FALSE, NULL); + fprintf(header, ";\n\n"); + } + } ; cppquote: tCPPQUOTE '(' aSTRING ')' { $$ = $3; if (!parse_only && do_header) fprintf(header, "%s\n", $3); } @@ -819,7 +823,7 @@ base_type: tBYTE { $$ = make_builtin($1); } } | tUNSIGNED { $$ = make_int(-1); } | tFLOAT { $$ = make_builtin($1); } - | tSINGLE { $$ = find_type("float", 0); } + | tSINGLE { $$ = duptype(find_type("float", 0), 1); } | tDOUBLE { $$ = make_builtin($1); } | tBOOLEAN { $$ = make_builtin($1); } | tERRORSTATUST { $$ = make_builtin($1); } @@ -841,15 +845,12 @@ int_std: tINT { $$ = make_builtin($1); } coclass: tCOCLASS aIDENTIFIER { $$ = make_class($2); } | tCOCLASS aKNOWNTYPE { $$ = find_type($2, 0); - if ($$->kind != TKIND_COCLASS) - error_loc("%s was not declared a coclass at %s:%d\n", - $2, $$->loc_info.input_name, - $$->loc_info.line_number); + if ($$->defined) error_loc("multiple definition error\n"); + if ($$->kind != TKIND_COCLASS) error_loc("%s was not declared a coclass\n", $2); } ; coclasshdr: attributes coclass { $$ = $2; - check_def($$); $$->attrs = check_coclass_attrs($2->name, $1); if (!parse_only && do_header) write_coclass($$); @@ -881,7 +882,7 @@ dispinterfacehdr: attributes dispinterface { attr_t *attrs; is_in_interface = TRUE; is_object_interface = TRUE; $$ = $2; - check_def($$); + if ($$->defined) error_loc("multiple definition error\n"); attrs = make_attr(ATTR_DISPINTERFACE); $$->attrs = append_attr( check_dispiface_attrs($2->name, $1), attrs ); $$->ref = find_type("IDispatch", 0); @@ -920,7 +921,7 @@ dispinterfacedef: dispinterfacehdr '{' ; inherit: { $$ = NULL; } - | ':' aKNOWNTYPE { $$ = find_type_or_error2($2, 0); } + | ':' aKNOWNTYPE { $$ = find_type2($2, 0); } ; interface: tINTERFACE aIDENTIFIER { $$ = get_type(RPC_FC_IP, $2, 0); $$->kind = TKIND_INTERFACE; } @@ -933,7 +934,7 @@ interfacehdr: attributes interface { $$.interface = $2; pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); is_object_interface = is_object($1); is_in_interface = TRUE; - check_def($2); + if ($2->defined) error_loc("multiple definition error\n"); $2->attrs = check_iface_attrs($2->name, $1); $2->defined = TRUE; if (!parse_only && do_header) write_forward($2); @@ -957,7 +958,7 @@ interfacedef: interfacehdr inherit | interfacehdr ':' aIDENTIFIER '{' import int_statements '}' semicolon_opt { $$ = $1.interface; - $$->ref = find_type_or_error2($3, 0); + $$->ref = find_type2($3, 0); if (!$$->ref) error_loc("base class '%s' not found in import\n", $3); $$->funcs = $6; compute_method_indexes($$); @@ -1059,7 +1060,6 @@ pointer_type: structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, tsSTRUCT); /* overwrite RPC_FC_STRUCT with a more exact type */ - check_def($$); $$->type = get_struct_type( $4 ); $$->kind = TKIND_RECORD; $$->fields_or_args = $4; @@ -1069,15 +1069,15 @@ structdef: tSTRUCT t_ident '{' fields '}' { $$ = get_typev(RPC_FC_STRUCT, $2, ts } ; -type: tVOID { $$ = find_type_or_error("void", 0); } - | aKNOWNTYPE { $$ = find_type_or_error($1, 0); } +type: tVOID { $$ = duptype(find_type("void", 0), 1); } + | aKNOWNTYPE { $$ = find_type($1, 0); } | base_type { $$ = $1; } | enumdef { $$ = $1; } - | tENUM aIDENTIFIER { $$ = find_type_or_error2($2, tsENUM); } + | tENUM aIDENTIFIER { $$ = find_type2($2, tsENUM); } | structdef { $$ = $1; } | tSTRUCT aIDENTIFIER { $$ = get_type(RPC_FC_STRUCT, $2, tsSTRUCT); } | uniondef { $$ = $1; } - | tUNION aIDENTIFIER { $$ = find_type_or_error2($2, tsUNION); } + | tUNION aIDENTIFIER { $$ = find_type2($2, tsUNION); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } ; @@ -1089,7 +1089,6 @@ typedef: tTYPEDEF m_attributes decl_spec declarator_list uniondef: tUNION t_ident '{' ne_union_fields '}' { $$ = get_typev(RPC_FC_NON_ENCAPSULATED_UNION, $2, tsUNION); - check_def($$); $$->kind = TKIND_UNION; $$->fields_or_args = $4; $$->defined = TRUE; @@ -1098,7 +1097,6 @@ uniondef: tUNION t_ident '{' ne_union_fields '}' tSWITCH '(' s_field ')' m_ident '{' cases '}' { var_t *u = $7; $$ = get_typev(RPC_FC_ENCAPSULATED_UNION, $2, tsUNION); - check_def($$); $$->kind = TKIND_UNION; if (!u) u = make_var( xstrdup("tagged_union") ); u->type = make_type(RPC_FC_NON_ENCAPSULATED_UNION, NULL); @@ -1128,14 +1126,14 @@ static void decl_builtin(const char *name, unsigned char type) static type_t *make_builtin(char *name) { /* NAME is strdup'd in the lexer */ - type_t *t = duptype(find_type_or_error(name, 0), 0); + type_t *t = duptype(find_type(name, 0), 0); t->name = name; return t; } static type_t *make_int(int sign) { - type_t *t = duptype(find_type_or_error("int", 0), 1); + type_t *t = duptype(find_type("int", 0), 1); t->sign = sign; if (sign < 0) @@ -1392,7 +1390,6 @@ type_t *make_type(unsigned char type, type_t *ref) t->tfswrite = FALSE; t->checked = FALSE; t->typelib_idx = -1; - init_loc_info(&t->loc_info); return t; } @@ -1704,7 +1701,9 @@ static var_t *make_var(char *name) v->attrs = NULL; v->eval = NULL; v->stgclass = STG_NONE; - init_loc_info(&v->loc_info); + v->loc_info.input_name = input_name ? input_name : "stdin"; + v->loc_info.line_number = line_number; + v->loc_info.near_text = parser_text; return v; } @@ -1761,7 +1760,7 @@ static type_t *make_class(char *name) static type_t *make_safearray(type_t *type) { - type_t *sa = find_type_or_error("SAFEARRAY", 0); + type_t *sa = duptype(find_type("SAFEARRAY", 0), 1); sa->ref = type; return make_type(pointer_default, sa); } @@ -1895,12 +1894,6 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at if (name->name) { type_t *cur; - cur = find_type(name->name, 0); - if (cur) - error_loc("%s: redefinition error; original definition was at %s:%d\n", - cur->name, cur->loc_info.input_name, - cur->loc_info.line_number); - /* set the attributes to allow set_type to do some checks on them */ name->attrs = attrs; set_type(name, decl_spec, decl, 0); @@ -1915,7 +1908,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at return type; } -type_t *find_type(const char *name, int t) +static type_t *find_type_helper(const char *name, int t) { struct rtype *cur = type_hash[hash_ident(name)]; while (cur && (cur->t != t || strcmp(cur->name, name))) @@ -1923,9 +1916,9 @@ type_t *find_type(const char *name, int t) return cur ? cur->type : NULL; } -static type_t *find_type_or_error(const char *name, int t) +type_t *find_type(const char *name, int t) { - type_t *type = find_type(name, t); + type_t *type = find_type_helper(name, t); if (!type) { error_loc("type '%s' not found\n", name); return NULL; @@ -1933,23 +1926,23 @@ static type_t *find_type_or_error(const char *name, int t) return type; } -static type_t *find_type_or_error2(char *name, int t) +static type_t *find_type2(char *name, int t) { - type_t *tp = find_type_or_error(name, t); + type_t *tp = find_type(name, t); free(name); return tp; } int is_type(const char *name) { - return find_type(name, 0) != NULL; + return find_type_helper(name, 0) != NULL; } static type_t *get_type(unsigned char type, char *name, int t) { type_t *tp; if (name) { - tp = find_type(name, t); + tp = find_type_helper(name, t); if (tp) { free(name); return tp; @@ -2618,12 +2611,7 @@ static void check_remoting_fields(const var_t *var, type_t *type) type->checked = TRUE; if (is_struct(type->type)) - { - if (type->defined) - fields = type->fields_or_args; - else - error_loc_info(&var->loc_info, "undefined type declaration %s\n", type->name); - } + fields = type->fields_or_args; else if (is_union(type->type)) { if (type->type == RPC_FC_ENCAPSULATED_UNION) @@ -2705,7 +2693,7 @@ static void add_explicit_handle_if_necessary(func_t *func) * function */ var_t *idl_handle = make_var(xstrdup("IDL_handle")); idl_handle->attrs = append_attr(NULL, make_attr(ATTR_IN)); - idl_handle->type = find_type_or_error("handle_t", 0); + idl_handle->type = find_type("handle_t", 0); if (!func->def->type->fields_or_args) { func->def->type->fields_or_args = xmalloc( sizeof(*func->def->type->fields_or_args) ); @@ -2860,7 +2848,7 @@ static statement_t *process_typedefs(declarator_list_t *decls) LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) { var_t *var = decl->var; - type_t *type = find_type_or_error(var->name, 0); + type_t *type = find_type(var->name, 0); *type_list = xmalloc(sizeof(type_list_t)); (*type_list)->type = type; (*type_list)->next = NULL; @@ -2903,17 +2891,3 @@ static func_list_t *append_func_from_statement(func_list_t *list, statement_t *s } return list; } - -void init_loc_info(loc_info_t *i) -{ - i->input_name = input_name ? input_name : "stdin"; - i->line_number = line_number; - i->near_text = parser_text; -} - -static void check_def(const type_t *t) -{ - if (t->defined) - error_loc("%s: redefinition error; original definition was at %s:%d\n", - t->name, t->loc_info.input_name, t->loc_info.line_number); -} diff --git a/reactos/tools/widl/parser.yy.c b/reactos/tools/widl/parser.yy.c index 899a82123bc..31528be0517 100644 --- a/reactos/tools/widl/parser.yy.c +++ b/reactos/tools/widl/parser.yy.c @@ -565,7 +565,6 @@ char *yytext; * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define YY_STACK_USED 1 -#define YY_NO_INPUT 1 #define YY_NO_UNPUT 1 #define YY_NO_TOP_STATE 1 #define YY_NEVER_INTERACTIVE 1 @@ -646,7 +645,7 @@ UUID *parse_uuid(const char *u) * The flexer starts here ************************************************************************** */ -#line 650 "parser.yy.c" +#line 649 "parser.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -802,7 +801,7 @@ YY_DECL #line 112 "parser.l" -#line 806 "parser.yy.c" +#line 805 "parser.yy.c" if ( yy_init ) { @@ -1096,7 +1095,7 @@ YY_RULE_SETUP #line 187 "parser.l" ECHO; YY_BREAK -#line 1100 "parser.yy.c" +#line 1099 "parser.yy.c" case YY_END_OF_BUFFER: { diff --git a/reactos/tools/widl/typegen.c b/reactos/tools/widl/typegen.c index 35b2d71df8f..f89f13fb9b8 100644 --- a/reactos/tools/widl/typegen.c +++ b/reactos/tools/widl/typegen.c @@ -984,7 +984,7 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) { unsigned int start, absoff, flags; unsigned int align = 0, ualign = 0; - const char *name = NULL; + const char *name; type_t *utype = get_user_type(type, &name); size_t usize = user_type_has_variable_size(utype) ? 0 : type_memsize(utype, &ualign); size_t size = type_memsize(type, &align); @@ -1437,14 +1437,6 @@ static int write_varying_array_pointer_descriptions( if (offset_in_memory && offset_in_buffer) { size_t padding; - - if (is_array(v->type) && v->type->length_is) - { - *offset_in_buffer = ROUND_SIZE(*offset_in_buffer, 4); - /* skip over variance and offset in buffer */ - *offset_in_buffer += 8; - } - align = 0; type_memsize(v->type, &align); padding = ROUNDING(*offset_in_memory, align); @@ -1478,13 +1470,19 @@ static void write_pointer_description(FILE *file, type_t *type, { size_t offset_in_buffer; size_t offset_in_memory; + size_t conformance = 0; + + if (type->type == RPC_FC_CVSTRUCT) + conformance = 8; + else if (type->type == RPC_FC_CSTRUCT || type->type == RPC_FC_CPSTRUCT) + conformance = 4; /* pass 1: search for single instance of a pointer (i.e. don't descend * into arrays) */ if (!is_array(type)) { offset_in_memory = 0; - offset_in_buffer = 0; + offset_in_buffer = conformance; write_no_repeat_pointer_descriptions( file, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1492,7 +1490,7 @@ static void write_pointer_description(FILE *file, type_t *type, /* pass 2: search for pointers in fixed arrays */ offset_in_memory = 0; - offset_in_buffer = 0; + offset_in_buffer = conformance; write_fixed_array_pointer_descriptions( file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -1514,7 +1512,7 @@ static void write_pointer_description(FILE *file, type_t *type, /* pass 4: search for pointers in varying arrays */ offset_in_memory = 0; - offset_in_buffer = 0; + offset_in_buffer = conformance; write_varying_array_pointer_descriptions( file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset); @@ -2034,34 +2032,6 @@ static size_t write_union_tfs(FILE *file, type_t *type, unsigned int *tfsoff) error("union switch type must be an integer, char, or enum\n"); } } - else if (is_attr(type->attrs, ATTR_SWITCHTYPE)) - { - static const expr_t dummy_expr; /* FIXME */ - const type_t *st = get_attrp(type->attrs, ATTR_SWITCHTYPE); - - switch (st->type) - { - case RPC_FC_CHAR: - case RPC_FC_SMALL: - case RPC_FC_USMALL: - case RPC_FC_SHORT: - case RPC_FC_USHORT: - case RPC_FC_LONG: - case RPC_FC_ULONG: - case RPC_FC_ENUM16: - case RPC_FC_ENUM32: - print_file(file, 2, "0x%x,\t/* %s */\n", type->type, string_of_type(type->type)); - print_file(file, 2, "0x%x,\t/* Switch type= %s */\n", - st->type, string_of_type(st->type)); - *tfsoff += 2; - break; - default: - error("union switch type must be an integer, char, or enum\n"); - } - - *tfsoff += write_conf_or_var_desc(file, NULL, *tfsoff, st, &dummy_expr ); - } - print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", size, size); print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", nbranch, nbranch); *tfsoff += 4; @@ -2457,12 +2427,11 @@ void write_typeformatstring(FILE *file, const statement_list_t *stmts, type_pred static unsigned int get_required_buffer_size_type( const type_t *type, const char *name, unsigned int *alignment) { - const char *uname; - const type_t *utype; - *alignment = 0; - if ((utype = get_user_type(type, &uname))) + if (is_user_type(type)) { + const char *uname; + const type_t *utype = get_user_type(type, &uname); return get_required_buffer_size_type(utype, uname, alignment); } else @@ -2771,7 +2740,7 @@ void print_phase_basetype(FILE *file, int indent, enum remoting_phase phase, /* returns whether the MaxCount, Offset or ActualCount members need to be * filled in for the specified phase */ -static inline int is_conformance_needed_for_phase(enum remoting_phase phase) +static inline int is_size_needed_for_phase(enum remoting_phase phase) { return (phase != PHASE_UNMARSHAL); } @@ -2794,67 +2763,6 @@ expr_t *get_size_is_expr(const type_t *t, const char *name) return x; } -static void write_parameter_conf_or_var_exprs(FILE *file, int indent, - enum remoting_phase phase, - const var_t *var) -{ - const type_t *type = var->type; - /* get fundamental type for the argument */ - for (;;) - { - if (is_attr(type->attrs, ATTR_WIREMARSHAL)) - break; - else if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) - break; - else if (is_array(type) || is_string_type(var->attrs, type)) - { - if (is_conformance_needed_for_phase(phase)) - { - if (type->size_is) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); - write_expr(file, type->size_is, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } - if (type->length_is) - { - print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ - print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); - write_expr(file, type->length_is, 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } - } - break; - } - else if (type->type == RPC_FC_NON_ENCAPSULATED_UNION) - { - if (is_conformance_needed_for_phase(phase)) - { - print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); - write_expr(file, get_attrp(var->attrs, ATTR_SWITCHIS), 1, 1, NULL, NULL); - fprintf(file, ";\n\n"); - } - break; - } - else if (type->type == RPC_FC_IP) - { - expr_t *iid; - - if (is_conformance_needed_for_phase(phase) && (iid = get_attrp( var->attrs, ATTR_IIDIS ))) - { - print_file( file, indent, "_StubMsg.MaxCount = (unsigned long) " ); - write_expr( file, iid, 1, 1, NULL, NULL ); - fprintf( file, ";\n\n" ); - } - break; - } - else if (is_ptr(type)) - type = type->ref; - else - break; - } -} - static void write_remoting_arg(FILE *file, int indent, const func_t *func, enum pass pass, enum remoting_phase phase, const var_t *var) @@ -2886,7 +2794,6 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, break; } - write_parameter_conf_or_var_exprs(file, indent, phase, var); rtype = type->type; if (is_context_handle(type)) @@ -2942,6 +2849,13 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, print_phase_function(file, indent, "NonConformantString", phase, var, start_offset); else { + if (type->size_is && is_size_needed_for_phase(phase)) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, type->size_is, 1, 1, NULL, NULL); + fprintf(file, ";\n"); + } + if (phase == PHASE_FREE || pass == PASS_RETURN || pointer_type == RPC_FC_UP) print_phase_function(file, indent, "Pointer", phase, var, start_offset - (type->size_is ? 4 : 2)); @@ -2964,14 +2878,43 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, if (tc == RPC_FC_SMVARRAY || tc == RPC_FC_LGVARRAY) { + if (is_size_needed_for_phase(phase)) + { + print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ + print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); + write_expr(file, type->length_is, 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } array_type = "VaryingArray"; } else if (tc == RPC_FC_CARRAY) { + if (is_size_needed_for_phase(phase)) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, type->size_is, 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } array_type = "ConformantArray"; } else if (tc == RPC_FC_CVARRAY || tc == RPC_FC_BOGUS_ARRAY) { + if (is_size_needed_for_phase(phase)) + { + if (type->size_is) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long)"); + write_expr(file, type->size_is, 1, 1, NULL, NULL); + fprintf(file, ";\n"); + } + if (type->length_is) + { + print_file(file, indent, "_StubMsg.Offset = (unsigned long)0;\n"); /* FIXME */ + print_file(file, indent, "_StubMsg.ActualCount = (unsigned long)"); + write_expr(file, type->length_is, 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } + } array_type = (tc == RPC_FC_BOGUS_ARRAY ? "ComplexArray" : "ConformantVaryingArray"); @@ -3056,6 +2999,21 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, } else { + expr_t *iid; + expr_t *sx = get_size_is_expr(type, var->name); + + if ((iid = get_attrp( var->attrs, ATTR_IIDIS ))) + { + print_file( file, indent, "_StubMsg.MaxCount = (unsigned long) " ); + write_expr( file, iid, 1, 1, NULL, NULL ); + fprintf( file, ";\n\n" ); + } + else if (sx) + { + print_file(file, indent, "_StubMsg.MaxCount = (unsigned long) "); + write_expr(file, sx, 1, 1, NULL, NULL); + fprintf(file, ";\n\n"); + } if (var->type->ref->type == RPC_FC_IP) print_phase_function(file, indent, "InterfacePointer", phase, var, start_offset); else @@ -3133,7 +3091,7 @@ size_t get_size_procformatstring(const statement_list_t *stmts, type_pred_t pred size += get_size_procformatstring(stmt->u.lib->stmts, pred) - 1; continue; } - else if (stmt->type != STMT_TYPE || stmt->u.type->type != RPC_FC_IP) + else if (stmt->type != STMT_TYPE && stmt->u.type->type != RPC_FC_IP) continue; iface = stmt->u.type; diff --git a/reactos/tools/widl/typelib.c b/reactos/tools/widl/typelib.c index c79f01646cf..b6464354e68 100644 --- a/reactos/tools/widl/typelib.c +++ b/reactos/tools/widl/typelib.c @@ -69,7 +69,6 @@ type_t *alias(type_t *t, const char *name) a->kind = TKIND_ALIAS; a->attrs = NULL; a->declarray = FALSE; - init_loc_info(&a->loc_info); return a; } diff --git a/reactos/tools/widl/widltypes.h b/reactos/tools/widl/widltypes.h index b1805cfe8a0..de1ea3f0ffc 100644 --- a/reactos/tools/widl/widltypes.h +++ b/reactos/tools/widl/widltypes.h @@ -283,7 +283,6 @@ struct _type_t { unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */ int typelib_idx; - loc_info_t loc_info; unsigned int declarray : 1; /* if declared as an array */ unsigned int ignore : 1; unsigned int defined : 1; @@ -420,8 +419,6 @@ var_t *find_const(const char *name, int f); type_t *find_type(const char *name, int t); type_t *make_type(unsigned char type, type_t *ref); -void init_loc_info(loc_info_t *); - static inline type_t *get_func_return_type(const func_t *func) { return func->def->type->ref;