!(g_list_length(funcargs) == 1 &&
g_list_length(gtktypes) == 2 &&
strcmp(gtktypes->next->data, "NONE")==0)) {
- print_error(TRUE, _("The number of GTK arguments and "
- "function arguments for a signal "
- "don't seem to match"), line_no);
+ error_print(GOB_WARN, line_no,
+ _("The number of GTK arguments and "
+ "function arguments for a signal "
+ "don't seem to match"));
}
if(g_list_length(gtktypes) > 2) {
GList *li;
for(li = gtktypes->next; li; li = li->next) {
if(strcmp(li->data, "NONE")==0) {
- print_error(FALSE,
+ error_print(GOB_ERROR, line_no,
_("NONE can only appear in an "
- "argument list by itself"),
- line_no);
+ "argument list by itself"));
}
}
}
}
static void
-push_self(char *id)
+push_self(char *id, gboolean constant)
{
Node *node;
Node *type;
GList *ch = NULL;
- type = new_type(g_strdup(((Class *)class)->otype), g_strdup("*"), NULL);
+ type = new_type(g_strdup(((Class *)class)->otype),
+ g_strdup(constant ? "const *" : "*"), NULL);
ch = g_list_append(ch,new_check(NULL_CHECK,NULL));
ch = g_list_append(ch,new_check(TYPE_CHECK,NULL));
node = new_funcarg((Type *)type,id,ch);
find_var_or_die(const char *id, int line)
{
GList *li;
- char *s;
for(li = class_nodes; li != NULL; li = li->next) {
Variable *var;
return var;
}
- s = g_strdup_printf(_("Variable %s not defined here"), id);
- print_error(FALSE, s, line);
+ error_printf(GOB_ERROR, line, _("Variable %s not defined here"), id);
g_assert_not_reached();
return NULL;
}
-#line 294 "parse.y"
+#line 293 "parse.y"
typedef union {
char *id;
GString *cbuf;
-#define YYFINAL 256
+#define YYFINAL 263
#define YYFLAG -32768
#define YYNTBASE 50
217, 219, 221, 223, 225, 227, 229, 231, 234, 237,
241, 244, 246, 250, 254, 257, 259, 264, 268, 270,
273, 275, 286, 298, 308, 318, 327, 339, 348, 354,
- 357, 362, 363, 365, 368, 370, 372, 376, 378, 382,
- 384, 388, 390, 393, 397, 404, 412, 415, 417, 419,
- 422, 425, 429, 433, 437, 441, 443, 446
+ 357, 362, 363, 365, 368, 370, 372, 375, 378, 382,
+ 387, 392, 394, 398, 400, 404, 406, 409, 413, 420,
+ 428, 431, 433, 435, 438, 441, 445, 449, 453, 457,
+ 459, 462
};
static const short yyrhs[] = { 52,
19, 39, 81, 40, 79, 77, 0, 19, 39, 19,
40, 77, 0, 19, 80, 0, 19, 80, 19, 80,
0, 0, 87, 0, 37, 23, 0, 6, 0, 19,
- 0, 19, 45, 82, 0, 82, 0, 83, 45, 10,
- 0, 83, 0, 83, 45, 84, 0, 84, 0, 67,
- 19, 0, 67, 19, 22, 0, 67, 19, 39, 19,
- 85, 40, 0, 67, 19, 22, 39, 19, 85, 40,
- 0, 85, 86, 0, 86, 0, 19, 0, 46, 87,
- 0, 47, 87, 0, 46, 42, 87, 0, 47, 42,
- 87, 0, 42, 42, 87, 0, 48, 42, 87, 0,
- 20, 0, 49, 20, 0, 19, 0
+ 0, 19, 5, 0, 5, 19, 0, 19, 45, 82,
+ 0, 19, 5, 45, 82, 0, 5, 19, 45, 82,
+ 0, 82, 0, 83, 45, 10, 0, 83, 0, 83,
+ 45, 84, 0, 84, 0, 67, 19, 0, 67, 19,
+ 22, 0, 67, 19, 39, 19, 85, 40, 0, 67,
+ 19, 22, 39, 19, 85, 40, 0, 85, 86, 0,
+ 86, 0, 19, 0, 46, 87, 0, 47, 87, 0,
+ 46, 42, 87, 0, 47, 42, 87, 0, 42, 42,
+ 87, 0, 48, 42, 87, 0, 20, 0, 49, 20,
+ 0, 19, 0
};
#endif
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 312, 313, 314, 315, 318, 324, 330, 336, 342, 348,
- 356, 357, 360, 365, 372, 377, 378, 386, 397, 398,
- 401, 402, 403, 404, 407, 408, 409, 410, 413, 426,
- 442, 446, 454, 455, 456, 457, 458, 464, 467, 471,
- 506, 534, 604, 613, 619, 620, 623, 626, 632, 636,
- 643, 646, 649, 653, 657, 661, 666, 674, 678, 683,
- 687, 690, 694, 697, 702, 703, 704, 705, 706, 707,
- 708, 709, 710, 713, 714, 715, 718, 719, 720, 724,
- 731, 743, 749, 761, 773, 776, 782, 787, 790, 795,
- 796, 800, 816, 832, 848, 864, 875, 881, 891, 914,
- 925, 944, 950, 951, 957, 958, 969, 979, 982, 983,
- 986, 987, 990, 993, 996, 1004, 1014, 1015, 1018, 1031,
- 1035, 1039, 1043, 1047, 1051, 1057, 1058, 1062
+ 311, 312, 313, 314, 317, 323, 329, 335, 341, 347,
+ 355, 356, 359, 364, 371, 376, 377, 385, 396, 397,
+ 400, 401, 402, 403, 406, 407, 408, 409, 412, 425,
+ 441, 445, 453, 454, 455, 456, 457, 463, 466, 470,
+ 506, 535, 609, 618, 624, 625, 628, 631, 637, 641,
+ 648, 651, 654, 658, 662, 666, 671, 679, 683, 688,
+ 692, 695, 699, 702, 707, 708, 709, 710, 711, 712,
+ 713, 714, 715, 718, 719, 720, 723, 724, 725, 729,
+ 736, 748, 754, 766, 778, 781, 787, 792, 795, 800,
+ 801, 805, 821, 837, 853, 869, 880, 886, 896, 919,
+ 930, 949, 955, 956, 962, 963, 974, 985, 996, 1006,
+ 1016, 1026, 1029, 1030, 1033, 1034, 1037, 1040, 1043, 1051,
+ 1061, 1062, 1065, 1078, 1082, 1086, 1090, 1094, 1098, 1104,
+ 1105, 1109
};
#endif
70, 70, 70, 71, 71, 71, 72, 72, 72, 72,
73, 73, 74, 74, 74, 74, 75, 76, 76, 77,
77, 78, 78, 78, 78, 78, 78, 78, 78, 79,
- 79, 79, 80, 80, 81, 81, 81, 81, 82, 82,
- 83, 83, 84, 84, 84, 84, 85, 85, 86, 86,
- 86, 86, 86, 86, 86, 87, 87, 87
+ 79, 79, 80, 80, 81, 81, 81, 81, 81, 81,
+ 81, 81, 82, 82, 83, 83, 84, 84, 84, 84,
+ 85, 85, 86, 86, 86, 86, 86, 86, 86, 87,
+ 87, 87
};
static const short yyr2[] = { 0,
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, 3, 1, 3, 1,
- 3, 1, 2, 3, 6, 7, 2, 1, 1, 2,
- 2, 3, 3, 3, 3, 1, 2, 1
+ 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, 1,
+ 2, 1
};
static const short yydefact[] = { 0,
45, 0, 0, 56, 0, 0, 78, 79, 57, 0,
0, 0, 81, 0, 85, 0, 0, 0, 0, 0,
0, 37, 0, 0, 36, 35, 0, 0, 0, 0,
- 91, 99, 47, 0, 42, 0, 65, 52, 0, 0,
- 108, 110, 112, 80, 89, 0, 84, 83, 0, 0,
- 0, 0, 29, 0, 0, 0, 128, 126, 0, 0,
- 31, 33, 34, 38, 17, 18, 90, 0, 0, 0,
- 0, 113, 102, 0, 87, 0, 0, 0, 0, 0,
- 30, 39, 102, 32, 127, 43, 0, 102, 107, 114,
- 0, 0, 0, 109, 111, 88, 0, 0, 102, 0,
- 0, 0, 41, 0, 0, 0, 0, 100, 103, 96,
- 102, 0, 0, 0, 98, 0, 94, 0, 119, 0,
- 0, 0, 0, 0, 118, 104, 0, 0, 102, 95,
- 102, 0, 0, 0, 0, 120, 0, 121, 0, 115,
- 117, 101, 92, 0, 0, 40, 116, 124, 122, 123,
- 125, 97, 93, 0, 0, 0
+ 91, 99, 47, 0, 42, 0, 0, 65, 52, 0,
+ 0, 112, 114, 116, 80, 89, 0, 84, 83, 0,
+ 0, 0, 0, 29, 0, 0, 0, 132, 130, 0,
+ 0, 31, 33, 34, 38, 17, 18, 90, 0, 0,
+ 0, 53, 54, 0, 117, 102, 0, 87, 0, 0,
+ 0, 0, 0, 30, 39, 102, 32, 131, 43, 0,
+ 102, 0, 0, 109, 118, 0, 0, 0, 113, 115,
+ 88, 0, 0, 102, 0, 0, 0, 41, 0, 111,
+ 110, 0, 0, 0, 100, 103, 96, 102, 0, 0,
+ 0, 98, 0, 94, 0, 123, 0, 0, 0, 0,
+ 0, 122, 104, 0, 0, 102, 95, 102, 0, 0,
+ 0, 0, 124, 0, 125, 0, 119, 121, 101, 92,
+ 0, 0, 40, 120, 128, 126, 127, 129, 97, 93,
+ 0, 0, 0
};
-static const short yydefgoto[] = { 254,
+static const short yydefgoto[] = { 261,
8, 9, 10, 11, 69, 30, 31, 32, 125, 126,
- 127, 33, 34, 74, 39, 72, 139, 57, 58, 59,
- 60, 85, 91, 92, 93, 146, 132, 35, 193, 208,
- 140, 141, 142, 143, 224, 225, 209
+ 127, 33, 34, 74, 39, 72, 140, 57, 58, 59,
+ 60, 85, 91, 92, 93, 147, 132, 35, 198, 215,
+ 141, 142, 143, 144, 231, 232, 216
};
-static const short yypact[] = { 174,
- -1,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 174, 221,
- -14, 38,-32768, 221, 221, 175, 23, 221, 29,-32768,
--32768,-32768,-32768, 39, 157, 39, 41,-32768,-32768, 193,
--32768, 112,-32768,-32768,-32768, 57, 72, 81, 84, 263,
+static const short yypact[] = { 88,
+ -12,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 88, 347,
+ -15, 15,-32768, 347, 347, 157, 18, 347, 7,-32768,
+-32768,-32768,-32768, 25, 153, 25, 36,-32768,-32768, 175,
+-32768, 118,-32768,-32768,-32768, 67, 102, 122, 135, 245,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768, 99, 314, 280, 89, 90,-32768, 328, 117,
- 161, 116,-32768,-32768, 280, 39, 119, 123,-32768, 104,
- 105, 114, 118, 133, 342,-32768,-32768, 137,-32768, 342,
--32768, 139, 128, 5,-32768, 342,-32768, 176, 211, 160,
--32768, 280,-32768, 142, 164, 165, 67, 6, 17, 81,
--32768, 166, 177,-32768, 156, 297, 90,-32768,-32768, 178,
- 184, 195,-32768, 31,-32768, 196, 280, 179, 31, 280,
- -2, -15, 297, 44, 190, 200, 180, 197, 198, 210,
--32768,-32768,-32768, 280, 183, 297, 199, 3, 216, 226,
--32768, 191,-32768,-32768,-32768, 42,-32768,-32768, 234, 264,
- 297, 271,-32768, 277, 266, 281,-32768,-32768, 294, 302,
--32768,-32768,-32768,-32768,-32768,-32768,-32768, 283, 301, 296,
- 280, 51, 318, 246,-32768, 319, 297, 311, 312, 322,
--32768,-32768, 318,-32768,-32768,-32768, -3, 318,-32768, 323,
- 332, 46, 17,-32768,-32768,-32768, 324, 297, 318, 297,
- 17, 329,-32768, 17, 346, 93, 344, 349,-32768,-32768,
- 318, 330, 17, 331,-32768, 350,-32768, 93,-32768, 327,
- 52, 65, 333, 103,-32768,-32768, 46, 17, 318,-32768,
- 318, 335, 113, 56, 56,-32768, 56,-32768, 56,-32768,
--32768,-32768,-32768, 17, 17,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768, 372, 374,-32768
+-32768,-32768, 22, 313, 262, 144, 131,-32768, 327, 160,
+ 198, 159,-32768,-32768, 262, 25, 162, 180,-32768, 161,
+ 171, 178, 164, 181, 341,-32768,-32768, 183,-32768, 341,
+-32768, 196, 182, 8,-32768, 341,-32768, 214, 193, 201,
+-32768, 262,-32768, 186, 212, 229, 48, 62, 57, 122,
+-32768, 236, 246,-32768, 233, 279, 131,-32768,-32768, 243,
+ 270, 280,-32768, 50,-32768, 287, 262, 277, 50, 262,
+ -1, 9, 279, -5, 278, 302, 281, 283, 295, 314,
+-32768,-32768,-32768, 262, 299, 279, 296, 309, 0, 331,
+ 311,-32768, 316,-32768,-32768,-32768, 98,-32768,-32768, 324,
+ 345, 279, 346,-32768, 344, 335, 328,-32768,-32768, 354,
+ 358,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 339, 357,
+ 342, 104, 105, 262, 38, 362, 228,-32768, 364, 279,
+ 348, 349, 352,-32768,-32768, 362,-32768,-32768,-32768, 16,
+ 362, 262, 262,-32768, 353, 365, 10, 57,-32768,-32768,
+-32768, 350, 279, 362, 279, 57, 356,-32768, 57,-32768,
+-32768, 366, 109, 363, 369,-32768,-32768, 362, 355, 57,
+ 359,-32768, 371,-32768, 109,-32768, 360, 43, 53, 361,
+ 61,-32768,-32768, 10, 57, 362,-32768, 362, 367, 100,
+ 6, 6,-32768, 6,-32768, 6,-32768,-32768,-32768,-32768,
+ 57, 57,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ 396, 397,-32768
};
static const short yypgoto[] = {-32768,
- 13, 78, 368,-32768,-32768,-32768, 348, -22, 253, 255,
- 259,-32768,-32768,-32768, -20, 282, -18,-32768, -35,-32768,
- 343, -73, 288,-32768, -57,-32768, -192,-32768, -170, 158,
- -121, 215,-32768, 213, 170, -164, -124
+ 351, 163, 389,-32768,-32768,-32768, 370, -18, 275, 282,
+ 284,-32768,-32768,-32768, -16, 304, -24,-32768, -38,-32768,
+ -37, -10, 315,-32768, -36,-32768, -186,-32768, -180, 176,
+ -119, 4,-32768, 232, 187, -152, -124
};
-#define YYLAST 388
-
-
-static const short yytable[] = { 161,
- 210, 156, 55, 121, 77, 61, 56, 79, 215, 107,
- 108, 217, 201, 67, 170, 202, 153, 204, 81, 12,
- 230, 13, 16, 87, 128, 129, 124, 13, 213, 179,
- 13, 113, 115, 144, 154, 243, 82, 203, 90, 77,
- 228, 17, -106, 36, 77, 96, 95, 171, 84, 110,
- 77, 252, 253, 130, 147, 197, 148, 131, 244, 241,
- 245, 113, 157, 158, 157, 158, 112, 37, 241, 111,
- 157, 158, 190, 116, 157, 158, 212, 38, 214, 62,
- 159, 175, 207, 157, 158, 121, 176, 15, 122, 191,
- 70, 18, 160, 235, 160, 68, 236, 238, 150, 71,
- 160, 152, 73, 79, 160, 123, 237, 83, 124, 248,
- 249, 219, 250, 160, 251, 168, 40, 41, 42, 43,
- 44, 219, 45, 46, 47, 48, 49, 50, 51, 52,
- 53, 219, 54, 84, 220, 88, 94, 97, 221, 222,
- 223, 98, 240, 99, 220, 65, 66, 100, 221, 222,
- 223, 103, 247, 101, 220, 104, 102, 105, 221, 222,
- 223, 40, 41, 42, 43, 44, 106, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 1, 54, 114, 89,
- 109, 117, 118, 119, 134, 20, 21, 22, 23, 20,
- 21, 22, 23, 19, 136, 135, 2, 3, 4, 5,
- 6, 7, 145, 20, 21, 22, 23, 24, 25, 26,
- 27, 19, 28, 110, 149, 29, 111, 151, 121, 169,
- 164, 20, 21, 22, 23, 24, 25, 26, 27, 110,
- 63, 124, 167, 29, 172, 174, 165, 166, -105, 20,
- 21, 22, 23, 2, 3, 4, 5, 6, 7, 111,
- 40, 41, 42, 43, 44, 194, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 173, 54, 75, 41, 42,
- 43, 44, 177, 45, 46, 47, 48, 49, 50, 51,
- 52, 76, 178, 54, 40, 41, 42, 43, 44, 180,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 181,
- 54, 40, 137, 42, 43, 44, 182, 45, 46, 47,
- 48, 49, 50, 51, 52, 138, 184, 54, 80, 41,
- 183, 185, 186, 187, 45, 46, 47, 48, 49, 50,
- 51, 52, 86, 41, 54, 188, 192, 196, 45, 46,
- 47, 48, 49, 50, 51, 52, 75, 41, 54, 198,
- 206, 199, 45, 46, 47, 48, 49, 50, 51, 52,
- 200, 205, 54, 211, 218, 216, 226, 227, 234, 229,
- 231, 255, 232, 256, 239, 246, 14, 64, 163, 162,
- 155, 133, 78, 120, 242, 189, 195, 233
+#define YYLAST 412
+
+
+static const short yytable[] = { 162,
+ 56, 77, 78, 157, 173, 206, 55, 67, 12, 61,
+ 209, 217, 107, 158, 159, 81, 171, 154, 17, 222,
+ 87, 16, 224, 220, 158, 159, 79, 121, 158, 159,
+ 82, 160, 182, 237, 207, 155, 77, 235, 36, -106,
+ 95, 77, 90, 161, 174, 37, 214, 77, 250, 96,
+ 124, 84, 113, 115, 161, 251, 208, 252, 161, 195,
+ 202, 158, 159, 38, 259, 260, 121, 116, 110, 122,
+ 112, 158, 159, 108, 62, 148, 196, 149, 248, 226,
+ 128, 129, 113, 219, 242, 221, 123, 248, 111, 124,
+ 1, 161, 151, 130, 244, 153, 145, 131, 77, 78,
+ 247, 161, 227, 243, 245, 68, 228, 229, 230, 169,
+ 2, 3, 4, 5, 6, 7, 255, 256, 226, 257,
+ 70, 258, 40, 41, 42, 43, 44, 226, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 178, 54, 254,
+ 71, 227, 179, -108, -107, 228, 229, 230, 192, 193,
+ 227, 65, 66, 73, 228, 229, 230, 40, 41, 42,
+ 43, 44, 83, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 15, 54, 84, 19, 18, 194, 88, 94,
+ 97, 20, 21, 22, 23, 20, 21, 22, 23, 24,
+ 25, 26, 27, 19, 28, 210, 211, 29, 98, 103,
+ 99, 104, 102, 20, 21, 22, 23, 24, 25, 26,
+ 27, 110, 63, 100, 105, 29, 89, 101, 109, 114,
+ 106, 20, 21, 22, 23, 117, 20, 21, 22, 23,
+ 118, 111, 40, 41, 42, 43, 44, 199, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 119, 54, 75,
+ 41, 42, 43, 44, 134, 45, 46, 47, 48, 49,
+ 50, 51, 52, 76, 135, 54, 40, 41, 42, 43,
+ 44, 136, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 111, 54, 137, 138, 42, 43, 44, 146, 45,
+ 46, 47, 48, 49, 50, 51, 52, 139, 110, 54,
+ 75, 41, 42, 43, 44, 150, 45, 46, 47, 48,
+ 49, 50, 51, 52, 172, 152, 54, 80, 41, 124,
+ 121, 165, 166, 45, 46, 47, 48, 49, 50, 51,
+ 52, 86, 41, 54, 167, 170, 168, 45, 46, 47,
+ 48, 49, 50, 51, 52, 75, 41, 54, -105, 175,
+ 176, 45, 46, 47, 48, 49, 50, 51, 52, 13,
+ 177, 54, 180, 181, 183, 13, 184, 186, 13, 2,
+ 3, 4, 5, 6, 7, 185, 187, 188, 189, 190,
+ 197, 191, 201, 213, 225, 233, 203, 234, 204, 218,
+ 205, 212, 223, 239, 236, 262, 263, 14, 238, 64,
+ 164, 241, 246, 133, 0, 156, 163, 253, 200, 249,
+ 120, 240
};
static const short yycheck[] = { 124,
- 193, 123, 25, 19, 40, 26, 25, 5, 201, 5,
- 84, 204, 183, 32, 136, 19, 19, 188, 54, 21,
- 213, 9, 37, 59, 19, 20, 42, 15, 199, 151,
- 18, 89, 90, 107, 37, 228, 55, 41, 61, 75,
- 211, 4, 40, 21, 80, 66, 65, 45, 44, 19,
- 86, 244, 245, 37, 112, 177, 114, 41, 229, 224,
- 231, 119, 19, 20, 19, 20, 89, 39, 233, 39,
- 19, 20, 22, 92, 19, 20, 198, 39, 200, 39,
- 37, 40, 37, 19, 20, 19, 45, 10, 22, 39,
- 19, 14, 49, 42, 49, 39, 221, 222, 117, 19,
- 49, 120, 19, 5, 49, 39, 42, 19, 42, 234,
- 235, 19, 237, 49, 239, 134, 5, 6, 7, 8,
- 9, 19, 11, 12, 13, 14, 15, 16, 17, 18,
- 19, 19, 21, 44, 42, 19, 21, 19, 46, 47,
- 48, 19, 40, 40, 42, 34, 35, 43, 46, 47,
- 48, 19, 40, 40, 42, 19, 39, 19, 46, 47,
- 48, 5, 6, 7, 8, 9, 39, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 3, 21, 19, 19,
- 5, 40, 19, 19, 19, 29, 30, 31, 32, 29,
- 30, 31, 32, 19, 39, 19, 23, 24, 25, 26,
- 27, 28, 19, 29, 30, 31, 32, 33, 34, 35,
- 36, 19, 38, 19, 19, 41, 39, 39, 19, 37,
- 41, 29, 30, 31, 32, 33, 34, 35, 36, 19,
- 38, 42, 23, 41, 19, 45, 40, 40, 40, 29,
- 30, 31, 32, 23, 24, 25, 26, 27, 28, 39,
- 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 40, 21, 5, 6, 7,
- 8, 9, 39, 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, 23,
- 21, 5, 6, 7, 8, 9, 41, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 23, 21, 5, 6,
- 40, 20, 40, 23, 11, 12, 13, 14, 15, 16,
- 17, 18, 5, 6, 21, 40, 19, 19, 11, 12,
- 13, 14, 15, 16, 17, 18, 5, 6, 21, 39,
- 19, 40, 11, 12, 13, 14, 15, 16, 17, 18,
- 39, 39, 21, 40, 19, 37, 23, 19, 42, 40,
- 40, 0, 23, 0, 42, 41, 9, 30, 126, 125,
- 122, 100, 40, 96, 227, 171, 174, 218
+ 25, 40, 40, 123, 5, 186, 25, 32, 21, 26,
+ 191, 198, 5, 19, 20, 54, 136, 19, 4, 206,
+ 59, 37, 209, 204, 19, 20, 5, 19, 19, 20,
+ 55, 37, 152, 220, 19, 37, 75, 218, 21, 40,
+ 65, 80, 61, 49, 45, 39, 37, 86, 235, 66,
+ 42, 44, 89, 90, 49, 236, 41, 238, 49, 22,
+ 180, 19, 20, 39, 251, 252, 19, 92, 19, 22,
+ 89, 19, 20, 84, 39, 112, 39, 114, 231, 19,
+ 19, 20, 119, 203, 42, 205, 39, 240, 39, 42,
+ 3, 49, 117, 37, 42, 120, 107, 41, 137, 137,
+ 40, 49, 42, 228, 229, 39, 46, 47, 48, 134,
+ 23, 24, 25, 26, 27, 28, 241, 242, 19, 244,
+ 19, 246, 5, 6, 7, 8, 9, 19, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 40, 21, 40,
+ 19, 42, 45, 40, 40, 46, 47, 48, 45, 45,
+ 42, 34, 35, 19, 46, 47, 48, 5, 6, 7,
+ 8, 9, 19, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 10, 21, 44, 19, 14, 174, 19, 21,
+ 19, 29, 30, 31, 32, 29, 30, 31, 32, 33,
+ 34, 35, 36, 19, 38, 192, 193, 41, 19, 19,
+ 40, 19, 39, 29, 30, 31, 32, 33, 34, 35,
+ 36, 19, 38, 43, 19, 41, 19, 40, 5, 19,
+ 39, 29, 30, 31, 32, 40, 29, 30, 31, 32,
+ 19, 39, 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, 19, 21, 5, 6, 7, 8,
+ 9, 39, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, 39, 21, 5, 6, 7, 8, 9, 19, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 19, 21,
+ 5, 6, 7, 8, 9, 19, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 39, 21, 5, 6, 42,
+ 19, 41, 40, 11, 12, 13, 14, 15, 16, 17,
+ 18, 5, 6, 21, 40, 37, 23, 11, 12, 13,
+ 14, 15, 16, 17, 18, 5, 6, 21, 40, 19,
+ 40, 11, 12, 13, 14, 15, 16, 17, 18, 9,
+ 45, 21, 39, 19, 19, 15, 23, 40, 18, 23,
+ 24, 25, 26, 27, 28, 41, 23, 20, 40, 23,
+ 19, 40, 19, 19, 19, 23, 39, 19, 40, 40,
+ 39, 39, 37, 23, 40, 0, 0, 9, 40, 30,
+ 126, 42, 42, 100, -1, 122, 125, 41, 177, 234,
+ 96, 225
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/lib/bison.simple"
switch (yyn) {
case 1:
-#line 312 "parse.y"
+#line 311 "parse.y"
{ ; ;
break;}
case 2:
-#line 313 "parse.y"
+#line 312 "parse.y"
{ ; ;
break;}
case 3:
-#line 314 "parse.y"
+#line 313 "parse.y"
{ ; ;
break;}
case 4:
-#line 315 "parse.y"
+#line 314 "parse.y"
{ ; ;
break;}
case 5:
-#line 318 "parse.y"
+#line 317 "parse.y"
{
Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 6:
-#line 324 "parse.y"
+#line 323 "parse.y"
{
Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 7:
-#line 330 "parse.y"
+#line 329 "parse.y"
{
Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 8:
-#line 336 "parse.y"
+#line 335 "parse.y"
{
Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 9:
-#line 342 "parse.y"
+#line 341 "parse.y"
{
Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 10:
-#line 348 "parse.y"
+#line 347 "parse.y"
{
Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 11:
-#line 356 "parse.y"
+#line 355 "parse.y"
{ ; ;
break;}
case 12:
-#line 357 "parse.y"
+#line 356 "parse.y"
{ ; ;
break;}
case 13:
-#line 360 "parse.y"
+#line 359 "parse.y"
{
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
;
break;}
case 14:
-#line 365 "parse.y"
+#line 364 "parse.y"
{
((Class *)class)->nodes = NULL;
class_nodes = NULL;
;
break;}
case 15:
-#line 372 "parse.y"
+#line 371 "parse.y"
{
class = new_class(yyvsp[-3].id,yyvsp[-1].id,chunk_size,NULL);
;
break;}
case 17:
-#line 378 "parse.y"
+#line 377 "parse.y"
{
if(strcmp(yyvsp[-2].id,"chunks") == 0) {
chunk_size = g_strdup(yyvsp[0].id);
;
break;}
case 18:
-#line 386 "parse.y"
+#line 385 "parse.y"
{
if(strcmp(yyvsp[-2].id,"chunks") == 0) {
if(atoi(yyvsp[0].id) != 0)
;
break;}
case 19:
-#line 397 "parse.y"
+#line 396 "parse.y"
{ ; ;
break;}
case 20:
-#line 398 "parse.y"
+#line 397 "parse.y"
{ ; ;
break;}
case 21:
-#line 401 "parse.y"
+#line 400 "parse.y"
{ ; ;
break;}
case 22:
-#line 402 "parse.y"
+#line 401 "parse.y"
{ ; ;
break;}
case 23:
-#line 403 "parse.y"
+#line 402 "parse.y"
{ ; ;
break;}
case 24:
-#line 404 "parse.y"
+#line 403 "parse.y"
{ ; ;
break;}
case 25:
-#line 407 "parse.y"
+#line 406 "parse.y"
{ the_scope = PUBLIC_SCOPE; ;
break;}
case 26:
-#line 408 "parse.y"
+#line 407 "parse.y"
{ the_scope = PRIVATE_SCOPE; ;
break;}
case 27:
-#line 409 "parse.y"
+#line 408 "parse.y"
{ the_scope = PROTECTED_SCOPE; ;
break;}
case 28:
-#line 410 "parse.y"
+#line 409 "parse.y"
{ the_scope = CLASS_SCOPE; ;
break;}
case 29:
-#line 413 "parse.y"
+#line 412 "parse.y"
{
if(strcmp(yyvsp[-1].id, "destroywith")==0) {
g_free(yyvsp[-1].id);
;
break;}
case 30:
-#line 426 "parse.y"
+#line 425 "parse.y"
{
if(strcmp(yyvsp[-2].id, "destroy")==0) {
g_free(yyvsp[-2].id);
;
break;}
case 31:
-#line 442 "parse.y"
+#line 441 "parse.y"
{
initializer = yyvsp[0].id;
initializer_line = ccode_line;
;
break;}
case 32:
-#line 446 "parse.y"
+#line 445 "parse.y"
{
initializer = (yyvsp[0].cbuf)->str;
initializer_line = ccode_line;
;
break;}
case 33:
-#line 454 "parse.y"
+#line 453 "parse.y"
{ ; ;
break;}
case 34:
-#line 455 "parse.y"
+#line 454 "parse.y"
{ ; ;
break;}
case 35:
-#line 456 "parse.y"
+#line 455 "parse.y"
{ destructor = NULL; ;
break;}
case 36:
-#line 457 "parse.y"
+#line 456 "parse.y"
{ initializer = NULL; ;
break;}
case 37:
-#line 458 "parse.y"
+#line 457 "parse.y"
{
destructor = NULL;
initializer = NULL;
;
break;}
case 38:
-#line 464 "parse.y"
+#line 463 "parse.y"
{
push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL);
;
break;}
case 39:
-#line 467 "parse.y"
+#line 466 "parse.y"
{
push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
;
break;}
case 40:
-#line 471 "parse.y"
+#line 470 "parse.y"
{
if(strcmp(yyvsp[-6].id,"get")==0 &&
strcmp(yyvsp[-3].id,"set")==0) {
g_free(yyvsp[-8].id); g_free(yyvsp[-7].id);
g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
g_list_foreach(yyvsp[-9].list,(GFunc)g_free,NULL);
+ g_list_free(yyvsp[-9].list);
g_string_free(yyvsp[-1].cbuf,TRUE);
g_string_free(yyvsp[-4].cbuf,TRUE);
yyerror(_("parse error"));
case 41:
#line 506 "parse.y"
{
- if(strcmp(yyvsp[-3].id,"get")==0) {
+ if(strcmp(yyvsp[-3].id, "get") == 0) {
Node *node;
Type *type = pop_type();
g_free(yyvsp[-3].id);
- node = new_argument(yyvsp[-5].id,type,yyvsp[-6].list,yyvsp[-4].id,
- (yyvsp[-1].cbuf)->str,yyvsp[-2].line,
- NULL,0, yyvsp[-7].line);
- g_string_free(yyvsp[-1].cbuf,FALSE);
- class_nodes = g_list_append(class_nodes,node);
- } else if(strcmp(yyvsp[-3].id,"set")==0) {
+ node = new_argument(yyvsp[-5].id, type, yyvsp[-6].list, yyvsp[-4].id,
+ (yyvsp[-1].cbuf)->str, yyvsp[-2].line,
+ NULL, 0, yyvsp[-7].line);
+ g_string_free(yyvsp[-1].cbuf, FALSE);
+ class_nodes = g_list_append(class_nodes, node);
+ } else if(strcmp(yyvsp[-3].id, "set") == 0) {
Node *node;
Type *type = pop_type();
g_free(yyvsp[-3].id);
- node = new_argument(yyvsp[-5].id,type,yyvsp[-6].list,yyvsp[-4].id,
- NULL,0,(yyvsp[-1].cbuf)->str,
+ node = new_argument(yyvsp[-5].id, type, yyvsp[-6].list, yyvsp[-4].id,
+ NULL, 0, (yyvsp[-1].cbuf)->str,
yyvsp[-2].line, yyvsp[-7].line);
- g_string_free(yyvsp[-1].cbuf,FALSE);
- class_nodes = g_list_append(class_nodes,node);
+ g_string_free(yyvsp[-1].cbuf, FALSE);
+ class_nodes = g_list_append(class_nodes, node);
} else {
g_free(yyvsp[-3].id); g_free(yyvsp[-5].id);
g_free(yyvsp[-4].id);
- g_list_foreach(yyvsp[-6].list,(GFunc)g_free,NULL);
- g_string_free(yyvsp[-1].cbuf,TRUE);
+ g_list_foreach(yyvsp[-6].list, (GFunc)g_free, NULL);
+ g_list_free(yyvsp[-6].list);
+ g_string_free(yyvsp[-1].cbuf, TRUE);
yyerror(_("parse error"));
YYERROR;
}
;
break;}
case 42:
-#line 534 "parse.y"
+#line 535 "parse.y"
{
Node *node;
char *get, *set = NULL;
g_free(yyvsp[0].id); g_free(yyvsp[-2].id);
g_free(yyvsp[-1].id);
g_list_foreach(yyvsp[-3].list,(GFunc)g_free,NULL);
+ g_list_free(yyvsp[-3].list);
yyerror(_("parse error"));
YYERROR;
}
var = find_var_or_die(yyvsp[-1].id, yyvsp[-4].line);
if(var->scope == PRIVATE_SCOPE)
root = "self->_priv";
- else if(var->scope == CLASS_SCOPE)
- root = "SELF_CLASS(GTK_OBJECT(self)->klass)";
- else
+ else if(var->scope == CLASS_SCOPE) {
+ root = "SELF_GET_CLASS(self)";
+ if(no_self_alias)
+ error_print(GOB_ERROR, yyvsp[-4].line,
+ _("Self aliases needed when autolinking to a classwide member"));
+ } else
root = "self";
if(strcmp(yyvsp[0].id, "link")==0) {
;
break;}
case 43:
-#line 604 "parse.y"
+#line 609 "parse.y"
{
if(strcmp(yyvsp[-2].id,"type")!=0) {
g_free(yyvsp[-4].id);
;
break;}
case 44:
-#line 613 "parse.y"
+#line 618 "parse.y"
{
yyval.id = yyvsp[0].id;
typestack = g_list_prepend(typestack,NULL);
;
break;}
case 45:
-#line 619 "parse.y"
+#line 624 "parse.y"
{ yyval.list = yyvsp[-1].list; ;
break;}
case 46:
-#line 620 "parse.y"
+#line 625 "parse.y"
{ yyval.list = NULL; ;
break;}
case 47:
-#line 623 "parse.y"
+#line 628 "parse.y"
{
yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
case 48:
-#line 626 "parse.y"
+#line 631 "parse.y"
{
yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
case 49:
-#line 632 "parse.y"
+#line 637 "parse.y"
{
Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL);
typestack = g_list_prepend(typestack,node);
;
break;}
case 50:
-#line 636 "parse.y"
+#line 641 "parse.y"
{
Node *node = new_type(yyvsp[0].id, NULL, NULL);
typestack = g_list_prepend(typestack,node);
;
break;}
case 51:
-#line 643 "parse.y"
+#line 648 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
case 52:
-#line 646 "parse.y"
+#line 651 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
case 53:
-#line 649 "parse.y"
+#line 654 "parse.y"
{
yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
g_free(yyvsp[0].id);
;
break;}
case 54:
-#line 653 "parse.y"
+#line 658 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
g_free(yyvsp[-1].id);
;
break;}
case 55:
-#line 657 "parse.y"
+#line 662 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
g_free(yyvsp[0].id);
;
break;}
case 56:
-#line 661 "parse.y"
+#line 666 "parse.y"
{
yyval.id = g_strconcat("const ", yyvsp[-1].id, " ",
yyvsp[0].id, NULL);
;
break;}
case 57:
-#line 666 "parse.y"
+#line 671 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-2].id, " ",
yyvsp[-1].id, " const", NULL);
;
break;}
case 58:
-#line 674 "parse.y"
+#line 679 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
g_free(yyvsp[0].id);
;
break;}
case 59:
-#line 678 "parse.y"
+#line 683 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
g_free(yyvsp[-1].id);
;
break;}
case 60:
-#line 683 "parse.y"
+#line 688 "parse.y"
{
yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
g_free(yyvsp[0].id);
;
break;}
case 61:
-#line 687 "parse.y"
+#line 692 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
case 62:
-#line 690 "parse.y"
+#line 695 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
g_free(yyvsp[-1].id);
;
break;}
case 63:
-#line 694 "parse.y"
+#line 699 "parse.y"
{
yyval.id = g_strdup(yyvsp[0].id);
;
break;}
case 64:
-#line 697 "parse.y"
+#line 702 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
;
break;}
case 65:
-#line 702 "parse.y"
+#line 707 "parse.y"
{ yyval.id = "void"; ;
break;}
case 66:
-#line 703 "parse.y"
+#line 708 "parse.y"
{ yyval.id = "char"; ;
break;}
case 67:
-#line 704 "parse.y"
+#line 709 "parse.y"
{ yyval.id = "short"; ;
break;}
case 68:
-#line 705 "parse.y"
+#line 710 "parse.y"
{ yyval.id = "int"; ;
break;}
case 69:
-#line 706 "parse.y"
+#line 711 "parse.y"
{ yyval.id = "long"; ;
break;}
case 70:
-#line 707 "parse.y"
+#line 712 "parse.y"
{ yyval.id = "float"; ;
break;}
case 71:
-#line 708 "parse.y"
+#line 713 "parse.y"
{ yyval.id = "double"; ;
break;}
case 72:
-#line 709 "parse.y"
+#line 714 "parse.y"
{ yyval.id = "signed"; ;
break;}
case 73:
-#line 710 "parse.y"
+#line 715 "parse.y"
{ yyval.id = "unsigned"; ;
break;}
case 74:
-#line 713 "parse.y"
+#line 718 "parse.y"
{ yyval.id = "struct"; ;
break;}
case 75:
-#line 714 "parse.y"
+#line 719 "parse.y"
{ yyval.id = "union"; ;
break;}
case 76:
-#line 715 "parse.y"
+#line 720 "parse.y"
{ yyval.id = "enum"; ;
break;}
case 77:
-#line 718 "parse.y"
+#line 723 "parse.y"
{ yyval.id = g_strdup("*"); ;
break;}
case 78:
-#line 719 "parse.y"
+#line 724 "parse.y"
{ yyval.id = g_strdup("* const"); ;
break;}
case 79:
-#line 720 "parse.y"
+#line 725 "parse.y"
{
yyval.id = g_strconcat("*", yyvsp[0].id, NULL);
g_free(yyvsp[0].id);
;
break;}
case 80:
-#line 724 "parse.y"
+#line 729 "parse.y"
{
yyval.id = g_strconcat("* const", yyvsp[0].id, NULL);
g_free(yyvsp[0].id);
;
break;}
case 81:
-#line 731 "parse.y"
+#line 736 "parse.y"
{
if(strcmp(yyvsp[-1].id, "first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
;
break;}
case 82:
-#line 743 "parse.y"
+#line 748 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
case 83:
-#line 749 "parse.y"
+#line 754 "parse.y"
{
if(strcmp(yyvsp[-1].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
;
break;}
case 84:
-#line 761 "parse.y"
+#line 766 "parse.y"
{
if(strcmp(yyvsp[-2].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
;
break;}
case 85:
-#line 773 "parse.y"
+#line 778 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
case 86:
-#line 776 "parse.y"
+#line 781 "parse.y"
{
/* the_scope was default thus public */
the_scope = PUBLIC_SCOPE;
;
break;}
case 87:
-#line 782 "parse.y"
+#line 787 "parse.y"
{
gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id);
;
break;}
case 88:
-#line 787 "parse.y"
+#line 792 "parse.y"
{
gtktypes = g_list_append(gtktypes, yyvsp[0].id);
;
break;}
case 89:
-#line 790 "parse.y"
+#line 795 "parse.y"
{
gtktypes = g_list_append(gtktypes, yyvsp[0].id);
;
break;}
case 90:
-#line 795 "parse.y"
+#line 800 "parse.y"
{ yyval.cbuf = yyvsp[0].cbuf; ;
break;}
case 91:
-#line 796 "parse.y"
+#line 801 "parse.y"
{ yyval.cbuf = NULL; ;
break;}
case 92:
-#line 800 "parse.y"
+#line 805 "parse.y"
{
if(!has_self) {
yyerror(_("signal without 'self' as "
;
break;}
case 93:
-#line 816 "parse.y"
+#line 821 "parse.y"
{
if(!has_self) {
yyerror(_("signal without 'self' as "
;
break;}
case 94:
-#line 832 "parse.y"
+#line 837 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
;
break;}
case 95:
-#line 848 "parse.y"
+#line 853 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
;
break;}
case 96:
-#line 864 "parse.y"
+#line 869 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
;
break;}
case 97:
-#line 875 "parse.y"
+#line 880 "parse.y"
{
push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id,
yyvsp[-5].id, yyvsp[0].cbuf,
;
break;}
case 98:
-#line 881 "parse.y"
+#line 886 "parse.y"
{
if(the_scope == CLASS_SCOPE) {
yyerror(_("a method cannot be of class scope"));
;
break;}
case 99:
-#line 891 "parse.y"
+#line 896 "parse.y"
{
if(strcmp(yyvsp[-4].id, "init")==0) {
push_init_arg(yyvsp[-2].id,FALSE);
;
break;}
case 100:
-#line 914 "parse.y"
+#line 919 "parse.y"
{
g_free(onerror); onerror = NULL;
g_free(defreturn); defreturn = NULL;
;
break;}
case 101:
-#line 925 "parse.y"
+#line 930 "parse.y"
{
g_free(onerror); onerror = NULL;
g_free(defreturn); defreturn = NULL;
;
break;}
case 102:
-#line 944 "parse.y"
+#line 949 "parse.y"
{
g_free(onerror); onerror = NULL;
g_free(defreturn); defreturn = NULL;
;
break;}
case 103:
-#line 950 "parse.y"
+#line 955 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
case 104:
-#line 951 "parse.y"
+#line 956 "parse.y"
{
yyval.id = (yyvsp[1].cbuf)->str;
g_string_free(yyvsp[1].cbuf, FALSE);
;
break;}
case 105:
-#line 957 "parse.y"
+#line 962 "parse.y"
{ vararg = FALSE; has_self = FALSE; ;
break;}
case 106:
-#line 958 "parse.y"
+#line 963 "parse.y"
{
vararg = FALSE;
has_self = TRUE;
if(strcmp(yyvsp[0].id,"self")==0)
- push_self(yyvsp[0].id);
+ push_self(yyvsp[0].id, FALSE);
else {
g_free(yyvsp[0].id);
yyerror(_("parse error"));
;
break;}
case 107:
-#line 969 "parse.y"
+#line 974 "parse.y"
+{
+ vararg = FALSE;
+ has_self = TRUE;
+ if(strcmp(yyvsp[-1].id,"self")==0)
+ push_self(yyvsp[-1].id, TRUE);
+ else {
+ g_free(yyvsp[-1].id);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ ;
+ break;}
+case 108:
+#line 985 "parse.y"
+{
+ vararg = FALSE;
+ has_self = TRUE;
+ if(strcmp(yyvsp[0].id,"self")==0)
+ push_self(yyvsp[0].id, TRUE);
+ else {
+ g_free(yyvsp[0].id);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ ;
+ break;}
+case 109:
+#line 996 "parse.y"
{
has_self = TRUE;
if(strcmp(yyvsp[-2].id,"self")==0)
- push_self(yyvsp[-2].id);
+ push_self(yyvsp[-2].id, FALSE);
else {
g_free(yyvsp[-2].id);
yyerror(_("parse error"));
}
;
break;}
-case 108:
-#line 979 "parse.y"
+case 110:
+#line 1006 "parse.y"
+{
+ has_self = TRUE;
+ if(strcmp(yyvsp[-3].id,"self")==0)
+ push_self(yyvsp[-3].id, TRUE);
+ else {
+ g_free(yyvsp[-3].id);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ ;
+ break;}
+case 111:
+#line 1016 "parse.y"
+{
+ has_self = TRUE;
+ if(strcmp(yyvsp[-2].id,"self")==0)
+ push_self(yyvsp[-2].id, TRUE);
+ else {
+ g_free(yyvsp[-2].id);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ ;
+ break;}
+case 112:
+#line 1026 "parse.y"
{ has_self = FALSE; ;
break;}
-case 109:
-#line 982 "parse.y"
+case 113:
+#line 1029 "parse.y"
{ vararg = TRUE; ;
break;}
-case 110:
-#line 983 "parse.y"
+case 114:
+#line 1030 "parse.y"
{ vararg = FALSE; ;
break;}
-case 111:
-#line 986 "parse.y"
+case 115:
+#line 1033 "parse.y"
{ ; ;
break;}
-case 112:
-#line 987 "parse.y"
+case 116:
+#line 1034 "parse.y"
{ ; ;
break;}
-case 113:
-#line 990 "parse.y"
+case 117:
+#line 1037 "parse.y"
{
push_funcarg(yyvsp[0].id,NULL);
;
break;}
-case 114:
-#line 993 "parse.y"
+case 118:
+#line 1040 "parse.y"
{
push_funcarg(yyvsp[-1].id,yyvsp[0].id);
;
break;}
-case 115:
-#line 996 "parse.y"
+case 119:
+#line 1043 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
push_funcarg(yyvsp[-4].id,NULL);
;
break;}
-case 116:
-#line 1004 "parse.y"
+case 120:
+#line 1051 "parse.y"
{
if(strcmp(yyvsp[-2].id,"check")!=0) {
yyerror(_("parse error"));
push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
;
break;}
-case 117:
-#line 1014 "parse.y"
+case 121:
+#line 1061 "parse.y"
{ ; ;
break;}
-case 118:
-#line 1015 "parse.y"
+case 122:
+#line 1062 "parse.y"
{ ; ;
break;}
-case 119:
-#line 1018 "parse.y"
+case 123:
+#line 1065 "parse.y"
{
if(strcmp(yyvsp[0].id,"type")==0) {
Node *node = new_check(TYPE_CHECK,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 120:
-#line 1031 "parse.y"
+case 124:
+#line 1078 "parse.y"
{
Node *node = new_check(GT_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 121:
-#line 1035 "parse.y"
+case 125:
+#line 1082 "parse.y"
{
Node *node = new_check(LT_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 122:
-#line 1039 "parse.y"
+case 126:
+#line 1086 "parse.y"
{
Node *node = new_check(GE_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 123:
-#line 1043 "parse.y"
+case 127:
+#line 1090 "parse.y"
{
Node *node = new_check(LE_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 124:
-#line 1047 "parse.y"
+case 128:
+#line 1094 "parse.y"
{
Node *node = new_check(EQ_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 125:
-#line 1051 "parse.y"
+case 129:
+#line 1098 "parse.y"
{
Node *node = new_check(NE_CHECK,yyvsp[0].id);
checks = g_list_append(checks,node);
;
break;}
-case 126:
-#line 1057 "parse.y"
+case 130:
+#line 1104 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 127:
-#line 1058 "parse.y"
+case 131:
+#line 1105 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 128:
-#line 1062 "parse.y"
+case 132:
+#line 1109 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
}
}
return 1;
}
-#line 1065 "parse.y"
+#line 1112 "parse.y"
projects / gob-dx.git / blobdiff