X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/f31590988781d77ff5249987801d03a986368ca2..refs/tags/v1.0.9:/src/parse.c diff --git a/src/parse.c b/src/parse.c index f8593b9..420897c 100644 --- a/src/parse.c +++ b/src/parse.c @@ -20,19 +20,24 @@ #define FLOAT 270 #define DOUBLE 271 #define CHAR 272 -#define ONERROR 273 -#define TOKEN 274 -#define NUMBER 275 -#define TYPETOKEN 276 -#define ARRAY_DIM 277 -#define CCODE 278 -#define HCODE 279 -#define PUBLIC 280 -#define PRIVATE 281 -#define ARGUMENT 282 -#define VIRTUAL 283 -#define SIGNAL 284 -#define OVERRIDE 285 +#define TOKEN 273 +#define NUMBER 274 +#define TYPETOKEN 275 +#define ARRAY_DIM 276 +#define CCODE 277 +#define HTCODE 278 +#define PHCODE 279 +#define HCODE 280 +#define ACODE 281 +#define ATCODE 282 +#define PUBLIC 283 +#define PRIVATE 284 +#define PROTECTED 285 +#define CLASSWIDE 286 +#define ARGUMENT 287 +#define VIRTUAL 288 +#define SIGNAL 289 +#define OVERRIDE 290 #line 21 "parse.y" @@ -40,29 +45,45 @@ #include "config.h" #include #include +#include #include -#include "tree.h" +#include "treefuncs.h" #include "main.h" +#include "util.h" #define _(x) (x) -extern char *filename; - 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; +static int destructor_line = 0; +static gboolean destructor_simple = TRUE; +static char *initializer = NULL; +static int initializer_line = 0; + +static char *onerror = NULL; +static char *defreturn = NULL; static GList *gtktypes = NULL; +/* this can be a global as we will only do one function at a time + anyway */ +static int the_scope = NO_SCOPE; + void free(void *ptr); int yylex(void); @@ -80,81 +101,144 @@ yyerror(char *str) if(strcmp(yytext,"\n")==0) { out=g_strconcat("Error: ",str," before newline",NULL); } else if(yytext[0]=='\0') { - out=g_strconcat("Error: ",str," at end of input",NULL); + out=g_strconcat("Error: ", str, " at end of input", NULL); } else { char *tmp = g_strdup(yytext); - while((p=strchr(tmp,'\n'))) + while((p=strchr(tmp, '\n'))) *p='.'; - out=g_strconcat("Error: ",str," before '",tmp,"'",NULL); + out=g_strconcat("Error: ", str, " before '", tmp, "'", NULL); g_free(tmp); } - fprintf(stderr,"%s:%d: %s\n",filename,line_no,out); + fprintf(stderr, "%s:%d: %s\n", filename, line_no, out); g_free(out); exit(1); } +static Type * +pop_type(void) +{ + Type *type = typestack->data; + typestack = g_list_remove(typestack,typestack->data); + return type; +} + static void push_variable(char *name, int scope, int line_no, char *postfix) { Node *var; - Type *type = typestack->data; - typestack = g_list_remove(typestack,typestack->data); + Type *type = pop_type(); type->postfix = postfix; - var = new_variable(scope,type,name,line_no); + var = new_variable(scope, type, name, line_no, + destructor, destructor_line, + destructor_simple, + initializer, initializer_line); class_nodes = g_list_append(class_nodes, var); } static void -push_function(int scope, char *oid, char *id, char *onerror, - GString *cbuf,int line_no, int ccode_line, int vararg) +push_function(int scope, int method, char *oid, char *id, + GString *cbuf, int line_no, int ccode_line, + gboolean vararg, GList *flags) { Node *node; Type *type; + char *c_cbuf; + + g_assert(scope != CLASS_SCOPE); - if(scope!=INIT_METHOD && scope!=CLASS_INIT_METHOD) { - type = typestack->data; - typestack = g_list_remove(typestack,typestack->data); + 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 the wrong number of types for a signal */ - if((scope == SIGNAL_FIRST_METHOD || - scope == SIGNAL_LAST_METHOD || - scope == PRIVATE_SIGNAL_FIRST_METHOD || - scope == PRIVATE_SIGNAL_LAST_METHOD) && + if((method == SIGNAL_FIRST_METHOD || + method == SIGNAL_LAST_METHOD) && 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")); } - node = new_method(scope,type,oid,gtktypes,id,funcargs, - onerror,cbuf,line_no,ccode_line,vararg); + 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; + c_cbuf = p = cbuf->str; + while(p && *p && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r')) + p++; + if(!p || !*p) + c_cbuf = NULL; + } else + c_cbuf = NULL; + + node = new_method(scope, method, type, oid, gtktypes, flags, + id, funcargs, onerror, defreturn, c_cbuf, line_no, + ccode_line, vararg, method_unique_id++, + FALSE); + + last_added_method = (Method *)node; + + if(cbuf) + g_string_free(cbuf, + /*only free segment if we haven't passed it + above */ + c_cbuf?FALSE:TRUE); gtktypes = NULL; funcargs = NULL; + onerror = NULL; + defreturn = NULL; + class_nodes = g_list_append(class_nodes, node); } +static void +free_all_global_state(void) +{ + g_free(onerror); + onerror = NULL; + 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; + + free_node_list(funcargs); + funcargs = NULL; +} + static void push_funcarg(char *name, char *postfix) { Node *node; - Type *type = typestack->data; - typestack = g_list_remove(typestack,typestack->data); + Type *type = pop_type(); type->postfix = postfix; - node = new_funcarg(type,name,checks); + node = new_funcarg(type, name, checks); checks = NULL; funcargs = g_list_append(funcargs, node); @@ -172,26 +256,67 @@ 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); funcargs = g_list_prepend(funcargs, node); } +static Variable * +find_var_or_die(const char *id, int line) +{ + GList *li; + + for(li = class_nodes; li != NULL; li = li->next) { + Variable *var; + Node *node = li->data; + if(node->type != VARIABLE_NODE) + continue; + var = li->data; + if(strcmp(var->id, id)==0) + return var; + } + + error_printf(GOB_ERROR, line, _("Variable %s not defined here"), id); + + g_assert_not_reached(); + return NULL; +} + +static gboolean +set_return_value(char *type, char *val) +{ + if(strcmp(type, "onerror")==0) { + if(!onerror) { + onerror = val; + return TRUE; + } else + return FALSE; + } else if(strcmp(type, "defreturn")==0) { + if(!defreturn) { + defreturn = val; + return TRUE; + } else + return FALSE; + } + return FALSE; +} + -#line 178 "parse.y" +#line 298 "parse.y" typedef union { char *id; GString *cbuf; @@ -213,26 +338,26 @@ typedef union { -#define YYFINAL 207 +#define YYFINAL 270 #define YYFLAG -32768 -#define YYNTBASE 46 +#define YYNTBASE 50 -#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 74) +#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, 44, 2, 2, 2, 2, 2, 2, 35, - 36, 38, 2, 39, 45, 2, 2, 2, 41, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 34, 43, - 40, 42, 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, 32, 37, 33, 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, @@ -248,76 +373,95 @@ 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 + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36 }; #if YYDEBUG != 0 static const short yyprhs[] = { 0, - 0, 4, 7, 10, 12, 15, 18, 20, 22, 27, - 32, 35, 38, 41, 43, 45, 47, 52, 58, 63, - 69, 81, 90, 94, 95, 99, 101, 103, 106, 108, - 111, 114, 117, 119, 122, 125, 127, 129, 131, 133, - 136, 138, 140, 143, 145, 148, 150, 152, 154, 156, - 158, 161, 163, 167, 171, 174, 177, 179, 184, 188, - 190, 193, 195, 205, 215, 224, 237, 247, 257, 263, - 266, 270, 273, 274, 276, 278, 282, 284, 288, 290, - 294, 296, 299, 303, 310, 318, 321, 323, 325, 328, - 331, 335, 339, 343, 347, 349, 352 + 0, 4, 7, 10, 12, 14, 16, 18, 20, 22, + 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[] = { 47, - 48, 47, 0, 48, 47, 0, 47, 48, 0, 48, - 0, 47, 24, 0, 47, 25, 0, 24, 0, 25, - 0, 49, 32, 50, 33, 0, 3, 22, 4, 22, - 0, 50, 65, 0, 50, 51, 0, 50, 52, 0, - 65, 0, 51, 0, 52, 0, 26, 55, 20, 34, - 0, 26, 55, 20, 23, 34, 0, 27, 55, 20, - 34, 0, 27, 55, 20, 23, 34, 0, 28, 53, - 20, 20, 20, 32, 24, 20, 32, 24, 34, 0, - 28, 53, 20, 20, 20, 32, 24, 34, 0, 35, - 54, 36, 0, 0, 20, 37, 54, 0, 20, 0, - 56, 0, 5, 56, 0, 57, 0, 57, 60, 0, - 12, 58, 0, 11, 58, 0, 58, 0, 12, 18, - 0, 11, 18, 0, 18, 0, 17, 0, 16, 0, - 20, 0, 59, 20, 0, 22, 0, 6, 0, 13, - 15, 0, 13, 0, 14, 15, 0, 14, 0, 15, - 0, 9, 0, 8, 0, 7, 0, 38, 60, 0, - 38, 0, 27, 20, 62, 0, 20, 27, 62, 0, - 27, 62, 0, 20, 62, 0, 62, 0, 20, 35, - 63, 36, 0, 63, 39, 20, 0, 20, 0, 32, - 24, 0, 34, 0, 30, 61, 55, 20, 35, 67, - 36, 66, 64, 0, 29, 27, 55, 20, 35, 67, - 36, 66, 64, 0, 29, 55, 20, 35, 67, 36, - 66, 64, 0, 31, 35, 22, 36, 55, 20, 35, - 67, 36, 66, 32, 24, 0, 26, 55, 20, 35, - 67, 36, 66, 32, 24, 0, 27, 55, 20, 35, - 67, 36, 66, 32, 24, 0, 20, 35, 20, 36, - 64, 0, 19, 73, 0, 19, 32, 24, 0, 40, - 41, 0, 0, 6, 0, 20, 0, 20, 39, 68, - 0, 68, 0, 69, 39, 10, 0, 69, 0, 69, - 39, 70, 0, 70, 0, 55, 20, 0, 55, 20, - 23, 0, 55, 20, 35, 20, 71, 36, 0, 55, - 20, 23, 35, 20, 71, 36, 0, 71, 72, 0, - 72, 0, 20, 0, 42, 73, 0, 43, 73, 0, - 42, 40, 73, 0, 43, 40, 73, 0, 40, 40, - 73, 0, 44, 40, 73, 0, 21, 0, 45, 21, - 0, 20, 0 +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, 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, - 197, 198, 199, 200, 203, 207, 211, 215, 221, 228, - 233, 234, 235, 236, 237, 238, 241, 244, 247, 250, - 254, 283, 309, 310, 313, 316, 322, 323, 331, 335, - 342, 345, 348, 351, 354, 357, 360, 363, 366, 369, - 373, 376, 381, 384, 387, 390, 393, 398, 401, 404, - 409, 410, 413, 425, 437, 440, 452, 457, 462, 465, - 470, 471, 475, 485, 495, 505, 511, 516, 521, 542, - 543, 547, 548, 551, 552, 563, 573, 576, 577, 580, - 581, 584, 587, 590, 598, 608, 609, 612, 625, 629, - 633, 637, 641, 645, 651, 652, 656 + 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 @@ -326,166 +470,222 @@ static const short yyrline[] = { 0, static const char * const yytname[] = { "$","error","$undefined.","CLASS", "FROM","CONST","VOID","STRUCT","UNION","ENUM","THREEDOTS","SIGNED","UNSIGNED", -"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","ONERROR","TOKEN","NUMBER","TYPETOKEN", -"ARRAY_DIM","CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL", -"OVERRIDE","'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'", -"'<'","'!'","'-'","prog","ccodes","class","classdec","classcode","variable", -"argument","argflags","flaglist","type","type1","type2","integer","tspecifier", -"stars","fullsigtype","sigtype","tokenlist","codenocode","method","onerror", -"funcargs","arglist","arglist1","arg","checklist","check","numtok", NULL +"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","TOKEN","NUMBER","TYPETOKEN","ARRAY_DIM", +"CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE","PROTECTED", +"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, - 46, 46, 46, 46, 47, 47, 47, 47, 48, 49, - 50, 50, 50, 50, 50, 50, 51, 51, 51, 51, - 52, 52, 53, 53, 54, 54, 55, 55, 56, 56, - 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, - 57, 57, 58, 58, 58, 58, 58, 59, 59, 59, - 60, 60, 61, 61, 61, 61, 61, 62, 63, 63, - 64, 64, 65, 65, 65, 65, 65, 65, 65, 66, - 66, 66, 66, 67, 67, 67, 67, 68, 68, 69, - 69, 70, 70, 70, 70, 71, 71, 72, 72, 72, - 72, 72, 72, 72, 73, 73, 73 + 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, 2, 2, 1, 1, 4, 4, - 2, 2, 2, 1, 1, 1, 4, 5, 4, 5, - 11, 8, 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, 3, 3, 2, 2, 1, 4, 3, 1, - 2, 1, 9, 9, 8, 12, 9, 9, 5, 2, - 3, 2, 0, 1, 1, 3, 1, 3, 1, 3, - 1, 2, 3, 6, 7, 2, 1, 1, 2, 2, - 3, 3, 3, 3, 1, 2, 1 + 3, 2, 2, 1, 1, 1, 1, 1, 1, 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, 7, 8, 0, 4, 0, 0, 5, 6, 3, - 2, 0, 0, 1, 0, 0, 0, 24, 0, 0, - 0, 0, 15, 16, 14, 10, 0, 0, 42, 50, - 49, 48, 0, 0, 44, 46, 47, 38, 37, 36, - 39, 41, 0, 27, 29, 33, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 57, 0, 9, 12, 13, - 11, 0, 28, 35, 32, 34, 31, 43, 45, 0, - 52, 30, 40, 0, 26, 0, 0, 0, 0, 0, - 0, 0, 56, 0, 55, 0, 0, 0, 0, 17, - 0, 51, 0, 19, 0, 0, 23, 0, 0, 0, - 54, 60, 0, 53, 0, 0, 0, 62, 69, 18, - 42, 39, 0, 0, 77, 79, 81, 20, 0, 25, - 0, 0, 0, 58, 0, 0, 0, 61, 0, 82, - 73, 0, 73, 0, 0, 73, 59, 0, 0, 76, - 83, 0, 0, 0, 0, 78, 80, 0, 0, 73, - 0, 73, 0, 0, 0, 97, 95, 0, 0, 70, - 72, 0, 0, 0, 22, 0, 65, 0, 0, 0, - 88, 0, 0, 0, 0, 0, 87, 71, 96, 67, - 68, 0, 64, 63, 73, 0, 0, 0, 89, 0, - 90, 0, 84, 86, 0, 0, 85, 93, 91, 92, - 94, 21, 0, 66, 0, 0, 0 + 0, 5, 7, 8, 6, 9, 10, 12, 0, 4, + 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[] = { 205, - 4, 5, 6, 22, 23, 24, 50, 76, 113, 44, - 45, 46, 47, 72, 55, 56, 103, 109, 25, 145, - 114, 115, 116, 117, 176, 177, 160 +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[] = { 3, - 47,-32768,-32768, 70, 169, 94, 75,-32768,-32768, 169, - 182, 171, 79, 182, 100, 125, 125, 109, 69, 77, - 111, 159,-32768,-32768,-32768,-32768, 108, 160,-32768,-32768, --32768,-32768, 190, 196, 138, 147,-32768,-32768,-32768,-32768, --32768,-32768, 144,-32768, 132,-32768, 163, 193, 197, 198, - 125, 199, 32, 200, 125,-32768, 194,-32768,-32768,-32768, --32768, 145,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 65, - 132,-32768,-32768, 161, 184, 186, 203, 204, 191, 192, - 205, 208,-32768, 26,-32768, 209, 195, 76, 201,-32768, - 143,-32768, 202,-32768, 143, 197,-32768, 210, 206, 143, --32768,-32768, 66,-32768, 207, 125, 213,-32768,-32768,-32768, - 211, 176, 212, 214,-32768, 215,-32768,-32768, 216,-32768, - 217, 143, 219,-32768, 218, 143, 220,-32768, 125, 21, - -6, 107, -6, 221, 222, -6,-32768, 223, 225,-32768, - 226, 224, -9, 227, 230,-32768,-32768, 231, 29, -6, - 76, -6, 143, 228, 28,-32768,-32768, 229, 235,-32768, --32768, 233, 240, 234,-32768, 76,-32768, 76, 236, 28, --32768, 237, -2, 5, 238, 11,-32768,-32768,-32768,-32768, --32768, 241,-32768,-32768, -6, 22, -4, -4,-32768, -4, --32768, -4,-32768,-32768, 239, 242,-32768,-32768,-32768,-32768, --32768,-32768, 243,-32768, 246, 251,-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, - 93, 265,-32768,-32768, 248, 249,-32768, 137, -16, 247, --32768, -13,-32768, 168,-32768, -44,-32768, -136, 254, -128, - -93, 105,-32768, 148, 73, -172, -81 + 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 280 - - -static const short yytable[] = { 43, - 48, 119, 52, 194, 148, 1, 123, 151, 83, 85, - 156, 157, 143, 194, 167, 156, 157, 156, 157, 65, - 67, 166, 158, 168, 156, 157, 2, 3, 135, 183, - 171, 184, 138, 144, 78, 159, 101, 188, 86, 104, - 159, 171, 159, 141, 190, 80, 193, 171, 164, 159, - 172, 80, 173, 174, 175, 142, 196, 197, 81, 169, - 82, 172, 165, 173, 174, 175, 82, 172, 7, 173, - 174, 175, 1, 28, 29, 30, 31, 32, 13, 33, - 34, 35, 36, 37, 38, 39, 40, 89, 41, 127, - 42, 189, 191, 8, 9, 51, 53, 11, 90, 91, - 26, 124, 14, 54, 125, 198, 199, 107, 200, 108, - 201, 28, 29, 30, 31, 32, 146, 33, 34, 35, - 36, 37, 38, 39, 40, 12, 41, 62, 42, 28, - 29, 30, 31, 32, 27, 33, 34, 35, 36, 37, - 38, 39, 40, 49, 41, 57, 42, 28, 111, 30, - 31, 32, 68, 33, 34, 35, 36, 37, 38, 39, - 40, 69, 112, 70, 42, 29, 30, 31, 32, 71, - 33, 34, 35, 36, 37, 38, 39, 40, 15, 41, - 88, 42, 73, 93, 16, 17, 18, 19, 20, 21, - 15, 58, 2, 3, 94, 95, 16, 17, 18, 19, - 20, 21, 35, 36, 37, 8, 9, 64, 35, 36, - 37, -75, 74, 66, 129, 87, 75, 77, 79, 84, - 96, 97, 98, 99, 80, 100, 82, 102, 105, 121, - 106, 130, 120, 140, 110, 118, 128, 137, 92, 139, - 122, 126, 186, 155, 149, 206, -74, 170, 134, 131, - 207, 133, 178, 132, 136, 179, 180, 150, 152, 153, - 154, 162, 163, 181, 195, 182, 204, 161, 10, 59, - 60, 185, 202, 203, 63, 61, 187, 192, 0, 147 +#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[] = { 16, - 17, 95, 19, 176, 133, 3, 100, 136, 53, 54, - 20, 21, 19, 186, 151, 20, 21, 20, 21, 33, - 34, 150, 32, 152, 20, 21, 24, 25, 122, 166, - 20, 168, 126, 40, 51, 45, 81, 40, 55, 84, - 45, 20, 45, 23, 40, 20, 36, 20, 20, 45, - 40, 20, 42, 43, 44, 35, 185, 36, 27, 153, - 35, 40, 34, 42, 43, 44, 35, 40, 22, 42, - 43, 44, 3, 5, 6, 7, 8, 9, 4, 11, - 12, 13, 14, 15, 16, 17, 18, 23, 20, 106, - 22, 173, 174, 24, 25, 27, 20, 5, 34, 35, - 22, 36, 10, 27, 39, 187, 188, 32, 190, 34, - 192, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 32, 20, 20, 22, 5, - 6, 7, 8, 9, 35, 11, 12, 13, 14, 15, - 16, 17, 18, 35, 20, 35, 22, 5, 6, 7, - 8, 9, 15, 11, 12, 13, 14, 15, 16, 17, - 18, 15, 20, 20, 22, 6, 7, 8, 9, 38, - 11, 12, 13, 14, 15, 16, 17, 18, 20, 20, - 36, 22, 20, 23, 26, 27, 28, 29, 30, 31, - 20, 33, 24, 25, 34, 35, 26, 27, 28, 29, - 30, 31, 13, 14, 15, 24, 25, 18, 13, 14, - 15, 36, 20, 18, 39, 22, 20, 20, 20, 20, - 37, 36, 20, 20, 20, 35, 35, 20, 20, 20, - 36, 20, 96, 129, 34, 34, 24, 20, 71, 20, - 35, 35, 170, 20, 24, 0, 36, 20, 32, 36, - 0, 36, 24, 39, 36, 21, 24, 36, 36, 35, - 35, 32, 32, 24, 24, 32, 24, 41, 4, 22, - 22, 36, 34, 32, 28, 22, 40, 40, -1, 132 +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" @@ -1031,385 +1231,656 @@ yyreduce: switch (yyn) { case 1: -#line 197 "parse.y" +#line 316 "parse.y" { ; ; break;} case 2: -#line 198 "parse.y" +#line 317 "parse.y" { ; ; break;} case 3: -#line 199 "parse.y" +#line 318 "parse.y" { ; ; break;} case 4: -#line 200 "parse.y" +#line 319 "parse.y" { ; ; break;} case 5: -#line 203 "parse.y" +#line 322 "parse.y" { - Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); + Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 6: -#line 207 "parse.y" +#line 328 "parse.y" { - Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); + Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 7: -#line 211 "parse.y" +#line 334 "parse.y" { - Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line); + Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 8: -#line 215 "parse.y" +#line 340 "parse.y" { - Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line); + Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 9: -#line 221 "parse.y" +#line 346 "parse.y" { - ((Class *)class)->nodes = class_nodes; - class_nodes = NULL; - nodes = g_list_append(nodes,class); - ; + Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); + nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); + ; break;} case 10: -#line 228 "parse.y" +#line 352 "parse.y" { - class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); - ; + Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, + ccode_line); + nodes = g_list_append(nodes,node); + g_string_free(yyvsp[0].cbuf,FALSE); + ; break;} case 11: -#line 233 "parse.y" +#line 360 "parse.y" { ; ; break;} case 12: -#line 234 "parse.y" +#line 361 "parse.y" { ; ; break;} case 13: -#line 235 "parse.y" -{ ; ; - break;} -case 14: -#line 236 "parse.y" -{ ; ; - break;} -case 15: -#line 237 "parse.y" -{ ; ; - break;} -case 16: -#line 238 "parse.y" -{ ; ; - break;} -case 17: -#line 241 "parse.y" +#line 364 "parse.y" { - push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line,NULL); + ((Class *)class)->nodes = class_nodes; + class_nodes = NULL; + nodes = g_list_append(nodes,class); ; break;} -case 18: -#line 244 "parse.y" +case 14: +#line 369 "parse.y" { - push_variable(yyvsp[-2].id,PUBLIC_SCOPE,yyvsp[-4].line,yyvsp[-1].id); + ((Class *)class)->nodes = NULL; + class_nodes = NULL; + nodes = g_list_append(nodes,class); ; break;} -case 19: -#line 247 "parse.y" +case 15: +#line 376 "parse.y" { - push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line,NULL); + class = new_class (yyvsp[-3].id, yyvsp[-1].id, + bonobo_x_class, chunk_size, NULL); ; break;} -case 20: -#line 250 "parse.y" -{ - push_variable(yyvsp[-2].id,PRIVATE_SCOPE,yyvsp[-4].line,yyvsp[-1].id); - ; +case 17: +#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 21: -#line 254 "parse.y" -{ - if(strcmp(yyvsp[-6].id,"get")==0 && - strcmp(yyvsp[-3].id,"set")==0) { - Node *node; - g_free(yyvsp[-6].id); g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-8].id,yyvsp[-9].list,yyvsp[-7].id, - yyvsp[-4].cbuf,yyvsp[-5].line, - yyvsp[-1].cbuf,yyvsp[-2].line, - yyvsp[-10].line); - class_nodes = g_list_append(class_nodes,node); - } else if(strcmp(yyvsp[-6].id,"set")==0 && - strcmp(yyvsp[-3].id,"get")==0) { - Node *node; - g_free(yyvsp[-6].id); g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-8].id,yyvsp[-9].list,yyvsp[-7].id, - yyvsp[-1].cbuf,yyvsp[-2].line, - yyvsp[-4].cbuf,yyvsp[-5].line, - yyvsp[-10].line); - class_nodes = g_list_append(class_nodes,node); +case 18: +#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 { - 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")); YYERROR; } - ; + ; + break;} +case 19: +#line 409 "parse.y" +{ ; ; + break;} +case 20: +#line 410 "parse.y" +{ ; ; + break;} +case 21: +#line 413 "parse.y" +{ ; ; break;} case 22: -#line 283 "parse.y" +#line 414 "parse.y" { - if(strcmp(yyvsp[-3].id,"get")==0) { - Node *node; - g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id, - yyvsp[-1].cbuf,yyvsp[-2].line,NULL,0, - yyvsp[-7].line); - class_nodes = g_list_append(class_nodes,node); - } else if(strcmp(yyvsp[-3].id,"set")==0) { - Node *node; - g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id, - NULL,0,yyvsp[-1].cbuf,yyvsp[-2].line, - yyvsp[-7].line); - 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); + 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 309 "parse.y" -{ yyval.list = yyvsp[-1].list; ; +#line 422 "parse.y" +{ ; ; break;} case 24: -#line 310 "parse.y" -{ yyval.list = NULL; ; +#line 423 "parse.y" +{ ; ; break;} case 25: -#line 313 "parse.y" -{ - yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); - ; +#line 424 "parse.y" +{ ; ; break;} case 26: -#line 316 "parse.y" -{ - yyval.list = g_list_append(NULL,yyvsp[0].id); - ; +#line 427 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; break;} case 27: -#line 322 "parse.y" -{ ; ; +#line 428 "parse.y" +{ the_scope = PRIVATE_SCOPE; ; break;} case 28: -#line 323 "parse.y" -{ - Type *type = typestack->data; - char *oldname = type->name; - type->name = g_strconcat("const ",oldname,NULL); - g_free(oldname); - ; +#line 429 "parse.y" +{ the_scope = PROTECTED_SCOPE; ; break;} case 29: -#line 331 "parse.y" -{ - Node *node = new_type(0,yyvsp[0].id,NULL); - typestack = g_list_prepend(typestack,node); - ; +#line 430 "parse.y" +{ the_scope = CLASS_SCOPE; ; break;} case 30: -#line 335 "parse.y" +#line 433 "parse.y" { - Node *node = new_type(stars,yyvsp[-1].id,NULL); - stars = 0; - typestack = g_list_prepend(typestack,node); - ; + if(strcmp(yyvsp[-1].id, "destroywith")==0) { + g_free(yyvsp[-1].id); + destructor = yyvsp[0].id; + destructor_line = line_no; + destructor_simple = TRUE; + } else { + g_free(yyvsp[-1].id); + g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + ; break;} case 31: -#line 342 "parse.y" +#line 446 "parse.y" { - yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); - ; + if(strcmp(yyvsp[-2].id, "destroy")==0) { + g_free(yyvsp[-2].id); + destructor = (yyvsp[0].cbuf)->str; + g_string_free(yyvsp[0].cbuf, FALSE); + destructor_line = ccode_line; + destructor_simple = FALSE; + } else { + g_free(yyvsp[-2].id); + g_string_free(yyvsp[0].cbuf, TRUE); + yyerror(_("parse error")); + YYERROR; + } + ; break;} case 32: -#line 345 "parse.y" +#line 462 "parse.y" { - yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); - ; + initializer = yyvsp[0].id; + initializer_line = ccode_line; + ; break;} case 33: -#line 348 "parse.y" +#line 466 "parse.y" { - yyval.id = g_strdup(yyvsp[0].id); - ; + initializer = (yyvsp[0].cbuf)->str; + initializer_line = ccode_line; + g_string_free(yyvsp[0].cbuf, FALSE); + ; break;} case 34: -#line 351 "parse.y" -{ - yyval.id = g_strdup("unsigned char"); - ; +#line 474 "parse.y" +{ ; ; break;} case 35: -#line 354 "parse.y" -{ - yyval.id = g_strdup("signed char"); - ; +#line 475 "parse.y" +{ ; ; break;} case 36: -#line 357 "parse.y" -{ - yyval.id = g_strdup("char"); - ; +#line 476 "parse.y" +{ destructor = NULL; ; break;} case 37: -#line 360 "parse.y" -{ - yyval.id = g_strdup("double"); - ; +#line 477 "parse.y" +{ initializer = NULL; ; break;} case 38: -#line 363 "parse.y" +#line 478 "parse.y" { - yyval.id = g_strdup("float"); - ; + destructor = NULL; + initializer = NULL; + ; break;} case 39: -#line 366 "parse.y" +#line 484 "parse.y" { - yyval.id = yyvsp[0].id; + push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} case 40: -#line 369 "parse.y" +#line 487 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); - g_free(yyvsp[0].id); + push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} case 41: -#line 373 "parse.y" +#line 491 "parse.y" { - yyval.id = yyvsp[0].id; + 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); + class_nodes = g_list_append(class_nodes,node); + } 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); + 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_list_free(yyvsp[-9].list); + g_string_free(yyvsp[-1].cbuf,TRUE); + g_string_free(yyvsp[-4].cbuf,TRUE); + yyerror(_("parse error")); + YYERROR; + } ; break;} case 42: -#line 376 "parse.y" +#line 527 "parse.y" { - yyval.id = g_strdup("void"); + 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 *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); + } 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_list_free(yyvsp[-6].list); + g_string_free(yyvsp[-1].cbuf, TRUE); + yyerror(_("parse error")); + YYERROR; + } ; break;} case 43: -#line 381 "parse.y" -{ - yyval.id = "long int"; +#line 556 "parse.y" +{ + Node *node; + char *get, *set = NULL; + Variable *var; + 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); + g_list_free(yyvsp[-3].list); + yyerror(_("parse error")); + YYERROR; + } + + type = pop_type(); + + var = find_var_or_die(yyvsp[-1].id, yyvsp[-4].line); + if(var->scope == PRIVATE_SCOPE) + root = "self->_priv"; + else if(var->scope == CLASS_SCOPE) { + root = "SELF_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) { + set = g_strdup_printf("%s->%s = ARG;", + root, yyvsp[-1].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) { + set = g_strdup_printf( + "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); + } else { + g_assert_not_reached(); + } + + 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); + + + 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); + class_nodes = g_list_append(class_nodes,node); ; break;} case 44: -#line 384 "parse.y" +#line 628 "parse.y" { - yyval.id = "long"; + if(strcmp(yyvsp[-2].id,"type")!=0) { + g_free(yyvsp[-4].id); + g_free(yyvsp[-2].id); + yyerror(_("parse error")); + YYERROR; + } + yyval.id = yyvsp[-4].id; ; break;} case 45: -#line 387 "parse.y" +#line 637 "parse.y" { - yyval.id = "short int"; + yyval.id = yyvsp[0].id; + typestack = g_list_prepend(typestack,NULL); ; break;} case 46: -#line 390 "parse.y" -{ - yyval.id = "short"; - ; +#line 643 "parse.y" +{ yyval.list = yyvsp[-1].list; ; break;} case 47: -#line 393 "parse.y" -{ - yyval.id = "int"; - ; +#line 644 "parse.y" +{ yyval.list = NULL; ; break;} case 48: -#line 398 "parse.y" +#line 647 "parse.y" { - yyval.id = "enum "; + yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} case 49: -#line 401 "parse.y" +#line 650 "parse.y" { - yyval.id = "union "; + yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 50: -#line 404 "parse.y" +#line 656 "parse.y" { - yyval.id = "struct "; - ; + Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 51: -#line 409 "parse.y" -{ stars++; ; +#line 660 "parse.y" +{ + Node *node = new_type(yyvsp[0].id, NULL, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 52: -#line 410 "parse.y" -{ stars++; ; +#line 667 "parse.y" +{ + yyval.id = yyvsp[0].id; + ; break;} case 53: -#line 413 "parse.y" +#line 670 "parse.y" { - if(strcmp(yyvsp[-1].id,"first")==0) - yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-1].id,"last")==0) - yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; - else { - yyerror(_("signal must be 'first' or 'last'")); - g_free(yyvsp[-1].id); - YYERROR; - } + yyval.id = yyvsp[0].id; + ; + break;} +case 54: +#line 673 "parse.y" +{ + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 55: +#line 677 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; + break;} +case 56: +#line 681 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 57: +#line 685 "parse.y" +{ + yyval.id = g_strconcat("const ", yyvsp[-1].id, " ", + yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 58: +#line 690 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-2].id, " ", + yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; + break;} +case 59: +#line 698 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 60: +#line 702 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); g_free(yyvsp[-1].id); + g_free(yyvsp[0].id); + ; + break;} +case 61: +#line 707 "parse.y" +{ + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 62: +#line 711 "parse.y" +{ + yyval.id = yyvsp[0].id; + ; + break;} +case 63: +#line 714 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; + break;} +case 64: +#line 718 "parse.y" +{ + yyval.id = g_strdup(yyvsp[0].id); + ; + break;} +case 65: +#line 721 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + ; + break;} +case 66: +#line 726 "parse.y" +{ yyval.id = "void"; ; + break;} +case 67: +#line 727 "parse.y" +{ yyval.id = "char"; ; + break;} +case 68: +#line 728 "parse.y" +{ yyval.id = "short"; ; + break;} +case 69: +#line 729 "parse.y" +{ yyval.id = "int"; ; + break;} +case 70: +#line 730 "parse.y" +{ yyval.id = "long"; ; + break;} +case 71: +#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 54: -#line 425 "parse.y" +case 81: +#line 748 "parse.y" { - if(strcmp(yyvsp[-2].id,"first")==0) - yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-2].id,"last")==0) - yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + 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; + else if(strcmp(yyvsp[-1].id, "last")==0) + yyval.sigtype = SIGNAL_LAST_METHOD; else { yyerror(_("signal must be 'first' or 'last'")); - g_free(yyvsp[-2].id); + g_free(yyvsp[-1].id); YYERROR; } - g_free(yyvsp[-2].id); + g_free(yyvsp[-1].id); ; break;} -case 55: -#line 437 "parse.y" +case 83: +#line 767 "parse.y" { - yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD; + yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 56: -#line 440 "parse.y" +case 84: +#line 773 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1423,154 +1894,289 @@ case 56: g_free(yyvsp[-1].id); ; break;} -case 57: -#line 452 "parse.y" +case 85: +#line 785 "parse.y" +{ + if(strcmp(yyvsp[-2].id,"first")==0) + yyval.sigtype = SIGNAL_FIRST_METHOD; + else if(strcmp(yyvsp[-2].id,"last")==0) + yyval.sigtype = SIGNAL_LAST_METHOD; + else { + yyerror(_("signal must be 'first' or 'last'")); + g_free(yyvsp[-2].id); + YYERROR; + } + g_free(yyvsp[-2].id); + ; + break;} +case 86: +#line 797 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 58: -#line 457 "parse.y" +case 87: +#line 800 "parse.y" +{ + /* the_scope was default thus public */ + the_scope = PUBLIC_SCOPE; + ; + break;} +case 88: +#line 806 "parse.y" { - gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); + gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id); ; break;} -case 59: -#line 462 "parse.y" +case 89: +#line 811 "parse.y" { - gtktypes = g_list_append(gtktypes,yyvsp[0].id); + gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 60: -#line 465 "parse.y" +case 90: +#line 814 "parse.y" { - gtktypes = g_list_append(gtktypes,yyvsp[0].id); + gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 61: -#line 470 "parse.y" -{ yyval.cbuf=yyvsp[0].cbuf; ; +case 91: +#line 819 "parse.y" +{ yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 62: -#line 471 "parse.y" +case 92: +#line 820 "parse.y" { yyval.cbuf = NULL; ; break;} -case 63: -#line 475 "parse.y" +case 93: +#line 824 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); + 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(yyvsp[-7].sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, - ccode_line,vararg); + 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 64: -#line 485 "parse.y" +case 94: +#line 840 "parse.y" +{ + if(!has_self) { + yyerror(_("signal without 'self' as " + "first parameter")); + 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 95: +#line 856 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); + free_all_global_state(); YYERROR; } - push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line, - ccode_line,vararg); + 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 65: -#line 495 "parse.y" +case 96: +#line 872 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " "first parameter")); + free_all_global_state(); YYERROR; } - push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line, - ccode_line,vararg); + 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 66: -#line 505 "parse.y" +case 97: +#line 888 "parse.y" { - push_function(OVERRIDE_METHOD, yyvsp[-9].id, - yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf, - yyvsp[-11].line,yyvsp[-1].line, - vararg); + if(!has_self) { + yyerror(_("virtual method without 'self' as " + "first parameter")); + free_all_global_state(); + YYERROR; + } + push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL, + yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line, + ccode_line, vararg, NULL); ; break;} -case 67: -#line 511 "parse.y" +case 98: +#line 899 "parse.y" { - push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, - vararg); - ; + push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, + yyvsp[-5].id, yyvsp[0].cbuf, + yyvsp[-10].line, ccode_line, + vararg, NULL); + ; break;} -case 68: -#line 516 "parse.y" +case 99: +#line 905 "parse.y" { - push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line, - vararg); + 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 69: -#line 521 "parse.y" +case 100: +#line 915 "parse.y" { - if(strcmp(yyvsp[-4].id,"init")==0) { + if(strcmp(yyvsp[-4].id, "init")==0) { push_init_arg(yyvsp[-2].id,FALSE); - push_function(INIT_METHOD, NULL, - yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line, - ccode_line,FALSE); - } else if(strcmp(yyvsp[-4].id,"class_init")==0) { + push_function(NO_SCOPE, INIT_METHOD, NULL, + yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line, + ccode_line, FALSE, NULL); + } else if(strcmp(yyvsp[-4].id, "class_init")==0) { push_init_arg(yyvsp[-2].id,TRUE); - push_function(CLASS_INIT_METHOD, NULL, - yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line, - ccode_line,FALSE); + push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, + yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line, + ccode_line, FALSE, NULL); } else { g_free(yyvsp[-4].id); g_free(yyvsp[-2].id); - g_string_free(yyvsp[-2].cbuf,TRUE); + g_string_free(yyvsp[0].cbuf,TRUE); + yyerror(_("parse error " + "(untyped blocks must be init or " + "class_init)")); + YYERROR; + } + ; + break;} +case 101: +#line 938 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) { + g_free(yyvsp[-1].id); + g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + g_free(yyvsp[-1].id); + ; + break;} +case 102: +#line 949 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + if(!set_return_value(yyvsp[-3].id, yyvsp[-2].id)) { + g_free(yyvsp[-3].id); g_free(yyvsp[-2].id); + g_free(yyvsp[-1].id); g_free(yyvsp[0].id); yyerror(_("parse error")); YYERROR; } + if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) { + onerror = defreturn = NULL; + g_free(yyvsp[-3].id); g_free(yyvsp[-2].id); + g_free(yyvsp[-1].id); g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + g_free(yyvsp[-3].id); + g_free(yyvsp[-1].id); ; break;} -case 70: -#line 542 "parse.y" +case 103: +#line 968 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + ; + break;} +case 104: +#line 974 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 71: -#line 543 "parse.y" +case 105: +#line 975 "parse.y" { - yyval.id = (yyvsp[0].cbuf)->str; - g_string_free(yyvsp[0].cbuf,FALSE); + yyval.id = (yyvsp[1].cbuf)->str; + g_string_free(yyvsp[1].cbuf, FALSE); ; break;} -case 72: -#line 547 "parse.y" -{ ; ; +case 106: +#line 981 "parse.y" +{ vararg = FALSE; has_self = FALSE; ; break;} -case 73: -#line 548 "parse.y" -{ yyval.id = NULL; ; +case 107: +#line 982 "parse.y" +{ + vararg = FALSE; + has_self = TRUE; + if(strcmp(yyvsp[0].id,"self")==0) + push_self(yyvsp[0].id, FALSE); + else { + g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + ; break;} -case 74: -#line 551 "parse.y" -{ vararg = FALSE; has_self = FALSE; ; +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 75: -#line 552 "parse.y" +case 109: +#line 1004 "parse.y" { vararg = FALSE; has_self = TRUE; if(strcmp(yyvsp[0].id,"self")==0) - push_self(yyvsp[0].id); + push_self(yyvsp[0].id, TRUE); else { g_free(yyvsp[0].id); yyerror(_("parse error")); @@ -1578,12 +2184,12 @@ case 75: } ; break;} -case 76: -#line 563 "parse.y" +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")); @@ -1591,40 +2197,66 @@ case 76: } ; break;} -case 77: -#line 573 "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 78: -#line 576 "parse.y" +case 114: +#line 1048 "parse.y" { vararg = TRUE; ; break;} -case 79: -#line 577 "parse.y" +case 115: +#line 1049 "parse.y" { vararg = FALSE; ; break;} -case 80: -#line 580 "parse.y" +case 116: +#line 1052 "parse.y" { ; ; break;} -case 81: -#line 581 "parse.y" +case 117: +#line 1053 "parse.y" { ; ; break;} -case 82: -#line 584 "parse.y" +case 118: +#line 1056 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 83: -#line 587 "parse.y" +case 119: +#line 1059 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 84: -#line 590 "parse.y" +case 120: +#line 1062 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1634,8 +2266,8 @@ case 84: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 85: -#line 598 "parse.y" +case 121: +#line 1070 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1645,16 +2277,16 @@ case 85: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 86: -#line 608 "parse.y" +case 122: +#line 1080 "parse.y" { ; ; break;} -case 87: -#line 609 "parse.y" +case 123: +#line 1081 "parse.y" { ; ; break;} -case 88: -#line 612 "parse.y" +case 124: +#line 1084 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1669,61 +2301,61 @@ case 88: g_free(yyvsp[0].id); ; break;} -case 89: -#line 625 "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 90: -#line 629 "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 91: -#line 633 "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 92: -#line 637 "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 93: -#line 641 "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 94: -#line 645 "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 95: -#line 651 "parse.y" +case 131: +#line 1123 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 96: -#line 652 "parse.y" +case 132: +#line 1124 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 97: -#line 656 "parse.y" +case 133: +#line 1128 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -1948,5 +2580,5 @@ yyerrhandle: } return 1; } -#line 659 "parse.y" +#line 1131 "parse.y"