X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/a8ea1a669f332b0ed29c6271896476f59f357533..4d534c82fb65897999ade6867534ab952a9bc019:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 0146efb..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,6 +185,7 @@ 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; @@ -614,7 +615,6 @@ add_construct_glade (char * file, char * root, char * domain) Node *var; Type * type; GList * flags = NULL; - char * set; type = (Type *)node_new (TYPE_NODE, "name", "GladeXML", @@ -622,11 +622,11 @@ add_construct_glade (char * file, char * root, char * domain) NULL); initializer = g_strdup_printf("\t{\n" "\tGtkWidget * root;\n" - "\to->_priv->_glade_xml = glade_xml_new(%s, %s, %s);\n" - "\troot = glade_xml_get_widget(o->_priv->_glade_xml, %s);\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(o), root);\n" - "\tglade_xml_signal_autoconnect_full(o->_priv->_glade_xml, (GladeXMLConnectFunc)___glade_xml_connect_foreach, (gpointer)o);\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, @@ -828,8 +828,8 @@ typedef union YYSTYPE { int line; int sigtype; } YYSTYPE; -/* Line 191 of yacc.c. */ -#line 833 "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 @@ -840,8 +840,8 @@ typedef union YYSTYPE { /* Copy the second part of user declarations. */ -/* Line 214 of yacc.c. */ -#line 845 "parse.c" +/* Line 213 of yacc.c. */ +#line 845 "y.tab.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -856,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 @@ -889,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; }; @@ -899,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 @@ -941,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 595 +#define YYLAST 629 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 66 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 53 /* YYNRULES -- Number of rules. */ -#define YYNRULES 194 +#define YYNRULES 195 /* YYNRULES -- Number of states. */ -#define YYNSTATES 412 +#define YYNSTATES 414 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -1004,28 +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, 88, 96, - 103, 111, 114, 116, 118, 121, 125, 127, 129, 131, - 133, 135, 137, 139, 141, 144, 148, 151, 155, 158, - 161, 163, 165, 167, 168, 174, 181, 194, 204, 211, - 215, 216, 228, 237, 243, 247, 248, 252, 254, 256, - 261, 263, 265, 269, 273, 277, 281, 285, 289, 293, - 297, 301, 305, 309, 313, 317, 321, 325, 329, 333, - 335, 341, 343, 347, 348, 352, 354, 357, 359, 361, - 363, 366, 369, 372, 376, 380, 383, 386, 389, 391, - 394, 396, 399, 401, 403, 405, 407, 409, 411, 413, - 415, 417, 419, 421, 423, 425, 428, 431, 435, 438, - 440, 444, 448, 451, 453, 458, 462, 464, 467, 469, - 480, 492, 502, 512, 521, 533, 542, 548, 551, 556, - 557, 559, 562, 564, 566, 569, 572, 576, 581, 586, - 588, 592, 594, 598, 600, 603, 607, 614, 622, 625, - 627, 629, 632, 635, 639, 643, 647, 651, 659, 668, - 672, 674, 678, 680, 688, 697, 701, 703, 711, 720, - 724, 726, 728, 731, 733 + 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. */ @@ -1037,99 +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, 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 + 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, 689, 689, 690, 691, 692, 695, 704, 713, 722, 731, 740, 751, 752, 753, 754, 755, 756, 757, 758, - 761, 766, 773, 789, 790, 802, 811, 823, 832, 841, - 850, 861, 862, 865, 866, 875, 887, 888, 889, 890, - 893, 894, 895, 896, 899, 919, 943, 947, 955, 956, - 957, 958, 959, 967, 973, 976, 981, 1049, 1103, 1192, - 1200, 1205, 1253, 1289, 1305, 1306, 1309, 1310, 1313, 1314, - 1326, 1327, 1330, 1336, 1342, 1348, 1354, 1360, 1366, 1373, - 1379, 1385, 1391, 1397, 1403, 1409, 1415, 1421, 1427, 1433, - 1458, 1467, 1473, 1474, 1477, 1480, 1486, 1493, 1502, 1505, - 1508, 1512, 1516, 1520, 1525, 1533, 1537, 1542, 1546, 1549, - 1553, 1556, 1561, 1562, 1563, 1564, 1565, 1566, 1567, 1568, - 1569, 1572, 1573, 1574, 1577, 1578, 1579, 1583, 1590, 1602, - 1608, 1620, 1632, 1635, 1641, 1646, 1649, 1654, 1655, 1659, - 1675, 1691, 1707, 1723, 1734, 1740, 1750, 1773, 1784, 1803, - 1809, 1810, 1816, 1817, 1828, 1839, 1850, 1860, 1870, 1880, - 1883, 1884, 1887, 1888, 1891, 1894, 1897, 1905, 1915, 1916, - 1919, 1936, 1943, 1950, 1957, 1964, 1971, 1980, 1989, 2000, - 2001, 2004, 2024, 2034, 2043, 2054, 2057, 2062, 2071, 2082, - 2085, 2091, 2092, 2096, 2097 + 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 @@ -1163,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, @@ -1181,23 +1177,23 @@ 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, 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, + 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, - 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. */ @@ -1205,24 +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, 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, 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 + 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, + 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 @@ -1233,249 +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, 40, 41, 42, - 43, 0, 93, 0, 93, 0, 21, 39, 0, 32, - 0, 36, 37, 38, 33, 23, 182, 0, 180, 190, - 0, 186, 0, 0, 0, 0, 0, 34, 0, 0, - 0, 0, 112, 121, 122, 123, 119, 120, 116, 114, - 115, 117, 118, 113, 99, 108, 0, 0, 97, 98, - 110, 0, 0, 0, 20, 31, 0, 93, 0, 0, - 22, 0, 0, 0, 0, 0, 0, 0, 35, 0, - 0, 65, 95, 0, 91, 0, 0, 100, 107, 0, - 101, 109, 106, 0, 0, 124, 96, 111, 105, 102, - 0, 0, 133, 0, 129, 0, 0, 0, 53, 0, - 194, 191, 193, 0, 181, 0, 0, 179, 0, 189, - 0, 0, 185, 0, 0, 0, 0, 0, 0, 92, - 0, 60, 103, 0, 0, 125, 126, 104, 0, 0, - 0, 128, 0, 132, 0, 0, 0, 0, 0, 52, - 53, 0, 0, 51, 50, 0, 0, 0, 0, 0, - 192, 177, 0, 187, 0, 183, 0, 0, 138, 146, - 89, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 67, 0, 63, 94, 0, 0, - 0, 0, 0, 112, 99, 0, 0, 159, 161, 163, - 127, 136, 0, 131, 130, 0, 0, 0, 0, 44, - 0, 0, 0, 0, 46, 48, 0, 49, 54, 0, - 23, 23, 23, 0, 178, 188, 184, 137, 0, 0, + 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, - 64, 0, 0, 0, 0, 58, 0, 100, 101, 0, - 164, 149, 0, 134, 0, 0, 0, 0, 0, 45, - 55, 149, 47, 0, 23, 24, 26, 25, 0, 23, - 0, 68, 72, 73, 74, 75, 194, 71, 76, 70, - 77, 78, 80, 79, 82, 81, 84, 83, 86, 85, - 88, 87, 66, 0, 90, 59, 0, 149, 0, 0, - 156, 165, 0, 0, 0, 160, 162, 135, 0, 0, - 149, 0, 0, 23, 29, 23, 27, 0, 0, 62, - 0, 0, 158, 157, 0, 0, 0, 147, 150, 143, - 149, 0, 0, 0, 145, 30, 28, 0, 0, 0, - 57, 141, 0, 170, 0, 0, 0, 0, 0, 169, - 151, 0, 0, 149, 142, 149, 69, 0, 0, 0, - 0, 0, 171, 0, 172, 0, 166, 168, 148, 139, - 0, 0, 61, 0, 167, 175, 173, 174, 176, 144, - 140, 56 + 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, 220, 53, 157, 213, 302, - 308, 214, 115, 70, 113, 225, 88, 89, 90, 91, - 126, 132, 133, 134, 232, 199, 54, 334, 357, 226, - 227, 228, 229, 378, 379, 16, 57, 58, 17, 62, - 18, 60, 358 + 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 -326 -static const short yypact[] = +#define YYPACT_NINF -325 +static const short int yypact[] = { - 166, 18, 73, -326, -326, -326, -326, -326, -326, 115, - 116, 147, -326, 166, 210, 121, -326, -326, -326, 148, - 127, 128, 135, -326, -326, 210, -326, -326, -326, 210, - 167, 175, 178, 204, 225, 210, 226, -326, -326, -326, - -326, 230, 195, 330, 195, 199, -326, -326, 194, -326, - 296, -326, -326, -326, -326, 206, 209, -32, -326, -326, - -18, -326, 156, 217, 321, 261, 296, -326, 268, 272, - 274, 377, -326, -326, -326, -326, -326, -326, -326, -326, - -326, -326, -326, -326, 290, 445, 394, 277, 237, -326, - 459, 280, 151, 279, -326, -326, 394, 195, 297, 304, - -326, 99, 310, 31, 311, 83, 329, 89, -326, 300, - 338, 325, 327, 341, 349, 395, 473, -326, -326, 402, - -326, 473, -326, 412, 383, 5, -326, 473, -326, 443, - 251, 433, -326, 394, -326, 397, 435, 436, 12, 188, - -326, -326, -326, 447, -326, 424, 448, -326, 425, -326, - 462, 438, -326, 471, 163, 413, 278, 11, 272, -326, - 474, 441, -326, 442, 411, 237, -326, -326, 444, 479, - 481, -326, 1, -326, 482, 394, 449, 1, 394, 76, - 19, 411, 9, 450, 483, 446, 84, 451, 453, 475, - -326, -326, 454, -326, 455, -326, 456, 486, -326, -326, - -326, 457, 458, 460, 461, 463, 464, 465, 466, 467, - 468, 469, 470, -10, -326, 476, -326, -326, 394, 487, - 495, 411, 428, 477, 13, 498, 478, -326, 472, -326, - -326, -326, 51, -326, -326, 480, 501, 411, 511, -326, - 508, 484, 488, 512, -326, -326, 76, -326, -326, 85, - 206, 206, 206, 90, -326, -326, -326, -326, 98, 98, - 99, 99, 60, 272, 394, 168, 252, 257, 258, 267, - -326, 278, 513, 489, 490, 485, 491, 158, 184, 394, - 66, 520, 360, -326, 521, 411, 493, 494, 496, -326, - -326, 520, -326, 497, 206, -326, -326, -326, 499, 206, - 502, -326, -326, -326, -326, -326, 502, -326, -326, -326, - -326, -326, -326, -326, -326, -326, -326, -326, -326, -326, - -326, -326, -326, 14, -326, -326, 518, 520, 394, 394, - -326, 503, 524, 74, 163, -326, -326, -326, 500, 411, - 520, 411, 163, 206, -326, 206, -326, 519, 506, -326, - 29, 163, -326, -326, 533, 104, 530, 541, -326, -326, - 520, 505, 163, 507, -326, -326, -326, 509, 538, 514, - -326, -326, 104, -326, 510, 80, 93, 515, 68, -326, - -326, 74, 163, 520, -326, 520, -326, 517, 540, 86, - 99, 99, -326, 99, -326, 99, -326, -326, -326, -326, - 163, 163, -326, 522, -326, -326, -326, -326, -326, -326, - -326, -326 + 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[] = { - -326, -326, 142, 227, 553, -326, -239, -326, 523, -29, - 385, 387, 392, -326, -326, -326, -326, -326, -326, 7, - -326, 305, -326, -19, -152, -42, -326, -69, -326, -68, - -106, 440, -326, -88, -326, -325, -13, -287, 197, -176, - -264, -326, 293, 208, -136, 143, -326, 492, 144, -326, - 233, -326, -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 -156 -static const short yytable[] = +#define YYTABLE_NINF -157 +static const short int yytable[] = { - 144, 87, 118, 119, 342, 242, 217, 66, 98, 359, - 165, 295, 296, 297, 86, 330, 122, 364, 278, 166, - 168, 128, 102, 67, 110, 92, 371, 103, 140, 141, - 215, 179, 142, 348, 180, 66, 104, 384, 179, 19, - 351, 105, 171, 173, 123, 276, 270, 118, 369, 271, - 56, 108, 118, 362, 136, 344, 169, 399, 118, 230, - 346, 287, 243, 131, 352, 353, 125, 181, 216, -153, - 182, 349, 279, 382, 143, 409, 410, 182, 137, 306, - 141, 244, 233, 142, 234, 146, 370, 373, 331, 171, - 301, 174, 20, 140, 141, 239, 400, 142, 401, 140, - 141, 170, 149, 142, 365, 373, 366, 283, 152, 338, - 284, 310, 140, 141, 249, 293, 142, 300, 140, 141, - 298, 332, 142, 373, 396, 143, 374, 356, 301, 240, - 375, 376, 377, 236, 21, 22, 238, 150, 391, 143, - 250, 294, 404, 153, 374, 143, 299, 23, 375, 376, - 377, 393, 31, 118, 119, 24, 26, 27, 143, 304, - 305, 309, 374, 361, 143, 363, 375, 376, 377, 1, - 130, 24, 26, 27, 30, 2, 273, 24, 26, 27, - 32, 33, 37, 38, 39, 40, 36, 312, 34, 313, - 3, 4, 5, 6, 7, 8, 55, 56, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 186, 187, 188, - 106, 9, 10, 36, -155, 107, 197, 328, 189, 2, - 198, 46, 311, 59, 47, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 3, 4, 5, 6, 7, 8, - -154, 29, 397, 329, 61, 63, 28, 64, 94, 68, - 69, 47, 35, 397, 93, 9, 10, 37, 38, 39, - 40, 99, 28, 43, 44, 45, 303, 101, 28, 307, - 168, 314, 65, 315, 392, 394, 316, 318, 317, 319, - 109, 65, 37, 38, 39, 40, 320, 111, 321, 405, - 406, 112, 407, 114, 408, 120, 124, 200, 125, 129, - 135, 71, 72, 73, 74, 75, 169, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 138, 85, 201, 202, - 203, 204, 205, 139, 206, 207, 208, 209, 210, 211, - 212, 145, 148, 96, 97, 71, 72, 73, 74, 75, - 63, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 151, 85, 37, 38, 39, 40, 154, 155, 43, 44, - 45, 37, 38, 39, 40, 71, 72, 73, 74, 75, - 335, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 156, 85, 116, 72, 73, 74, 75, 158, 76, 77, - 78, 79, 80, 81, 82, 83, 117, 159, 85, 71, - 72, 73, 74, 75, 160, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 161, 85, 222, 223, 73, 74, - 75, 162, 76, 77, 78, 79, 80, 81, 82, 83, - 224, 163, 85, 116, 72, 73, 74, 75, 164, 76, - 77, 78, 79, 80, 81, 82, 83, 277, 167, 85, - 121, 72, 172, 175, 176, 177, 76, 77, 78, 79, - 80, 81, 82, 83, 127, 72, 85, 190, 181, 192, - 76, 77, 78, 79, 80, 81, 82, 83, 116, 72, - 85, 191, 193, 194, 76, 77, 78, 79, 80, 81, - 82, 83, 196, 218, 85, 195, 219, 221, 231, 169, - 168, 235, 246, 248, 237, 253, 274, 251, 182, 252, - 257, 254, 255, 256, 275, 258, 259, 280, 260, 261, - 286, 262, 263, 264, 265, 266, 267, 268, 269, 272, - 288, 282, 289, -152, 281, 285, 292, 323, 326, 333, - 337, 290, 350, 355, 291, 324, 325, 327, 339, 367, - 340, 341, 372, 343, 380, 345, 360, 347, 354, 368, - 381, 383, 387, 385, 403, 386, 25, 388, 390, 247, - 245, 95, 241, 395, 402, 336, 322, 178, 398, 411, - 389, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 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, 71, 71, 291, 181, 158, 36, 50, 334, - 5, 250, 251, 252, 43, 279, 85, 342, 5, 125, - 19, 90, 54, 36, 66, 44, 351, 59, 19, 20, - 19, 19, 23, 19, 22, 64, 54, 362, 19, 21, - 327, 59, 130, 131, 86, 221, 56, 116, 19, 59, - 19, 64, 121, 340, 96, 294, 55, 382, 127, 165, - 299, 237, 53, 92, 328, 329, 61, 55, 57, 56, - 58, 57, 59, 360, 65, 400, 401, 58, 97, 19, - 20, 182, 170, 23, 172, 54, 57, 19, 22, 177, - 30, 133, 19, 19, 20, 19, 383, 23, 385, 19, - 20, 130, 19, 23, 343, 19, 345, 56, 19, 285, - 59, 263, 19, 20, 30, 30, 23, 19, 19, 20, - 30, 55, 23, 19, 56, 65, 58, 53, 30, 53, - 62, 63, 64, 175, 19, 19, 178, 54, 58, 65, - 56, 56, 56, 54, 58, 65, 56, 0, 62, 63, - 64, 58, 4, 222, 222, 13, 13, 13, 65, 260, - 261, 262, 58, 339, 65, 341, 62, 63, 64, 3, - 19, 29, 29, 29, 53, 9, 218, 35, 35, 35, - 53, 53, 31, 32, 33, 34, 19, 19, 53, 21, - 24, 25, 26, 27, 28, 29, 21, 19, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 19, 20, 21, - 54, 45, 46, 19, 56, 59, 53, 59, 30, 9, - 57, 54, 264, 19, 57, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 24, 25, 26, 27, 28, 29, - 56, 14, 378, 59, 19, 19, 13, 21, 54, 19, - 55, 57, 25, 389, 55, 45, 46, 31, 32, 33, - 34, 55, 29, 37, 38, 39, 259, 58, 35, 262, - 19, 19, 55, 21, 375, 376, 19, 19, 21, 21, - 19, 55, 31, 32, 33, 34, 19, 19, 21, 390, - 391, 19, 393, 19, 395, 5, 19, 19, 61, 19, - 21, 5, 6, 7, 8, 9, 55, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 19, 21, 40, 41, - 42, 43, 44, 19, 46, 47, 48, 49, 50, 51, - 52, 21, 21, 37, 38, 5, 6, 7, 8, 9, - 19, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 21, 21, 31, 32, 33, 34, 56, 19, 37, 38, - 39, 31, 32, 33, 34, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 55, 21, 5, 6, 7, 8, 9, 60, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 56, 21, 5, - 6, 7, 8, 9, 55, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 19, 21, 5, 6, 7, 8, - 9, 19, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 19, 21, 5, 6, 7, 8, 9, 55, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 5, 21, - 5, 6, 19, 56, 19, 19, 11, 12, 13, 14, - 15, 16, 17, 18, 5, 6, 21, 20, 55, 21, - 11, 12, 13, 14, 15, 16, 17, 18, 5, 6, - 21, 57, 57, 21, 11, 12, 13, 14, 15, 16, - 17, 18, 21, 19, 21, 57, 55, 55, 19, 55, - 19, 19, 19, 57, 55, 30, 19, 56, 58, 56, - 24, 57, 57, 57, 19, 58, 58, 19, 58, 58, - 19, 58, 58, 58, 58, 58, 58, 58, 58, 53, - 19, 59, 24, 56, 56, 55, 24, 24, 53, 19, - 19, 57, 24, 19, 56, 56, 56, 56, 55, 30, - 56, 55, 19, 56, 24, 56, 56, 55, 55, 53, - 19, 56, 24, 56, 24, 56, 13, 53, 58, 184, - 183, 48, 180, 58, 57, 282, 271, 137, 381, 57, - 372, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 103 + 101, 43, 190, 71, 181, 158, 71, 293, 50, 44, + 5, 36, 336, 19, 36, 30, 21, 85, 43, 5, + 344, 19, 90, 54, 66, 281, 19, 20, 59, 353, + 23, 125, 30, 56, 19, 20, 59, 30, 23, 64, + 364, 56, 64, 329, 86, 222, 130, 131, 116, 55, + 19, 19, 20, 121, 96, 23, 342, 19, 19, 127, + 384, 238, 97, 251, 252, 253, 61, 92, 53, 19, + 56, 165, 65, 59, 330, 331, 362, 19, 402, 403, + 65, 182, 19, 19, 20, 53, 170, 23, 172, 58, + 19, 133, 54, 177, 19, 20, 57, 65, 23, 385, + 19, 387, 19, 20, 54, 130, 23, 19, 296, 22, + 287, 19, 265, 301, 19, 57, 13, 19, 19, 56, + 19, 58, 58, 0, 14, 62, 63, 64, 57, 65, + 30, 53, 29, 175, 30, 25, 178, 56, 35, 58, + 65, 58, 55, 62, 63, 64, 58, 3, 65, 54, + 62, 63, 64, 9, 53, 223, 56, 345, 223, 347, + 56, 262, 263, 264, 341, 4, 343, 19, 24, 25, + 26, 27, 28, 29, 53, 19, 9, 219, 22, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 13, 45, + 46, 24, 25, 26, 27, 28, 29, 19, 20, 21, + 21, 54, 54, 19, 29, 57, 59, 53, 30, 13, + 35, 55, 45, 46, 58, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 266, 29, 380, 19, 54, 21, + 19, 35, 21, 59, 56, 53, 19, 391, 54, 19, + 19, 57, 31, 32, 33, 34, 19, 19, 37, 38, + 39, 31, 32, 33, 34, 53, 19, 56, 13, 57, + 59, 40, 41, 42, 43, 44, 55, 46, 47, 48, + 49, 50, 51, 52, 29, 55, 377, 378, 56, 56, + 35, 59, 59, 261, 55, 19, 264, 21, 19, 55, + 21, 392, 393, 19, 395, 21, 397, 5, 6, 7, + 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 @@ -1501,29 +1503,29 @@ static const unsigned char yystos[] = 55, 19, 19, 19, 55, 5, 96, 5, 19, 55, 75, 99, 19, 99, 91, 56, 19, 19, 97, 19, 22, 55, 58, 76, 77, 78, 19, 20, 21, 30, - 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, 57, 57, 57, 24, 58, 58, + 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, - 56, 59, 53, 91, 19, 19, 105, 19, 5, 59, - 19, 56, 59, 56, 59, 55, 19, 105, 19, 24, - 57, 56, 24, 30, 56, 72, 72, 72, 30, 56, - 19, 30, 85, 85, 118, 118, 19, 85, 86, 118, - 90, 91, 19, 21, 19, 21, 19, 21, 19, 21, - 19, 21, 87, 24, 56, 56, 53, 56, 59, 59, - 106, 22, 55, 19, 103, 10, 108, 19, 105, 55, - 56, 55, 103, 56, 72, 56, 72, 55, 19, 57, - 24, 103, 106, 106, 55, 19, 53, 104, 118, 101, - 56, 105, 103, 105, 101, 72, 72, 30, 53, 19, - 57, 101, 19, 19, 58, 62, 63, 64, 109, 110, - 24, 19, 103, 56, 101, 56, 56, 24, 53, 109, - 58, 58, 118, 58, 118, 58, 56, 110, 104, 101, - 103, 103, 57, 24, 56, 118, 118, 118, 118, 101, - 101, 57 + 58, 58, 56, 59, 53, 91, 19, 19, 105, 19, + 5, 59, 19, 56, 59, 56, 59, 55, 19, 105, + 19, 24, 57, 56, 24, 30, 56, 72, 72, 72, + 30, 56, 19, 30, 85, 85, 118, 118, 19, 85, + 86, 118, 90, 91, 19, 21, 19, 21, 19, 21, + 19, 21, 19, 21, 87, 24, 56, 56, 53, 56, + 59, 59, 106, 22, 55, 19, 103, 10, 108, 19, + 105, 55, 56, 55, 103, 56, 72, 56, 72, 55, + 19, 57, 24, 103, 106, 106, 55, 19, 53, 104, + 118, 101, 56, 105, 103, 105, 101, 72, 72, 30, + 53, 19, 57, 101, 19, 19, 58, 62, 63, 64, + 109, 110, 24, 19, 103, 56, 101, 56, 56, 24, + 53, 109, 58, 58, 118, 58, 118, 58, 56, 110, + 104, 101, 103, 103, 57, 24, 56, 118, 118, 118, + 118, 101, 101, 57 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -1577,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 @@ -1613,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) @@ -1637,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"); @@ -1692,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 */ @@ -1711,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 @@ -1796,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: @@ -1820,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 @@ -1831,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) { @@ -1858,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. */ @@ -1897,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: @@ -1909,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]; @@ -1948,6 +1977,9 @@ yyparse () yyssp = yyss; yyvsp = yyvs; + + yyvsp[0] = yylval; + goto yysetstate; /*------------------------------------------------------------. @@ -1973,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 @@ -2001,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) @@ -2037,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: ")); @@ -2063,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 @@ -2083,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) @@ -2158,11 +2190,11 @@ yyreduce: { 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; @@ -2171,11 +2203,11 @@ yyreduce: { 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; @@ -2184,11 +2216,11 @@ yyreduce: { 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; @@ -2197,11 +2229,11 @@ yyreduce: { 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; @@ -2210,11 +2242,11 @@ yyreduce: { 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; @@ -2223,11 +2255,11 @@ yyreduce: { 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; @@ -2293,12 +2325,13 @@ yyreduce: #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; @@ -2308,14 +2341,10 @@ yyreduce: break; case 24: -#line 790 "parse.y" +#line 791 "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) { - g_free (bonobo_object_class); - bonobo_object_class = g_strdup(yyvsp[-2].id); + if(strcmp((yyvsp[-2].id),"abstract") == 0) { + abstract = TRUE; } else { yyerror(_("parse error")); YYERROR; @@ -2324,11 +2353,14 @@ yyreduce: break; case 25: -#line 802 "parse.y" +#line 799 "parse.y" { - if (strcmp (yyvsp[-3].id, "interface") == 0) { - interfaces = g_list_append (interfaces, - g_strdup (yyvsp[-2].id)); + 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) { + g_free (bonobo_object_class); + bonobo_object_class = g_strdup((yyvsp[-2].id)); } else { yyerror(_("parse error")); YYERROR; @@ -2339,12 +2371,9 @@ yyreduce: case 26: #line 811 "parse.y" { - if(strcmp(yyvsp[-3].id,"chunks") == 0) { - g_free (chunk_size); - if(atoi(yyvsp[-2].id) != 0) - chunk_size = g_strdup(yyvsp[-2].id); - else - chunk_size = NULL; + if (strcmp ((yyvsp[-3].id), "interface") == 0) { + interfaces = g_list_append (interfaces, + g_strdup ((yyvsp[-2].id))); } else { yyerror(_("parse error")); YYERROR; @@ -2353,11 +2382,14 @@ yyreduce: break; case 27: -#line 823 "parse.y" +#line 820 "parse.y" { - if (strcmp (yyvsp[-4].id, "GladeXML") == 0) { - glade_xml = TRUE; - add_construct_glade(yyvsp[-3].id, yyvsp[-2].id, NULL); + if(strcmp((yyvsp[-3].id),"chunks") == 0) { + g_free (chunk_size); + if(atoi((yyvsp[-2].id)) != 0) + chunk_size = g_strdup((yyvsp[-2].id)); + else + chunk_size = NULL; } else { yyerror(_("parse error")); YYERROR; @@ -2368,9 +2400,9 @@ yyreduce: case 28: #line 832 "parse.y" { - if (strcmp (yyvsp[-5].id, "GladeXML") == 0) { + if (strcmp ((yyvsp[-4].id), "GladeXML") == 0) { glade_xml = TRUE; - add_construct_glade(yyvsp[-4].id, yyvsp[-3].id, yyvsp[-2].id); + add_construct_glade((yyvsp[-3].id), (yyvsp[-2].id), NULL); } else { yyerror(_("parse error")); YYERROR; @@ -2381,9 +2413,9 @@ yyreduce: case 29: #line 841 "parse.y" { - if (strcmp (yyvsp[-4].id, "GladeXML") == 0) { + if (strcmp ((yyvsp[-5].id), "GladeXML") == 0) { glade_xml = TRUE; - add_construct_glade(yyvsp[-3].id, yyvsp[-2].id, NULL); + add_construct_glade((yyvsp[-4].id), (yyvsp[-3].id), (yyvsp[-2].id)); } else { yyerror(_("parse error")); YYERROR; @@ -2394,9 +2426,9 @@ yyreduce: case 30: #line 850 "parse.y" { - if (strcmp (yyvsp[-5].id, "GladeXML") == 0) { + if (strcmp ((yyvsp[-4].id), "GladeXML") == 0) { glade_xml = TRUE; - add_construct_glade(yyvsp[-4].id, yyvsp[-3].id, yyvsp[-2].id); + add_construct_glade((yyvsp[-3].id), (yyvsp[-2].id), NULL); } else { yyerror(_("parse error")); YYERROR; @@ -2405,180 +2437,193 @@ yyreduce: break; case 31: -#line 861 "parse.y" - { ; } +#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 862 "parse.y" +#line 870 "parse.y" { ; } break; case 33: -#line 865 "parse.y" +#line 871 "parse.y" { ; } break; case 34: -#line 866 "parse.y" +#line 874 "parse.y" + { ; } + break; + + 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 35: -#line 875 "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 36: -#line 887 "parse.y" - { ; } - break; - case 37: -#line 888 "parse.y" +#line 896 "parse.y" { ; } break; case 38: -#line 889 "parse.y" +#line 897 "parse.y" { ; } break; case 39: -#line 890 "parse.y" +#line 898 "parse.y" { ; } break; case 40: -#line 893 "parse.y" - { the_scope = PUBLIC_SCOPE; } +#line 899 "parse.y" + { ; } break; case 41: -#line 894 "parse.y" - { the_scope = PRIVATE_SCOPE; } +#line 902 "parse.y" + { the_scope = PUBLIC_SCOPE; } break; case 42: -#line 895 "parse.y" - { the_scope = PROTECTED_SCOPE; } +#line 903 "parse.y" + { the_scope = PRIVATE_SCOPE; } break; case 43: -#line 896 "parse.y" - { the_scope = CLASS_SCOPE; } +#line 904 "parse.y" + { the_scope = PROTECTED_SCOPE; } break; case 44: -#line 899 "parse.y" +#line 905 "parse.y" + { the_scope = CLASS_SCOPE; } + break; + + 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 45: -#line 919 "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 46: -#line 943 "parse.y" + case 47: +#line 952 "parse.y" { - initializer = yyvsp[0].id; + initializer = (yyvsp[0].id); initializer_line = ccode_line; } break; - case 47: -#line 947 "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 48: -#line 955 "parse.y" + case 49: +#line 964 "parse.y" { ; } break; - case 49: -#line 956 "parse.y" + case 50: +#line 965 "parse.y" { ; } break; - case 50: -#line 957 "parse.y" + case 51: +#line 966 "parse.y" { destructor = NULL; } break; - case 51: -#line 958 "parse.y" + case 52: +#line 967 "parse.y" { initializer = NULL; } break; - case 52: -#line 959 "parse.y" + case 53: +#line 968 "parse.y" { - if (strcmp (yyvsp[0].id, "GladeXML") == 0) { + if (strcmp ((yyvsp[0].id), "GladeXML") == 0) { glade_widget = TRUE; } else { yyerror(_("parse error")); @@ -2587,87 +2632,87 @@ yyreduce: } break; - case 53: -#line 967 "parse.y" + case 54: +#line 976 "parse.y" { destructor = NULL; initializer = NULL; } break; - case 54: -#line 973 "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 55: -#line 976 "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 56: -#line 981 "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, @@ -2675,58 +2720,58 @@ yyreduce: arg->atype, arg->gtktype, arg->line_no); - g_free (yyvsp[-7].id); + g_free ((yyvsp[-7].id)); } } break; - case 57: -#line 1049 "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, @@ -2734,13 +2779,13 @@ yyreduce: arg->atype, arg->gtktype, arg->line_no); - g_free (yyvsp[-4].id); + g_free ((yyvsp[-4].id)); } } break; - case 58: -#line 1103 "parse.y" + case 59: +#line 1112 "parse.y" { Node *node; char *get, *set = NULL; @@ -2748,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, @@ -2823,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 59: -#line 1192 "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 60: -#line 1200 "parse.y" + case 61: +#line 1209 "parse.y" { - yyval.id = NULL; + (yyval.id) = NULL; } break; - case 61: -#line 1205 "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")); @@ -2901,32 +2946,32 @@ yyreduce: } break; - case 62: -#line 1253 "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")); @@ -2941,14 +2986,14 @@ yyreduce: } break; - case 63: -#line 1289 "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) { @@ -2959,314 +3004,304 @@ yyreduce: } break; - case 64: -#line 1305 "parse.y" - { ; } - break; - case 65: -#line 1306 "parse.y" +#line 1314 "parse.y" { ; } break; case 66: -#line 1309 "parse.y" +#line 1315 "parse.y" { ; } break; case 67: -#line 1310 "parse.y" +#line 1318 "parse.y" { ; } break; case 68: -#line 1313 "parse.y" - { yyval.id = yyvsp[0].id; } +#line 1319 "parse.y" + { ; } break; case 69: -#line 1314 "parse.y" +#line 1322 "parse.y" + { (yyval.id) = (yyvsp[0].id); } + break; + + 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 70: -#line 1326 "parse.y" - { yyval.id = yyvsp[0].id; } - break; - case 71: -#line 1327 "parse.y" - { yyval.id = yyvsp[0].id; } +#line 1335 "parse.y" + { (yyval.id) = (yyvsp[0].id); } break; case 72: -#line 1330 "parse.y" - { - ensure_property (); - node_set ((Node *)property, - "nick:steal", yyvsp[0].id, - NULL); - } +#line 1336 "parse.y" + { (yyval.id) = (yyvsp[0].id); } break; case 73: -#line 1336 "parse.y" +#line 1339 "parse.y" { ensure_property (); node_set ((Node *)property, - "blurb:steal", yyvsp[0].id, + "nick:steal", (yyvsp[0].id), NULL); } break; case 74: -#line 1342 "parse.y" +#line 1345 "parse.y" { ensure_property (); node_set ((Node *)property, - "maximum:steal", yyvsp[0].id, + "blurb:steal", (yyvsp[0].id), NULL); } break; case 75: -#line 1348 "parse.y" +#line 1351 "parse.y" { ensure_property (); node_set ((Node *)property, - "minimum:steal", yyvsp[0].id, + "maximum:steal", (yyvsp[0].id), NULL); } break; case 76: -#line 1354 "parse.y" +#line 1357 "parse.y" { ensure_property (); node_set ((Node *)property, - "default_value:steal", yyvsp[0].id, + "minimum:steal", (yyvsp[0].id), NULL); } break; case 77: -#line 1360 "parse.y" +#line 1363 "parse.y" { ensure_property (); node_set ((Node *)property, - "flags:steal", yyvsp[0].list, + "default_value:steal", (yyvsp[0].id), NULL); } break; case 78: -#line 1366 "parse.y" +#line 1369 "parse.y" { - Type *type = pop_type (); ensure_property (); node_set ((Node *)property, - "ptype:steal", type, + "flags:steal", (yyvsp[0].list), NULL); } break; case 79: -#line 1373 "parse.y" +#line 1375 "parse.y" { + Type *type = pop_type (); ensure_property (); node_set ((Node *)property, - "extra_gtktype:steal", yyvsp[0].id, + "ptype:steal", type, NULL); } break; case 80: -#line 1379 "parse.y" +#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 81: -#line 1385 "parse.y" +#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 82: -#line 1391 "parse.y" +#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 83: -#line 1397 "parse.y" +#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 84: -#line 1403 "parse.y" +#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 85: -#line 1409 "parse.y" +#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 86: -#line 1415 "parse.y" +#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 87: -#line 1421 "parse.y" +#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 88: -#line 1427 "parse.y" +#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 89: -#line 1433 "parse.y" +#line 1436 "parse.y" { ensure_property (); - if (strcmp (yyvsp[0].id, "override") == 0) { - g_free(yyvsp[0].id); + node_set ((Node *)property, + "extra_gtktype:steal", (yyvsp[0].id), + NULL); + } + break; + + case 90: +#line 1442 "parse.y" + { + ensure_property (); + 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 90: -#line 1458 "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 91: -#line 1467 "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 92: -#line 1473 "parse.y" - { yyval.list = yyvsp[-1].list; } - break; - case 93: -#line 1474 "parse.y" - { yyval.list = NULL; } +#line 1482 "parse.y" + { (yyval.list) = (yyvsp[-1].list); } break; case 94: -#line 1477 "parse.y" - { - yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); - } +#line 1483 "parse.y" + { (yyval.list) = NULL; } break; case 95: -#line 1480 "parse.y" +#line 1486 "parse.y" { - yyval.list = g_list_append(NULL,yyvsp[0].id); + (yyval.list) = g_list_append((yyvsp[0].list),(yyvsp[-2].id)); } break; case 96: -#line 1486 "parse.y" +#line 1489 "parse.y" { - Node *node = node_new (TYPE_NODE, - "name:steal", yyvsp[-1].id, - "pointer:steal", yyvsp[0].id, - NULL); - typestack = g_list_prepend(typestack,node); - } + (yyval.list) = g_list_append(NULL,(yyvsp[0].id)); + } break; case 97: -#line 1493 "parse.y" +#line 1495 "parse.y" { Node *node = node_new (TYPE_NODE, - "name:steal", yyvsp[0].id, + "name:steal", (yyvsp[-1].id), + "pointer:steal", (yyvsp[0].id), NULL); typestack = g_list_prepend(typestack,node); } @@ -3275,302 +3310,312 @@ yyreduce: case 98: #line 1502 "parse.y" { - yyval.id = yyvsp[0].id; + Node *node = node_new (TYPE_NODE, + "name:steal", (yyvsp[0].id), + NULL); + typestack = g_list_prepend(typestack,node); } break; case 99: -#line 1505 "parse.y" +#line 1511 "parse.y" { - yyval.id = yyvsp[0].id; + (yyval.id) = (yyvsp[0].id); } break; case 100: -#line 1508 "parse.y" +#line 1514 "parse.y" { - yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); - g_free(yyvsp[0].id); + (yyval.id) = (yyvsp[0].id); } break; case 101: -#line 1512 "parse.y" +#line 1517 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); - g_free(yyvsp[-1].id); + (yyval.id) = g_strconcat("const ", (yyvsp[0].id), NULL); + g_free((yyvsp[0].id)); } break; case 102: -#line 1516 "parse.y" +#line 1521 "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), " const", NULL); + g_free((yyvsp[-1].id)); } break; case 103: -#line 1520 "parse.y" +#line 1525 "parse.y" { - yyval.id = g_strconcat("const ", 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 104: -#line 1525 "parse.y" +#line 1529 "parse.y" { - yyval.id = g_strconcat(yyvsp[-2].id, " ", - yyvsp[-1].id, " const", NULL); - g_free(yyvsp[-1].id); + (yyval.id) = g_strconcat("const ", (yyvsp[-1].id), " ", + (yyvsp[0].id), NULL); + g_free((yyvsp[0].id)); } break; case 105: -#line 1533 "parse.y" +#line 1534 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); - g_free(yyvsp[0].id); + (yyval.id) = g_strconcat((yyvsp[-2].id), " ", + (yyvsp[-1].id), " const", NULL); + g_free((yyvsp[-1].id)); } break; case 106: -#line 1537 "parse.y" +#line 1542 "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[0].id)); } break; case 107: -#line 1542 "parse.y" +#line 1546 "parse.y" { - yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); - 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 108: -#line 1546 "parse.y" +#line 1551 "parse.y" { - yyval.id = yyvsp[0].id; + (yyval.id) = g_strconcat("const ", (yyvsp[0].id), NULL); + g_free((yyvsp[0].id)); } break; case 109: -#line 1549 "parse.y" +#line 1555 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); - g_free(yyvsp[-1].id); + (yyval.id) = (yyvsp[0].id); } break; case 110: -#line 1553 "parse.y" +#line 1558 "parse.y" { - yyval.id = g_strdup(yyvsp[0].id); + (yyval.id) = g_strconcat((yyvsp[-1].id), " const", NULL); + g_free((yyvsp[-1].id)); } break; case 111: -#line 1556 "parse.y" +#line 1562 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + (yyval.id) = g_strdup((yyvsp[0].id)); } break; case 112: -#line 1561 "parse.y" - { yyval.id = "void"; } +#line 1565 "parse.y" + { + (yyval.id) = g_strconcat((yyvsp[-1].id), " const", NULL); + } break; case 113: -#line 1562 "parse.y" - { yyval.id = "char"; } +#line 1570 "parse.y" + { (yyval.id) = "void"; } break; case 114: -#line 1563 "parse.y" - { yyval.id = "short"; } +#line 1571 "parse.y" + { (yyval.id) = "char"; } break; case 115: -#line 1564 "parse.y" - { yyval.id = "int"; } +#line 1572 "parse.y" + { (yyval.id) = "short"; } break; case 116: -#line 1565 "parse.y" - { yyval.id = "long"; } +#line 1573 "parse.y" + { (yyval.id) = "int"; } break; case 117: -#line 1566 "parse.y" - { yyval.id = "float"; } +#line 1574 "parse.y" + { (yyval.id) = "long"; } break; case 118: -#line 1567 "parse.y" - { yyval.id = "double"; } +#line 1575 "parse.y" + { (yyval.id) = "float"; } break; case 119: -#line 1568 "parse.y" - { yyval.id = "signed"; } +#line 1576 "parse.y" + { (yyval.id) = "double"; } break; case 120: -#line 1569 "parse.y" - { yyval.id = "unsigned"; } +#line 1577 "parse.y" + { (yyval.id) = "signed"; } break; case 121: -#line 1572 "parse.y" - { yyval.id = "struct"; } +#line 1578 "parse.y" + { (yyval.id) = "unsigned"; } break; case 122: -#line 1573 "parse.y" - { yyval.id = "union"; } +#line 1581 "parse.y" + { (yyval.id) = "struct"; } break; case 123: -#line 1574 "parse.y" - { yyval.id = "enum"; } +#line 1582 "parse.y" + { (yyval.id) = "union"; } break; case 124: -#line 1577 "parse.y" - { yyval.id = g_strdup("*"); } +#line 1583 "parse.y" + { (yyval.id) = "enum"; } break; case 125: -#line 1578 "parse.y" - { yyval.id = g_strdup("* const"); } +#line 1586 "parse.y" + { (yyval.id) = g_strdup("*"); } break; case 126: -#line 1579 "parse.y" - { - yyval.id = g_strconcat("*", yyvsp[0].id, NULL); - g_free(yyvsp[0].id); - } +#line 1587 "parse.y" + { (yyval.id) = g_strdup("* const"); } break; case 127: -#line 1583 "parse.y" +#line 1588 "parse.y" { - yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); - g_free(yyvsp[0].id); + (yyval.id) = g_strconcat("*", (yyvsp[0].id), NULL); + g_free((yyvsp[0].id)); } break; case 128: -#line 1590 "parse.y" +#line 1592 "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; + (yyval.id) = g_strconcat("* const", (yyvsp[0].id), NULL); + g_free((yyvsp[0].id)); + } + break; + + 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; 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 129: -#line 1602 "parse.y" + case 130: +#line 1611 "parse.y" { - yyval.sigtype = SIGNAL_LAST_METHOD; + (yyval.sigtype) = SIGNAL_LAST_METHOD; } break; - case 130: -#line 1608 "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 131: -#line 1620 "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 132: -#line 1632 "parse.y" + case 133: +#line 1641 "parse.y" { - yyval.sigtype = SIGNAL_LAST_METHOD; + (yyval.sigtype) = SIGNAL_LAST_METHOD; } break; - case 133: -#line 1635 "parse.y" + case 134: +#line 1644 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; } break; - case 134: -#line 1641 "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 135: -#line 1646 "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 136: -#line 1649 "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 137: -#line 1654 "parse.y" - { yyval.cbuf = yyvsp[0].cbuf; } - break; - case 138: -#line 1655 "parse.y" - { yyval.cbuf = NULL; } +#line 1663 "parse.y" + { (yyval.cbuf) = (yyvsp[0].cbuf); } break; case 139: -#line 1659 "parse.y" +#line 1664 "parse.y" + { (yyval.cbuf) = NULL; } + break; + + case 140: +#line 1668 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -3583,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 140: -#line 1675 "parse.y" + case 141: +#line 1684 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -3603,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 141: -#line 1691 "parse.y" + case 142: +#line 1700 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -3623,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 142: -#line 1707 "parse.y" + case 143: +#line 1716 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -3643,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 143: -#line 1723 "parse.y" + case 144: +#line 1732 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -3659,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 144: -#line 1734 "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 145: -#line 1740 "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 146: -#line 1750 "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)")); @@ -3713,239 +3758,239 @@ yyreduce: } break; - case 147: -#line 1773 "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 148: -#line 1784 "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 149: -#line 1803 "parse.y" + case 150: +#line 1812 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; } break; - case 150: -#line 1809 "parse.y" - { yyval.id = yyvsp[0].id; } + case 151: +#line 1818 "parse.y" + { (yyval.id) = (yyvsp[0].id); } break; - case 151: -#line 1810 "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 152: -#line 1816 "parse.y" + case 153: +#line 1825 "parse.y" { vararg = FALSE; has_self = FALSE; } break; - case 153: -#line 1817 "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 154: -#line 1828 "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 155: -#line 1839 "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 156: -#line 1850 "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 157: -#line 1860 "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 158: -#line 1870 "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 159: -#line 1880 "parse.y" + case 160: +#line 1889 "parse.y" { has_self = FALSE; } break; - case 160: -#line 1883 "parse.y" + case 161: +#line 1892 "parse.y" { vararg = TRUE; } break; - case 161: -#line 1884 "parse.y" + case 162: +#line 1893 "parse.y" { vararg = FALSE; } break; - case 162: -#line 1887 "parse.y" + case 163: +#line 1896 "parse.y" { ; } break; - case 163: -#line 1888 "parse.y" + case 164: +#line 1897 "parse.y" { ; } break; - case 164: -#line 1891 "parse.y" + case 165: +#line 1900 "parse.y" { - push_funcarg(yyvsp[0].id,NULL); + push_funcarg((yyvsp[0].id),NULL); } break; - case 165: -#line 1894 "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 166: -#line 1897 "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 167: -#line 1905 "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 168: -#line 1915 "parse.y" + case 169: +#line 1924 "parse.y" { ; } break; - case 169: -#line 1916 "parse.y" + case 170: +#line 1925 "parse.y" { ; } break; - case 170: -#line 1919 "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); @@ -3954,82 +3999,82 @@ yyreduce: yyerror(_("parse error")); YYERROR; } - g_free(yyvsp[0].id); + g_free((yyvsp[0].id)); } break; - case 171: -#line 1936 "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 172: -#line 1943 "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 173: -#line 1950 "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 174: -#line 1957 "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 175: -#line 1964 "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 176: -#line 1971 "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 177: -#line 1980 "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; @@ -4037,12 +4082,12 @@ yyreduce: } break; - case 178: -#line 1989 "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; @@ -4050,58 +4095,58 @@ yyreduce: } break; - case 179: -#line 2000 "parse.y" + case 180: +#line 2009 "parse.y" {;} break; - case 180: -#line 2001 "parse.y" + case 181: +#line 2010 "parse.y" {;} break; - case 181: -#line 2004 "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 182: -#line 2024 "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 183: -#line 2034 "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; @@ -4109,12 +4154,12 @@ yyreduce: } break; - case 184: -#line 2043 "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; @@ -4122,26 +4167,26 @@ yyreduce: } break; - case 185: -#line 2054 "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 186: -#line 2057 "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 187: -#line 2062 "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; @@ -4149,12 +4194,12 @@ yyreduce: } break; - case 188: -#line 2071 "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; @@ -4162,48 +4207,48 @@ yyreduce: } break; - case 189: -#line 2082 "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 190: -#line 2085 "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 191: -#line 2091 "parse.y" - { yyval.id = yyvsp[0].id; } + case 192: +#line 2100 "parse.y" + { (yyval.id) = (yyvsp[0].id); } break; - case 192: -#line 2092 "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 193: -#line 2096 "parse.y" - { yyval.id = yyvsp[0].id; } + case 194: +#line 2105 "parse.y" + { (yyval.id) = (yyvsp[0].id); } break; - case 194: -#line 2097 "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 4207 "parse.c" +/* Line 1037 of yacc.c. */ +#line 4252 "y.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -4303,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) @@ -4313,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; @@ -4346,7 +4390,7 @@ yyerrorlab: goto yyerrorlab; #endif - yyvsp -= yylen; +yyvsp -= yylen; yyssp -= yylen; yystate = *yyssp; goto yyerrlab1; @@ -4376,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); @@ -4386,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; @@ -4406,6 +4451,9 @@ yyacceptlab: | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: + yydestruct ("Error: discarding lookahead", + yytoken, &yylval); + yychar = YYEMPTY; yyresult = 1; goto yyreturn; @@ -4428,6 +4476,6 @@ yyreturn: } -#line 2100 "parse.y" +#line 2109 "parse.y"