X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/56beb0d2b20edc2f0ac8716c020053f8a103577d..3e833eea9cb9822f04c639e143212c4b6f7940d4:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 05fbfbf..aee046d 100644 --- a/src/parse.c +++ b/src/parse.c @@ -88,34 +88,35 @@ ARRAY_DIM = 277, SINGLE_CHAR = 278, CCODE = 279, - HTCODE = 280, - PHCODE = 281, - HCODE = 282, - ACODE = 283, - ATCODE = 284, - STRING = 285, - PUBLIC = 286, - PRIVATE = 287, - PROTECTED = 288, - CLASSWIDE = 289, - PROPERTY = 290, - ARGUMENT = 291, - VIRTUAL = 292, - SIGNAL = 293, - OVERRIDE = 294, - NICK = 295, - BLURB = 296, - MAXIMUM = 297, - MINIMUM = 298, - DEFAULT_VALUE = 299, - ERROR = 300, - FLAGS = 301, - TYPE = 302, - FLAGS_TYPE = 303, - ENUM_TYPE = 304, - PARAM_TYPE = 305, - BOXED_TYPE = 306, - OBJECT_TYPE = 307 + ADCODE = 280, + HTCODE = 281, + PHCODE = 282, + HCODE = 283, + ACODE = 284, + ATCODE = 285, + STRING = 286, + PUBLIC = 287, + PRIVATE = 288, + PROTECTED = 289, + CLASSWIDE = 290, + PROPERTY = 291, + ARGUMENT = 292, + VIRTUAL = 293, + SIGNAL = 294, + OVERRIDE = 295, + NICK = 296, + BLURB = 297, + MAXIMUM = 298, + MINIMUM = 299, + DEFAULT_VALUE = 300, + ERROR = 301, + FLAGS = 302, + TYPE = 303, + FLAGS_TYPE = 304, + ENUM_TYPE = 305, + PARAM_TYPE = 306, + BOXED_TYPE = 307, + OBJECT_TYPE = 308 }; #endif /* Tokens. */ @@ -141,34 +142,35 @@ #define ARRAY_DIM 277 #define SINGLE_CHAR 278 #define CCODE 279 -#define HTCODE 280 -#define PHCODE 281 -#define HCODE 282 -#define ACODE 283 -#define ATCODE 284 -#define STRING 285 -#define PUBLIC 286 -#define PRIVATE 287 -#define PROTECTED 288 -#define CLASSWIDE 289 -#define PROPERTY 290 -#define ARGUMENT 291 -#define VIRTUAL 292 -#define SIGNAL 293 -#define OVERRIDE 294 -#define NICK 295 -#define BLURB 296 -#define MAXIMUM 297 -#define MINIMUM 298 -#define DEFAULT_VALUE 299 -#define ERROR 300 -#define FLAGS 301 -#define TYPE 302 -#define FLAGS_TYPE 303 -#define ENUM_TYPE 304 -#define PARAM_TYPE 305 -#define BOXED_TYPE 306 -#define OBJECT_TYPE 307 +#define ADCODE 280 +#define HTCODE 281 +#define PHCODE 282 +#define HCODE 283 +#define ACODE 284 +#define ATCODE 285 +#define STRING 286 +#define PUBLIC 287 +#define PRIVATE 288 +#define PROTECTED 289 +#define CLASSWIDE 290 +#define PROPERTY 291 +#define ARGUMENT 292 +#define VIRTUAL 293 +#define SIGNAL 294 +#define OVERRIDE 295 +#define NICK 296 +#define BLURB 297 +#define MAXIMUM 298 +#define MINIMUM 299 +#define DEFAULT_VALUE 300 +#define ERROR 301 +#define FLAGS 302 +#define TYPE 303 +#define FLAGS_TYPE 304 +#define ENUM_TYPE 305 +#define PARAM_TYPE 306 +#define BOXED_TYPE 307 +#define OBJECT_TYPE 308 @@ -220,6 +222,7 @@ static char *initializer = NULL; static int initializer_line = 0; static int glade_widget = FALSE; +static char *funcattrs = NULL; static char *onerror = NULL; static char *defreturn = NULL; @@ -360,6 +363,7 @@ push_function (int scope, int method, char *oid, char *id, "flags:steal", flags, "id:steal", id, "args:steal", funcargs, + "funcattrs:steal", funcattrs, "onerror:steal", onerror, "defreturn:steal", defreturn, "cbuf:steal", c_cbuf, @@ -379,6 +383,7 @@ push_function (int scope, int method, char *oid, char *id, gtktypes = NULL; funcargs = NULL; + funcattrs = NULL; onerror = NULL; defreturn = NULL; @@ -388,6 +393,8 @@ push_function (int scope, int method, char *oid, char *id, static void free_all_global_state(void) { + g_free(funcattrs); + funcattrs = NULL; g_free(onerror); onerror = NULL; g_free(defreturn); @@ -491,9 +498,15 @@ find_var_or_die(const char *id, int line) } static gboolean -set_return_value(char *type, char *val) +set_attr_value(char *type, char *val) { - if(strcmp(type, "onerror")==0) { + if(strcmp(type, "attr")==0) { + if(!funcattrs) { + funcattrs = val; + return TRUE; + } else + return FALSE; + } else if(strcmp(type, "onerror")==0) { if(!onerror) { onerror = val; return TRUE; @@ -628,7 +641,6 @@ add_construct_glade (char * file, char * root, char * domain) { Node *var; Type * type; - GList * flags = NULL; type = (Type *)node_new (TYPE_NODE, "name", "GladeXML", @@ -840,7 +852,7 @@ ensure_property (void) #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 668 "parse.y" +#line 678 "parse.y" { char *id; GString *cbuf; @@ -849,7 +861,7 @@ typedef union YYSTYPE int sigtype; } /* Line 187 of yacc.c. */ -#line 853 "parse.c" +#line 865 "parse.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -862,7 +874,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 866 "parse.c" +#line 878 "parse.c" #ifdef short # undef short @@ -1075,22 +1087,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 23 +#define YYFINAL 24 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 629 +#define YYLAST 640 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 66 +#define YYNTOKENS 67 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 53 /* YYNRULES -- Number of rules. */ -#define YYNRULES 195 +#define YYNRULES 197 /* YYNRULES -- Number of states. */ -#define YYNSTATES 414 +#define YYNSTATES 417 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 307 +#define YYMAXUTOK 308 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -1101,16 +1113,16 @@ static const yytype_uint8 yytranslate[] = 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 64, 2, 2, 2, 2, 2, 2, - 55, 56, 61, 2, 59, 65, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 57, - 63, 58, 62, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 65, 2, 2, 2, 2, 2, 2, + 56, 57, 62, 2, 60, 66, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 58, + 64, 59, 63, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 53, 60, 54, 2, 2, 2, 2, + 2, 2, 2, 54, 61, 55, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1128,7 +1140,7 @@ static const yytype_uint8 yytranslate[] = 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 52 + 45, 46, 47, 48, 49, 50, 51, 52, 53 }; #if YYDEBUG @@ -1137,129 +1149,130 @@ static const yytype_uint8 yytranslate[] = static const yytype_uint16 yyprhs[] = { 0, 0, 3, 7, 10, 13, 15, 17, 19, 21, - 23, 25, 27, 30, 33, 36, 39, 41, 43, 45, - 47, 52, 56, 62, 63, 68, 74, 80, 86, 93, - 101, 108, 116, 119, 121, 123, 126, 130, 132, 134, - 136, 138, 140, 142, 144, 146, 149, 153, 156, 160, - 163, 166, 168, 170, 172, 173, 179, 186, 199, 209, - 216, 220, 221, 233, 242, 248, 252, 253, 257, 259, - 261, 266, 268, 270, 274, 278, 282, 286, 290, 294, - 298, 302, 306, 310, 314, 318, 322, 326, 330, 334, - 338, 340, 346, 348, 352, 353, 357, 359, 362, 364, - 366, 368, 371, 374, 377, 381, 385, 388, 391, 394, - 396, 399, 401, 404, 406, 408, 410, 412, 414, 416, - 418, 420, 422, 424, 426, 428, 430, 433, 436, 440, - 443, 445, 449, 453, 456, 458, 463, 467, 469, 472, - 474, 485, 497, 507, 517, 526, 538, 547, 553, 556, - 561, 562, 564, 567, 569, 571, 574, 577, 581, 586, - 591, 593, 597, 599, 603, 605, 608, 612, 619, 627, - 630, 632, 634, 637, 640, 644, 648, 652, 656, 664, - 673, 677, 679, 683, 685, 693, 702, 706, 708, 716, - 725, 729, 731, 733, 736, 738 + 23, 25, 27, 29, 32, 35, 38, 41, 43, 45, + 47, 49, 54, 58, 64, 65, 70, 76, 82, 88, + 95, 103, 110, 118, 121, 123, 125, 128, 132, 134, + 136, 138, 140, 142, 144, 146, 148, 151, 155, 158, + 162, 165, 168, 170, 172, 174, 175, 181, 188, 201, + 211, 218, 222, 223, 235, 244, 250, 254, 255, 259, + 261, 263, 268, 270, 272, 276, 280, 284, 288, 292, + 296, 300, 304, 308, 312, 316, 320, 324, 328, 332, + 336, 340, 342, 348, 350, 354, 355, 359, 361, 364, + 366, 368, 370, 373, 376, 379, 383, 387, 390, 393, + 396, 398, 401, 403, 406, 408, 410, 412, 414, 416, + 418, 420, 422, 424, 426, 428, 430, 432, 435, 438, + 442, 445, 447, 451, 455, 458, 460, 465, 469, 471, + 474, 476, 487, 499, 509, 519, 528, 540, 549, 555, + 558, 563, 570, 571, 573, 576, 578, 580, 583, 586, + 590, 595, 600, 602, 606, 608, 612, 614, 617, 621, + 628, 636, 639, 641, 643, 646, 649, 653, 657, 661, + 665, 673, 682, 686, 688, 692, 694, 702, 711, 715, + 717, 725, 734, 738, 740, 742, 745, 747 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 67, 0, -1, 69, 70, 69, -1, 70, 69, -1, - 69, 70, -1, 70, -1, 24, -1, 27, -1, 25, - -1, 26, -1, 28, -1, 29, -1, 69, 68, -1, - 69, 111, -1, 69, 114, -1, 69, 116, -1, 68, - -1, 111, -1, 114, -1, 116, -1, 71, 53, 73, - 54, -1, 71, 53, 54, -1, 3, 21, 4, 21, - 72, -1, -1, 55, 19, 56, 72, -1, 55, 19, - 19, 56, 72, -1, 55, 19, 21, 56, 72, -1, - 55, 19, 20, 56, 72, -1, 55, 19, 30, 30, - 56, 72, -1, 55, 19, 30, 30, 30, 56, 72, - -1, 55, 19, 19, 30, 56, 72, -1, 55, 19, - 19, 30, 30, 56, 72, -1, 73, 74, -1, 74, - -1, 102, -1, 19, 102, -1, 19, 21, 102, -1, - 79, -1, 80, -1, 82, -1, 57, -1, 31, -1, - 32, -1, 33, -1, 34, -1, 19, 19, -1, 19, - 53, 24, -1, 58, 118, -1, 58, 53, 24, -1, - 76, 77, -1, 77, 76, -1, 77, -1, 76, -1, - 19, -1, -1, 75, 91, 19, 78, 57, -1, 75, - 91, 19, 22, 78, 57, -1, 36, 89, 88, 19, - 81, 19, 53, 24, 19, 53, 24, 57, -1, 36, - 89, 88, 19, 81, 19, 53, 24, 57, -1, 36, - 89, 88, 19, 81, 19, -1, 55, 19, 56, -1, - -1, 35, 19, 19, 83, 19, 53, 24, 19, 53, - 24, 57, -1, 35, 19, 19, 83, 19, 53, 24, - 57, -1, 35, 19, 19, 83, 57, -1, 55, 84, - 56, -1, -1, 84, 59, 87, -1, 87, -1, 30, - -1, 19, 55, 30, 56, -1, 118, -1, 85, -1, - 40, 58, 85, -1, 41, 58, 85, -1, 42, 58, - 118, -1, 43, 58, 118, -1, 44, 58, 86, -1, - 46, 58, 90, -1, 47, 58, 91, -1, 48, 58, - 21, -1, 48, 58, 19, -1, 49, 58, 21, -1, - 49, 58, 19, -1, 50, 58, 21, -1, 50, 58, - 19, -1, 51, 58, 21, -1, 51, 58, 19, -1, - 52, 58, 21, -1, 52, 58, 19, -1, 19, -1, - 19, 55, 19, 91, 56, -1, 19, -1, 55, 90, - 56, -1, -1, 19, 60, 90, -1, 19, -1, 92, - 96, -1, 92, -1, 93, -1, 19, -1, 5, 19, - -1, 19, 5, -1, 95, 19, -1, 5, 95, 19, - -1, 95, 19, 5, -1, 94, 93, -1, 21, 93, - -1, 5, 93, -1, 21, -1, 21, 5, -1, 94, - -1, 94, 5, -1, 6, -1, 18, -1, 14, -1, - 15, -1, 13, -1, 16, -1, 17, -1, 11, -1, - 12, -1, 7, -1, 8, -1, 9, -1, 61, -1, - 61, 5, -1, 61, 96, -1, 61, 5, 96, -1, - 19, 99, -1, 99, -1, 75, 19, 99, -1, 19, - 75, 99, -1, 75, 99, -1, 97, -1, 19, 55, - 100, 56, -1, 100, 59, 19, -1, 19, -1, 53, - 24, -1, 57, -1, 38, 89, 98, 91, 19, 55, - 105, 56, 103, 101, -1, 75, 38, 89, 97, 91, - 19, 55, 105, 56, 103, 101, -1, 37, 75, 91, - 19, 55, 105, 56, 103, 101, -1, 75, 37, 91, - 19, 55, 105, 56, 103, 101, -1, 37, 91, 19, - 55, 105, 56, 103, 101, -1, 39, 55, 21, 56, - 91, 19, 55, 105, 56, 103, 101, -1, 75, 91, - 19, 55, 105, 56, 103, 101, -1, 19, 55, 19, - 56, 101, -1, 19, 104, -1, 19, 104, 19, 104, - -1, -1, 118, -1, 53, 24, -1, 6, -1, 19, - -1, 19, 5, -1, 5, 19, -1, 19, 59, 106, - -1, 19, 5, 59, 106, -1, 5, 19, 59, 106, - -1, 106, -1, 107, 59, 10, -1, 107, -1, 107, - 59, 108, -1, 108, -1, 91, 19, -1, 91, 19, - 22, -1, 91, 19, 55, 19, 109, 56, -1, 91, - 19, 22, 55, 19, 109, 56, -1, 109, 110, -1, - 110, -1, 19, -1, 62, 118, -1, 63, 118, -1, - 62, 58, 118, -1, 63, 58, 118, -1, 58, 58, - 118, -1, 64, 58, 118, -1, 9, 19, 53, 112, - 54, 21, 57, -1, 9, 19, 53, 112, 59, 54, - 21, 57, -1, 112, 59, 113, -1, 113, -1, 19, - 58, 118, -1, 19, -1, 46, 19, 53, 115, 54, - 21, 57, -1, 46, 19, 53, 115, 59, 54, 21, - 57, -1, 115, 59, 19, -1, 19, -1, 45, 19, - 53, 117, 54, 21, 57, -1, 45, 19, 53, 117, - 59, 54, 21, 57, -1, 117, 59, 19, -1, 19, - -1, 20, -1, 65, 20, -1, 23, -1, 19, -1 + 68, 0, -1, 70, 71, 70, -1, 71, 70, -1, + 70, 71, -1, 71, -1, 24, -1, 25, -1, 28, + -1, 26, -1, 27, -1, 29, -1, 30, -1, 70, + 69, -1, 70, 112, -1, 70, 115, -1, 70, 117, + -1, 69, -1, 112, -1, 115, -1, 117, -1, 72, + 54, 74, 55, -1, 72, 54, 55, -1, 3, 21, + 4, 21, 73, -1, -1, 56, 19, 57, 73, -1, + 56, 19, 19, 57, 73, -1, 56, 19, 21, 57, + 73, -1, 56, 19, 20, 57, 73, -1, 56, 19, + 31, 31, 57, 73, -1, 56, 19, 31, 31, 31, + 57, 73, -1, 56, 19, 19, 31, 57, 73, -1, + 56, 19, 19, 31, 31, 57, 73, -1, 74, 75, + -1, 75, -1, 103, -1, 19, 103, -1, 19, 21, + 103, -1, 80, -1, 81, -1, 83, -1, 58, -1, + 32, -1, 33, -1, 34, -1, 35, -1, 19, 19, + -1, 19, 54, 24, -1, 59, 119, -1, 59, 54, + 24, -1, 77, 78, -1, 78, 77, -1, 78, -1, + 77, -1, 19, -1, -1, 76, 92, 19, 79, 58, + -1, 76, 92, 19, 22, 79, 58, -1, 37, 90, + 89, 19, 82, 19, 54, 24, 19, 54, 24, 58, + -1, 37, 90, 89, 19, 82, 19, 54, 24, 58, + -1, 37, 90, 89, 19, 82, 19, -1, 56, 19, + 57, -1, -1, 36, 19, 19, 84, 19, 54, 24, + 19, 54, 24, 58, -1, 36, 19, 19, 84, 19, + 54, 24, 58, -1, 36, 19, 19, 84, 58, -1, + 56, 85, 57, -1, -1, 85, 60, 88, -1, 88, + -1, 31, -1, 19, 56, 31, 57, -1, 119, -1, + 86, -1, 41, 59, 86, -1, 42, 59, 86, -1, + 43, 59, 119, -1, 44, 59, 119, -1, 45, 59, + 87, -1, 47, 59, 91, -1, 48, 59, 92, -1, + 49, 59, 21, -1, 49, 59, 19, -1, 50, 59, + 21, -1, 50, 59, 19, -1, 51, 59, 21, -1, + 51, 59, 19, -1, 52, 59, 21, -1, 52, 59, + 19, -1, 53, 59, 21, -1, 53, 59, 19, -1, + 19, -1, 19, 56, 19, 92, 57, -1, 19, -1, + 56, 91, 57, -1, -1, 19, 61, 91, -1, 19, + -1, 93, 97, -1, 93, -1, 94, -1, 19, -1, + 5, 19, -1, 19, 5, -1, 96, 19, -1, 5, + 96, 19, -1, 96, 19, 5, -1, 95, 94, -1, + 21, 94, -1, 5, 94, -1, 21, -1, 21, 5, + -1, 95, -1, 95, 5, -1, 6, -1, 18, -1, + 14, -1, 15, -1, 13, -1, 16, -1, 17, -1, + 11, -1, 12, -1, 7, -1, 8, -1, 9, -1, + 62, -1, 62, 5, -1, 62, 97, -1, 62, 5, + 97, -1, 19, 100, -1, 100, -1, 76, 19, 100, + -1, 19, 76, 100, -1, 76, 100, -1, 98, -1, + 19, 56, 101, 57, -1, 101, 60, 19, -1, 19, + -1, 54, 24, -1, 58, -1, 39, 90, 99, 92, + 19, 56, 106, 57, 104, 102, -1, 76, 39, 90, + 98, 92, 19, 56, 106, 57, 104, 102, -1, 38, + 76, 92, 19, 56, 106, 57, 104, 102, -1, 76, + 38, 92, 19, 56, 106, 57, 104, 102, -1, 38, + 92, 19, 56, 106, 57, 104, 102, -1, 40, 56, + 21, 57, 92, 19, 56, 106, 57, 104, 102, -1, + 76, 92, 19, 56, 106, 57, 104, 102, -1, 19, + 56, 19, 57, 102, -1, 19, 105, -1, 19, 105, + 19, 105, -1, 19, 105, 19, 105, 19, 105, -1, + -1, 119, -1, 54, 24, -1, 6, -1, 19, -1, + 19, 5, -1, 5, 19, -1, 19, 60, 107, -1, + 19, 5, 60, 107, -1, 5, 19, 60, 107, -1, + 107, -1, 108, 60, 10, -1, 108, -1, 108, 60, + 109, -1, 109, -1, 92, 19, -1, 92, 19, 22, + -1, 92, 19, 56, 19, 110, 57, -1, 92, 19, + 22, 56, 19, 110, 57, -1, 110, 111, -1, 111, + -1, 19, -1, 63, 119, -1, 64, 119, -1, 63, + 59, 119, -1, 64, 59, 119, -1, 59, 59, 119, + -1, 65, 59, 119, -1, 9, 19, 54, 113, 55, + 21, 58, -1, 9, 19, 54, 113, 60, 55, 21, + 58, -1, 113, 60, 114, -1, 114, -1, 19, 59, + 119, -1, 19, -1, 47, 19, 54, 116, 55, 21, + 58, -1, 47, 19, 54, 116, 60, 55, 21, 58, + -1, 116, 60, 19, -1, 19, -1, 46, 19, 54, + 118, 55, 21, 58, -1, 46, 19, 54, 118, 60, + 55, 21, 58, -1, 118, 60, 19, -1, 19, -1, + 20, -1, 66, 20, -1, 23, -1, 19, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 689, 689, 690, 691, 692, 695, 704, 713, 722, - 731, 740, 751, 752, 753, 754, 755, 756, 757, 758, - 761, 766, 773, 790, 791, 799, 811, 820, 832, 841, - 850, 859, 870, 871, 874, 875, 884, 896, 897, 898, - 899, 902, 903, 904, 905, 908, 928, 952, 956, 964, - 965, 966, 967, 968, 976, 982, 985, 990, 1058, 1112, - 1201, 1209, 1214, 1262, 1298, 1314, 1315, 1318, 1319, 1322, - 1323, 1335, 1336, 1339, 1345, 1351, 1357, 1363, 1369, 1375, - 1382, 1388, 1394, 1400, 1406, 1412, 1418, 1424, 1430, 1436, - 1442, 1467, 1476, 1482, 1483, 1486, 1489, 1495, 1502, 1511, - 1514, 1517, 1521, 1525, 1529, 1534, 1542, 1546, 1551, 1555, - 1558, 1562, 1565, 1570, 1571, 1572, 1573, 1574, 1575, 1576, - 1577, 1578, 1581, 1582, 1583, 1586, 1587, 1588, 1592, 1599, - 1611, 1617, 1629, 1641, 1644, 1650, 1655, 1658, 1663, 1664, - 1668, 1684, 1700, 1716, 1732, 1743, 1749, 1759, 1782, 1793, - 1812, 1818, 1819, 1825, 1826, 1837, 1848, 1859, 1869, 1879, - 1889, 1892, 1893, 1896, 1897, 1900, 1903, 1906, 1914, 1924, - 1925, 1928, 1945, 1952, 1959, 1966, 1973, 1980, 1989, 1998, - 2009, 2010, 2013, 2033, 2043, 2052, 2063, 2066, 2071, 2080, - 2091, 2094, 2100, 2101, 2105, 2106 + 0, 699, 699, 700, 701, 702, 705, 714, 723, 732, + 741, 750, 759, 770, 771, 772, 773, 774, 775, 776, + 777, 780, 785, 792, 809, 810, 818, 830, 839, 851, + 860, 869, 878, 889, 890, 893, 894, 903, 915, 916, + 917, 918, 921, 922, 923, 924, 927, 947, 971, 975, + 983, 984, 985, 986, 987, 995, 1001, 1004, 1009, 1077, + 1131, 1220, 1228, 1233, 1281, 1317, 1333, 1334, 1337, 1338, + 1341, 1342, 1354, 1355, 1358, 1364, 1370, 1376, 1382, 1388, + 1394, 1401, 1407, 1413, 1419, 1425, 1431, 1437, 1443, 1449, + 1455, 1461, 1486, 1495, 1501, 1502, 1505, 1508, 1514, 1521, + 1530, 1533, 1536, 1540, 1544, 1548, 1553, 1561, 1565, 1570, + 1574, 1577, 1581, 1584, 1589, 1590, 1591, 1592, 1593, 1594, + 1595, 1596, 1597, 1600, 1601, 1602, 1605, 1606, 1607, 1611, + 1618, 1630, 1636, 1648, 1660, 1663, 1669, 1674, 1677, 1682, + 1683, 1687, 1710, 1733, 1756, 1779, 1797, 1810, 1820, 1860, + 1872, 1892, 1923, 1930, 1931, 1937, 1938, 1949, 1960, 1971, + 1981, 1991, 2001, 2004, 2005, 2008, 2009, 2012, 2015, 2018, + 2026, 2036, 2037, 2040, 2057, 2064, 2071, 2078, 2085, 2092, + 2101, 2110, 2121, 2122, 2125, 2145, 2155, 2164, 2175, 2178, + 2183, 2192, 2203, 2206, 2212, 2213, 2217, 2218 }; #endif @@ -1271,22 +1284,22 @@ static const char *const yytname[] = "$end", "error", "$undefined", "CLASS", "FROM", "CONST", "VOID", "STRUCT", "UNION", "ENUM", "THREEDOTS", "SIGNED", "UNSIGNED", "LONG", "SHORT", "INT", "FLOAT", "DOUBLE", "CHAR", "TOKEN", "NUMBER", - "TYPETOKEN", "ARRAY_DIM", "SINGLE_CHAR", "CCODE", "HTCODE", "PHCODE", - "HCODE", "ACODE", "ATCODE", "STRING", "PUBLIC", "PRIVATE", "PROTECTED", - "CLASSWIDE", "PROPERTY", "ARGUMENT", "VIRTUAL", "SIGNAL", "OVERRIDE", - "NICK", "BLURB", "MAXIMUM", "MINIMUM", "DEFAULT_VALUE", "ERROR", "FLAGS", - "TYPE", "FLAGS_TYPE", "ENUM_TYPE", "PARAM_TYPE", "BOXED_TYPE", - "OBJECT_TYPE", "'{'", "'}'", "'('", "')'", "';'", "'='", "','", "'|'", - "'*'", "'>'", "'<'", "'!'", "'-'", "$accept", "prog", "ccode", "ccodes", - "class", "classdec", "classflags", "classcode", "thing", "scope", - "destructor", "initializer", "varoptions", "variable", "argument", - "export", "property", "param_spec", "param_spec_list", "string", - "anyval", "param_spec_value", "argtype", "flags", "flaglist", "type", - "specifier_list", "spec_list", "specifier", "strunionenum", "pointer", - "simplesigtype", "fullsigtype", "sigtype", "tokenlist", "codenocode", - "method", "returnvals", "retcode", "funcargs", "arglist", "arglist1", - "arg", "checklist", "check", "enumcode", "enumvals", "enumval", - "flagcode", "flagvals", "errorcode", "errorvals", "numtok", 0 + "TYPETOKEN", "ARRAY_DIM", "SINGLE_CHAR", "CCODE", "ADCODE", "HTCODE", + "PHCODE", "HCODE", "ACODE", "ATCODE", "STRING", "PUBLIC", "PRIVATE", + "PROTECTED", "CLASSWIDE", "PROPERTY", "ARGUMENT", "VIRTUAL", "SIGNAL", + "OVERRIDE", "NICK", "BLURB", "MAXIMUM", "MINIMUM", "DEFAULT_VALUE", + "ERROR", "FLAGS", "TYPE", "FLAGS_TYPE", "ENUM_TYPE", "PARAM_TYPE", + "BOXED_TYPE", "OBJECT_TYPE", "'{'", "'}'", "'('", "')'", "';'", "'='", + "','", "'|'", "'*'", "'>'", "'<'", "'!'", "'-'", "$accept", "prog", + "ccode", "ccodes", "class", "classdec", "classflags", "classcode", + "thing", "scope", "destructor", "initializer", "varoptions", "variable", + "argument", "export", "property", "param_spec", "param_spec_list", + "string", "anyval", "param_spec_value", "argtype", "flags", "flaglist", + "type", "specifier_list", "spec_list", "specifier", "strunionenum", + "pointer", "simplesigtype", "fullsigtype", "sigtype", "tokenlist", + "codenocode", "method", "methodmods", "retcode", "funcargs", "arglist", + "arglist1", "arg", "checklist", "check", "enumcode", "enumvals", + "enumval", "flagcode", "flagvals", "errorcode", "errorvals", "numtok", 0 }; #endif @@ -1300,59 +1313,59 @@ static const yytype_uint16 yytoknum[] = 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 123, 125, 40, 41, 59, 61, 44, - 124, 42, 62, 60, 33, 45 + 305, 306, 307, 308, 123, 125, 40, 41, 59, 61, + 44, 124, 42, 62, 60, 33, 45 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 66, 67, 67, 67, 67, 68, 68, 68, 68, - 68, 68, 69, 69, 69, 69, 69, 69, 69, 69, - 70, 70, 71, 72, 72, 72, 72, 72, 72, 72, - 72, 72, 73, 73, 74, 74, 74, 74, 74, 74, - 74, 75, 75, 75, 75, 76, 76, 77, 77, 78, - 78, 78, 78, 78, 78, 79, 79, 80, 80, 80, - 81, 81, 82, 82, 82, 83, 83, 84, 84, 85, - 85, 86, 86, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 88, 88, 89, 89, 90, 90, 91, 91, 92, - 92, 92, 92, 92, 92, 92, 93, 93, 93, 93, - 93, 93, 93, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 95, 95, 95, 96, 96, 96, 96, 97, - 97, 98, 98, 98, 98, 99, 100, 100, 101, 101, - 102, 102, 102, 102, 102, 102, 102, 102, 103, 103, - 103, 104, 104, 105, 105, 105, 105, 105, 105, 105, - 105, 106, 106, 107, 107, 108, 108, 108, 108, 109, - 109, 110, 110, 110, 110, 110, 110, 110, 111, 111, + 0, 67, 68, 68, 68, 68, 69, 69, 69, 69, + 69, 69, 69, 70, 70, 70, 70, 70, 70, 70, + 70, 71, 71, 72, 73, 73, 73, 73, 73, 73, + 73, 73, 73, 74, 74, 75, 75, 75, 75, 75, + 75, 75, 76, 76, 76, 76, 77, 77, 78, 78, + 79, 79, 79, 79, 79, 79, 80, 80, 81, 81, + 81, 82, 82, 83, 83, 83, 84, 84, 85, 85, + 86, 86, 87, 87, 88, 88, 88, 88, 88, 88, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 88, 89, 89, 90, 90, 91, 91, 92, 92, + 93, 93, 93, 93, 93, 93, 93, 94, 94, 94, + 94, 94, 94, 94, 95, 95, 95, 95, 95, 95, + 95, 95, 95, 96, 96, 96, 97, 97, 97, 97, + 98, 98, 99, 99, 99, 99, 100, 101, 101, 102, + 102, 103, 103, 103, 103, 103, 103, 103, 103, 104, + 104, 104, 104, 105, 105, 106, 106, 106, 106, 106, + 106, 106, 106, 107, 107, 108, 108, 109, 109, 109, + 109, 110, 110, 111, 111, 111, 111, 111, 111, 111, 112, 112, 113, 113, 114, 114, 115, 115, 116, 116, - 117, 117, 118, 118, 118, 118 + 117, 117, 118, 118, 119, 119, 119, 119 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 3, 2, 2, 1, 1, 1, 1, 1, - 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, - 4, 3, 5, 0, 4, 5, 5, 5, 6, 7, - 6, 7, 2, 1, 1, 2, 3, 1, 1, 1, - 1, 1, 1, 1, 1, 2, 3, 2, 3, 2, - 2, 1, 1, 1, 0, 5, 6, 12, 9, 6, - 3, 0, 11, 8, 5, 3, 0, 3, 1, 1, - 4, 1, 1, 3, 3, 3, 3, 3, 3, 3, + 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, + 1, 4, 3, 5, 0, 4, 5, 5, 5, 6, + 7, 6, 7, 2, 1, 1, 2, 3, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 3, 2, 3, + 2, 2, 1, 1, 1, 0, 5, 6, 12, 9, + 6, 3, 0, 11, 8, 5, 3, 0, 3, 1, + 1, 4, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 1, 5, 1, 3, 0, 3, 1, 2, 1, 1, - 1, 2, 2, 2, 3, 3, 2, 2, 2, 1, - 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 2, 3, 2, - 1, 3, 3, 2, 1, 4, 3, 1, 2, 1, - 10, 11, 9, 9, 8, 11, 8, 5, 2, 4, - 0, 1, 2, 1, 1, 2, 2, 3, 4, 4, - 1, 3, 1, 3, 1, 2, 3, 6, 7, 2, - 1, 1, 2, 2, 3, 3, 3, 3, 7, 8, - 3, 1, 3, 1, 7, 8, 3, 1, 7, 8, - 3, 1, 1, 2, 1, 1 + 3, 1, 5, 1, 3, 0, 3, 1, 2, 1, + 1, 1, 2, 2, 2, 3, 3, 2, 2, 2, + 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, + 2, 1, 3, 3, 2, 1, 4, 3, 1, 2, + 1, 10, 11, 9, 9, 8, 11, 8, 5, 2, + 4, 6, 0, 1, 2, 1, 1, 2, 2, 3, + 4, 4, 1, 3, 1, 3, 1, 2, 3, 6, + 7, 2, 1, 1, 2, 2, 3, 3, 3, 3, + 7, 8, 3, 1, 3, 1, 7, 8, 3, 1, + 7, 8, 3, 1, 1, 2, 1, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -1360,306 +1373,310 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 0, 0, 0, 6, 8, 9, 7, 10, 11, 0, - 0, 0, 16, 0, 5, 0, 17, 18, 19, 0, - 0, 0, 0, 1, 12, 4, 13, 14, 15, 3, - 0, 0, 0, 0, 0, 2, 0, 41, 42, 43, - 44, 0, 94, 0, 94, 0, 21, 40, 0, 33, - 0, 37, 38, 39, 34, 23, 183, 0, 181, 191, - 0, 187, 0, 0, 0, 0, 0, 35, 0, 0, - 0, 0, 113, 122, 123, 124, 120, 121, 117, 115, - 116, 118, 119, 114, 100, 109, 0, 0, 98, 99, - 111, 0, 0, 0, 20, 32, 0, 94, 0, 0, - 22, 0, 0, 0, 0, 0, 0, 0, 36, 0, - 0, 66, 96, 0, 92, 0, 0, 101, 108, 0, - 102, 110, 107, 0, 0, 125, 97, 112, 106, 103, - 0, 0, 134, 0, 130, 0, 0, 0, 54, 0, - 195, 192, 194, 0, 182, 0, 0, 180, 0, 190, - 0, 0, 186, 0, 0, 0, 0, 0, 0, 93, - 0, 61, 104, 0, 0, 126, 127, 105, 0, 0, - 0, 129, 0, 133, 0, 0, 0, 0, 0, 53, - 54, 0, 0, 52, 51, 0, 0, 0, 0, 0, - 23, 193, 178, 0, 188, 0, 184, 0, 0, 139, - 147, 90, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 68, 0, 64, 95, 0, - 0, 0, 0, 0, 113, 100, 0, 0, 160, 162, - 164, 128, 137, 0, 132, 131, 0, 0, 0, 0, - 45, 0, 0, 0, 0, 47, 49, 0, 50, 55, - 0, 23, 23, 23, 0, 24, 179, 189, 185, 138, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 65, 0, 0, 0, 0, 59, 0, 101, - 102, 0, 165, 150, 0, 135, 0, 0, 0, 0, - 0, 46, 56, 150, 48, 0, 23, 25, 27, 26, - 0, 23, 0, 69, 73, 74, 75, 76, 195, 72, - 77, 71, 78, 79, 81, 80, 83, 82, 85, 84, - 87, 86, 89, 88, 67, 0, 91, 60, 0, 150, - 0, 0, 157, 166, 0, 0, 0, 161, 163, 136, - 0, 0, 150, 0, 0, 23, 30, 23, 28, 0, - 0, 63, 0, 0, 159, 158, 0, 0, 0, 148, - 151, 144, 150, 0, 0, 0, 146, 31, 29, 0, - 0, 0, 58, 142, 0, 171, 0, 0, 0, 0, - 0, 170, 152, 0, 0, 150, 143, 150, 70, 0, - 0, 0, 0, 0, 172, 0, 173, 0, 167, 169, - 149, 140, 0, 0, 62, 0, 168, 176, 174, 175, - 177, 145, 141, 57 + 0, 0, 0, 6, 7, 9, 10, 8, 11, 12, + 0, 0, 0, 17, 0, 5, 0, 18, 19, 20, + 0, 0, 0, 0, 1, 13, 4, 14, 15, 16, + 3, 0, 0, 0, 0, 0, 2, 0, 42, 43, + 44, 45, 0, 95, 0, 95, 0, 22, 41, 0, + 34, 0, 38, 39, 40, 35, 24, 185, 0, 183, + 193, 0, 189, 0, 0, 0, 0, 0, 36, 0, + 0, 0, 0, 114, 123, 124, 125, 121, 122, 118, + 116, 117, 119, 120, 115, 101, 110, 0, 0, 99, + 100, 112, 0, 0, 0, 21, 33, 0, 95, 0, + 0, 23, 0, 0, 0, 0, 0, 0, 0, 37, + 0, 0, 67, 97, 0, 93, 0, 0, 102, 109, + 0, 103, 111, 108, 0, 0, 126, 98, 113, 107, + 104, 0, 0, 135, 0, 131, 0, 0, 0, 55, + 0, 197, 194, 196, 0, 184, 0, 0, 182, 0, + 192, 0, 0, 188, 0, 0, 0, 0, 0, 0, + 94, 0, 62, 105, 0, 0, 127, 128, 106, 0, + 0, 0, 130, 0, 134, 0, 0, 0, 0, 0, + 54, 55, 0, 0, 53, 52, 0, 0, 0, 0, + 0, 24, 195, 180, 0, 190, 0, 186, 0, 0, + 140, 148, 91, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 69, 0, 65, 96, + 0, 0, 0, 0, 0, 114, 101, 0, 0, 162, + 164, 166, 129, 138, 0, 133, 132, 0, 0, 0, + 0, 46, 0, 0, 0, 0, 48, 50, 0, 51, + 56, 0, 24, 24, 24, 0, 25, 181, 191, 187, + 139, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 66, 0, 0, 0, 0, 60, 0, + 102, 103, 0, 167, 152, 0, 136, 0, 0, 0, + 0, 0, 47, 57, 152, 49, 0, 24, 26, 28, + 27, 0, 24, 0, 70, 74, 75, 76, 77, 197, + 73, 78, 72, 79, 80, 82, 81, 84, 83, 86, + 85, 88, 87, 90, 89, 68, 0, 92, 61, 0, + 152, 0, 0, 159, 168, 0, 0, 0, 163, 165, + 137, 0, 0, 152, 0, 0, 24, 31, 24, 29, + 0, 0, 64, 0, 0, 161, 160, 0, 0, 0, + 149, 153, 145, 152, 0, 0, 0, 147, 32, 30, + 0, 0, 0, 59, 143, 0, 173, 0, 0, 0, + 0, 0, 172, 154, 0, 0, 152, 144, 152, 71, + 0, 0, 0, 0, 0, 174, 0, 175, 0, 169, + 171, 150, 141, 0, 0, 63, 0, 170, 178, 176, + 177, 179, 0, 146, 142, 58, 151 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 11, 12, 13, 14, 15, 100, 48, 49, 50, - 183, 184, 185, 51, 52, 221, 53, 157, 214, 304, - 310, 215, 115, 70, 113, 226, 88, 89, 90, 91, - 126, 132, 133, 134, 233, 200, 54, 336, 359, 227, - 228, 229, 230, 380, 381, 16, 57, 58, 17, 62, - 18, 60, 360 + -1, 12, 13, 14, 15, 16, 101, 49, 50, 51, + 184, 185, 186, 52, 53, 222, 54, 158, 215, 305, + 311, 216, 116, 71, 114, 227, 89, 90, 91, 92, + 127, 133, 134, 135, 234, 201, 55, 337, 360, 228, + 229, 230, 231, 381, 382, 17, 58, 59, 18, 63, + 19, 61, 361 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -325 +#define YYPACT_NINF -326 static const yytype_int16 yypact[] = { - 144, -5, 92, -325, -325, -325, -325, -325, -325, 98, - 99, 123, -325, 144, 167, 78, -325, -325, -325, 161, - 121, 154, 182, -325, -325, 167, -325, -325, -325, 167, - 148, 179, 217, 227, 228, 167, 211, -325, -325, -325, - -325, 237, 229, 326, 229, 234, -325, -325, 184, -325, - 292, -325, -325, -325, -325, 263, 261, -31, -325, -325, - 147, -325, 174, 268, 283, 309, 292, -325, 317, 330, - 331, 373, -325, -325, -325, -325, -325, -325, -325, -325, - -325, -325, -325, -325, 346, 441, 390, 333, 294, -325, - 455, 334, 293, 335, -325, -325, 390, 229, 357, 364, - -325, 75, 372, 38, 379, 50, 389, 95, -325, 298, - 398, 393, 367, 378, 394, 425, 469, -325, -325, 431, - -325, 469, -325, 432, 408, 5, -325, 469, -325, 459, - 220, 446, -325, 390, -325, 421, 460, 470, 156, 178, - -325, -325, -325, 458, -325, 434, 467, -325, 435, -325, - 472, 437, -325, 474, 202, 442, 221, 39, 330, -325, - 477, 443, -325, 444, 407, 294, -325, -325, 445, 482, - 483, -325, -6, -325, 484, 390, 449, -6, 390, 101, - 31, 407, 15, 447, 487, 450, -15, 452, 453, 480, - 263, -325, -325, 454, -325, 456, -325, 457, 488, -325, - -325, -325, 461, 462, 463, 464, 465, 466, 468, 471, - 473, 475, 476, 478, -23, -325, 479, -325, -325, 390, - 496, 497, 407, 424, 481, 14, 498, 485, -325, 486, - -325, -325, -325, 201, -325, -325, 489, 499, 407, 506, - -325, 503, 490, 492, 504, -325, -325, 101, -325, -325, - 100, 263, 263, 263, 104, -325, -325, -325, -325, -325, - 2, 2, 75, 75, 7, 330, 390, 208, 266, 269, - 274, 327, -325, 221, 511, 493, 494, 500, 495, 222, - 223, 390, 87, 519, 356, -325, 520, 407, 491, 501, - 505, -325, -325, 519, -325, 502, 263, -325, -325, -325, - 507, 263, 509, -325, -325, -325, -325, -325, 509, -325, - -325, -325, -325, -325, -325, -325, -325, -325, -325, -325, - -325, -325, -325, -325, -325, 58, -325, -325, 516, 519, - 390, 390, -325, 510, 523, 32, 202, -325, -325, -325, - 512, 407, 519, 407, 202, 263, -325, 263, -325, 513, - 508, -325, 71, 202, -325, -325, 533, 88, 530, 536, - -325, -325, 519, 514, 202, 515, -325, -325, -325, 517, - 532, 521, -325, -325, 88, -325, 518, 64, 83, 522, - 63, -325, -325, 32, 202, 519, -325, 519, -325, 524, - 535, 81, 75, 75, -325, 75, -325, 75, -325, -325, - -325, -325, 202, 202, -325, 525, -325, -325, -325, -325, - -325, -325, -325, -325 + 145, 13, 77, -326, -326, -326, -326, -326, -326, -326, + 108, 196, 146, -326, 145, 205, 168, -326, -326, -326, + 264, 173, 221, 232, -326, -326, 205, -326, -326, -326, + 205, 161, 259, 276, 283, 301, 205, 222, -326, -326, + -326, -326, 309, 273, 327, 273, 281, -326, -326, 170, + -326, 292, -326, -326, -326, -326, 291, 290, -27, -326, + -326, 40, -326, 127, 294, 250, 332, 292, -326, 333, + 334, 335, 375, -326, -326, -326, -326, -326, -326, -326, + -326, -326, -326, -326, -326, 350, 443, 392, 337, 295, + -326, 457, 339, 239, 357, -326, -326, 392, 273, 366, + 376, -326, 27, 381, 71, 391, 95, 398, 124, -326, + 372, 417, 390, 389, 394, 396, 434, 471, -326, -326, + 446, -326, 471, -326, 447, 411, 4, -326, 471, -326, + 474, 231, 461, -326, 392, -326, 424, 472, 475, 122, + 192, -326, -326, -326, 470, -326, 435, 476, -326, 437, + -326, 477, 438, -326, 478, 163, 444, 274, 0, 334, + -326, 482, 448, -326, 449, 409, 295, -326, -326, 450, + 483, 484, -326, 6, -326, 488, 392, 452, 6, 392, + 64, 38, 409, 32, 451, 490, 453, 80, 455, 456, + 485, 291, -326, -326, 459, -326, 460, -326, 462, 491, + -326, -326, -326, 463, 464, 465, 466, 467, 468, 469, + 473, 479, 480, 481, 486, -30, -326, 487, -326, -326, + 392, 495, 500, 409, 426, 489, 11, 502, 492, -326, + 493, -326, -326, -326, 126, -326, -326, 494, 510, 409, + 511, -326, 507, 496, 498, 509, -326, -326, 64, -326, + -326, 187, 291, 291, 291, 189, -326, -326, -326, -326, + -326, 85, 85, 27, 27, 18, 334, 392, -6, 219, + 226, 260, 293, -326, 274, 512, 499, 501, 497, 503, + 128, 179, 392, 100, 515, 358, -326, 516, 409, 505, + 506, 508, -326, -326, 515, -326, 513, 291, -326, -326, + -326, 514, 291, 517, -326, -326, -326, -326, -326, 517, + -326, -326, -326, -326, -326, -326, -326, -326, -326, -326, + -326, -326, -326, -326, -326, -326, 12, -326, -326, 518, + 515, 392, 392, -326, 519, 524, 69, 163, -326, -326, + -326, 520, 409, 515, 409, 163, 291, -326, 291, -326, + 521, 522, -326, 61, 163, -326, -326, 525, 66, 523, + 529, -326, -326, 515, 526, 163, 527, -326, -326, -326, + 528, 533, 532, -326, -326, 66, -326, 530, 83, 101, + 531, 75, -326, -326, 69, 163, 515, -326, 515, -326, + 504, 535, 88, 27, 27, -326, 27, -326, 27, -326, + -326, 546, -326, 163, 163, -326, 534, -326, -326, -326, + -326, -326, 69, -326, -326, -326, -326 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -325, -325, 103, 110, 549, -325, -188, -325, 527, -25, - 382, 347, 387, -325, -325, -325, -325, -325, -325, 22, - -325, 296, -325, -35, -153, -42, -325, -68, -325, -65, - -94, 440, -325, -84, -325, -324, -22, -286, 189, -177, - -256, -325, 295, 204, -154, 175, -325, 526, 196, -325, - 245, -325, -101 + -326, -326, -4, 102, 552, -326, -189, -326, 538, -26, + 352, 383, 387, -326, -326, -326, -326, -326, -326, 5, + -326, 298, -326, -24, -154, -43, -326, -69, -326, -66, + -57, 431, -326, -96, -326, -325, -23, -287, -297, -178, + -259, -326, 289, 203, -216, 154, -326, 536, 212, -326, + 223, -326, -102 }; /* 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 -157 +#define YYTABLE_NINF -159 static const yytype_int16 yytable[] = { - 144, 87, 255, 118, 243, 218, 119, 344, 98, 92, - 165, 66, 361, 168, 67, 250, 19, 122, 86, 280, - 366, 302, 128, 102, 110, 332, 308, 141, 103, 373, - 142, 166, 303, 272, 140, 141, 273, 303, 142, 66, - 386, 251, 108, 353, 123, 278, 171, 173, 118, 169, - 179, 140, 141, 118, 136, 142, 364, 56, 216, 118, - 401, 289, 137, 297, 298, 299, 125, 131, 244, 149, - -154, 231, 143, 281, 354, 355, 384, 350, 411, 412, - 143, 245, 375, 140, 141, 358, 234, 142, 235, 182, - 371, 174, 146, 171, 140, 141, 217, 143, 142, 402, - 375, 403, 140, 141, 150, 170, 142, 375, 346, 333, - 340, 20, 312, 348, 152, 351, 24, 21, 22, 398, - 240, 376, 393, 23, 29, 377, 378, 379, 372, 143, - 295, 30, 24, 237, 300, 35, 239, 406, 24, 376, - 143, 395, 334, 377, 378, 379, 376, 1, 143, 153, - 377, 378, 379, 2, 241, 118, 296, 367, 119, 368, - 301, 306, 307, 311, 363, 31, 365, 36, 3, 4, - 5, 6, 7, 8, 32, 179, 2, 275, 180, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 26, 9, - 10, 3, 4, 5, 6, 7, 8, 186, 187, 188, - 55, 104, 46, 36, 26, 47, 105, 33, 189, 27, - 26, 181, 9, 10, 182, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 313, 27, 399, 314, 106, 315, - 63, 27, 64, 107, 190, 34, 56, 399, 94, 168, - 201, 47, 37, 38, 39, 40, 59, 61, 43, 44, - 45, 37, 38, 39, 40, 198, 68, 285, 28, 199, - 286, 202, 203, 204, 205, 206, 65, 207, 208, 209, - 210, 211, 212, 213, 28, 169, 394, 396, -156, -155, - 28, 330, 331, 305, 69, 316, 309, 317, 318, 93, - 319, 407, 408, 320, 409, 321, 410, 71, 72, 73, - 74, 75, 63, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 130, 85, 37, 38, 39, 40, 99, 101, - 43, 44, 45, 65, 37, 38, 39, 40, 109, 96, - 97, 71, 72, 73, 74, 75, 111, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 322, 85, 323, 112, - 114, 120, 124, 129, 154, 125, 135, 37, 38, 39, - 40, 71, 72, 73, 74, 75, 337, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 138, 85, 116, 72, - 73, 74, 75, 139, 76, 77, 78, 79, 80, 81, - 82, 83, 117, 145, 85, 71, 72, 73, 74, 75, - 148, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 151, 85, 223, 224, 73, 74, 75, 155, 76, 77, - 78, 79, 80, 81, 82, 83, 225, 158, 85, 116, - 72, 73, 74, 75, 159, 76, 77, 78, 79, 80, - 81, 82, 83, 279, 161, 85, 121, 72, 156, 160, - 162, 163, 76, 77, 78, 79, 80, 81, 82, 83, - 127, 72, 85, 164, 167, 172, 76, 77, 78, 79, - 80, 81, 82, 83, 116, 72, 85, 175, 191, 176, - 76, 77, 78, 79, 80, 81, 82, 83, 193, 177, - 85, 192, 194, 195, 196, 197, 219, 181, 220, 222, - 169, 232, 168, 236, 238, 182, 247, 249, 252, 253, - 254, 256, 259, 257, 258, 276, 277, 282, 288, 260, - 261, 262, 263, 264, 265, 290, 266, 291, 294, 267, - 246, 268, 274, 269, 270, 325, 271, -153, 335, 339, - 352, 283, 357, 369, 287, 284, 341, 292, 293, 326, - 327, 329, 374, 328, 382, 383, 389, 342, 345, 405, - 343, 370, 25, 347, 349, 356, 248, 242, 362, 324, - 385, 387, 400, 388, 390, 95, 392, 178, 391, 338, - 397, 404, 413, 0, 0, 0, 0, 0, 0, 0, + 145, 88, 256, 119, 244, 219, 120, 345, 99, 166, + 25, 67, 362, 315, 68, 316, 281, 123, 87, 217, + 367, 93, 129, 333, 111, 169, 25, 273, 103, 374, + 274, 351, 25, 104, 20, 172, 174, 309, 142, 67, + 387, 143, 109, 354, 124, 279, 141, 142, 119, 304, + 143, 141, 142, 119, 137, 143, 365, 180, 218, 119, + 402, 290, 170, 298, 299, 300, 126, 132, -156, 167, + 352, 282, 355, 356, 138, 235, 385, 236, 413, 414, + 372, 246, 172, 241, 144, 376, 245, 401, 141, 142, + 57, 175, 143, 144, 376, 105, 21, 183, 144, 403, + 106, 404, 141, 142, 303, 171, 143, 376, 347, 232, + 341, 251, 313, 349, 150, 416, 304, 30, 242, 373, + 141, 142, 334, 359, 143, 377, 147, 22, 36, 378, + 379, 380, 399, 238, 377, 144, 240, 252, 378, 379, + 380, 180, 394, 153, 181, 407, 24, 377, 1, 144, + 151, 378, 379, 380, 2, 119, 335, 368, 120, 369, + 396, 307, 308, 312, 364, 400, 366, 144, 27, 3, + 4, 5, 6, 7, 8, 9, 400, 276, 182, 154, + 37, 183, 107, 286, 27, -158, 287, 108, 331, 37, + 27, 10, 11, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 187, 188, 189, 2, 23, 47, 199, 296, 48, + 301, 200, 31, 190, 314, 95, 28, 33, 48, 3, + 4, 5, 6, 7, 8, 9, -157, 29, 317, 332, + 318, 64, 28, 65, 297, 319, 302, 320, 28, 191, + 169, 10, 11, 29, 38, 39, 40, 41, 131, 29, + 44, 45, 46, 38, 39, 40, 41, 306, 32, 64, + 310, 38, 39, 40, 41, 34, 395, 397, 66, 321, + 56, 322, 38, 39, 40, 41, 35, 170, 44, 45, + 46, 408, 409, 202, 410, 57, 411, 72, 73, 74, + 75, 76, 60, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 323, 86, 324, 203, 204, 205, 206, 207, + 62, 208, 209, 210, 211, 212, 213, 214, 69, 70, + 97, 98, 72, 73, 74, 75, 76, 94, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 100, 86, 102, + 66, 110, 112, 113, 115, 121, 125, 126, 130, 38, + 39, 40, 41, 72, 73, 74, 75, 76, 338, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 136, 86, + 117, 73, 74, 75, 76, 139, 77, 78, 79, 80, + 81, 82, 83, 84, 118, 140, 86, 72, 73, 74, + 75, 76, 146, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 149, 86, 224, 225, 74, 75, 76, 152, + 77, 78, 79, 80, 81, 82, 83, 84, 226, 155, + 86, 117, 73, 74, 75, 76, 156, 77, 78, 79, + 80, 81, 82, 83, 84, 280, 157, 86, 122, 73, + 159, 160, 161, 162, 77, 78, 79, 80, 81, 82, + 83, 84, 128, 73, 86, 163, 164, 165, 77, 78, + 79, 80, 81, 82, 83, 84, 117, 73, 86, 168, + 173, 176, 77, 78, 79, 80, 81, 82, 83, 84, + 192, 177, 86, 193, 178, 195, 197, 194, 196, 198, + 182, 220, 233, 169, 221, 223, 170, 237, 239, 248, + 183, 250, 253, 254, 277, 260, 255, 257, 258, 278, + 259, 283, 261, 262, 263, 264, 265, 266, 267, 289, + 291, 292, 268, 295, 336, 340, 326, 249, 269, 270, + 271, 275, 353, 358, 375, 272, -155, 383, 384, 284, + 288, 329, 370, 285, 293, 294, 327, 390, 328, 406, + 330, 342, 405, 343, 344, 412, 26, 247, 243, 179, + 346, 348, 325, 350, 339, 357, 371, 363, 392, 0, + 0, 0, 0, 386, 388, 389, 391, 96, 0, 393, + 398, 0, 415, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 147 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 148 }; static const yytype_int16 yycheck[] = { - 101, 43, 190, 71, 181, 158, 71, 293, 50, 44, - 5, 36, 336, 19, 36, 30, 21, 85, 43, 5, - 344, 19, 90, 54, 66, 281, 19, 20, 59, 353, - 23, 125, 30, 56, 19, 20, 59, 30, 23, 64, - 364, 56, 64, 329, 86, 222, 130, 131, 116, 55, - 19, 19, 20, 121, 96, 23, 342, 19, 19, 127, - 384, 238, 97, 251, 252, 253, 61, 92, 53, 19, - 56, 165, 65, 59, 330, 331, 362, 19, 402, 403, - 65, 182, 19, 19, 20, 53, 170, 23, 172, 58, - 19, 133, 54, 177, 19, 20, 57, 65, 23, 385, - 19, 387, 19, 20, 54, 130, 23, 19, 296, 22, - 287, 19, 265, 301, 19, 57, 13, 19, 19, 56, - 19, 58, 58, 0, 14, 62, 63, 64, 57, 65, - 30, 53, 29, 175, 30, 25, 178, 56, 35, 58, - 65, 58, 55, 62, 63, 64, 58, 3, 65, 54, - 62, 63, 64, 9, 53, 223, 56, 345, 223, 347, - 56, 262, 263, 264, 341, 4, 343, 19, 24, 25, - 26, 27, 28, 29, 53, 19, 9, 219, 22, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 13, 45, - 46, 24, 25, 26, 27, 28, 29, 19, 20, 21, - 21, 54, 54, 19, 29, 57, 59, 53, 30, 13, - 35, 55, 45, 46, 58, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 266, 29, 380, 19, 54, 21, - 19, 35, 21, 59, 56, 53, 19, 391, 54, 19, - 19, 57, 31, 32, 33, 34, 19, 19, 37, 38, - 39, 31, 32, 33, 34, 53, 19, 56, 13, 57, - 59, 40, 41, 42, 43, 44, 55, 46, 47, 48, - 49, 50, 51, 52, 29, 55, 377, 378, 56, 56, - 35, 59, 59, 261, 55, 19, 264, 21, 19, 55, - 21, 392, 393, 19, 395, 21, 397, 5, 6, 7, + 102, 44, 191, 72, 182, 159, 72, 294, 51, 5, + 14, 37, 337, 19, 37, 21, 5, 86, 44, 19, + 345, 45, 91, 282, 67, 19, 30, 57, 55, 354, + 60, 19, 36, 60, 21, 131, 132, 19, 20, 65, + 365, 23, 65, 330, 87, 223, 19, 20, 117, 31, + 23, 19, 20, 122, 97, 23, 343, 19, 58, 128, + 385, 239, 56, 252, 253, 254, 62, 93, 57, 126, + 58, 60, 331, 332, 98, 171, 363, 173, 403, 404, + 19, 183, 178, 19, 66, 19, 54, 384, 19, 20, + 19, 134, 23, 66, 19, 55, 19, 59, 66, 386, + 60, 388, 19, 20, 19, 131, 23, 19, 297, 166, + 288, 31, 266, 302, 19, 412, 31, 15, 54, 58, + 19, 20, 22, 54, 23, 59, 55, 19, 26, 63, + 64, 65, 57, 176, 59, 66, 179, 57, 63, 64, + 65, 19, 59, 19, 22, 57, 0, 59, 3, 66, + 55, 63, 64, 65, 9, 224, 56, 346, 224, 348, + 59, 263, 264, 265, 342, 381, 344, 66, 14, 24, + 25, 26, 27, 28, 29, 30, 392, 220, 56, 55, + 19, 59, 55, 57, 30, 57, 60, 60, 60, 19, + 36, 46, 47, 32, 33, 34, 35, 36, 37, 38, + 39, 40, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 19, 20, 21, 9, 19, 55, 54, 31, 58, + 31, 58, 54, 31, 267, 55, 14, 54, 58, 24, + 25, 26, 27, 28, 29, 30, 57, 14, 19, 60, + 21, 19, 30, 21, 57, 19, 57, 21, 36, 57, + 19, 46, 47, 30, 32, 33, 34, 35, 19, 36, + 38, 39, 40, 32, 33, 34, 35, 262, 4, 19, + 265, 32, 33, 34, 35, 54, 378, 379, 56, 19, + 21, 21, 32, 33, 34, 35, 54, 56, 38, 39, + 40, 393, 394, 19, 396, 19, 398, 5, 6, 7, 8, 9, 19, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 19, 21, 31, 32, 33, 34, 55, 58, - 37, 38, 39, 55, 31, 32, 33, 34, 19, 37, - 38, 5, 6, 7, 8, 9, 19, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 19, 21, 21, 19, - 19, 5, 19, 19, 56, 61, 21, 31, 32, 33, - 34, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 19, 21, 5, 6, - 7, 8, 9, 19, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 21, 21, 5, 6, 7, 8, 9, - 21, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 21, 21, 5, 6, 7, 8, 9, 19, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 60, 21, 5, - 6, 7, 8, 9, 56, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 19, 21, 5, 6, 55, 55, - 19, 19, 11, 12, 13, 14, 15, 16, 17, 18, - 5, 6, 21, 55, 5, 19, 11, 12, 13, 14, - 15, 16, 17, 18, 5, 6, 21, 56, 20, 19, - 11, 12, 13, 14, 15, 16, 17, 18, 21, 19, - 21, 57, 57, 21, 57, 21, 19, 55, 55, 55, - 55, 19, 19, 19, 55, 58, 19, 57, 56, 56, - 30, 57, 24, 57, 57, 19, 19, 19, 19, 58, - 58, 58, 58, 58, 58, 19, 58, 24, 24, 58, - 183, 58, 53, 58, 58, 24, 58, 56, 19, 19, - 24, 56, 19, 30, 55, 59, 55, 57, 56, 56, - 56, 56, 19, 53, 24, 19, 24, 56, 56, 24, - 55, 53, 13, 56, 55, 55, 184, 180, 56, 273, - 56, 56, 383, 56, 53, 48, 58, 137, 374, 284, - 58, 57, 57, -1, -1, -1, -1, -1, -1, -1, + 18, 19, 19, 21, 21, 41, 42, 43, 44, 45, + 19, 47, 48, 49, 50, 51, 52, 53, 19, 56, + 38, 39, 5, 6, 7, 8, 9, 56, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 56, 21, 59, + 56, 19, 19, 19, 19, 5, 19, 62, 19, 32, + 33, 34, 35, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 21, 21, + 5, 6, 7, 8, 9, 19, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 19, 21, 5, 6, 7, + 8, 9, 21, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 21, 21, 5, 6, 7, 8, 9, 21, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 57, + 21, 5, 6, 7, 8, 9, 19, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 56, 21, 5, 6, + 61, 57, 56, 19, 11, 12, 13, 14, 15, 16, + 17, 18, 5, 6, 21, 19, 19, 56, 11, 12, + 13, 14, 15, 16, 17, 18, 5, 6, 21, 5, + 19, 57, 11, 12, 13, 14, 15, 16, 17, 18, + 20, 19, 21, 58, 19, 58, 58, 21, 21, 21, + 56, 19, 19, 19, 56, 56, 56, 19, 56, 19, + 59, 58, 57, 57, 19, 24, 31, 58, 58, 19, + 58, 19, 59, 59, 59, 59, 59, 59, 59, 19, + 19, 24, 59, 24, 19, 19, 24, 185, 59, 59, + 59, 54, 24, 19, 19, 59, 57, 24, 19, 57, + 56, 54, 31, 60, 58, 57, 57, 24, 57, 24, + 57, 56, 58, 57, 56, 19, 14, 184, 181, 138, + 57, 57, 274, 56, 285, 56, 54, 57, 375, -1, + -1, -1, -1, 57, 57, 57, 54, 49, -1, 59, + 59, -1, 58, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 103 + 104 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 3, 9, 24, 25, 26, 27, 28, 29, 45, - 46, 67, 68, 69, 70, 71, 111, 114, 116, 21, - 19, 19, 19, 0, 68, 70, 111, 114, 116, 69, - 53, 4, 53, 53, 53, 69, 19, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 54, 57, 73, 74, - 75, 79, 80, 82, 102, 21, 19, 112, 113, 19, - 117, 19, 115, 19, 21, 55, 75, 102, 19, 55, - 89, 5, 6, 7, 8, 9, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 21, 75, 91, 92, 93, - 94, 95, 89, 55, 54, 74, 37, 38, 91, 55, - 72, 58, 54, 59, 54, 59, 54, 59, 102, 19, - 91, 19, 19, 90, 19, 88, 5, 19, 93, 95, - 5, 5, 93, 91, 19, 61, 96, 5, 93, 19, - 19, 75, 97, 98, 99, 21, 91, 89, 19, 19, - 19, 20, 23, 65, 118, 21, 54, 113, 21, 19, - 54, 21, 19, 54, 56, 19, 55, 83, 60, 56, - 55, 19, 19, 19, 55, 5, 96, 5, 19, 55, - 75, 99, 19, 99, 91, 56, 19, 19, 97, 19, - 22, 55, 58, 76, 77, 78, 19, 20, 21, 30, - 56, 20, 57, 21, 57, 21, 57, 21, 53, 57, - 101, 19, 40, 41, 42, 43, 44, 46, 47, 48, - 49, 50, 51, 52, 84, 87, 19, 57, 90, 19, - 55, 81, 55, 5, 6, 19, 91, 105, 106, 107, - 108, 96, 19, 100, 99, 99, 19, 91, 55, 91, - 19, 53, 78, 105, 53, 118, 77, 19, 76, 57, - 30, 56, 56, 56, 30, 72, 57, 57, 57, 24, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 56, 59, 53, 91, 19, 19, 105, 19, - 5, 59, 19, 56, 59, 56, 59, 55, 19, 105, - 19, 24, 57, 56, 24, 30, 56, 72, 72, 72, - 30, 56, 19, 30, 85, 85, 118, 118, 19, 85, - 86, 118, 90, 91, 19, 21, 19, 21, 19, 21, - 19, 21, 19, 21, 87, 24, 56, 56, 53, 56, - 59, 59, 106, 22, 55, 19, 103, 10, 108, 19, - 105, 55, 56, 55, 103, 56, 72, 56, 72, 55, - 19, 57, 24, 103, 106, 106, 55, 19, 53, 104, - 118, 101, 56, 105, 103, 105, 101, 72, 72, 30, - 53, 19, 57, 101, 19, 19, 58, 62, 63, 64, - 109, 110, 24, 19, 103, 56, 101, 56, 56, 24, - 53, 109, 58, 58, 118, 58, 118, 58, 56, 110, - 104, 101, 103, 103, 57, 24, 56, 118, 118, 118, - 118, 101, 101, 57 + 0, 3, 9, 24, 25, 26, 27, 28, 29, 30, + 46, 47, 68, 69, 70, 71, 72, 112, 115, 117, + 21, 19, 19, 19, 0, 69, 71, 112, 115, 117, + 70, 54, 4, 54, 54, 54, 70, 19, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 55, 58, 74, + 75, 76, 80, 81, 83, 103, 21, 19, 113, 114, + 19, 118, 19, 116, 19, 21, 56, 76, 103, 19, + 56, 90, 5, 6, 7, 8, 9, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 21, 76, 92, 93, + 94, 95, 96, 90, 56, 55, 75, 38, 39, 92, + 56, 73, 59, 55, 60, 55, 60, 55, 60, 103, + 19, 92, 19, 19, 91, 19, 89, 5, 19, 94, + 96, 5, 5, 94, 92, 19, 62, 97, 5, 94, + 19, 19, 76, 98, 99, 100, 21, 92, 90, 19, + 19, 19, 20, 23, 66, 119, 21, 55, 114, 21, + 19, 55, 21, 19, 55, 57, 19, 56, 84, 61, + 57, 56, 19, 19, 19, 56, 5, 97, 5, 19, + 56, 76, 100, 19, 100, 92, 57, 19, 19, 98, + 19, 22, 56, 59, 77, 78, 79, 19, 20, 21, + 31, 57, 20, 58, 21, 58, 21, 58, 21, 54, + 58, 102, 19, 41, 42, 43, 44, 45, 47, 48, + 49, 50, 51, 52, 53, 85, 88, 19, 58, 91, + 19, 56, 82, 56, 5, 6, 19, 92, 106, 107, + 108, 109, 97, 19, 101, 100, 100, 19, 92, 56, + 92, 19, 54, 79, 106, 54, 119, 78, 19, 77, + 58, 31, 57, 57, 57, 31, 73, 58, 58, 58, + 24, 59, 59, 59, 59, 59, 59, 59, 59, 59, + 59, 59, 59, 57, 60, 54, 92, 19, 19, 106, + 19, 5, 60, 19, 57, 60, 57, 60, 56, 19, + 106, 19, 24, 58, 57, 24, 31, 57, 73, 73, + 73, 31, 57, 19, 31, 86, 86, 119, 119, 19, + 86, 87, 119, 91, 92, 19, 21, 19, 21, 19, + 21, 19, 21, 19, 21, 88, 24, 57, 57, 54, + 57, 60, 60, 107, 22, 56, 19, 104, 10, 109, + 19, 106, 56, 57, 56, 104, 57, 73, 57, 73, + 56, 19, 58, 24, 104, 107, 107, 56, 19, 54, + 105, 119, 102, 57, 106, 104, 106, 102, 73, 73, + 31, 54, 19, 58, 102, 19, 19, 59, 63, 64, + 65, 110, 111, 24, 19, 104, 57, 102, 57, 57, + 24, 54, 110, 59, 59, 119, 59, 119, 59, 57, + 111, 105, 102, 104, 104, 58, 24, 57, 119, 119, + 119, 119, 19, 102, 102, 58, 105 }; #define yyerrok (yyerrstatus = 0) @@ -2474,27 +2491,27 @@ yyreduce: switch (yyn) { case 2: -#line 689 "parse.y" +#line 699 "parse.y" { ; } break; case 3: -#line 690 "parse.y" +#line 700 "parse.y" { ; } break; case 4: -#line 691 "parse.y" +#line 701 "parse.y" { ; } break; case 5: -#line 692 "parse.y" +#line 702 "parse.y" { ; } break; case 6: -#line 695 "parse.y" +#line 705 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", C_CCODE, @@ -2507,10 +2524,10 @@ yyreduce: break; case 7: -#line 704 "parse.y" +#line 714 "parse.y" { Node *node = node_new (CCODE_NODE, - "cctype", H_CCODE, + "cctype", AD_CCODE, "cbuf:steal", ((yyvsp[(1) - (1)].cbuf))->str, "line_no", ccode_line, NULL); @@ -2520,10 +2537,10 @@ yyreduce: break; case 8: -#line 713 "parse.y" +#line 723 "parse.y" { Node *node = node_new (CCODE_NODE, - "cctype", HT_CCODE, + "cctype", H_CCODE, "cbuf:steal", ((yyvsp[(1) - (1)].cbuf))->str, "line_no", ccode_line, NULL); @@ -2533,10 +2550,10 @@ yyreduce: break; case 9: -#line 722 "parse.y" +#line 732 "parse.y" { Node *node = node_new (CCODE_NODE, - "cctype", PH_CCODE, + "cctype", HT_CCODE, "cbuf:steal", ((yyvsp[(1) - (1)].cbuf))->str, "line_no", ccode_line, NULL); @@ -2546,10 +2563,10 @@ yyreduce: break; case 10: -#line 731 "parse.y" +#line 741 "parse.y" { Node *node = node_new (CCODE_NODE, - "cctype", A_CCODE, + "cctype", PH_CCODE, "cbuf:steal", ((yyvsp[(1) - (1)].cbuf))->str, "line_no", ccode_line, NULL); @@ -2559,10 +2576,10 @@ yyreduce: break; case 11: -#line 740 "parse.y" +#line 750 "parse.y" { Node *node = node_new (CCODE_NODE, - "cctype", AT_CCODE, + "cctype", A_CCODE, "cbuf:steal", ((yyvsp[(1) - (1)].cbuf))->str, "line_no", ccode_line, NULL); @@ -2572,47 +2589,60 @@ yyreduce: break; case 12: -#line 751 "parse.y" - { ; } +#line 759 "parse.y" + { + Node *node = node_new (CCODE_NODE, + "cctype", AT_CCODE, + "cbuf:steal", ((yyvsp[(1) - (1)].cbuf))->str, + "line_no", ccode_line, + NULL); + nodes = g_list_append(nodes,node); + g_string_free((yyvsp[(1) - (1)].cbuf),FALSE); + } break; case 13: -#line 752 "parse.y" +#line 770 "parse.y" { ; } break; case 14: -#line 753 "parse.y" +#line 771 "parse.y" { ; } break; case 15: -#line 754 "parse.y" +#line 772 "parse.y" { ; } break; case 16: -#line 755 "parse.y" +#line 773 "parse.y" { ; } break; case 17: -#line 756 "parse.y" +#line 774 "parse.y" { ; } break; case 18: -#line 757 "parse.y" +#line 775 "parse.y" { ; } break; case 19: -#line 758 "parse.y" +#line 776 "parse.y" { ; } break; case 20: -#line 761 "parse.y" +#line 777 "parse.y" + { ; } + break; + + case 21: +#line 780 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -2620,8 +2650,8 @@ yyreduce: } break; - case 21: -#line 766 "parse.y" + case 22: +#line 785 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; @@ -2629,8 +2659,8 @@ yyreduce: } break; - case 22: -#line 773 "parse.y" + case 23: +#line 792 "parse.y" { class = node_new (CLASS_NODE, "otype:steal", (yyvsp[(2) - (5)].id), @@ -2648,8 +2678,8 @@ yyreduce: } break; - case 24: -#line 791 "parse.y" + case 25: +#line 810 "parse.y" { if(strcmp((yyvsp[(2) - (4)].id),"abstract") == 0) { abstract = TRUE; @@ -2660,8 +2690,8 @@ yyreduce: } break; - case 25: -#line 799 "parse.y" + case 26: +#line 818 "parse.y" { if(strcmp((yyvsp[(2) - (5)].id),"chunks") == 0) { g_free (chunk_size); @@ -2676,8 +2706,8 @@ yyreduce: } break; - case 26: -#line 811 "parse.y" + case 27: +#line 830 "parse.y" { if (strcmp ((yyvsp[(2) - (5)].id), "interface") == 0) { interfaces = g_list_append (interfaces, @@ -2689,8 +2719,8 @@ yyreduce: } break; - case 27: -#line 820 "parse.y" + case 28: +#line 839 "parse.y" { if(strcmp((yyvsp[(2) - (5)].id),"chunks") == 0) { g_free (chunk_size); @@ -2705,8 +2735,8 @@ yyreduce: } break; - case 28: -#line 832 "parse.y" + case 29: +#line 851 "parse.y" { if (strcmp ((yyvsp[(2) - (6)].id), "GladeXML") == 0) { glade_xml = TRUE; @@ -2718,8 +2748,8 @@ yyreduce: } break; - case 29: -#line 841 "parse.y" + case 30: +#line 860 "parse.y" { if (strcmp ((yyvsp[(2) - (7)].id), "GladeXML") == 0) { glade_xml = TRUE; @@ -2731,8 +2761,8 @@ yyreduce: } break; - case 30: -#line 850 "parse.y" + case 31: +#line 869 "parse.y" { if (strcmp ((yyvsp[(2) - (6)].id), "GladeXML") == 0) { glade_xml = TRUE; @@ -2744,8 +2774,8 @@ yyreduce: } break; - case 31: -#line 859 "parse.y" + case 32: +#line 878 "parse.y" { if (strcmp ((yyvsp[(2) - (7)].id), "GladeXML") == 0) { glade_xml = TRUE; @@ -2757,23 +2787,23 @@ yyreduce: } break; - case 32: -#line 870 "parse.y" - { ; } - break; - case 33: -#line 871 "parse.y" +#line 889 "parse.y" { ; } break; case 34: -#line 874 "parse.y" +#line 890 "parse.y" { ; } break; case 35: -#line 875 "parse.y" +#line 893 "parse.y" + { ; } + break; + + case 36: +#line 894 "parse.y" { if (strcmp ((yyvsp[(1) - (2)].id), "BonoboObject") != 0) { g_free ((yyvsp[(1) - (2)].id)); @@ -2785,8 +2815,8 @@ yyreduce: } break; - case 36: -#line 884 "parse.y" + case 37: +#line 903 "parse.y" { if (strcmp ((yyvsp[(1) - (3)].id), "interface") != 0) { g_free ((yyvsp[(1) - (3)].id)); @@ -2801,48 +2831,48 @@ yyreduce: } break; - case 37: -#line 896 "parse.y" - { ; } - break; - case 38: -#line 897 "parse.y" +#line 915 "parse.y" { ; } break; case 39: -#line 898 "parse.y" +#line 916 "parse.y" { ; } break; case 40: -#line 899 "parse.y" +#line 917 "parse.y" { ; } break; case 41: -#line 902 "parse.y" - { the_scope = PUBLIC_SCOPE; } +#line 918 "parse.y" + { ; } break; case 42: -#line 903 "parse.y" - { the_scope = PRIVATE_SCOPE; } +#line 921 "parse.y" + { the_scope = PUBLIC_SCOPE; } break; case 43: -#line 904 "parse.y" - { the_scope = PROTECTED_SCOPE; } +#line 922 "parse.y" + { the_scope = PRIVATE_SCOPE; } break; case 44: -#line 905 "parse.y" - { the_scope = CLASS_SCOPE; } +#line 923 "parse.y" + { the_scope = PROTECTED_SCOPE; } break; case 45: -#line 908 "parse.y" +#line 924 "parse.y" + { the_scope = CLASS_SCOPE; } + break; + + case 46: +#line 927 "parse.y" { if (strcmp ((yyvsp[(1) - (2)].id), "destroywith") == 0) { g_free ((yyvsp[(1) - (2)].id)); @@ -2865,8 +2895,8 @@ yyreduce: } break; - case 46: -#line 928 "parse.y" + case 47: +#line 947 "parse.y" { if (strcmp ((yyvsp[(1) - (3)].id), "destroy") == 0) { g_free((yyvsp[(1) - (3)].id)); @@ -2891,16 +2921,16 @@ yyreduce: } break; - case 47: -#line 952 "parse.y" + case 48: +#line 971 "parse.y" { initializer = (yyvsp[(2) - (2)].id); initializer_line = ccode_line; } break; - case 48: -#line 956 "parse.y" + case 49: +#line 975 "parse.y" { initializer = ((yyvsp[(3) - (3)].cbuf))->str; initializer_line = ccode_line; @@ -2908,28 +2938,28 @@ yyreduce: } break; - case 49: -#line 964 "parse.y" + case 50: +#line 983 "parse.y" { ; } break; - case 50: -#line 965 "parse.y" + case 51: +#line 984 "parse.y" { ; } break; - case 51: -#line 966 "parse.y" + case 52: +#line 985 "parse.y" { destructor = NULL; } break; - case 52: -#line 967 "parse.y" + case 53: +#line 986 "parse.y" { initializer = NULL; } break; - case 53: -#line 968 "parse.y" + case 54: +#line 987 "parse.y" { if (strcmp ((yyvsp[(1) - (1)].id), "GladeXML") == 0) { glade_widget = TRUE; @@ -2940,30 +2970,30 @@ yyreduce: } break; - case 54: -#line 976 "parse.y" + case 55: +#line 995 "parse.y" { destructor = NULL; initializer = NULL; } break; - case 55: -#line 982 "parse.y" + case 56: +#line 1001 "parse.y" { push_variable((yyvsp[(3) - (5)].id), the_scope,(yyvsp[(1) - (5)].line), NULL); } break; - case 56: -#line 985 "parse.y" + case 57: +#line 1004 "parse.y" { push_variable((yyvsp[(3) - (6)].id), the_scope, (yyvsp[(1) - (6)].line), (yyvsp[(4) - (6)].id)); } break; - case 57: -#line 990 "parse.y" + case 58: +#line 1009 "parse.y" { Node *node = NULL; if(strcmp((yyvsp[(6) - (12)].id),"get")==0 && @@ -3034,8 +3064,8 @@ yyreduce: } break; - case 58: -#line 1058 "parse.y" + case 59: +#line 1077 "parse.y" { Node *node = NULL; if(strcmp((yyvsp[(6) - (9)].id), "get") == 0) { @@ -3092,8 +3122,8 @@ yyreduce: } break; - case 59: -#line 1112 "parse.y" + case 60: +#line 1131 "parse.y" { Node *node; char *get, *set = NULL; @@ -3183,8 +3213,8 @@ yyreduce: } break; - case 60: -#line 1201 "parse.y" + case 61: +#line 1220 "parse.y" { if (strcmp ((yyvsp[(2) - (3)].id), "export")!=0) { g_free ((yyvsp[(2) - (3)].id)); @@ -3195,15 +3225,15 @@ yyreduce: } break; - case 61: -#line 1209 "parse.y" + case 62: +#line 1228 "parse.y" { (yyval.id) = NULL; } break; - case 62: -#line 1214 "parse.y" + case 63: +#line 1233 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3254,8 +3284,8 @@ yyreduce: } break; - case 63: -#line 1262 "parse.y" + case 64: +#line 1281 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3294,8 +3324,8 @@ yyreduce: } break; - case 64: -#line 1298 "parse.y" + case 65: +#line 1317 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3312,33 +3342,33 @@ yyreduce: } break; - case 65: -#line 1314 "parse.y" - { ; } - break; - case 66: -#line 1315 "parse.y" +#line 1333 "parse.y" { ; } break; case 67: -#line 1318 "parse.y" +#line 1334 "parse.y" { ; } break; case 68: -#line 1319 "parse.y" +#line 1337 "parse.y" { ; } break; case 69: -#line 1322 "parse.y" - { (yyval.id) = (yyvsp[(1) - (1)].id); } +#line 1338 "parse.y" + { ; } break; case 70: -#line 1323 "parse.y" +#line 1341 "parse.y" + { (yyval.id) = (yyvsp[(1) - (1)].id); } + break; + + case 71: +#line 1342 "parse.y" { if (strcmp ((yyvsp[(1) - (4)].id), "_") != 0) { g_free ((yyvsp[(1) - (4)].id)); @@ -3351,99 +3381,89 @@ yyreduce: } break; - case 71: -#line 1335 "parse.y" - { (yyval.id) = (yyvsp[(1) - (1)].id); } - break; - case 72: -#line 1336 "parse.y" +#line 1354 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; case 73: -#line 1339 "parse.y" - { - ensure_property (); - node_set ((Node *)property, - "nick:steal", (yyvsp[(3) - (3)].id), - NULL); - } +#line 1355 "parse.y" + { (yyval.id) = (yyvsp[(1) - (1)].id); } break; case 74: -#line 1345 "parse.y" +#line 1358 "parse.y" { ensure_property (); node_set ((Node *)property, - "blurb:steal", (yyvsp[(3) - (3)].id), + "nick:steal", (yyvsp[(3) - (3)].id), NULL); } break; case 75: -#line 1351 "parse.y" +#line 1364 "parse.y" { ensure_property (); node_set ((Node *)property, - "maximum:steal", (yyvsp[(3) - (3)].id), + "blurb:steal", (yyvsp[(3) - (3)].id), NULL); } break; case 76: -#line 1357 "parse.y" +#line 1370 "parse.y" { ensure_property (); node_set ((Node *)property, - "minimum:steal", (yyvsp[(3) - (3)].id), + "maximum:steal", (yyvsp[(3) - (3)].id), NULL); } break; case 77: -#line 1363 "parse.y" +#line 1376 "parse.y" { ensure_property (); node_set ((Node *)property, - "default_value:steal", (yyvsp[(3) - (3)].id), + "minimum:steal", (yyvsp[(3) - (3)].id), NULL); } break; case 78: -#line 1369 "parse.y" +#line 1382 "parse.y" { ensure_property (); node_set ((Node *)property, - "flags:steal", (yyvsp[(3) - (3)].list), + "default_value:steal", (yyvsp[(3) - (3)].id), NULL); } break; case 79: -#line 1375 "parse.y" +#line 1388 "parse.y" { - Type *type = pop_type (); ensure_property (); node_set ((Node *)property, - "ptype:steal", type, + "flags:steal", (yyvsp[(3) - (3)].list), NULL); } break; case 80: -#line 1382 "parse.y" +#line 1394 "parse.y" { + Type *type = pop_type (); ensure_property (); node_set ((Node *)property, - "extra_gtktype:steal", (yyvsp[(3) - (3)].id), + "ptype:steal", type, NULL); } break; case 81: -#line 1388 "parse.y" +#line 1401 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3453,7 +3473,7 @@ yyreduce: break; case 82: -#line 1394 "parse.y" +#line 1407 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3463,7 +3483,7 @@ yyreduce: break; case 83: -#line 1400 "parse.y" +#line 1413 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3473,7 +3493,7 @@ yyreduce: break; case 84: -#line 1406 "parse.y" +#line 1419 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3483,7 +3503,7 @@ yyreduce: break; case 85: -#line 1412 "parse.y" +#line 1425 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3493,7 +3513,7 @@ yyreduce: break; case 86: -#line 1418 "parse.y" +#line 1431 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3503,7 +3523,7 @@ yyreduce: break; case 87: -#line 1424 "parse.y" +#line 1437 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3513,7 +3533,7 @@ yyreduce: break; case 88: -#line 1430 "parse.y" +#line 1443 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3523,7 +3543,7 @@ yyreduce: break; case 89: -#line 1436 "parse.y" +#line 1449 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3533,7 +3553,17 @@ yyreduce: break; case 90: -#line 1442 "parse.y" +#line 1455 "parse.y" + { + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", (yyvsp[(3) - (3)].id), + NULL); + } + break; + + case 91: +#line 1461 "parse.y" { ensure_property (); if (strcmp ((yyvsp[(1) - (1)].id), "override") == 0) { @@ -3559,8 +3589,8 @@ yyreduce: } break; - case 91: -#line 1467 "parse.y" + case 92: +#line 1486 "parse.y" { if(strcmp((yyvsp[(3) - (5)].id),"type")!=0) { g_free((yyvsp[(1) - (5)].id)); @@ -3572,40 +3602,40 @@ yyreduce: } break; - case 92: -#line 1476 "parse.y" + case 93: +#line 1495 "parse.y" { (yyval.id) = debool ((yyvsp[(1) - (1)].id)); typestack = g_list_prepend(typestack,NULL); } break; - case 93: -#line 1482 "parse.y" + case 94: +#line 1501 "parse.y" { (yyval.list) = (yyvsp[(2) - (3)].list); } break; - case 94: -#line 1483 "parse.y" + case 95: +#line 1502 "parse.y" { (yyval.list) = NULL; } break; - case 95: -#line 1486 "parse.y" + case 96: +#line 1505 "parse.y" { (yyval.list) = g_list_append((yyvsp[(3) - (3)].list),(yyvsp[(1) - (3)].id)); } break; - case 96: -#line 1489 "parse.y" + case 97: +#line 1508 "parse.y" { (yyval.list) = g_list_append(NULL,(yyvsp[(1) - (1)].id)); } break; - case 97: -#line 1495 "parse.y" + case 98: +#line 1514 "parse.y" { Node *node = node_new (TYPE_NODE, "name:steal", (yyvsp[(1) - (2)].id), @@ -3615,8 +3645,8 @@ yyreduce: } break; - case 98: -#line 1502 "parse.y" + case 99: +#line 1521 "parse.y" { Node *node = node_new (TYPE_NODE, "name:steal", (yyvsp[(1) - (1)].id), @@ -3625,46 +3655,46 @@ yyreduce: } break; - case 99: -#line 1511 "parse.y" + case 100: +#line 1530 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - case 100: -#line 1514 "parse.y" + case 101: +#line 1533 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - case 101: -#line 1517 "parse.y" + case 102: +#line 1536 "parse.y" { (yyval.id) = g_strconcat("const ", (yyvsp[(2) - (2)].id), NULL); g_free((yyvsp[(2) - (2)].id)); } break; - case 102: -#line 1521 "parse.y" + case 103: +#line 1540 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " const", NULL); g_free((yyvsp[(1) - (2)].id)); } break; - case 103: -#line 1525 "parse.y" + case 104: +#line 1544 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " ", (yyvsp[(2) - (2)].id), NULL); g_free((yyvsp[(2) - (2)].id)); } break; - case 104: -#line 1529 "parse.y" + case 105: +#line 1548 "parse.y" { (yyval.id) = g_strconcat("const ", (yyvsp[(2) - (3)].id), " ", (yyvsp[(3) - (3)].id), NULL); @@ -3672,8 +3702,8 @@ yyreduce: } break; - case 105: -#line 1534 "parse.y" + case 106: +#line 1553 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (3)].id), " ", (yyvsp[(2) - (3)].id), " const", NULL); @@ -3681,16 +3711,16 @@ yyreduce: } break; - case 106: -#line 1542 "parse.y" + case 107: +#line 1561 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " ", (yyvsp[(2) - (2)].id), NULL); g_free((yyvsp[(2) - (2)].id)); } break; - case 107: -#line 1546 "parse.y" + case 108: +#line 1565 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " ", (yyvsp[(2) - (2)].id), NULL); g_free((yyvsp[(1) - (2)].id)); @@ -3698,131 +3728,131 @@ yyreduce: } break; - case 108: -#line 1551 "parse.y" + case 109: +#line 1570 "parse.y" { (yyval.id) = g_strconcat("const ", (yyvsp[(2) - (2)].id), NULL); g_free((yyvsp[(2) - (2)].id)); } break; - case 109: -#line 1555 "parse.y" + case 110: +#line 1574 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - case 110: -#line 1558 "parse.y" + case 111: +#line 1577 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " const", NULL); g_free((yyvsp[(1) - (2)].id)); } break; - case 111: -#line 1562 "parse.y" + case 112: +#line 1581 "parse.y" { (yyval.id) = g_strdup((yyvsp[(1) - (1)].id)); } break; - case 112: -#line 1565 "parse.y" + case 113: +#line 1584 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " const", NULL); } break; - case 113: -#line 1570 "parse.y" + case 114: +#line 1589 "parse.y" { (yyval.id) = "void"; } break; - case 114: -#line 1571 "parse.y" + case 115: +#line 1590 "parse.y" { (yyval.id) = "char"; } break; - case 115: -#line 1572 "parse.y" + case 116: +#line 1591 "parse.y" { (yyval.id) = "short"; } break; - case 116: -#line 1573 "parse.y" + case 117: +#line 1592 "parse.y" { (yyval.id) = "int"; } break; - case 117: -#line 1574 "parse.y" + case 118: +#line 1593 "parse.y" { (yyval.id) = "long"; } break; - case 118: -#line 1575 "parse.y" + case 119: +#line 1594 "parse.y" { (yyval.id) = "float"; } break; - case 119: -#line 1576 "parse.y" + case 120: +#line 1595 "parse.y" { (yyval.id) = "double"; } break; - case 120: -#line 1577 "parse.y" + case 121: +#line 1596 "parse.y" { (yyval.id) = "signed"; } break; - case 121: -#line 1578 "parse.y" + case 122: +#line 1597 "parse.y" { (yyval.id) = "unsigned"; } break; - case 122: -#line 1581 "parse.y" + case 123: +#line 1600 "parse.y" { (yyval.id) = "struct"; } break; - case 123: -#line 1582 "parse.y" + case 124: +#line 1601 "parse.y" { (yyval.id) = "union"; } break; - case 124: -#line 1583 "parse.y" + case 125: +#line 1602 "parse.y" { (yyval.id) = "enum"; } break; - case 125: -#line 1586 "parse.y" + case 126: +#line 1605 "parse.y" { (yyval.id) = g_strdup("*"); } break; - case 126: -#line 1587 "parse.y" + case 127: +#line 1606 "parse.y" { (yyval.id) = g_strdup("* const"); } break; - case 127: -#line 1588 "parse.y" + case 128: +#line 1607 "parse.y" { (yyval.id) = g_strconcat("*", (yyvsp[(2) - (2)].id), NULL); g_free((yyvsp[(2) - (2)].id)); } break; - case 128: -#line 1592 "parse.y" + case 129: +#line 1611 "parse.y" { (yyval.id) = g_strconcat("* const", (yyvsp[(3) - (3)].id), NULL); g_free((yyvsp[(3) - (3)].id)); } break; - case 129: -#line 1599 "parse.y" + case 130: +#line 1618 "parse.y" { if(strcmp((yyvsp[(1) - (2)].id), "first")==0) (yyval.sigtype) = SIGNAL_FIRST_METHOD; @@ -3837,15 +3867,15 @@ yyreduce: } break; - case 130: -#line 1611 "parse.y" + case 131: +#line 1630 "parse.y" { (yyval.sigtype) = SIGNAL_LAST_METHOD; } break; - case 131: -#line 1617 "parse.y" + case 132: +#line 1636 "parse.y" { if(strcmp((yyvsp[(2) - (3)].id),"first")==0) (yyval.sigtype) = SIGNAL_FIRST_METHOD; @@ -3860,8 +3890,8 @@ yyreduce: } break; - case 132: -#line 1629 "parse.y" + case 133: +#line 1648 "parse.y" { if(strcmp((yyvsp[(1) - (3)].id),"first")==0) (yyval.sigtype) = SIGNAL_FIRST_METHOD; @@ -3876,54 +3906,54 @@ yyreduce: } break; - case 133: -#line 1641 "parse.y" + case 134: +#line 1660 "parse.y" { (yyval.sigtype) = SIGNAL_LAST_METHOD; } break; - case 134: -#line 1644 "parse.y" + case 135: +#line 1663 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; } break; - case 135: -#line 1650 "parse.y" + case 136: +#line 1669 "parse.y" { gtktypes = g_list_prepend(gtktypes, debool ((yyvsp[(1) - (4)].id))); } break; - case 136: -#line 1655 "parse.y" + case 137: +#line 1674 "parse.y" { gtktypes = g_list_append(gtktypes, debool ((yyvsp[(3) - (3)].id))); } break; - case 137: -#line 1658 "parse.y" + case 138: +#line 1677 "parse.y" { gtktypes = g_list_append(gtktypes, debool ((yyvsp[(1) - (1)].id))); } break; - case 138: -#line 1663 "parse.y" + case 139: +#line 1682 "parse.y" { (yyval.cbuf) = (yyvsp[(2) - (2)].cbuf); } break; - case 139: -#line 1664 "parse.y" + case 140: +#line 1683 "parse.y" { (yyval.cbuf) = NULL; } break; - case 140: -#line 1668 "parse.y" + case 141: +#line 1687 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -3936,14 +3966,21 @@ yyreduce: free_all_global_state(); YYERROR; } + if (funcattrs != NULL) { + char *error = g_strdup_printf + (_("function attribute macros ('%s' in this case) may not be used with signal methods"), + funcattrs); + yyerror (error); + YYERROR; + } push_function(the_scope, (yyvsp[(3) - (10)].sigtype),NULL, (yyvsp[(5) - (10)].id), (yyvsp[(10) - (10)].cbuf),(yyvsp[(1) - (10)].line), ccode_line, vararg, (yyvsp[(2) - (10)].list)); } break; - case 141: -#line 1684 "parse.y" + case 142: +#line 1710 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -3956,14 +3993,21 @@ yyreduce: free_all_global_state(); YYERROR; } + if (funcattrs != NULL) { + char *error = g_strdup_printf + (_("function attribute macros ('%s' in this case) may not be used with signal methods"), + funcattrs); + yyerror (error); + YYERROR; + } push_function(the_scope, (yyvsp[(4) - (11)].sigtype), NULL, (yyvsp[(6) - (11)].id), (yyvsp[(11) - (11)].cbuf), (yyvsp[(2) - (11)].line), ccode_line, vararg, (yyvsp[(3) - (11)].list)); } break; - case 142: -#line 1700 "parse.y" + case 143: +#line 1733 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -3976,14 +4020,21 @@ yyreduce: free_all_global_state(); YYERROR; } + if (funcattrs != NULL) { + char *error = g_strdup_printf + (_("function attribute macros ('%s' in this case) may not be used with virtual methods"), + funcattrs); + yyerror (error); + YYERROR; + } push_function(the_scope, VIRTUAL_METHOD, NULL, (yyvsp[(4) - (9)].id), (yyvsp[(9) - (9)].cbuf), (yyvsp[(1) - (9)].line), ccode_line, vararg, NULL); } break; - case 143: -#line 1716 "parse.y" + case 144: +#line 1756 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -3996,30 +4047,51 @@ yyreduce: free_all_global_state(); YYERROR; } + if (funcattrs != NULL) { + char *error = g_strdup_printf + (_("function attribute macros ('%s' in this case) may not be used with virtual methods"), + funcattrs); + yyerror (error); + YYERROR; + } push_function(the_scope, VIRTUAL_METHOD, NULL, (yyvsp[(4) - (9)].id), (yyvsp[(9) - (9)].cbuf), (yyvsp[(2) - (9)].line), ccode_line, vararg, NULL); } break; - case 144: -#line 1732 "parse.y" + case 145: +#line 1779 "parse.y" { if(!has_self) { - yyerror(_("virtual method without 'self' as " + yyerror(_("virtual method without 'szelf' as " "first parameter")); free_all_global_state(); YYERROR; } + if (funcattrs != NULL) { + char *error = g_strdup_printf + (_("function attribute macros ('%s' in this case) may not be used with virtual methods"), + funcattrs); + yyerror (error); + YYERROR; + } push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, (yyvsp[(3) - (8)].id), (yyvsp[(8) - (8)].cbuf), (yyvsp[(1) - (8)].line), ccode_line, vararg, NULL); } break; - case 145: -#line 1743 "parse.y" - { + case 146: +#line 1797 "parse.y" + { + if (funcattrs != NULL) { + char *error = g_strdup_printf + (_("function attribute macros ('%s' in this case) may not be used with override methods"), + funcattrs); + yyerror (error); + YYERROR; + } push_function(NO_SCOPE, OVERRIDE_METHOD, (yyvsp[(3) - (11)].id), (yyvsp[(6) - (11)].id), (yyvsp[(11) - (11)].cbuf), (yyvsp[(1) - (11)].line), ccode_line, @@ -4027,8 +4099,8 @@ yyreduce: } break; - case 146: -#line 1749 "parse.y" + case 147: +#line 1810 "parse.y" { if(the_scope == CLASS_SCOPE) { yyerror(_("a method cannot be of class scope")); @@ -4041,8 +4113,8 @@ yyreduce: } break; - case 147: -#line 1759 "parse.y" + case 148: +#line 1820 "parse.y" { if(strcmp((yyvsp[(1) - (5)].id), "init")==0) { push_init_arg((yyvsp[(3) - (5)].id),FALSE); @@ -4054,24 +4126,42 @@ yyreduce: push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, (yyvsp[(1) - (5)].id), (yyvsp[(5) - (5)].cbuf), (yyvsp[(2) - (5)].line), ccode_line, FALSE, NULL); + } else if(strcmp((yyvsp[(1) - (5)].id), "constructor")==0) { + push_init_arg((yyvsp[(3) - (5)].id), FALSE); + push_function(NO_SCOPE, CONSTRUCTOR_METHOD, NULL, + (yyvsp[(1) - (5)].id), (yyvsp[(5) - (5)].cbuf), (yyvsp[(2) - (5)].line), + ccode_line, FALSE, NULL); + } else if(strcmp((yyvsp[(1) - (5)].id), "dispose")==0) { + push_init_arg((yyvsp[(3) - (5)].id), FALSE); + push_function(NO_SCOPE, DISPOSE_METHOD, NULL, + (yyvsp[(1) - (5)].id), (yyvsp[(5) - (5)].cbuf), (yyvsp[(2) - (5)].line), + ccode_line, FALSE, NULL); + } else if(strcmp((yyvsp[(1) - (5)].id), "finalize")==0) { + push_init_arg((yyvsp[(3) - (5)].id), FALSE); + push_function(NO_SCOPE, FINALIZE_METHOD, NULL, + (yyvsp[(1) - (5)].id), (yyvsp[(5) - (5)].cbuf), (yyvsp[(2) - (5)].line), + ccode_line, FALSE, NULL); + } else { g_free((yyvsp[(1) - (5)].id)); g_free((yyvsp[(3) - (5)].id)); g_string_free((yyvsp[(5) - (5)].cbuf),TRUE); yyerror(_("parse error " - "(untyped blocks must be init or " - "class_init)")); + "(untyped blocks must be init, " + "class_init, constructor, dispose " + "or finalize)")); YYERROR; } } break; - case 148: -#line 1782 "parse.y" + case 149: +#line 1860 "parse.y" { + g_free(funcattrs); funcattrs = NULL; g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; - if(!set_return_value((yyvsp[(1) - (2)].id), (yyvsp[(2) - (2)].id))) { + if(!set_attr_value((yyvsp[(1) - (2)].id), (yyvsp[(2) - (2)].id))) { g_free((yyvsp[(1) - (2)].id)); g_free((yyvsp[(2) - (2)].id)); yyerror(_("parse error")); @@ -4081,19 +4171,20 @@ yyreduce: } break; - case 149: -#line 1793 "parse.y" + case 150: +#line 1872 "parse.y" { + g_free(funcattrs); funcattrs = NULL; g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; - if(!set_return_value((yyvsp[(1) - (4)].id), (yyvsp[(2) - (4)].id))) { + if(!set_attr_value((yyvsp[(1) - (4)].id), (yyvsp[(2) - (4)].id))) { g_free((yyvsp[(1) - (4)].id)); g_free((yyvsp[(2) - (4)].id)); g_free((yyvsp[(3) - (4)].id)); g_free((yyvsp[(4) - (4)].id)); yyerror(_("parse error")); YYERROR; } - if(!set_return_value((yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].id))) { - onerror = defreturn = NULL; + if(!set_attr_value((yyvsp[(3) - (4)].id), (yyvsp[(4) - (4)].id))) { + funcattrs = onerror = defreturn = NULL; g_free((yyvsp[(1) - (4)].id)); g_free((yyvsp[(2) - (4)].id)); g_free((yyvsp[(3) - (4)].id)); g_free((yyvsp[(4) - (4)].id)); yyerror(_("parse error")); @@ -4104,34 +4195,70 @@ yyreduce: } break; - case 150: -#line 1812 "parse.y" + case 151: +#line 1892 "parse.y" + { + g_free(funcattrs); funcattrs = NULL; + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + if(!set_attr_value((yyvsp[(1) - (6)].id), (yyvsp[(2) - (6)].id))) { + g_free((yyvsp[(1) - (6)].id)); g_free((yyvsp[(2) - (6)].id)); + g_free((yyvsp[(3) - (6)].id)); g_free((yyvsp[(4) - (6)].id)); + g_free((yyvsp[(5) - (6)].id)); g_free((yyvsp[(6) - (6)].id)); + yyerror(_("parse error")); + YYERROR; + } + if(!set_attr_value((yyvsp[(3) - (6)].id), (yyvsp[(4) - (6)].id))) { + funcattrs = onerror = defreturn = NULL; + g_free((yyvsp[(1) - (6)].id)); g_free((yyvsp[(2) - (6)].id)); + g_free((yyvsp[(3) - (6)].id)); g_free((yyvsp[(4) - (6)].id)); + g_free((yyvsp[(5) - (6)].id)); g_free((yyvsp[(6) - (6)].id)); + yyerror(_("parse error")); + YYERROR; + } + if(!set_attr_value((yyvsp[(5) - (6)].id), (yyvsp[(6) - (6)].id))) { + funcattrs = onerror = defreturn = NULL; + g_free((yyvsp[(1) - (6)].id)); g_free((yyvsp[(2) - (6)].id)); + g_free((yyvsp[(3) - (6)].id)); g_free((yyvsp[(4) - (6)].id)); + g_free((yyvsp[(5) - (6)].id)); g_free((yyvsp[(6) - (6)].id)); + yyerror(_("parse error")); + YYERROR; + } + g_free((yyvsp[(1) - (6)].id)); + g_free((yyvsp[(3) - (6)].id)); + g_free((yyvsp[(5) - (6)].id)); + } + break; + + case 152: +#line 1923 "parse.y" { + g_free(funcattrs); funcattrs = NULL; g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; } break; - case 151: -#line 1818 "parse.y" + case 153: +#line 1930 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - case 152: -#line 1819 "parse.y" + case 154: +#line 1931 "parse.y" { (yyval.id) = ((yyvsp[(2) - (2)].cbuf))->str; g_string_free((yyvsp[(2) - (2)].cbuf), FALSE); } break; - case 153: -#line 1825 "parse.y" + case 155: +#line 1937 "parse.y" { vararg = FALSE; has_self = FALSE; } break; - case 154: -#line 1826 "parse.y" + case 156: +#line 1938 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -4145,8 +4272,8 @@ yyreduce: } break; - case 155: -#line 1837 "parse.y" + case 157: +#line 1949 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -4160,8 +4287,8 @@ yyreduce: } break; - case 156: -#line 1848 "parse.y" + case 158: +#line 1960 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -4175,8 +4302,8 @@ yyreduce: } break; - case 157: -#line 1859 "parse.y" + case 159: +#line 1971 "parse.y" { has_self = TRUE; if(strcmp((yyvsp[(1) - (3)].id),"self")==0) @@ -4189,8 +4316,8 @@ yyreduce: } break; - case 158: -#line 1869 "parse.y" + case 160: +#line 1981 "parse.y" { has_self = TRUE; if(strcmp((yyvsp[(1) - (4)].id),"self")==0) @@ -4203,8 +4330,8 @@ yyreduce: } break; - case 159: -#line 1879 "parse.y" + case 161: +#line 1991 "parse.y" { has_self = TRUE; if(strcmp((yyvsp[(2) - (4)].id),"self")==0) @@ -4217,47 +4344,47 @@ yyreduce: } break; - case 160: -#line 1889 "parse.y" + case 162: +#line 2001 "parse.y" { has_self = FALSE; } break; - case 161: -#line 1892 "parse.y" + case 163: +#line 2004 "parse.y" { vararg = TRUE; } break; - case 162: -#line 1893 "parse.y" + case 164: +#line 2005 "parse.y" { vararg = FALSE; } break; - case 163: -#line 1896 "parse.y" + case 165: +#line 2008 "parse.y" { ; } break; - case 164: -#line 1897 "parse.y" + case 166: +#line 2009 "parse.y" { ; } break; - case 165: -#line 1900 "parse.y" + case 167: +#line 2012 "parse.y" { push_funcarg((yyvsp[(2) - (2)].id),NULL); } break; - case 166: -#line 1903 "parse.y" + case 168: +#line 2015 "parse.y" { push_funcarg((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].id)); } break; - case 167: -#line 1906 "parse.y" + case 169: +#line 2018 "parse.y" { if(strcmp((yyvsp[(4) - (6)].id),"check")!=0) { yyerror(_("parse error")); @@ -4268,8 +4395,8 @@ yyreduce: } break; - case 168: -#line 1914 "parse.y" + case 170: +#line 2026 "parse.y" { if(strcmp((yyvsp[(5) - (7)].id),"check")!=0) { yyerror(_("parse error")); @@ -4280,18 +4407,18 @@ yyreduce: } break; - case 169: -#line 1924 "parse.y" + case 171: +#line 2036 "parse.y" { ; } break; - case 170: -#line 1925 "parse.y" + case 172: +#line 2037 "parse.y" { ; } break; - case 171: -#line 1928 "parse.y" + case 173: +#line 2040 "parse.y" { if(strcmp((yyvsp[(1) - (1)].id),"type")==0) { Node *node = node_new (CHECK_NODE, @@ -4311,8 +4438,8 @@ yyreduce: } break; - case 172: -#line 1945 "parse.y" + case 174: +#line 2057 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", GT_CHECK, @@ -4322,8 +4449,8 @@ yyreduce: } break; - case 173: -#line 1952 "parse.y" + case 175: +#line 2064 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", LT_CHECK, @@ -4333,8 +4460,8 @@ yyreduce: } break; - case 174: -#line 1959 "parse.y" + case 176: +#line 2071 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", GE_CHECK, @@ -4344,8 +4471,8 @@ yyreduce: } break; - case 175: -#line 1966 "parse.y" + case 177: +#line 2078 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", LE_CHECK, @@ -4355,8 +4482,8 @@ yyreduce: } break; - case 176: -#line 1973 "parse.y" + case 178: +#line 2085 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", EQ_CHECK, @@ -4366,8 +4493,8 @@ yyreduce: } break; - case 177: -#line 1980 "parse.y" + case 179: +#line 2092 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", NE_CHECK, @@ -4377,8 +4504,8 @@ yyreduce: } break; - case 178: -#line 1989 "parse.y" + case 180: +#line 2101 "parse.y" { Node *node = node_new (ENUMDEF_NODE, "etype:steal", (yyvsp[(6) - (7)].id), @@ -4390,8 +4517,8 @@ yyreduce: } break; - case 179: -#line 1998 "parse.y" + case 181: +#line 2110 "parse.y" { Node *node = node_new (ENUMDEF_NODE, "etype:steal", (yyvsp[(7) - (8)].id), @@ -4403,18 +4530,18 @@ yyreduce: } break; - case 180: -#line 2009 "parse.y" + case 182: +#line 2121 "parse.y" {;} break; - case 181: -#line 2010 "parse.y" + case 183: +#line 2122 "parse.y" {;} break; - case 182: -#line 2013 "parse.y" + case 184: +#line 2125 "parse.y" { Node *node; char *num = (yyvsp[(3) - (3)].id); @@ -4437,8 +4564,8 @@ yyreduce: } break; - case 183: -#line 2033 "parse.y" + case 185: +#line 2145 "parse.y" { Node *node; @@ -4449,8 +4576,8 @@ yyreduce: } break; - case 184: -#line 2043 "parse.y" + case 186: +#line 2155 "parse.y" { Node *node = node_new (FLAGS_NODE, "ftype:steal", (yyvsp[(6) - (7)].id), @@ -4462,8 +4589,8 @@ yyreduce: } break; - case 185: -#line 2052 "parse.y" + case 187: +#line 2164 "parse.y" { Node *node = node_new (FLAGS_NODE, "ftype:steal", (yyvsp[(7) - (8)].id), @@ -4475,22 +4602,22 @@ yyreduce: } break; - case 186: -#line 2063 "parse.y" + case 188: +#line 2175 "parse.y" { flag_vals = g_list_append (flag_vals, (yyvsp[(3) - (3)].id)); } break; - case 187: -#line 2066 "parse.y" + case 189: +#line 2178 "parse.y" { flag_vals = g_list_append (flag_vals, (yyvsp[(1) - (1)].id)); } break; - case 188: -#line 2071 "parse.y" + case 190: +#line 2183 "parse.y" { Node *node = node_new (ERROR_NODE, "etype:steal", (yyvsp[(6) - (7)].id), @@ -4502,8 +4629,8 @@ yyreduce: } break; - case 189: -#line 2080 "parse.y" + case 191: +#line 2192 "parse.y" { Node *node = node_new (ERROR_NODE, "etype:steal", (yyvsp[(7) - (8)].id), @@ -4515,46 +4642,46 @@ yyreduce: } break; - case 190: -#line 2091 "parse.y" + case 192: +#line 2203 "parse.y" { error_vals = g_list_append (error_vals, (yyvsp[(3) - (3)].id)); } break; - case 191: -#line 2094 "parse.y" + case 193: +#line 2206 "parse.y" { error_vals = g_list_append (error_vals, (yyvsp[(1) - (1)].id)); } break; - case 192: -#line 2100 "parse.y" + case 194: +#line 2212 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - case 193: -#line 2101 "parse.y" + case 195: +#line 2213 "parse.y" { (yyval.id) = g_strconcat("-",(yyvsp[(2) - (2)].id),NULL); g_free((yyvsp[(2) - (2)].id)); } break; - case 194: -#line 2105 "parse.y" + case 196: +#line 2217 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - case 195: -#line 2106 "parse.y" + case 197: +#line 2218 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; /* Line 1267 of yacc.c. */ -#line 4558 "parse.c" +#line 4685 "parse.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -4768,6 +4895,6 @@ yyreturn: } -#line 2109 "parse.y" +#line 2221 "parse.y"