X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/4cda31fc14f41746b4f3ced7015f9f15e0168dfc..4d534c82fb65897999ade6867534ab952a9bc019:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 762e14c..f015958 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875c. */ +/* A Bison parser, made by GNU Bison 2.0. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 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 @@ -185,8 +185,10 @@ static GList *enum_vals = NULL; static GList *flag_vals = NULL; static GList *error_vals = NULL; +static gboolean abstract = FALSE; static char *chunk_size = NULL; static char *bonobo_object_class = NULL; +static int glade_xml = FALSE; static GList *interfaces = NULL; static GList *typestack = NULL; static GList *funcargs = NULL; @@ -202,6 +204,7 @@ static int destructor_line = 0; static gboolean destructor_simple = TRUE; static char *initializer = NULL; static int initializer_line = 0; +static int glade_widget = FALSE; static char *onerror = NULL; static char *defreturn = NULL; @@ -267,6 +270,7 @@ push_variable (char *name, int scope, int line_no, char *postfix) var = node_new (VARIABLE_NODE, "scope", scope, "vtype:steal", type, + "glade_widget", glade_widget, "id:steal", name, "line_no", line_no, "destructor_unref", destructor_unref, @@ -275,8 +279,10 @@ push_variable (char *name, int scope, int line_no, char *postfix) "destructor_simple", destructor_simple, "initializer:steal", initializer, "initializer_line", initializer_line, + "initializer_simple", TRUE, NULL); class_nodes = g_list_append(class_nodes, var); + glade_widget = FALSE; } static void @@ -603,6 +609,40 @@ get_prop_enum_flag_cast (Property *prop) return ret; } +static void +add_construct_glade (char * file, char * root, char * domain) +{ + Node *var; + Type * type; + GList * flags = NULL; + + type = (Type *)node_new (TYPE_NODE, + "name", "GladeXML", + "pointer", "*", + NULL); + initializer = g_strdup_printf("\t{\n" + "\tGtkWidget * root;\n" + "\t%%1$s->_priv->_glade_xml = glade_xml_new(%s, %s, %s);\n" + "\troot = glade_xml_get_widget(%%1$s->_priv->_glade_xml, %s);\n" + "\tgtk_widget_show(root);\n" + "\tgtk_container_add(GTK_CONTAINER(%%1$s), root);\n" + "\tglade_xml_signal_autoconnect_full(%%1$s->_priv->_glade_xml, (GladeXMLConnectFunc)___glade_xml_connect_foreach, (gpointer)%%1$s);\n" + "}\n", file, root, domain ? domain : "NULL", root); + + var = node_new (VARIABLE_NODE, + "scope", PRIVATE_SCOPE, + "vtype:steal", type, + "glade_widget", FALSE, + "id:steal", "_glade_xml", + "destructor_unref", FALSE, + "destructor", "g_object_unref", + "destructor_simple", TRUE, + "initializer", initializer, + "initializer_simple", FALSE, + NULL); + class_nodes = g_list_prepend(class_nodes, var); +} + static void property_link_and_export (Node *node) { @@ -780,7 +820,7 @@ ensure_property (void) #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 628 "parse.y" +#line 668 "parse.y" typedef union YYSTYPE { char *id; GString *cbuf; @@ -788,8 +828,8 @@ typedef union YYSTYPE { int line; int sigtype; } YYSTYPE; -/* Line 191 of yacc.c. */ -#line 793 "parse.c" +/* Line 190 of yacc.c. */ +#line 833 "y.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -800,8 +840,8 @@ typedef union YYSTYPE { /* Copy the second part of user declarations. */ -/* Line 214 of yacc.c. */ -#line 805 "parse.c" +/* Line 213 of yacc.c. */ +#line 845 "y.tab.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -816,14 +856,10 @@ typedef union YYSTYPE { # ifdef YYSTACK_USE_ALLOCA # if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -# endif -# else -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca -# else # ifdef __GNUC__ # define YYSTACK_ALLOC __builtin_alloca +# else +# define YYSTACK_ALLOC alloca # endif # endif # endif @@ -849,7 +885,7 @@ typedef union YYSTYPE { /* A type that is properly aligned for any stack member. */ union yyalloc { - short yyss; + short int yyss; YYSTYPE yyvs; }; @@ -859,7 +895,7 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do @@ -901,22 +937,22 @@ union yyalloc #if defined (__STDC__) || defined (__cplusplus) typedef signed char yysigned_char; #else - typedef short yysigned_char; + typedef short int yysigned_char; #endif /* YYFINAL -- State number of the termination state. */ #define YYFINAL 23 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 572 +#define YYLAST 629 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 66 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 53 /* YYNRULES -- Number of rules. */ -#define YYNRULES 189 +#define YYNRULES 195 /* YYNRULES -- Number of states. */ -#define YYNSTATES 398 +#define YYNSTATES 414 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -964,27 +1000,28 @@ static const unsigned char yytranslate[] = #if YYDEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const unsigned short yyprhs[] = +static const unsigned short int yyprhs[] = { 0, 0, 3, 7, 10, 13, 15, 17, 19, 21, 23, 25, 27, 30, 33, 36, 39, 41, 43, 45, - 47, 52, 56, 62, 63, 69, 75, 81, 84, 86, - 88, 91, 95, 97, 99, 101, 103, 105, 107, 109, - 111, 114, 118, 121, 125, 128, 131, 133, 135, 136, - 142, 149, 162, 172, 179, 183, 184, 196, 205, 211, - 215, 216, 220, 222, 224, 229, 231, 233, 237, 241, - 245, 249, 253, 257, 261, 265, 269, 273, 277, 281, - 285, 289, 293, 297, 301, 303, 309, 311, 315, 316, - 320, 322, 325, 327, 329, 331, 334, 337, 340, 344, - 348, 351, 354, 357, 359, 362, 364, 367, 369, 371, - 373, 375, 377, 379, 381, 383, 385, 387, 389, 391, - 393, 396, 399, 403, 406, 408, 412, 416, 419, 421, - 426, 430, 432, 435, 437, 448, 460, 470, 480, 489, - 501, 510, 516, 519, 524, 525, 527, 530, 532, 534, - 537, 540, 544, 549, 554, 556, 560, 562, 566, 568, - 571, 575, 582, 590, 593, 595, 597, 600, 603, 607, - 611, 615, 619, 627, 636, 640, 642, 646, 648, 656, - 665, 669, 671, 679, 688, 692, 694, 696, 699, 701 + 47, 52, 56, 62, 63, 68, 74, 80, 86, 93, + 101, 108, 116, 119, 121, 123, 126, 130, 132, 134, + 136, 138, 140, 142, 144, 146, 149, 153, 156, 160, + 163, 166, 168, 170, 172, 173, 179, 186, 199, 209, + 216, 220, 221, 233, 242, 248, 252, 253, 257, 259, + 261, 266, 268, 270, 274, 278, 282, 286, 290, 294, + 298, 302, 306, 310, 314, 318, 322, 326, 330, 334, + 338, 340, 346, 348, 352, 353, 357, 359, 362, 364, + 366, 368, 371, 374, 377, 381, 385, 388, 391, 394, + 396, 399, 401, 404, 406, 408, 410, 412, 414, 416, + 418, 420, 422, 424, 426, 428, 430, 433, 436, 440, + 443, 445, 449, 453, 456, 458, 463, 467, 469, 472, + 474, 485, 497, 507, 517, 526, 538, 547, 553, 556, + 561, 562, 564, 567, 569, 571, 574, 577, 581, 586, + 591, 593, 597, 599, 603, 605, 608, 612, 619, 627, + 630, 632, 634, 637, 640, 644, 648, 652, 656, 664, + 673, 677, 679, 683, 685, 693, 702, 706, 708, 716, + 725, 729, 731, 733, 736, 738 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -996,95 +1033,99 @@ static const yysigned_char yyrhs[] = 69, 111, -1, 69, 114, -1, 69, 116, -1, 68, -1, 111, -1, 114, -1, 116, -1, 71, 53, 73, 54, -1, 71, 53, 54, -1, 3, 21, 4, 21, - 72, -1, -1, 55, 19, 19, 56, 72, -1, 55, - 19, 21, 56, 72, -1, 55, 19, 20, 56, 72, - -1, 73, 74, -1, 74, -1, 102, -1, 19, 102, - -1, 19, 21, 102, -1, 79, -1, 80, -1, 82, - -1, 57, -1, 31, -1, 32, -1, 33, -1, 34, - -1, 19, 19, -1, 19, 53, 24, -1, 58, 118, - -1, 58, 53, 24, -1, 76, 77, -1, 77, 76, - -1, 77, -1, 76, -1, -1, 75, 91, 19, 78, - 57, -1, 75, 91, 19, 22, 78, 57, -1, 36, - 89, 88, 19, 81, 19, 53, 24, 19, 53, 24, - 57, -1, 36, 89, 88, 19, 81, 19, 53, 24, - 57, -1, 36, 89, 88, 19, 81, 19, -1, 55, - 19, 56, -1, -1, 35, 19, 19, 83, 19, 53, - 24, 19, 53, 24, 57, -1, 35, 19, 19, 83, - 19, 53, 24, 57, -1, 35, 19, 19, 83, 57, - -1, 55, 84, 56, -1, -1, 84, 59, 87, -1, - 87, -1, 30, -1, 19, 55, 30, 56, -1, 118, - -1, 85, -1, 40, 58, 85, -1, 41, 58, 85, - -1, 42, 58, 118, -1, 43, 58, 118, -1, 44, - 58, 86, -1, 46, 58, 90, -1, 47, 58, 91, - -1, 48, 58, 21, -1, 48, 58, 19, -1, 49, - 58, 21, -1, 49, 58, 19, -1, 50, 58, 21, - -1, 50, 58, 19, -1, 51, 58, 21, -1, 51, - 58, 19, -1, 52, 58, 21, -1, 52, 58, 19, - -1, 19, -1, 19, 55, 19, 91, 56, -1, 19, - -1, 55, 90, 56, -1, -1, 19, 60, 90, -1, - 19, -1, 92, 96, -1, 92, -1, 93, -1, 19, - -1, 5, 19, -1, 19, 5, -1, 95, 19, -1, - 5, 95, 19, -1, 95, 19, 5, -1, 94, 93, - -1, 21, 93, -1, 5, 93, -1, 21, -1, 21, - 5, -1, 94, -1, 94, 5, -1, 6, -1, 18, - -1, 14, -1, 15, -1, 13, -1, 16, -1, 17, - -1, 11, -1, 12, -1, 7, -1, 8, -1, 9, - -1, 61, -1, 61, 5, -1, 61, 96, -1, 61, - 5, 96, -1, 19, 99, -1, 99, -1, 75, 19, - 99, -1, 19, 75, 99, -1, 75, 99, -1, 97, - -1, 19, 55, 100, 56, -1, 100, 59, 19, -1, - 19, -1, 53, 24, -1, 57, -1, 38, 89, 98, - 91, 19, 55, 105, 56, 103, 101, -1, 75, 38, - 89, 97, 91, 19, 55, 105, 56, 103, 101, -1, - 37, 75, 91, 19, 55, 105, 56, 103, 101, -1, - 75, 37, 91, 19, 55, 105, 56, 103, 101, -1, - 37, 91, 19, 55, 105, 56, 103, 101, -1, 39, - 55, 21, 56, 91, 19, 55, 105, 56, 103, 101, - -1, 75, 91, 19, 55, 105, 56, 103, 101, -1, - 19, 55, 19, 56, 101, -1, 19, 104, -1, 19, - 104, 19, 104, -1, -1, 118, -1, 53, 24, -1, - 6, -1, 19, -1, 19, 5, -1, 5, 19, -1, - 19, 59, 106, -1, 19, 5, 59, 106, -1, 5, - 19, 59, 106, -1, 106, -1, 107, 59, 10, -1, - 107, -1, 107, 59, 108, -1, 108, -1, 91, 19, - -1, 91, 19, 22, -1, 91, 19, 55, 19, 109, - 56, -1, 91, 19, 22, 55, 19, 109, 56, -1, - 109, 110, -1, 110, -1, 19, -1, 62, 118, -1, - 63, 118, -1, 62, 58, 118, -1, 63, 58, 118, - -1, 58, 58, 118, -1, 64, 58, 118, -1, 9, - 19, 53, 112, 54, 21, 57, -1, 9, 19, 53, - 112, 59, 54, 21, 57, -1, 112, 59, 113, -1, - 113, -1, 19, 58, 118, -1, 19, -1, 46, 19, - 53, 115, 54, 21, 57, -1, 46, 19, 53, 115, - 59, 54, 21, 57, -1, 115, 59, 19, -1, 19, - -1, 45, 19, 53, 117, 54, 21, 57, -1, 45, - 19, 53, 117, 59, 54, 21, 57, -1, 117, 59, - 19, -1, 19, -1, 20, -1, 65, 20, -1, 23, - -1, 19, -1 + 72, -1, -1, 55, 19, 56, 72, -1, 55, 19, + 19, 56, 72, -1, 55, 19, 21, 56, 72, -1, + 55, 19, 20, 56, 72, -1, 55, 19, 30, 30, + 56, 72, -1, 55, 19, 30, 30, 30, 56, 72, + -1, 55, 19, 19, 30, 56, 72, -1, 55, 19, + 19, 30, 30, 56, 72, -1, 73, 74, -1, 74, + -1, 102, -1, 19, 102, -1, 19, 21, 102, -1, + 79, -1, 80, -1, 82, -1, 57, -1, 31, -1, + 32, -1, 33, -1, 34, -1, 19, 19, -1, 19, + 53, 24, -1, 58, 118, -1, 58, 53, 24, -1, + 76, 77, -1, 77, 76, -1, 77, -1, 76, -1, + 19, -1, -1, 75, 91, 19, 78, 57, -1, 75, + 91, 19, 22, 78, 57, -1, 36, 89, 88, 19, + 81, 19, 53, 24, 19, 53, 24, 57, -1, 36, + 89, 88, 19, 81, 19, 53, 24, 57, -1, 36, + 89, 88, 19, 81, 19, -1, 55, 19, 56, -1, + -1, 35, 19, 19, 83, 19, 53, 24, 19, 53, + 24, 57, -1, 35, 19, 19, 83, 19, 53, 24, + 57, -1, 35, 19, 19, 83, 57, -1, 55, 84, + 56, -1, -1, 84, 59, 87, -1, 87, -1, 30, + -1, 19, 55, 30, 56, -1, 118, -1, 85, -1, + 40, 58, 85, -1, 41, 58, 85, -1, 42, 58, + 118, -1, 43, 58, 118, -1, 44, 58, 86, -1, + 46, 58, 90, -1, 47, 58, 91, -1, 48, 58, + 21, -1, 48, 58, 19, -1, 49, 58, 21, -1, + 49, 58, 19, -1, 50, 58, 21, -1, 50, 58, + 19, -1, 51, 58, 21, -1, 51, 58, 19, -1, + 52, 58, 21, -1, 52, 58, 19, -1, 19, -1, + 19, 55, 19, 91, 56, -1, 19, -1, 55, 90, + 56, -1, -1, 19, 60, 90, -1, 19, -1, 92, + 96, -1, 92, -1, 93, -1, 19, -1, 5, 19, + -1, 19, 5, -1, 95, 19, -1, 5, 95, 19, + -1, 95, 19, 5, -1, 94, 93, -1, 21, 93, + -1, 5, 93, -1, 21, -1, 21, 5, -1, 94, + -1, 94, 5, -1, 6, -1, 18, -1, 14, -1, + 15, -1, 13, -1, 16, -1, 17, -1, 11, -1, + 12, -1, 7, -1, 8, -1, 9, -1, 61, -1, + 61, 5, -1, 61, 96, -1, 61, 5, 96, -1, + 19, 99, -1, 99, -1, 75, 19, 99, -1, 19, + 75, 99, -1, 75, 99, -1, 97, -1, 19, 55, + 100, 56, -1, 100, 59, 19, -1, 19, -1, 53, + 24, -1, 57, -1, 38, 89, 98, 91, 19, 55, + 105, 56, 103, 101, -1, 75, 38, 89, 97, 91, + 19, 55, 105, 56, 103, 101, -1, 37, 75, 91, + 19, 55, 105, 56, 103, 101, -1, 75, 37, 91, + 19, 55, 105, 56, 103, 101, -1, 37, 91, 19, + 55, 105, 56, 103, 101, -1, 39, 55, 21, 56, + 91, 19, 55, 105, 56, 103, 101, -1, 75, 91, + 19, 55, 105, 56, 103, 101, -1, 19, 55, 19, + 56, 101, -1, 19, 104, -1, 19, 104, 19, 104, + -1, -1, 118, -1, 53, 24, -1, 6, -1, 19, + -1, 19, 5, -1, 5, 19, -1, 19, 59, 106, + -1, 19, 5, 59, 106, -1, 5, 19, 59, 106, + -1, 106, -1, 107, 59, 10, -1, 107, -1, 107, + 59, 108, -1, 108, -1, 91, 19, -1, 91, 19, + 22, -1, 91, 19, 55, 19, 109, 56, -1, 91, + 19, 22, 55, 19, 109, 56, -1, 109, 110, -1, + 110, -1, 19, -1, 62, 118, -1, 63, 118, -1, + 62, 58, 118, -1, 63, 58, 118, -1, 58, 58, + 118, -1, 64, 58, 118, -1, 9, 19, 53, 112, + 54, 21, 57, -1, 9, 19, 53, 112, 59, 54, + 21, 57, -1, 112, 59, 113, -1, 113, -1, 19, + 58, 118, -1, 19, -1, 46, 19, 53, 115, 54, + 21, 57, -1, 46, 19, 53, 115, 59, 54, 21, + 57, -1, 115, 59, 19, -1, 19, -1, 45, 19, + 53, 117, 54, 21, 57, -1, 45, 19, 53, 117, + 59, 54, 21, 57, -1, 117, 59, 19, -1, 19, + -1, 20, -1, 65, 20, -1, 23, -1, 19, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const unsigned short yyrline[] = +static const unsigned short int yyrline[] = { - 0, 649, 649, 650, 651, 652, 655, 664, 673, 682, - 691, 700, 711, 712, 713, 714, 715, 716, 717, 718, - 721, 726, 733, 747, 748, 760, 769, 783, 784, 787, - 788, 797, 809, 810, 811, 812, 815, 816, 817, 818, - 821, 841, 865, 869, 877, 878, 879, 880, 881, 887, - 890, 895, 963, 1017, 1106, 1114, 1119, 1167, 1203, 1219, - 1220, 1223, 1224, 1227, 1228, 1240, 1241, 1244, 1250, 1256, - 1262, 1268, 1274, 1280, 1287, 1293, 1299, 1305, 1311, 1317, - 1323, 1329, 1335, 1341, 1347, 1372, 1381, 1387, 1388, 1391, - 1394, 1400, 1407, 1416, 1419, 1422, 1426, 1430, 1434, 1439, - 1447, 1451, 1456, 1460, 1463, 1467, 1470, 1475, 1476, 1477, - 1478, 1479, 1480, 1481, 1482, 1483, 1486, 1487, 1488, 1491, - 1492, 1493, 1497, 1504, 1516, 1522, 1534, 1546, 1549, 1555, - 1560, 1563, 1568, 1569, 1573, 1589, 1605, 1621, 1637, 1648, - 1654, 1664, 1687, 1698, 1717, 1723, 1724, 1730, 1731, 1742, - 1753, 1764, 1774, 1784, 1794, 1797, 1798, 1801, 1802, 1805, - 1808, 1811, 1819, 1829, 1830, 1833, 1850, 1857, 1864, 1871, - 1878, 1885, 1894, 1903, 1914, 1915, 1918, 1938, 1948, 1957, - 1968, 1971, 1976, 1985, 1996, 1999, 2005, 2006, 2010, 2011 + 0, 689, 689, 690, 691, 692, 695, 704, 713, 722, + 731, 740, 751, 752, 753, 754, 755, 756, 757, 758, + 761, 766, 773, 790, 791, 799, 811, 820, 832, 841, + 850, 859, 870, 871, 874, 875, 884, 896, 897, 898, + 899, 902, 903, 904, 905, 908, 928, 952, 956, 964, + 965, 966, 967, 968, 976, 982, 985, 990, 1058, 1112, + 1201, 1209, 1214, 1262, 1298, 1314, 1315, 1318, 1319, 1322, + 1323, 1335, 1336, 1339, 1345, 1351, 1357, 1363, 1369, 1375, + 1382, 1388, 1394, 1400, 1406, 1412, 1418, 1424, 1430, 1436, + 1442, 1467, 1476, 1482, 1483, 1486, 1489, 1495, 1502, 1511, + 1514, 1517, 1521, 1525, 1529, 1534, 1542, 1546, 1551, 1555, + 1558, 1562, 1565, 1570, 1571, 1572, 1573, 1574, 1575, 1576, + 1577, 1578, 1581, 1582, 1583, 1586, 1587, 1588, 1592, 1599, + 1611, 1617, 1629, 1641, 1644, 1650, 1655, 1658, 1663, 1664, + 1668, 1684, 1700, 1716, 1732, 1743, 1749, 1759, 1782, 1793, + 1812, 1818, 1819, 1825, 1826, 1837, 1848, 1859, 1869, 1879, + 1889, 1892, 1893, 1896, 1897, 1900, 1903, 1906, 1914, 1924, + 1925, 1928, 1945, 1952, 1959, 1966, 1973, 1980, 1989, 1998, + 2009, 2010, 2013, 2033, 2043, 2052, 2063, 2066, 2071, 2080, + 2091, 2094, 2100, 2101, 2105, 2106 }; #endif @@ -1118,7 +1159,7 @@ static const char *const yytname[] = # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const unsigned short yytoknum[] = +static const unsigned short int yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, @@ -1135,23 +1176,24 @@ static const unsigned char yyr1[] = { 0, 66, 67, 67, 67, 67, 68, 68, 68, 68, 68, 68, 69, 69, 69, 69, 69, 69, 69, 69, - 70, 70, 71, 72, 72, 72, 72, 73, 73, 74, - 74, 74, 74, 74, 74, 74, 75, 75, 75, 75, - 76, 76, 77, 77, 78, 78, 78, 78, 78, 79, - 79, 80, 80, 80, 81, 81, 82, 82, 82, 83, - 83, 84, 84, 85, 85, 86, 86, 87, 87, 87, + 70, 70, 71, 72, 72, 72, 72, 72, 72, 72, + 72, 72, 73, 73, 74, 74, 74, 74, 74, 74, + 74, 75, 75, 75, 75, 76, 76, 77, 77, 78, + 78, 78, 78, 78, 78, 79, 79, 80, 80, 80, + 81, 81, 82, 82, 82, 83, 83, 84, 84, 85, + 85, 86, 86, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, - 87, 87, 87, 87, 87, 88, 88, 89, 89, 90, - 90, 91, 91, 92, 92, 92, 92, 92, 92, 92, - 93, 93, 93, 93, 93, 93, 93, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 95, 95, 95, 96, - 96, 96, 96, 97, 97, 98, 98, 98, 98, 99, - 100, 100, 101, 101, 102, 102, 102, 102, 102, 102, - 102, 102, 103, 103, 103, 104, 104, 105, 105, 105, - 105, 105, 105, 105, 105, 106, 106, 107, 107, 108, - 108, 108, 108, 109, 109, 110, 110, 110, 110, 110, - 110, 110, 111, 111, 112, 112, 113, 113, 114, 114, - 115, 115, 116, 116, 117, 117, 118, 118, 118, 118 + 87, 88, 88, 89, 89, 90, 90, 91, 91, 92, + 92, 92, 92, 92, 92, 92, 93, 93, 93, 93, + 93, 93, 93, 94, 94, 94, 94, 94, 94, 94, + 94, 94, 95, 95, 95, 96, 96, 96, 96, 97, + 97, 98, 98, 98, 98, 99, 100, 100, 101, 101, + 102, 102, 102, 102, 102, 102, 102, 102, 103, 103, + 103, 104, 104, 105, 105, 105, 105, 105, 105, 105, + 105, 106, 106, 107, 107, 108, 108, 108, 108, 109, + 109, 110, 110, 110, 110, 110, 110, 110, 111, 111, + 112, 112, 113, 113, 114, 114, 115, 115, 116, 116, + 117, 117, 118, 118, 118, 118 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1159,23 +1201,24 @@ static const unsigned char yyr2[] = { 0, 2, 3, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 1, - 4, 3, 5, 0, 5, 5, 5, 2, 1, 1, - 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 3, 2, 3, 2, 2, 1, 1, 0, 5, - 6, 12, 9, 6, 3, 0, 11, 8, 5, 3, - 0, 3, 1, 1, 4, 1, 1, 3, 3, 3, + 4, 3, 5, 0, 4, 5, 5, 5, 6, 7, + 6, 7, 2, 1, 1, 2, 3, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 3, 2, 3, 2, + 2, 1, 1, 1, 0, 5, 6, 12, 9, 6, + 3, 0, 11, 8, 5, 3, 0, 3, 1, 1, + 4, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 1, 5, 1, 3, 0, 3, - 1, 2, 1, 1, 1, 2, 2, 2, 3, 3, - 2, 2, 2, 1, 2, 1, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 2, 3, 2, 1, 3, 3, 2, 1, 4, - 3, 1, 2, 1, 10, 11, 9, 9, 8, 11, - 8, 5, 2, 4, 0, 1, 2, 1, 1, 2, - 2, 3, 4, 4, 1, 3, 1, 3, 1, 2, - 3, 6, 7, 2, 1, 1, 2, 2, 3, 3, - 3, 3, 7, 8, 3, 1, 3, 1, 7, 8, - 3, 1, 7, 8, 3, 1, 1, 2, 1, 1 + 1, 5, 1, 3, 0, 3, 1, 2, 1, 1, + 1, 2, 2, 2, 3, 3, 2, 2, 2, 1, + 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 2, 3, 2, + 1, 3, 3, 2, 1, 4, 3, 1, 2, 1, + 10, 11, 9, 9, 8, 11, 8, 5, 2, 4, + 0, 1, 2, 1, 1, 2, 2, 3, 4, 4, + 1, 3, 1, 3, 1, 2, 3, 6, 7, 2, + 1, 1, 2, 2, 3, 3, 3, 3, 7, 8, + 3, 1, 3, 1, 7, 8, 3, 1, 7, 8, + 3, 1, 1, 2, 1, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -1186,241 +1229,255 @@ static const unsigned char yydefact[] = 0, 0, 0, 6, 8, 9, 7, 10, 11, 0, 0, 0, 16, 0, 5, 0, 17, 18, 19, 0, 0, 0, 0, 1, 12, 4, 13, 14, 15, 3, - 0, 0, 0, 0, 0, 2, 0, 36, 37, 38, - 39, 0, 88, 0, 88, 0, 21, 35, 0, 28, - 0, 32, 33, 34, 29, 23, 177, 0, 175, 185, - 0, 181, 0, 0, 0, 0, 0, 30, 0, 0, - 0, 0, 107, 116, 117, 118, 114, 115, 111, 109, - 110, 112, 113, 108, 94, 103, 0, 0, 92, 93, - 105, 0, 0, 0, 20, 27, 0, 88, 0, 0, - 22, 0, 0, 0, 0, 0, 0, 0, 31, 0, - 0, 60, 90, 0, 86, 0, 0, 95, 102, 0, - 96, 104, 101, 0, 0, 119, 91, 106, 100, 97, - 0, 0, 128, 0, 124, 0, 0, 0, 48, 0, - 189, 186, 188, 0, 176, 0, 0, 174, 0, 184, - 0, 0, 180, 0, 0, 0, 0, 0, 0, 87, - 0, 55, 98, 0, 0, 120, 121, 99, 0, 0, - 0, 123, 0, 127, 0, 0, 0, 0, 0, 0, - 48, 0, 0, 47, 46, 0, 0, 0, 0, 187, - 172, 0, 182, 0, 178, 0, 0, 133, 141, 84, + 0, 0, 0, 0, 0, 2, 0, 41, 42, 43, + 44, 0, 94, 0, 94, 0, 21, 40, 0, 33, + 0, 37, 38, 39, 34, 23, 183, 0, 181, 191, + 0, 187, 0, 0, 0, 0, 0, 35, 0, 0, + 0, 0, 113, 122, 123, 124, 120, 121, 117, 115, + 116, 118, 119, 114, 100, 109, 0, 0, 98, 99, + 111, 0, 0, 0, 20, 32, 0, 94, 0, 0, + 22, 0, 0, 0, 0, 0, 0, 0, 36, 0, + 0, 66, 96, 0, 92, 0, 0, 101, 108, 0, + 102, 110, 107, 0, 0, 125, 97, 112, 106, 103, + 0, 0, 134, 0, 130, 0, 0, 0, 54, 0, + 195, 192, 194, 0, 182, 0, 0, 180, 0, 190, + 0, 0, 186, 0, 0, 0, 0, 0, 0, 93, + 0, 61, 104, 0, 0, 126, 127, 105, 0, 0, + 0, 129, 0, 133, 0, 0, 0, 0, 0, 53, + 54, 0, 0, 52, 51, 0, 0, 0, 0, 0, + 23, 193, 178, 0, 188, 0, 184, 0, 0, 139, + 147, 90, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 68, 0, 64, 95, 0, + 0, 0, 0, 0, 113, 100, 0, 0, 160, 162, + 164, 128, 137, 0, 132, 131, 0, 0, 0, 0, + 45, 0, 0, 0, 0, 47, 49, 0, 50, 55, + 0, 23, 23, 23, 0, 24, 179, 189, 185, 138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 62, 0, 58, 89, 0, 0, 0, - 0, 0, 107, 94, 0, 0, 154, 156, 158, 122, - 131, 0, 126, 125, 0, 0, 0, 0, 40, 0, - 0, 0, 0, 42, 44, 45, 49, 23, 23, 23, - 173, 183, 179, 132, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 59, 0, 0, 0, - 0, 53, 0, 95, 96, 0, 159, 144, 0, 129, - 0, 0, 0, 0, 0, 41, 50, 144, 43, 24, - 26, 25, 0, 63, 67, 68, 69, 70, 189, 66, - 71, 65, 72, 73, 75, 74, 77, 76, 79, 78, - 81, 80, 83, 82, 61, 0, 85, 54, 0, 144, - 0, 0, 151, 160, 0, 0, 0, 155, 157, 130, - 0, 0, 144, 0, 0, 0, 0, 57, 0, 0, - 153, 152, 0, 0, 0, 142, 145, 138, 144, 0, - 0, 0, 140, 0, 0, 0, 52, 136, 0, 165, - 0, 0, 0, 0, 0, 164, 146, 0, 0, 144, - 137, 144, 64, 0, 0, 0, 0, 0, 166, 0, - 167, 0, 161, 163, 143, 134, 0, 0, 56, 0, - 162, 170, 168, 169, 171, 139, 135, 51 + 0, 0, 65, 0, 0, 0, 0, 59, 0, 101, + 102, 0, 165, 150, 0, 135, 0, 0, 0, 0, + 0, 46, 56, 150, 48, 0, 23, 25, 27, 26, + 0, 23, 0, 69, 73, 74, 75, 76, 195, 72, + 77, 71, 78, 79, 81, 80, 83, 82, 85, 84, + 87, 86, 89, 88, 67, 0, 91, 60, 0, 150, + 0, 0, 157, 166, 0, 0, 0, 161, 163, 136, + 0, 0, 150, 0, 0, 23, 30, 23, 28, 0, + 0, 63, 0, 0, 159, 158, 0, 0, 0, 148, + 151, 144, 150, 0, 0, 0, 146, 31, 29, 0, + 0, 0, 58, 142, 0, 171, 0, 0, 0, 0, + 0, 170, 152, 0, 0, 150, 143, 150, 70, 0, + 0, 0, 0, 0, 172, 0, 173, 0, 167, 169, + 149, 140, 0, 0, 62, 0, 168, 176, 174, 175, + 177, 145, 141, 57 }; /* YYDEFGOTO[NTERM-NUM]. */ -static const short yydefgoto[] = +static const short int yydefgoto[] = { -1, 11, 12, 13, 14, 15, 100, 48, 49, 50, - 183, 184, 185, 51, 52, 219, 53, 157, 212, 294, - 300, 213, 115, 70, 113, 224, 88, 89, 90, 91, - 126, 132, 133, 134, 231, 198, 54, 326, 345, 225, - 226, 227, 228, 364, 365, 16, 57, 58, 17, 62, - 18, 60, 346 + 183, 184, 185, 51, 52, 221, 53, 157, 214, 304, + 310, 215, 115, 70, 113, 226, 88, 89, 90, 91, + 126, 132, 133, 134, 233, 200, 54, 336, 359, 227, + 228, 229, 230, 380, 381, 16, 57, 58, 17, 62, + 18, 60, 360 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -317 -static const short yypact[] = +#define YYPACT_NINF -325 +static const short int yypact[] = { - 137, 4, 45, -317, -317, -317, -317, -317, -317, 99, - 106, 134, -317, 137, 170, 98, -317, -317, -317, 156, - 124, 125, 157, -317, -317, 170, -317, -317, -317, 170, - 154, 181, 209, 214, 222, 170, 215, -317, -317, -317, - -317, 225, 196, 310, 196, 204, -317, -317, 188, -317, - 276, -317, -317, -317, -317, 217, 216, 113, -317, -317, - 117, -317, 146, 241, 301, 267, 276, -317, 284, 292, - 293, 357, -317, -317, -317, -317, -317, -317, -317, -317, - -317, -317, -317, -317, 325, 425, 374, 317, 299, -317, - 439, 318, 231, 346, -317, -317, 374, 196, 358, 365, - -317, 74, 373, 76, 380, 84, 390, 90, -317, 362, - 409, 377, 375, 378, 392, 414, 453, -317, -317, 429, - -317, 453, -317, 430, 406, 2, -317, 453, -317, 457, - 224, 444, -317, 374, -317, 416, 454, 456, 126, 149, - -317, -317, -317, 458, -317, 419, 459, -317, 420, -317, - 460, 422, -317, 461, 70, 428, 258, 21, 292, -317, - 465, 431, -317, 432, 391, 299, -317, -317, 433, 466, - 470, -317, -6, -317, 471, 374, 436, -6, 374, 26, - 0, 391, 7, 434, 474, 437, 440, 441, 442, -317, - -317, 438, -317, 443, -317, 445, 475, -317, -317, -317, - 446, 447, 448, 449, 450, 451, 452, 455, 462, 463, - 464, 467, 91, -317, 473, -317, -317, 374, 482, 484, - 391, 408, 468, 6, 492, 472, -317, 476, -317, -317, - -317, 147, -317, -317, 477, 493, 391, 495, -317, 491, - 479, 478, 494, -317, -317, -317, -317, 217, 217, 217, - -317, -317, -317, -317, 1, 1, 74, 74, 9, 292, - 374, 218, 219, 247, 248, 252, -317, 258, 499, 481, - 483, 480, 485, 153, 158, 374, 94, 497, 340, -317, - 498, 391, 487, 488, 490, -317, -317, 497, -317, -317, - -317, -317, 496, -317, -317, -317, -317, -317, 496, -317, - -317, -317, -317, -317, -317, -317, -317, -317, -317, -317, - -317, -317, -317, -317, -317, 47, -317, -317, 503, 497, - 374, 374, -317, 500, 510, 27, 70, -317, -317, -317, - 501, 391, 497, 391, 70, 489, 505, -317, 54, 70, - -317, -317, 511, 57, 507, 519, -317, -317, 497, 504, - 70, 506, -317, 508, 516, 512, -317, -317, 57, -317, - 509, 64, 66, 513, 50, -317, -317, 27, 70, 497, - -317, 497, -317, 486, 522, 79, 74, 74, -317, 74, - -317, 74, -317, -317, -317, -317, 70, 70, -317, 502, - -317, -317, -317, -317, -317, -317, -317, -317 + 144, -5, 92, -325, -325, -325, -325, -325, -325, 98, + 99, 123, -325, 144, 167, 78, -325, -325, -325, 161, + 121, 154, 182, -325, -325, 167, -325, -325, -325, 167, + 148, 179, 217, 227, 228, 167, 211, -325, -325, -325, + -325, 237, 229, 326, 229, 234, -325, -325, 184, -325, + 292, -325, -325, -325, -325, 263, 261, -31, -325, -325, + 147, -325, 174, 268, 283, 309, 292, -325, 317, 330, + 331, 373, -325, -325, -325, -325, -325, -325, -325, -325, + -325, -325, -325, -325, 346, 441, 390, 333, 294, -325, + 455, 334, 293, 335, -325, -325, 390, 229, 357, 364, + -325, 75, 372, 38, 379, 50, 389, 95, -325, 298, + 398, 393, 367, 378, 394, 425, 469, -325, -325, 431, + -325, 469, -325, 432, 408, 5, -325, 469, -325, 459, + 220, 446, -325, 390, -325, 421, 460, 470, 156, 178, + -325, -325, -325, 458, -325, 434, 467, -325, 435, -325, + 472, 437, -325, 474, 202, 442, 221, 39, 330, -325, + 477, 443, -325, 444, 407, 294, -325, -325, 445, 482, + 483, -325, -6, -325, 484, 390, 449, -6, 390, 101, + 31, 407, 15, 447, 487, 450, -15, 452, 453, 480, + 263, -325, -325, 454, -325, 456, -325, 457, 488, -325, + -325, -325, 461, 462, 463, 464, 465, 466, 468, 471, + 473, 475, 476, 478, -23, -325, 479, -325, -325, 390, + 496, 497, 407, 424, 481, 14, 498, 485, -325, 486, + -325, -325, -325, 201, -325, -325, 489, 499, 407, 506, + -325, 503, 490, 492, 504, -325, -325, 101, -325, -325, + 100, 263, 263, 263, 104, -325, -325, -325, -325, -325, + 2, 2, 75, 75, 7, 330, 390, 208, 266, 269, + 274, 327, -325, 221, 511, 493, 494, 500, 495, 222, + 223, 390, 87, 519, 356, -325, 520, 407, 491, 501, + 505, -325, -325, 519, -325, 502, 263, -325, -325, -325, + 507, 263, 509, -325, -325, -325, -325, -325, 509, -325, + -325, -325, -325, -325, -325, -325, -325, -325, -325, -325, + -325, -325, -325, -325, -325, 58, -325, -325, 516, 519, + 390, 390, -325, 510, 523, 32, 202, -325, -325, -325, + 512, 407, 519, 407, 202, 263, -325, 263, -325, 513, + 508, -325, 71, 202, -325, -325, 533, 88, 530, 536, + -325, -325, 519, 514, 202, 515, -325, -325, -325, 517, + 532, 521, -325, -325, 88, -325, 518, 64, 83, 522, + 63, -325, -325, 32, 202, 519, -325, 519, -325, 524, + 535, 81, 75, 75, -325, 75, -325, 75, -325, -325, + -325, -325, 202, 202, -325, 525, -325, -325, -325, -325, + -325, -325, -325, -325 }; /* YYPGOTO[NTERM-NUM]. */ -static const short yypgoto[] = +static const short int yypgoto[] = { - -317, -317, 8, 82, 534, -317, -17, -317, 515, -31, - 364, 366, 370, -317, -317, -317, -317, -317, -317, -54, - -317, 285, -317, -29, -154, -42, -317, -68, -317, -62, - -109, 417, -317, -95, -317, -316, -22, -281, 186, -179, - -220, -317, 278, 203, -247, 97, -317, 469, 145, -317, - 200, -317, -101 + -325, -325, 103, 110, 549, -325, -188, -325, 527, -25, + 382, 347, 387, -325, -325, -325, -325, -325, -325, 22, + -325, 296, -325, -35, -153, -42, -325, -68, -325, -65, + -94, 440, -325, -84, -325, -324, -22, -286, 189, -177, + -256, -325, 295, 204, -154, 175, -325, 526, 196, -325, + 245, -325, -101 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -151 -static const short yytable[] = +#define YYTABLE_NINF -157 +static const short int yytable[] = { - 144, 87, 241, 118, 216, 66, 334, 165, 98, 119, - 347, 274, 86, 168, 67, 92, 166, 122, 352, 179, - 292, 24, 128, 357, 110, 19, 140, 141, 298, 141, - 142, 293, 142, 66, 370, 171, 173, 24, 339, 293, - 214, 272, 108, 24, 123, 238, 140, 141, 118, 169, - 142, 350, 385, 118, 136, 322, 229, 283, 182, 118, - 242, 131, -148, 125, 20, 275, 336, 368, 137, 359, - 395, 396, 143, 355, 143, 232, 359, 233, 215, 239, - 344, 243, 171, 140, 141, 140, 141, 142, 386, 142, - 387, 174, 143, 140, 141, 56, 29, 142, 359, 170, - 340, 341, 330, 149, 337, 302, 382, 35, 360, 152, - 26, 356, 361, 362, 363, 360, 323, 383, 21, 361, - 362, 363, 377, 196, 379, 22, 26, 197, 383, 143, - 146, 143, 26, 235, 23, 390, 237, 360, 150, 143, - 1, 361, 362, 363, 153, 179, 2, 266, 180, 324, - 267, 30, 349, 118, 351, 296, 297, 301, 27, 119, - 31, 3, 4, 5, 6, 7, 8, 102, 186, 187, - 188, 104, 103, 36, 27, 269, 105, 32, 33, 2, - 27, 181, 9, 10, 182, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 3, 4, 5, 6, 7, 8, - 106, 295, 55, 279, 299, 107, 280, 36, 46, -150, - 34, 47, 320, 28, -149, 9, 10, 321, 303, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 56, 28, - 289, 290, 291, 59, 63, 28, 64, 304, 306, 305, - 307, 61, 94, 168, 68, 47, 37, 38, 39, 40, - 130, 69, 43, 44, 45, 37, 38, 39, 40, 93, - 378, 380, 37, 38, 39, 40, 308, 310, 309, 311, - 65, 312, 99, 313, 101, 391, 392, 199, 393, 169, - 394, 71, 72, 73, 74, 75, 109, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 65, 85, 200, 201, - 202, 203, 204, 111, 205, 206, 207, 208, 209, 210, - 211, 112, 114, 96, 97, 71, 72, 73, 74, 75, - 63, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 120, 85, 37, 38, 39, 40, 124, 129, 43, 44, - 45, 37, 38, 39, 40, 71, 72, 73, 74, 75, - 327, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 125, 85, 116, 72, 73, 74, 75, 135, 76, 77, - 78, 79, 80, 81, 82, 83, 117, 138, 85, 71, - 72, 73, 74, 75, 139, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 145, 85, 221, 222, 73, 74, - 75, 148, 76, 77, 78, 79, 80, 81, 82, 83, - 223, 151, 85, 116, 72, 73, 74, 75, 154, 76, - 77, 78, 79, 80, 81, 82, 83, 273, 155, 85, - 121, 72, 156, 161, 159, 158, 76, 77, 78, 79, - 80, 81, 82, 83, 127, 72, 85, 160, 162, 163, - 76, 77, 78, 79, 80, 81, 82, 83, 116, 72, - 85, 164, 167, 172, 76, 77, 78, 79, 80, 81, - 82, 83, 175, 176, 85, 177, 190, 192, 189, 194, - 191, 193, 195, 181, 217, 230, 218, 220, 169, 168, - 234, 236, 182, 179, 246, 250, 247, 248, 249, 253, - 251, 270, 252, 271, 254, 255, 256, 257, 258, 259, - 260, 276, 282, 261, 284, 285, 325, 329, 288, 353, - 262, 263, 264, 315, -147, 265, 268, 338, 277, 343, - 358, 366, 281, 318, 287, 278, 286, 316, 367, 317, - 373, 319, 331, 388, 332, 333, 389, 25, 245, 244, - 240, 335, 314, 384, 178, 342, 328, 348, 354, 397, - 369, 375, 371, 95, 372, 374, 0, 376, 0, 0, - 0, 381, 147 + 144, 87, 255, 118, 243, 218, 119, 344, 98, 92, + 165, 66, 361, 168, 67, 250, 19, 122, 86, 280, + 366, 302, 128, 102, 110, 332, 308, 141, 103, 373, + 142, 166, 303, 272, 140, 141, 273, 303, 142, 66, + 386, 251, 108, 353, 123, 278, 171, 173, 118, 169, + 179, 140, 141, 118, 136, 142, 364, 56, 216, 118, + 401, 289, 137, 297, 298, 299, 125, 131, 244, 149, + -154, 231, 143, 281, 354, 355, 384, 350, 411, 412, + 143, 245, 375, 140, 141, 358, 234, 142, 235, 182, + 371, 174, 146, 171, 140, 141, 217, 143, 142, 402, + 375, 403, 140, 141, 150, 170, 142, 375, 346, 333, + 340, 20, 312, 348, 152, 351, 24, 21, 22, 398, + 240, 376, 393, 23, 29, 377, 378, 379, 372, 143, + 295, 30, 24, 237, 300, 35, 239, 406, 24, 376, + 143, 395, 334, 377, 378, 379, 376, 1, 143, 153, + 377, 378, 379, 2, 241, 118, 296, 367, 119, 368, + 301, 306, 307, 311, 363, 31, 365, 36, 3, 4, + 5, 6, 7, 8, 32, 179, 2, 275, 180, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 26, 9, + 10, 3, 4, 5, 6, 7, 8, 186, 187, 188, + 55, 104, 46, 36, 26, 47, 105, 33, 189, 27, + 26, 181, 9, 10, 182, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 313, 27, 399, 314, 106, 315, + 63, 27, 64, 107, 190, 34, 56, 399, 94, 168, + 201, 47, 37, 38, 39, 40, 59, 61, 43, 44, + 45, 37, 38, 39, 40, 198, 68, 285, 28, 199, + 286, 202, 203, 204, 205, 206, 65, 207, 208, 209, + 210, 211, 212, 213, 28, 169, 394, 396, -156, -155, + 28, 330, 331, 305, 69, 316, 309, 317, 318, 93, + 319, 407, 408, 320, 409, 321, 410, 71, 72, 73, + 74, 75, 63, 76, 77, 78, 79, 80, 81, 82, + 83, 84, 130, 85, 37, 38, 39, 40, 99, 101, + 43, 44, 45, 65, 37, 38, 39, 40, 109, 96, + 97, 71, 72, 73, 74, 75, 111, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 322, 85, 323, 112, + 114, 120, 124, 129, 154, 125, 135, 37, 38, 39, + 40, 71, 72, 73, 74, 75, 337, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 138, 85, 116, 72, + 73, 74, 75, 139, 76, 77, 78, 79, 80, 81, + 82, 83, 117, 145, 85, 71, 72, 73, 74, 75, + 148, 76, 77, 78, 79, 80, 81, 82, 83, 84, + 151, 85, 223, 224, 73, 74, 75, 155, 76, 77, + 78, 79, 80, 81, 82, 83, 225, 158, 85, 116, + 72, 73, 74, 75, 159, 76, 77, 78, 79, 80, + 81, 82, 83, 279, 161, 85, 121, 72, 156, 160, + 162, 163, 76, 77, 78, 79, 80, 81, 82, 83, + 127, 72, 85, 164, 167, 172, 76, 77, 78, 79, + 80, 81, 82, 83, 116, 72, 85, 175, 191, 176, + 76, 77, 78, 79, 80, 81, 82, 83, 193, 177, + 85, 192, 194, 195, 196, 197, 219, 181, 220, 222, + 169, 232, 168, 236, 238, 182, 247, 249, 252, 253, + 254, 256, 259, 257, 258, 276, 277, 282, 288, 260, + 261, 262, 263, 264, 265, 290, 266, 291, 294, 267, + 246, 268, 274, 269, 270, 325, 271, -153, 335, 339, + 352, 283, 357, 369, 287, 284, 341, 292, 293, 326, + 327, 329, 374, 328, 382, 383, 389, 342, 345, 405, + 343, 370, 25, 347, 349, 356, 248, 242, 362, 324, + 385, 387, 400, 388, 390, 95, 392, 178, 391, 338, + 397, 404, 413, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 147 }; -static const short yycheck[] = +static const short int yycheck[] = { - 101, 43, 181, 71, 158, 36, 287, 5, 50, 71, - 326, 5, 43, 19, 36, 44, 125, 85, 334, 19, - 19, 13, 90, 339, 66, 21, 19, 20, 19, 20, - 23, 30, 23, 64, 350, 130, 131, 29, 319, 30, - 19, 220, 64, 35, 86, 19, 19, 20, 116, 55, - 23, 332, 368, 121, 96, 275, 165, 236, 58, 127, - 53, 92, 56, 61, 19, 59, 19, 348, 97, 19, - 386, 387, 65, 19, 65, 170, 19, 172, 57, 53, - 53, 182, 177, 19, 20, 19, 20, 23, 369, 23, - 371, 133, 65, 19, 20, 19, 14, 23, 19, 130, - 320, 321, 281, 19, 57, 259, 56, 25, 58, 19, - 13, 57, 62, 63, 64, 58, 22, 364, 19, 62, - 63, 64, 58, 53, 58, 19, 29, 57, 375, 65, - 54, 65, 35, 175, 0, 56, 178, 58, 54, 65, - 3, 62, 63, 64, 54, 19, 9, 56, 22, 55, - 59, 53, 331, 221, 333, 256, 257, 258, 13, 221, - 4, 24, 25, 26, 27, 28, 29, 54, 19, 20, - 21, 54, 59, 19, 29, 217, 59, 53, 53, 9, + 101, 43, 190, 71, 181, 158, 71, 293, 50, 44, + 5, 36, 336, 19, 36, 30, 21, 85, 43, 5, + 344, 19, 90, 54, 66, 281, 19, 20, 59, 353, + 23, 125, 30, 56, 19, 20, 59, 30, 23, 64, + 364, 56, 64, 329, 86, 222, 130, 131, 116, 55, + 19, 19, 20, 121, 96, 23, 342, 19, 19, 127, + 384, 238, 97, 251, 252, 253, 61, 92, 53, 19, + 56, 165, 65, 59, 330, 331, 362, 19, 402, 403, + 65, 182, 19, 19, 20, 53, 170, 23, 172, 58, + 19, 133, 54, 177, 19, 20, 57, 65, 23, 385, + 19, 387, 19, 20, 54, 130, 23, 19, 296, 22, + 287, 19, 265, 301, 19, 57, 13, 19, 19, 56, + 19, 58, 58, 0, 14, 62, 63, 64, 57, 65, + 30, 53, 29, 175, 30, 25, 178, 56, 35, 58, + 65, 58, 55, 62, 63, 64, 58, 3, 65, 54, + 62, 63, 64, 9, 53, 223, 56, 345, 223, 347, + 56, 262, 263, 264, 341, 4, 343, 19, 24, 25, + 26, 27, 28, 29, 53, 19, 9, 219, 22, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 13, 45, + 46, 24, 25, 26, 27, 28, 29, 19, 20, 21, + 21, 54, 54, 19, 29, 57, 59, 53, 30, 13, 35, 55, 45, 46, 58, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 24, 25, 26, 27, 28, 29, - 54, 255, 21, 56, 258, 59, 59, 19, 54, 56, - 53, 57, 59, 13, 56, 45, 46, 59, 260, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 19, 29, - 247, 248, 249, 19, 19, 35, 21, 19, 19, 21, - 21, 19, 54, 19, 19, 57, 31, 32, 33, 34, - 19, 55, 37, 38, 39, 31, 32, 33, 34, 55, - 361, 362, 31, 32, 33, 34, 19, 19, 21, 21, - 55, 19, 55, 21, 58, 376, 377, 19, 379, 55, - 381, 5, 6, 7, 8, 9, 19, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 55, 21, 40, 41, - 42, 43, 44, 19, 46, 47, 48, 49, 50, 51, - 52, 19, 19, 37, 38, 5, 6, 7, 8, 9, - 19, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 5, 21, 31, 32, 33, 34, 19, 19, 37, 38, - 39, 31, 32, 33, 34, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 61, 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, 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, 56, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 19, 21, - 5, 6, 55, 19, 56, 60, 11, 12, 13, 14, - 15, 16, 17, 18, 5, 6, 21, 55, 19, 19, - 11, 12, 13, 14, 15, 16, 17, 18, 5, 6, - 21, 55, 5, 19, 11, 12, 13, 14, 15, 16, - 17, 18, 56, 19, 21, 19, 57, 57, 20, 57, - 21, 21, 21, 55, 19, 19, 55, 55, 55, 19, - 19, 55, 58, 19, 57, 57, 56, 56, 56, 24, - 57, 19, 57, 19, 58, 58, 58, 58, 58, 58, - 58, 19, 19, 58, 19, 24, 19, 19, 24, 30, - 58, 58, 58, 24, 56, 58, 53, 24, 56, 19, - 19, 24, 55, 53, 56, 59, 57, 56, 19, 56, - 24, 56, 55, 57, 56, 55, 24, 13, 184, 183, - 180, 55, 267, 367, 137, 55, 278, 56, 53, 57, - 56, 358, 56, 48, 56, 53, -1, 58, -1, -1, - -1, 58, 103 + 36, 37, 38, 39, 266, 29, 380, 19, 54, 21, + 19, 35, 21, 59, 56, 53, 19, 391, 54, 19, + 19, 57, 31, 32, 33, 34, 19, 19, 37, 38, + 39, 31, 32, 33, 34, 53, 19, 56, 13, 57, + 59, 40, 41, 42, 43, 44, 55, 46, 47, 48, + 49, 50, 51, 52, 29, 55, 377, 378, 56, 56, + 35, 59, 59, 261, 55, 19, 264, 21, 19, 55, + 21, 392, 393, 19, 395, 21, 397, 5, 6, 7, + 8, 9, 19, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 19, 21, 31, 32, 33, 34, 55, 58, + 37, 38, 39, 55, 31, 32, 33, 34, 19, 37, + 38, 5, 6, 7, 8, 9, 19, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 19, 21, 21, 19, + 19, 5, 19, 19, 56, 61, 21, 31, 32, 33, + 34, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 19, 21, 5, 6, + 7, 8, 9, 19, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 21, 21, 5, 6, 7, 8, 9, + 21, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 21, 21, 5, 6, 7, 8, 9, 19, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 60, 21, 5, + 6, 7, 8, 9, 56, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 19, 21, 5, 6, 55, 55, + 19, 19, 11, 12, 13, 14, 15, 16, 17, 18, + 5, 6, 21, 55, 5, 19, 11, 12, 13, 14, + 15, 16, 17, 18, 5, 6, 21, 56, 20, 19, + 11, 12, 13, 14, 15, 16, 17, 18, 21, 19, + 21, 57, 57, 21, 57, 21, 19, 55, 55, 55, + 55, 19, 19, 19, 55, 58, 19, 57, 56, 56, + 30, 57, 24, 57, 57, 19, 19, 19, 19, 58, + 58, 58, 58, 58, 58, 19, 58, 24, 24, 58, + 183, 58, 53, 58, 58, 24, 58, 56, 19, 19, + 24, 56, 19, 30, 55, 59, 55, 57, 56, 56, + 56, 56, 19, 53, 24, 19, 24, 56, 56, 24, + 55, 53, 13, 56, 55, 55, 184, 180, 56, 273, + 56, 56, 383, 56, 53, 48, 58, 137, 374, 284, + 58, 57, 57, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 103 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1445,28 +1502,30 @@ static const unsigned char yystos[] = 54, 21, 19, 54, 56, 19, 55, 83, 60, 56, 55, 19, 19, 19, 55, 5, 96, 5, 19, 55, 75, 99, 19, 99, 91, 56, 19, 19, 97, 19, - 22, 55, 58, 76, 77, 78, 19, 20, 21, 20, - 57, 21, 57, 21, 57, 21, 53, 57, 101, 19, - 40, 41, 42, 43, 44, 46, 47, 48, 49, 50, - 51, 52, 84, 87, 19, 57, 90, 19, 55, 81, - 55, 5, 6, 19, 91, 105, 106, 107, 108, 96, - 19, 100, 99, 99, 19, 91, 55, 91, 19, 53, - 78, 105, 53, 118, 77, 76, 57, 56, 56, 56, - 57, 57, 57, 24, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 56, 59, 53, 91, - 19, 19, 105, 19, 5, 59, 19, 56, 59, 56, - 59, 55, 19, 105, 19, 24, 57, 56, 24, 72, - 72, 72, 19, 30, 85, 85, 118, 118, 19, 85, + 22, 55, 58, 76, 77, 78, 19, 20, 21, 30, + 56, 20, 57, 21, 57, 21, 57, 21, 53, 57, + 101, 19, 40, 41, 42, 43, 44, 46, 47, 48, + 49, 50, 51, 52, 84, 87, 19, 57, 90, 19, + 55, 81, 55, 5, 6, 19, 91, 105, 106, 107, + 108, 96, 19, 100, 99, 99, 19, 91, 55, 91, + 19, 53, 78, 105, 53, 118, 77, 19, 76, 57, + 30, 56, 56, 56, 30, 72, 57, 57, 57, 24, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 58, 56, 59, 53, 91, 19, 19, 105, 19, + 5, 59, 19, 56, 59, 56, 59, 55, 19, 105, + 19, 24, 57, 56, 24, 30, 56, 72, 72, 72, + 30, 56, 19, 30, 85, 85, 118, 118, 19, 85, 86, 118, 90, 91, 19, 21, 19, 21, 19, 21, 19, 21, 19, 21, 87, 24, 56, 56, 53, 56, 59, 59, 106, 22, 55, 19, 103, 10, 108, 19, - 105, 55, 56, 55, 103, 55, 19, 57, 24, 103, - 106, 106, 55, 19, 53, 104, 118, 101, 56, 105, - 103, 105, 101, 30, 53, 19, 57, 101, 19, 19, - 58, 62, 63, 64, 109, 110, 24, 19, 103, 56, - 101, 56, 56, 24, 53, 109, 58, 58, 118, 58, - 118, 58, 56, 110, 104, 101, 103, 103, 57, 24, - 56, 118, 118, 118, 118, 101, 101, 57 + 105, 55, 56, 55, 103, 56, 72, 56, 72, 55, + 19, 57, 24, 103, 106, 106, 55, 19, 53, 104, + 118, 101, 56, 105, 103, 105, 101, 72, 72, 30, + 53, 19, 57, 101, 19, 19, 58, 62, 63, 64, + 109, 110, 24, 19, 103, 56, 101, 56, 56, 24, + 53, 109, 58, 58, 118, 58, 118, 58, 56, 110, + 104, 101, 103, 103, 57, 24, 56, 118, 118, 118, + 118, 101, 101, 57 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -1520,20 +1579,53 @@ do \ } \ while (0) + #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). */ +/* 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) \ - ((Current).first_line = (Rhs)[1].first_line, \ - (Current).first_column = (Rhs)[1].first_column, \ - (Current).last_line = (Rhs)[N].last_line, \ - (Current).last_column = (Rhs)[N].last_column) +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (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 (0) #endif + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif + + /* YYLEX -- calling `yylex' with the right arguments. */ #ifdef YYLEX_PARAM @@ -1556,19 +1648,13 @@ do { \ YYFPRINTF Args; \ } while (0) -# define YYDSYMPRINT(Args) \ -do { \ - if (yydebug) \ - yysymprint Args; \ -} while (0) - -# define YYDSYMPRINTF(Title, Token, Value, Location) \ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ yysymprint (stderr, \ - Token, Value); \ + Type, Value); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) @@ -1580,12 +1666,12 @@ do { \ #if defined (__STDC__) || defined (__cplusplus) static void -yy_stack_print (short *bottom, short *top) +yy_stack_print (short int *bottom, short int *top) #else static void yy_stack_print (bottom, top) - short *bottom; - short *top; + short int *bottom; + short int *top; #endif { YYFPRINTF (stderr, "Stack now"); @@ -1635,8 +1721,7 @@ do { \ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) -# define YYDSYMPRINT(Args) -# define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -1654,10 +1739,6 @@ int yydebug; SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ -#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0 -# undef YYMAXDEPTH -#endif - #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif @@ -1739,15 +1820,15 @@ yysymprint (yyoutput, yytype, yyvaluep) (void) yyvaluep; if (yytype < YYNTOKENS) - { - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); -# ifdef YYPRINT - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - } + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); else YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif switch (yytype) { default: @@ -1763,10 +1844,11 @@ yysymprint (yyoutput, yytype, yyvaluep) #if defined (__STDC__) || defined (__cplusplus) static void -yydestruct (int yytype, YYSTYPE *yyvaluep) +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) #else static void -yydestruct (yytype, yyvaluep) +yydestruct (yymsg, yytype, yyvaluep) + const char *yymsg; int yytype; YYSTYPE *yyvaluep; #endif @@ -1774,6 +1856,10 @@ yydestruct (yytype, yyvaluep) /* Pacify ``unused variable'' warnings. */ (void) yyvaluep; + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + switch (yytype) { @@ -1801,10 +1887,10 @@ int yyparse (); -/* The lookahead symbol. */ +/* The look-ahead symbol. */ int yychar; -/* The semantic value of the lookahead symbol. */ +/* The semantic value of the look-ahead symbol. */ YYSTYPE yylval; /* Number of syntax errors so far. */ @@ -1840,7 +1926,7 @@ yyparse () int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ + /* Look-ahead token as an internal (translated) token number. */ int yytoken = 0; /* Three stacks and their tools: @@ -1852,9 +1938,9 @@ yyparse () to reallocate them elsewhere. */ /* The state stack. */ - short yyssa[YYINITDEPTH]; - short *yyss = yyssa; - register short *yyssp; + short int yyssa[YYINITDEPTH]; + short int *yyss = yyssa; + register short int *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; @@ -1891,6 +1977,9 @@ yyparse () yyssp = yyss; yyvsp = yyvs; + + yyvsp[0] = yylval; + goto yysetstate; /*------------------------------------------------------------. @@ -1916,7 +2005,7 @@ yyparse () these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; + short int *yyss1 = yyss; /* Each stack pointer address is followed by the size of the @@ -1944,7 +2033,7 @@ yyparse () yystacksize = YYMAXDEPTH; { - short *yyss1 = yyss; + short int *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) @@ -1980,18 +2069,18 @@ yyparse () yybackup: /* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ +/* Read a look-ahead token if we need one and don't already have one. */ /* yyresume: */ - /* First try to decide what to do without reference to lookahead token. */ + /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a lookahead token if don't already have one. */ + /* Not known => get a look-ahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -2006,7 +2095,7 @@ yybackup: else { yytoken = YYTRANSLATE (yychar); - YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -2026,8 +2115,8 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; - /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) @@ -2077,145 +2166,145 @@ yyreduce: switch (yyn) { case 2: -#line 649 "parse.y" +#line 689 "parse.y" { ; } break; case 3: -#line 650 "parse.y" +#line 690 "parse.y" { ; } break; case 4: -#line 651 "parse.y" +#line 691 "parse.y" { ; } break; case 5: -#line 652 "parse.y" +#line 692 "parse.y" { ; } break; case 6: -#line 655 "parse.y" +#line 695 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", C_CCODE, - "cbuf:steal", (yyvsp[0].cbuf)->str, + "cbuf:steal", ((yyvsp[0].cbuf))->str, "line_no", ccode_line, NULL); nodes = g_list_append(nodes,node); - g_string_free(yyvsp[0].cbuf,FALSE); + g_string_free((yyvsp[0].cbuf),FALSE); } break; case 7: -#line 664 "parse.y" +#line 704 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", H_CCODE, - "cbuf:steal", (yyvsp[0].cbuf)->str, + "cbuf:steal", ((yyvsp[0].cbuf))->str, "line_no", ccode_line, NULL); nodes = g_list_append(nodes,node); - g_string_free(yyvsp[0].cbuf,FALSE); + g_string_free((yyvsp[0].cbuf),FALSE); } break; case 8: -#line 673 "parse.y" +#line 713 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", HT_CCODE, - "cbuf:steal", (yyvsp[0].cbuf)->str, + "cbuf:steal", ((yyvsp[0].cbuf))->str, "line_no", ccode_line, NULL); nodes = g_list_append(nodes,node); - g_string_free(yyvsp[0].cbuf,FALSE); + g_string_free((yyvsp[0].cbuf),FALSE); } break; case 9: -#line 682 "parse.y" +#line 722 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", PH_CCODE, - "cbuf:steal", (yyvsp[0].cbuf)->str, + "cbuf:steal", ((yyvsp[0].cbuf))->str, "line_no", ccode_line, NULL); nodes = g_list_append(nodes,node); - g_string_free(yyvsp[0].cbuf,FALSE); + g_string_free((yyvsp[0].cbuf),FALSE); } break; case 10: -#line 691 "parse.y" +#line 731 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", A_CCODE, - "cbuf:steal", (yyvsp[0].cbuf)->str, + "cbuf:steal", ((yyvsp[0].cbuf))->str, "line_no", ccode_line, NULL); nodes = g_list_append(nodes,node); - g_string_free(yyvsp[0].cbuf,FALSE); + g_string_free((yyvsp[0].cbuf),FALSE); } break; case 11: -#line 700 "parse.y" +#line 740 "parse.y" { Node *node = node_new (CCODE_NODE, "cctype", AT_CCODE, - "cbuf:steal", (yyvsp[0].cbuf)->str, + "cbuf:steal", ((yyvsp[0].cbuf))->str, "line_no", ccode_line, NULL); nodes = g_list_append(nodes,node); - g_string_free(yyvsp[0].cbuf,FALSE); + g_string_free((yyvsp[0].cbuf),FALSE); } break; case 12: -#line 711 "parse.y" +#line 751 "parse.y" { ; } break; case 13: -#line 712 "parse.y" +#line 752 "parse.y" { ; } break; case 14: -#line 713 "parse.y" +#line 753 "parse.y" { ; } break; case 15: -#line 714 "parse.y" +#line 754 "parse.y" { ; } break; case 16: -#line 715 "parse.y" +#line 755 "parse.y" { ; } break; case 17: -#line 716 "parse.y" +#line 756 "parse.y" { ; } break; case 18: -#line 717 "parse.y" +#line 757 "parse.y" { ; } break; case 19: -#line 718 "parse.y" +#line 758 "parse.y" { ; } break; case 20: -#line 721 "parse.y" +#line 761 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -2224,7 +2313,7 @@ yyreduce: break; case 21: -#line 726 "parse.y" +#line 766 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; @@ -2233,30 +2322,45 @@ yyreduce: break; case 22: -#line 733 "parse.y" +#line 773 "parse.y" { class = node_new (CLASS_NODE, - "otype:steal", yyvsp[-3].id, - "ptype:steal", yyvsp[-1].id, + "otype:steal", (yyvsp[-3].id), + "ptype:steal", (yyvsp[-1].id), "bonobo_object_class:steal", bonobo_object_class, + "glade_xml", glade_xml, "interfaces:steal", interfaces, "chunk_size:steal", chunk_size, + "abstract", abstract, NULL); bonobo_object_class = NULL; + glade_xml = FALSE; chunk_size = NULL; interfaces = NULL; } break; case 24: -#line 748 "parse.y" +#line 791 "parse.y" { - if(strcmp(yyvsp[-3].id,"chunks") == 0) { + if(strcmp((yyvsp[-2].id),"abstract") == 0) { + abstract = TRUE; + } else { + yyerror(_("parse error")); + YYERROR; + } + } + break; + + case 25: +#line 799 "parse.y" + { + if(strcmp((yyvsp[-3].id),"chunks") == 0) { g_free (chunk_size); - chunk_size = g_strdup(yyvsp[-2].id); - } else if(strcmp(yyvsp[-3].id,"BonoboObject") == 0) { + chunk_size = g_strdup((yyvsp[-2].id)); + } else if(strcmp((yyvsp[-3].id),"BonoboObject") == 0) { g_free (bonobo_object_class); - bonobo_object_class = g_strdup(yyvsp[-2].id); + bonobo_object_class = g_strdup((yyvsp[-2].id)); } else { yyerror(_("parse error")); YYERROR; @@ -2264,12 +2368,12 @@ yyreduce: } break; - case 25: -#line 760 "parse.y" + case 26: +#line 811 "parse.y" { - if (strcmp (yyvsp[-3].id, "interface") == 0) { + if (strcmp ((yyvsp[-3].id), "interface") == 0) { interfaces = g_list_append (interfaces, - g_strdup (yyvsp[-2].id)); + g_strdup ((yyvsp[-2].id))); } else { yyerror(_("parse error")); YYERROR; @@ -2277,13 +2381,13 @@ yyreduce: } break; - case 26: -#line 769 "parse.y" + case 27: +#line 820 "parse.y" { - if(strcmp(yyvsp[-3].id,"chunks") == 0) { + if(strcmp((yyvsp[-3].id),"chunks") == 0) { g_free (chunk_size); - if(atoi(yyvsp[-2].id) != 0) - chunk_size = g_strdup(yyvsp[-2].id); + if(atoi((yyvsp[-2].id)) != 0) + chunk_size = g_strdup((yyvsp[-2].id)); else chunk_size = NULL; } else { @@ -2293,258 +2397,322 @@ yyreduce: } break; - case 27: -#line 783 "parse.y" + case 28: +#line 832 "parse.y" + { + if (strcmp ((yyvsp[-4].id), "GladeXML") == 0) { + glade_xml = TRUE; + add_construct_glade((yyvsp[-3].id), (yyvsp[-2].id), NULL); + } else { + yyerror(_("parse error")); + YYERROR; + } + } + break; + + case 29: +#line 841 "parse.y" + { + if (strcmp ((yyvsp[-5].id), "GladeXML") == 0) { + glade_xml = TRUE; + add_construct_glade((yyvsp[-4].id), (yyvsp[-3].id), (yyvsp[-2].id)); + } else { + yyerror(_("parse error")); + YYERROR; + } + } + break; + + case 30: +#line 850 "parse.y" + { + if (strcmp ((yyvsp[-4].id), "GladeXML") == 0) { + glade_xml = TRUE; + add_construct_glade((yyvsp[-3].id), (yyvsp[-2].id), NULL); + } else { + yyerror(_("parse error")); + YYERROR; + } + } + break; + + case 31: +#line 859 "parse.y" + { + if (strcmp ((yyvsp[-5].id), "GladeXML") == 0) { + glade_xml = TRUE; + add_construct_glade((yyvsp[-4].id), (yyvsp[-3].id), (yyvsp[-2].id)); + } else { + yyerror(_("parse error")); + YYERROR; + } + } + break; + + case 32: +#line 870 "parse.y" { ; } break; - case 28: -#line 784 "parse.y" + case 33: +#line 871 "parse.y" { ; } break; - case 29: -#line 787 "parse.y" + case 34: +#line 874 "parse.y" { ; } break; - case 30: -#line 788 "parse.y" + case 35: +#line 875 "parse.y" { - if (strcmp (yyvsp[-1].id, "BonoboObject") != 0) { - g_free (yyvsp[-1].id); + if (strcmp ((yyvsp[-1].id), "BonoboObject") != 0) { + g_free ((yyvsp[-1].id)); yyerror (_("parse error")); YYERROR; } - g_free (yyvsp[-1].id); + g_free ((yyvsp[-1].id)); last_added_method->bonobo_object_func = TRUE; } break; - case 31: -#line 797 "parse.y" + case 36: +#line 884 "parse.y" { - if (strcmp (yyvsp[-2].id, "interface") != 0) { - g_free (yyvsp[-2].id); - g_free (yyvsp[-1].id); + if (strcmp ((yyvsp[-2].id), "interface") != 0) { + g_free ((yyvsp[-2].id)); + g_free ((yyvsp[-1].id)); yyerror (_("parse error")); YYERROR; } - g_free (yyvsp[-2].id); + g_free ((yyvsp[-2].id)); node_set ((Node *)last_added_method, - "interface:steal", yyvsp[-1].id, + "interface:steal", (yyvsp[-1].id), NULL); } break; - case 32: -#line 809 "parse.y" + case 37: +#line 896 "parse.y" { ; } break; - case 33: -#line 810 "parse.y" + case 38: +#line 897 "parse.y" { ; } break; - case 34: -#line 811 "parse.y" + case 39: +#line 898 "parse.y" { ; } break; - case 35: -#line 812 "parse.y" + case 40: +#line 899 "parse.y" { ; } break; - case 36: -#line 815 "parse.y" + case 41: +#line 902 "parse.y" { the_scope = PUBLIC_SCOPE; } break; - case 37: -#line 816 "parse.y" + case 42: +#line 903 "parse.y" { the_scope = PRIVATE_SCOPE; } break; - case 38: -#line 817 "parse.y" + case 43: +#line 904 "parse.y" { the_scope = PROTECTED_SCOPE; } break; - case 39: -#line 818 "parse.y" + case 44: +#line 905 "parse.y" { the_scope = CLASS_SCOPE; } break; - case 40: -#line 821 "parse.y" + case 45: +#line 908 "parse.y" { - if (strcmp (yyvsp[-1].id, "destroywith") == 0) { - g_free (yyvsp[-1].id); + if (strcmp ((yyvsp[-1].id), "destroywith") == 0) { + g_free ((yyvsp[-1].id)); destructor_unref = FALSE; - destructor = yyvsp[0].id; + destructor = (yyvsp[0].id); destructor_line = line_no; destructor_simple = TRUE; - } else if (strcmp (yyvsp[-1].id, "unrefwith") == 0) { - g_free (yyvsp[-1].id); + } else if (strcmp ((yyvsp[-1].id), "unrefwith") == 0) { + g_free ((yyvsp[-1].id)); destructor_unref = TRUE; - destructor = yyvsp[0].id; + destructor = (yyvsp[0].id); destructor_line = line_no; destructor_simple = TRUE; } else { - g_free (yyvsp[-1].id); - g_free (yyvsp[0].id); + g_free ((yyvsp[-1].id)); + g_free ((yyvsp[0].id)); yyerror (_("parse error")); YYERROR; } } break; - case 41: -#line 841 "parse.y" + case 46: +#line 928 "parse.y" { - if (strcmp (yyvsp[-2].id, "destroy") == 0) { - g_free(yyvsp[-2].id); + if (strcmp ((yyvsp[-2].id), "destroy") == 0) { + g_free((yyvsp[-2].id)); destructor_unref = FALSE; - destructor = (yyvsp[0].cbuf)->str; - g_string_free(yyvsp[0].cbuf, FALSE); + destructor = ((yyvsp[0].cbuf))->str; + g_string_free((yyvsp[0].cbuf), FALSE); destructor_line = ccode_line; destructor_simple = FALSE; - } else if (strcmp (yyvsp[-2].id, "unref") == 0) { - g_free (yyvsp[-2].id); + } else if (strcmp ((yyvsp[-2].id), "unref") == 0) { + g_free ((yyvsp[-2].id)); destructor_unref = TRUE; - destructor = (yyvsp[0].cbuf)->str; - g_string_free (yyvsp[0].cbuf, FALSE); + destructor = ((yyvsp[0].cbuf))->str; + g_string_free ((yyvsp[0].cbuf), FALSE); destructor_line = ccode_line; destructor_simple = FALSE; } else { - g_free (yyvsp[-2].id); - g_string_free (yyvsp[0].cbuf, TRUE); + g_free ((yyvsp[-2].id)); + g_string_free ((yyvsp[0].cbuf), TRUE); yyerror (_("parse error")); YYERROR; } } break; - case 42: -#line 865 "parse.y" + case 47: +#line 952 "parse.y" { - initializer = yyvsp[0].id; + initializer = (yyvsp[0].id); initializer_line = ccode_line; } break; - case 43: -#line 869 "parse.y" + case 48: +#line 956 "parse.y" { - initializer = (yyvsp[0].cbuf)->str; + initializer = ((yyvsp[0].cbuf))->str; initializer_line = ccode_line; - g_string_free(yyvsp[0].cbuf, FALSE); + g_string_free((yyvsp[0].cbuf), FALSE); } break; - case 44: -#line 877 "parse.y" + case 49: +#line 964 "parse.y" { ; } break; - case 45: -#line 878 "parse.y" + case 50: +#line 965 "parse.y" { ; } break; - case 46: -#line 879 "parse.y" + case 51: +#line 966 "parse.y" { destructor = NULL; } break; - case 47: -#line 880 "parse.y" + case 52: +#line 967 "parse.y" { initializer = NULL; } break; - case 48: -#line 881 "parse.y" + case 53: +#line 968 "parse.y" + { + if (strcmp ((yyvsp[0].id), "GladeXML") == 0) { + glade_widget = TRUE; + } else { + yyerror(_("parse error")); + YYERROR; + } + } + break; + + case 54: +#line 976 "parse.y" { destructor = NULL; initializer = NULL; } break; - case 49: -#line 887 "parse.y" + case 55: +#line 982 "parse.y" { - push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); + push_variable((yyvsp[-2].id), the_scope,(yyvsp[-4].line), NULL); } break; - case 50: -#line 890 "parse.y" + case 56: +#line 985 "parse.y" { - push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); + push_variable((yyvsp[-3].id), the_scope, (yyvsp[-5].line), (yyvsp[-2].id)); } break; - case 51: -#line 895 "parse.y" + case 57: +#line 990 "parse.y" { Node *node = NULL; - if(strcmp(yyvsp[-6].id,"get")==0 && - strcmp(yyvsp[-3].id,"set")==0) { + if(strcmp((yyvsp[-6].id),"get")==0 && + strcmp((yyvsp[-3].id),"set")==0) { Type *type = pop_type(); - g_free (yyvsp[-6].id); - g_free (yyvsp[-3].id); + g_free ((yyvsp[-6].id)); + g_free ((yyvsp[-3].id)); node = node_new (ARGUMENT_NODE, - "gtktype:steal", yyvsp[-9].id, + "gtktype:steal", (yyvsp[-9].id), "atype:steal", type, - "flags:steal", yyvsp[-10].list, - "name:steal", yyvsp[-8].id, - "get:steal", (yyvsp[-4].cbuf)->str, - "get_line", yyvsp[-5].line, - "set:steal", (yyvsp[-1].cbuf)->str, - "set_line", yyvsp[-2].line, - "line_no", yyvsp[-11].line, + "flags:steal", (yyvsp[-10].list), + "name:steal", (yyvsp[-8].id), + "get:steal", ((yyvsp[-4].cbuf))->str, + "get_line", (yyvsp[-5].line), + "set:steal", ((yyvsp[-1].cbuf))->str, + "set_line", (yyvsp[-2].line), + "line_no", (yyvsp[-11].line), NULL); class_nodes = g_list_append(class_nodes,node); - g_string_free (yyvsp[-4].cbuf, FALSE); - g_string_free (yyvsp[-1].cbuf, FALSE); + g_string_free ((yyvsp[-4].cbuf), FALSE); + g_string_free ((yyvsp[-1].cbuf), FALSE); - } else if(strcmp(yyvsp[-6].id,"set")==0 && - strcmp(yyvsp[-3].id,"get")==0) { + } else if(strcmp((yyvsp[-6].id),"set")==0 && + strcmp((yyvsp[-3].id),"get")==0) { Type *type = pop_type(); - g_free (yyvsp[-6].id); - g_free (yyvsp[-3].id); + g_free ((yyvsp[-6].id)); + g_free ((yyvsp[-3].id)); node = node_new (ARGUMENT_NODE, - "gtktype:steal", yyvsp[-9].id, + "gtktype:steal", (yyvsp[-9].id), "atype:steal", type, - "flags:steal", yyvsp[-10].list, - "name:steal", yyvsp[-8].id, - "get:steal", (yyvsp[-1].cbuf)->str, - "get_line", yyvsp[-2].line, - "set:steal", (yyvsp[-4].cbuf)->str, - "set_line", yyvsp[-5].line, - "line_no", yyvsp[-11].line, + "flags:steal", (yyvsp[-10].list), + "name:steal", (yyvsp[-8].id), + "get:steal", ((yyvsp[-1].cbuf))->str, + "get_line", (yyvsp[-2].line), + "set:steal", ((yyvsp[-4].cbuf))->str, + "set_line", (yyvsp[-5].line), + "line_no", (yyvsp[-11].line), NULL); - g_string_free (yyvsp[-1].cbuf, FALSE); - g_string_free (yyvsp[-4].cbuf, FALSE); + g_string_free ((yyvsp[-1].cbuf), FALSE); + g_string_free ((yyvsp[-4].cbuf), FALSE); class_nodes = g_list_append(class_nodes,node); } else { - g_free (yyvsp[-9].id); - g_free (yyvsp[-8].id); - g_free (yyvsp[-6].id); - g_free (yyvsp[-3].id); - g_list_foreach (yyvsp[-10].list, (GFunc)g_free, NULL); - g_list_free (yyvsp[-10].list); - g_string_free (yyvsp[-1].cbuf, TRUE); - g_string_free (yyvsp[-4].cbuf, TRUE); + g_free ((yyvsp[-9].id)); + g_free ((yyvsp[-8].id)); + g_free ((yyvsp[-6].id)); + g_free ((yyvsp[-3].id)); + g_list_foreach ((yyvsp[-10].list), (GFunc)g_free, NULL); + g_list_free ((yyvsp[-10].list)); + g_string_free ((yyvsp[-1].cbuf), TRUE); + g_string_free ((yyvsp[-4].cbuf), TRUE); yyerror (_("parse error")); YYERROR; } - if (yyvsp[-7].id != NULL) { + if ((yyvsp[-7].id) != NULL) { Argument *arg = (Argument *)node; export_accessors (arg->name, arg->get != NULL, arg->get_line, @@ -2552,58 +2720,58 @@ yyreduce: arg->atype, arg->gtktype, arg->line_no); - g_free (yyvsp[-7].id); + g_free ((yyvsp[-7].id)); } } break; - case 52: -#line 963 "parse.y" + case 58: +#line 1058 "parse.y" { Node *node = NULL; - if(strcmp(yyvsp[-3].id, "get") == 0) { + if(strcmp((yyvsp[-3].id), "get") == 0) { Type *type = pop_type(); - g_free (yyvsp[-3].id); + g_free ((yyvsp[-3].id)); node = node_new (ARGUMENT_NODE, - "gtktype:steal", yyvsp[-6].id, + "gtktype:steal", (yyvsp[-6].id), "atype:steal", type, - "flags:steal", yyvsp[-7].list, - "name:steal", yyvsp[-5].id, - "get:steal", (yyvsp[-1].cbuf)->str, - "get_line", yyvsp[-2].line, - "line_no", yyvsp[-8].line, + "flags:steal", (yyvsp[-7].list), + "name:steal", (yyvsp[-5].id), + "get:steal", ((yyvsp[-1].cbuf))->str, + "get_line", (yyvsp[-2].line), + "line_no", (yyvsp[-8].line), NULL); - g_string_free (yyvsp[-1].cbuf, FALSE); + g_string_free ((yyvsp[-1].cbuf), FALSE); class_nodes = g_list_append(class_nodes, node); - } else if(strcmp(yyvsp[-3].id, "set") == 0) { + } else if(strcmp((yyvsp[-3].id), "set") == 0) { Type *type = pop_type(); - g_free (yyvsp[-3].id); + g_free ((yyvsp[-3].id)); node = node_new (ARGUMENT_NODE, - "gtktype:steal", yyvsp[-6].id, + "gtktype:steal", (yyvsp[-6].id), "atype:steal", type, - "flags:steal", yyvsp[-7].list, - "name:steal", yyvsp[-5].id, - "set:steal", (yyvsp[-1].cbuf)->str, - "set_line", yyvsp[-2].line, - "line_no", yyvsp[-8].line, + "flags:steal", (yyvsp[-7].list), + "name:steal", (yyvsp[-5].id), + "set:steal", ((yyvsp[-1].cbuf))->str, + "set_line", (yyvsp[-2].line), + "line_no", (yyvsp[-8].line), NULL); - g_string_free (yyvsp[-1].cbuf, FALSE); + g_string_free ((yyvsp[-1].cbuf), FALSE); class_nodes = g_list_append (class_nodes, node); } else { - g_free (yyvsp[-3].id); - g_free (yyvsp[-6].id); - g_free (yyvsp[-5].id); - g_list_foreach (yyvsp[-7].list, (GFunc)g_free, NULL); - g_list_free (yyvsp[-7].list); - g_string_free (yyvsp[-1].cbuf, TRUE); + g_free ((yyvsp[-3].id)); + g_free ((yyvsp[-6].id)); + g_free ((yyvsp[-5].id)); + g_list_foreach ((yyvsp[-7].list), (GFunc)g_free, NULL); + g_list_free ((yyvsp[-7].list)); + g_string_free ((yyvsp[-1].cbuf), TRUE); yyerror(_("parse error")); YYERROR; } - if (yyvsp[-4].id != NULL) { + if ((yyvsp[-4].id) != NULL) { Argument *arg = (Argument *)node; export_accessors (arg->name, arg->get != NULL, arg->get_line, @@ -2611,13 +2779,13 @@ yyreduce: arg->atype, arg->gtktype, arg->line_no); - g_free (yyvsp[-4].id); + g_free ((yyvsp[-4].id)); } } break; - case 53: -#line 1017 "parse.y" + case 59: +#line 1112 "parse.y" { Node *node; char *get, *set = NULL; @@ -2625,74 +2793,74 @@ yyreduce: Type *type; const char *root; - if(strcmp(yyvsp[0].id, "link")!=0 && - strcmp(yyvsp[0].id, "stringlink")!=0 && - strcmp(yyvsp[0].id, "objectlink")!=0) { - g_free(yyvsp[0].id); - g_free(yyvsp[-3].id); - g_free(yyvsp[-2].id); - g_list_foreach(yyvsp[-4].list,(GFunc)g_free,NULL); - g_list_free(yyvsp[-4].list); + if(strcmp((yyvsp[0].id), "link")!=0 && + strcmp((yyvsp[0].id), "stringlink")!=0 && + strcmp((yyvsp[0].id), "objectlink")!=0) { + g_free((yyvsp[0].id)); + g_free((yyvsp[-3].id)); + g_free((yyvsp[-2].id)); + g_list_foreach((yyvsp[-4].list),(GFunc)g_free,NULL); + g_list_free((yyvsp[-4].list)); yyerror(_("parse error")); YYERROR; } type = pop_type(); - var = find_var_or_die(yyvsp[-2].id, yyvsp[-5].line); + var = find_var_or_die((yyvsp[-2].id), (yyvsp[-5].line)); if(var->scope == PRIVATE_SCOPE) { root = "self->_priv"; } else if(var->scope == CLASS_SCOPE) { root = "SELF_GET_CLASS(self)"; if(no_self_alias) - error_print(GOB_ERROR, yyvsp[-5].line, + error_print(GOB_ERROR, (yyvsp[-5].line), _("Self aliases needed when autolinking to a classwide member")); } else { root = "self"; } - if(strcmp(yyvsp[0].id, "link")==0) { + if(strcmp((yyvsp[0].id), "link")==0) { set = g_strdup_printf("%s->%s = ARG;", - root, yyvsp[-2].id); - } else if(strcmp(yyvsp[0].id, "stringlink")==0) { + root, (yyvsp[-2].id)); + } else if(strcmp((yyvsp[0].id), "stringlink")==0) { set = g_strdup_printf("g_free (%s->%s); " "%s->%s = g_strdup (ARG);", - root, yyvsp[-2].id, - root, yyvsp[-2].id); - } else if(strcmp(yyvsp[0].id, "objectlink")==0) { + root, (yyvsp[-2].id), + root, (yyvsp[-2].id)); + } else if(strcmp((yyvsp[0].id), "objectlink")==0) { set = g_strdup_printf( "if (ARG != NULL) " "g_object_ref (G_OBJECT (ARG)); " "if (%s->%s != NULL) " "g_object_unref (G_OBJECT (%s->%s)); " "%s->%s = ARG;", - root, yyvsp[-2].id, - root, yyvsp[-2].id, - root, yyvsp[-2].id); + root, (yyvsp[-2].id), + root, (yyvsp[-2].id), + root, (yyvsp[-2].id)); } else { g_assert_not_reached(); } - get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-2].id); + get = g_strdup_printf("ARG = %s->%s;", root, (yyvsp[-2].id)); - g_free (yyvsp[0].id); + g_free ((yyvsp[0].id)); if (type == NULL) type = (Type *)node_copy ((Node *)var->vtype); node = node_new (ARGUMENT_NODE, - "gtktype:steal", yyvsp[-3].id, + "gtktype:steal", (yyvsp[-3].id), "atype:steal", type, - "flags:steal", yyvsp[-4].list, - "name:steal", yyvsp[-2].id, + "flags:steal", (yyvsp[-4].list), + "name:steal", (yyvsp[-2].id), "get:steal", get, - "get_line", yyvsp[-5].line, + "get_line", (yyvsp[-5].line), "set:steal", set, - "set_line", yyvsp[-5].line, - "line_no", yyvsp[-5].line, + "set_line", (yyvsp[-5].line), + "line_no", (yyvsp[-5].line), NULL); - if (yyvsp[-1].id != NULL) { + if ((yyvsp[-1].id) != NULL) { Argument *arg = (Argument *)node; export_accessors (arg->name, arg->get != NULL, arg->get_line, @@ -2700,70 +2868,70 @@ yyreduce: arg->atype, arg->gtktype, arg->line_no); - g_free (yyvsp[-1].id); + g_free ((yyvsp[-1].id)); } class_nodes = g_list_append (class_nodes, node); } break; - case 54: -#line 1106 "parse.y" + case 60: +#line 1201 "parse.y" { - if (strcmp (yyvsp[-1].id, "export")!=0) { - g_free (yyvsp[-1].id); + if (strcmp ((yyvsp[-1].id), "export")!=0) { + g_free ((yyvsp[-1].id)); yyerror (_("parse error")); YYERROR; } - yyval.id = yyvsp[-1].id; + (yyval.id) = (yyvsp[-1].id); } break; - case 55: -#line 1114 "parse.y" + case 61: +#line 1209 "parse.y" { - yyval.id = NULL; + (yyval.id) = NULL; } break; - case 56: -#line 1119 "parse.y" + case 62: +#line 1214 "parse.y" { ensure_property (); node_set ((Node *)property, - "line_no", yyvsp[-10].line, - "gtktype:steal", debool (yyvsp[-9].id), - "name:steal", yyvsp[-8].id, + "line_no", (yyvsp[-10].line), + "gtktype:steal", debool ((yyvsp[-9].id)), + "name:steal", (yyvsp[-8].id), NULL); - if (strcmp (yyvsp[-6].id, "get") == 0 && - strcmp (yyvsp[-3].id, "set") == 0) { + if (strcmp ((yyvsp[-6].id), "get") == 0 && + strcmp ((yyvsp[-3].id), "set") == 0) { node_set ((Node *)property, - "get:steal", (yyvsp[-4].cbuf)->str, - "get_line", yyvsp[-5].line, - "set:steal", (yyvsp[-1].cbuf)->str, - "set_line", yyvsp[-2].line, + "get:steal", ((yyvsp[-4].cbuf))->str, + "get_line", (yyvsp[-5].line), + "set:steal", ((yyvsp[-1].cbuf))->str, + "set_line", (yyvsp[-2].line), NULL); - g_string_free (yyvsp[-4].cbuf, FALSE); - g_string_free (yyvsp[-1].cbuf, FALSE); - g_free (yyvsp[-6].id); - g_free (yyvsp[-3].id); - } else if (strcmp (yyvsp[-6].id, "set") == 0 && - strcmp (yyvsp[-3].id, "get") == 0) { + g_string_free ((yyvsp[-4].cbuf), FALSE); + g_string_free ((yyvsp[-1].cbuf), FALSE); + g_free ((yyvsp[-6].id)); + g_free ((yyvsp[-3].id)); + } else if (strcmp ((yyvsp[-6].id), "set") == 0 && + strcmp ((yyvsp[-3].id), "get") == 0) { node_set ((Node *)property, - "get:steal", (yyvsp[-1].cbuf)->str, - "get_line", yyvsp[-2].line, - "set:steal", (yyvsp[-4].cbuf)->str, - "set_line", yyvsp[-5].line, + "get:steal", ((yyvsp[-1].cbuf))->str, + "get_line", (yyvsp[-2].line), + "set:steal", ((yyvsp[-4].cbuf))->str, + "set_line", (yyvsp[-5].line), NULL); - g_string_free (yyvsp[-4].cbuf, FALSE); - g_string_free (yyvsp[-1].cbuf, FALSE); - g_free (yyvsp[-6].id); - g_free (yyvsp[-3].id); + g_string_free ((yyvsp[-4].cbuf), FALSE); + g_string_free ((yyvsp[-1].cbuf), FALSE); + g_free ((yyvsp[-6].id)); + g_free ((yyvsp[-3].id)); } else { - g_string_free (yyvsp[-4].cbuf, TRUE); - g_string_free (yyvsp[-1].cbuf, TRUE); - g_free (yyvsp[-6].id); - g_free (yyvsp[-3].id); + g_string_free ((yyvsp[-4].cbuf), TRUE); + g_string_free ((yyvsp[-1].cbuf), TRUE); + g_free ((yyvsp[-6].id)); + g_free ((yyvsp[-3].id)); node_free ((Node *)property); property = NULL; yyerror (_("parse error")); @@ -2778,32 +2946,32 @@ yyreduce: } break; - case 57: -#line 1167 "parse.y" + case 63: +#line 1262 "parse.y" { ensure_property (); node_set ((Node *)property, - "line_no", yyvsp[-7].line, - "gtktype:steal", debool (yyvsp[-6].id), - "name:steal", yyvsp[-5].id, + "line_no", (yyvsp[-7].line), + "gtktype:steal", debool ((yyvsp[-6].id)), + "name:steal", (yyvsp[-5].id), NULL); - if (strcmp (yyvsp[-3].id, "get") == 0) { + if (strcmp ((yyvsp[-3].id), "get") == 0) { node_set ((Node *)property, - "get:steal", (yyvsp[-1].cbuf)->str, - "get_line", yyvsp[-2].line, + "get:steal", ((yyvsp[-1].cbuf))->str, + "get_line", (yyvsp[-2].line), NULL); - g_string_free (yyvsp[-1].cbuf, FALSE); - g_free (yyvsp[-3].id); - } else if (strcmp (yyvsp[-3].id, "set") == 0) { + g_string_free ((yyvsp[-1].cbuf), FALSE); + g_free ((yyvsp[-3].id)); + } else if (strcmp ((yyvsp[-3].id), "set") == 0) { node_set ((Node *)property, - "set:steal", (yyvsp[-1].cbuf)->str, - "set_line", yyvsp[-2].line, + "set:steal", ((yyvsp[-1].cbuf))->str, + "set_line", (yyvsp[-2].line), NULL); - g_string_free (yyvsp[-1].cbuf, FALSE); - g_free (yyvsp[-3].id); + g_string_free ((yyvsp[-1].cbuf), FALSE); + g_free ((yyvsp[-3].id)); } else { - g_string_free (yyvsp[-1].cbuf, TRUE); - g_free (yyvsp[-3].id); + g_string_free ((yyvsp[-1].cbuf), TRUE); + g_free ((yyvsp[-3].id)); node_free ((Node *)property); property = NULL; yyerror (_("parse error")); @@ -2818,14 +2986,14 @@ yyreduce: } break; - case 58: -#line 1203 "parse.y" + case 64: +#line 1298 "parse.y" { ensure_property (); node_set ((Node *)property, - "line_no", yyvsp[-4].line, - "gtktype:steal", debool (yyvsp[-3].id), - "name:steal", yyvsp[-2].id, + "line_no", (yyvsp[-4].line), + "gtktype:steal", debool ((yyvsp[-3].id)), + "name:steal", (yyvsp[-2].id), NULL); property_link_and_export ((Node *)property); if (property != NULL) { @@ -2836,117 +3004,117 @@ yyreduce: } break; - case 59: -#line 1219 "parse.y" + case 65: +#line 1314 "parse.y" { ; } break; - case 60: -#line 1220 "parse.y" + case 66: +#line 1315 "parse.y" { ; } break; - case 61: -#line 1223 "parse.y" + case 67: +#line 1318 "parse.y" { ; } break; - case 62: -#line 1224 "parse.y" + case 68: +#line 1319 "parse.y" { ; } break; - case 63: -#line 1227 "parse.y" - { yyval.id = yyvsp[0].id; } + case 69: +#line 1322 "parse.y" + { (yyval.id) = (yyvsp[0].id); } break; - case 64: -#line 1228 "parse.y" + case 70: +#line 1323 "parse.y" { - if (strcmp (yyvsp[-3].id, "_") != 0) { - g_free (yyvsp[-3].id); + if (strcmp ((yyvsp[-3].id), "_") != 0) { + g_free ((yyvsp[-3].id)); yyerror(_("parse error")); YYERROR; } - g_free (yyvsp[-3].id); - yyval.id = g_strconcat ("_(", yyvsp[-1].id, ")", NULL); - g_free (yyvsp[-1].id); + g_free ((yyvsp[-3].id)); + (yyval.id) = g_strconcat ("_(", (yyvsp[-1].id), ")", NULL); + g_free ((yyvsp[-1].id)); } break; - case 65: -#line 1240 "parse.y" - { yyval.id = yyvsp[0].id; } + case 71: +#line 1335 "parse.y" + { (yyval.id) = (yyvsp[0].id); } break; - case 66: -#line 1241 "parse.y" - { yyval.id = yyvsp[0].id; } + case 72: +#line 1336 "parse.y" + { (yyval.id) = (yyvsp[0].id); } break; - case 67: -#line 1244 "parse.y" + case 73: +#line 1339 "parse.y" { ensure_property (); node_set ((Node *)property, - "nick:steal", yyvsp[0].id, + "nick:steal", (yyvsp[0].id), NULL); } break; - case 68: -#line 1250 "parse.y" + case 74: +#line 1345 "parse.y" { ensure_property (); node_set ((Node *)property, - "blurb:steal", yyvsp[0].id, + "blurb:steal", (yyvsp[0].id), NULL); } break; - case 69: -#line 1256 "parse.y" + case 75: +#line 1351 "parse.y" { ensure_property (); node_set ((Node *)property, - "maximum:steal", yyvsp[0].id, + "maximum:steal", (yyvsp[0].id), NULL); } break; - case 70: -#line 1262 "parse.y" + case 76: +#line 1357 "parse.y" { ensure_property (); node_set ((Node *)property, - "minimum:steal", yyvsp[0].id, + "minimum:steal", (yyvsp[0].id), NULL); } break; - case 71: -#line 1268 "parse.y" + case 77: +#line 1363 "parse.y" { ensure_property (); node_set ((Node *)property, - "default_value:steal", yyvsp[0].id, + "default_value:steal", (yyvsp[0].id), NULL); } break; - case 72: -#line 1274 "parse.y" + case 78: +#line 1369 "parse.y" { ensure_property (); node_set ((Node *)property, - "flags:steal", yyvsp[0].list, + "flags:steal", (yyvsp[0].list), NULL); } break; - case 73: -#line 1280 "parse.y" + case 79: +#line 1375 "parse.y" { Type *type = pop_type (); ensure_property (); @@ -2956,498 +3124,498 @@ yyreduce: } break; - case 74: -#line 1287 "parse.y" + case 80: +#line 1382 "parse.y" { ensure_property (); node_set ((Node *)property, - "extra_gtktype:steal", yyvsp[0].id, + "extra_gtktype:steal", (yyvsp[0].id), NULL); } break; - case 75: -#line 1293 "parse.y" + case 81: +#line 1388 "parse.y" { ensure_property (); node_set ((Node *)property, - "extra_gtktype:steal", yyvsp[0].id, + "extra_gtktype:steal", (yyvsp[0].id), NULL); } break; - case 76: -#line 1299 "parse.y" + case 82: +#line 1394 "parse.y" { ensure_property (); node_set ((Node *)property, - "extra_gtktype:steal", yyvsp[0].id, + "extra_gtktype:steal", (yyvsp[0].id), NULL); } break; - case 77: -#line 1305 "parse.y" + case 83: +#line 1400 "parse.y" { ensure_property (); node_set ((Node *)property, - "extra_gtktype:steal", yyvsp[0].id, + "extra_gtktype:steal", (yyvsp[0].id), NULL); } break; - case 78: -#line 1311 "parse.y" + case 84: +#line 1406 "parse.y" { ensure_property (); node_set ((Node *)property, - "extra_gtktype:steal", yyvsp[0].id, + "extra_gtktype:steal", (yyvsp[0].id), NULL); } break; - case 79: -#line 1317 "parse.y" + case 85: +#line 1412 "parse.y" { ensure_property (); node_set ((Node *)property, - "extra_gtktype:steal", yyvsp[0].id, + "extra_gtktype:steal", (yyvsp[0].id), NULL); } break; - case 80: -#line 1323 "parse.y" + case 86: +#line 1418 "parse.y" { ensure_property (); node_set ((Node *)property, - "extra_gtktype:steal", yyvsp[0].id, + "extra_gtktype:steal", (yyvsp[0].id), NULL); } break; - case 81: -#line 1329 "parse.y" + case 87: +#line 1424 "parse.y" { ensure_property (); node_set ((Node *)property, - "extra_gtktype:steal", yyvsp[0].id, + "extra_gtktype:steal", (yyvsp[0].id), NULL); } break; - case 82: -#line 1335 "parse.y" + case 88: +#line 1430 "parse.y" { ensure_property (); node_set ((Node *)property, - "extra_gtktype:steal", yyvsp[0].id, + "extra_gtktype:steal", (yyvsp[0].id), NULL); } break; - case 83: -#line 1341 "parse.y" + case 89: +#line 1436 "parse.y" { ensure_property (); node_set ((Node *)property, - "extra_gtktype:steal", yyvsp[0].id, + "extra_gtktype:steal", (yyvsp[0].id), NULL); } break; - case 84: -#line 1347 "parse.y" + case 90: +#line 1442 "parse.y" { ensure_property (); - if (strcmp (yyvsp[0].id, "override") == 0) { - g_free(yyvsp[0].id); + if (strcmp ((yyvsp[0].id), "override") == 0) { + g_free((yyvsp[0].id)); node_set ((Node *)property, "override", TRUE, NULL); - } else if (strcmp (yyvsp[0].id, "link") == 0) { - g_free(yyvsp[0].id); + } else if (strcmp ((yyvsp[0].id), "link") == 0) { + g_free((yyvsp[0].id)); node_set ((Node *)property, "link", TRUE, NULL); - } else if (strcmp (yyvsp[0].id, "export") == 0) { - g_free(yyvsp[0].id); + } else if (strcmp ((yyvsp[0].id), "export") == 0) { + g_free((yyvsp[0].id)); node_set ((Node *)property, "export", TRUE, NULL); } else { - g_free(yyvsp[0].id); + g_free((yyvsp[0].id)); yyerror(_("parse error")); YYERROR; } } break; - case 85: -#line 1372 "parse.y" + case 91: +#line 1467 "parse.y" { - if(strcmp(yyvsp[-2].id,"type")!=0) { - g_free(yyvsp[-4].id); - g_free(yyvsp[-2].id); + if(strcmp((yyvsp[-2].id),"type")!=0) { + g_free((yyvsp[-4].id)); + g_free((yyvsp[-2].id)); yyerror(_("parse error")); YYERROR; } - yyval.id = debool (yyvsp[-4].id); + (yyval.id) = debool ((yyvsp[-4].id)); } break; - case 86: -#line 1381 "parse.y" + case 92: +#line 1476 "parse.y" { - yyval.id = debool (yyvsp[0].id); + (yyval.id) = debool ((yyvsp[0].id)); typestack = g_list_prepend(typestack,NULL); } break; - case 87: -#line 1387 "parse.y" - { yyval.list = yyvsp[-1].list; } + case 93: +#line 1482 "parse.y" + { (yyval.list) = (yyvsp[-1].list); } break; - case 88: -#line 1388 "parse.y" - { yyval.list = NULL; } + case 94: +#line 1483 "parse.y" + { (yyval.list) = NULL; } break; - case 89: -#line 1391 "parse.y" + case 95: +#line 1486 "parse.y" { - yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); + (yyval.list) = g_list_append((yyvsp[0].list),(yyvsp[-2].id)); } break; - case 90: -#line 1394 "parse.y" + case 96: +#line 1489 "parse.y" { - yyval.list = g_list_append(NULL,yyvsp[0].id); + (yyval.list) = g_list_append(NULL,(yyvsp[0].id)); } break; - case 91: -#line 1400 "parse.y" + case 97: +#line 1495 "parse.y" { Node *node = node_new (TYPE_NODE, - "name:steal", yyvsp[-1].id, - "pointer:steal", yyvsp[0].id, + "name:steal", (yyvsp[-1].id), + "pointer:steal", (yyvsp[0].id), NULL); typestack = g_list_prepend(typestack,node); } break; - case 92: -#line 1407 "parse.y" + case 98: +#line 1502 "parse.y" { Node *node = node_new (TYPE_NODE, - "name:steal", yyvsp[0].id, + "name:steal", (yyvsp[0].id), NULL); typestack = g_list_prepend(typestack,node); } break; - case 93: -#line 1416 "parse.y" + case 99: +#line 1511 "parse.y" { - yyval.id = yyvsp[0].id; + (yyval.id) = (yyvsp[0].id); } break; - case 94: -#line 1419 "parse.y" + case 100: +#line 1514 "parse.y" { - yyval.id = yyvsp[0].id; + (yyval.id) = (yyvsp[0].id); } break; - case 95: -#line 1422 "parse.y" + case 101: +#line 1517 "parse.y" { - yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); - g_free(yyvsp[0].id); + (yyval.id) = g_strconcat("const ", (yyvsp[0].id), NULL); + g_free((yyvsp[0].id)); } break; - case 96: -#line 1426 "parse.y" + case 102: +#line 1521 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); - g_free(yyvsp[-1].id); + (yyval.id) = g_strconcat((yyvsp[-1].id), " const", NULL); + g_free((yyvsp[-1].id)); } break; - case 97: -#line 1430 "parse.y" + case 103: +#line 1525 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); - g_free(yyvsp[0].id); + (yyval.id) = g_strconcat((yyvsp[-1].id), " ", (yyvsp[0].id), NULL); + g_free((yyvsp[0].id)); } break; - case 98: -#line 1434 "parse.y" + case 104: +#line 1529 "parse.y" { - yyval.id = g_strconcat("const ", yyvsp[-1].id, " ", - yyvsp[0].id, NULL); - g_free(yyvsp[0].id); + (yyval.id) = g_strconcat("const ", (yyvsp[-1].id), " ", + (yyvsp[0].id), NULL); + g_free((yyvsp[0].id)); } break; - case 99: -#line 1439 "parse.y" + case 105: +#line 1534 "parse.y" { - yyval.id = g_strconcat(yyvsp[-2].id, " ", - yyvsp[-1].id, " const", NULL); - g_free(yyvsp[-1].id); + (yyval.id) = g_strconcat((yyvsp[-2].id), " ", + (yyvsp[-1].id), " const", NULL); + g_free((yyvsp[-1].id)); } break; - case 100: -#line 1447 "parse.y" + case 106: +#line 1542 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); - g_free(yyvsp[0].id); + (yyval.id) = g_strconcat((yyvsp[-1].id), " ", (yyvsp[0].id), NULL); + g_free((yyvsp[0].id)); } break; - case 101: -#line 1451 "parse.y" + case 107: +#line 1546 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); - g_free(yyvsp[-1].id); - g_free(yyvsp[0].id); + (yyval.id) = g_strconcat((yyvsp[-1].id), " ", (yyvsp[0].id), NULL); + g_free((yyvsp[-1].id)); + g_free((yyvsp[0].id)); } break; - case 102: -#line 1456 "parse.y" + case 108: +#line 1551 "parse.y" { - yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); - g_free(yyvsp[0].id); + (yyval.id) = g_strconcat("const ", (yyvsp[0].id), NULL); + g_free((yyvsp[0].id)); } break; - case 103: -#line 1460 "parse.y" + case 109: +#line 1555 "parse.y" { - yyval.id = yyvsp[0].id; + (yyval.id) = (yyvsp[0].id); } break; - case 104: -#line 1463 "parse.y" + case 110: +#line 1558 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); - g_free(yyvsp[-1].id); + (yyval.id) = g_strconcat((yyvsp[-1].id), " const", NULL); + g_free((yyvsp[-1].id)); } break; - case 105: -#line 1467 "parse.y" + case 111: +#line 1562 "parse.y" { - yyval.id = g_strdup(yyvsp[0].id); + (yyval.id) = g_strdup((yyvsp[0].id)); } break; - case 106: -#line 1470 "parse.y" + case 112: +#line 1565 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + (yyval.id) = g_strconcat((yyvsp[-1].id), " const", NULL); } break; - case 107: -#line 1475 "parse.y" - { yyval.id = "void"; } + case 113: +#line 1570 "parse.y" + { (yyval.id) = "void"; } break; - case 108: -#line 1476 "parse.y" - { yyval.id = "char"; } + case 114: +#line 1571 "parse.y" + { (yyval.id) = "char"; } break; - case 109: -#line 1477 "parse.y" - { yyval.id = "short"; } + case 115: +#line 1572 "parse.y" + { (yyval.id) = "short"; } break; - case 110: -#line 1478 "parse.y" - { yyval.id = "int"; } + case 116: +#line 1573 "parse.y" + { (yyval.id) = "int"; } break; - case 111: -#line 1479 "parse.y" - { yyval.id = "long"; } + case 117: +#line 1574 "parse.y" + { (yyval.id) = "long"; } break; - case 112: -#line 1480 "parse.y" - { yyval.id = "float"; } + case 118: +#line 1575 "parse.y" + { (yyval.id) = "float"; } break; - case 113: -#line 1481 "parse.y" - { yyval.id = "double"; } + case 119: +#line 1576 "parse.y" + { (yyval.id) = "double"; } break; - case 114: -#line 1482 "parse.y" - { yyval.id = "signed"; } + case 120: +#line 1577 "parse.y" + { (yyval.id) = "signed"; } break; - case 115: -#line 1483 "parse.y" - { yyval.id = "unsigned"; } + case 121: +#line 1578 "parse.y" + { (yyval.id) = "unsigned"; } break; - case 116: -#line 1486 "parse.y" - { yyval.id = "struct"; } + case 122: +#line 1581 "parse.y" + { (yyval.id) = "struct"; } break; - case 117: -#line 1487 "parse.y" - { yyval.id = "union"; } + case 123: +#line 1582 "parse.y" + { (yyval.id) = "union"; } break; - case 118: -#line 1488 "parse.y" - { yyval.id = "enum"; } + case 124: +#line 1583 "parse.y" + { (yyval.id) = "enum"; } break; - case 119: -#line 1491 "parse.y" - { yyval.id = g_strdup("*"); } + case 125: +#line 1586 "parse.y" + { (yyval.id) = g_strdup("*"); } break; - case 120: -#line 1492 "parse.y" - { yyval.id = g_strdup("* const"); } + case 126: +#line 1587 "parse.y" + { (yyval.id) = g_strdup("* const"); } break; - case 121: -#line 1493 "parse.y" + case 127: +#line 1588 "parse.y" { - yyval.id = g_strconcat("*", yyvsp[0].id, NULL); - g_free(yyvsp[0].id); + (yyval.id) = g_strconcat("*", (yyvsp[0].id), NULL); + g_free((yyvsp[0].id)); } break; - case 122: -#line 1497 "parse.y" + case 128: +#line 1592 "parse.y" { - yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); - g_free(yyvsp[0].id); + (yyval.id) = g_strconcat("* const", (yyvsp[0].id), NULL); + g_free((yyvsp[0].id)); } break; - case 123: -#line 1504 "parse.y" + case 129: +#line 1599 "parse.y" { - if(strcmp(yyvsp[-1].id, "first")==0) - yyval.sigtype = SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-1].id, "last")==0) - yyval.sigtype = SIGNAL_LAST_METHOD; + if(strcmp((yyvsp[-1].id), "first")==0) + (yyval.sigtype) = SIGNAL_FIRST_METHOD; + else if(strcmp((yyvsp[-1].id), "last")==0) + (yyval.sigtype) = SIGNAL_LAST_METHOD; else { yyerror(_("signal must be 'first' or 'last'")); - g_free(yyvsp[-1].id); + g_free((yyvsp[-1].id)); YYERROR; } - g_free(yyvsp[-1].id); + g_free((yyvsp[-1].id)); } break; - case 124: -#line 1516 "parse.y" + case 130: +#line 1611 "parse.y" { - yyval.sigtype = SIGNAL_LAST_METHOD; + (yyval.sigtype) = SIGNAL_LAST_METHOD; } break; - case 125: -#line 1522 "parse.y" + case 131: +#line 1617 "parse.y" { - if(strcmp(yyvsp[-1].id,"first")==0) - yyval.sigtype = SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-1].id,"last")==0) - yyval.sigtype = SIGNAL_LAST_METHOD; + if(strcmp((yyvsp[-1].id),"first")==0) + (yyval.sigtype) = SIGNAL_FIRST_METHOD; + else if(strcmp((yyvsp[-1].id),"last")==0) + (yyval.sigtype) = SIGNAL_LAST_METHOD; else { yyerror(_("signal must be 'first' or 'last'")); - g_free(yyvsp[-1].id); + g_free((yyvsp[-1].id)); YYERROR; } - g_free(yyvsp[-1].id); + g_free((yyvsp[-1].id)); } break; - case 126: -#line 1534 "parse.y" + case 132: +#line 1629 "parse.y" { - if(strcmp(yyvsp[-2].id,"first")==0) - yyval.sigtype = SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-2].id,"last")==0) - yyval.sigtype = SIGNAL_LAST_METHOD; + if(strcmp((yyvsp[-2].id),"first")==0) + (yyval.sigtype) = SIGNAL_FIRST_METHOD; + else if(strcmp((yyvsp[-2].id),"last")==0) + (yyval.sigtype) = SIGNAL_LAST_METHOD; else { yyerror(_("signal must be 'first' or 'last'")); - g_free(yyvsp[-2].id); + g_free((yyvsp[-2].id)); YYERROR; } - g_free(yyvsp[-2].id); + g_free((yyvsp[-2].id)); } break; - case 127: -#line 1546 "parse.y" + case 133: +#line 1641 "parse.y" { - yyval.sigtype = SIGNAL_LAST_METHOD; + (yyval.sigtype) = SIGNAL_LAST_METHOD; } break; - case 128: -#line 1549 "parse.y" + case 134: +#line 1644 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; } break; - case 129: -#line 1555 "parse.y" + case 135: +#line 1650 "parse.y" { - gtktypes = g_list_prepend(gtktypes, debool (yyvsp[-3].id)); + gtktypes = g_list_prepend(gtktypes, debool ((yyvsp[-3].id))); } break; - case 130: -#line 1560 "parse.y" + case 136: +#line 1655 "parse.y" { - gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id)); + gtktypes = g_list_append(gtktypes, debool ((yyvsp[0].id))); } break; - case 131: -#line 1563 "parse.y" + case 137: +#line 1658 "parse.y" { - gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id)); + gtktypes = g_list_append(gtktypes, debool ((yyvsp[0].id))); } break; - case 132: -#line 1568 "parse.y" - { yyval.cbuf = yyvsp[0].cbuf; } + case 138: +#line 1663 "parse.y" + { (yyval.cbuf) = (yyvsp[0].cbuf); } break; - case 133: -#line 1569 "parse.y" - { yyval.cbuf = NULL; } + case 139: +#line 1664 "parse.y" + { (yyval.cbuf) = NULL; } break; - case 134: -#line 1573 "parse.y" + case 140: +#line 1668 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -3460,14 +3628,14 @@ yyreduce: free_all_global_state(); YYERROR; } - push_function(the_scope, yyvsp[-7].sigtype,NULL, - yyvsp[-5].id, yyvsp[0].cbuf,yyvsp[-9].line, - ccode_line, vararg, yyvsp[-8].list); + push_function(the_scope, (yyvsp[-7].sigtype),NULL, + (yyvsp[-5].id), (yyvsp[0].cbuf),(yyvsp[-9].line), + ccode_line, vararg, (yyvsp[-8].list)); } break; - case 135: -#line 1589 "parse.y" + case 141: +#line 1684 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -3480,14 +3648,14 @@ yyreduce: free_all_global_state(); YYERROR; } - push_function(the_scope, yyvsp[-7].sigtype, NULL, - yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-9].line, - ccode_line, vararg, yyvsp[-8].list); + push_function(the_scope, (yyvsp[-7].sigtype), NULL, + (yyvsp[-5].id), (yyvsp[0].cbuf), (yyvsp[-9].line), + ccode_line, vararg, (yyvsp[-8].list)); } break; - case 136: -#line 1605 "parse.y" + case 142: +#line 1700 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -3500,14 +3668,14 @@ yyreduce: free_all_global_state(); YYERROR; } - push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[0].cbuf, yyvsp[-8].line, + push_function(the_scope, VIRTUAL_METHOD, NULL, (yyvsp[-5].id), + (yyvsp[0].cbuf), (yyvsp[-8].line), ccode_line, vararg, NULL); } break; - case 137: -#line 1621 "parse.y" + case 143: +#line 1716 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -3520,14 +3688,14 @@ yyreduce: free_all_global_state(); YYERROR; } - push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[0].cbuf, yyvsp[-7].line, + push_function(the_scope, VIRTUAL_METHOD, NULL, (yyvsp[-5].id), + (yyvsp[0].cbuf), (yyvsp[-7].line), ccode_line, vararg, NULL); } break; - case 138: -#line 1637 "parse.y" + case 144: +#line 1732 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -3536,52 +3704,52 @@ yyreduce: YYERROR; } push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, - yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line, + (yyvsp[-5].id), (yyvsp[0].cbuf), (yyvsp[-7].line), ccode_line, vararg, NULL); } break; - case 139: -#line 1648 "parse.y" + case 145: +#line 1743 "parse.y" { - push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, - yyvsp[-5].id, yyvsp[0].cbuf, - yyvsp[-10].line, ccode_line, + push_function(NO_SCOPE, OVERRIDE_METHOD, (yyvsp[-8].id), + (yyvsp[-5].id), (yyvsp[0].cbuf), + (yyvsp[-10].line), ccode_line, vararg, NULL); } break; - case 140: -#line 1654 "parse.y" + case 146: +#line 1749 "parse.y" { if(the_scope == CLASS_SCOPE) { yyerror(_("a method cannot be of class scope")); free_all_global_state(); YYERROR; } - push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id, - yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, + push_function(the_scope, REGULAR_METHOD, NULL, (yyvsp[-5].id), + (yyvsp[0].cbuf), (yyvsp[-7].line), ccode_line, vararg, NULL); } break; - case 141: -#line 1664 "parse.y" + case 147: +#line 1759 "parse.y" { - if(strcmp(yyvsp[-4].id, "init")==0) { - push_init_arg(yyvsp[-2].id,FALSE); + if(strcmp((yyvsp[-4].id), "init")==0) { + push_init_arg((yyvsp[-2].id),FALSE); push_function(NO_SCOPE, INIT_METHOD, NULL, - yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line, + (yyvsp[-4].id), (yyvsp[0].cbuf), (yyvsp[-3].line), ccode_line, FALSE, NULL); - } else if(strcmp(yyvsp[-4].id, "class_init")==0) { - push_init_arg(yyvsp[-2].id,TRUE); + } else if(strcmp((yyvsp[-4].id), "class_init")==0) { + push_init_arg((yyvsp[-2].id),TRUE); push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, - yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line, + (yyvsp[-4].id), (yyvsp[0].cbuf), (yyvsp[-3].line), ccode_line, FALSE, NULL); } else { - g_free(yyvsp[-4].id); - g_free(yyvsp[-2].id); - g_string_free(yyvsp[0].cbuf,TRUE); + g_free((yyvsp[-4].id)); + g_free((yyvsp[-2].id)); + g_string_free((yyvsp[0].cbuf),TRUE); yyerror(_("parse error " "(untyped blocks must be init or " "class_init)")); @@ -3590,239 +3758,239 @@ yyreduce: } break; - case 142: -#line 1687 "parse.y" + case 148: +#line 1782 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; - if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) { - g_free(yyvsp[-1].id); - g_free(yyvsp[0].id); + if(!set_return_value((yyvsp[-1].id), (yyvsp[0].id))) { + g_free((yyvsp[-1].id)); + g_free((yyvsp[0].id)); yyerror(_("parse error")); YYERROR; } - g_free(yyvsp[-1].id); + g_free((yyvsp[-1].id)); } break; - case 143: -#line 1698 "parse.y" + case 149: +#line 1793 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; - if(!set_return_value(yyvsp[-3].id, yyvsp[-2].id)) { - g_free(yyvsp[-3].id); g_free(yyvsp[-2].id); - g_free(yyvsp[-1].id); g_free(yyvsp[0].id); + if(!set_return_value((yyvsp[-3].id), (yyvsp[-2].id))) { + g_free((yyvsp[-3].id)); g_free((yyvsp[-2].id)); + g_free((yyvsp[-1].id)); g_free((yyvsp[0].id)); yyerror(_("parse error")); YYERROR; } - if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) { + if(!set_return_value((yyvsp[-1].id), (yyvsp[0].id))) { onerror = defreturn = NULL; - g_free(yyvsp[-3].id); g_free(yyvsp[-2].id); - g_free(yyvsp[-1].id); g_free(yyvsp[0].id); + g_free((yyvsp[-3].id)); g_free((yyvsp[-2].id)); + g_free((yyvsp[-1].id)); g_free((yyvsp[0].id)); yyerror(_("parse error")); YYERROR; } - g_free(yyvsp[-3].id); - g_free(yyvsp[-1].id); + g_free((yyvsp[-3].id)); + g_free((yyvsp[-1].id)); } break; - case 144: -#line 1717 "parse.y" + case 150: +#line 1812 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; } break; - case 145: -#line 1723 "parse.y" - { yyval.id = yyvsp[0].id; } + case 151: +#line 1818 "parse.y" + { (yyval.id) = (yyvsp[0].id); } break; - case 146: -#line 1724 "parse.y" + case 152: +#line 1819 "parse.y" { - yyval.id = (yyvsp[0].cbuf)->str; - g_string_free(yyvsp[0].cbuf, FALSE); + (yyval.id) = ((yyvsp[0].cbuf))->str; + g_string_free((yyvsp[0].cbuf), FALSE); } break; - case 147: -#line 1730 "parse.y" + case 153: +#line 1825 "parse.y" { vararg = FALSE; has_self = FALSE; } break; - case 148: -#line 1731 "parse.y" + case 154: +#line 1826 "parse.y" { vararg = FALSE; has_self = TRUE; - if(strcmp(yyvsp[0].id,"self")==0) - push_self(yyvsp[0].id, FALSE); + if(strcmp((yyvsp[0].id),"self")==0) + push_self((yyvsp[0].id), FALSE); else { - g_free(yyvsp[0].id); + g_free((yyvsp[0].id)); yyerror(_("parse error")); YYERROR; } } break; - case 149: -#line 1742 "parse.y" + case 155: +#line 1837 "parse.y" { vararg = FALSE; has_self = TRUE; - if(strcmp(yyvsp[-1].id,"self")==0) - push_self(yyvsp[-1].id, TRUE); + if(strcmp((yyvsp[-1].id),"self")==0) + push_self((yyvsp[-1].id), TRUE); else { - g_free(yyvsp[-1].id); + g_free((yyvsp[-1].id)); yyerror(_("parse error")); YYERROR; } } break; - case 150: -#line 1753 "parse.y" + case 156: +#line 1848 "parse.y" { vararg = FALSE; has_self = TRUE; - if(strcmp(yyvsp[0].id,"self")==0) - push_self(yyvsp[0].id, TRUE); + if(strcmp((yyvsp[0].id),"self")==0) + push_self((yyvsp[0].id), TRUE); else { - g_free(yyvsp[0].id); + g_free((yyvsp[0].id)); yyerror(_("parse error")); YYERROR; } } break; - case 151: -#line 1764 "parse.y" + case 157: +#line 1859 "parse.y" { has_self = TRUE; - if(strcmp(yyvsp[-2].id,"self")==0) - push_self(yyvsp[-2].id, FALSE); + if(strcmp((yyvsp[-2].id),"self")==0) + push_self((yyvsp[-2].id), FALSE); else { - g_free(yyvsp[-2].id); + g_free((yyvsp[-2].id)); yyerror(_("parse error")); YYERROR; } } break; - case 152: -#line 1774 "parse.y" + case 158: +#line 1869 "parse.y" { has_self = TRUE; - if(strcmp(yyvsp[-3].id,"self")==0) - push_self(yyvsp[-3].id, TRUE); + if(strcmp((yyvsp[-3].id),"self")==0) + push_self((yyvsp[-3].id), TRUE); else { - g_free(yyvsp[-3].id); + g_free((yyvsp[-3].id)); yyerror(_("parse error")); YYERROR; } } break; - case 153: -#line 1784 "parse.y" + case 159: +#line 1879 "parse.y" { has_self = TRUE; - if(strcmp(yyvsp[-2].id,"self")==0) - push_self(yyvsp[-2].id, TRUE); + if(strcmp((yyvsp[-2].id),"self")==0) + push_self((yyvsp[-2].id), TRUE); else { - g_free(yyvsp[-2].id); + g_free((yyvsp[-2].id)); yyerror(_("parse error")); YYERROR; } } break; - case 154: -#line 1794 "parse.y" + case 160: +#line 1889 "parse.y" { has_self = FALSE; } break; - case 155: -#line 1797 "parse.y" + case 161: +#line 1892 "parse.y" { vararg = TRUE; } break; - case 156: -#line 1798 "parse.y" + case 162: +#line 1893 "parse.y" { vararg = FALSE; } break; - case 157: -#line 1801 "parse.y" + case 163: +#line 1896 "parse.y" { ; } break; - case 158: -#line 1802 "parse.y" + case 164: +#line 1897 "parse.y" { ; } break; - case 159: -#line 1805 "parse.y" + case 165: +#line 1900 "parse.y" { - push_funcarg(yyvsp[0].id,NULL); + push_funcarg((yyvsp[0].id),NULL); } break; - case 160: -#line 1808 "parse.y" + case 166: +#line 1903 "parse.y" { - push_funcarg(yyvsp[-1].id,yyvsp[0].id); + push_funcarg((yyvsp[-1].id),(yyvsp[0].id)); } break; - case 161: -#line 1811 "parse.y" + case 167: +#line 1906 "parse.y" { - if(strcmp(yyvsp[-2].id,"check")!=0) { + if(strcmp((yyvsp[-2].id),"check")!=0) { yyerror(_("parse error")); YYERROR; } - g_free(yyvsp[-2].id); - push_funcarg(yyvsp[-4].id,NULL); + g_free((yyvsp[-2].id)); + push_funcarg((yyvsp[-4].id),NULL); } break; - case 162: -#line 1819 "parse.y" + case 168: +#line 1914 "parse.y" { - if(strcmp(yyvsp[-2].id,"check")!=0) { + if(strcmp((yyvsp[-2].id),"check")!=0) { yyerror(_("parse error")); YYERROR; } - g_free(yyvsp[-2].id); - push_funcarg(yyvsp[-5].id,yyvsp[-4].id); + g_free((yyvsp[-2].id)); + push_funcarg((yyvsp[-5].id),(yyvsp[-4].id)); } break; - case 163: -#line 1829 "parse.y" + case 169: +#line 1924 "parse.y" { ; } break; - case 164: -#line 1830 "parse.y" + case 170: +#line 1925 "parse.y" { ; } break; - case 165: -#line 1833 "parse.y" + case 171: +#line 1928 "parse.y" { - if(strcmp(yyvsp[0].id,"type")==0) { + if(strcmp((yyvsp[0].id),"type")==0) { Node *node = node_new (CHECK_NODE, "chtype", TYPE_CHECK, NULL); checks = g_list_append(checks,node); - } else if(strcmp(yyvsp[0].id,"null")==0) { + } else if(strcmp((yyvsp[0].id),"null")==0) { Node *node = node_new (CHECK_NODE, "chtype", NULL_CHECK, NULL); @@ -3831,82 +3999,82 @@ yyreduce: yyerror(_("parse error")); YYERROR; } - g_free(yyvsp[0].id); + g_free((yyvsp[0].id)); } break; - case 166: -#line 1850 "parse.y" + case 172: +#line 1945 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", GT_CHECK, - "number:steal", yyvsp[0].id, + "number:steal", (yyvsp[0].id), NULL); checks = g_list_append(checks,node); } break; - case 167: -#line 1857 "parse.y" + case 173: +#line 1952 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", LT_CHECK, - "number:steal", yyvsp[0].id, + "number:steal", (yyvsp[0].id), NULL); checks = g_list_append(checks,node); } break; - case 168: -#line 1864 "parse.y" + case 174: +#line 1959 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", GE_CHECK, - "number:steal", yyvsp[0].id, + "number:steal", (yyvsp[0].id), NULL); checks = g_list_append(checks,node); } break; - case 169: -#line 1871 "parse.y" + case 175: +#line 1966 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", LE_CHECK, - "number:steal", yyvsp[0].id, + "number:steal", (yyvsp[0].id), NULL); checks = g_list_append(checks,node); } break; - case 170: -#line 1878 "parse.y" + case 176: +#line 1973 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", EQ_CHECK, - "number:steal", yyvsp[0].id, + "number:steal", (yyvsp[0].id), NULL); checks = g_list_append(checks,node); } break; - case 171: -#line 1885 "parse.y" + case 177: +#line 1980 "parse.y" { Node *node = node_new (CHECK_NODE, "chtype", NE_CHECK, - "number:steal", yyvsp[0].id, + "number:steal", (yyvsp[0].id), NULL); checks = g_list_append(checks,node); } break; - case 172: -#line 1894 "parse.y" + case 178: +#line 1989 "parse.y" { Node *node = node_new (ENUMDEF_NODE, - "etype:steal", yyvsp[-1].id, - "prefix:steal", yyvsp[-5].id, + "etype:steal", (yyvsp[-1].id), + "prefix:steal", (yyvsp[-5].id), "values:steal", enum_vals, NULL); enum_vals = NULL; @@ -3914,12 +4082,12 @@ yyreduce: } break; - case 173: -#line 1903 "parse.y" + case 179: +#line 1998 "parse.y" { Node *node = node_new (ENUMDEF_NODE, - "etype:steal", yyvsp[-1].id, - "prefix:steal", yyvsp[-6].id, + "etype:steal", (yyvsp[-1].id), + "prefix:steal", (yyvsp[-6].id), "values:steal", enum_vals, NULL); enum_vals = NULL; @@ -3927,58 +4095,58 @@ yyreduce: } break; - case 174: -#line 1914 "parse.y" + case 180: +#line 2009 "parse.y" {;} break; - case 175: -#line 1915 "parse.y" + case 181: +#line 2010 "parse.y" {;} break; - case 176: -#line 1918 "parse.y" + case 182: +#line 2013 "parse.y" { Node *node; - char *num = yyvsp[0].id; + char *num = (yyvsp[0].id); /* A float value, that's a bad enum */ if (num[0] >= '0' && num[0] <= '9' && strchr (num, '.') != NULL) { - g_free (yyvsp[-2].id); + g_free ((yyvsp[-2].id)); g_free (num); yyerror(_("parse error (enumerator value not integer constant)")); YYERROR; } node = node_new (ENUMVALUE_NODE, - "name:steal", yyvsp[-2].id, + "name:steal", (yyvsp[-2].id), "value:steal", num, NULL); enum_vals = g_list_append (enum_vals, node); } break; - case 177: -#line 1938 "parse.y" + case 183: +#line 2033 "parse.y" { Node *node; node = node_new (ENUMVALUE_NODE, - "name:steal", yyvsp[0].id, + "name:steal", (yyvsp[0].id), NULL); enum_vals = g_list_append (enum_vals, node); } break; - case 178: -#line 1948 "parse.y" + case 184: +#line 2043 "parse.y" { Node *node = node_new (FLAGS_NODE, - "ftype:steal", yyvsp[-1].id, - "prefix:steal", yyvsp[-5].id, + "ftype:steal", (yyvsp[-1].id), + "prefix:steal", (yyvsp[-5].id), "values:steal", flag_vals, NULL); flag_vals = NULL; @@ -3986,12 +4154,12 @@ yyreduce: } break; - case 179: -#line 1957 "parse.y" + case 185: +#line 2052 "parse.y" { Node *node = node_new (FLAGS_NODE, - "ftype:steal", yyvsp[-1].id, - "prefix:steal", yyvsp[-6].id, + "ftype:steal", (yyvsp[-1].id), + "prefix:steal", (yyvsp[-6].id), "values:steal", flag_vals, NULL); flag_vals = NULL; @@ -3999,26 +4167,26 @@ yyreduce: } break; - case 180: -#line 1968 "parse.y" + case 186: +#line 2063 "parse.y" { - flag_vals = g_list_append (flag_vals, yyvsp[0].id); + flag_vals = g_list_append (flag_vals, (yyvsp[0].id)); } break; - case 181: -#line 1971 "parse.y" + case 187: +#line 2066 "parse.y" { - flag_vals = g_list_append (flag_vals, yyvsp[0].id); + flag_vals = g_list_append (flag_vals, (yyvsp[0].id)); } break; - case 182: -#line 1976 "parse.y" + case 188: +#line 2071 "parse.y" { Node *node = node_new (ERROR_NODE, - "etype:steal", yyvsp[-1].id, - "prefix:steal", yyvsp[-5].id, + "etype:steal", (yyvsp[-1].id), + "prefix:steal", (yyvsp[-5].id), "values:steal", error_vals, NULL); error_vals = NULL; @@ -4026,12 +4194,12 @@ yyreduce: } break; - case 183: -#line 1985 "parse.y" + case 189: +#line 2080 "parse.y" { Node *node = node_new (ERROR_NODE, - "etype:steal", yyvsp[-1].id, - "prefix:steal", yyvsp[-6].id, + "etype:steal", (yyvsp[-1].id), + "prefix:steal", (yyvsp[-6].id), "values:steal", error_vals, NULL); error_vals = NULL; @@ -4039,48 +4207,48 @@ yyreduce: } break; - case 184: -#line 1996 "parse.y" + case 190: +#line 2091 "parse.y" { - error_vals = g_list_append (error_vals, yyvsp[0].id); + error_vals = g_list_append (error_vals, (yyvsp[0].id)); } break; - case 185: -#line 1999 "parse.y" + case 191: +#line 2094 "parse.y" { - error_vals = g_list_append (error_vals, yyvsp[0].id); + error_vals = g_list_append (error_vals, (yyvsp[0].id)); } break; - case 186: -#line 2005 "parse.y" - { yyval.id = yyvsp[0].id; } + case 192: +#line 2100 "parse.y" + { (yyval.id) = (yyvsp[0].id); } break; - case 187: -#line 2006 "parse.y" + case 193: +#line 2101 "parse.y" { - yyval.id = g_strconcat("-",yyvsp[0].id,NULL); - g_free(yyvsp[0].id); + (yyval.id) = g_strconcat("-",(yyvsp[0].id),NULL); + g_free((yyvsp[0].id)); } break; - case 188: -#line 2010 "parse.y" - { yyval.id = yyvsp[0].id; } + case 194: +#line 2105 "parse.y" + { (yyval.id) = (yyvsp[0].id); } break; - case 189: -#line 2011 "parse.y" - { yyval.id = yyvsp[0].id; } + case 195: +#line 2106 "parse.y" + { (yyval.id) = (yyvsp[0].id); } break; } -/* Line 1000 of yacc.c. */ -#line 4084 "parse.c" +/* Line 1037 of yacc.c. */ +#line 4252 "y.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -4180,7 +4348,7 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse lookahead token after an + /* If just tried and failed to reuse look-ahead token after an error, discard it. */ if (yychar <= YYEOF) @@ -4190,23 +4358,22 @@ yyerrlab: if (yychar == YYEOF) for (;;) { + YYPOPSTACK; if (yyssp == yyss) YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[*yyssp], yyvsp); + yydestruct ("Error: popping", + yystos[*yyssp], yyvsp); } } else { - YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); - yydestruct (yytoken, &yylval); + yydestruct ("Error: discarding", yytoken, &yylval); yychar = YYEMPTY; - } } - /* Else will try to reuse lookahead token after shifting the error + /* Else will try to reuse look-ahead token after shifting the error token. */ goto yyerrlab1; @@ -4223,7 +4390,7 @@ yyerrorlab: goto yyerrorlab; #endif - yyvsp -= yylen; +yyvsp -= yylen; yyssp -= yylen; yystate = *yyssp; goto yyerrlab1; @@ -4253,8 +4420,8 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[yystate], yyvsp); + + yydestruct ("Error: popping", yystos[yystate], yyvsp); YYPOPSTACK; yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -4263,11 +4430,12 @@ yyerrlab1: if (yyn == YYFINAL) YYACCEPT; - YYDPRINTF ((stderr, "Shifting error token, ")); - *++yyvsp = yylval; + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + yystate = yyn; goto yynewstate; @@ -4283,6 +4451,9 @@ yyacceptlab: | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: + yydestruct ("Error: discarding lookahead", + yytoken, &yylval); + yychar = YYEMPTY; yyresult = 1; goto yyreturn; @@ -4305,6 +4476,6 @@ yyreturn: } -#line 2014 "parse.y" +#line 2109 "parse.y"