static GList *class_nodes = NULL;
Node *class = NULL;
-char *chunk_size = NULL;
+static char *chunk_size = NULL;
+static char *bonobo_x_class = NULL;
static GList *typestack = NULL;
static GList *funcargs = NULL;
static GList *checks = NULL;
static int has_self = FALSE;
static int vararg = FALSE;
+static Method *last_added_method = NULL;
/* destructor and initializer for variables */
static char *destructor = NULL;
!(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"));
}
}
}
node = new_method(scope, method, type, oid, gtktypes, flags,
id, funcargs, onerror, defreturn, c_cbuf, line_no,
- ccode_line, vararg, method_unique_id++);
+ ccode_line, vararg, method_unique_id++,
+ FALSE);
+
+ last_added_method = (Method *)node;
if(cbuf)
g_string_free(cbuf,
}
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 298 "parse.y"
typedef union {
char *id;
GString *cbuf;
-#define YYFINAL 256
+#define YYFINAL 270
#define YYFLAG -32768
#define YYNTBASE 50
#if YYDEBUG != 0
static const short yyprhs[] = { 0,
0, 4, 7, 10, 12, 14, 16, 18, 20, 22,
- 24, 27, 29, 34, 38, 44, 45, 50, 55, 58,
- 60, 62, 64, 66, 68, 70, 72, 74, 76, 79,
- 83, 86, 90, 93, 96, 98, 100, 101, 107, 114,
- 126, 135, 141, 147, 149, 153, 154, 158, 160, 163,
- 165, 167, 169, 172, 175, 178, 182, 186, 189, 192,
- 195, 197, 200, 202, 205, 207, 209, 211, 213, 215,
- 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
+ 24, 27, 29, 34, 38, 44, 45, 51, 57, 60,
+ 62, 64, 67, 69, 71, 73, 75, 77, 79, 81,
+ 84, 88, 91, 95, 98, 101, 103, 105, 106, 112,
+ 119, 131, 140, 146, 152, 154, 158, 159, 163, 165,
+ 168, 170, 172, 174, 177, 180, 183, 187, 191, 194,
+ 197, 200, 202, 205, 207, 210, 212, 214, 216, 218,
+ 220, 222, 224, 226, 228, 230, 232, 234, 236, 239,
+ 242, 246, 249, 251, 255, 259, 262, 264, 269, 273,
+ 275, 278, 280, 291, 303, 313, 323, 332, 344, 353,
+ 359, 362, 367, 368, 370, 373, 375, 377, 380, 383,
+ 387, 392, 397, 399, 403, 405, 409, 411, 414, 418,
+ 425, 433, 436, 438, 440, 443, 446, 450, 454, 458,
+ 462, 464, 467
};
static const short yyrhs[] = { 52,
0, 23, 0, 26, 0, 24, 0, 25, 0, 27,
0, 28, 0, 52, 51, 0, 51, 0, 54, 37,
56, 38, 0, 54, 37, 38, 0, 3, 21, 4,
- 21, 55, 0, 0, 39, 19, 19, 40, 0, 39,
- 19, 20, 40, 0, 56, 57, 0, 57, 0, 78,
- 0, 62, 0, 63, 0, 41, 0, 29, 0, 30,
- 0, 31, 0, 32, 0, 19, 19, 0, 19, 37,
- 23, 0, 42, 87, 0, 42, 37, 23, 0, 59,
- 60, 0, 60, 59, 0, 60, 0, 59, 0, 0,
- 58, 67, 19, 61, 41, 0, 58, 67, 19, 22,
- 61, 41, 0, 33, 65, 64, 19, 19, 37, 23,
- 19, 37, 23, 41, 0, 33, 65, 64, 19, 19,
- 37, 23, 41, 0, 33, 65, 64, 19, 19, 0,
- 19, 39, 19, 67, 40, 0, 19, 0, 39, 66,
- 40, 0, 0, 19, 43, 66, 0, 19, 0, 68,
- 72, 0, 68, 0, 69, 0, 19, 0, 5, 19,
- 0, 19, 5, 0, 71, 19, 0, 5, 71, 19,
- 0, 71, 19, 5, 0, 70, 69, 0, 21, 69,
- 0, 5, 69, 0, 21, 0, 21, 5, 0, 70,
- 0, 70, 5, 0, 6, 0, 18, 0, 14, 0,
- 15, 0, 13, 0, 16, 0, 17, 0, 11, 0,
- 12, 0, 7, 0, 8, 0, 9, 0, 44, 0,
- 44, 5, 0, 44, 72, 0, 44, 5, 72, 0,
- 19, 75, 0, 75, 0, 58, 19, 75, 0, 19,
- 58, 75, 0, 58, 75, 0, 73, 0, 19, 39,
- 76, 40, 0, 76, 45, 19, 0, 19, 0, 37,
- 23, 0, 41, 0, 35, 65, 74, 67, 19, 39,
- 81, 40, 79, 77, 0, 58, 35, 65, 73, 67,
- 19, 39, 81, 40, 79, 77, 0, 34, 58, 67,
- 19, 39, 81, 40, 79, 77, 0, 58, 34, 67,
- 19, 39, 81, 40, 79, 77, 0, 34, 67, 19,
- 39, 81, 40, 79, 77, 0, 36, 39, 21, 40,
- 67, 19, 39, 81, 40, 79, 77, 0, 58, 67,
- 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
+ 21, 55, 0, 0, 39, 19, 19, 40, 55, 0,
+ 39, 19, 20, 40, 55, 0, 56, 57, 0, 57,
+ 0, 78, 0, 19, 78, 0, 62, 0, 63, 0,
+ 41, 0, 29, 0, 30, 0, 31, 0, 32, 0,
+ 19, 19, 0, 19, 37, 23, 0, 42, 87, 0,
+ 42, 37, 23, 0, 59, 60, 0, 60, 59, 0,
+ 60, 0, 59, 0, 0, 58, 67, 19, 61, 41,
+ 0, 58, 67, 19, 22, 61, 41, 0, 33, 65,
+ 64, 19, 19, 37, 23, 19, 37, 23, 41, 0,
+ 33, 65, 64, 19, 19, 37, 23, 41, 0, 33,
+ 65, 64, 19, 19, 0, 19, 39, 19, 67, 40,
+ 0, 19, 0, 39, 66, 40, 0, 0, 19, 43,
+ 66, 0, 19, 0, 68, 72, 0, 68, 0, 69,
+ 0, 19, 0, 5, 19, 0, 19, 5, 0, 71,
+ 19, 0, 5, 71, 19, 0, 71, 19, 5, 0,
+ 70, 69, 0, 21, 69, 0, 5, 69, 0, 21,
+ 0, 21, 5, 0, 70, 0, 70, 5, 0, 6,
+ 0, 18, 0, 14, 0, 15, 0, 13, 0, 16,
+ 0, 17, 0, 11, 0, 12, 0, 7, 0, 8,
+ 0, 9, 0, 44, 0, 44, 5, 0, 44, 72,
+ 0, 44, 5, 72, 0, 19, 75, 0, 75, 0,
+ 58, 19, 75, 0, 19, 58, 75, 0, 58, 75,
+ 0, 73, 0, 19, 39, 76, 40, 0, 76, 45,
+ 19, 0, 19, 0, 37, 23, 0, 41, 0, 35,
+ 65, 74, 67, 19, 39, 81, 40, 79, 77, 0,
+ 58, 35, 65, 73, 67, 19, 39, 81, 40, 79,
+ 77, 0, 34, 58, 67, 19, 39, 81, 40, 79,
+ 77, 0, 58, 34, 67, 19, 39, 81, 40, 79,
+ 77, 0, 34, 67, 19, 39, 81, 40, 79, 77,
+ 0, 36, 39, 21, 40, 67, 19, 39, 81, 40,
+ 79, 77, 0, 58, 67, 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, 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
+ 316, 317, 318, 319, 322, 328, 334, 340, 346, 352,
+ 360, 361, 364, 369, 376, 382, 383, 395, 409, 410,
+ 413, 414, 422, 423, 424, 427, 428, 429, 430, 433,
+ 446, 462, 466, 474, 475, 476, 477, 478, 484, 487,
+ 491, 527, 556, 628, 637, 643, 644, 647, 650, 656,
+ 660, 667, 670, 673, 677, 681, 685, 690, 698, 702,
+ 707, 711, 714, 718, 721, 726, 727, 728, 729, 730,
+ 731, 732, 733, 734, 737, 738, 739, 742, 743, 744,
+ 748, 755, 767, 773, 785, 797, 800, 806, 811, 814,
+ 819, 820, 824, 840, 856, 872, 888, 899, 905, 915,
+ 938, 949, 968, 974, 975, 981, 982, 993, 1004, 1015,
+ 1025, 1035, 1045, 1048, 1049, 1052, 1053, 1056, 1059, 1062,
+ 1070, 1080, 1081, 1084, 1097, 1101, 1105, 1109, 1113, 1117,
+ 1123, 1124, 1128
};
#endif
"CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE","PROTECTED",
"CLASSWIDE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","'('","')'",
"';'","'='","'|'","'*'","','","'>'","'<'","'!'","'-'","prog","ccode","ccodes",
-"class","classdec","chunk","classcode","thing","scope","destructor","initializer",
+"class","classdec","classflags","classcode","thing","scope","destructor","initializer",
"varoptions","variable","argument","argtype","flags","flaglist","type","specifier_list",
"spec_list","specifier","strunionenum","pointer","simplesigtype","fullsigtype",
"sigtype","tokenlist","codenocode","method","returnvals","retcode","funcargs",
static const short yyr1[] = { 0,
50, 50, 50, 50, 51, 51, 51, 51, 51, 51,
52, 52, 53, 53, 54, 55, 55, 55, 56, 56,
- 57, 57, 57, 57, 58, 58, 58, 58, 59, 59,
- 60, 60, 61, 61, 61, 61, 61, 62, 62, 63,
- 63, 63, 64, 64, 65, 65, 66, 66, 67, 67,
- 68, 68, 68, 68, 68, 68, 68, 69, 69, 69,
- 69, 69, 69, 69, 70, 70, 70, 70, 70, 70,
- 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
+ 57, 57, 57, 57, 57, 58, 58, 58, 58, 59,
+ 59, 60, 60, 61, 61, 61, 61, 61, 62, 62,
+ 63, 63, 63, 64, 64, 65, 65, 66, 66, 67,
+ 67, 68, 68, 68, 68, 68, 68, 68, 69, 69,
+ 69, 69, 69, 69, 69, 70, 70, 70, 70, 70,
+ 70, 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, 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,
3, 2, 2, 1, 1, 1, 1, 1, 1, 1,
- 2, 1, 4, 3, 5, 0, 4, 4, 2, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
- 2, 3, 2, 2, 1, 1, 0, 5, 6, 11,
- 8, 5, 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, 3, 1, 3, 1,
- 3, 1, 2, 3, 6, 7, 2, 1, 1, 2,
- 2, 3, 3, 3, 3, 1, 2, 1
+ 2, 1, 4, 3, 5, 0, 5, 5, 2, 1,
+ 1, 2, 1, 1, 1, 1, 1, 1, 1, 2,
+ 3, 2, 3, 2, 2, 1, 1, 0, 5, 6,
+ 11, 8, 5, 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,
+ 1, 2, 1
};
static const short yydefact[] = { 0,
0, 5, 7, 8, 6, 9, 10, 12, 0, 4,
- 0, 0, 11, 3, 2, 0, 0, 1, 0, 25,
- 26, 27, 28, 46, 0, 46, 0, 14, 24, 0,
- 20, 0, 22, 23, 21, 16, 0, 0, 0, 0,
- 65, 74, 75, 76, 72, 73, 69, 67, 68, 70,
- 71, 66, 52, 61, 0, 0, 50, 51, 63, 0,
- 0, 0, 13, 19, 0, 46, 0, 0, 15, 0,
- 48, 0, 44, 0, 0, 53, 60, 0, 54, 62,
- 59, 0, 0, 77, 49, 64, 58, 55, 0, 0,
- 86, 0, 82, 0, 0, 0, 37, 0, 0, 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
+ 0, 0, 11, 3, 2, 0, 0, 1, 0, 26,
+ 27, 28, 29, 47, 0, 47, 0, 14, 25, 0,
+ 20, 0, 23, 24, 21, 16, 0, 0, 0, 22,
+ 0, 0, 0, 66, 75, 76, 77, 73, 74, 70,
+ 68, 69, 71, 72, 67, 53, 62, 0, 0, 51,
+ 52, 64, 0, 0, 0, 13, 19, 0, 47, 0,
+ 0, 15, 0, 0, 49, 0, 45, 0, 0, 54,
+ 61, 0, 55, 63, 60, 0, 0, 78, 50, 65,
+ 59, 56, 0, 0, 87, 0, 83, 0, 0, 0,
+ 38, 0, 0, 0, 0, 46, 0, 0, 57, 0,
+ 0, 79, 80, 58, 0, 0, 0, 82, 0, 86,
+ 0, 0, 0, 0, 0, 0, 38, 0, 0, 37,
+ 36, 0, 0, 0, 0, 92, 100, 48, 0, 43,
+ 0, 0, 66, 53, 0, 0, 113, 115, 117, 81,
+ 90, 0, 85, 84, 0, 0, 0, 0, 30, 0,
+ 0, 0, 133, 131, 0, 0, 32, 34, 35, 39,
+ 16, 16, 91, 0, 0, 0, 54, 55, 0, 118,
+ 103, 0, 88, 0, 0, 0, 0, 0, 31, 40,
+ 103, 33, 132, 17, 18, 44, 0, 103, 0, 0,
+ 110, 119, 0, 0, 0, 114, 116, 89, 0, 0,
+ 103, 0, 0, 0, 42, 0, 112, 111, 0, 0,
+ 0, 101, 104, 97, 103, 0, 0, 0, 99, 0,
+ 95, 0, 124, 0, 0, 0, 0, 0, 123, 105,
+ 0, 0, 103, 96, 103, 0, 0, 0, 0, 125,
+ 0, 126, 0, 120, 122, 102, 93, 0, 0, 41,
+ 121, 129, 127, 128, 130, 98, 94, 0, 0, 0
};
-static const short yydefgoto[] = { 254,
- 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
+static const short yydefgoto[] = { 268,
+ 8, 9, 10, 11, 72, 30, 31, 32, 130, 131,
+ 132, 33, 34, 78, 42, 76, 145, 60, 61, 62,
+ 63, 89, 95, 96, 97, 152, 137, 35, 205, 222,
+ 146, 147, 148, 149, 238, 239, 223
};
-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,
--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
+static const short yypact[] = { 172,
+ -4,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 172, 370,
+ -5, 93,-32768, 370, 370, 173, 87, 370, 209,-32768,
+-32768,-32768,-32768, 72, 155, 72, 84,-32768,-32768, 191,
+-32768, 120,-32768,-32768,-32768, 104, 107, 128, 120,-32768,
+ 132, 133, 275,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768, 151, 343, 292, 146, 135,
+-32768, 357, 158, 159, 160,-32768,-32768, 292, 72, 161,
+ 163,-32768, 143, 174, 169, 154, 162, 194, 371,-32768,
+-32768, 196,-32768, 371,-32768, 197, 178, 16,-32768, 371,
+-32768, 213, 223, 200,-32768, 292,-32768, 190, 212, 214,
+ 52, 11, 41, 195, 132,-32768, 216, 217,-32768, 198,
+ 309, 135,-32768,-32768, 207, 228, 230,-32768, 61,-32768,
+ 232, 292, 218, 61, 292, 68, 7, 309, 9, 219,
+ 239, 237, 220, 245, 272,-32768,-32768,-32768, 292, 265,
+ 309, 326, 279, 17, 293, 289,-32768, 291,-32768,-32768,
+-32768, -20,-32768,-32768, 307, 331, 309, 332,-32768, 329,
+ 312, 325,-32768,-32768, 344, 346,-32768,-32768,-32768,-32768,
+ 104, 104,-32768, 339, 358, 340, 64, 100, 292, -6,
+ 372, 258,-32768, 380, 309, 351, 360, 362,-32768,-32768,
+ 372,-32768,-32768,-32768,-32768,-32768, 45, 372, 292, 292,
+-32768, 363, 384, 28, 41,-32768,-32768,-32768, 364, 309,
+ 372, 309, 41, 368,-32768, 41,-32768,-32768, 387, 111,
+ 385, 388,-32768,-32768, 372, 369, 41, 373,-32768, 389,
+-32768, 111,-32768, 374, 34, 50, 375, 70,-32768,-32768,
+ 28, 41, 372,-32768, 372, 377, 102, 18, 18,-32768,
+ 18,-32768, 18,-32768,-32768,-32768,-32768, 41, 41,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768, 410, 411,-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
+ 241, 71, 405,-32768, -58,-32768, 390, -14, 284, 294,
+ 295,-32768,-32768,-32768, -17, 314, -24,-32768, -39,-32768,
+ -40, -76, 321,-32768, -51,-32768, -203, 404, -184, 184,
+ -122, -104,-32768, 244, 199, -154, -129
};
-#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 431
+
+
+static const short yytable[] = { 167,
+ 59, 224, 82, 81, 39, 162, 213, 70, 64, 229,
+ 58, 113, 231, 216, 74, 202, 12, 85, 176, 183,
+ 112, 178, 91, 244, 184, 126, 227, 163, 164, 133,
+ 134, 16, 203, 86, 187, 150, 163, 164, 257, 81,
+ 242, 118, 120, 99, 81, 165, 163, 164, 129, 94,
+ 81, 100, 163, 164, 266, 267, -107, 166, 258, 88,
+ 259, 179, 209, 214, 221, 153, 166, 154, 163, 164,
+ 126, 121, 118, 127, 201, 249, 166, 135, 117, 115,
+ 15, 136, 166, 255, 18, 215, 159, 226, 233, 228,
+ 128, 251, 255, 129, 217, 218, 17, 156, 166, 116,
+ 158, 82, 81, -109, 160, 250, 252, 36, 199, 254,
+ 41, 234, 194, 195, 174, 235, 236, 237, 262, 263,
+ 233, 264, 65, 265, 43, 44, 45, 46, 47, 233,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, -108,
+ 57, 261, 71, 234, 200, 38, 73, 235, 236, 237,
+ 75, 77, 234, 68, 69, 83, 235, 236, 237, 43,
+ 44, 45, 46, 47, 87, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 1, 57, 92, 93, 88, 101,
+ 98, 102, 103, 20, 21, 22, 23, 20, 21, 22,
+ 23, 19, 104, 106, 2, 3, 4, 5, 6, 7,
+ 107, 20, 21, 22, 23, 24, 25, 26, 27, 19,
+ 28, 105, 108, 29, 109, 110, 111, 114, 119, 20,
+ 21, 22, 23, 24, 25, 26, 27, 37, 66, 122,
+ 123, 29, 124, 128, 139, 140, 141, 20, 21, 22,
+ 23, 115, 25, 26, 27, 116, 151, 38, 115, 13,
+ 155, 20, 21, 22, 23, 13, 157, 126, 13, 171,
+ 129, 116, 43, 44, 45, 46, 47, 206, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 170, 57, 79,
+ 44, 45, 46, 47, 172, 48, 49, 50, 51, 52,
+ 53, 54, 55, 80, 173, 57, 43, 44, 45, 46,
+ 47, 175, 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 180, 57, 142, 143, 45, 46, 47, -106, 48,
+ 49, 50, 51, 52, 53, 54, 55, 144, 181, 57,
+ 79, 44, 45, 46, 47, 182, 48, 49, 50, 51,
+ 52, 53, 54, 55, 177, 185, 57, 84, 44, 186,
+ 188, 189, 190, 48, 49, 50, 51, 52, 53, 54,
+ 55, 90, 44, 57, 191, 193, 192, 48, 49, 50,
+ 51, 52, 53, 54, 55, 79, 44, 57, 196, 198,
+ 197, 48, 49, 50, 51, 52, 53, 54, 55, 210,
+ 204, 57, 2, 3, 4, 5, 6, 7, 208, 211,
+ 212, 219, 220, 225, 230, 232, 241, 240, 243, 269,
+ 270, 246, 245, 14, 169, 248, 253, 260, 138, 67,
+ 125, 161, 40, 168, 256, 207, 0, 0, 0, 0,
+ 247
};
-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
+static const short yycheck[] = { 129,
+ 25, 205, 43, 43, 19, 128, 191, 32, 26, 213,
+ 25, 88, 216, 198, 39, 22, 21, 57, 141, 40,
+ 5, 5, 62, 227, 45, 19, 211, 19, 20, 19,
+ 20, 37, 39, 58, 157, 112, 19, 20, 242, 79,
+ 225, 93, 94, 68, 84, 37, 19, 20, 42, 64,
+ 90, 69, 19, 20, 258, 259, 40, 49, 243, 44,
+ 245, 45, 185, 19, 37, 117, 49, 119, 19, 20,
+ 19, 96, 124, 22, 179, 42, 49, 37, 93, 19,
+ 10, 41, 49, 238, 14, 41, 19, 210, 19, 212,
+ 39, 42, 247, 42, 199, 200, 4, 122, 49, 39,
+ 125, 142, 142, 40, 37, 235, 236, 21, 45, 40,
+ 39, 42, 171, 172, 139, 46, 47, 48, 248, 249,
+ 19, 251, 39, 253, 5, 6, 7, 8, 9, 19,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 40,
+ 21, 40, 39, 42, 45, 39, 19, 46, 47, 48,
+ 19, 19, 42, 34, 35, 5, 46, 47, 48, 5,
+ 6, 7, 8, 9, 19, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 3, 21, 19, 19, 44, 19,
+ 21, 19, 40, 29, 30, 31, 32, 29, 30, 31,
+ 32, 19, 19, 40, 23, 24, 25, 26, 27, 28,
+ 39, 29, 30, 31, 32, 33, 34, 35, 36, 19,
+ 38, 43, 19, 41, 19, 19, 39, 5, 19, 29,
+ 30, 31, 32, 33, 34, 35, 36, 19, 38, 40,
+ 19, 41, 19, 39, 19, 19, 39, 29, 30, 31,
+ 32, 19, 34, 35, 36, 39, 19, 39, 19, 9,
+ 19, 29, 30, 31, 32, 15, 39, 19, 18, 40,
+ 42, 39, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, 41, 21, 5,
+ 6, 7, 8, 9, 40, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 23, 21, 5, 6, 7, 8,
+ 9, 37, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, 19, 21, 5, 6, 7, 8, 9, 40, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 40, 21,
+ 5, 6, 7, 8, 9, 45, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 39, 21, 5, 6, 19,
+ 19, 23, 41, 11, 12, 13, 14, 15, 16, 17,
+ 18, 5, 6, 21, 40, 20, 23, 11, 12, 13,
+ 14, 15, 16, 17, 18, 5, 6, 21, 40, 40,
+ 23, 11, 12, 13, 14, 15, 16, 17, 18, 39,
+ 19, 21, 23, 24, 25, 26, 27, 28, 19, 40,
+ 39, 39, 19, 40, 37, 19, 19, 23, 40, 0,
+ 0, 23, 40, 9, 131, 42, 42, 41, 105, 30,
+ 100, 127, 19, 130, 241, 182, -1, -1, -1, -1,
+ 232
};
/* -*-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 316 "parse.y"
{ ; ;
break;}
case 2:
-#line 313 "parse.y"
+#line 317 "parse.y"
{ ; ;
break;}
case 3:
-#line 314 "parse.y"
+#line 318 "parse.y"
{ ; ;
break;}
case 4:
-#line 315 "parse.y"
+#line 319 "parse.y"
{ ; ;
break;}
case 5:
-#line 318 "parse.y"
+#line 322 "parse.y"
{
Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 6:
-#line 324 "parse.y"
+#line 328 "parse.y"
{
Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 7:
-#line 330 "parse.y"
+#line 334 "parse.y"
{
Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 8:
-#line 336 "parse.y"
+#line 340 "parse.y"
{
Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 9:
-#line 342 "parse.y"
+#line 346 "parse.y"
{
Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 10:
-#line 348 "parse.y"
+#line 352 "parse.y"
{
Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 11:
-#line 356 "parse.y"
+#line 360 "parse.y"
{ ; ;
break;}
case 12:
-#line 357 "parse.y"
+#line 361 "parse.y"
{ ; ;
break;}
case 13:
-#line 360 "parse.y"
+#line 364 "parse.y"
{
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
;
break;}
case 14:
-#line 365 "parse.y"
+#line 369 "parse.y"
{
((Class *)class)->nodes = NULL;
class_nodes = NULL;
;
break;}
case 15:
-#line 372 "parse.y"
+#line 376 "parse.y"
{
- class = new_class(yyvsp[-3].id,yyvsp[-1].id,chunk_size,NULL);
+ class = new_class (yyvsp[-3].id, yyvsp[-1].id,
+ bonobo_x_class, chunk_size, NULL);
;
break;}
case 17:
-#line 378 "parse.y"
-{
- if(strcmp(yyvsp[-2].id,"chunks") == 0) {
- chunk_size = g_strdup(yyvsp[0].id);
+#line 383 "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,"BonoboX") == 0) {
+ g_free (bonobo_x_class);
+ bonobo_x_class = g_strdup(yyvsp[-2].id);
} else {
yyerror(_("parse error"));
YYERROR;
;
break;}
case 18:
-#line 386 "parse.y"
-{
- if(strcmp(yyvsp[-2].id,"chunks") == 0) {
- if(atoi(yyvsp[0].id) != 0)
- chunk_size = g_strdup(yyvsp[0].id);
+#line 395 "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;
} else {
yyerror(_("parse error"));
YYERROR;
;
break;}
case 19:
-#line 397 "parse.y"
+#line 409 "parse.y"
{ ; ;
break;}
case 20:
-#line 398 "parse.y"
+#line 410 "parse.y"
{ ; ;
break;}
case 21:
-#line 401 "parse.y"
+#line 413 "parse.y"
{ ; ;
break;}
case 22:
-#line 402 "parse.y"
-{ ; ;
+#line 414 "parse.y"
+{
+ if (strcmp (yyvsp[-1].id, "BonoboX") != 0) {
+ g_free(yyvsp[-1].id);
+ yyerror(_("parse error"));
+ YYERROR;
+ }
+ last_added_method->bonobo_x_func = TRUE;
+ ;
break;}
case 23:
-#line 403 "parse.y"
+#line 422 "parse.y"
{ ; ;
break;}
case 24:
-#line 404 "parse.y"
+#line 423 "parse.y"
{ ; ;
break;}
case 25:
-#line 407 "parse.y"
-{ the_scope = PUBLIC_SCOPE; ;
+#line 424 "parse.y"
+{ ; ;
break;}
case 26:
-#line 408 "parse.y"
-{ the_scope = PRIVATE_SCOPE; ;
+#line 427 "parse.y"
+{ the_scope = PUBLIC_SCOPE; ;
break;}
case 27:
-#line 409 "parse.y"
-{ the_scope = PROTECTED_SCOPE; ;
+#line 428 "parse.y"
+{ the_scope = PRIVATE_SCOPE; ;
break;}
case 28:
-#line 410 "parse.y"
-{ the_scope = CLASS_SCOPE; ;
+#line 429 "parse.y"
+{ the_scope = PROTECTED_SCOPE; ;
break;}
case 29:
-#line 413 "parse.y"
+#line 430 "parse.y"
+{ the_scope = CLASS_SCOPE; ;
+ break;}
+case 30:
+#line 433 "parse.y"
{
if(strcmp(yyvsp[-1].id, "destroywith")==0) {
g_free(yyvsp[-1].id);
}
;
break;}
-case 30:
-#line 426 "parse.y"
+case 31:
+#line 446 "parse.y"
{
if(strcmp(yyvsp[-2].id, "destroy")==0) {
g_free(yyvsp[-2].id);
}
;
break;}
-case 31:
-#line 442 "parse.y"
+case 32:
+#line 462 "parse.y"
{
initializer = yyvsp[0].id;
initializer_line = ccode_line;
;
break;}
-case 32:
-#line 446 "parse.y"
+case 33:
+#line 466 "parse.y"
{
initializer = (yyvsp[0].cbuf)->str;
initializer_line = ccode_line;
g_string_free(yyvsp[0].cbuf, FALSE);
;
break;}
-case 33:
-#line 454 "parse.y"
-{ ; ;
- break;}
case 34:
-#line 455 "parse.y"
+#line 474 "parse.y"
{ ; ;
break;}
case 35:
-#line 456 "parse.y"
-{ destructor = NULL; ;
+#line 475 "parse.y"
+{ ; ;
break;}
case 36:
-#line 457 "parse.y"
-{ initializer = NULL; ;
+#line 476 "parse.y"
+{ destructor = NULL; ;
break;}
case 37:
-#line 458 "parse.y"
+#line 477 "parse.y"
+{ initializer = NULL; ;
+ break;}
+case 38:
+#line 478 "parse.y"
{
destructor = NULL;
initializer = NULL;
;
break;}
-case 38:
-#line 464 "parse.y"
+case 39:
+#line 484 "parse.y"
{
push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL);
;
break;}
-case 39:
-#line 467 "parse.y"
+case 40:
+#line 487 "parse.y"
{
push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
;
break;}
-case 40:
-#line 471 "parse.y"
+case 41:
+#line 491 "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"));
}
;
break;}
-case 41:
-#line 506 "parse.y"
+case 42:
+#line 527 "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"
+case 43:
+#line 556 "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) {
root, yyvsp[-1].id);
} else if(strcmp(yyvsp[0].id, "objectlink")==0) {
set = g_strdup_printf(
- "if(%s->%s) "
- "gtk_object_unref(GTK_OBJECT(%s->%s)); "
- "%s->%s = ARG; "
- "if(%s->%s) "
- "gtk_object_ref(GTK_OBJECT(%s->%s));",
- root, yyvsp[-1].id,
- root, yyvsp[-1].id,
+ "if (ARG != NULL) "
+ "gtk_object_ref (GTK_OBJECT (ARG)); "
+ "if (%s->%s != NULL) "
+ "gtk_object_unref (GTK_OBJECT (%s->%s)); "
+ "%s->%s = ARG;",
root, yyvsp[-1].id,
root, yyvsp[-1].id,
root, yyvsp[-1].id);
class_nodes = g_list_append(class_nodes,node);
;
break;}
-case 43:
-#line 604 "parse.y"
+case 44:
+#line 628 "parse.y"
{
if(strcmp(yyvsp[-2].id,"type")!=0) {
g_free(yyvsp[-4].id);
yyval.id = yyvsp[-4].id;
;
break;}
-case 44:
-#line 613 "parse.y"
+case 45:
+#line 637 "parse.y"
{
yyval.id = yyvsp[0].id;
typestack = g_list_prepend(typestack,NULL);
;
break;}
-case 45:
-#line 619 "parse.y"
+case 46:
+#line 643 "parse.y"
{ yyval.list = yyvsp[-1].list; ;
break;}
-case 46:
-#line 620 "parse.y"
+case 47:
+#line 644 "parse.y"
{ yyval.list = NULL; ;
break;}
-case 47:
-#line 623 "parse.y"
+case 48:
+#line 647 "parse.y"
{
yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
-case 48:
-#line 626 "parse.y"
+case 49:
+#line 650 "parse.y"
{
yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
-case 49:
-#line 632 "parse.y"
+case 50:
+#line 656 "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"
+case 51:
+#line 660 "parse.y"
{
Node *node = new_type(yyvsp[0].id, NULL, NULL);
typestack = g_list_prepend(typestack,node);
;
break;}
-case 51:
-#line 643 "parse.y"
+case 52:
+#line 667 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 52:
-#line 646 "parse.y"
+case 53:
+#line 670 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 53:
-#line 649 "parse.y"
+case 54:
+#line 673 "parse.y"
{
yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
g_free(yyvsp[0].id);
;
break;}
-case 54:
-#line 653 "parse.y"
+case 55:
+#line 677 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
g_free(yyvsp[-1].id);
;
break;}
-case 55:
-#line 657 "parse.y"
+case 56:
+#line 681 "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"
+case 57:
+#line 685 "parse.y"
{
yyval.id = g_strconcat("const ", yyvsp[-1].id, " ",
yyvsp[0].id, NULL);
g_free(yyvsp[0].id);
;
break;}
-case 57:
-#line 666 "parse.y"
+case 58:
+#line 690 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-2].id, " ",
yyvsp[-1].id, " const", NULL);
g_free(yyvsp[-1].id);
;
break;}
-case 58:
-#line 674 "parse.y"
+case 59:
+#line 698 "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"
+case 60:
+#line 702 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
g_free(yyvsp[-1].id);
g_free(yyvsp[0].id);
;
break;}
-case 60:
-#line 683 "parse.y"
+case 61:
+#line 707 "parse.y"
{
yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
g_free(yyvsp[0].id);
;
break;}
-case 61:
-#line 687 "parse.y"
+case 62:
+#line 711 "parse.y"
{
yyval.id = yyvsp[0].id;
;
break;}
-case 62:
-#line 690 "parse.y"
+case 63:
+#line 714 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
g_free(yyvsp[-1].id);
;
break;}
-case 63:
-#line 694 "parse.y"
+case 64:
+#line 718 "parse.y"
{
yyval.id = g_strdup(yyvsp[0].id);
;
break;}
-case 64:
-#line 697 "parse.y"
+case 65:
+#line 721 "parse.y"
{
yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
;
break;}
-case 65:
-#line 702 "parse.y"
+case 66:
+#line 726 "parse.y"
{ yyval.id = "void"; ;
break;}
-case 66:
-#line 703 "parse.y"
+case 67:
+#line 727 "parse.y"
{ yyval.id = "char"; ;
break;}
-case 67:
-#line 704 "parse.y"
+case 68:
+#line 728 "parse.y"
{ yyval.id = "short"; ;
break;}
-case 68:
-#line 705 "parse.y"
+case 69:
+#line 729 "parse.y"
{ yyval.id = "int"; ;
break;}
-case 69:
-#line 706 "parse.y"
+case 70:
+#line 730 "parse.y"
{ yyval.id = "long"; ;
break;}
-case 70:
-#line 707 "parse.y"
+case 71:
+#line 731 "parse.y"
{ yyval.id = "float"; ;
break;}
-case 71:
-#line 708 "parse.y"
+case 72:
+#line 732 "parse.y"
{ yyval.id = "double"; ;
break;}
-case 72:
-#line 709 "parse.y"
+case 73:
+#line 733 "parse.y"
{ yyval.id = "signed"; ;
break;}
-case 73:
-#line 710 "parse.y"
+case 74:
+#line 734 "parse.y"
{ yyval.id = "unsigned"; ;
break;}
-case 74:
-#line 713 "parse.y"
+case 75:
+#line 737 "parse.y"
{ yyval.id = "struct"; ;
break;}
-case 75:
-#line 714 "parse.y"
+case 76:
+#line 738 "parse.y"
{ yyval.id = "union"; ;
break;}
-case 76:
-#line 715 "parse.y"
+case 77:
+#line 739 "parse.y"
{ yyval.id = "enum"; ;
break;}
-case 77:
-#line 718 "parse.y"
+case 78:
+#line 742 "parse.y"
{ yyval.id = g_strdup("*"); ;
break;}
-case 78:
-#line 719 "parse.y"
+case 79:
+#line 743 "parse.y"
{ yyval.id = g_strdup("* const"); ;
break;}
-case 79:
-#line 720 "parse.y"
+case 80:
+#line 744 "parse.y"
{
yyval.id = g_strconcat("*", yyvsp[0].id, NULL);
g_free(yyvsp[0].id);
;
break;}
-case 80:
-#line 724 "parse.y"
+case 81:
+#line 748 "parse.y"
{
yyval.id = g_strconcat("* const", yyvsp[0].id, NULL);
g_free(yyvsp[0].id);
;
break;}
-case 81:
-#line 731 "parse.y"
+case 82:
+#line 755 "parse.y"
{
if(strcmp(yyvsp[-1].id, "first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
g_free(yyvsp[-1].id);
;
break;}
-case 82:
-#line 743 "parse.y"
+case 83:
+#line 767 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 83:
-#line 749 "parse.y"
+case 84:
+#line 773 "parse.y"
{
if(strcmp(yyvsp[-1].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
g_free(yyvsp[-1].id);
;
break;}
-case 84:
-#line 761 "parse.y"
+case 85:
+#line 785 "parse.y"
{
if(strcmp(yyvsp[-2].id,"first")==0)
yyval.sigtype = SIGNAL_FIRST_METHOD;
g_free(yyvsp[-2].id);
;
break;}
-case 85:
-#line 773 "parse.y"
+case 86:
+#line 797 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 86:
-#line 776 "parse.y"
+case 87:
+#line 800 "parse.y"
{
/* the_scope was default thus public */
the_scope = PUBLIC_SCOPE;
;
break;}
-case 87:
-#line 782 "parse.y"
+case 88:
+#line 806 "parse.y"
{
gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id);
;
break;}
-case 88:
-#line 787 "parse.y"
+case 89:
+#line 811 "parse.y"
{
gtktypes = g_list_append(gtktypes, yyvsp[0].id);
;
break;}
-case 89:
-#line 790 "parse.y"
+case 90:
+#line 814 "parse.y"
{
gtktypes = g_list_append(gtktypes, yyvsp[0].id);
;
break;}
-case 90:
-#line 795 "parse.y"
+case 91:
+#line 819 "parse.y"
{ yyval.cbuf = yyvsp[0].cbuf; ;
break;}
-case 91:
-#line 796 "parse.y"
+case 92:
+#line 820 "parse.y"
{ yyval.cbuf = NULL; ;
break;}
-case 92:
-#line 800 "parse.y"
+case 93:
+#line 824 "parse.y"
{
if(!has_self) {
yyerror(_("signal without 'self' as "
ccode_line, vararg, yyvsp[-8].list);
;
break;}
-case 93:
-#line 816 "parse.y"
+case 94:
+#line 840 "parse.y"
{
if(!has_self) {
yyerror(_("signal without 'self' as "
ccode_line, vararg, yyvsp[-8].list);
;
break;}
-case 94:
-#line 832 "parse.y"
+case 95:
+#line 856 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
ccode_line, vararg, NULL);
;
break;}
-case 95:
-#line 848 "parse.y"
+case 96:
+#line 872 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
ccode_line, vararg, NULL);
;
break;}
-case 96:
-#line 864 "parse.y"
+case 97:
+#line 888 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
ccode_line, vararg, NULL);
;
break;}
-case 97:
-#line 875 "parse.y"
+case 98:
+#line 899 "parse.y"
{
push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id,
yyvsp[-5].id, yyvsp[0].cbuf,
vararg, NULL);
;
break;}
-case 98:
-#line 881 "parse.y"
+case 99:
+#line 905 "parse.y"
{
if(the_scope == CLASS_SCOPE) {
yyerror(_("a method cannot be of class scope"));
vararg, NULL);
;
break;}
-case 99:
-#line 891 "parse.y"
+case 100:
+#line 915 "parse.y"
{
if(strcmp(yyvsp[-4].id, "init")==0) {
push_init_arg(yyvsp[-2].id,FALSE);
}
;
break;}
-case 100:
-#line 914 "parse.y"
+case 101:
+#line 938 "parse.y"
{
g_free(onerror); onerror = NULL;
g_free(defreturn); defreturn = NULL;
g_free(yyvsp[-1].id);
;
break;}
-case 101:
-#line 925 "parse.y"
+case 102:
+#line 949 "parse.y"
{
g_free(onerror); onerror = NULL;
g_free(defreturn); defreturn = NULL;
g_free(yyvsp[-1].id);
;
break;}
-case 102:
-#line 944 "parse.y"
+case 103:
+#line 968 "parse.y"
{
g_free(onerror); onerror = NULL;
g_free(defreturn); defreturn = NULL;
;
break;}
-case 103:
-#line 950 "parse.y"
+case 104:
+#line 974 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 104:
-#line 951 "parse.y"
+case 105:
+#line 975 "parse.y"
{
yyval.id = (yyvsp[1].cbuf)->str;
g_string_free(yyvsp[1].cbuf, FALSE);
;
break;}
-case 105:
-#line 957 "parse.y"
+case 106:
+#line 981 "parse.y"
{ vararg = FALSE; has_self = FALSE; ;
break;}
-case 106:
-#line 958 "parse.y"
+case 107:
+#line 982 "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"
+case 108:
+#line 993 "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 109:
+#line 1004 "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 110:
+#line 1015 "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 111:
+#line 1025 "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 112:
+#line 1035 "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 113:
+#line 1045 "parse.y"
{ has_self = FALSE; ;
break;}
-case 109:
-#line 982 "parse.y"
+case 114:
+#line 1048 "parse.y"
{ vararg = TRUE; ;
break;}
-case 110:
-#line 983 "parse.y"
+case 115:
+#line 1049 "parse.y"
{ vararg = FALSE; ;
break;}
-case 111:
-#line 986 "parse.y"
+case 116:
+#line 1052 "parse.y"
{ ; ;
break;}
-case 112:
-#line 987 "parse.y"
+case 117:
+#line 1053 "parse.y"
{ ; ;
break;}
-case 113:
-#line 990 "parse.y"
+case 118:
+#line 1056 "parse.y"
{
push_funcarg(yyvsp[0].id,NULL);
;
break;}
-case 114:
-#line 993 "parse.y"
+case 119:
+#line 1059 "parse.y"
{
push_funcarg(yyvsp[-1].id,yyvsp[0].id);
;
break;}
-case 115:
-#line 996 "parse.y"
+case 120:
+#line 1062 "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 121:
+#line 1070 "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 122:
+#line 1080 "parse.y"
{ ; ;
break;}
-case 118:
-#line 1015 "parse.y"
+case 123:
+#line 1081 "parse.y"
{ ; ;
break;}
-case 119:
-#line 1018 "parse.y"
+case 124:
+#line 1084 "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 125:
+#line 1097 "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 126:
+#line 1101 "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 127:
+#line 1105 "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 128:
+#line 1109 "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 129:
+#line 1113 "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 130:
+#line 1117 "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 131:
+#line 1123 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 127:
-#line 1058 "parse.y"
+case 132:
+#line 1124 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 128:
-#line 1062 "parse.y"
+case 133:
+#line 1128 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
}
}
return 1;
}
-#line 1065 "parse.y"
+#line 1131 "parse.y"