X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/d52e64e92557f0b6d7704077ec175c88fa7ca243..8445442abc02fc325a9ce228759403113583818c:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 0c3a4ad..3e007ba 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.5. */ +/* A Bison parser, made by GNU Bison 2.7. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.5" +#define YYBISON_VERSION "2.7" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -58,14 +58,11 @@ /* Pull parsers. */ #define YYPULL 1 -/* Using locations. */ -#define YYLSP_NEEDED 0 /* Copy the first part of user declarations. */ - -/* Line 268 of yacc.c */ +/* Line 371 of yacc.c */ #line 23 "parse.y" @@ -117,6 +114,7 @@ static char *onerror = NULL; static char *defreturn = NULL; static GList *gtktypes = NULL; +static char *signal_name=NULL; static Property *property = NULL; @@ -249,6 +247,13 @@ push_function (int scope, int method, char *oid, char *id, } else c_cbuf = NULL; + if (signal_name == NULL ) + { + GString * buffer=g_string_new(""); + g_string_printf(buffer, "\"%s\"", id); + signal_name = buffer->str; + g_string_free(buffer, FALSE); + } node = node_new (METHOD_NODE, "scope", scope, "method", method, @@ -257,6 +262,7 @@ push_function (int scope, int method, char *oid, char *id, "gtktypes:steal", gtktypes, "flags:steal", flags, "id:steal", id, + "signal_name:steal", signal_name, "args:steal", funcargs, "funcattrs:steal", funcattrs, "onerror:steal", onerror, @@ -276,8 +282,8 @@ push_function (int scope, int method, char *oid, char *id, above */ c_cbuf?FALSE:TRUE); gtktypes = NULL; + signal_name = NULL; funcargs = NULL; - funcattrs = NULL; onerror = NULL; defreturn = NULL; @@ -726,14 +732,16 @@ ensure_property (void) } +/* Line 371 of yacc.c */ +#line 737 "parse.c" -/* Line 268 of yacc.c */ -#line 732 "parse.c" - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif +# ifndef YY_NULL +# if defined __cplusplus && 201103L <= __cplusplus +# define YY_NULL nullptr +# else +# define YY_NULL 0 +# endif +# endif /* Enabling verbose error messages. */ #ifdef YYERROR_VERBOSE @@ -743,11 +751,17 @@ ensure_property (void) # define YYERROR_VERBOSE 0 #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* In a future release of Bison, this section will be replaced + by #include "y.tab.h". */ +#ifndef YY_YY_PARSE_H_INCLUDED +# define YY_YY_PARSE_H_INCLUDED +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif +#if YYDEBUG +extern int yydebug; #endif - /* Tokens. */ #ifndef YYTOKENTYPE @@ -794,19 +808,20 @@ ensure_property (void) VIRTUAL = 294, SIGNAL = 295, OVERRIDE = 296, - NICK = 297, - BLURB = 298, - MAXIMUM = 299, - MINIMUM = 300, - DEFAULT_VALUE = 301, - ERROR = 302, - FLAGS = 303, - TYPE = 304, - FLAGS_TYPE = 305, - ENUM_TYPE = 306, - PARAM_TYPE = 307, - BOXED_TYPE = 308, - OBJECT_TYPE = 309 + NAME = 297, + NICK = 298, + BLURB = 299, + MAXIMUM = 300, + MINIMUM = 301, + DEFAULT_VALUE = 302, + ERROR = 303, + FLAGS = 304, + TYPE = 305, + FLAGS_TYPE = 306, + ENUM_TYPE = 307, + PARAM_TYPE = 308, + BOXED_TYPE = 309, + OBJECT_TYPE = 310 }; #endif /* Tokens. */ @@ -849,29 +864,28 @@ ensure_property (void) #define VIRTUAL 294 #define SIGNAL 295 #define OVERRIDE 296 -#define NICK 297 -#define BLURB 298 -#define MAXIMUM 299 -#define MINIMUM 300 -#define DEFAULT_VALUE 301 -#define ERROR 302 -#define FLAGS 303 -#define TYPE 304 -#define FLAGS_TYPE 305 -#define ENUM_TYPE 306 -#define PARAM_TYPE 307 -#define BOXED_TYPE 308 -#define OBJECT_TYPE 309 - +#define NAME 297 +#define NICK 298 +#define BLURB 299 +#define MAXIMUM 300 +#define MINIMUM 301 +#define DEFAULT_VALUE 302 +#define ERROR 303 +#define FLAGS 304 +#define TYPE 305 +#define FLAGS_TYPE 306 +#define ENUM_TYPE 307 +#define PARAM_TYPE 308 +#define BOXED_TYPE 309 +#define OBJECT_TYPE 310 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { - -/* Line 293 of yacc.c */ -#line 683 "parse.y" +/* Line 387 of yacc.c */ +#line 692 "parse.y" char *id; GString *cbuf; @@ -880,21 +894,36 @@ typedef union YYSTYPE int sigtype; - -/* Line 293 of yacc.c */ -#line 886 "parse.c" +/* Line 387 of yacc.c */ +#line 899 "parse.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif +extern YYSTYPE yylval; -/* Copy the second part of user declarations. */ +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ + +#endif /* !YY_YY_PARSE_H_INCLUDED */ +/* Copy the second part of user declarations. */ -/* Line 343 of yacc.c */ -#line 898 "parse.c" +/* Line 390 of yacc.c */ +#line 927 "parse.c" #ifdef short # undef short @@ -947,24 +976,24 @@ typedef short int yytype_int16; # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YYUSE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YYUSE(E) /* empty */ #endif /* Identity function, used to suppress warnings about constant conditions. */ #ifndef lint -# define YYID(n) (n) +# define YYID(N) (N) #else #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) @@ -1000,6 +1029,7 @@ YYID (yyi) # if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 # endif @@ -1091,20 +1121,20 @@ union yyalloc #endif #if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from FROM to TO. The source and destination do +/* Copy COUNT objects from SRC to DST. The source and destination do not overlap. */ # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) # else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ while (YYID (0)) # endif # endif @@ -1113,20 +1143,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 25 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 641 +#define YYLAST 612 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 68 +#define YYNTOKENS 69 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 53 /* YYNRULES -- Number of rules. */ -#define YYNRULES 198 +#define YYNRULES 200 /* YYNRULES -- Number of states. */ -#define YYNSTATES 418 +#define YYNSTATES 425 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 309 +#define YYMAXUTOK 310 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -1137,16 +1167,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, 66, 2, 2, 2, 2, 2, 2, - 57, 58, 63, 2, 61, 67, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 59, - 65, 60, 64, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 67, 2, 2, 2, 2, 2, 2, + 58, 59, 64, 2, 62, 68, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 60, + 66, 61, 65, 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, 55, 62, 56, 2, 2, 2, 2, + 2, 2, 2, 56, 63, 57, 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, @@ -1164,7 +1194,8 @@ 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, 53, 54 + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55 }; #if YYDEBUG @@ -1181,127 +1212,130 @@ static const yytype_uint16 yyprhs[] = 203, 213, 220, 224, 225, 237, 246, 252, 256, 257, 261, 263, 265, 270, 272, 274, 278, 282, 286, 290, 294, 298, 302, 306, 310, 314, 318, 322, 326, 330, - 334, 338, 342, 344, 350, 352, 356, 357, 361, 363, - 366, 368, 370, 372, 375, 378, 381, 385, 389, 392, - 395, 398, 400, 403, 405, 408, 410, 412, 414, 416, - 418, 420, 422, 424, 426, 428, 430, 432, 434, 437, - 440, 444, 447, 449, 453, 457, 460, 462, 467, 471, - 473, 476, 478, 489, 501, 511, 521, 530, 542, 551, - 557, 560, 565, 572, 573, 575, 578, 580, 582, 585, - 588, 592, 597, 602, 604, 608, 610, 614, 616, 619, - 623, 630, 638, 641, 643, 645, 648, 651, 655, 659, - 663, 667, 675, 684, 688, 690, 694, 696, 704, 713, - 717, 719, 727, 736, 740, 742, 744, 747, 749 + 334, 338, 342, 346, 348, 354, 356, 360, 361, 365, + 367, 370, 372, 374, 376, 379, 382, 385, 389, 393, + 396, 399, 402, 404, 407, 409, 412, 414, 416, 418, + 420, 422, 424, 426, 428, 430, 432, 434, 436, 438, + 441, 444, 448, 451, 453, 457, 461, 464, 466, 471, + 477, 481, 483, 486, 488, 499, 511, 521, 531, 540, + 552, 561, 567, 570, 575, 582, 583, 585, 588, 590, + 592, 595, 598, 602, 607, 612, 614, 618, 620, 624, + 626, 629, 633, 640, 648, 651, 653, 655, 658, 661, + 665, 669, 673, 677, 685, 694, 698, 700, 704, 706, + 714, 723, 727, 729, 737, 746, 750, 752, 754, 757, + 759 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 69, 0, -1, 71, 72, 71, -1, 72, 71, -1, - 71, 72, -1, 72, -1, 24, -1, 26, -1, 29, + 70, 0, -1, 72, 73, 72, -1, 73, 72, -1, + 72, 73, -1, 73, -1, 24, -1, 26, -1, 29, -1, 27, -1, 28, -1, 30, -1, 31, -1, 25, - -1, 71, 70, -1, 71, 113, -1, 71, 116, -1, - 71, 118, -1, 70, -1, 113, -1, 116, -1, 118, - -1, 73, 55, 75, 56, -1, 73, 55, 56, -1, - 3, 21, 4, 21, 74, -1, -1, 57, 19, 58, - 74, -1, 57, 19, 19, 58, 74, -1, 57, 19, - 21, 58, 74, -1, 57, 19, 20, 58, 74, -1, - 57, 19, 32, 32, 58, 74, -1, 57, 19, 32, - 32, 32, 58, 74, -1, 57, 19, 19, 32, 58, - 74, -1, 57, 19, 19, 32, 32, 58, 74, -1, - 75, 76, -1, 76, -1, 104, -1, 19, 104, -1, - 19, 21, 104, -1, 81, -1, 82, -1, 84, -1, - 59, -1, 33, -1, 34, -1, 35, -1, 36, -1, - 19, 19, -1, 19, 55, 24, -1, 60, 120, -1, - 60, 55, 24, -1, 78, 79, -1, 79, 78, -1, - 79, -1, 78, -1, 19, -1, -1, 77, 93, 19, - 80, 59, -1, 77, 93, 19, 22, 80, 59, -1, - 38, 91, 90, 19, 83, 19, 55, 24, 19, 55, - 24, 59, -1, 38, 91, 90, 19, 83, 19, 55, - 24, 59, -1, 38, 91, 90, 19, 83, 19, -1, - 57, 19, 58, -1, -1, 37, 19, 19, 85, 19, - 55, 24, 19, 55, 24, 59, -1, 37, 19, 19, - 85, 19, 55, 24, 59, -1, 37, 19, 19, 85, - 59, -1, 57, 86, 58, -1, -1, 86, 61, 89, - -1, 89, -1, 32, -1, 19, 57, 32, 58, -1, - 120, -1, 87, -1, 42, 60, 87, -1, 43, 60, - 87, -1, 44, 60, 120, -1, 45, 60, 120, -1, - 46, 60, 88, -1, 48, 60, 92, -1, 49, 60, - 93, -1, 50, 60, 21, -1, 50, 60, 19, -1, - 51, 60, 21, -1, 51, 60, 19, -1, 52, 60, - 21, -1, 52, 60, 19, -1, 53, 60, 21, -1, - 53, 60, 19, -1, 54, 60, 21, -1, 54, 60, - 19, -1, 19, -1, 19, 57, 19, 93, 58, -1, - 19, -1, 57, 92, 58, -1, -1, 19, 62, 92, - -1, 19, -1, 94, 98, -1, 94, -1, 95, -1, - 19, -1, 5, 19, -1, 19, 5, -1, 97, 19, - -1, 5, 97, 19, -1, 97, 19, 5, -1, 96, - 95, -1, 21, 95, -1, 5, 95, -1, 21, -1, - 21, 5, -1, 96, -1, 96, 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, 63, -1, 63, 5, -1, 63, 98, -1, - 63, 5, 98, -1, 19, 101, -1, 101, -1, 77, - 19, 101, -1, 19, 77, 101, -1, 77, 101, -1, - 99, -1, 19, 57, 102, 58, -1, 102, 61, 19, - -1, 19, -1, 55, 24, -1, 59, -1, 40, 91, - 100, 93, 19, 57, 107, 58, 105, 103, -1, 77, - 40, 91, 99, 93, 19, 57, 107, 58, 105, 103, - -1, 39, 77, 93, 19, 57, 107, 58, 105, 103, - -1, 77, 39, 93, 19, 57, 107, 58, 105, 103, - -1, 39, 93, 19, 57, 107, 58, 105, 103, -1, - 41, 57, 21, 58, 93, 19, 57, 107, 58, 105, - 103, -1, 77, 93, 19, 57, 107, 58, 105, 103, - -1, 19, 57, 19, 58, 103, -1, 19, 106, -1, - 19, 106, 19, 106, -1, 19, 106, 19, 106, 19, - 106, -1, -1, 120, -1, 55, 24, -1, 6, -1, - 19, -1, 19, 5, -1, 5, 19, -1, 19, 61, - 108, -1, 19, 5, 61, 108, -1, 5, 19, 61, - 108, -1, 108, -1, 109, 61, 10, -1, 109, -1, - 109, 61, 110, -1, 110, -1, 93, 19, -1, 93, - 19, 22, -1, 93, 19, 57, 19, 111, 58, -1, - 93, 19, 22, 57, 19, 111, 58, -1, 111, 112, - -1, 112, -1, 19, -1, 64, 120, -1, 65, 120, - -1, 64, 60, 120, -1, 65, 60, 120, -1, 60, - 60, 120, -1, 66, 60, 120, -1, 9, 19, 55, - 114, 56, 21, 59, -1, 9, 19, 55, 114, 61, - 56, 21, 59, -1, 114, 61, 115, -1, 115, -1, - 19, 60, 120, -1, 19, -1, 48, 19, 55, 117, - 56, 21, 59, -1, 48, 19, 55, 117, 61, 56, - 21, 59, -1, 117, 61, 19, -1, 19, -1, 47, - 19, 55, 119, 56, 21, 59, -1, 47, 19, 55, - 119, 61, 56, 21, 59, -1, 119, 61, 19, -1, - 19, -1, 20, -1, 67, 20, -1, 23, -1, 19, + -1, 72, 71, -1, 72, 114, -1, 72, 117, -1, + 72, 119, -1, 71, -1, 114, -1, 117, -1, 119, + -1, 74, 56, 76, 57, -1, 74, 56, 57, -1, + 3, 21, 4, 21, 75, -1, -1, 58, 19, 59, + 75, -1, 58, 19, 19, 59, 75, -1, 58, 19, + 21, 59, 75, -1, 58, 19, 20, 59, 75, -1, + 58, 19, 32, 32, 59, 75, -1, 58, 19, 32, + 32, 32, 59, 75, -1, 58, 19, 19, 32, 59, + 75, -1, 58, 19, 19, 32, 32, 59, 75, -1, + 76, 77, -1, 77, -1, 105, -1, 19, 105, -1, + 19, 21, 105, -1, 82, -1, 83, -1, 85, -1, + 60, -1, 33, -1, 34, -1, 35, -1, 36, -1, + 19, 19, -1, 19, 56, 24, -1, 61, 121, -1, + 61, 56, 24, -1, 79, 80, -1, 80, 79, -1, + 80, -1, 79, -1, 19, -1, -1, 78, 94, 19, + 81, 60, -1, 78, 94, 19, 22, 81, 60, -1, + 38, 92, 91, 19, 84, 19, 56, 24, 19, 56, + 24, 60, -1, 38, 92, 91, 19, 84, 19, 56, + 24, 60, -1, 38, 92, 91, 19, 84, 19, -1, + 58, 19, 59, -1, -1, 37, 19, 19, 86, 19, + 56, 24, 19, 56, 24, 60, -1, 37, 19, 19, + 86, 19, 56, 24, 60, -1, 37, 19, 19, 86, + 60, -1, 58, 87, 59, -1, -1, 87, 62, 90, + -1, 90, -1, 32, -1, 19, 58, 32, 59, -1, + 121, -1, 88, -1, 42, 61, 88, -1, 43, 61, + 88, -1, 44, 61, 88, -1, 45, 61, 121, -1, + 46, 61, 121, -1, 47, 61, 89, -1, 49, 61, + 93, -1, 50, 61, 94, -1, 51, 61, 21, -1, + 51, 61, 19, -1, 52, 61, 21, -1, 52, 61, + 19, -1, 53, 61, 21, -1, 53, 61, 19, -1, + 54, 61, 21, -1, 54, 61, 19, -1, 55, 61, + 21, -1, 55, 61, 19, -1, 19, -1, 19, 58, + 19, 94, 59, -1, 19, -1, 58, 93, 59, -1, + -1, 19, 63, 93, -1, 19, -1, 95, 99, -1, + 95, -1, 96, -1, 19, -1, 5, 19, -1, 19, + 5, -1, 98, 19, -1, 5, 98, 19, -1, 98, + 19, 5, -1, 97, 96, -1, 21, 96, -1, 5, + 96, -1, 21, -1, 21, 5, -1, 97, -1, 97, + 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, 64, -1, 64, 5, + -1, 64, 99, -1, 64, 5, 99, -1, 19, 102, + -1, 102, -1, 78, 19, 102, -1, 19, 78, 102, + -1, 78, 102, -1, 100, -1, 19, 58, 103, 59, + -1, 19, 32, 58, 103, 59, -1, 103, 62, 19, + -1, 19, -1, 56, 24, -1, 60, -1, 40, 92, + 101, 94, 19, 58, 108, 59, 106, 104, -1, 78, + 40, 92, 100, 94, 19, 58, 108, 59, 106, 104, + -1, 39, 78, 94, 19, 58, 108, 59, 106, 104, + -1, 78, 39, 94, 19, 58, 108, 59, 106, 104, + -1, 39, 94, 19, 58, 108, 59, 106, 104, -1, + 41, 58, 21, 59, 94, 19, 58, 108, 59, 106, + 104, -1, 78, 94, 19, 58, 108, 59, 106, 104, + -1, 19, 58, 19, 59, 104, -1, 19, 107, -1, + 19, 107, 19, 107, -1, 19, 107, 19, 107, 19, + 107, -1, -1, 121, -1, 56, 24, -1, 6, -1, + 19, -1, 19, 5, -1, 5, 19, -1, 19, 62, + 109, -1, 19, 5, 62, 109, -1, 5, 19, 62, + 109, -1, 109, -1, 110, 62, 10, -1, 110, -1, + 110, 62, 111, -1, 111, -1, 94, 19, -1, 94, + 19, 22, -1, 94, 19, 58, 19, 112, 59, -1, + 94, 19, 22, 58, 19, 112, 59, -1, 112, 113, + -1, 113, -1, 19, -1, 65, 121, -1, 66, 121, + -1, 65, 61, 121, -1, 66, 61, 121, -1, 61, + 61, 121, -1, 67, 61, 121, -1, 9, 19, 56, + 115, 57, 21, 60, -1, 9, 19, 56, 115, 62, + 57, 21, 60, -1, 115, 62, 116, -1, 116, -1, + 19, 61, 121, -1, 19, -1, 49, 19, 56, 118, + 57, 21, 60, -1, 49, 19, 56, 118, 62, 57, + 21, 60, -1, 118, 62, 19, -1, 19, -1, 48, + 19, 56, 120, 57, 21, 60, -1, 48, 19, 56, + 120, 62, 57, 21, 60, -1, 120, 62, 19, -1, + 19, -1, 20, -1, 68, 20, -1, 23, -1, 19, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 704, 704, 705, 706, 707, 710, 719, 728, 737, - 746, 755, 764, 773, 784, 785, 786, 787, 788, 789, - 790, 791, 794, 799, 806, 823, 824, 832, 844, 853, - 865, 874, 883, 892, 903, 904, 907, 908, 917, 929, - 930, 931, 932, 935, 936, 937, 938, 941, 961, 985, - 989, 997, 998, 999, 1000, 1001, 1009, 1015, 1018, 1023, - 1091, 1145, 1234, 1242, 1247, 1295, 1331, 1347, 1348, 1351, - 1352, 1355, 1356, 1368, 1369, 1372, 1378, 1384, 1390, 1396, - 1402, 1408, 1415, 1421, 1427, 1433, 1439, 1445, 1451, 1457, - 1463, 1469, 1475, 1500, 1509, 1515, 1516, 1519, 1522, 1528, - 1535, 1544, 1547, 1550, 1554, 1558, 1562, 1567, 1575, 1579, - 1584, 1588, 1591, 1595, 1598, 1603, 1604, 1605, 1606, 1607, - 1608, 1609, 1610, 1611, 1614, 1615, 1616, 1619, 1620, 1621, - 1625, 1632, 1644, 1650, 1662, 1674, 1677, 1683, 1688, 1691, - 1696, 1697, 1701, 1724, 1747, 1770, 1793, 1811, 1824, 1834, - 1874, 1886, 1906, 1937, 1944, 1945, 1951, 1952, 1963, 1974, - 1985, 1995, 2005, 2015, 2018, 2019, 2022, 2023, 2026, 2029, - 2032, 2040, 2050, 2051, 2054, 2071, 2078, 2085, 2092, 2099, - 2106, 2115, 2124, 2135, 2136, 2139, 2159, 2169, 2178, 2189, - 2192, 2197, 2206, 2217, 2220, 2226, 2227, 2231, 2232 + 0, 713, 713, 714, 715, 716, 719, 728, 737, 746, + 755, 764, 773, 782, 793, 794, 795, 796, 797, 798, + 799, 800, 803, 808, 815, 832, 833, 841, 853, 862, + 874, 883, 892, 901, 912, 913, 916, 917, 926, 938, + 939, 940, 941, 944, 945, 946, 947, 950, 970, 994, + 998, 1006, 1007, 1008, 1009, 1010, 1018, 1024, 1027, 1032, + 1100, 1154, 1243, 1251, 1256, 1304, 1340, 1356, 1357, 1360, + 1361, 1364, 1365, 1377, 1378, 1381, 1387, 1393, 1399, 1405, + 1411, 1417, 1423, 1430, 1436, 1442, 1448, 1454, 1460, 1466, + 1472, 1478, 1484, 1490, 1515, 1524, 1530, 1531, 1534, 1537, + 1543, 1550, 1559, 1562, 1565, 1569, 1573, 1577, 1582, 1590, + 1594, 1599, 1603, 1606, 1610, 1613, 1618, 1619, 1620, 1621, + 1622, 1623, 1624, 1625, 1626, 1629, 1630, 1631, 1634, 1635, + 1636, 1640, 1647, 1659, 1665, 1677, 1689, 1692, 1698, 1701, + 1707, 1710, 1715, 1716, 1720, 1743, 1766, 1789, 1812, 1830, + 1843, 1853, 1893, 1905, 1925, 1956, 1963, 1964, 1970, 1971, + 1982, 1993, 2004, 2014, 2024, 2034, 2037, 2038, 2041, 2042, + 2045, 2048, 2051, 2059, 2069, 2070, 2073, 2090, 2097, 2104, + 2111, 2118, 2125, 2134, 2143, 2154, 2155, 2158, 2178, 2188, + 2197, 2208, 2211, 2216, 2225, 2236, 2239, 2245, 2246, 2250, + 2251 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +#if YYDEBUG || YYERROR_VERBOSE || 0 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = @@ -1312,7 +1346,7 @@ static const char *const yytname[] = "TYPETOKEN", "ARRAY_DIM", "SINGLE_CHAR", "CCODE", "CTCODE", "ADCODE", "HTCODE", "PHCODE", "HCODE", "ACODE", "ATCODE", "STRING", "PUBLIC", "PRIVATE", "PROTECTED", "CLASSWIDE", "PROPERTY", "ARGUMENT", "VIRTUAL", - "SIGNAL", "OVERRIDE", "NICK", "BLURB", "MAXIMUM", "MINIMUM", + "SIGNAL", "OVERRIDE", "NAME", "NICK", "BLURB", "MAXIMUM", "MINIMUM", "DEFAULT_VALUE", "ERROR", "FLAGS", "TYPE", "FLAGS_TYPE", "ENUM_TYPE", "PARAM_TYPE", "BOXED_TYPE", "OBJECT_TYPE", "'{'", "'}'", "'('", "')'", "';'", "'='", "','", "'|'", "'*'", "'>'", "'<'", "'!'", "'-'", "$accept", @@ -1325,7 +1359,7 @@ static const char *const yytname[] = "tokenlist", "codenocode", "method", "methodmods", "retcode", "funcargs", "arglist", "arglist1", "arg", "checklist", "check", "enumcode", "enumvals", "enumval", "flagcode", "flagvals", "errorcode", "errorvals", - "numtok", 0 + "numtok", YY_NULL }; #endif @@ -1339,34 +1373,35 @@ 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, 308, 309, 123, 125, 40, 41, 59, - 61, 44, 124, 42, 62, 60, 33, 45 + 305, 306, 307, 308, 309, 310, 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, 68, 69, 69, 69, 69, 70, 70, 70, 70, - 70, 70, 70, 70, 71, 71, 71, 71, 71, 71, - 71, 71, 72, 72, 73, 74, 74, 74, 74, 74, - 74, 74, 74, 74, 75, 75, 76, 76, 76, 76, - 76, 76, 76, 77, 77, 77, 77, 78, 78, 79, - 79, 80, 80, 80, 80, 80, 80, 81, 81, 82, - 82, 82, 83, 83, 84, 84, 84, 85, 85, 86, - 86, 87, 87, 88, 88, 89, 89, 89, 89, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 89, 90, 90, 91, 91, 92, 92, 93, - 93, 94, 94, 94, 94, 94, 94, 94, 95, 95, - 95, 95, 95, 95, 95, 96, 96, 96, 96, 96, - 96, 96, 96, 96, 97, 97, 97, 98, 98, 98, - 98, 99, 99, 100, 100, 100, 100, 101, 102, 102, - 103, 103, 104, 104, 104, 104, 104, 104, 104, 104, - 105, 105, 105, 105, 106, 106, 107, 107, 107, 107, - 107, 107, 107, 107, 108, 108, 109, 109, 110, 110, - 110, 110, 111, 111, 112, 112, 112, 112, 112, 112, - 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, - 117, 118, 118, 119, 119, 120, 120, 120, 120 + 0, 69, 70, 70, 70, 70, 71, 71, 71, 71, + 71, 71, 71, 71, 72, 72, 72, 72, 72, 72, + 72, 72, 73, 73, 74, 75, 75, 75, 75, 75, + 75, 75, 75, 75, 76, 76, 77, 77, 77, 77, + 77, 77, 77, 78, 78, 78, 78, 79, 79, 80, + 80, 81, 81, 81, 81, 81, 81, 82, 82, 83, + 83, 83, 84, 84, 85, 85, 85, 86, 86, 87, + 87, 88, 88, 89, 89, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 91, 91, 92, 92, 93, 93, + 94, 94, 95, 95, 95, 95, 95, 95, 95, 96, + 96, 96, 96, 96, 96, 96, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 98, 98, 98, 99, 99, + 99, 99, 100, 100, 101, 101, 101, 101, 102, 102, + 103, 103, 104, 104, 105, 105, 105, 105, 105, 105, + 105, 105, 106, 106, 106, 106, 107, 107, 108, 108, + 108, 108, 108, 108, 108, 108, 109, 109, 110, 110, + 111, 111, 111, 111, 112, 112, 113, 113, 113, 113, + 113, 113, 113, 114, 114, 115, 115, 116, 116, 117, + 117, 118, 118, 119, 119, 120, 120, 121, 121, 121, + 121 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1381,17 +1416,18 @@ static const yytype_uint8 yyr2[] = 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, 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 + 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, 5, + 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 reduction number in state STATE-NUM. @@ -1403,263 +1439,259 @@ static const yytype_uint8 yydefact[] = 12, 0, 0, 0, 18, 0, 5, 0, 19, 20, 21, 0, 0, 0, 0, 1, 14, 4, 15, 16, 17, 3, 0, 0, 0, 0, 0, 2, 0, 43, - 44, 45, 46, 0, 96, 0, 96, 0, 23, 42, - 0, 35, 0, 39, 40, 41, 36, 25, 186, 0, - 184, 194, 0, 190, 0, 0, 0, 0, 0, 37, - 0, 0, 0, 0, 115, 124, 125, 126, 122, 123, - 119, 117, 118, 120, 121, 116, 102, 111, 0, 0, - 100, 101, 113, 0, 0, 0, 22, 34, 0, 96, + 44, 45, 46, 0, 97, 0, 97, 0, 23, 42, + 0, 35, 0, 39, 40, 41, 36, 25, 188, 0, + 186, 196, 0, 192, 0, 0, 0, 0, 0, 37, + 0, 0, 0, 0, 116, 125, 126, 127, 123, 124, + 120, 118, 119, 121, 122, 117, 103, 112, 0, 0, + 101, 102, 114, 0, 0, 0, 22, 34, 0, 97, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, - 38, 0, 0, 68, 98, 0, 94, 0, 0, 103, - 110, 0, 104, 112, 109, 0, 0, 127, 99, 114, - 108, 105, 0, 0, 136, 0, 132, 0, 0, 0, - 56, 0, 198, 195, 197, 0, 185, 0, 0, 183, - 0, 193, 0, 0, 189, 0, 0, 0, 0, 0, - 0, 95, 0, 63, 106, 0, 0, 128, 129, 107, - 0, 0, 0, 131, 0, 135, 0, 0, 0, 0, - 0, 55, 56, 0, 0, 54, 53, 0, 0, 0, - 0, 0, 25, 196, 181, 0, 191, 0, 187, 0, - 0, 141, 149, 92, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 70, 0, 66, - 97, 0, 0, 0, 0, 0, 115, 102, 0, 0, - 163, 165, 167, 130, 139, 0, 134, 133, 0, 0, - 0, 0, 47, 0, 0, 0, 0, 49, 51, 0, - 52, 57, 0, 25, 25, 25, 0, 26, 182, 192, - 188, 140, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 67, 0, 0, 0, 0, 61, - 0, 103, 104, 0, 168, 153, 0, 137, 0, 0, - 0, 0, 0, 48, 58, 153, 50, 0, 25, 27, - 29, 28, 0, 25, 0, 71, 75, 76, 77, 78, - 198, 74, 79, 73, 80, 81, 83, 82, 85, 84, - 87, 86, 89, 88, 91, 90, 69, 0, 93, 62, - 0, 153, 0, 0, 160, 169, 0, 0, 0, 164, - 166, 138, 0, 0, 153, 0, 0, 25, 32, 25, - 30, 0, 0, 65, 0, 0, 162, 161, 0, 0, - 0, 150, 154, 146, 153, 0, 0, 0, 148, 33, - 31, 0, 0, 0, 60, 144, 0, 174, 0, 0, - 0, 0, 0, 173, 155, 0, 0, 153, 145, 153, - 72, 0, 0, 0, 0, 0, 175, 0, 176, 0, - 170, 172, 151, 142, 0, 0, 64, 0, 171, 179, - 177, 178, 180, 0, 147, 143, 59, 152 + 38, 0, 0, 68, 99, 0, 95, 0, 0, 104, + 111, 0, 105, 113, 110, 0, 0, 128, 100, 115, + 109, 106, 0, 0, 137, 0, 133, 0, 0, 0, + 56, 0, 200, 197, 199, 0, 187, 0, 0, 185, + 0, 195, 0, 0, 191, 0, 0, 0, 0, 0, + 0, 96, 0, 63, 107, 0, 0, 129, 130, 108, + 0, 0, 0, 0, 132, 0, 136, 0, 0, 0, + 0, 0, 55, 56, 0, 0, 54, 53, 0, 0, + 0, 0, 0, 25, 198, 183, 0, 193, 0, 189, + 0, 0, 143, 151, 93, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, + 0, 66, 98, 0, 0, 0, 0, 0, 116, 103, + 0, 0, 165, 167, 169, 131, 0, 141, 0, 135, + 134, 0, 0, 0, 0, 47, 0, 0, 0, 0, + 49, 51, 0, 52, 57, 0, 25, 25, 25, 0, + 26, 184, 194, 190, 142, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 67, 0, + 0, 0, 0, 61, 0, 104, 105, 0, 170, 155, + 0, 0, 138, 0, 0, 0, 0, 0, 48, 58, + 155, 50, 0, 25, 27, 29, 28, 0, 25, 0, + 71, 75, 76, 77, 78, 79, 200, 74, 80, 73, + 81, 82, 84, 83, 86, 85, 88, 87, 90, 89, + 92, 91, 69, 0, 94, 62, 0, 155, 0, 0, + 162, 171, 0, 0, 0, 166, 168, 139, 140, 0, + 0, 155, 0, 0, 25, 32, 25, 30, 0, 0, + 65, 0, 0, 164, 163, 0, 0, 0, 152, 156, + 148, 155, 0, 0, 0, 150, 33, 31, 0, 0, + 0, 60, 146, 0, 176, 0, 0, 0, 0, 0, + 175, 157, 0, 0, 155, 147, 155, 72, 0, 0, + 0, 0, 0, 177, 0, 178, 0, 172, 174, 153, + 144, 0, 0, 64, 0, 173, 181, 179, 180, 182, + 0, 149, 145, 59, 154 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { -1, 13, 14, 15, 16, 17, 102, 50, 51, 52, - 185, 186, 187, 53, 54, 223, 55, 159, 216, 306, - 312, 217, 117, 72, 115, 228, 90, 91, 92, 93, - 128, 134, 135, 136, 235, 202, 56, 338, 361, 229, - 230, 231, 232, 382, 383, 18, 59, 60, 19, 64, - 20, 62, 362 + 186, 187, 188, 53, 54, 225, 55, 159, 218, 311, + 318, 219, 117, 72, 115, 230, 90, 91, 92, 93, + 128, 134, 135, 136, 238, 203, 56, 344, 368, 231, + 232, 233, 234, 389, 390, 18, 59, 60, 19, 64, + 20, 62, 369 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -360 +#define YYPACT_NINF -334 static const yytype_int16 yypact[] = { - 162, -2, 6, -360, -360, -360, -360, -360, -360, -360, - -360, 16, 90, 131, -360, 162, 210, 77, -360, -360, - -360, 156, 126, 160, 167, -360, -360, 210, -360, -360, - -360, 210, 161, 223, 153, 230, 231, 210, 226, -360, - -360, -360, -360, 244, 207, 309, 207, 214, -360, -360, - 192, -360, 292, -360, -360, -360, -360, 215, 242, -28, - -360, -360, 151, -360, 152, 255, 300, 310, 292, -360, - 319, 330, 336, 376, -360, -360, -360, -360, -360, -360, - -360, -360, -360, -360, -360, -360, 351, 444, 393, 338, - 295, -360, 458, 360, 327, 365, -360, -360, 393, 207, - 377, 384, -360, 7, 392, 92, 399, 98, 409, 100, - -360, 379, 428, 394, 390, 395, 397, 447, 472, -360, - -360, 448, -360, 472, -360, 449, 423, 5, -360, 472, - -360, 476, 149, 463, -360, 393, -360, 433, 473, 475, - 58, 184, -360, -360, -360, 477, -360, 436, 478, -360, - 437, -360, 479, 439, -360, 480, 159, 445, 236, -4, - 330, -360, 484, 450, -360, 451, 410, 295, -360, -360, - 452, 485, 486, -360, 69, -360, 487, 393, 453, 69, - 393, 115, -3, 410, 18, 454, 492, 456, 117, 455, - 459, 488, 215, -360, -360, 457, -360, 460, -360, 462, - 494, -360, -360, -360, 464, 465, 466, 467, 468, 469, - 470, 471, 474, 481, 482, 483, 185, -360, 489, -360, - -360, 393, 493, 503, 410, 427, 490, 8, 504, 491, - -360, 495, -360, -360, -360, 212, -360, -360, 496, 513, - 410, 514, -360, 511, 498, 497, 512, -360, -360, 115, - -360, -360, 120, 215, 215, 215, 121, -360, -360, -360, - -360, -360, 110, 110, 7, 7, 63, 330, 393, 119, - 202, 235, 274, 333, -360, 236, 515, 500, 501, 499, - 502, 289, 290, 393, -8, 518, 359, -360, 519, 410, - 505, 506, 508, -360, -360, 518, -360, 509, 215, -360, - -360, -360, 510, 215, 516, -360, -360, -360, -360, -360, - 516, -360, -360, -360, -360, -360, -360, -360, -360, -360, - -360, -360, -360, -360, -360, -360, -360, 13, -360, -360, - 521, 518, 393, 393, -360, 517, 527, 70, 159, -360, - -360, -360, 520, 410, 518, 410, 159, 215, -360, 215, - -360, 529, 522, -360, 65, 159, -360, -360, 528, 32, - 526, 532, -360, -360, 518, 523, 159, 524, -360, -360, - -360, 525, 539, 530, -360, -360, 32, -360, 531, 27, - 83, 533, 56, -360, -360, 70, 159, 518, -360, 518, - -360, 507, 545, 81, 7, 7, -360, 7, -360, 7, - -360, -360, 551, -360, 159, 159, -360, 535, -360, -360, - -360, -360, -360, 70, -360, -360, -360, -360 + 169, 10, 22, -334, -334, -334, -334, -334, -334, -334, + -334, 82, 99, 133, -334, 169, 220, 96, -334, -334, + -334, 181, 134, 135, 145, -334, -334, 220, -334, -334, + -334, 220, 170, 205, 183, 212, 213, 220, 237, -334, + -334, -334, -334, 223, 196, 341, 196, 203, -334, -334, + 200, -334, 324, -334, -334, -334, -334, 204, 192, -30, + -334, -334, 102, -334, 125, 208, 332, 256, 324, -334, + 262, 263, 278, 390, -334, -334, -334, -334, -334, -334, + -334, -334, -334, -334, -334, -334, 300, 458, 407, 292, + 257, -334, 472, 315, 274, 246, -334, -334, 407, 196, + 325, 342, -334, 76, 348, 68, 349, 69, 372, 73, + -334, 351, 381, 359, 364, 375, 386, 432, 486, -334, + -334, 442, -334, 486, -334, 446, 408, 4, -334, 486, + -334, 462, 255, 449, -334, 407, -334, 421, 463, 475, + 3, 154, -334, -334, -334, 461, -334, 435, 484, -334, + 436, -334, 485, 448, -334, 488, 128, 452, 273, 7, + 263, -334, 492, 454, -334, 455, 424, 257, -334, -334, + -2, 456, 496, 497, -334, 27, -334, 498, 407, 460, + 27, 407, 92, -6, 424, -5, 459, 500, 464, 65, + 466, 467, 489, 204, -334, -334, 468, -334, 469, -334, + 470, 499, -334, -334, -334, 471, 473, 474, 476, 477, + 478, 479, 480, 481, 482, 483, 487, 490, 153, -334, + 491, -334, -334, 407, 503, 508, 424, 441, 493, 14, + 512, 494, -334, 495, -334, -334, 496, -334, 161, -334, + -334, 501, 514, 424, 517, -334, 521, 502, 504, 522, + -334, -334, 92, -334, -334, 80, 204, 204, 204, 121, + -334, -334, -334, -334, -334, 144, 144, 144, 76, 76, + 16, 263, 407, 195, 275, 281, 285, 293, -334, 273, + 525, 505, 506, 510, 509, 162, 163, 407, 88, 531, + 373, 193, -334, 535, 424, 511, 513, 515, -334, -334, + 531, -334, 516, 204, -334, -334, -334, 518, 204, 520, + -334, -334, -334, -334, -334, -334, 520, -334, -334, -334, + -334, -334, -334, -334, -334, -334, -334, -334, -334, -334, + -334, -334, -334, 9, -334, -334, 532, 531, 407, 407, + -334, 523, 536, 30, 128, -334, -334, -334, -334, 524, + 424, 531, 424, 128, 204, -334, 204, -334, 526, 528, + -334, 23, 128, -334, -334, 541, 75, 537, 548, -334, + -334, 531, 527, 128, 529, -334, -334, -334, 530, 546, + 534, -334, -334, 75, -334, 519, 70, 86, 533, 62, + -334, -334, 30, 128, 531, -334, 531, -334, 538, 547, + 84, 76, 76, -334, 76, -334, 76, -334, -334, 555, + -334, 128, 128, -334, 539, -334, -334, -334, -334, -334, + 30, -334, -334, -334, -334 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -360, -360, 21, 15, 537, -360, -190, -360, 534, -27, - 354, 386, 398, -360, -360, -360, -360, -360, -360, -90, - -360, 297, -360, -37, -155, -44, -360, -70, -360, -67, - -23, 440, -360, -5, -360, -326, 85, -288, -278, -179, - -262, -360, 301, 199, -359, 237, -360, 536, 238, -360, - 322, -360, -103 + -334, -334, 146, 165, 561, -334, -186, -334, 542, -28, + 392, 396, 402, -334, -334, -334, -334, -334, -334, -233, + -334, 308, -334, -34, -155, -44, -334, -71, -334, -69, + -47, 457, -334, -18, 355, -333, 94, -294, -285, -181, + -264, -334, 303, 214, -281, 228, -334, 507, 248, -334, + 249, -334, -103 }; /* 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 YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -160 +#define YYTABLE_NINF -162 static const yytype_int16 yytable[] = { - 146, 89, 257, 120, 245, 220, 121, 346, 100, 94, - 167, 68, 363, 282, 335, 218, 181, 124, 88, 21, - 368, 334, 130, 401, 112, 22, 142, 143, 104, 375, - 144, 31, 352, 105, 401, 23, 26, 142, 143, 68, - 388, 144, 37, 355, 125, 280, 142, 143, 120, 336, - 144, 377, 26, 120, 138, 219, 366, 184, 26, 120, - 403, 291, 139, 299, 300, 301, -157, 133, 127, 283, - 356, 357, 353, 246, 145, 377, 386, 181, 414, 415, - 182, 247, 310, 143, 373, 145, 144, 395, 170, 142, - 143, 176, 378, 144, 145, 305, 379, 380, 381, 404, - 377, 405, 142, 143, 168, 172, 144, 402, 348, 24, - 342, 58, 314, 350, 400, 183, 378, 151, 184, 154, - 379, 380, 381, 69, 374, 360, 171, 173, 175, 304, - 145, 25, 32, 239, 242, 417, 241, 145, 316, 408, - 317, 378, 305, 397, 233, 379, 380, 381, 148, 252, - 145, 110, 297, 302, 152, 120, 155, 369, 121, 370, - 33, 308, 309, 313, 365, 1, 367, 236, 170, 237, - 243, 2, 58, 307, 173, 253, 311, 277, 298, 303, - 38, 34, 39, 40, 41, 42, 3, 4, 5, 6, - 7, 8, 9, 10, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 188, 189, 190, 171, 106, 108, 11, - 12, 38, 107, 109, 200, 35, 191, 48, 201, 2, - 49, 318, 36, 319, 315, 39, 40, 41, 42, 43, - 44, 45, 46, 47, 3, 4, 5, 6, 7, 8, - 9, 10, 192, 274, 57, 65, 275, 66, 96, 61, - 63, 49, 28, 29, 320, 203, 321, 11, 12, 39, - 40, 41, 42, 70, 71, 45, 46, 47, 28, 29, - 287, 95, 101, 288, 28, 29, 396, 398, 204, 205, - 206, 207, 208, 67, 209, 210, 211, 212, 213, 214, - 215, 409, 410, 322, 411, 323, 412, 73, 74, 75, - 76, 77, 103, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 67, 87, 73, 74, 75, 76, 77, 65, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 111, - 87, 98, 99, 39, 40, 41, 42, 30, 113, 45, - 46, 47, 39, 40, 41, 42, 132, -159, -158, 114, - 332, 333, 324, 30, 325, 116, 122, 126, 127, 30, - 39, 40, 41, 42, 73, 74, 75, 76, 77, 339, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 131, - 87, 118, 74, 75, 76, 77, 137, 78, 79, 80, - 81, 82, 83, 84, 85, 119, 140, 87, 73, 74, - 75, 76, 77, 141, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 147, 87, 225, 226, 75, 76, 77, - 150, 78, 79, 80, 81, 82, 83, 84, 85, 227, - 153, 87, 118, 74, 75, 76, 77, 156, 78, 79, - 80, 81, 82, 83, 84, 85, 281, 157, 87, 123, - 74, 158, 160, 161, 162, 78, 79, 80, 81, 82, - 83, 84, 85, 129, 74, 87, 163, 164, 165, 78, - 79, 80, 81, 82, 83, 84, 85, 118, 74, 87, - 166, 169, 174, 78, 79, 80, 81, 82, 83, 84, - 85, 177, 178, 87, 179, 194, 196, 193, 198, 195, - 197, 199, 183, 221, 234, 170, 238, 222, 224, 171, - 240, 249, 278, 254, 184, 251, 258, 255, 261, 259, - 256, 260, 279, 284, 262, 263, 264, 265, 266, 267, - 268, 269, 290, 292, 270, 293, 296, 337, 341, 327, - 250, 271, 272, 273, 276, 354, 359, 376, -156, 285, - 384, 385, 27, 289, 330, 295, 286, 294, 328, 329, - 331, 371, 343, 391, 344, 345, 406, 347, 349, 407, - 413, 248, 326, 351, 358, 393, 0, 372, 364, 180, - 244, 387, 389, 390, 97, 392, 0, 340, 0, 0, - 0, 394, 0, 399, 416, 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, + 146, 89, 120, 248, 121, 222, 353, 260, 100, 167, + 68, 370, 94, 182, 142, 143, 124, 88, 144, 286, + 375, 130, 182, 340, 112, 183, 220, 104, 359, 382, + 171, 21, 105, 312, 313, 316, 143, 317, 68, 144, + 395, 22, 380, 362, 125, 284, 170, 120, 310, 142, + 143, 249, 120, 144, 138, 185, 172, 373, 120, 171, + 410, 184, 296, 145, 185, 139, 133, 221, 127, 360, + 304, 305, 306, -159, 363, 364, 287, 393, 421, 422, + 168, 384, 250, 381, 145, 172, 367, 58, 151, 142, + 143, 177, 154, 144, 384, 142, 143, 255, 145, 144, + 411, 23, 412, 384, 173, 142, 143, 409, 408, 144, + 341, 245, 302, 349, 174, 176, 320, 355, 24, 408, + 235, 407, 357, 385, 256, 148, 152, 386, 387, 388, + 155, 402, 69, 25, 242, 424, 385, 244, 145, 303, + 386, 387, 388, 415, 145, 385, 342, 404, 246, 386, + 387, 388, 32, 307, 145, 239, 120, 240, 121, 106, + 110, 26, 174, 309, 107, 314, 315, 319, 376, 372, + 377, 374, 1, 189, 190, 191, 310, 26, 2, 281, + 308, 31, 108, 26, 201, 33, 192, 109, 202, 38, + 34, 35, 37, 3, 4, 5, 6, 7, 8, 9, + 10, 36, 58, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 278, 193, 322, 279, 323, 11, 12, 38, + 292, -161, -160, 293, 338, 339, 57, 48, 321, 2, + 49, 61, 63, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 70, 28, 3, 4, 5, 6, 7, 8, + 9, 10, 347, 103, 71, 293, 65, 96, 66, 28, + 49, 95, 101, 29, 30, 28, 67, 137, 11, 12, + 39, 40, 41, 42, 170, 111, 45, 46, 47, 29, + 30, 113, 114, 403, 405, 29, 30, 171, 39, 40, + 41, 42, 204, 132, 324, 67, 325, 116, 416, 417, + 326, 418, 327, 419, 328, 122, 329, 39, 40, 41, + 42, 126, 330, 172, 331, 205, 206, 207, 208, 209, + 210, 127, 211, 212, 213, 214, 215, 216, 217, 73, + 74, 75, 76, 77, 131, 78, 79, 80, 81, 82, + 83, 84, 85, 86, 140, 87, 73, 74, 75, 76, + 77, 65, 78, 79, 80, 81, 82, 83, 84, 85, + 86, 141, 87, 98, 99, 39, 40, 41, 42, 147, + 150, 45, 46, 47, 39, 40, 41, 42, 73, 74, + 75, 76, 77, 345, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 153, 87, 118, 74, 75, 76, 77, + 157, 78, 79, 80, 81, 82, 83, 84, 85, 119, + 156, 87, 73, 74, 75, 76, 77, 158, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 160, 87, 227, + 228, 75, 76, 77, 161, 78, 79, 80, 81, 82, + 83, 84, 85, 229, 162, 87, 118, 74, 75, 76, + 77, 163, 78, 79, 80, 81, 82, 83, 84, 85, + 285, 164, 87, 123, 74, 165, 166, 169, 175, 78, + 79, 80, 81, 82, 83, 84, 85, 129, 74, 87, + 178, 194, 179, 78, 79, 80, 81, 82, 83, 84, + 85, 118, 74, 87, 180, 195, 197, 78, 79, 80, + 81, 82, 83, 84, 85, 196, 198, 87, 199, 200, + 184, 223, 224, 226, 236, 237, 170, 241, 243, 252, + 185, 259, 282, 264, 254, 257, 258, 283, 261, 262, + 263, 288, 265, 295, 266, 267, 297, 268, 269, 270, + 271, 272, 273, 274, 275, 298, 301, 280, 276, 333, + 343, 277, -158, 289, 348, 366, 361, 290, 378, 294, + 383, 391, 299, 300, 334, 335, 336, 392, 337, 350, + 398, 414, 351, 352, 420, 354, 27, 356, 358, 253, + 401, 365, 251, 371, 379, 247, 394, 332, 396, 397, + 399, 291, 97, 346, 406, 0, 181, 400, 413, 423, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 149 + 0, 0, 149 }; -#define yypact_value_is_default(yystate) \ - ((yystate) == (-360)) +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-334))) -#define yytable_value_is_error(yytable_value) \ +#define yytable_value_is_error(Yytable_value) \ YYID (0) static const yytype_int16 yycheck[] = { - 103, 45, 192, 73, 183, 160, 73, 295, 52, 46, - 5, 38, 338, 5, 22, 19, 19, 87, 45, 21, - 346, 283, 92, 382, 68, 19, 19, 20, 56, 355, - 23, 16, 19, 61, 393, 19, 15, 19, 20, 66, - 366, 23, 27, 331, 88, 224, 19, 20, 118, 57, - 23, 19, 31, 123, 98, 59, 344, 60, 37, 129, - 386, 240, 99, 253, 254, 255, 58, 94, 63, 61, - 332, 333, 59, 55, 67, 19, 364, 19, 404, 405, - 22, 184, 19, 20, 19, 67, 23, 60, 19, 19, - 20, 135, 60, 23, 67, 32, 64, 65, 66, 387, - 19, 389, 19, 20, 127, 132, 23, 385, 298, 19, - 289, 19, 267, 303, 58, 57, 60, 19, 60, 19, - 64, 65, 66, 38, 59, 55, 57, 132, 133, 19, - 67, 0, 55, 177, 19, 413, 180, 67, 19, 58, - 21, 60, 32, 60, 167, 64, 65, 66, 56, 32, - 67, 66, 32, 32, 56, 225, 56, 347, 225, 349, - 4, 264, 265, 266, 343, 3, 345, 172, 19, 174, - 55, 9, 19, 263, 179, 58, 266, 221, 58, 58, - 19, 55, 33, 34, 35, 36, 24, 25, 26, 27, - 28, 29, 30, 31, 33, 34, 35, 36, 37, 38, - 39, 40, 41, 19, 20, 21, 57, 56, 56, 47, - 48, 19, 61, 61, 55, 55, 32, 56, 59, 9, - 59, 19, 55, 21, 268, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 24, 25, 26, 27, 28, 29, - 30, 31, 58, 58, 21, 19, 61, 21, 56, 19, - 19, 59, 15, 15, 19, 19, 21, 47, 48, 33, - 34, 35, 36, 19, 57, 39, 40, 41, 31, 31, - 58, 57, 57, 61, 37, 37, 379, 380, 42, 43, - 44, 45, 46, 57, 48, 49, 50, 51, 52, 53, - 54, 394, 395, 19, 397, 21, 399, 5, 6, 7, - 8, 9, 60, 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, 19, - 21, 39, 40, 33, 34, 35, 36, 15, 19, 39, - 40, 41, 33, 34, 35, 36, 19, 58, 58, 19, - 61, 61, 19, 31, 21, 19, 5, 19, 63, 37, - 33, 34, 35, 36, 5, 6, 7, 8, 9, 10, - 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, 19, 21, 5, 6, - 7, 8, 9, 19, 11, 12, 13, 14, 15, 16, + 103, 45, 73, 184, 73, 160, 300, 193, 52, 5, + 38, 344, 46, 19, 19, 20, 87, 45, 23, 5, + 353, 92, 19, 287, 68, 22, 19, 57, 19, 362, + 32, 21, 62, 266, 267, 19, 20, 270, 66, 23, + 373, 19, 19, 337, 88, 226, 19, 118, 32, 19, + 20, 56, 123, 23, 98, 61, 58, 351, 129, 32, + 393, 58, 243, 68, 61, 99, 94, 60, 64, 60, + 256, 257, 258, 59, 338, 339, 62, 371, 411, 412, + 127, 19, 185, 60, 68, 58, 56, 19, 19, 19, + 20, 135, 19, 23, 19, 19, 20, 32, 68, 23, + 394, 19, 396, 19, 132, 19, 20, 392, 389, 23, + 22, 19, 32, 294, 132, 133, 271, 303, 19, 400, + 167, 59, 308, 61, 59, 57, 57, 65, 66, 67, + 57, 61, 38, 0, 178, 420, 61, 181, 68, 59, + 65, 66, 67, 59, 68, 61, 58, 61, 56, 65, + 66, 67, 56, 32, 68, 173, 227, 175, 227, 57, + 66, 15, 180, 19, 62, 268, 269, 270, 354, 350, + 356, 352, 3, 19, 20, 21, 32, 31, 9, 223, + 59, 16, 57, 37, 56, 4, 32, 62, 60, 19, + 56, 56, 27, 24, 25, 26, 27, 28, 29, 30, + 31, 56, 19, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 59, 59, 19, 62, 21, 48, 49, 19, + 59, 59, 59, 62, 62, 62, 21, 57, 272, 9, + 60, 19, 19, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 19, 15, 24, 25, 26, 27, 28, 29, + 30, 31, 59, 61, 58, 62, 19, 57, 21, 31, + 60, 58, 58, 15, 15, 37, 58, 21, 48, 49, + 33, 34, 35, 36, 19, 19, 39, 40, 41, 31, + 31, 19, 19, 386, 387, 37, 37, 32, 33, 34, + 35, 36, 19, 19, 19, 58, 21, 19, 401, 402, + 19, 404, 21, 406, 19, 5, 21, 33, 34, 35, + 36, 19, 19, 58, 21, 42, 43, 44, 45, 46, + 47, 64, 49, 50, 51, 52, 53, 54, 55, 5, + 6, 7, 8, 9, 19, 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, 19, 21, 39, 40, 33, 34, 35, 36, 21, + 21, 39, 40, 41, 33, 34, 35, 36, 5, 6, + 7, 8, 9, 10, 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, 58, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 19, 21, 5, - 6, 57, 62, 58, 57, 11, 12, 13, 14, 15, - 16, 17, 18, 5, 6, 21, 19, 19, 19, 11, + 19, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 59, 21, 5, 6, 7, 8, 9, 58, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 63, 21, 5, + 6, 7, 8, 9, 59, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 58, 21, 5, 6, 7, 8, + 9, 19, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 19, 21, 5, 6, 19, 58, 5, 19, 11, 12, 13, 14, 15, 16, 17, 18, 5, 6, 21, - 57, 5, 19, 11, 12, 13, 14, 15, 16, 17, - 18, 58, 19, 21, 19, 59, 59, 20, 59, 21, - 21, 21, 57, 19, 19, 19, 19, 57, 57, 57, - 57, 19, 19, 58, 60, 59, 59, 58, 24, 59, - 32, 59, 19, 19, 60, 60, 60, 60, 60, 60, - 60, 60, 19, 19, 60, 24, 24, 19, 19, 24, - 186, 60, 60, 60, 55, 24, 19, 19, 58, 58, - 24, 19, 15, 57, 55, 58, 61, 59, 58, 58, - 58, 32, 57, 24, 58, 57, 59, 58, 58, 24, - 19, 185, 275, 57, 57, 376, -1, 55, 58, 139, - 182, 58, 58, 58, 50, 55, -1, 286, -1, -1, - -1, 60, -1, 60, 59, -1, -1, -1, -1, -1, + 59, 20, 19, 11, 12, 13, 14, 15, 16, 17, + 18, 5, 6, 21, 19, 60, 60, 11, 12, 13, + 14, 15, 16, 17, 18, 21, 21, 21, 60, 21, + 58, 19, 58, 58, 58, 19, 19, 19, 58, 19, + 61, 32, 19, 24, 60, 59, 59, 19, 60, 60, + 60, 19, 61, 19, 61, 61, 19, 61, 61, 61, + 61, 61, 61, 61, 61, 24, 24, 56, 61, 24, + 19, 61, 59, 59, 19, 19, 24, 62, 32, 58, + 19, 24, 60, 59, 59, 59, 56, 19, 59, 58, + 24, 24, 59, 58, 19, 59, 15, 59, 58, 187, + 61, 58, 186, 59, 56, 183, 59, 279, 59, 59, + 56, 236, 50, 290, 61, -1, 139, 383, 60, 60, -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, 105 + -1, -1, 105 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1667,47 +1699,48 @@ static const yytype_int16 yycheck[] = static const yytype_uint8 yystos[] = { 0, 3, 9, 24, 25, 26, 27, 28, 29, 30, - 31, 47, 48, 69, 70, 71, 72, 73, 113, 116, - 118, 21, 19, 19, 19, 0, 70, 72, 113, 116, - 118, 71, 55, 4, 55, 55, 55, 71, 19, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 56, 59, - 75, 76, 77, 81, 82, 84, 104, 21, 19, 114, - 115, 19, 119, 19, 117, 19, 21, 57, 77, 104, - 19, 57, 91, 5, 6, 7, 8, 9, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 21, 77, 93, - 94, 95, 96, 97, 91, 57, 56, 76, 39, 40, - 93, 57, 74, 60, 56, 61, 56, 61, 56, 61, - 104, 19, 93, 19, 19, 92, 19, 90, 5, 19, - 95, 97, 5, 5, 95, 93, 19, 63, 98, 5, - 95, 19, 19, 77, 99, 100, 101, 21, 93, 91, - 19, 19, 19, 20, 23, 67, 120, 21, 56, 115, - 21, 19, 56, 21, 19, 56, 58, 19, 57, 85, - 62, 58, 57, 19, 19, 19, 57, 5, 98, 5, - 19, 57, 77, 101, 19, 101, 93, 58, 19, 19, - 99, 19, 22, 57, 60, 78, 79, 80, 19, 20, - 21, 32, 58, 20, 59, 21, 59, 21, 59, 21, - 55, 59, 103, 19, 42, 43, 44, 45, 46, 48, - 49, 50, 51, 52, 53, 54, 86, 89, 19, 59, - 92, 19, 57, 83, 57, 5, 6, 19, 93, 107, - 108, 109, 110, 98, 19, 102, 101, 101, 19, 93, - 57, 93, 19, 55, 80, 107, 55, 120, 79, 19, - 78, 59, 32, 58, 58, 58, 32, 74, 59, 59, - 59, 24, 60, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 58, 61, 55, 93, 19, 19, - 107, 19, 5, 61, 19, 58, 61, 58, 61, 57, - 19, 107, 19, 24, 59, 58, 24, 32, 58, 74, - 74, 74, 32, 58, 19, 32, 87, 87, 120, 120, - 19, 87, 88, 120, 92, 93, 19, 21, 19, 21, - 19, 21, 19, 21, 19, 21, 89, 24, 58, 58, - 55, 58, 61, 61, 108, 22, 57, 19, 105, 10, - 110, 19, 107, 57, 58, 57, 105, 58, 74, 58, - 74, 57, 19, 59, 24, 105, 108, 108, 57, 19, - 55, 106, 120, 103, 58, 107, 105, 107, 103, 74, - 74, 32, 55, 19, 59, 103, 19, 19, 60, 64, - 65, 66, 111, 112, 24, 19, 105, 58, 103, 58, - 58, 24, 55, 111, 60, 60, 120, 60, 120, 60, - 58, 112, 106, 103, 105, 105, 59, 24, 58, 120, - 120, 120, 120, 19, 103, 103, 59, 106 + 31, 48, 49, 70, 71, 72, 73, 74, 114, 117, + 119, 21, 19, 19, 19, 0, 71, 73, 114, 117, + 119, 72, 56, 4, 56, 56, 56, 72, 19, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 57, 60, + 76, 77, 78, 82, 83, 85, 105, 21, 19, 115, + 116, 19, 120, 19, 118, 19, 21, 58, 78, 105, + 19, 58, 92, 5, 6, 7, 8, 9, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 21, 78, 94, + 95, 96, 97, 98, 92, 58, 57, 77, 39, 40, + 94, 58, 75, 61, 57, 62, 57, 62, 57, 62, + 105, 19, 94, 19, 19, 93, 19, 91, 5, 19, + 96, 98, 5, 5, 96, 94, 19, 64, 99, 5, + 96, 19, 19, 78, 100, 101, 102, 21, 94, 92, + 19, 19, 19, 20, 23, 68, 121, 21, 57, 116, + 21, 19, 57, 21, 19, 57, 59, 19, 58, 86, + 63, 59, 58, 19, 19, 19, 58, 5, 99, 5, + 19, 32, 58, 78, 102, 19, 102, 94, 59, 19, + 19, 100, 19, 22, 58, 61, 79, 80, 81, 19, + 20, 21, 32, 59, 20, 60, 21, 60, 21, 60, + 21, 56, 60, 104, 19, 42, 43, 44, 45, 46, + 47, 49, 50, 51, 52, 53, 54, 55, 87, 90, + 19, 60, 93, 19, 58, 84, 58, 5, 6, 19, + 94, 108, 109, 110, 111, 99, 58, 19, 103, 102, + 102, 19, 94, 58, 94, 19, 56, 81, 108, 56, + 121, 80, 19, 79, 60, 32, 59, 59, 59, 32, + 75, 60, 60, 60, 24, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 59, 62, + 56, 94, 19, 19, 108, 19, 5, 62, 19, 59, + 62, 103, 59, 62, 58, 19, 108, 19, 24, 60, + 59, 24, 32, 59, 75, 75, 75, 32, 59, 19, + 32, 88, 88, 88, 121, 121, 19, 88, 89, 121, + 93, 94, 19, 21, 19, 21, 19, 21, 19, 21, + 19, 21, 90, 24, 59, 59, 56, 59, 62, 62, + 109, 22, 58, 19, 106, 10, 111, 59, 19, 108, + 58, 59, 58, 106, 59, 75, 59, 75, 58, 19, + 60, 24, 106, 109, 109, 58, 19, 56, 107, 121, + 104, 59, 108, 106, 108, 104, 75, 75, 32, 56, + 19, 60, 104, 19, 19, 61, 65, 66, 67, 112, + 113, 24, 19, 106, 59, 104, 59, 59, 24, 56, + 112, 61, 61, 121, 61, 121, 61, 59, 113, 107, + 104, 106, 106, 60, 24, 59, 121, 121, 121, 121, + 19, 104, 104, 60, 107 }; #define yyerrok (yyerrstatus = 0) @@ -1737,62 +1770,35 @@ static const yytype_uint8 yystos[] = #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (YYID (0)) - +/* Error token number */ #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - - /* This macro is provided for backward compatibility. */ - #ifndef YY_LOCATION_PRINT # define YY_LOCATION_PRINT(File, Loc) ((void) 0) #endif /* YYLEX -- calling `yylex' with the right arguments. */ - #ifdef YYLEX_PARAM # define YYLEX yylex (YYLEX_PARAM) #else @@ -1842,6 +1848,8 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) YYSTYPE const * const yyvaluep; #endif { + FILE *yyo = yyoutput; + YYUSE (yyo); if (!yyvaluep) return; # ifdef YYPRINT @@ -1853,7 +1861,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep) switch (yytype) { default: - break; + break; } } @@ -2093,12 +2101,11 @@ static int yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = 0; + const char *yyformat = YY_NULL; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -2158,11 +2165,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } } } } @@ -2182,10 +2191,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, # undef YYCASE_ } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } if (*yymsg_alloc < yysize) { @@ -2245,32 +2256,27 @@ yydestruct (yymsg, yytype, yyvaluep) { default: - break; + break; } } -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ /* The lookahead symbol. */ int yychar; + +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + /* The semantic value of the lookahead symbol. */ -YYSTYPE yylval; +YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); /* Number of syntax errors so far. */ int yynerrs; @@ -2310,7 +2316,7 @@ yyparse () `yyss': related to states. `yyvs': related to semantic values. - Refer to the stacks thru separate pointers, to allow yyoverflow + Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* The state stack. */ @@ -2328,7 +2334,7 @@ yyparse () int yyn; int yyresult; /* Lookahead token as an internal (translated) token number. */ - int yytoken; + int yytoken = 0; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; @@ -2346,9 +2352,8 @@ yyparse () Keep to zero when no symbol should be popped. */ int yylen = 0; - yytoken = 0; - yyss = yyssa; - yyvs = yyvsa; + yyssp = yyss = yyssa; + yyvsp = yyvs = yyvsa; yystacksize = YYINITDEPTH; YYDPRINTF ((stderr, "Starting parse\n")); @@ -2357,14 +2362,6 @@ yyparse () yyerrstatus = 0; yynerrs = 0; yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - yyssp = yyss; - yyvsp = yyvs; - goto yysetstate; /*------------------------------------------------------------. @@ -2505,7 +2502,9 @@ yybackup: yychar = YYEMPTY; yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END goto yynewstate; @@ -2542,37 +2541,32 @@ yyreduce: switch (yyn) { case 2: - -/* Line 1806 of yacc.c */ -#line 704 "parse.y" +/* Line 1792 of yacc.c */ +#line 713 "parse.y" { ; } break; case 3: - -/* Line 1806 of yacc.c */ -#line 705 "parse.y" +/* Line 1792 of yacc.c */ +#line 714 "parse.y" { ; } break; case 4: - -/* Line 1806 of yacc.c */ -#line 706 "parse.y" +/* Line 1792 of yacc.c */ +#line 715 "parse.y" { ; } break; case 5: - -/* Line 1806 of yacc.c */ -#line 707 "parse.y" +/* Line 1792 of yacc.c */ +#line 716 "parse.y" { ; } break; case 6: - -/* Line 1806 of yacc.c */ -#line 710 "parse.y" +/* Line 1792 of yacc.c */ +#line 719 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", C_CCODE, @@ -2585,9 +2579,8 @@ yyreduce: break; case 7: - -/* Line 1806 of yacc.c */ -#line 719 "parse.y" +/* Line 1792 of yacc.c */ +#line 728 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", AD_CCODE, @@ -2600,9 +2593,8 @@ yyreduce: break; case 8: - -/* Line 1806 of yacc.c */ -#line 728 "parse.y" +/* Line 1792 of yacc.c */ +#line 737 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", H_CCODE, @@ -2615,9 +2607,8 @@ yyreduce: break; case 9: - -/* Line 1806 of yacc.c */ -#line 737 "parse.y" +/* Line 1792 of yacc.c */ +#line 746 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", HT_CCODE, @@ -2630,9 +2621,8 @@ yyreduce: break; case 10: - -/* Line 1806 of yacc.c */ -#line 746 "parse.y" +/* Line 1792 of yacc.c */ +#line 755 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", PH_CCODE, @@ -2645,9 +2635,8 @@ yyreduce: break; case 11: - -/* Line 1806 of yacc.c */ -#line 755 "parse.y" +/* Line 1792 of yacc.c */ +#line 764 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", A_CCODE, @@ -2660,9 +2649,8 @@ yyreduce: break; case 12: - -/* Line 1806 of yacc.c */ -#line 764 "parse.y" +/* Line 1792 of yacc.c */ +#line 773 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", AT_CCODE, @@ -2675,9 +2663,8 @@ yyreduce: break; case 13: - -/* Line 1806 of yacc.c */ -#line 773 "parse.y" +/* Line 1792 of yacc.c */ +#line 782 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", CT_CCODE, @@ -2690,65 +2677,56 @@ yyreduce: break; case 14: - -/* Line 1806 of yacc.c */ -#line 784 "parse.y" +/* Line 1792 of yacc.c */ +#line 793 "parse.y" { ; } break; case 15: - -/* Line 1806 of yacc.c */ -#line 785 "parse.y" +/* Line 1792 of yacc.c */ +#line 794 "parse.y" { ; } break; case 16: - -/* Line 1806 of yacc.c */ -#line 786 "parse.y" +/* Line 1792 of yacc.c */ +#line 795 "parse.y" { ; } break; case 17: - -/* Line 1806 of yacc.c */ -#line 787 "parse.y" +/* Line 1792 of yacc.c */ +#line 796 "parse.y" { ; } break; case 18: - -/* Line 1806 of yacc.c */ -#line 788 "parse.y" +/* Line 1792 of yacc.c */ +#line 797 "parse.y" { ; } break; case 19: - -/* Line 1806 of yacc.c */ -#line 789 "parse.y" +/* Line 1792 of yacc.c */ +#line 798 "parse.y" { ; } break; case 20: - -/* Line 1806 of yacc.c */ -#line 790 "parse.y" +/* Line 1792 of yacc.c */ +#line 799 "parse.y" { ; } break; case 21: - -/* Line 1806 of yacc.c */ -#line 791 "parse.y" +/* Line 1792 of yacc.c */ +#line 800 "parse.y" { ; } break; case 22: - -/* Line 1806 of yacc.c */ -#line 794 "parse.y" +/* Line 1792 of yacc.c */ +#line 803 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -2757,9 +2735,8 @@ yyreduce: break; case 23: - -/* Line 1806 of yacc.c */ -#line 799 "parse.y" +/* Line 1792 of yacc.c */ +#line 808 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; @@ -2768,9 +2745,8 @@ yyreduce: break; case 24: - -/* Line 1806 of yacc.c */ -#line 806 "parse.y" +/* Line 1792 of yacc.c */ +#line 815 "parse.y" { class = node_new (CLASS_NODE, "otype:steal", (yyvsp[(2) - (5)].id), @@ -2789,9 +2765,8 @@ yyreduce: break; case 26: - -/* Line 1806 of yacc.c */ -#line 824 "parse.y" +/* Line 1792 of yacc.c */ +#line 833 "parse.y" { if(strcmp((yyvsp[(2) - (4)].id),"abstract") == 0) { abstract = TRUE; @@ -2803,9 +2778,8 @@ yyreduce: break; case 27: - -/* Line 1806 of yacc.c */ -#line 832 "parse.y" +/* Line 1792 of yacc.c */ +#line 841 "parse.y" { if(strcmp((yyvsp[(2) - (5)].id),"chunks") == 0) { g_free (chunk_size); @@ -2821,9 +2795,8 @@ yyreduce: break; case 28: - -/* Line 1806 of yacc.c */ -#line 844 "parse.y" +/* Line 1792 of yacc.c */ +#line 853 "parse.y" { if (strcmp ((yyvsp[(2) - (5)].id), "interface") == 0) { interfaces = g_list_append (interfaces, @@ -2836,9 +2809,8 @@ yyreduce: break; case 29: - -/* Line 1806 of yacc.c */ -#line 853 "parse.y" +/* Line 1792 of yacc.c */ +#line 862 "parse.y" { if(strcmp((yyvsp[(2) - (5)].id),"chunks") == 0) { g_free (chunk_size); @@ -2854,9 +2826,8 @@ yyreduce: break; case 30: - -/* Line 1806 of yacc.c */ -#line 865 "parse.y" +/* Line 1792 of yacc.c */ +#line 874 "parse.y" { if (strcmp ((yyvsp[(2) - (6)].id), "GladeXML") == 0) { glade_xml = TRUE; @@ -2869,9 +2840,8 @@ yyreduce: break; case 31: - -/* Line 1806 of yacc.c */ -#line 874 "parse.y" +/* Line 1792 of yacc.c */ +#line 883 "parse.y" { if (strcmp ((yyvsp[(2) - (7)].id), "GladeXML") == 0) { glade_xml = TRUE; @@ -2884,9 +2854,8 @@ yyreduce: break; case 32: - -/* Line 1806 of yacc.c */ -#line 883 "parse.y" +/* Line 1792 of yacc.c */ +#line 892 "parse.y" { if (strcmp ((yyvsp[(2) - (6)].id), "GladeXML") == 0) { glade_xml = TRUE; @@ -2899,9 +2868,8 @@ yyreduce: break; case 33: - -/* Line 1806 of yacc.c */ -#line 892 "parse.y" +/* Line 1792 of yacc.c */ +#line 901 "parse.y" { if (strcmp ((yyvsp[(2) - (7)].id), "GladeXML") == 0) { glade_xml = TRUE; @@ -2914,30 +2882,26 @@ yyreduce: break; case 34: - -/* Line 1806 of yacc.c */ -#line 903 "parse.y" +/* Line 1792 of yacc.c */ +#line 912 "parse.y" { ; } break; case 35: - -/* Line 1806 of yacc.c */ -#line 904 "parse.y" +/* Line 1792 of yacc.c */ +#line 913 "parse.y" { ; } break; case 36: - -/* Line 1806 of yacc.c */ -#line 907 "parse.y" +/* Line 1792 of yacc.c */ +#line 916 "parse.y" { ; } break; case 37: - -/* Line 1806 of yacc.c */ -#line 908 "parse.y" +/* Line 1792 of yacc.c */ +#line 917 "parse.y" { if (strcmp ((yyvsp[(1) - (2)].id), "BonoboObject") != 0) { g_free ((yyvsp[(1) - (2)].id)); @@ -2950,9 +2914,8 @@ yyreduce: break; case 38: - -/* Line 1806 of yacc.c */ -#line 917 "parse.y" +/* Line 1792 of yacc.c */ +#line 926 "parse.y" { if (strcmp ((yyvsp[(1) - (3)].id), "interface") != 0) { g_free ((yyvsp[(1) - (3)].id)); @@ -2968,65 +2931,56 @@ yyreduce: break; case 39: - -/* Line 1806 of yacc.c */ -#line 929 "parse.y" +/* Line 1792 of yacc.c */ +#line 938 "parse.y" { ; } break; case 40: - -/* Line 1806 of yacc.c */ -#line 930 "parse.y" +/* Line 1792 of yacc.c */ +#line 939 "parse.y" { ; } break; case 41: - -/* Line 1806 of yacc.c */ -#line 931 "parse.y" +/* Line 1792 of yacc.c */ +#line 940 "parse.y" { ; } break; case 42: - -/* Line 1806 of yacc.c */ -#line 932 "parse.y" +/* Line 1792 of yacc.c */ +#line 941 "parse.y" { ; } break; case 43: - -/* Line 1806 of yacc.c */ -#line 935 "parse.y" +/* Line 1792 of yacc.c */ +#line 944 "parse.y" { the_scope = PUBLIC_SCOPE; } break; case 44: - -/* Line 1806 of yacc.c */ -#line 936 "parse.y" +/* Line 1792 of yacc.c */ +#line 945 "parse.y" { the_scope = PRIVATE_SCOPE; } break; case 45: - -/* Line 1806 of yacc.c */ -#line 937 "parse.y" +/* Line 1792 of yacc.c */ +#line 946 "parse.y" { the_scope = PROTECTED_SCOPE; } break; case 46: - -/* Line 1806 of yacc.c */ -#line 938 "parse.y" +/* Line 1792 of yacc.c */ +#line 947 "parse.y" { the_scope = CLASS_SCOPE; } break; case 47: - -/* Line 1806 of yacc.c */ -#line 941 "parse.y" +/* Line 1792 of yacc.c */ +#line 950 "parse.y" { if (strcmp ((yyvsp[(1) - (2)].id), "destroywith") == 0) { g_free ((yyvsp[(1) - (2)].id)); @@ -3050,9 +3004,8 @@ yyreduce: break; case 48: - -/* Line 1806 of yacc.c */ -#line 961 "parse.y" +/* Line 1792 of yacc.c */ +#line 970 "parse.y" { if (strcmp ((yyvsp[(1) - (3)].id), "destroy") == 0) { g_free((yyvsp[(1) - (3)].id)); @@ -3078,9 +3031,8 @@ yyreduce: break; case 49: - -/* Line 1806 of yacc.c */ -#line 985 "parse.y" +/* Line 1792 of yacc.c */ +#line 994 "parse.y" { initializer = (yyvsp[(2) - (2)].id); initializer_line = ccode_line; @@ -3088,9 +3040,8 @@ yyreduce: break; case 50: - -/* Line 1806 of yacc.c */ -#line 989 "parse.y" +/* Line 1792 of yacc.c */ +#line 998 "parse.y" { initializer = ((yyvsp[(3) - (3)].cbuf))->str; initializer_line = ccode_line; @@ -3099,37 +3050,32 @@ yyreduce: break; case 51: - -/* Line 1806 of yacc.c */ -#line 997 "parse.y" +/* Line 1792 of yacc.c */ +#line 1006 "parse.y" { ; } break; case 52: - -/* Line 1806 of yacc.c */ -#line 998 "parse.y" +/* Line 1792 of yacc.c */ +#line 1007 "parse.y" { ; } break; case 53: - -/* Line 1806 of yacc.c */ -#line 999 "parse.y" +/* Line 1792 of yacc.c */ +#line 1008 "parse.y" { destructor = NULL; } break; case 54: - -/* Line 1806 of yacc.c */ -#line 1000 "parse.y" +/* Line 1792 of yacc.c */ +#line 1009 "parse.y" { initializer = NULL; } break; case 55: - -/* Line 1806 of yacc.c */ -#line 1001 "parse.y" +/* Line 1792 of yacc.c */ +#line 1010 "parse.y" { if (strcmp ((yyvsp[(1) - (1)].id), "GladeXML") == 0) { glade_widget = TRUE; @@ -3141,9 +3087,8 @@ yyreduce: break; case 56: - -/* Line 1806 of yacc.c */ -#line 1009 "parse.y" +/* Line 1792 of yacc.c */ +#line 1018 "parse.y" { destructor = NULL; initializer = NULL; @@ -3151,27 +3096,24 @@ yyreduce: break; case 57: - -/* Line 1806 of yacc.c */ -#line 1015 "parse.y" +/* Line 1792 of yacc.c */ +#line 1024 "parse.y" { push_variable((yyvsp[(3) - (5)].id), the_scope,(yyvsp[(1) - (5)].line), NULL); } break; case 58: - -/* Line 1806 of yacc.c */ -#line 1018 "parse.y" +/* Line 1792 of yacc.c */ +#line 1027 "parse.y" { push_variable((yyvsp[(3) - (6)].id), the_scope, (yyvsp[(1) - (6)].line), (yyvsp[(4) - (6)].id)); } break; case 59: - -/* Line 1806 of yacc.c */ -#line 1023 "parse.y" +/* Line 1792 of yacc.c */ +#line 1032 "parse.y" { Node *node = NULL; if(strcmp((yyvsp[(6) - (12)].id),"get")==0 && @@ -3243,9 +3185,8 @@ yyreduce: break; case 60: - -/* Line 1806 of yacc.c */ -#line 1091 "parse.y" +/* Line 1792 of yacc.c */ +#line 1100 "parse.y" { Node *node = NULL; if(strcmp((yyvsp[(6) - (9)].id), "get") == 0) { @@ -3303,9 +3244,8 @@ yyreduce: break; case 61: - -/* Line 1806 of yacc.c */ -#line 1145 "parse.y" +/* Line 1792 of yacc.c */ +#line 1154 "parse.y" { Node *node; char *get, *set = NULL; @@ -3396,9 +3336,8 @@ yyreduce: break; case 62: - -/* Line 1806 of yacc.c */ -#line 1234 "parse.y" +/* Line 1792 of yacc.c */ +#line 1243 "parse.y" { if (strcmp ((yyvsp[(2) - (3)].id), "export")!=0) { g_free ((yyvsp[(2) - (3)].id)); @@ -3410,18 +3349,16 @@ yyreduce: break; case 63: - -/* Line 1806 of yacc.c */ -#line 1242 "parse.y" +/* Line 1792 of yacc.c */ +#line 1251 "parse.y" { (yyval.id) = NULL; } break; case 64: - -/* Line 1806 of yacc.c */ -#line 1247 "parse.y" +/* Line 1792 of yacc.c */ +#line 1256 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3473,9 +3410,8 @@ yyreduce: break; case 65: - -/* Line 1806 of yacc.c */ -#line 1295 "parse.y" +/* Line 1792 of yacc.c */ +#line 1304 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3515,9 +3451,8 @@ yyreduce: break; case 66: - -/* Line 1806 of yacc.c */ -#line 1331 "parse.y" +/* Line 1792 of yacc.c */ +#line 1340 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3535,44 +3470,38 @@ yyreduce: break; case 67: - -/* Line 1806 of yacc.c */ -#line 1347 "parse.y" +/* Line 1792 of yacc.c */ +#line 1356 "parse.y" { ; } break; case 68: - -/* Line 1806 of yacc.c */ -#line 1348 "parse.y" +/* Line 1792 of yacc.c */ +#line 1357 "parse.y" { ; } break; case 69: - -/* Line 1806 of yacc.c */ -#line 1351 "parse.y" +/* Line 1792 of yacc.c */ +#line 1360 "parse.y" { ; } break; case 70: - -/* Line 1806 of yacc.c */ -#line 1352 "parse.y" +/* Line 1792 of yacc.c */ +#line 1361 "parse.y" { ; } break; case 71: - -/* Line 1806 of yacc.c */ -#line 1355 "parse.y" +/* Line 1792 of yacc.c */ +#line 1364 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; case 72: - -/* Line 1806 of yacc.c */ -#line 1356 "parse.y" +/* Line 1792 of yacc.c */ +#line 1365 "parse.y" { if (strcmp ((yyvsp[(1) - (4)].id), "_") != 0) { g_free ((yyvsp[(1) - (4)].id)); @@ -3586,120 +3515,109 @@ yyreduce: break; case 73: - -/* Line 1806 of yacc.c */ -#line 1368 "parse.y" +/* Line 1792 of yacc.c */ +#line 1377 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; case 74: - -/* Line 1806 of yacc.c */ -#line 1369 "parse.y" +/* Line 1792 of yacc.c */ +#line 1378 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; case 75: - -/* Line 1806 of yacc.c */ -#line 1372 "parse.y" +/* Line 1792 of yacc.c */ +#line 1381 "parse.y" { ensure_property (); node_set ((Node *)property, - "nick:steal", (yyvsp[(3) - (3)].id), + "canonical_name:steal", gob_str_delete_quotes((yyvsp[(3) - (3)].id)), NULL); } break; case 76: - -/* Line 1806 of yacc.c */ -#line 1378 "parse.y" +/* Line 1792 of yacc.c */ +#line 1387 "parse.y" { ensure_property (); node_set ((Node *)property, - "blurb:steal", (yyvsp[(3) - (3)].id), + "nick:steal", (yyvsp[(3) - (3)].id), NULL); } break; case 77: - -/* Line 1806 of yacc.c */ -#line 1384 "parse.y" +/* Line 1792 of yacc.c */ +#line 1393 "parse.y" { ensure_property (); node_set ((Node *)property, - "maximum:steal", (yyvsp[(3) - (3)].id), + "blurb:steal", (yyvsp[(3) - (3)].id), NULL); } break; case 78: - -/* Line 1806 of yacc.c */ -#line 1390 "parse.y" +/* Line 1792 of yacc.c */ +#line 1399 "parse.y" { ensure_property (); node_set ((Node *)property, - "minimum:steal", (yyvsp[(3) - (3)].id), + "maximum:steal", (yyvsp[(3) - (3)].id), NULL); } break; case 79: - -/* Line 1806 of yacc.c */ -#line 1396 "parse.y" +/* Line 1792 of yacc.c */ +#line 1405 "parse.y" { ensure_property (); node_set ((Node *)property, - "default_value:steal", (yyvsp[(3) - (3)].id), + "minimum:steal", (yyvsp[(3) - (3)].id), NULL); } break; case 80: - -/* Line 1806 of yacc.c */ -#line 1402 "parse.y" +/* Line 1792 of yacc.c */ +#line 1411 "parse.y" { ensure_property (); node_set ((Node *)property, - "flags:steal", (yyvsp[(3) - (3)].list), + "default_value:steal", (yyvsp[(3) - (3)].id), NULL); } break; case 81: - -/* Line 1806 of yacc.c */ -#line 1408 "parse.y" +/* Line 1792 of yacc.c */ +#line 1417 "parse.y" { - Type *type = pop_type (); ensure_property (); node_set ((Node *)property, - "ptype:steal", type, + "flags:steal", (yyvsp[(3) - (3)].list), NULL); } break; case 82: - -/* Line 1806 of yacc.c */ -#line 1415 "parse.y" +/* Line 1792 of yacc.c */ +#line 1423 "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 83: - -/* Line 1806 of yacc.c */ -#line 1421 "parse.y" +/* Line 1792 of yacc.c */ +#line 1430 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3709,9 +3627,8 @@ yyreduce: break; case 84: - -/* Line 1806 of yacc.c */ -#line 1427 "parse.y" +/* Line 1792 of yacc.c */ +#line 1436 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3721,9 +3638,8 @@ yyreduce: break; case 85: - -/* Line 1806 of yacc.c */ -#line 1433 "parse.y" +/* Line 1792 of yacc.c */ +#line 1442 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3733,9 +3649,8 @@ yyreduce: break; case 86: - -/* Line 1806 of yacc.c */ -#line 1439 "parse.y" +/* Line 1792 of yacc.c */ +#line 1448 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3745,9 +3660,8 @@ yyreduce: break; case 87: - -/* Line 1806 of yacc.c */ -#line 1445 "parse.y" +/* Line 1792 of yacc.c */ +#line 1454 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3757,9 +3671,8 @@ yyreduce: break; case 88: - -/* Line 1806 of yacc.c */ -#line 1451 "parse.y" +/* Line 1792 of yacc.c */ +#line 1460 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3769,9 +3682,8 @@ yyreduce: break; case 89: - -/* Line 1806 of yacc.c */ -#line 1457 "parse.y" +/* Line 1792 of yacc.c */ +#line 1466 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3781,9 +3693,8 @@ yyreduce: break; case 90: - -/* Line 1806 of yacc.c */ -#line 1463 "parse.y" +/* Line 1792 of yacc.c */ +#line 1472 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3793,9 +3704,8 @@ yyreduce: break; case 91: - -/* Line 1806 of yacc.c */ -#line 1469 "parse.y" +/* Line 1792 of yacc.c */ +#line 1478 "parse.y" { ensure_property (); node_set ((Node *)property, @@ -3805,9 +3715,19 @@ yyreduce: break; case 92: +/* Line 1792 of yacc.c */ +#line 1484 "parse.y" + { + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", (yyvsp[(3) - (3)].id), + NULL); + } + break; -/* Line 1806 of yacc.c */ -#line 1475 "parse.y" + case 93: +/* Line 1792 of yacc.c */ +#line 1490 "parse.y" { ensure_property (); if (strcmp ((yyvsp[(1) - (1)].id), "override") == 0) { @@ -3833,10 +3753,9 @@ yyreduce: } break; - case 93: - -/* Line 1806 of yacc.c */ -#line 1500 "parse.y" + case 94: +/* Line 1792 of yacc.c */ +#line 1515 "parse.y" { if(strcmp((yyvsp[(3) - (5)].id),"type")!=0) { g_free((yyvsp[(1) - (5)].id)); @@ -3848,52 +3767,46 @@ yyreduce: } break; - case 94: - -/* Line 1806 of yacc.c */ -#line 1509 "parse.y" + case 95: +/* Line 1792 of yacc.c */ +#line 1524 "parse.y" { (yyval.id) = debool ((yyvsp[(1) - (1)].id)); typestack = g_list_prepend(typestack,NULL); } break; - case 95: - -/* Line 1806 of yacc.c */ -#line 1515 "parse.y" + case 96: +/* Line 1792 of yacc.c */ +#line 1530 "parse.y" { (yyval.list) = (yyvsp[(2) - (3)].list); } break; - case 96: - -/* Line 1806 of yacc.c */ -#line 1516 "parse.y" + case 97: +/* Line 1792 of yacc.c */ +#line 1531 "parse.y" { (yyval.list) = NULL; } break; - case 97: - -/* Line 1806 of yacc.c */ -#line 1519 "parse.y" + case 98: +/* Line 1792 of yacc.c */ +#line 1534 "parse.y" { (yyval.list) = g_list_append((yyvsp[(3) - (3)].list),(yyvsp[(1) - (3)].id)); } break; - case 98: - -/* Line 1806 of yacc.c */ -#line 1522 "parse.y" + case 99: +/* Line 1792 of yacc.c */ +#line 1537 "parse.y" { (yyval.list) = g_list_append(NULL,(yyvsp[(1) - (1)].id)); } break; - case 99: - -/* Line 1806 of yacc.c */ -#line 1528 "parse.y" + case 100: +/* Line 1792 of yacc.c */ +#line 1543 "parse.y" { Node *node = node_new (TYPE_NODE, "name:steal", (yyvsp[(1) - (2)].id), @@ -3903,11 +3816,10 @@ yyreduce: } break; - case 100: - -/* Line 1806 of yacc.c */ -#line 1535 "parse.y" - { + case 101: +/* Line 1792 of yacc.c */ +#line 1550 "parse.y" + { Node *node = node_new (TYPE_NODE, "name:steal", (yyvsp[(1) - (1)].id), NULL); @@ -3915,58 +3827,52 @@ yyreduce: } break; - case 101: - -/* Line 1806 of yacc.c */ -#line 1544 "parse.y" + case 102: +/* Line 1792 of yacc.c */ +#line 1559 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - case 102: - -/* Line 1806 of yacc.c */ -#line 1547 "parse.y" + case 103: +/* Line 1792 of yacc.c */ +#line 1562 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - case 103: - -/* Line 1806 of yacc.c */ -#line 1550 "parse.y" + case 104: +/* Line 1792 of yacc.c */ +#line 1565 "parse.y" { (yyval.id) = g_strconcat("const ", (yyvsp[(2) - (2)].id), NULL); g_free((yyvsp[(2) - (2)].id)); } break; - case 104: - -/* Line 1806 of yacc.c */ -#line 1554 "parse.y" + case 105: +/* Line 1792 of yacc.c */ +#line 1569 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " const", NULL); g_free((yyvsp[(1) - (2)].id)); } break; - case 105: - -/* Line 1806 of yacc.c */ -#line 1558 "parse.y" + case 106: +/* Line 1792 of yacc.c */ +#line 1573 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " ", (yyvsp[(2) - (2)].id), NULL); g_free((yyvsp[(2) - (2)].id)); } break; - case 106: - -/* Line 1806 of yacc.c */ -#line 1562 "parse.y" + case 107: +/* Line 1792 of yacc.c */ +#line 1577 "parse.y" { (yyval.id) = g_strconcat("const ", (yyvsp[(2) - (3)].id), " ", (yyvsp[(3) - (3)].id), NULL); @@ -3974,10 +3880,9 @@ yyreduce: } break; - case 107: - -/* Line 1806 of yacc.c */ -#line 1567 "parse.y" + case 108: +/* Line 1792 of yacc.c */ +#line 1582 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (3)].id), " ", (yyvsp[(2) - (3)].id), " const", NULL); @@ -3985,20 +3890,18 @@ yyreduce: } break; - case 108: - -/* Line 1806 of yacc.c */ -#line 1575 "parse.y" + case 109: +/* Line 1792 of yacc.c */ +#line 1590 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " ", (yyvsp[(2) - (2)].id), NULL); g_free((yyvsp[(2) - (2)].id)); } break; - case 109: - -/* Line 1806 of yacc.c */ -#line 1579 "parse.y" + case 110: +/* Line 1792 of yacc.c */ +#line 1594 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " ", (yyvsp[(2) - (2)].id), NULL); g_free((yyvsp[(1) - (2)].id)); @@ -4006,175 +3909,153 @@ yyreduce: } break; - case 110: - -/* Line 1806 of yacc.c */ -#line 1584 "parse.y" + case 111: +/* Line 1792 of yacc.c */ +#line 1599 "parse.y" { (yyval.id) = g_strconcat("const ", (yyvsp[(2) - (2)].id), NULL); g_free((yyvsp[(2) - (2)].id)); } break; - case 111: - -/* Line 1806 of yacc.c */ -#line 1588 "parse.y" + case 112: +/* Line 1792 of yacc.c */ +#line 1603 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - case 112: - -/* Line 1806 of yacc.c */ -#line 1591 "parse.y" + case 113: +/* Line 1792 of yacc.c */ +#line 1606 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " const", NULL); g_free((yyvsp[(1) - (2)].id)); } break; - case 113: - -/* Line 1806 of yacc.c */ -#line 1595 "parse.y" + case 114: +/* Line 1792 of yacc.c */ +#line 1610 "parse.y" { (yyval.id) = g_strdup((yyvsp[(1) - (1)].id)); } break; - case 114: - -/* Line 1806 of yacc.c */ -#line 1598 "parse.y" + case 115: +/* Line 1792 of yacc.c */ +#line 1613 "parse.y" { (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " const", NULL); } break; - case 115: - -/* Line 1806 of yacc.c */ -#line 1603 "parse.y" + case 116: +/* Line 1792 of yacc.c */ +#line 1618 "parse.y" { (yyval.id) = "void"; } break; - case 116: - -/* Line 1806 of yacc.c */ -#line 1604 "parse.y" + case 117: +/* Line 1792 of yacc.c */ +#line 1619 "parse.y" { (yyval.id) = "char"; } break; - case 117: - -/* Line 1806 of yacc.c */ -#line 1605 "parse.y" + case 118: +/* Line 1792 of yacc.c */ +#line 1620 "parse.y" { (yyval.id) = "short"; } break; - case 118: - -/* Line 1806 of yacc.c */ -#line 1606 "parse.y" + case 119: +/* Line 1792 of yacc.c */ +#line 1621 "parse.y" { (yyval.id) = "int"; } break; - case 119: - -/* Line 1806 of yacc.c */ -#line 1607 "parse.y" + case 120: +/* Line 1792 of yacc.c */ +#line 1622 "parse.y" { (yyval.id) = "long"; } break; - case 120: - -/* Line 1806 of yacc.c */ -#line 1608 "parse.y" + case 121: +/* Line 1792 of yacc.c */ +#line 1623 "parse.y" { (yyval.id) = "float"; } break; - case 121: - -/* Line 1806 of yacc.c */ -#line 1609 "parse.y" + case 122: +/* Line 1792 of yacc.c */ +#line 1624 "parse.y" { (yyval.id) = "double"; } break; - case 122: - -/* Line 1806 of yacc.c */ -#line 1610 "parse.y" + case 123: +/* Line 1792 of yacc.c */ +#line 1625 "parse.y" { (yyval.id) = "signed"; } break; - case 123: - -/* Line 1806 of yacc.c */ -#line 1611 "parse.y" + case 124: +/* Line 1792 of yacc.c */ +#line 1626 "parse.y" { (yyval.id) = "unsigned"; } break; - case 124: - -/* Line 1806 of yacc.c */ -#line 1614 "parse.y" + case 125: +/* Line 1792 of yacc.c */ +#line 1629 "parse.y" { (yyval.id) = "struct"; } break; - case 125: - -/* Line 1806 of yacc.c */ -#line 1615 "parse.y" + case 126: +/* Line 1792 of yacc.c */ +#line 1630 "parse.y" { (yyval.id) = "union"; } break; - case 126: - -/* Line 1806 of yacc.c */ -#line 1616 "parse.y" + case 127: +/* Line 1792 of yacc.c */ +#line 1631 "parse.y" { (yyval.id) = "enum"; } break; - case 127: - -/* Line 1806 of yacc.c */ -#line 1619 "parse.y" + case 128: +/* Line 1792 of yacc.c */ +#line 1634 "parse.y" { (yyval.id) = g_strdup("*"); } break; - case 128: - -/* Line 1806 of yacc.c */ -#line 1620 "parse.y" + case 129: +/* Line 1792 of yacc.c */ +#line 1635 "parse.y" { (yyval.id) = g_strdup("* const"); } break; - case 129: - -/* Line 1806 of yacc.c */ -#line 1621 "parse.y" + case 130: +/* Line 1792 of yacc.c */ +#line 1636 "parse.y" { (yyval.id) = g_strconcat("*", (yyvsp[(2) - (2)].id), NULL); g_free((yyvsp[(2) - (2)].id)); } break; - case 130: - -/* Line 1806 of yacc.c */ -#line 1625 "parse.y" + case 131: +/* Line 1792 of yacc.c */ +#line 1640 "parse.y" { (yyval.id) = g_strconcat("* const", (yyvsp[(3) - (3)].id), NULL); g_free((yyvsp[(3) - (3)].id)); } break; - case 131: - -/* Line 1806 of yacc.c */ -#line 1632 "parse.y" + case 132: +/* Line 1792 of yacc.c */ +#line 1647 "parse.y" { if(strcmp((yyvsp[(1) - (2)].id), "first")==0) (yyval.sigtype) = SIGNAL_FIRST_METHOD; @@ -4189,19 +4070,17 @@ yyreduce: } break; - case 132: - -/* Line 1806 of yacc.c */ -#line 1644 "parse.y" + case 133: +/* Line 1792 of yacc.c */ +#line 1659 "parse.y" { (yyval.sigtype) = SIGNAL_LAST_METHOD; } break; - case 133: - -/* Line 1806 of yacc.c */ -#line 1650 "parse.y" + case 134: +/* Line 1792 of yacc.c */ +#line 1665 "parse.y" { if(strcmp((yyvsp[(2) - (3)].id),"first")==0) (yyval.sigtype) = SIGNAL_FIRST_METHOD; @@ -4216,10 +4095,9 @@ yyreduce: } break; - case 134: - -/* Line 1806 of yacc.c */ -#line 1662 "parse.y" + case 135: +/* Line 1792 of yacc.c */ +#line 1677 "parse.y" { if(strcmp((yyvsp[(1) - (3)].id),"first")==0) (yyval.sigtype) = SIGNAL_FIRST_METHOD; @@ -4234,70 +4112,71 @@ yyreduce: } break; - case 135: - -/* Line 1806 of yacc.c */ -#line 1674 "parse.y" + case 136: +/* Line 1792 of yacc.c */ +#line 1689 "parse.y" { (yyval.sigtype) = SIGNAL_LAST_METHOD; } break; - case 136: - -/* Line 1806 of yacc.c */ -#line 1677 "parse.y" + case 137: +/* Line 1792 of yacc.c */ +#line 1692 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; } break; - case 137: - -/* Line 1806 of yacc.c */ -#line 1683 "parse.y" + case 138: +/* Line 1792 of yacc.c */ +#line 1698 "parse.y" { gtktypes = g_list_prepend(gtktypes, debool ((yyvsp[(1) - (4)].id))); } break; - case 138: + case 139: +/* Line 1792 of yacc.c */ +#line 1701 "parse.y" + { + gtktypes = g_list_prepend(gtktypes, debool ((yyvsp[(1) - (5)].id))); + signal_name=(yyvsp[(2) - (5)].id); + } + break; -/* Line 1806 of yacc.c */ -#line 1688 "parse.y" + case 140: +/* Line 1792 of yacc.c */ +#line 1707 "parse.y" { gtktypes = g_list_append(gtktypes, debool ((yyvsp[(3) - (3)].id))); } break; - case 139: - -/* Line 1806 of yacc.c */ -#line 1691 "parse.y" + case 141: +/* Line 1792 of yacc.c */ +#line 1710 "parse.y" { gtktypes = g_list_append(gtktypes, debool ((yyvsp[(1) - (1)].id))); } break; - case 140: - -/* Line 1806 of yacc.c */ -#line 1696 "parse.y" + case 142: +/* Line 1792 of yacc.c */ +#line 1715 "parse.y" { (yyval.cbuf) = (yyvsp[(2) - (2)].cbuf); } break; - case 141: - -/* Line 1806 of yacc.c */ -#line 1697 "parse.y" + case 143: +/* Line 1792 of yacc.c */ +#line 1716 "parse.y" { (yyval.cbuf) = NULL; } break; - case 142: - -/* Line 1806 of yacc.c */ -#line 1701 "parse.y" + case 144: +/* Line 1792 of yacc.c */ +#line 1720 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -4323,10 +4202,9 @@ yyreduce: } break; - case 143: - -/* Line 1806 of yacc.c */ -#line 1724 "parse.y" + case 145: +/* Line 1792 of yacc.c */ +#line 1743 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -4352,10 +4230,9 @@ yyreduce: } break; - case 144: - -/* Line 1806 of yacc.c */ -#line 1747 "parse.y" + case 146: +/* Line 1792 of yacc.c */ +#line 1766 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -4381,10 +4258,9 @@ yyreduce: } break; - case 145: - -/* Line 1806 of yacc.c */ -#line 1770 "parse.y" + case 147: +/* Line 1792 of yacc.c */ +#line 1789 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -4410,10 +4286,9 @@ yyreduce: } break; - case 146: - -/* Line 1806 of yacc.c */ -#line 1793 "parse.y" + case 148: +/* Line 1792 of yacc.c */ +#line 1812 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'szelf' as " @@ -4434,10 +4309,9 @@ yyreduce: } break; - case 147: - -/* Line 1806 of yacc.c */ -#line 1811 "parse.y" + case 149: +/* Line 1792 of yacc.c */ +#line 1830 "parse.y" { if (funcattrs != NULL) { char *error = g_strdup_printf @@ -4453,10 +4327,9 @@ yyreduce: } break; - case 148: - -/* Line 1806 of yacc.c */ -#line 1824 "parse.y" + case 150: +/* Line 1792 of yacc.c */ +#line 1843 "parse.y" { if(the_scope == CLASS_SCOPE) { yyerror(_("a method cannot be of class scope")); @@ -4469,10 +4342,9 @@ yyreduce: } break; - case 149: - -/* Line 1806 of yacc.c */ -#line 1834 "parse.y" + case 151: +/* Line 1792 of yacc.c */ +#line 1853 "parse.y" { if(strcmp((yyvsp[(1) - (5)].id), "init")==0) { push_init_arg((yyvsp[(3) - (5)].id),FALSE); @@ -4513,10 +4385,9 @@ yyreduce: } break; - case 150: - -/* Line 1806 of yacc.c */ -#line 1874 "parse.y" + case 152: +/* Line 1792 of yacc.c */ +#line 1893 "parse.y" { g_free(funcattrs); funcattrs = NULL; g_free(onerror); onerror = NULL; @@ -4531,10 +4402,9 @@ yyreduce: } break; - case 151: - -/* Line 1806 of yacc.c */ -#line 1886 "parse.y" + case 153: +/* Line 1792 of yacc.c */ +#line 1905 "parse.y" { g_free(funcattrs); funcattrs = NULL; g_free(onerror); onerror = NULL; @@ -4557,10 +4427,9 @@ yyreduce: } break; - case 152: - -/* Line 1806 of yacc.c */ -#line 1906 "parse.y" + case 154: +/* Line 1792 of yacc.c */ +#line 1925 "parse.y" { g_free(funcattrs); funcattrs = NULL; g_free(onerror); onerror = NULL; @@ -4594,10 +4463,9 @@ yyreduce: } break; - case 153: - -/* Line 1806 of yacc.c */ -#line 1937 "parse.y" + case 155: +/* Line 1792 of yacc.c */ +#line 1956 "parse.y" { g_free(funcattrs); funcattrs = NULL; g_free(onerror); onerror = NULL; @@ -4605,34 +4473,30 @@ yyreduce: } break; - case 154: - -/* Line 1806 of yacc.c */ -#line 1944 "parse.y" + case 156: +/* Line 1792 of yacc.c */ +#line 1963 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - case 155: - -/* Line 1806 of yacc.c */ -#line 1945 "parse.y" + case 157: +/* Line 1792 of yacc.c */ +#line 1964 "parse.y" { (yyval.id) = ((yyvsp[(2) - (2)].cbuf))->str; g_string_free((yyvsp[(2) - (2)].cbuf), FALSE); } break; - case 156: - -/* Line 1806 of yacc.c */ -#line 1951 "parse.y" + case 158: +/* Line 1792 of yacc.c */ +#line 1970 "parse.y" { vararg = FALSE; has_self = FALSE; } break; - case 157: - -/* Line 1806 of yacc.c */ -#line 1952 "parse.y" + case 159: +/* Line 1792 of yacc.c */ +#line 1971 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -4646,10 +4510,9 @@ yyreduce: } break; - case 158: - -/* Line 1806 of yacc.c */ -#line 1963 "parse.y" + case 160: +/* Line 1792 of yacc.c */ +#line 1982 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -4663,10 +4526,9 @@ yyreduce: } break; - case 159: - -/* Line 1806 of yacc.c */ -#line 1974 "parse.y" + case 161: +/* Line 1792 of yacc.c */ +#line 1993 "parse.y" { vararg = FALSE; has_self = TRUE; @@ -4680,10 +4542,9 @@ yyreduce: } break; - case 160: - -/* Line 1806 of yacc.c */ -#line 1985 "parse.y" + case 162: +/* Line 1792 of yacc.c */ +#line 2004 "parse.y" { has_self = TRUE; if(strcmp((yyvsp[(1) - (3)].id),"self")==0) @@ -4696,10 +4557,9 @@ yyreduce: } break; - case 161: - -/* Line 1806 of yacc.c */ -#line 1995 "parse.y" + case 163: +/* Line 1792 of yacc.c */ +#line 2014 "parse.y" { has_self = TRUE; if(strcmp((yyvsp[(1) - (4)].id),"self")==0) @@ -4712,10 +4572,9 @@ yyreduce: } break; - case 162: - -/* Line 1806 of yacc.c */ -#line 2005 "parse.y" + case 164: +/* Line 1792 of yacc.c */ +#line 2024 "parse.y" { has_self = TRUE; if(strcmp((yyvsp[(2) - (4)].id),"self")==0) @@ -4728,63 +4587,55 @@ yyreduce: } break; - case 163: - -/* Line 1806 of yacc.c */ -#line 2015 "parse.y" + case 165: +/* Line 1792 of yacc.c */ +#line 2034 "parse.y" { has_self = FALSE; } break; - case 164: - -/* Line 1806 of yacc.c */ -#line 2018 "parse.y" + case 166: +/* Line 1792 of yacc.c */ +#line 2037 "parse.y" { vararg = TRUE; } break; - case 165: - -/* Line 1806 of yacc.c */ -#line 2019 "parse.y" + case 167: +/* Line 1792 of yacc.c */ +#line 2038 "parse.y" { vararg = FALSE; } break; - case 166: - -/* Line 1806 of yacc.c */ -#line 2022 "parse.y" + case 168: +/* Line 1792 of yacc.c */ +#line 2041 "parse.y" { ; } break; - case 167: - -/* Line 1806 of yacc.c */ -#line 2023 "parse.y" + case 169: +/* Line 1792 of yacc.c */ +#line 2042 "parse.y" { ; } break; - case 168: - -/* Line 1806 of yacc.c */ -#line 2026 "parse.y" + case 170: +/* Line 1792 of yacc.c */ +#line 2045 "parse.y" { push_funcarg((yyvsp[(2) - (2)].id),NULL); } break; - case 169: - -/* Line 1806 of yacc.c */ -#line 2029 "parse.y" + case 171: +/* Line 1792 of yacc.c */ +#line 2048 "parse.y" { push_funcarg((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].id)); } break; - case 170: - -/* Line 1806 of yacc.c */ -#line 2032 "parse.y" + case 172: +/* Line 1792 of yacc.c */ +#line 2051 "parse.y" { if(strcmp((yyvsp[(4) - (6)].id),"check")!=0) { yyerror(_("parse error")); @@ -4795,10 +4646,9 @@ yyreduce: } break; - case 171: - -/* Line 1806 of yacc.c */ -#line 2040 "parse.y" + case 173: +/* Line 1792 of yacc.c */ +#line 2059 "parse.y" { if(strcmp((yyvsp[(5) - (7)].id),"check")!=0) { yyerror(_("parse error")); @@ -4809,24 +4659,21 @@ yyreduce: } break; - case 172: - -/* Line 1806 of yacc.c */ -#line 2050 "parse.y" + case 174: +/* Line 1792 of yacc.c */ +#line 2069 "parse.y" { ; } break; - case 173: - -/* Line 1806 of yacc.c */ -#line 2051 "parse.y" + case 175: +/* Line 1792 of yacc.c */ +#line 2070 "parse.y" { ; } break; - case 174: - -/* Line 1806 of yacc.c */ -#line 2054 "parse.y" + case 176: +/* Line 1792 of yacc.c */ +#line 2073 "parse.y" { if(strcmp((yyvsp[(1) - (1)].id),"type")==0) { Node *node = node_new (CHECK_NODE, @@ -4846,10 +4693,9 @@ yyreduce: } break; - case 175: - -/* Line 1806 of yacc.c */ -#line 2071 "parse.y" + case 177: +/* Line 1792 of yacc.c */ +#line 2090 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", GT_CHECK, @@ -4859,10 +4705,9 @@ yyreduce: } break; - case 176: - -/* Line 1806 of yacc.c */ -#line 2078 "parse.y" + case 178: +/* Line 1792 of yacc.c */ +#line 2097 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", LT_CHECK, @@ -4872,10 +4717,9 @@ yyreduce: } break; - case 177: - -/* Line 1806 of yacc.c */ -#line 2085 "parse.y" + case 179: +/* Line 1792 of yacc.c */ +#line 2104 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", GE_CHECK, @@ -4885,10 +4729,9 @@ yyreduce: } break; - case 178: - -/* Line 1806 of yacc.c */ -#line 2092 "parse.y" + case 180: +/* Line 1792 of yacc.c */ +#line 2111 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", LE_CHECK, @@ -4898,10 +4741,9 @@ yyreduce: } break; - case 179: - -/* Line 1806 of yacc.c */ -#line 2099 "parse.y" + case 181: +/* Line 1792 of yacc.c */ +#line 2118 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", EQ_CHECK, @@ -4911,10 +4753,9 @@ yyreduce: } break; - case 180: - -/* Line 1806 of yacc.c */ -#line 2106 "parse.y" + case 182: +/* Line 1792 of yacc.c */ +#line 2125 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", NE_CHECK, @@ -4924,10 +4765,9 @@ yyreduce: } break; - case 181: - -/* Line 1806 of yacc.c */ -#line 2115 "parse.y" + case 183: +/* Line 1792 of yacc.c */ +#line 2134 "parse.y" { Node *node = node_new (ENUMDEF_NODE, "etype:steal", (yyvsp[(6) - (7)].id), @@ -4939,10 +4779,9 @@ yyreduce: } break; - case 182: - -/* Line 1806 of yacc.c */ -#line 2124 "parse.y" + case 184: +/* Line 1792 of yacc.c */ +#line 2143 "parse.y" { Node *node = node_new (ENUMDEF_NODE, "etype:steal", (yyvsp[(7) - (8)].id), @@ -4954,24 +4793,21 @@ yyreduce: } break; - case 183: - -/* Line 1806 of yacc.c */ -#line 2135 "parse.y" + case 185: +/* Line 1792 of yacc.c */ +#line 2154 "parse.y" {;} break; - case 184: - -/* Line 1806 of yacc.c */ -#line 2136 "parse.y" + case 186: +/* Line 1792 of yacc.c */ +#line 2155 "parse.y" {;} break; - case 185: - -/* Line 1806 of yacc.c */ -#line 2139 "parse.y" + case 187: +/* Line 1792 of yacc.c */ +#line 2158 "parse.y" { Node *node; char *num = (yyvsp[(3) - (3)].id); @@ -4994,10 +4830,9 @@ yyreduce: } break; - case 186: - -/* Line 1806 of yacc.c */ -#line 2159 "parse.y" + case 188: +/* Line 1792 of yacc.c */ +#line 2178 "parse.y" { Node *node; @@ -5008,10 +4843,9 @@ yyreduce: } break; - case 187: - -/* Line 1806 of yacc.c */ -#line 2169 "parse.y" + case 189: +/* Line 1792 of yacc.c */ +#line 2188 "parse.y" { Node *node = node_new (FLAGS_NODE, "ftype:steal", (yyvsp[(6) - (7)].id), @@ -5023,10 +4857,9 @@ yyreduce: } break; - case 188: - -/* Line 1806 of yacc.c */ -#line 2178 "parse.y" + case 190: +/* Line 1792 of yacc.c */ +#line 2197 "parse.y" { Node *node = node_new (FLAGS_NODE, "ftype:steal", (yyvsp[(7) - (8)].id), @@ -5038,28 +4871,25 @@ yyreduce: } break; - case 189: - -/* Line 1806 of yacc.c */ -#line 2189 "parse.y" + case 191: +/* Line 1792 of yacc.c */ +#line 2208 "parse.y" { flag_vals = g_list_append (flag_vals, (yyvsp[(3) - (3)].id)); } break; - case 190: - -/* Line 1806 of yacc.c */ -#line 2192 "parse.y" + case 192: +/* Line 1792 of yacc.c */ +#line 2211 "parse.y" { flag_vals = g_list_append (flag_vals, (yyvsp[(1) - (1)].id)); } break; - case 191: - -/* Line 1806 of yacc.c */ -#line 2197 "parse.y" + case 193: +/* Line 1792 of yacc.c */ +#line 2216 "parse.y" { Node *node = node_new (ERROR_NODE, "etype:steal", (yyvsp[(6) - (7)].id), @@ -5071,10 +4901,9 @@ yyreduce: } break; - case 192: - -/* Line 1806 of yacc.c */ -#line 2206 "parse.y" + case 194: +/* Line 1792 of yacc.c */ +#line 2225 "parse.y" { Node *node = node_new (ERROR_NODE, "etype:steal", (yyvsp[(7) - (8)].id), @@ -5086,59 +4915,52 @@ yyreduce: } break; - case 193: - -/* Line 1806 of yacc.c */ -#line 2217 "parse.y" + case 195: +/* Line 1792 of yacc.c */ +#line 2236 "parse.y" { error_vals = g_list_append (error_vals, (yyvsp[(3) - (3)].id)); } break; - case 194: - -/* Line 1806 of yacc.c */ -#line 2220 "parse.y" + case 196: +/* Line 1792 of yacc.c */ +#line 2239 "parse.y" { error_vals = g_list_append (error_vals, (yyvsp[(1) - (1)].id)); } break; - case 195: - -/* Line 1806 of yacc.c */ -#line 2226 "parse.y" + case 197: +/* Line 1792 of yacc.c */ +#line 2245 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - case 196: - -/* Line 1806 of yacc.c */ -#line 2227 "parse.y" + case 198: +/* Line 1792 of yacc.c */ +#line 2246 "parse.y" { (yyval.id) = g_strconcat("-",(yyvsp[(2) - (2)].id),NULL); g_free((yyvsp[(2) - (2)].id)); } break; - case 197: - -/* Line 1806 of yacc.c */ -#line 2231 "parse.y" + case 199: +/* Line 1792 of yacc.c */ +#line 2250 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - case 198: - -/* Line 1806 of yacc.c */ -#line 2232 "parse.y" + case 200: +/* Line 1792 of yacc.c */ +#line 2251 "parse.y" { (yyval.id) = (yyvsp[(1) - (1)].id); } break; - -/* Line 1806 of yacc.c */ -#line 5142 "parse.c" +/* Line 1792 of yacc.c */ +#line 4964 "parse.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -5301,7 +5123,9 @@ yyerrlab1: YY_STACK_PRINT (yyss, yyssp); } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ @@ -5325,7 +5149,7 @@ yyabortlab: yyresult = 1; goto yyreturn; -#if !defined(yyoverflow) || YYERROR_VERBOSE +#if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ @@ -5367,8 +5191,6 @@ yyreturn: } - -/* Line 2067 of yacc.c */ -#line 2235 "parse.y" - +/* Line 2055 of yacc.c */ +#line 2254 "parse.y"