#define PUBLIC 283
#define PRIVATE 284
#define PROTECTED 285
-#define ARGUMENT 286
-#define VIRTUAL 287
-#define SIGNAL 288
-#define OVERRIDE 289
+#define CLASSWIDE 286
+#define ARGUMENT 287
+#define VIRTUAL 288
+#define SIGNAL 289
+#define OVERRIDE 290
#line 21 "parse.y"
#include "config.h"
#include <glib.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include "treefuncs.h"
static GList *class_nodes = NULL;
Node *class = NULL;
+static char *chunk_size = NULL;
+static char *bonobo_x_class = NULL;
static GList *typestack = NULL;
-static int stars = 0;
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;
Node *node;
Type *type;
char *c_cbuf;
+
+ g_assert(scope != CLASS_SCOPE);
- if(method!=INIT_METHOD && method!=CLASS_INIT_METHOD) {
- type = pop_type();
+ if(method == INIT_METHOD || method == CLASS_INIT_METHOD) {
+ type = (Type *)new_type(g_strdup("void"), NULL, NULL);
} else {
- type = (Type *)new_type(0,g_strdup("void"),NULL);
+ type = pop_type();
}
/* a complicated and ugly test to figure out if we have
g_list_length(gtktypes) != g_list_length(funcargs) &&
!(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);
+ strcmp(gtktypes->next->data, "NONE")==0)) {
+ 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) {
+ error_print(GOB_ERROR, line_no,
+ _("NONE can only appear in an "
+ "argument list by itself"));
+ }
+ }
}
if(cbuf) {
char *p;
node = new_method(scope, method, type, oid, gtktypes, flags,
id, funcargs, onerror, defreturn, c_cbuf, line_no,
- ccode_line, vararg);
+ ccode_line, vararg, method_unique_id++,
+ FALSE);
+
+ last_added_method = (Method *)node;
if(cbuf)
g_string_free(cbuf,
g_free(defreturn);
defreturn = NULL;
+ g_free(chunk_size);
+ chunk_size = NULL;
+
g_list_foreach(gtktypes, (GFunc)g_free, NULL);
g_list_free(gtktypes);
gtktypes = NULL;
else
tn = g_strdup(((Class *)class)->otype);
- type = new_type(1,tn,NULL);
+ type = new_type(tn, g_strdup("*"), NULL);
node = new_funcarg((Type *)type,name,NULL);
funcargs = g_list_prepend(funcargs, node);
}
static void
-push_self(char *id)
+push_self(char *id, gboolean constant)
{
Node *node;
Node *type;
GList *ch = NULL;
- type = new_type(1,g_strdup(((Class *)class)->otype),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 277 "parse.y"
+#line 298 "parse.y"
typedef union {
char *id;
GString *cbuf;
-#define YYFINAL 242
+#define YYFINAL 270
#define YYFLAG -32768
-#define YYNTBASE 49
+#define YYNTBASE 50
-#define YYTRANSLATE(x) ((unsigned)(x) <= 289 ? yytranslate[x] : 86)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 88)
static const char yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 47, 2, 2, 2, 2, 2, 2, 40,
- 41, 43, 2, 44, 48, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 38, 46,
- 39, 45, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 48, 2, 2, 2, 2, 2, 2, 39,
+ 40, 44, 2, 45, 49, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 41, 47,
+ 42, 46, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 36, 42, 37, 2, 2, 2, 2, 2,
+ 2, 2, 37, 43, 38, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36
};
#if YYDEBUG != 0
static const short yyprhs[] = { 0,
0, 4, 7, 10, 12, 14, 16, 18, 20, 22,
- 24, 27, 29, 34, 38, 43, 46, 48, 50, 52,
- 54, 56, 58, 60, 62, 65, 69, 72, 76, 79,
- 82, 84, 86, 87, 93, 100, 112, 121, 127, 133,
- 135, 139, 140, 144, 146, 148, 151, 153, 156, 159,
- 162, 164, 167, 170, 172, 174, 176, 178, 181, 183,
- 185, 188, 190, 193, 195, 197, 199, 201, 203, 206,
- 208, 211, 213, 217, 221, 224, 226, 231, 235, 237,
- 240, 242, 253, 265, 275, 285, 294, 306, 315, 321,
- 324, 329, 330, 332, 335, 337, 339, 343, 345, 349,
- 351, 355, 357, 360, 364, 371, 379, 382, 384, 386,
- 389, 392, 396, 400, 404, 408, 410, 413
+ 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[] = { 51,
- 52, 51, 0, 52, 51, 0, 51, 52, 0, 52,
+static const short yyrhs[] = { 52,
+ 53, 52, 0, 53, 52, 0, 52, 53, 0, 53,
0, 23, 0, 26, 0, 24, 0, 25, 0, 27,
- 0, 28, 0, 51, 50, 0, 50, 0, 53, 36,
- 54, 37, 0, 53, 36, 37, 0, 3, 21, 4,
- 21, 0, 54, 55, 0, 55, 0, 76, 0, 60,
- 0, 61, 0, 38, 0, 29, 0, 30, 0, 31,
- 0, 19, 19, 0, 19, 36, 23, 0, 39, 85,
- 0, 39, 36, 23, 0, 57, 58, 0, 58, 57,
- 0, 58, 0, 57, 0, 0, 56, 65, 19, 59,
- 38, 0, 56, 65, 19, 22, 59, 38, 0, 32,
- 63, 62, 19, 19, 36, 23, 19, 36, 23, 38,
- 0, 32, 63, 62, 19, 19, 36, 23, 38, 0,
- 32, 63, 62, 19, 19, 0, 19, 40, 19, 65,
- 41, 0, 19, 0, 40, 64, 41, 0, 0, 19,
- 42, 64, 0, 19, 0, 66, 0, 5, 66, 0,
- 67, 0, 67, 70, 0, 12, 68, 0, 11, 68,
- 0, 68, 0, 12, 18, 0, 11, 18, 0, 18,
- 0, 17, 0, 16, 0, 19, 0, 69, 19, 0,
- 21, 0, 6, 0, 13, 15, 0, 13, 0, 14,
- 15, 0, 14, 0, 15, 0, 9, 0, 8, 0,
- 7, 0, 43, 70, 0, 43, 0, 19, 73, 0,
- 73, 0, 56, 19, 73, 0, 19, 56, 73, 0,
- 56, 73, 0, 71, 0, 19, 40, 74, 41, 0,
- 74, 44, 19, 0, 19, 0, 36, 23, 0, 38,
- 0, 34, 63, 72, 65, 19, 40, 79, 41, 77,
- 75, 0, 56, 34, 63, 71, 65, 19, 40, 79,
- 41, 77, 75, 0, 33, 56, 65, 19, 40, 79,
- 41, 77, 75, 0, 56, 33, 65, 19, 40, 79,
- 41, 77, 75, 0, 33, 65, 19, 40, 79, 41,
- 77, 75, 0, 35, 40, 21, 41, 65, 19, 40,
- 79, 41, 77, 75, 0, 56, 65, 19, 40, 79,
- 41, 77, 75, 0, 19, 40, 19, 41, 75, 0,
- 19, 78, 0, 19, 78, 19, 78, 0, 0, 85,
- 0, 36, 23, 0, 6, 0, 19, 0, 19, 44,
- 80, 0, 80, 0, 81, 44, 10, 0, 81, 0,
- 81, 44, 82, 0, 82, 0, 65, 19, 0, 65,
- 19, 22, 0, 65, 19, 40, 19, 83, 41, 0,
- 65, 19, 22, 40, 19, 83, 41, 0, 83, 84,
- 0, 84, 0, 19, 0, 45, 85, 0, 46, 85,
- 0, 45, 39, 85, 0, 46, 39, 85, 0, 39,
- 39, 85, 0, 47, 39, 85, 0, 20, 0, 48,
- 20, 0, 19, 0
+ 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, 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,
- 295, 296, 297, 298, 301, 307, 313, 319, 325, 331,
- 339, 340, 343, 348, 355, 360, 361, 364, 365, 366,
- 367, 370, 371, 372, 375, 388, 404, 408, 416, 417,
- 418, 419, 420, 426, 429, 433, 468, 496, 561, 570,
- 576, 577, 580, 583, 589, 590, 598, 602, 609, 612,
- 615, 618, 621, 624, 627, 630, 633, 636, 640, 643,
- 648, 651, 654, 657, 660, 665, 668, 671, 676, 677,
- 681, 693, 699, 711, 723, 726, 732, 737, 740, 745,
- 746, 750, 761, 772, 783, 794, 805, 811, 816, 837,
- 848, 867, 873, 874, 880, 881, 892, 902, 905, 906,
- 909, 910, 913, 916, 919, 927, 937, 938, 941, 954,
- 958, 962, 966, 970, 974, 980, 981, 985
+ 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
"FROM","CONST","VOID","STRUCT","UNION","ENUM","THREEDOTS","SIGNED","UNSIGNED",
"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","TOKEN","NUMBER","TYPETOKEN","ARRAY_DIM",
"CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE","PROTECTED",
-"ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","';'","'='","'('","')'",
-"'|'","'*'","','","'>'","'<'","'!'","'-'","prog","ccode","ccodes","class","classdec",
-"classcode","thing","scope","destructor","initializer","varoptions","variable",
-"argument","argtype","flags","flaglist","type","type1","type2","integer","tspecifier",
-"stars","simplesigtype","fullsigtype","sigtype","tokenlist","codenocode","method",
-"returnvals","retcode","funcargs","arglist","arglist1","arg","checklist","check",
-"numtok", NULL
+"CLASSWIDE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","'('","')'",
+"';'","'='","'|'","'*'","','","'>'","'<'","'!'","'-'","prog","ccode","ccodes",
+"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",
+"arglist","arglist1","arg","checklist","check","numtok", NULL
};
#endif
static const short yyr1[] = { 0,
- 49, 49, 49, 49, 50, 50, 50, 50, 50, 50,
- 51, 51, 52, 52, 53, 54, 54, 55, 55, 55,
- 55, 56, 56, 56, 57, 57, 58, 58, 59, 59,
- 59, 59, 59, 60, 60, 61, 61, 61, 62, 62,
- 63, 63, 64, 64, 65, 65, 66, 66, 67, 67,
- 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
- 68, 68, 68, 68, 68, 69, 69, 69, 70, 70,
- 71, 71, 72, 72, 72, 72, 73, 74, 74, 75,
- 75, 76, 76, 76, 76, 76, 76, 76, 76, 77,
- 77, 77, 78, 78, 79, 79, 79, 79, 80, 80,
- 81, 81, 82, 82, 82, 82, 83, 83, 84, 84,
- 84, 84, 84, 84, 84, 85, 85, 85
+ 50, 50, 50, 50, 51, 51, 51, 51, 51, 51,
+ 52, 52, 53, 53, 54, 55, 55, 55, 56, 56,
+ 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, 4, 2, 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, 1, 2, 1, 2, 2, 2,
- 1, 2, 2, 1, 1, 1, 1, 2, 1, 1,
- 2, 1, 2, 1, 1, 1, 1, 1, 2, 1,
- 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, 22,
- 23, 24, 42, 0, 42, 0, 14, 21, 0, 17,
- 0, 19, 20, 18, 15, 0, 0, 0, 0, 60,
- 68, 67, 66, 0, 0, 62, 64, 65, 56, 55,
- 54, 57, 59, 0, 0, 45, 47, 51, 0, 0,
- 0, 13, 16, 0, 42, 0, 0, 44, 0, 40,
- 0, 46, 53, 50, 52, 49, 61, 63, 0, 0,
- 70, 48, 58, 0, 0, 76, 0, 72, 0, 0,
- 0, 33, 0, 0, 41, 0, 0, 0, 0, 69,
- 0, 0, 0, 71, 0, 75, 0, 0, 0, 0,
- 0, 0, 33, 0, 0, 32, 31, 0, 0, 81,
- 89, 43, 0, 38, 0, 60, 57, 0, 0, 98,
- 100, 102, 79, 0, 74, 73, 0, 0, 0, 0,
- 25, 0, 0, 118, 116, 0, 0, 27, 0, 29,
- 30, 34, 80, 0, 0, 0, 0, 103, 92, 0,
- 77, 0, 0, 0, 0, 0, 26, 35, 28, 117,
- 92, 39, 0, 92, 97, 104, 0, 0, 0, 99,
- 101, 78, 0, 0, 92, 0, 0, 0, 37, 0,
- 0, 0, 0, 90, 93, 86, 92, 0, 0, 0,
- 88, 0, 84, 0, 109, 0, 0, 0, 0, 0,
- 108, 94, 0, 0, 92, 85, 92, 0, 0, 0,
- 0, 110, 0, 111, 0, 105, 107, 91, 82, 0,
- 0, 36, 106, 114, 112, 113, 115, 87, 83, 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[] = { 240,
- 8, 9, 10, 11, 29, 30, 31, 116, 117, 118,
- 32, 33, 71, 38, 69, 128, 56, 57, 58, 59,
- 82, 86, 87, 88, 134, 121, 34, 179, 194, 129,
- 130, 131, 132, 210, 211, 195
+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[] = { 136,
- -17,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 136, 167,
- -16, 13,-32768, 167, 167, 150, 15, 167, 19,-32768,
--32768,-32768, 27, 137, 27, 37,-32768,-32768, 170,-32768,
- 107,-32768,-32768,-32768,-32768, 25, 61, 98, 254,-32768,
--32768,-32768,-32768, 263, 269, 114, 118,-32768,-32768,-32768,
--32768,-32768,-32768, 221, 116,-32768, 104,-32768, 138, 73,
- 151,-32768,-32768, 221, 27, 154, 133, 155, 157, 156,
- 159,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 187, 184,
- 104,-32768,-32768, 146, 212,-32768, 221,-32768, 200, 229,
- 239, 43, 96, 61,-32768, 245, 255, 240, 238,-32768,
- 246, 260, 266,-32768, -8,-32768, 270, 221, 248, -8,
- 221, 36, 3, -1, 238, 251, 272, 256, 273,-32768,
--32768,-32768, 221, 257, 238, 258, 57, 276, 259,-32768,
- 253,-32768,-32768, 64,-32768,-32768, 252, 279, 238, 282,
--32768, 280, 264,-32768,-32768, 281, 285,-32768, 265,-32768,
--32768,-32768,-32768, 267, 284, 268, 221, 5, 291, 204,
--32768, 292, 238, 274, 271, 275,-32768,-32768,-32768,-32768,
- 291,-32768, -10, 291,-32768, 277, 294, 18, 96,-32768,
--32768,-32768, 278, 238, 291, 238, 96, 286,-32768, 96,
- 297, 91, 295, 301,-32768,-32768, 291, 283, 96, 287,
--32768, 298,-32768, 91,-32768, 288, -5, 10, 290, 29,
--32768,-32768, 18, 96, 291,-32768, 291, 293, 50, 4,
- 4,-32768, 4,-32768, 4,-32768,-32768,-32768,-32768, 96,
- 96,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 323,
- 325,-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,
- 69, 117, 317,-32768,-32768, 303, -21, 213, 217, 222,
--32768,-32768,-32768, -19, 242, -23, 299,-32768, 126,-32768,
- 261, 243,-32768, -24,-32768, -174,-32768, -164, 124, -113,
- 182,-32768, 180, 139, -120, -114
+ 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 343
-
-
-static const short yytable[] = { 148,
- 55, 149, 54, 12, 196, 60, 187, 66, 188, 190,
- 101, 156, 201, 144, 145, 203, 17, 144, 145, 16,
- 199, 112, 144, 145, 216, 165, 176, 189, 144, 145,
- 79, 102, 214, 221, 146, 35, 144, 145, 85, 229,
- 90, 114, 147, 67, 177, 91, 147, 205, 223, 183,
- 230, 147, 231, 193, 141, 238, 239, 147, 36, 104,
- 106, 112, 103, 107, 113, 147, 37, 206, 205, 226,
- 198, 142, 200, 207, 208, 209, 61, 13, 135, 68,
- 136, 114, 115, 13, 138, 104, 13, 140, 206, 227,
- 233, 84, 222, 224, 207, 208, 209, -96, 227, 154,
- 157, 20, 21, 22, 161, 234, 235, 162, 236, 205,
- 237, 39, 40, 41, 42, 43, 70, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 15, 53, 77, 206,
- 18, 119, 78, 120, 80, 207, 208, 209, 1, 64,
- 65, 39, 40, 41, 42, 43, 81, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 83, 53, 2, 3,
- 4, 5, 6, 7, 101, 20, 21, 22, 19, 74,
- 76, 89, 92, 93, 20, 21, 22, 97, 20, 21,
- 22, 23, 24, 25, 26, 102, 27, 28, 19, 2,
- 3, 4, 5, 6, 7, 96, 94, 95, 20, 21,
- 22, 23, 24, 25, 26, 98, 62, 28, 39, 40,
- 41, 42, 43, 180, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 99, 53, 39, 40, 41, 42, 43,
- 105, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 108, 53, 39, 126, 41, 42, 43, 109, 44, 45,
- 46, 47, 48, 49, 50, 51, 127, 110, 53, 40,
- 41, 42, 43, 123, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 124, 53, 46, 47, 48, 133, 125,
- 73, 46, 47, 48, 101, 102, 75, 139, 137, 114,
- 112, 163, 155, 152, 158, 153, 160, 164, -95, 159,
- 166, 168, 167, 169, 170, 171, 173, 172, 174, 178,
- 182, 185, 192, 184, 186, 204, 191, 212, 197, 213,
- 218, 202, 241, 215, 242, 14, 220, 217, 225, 151,
- 232, 63, 150, 111, 143, 122, 228, 72, 175, 181,
- 0, 100, 219
+#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[] = { 114,
- 24, 115, 24, 21, 179, 25, 171, 31, 19, 174,
- 19, 125, 187, 19, 20, 190, 4, 19, 20, 36,
- 185, 19, 19, 20, 199, 139, 22, 38, 19, 20,
- 54, 40, 197, 39, 36, 21, 19, 20, 60, 214,
- 64, 39, 48, 19, 40, 65, 48, 19, 39, 163,
- 215, 48, 217, 36, 19, 230, 231, 48, 40, 84,
- 85, 19, 84, 87, 22, 48, 40, 39, 19, 41,
- 184, 36, 186, 45, 46, 47, 40, 9, 103, 19,
- 105, 39, 40, 15, 108, 110, 18, 111, 39, 210,
- 41, 19, 207, 208, 45, 46, 47, 41, 219, 123,
- 44, 29, 30, 31, 41, 220, 221, 44, 223, 19,
- 225, 5, 6, 7, 8, 9, 19, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 10, 21, 15, 39,
- 14, 36, 15, 38, 19, 45, 46, 47, 3, 33,
- 34, 5, 6, 7, 8, 9, 43, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 19, 21, 23, 24,
- 25, 26, 27, 28, 19, 29, 30, 31, 19, 44,
- 45, 21, 19, 41, 29, 30, 31, 19, 29, 30,
- 31, 32, 33, 34, 35, 40, 37, 38, 19, 23,
- 24, 25, 26, 27, 28, 40, 42, 41, 29, 30,
- 31, 32, 33, 34, 35, 19, 37, 38, 5, 6,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 40, 21, 5, 6, 7, 8, 9,
- 19, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 41, 21, 5, 6, 7, 8, 9, 19, 11, 12,
- 13, 14, 15, 16, 17, 18, 19, 19, 21, 6,
- 7, 8, 9, 19, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 19, 21, 13, 14, 15, 19, 40,
- 18, 13, 14, 15, 19, 40, 18, 40, 19, 39,
- 19, 40, 36, 38, 19, 23, 44, 19, 41, 41,
- 19, 38, 23, 23, 20, 41, 23, 41, 41, 19,
- 19, 41, 19, 40, 40, 19, 40, 23, 41, 19,
- 23, 36, 0, 41, 0, 9, 39, 41, 39, 117,
- 38, 29, 116, 91, 113, 94, 213, 39, 157, 160,
- -1, 81, 204
+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 295 "parse.y"
+#line 316 "parse.y"
{ ; ;
break;}
case 2:
-#line 296 "parse.y"
+#line 317 "parse.y"
{ ; ;
break;}
case 3:
-#line 297 "parse.y"
+#line 318 "parse.y"
{ ; ;
break;}
case 4:
-#line 298 "parse.y"
+#line 319 "parse.y"
{ ; ;
break;}
case 5:
-#line 301 "parse.y"
+#line 322 "parse.y"
{
Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 6:
-#line 307 "parse.y"
+#line 328 "parse.y"
{
Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 7:
-#line 313 "parse.y"
+#line 334 "parse.y"
{
Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 8:
-#line 319 "parse.y"
+#line 340 "parse.y"
{
Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 9:
-#line 325 "parse.y"
+#line 346 "parse.y"
{
Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 10:
-#line 331 "parse.y"
+#line 352 "parse.y"
{
Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str,
ccode_line);
;
break;}
case 11:
-#line 339 "parse.y"
+#line 360 "parse.y"
{ ; ;
break;}
case 12:
-#line 340 "parse.y"
+#line 361 "parse.y"
{ ; ;
break;}
case 13:
-#line 343 "parse.y"
+#line 364 "parse.y"
{
((Class *)class)->nodes = class_nodes;
class_nodes = NULL;
;
break;}
case 14:
-#line 348 "parse.y"
+#line 369 "parse.y"
{
((Class *)class)->nodes = NULL;
class_nodes = NULL;
;
break;}
case 15:
-#line 355 "parse.y"
+#line 376 "parse.y"
{
- class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
+ class = new_class (yyvsp[-3].id, yyvsp[-1].id,
+ bonobo_x_class, chunk_size, NULL);
;
break;}
-case 16:
-#line 360 "parse.y"
-{ ; ;
- break;}
case 17:
-#line 361 "parse.y"
-{ ; ;
+#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 364 "parse.y"
-{ ; ;
+#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 365 "parse.y"
+#line 409 "parse.y"
{ ; ;
break;}
case 20:
-#line 366 "parse.y"
+#line 410 "parse.y"
{ ; ;
break;}
case 21:
-#line 367 "parse.y"
+#line 413 "parse.y"
{ ; ;
break;}
case 22:
-#line 370 "parse.y"
-{ the_scope = PUBLIC_SCOPE; ;
+#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 371 "parse.y"
-{ the_scope = PRIVATE_SCOPE; ;
+#line 422 "parse.y"
+{ ; ;
break;}
case 24:
-#line 372 "parse.y"
-{ the_scope = PROTECTED_SCOPE; ;
+#line 423 "parse.y"
+{ ; ;
break;}
case 25:
-#line 375 "parse.y"
+#line 424 "parse.y"
+{ ; ;
+ break;}
+case 26:
+#line 427 "parse.y"
+{ the_scope = PUBLIC_SCOPE; ;
+ break;}
+case 27:
+#line 428 "parse.y"
+{ the_scope = PRIVATE_SCOPE; ;
+ break;}
+case 28:
+#line 429 "parse.y"
+{ the_scope = PROTECTED_SCOPE; ;
+ break;}
+case 29:
+#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 26:
-#line 388 "parse.y"
+case 31:
+#line 446 "parse.y"
{
if(strcmp(yyvsp[-2].id, "destroy")==0) {
g_free(yyvsp[-2].id);
}
;
break;}
-case 27:
-#line 404 "parse.y"
+case 32:
+#line 462 "parse.y"
{
initializer = yyvsp[0].id;
initializer_line = ccode_line;
;
break;}
-case 28:
-#line 408 "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 29:
-#line 416 "parse.y"
+case 34:
+#line 474 "parse.y"
{ ; ;
break;}
-case 30:
-#line 417 "parse.y"
+case 35:
+#line 475 "parse.y"
{ ; ;
break;}
-case 31:
-#line 418 "parse.y"
+case 36:
+#line 476 "parse.y"
{ destructor = NULL; ;
break;}
-case 32:
-#line 419 "parse.y"
+case 37:
+#line 477 "parse.y"
{ initializer = NULL; ;
break;}
-case 33:
-#line 420 "parse.y"
+case 38:
+#line 478 "parse.y"
{
destructor = NULL;
initializer = NULL;
;
break;}
-case 34:
-#line 426 "parse.y"
+case 39:
+#line 484 "parse.y"
{
push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL);
;
break;}
-case 35:
-#line 429 "parse.y"
+case 40:
+#line 487 "parse.y"
{
push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
;
break;}
-case 36:
-#line 433 "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 37:
-#line 468 "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 38:
-#line 496 "parse.y"
+case 43:
+#line 556 "parse.y"
{
Node *node;
char *get, *set = NULL;
Type *type;
char *root;
- if(strcmp(yyvsp[0].id,"link")!=0 &&
- strcmp(yyvsp[0].id,"stringlink")!=0 &&
- strcmp(yyvsp[0].id,"objectlink")!=0) {
+ 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[-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
+ 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) {
+ if(strcmp(yyvsp[0].id, "link")==0) {
set = g_strdup_printf("%s->%s = ARG;",
root, yyvsp[-1].id);
- } else if(strcmp(yyvsp[0].id,"stringlink")==0) {
+ } else if(strcmp(yyvsp[0].id, "stringlink")==0) {
set = g_strdup_printf("g_free(%s->%s); "
"%s->%s = g_strdup(ARG);",
root, yyvsp[-1].id,
root, yyvsp[-1].id);
- } else if(strcmp(yyvsp[0].id,"objectlink")==0) {
+ } 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);
g_assert_not_reached();
}
- /* get is the same for everything */
- get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-1].id);
+ if(strcmp(yyvsp[0].id, "stringlink")==0) {
+ get = g_strdup_printf("ARG = g_strdup(%s->%s);", root, yyvsp[-1].id);
+ } else
+ /* For everything else, get is just straight assignment */
+ get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-1].id);
g_free(yyvsp[0].id);
class_nodes = g_list_append(class_nodes,node);
;
break;}
-case 39:
-#line 561 "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 40:
-#line 570 "parse.y"
+case 45:
+#line 637 "parse.y"
{
yyval.id = yyvsp[0].id;
typestack = g_list_prepend(typestack,NULL);
;
break;}
-case 41:
-#line 576 "parse.y"
-{ yyval.list = yyvsp[-1].list; ;
- break;}
-case 42:
-#line 577 "parse.y"
-{ yyval.list = NULL; ;
- break;}
-case 43:
-#line 580 "parse.y"
-{
- yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
- ;
- break;}
-case 44:
-#line 583 "parse.y"
-{
- yyval.list = g_list_append(NULL,yyvsp[0].id);
- ;
- break;}
-case 45:
-#line 589 "parse.y"
-{ ; ;
- break;}
case 46:
-#line 590 "parse.y"
-{
- Type *type = typestack->data;
- char *oldname = type->name;
- type->name = g_strconcat("const ",oldname,NULL);
- g_free(oldname);
- ;
+#line 643 "parse.y"
+{ yyval.list = yyvsp[-1].list; ;
break;}
case 47:
-#line 598 "parse.y"
-{
- Node *node = new_type(0,yyvsp[0].id,NULL);
- typestack = g_list_prepend(typestack,node);
- ;
+#line 644 "parse.y"
+{ yyval.list = NULL; ;
break;}
case 48:
-#line 602 "parse.y"
+#line 647 "parse.y"
{
- Node *node = new_type(stars,yyvsp[-1].id,NULL);
- stars = 0;
- typestack = g_list_prepend(typestack,node);
+ yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
;
break;}
case 49:
-#line 609 "parse.y"
+#line 650 "parse.y"
{
- yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
+ yyval.list = g_list_append(NULL,yyvsp[0].id);
;
break;}
case 50:
-#line 612 "parse.y"
+#line 656 "parse.y"
{
- yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
- ;
+ Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL);
+ typestack = g_list_prepend(typestack,node);
+ ;
break;}
case 51:
-#line 615 "parse.y"
+#line 660 "parse.y"
{
- yyval.id = g_strdup(yyvsp[0].id);
- ;
+ Node *node = new_type(yyvsp[0].id, NULL, NULL);
+ typestack = g_list_prepend(typestack,node);
+ ;
break;}
case 52:
-#line 618 "parse.y"
+#line 667 "parse.y"
{
- yyval.id = g_strdup("unsigned char");
- ;
+ yyval.id = yyvsp[0].id;
+ ;
break;}
case 53:
-#line 621 "parse.y"
+#line 670 "parse.y"
{
- yyval.id = g_strdup("signed char");
- ;
+ yyval.id = yyvsp[0].id;
+ ;
break;}
case 54:
-#line 624 "parse.y"
+#line 673 "parse.y"
{
- yyval.id = g_strdup("char");
- ;
+ yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
+ g_free(yyvsp[0].id);
+ ;
break;}
case 55:
-#line 627 "parse.y"
+#line 677 "parse.y"
{
- yyval.id = g_strdup("double");
- ;
+ yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+ g_free(yyvsp[-1].id);
+ ;
break;}
case 56:
-#line 630 "parse.y"
+#line 681 "parse.y"
{
- yyval.id = g_strdup("float");
- ;
+ yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+ g_free(yyvsp[0].id);
+ ;
break;}
case 57:
-#line 633 "parse.y"
+#line 685 "parse.y"
{
- yyval.id = yyvsp[0].id;
- ;
+ yyval.id = g_strconcat("const ", yyvsp[-1].id, " ",
+ yyvsp[0].id, NULL);
+ g_free(yyvsp[0].id);
+ ;
break;}
case 58:
-#line 636 "parse.y"
+#line 690 "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 59:
-#line 640 "parse.y"
+#line 698 "parse.y"
{
- yyval.id = yyvsp[0].id;
- ;
+ yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+ g_free(yyvsp[0].id);
+ ;
break;}
case 60:
-#line 643 "parse.y"
+#line 702 "parse.y"
{
- yyval.id = g_strdup("void");
- ;
+ yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+ g_free(yyvsp[-1].id);
+ g_free(yyvsp[0].id);
+ ;
break;}
case 61:
-#line 648 "parse.y"
+#line 707 "parse.y"
{
- yyval.id = "long int";
- ;
+ yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
+ g_free(yyvsp[0].id);
+ ;
break;}
case 62:
-#line 651 "parse.y"
+#line 711 "parse.y"
{
- yyval.id = "long";
- ;
+ yyval.id = yyvsp[0].id;
+ ;
break;}
case 63:
-#line 654 "parse.y"
+#line 714 "parse.y"
{
- yyval.id = "short int";
- ;
+ yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+ g_free(yyvsp[-1].id);
+ ;
break;}
case 64:
-#line 657 "parse.y"
+#line 718 "parse.y"
{
- yyval.id = "short";
- ;
+ yyval.id = g_strdup(yyvsp[0].id);
+ ;
break;}
case 65:
-#line 660 "parse.y"
+#line 721 "parse.y"
{
- yyval.id = "int";
- ;
+ yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+ ;
break;}
case 66:
-#line 665 "parse.y"
-{
- yyval.id = "enum ";
- ;
+#line 726 "parse.y"
+{ yyval.id = "void"; ;
break;}
case 67:
-#line 668 "parse.y"
-{
- yyval.id = "union ";
- ;
+#line 727 "parse.y"
+{ yyval.id = "char"; ;
break;}
case 68:
-#line 671 "parse.y"
-{
- yyval.id = "struct ";
- ;
+#line 728 "parse.y"
+{ yyval.id = "short"; ;
break;}
case 69:
-#line 676 "parse.y"
-{ stars++; ;
+#line 729 "parse.y"
+{ yyval.id = "int"; ;
break;}
case 70:
-#line 677 "parse.y"
-{ stars++; ;
+#line 730 "parse.y"
+{ yyval.id = "long"; ;
break;}
case 71:
-#line 681 "parse.y"
+#line 731 "parse.y"
+{ yyval.id = "float"; ;
+ break;}
+case 72:
+#line 732 "parse.y"
+{ yyval.id = "double"; ;
+ break;}
+case 73:
+#line 733 "parse.y"
+{ yyval.id = "signed"; ;
+ break;}
+case 74:
+#line 734 "parse.y"
+{ yyval.id = "unsigned"; ;
+ break;}
+case 75:
+#line 737 "parse.y"
+{ yyval.id = "struct"; ;
+ break;}
+case 76:
+#line 738 "parse.y"
+{ yyval.id = "union"; ;
+ break;}
+case 77:
+#line 739 "parse.y"
+{ yyval.id = "enum"; ;
+ break;}
+case 78:
+#line 742 "parse.y"
+{ yyval.id = g_strdup("*"); ;
+ break;}
+case 79:
+#line 743 "parse.y"
+{ yyval.id = g_strdup("* const"); ;
+ break;}
+case 80:
+#line 744 "parse.y"
+{
+ yyval.id = g_strconcat("*", yyvsp[0].id, NULL);
+ g_free(yyvsp[0].id);
+ ;
+ break;}
+case 81:
+#line 748 "parse.y"
+{
+ yyval.id = g_strconcat("* const", yyvsp[0].id, NULL);
+ g_free(yyvsp[0].id);
+ ;
+ break;}
+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 72:
-#line 693 "parse.y"
+case 83:
+#line 767 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 73:
-#line 699 "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 74:
-#line 711 "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 75:
-#line 723 "parse.y"
+case 86:
+#line 797 "parse.y"
{
yyval.sigtype = SIGNAL_LAST_METHOD;
;
break;}
-case 76:
-#line 726 "parse.y"
+case 87:
+#line 800 "parse.y"
{
/* the_scope was default thus public */
the_scope = PUBLIC_SCOPE;
;
break;}
-case 77:
-#line 732 "parse.y"
+case 88:
+#line 806 "parse.y"
{
gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id);
;
break;}
-case 78:
-#line 737 "parse.y"
+case 89:
+#line 811 "parse.y"
{
gtktypes = g_list_append(gtktypes, yyvsp[0].id);
;
break;}
-case 79:
-#line 740 "parse.y"
+case 90:
+#line 814 "parse.y"
{
gtktypes = g_list_append(gtktypes, yyvsp[0].id);
;
break;}
-case 80:
-#line 745 "parse.y"
+case 91:
+#line 819 "parse.y"
{ yyval.cbuf = yyvsp[0].cbuf; ;
break;}
-case 81:
-#line 746 "parse.y"
+case 92:
+#line 820 "parse.y"
{ yyval.cbuf = NULL; ;
break;}
-case 82:
-#line 750 "parse.y"
+case 93:
+#line 824 "parse.y"
{
if(!has_self) {
yyerror(_("signal without 'self' as "
free_all_global_state();
YYERROR;
}
+ if(the_scope == CLASS_SCOPE) {
+ yyerror(_("a method cannot be of class scope"));
+ 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);
;
break;}
-case 83:
-#line 761 "parse.y"
+case 94:
+#line 840 "parse.y"
{
if(!has_self) {
yyerror(_("signal without 'self' as "
free_all_global_state();
YYERROR;
}
+ if(the_scope == CLASS_SCOPE) {
+ yyerror(_("a method cannot be of class scope"));
+ 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);
;
break;}
-case 84:
-#line 772 "parse.y"
+case 95:
+#line 856 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
free_all_global_state();
YYERROR;
}
+ if(the_scope == CLASS_SCOPE) {
+ yyerror(_("a method cannot be of class scope"));
+ free_all_global_state();
+ YYERROR;
+ }
push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
yyvsp[0].cbuf, yyvsp[-8].line,
ccode_line, vararg, NULL);
;
break;}
-case 85:
-#line 783 "parse.y"
+case 96:
+#line 872 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
free_all_global_state();
YYERROR;
}
+ if(the_scope == CLASS_SCOPE) {
+ yyerror(_("a method cannot be of class scope"));
+ free_all_global_state();
+ YYERROR;
+ }
push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
yyvsp[0].cbuf, yyvsp[-7].line,
ccode_line, vararg, NULL);
;
break;}
-case 86:
-#line 794 "parse.y"
+case 97:
+#line 888 "parse.y"
{
if(!has_self) {
yyerror(_("virtual method without 'self' as "
ccode_line, vararg, NULL);
;
break;}
-case 87:
-#line 805 "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 88:
-#line 811 "parse.y"
+case 99:
+#line 905 "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,
vararg, NULL);
;
break;}
-case 89:
-#line 816 "parse.y"
+case 100:
+#line 915 "parse.y"
{
if(strcmp(yyvsp[-4].id, "init")==0) {
push_init_arg(yyvsp[-2].id,FALSE);
} else {
g_free(yyvsp[-4].id);
g_free(yyvsp[-2].id);
- g_string_free(yyvsp[-2].cbuf,TRUE);
- yyerror(_("parse error"));
+ g_string_free(yyvsp[0].cbuf,TRUE);
+ yyerror(_("parse error "
+ "(untyped blocks must be init or "
+ "class_init)"));
YYERROR;
}
;
break;}
-case 90:
-#line 837 "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 91:
-#line 848 "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 92:
-#line 867 "parse.y"
+case 103:
+#line 968 "parse.y"
{
g_free(onerror); onerror = NULL;
g_free(defreturn); defreturn = NULL;
;
break;}
-case 93:
-#line 873 "parse.y"
+case 104:
+#line 974 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 94:
-#line 874 "parse.y"
+case 105:
+#line 975 "parse.y"
{
yyval.id = (yyvsp[1].cbuf)->str;
g_string_free(yyvsp[1].cbuf, FALSE);
;
break;}
-case 95:
-#line 880 "parse.y"
+case 106:
+#line 981 "parse.y"
{ vararg = FALSE; has_self = FALSE; ;
break;}
-case 96:
-#line 881 "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 97:
-#line 892 "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 98:
-#line 902 "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 99:
-#line 905 "parse.y"
+case 114:
+#line 1048 "parse.y"
{ vararg = TRUE; ;
break;}
-case 100:
-#line 906 "parse.y"
+case 115:
+#line 1049 "parse.y"
{ vararg = FALSE; ;
break;}
-case 101:
-#line 909 "parse.y"
+case 116:
+#line 1052 "parse.y"
{ ; ;
break;}
-case 102:
-#line 910 "parse.y"
+case 117:
+#line 1053 "parse.y"
{ ; ;
break;}
-case 103:
-#line 913 "parse.y"
+case 118:
+#line 1056 "parse.y"
{
push_funcarg(yyvsp[0].id,NULL);
;
break;}
-case 104:
-#line 916 "parse.y"
+case 119:
+#line 1059 "parse.y"
{
push_funcarg(yyvsp[-1].id,yyvsp[0].id);
;
break;}
-case 105:
-#line 919 "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 106:
-#line 927 "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 107:
-#line 937 "parse.y"
+case 122:
+#line 1080 "parse.y"
{ ; ;
break;}
-case 108:
-#line 938 "parse.y"
+case 123:
+#line 1081 "parse.y"
{ ; ;
break;}
-case 109:
-#line 941 "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 110:
-#line 954 "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 111:
-#line 958 "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 112:
-#line 962 "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 113:
-#line 966 "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 114:
-#line 970 "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 115:
-#line 974 "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 116:
-#line 980 "parse.y"
+case 131:
+#line 1123 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
-case 117:
-#line 981 "parse.y"
+case 132:
+#line 1124 "parse.y"
{
yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
g_free(yyvsp[0].id);
;
break;}
-case 118:
-#line 985 "parse.y"
+case 133:
+#line 1128 "parse.y"
{ yyval.id = yyvsp[0].id; ;
break;}
}
}
return 1;
}
-#line 988 "parse.y"
+#line 1131 "parse.y"
projects / gob-dx.git / blobdiff