X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/b17287deb56775a49030d738d8c8c0e9cd15f9fe..refs/tags/v1.0.11:/src/parse.c diff --git a/src/parse.c b/src/parse.c index b70b550..d8e8db7 100644 --- a/src/parse.c +++ b/src/parse.c @@ -20,20 +20,20 @@ #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 HTCODE 279 -#define PHCODE 280 -#define HCODE 281 -#define ACODE 282 -#define ATCODE 283 -#define PUBLIC 284 -#define PRIVATE 285 -#define PROTECTED 286 +#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 @@ -45,9 +45,10 @@ #include "config.h" #include #include +#include #include -#include "tree.h" +#include "treefuncs.h" #include "main.h" #include "util.h" @@ -58,12 +59,24 @@ 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; @@ -88,17 +101,17 @@ 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); @@ -120,23 +133,28 @@ push_variable(char *name, int scope, int line_no, char *postfix) 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, int method, char *oid, char *id, char *onerror, - GString *cbuf, int line_no, int ccode_line, gboolean vararg, - GList *flags) +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(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 @@ -146,10 +164,21 @@ push_function(int scope, int method, char *oid, char *id, char *onerror, g_list_length(gtktypes) != g_list_length(funcargs) && !(g_list_length(funcargs) == 1 && g_list_length(gtktypes) == 2 && - strcmp(gtktypes->next->data,"NONE")==0)) { - print_error(TRUE, _("The number of GTK arguments and " - "function arguments for a signal " - "don't seem to match"),line_no); + strcmp(gtktypes->next->data, "NONE")==0)) { + error_print(GOB_WARN, line_no, + _("The number of GTK arguments and " + "function arguments for a signal " + "don't seem to match")); + } + if(g_list_length(gtktypes) > 2) { + GList *li; + for(li = gtktypes->next; li; li = li->next) { + if(strcmp(li->data, "NONE")==0) { + error_print(GOB_ERROR, line_no, + _("NONE can only appear in an " + "argument list by itself")); + } + } } if(cbuf) { char *p; @@ -162,8 +191,11 @@ push_function(int scope, int method, char *oid, char *id, char *onerror, c_cbuf = NULL; node = new_method(scope, method, type, oid, gtktypes, flags, - id, funcargs, onerror, c_cbuf, line_no, - ccode_line, vararg); + 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, @@ -173,9 +205,31 @@ push_function(int scope, int method, char *oid, char *id, char *onerror, 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) { @@ -184,7 +238,7 @@ push_funcarg(char *name, char *postfix) type->postfix = postfix; - node = new_funcarg(type,name,checks); + node = new_funcarg(type, name, checks); checks = NULL; funcargs = g_list_append(funcargs, node); @@ -202,26 +256,148 @@ 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 203 "parse.y" +static void +export_accessors (const char *var_name, + const char *get_cbuf, + int get_lineno, + const char *set_cbuf, + int set_lineno, + Type *type, + const char *gtktype, + int lineno) +{ + if (type == NULL) { + char *cast = g_strdup (get_cast (gtktype, FALSE)); + char *p = strchr (cast, ' '); + if (p != NULL) { + *p = '\0'; + p++; + } + /* leak, but we don't really care any more */ + type = (Type *)new_type (cast, + g_strdup (p), + NULL); + } + + if (get_cbuf != NULL) { + char *get_id = g_strdup_printf ("get_%s", var_name); + GString *get_cbuf_copy = g_string_new (get_cbuf); + char *tmp; + Node *node1 = new_type (g_strdup (type->name), + g_strdup (type->pointer), + g_strdup (type->postfix)); + Node *node3 = new_type (g_strdup (class->class.otype), + g_strdup ("*"), + 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 != NULL) { + char *set_id = g_strdup_printf ("set_%s", var_name); + GString *set_cbuf_copy = g_string_new (set_cbuf); + Node *node1 = new_type (g_strdup (type->name), + g_strdup (type->pointer), + g_strdup (type->postfix)); + Node *node2 = new_type (g_strdup ("void"), + NULL, + NULL); + Node *node3 = new_type (g_strdup (class->class.otype), + g_strdup ("*"), + 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 379 "parse.y" typedef union { char *id; GString *cbuf; @@ -243,26 +419,26 @@ typedef union { -#define YYFINAL 225 +#define YYFINAL 274 #define YYFLAG -32768 #define YYNTBASE 50 -#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 82) +#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, 48, 2, 2, 2, 2, 2, 2, 40, - 41, 43, 2, 44, 49, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 39, 46, - 47, 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, 37, 42, 38, 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, @@ -284,74 +460,90 @@ static const char yytranslate[] = { 0, #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, 49, 52, 54, - 56, 58, 60, 62, 64, 69, 75, 87, 96, 102, - 104, 108, 109, 113, 115, 117, 120, 122, 125, 128, - 131, 133, 136, 139, 141, 143, 145, 147, 150, 152, - 154, 157, 159, 162, 164, 166, 168, 170, 172, 175, - 177, 180, 182, 186, 190, 193, 195, 200, 204, 206, - 209, 211, 222, 234, 244, 254, 263, 275, 284, 290, - 293, 297, 298, 300, 302, 306, 308, 312, 314, 318, - 320, 323, 327, 334, 342, 345, 347, 349, 352, 355, - 359, 363, 367, 371, 373, 376 + 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[] = { 52, 53, 52, 0, 53, 52, 0, 52, 53, 0, 53, - 0, 24, 0, 27, 0, 25, 0, 26, 0, 28, - 0, 29, 0, 52, 51, 0, 51, 0, 54, 37, - 55, 38, 0, 54, 37, 38, 0, 3, 22, 4, - 22, 0, 55, 73, 0, 55, 57, 0, 55, 58, - 0, 73, 0, 57, 0, 58, 0, 30, 0, 31, - 0, 32, 0, 56, 62, 20, 39, 0, 56, 62, - 20, 23, 39, 0, 33, 60, 59, 20, 20, 37, - 24, 20, 37, 24, 39, 0, 33, 60, 59, 20, - 20, 37, 24, 39, 0, 20, 40, 20, 62, 41, - 0, 20, 0, 40, 61, 41, 0, 0, 20, 42, - 61, 0, 20, 0, 63, 0, 5, 63, 0, 64, - 0, 64, 67, 0, 12, 65, 0, 11, 65, 0, - 65, 0, 12, 18, 0, 11, 18, 0, 18, 0, - 17, 0, 16, 0, 20, 0, 66, 20, 0, 22, - 0, 6, 0, 13, 15, 0, 13, 0, 14, 15, - 0, 14, 0, 15, 0, 9, 0, 8, 0, 7, - 0, 43, 67, 0, 43, 0, 20, 70, 0, 70, - 0, 56, 20, 70, 0, 20, 56, 70, 0, 56, - 70, 0, 68, 0, 20, 40, 71, 41, 0, 71, - 44, 20, 0, 20, 0, 37, 24, 0, 39, 0, - 35, 60, 69, 62, 20, 40, 75, 41, 74, 72, - 0, 56, 35, 60, 68, 62, 20, 40, 75, 41, - 74, 72, 0, 34, 56, 62, 20, 40, 75, 41, - 74, 72, 0, 56, 34, 62, 20, 40, 75, 41, - 74, 72, 0, 34, 62, 20, 40, 75, 41, 74, - 72, 0, 36, 40, 22, 41, 62, 20, 40, 75, - 41, 74, 72, 0, 56, 62, 20, 40, 75, 41, - 74, 72, 0, 20, 40, 20, 41, 72, 0, 19, - 81, 0, 19, 37, 24, 0, 0, 6, 0, 20, - 0, 20, 44, 76, 0, 76, 0, 77, 44, 10, - 0, 77, 0, 77, 44, 78, 0, 78, 0, 62, - 20, 0, 62, 20, 23, 0, 62, 20, 40, 20, - 79, 41, 0, 62, 20, 23, 40, 20, 79, 41, - 0, 79, 80, 0, 80, 0, 20, 0, 45, 81, - 0, 46, 81, 0, 45, 47, 81, 0, 46, 47, - 81, 0, 47, 47, 81, 0, 48, 47, 81, 0, - 21, 0, 49, 21, 0, 20, 0 + 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, 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, - 222, 223, 224, 225, 228, 234, 240, 246, 252, 258, - 266, 267, 270, 275, 282, 287, 288, 289, 290, 291, - 292, 295, 296, 297, 300, 303, 307, 342, 372, 381, - 387, 388, 391, 394, 400, 401, 409, 413, 420, 423, - 426, 429, 432, 435, 438, 441, 444, 447, 451, 454, - 459, 462, 465, 468, 471, 476, 479, 482, 487, 488, - 492, 504, 510, 522, 534, 537, 543, 548, 551, 556, - 557, 561, 571, 581, 591, 601, 611, 617, 622, 643, - 644, 648, 651, 652, 663, 673, 676, 677, 680, 681, - 684, 687, 690, 698, 708, 709, 712, 725, 729, 733, - 737, 741, 745, 751, 752, 756 + 397, 398, 399, 400, 403, 409, 415, 421, 427, 433, + 441, 442, 445, 450, 457, 463, 464, 476, 490, 491, + 494, 495, 503, 504, 505, 508, 509, 510, 511, 514, + 527, 543, 547, 555, 556, 557, 558, 559, 565, 568, + 573, 637, 689, 775, 783, 785, 794, 800, 801, 804, + 807, 813, 817, 824, 827, 830, 834, 838, 842, 847, + 855, 859, 864, 868, 871, 875, 878, 883, 884, 885, + 886, 887, 888, 889, 890, 891, 894, 895, 896, 899, + 900, 901, 905, 912, 924, 930, 942, 954, 957, 963, + 968, 971, 976, 977, 981, 997, 1013, 1029, 1045, 1056, + 1062, 1072, 1095, 1106, 1125, 1131, 1132, 1138, 1139, 1150, + 1161, 1172, 1182, 1192, 1202, 1205, 1206, 1209, 1210, 1213, + 1216, 1219, 1227, 1237, 1238, 1241, 1254, 1258, 1262, 1266, + 1270, 1274, 1280, 1281, 1285 }; #endif @@ -360,185 +552,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","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE", -"PROTECTED","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","';'","'('", -"')'","'|'","'*'","','","'>'","'<'","'='","'!'","'-'","prog","ccode","ccodes", -"class","classdec","classcode","scope","variable","argument","argtype","flags", -"flaglist","type","type1","type2","integer","tspecifier","stars","simplesigtype", -"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","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, 50, 50, 50, 50, 51, 51, 51, 51, 51, 51, - 52, 52, 53, 53, 54, 55, 55, 55, 55, 55, - 55, 56, 56, 56, 57, 57, 58, 58, 59, 59, - 60, 60, 61, 61, 62, 62, 63, 63, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, - 65, 65, 65, 65, 65, 66, 66, 66, 67, 67, - 68, 68, 69, 69, 69, 69, 70, 71, 71, 72, - 72, 73, 73, 73, 73, 73, 73, 73, 73, 74, - 74, 74, 75, 75, 75, 75, 76, 76, 77, 77, - 78, 78, 78, 78, 79, 79, 80, 80, 80, 80, - 80, 80, 80, 81, 81, 81 + 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, 2, 2, 1, 1, - 1, 1, 1, 1, 4, 5, 11, 8, 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, - 3, 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 + 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, 32, 0, 32, 0, 14, 0, 0, 20, - 21, 19, 15, 0, 0, 0, 0, 50, 58, 57, - 56, 0, 0, 52, 54, 55, 46, 45, 44, 47, - 49, 0, 0, 35, 37, 41, 0, 0, 0, 13, - 17, 18, 16, 0, 32, 0, 0, 34, 0, 30, - 0, 36, 43, 40, 42, 39, 51, 53, 0, 0, - 60, 38, 48, 0, 0, 66, 0, 62, 0, 0, - 0, 0, 0, 0, 31, 0, 0, 0, 0, 59, - 0, 0, 0, 61, 0, 65, 0, 0, 0, 0, - 0, 0, 25, 0, 0, 71, 79, 33, 0, 0, - 0, 50, 47, 0, 0, 86, 88, 90, 69, 0, - 64, 63, 0, 0, 0, 0, 26, 0, 70, 0, - 0, 0, 0, 91, 82, 0, 67, 0, 0, 0, - 0, 0, 82, 29, 0, 82, 85, 92, 0, 0, - 0, 87, 89, 68, 0, 0, 82, 0, 0, 0, - 28, 0, 0, 0, 106, 104, 0, 0, 80, 76, - 82, 0, 0, 0, 78, 0, 74, 0, 97, 0, - 0, 0, 0, 0, 96, 81, 105, 0, 82, 75, - 82, 0, 0, 0, 98, 0, 99, 0, 0, 93, - 95, 72, 0, 0, 27, 94, 100, 101, 102, 103, - 77, 73, 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[] = { 223, - 8, 9, 10, 11, 28, 29, 30, 31, 71, 36, - 69, 124, 54, 55, 56, 57, 82, 86, 87, 88, - 130, 117, 32, 161, 125, 126, 127, 128, 194, 195, - 179 +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, - 4,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 136, 119, - 32, 10,-32768, 119, 119, 146, 67, 119, 40,-32768, --32768,-32768, 57, 120, 57, 68,-32768, 155, 59,-32768, --32768,-32768,-32768, 78, 95, 96, 242,-32768,-32768,-32768, --32768, 252, 258, 115, 126,-32768,-32768,-32768,-32768,-32768, --32768, 207, 129,-32768, 113,-32768, 137, 70, 151,-32768, --32768,-32768,-32768, 207, 57, 138, 133, 141, 167, 152, - 190,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 197, 186, - 113,-32768,-32768, 2, 208,-32768, 207,-32768, 194, 224, - 226, -19, 131, 95,-32768, 232, 241, 223, 225,-32768, - 228, 249, 254,-32768, -4,-32768, 255, 207, 237, -4, - 207, 239,-32768, 225, 256,-32768,-32768,-32768, 207, 244, - 225, 238, 47, 262, 243,-32768, 245,-32768,-32768, 66, --32768,-32768, 246, 263, 225, 265,-32768, 247,-32768, 250, - 266, 251, 207, 7, 268, 189,-32768, 273, 225, 257, - 253, 259, 268,-32768, -1, 268,-32768, 260, 275, -10, - 131,-32768,-32768,-32768, 261, 225, 268, 225, 131, 264, --32768, 131, 276, 76,-32768,-32768, 274, 282,-32768,-32768, - 268, 267, 131, 269,-32768, 280,-32768, 76,-32768, 62, - 65, 270, 271, 58,-32768,-32768,-32768, 131, 268,-32768, - 268, 272, 72, -8,-32768, -8,-32768, -8, -8,-32768, --32768,-32768, 131, 131,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768, 305, 306,-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, - 37, 145, 298,-32768,-32768, -23, 281, 284,-32768, -17, - 219, -24, 277,-32768, 15,-32768, 234, 229,-32768, -60, --32768, -154, 288, -150, -112, 176,-32768, 175, 134, -141, - -37 + 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 322 - - -static const short yytable[] = { 53, - 52, 138, 169, 112, 66, 172, 180, 58, 142, 175, - 176, 175, 176, 17, 185, 101, 183, 187, 170, 113, - 114, 101, 151, 104, 106, 12, 177, 79, 200, 158, - 198, 20, 21, 22, 85, 102, 165, 171, 178, 90, - 178, 102, 131, 212, 132, 13, 159, 91, 213, 104, - 214, 13, 211, 182, 13, 184, 74, 76, 221, 222, - 103, 211, 107, 37, 38, 39, 40, 41, 16, 42, - 43, 44, 45, 46, 47, 48, 49, 189, 50, 34, - 51, 175, 176, 134, 175, 176, 136, -84, 33, 84, - 143, 189, 64, 65, 140, 189, 35, 67, 210, 20, - 21, 22, 190, 191, 192, 193, 147, 59, 204, 148, - 178, 206, 216, 178, 68, 70, 190, 191, 192, 193, - 190, 191, 192, 193, 37, 38, 39, 40, 41, 77, - 42, 43, 44, 45, 46, 47, 48, 49, 1, 50, - 78, 51, 2, 3, 4, 5, 6, 7, 80, 20, - 21, 22, 205, 207, 15, 81, 83, 92, 18, 2, - 3, 4, 5, 6, 7, 19, 217, 115, 218, 116, - 219, 220, 89, 93, 19, 20, 21, 22, 23, 24, - 25, 26, 94, 27, 20, 21, 22, 23, 24, 25, - 26, 96, 60, 37, 38, 39, 40, 41, 162, 42, - 43, 44, 45, 46, 47, 48, 49, 95, 50, 97, - 51, 37, 38, 39, 40, 41, 98, 42, 43, 44, - 45, 46, 47, 48, 49, 99, 50, 105, 51, 37, - 122, 39, 40, 41, 108, 42, 43, 44, 45, 46, - 47, 48, 49, 109, 123, 110, 51, 38, 39, 40, - 41, 119, 42, 43, 44, 45, 46, 47, 48, 49, - 120, 50, 121, 51, 44, 45, 46, 102, 129, 73, - 44, 45, 46, 101, 133, 75, 135, 137, -83, 139, - 141, 144, 150, 145, 152, 149, 160, 153, 146, 155, - 154, 156, 164, 167, 174, 188, 166, 196, 168, 173, - 186, 181, 197, 202, 224, 225, 14, 199, 61, 201, - 215, 62, 118, 72, 100, 63, 208, 209, 157, 111, - 163, 203 +#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[] = { 24, - 24, 114, 153, 23, 29, 156, 161, 25, 121, 20, - 21, 20, 21, 4, 169, 20, 167, 172, 20, 39, - 40, 20, 135, 84, 85, 22, 37, 52, 183, 23, - 181, 30, 31, 32, 58, 40, 149, 39, 49, 64, - 49, 40, 103, 198, 105, 9, 40, 65, 199, 110, - 201, 15, 194, 166, 18, 168, 42, 43, 213, 214, - 84, 203, 87, 5, 6, 7, 8, 9, 37, 11, - 12, 13, 14, 15, 16, 17, 18, 20, 20, 40, - 22, 20, 21, 108, 20, 21, 111, 41, 22, 20, - 44, 20, 34, 35, 119, 20, 40, 20, 41, 30, - 31, 32, 45, 46, 47, 48, 41, 40, 47, 44, - 49, 47, 41, 49, 20, 20, 45, 46, 47, 48, - 45, 46, 47, 48, 5, 6, 7, 8, 9, 15, - 11, 12, 13, 14, 15, 16, 17, 18, 3, 20, - 15, 22, 24, 25, 26, 27, 28, 29, 20, 30, - 31, 32, 190, 191, 10, 43, 20, 20, 14, 24, - 25, 26, 27, 28, 29, 20, 204, 37, 206, 39, - 208, 209, 22, 41, 20, 30, 31, 32, 33, 34, - 35, 36, 42, 38, 30, 31, 32, 33, 34, 35, - 36, 40, 38, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 41, 20, 20, - 22, 5, 6, 7, 8, 9, 20, 11, 12, 13, - 14, 15, 16, 17, 18, 40, 20, 20, 22, 5, - 6, 7, 8, 9, 41, 11, 12, 13, 14, 15, - 16, 17, 18, 20, 20, 20, 22, 6, 7, 8, - 9, 20, 11, 12, 13, 14, 15, 16, 17, 18, - 20, 20, 40, 22, 13, 14, 15, 40, 20, 18, - 13, 14, 15, 20, 20, 18, 40, 39, 41, 24, - 37, 20, 20, 41, 20, 40, 19, 41, 44, 24, - 41, 41, 20, 41, 20, 20, 40, 24, 40, 40, - 37, 41, 21, 24, 0, 0, 9, 41, 28, 41, - 39, 28, 94, 37, 81, 28, 47, 47, 143, 91, - 146, 188 +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" @@ -1084,23 +1313,23 @@ yyreduce: switch (yyn) { case 1: -#line 222 "parse.y" +#line 397 "parse.y" { ; ; break;} case 2: -#line 223 "parse.y" +#line 398 "parse.y" { ; ; break;} case 3: -#line 224 "parse.y" +#line 399 "parse.y" { ; ; break;} case 4: -#line 225 "parse.y" +#line 400 "parse.y" { ; ; break;} case 5: -#line 228 "parse.y" +#line 403 "parse.y" { Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1109,7 +1338,7 @@ case 5: ; break;} case 6: -#line 234 "parse.y" +#line 409 "parse.y" { Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1118,7 +1347,7 @@ case 6: ; break;} case 7: -#line 240 "parse.y" +#line 415 "parse.y" { Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1127,7 +1356,7 @@ case 7: ; break;} case 8: -#line 246 "parse.y" +#line 421 "parse.y" { Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1136,7 +1365,7 @@ case 8: ; break;} case 9: -#line 252 "parse.y" +#line 427 "parse.y" { Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1145,7 +1374,7 @@ case 9: ; break;} case 10: -#line 258 "parse.y" +#line 433 "parse.y" { Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, ccode_line); @@ -1154,15 +1383,15 @@ case 10: ; break;} case 11: -#line 266 "parse.y" +#line 441 "parse.y" { ; ; break;} case 12: -#line 267 "parse.y" +#line 442 "parse.y" { ; ; break;} case 13: -#line 270 "parse.y" +#line 445 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; @@ -1170,7 +1399,7 @@ case 13: ; break;} case 14: -#line 275 "parse.y" +#line 450 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; @@ -1178,330 +1407,625 @@ case 14: ; break;} case 15: -#line 282 "parse.y" +#line 457 "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 287 "parse.y" -{ ; ; - break;} case 17: -#line 288 "parse.y" -{ ; ; +#line 464 "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 289 "parse.y" -{ ; ; +#line 476 "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 290 "parse.y" +#line 490 "parse.y" { ; ; break;} case 20: -#line 291 "parse.y" +#line 491 "parse.y" { ; ; break;} case 21: -#line 292 "parse.y" +#line 494 "parse.y" { ; ; break;} case 22: -#line 295 "parse.y" -{ the_scope = PUBLIC_SCOPE; ; +#line 495 "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 296 "parse.y" -{ the_scope = PRIVATE_SCOPE; ; +#line 503 "parse.y" +{ ; ; break;} case 24: -#line 297 "parse.y" -{ the_scope = PROTECTED_SCOPE; ; +#line 504 "parse.y" +{ ; ; break;} case 25: -#line 300 "parse.y" -{ - push_variable(yyvsp[-1].id,the_scope,yyvsp[-3].line,NULL); - ; +#line 505 "parse.y" +{ ; ; break;} case 26: -#line 303 "parse.y" -{ - push_variable(yyvsp[-2].id,the_scope,yyvsp[-4].line,yyvsp[-1].id); - ; +#line 508 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; break;} case 27: -#line 307 "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); - 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_string_free(yyvsp[-1].cbuf,TRUE); - g_string_free(yyvsp[-4].cbuf,TRUE); - yyerror(_("parse error")); - YYERROR; - } - ; +#line 509 "parse.y" +{ the_scope = PRIVATE_SCOPE; ; break;} case 28: -#line 342 "parse.y" +#line 510 "parse.y" +{ the_scope = PROTECTED_SCOPE; ; + break;} +case 29: +#line 511 "parse.y" +{ the_scope = CLASS_SCOPE; ; + break;} +case 30: +#line 514 "parse.y" { - 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); + 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[-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[-1].id); + g_free(yyvsp[0].id); yyerror(_("parse error")); YYERROR; } - ; + ; break;} -case 29: -#line 372 "parse.y" +case 31: +#line 527 "parse.y" { - if(strcmp(yyvsp[-2].id,"type")!=0) { - g_free(yyvsp[-4].id); + 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; } - yyval.id = yyvsp[-4].id; - ; - break;} -case 30: -#line 381 "parse.y" -{ - yyval.id = yyvsp[0].id; - typestack = g_list_prepend(typestack,NULL); - ; - break;} -case 31: -#line 387 "parse.y" -{ yyval.list = yyvsp[-1].list; ; + ; break;} case 32: -#line 388 "parse.y" -{ yyval.list = NULL; ; +#line 543 "parse.y" +{ + initializer = yyvsp[0].id; + initializer_line = ccode_line; + ; break;} case 33: -#line 391 "parse.y" +#line 547 "parse.y" { - yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); - ; + initializer = (yyvsp[0].cbuf)->str; + initializer_line = ccode_line; + g_string_free(yyvsp[0].cbuf, FALSE); + ; break;} case 34: -#line 394 "parse.y" -{ - yyval.list = g_list_append(NULL,yyvsp[0].id); - ; +#line 555 "parse.y" +{ ; ; break;} case 35: -#line 400 "parse.y" +#line 556 "parse.y" { ; ; break;} case 36: -#line 401 "parse.y" -{ - Type *type = typestack->data; - char *oldname = type->name; - type->name = g_strconcat("const ",oldname,NULL); - g_free(oldname); - ; +#line 557 "parse.y" +{ destructor = NULL; ; break;} case 37: -#line 409 "parse.y" -{ - Node *node = new_type(0,yyvsp[0].id,NULL); - typestack = g_list_prepend(typestack,node); - ; +#line 558 "parse.y" +{ initializer = NULL; ; break;} case 38: -#line 413 "parse.y" +#line 559 "parse.y" { - Node *node = new_type(stars,yyvsp[-1].id,NULL); - stars = 0; - typestack = g_list_prepend(typestack,node); - ; + destructor = NULL; + initializer = NULL; + ; break;} case 39: -#line 420 "parse.y" +#line 565 "parse.y" { - yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); + push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} case 40: -#line 423 "parse.y" +#line 568 "parse.y" { - yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); + push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} case 41: -#line 426 "parse.y" +#line 573 "parse.y" { - yyval.id = g_strdup(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[-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)->str, yyvsp[-5].line, + (yyvsp[-1].cbuf)->str, yyvsp[-2].line, + type, + yyvsp[-9].id, + yyvsp[-11].line); + g_free (yyvsp[-7].id); + } + + 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[-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); + + if (yyvsp[-7].id) { + export_accessors (yyvsp[-8].id, + (yyvsp[-1].cbuf)->str, yyvsp[-2].line, + (yyvsp[-4].cbuf)->str, yyvsp[-5].line, + type, + yyvsp[-9].id, + yyvsp[-11].line); + g_free (yyvsp[-7].id); + } + + 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[-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 42: -#line 429 "parse.y" +#line 637 "parse.y" { - yyval.id = g_strdup("unsigned char"); + if(strcmp(yyvsp[-3].id, "get") == 0) { + Node *node; + Type *type = pop_type(); + 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)->str, yyvsp[-2].line, + NULL, 0, + type, + yyvsp[-6].id, + yyvsp[-8].line); + g_free (yyvsp[-4].id); + } + + 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[-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)->str, yyvsp[-2].line, + type, + yyvsp[-6].id, + yyvsp[-8].line); + g_free (yyvsp[-4].id); + } + + g_string_free (yyvsp[-1].cbuf, FALSE); + class_nodes = g_list_append (class_nodes, node); + } else { + 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 43: -#line 432 "parse.y" -{ - yyval.id = g_strdup("signed char"); +#line 689 "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[-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[-2].id, yyvsp[-5].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[-5].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[-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[-2].id, + root, yyvsp[-2].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[-2].id, + root, yyvsp[-2].id, + root, yyvsp[-2].id); + } else { + g_assert_not_reached(); + } + + 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); + + + if(!type) + type = copy_type(var->vtype); + + 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, + get, yyvsp[-5].line, + set, yyvsp[-5].line, + type, + yyvsp[-3].id, + yyvsp[-5].line); + g_free (yyvsp[-1].id); + } + + class_nodes = g_list_append(class_nodes,node); ; break;} case 44: -#line 435 "parse.y" +#line 775 "parse.y" { - yyval.id = g_strdup("char"); - ; + 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 438 "parse.y" -{ - yyval.id = g_strdup("double"); - ; +#line 783 "parse.y" +{ yyval.id = NULL; ; break;} case 46: -#line 441 "parse.y" +#line 785 "parse.y" { - yyval.id = g_strdup("float"); + 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 47: -#line 444 "parse.y" +#line 794 "parse.y" { yyval.id = yyvsp[0].id; + typestack = g_list_prepend(typestack,NULL); ; break;} case 48: -#line 447 "parse.y" -{ - yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); - g_free(yyvsp[0].id); - ; +#line 800 "parse.y" +{ yyval.list = yyvsp[-1].list; ; break;} case 49: -#line 451 "parse.y" -{ - yyval.id = yyvsp[0].id; - ; +#line 801 "parse.y" +{ yyval.list = NULL; ; break;} case 50: -#line 454 "parse.y" +#line 804 "parse.y" { - yyval.id = g_strdup("void"); + yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} case 51: -#line 459 "parse.y" +#line 807 "parse.y" { - yyval.id = "long int"; + yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 52: -#line 462 "parse.y" +#line 813 "parse.y" { - yyval.id = "long"; - ; + Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 53: -#line 465 "parse.y" +#line 817 "parse.y" { - yyval.id = "short int"; - ; + Node *node = new_type(yyvsp[0].id, NULL, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 54: -#line 468 "parse.y" +#line 824 "parse.y" { - yyval.id = "short"; - ; + yyval.id = yyvsp[0].id; + ; break;} case 55: -#line 471 "parse.y" +#line 827 "parse.y" { - yyval.id = "int"; - ; + yyval.id = yyvsp[0].id; + ; break;} case 56: -#line 476 "parse.y" +#line 830 "parse.y" { - yyval.id = "enum "; - ; + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 57: -#line 479 "parse.y" +#line 834 "parse.y" { - yyval.id = "union "; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 58: -#line 482 "parse.y" +#line 838 "parse.y" { - yyval.id = "struct "; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 59: -#line 487 "parse.y" -{ stars++; ; +#line 842 "parse.y" +{ + yyval.id = g_strconcat("const ", yyvsp[-1].id, " ", + yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} case 60: -#line 488 "parse.y" -{ stars++; ; +#line 847 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-2].id, " ", + yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} case 61: -#line 492 "parse.y" +#line 855 "parse.y" { - if(strcmp(yyvsp[-1].id,"first")==0) + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 62: +#line 859 "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 63: +#line 864 "parse.y" +{ + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 64: +#line 868 "parse.y" +{ + yyval.id = yyvsp[0].id; + ; + break;} +case 65: +#line 871 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; + break;} +case 66: +#line 875 "parse.y" +{ + yyval.id = g_strdup(yyvsp[0].id); + ; + break;} +case 67: +#line 878 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + ; + break;} +case 68: +#line 883 "parse.y" +{ yyval.id = "void"; ; + break;} +case 69: +#line 884 "parse.y" +{ yyval.id = "char"; ; + break;} +case 70: +#line 885 "parse.y" +{ yyval.id = "short"; ; + break;} +case 71: +#line 886 "parse.y" +{ yyval.id = "int"; ; + break;} +case 72: +#line 887 "parse.y" +{ yyval.id = "long"; ; + break;} +case 73: +#line 888 "parse.y" +{ yyval.id = "float"; ; + break;} +case 74: +#line 889 "parse.y" +{ yyval.id = "double"; ; + break;} +case 75: +#line 890 "parse.y" +{ yyval.id = "signed"; ; + break;} +case 76: +#line 891 "parse.y" +{ yyval.id = "unsigned"; ; + break;} +case 77: +#line 894 "parse.y" +{ yyval.id = "struct"; ; + break;} +case 78: +#line 895 "parse.y" +{ yyval.id = "union"; ; + break;} +case 79: +#line 896 "parse.y" +{ yyval.id = "enum"; ; + break;} +case 80: +#line 899 "parse.y" +{ yyval.id = g_strdup("*"); ; + break;} +case 81: +#line 900 "parse.y" +{ yyval.id = g_strdup("* const"); ; + break;} +case 82: +#line 901 "parse.y" +{ + yyval.id = g_strconcat("*", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 83: +#line 905 "parse.y" +{ + yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 84: +#line 912 "parse.y" +{ + if(strcmp(yyvsp[-1].id, "first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-1].id,"last")==0) + else if(strcmp(yyvsp[-1].id, "last")==0) yyval.sigtype = SIGNAL_LAST_METHOD; else { yyerror(_("signal must be 'first' or 'last'")); @@ -1511,14 +2035,14 @@ case 61: g_free(yyvsp[-1].id); ; break;} -case 62: -#line 504 "parse.y" +case 85: +#line 924 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 63: -#line 510 "parse.y" +case 86: +#line 930 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1532,8 +2056,8 @@ case 63: g_free(yyvsp[-1].id); ; break;} -case 64: -#line 522 "parse.y" +case 87: +#line 942 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1547,175 +2071,246 @@ case 64: g_free(yyvsp[-2].id); ; break;} -case 65: -#line 534 "parse.y" +case 88: +#line 954 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 66: -#line 537 "parse.y" +case 89: +#line 957 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 67: -#line 543 "parse.y" +case 90: +#line 963 "parse.y" { - gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); + gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id); ; break;} -case 68: -#line 548 "parse.y" +case 91: +#line 968 "parse.y" { - gtktypes = g_list_append(gtktypes,yyvsp[0].id); + gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 69: -#line 551 "parse.y" +case 92: +#line 971 "parse.y" { - gtktypes = g_list_append(gtktypes,yyvsp[0].id); + gtktypes = g_list_append(gtktypes, yyvsp[0].id); ; break;} -case 70: -#line 556 "parse.y" +case 93: +#line 976 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 71: -#line 557 "parse.y" +case 94: +#line 977 "parse.y" { yyval.cbuf = NULL; ; break;} -case 72: -#line 561 "parse.y" +case 95: +#line 981 "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[-1].id, yyvsp[0].cbuf,yyvsp[-9].line, + yyvsp[-5].id, yyvsp[0].cbuf,yyvsp[-9].line, ccode_line, vararg, yyvsp[-8].list); ; break;} -case 73: -#line 571 "parse.y" +case 96: +#line 997 "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[-1].id, yyvsp[0].cbuf, yyvsp[-9].line, + yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-9].line, ccode_line, vararg, yyvsp[-8].list); ; break;} -case 74: -#line 581 "parse.y" +case 97: +#line 1013 "parse.y" { if(!has_self) { yyerror(_("virtual method 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, VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-8].line, + yyvsp[0].cbuf, yyvsp[-8].line, ccode_line, vararg, NULL); ; break;} -case 75: -#line 591 "parse.y" +case 98: +#line 1029 "parse.y" { if(!has_self) { yyerror(_("virtual method 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, VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, + yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} -case 76: -#line 601 "parse.y" +case 99: +#line 1045 "parse.y" { 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[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, + yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} -case 77: -#line 611 "parse.y" +case 100: +#line 1056 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf, + yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-10].line, ccode_line, vararg, NULL); ; break;} -case 78: -#line 617 "parse.y" +case 101: +#line 1062 "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[-1].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, + yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} -case 79: -#line 622 "parse.y" +case 102: +#line 1072 "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(NO_SCOPE, INIT_METHOD, NULL, - yyvsp[-4].id, NULL, yyvsp[0].cbuf, yyvsp[-3].line, + yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line, ccode_line, FALSE, NULL); - } else if(strcmp(yyvsp[-4].id,"class_init")==0) { + } else if(strcmp(yyvsp[-4].id, "class_init")==0) { push_init_arg(yyvsp[-2].id,TRUE); push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL, - yyvsp[-4].id, NULL, yyvsp[0].cbuf, yyvsp[-3].line, + 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 103: +#line 1095 "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 104: +#line 1106 "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 80: -#line 643 "parse.y" +case 105: +#line 1125 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + ; + break;} +case 106: +#line 1131 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 81: -#line 644 "parse.y" +case 107: +#line 1132 "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 82: -#line 648 "parse.y" -{ yyval.id = NULL; ; - break;} -case 83: -#line 651 "parse.y" +case 108: +#line 1138 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 84: -#line 652 "parse.y" +case 109: +#line 1139 "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")); @@ -1723,12 +2318,40 @@ case 84: } ; break;} -case 85: -#line 663 "parse.y" +case 110: +#line 1150 "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 1161 "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 1172 "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")); @@ -1736,40 +2359,66 @@ case 85: } ; break;} -case 86: -#line 673 "parse.y" +case 113: +#line 1182 "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 1192 "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 1202 "parse.y" { has_self = FALSE; ; break;} -case 87: -#line 676 "parse.y" +case 116: +#line 1205 "parse.y" { vararg = TRUE; ; break;} -case 88: -#line 677 "parse.y" +case 117: +#line 1206 "parse.y" { vararg = FALSE; ; break;} -case 89: -#line 680 "parse.y" +case 118: +#line 1209 "parse.y" { ; ; break;} -case 90: -#line 681 "parse.y" +case 119: +#line 1210 "parse.y" { ; ; break;} -case 91: -#line 684 "parse.y" +case 120: +#line 1213 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 92: -#line 687 "parse.y" +case 121: +#line 1216 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 93: -#line 690 "parse.y" +case 122: +#line 1219 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1779,8 +2428,8 @@ case 93: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 94: -#line 698 "parse.y" +case 123: +#line 1227 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -1790,16 +2439,16 @@ case 94: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 95: -#line 708 "parse.y" +case 124: +#line 1237 "parse.y" { ; ; break;} -case 96: -#line 709 "parse.y" +case 125: +#line 1238 "parse.y" { ; ; break;} -case 97: -#line 712 "parse.y" +case 126: +#line 1241 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1814,61 +2463,61 @@ case 97: g_free(yyvsp[0].id); ; break;} -case 98: -#line 725 "parse.y" +case 127: +#line 1254 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 99: -#line 729 "parse.y" +case 128: +#line 1258 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 100: -#line 733 "parse.y" +case 129: +#line 1262 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 101: -#line 737 "parse.y" +case 130: +#line 1266 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 102: -#line 741 "parse.y" +case 131: +#line 1270 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 103: -#line 745 "parse.y" +case 132: +#line 1274 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 104: -#line 751 "parse.y" +case 133: +#line 1280 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 105: -#line 752 "parse.y" +case 134: +#line 1281 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 106: -#line 756 "parse.y" +case 135: +#line 1285 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2093,5 +2742,5 @@ yyerrhandle: } return 1; } -#line 759 "parse.y" +#line 1288 "parse.y"