X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/dd11885aadcfaafae2d6268c381b0aac94cbc149..2753ff6cefbe916211d543f1029879e2a075d111:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 7b6e9eb..2d9d349 100644 --- a/src/parse.c +++ b/src/parse.c @@ -33,10 +33,11 @@ #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" @@ -44,6 +45,7 @@ #include "config.h" #include #include +#include #include #include "treefuncs.h" @@ -57,12 +59,14 @@ GList *nodes = NULL; 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; @@ -144,11 +148,13 @@ push_function(int scope, int method, char *oid, char *id, 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 @@ -159,18 +165,18 @@ push_function(int scope, int method, char *oid, char *id, !(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")); } } } @@ -186,7 +192,10 @@ push_function(int scope, int method, char *oid, char *id, 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, @@ -210,6 +219,9 @@ free_all_global_state(void) 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; @@ -244,18 +256,19 @@ push_init_arg(char *name, int is_class) 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); @@ -266,7 +279,6 @@ static Variable * find_var_or_die(const char *id, int line) { GList *li; - char *s; for(li = class_nodes; li != NULL; li = li->next) { Variable *var; @@ -278,8 +290,7 @@ find_var_or_die(const char *id, int line) 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; @@ -304,8 +315,65 @@ set_return_value(char *type, char *val) return FALSE; } +static void +export_accessors (char *var_name, + GString *get_cbuf, + int get_lineno, + GString *set_cbuf, + int set_lineno, + Type *type, + int lineno) +{ + if (get_cbuf) { + char *get_id = g_strdup_printf ("get_%s", var_name); + GString *get_cbuf_copy = g_string_new (get_cbuf->str); + char *tmp; + Node *node1 = new_type (type->name, type->pointer, type->postfix); + Node *node3 = new_type (class->class.otype, "*", NULL); + + tmp = g_strdup_printf ("\t%s%s ARG;\n", + type->name, + type->pointer ? type->pointer : ""); + get_cbuf_copy = g_string_prepend (get_cbuf_copy, tmp); + g_free (tmp); + + tmp = g_strdup_printf ("\n\t\treturn ARG;\n"); + get_cbuf_copy = g_string_append (get_cbuf_copy, tmp); + g_free (tmp); + + typestack = g_list_prepend (typestack, node1); + typestack = g_list_prepend (typestack, node3); + + push_funcarg ("self", FALSE); + + push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, + get_id, get_cbuf_copy, get_lineno, + lineno, FALSE, NULL); + } + + if (set_cbuf) { + char *set_id = g_strdup_printf ("set_%s", var_name); + GString *set_cbuf_copy = g_string_new (set_cbuf->str); + Node *node1 = new_type (type->name, type->pointer, type->postfix); + Node *node2 = new_type ("void", NULL, NULL); + Node *node3 = new_type (class->class.otype, "*", NULL); + + typestack = g_list_prepend (typestack, node2); + typestack = g_list_prepend (typestack, node1); + typestack = g_list_prepend (typestack, node3); + + push_funcarg ("self", FALSE); + push_funcarg ("ARG", FALSE); + + typestack = g_list_prepend (typestack, node2); + push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, + set_id, set_cbuf_copy, set_lineno, + lineno, FALSE, NULL); + } +} + -#line 288 "parse.y" +#line 355 "parse.y" typedef union { char *id; GString *cbuf; @@ -327,26 +395,26 @@ typedef union { -#define YYFINAL 242 +#define YYFINAL 274 #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] : 89) 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, @@ -362,86 +430,96 @@ static const char yytranslate[] = { 0, 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, 132, 142, 149, 153, 154, 160, 162, 166, 167, + 171, 173, 176, 178, 180, 182, 185, 188, 191, 195, + 199, 202, 205, 208, 210, 213, 215, 218, 220, 222, + 224, 226, 228, 230, 232, 234, 236, 238, 240, 242, + 244, 247, 250, 254, 257, 259, 263, 267, 270, 272, + 277, 281, 283, 286, 288, 299, 311, 321, 331, 340, + 352, 361, 367, 370, 375, 376, 378, 381, 383, 385, + 388, 391, 395, 400, 405, 407, 411, 413, 417, 419, + 422, 426, 433, 441, 444, 446, 448, 451, 454, 458, + 462, 466, 470, 472, 475 }; -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, 79, 0, 19, 79, 0, 62, 0, 63, 0, + 41, 0, 29, 0, 30, 0, 31, 0, 32, 0, + 19, 19, 0, 19, 37, 23, 0, 42, 88, 0, + 42, 37, 23, 0, 59, 60, 0, 60, 59, 0, + 60, 0, 59, 0, 0, 58, 68, 19, 61, 41, + 0, 58, 68, 19, 22, 61, 41, 0, 33, 66, + 65, 19, 64, 19, 37, 23, 19, 37, 23, 41, + 0, 33, 66, 65, 19, 64, 19, 37, 23, 41, + 0, 33, 66, 65, 19, 64, 19, 0, 39, 19, + 40, 0, 0, 19, 39, 19, 68, 40, 0, 19, + 0, 39, 67, 40, 0, 0, 19, 43, 67, 0, + 19, 0, 69, 73, 0, 69, 0, 70, 0, 19, + 0, 5, 19, 0, 19, 5, 0, 72, 19, 0, + 5, 72, 19, 0, 72, 19, 5, 0, 71, 70, + 0, 21, 70, 0, 5, 70, 0, 21, 0, 21, + 5, 0, 71, 0, 71, 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, 73, 0, 44, + 5, 73, 0, 19, 76, 0, 76, 0, 58, 19, + 76, 0, 19, 58, 76, 0, 58, 76, 0, 74, + 0, 19, 39, 77, 40, 0, 77, 45, 19, 0, + 19, 0, 37, 23, 0, 41, 0, 35, 66, 75, + 68, 19, 39, 82, 40, 80, 78, 0, 58, 35, + 66, 74, 68, 19, 39, 82, 40, 80, 78, 0, + 34, 58, 68, 19, 39, 82, 40, 80, 78, 0, + 58, 34, 68, 19, 39, 82, 40, 80, 78, 0, + 34, 68, 19, 39, 82, 40, 80, 78, 0, 36, + 39, 21, 40, 68, 19, 39, 82, 40, 80, 78, + 0, 58, 68, 19, 39, 82, 40, 80, 78, 0, + 19, 39, 19, 40, 78, 0, 19, 81, 0, 19, + 81, 19, 81, 0, 0, 88, 0, 37, 23, 0, + 6, 0, 19, 0, 19, 5, 0, 5, 19, 0, + 19, 45, 83, 0, 19, 5, 45, 83, 0, 5, + 19, 45, 83, 0, 83, 0, 84, 45, 10, 0, + 84, 0, 84, 45, 85, 0, 85, 0, 68, 19, + 0, 68, 19, 22, 0, 68, 19, 39, 19, 86, + 40, 0, 68, 19, 22, 39, 19, 86, 40, 0, + 86, 87, 0, 87, 0, 19, 0, 46, 88, 0, + 47, 88, 0, 46, 42, 88, 0, 47, 42, 88, + 0, 42, 42, 88, 0, 48, 42, 88, 0, 20, + 0, 49, 20, 0, 19, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 306, 307, 308, 309, 312, 318, 324, 330, 336, 342, - 350, 351, 354, 359, 366, 371, 372, 375, 376, 377, - 378, 381, 382, 383, 386, 399, 415, 419, 427, 428, - 429, 430, 431, 437, 440, 444, 479, 507, 572, 581, - 587, 588, 591, 594, 600, 601, 609, 613, 620, 623, - 626, 629, 632, 635, 638, 641, 644, 647, 651, 654, - 659, 662, 665, 668, 671, 676, 679, 682, 687, 688, - 692, 704, 710, 722, 734, 737, 743, 748, 751, 756, - 757, 761, 772, 783, 794, 805, 816, 822, 827, 848, - 859, 878, 884, 885, 891, 892, 903, 913, 916, 917, - 920, 921, 924, 927, 930, 938, 948, 949, 952, 965, - 969, 973, 977, 981, 985, 991, 992, 996 + 373, 374, 375, 376, 379, 385, 391, 397, 403, 409, + 417, 418, 421, 426, 433, 439, 440, 452, 466, 467, + 470, 471, 479, 480, 481, 484, 485, 486, 487, 490, + 503, 519, 523, 531, 532, 533, 534, 535, 541, 544, + 549, 600, 648, 731, 739, 741, 750, 756, 757, 760, + 763, 769, 773, 780, 783, 786, 790, 794, 798, 803, + 811, 815, 820, 824, 827, 831, 834, 839, 840, 841, + 842, 843, 844, 845, 846, 847, 850, 851, 852, 855, + 856, 857, 861, 868, 880, 886, 898, 910, 913, 919, + 924, 927, 932, 933, 937, 953, 969, 985, 1001, 1012, + 1018, 1028, 1051, 1062, 1081, 1087, 1088, 1094, 1095, 1106, + 1117, 1128, 1138, 1148, 1158, 1161, 1162, 1165, 1166, 1169, + 1172, 1175, 1183, 1193, 1194, 1197, 1210, 1214, 1218, 1222, + 1226, 1230, 1236, 1237, 1241 }; #endif @@ -452,194 +530,220 @@ static const char * const yytname[] = { "$","error","$undefined.","CLASS", "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","export","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, 69, 69, 69, 69, 69, 69, 69, + 70, 70, 70, 70, 70, 70, 70, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 72, 72, 72, 73, + 73, 73, 73, 74, 74, 75, 75, 75, 75, 76, + 77, 77, 78, 78, 79, 79, 79, 79, 79, 79, + 79, 79, 80, 80, 80, 81, 81, 82, 82, 82, + 82, 82, 82, 82, 82, 83, 83, 84, 84, 85, + 85, 85, 85, 86, 86, 87, 87, 87, 87, 87, + 87, 87, 88, 88, 88 }; 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, + 12, 9, 6, 3, 0, 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, 49, 0, 49, 0, 14, 25, 0, + 20, 0, 23, 24, 21, 16, 0, 0, 0, 22, + 0, 0, 0, 68, 77, 78, 79, 75, 76, 72, + 70, 71, 73, 74, 69, 55, 64, 0, 0, 53, + 54, 66, 0, 0, 0, 13, 19, 0, 49, 0, + 0, 15, 0, 0, 51, 0, 47, 0, 0, 56, + 63, 0, 57, 65, 62, 0, 0, 80, 52, 67, + 61, 58, 0, 0, 89, 0, 85, 0, 0, 0, + 38, 0, 0, 0, 0, 48, 0, 45, 59, 0, + 0, 81, 82, 60, 0, 0, 0, 84, 0, 88, + 0, 0, 0, 0, 0, 0, 38, 0, 0, 37, + 36, 0, 0, 0, 0, 94, 102, 50, 0, 0, + 0, 0, 0, 68, 55, 0, 0, 115, 117, 119, + 83, 92, 0, 87, 86, 0, 0, 0, 0, 30, + 0, 0, 0, 135, 133, 0, 0, 32, 34, 35, + 39, 16, 16, 93, 0, 0, 43, 0, 56, 57, + 0, 120, 105, 0, 90, 0, 0, 0, 0, 0, + 31, 40, 105, 33, 134, 17, 18, 46, 44, 0, + 105, 0, 0, 112, 121, 0, 0, 0, 116, 118, + 91, 0, 0, 105, 0, 0, 0, 0, 114, 113, + 0, 0, 0, 103, 106, 99, 105, 0, 0, 0, + 101, 0, 42, 97, 0, 126, 0, 0, 0, 0, + 0, 125, 107, 0, 0, 105, 98, 105, 0, 0, + 0, 0, 127, 0, 128, 0, 122, 124, 104, 95, + 0, 0, 0, 123, 131, 129, 130, 132, 100, 96, + 41, 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[] = { 272, + 8, 9, 10, 11, 72, 30, 31, 32, 130, 131, + 132, 33, 34, 141, 78, 42, 76, 146, 60, 61, + 62, 63, 89, 95, 96, 97, 153, 137, 35, 208, + 224, 147, 148, 149, 150, 241, 242, 225 }; -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[] = { 175, + 34,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 175, 236, + 47, 104,-32768, 236, 236, 176, 96, 236, 212,-32768, +-32768,-32768,-32768, 107, 158, 107, 109,-32768,-32768, 194, +-32768, 123,-32768,-32768,-32768, 110, 111, 124, 123,-32768, + 135, 136, 278,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768, 154, 346, 295, 149, 138, +-32768, 360, 161, 162, 163,-32768,-32768, 295, 107, 164, + 166,-32768, 146, 177, 172, 157, 165, 197, 374,-32768, +-32768, 199,-32768, 374,-32768, 200, 181, 2,-32768, 374, +-32768, 216, 226, 203,-32768, 295,-32768, 193, 215, 217, + 57, 74, 37, 198, 135,-32768, 219, 201,-32768, 210, + 312, 138,-32768,-32768, 211, 220, 233,-32768, -2,-32768, + 234, 295, 242, -2, 295, -8, -6, 312, 38, 246, + 235, 257, 265, 275, 299,-32768,-32768,-32768, 295, 313, + 320, 312, 329, 309, 5, 334, 314,-32768, 310,-32768, +-32768,-32768, -20,-32768,-32768, 317, 349, 312, 350,-32768, + 347, 341, 343,-32768,-32768, 361, 373,-32768,-32768,-32768, +-32768, 110, 110,-32768, 354, 356, 362, 357, -18, 81, + 295, 61, 379, 261,-32768, 381, 312, 363, 364, 366, +-32768,-32768, 379,-32768,-32768,-32768,-32768,-32768,-32768, 378, + 379, 295, 295,-32768, 367, 384, 40, 37,-32768,-32768, +-32768, 368, 312, 379, 312, 37, 29, 37,-32768,-32768, + 388, 114, 386, 391,-32768,-32768, 379, 371, 37, 372, +-32768, 376,-32768,-32768, 114,-32768, 375, 46, 62, 377, + 72,-32768,-32768, 40, 37, 379,-32768, 379, 392, 105, + 48, 48,-32768, 48,-32768, 48,-32768,-32768,-32768,-32768, + 37, 37, 380,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768, 414, 416,-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 + 98, 14, 409,-32768, -67,-32768, 390, -13, 291, 293, + 297,-32768,-32768,-32768,-32768, -22, 321, -24,-32768, -41, +-32768, -40, -79, 325,-32768, -63,-32768, -176, 408, -175, + 184, -123, -140,-32768, 245, 195, -227, -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 430 + + +static const short yytable[] = { 168, + 59, 81, 82, 64, 163, 39, 112, 70, 113, 180, + 160, 58, 126, 258, 74, 85, 115, 216, 178, 185, + 91, -111, 258, 15, 186, 218, 202, 18, 161, 118, + 120, 226, 151, 86, 189, 129, 116, 81, 229, 231, + 204, 234, 81, 99, -109, 88, 100, 232, 81, 181, + 94, 245, 247, 154, 12, 155, 164, 165, 164, 165, + 118, 219, 220, 212, 164, 165, 164, 165, 260, 233, + 261, 121, 262, 135, 166, 126, 223, 136, 127, 117, + 164, 165, 205, 16, 269, 270, 167, 252, 167, 228, + 236, 230, 133, 134, 167, 128, 167, 157, 129, 206, + 159, 81, 82, 254, 196, 197, 13, 17, 253, 255, + 167, 257, 13, 237, 175, 13, 36, 238, 239, 240, + -110, 265, 266, 236, 267, 203, 268, 43, 44, 45, + 46, 47, 236, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 73, 57, 264, 41, 237, 65, 71, 38, + 238, 239, 240, 75, 77, 237, 68, 69, 83, 238, + 239, 240, 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, 152, 140, + 20, 21, 22, 23, 115, 25, 26, 27, 142, 116, + 38, 115, 156, 126, 20, 21, 22, 23, 2, 3, + 4, 5, 6, 7, 116, 43, 44, 45, 46, 47, + 209, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 158, 57, 79, 44, 45, 46, 47, 129, 48, 49, + 50, 51, 52, 53, 54, 55, 80, 171, 57, 43, + 44, 45, 46, 47, 172, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 173, 57, 143, 144, 45, 46, + 47, 174, 48, 49, 50, 51, 52, 53, 54, 55, + 145, 176, 57, 79, 44, 45, 46, 47, 177, 48, + 49, 50, 51, 52, 53, 54, 55, 179, -108, 57, + 84, 44, 182, 183, 184, 187, 48, 49, 50, 51, + 52, 53, 54, 55, 90, 44, 57, 188, 190, 191, + 48, 49, 50, 51, 52, 53, 54, 55, 79, 44, + 57, 192, 193, 194, 48, 49, 50, 51, 52, 53, + 54, 55, 195, 198, 57, 199, 201, 207, 200, 211, + 217, 213, 222, 214, 215, 221, 235, 227, 243, 244, + 246, 248, 249, 273, 263, 274, 251, 14, 256, 67, + 271, 170, 169, 162, 125, 138, 40, 259, 210, 250 }; -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, 43, 43, 26, 128, 19, 5, 32, 88, 5, + 19, 25, 19, 241, 39, 57, 19, 193, 142, 40, + 62, 40, 250, 10, 45, 201, 45, 14, 37, 93, + 94, 208, 112, 58, 158, 42, 39, 79, 214, 216, + 181, 218, 84, 68, 40, 44, 69, 19, 90, 45, + 64, 227, 229, 117, 21, 119, 19, 20, 19, 20, + 124, 202, 203, 187, 19, 20, 19, 20, 245, 41, + 246, 96, 248, 37, 37, 19, 37, 41, 22, 93, + 19, 20, 22, 37, 261, 262, 49, 42, 49, 213, + 19, 215, 19, 20, 49, 39, 49, 122, 42, 39, + 125, 143, 143, 42, 172, 173, 9, 4, 238, 239, + 49, 40, 15, 42, 139, 18, 21, 46, 47, 48, + 40, 251, 252, 19, 254, 45, 256, 5, 6, 7, + 8, 9, 19, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 19, 21, 40, 39, 42, 39, 39, 39, + 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, 39, + 39, 19, 19, 19, 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, + 39, 21, 5, 6, 7, 8, 9, 42, 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, 40, 21, 5, 6, 7, 8, + 9, 23, 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, 40, 21, + 5, 6, 19, 40, 45, 39, 11, 12, 13, 14, + 15, 16, 17, 18, 5, 6, 21, 19, 19, 23, + 11, 12, 13, 14, 15, 16, 17, 18, 5, 6, + 21, 41, 40, 23, 11, 12, 13, 14, 15, 16, + 17, 18, 20, 40, 21, 40, 40, 19, 37, 19, + 23, 39, 19, 40, 39, 39, 19, 40, 23, 19, + 40, 40, 37, 0, 23, 0, 42, 9, 42, 30, + 41, 131, 130, 127, 100, 105, 19, 244, 184, 235 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1185,23 +1289,23 @@ yyreduce: switch (yyn) { case 1: -#line 306 "parse.y" +#line 373 "parse.y" { ; ; break;} case 2: -#line 307 "parse.y" +#line 374 "parse.y" { ; ; break;} case 3: -#line 308 "parse.y" +#line 375 "parse.y" { ; ; break;} case 4: -#line 309 "parse.y" +#line 376 "parse.y" { ; ; break;} case 5: -#line 312 "parse.y" +#line 379 "parse.y" { Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1210,7 +1314,7 @@ case 5: ; break;} case 6: -#line 318 "parse.y" +#line 385 "parse.y" { Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1219,7 +1323,7 @@ case 6: ; break;} case 7: -#line 324 "parse.y" +#line 391 "parse.y" { Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1228,7 +1332,7 @@ case 7: ; break;} case 8: -#line 330 "parse.y" +#line 397 "parse.y" { Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1237,7 +1341,7 @@ case 8: ; break;} case 9: -#line 336 "parse.y" +#line 403 "parse.y" { Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1246,7 +1350,7 @@ case 9: ; break;} case 10: -#line 342 "parse.y" +#line 409 "parse.y" { Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1255,15 +1359,15 @@ case 10: ; break;} case 11: -#line 350 "parse.y" +#line 417 "parse.y" { ; ; break;} case 12: -#line 351 "parse.y" +#line 418 "parse.y" { ; ; break;} case 13: -#line 354 "parse.y" +#line 421 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1271,7 +1375,7 @@ case 13: ; break;} case 14: -#line 359 "parse.y" +#line 426 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; @@ -1279,49 +1383,95 @@ case 14: ; break;} case 15: -#line 366 "parse.y" +#line 433 "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 371 "parse.y" -{ ; ; - break;} case 17: -#line 372 "parse.y" -{ ; ; +#line 440 "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 375 "parse.y" -{ ; ; +#line 452 "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 376 "parse.y" +#line 466 "parse.y" { ; ; break;} case 20: -#line 377 "parse.y" +#line 467 "parse.y" { ; ; break;} case 21: -#line 378 "parse.y" +#line 470 "parse.y" { ; ; break;} case 22: -#line 381 "parse.y" -{ the_scope = PUBLIC_SCOPE; ; +#line 471 "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 382 "parse.y" -{ the_scope = PRIVATE_SCOPE; ; +#line 479 "parse.y" +{ ; ; break;} case 24: -#line 383 "parse.y" -{ the_scope = PROTECTED_SCOPE; ; +#line 480 "parse.y" +{ ; ; break;} case 25: -#line 386 "parse.y" +#line 481 "parse.y" +{ ; ; + break;} +case 26: +#line 484 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; + break;} +case 27: +#line 485 "parse.y" +{ the_scope = PRIVATE_SCOPE; ; + break;} +case 28: +#line 486 "parse.y" +{ the_scope = PROTECTED_SCOPE; ; + break;} +case 29: +#line 487 "parse.y" +{ the_scope = CLASS_SCOPE; ; + break;} +case 30: +#line 490 "parse.y" { if(strcmp(yyvsp[-1].id, "destroywith")==0) { g_free(yyvsp[-1].id); @@ -1336,8 +1486,8 @@ case 25: } ; break;} -case 26: -#line 399 "parse.y" +case 31: +#line 503 "parse.y" { if(strcmp(yyvsp[-2].id, "destroy")==0) { g_free(yyvsp[-2].id); @@ -1353,127 +1503,163 @@ case 26: } ; break;} -case 27: -#line 415 "parse.y" +case 32: +#line 519 "parse.y" { initializer = yyvsp[0].id; initializer_line = ccode_line; ; break;} -case 28: -#line 419 "parse.y" +case 33: +#line 523 "parse.y" { initializer = (yyvsp[0].cbuf)->str; initializer_line = ccode_line; g_string_free(yyvsp[0].cbuf, FALSE); ; break;} -case 29: -#line 427 "parse.y" +case 34: +#line 531 "parse.y" { ; ; break;} -case 30: -#line 428 "parse.y" +case 35: +#line 532 "parse.y" { ; ; break;} -case 31: -#line 429 "parse.y" +case 36: +#line 533 "parse.y" { destructor = NULL; ; break;} -case 32: -#line 430 "parse.y" +case 37: +#line 534 "parse.y" { initializer = NULL; ; break;} -case 33: -#line 431 "parse.y" +case 38: +#line 535 "parse.y" { destructor = NULL; initializer = NULL; ; break;} -case 34: -#line 437 "parse.y" +case 39: +#line 541 "parse.y" { push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} -case 35: -#line 440 "parse.y" +case 40: +#line 544 "parse.y" { push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} -case 36: -#line 444 "parse.y" +case 41: +#line 549 "parse.y" { if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { Node *node; Type *type = pop_type(); - g_free(yyvsp[-6].id); g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-8].id,type,yyvsp[-9].list,yyvsp[-7].id, - (yyvsp[-4].cbuf)->str,yyvsp[-5].line, - (yyvsp[-1].cbuf)->str,yyvsp[-2].line, - yyvsp[-10].line); - g_string_free(yyvsp[-4].cbuf,FALSE); - g_string_free(yyvsp[-1].cbuf,FALSE); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + node = new_argument (yyvsp[-9].id, type, yyvsp[-10].list, yyvsp[-8].id, + (yyvsp[-4].cbuf)->str, yyvsp[-5].line, + (yyvsp[-1].cbuf)->str,yyvsp[-2].line, + yyvsp[-11].line); + class_nodes = g_list_append(class_nodes,node); + + if (yyvsp[-7].id) { + export_accessors (yyvsp[-8].id, + yyvsp[-4].cbuf, yyvsp[-5].line, + yyvsp[-1].cbuf, yyvsp[-2].line, + type, + yyvsp[-11].line); + } + + g_string_free (yyvsp[-4].cbuf, FALSE); + g_string_free (yyvsp[-1].cbuf, FALSE); + } else if(strcmp(yyvsp[-6].id,"set")==0 && strcmp(yyvsp[-3].id,"get")==0) { Node *node; Type *type = pop_type(); - g_free(yyvsp[-6].id); g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-8].id,type,yyvsp[-9].list,yyvsp[-7].id, - (yyvsp[-1].cbuf)->str,yyvsp[-2].line, - (yyvsp[-4].cbuf)->str,yyvsp[-5].line, - yyvsp[-10].line); - g_string_free(yyvsp[-1].cbuf,FALSE); - g_string_free(yyvsp[-4].cbuf,FALSE); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + node = new_argument (yyvsp[-9].id, type, yyvsp[-10].list, yyvsp[-8].id, + (yyvsp[-1].cbuf)->str,yyvsp[-2].line, + (yyvsp[-4].cbuf)->str,yyvsp[-5].line, + yyvsp[-11].line); + g_string_free (yyvsp[-1].cbuf, FALSE); + g_string_free (yyvsp[-4].cbuf, FALSE); class_nodes = g_list_append(class_nodes,node); } else { - g_free(yyvsp[-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_string_free(yyvsp[-1].cbuf,TRUE); - g_string_free(yyvsp[-4].cbuf,TRUE); - yyerror(_("parse error")); + g_free (yyvsp[-9].id); + g_free (yyvsp[-8].id); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + g_list_foreach (yyvsp[-10].list, (GFunc)g_free, NULL); + g_list_free (yyvsp[-10].list); + g_string_free (yyvsp[-1].cbuf, TRUE); + g_string_free (yyvsp[-4].cbuf, TRUE); + yyerror (_("parse error")); YYERROR; } ; break;} -case 37: -#line 479 "parse.y" +case 42: +#line 600 "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) { + g_free (yyvsp[-3].id); + node = new_argument (yyvsp[-6].id, type, yyvsp[-7].list, yyvsp[-5].id, + (yyvsp[-1].cbuf)->str, yyvsp[-2].line, + NULL, 0, + yyvsp[-8].line); + if (yyvsp[-4].id) { + export_accessors (yyvsp[-5].id, + yyvsp[-1].cbuf, yyvsp[-2].line, + NULL, 0, + type, + yyvsp[-8].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, - yyvsp[-2].line, yyvsp[-7].line); - g_string_free(yyvsp[-1].cbuf,FALSE); - class_nodes = g_list_append(class_nodes,node); + g_free (yyvsp[-3].id); + node = new_argument (yyvsp[-6].id, type, yyvsp[-7].list, yyvsp[-5].id, + NULL, 0, + (yyvsp[-1].cbuf)->str, yyvsp[-2].line, + yyvsp[-8].line); + if (yyvsp[-4].id) { + export_accessors (yyvsp[-5].id, + NULL, 0, + yyvsp[-1].cbuf, yyvsp[-2].line, + type, + yyvsp[-8].line); + } + + 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_free (yyvsp[-3].id); + g_free (yyvsp[-6].id); + g_free (yyvsp[-5].id); + g_list_foreach (yyvsp[-7].list, (GFunc)g_free, NULL); + g_list_free (yyvsp[-7].list); + g_string_free (yyvsp[-1].cbuf, TRUE); yyerror(_("parse error")); YYERROR; } ; break;} -case 38: -#line 507 "parse.y" +case 43: +#line 648 "parse.y" { Node *node; char *get, *set = NULL; @@ -1481,65 +1667,98 @@ case 38: Type *type; char *root; - if(strcmp(yyvsp[0].id,"link")!=0 && - strcmp(yyvsp[0].id,"stringlink")!=0 && - strcmp(yyvsp[0].id,"objectlink")!=0) { - g_free(yyvsp[0].id); g_free(yyvsp[-2].id); - g_free(yyvsp[-1].id); - g_list_foreach(yyvsp[-3].list,(GFunc)g_free,NULL); + if(strcmp(yyvsp[0].id, "link")!=0 && + strcmp(yyvsp[0].id, "stringlink")!=0 && + strcmp(yyvsp[0].id, "objectlink")!=0) { + g_free(yyvsp[0].id); + g_free(yyvsp[-3].id); + g_free(yyvsp[-2].id); + g_list_foreach(yyvsp[-4].list,(GFunc)g_free,NULL); + g_list_free(yyvsp[-4].list); yyerror(_("parse error")); YYERROR; } type = pop_type(); - var = find_var_or_die(yyvsp[-1].id, yyvsp[-4].line); + var = find_var_or_die(yyvsp[-2].id, yyvsp[-5].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[-5].line, + _("Self aliases needed when autolinking to a classwide member")); + } else root = "self"; - if(strcmp(yyvsp[0].id,"link")==0) { + if(strcmp(yyvsp[0].id, "link")==0) { set = g_strdup_printf("%s->%s = ARG;", - root, yyvsp[-1].id); - } else if(strcmp(yyvsp[0].id,"stringlink")==0) { + root, yyvsp[-2].id); + } else if(strcmp (yyvsp[0].id, "stringlink")==0) { set = g_strdup_printf("g_free(%s->%s); " "%s->%s = g_strdup(ARG);", - root, yyvsp[-1].id, - root, yyvsp[-1].id); - } else if(strcmp(yyvsp[0].id,"objectlink")==0) { + root, yyvsp[-2].id, + root, yyvsp[-2].id); + } else if(strcmp (yyvsp[0].id, "objectlink")==0) { set = g_strdup_printf( - "if(%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, - root, yyvsp[-1].id, - 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[-2].id, + root, yyvsp[-2].id, + root, yyvsp[-2].id); } else { 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[-2].id); + } else + /* For everything else, get is just straight assignment */ + get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-2].id); - g_free(yyvsp[0].id); + g_free (yyvsp[0].id); if(!type) type = copy_type(var->vtype); - node = new_argument(yyvsp[-2].id, type, yyvsp[-3].list, - yyvsp[-1].id, get, yyvsp[-4].line, - set, yyvsp[-4].line, yyvsp[-4].line); + node = new_argument (yyvsp[-3].id, type, yyvsp[-4].list, + yyvsp[-2].id, + get, yyvsp[-5].line, + set, yyvsp[-5].line, + yyvsp[-5].line); + if (yyvsp[-1].id) { + export_accessors (yyvsp[-2].id, + g_string_new (get), yyvsp[-5].line, + g_string_new (set), yyvsp[-5].line, + type, + yyvsp[-5].line); + } + class_nodes = g_list_append(class_nodes,node); ; break;} -case 39: -#line 572 "parse.y" +case 44: +#line 731 "parse.y" +{ + if (strcmp (yyvsp[-1].id, "export")!=0) { + g_free (yyvsp[-1].id); + yyerror (_("parse error")); + YYERROR; + } + yyval.id = yyvsp[-1].id; + ; + break;} +case 45: +#line 739 "parse.y" +{ yyval.id = NULL; ; + break;} +case 46: +#line 741 "parse.y" { if(strcmp(yyvsp[-2].id,"type")!=0) { g_free(yyvsp[-4].id); @@ -1550,192 +1769,215 @@ case 39: yyval.id = yyvsp[-4].id; ; break;} -case 40: -#line 581 "parse.y" +case 47: +#line 750 "parse.y" { yyval.id = yyvsp[0].id; typestack = g_list_prepend(typestack,NULL); ; break;} -case 41: -#line 587 "parse.y" -{ yyval.list = yyvsp[-1].list; ; - break;} -case 42: -#line 588 "parse.y" -{ yyval.list = NULL; ; - break;} -case 43: -#line 591 "parse.y" -{ - yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); - ; - break;} -case 44: -#line 594 "parse.y" -{ - yyval.list = g_list_append(NULL,yyvsp[0].id); - ; - break;} -case 45: -#line 600 "parse.y" -{ ; ; - break;} -case 46: -#line 601 "parse.y" -{ - Type *type = typestack->data; - char *oldname = type->name; - type->name = g_strconcat("const ",oldname,NULL); - g_free(oldname); - ; - break;} -case 47: -#line 609 "parse.y" -{ - Node *node = new_type(0,yyvsp[0].id,NULL); - typestack = g_list_prepend(typestack,node); - ; - break;} case 48: -#line 613 "parse.y" -{ - Node *node = new_type(stars,yyvsp[-1].id,NULL); - stars = 0; - typestack = g_list_prepend(typestack,node); - ; +#line 756 "parse.y" +{ yyval.list = yyvsp[-1].list; ; break;} case 49: -#line 620 "parse.y" -{ - yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); - ; +#line 757 "parse.y" +{ yyval.list = NULL; ; break;} case 50: -#line 623 "parse.y" +#line 760 "parse.y" { - yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); + yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} case 51: -#line 626 "parse.y" +#line 763 "parse.y" { - yyval.id = g_strdup(yyvsp[0].id); + yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 52: -#line 629 "parse.y" +#line 769 "parse.y" { - yyval.id = g_strdup("unsigned char"); - ; + Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 53: -#line 632 "parse.y" +#line 773 "parse.y" { - yyval.id = g_strdup("signed char"); - ; + Node *node = new_type(yyvsp[0].id, NULL, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 54: -#line 635 "parse.y" +#line 780 "parse.y" { - yyval.id = g_strdup("char"); - ; + yyval.id = yyvsp[0].id; + ; break;} case 55: -#line 638 "parse.y" +#line 783 "parse.y" { - yyval.id = g_strdup("double"); - ; + yyval.id = yyvsp[0].id; + ; break;} case 56: -#line 641 "parse.y" +#line 786 "parse.y" { - yyval.id = g_strdup("float"); - ; + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 57: -#line 644 "parse.y" +#line 790 "parse.y" { - yyval.id = yyvsp[0].id; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 58: -#line 647 "parse.y" +#line 794 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); - ; + ; break;} case 59: -#line 651 "parse.y" +#line 798 "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 60: -#line 654 "parse.y" +#line 803 "parse.y" { - yyval.id = g_strdup("void"); - ; + yyval.id = g_strconcat(yyvsp[-2].id, " ", + yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 61: -#line 659 "parse.y" +#line 811 "parse.y" { - yyval.id = "long int"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 62: -#line 662 "parse.y" +#line 815 "parse.y" { - yyval.id = "long"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[-1].id); + g_free(yyvsp[0].id); + ; break;} case 63: -#line 665 "parse.y" +#line 820 "parse.y" { - yyval.id = "short int"; - ; + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 64: -#line 668 "parse.y" +#line 824 "parse.y" { - yyval.id = "short"; - ; + yyval.id = yyvsp[0].id; + ; break;} case 65: -#line 671 "parse.y" +#line 827 "parse.y" { - yyval.id = "int"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 66: -#line 676 "parse.y" +#line 831 "parse.y" { - yyval.id = "enum "; - ; + yyval.id = g_strdup(yyvsp[0].id); + ; break;} case 67: -#line 679 "parse.y" +#line 834 "parse.y" { - yyval.id = "union "; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + ; break;} case 68: -#line 682 "parse.y" -{ - yyval.id = "struct "; - ; +#line 839 "parse.y" +{ yyval.id = "void"; ; break;} case 69: -#line 687 "parse.y" -{ stars++; ; +#line 840 "parse.y" +{ yyval.id = "char"; ; break;} case 70: -#line 688 "parse.y" -{ stars++; ; +#line 841 "parse.y" +{ yyval.id = "short"; ; break;} case 71: -#line 692 "parse.y" +#line 842 "parse.y" +{ yyval.id = "int"; ; + break;} +case 72: +#line 843 "parse.y" +{ yyval.id = "long"; ; + break;} +case 73: +#line 844 "parse.y" +{ yyval.id = "float"; ; + break;} +case 74: +#line 845 "parse.y" +{ yyval.id = "double"; ; + break;} +case 75: +#line 846 "parse.y" +{ yyval.id = "signed"; ; + break;} +case 76: +#line 847 "parse.y" +{ yyval.id = "unsigned"; ; + break;} +case 77: +#line 850 "parse.y" +{ yyval.id = "struct"; ; + break;} +case 78: +#line 851 "parse.y" +{ yyval.id = "union"; ; + break;} +case 79: +#line 852 "parse.y" +{ yyval.id = "enum"; ; + break;} +case 80: +#line 855 "parse.y" +{ yyval.id = g_strdup("*"); ; + break;} +case 81: +#line 856 "parse.y" +{ yyval.id = g_strdup("* const"); ; + break;} +case 82: +#line 857 "parse.y" +{ + yyval.id = g_strconcat("*", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 83: +#line 861 "parse.y" +{ + yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 84: +#line 868 "parse.y" { if(strcmp(yyvsp[-1].id, "first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1749,14 +1991,14 @@ case 71: g_free(yyvsp[-1].id); ; break;} -case 72: -#line 704 "parse.y" +case 85: +#line 880 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 73: -#line 710 "parse.y" +case 86: +#line 886 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1770,8 +2012,8 @@ case 73: g_free(yyvsp[-1].id); ; break;} -case 74: -#line 722 "parse.y" +case 87: +#line 898 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1785,47 +2027,47 @@ case 74: g_free(yyvsp[-2].id); ; break;} -case 75: -#line 734 "parse.y" +case 88: +#line 910 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 76: -#line 737 "parse.y" +case 89: +#line 913 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 77: -#line 743 "parse.y" +case 90: +#line 919 "parse.y" { gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id); ; break;} -case 78: -#line 748 "parse.y" +case 91: +#line 924 "parse.y" { gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 79: -#line 751 "parse.y" +case 92: +#line 927 "parse.y" { gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 80: -#line 756 "parse.y" +case 93: +#line 932 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 81: -#line 757 "parse.y" +case 94: +#line 933 "parse.y" { yyval.cbuf = NULL; ; break;} -case 82: -#line 761 "parse.y" +case 95: +#line 937 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1833,13 +2075,18 @@ case 82: 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 772 "parse.y" +case 96: +#line 953 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1847,13 +2094,18 @@ case 83: 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 783 "parse.y" +case 97: +#line 969 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1861,13 +2113,18 @@ case 84: 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 794 "parse.y" +case 98: +#line 985 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1875,13 +2132,18 @@ case 85: 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 805 "parse.y" +case 99: +#line 1001 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1894,8 +2156,8 @@ case 86: ccode_line, vararg, NULL); ; break;} -case 87: -#line 816 "parse.y" +case 100: +#line 1012 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, yyvsp[-5].id, yyvsp[0].cbuf, @@ -1903,16 +2165,21 @@ case 87: vararg, NULL); ; break;} -case 88: -#line 822 "parse.y" +case 101: +#line 1018 "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 827 "parse.y" +case 102: +#line 1028 "parse.y" { if(strcmp(yyvsp[-4].id, "init")==0) { push_init_arg(yyvsp[-2].id,FALSE); @@ -1927,14 +2194,16 @@ case 89: } 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 848 "parse.y" +case 103: +#line 1051 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -1947,8 +2216,8 @@ case 90: g_free(yyvsp[-1].id); ; break;} -case 91: -#line 859 "parse.y" +case 104: +#line 1062 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -1969,35 +2238,35 @@ case 91: g_free(yyvsp[-1].id); ; break;} -case 92: -#line 878 "parse.y" +case 105: +#line 1081 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; ; break;} -case 93: -#line 884 "parse.y" +case 106: +#line 1087 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 94: -#line 885 "parse.y" +case 107: +#line 1088 "parse.y" { yyval.id = (yyvsp[1].cbuf)->str; g_string_free(yyvsp[1].cbuf, FALSE); ; break;} -case 95: -#line 891 "parse.y" +case 108: +#line 1094 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 96: -#line 892 "parse.y" +case 109: +#line 1095 "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")); @@ -2005,12 +2274,40 @@ case 96: } ; break;} -case 97: -#line 903 "parse.y" +case 110: +#line 1106 "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 111: +#line 1117 "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 112: +#line 1128 "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")); @@ -2018,40 +2315,66 @@ case 97: } ; break;} -case 98: -#line 913 "parse.y" +case 113: +#line 1138 "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 114: +#line 1148 "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 115: +#line 1158 "parse.y" { has_self = FALSE; ; break;} -case 99: -#line 916 "parse.y" +case 116: +#line 1161 "parse.y" { vararg = TRUE; ; break;} -case 100: -#line 917 "parse.y" +case 117: +#line 1162 "parse.y" { vararg = FALSE; ; break;} -case 101: -#line 920 "parse.y" +case 118: +#line 1165 "parse.y" { ; ; break;} -case 102: -#line 921 "parse.y" +case 119: +#line 1166 "parse.y" { ; ; break;} -case 103: -#line 924 "parse.y" +case 120: +#line 1169 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 104: -#line 927 "parse.y" +case 121: +#line 1172 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 105: -#line 930 "parse.y" +case 122: +#line 1175 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -2061,8 +2384,8 @@ case 105: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 106: -#line 938 "parse.y" +case 123: +#line 1183 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -2072,16 +2395,16 @@ case 106: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 107: -#line 948 "parse.y" +case 124: +#line 1193 "parse.y" { ; ; break;} -case 108: -#line 949 "parse.y" +case 125: +#line 1194 "parse.y" { ; ; break;} -case 109: -#line 952 "parse.y" +case 126: +#line 1197 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -2096,61 +2419,61 @@ case 109: g_free(yyvsp[0].id); ; break;} -case 110: -#line 965 "parse.y" +case 127: +#line 1210 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 111: -#line 969 "parse.y" +case 128: +#line 1214 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 112: -#line 973 "parse.y" +case 129: +#line 1218 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 113: -#line 977 "parse.y" +case 130: +#line 1222 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 114: -#line 981 "parse.y" +case 131: +#line 1226 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 115: -#line 985 "parse.y" +case 132: +#line 1230 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 116: -#line 991 "parse.y" +case 133: +#line 1236 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 117: -#line 992 "parse.y" +case 134: +#line 1237 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 118: -#line 996 "parse.y" +case 135: +#line 1241 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2375,5 +2698,5 @@ yyerrhandle: } return 1; } -#line 999 "parse.y" +#line 1244 "parse.y"