X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/64034bc2613afefb289d1450411e69a0de4bce4e..2753ff6cefbe916211d543f1029879e2a075d111:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 83fc42c..2d9d349 100644 --- a/src/parse.c +++ b/src/parse.c @@ -1,38 +1,43 @@ /* A Bison parser, made from parse.y - by GNU Bison version 1.25 - */ + by GNU Bison version 1.28 */ #define YYBISON 1 /* Identify Bison output. */ -#define CLASS 258 -#define FROM 259 -#define CONST 260 -#define VOID 261 -#define STRUCT 262 -#define UNION 263 -#define ENUM 264 -#define THREEDOTS 265 -#define SIGNED 266 -#define UNSIGNED 267 -#define LONG 268 -#define SHORT 269 -#define INT 270 -#define FLOAT 271 -#define DOUBLE 272 -#define CHAR 273 -#define ONERROR 274 -#define TOKEN 275 -#define NUMBER 276 -#define TYPETOKEN 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 CLASS 257 +#define FROM 258 +#define CONST 259 +#define VOID 260 +#define STRUCT 261 +#define UNION 262 +#define ENUM 263 +#define THREEDOTS 264 +#define SIGNED 265 +#define UNSIGNED 266 +#define LONG 267 +#define SHORT 268 +#define INT 269 +#define FLOAT 270 +#define DOUBLE 271 +#define CHAR 272 +#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,63 +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 void -push_variable(char *name, int scope, int line_no) +static Type * +pop_type(void) { - Node *var; 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 = 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")); + type = pop_type(); } - node = new_method(scope,type,oid,gtktypes,id,funcargs, - onerror,cbuf,line_no,ccode_line,vararg); + /* a complicated and ugly test to figure out if we have + the wrong number of types for a signal */ + 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)) { + 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; + 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 -push_funcarg(char *name) +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); @@ -154,31 +256,130 @@ push_init_arg(char *name, int is_class) else tn = g_strdup(((Class *)class)->otype); - type = new_type(1,tn); + 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)); + 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; +} + +static void +export_accessors (char *var_name, + GString *get_cbuf, + int get_lineno, + GString *set_cbuf, + int set_lineno, + Type *type, + int lineno) +{ + if (get_cbuf) { + char *get_id = g_strdup_printf ("get_%s", var_name); + GString *get_cbuf_copy = g_string_new (get_cbuf->str); + char *tmp; + Node *node1 = new_type (type->name, type->pointer, type->postfix); + Node *node3 = new_type (class->class.otype, "*", NULL); + + tmp = g_strdup_printf ("\t%s%s ARG;\n", + type->name, + type->pointer ? type->pointer : ""); + get_cbuf_copy = g_string_prepend (get_cbuf_copy, tmp); + g_free (tmp); + + tmp = g_strdup_printf ("\n\t\treturn ARG;\n"); + get_cbuf_copy = g_string_append (get_cbuf_copy, tmp); + g_free (tmp); + + typestack = g_list_prepend (typestack, node1); + typestack = g_list_prepend (typestack, node3); + + push_funcarg ("self", FALSE); + + push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, + get_id, get_cbuf_copy, get_lineno, + lineno, FALSE, NULL); + } + + if (set_cbuf) { + char *set_id = g_strdup_printf ("set_%s", var_name); + GString *set_cbuf_copy = g_string_new (set_cbuf->str); + Node *node1 = new_type (type->name, type->pointer, type->postfix); + Node *node2 = new_type ("void", NULL, NULL); + Node *node3 = new_type (class->class.otype, "*", NULL); + + typestack = g_list_prepend (typestack, node2); + typestack = g_list_prepend (typestack, node1); + typestack = g_list_prepend (typestack, node3); + + push_funcarg ("self", FALSE); + push_funcarg ("ARG", FALSE); + + typestack = g_list_prepend (typestack, node2); + push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, + set_id, set_cbuf_copy, set_lineno, + lineno, FALSE, NULL); + } +} -#line 160 "parse.y" + +#line 355 "parse.y" typedef union { char *id; GString *cbuf; GList *list; int line; + int sigtype; } YYSTYPE; #ifndef YYDEBUG #define YYDEBUG 1 @@ -194,26 +395,26 @@ typedef union { -#define YYFINAL 192 +#define YYFINAL 274 #define YYFLAG -32768 -#define YYNTBASE 45 +#define YYNTBASE 50 -#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 72) +#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, 43, 2, 2, 2, 2, 2, 2, 34, - 35, 37, 2, 38, 44, 2, 2, 2, 40, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 33, 42, - 39, 41, 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, 31, 36, 32, 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, @@ -226,74 +427,99 @@ 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, 2, 2, 2, 1, 2, 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 + 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 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, 57, 69, - 78, 82, 83, 87, 89, 91, 94, 96, 99, 102, - 105, 107, 110, 113, 115, 117, 119, 121, 124, 126, - 128, 131, 133, 136, 138, 140, 142, 144, 146, 149, - 151, 156, 160, 162, 165, 167, 178, 188, 197, 210, - 220, 230, 236, 243, 246, 250, 253, 254, 256, 258, - 262, 264, 268, 270, 274, 276, 279, 286, 289, 291, - 293, 296, 299, 303, 307, 311, 315, 317, 320 + 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, 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[] = { 46, - 47, 46, 0, 47, 46, 0, 46, 47, 0, 47, - 0, 46, 23, 0, 46, 24, 0, 23, 0, 24, - 0, 48, 31, 49, 32, 0, 3, 22, 4, 22, - 0, 49, 63, 0, 49, 50, 0, 49, 51, 0, - 63, 0, 50, 0, 51, 0, 25, 54, 20, 33, - 0, 26, 54, 20, 33, 0, 27, 52, 20, 20, - 20, 31, 23, 20, 31, 23, 33, 0, 27, 52, - 20, 20, 20, 31, 23, 33, 0, 34, 53, 35, - 0, 0, 20, 36, 53, 0, 20, 0, 55, 0, - 5, 55, 0, 56, 0, 56, 59, 0, 12, 57, - 0, 11, 57, 0, 57, 0, 12, 18, 0, 11, - 18, 0, 18, 0, 17, 0, 16, 0, 20, 0, - 58, 20, 0, 22, 0, 6, 0, 13, 15, 0, - 13, 0, 14, 15, 0, 14, 0, 15, 0, 9, - 0, 8, 0, 7, 0, 37, 59, 0, 37, 0, - 20, 34, 61, 35, 0, 61, 38, 20, 0, 20, - 0, 31, 23, 0, 33, 0, 29, 20, 60, 54, - 20, 34, 65, 35, 64, 62, 0, 29, 60, 54, - 20, 34, 65, 35, 64, 62, 0, 28, 54, 20, - 34, 65, 35, 64, 62, 0, 30, 34, 22, 35, - 54, 20, 34, 65, 35, 64, 31, 23, 0, 25, - 54, 20, 34, 65, 35, 64, 31, 23, 0, 26, - 54, 20, 34, 65, 35, 64, 31, 23, 0, 20, - 34, 20, 35, 33, 0, 20, 34, 20, 35, 31, - 23, 0, 19, 71, 0, 19, 31, 23, 0, 39, - 40, 0, 0, 6, 0, 20, 0, 20, 38, 66, - 0, 66, 0, 67, 38, 10, 0, 67, 0, 67, - 38, 68, 0, 68, 0, 54, 20, 0, 54, 20, - 34, 20, 69, 35, 0, 69, 70, 0, 70, 0, - 20, 0, 41, 71, 0, 42, 71, 0, 41, 39, - 71, 0, 42, 39, 71, 0, 39, 39, 71, 0, - 43, 39, 71, 0, 21, 0, 44, 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, 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, - 178, 179, 180, 181, 184, 188, 192, 196, 202, 209, - 214, 215, 216, 217, 218, 219, 222, 225, 229, 258, - 284, 285, 288, 291, 297, 298, 306, 310, 317, 320, - 323, 326, 329, 332, 335, 338, 341, 344, 348, 351, - 356, 359, 362, 365, 368, 373, 376, 379, 384, 385, - 388, 393, 396, 401, 402, 406, 428, 438, 448, 454, - 459, 464, 482, 503, 504, 508, 509, 512, 513, 528, - 543, 546, 547, 550, 551, 554, 557, 567, 568, 571, - 584, 588, 592, 596, 600, 604, 610, 611, 615 + 373, 374, 375, 376, 379, 385, 391, 397, 403, 409, + 417, 418, 421, 426, 433, 439, 440, 452, 466, 467, + 470, 471, 479, 480, 481, 484, 485, 486, 487, 490, + 503, 519, 523, 531, 532, 533, 534, 535, 541, 544, + 549, 600, 648, 731, 739, 741, 750, 756, 757, 760, + 763, 769, 773, 780, 783, 786, 790, 794, 798, 803, + 811, 815, 820, 824, 827, 831, 834, 839, 840, 841, + 842, 843, 844, 845, 846, 847, 850, 851, 852, 855, + 856, 857, 861, 868, 880, 886, 898, 910, 913, 919, + 924, 927, 932, 933, 937, 953, 969, 985, 1001, 1012, + 1018, 1028, 1051, 1062, 1081, 1087, 1088, 1094, 1095, 1106, + 1117, 1128, 1138, 1148, 1158, 1161, 1162, 1165, 1166, 1169, + 1172, 1175, 1183, 1193, 1194, 1197, 1210, 1214, 1218, 1222, + 1226, 1230, 1236, 1237, 1241 }; #endif @@ -302,159 +528,226 @@ 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", -"CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE", -"'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'","'<'","'!'", -"'-'","prog","ccodes","class","classdec","classcode","variable","argument","argflags", -"flaglist","type","type1","type2","integer","tspecifier","stars","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, - 45, 45, 45, 45, 46, 46, 46, 46, 47, 48, - 49, 49, 49, 49, 49, 49, 50, 50, 51, 51, - 52, 52, 53, 53, 54, 54, 55, 55, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 57, 57, 57, 57, 57, 58, 58, 58, 59, 59, - 60, 61, 61, 62, 62, 63, 63, 63, 63, 63, - 63, 63, 63, 64, 64, 64, 64, 65, 65, 65, - 65, 66, 66, 67, 67, 68, 68, 69, 69, 70, - 70, 70, 70, 70, 70, 70, 71, 71, 71 + 50, 50, 50, 50, 51, 51, 51, 51, 51, 51, + 52, 52, 53, 53, 54, 55, 55, 55, 56, 56, + 57, 57, 57, 57, 57, 58, 58, 58, 58, 59, + 59, 60, 60, 61, 61, 61, 61, 61, 62, 62, + 63, 63, 63, 64, 64, 65, 65, 66, 66, 67, + 67, 68, 68, 69, 69, 69, 69, 69, 69, 69, + 70, 70, 70, 70, 70, 70, 70, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 72, 72, 72, 73, + 73, 73, 73, 74, 74, 75, 75, 75, 75, 76, + 77, 77, 78, 78, 79, 79, 79, 79, 79, 79, + 79, 79, 80, 80, 80, 81, 81, 82, 82, 82, + 82, 82, 82, 82, 82, 83, 83, 84, 84, 85, + 85, 85, 85, 86, 86, 87, 87, 87, 87, 87, + 87, 87, 88, 88, 88 }; static const short yyr2[] = { 0, - 3, 2, 2, 1, 2, 2, 1, 1, 4, 4, - 2, 2, 2, 1, 1, 1, 4, 4, 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, - 4, 3, 1, 2, 1, 10, 9, 8, 12, 9, - 9, 5, 6, 2, 3, 2, 0, 1, 1, 3, - 1, 3, 1, 3, 1, 2, 6, 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, + 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, 7, 8, 0, 4, 0, 0, 5, 6, 3, - 2, 0, 0, 1, 0, 0, 0, 22, 0, 0, - 0, 0, 15, 16, 14, 10, 0, 0, 40, 48, - 47, 46, 0, 0, 42, 44, 45, 36, 35, 34, - 37, 39, 0, 25, 27, 31, 0, 0, 0, 0, - 0, 0, 0, 0, 9, 12, 13, 11, 0, 26, - 33, 30, 32, 29, 41, 43, 0, 50, 28, 38, - 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 17, 0, 49, 18, 0, 0, 21, 0, 0, - 53, 0, 0, 0, 0, 0, 62, 40, 37, 0, - 0, 71, 73, 75, 0, 23, 0, 0, 51, 0, - 0, 0, 0, 63, 0, 76, 67, 0, 67, 0, - 67, 52, 0, 0, 0, 70, 0, 0, 0, 0, - 72, 74, 0, 0, 0, 0, 67, 0, 0, 89, - 87, 0, 0, 64, 66, 0, 0, 0, 20, 0, - 55, 58, 67, 0, 0, 80, 0, 0, 0, 0, - 0, 79, 65, 88, 60, 61, 0, 54, 0, 57, - 67, 0, 0, 81, 0, 82, 0, 77, 78, 0, - 56, 0, 85, 83, 84, 86, 19, 0, 59, 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, 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[] = { 190, - 4, 5, 6, 22, 23, 24, 50, 73, 100, 44, - 45, 46, 47, 69, 53, 92, 152, 25, 130, 101, - 102, 103, 104, 161, 162, 144 +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[] = { 32, - 81,-32768,-32768, 36, 53, -15, 108,-32768,-32768, 53, - 137, 138, 92, 137, 87, 93, 93, 96, 93, 3, - 98, 127,-32768,-32768,-32768,-32768, 118, 128,-32768,-32768, --32768,-32768, 60, 156, 134, 136,-32768,-32768,-32768,-32768, --32768,-32768, 157,-32768, 125,-32768, 158, 159, 160, 161, - 162, -2, 93, 163,-32768,-32768,-32768,-32768, 148,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 19, 125,-32768,-32768, - 139, 150, 149, 167, 154, 155, 170, 93, 171, 164, - 10,-32768, 111,-32768,-32768, 111, 160,-32768, 172, 111, --32768, 23, 173, 166, 93, 174,-32768, 168, 28, 175, - 169,-32768, 176,-32768, 177,-32768, 165, 178,-32768, 181, - 182, 111, 185,-32768, 93, 183, -11, 75, -11, 179, - -11,-32768, 111, 180, 184,-32768, 186, -14, 187, 188, --32768,-32768, 189, -7, 63, 190, -11, 111, 29,-32768, --32768, 198, 201,-32768,-32768, 200, 203, 193,-32768, 205, --32768,-32768, -11, 63, 194,-32768, 191, -10, -6, 192, - 5,-32768,-32768,-32768,-32768,-32768, 209,-32768, 63,-32768, - -11, 1, 1,-32768, 1,-32768, 1,-32768,-32768, 202, --32768, 206,-32768,-32768,-32768,-32768,-32768, 210,-32768, 207, - 208,-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, - 14, 230,-32768,-32768, 214, 216,-32768, 107, -16, 211, --32768, 142,-32768, 130, 195,-32768, -142, 218, -117, -81, - 94,-32768, 123,-32768, 49, -108 + 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 247 - - -static const short yytable[] = { 43, - 48, 133, 51, 135, 105, 140, 141, 128, 108, 140, - 141, 170, 148, 140, 141, 12, 142, 76, 11, 154, - 140, 141, 52, 14, 156, 149, 181, 129, 173, 143, - 124, 77, 175, 143, 1, 169, 79, 143, 1, 178, - 96, 136, 97, 157, 143, 158, 159, 160, 156, 174, - 176, 82, 83, 182, 2, 3, 155, 109, 8, 9, - 110, 93, -69, 183, 184, 115, 185, 157, 186, 158, - 159, 160, 35, 36, 37, 2, 3, 61, 113, 28, - 29, 30, 31, 32, 131, 33, 34, 35, 36, 37, - 38, 39, 40, 150, 41, 151, 42, 28, 29, 30, - 31, 32, 7, 33, 34, 35, 36, 37, 38, 39, - 40, 13, 41, 26, 42, 28, 98, 30, 31, 32, - 27, 33, 34, 35, 36, 37, 38, 39, 40, 49, - 99, 54, 42, 29, 30, 31, 32, 59, 33, 34, - 35, 36, 37, 38, 39, 40, 15, 41, 65, 42, - 66, 16, 17, 18, 19, 20, 21, 15, 55, 8, - 9, 68, 16, 17, 18, 19, 20, 21, 35, 36, - 37, 85, 86, 63, 62, 64, 67, 70, 71, 72, - 74, 75, 81, 88, 80, 87, 89, 90, 77, 91, - 94, 107, 111, 106, 116, 120, 114, 84, 95, 112, - 122, 134, -68, 117, 125, 139, 191, 192, 126, 179, - 0, 119, 121, 118, 137, 123, 127, 138, 146, 147, - 163, 164, 165, 167, 153, 166, 145, 168, 171, 172, - 177, 180, 189, 10, 187, 56, 188, 57, 60, 58, - 132, 0, 0, 0, 0, 0, 78 +#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[] = { 16, - 17, 119, 19, 121, 86, 20, 21, 19, 90, 20, - 21, 154, 20, 20, 21, 31, 31, 20, 5, 137, - 20, 21, 20, 10, 20, 33, 169, 39, 39, 44, - 112, 34, 39, 44, 3, 153, 53, 44, 3, 35, - 31, 123, 33, 39, 44, 41, 42, 43, 20, 158, - 159, 33, 34, 171, 23, 24, 138, 35, 23, 24, - 38, 78, 35, 172, 173, 38, 175, 39, 177, 41, - 42, 43, 13, 14, 15, 23, 24, 18, 95, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 31, 20, 33, 22, 5, 6, 7, - 8, 9, 22, 11, 12, 13, 14, 15, 16, 17, - 18, 4, 20, 22, 22, 5, 6, 7, 8, 9, - 34, 11, 12, 13, 14, 15, 16, 17, 18, 34, - 20, 34, 22, 6, 7, 8, 9, 20, 11, 12, - 13, 14, 15, 16, 17, 18, 20, 20, 15, 22, - 15, 25, 26, 27, 28, 29, 30, 20, 32, 23, - 24, 37, 25, 26, 27, 28, 29, 30, 13, 14, - 15, 33, 34, 18, 33, 34, 20, 20, 20, 20, - 20, 20, 35, 35, 22, 36, 20, 34, 34, 20, - 20, 20, 20, 87, 20, 31, 23, 68, 35, 34, - 20, 23, 35, 35, 20, 20, 0, 0, 115, 161, - -1, 35, 35, 38, 35, 34, 34, 34, 31, 31, - 23, 21, 23, 31, 35, 23, 40, 23, 35, 39, - 39, 23, 23, 4, 33, 22, 31, 22, 28, 22, - 118, -1, -1, -1, -1, -1, 52 +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" +/* This file comes from bison-1.28. */ /* Skeleton output parser for bison, Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. @@ -471,46 +764,66 @@ static const short yycheck[] = { 16, You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. This special exception was added by the Free Software Foundation in version 1.24 of Bison. */ -#ifndef alloca +/* This is the parser code that is written into each bison parser + when the %semantic_parser declaration is not specified in the grammar. + It was written by Richard Stallman by simplifying the hairy parser + used when %semantic_parser is specified. */ + +#ifndef YYSTACK_USE_ALLOCA +#ifdef alloca +#define YYSTACK_USE_ALLOCA +#else /* alloca not defined */ #ifdef __GNUC__ +#define YYSTACK_USE_ALLOCA #define alloca __builtin_alloca #else /* not GNU C. */ -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) +#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) +#define YYSTACK_USE_ALLOCA #include #else /* not sparc */ -#if defined (MSDOS) && !defined (__TURBOC__) +/* We think this test detects Watcom and Microsoft C. */ +/* This used to test MSDOS, but that is a bad idea + since that symbol is in the user namespace. */ +#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) +#if 0 /* No need for malloc.h, which pollutes the namespace; + instead, just don't use alloca. */ #include +#endif #else /* not MSDOS, or __TURBOC__ */ #if defined(_AIX) -#include +/* I don't know what this was needed for, but it pollutes the namespace. + So I turned it off. rms, 2 May 1997. */ +/* #include */ #pragma alloca -#else /* not MSDOS, __TURBOC__, or _AIX */ -#ifdef __hpux -#ifdef __cplusplus -extern "C" { -void *alloca (unsigned int); -}; -#else /* not __cplusplus */ -void *alloca (); -#endif /* not __cplusplus */ +#define YYSTACK_USE_ALLOCA +#else /* not MSDOS, or __TURBOC__, or _AIX */ +#if 0 +#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, + and on HPUX 10. Eventually we can turn this on. */ +#define YYSTACK_USE_ALLOCA +#define alloca __builtin_alloca #endif /* __hpux */ +#endif #endif /* not _AIX */ #endif /* not MSDOS, or __TURBOC__ */ -#endif /* not sparc. */ -#endif /* not GNU C. */ -#endif /* alloca not defined. */ +#endif /* not sparc */ +#endif /* not GNU C */ +#endif /* alloca not defined */ +#endif /* YYSTACK_USE_ALLOCA not defined */ -/* This is the parser code that is written into each bison parser - when the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ +#ifdef YYSTACK_USE_ALLOCA +#define YYSTACK_ALLOC alloca +#else +#define YYSTACK_ALLOC malloc +#endif /* Note: there must be only one dollar sign in this file. It is replaced by the list of actions, each action @@ -520,8 +833,8 @@ void *alloca (); #define yyclearin (yychar = YYEMPTY) #define YYEMPTY -2 #define YYEOF 0 -#define YYACCEPT return(0) -#define YYABORT return(1) +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab #define YYERROR goto yyerrlab1 /* Like YYERROR except do call yyerror. This remains here temporarily to ease the @@ -602,12 +915,12 @@ int yydebug; /* nonzero means print parse trace */ #ifndef YYMAXDEPTH #define YYMAXDEPTH 10000 #endif - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -int yyparse (void); -#endif +/* Define __yy_memcpy. Note that the size argument + should be passed with type unsigned int, because that is what the non-GCC + definitions require. With GCC, __builtin_memcpy takes an arg + of type size_t, but it can handle unsigned int. */ + #if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ #define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) #else /* not GNU C or C++ */ @@ -619,7 +932,7 @@ static void __yy_memcpy (to, from, count) char *to; char *from; - int count; + unsigned int count; { register char *f = from; register char *t = to; @@ -634,10 +947,10 @@ __yy_memcpy (to, from, count) /* This is the most reliable way to avoid incompatibilities in available built-in functions on various systems. */ static void -__yy_memcpy (char *to, char *from, int count) +__yy_memcpy (char *to, char *from, unsigned int count) { - register char *f = from; register char *t = to; + register char *f = from; register int i = count; while (i-- > 0) @@ -647,7 +960,7 @@ __yy_memcpy (char *to, char *from, int count) #endif #endif -#line 196 "/usr/lib/bison.simple" +#line 217 "/usr/lib/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -668,6 +981,15 @@ __yy_memcpy (char *to, char *from, int count) #define YYPARSE_PARAM_DECL #endif /* not YYPARSE_PARAM */ +/* Prevent warning if -Wstrict-prototypes. */ +#ifdef __GNUC__ +#ifdef YYPARSE_PARAM +int yyparse (void *); +#else +int yyparse (void); +#endif +#endif + int yyparse(YYPARSE_PARAM_ARG) YYPARSE_PARAM_DECL @@ -696,6 +1018,7 @@ yyparse(YYPARSE_PARAM_ARG) #endif int yystacksize = YYINITDEPTH; + int yyfree_stacks = 0; #ifdef YYPURE int yychar; @@ -780,18 +1103,32 @@ yynewstate: if (yystacksize >= YYMAXDEPTH) { yyerror("parser stack overflow"); + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } return 2; } yystacksize *= 2; if (yystacksize > YYMAXDEPTH) yystacksize = YYMAXDEPTH; - yyss = (short *) alloca (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp)); - yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp)); +#ifndef YYSTACK_USE_ALLOCA + yyfree_stacks = 1; +#endif + yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); + __yy_memcpy ((char *)yyss, (char *)yyss1, + size * (unsigned int) sizeof (*yyssp)); + yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); + __yy_memcpy ((char *)yyvs, (char *)yyvs1, + size * (unsigned int) sizeof (*yyvsp)); #ifdef YYLSP_NEEDED - yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp)); + yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); + __yy_memcpy ((char *)yyls, (char *)yyls1, + size * (unsigned int) sizeof (*yylsp)); #endif #endif /* no yyoverflow */ @@ -952,514 +1289,1012 @@ yyreduce: switch (yyn) { case 1: -#line 178 "parse.y" +#line 373 "parse.y" { ; ; break;} case 2: -#line 179 "parse.y" +#line 374 "parse.y" { ; ; break;} case 3: -#line 180 "parse.y" +#line 375 "parse.y" { ; ; break;} case 4: -#line 181 "parse.y" +#line 376 "parse.y" { ; ; break;} case 5: -#line 184 "parse.y" +#line 379 "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 188 "parse.y" +#line 385 "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 192 "parse.y" +#line 391 "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 196 "parse.y" +#line 397 "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 202 "parse.y" +#line 403 "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 209 "parse.y" +#line 409 "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 214 "parse.y" +#line 417 "parse.y" { ; ; break;} case 12: -#line 215 "parse.y" +#line 418 "parse.y" { ; ; break;} case 13: -#line 216 "parse.y" -{ ; ; +#line 421 "parse.y" +{ + ((Class *)class)->nodes = class_nodes; + class_nodes = NULL; + nodes = g_list_append(nodes,class); + ; break;} case 14: -#line 217 "parse.y" -{ ; ; - break;} -case 15: -#line 218 "parse.y" -{ ; ; - break;} -case 16: -#line 219 "parse.y" -{ ; ; - break;} -case 17: -#line 222 "parse.y" +#line 426 "parse.y" { - push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line); + ((Class *)class)->nodes = NULL; + class_nodes = NULL; + nodes = g_list_append(nodes,class); ; break;} -case 18: -#line 225 "parse.y" +case 15: +#line 433 "parse.y" { - push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line); + class = new_class (yyvsp[-3].id, yyvsp[-1].id, + bonobo_x_class, chunk_size, NULL); ; break;} -case 19: -#line 229 "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 17: +#line 440 "parse.y" +{ + if(strcmp(yyvsp[-3].id,"chunks") == 0) { + g_free (chunk_size); + chunk_size = g_strdup(yyvsp[-2].id); + } else if(strcmp(yyvsp[-3].id,"BonoboX") == 0) { + g_free (bonobo_x_class); + bonobo_x_class = g_strdup(yyvsp[-2].id); } else { - 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 20: -#line 258 "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); +case 18: +#line 452 "parse.y" +{ + if(strcmp(yyvsp[-3].id,"chunks") == 0) { + g_free (chunk_size); + if(atoi(yyvsp[-2].id) != 0) + chunk_size = g_strdup(yyvsp[-2].id); + else + chunk_size = NULL; } else { - 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); yyerror(_("parse error")); YYERROR; } - ; + ; + break;} +case 19: +#line 466 "parse.y" +{ ; ; + break;} +case 20: +#line 467 "parse.y" +{ ; ; break;} case 21: -#line 284 "parse.y" -{ yyval.list = yyvsp[-1].list; ; +#line 470 "parse.y" +{ ; ; break;} case 22: -#line 285 "parse.y" -{ yyval.list = NULL; ; - break;} -case 23: -#line 288 "parse.y" +#line 471 "parse.y" { - yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); + 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 479 "parse.y" +{ ; ; + break;} case 24: -#line 291 "parse.y" -{ - yyval.list = g_list_append(NULL,yyvsp[0].id); - ; +#line 480 "parse.y" +{ ; ; break;} case 25: -#line 297 "parse.y" +#line 481 "parse.y" { ; ; break;} case 26: -#line 298 "parse.y" -{ - Type *type = typestack->data; - char *oldname = type->name; - type->name = g_strconcat("const ",oldname,NULL); - g_free(oldname); - ; +#line 484 "parse.y" +{ the_scope = PUBLIC_SCOPE; ; break;} case 27: -#line 306 "parse.y" -{ - Node *node = new_type(0,yyvsp[0].id); - typestack = g_list_prepend(typestack,node); - ; +#line 485 "parse.y" +{ the_scope = PRIVATE_SCOPE; ; break;} case 28: -#line 310 "parse.y" -{ - Node *node = new_type(stars,yyvsp[-1].id); - stars = 0; - typestack = g_list_prepend(typestack,node); - ; +#line 486 "parse.y" +{ the_scope = PROTECTED_SCOPE; ; break;} case 29: -#line 317 "parse.y" -{ - yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); - ; +#line 487 "parse.y" +{ the_scope = CLASS_SCOPE; ; break;} case 30: -#line 320 "parse.y" +#line 490 "parse.y" { - yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); - ; + 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 323 "parse.y" +#line 503 "parse.y" { - yyval.id = g_strdup(yyvsp[0].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; + } + ; break;} case 32: -#line 326 "parse.y" +#line 519 "parse.y" { - yyval.id = g_strdup("unsigned char"); - ; + initializer = yyvsp[0].id; + initializer_line = ccode_line; + ; break;} case 33: -#line 329 "parse.y" +#line 523 "parse.y" { - yyval.id = g_strdup("signed char"); - ; + initializer = (yyvsp[0].cbuf)->str; + initializer_line = ccode_line; + g_string_free(yyvsp[0].cbuf, FALSE); + ; break;} case 34: -#line 332 "parse.y" -{ - yyval.id = g_strdup("char"); - ; +#line 531 "parse.y" +{ ; ; break;} case 35: -#line 335 "parse.y" -{ - yyval.id = g_strdup("double"); - ; +#line 532 "parse.y" +{ ; ; break;} case 36: -#line 338 "parse.y" -{ - yyval.id = g_strdup("float"); - ; +#line 533 "parse.y" +{ destructor = NULL; ; break;} case 37: -#line 341 "parse.y" -{ - yyval.id = yyvsp[0].id; - ; +#line 534 "parse.y" +{ initializer = NULL; ; break;} case 38: -#line 344 "parse.y" +#line 535 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); - g_free(yyvsp[0].id); - ; + destructor = NULL; + initializer = NULL; + ; break;} case 39: -#line 348 "parse.y" +#line 541 "parse.y" { - yyval.id = yyvsp[0].id; + push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} case 40: -#line 351 "parse.y" +#line 544 "parse.y" { - yyval.id = g_strdup("void"); + push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} case 41: -#line 356 "parse.y" +#line 549 "parse.y" { - yyval.id = "long int"; + 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, yyvsp[-5].line, + yyvsp[-1].cbuf, yyvsp[-2].line, + type, + yyvsp[-11].line); + } + + g_string_free (yyvsp[-4].cbuf, FALSE); + g_string_free (yyvsp[-1].cbuf, FALSE); + + } else if(strcmp(yyvsp[-6].id,"set")==0 && + strcmp(yyvsp[-3].id,"get")==0) { + Node *node; + Type *type = pop_type(); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + node = new_argument (yyvsp[-9].id, type, yyvsp[-10].list, yyvsp[-8].id, + (yyvsp[-1].cbuf)->str,yyvsp[-2].line, + (yyvsp[-4].cbuf)->str,yyvsp[-5].line, + yyvsp[-11].line); + g_string_free (yyvsp[-1].cbuf, FALSE); + g_string_free (yyvsp[-4].cbuf, FALSE); + class_nodes = g_list_append(class_nodes,node); + } else { + g_free (yyvsp[-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 359 "parse.y" +#line 600 "parse.y" { - yyval.id = "long"; + 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, yyvsp[-2].line, + NULL, 0, + type, + yyvsp[-8].line); + } + + g_string_free (yyvsp[-1].cbuf, FALSE); + class_nodes = g_list_append(class_nodes, node); + } else if(strcmp(yyvsp[-3].id, "set") == 0) { + Node *node; + Type *type = pop_type(); + g_free (yyvsp[-3].id); + node = new_argument (yyvsp[-6].id, type, yyvsp[-7].list, yyvsp[-5].id, + NULL, 0, + (yyvsp[-1].cbuf)->str, yyvsp[-2].line, + yyvsp[-8].line); + if (yyvsp[-4].id) { + export_accessors (yyvsp[-5].id, + NULL, 0, + yyvsp[-1].cbuf, yyvsp[-2].line, + type, + yyvsp[-8].line); + } + + g_string_free (yyvsp[-1].cbuf, FALSE); + class_nodes = g_list_append (class_nodes, node); + } else { + g_free (yyvsp[-3].id); + g_free (yyvsp[-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 362 "parse.y" -{ - yyval.id = "short int"; +#line 648 "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, + g_string_new (get), yyvsp[-5].line, + g_string_new (set), yyvsp[-5].line, + type, + yyvsp[-5].line); + } + + class_nodes = g_list_append(class_nodes,node); ; break;} case 44: -#line 365 "parse.y" +#line 731 "parse.y" { - yyval.id = "short"; - ; + 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 368 "parse.y" -{ - yyval.id = "int"; - ; +#line 739 "parse.y" +{ yyval.id = NULL; ; break;} case 46: -#line 373 "parse.y" +#line 741 "parse.y" { - yyval.id = "enum "; - ; + 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 376 "parse.y" +#line 750 "parse.y" { - yyval.id = "union "; + yyval.id = yyvsp[0].id; + typestack = g_list_prepend(typestack,NULL); ; break;} case 48: -#line 379 "parse.y" -{ - yyval.id = "struct "; - ; +#line 756 "parse.y" +{ yyval.list = yyvsp[-1].list; ; break;} case 49: -#line 384 "parse.y" -{ stars++; ; +#line 757 "parse.y" +{ yyval.list = NULL; ; break;} case 50: -#line 385 "parse.y" -{ stars++; ; +#line 760 "parse.y" +{ + yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); + ; break;} case 51: -#line 388 "parse.y" +#line 763 "parse.y" { - gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id); + yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} case 52: -#line 393 "parse.y" +#line 769 "parse.y" { - gtktypes = g_list_append(gtktypes,yyvsp[0].id); - ; + Node *node = new_type(yyvsp[-1].id, yyvsp[0].id, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 53: -#line 396 "parse.y" -{ - gtktypes = g_list_append(gtktypes,yyvsp[0].id); - ; +#line 773 "parse.y" +{ + Node *node = new_type(yyvsp[0].id, NULL, NULL); + typestack = g_list_prepend(typestack,node); + ; break;} case 54: -#line 401 "parse.y" -{ yyval.cbuf=yyvsp[0].cbuf; ; +#line 780 "parse.y" +{ + yyval.id = yyvsp[0].id; + ; break;} case 55: -#line 402 "parse.y" -{ yyval.cbuf = NULL; ; +#line 783 "parse.y" +{ + yyval.id = yyvsp[0].id; + ; break;} case 56: -#line 406 "parse.y" +#line 786 "parse.y" +{ + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 57: +#line 790 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; + break;} +case 58: +#line 794 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 59: +#line 798 "parse.y" +{ + yyval.id = g_strconcat("const ", yyvsp[-1].id, " ", + yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 60: +#line 803 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-2].id, " ", + yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; + break;} +case 61: +#line 811 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 62: +#line 815 "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 820 "parse.y" +{ + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 64: +#line 824 "parse.y" +{ + yyval.id = yyvsp[0].id; + ; + break;} +case 65: +#line 827 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; + break;} +case 66: +#line 831 "parse.y" +{ + yyval.id = g_strdup(yyvsp[0].id); + ; + break;} +case 67: +#line 834 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + ; + break;} +case 68: +#line 839 "parse.y" +{ yyval.id = "void"; ; + break;} +case 69: +#line 840 "parse.y" +{ yyval.id = "char"; ; + break;} +case 70: +#line 841 "parse.y" +{ yyval.id = "short"; ; + break;} +case 71: +#line 842 "parse.y" +{ yyval.id = "int"; ; + break;} +case 72: +#line 843 "parse.y" +{ yyval.id = "long"; ; + break;} +case 73: +#line 844 "parse.y" +{ yyval.id = "float"; ; + break;} +case 74: +#line 845 "parse.y" +{ yyval.id = "double"; ; + break;} +case 75: +#line 846 "parse.y" +{ yyval.id = "signed"; ; + break;} +case 76: +#line 847 "parse.y" +{ yyval.id = "unsigned"; ; + break;} +case 77: +#line 850 "parse.y" +{ yyval.id = "struct"; ; + break;} +case 78: +#line 851 "parse.y" +{ yyval.id = "union"; ; + break;} +case 79: +#line 852 "parse.y" +{ yyval.id = "enum"; ; + break;} +case 80: +#line 855 "parse.y" +{ yyval.id = g_strdup("*"); ; + break;} +case 81: +#line 856 "parse.y" +{ yyval.id = g_strdup("* const"); ; + break;} +case 82: +#line 857 "parse.y" { - int sigtype = SIGNAL_LAST_METHOD; - if(strcmp(yyvsp[-8].id,"first")==0) - sigtype = SIGNAL_FIRST_METHOD; - else if(strcmp(yyvsp[-8].id,"last")==0) - sigtype = SIGNAL_LAST_METHOD; + yyval.id = g_strconcat("*", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 83: +#line 861 "parse.y" +{ + yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 84: +#line 868 "parse.y" +{ + if(strcmp(yyvsp[-1].id, "first")==0) + yyval.sigtype = SIGNAL_FIRST_METHOD; + else if(strcmp(yyvsp[-1].id, "last")==0) + yyval.sigtype = SIGNAL_LAST_METHOD; else { yyerror(_("signal must be 'first' or 'last'")); - g_free(yyvsp[-8].id); + g_free(yyvsp[-1].id); YYERROR; } - g_free(yyvsp[-8].id); - + g_free(yyvsp[-1].id); + ; + break;} +case 85: +#line 880 "parse.y" +{ + yyval.sigtype = SIGNAL_LAST_METHOD; + ; + break;} +case 86: +#line 886 "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[-1].id); + YYERROR; + } + g_free(yyvsp[-1].id); + ; + break;} +case 87: +#line 898 "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 88: +#line 910 "parse.y" +{ + yyval.sigtype = SIGNAL_LAST_METHOD; + ; + break;} +case 89: +#line 913 "parse.y" +{ + /* the_scope was default thus public */ + the_scope = PUBLIC_SCOPE; + ; + break;} +case 90: +#line 919 "parse.y" +{ + gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id); + ; + break;} +case 91: +#line 924 "parse.y" +{ + gtktypes = g_list_append(gtktypes, yyvsp[0].id); + ; + break;} +case 92: +#line 927 "parse.y" +{ + gtktypes = g_list_append(gtktypes, yyvsp[0].id); + ; + break;} +case 93: +#line 932 "parse.y" +{ yyval.cbuf = yyvsp[0].cbuf; ; + break;} +case 94: +#line 933 "parse.y" +{ yyval.cbuf = NULL; ; + break;} +case 95: +#line 937 "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(sigtype,NULL, - yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-9].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 57: -#line 428 "parse.y" +case 96: +#line 953 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " "first parameter")); + free_all_global_state(); YYERROR; } - push_function(SIGNAL_LAST_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, yyvsp[-7].sigtype, NULL, + yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-9].line, + ccode_line, vararg, yyvsp[-8].list); ; break;} -case 58: -#line 438 "parse.y" +case 97: +#line 969 "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(VIRTUAL_METHOD, NULL, yyvsp[-5].id, - yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line, - ccode_line,vararg); + push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, + yyvsp[0].cbuf, yyvsp[-8].line, + ccode_line, vararg, NULL); ; break;} -case 59: -#line 448 "parse.y" +case 98: +#line 985 "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; + } + 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 60: -#line 454 "parse.y" +case 99: +#line 1001 "parse.y" { - push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id, - yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].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 61: -#line 459 "parse.y" +case 100: +#line 1012 "parse.y" { - push_function(PRIVATE_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 101: +#line 1018 "parse.y" +{ + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } + push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id, + yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, + vararg, NULL); ; break;} -case 62: -#line 464 "parse.y" +case 102: +#line 1028 "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, NULL,yyvsp[-3].line,0, - 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, NULL,yyvsp[-3].line,0, - 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); - yyerror(_("parse error")); + g_string_free(yyvsp[0].cbuf,TRUE); + yyerror(_("parse error " + "(untyped blocks must be init or " + "class_init)")); YYERROR; } ; break;} -case 63: -#line 482 "parse.y" -{ - if(strcmp(yyvsp[-5].id,"init")==0) { - push_init_arg(yyvsp[-3].id,FALSE); - push_function(INIT_METHOD, NULL, - yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line, - yyvsp[-1].line,FALSE); - } else if(strcmp(yyvsp[-5].id,"class_init")==0) { - push_init_arg(yyvsp[-3].id,TRUE); - push_function(CLASS_INIT_METHOD, NULL, - yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line, - yyvsp[-1].line,FALSE); - } else { - g_free(yyvsp[-5].id); - g_free(yyvsp[-3].id); - g_string_free(yyvsp[-3].cbuf,TRUE); +case 103: +#line 1051 "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 1062 "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 64: -#line 503 "parse.y" +case 105: +#line 1081 "parse.y" +{ + g_free(onerror); onerror = NULL; + g_free(defreturn); defreturn = NULL; + ; + break;} +case 106: +#line 1087 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 65: -#line 504 "parse.y" +case 107: +#line 1088 "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 66: -#line 508 "parse.y" -{ ; ; +case 108: +#line 1094 "parse.y" +{ vararg = FALSE; has_self = FALSE; ; break;} -case 67: -#line 509 "parse.y" -{ yyval.id = NULL; ; +case 109: +#line 1095 "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 68: -#line 512 "parse.y" -{ has_self = FALSE; ; +case 110: +#line 1106 "parse.y" +{ + vararg = FALSE; + has_self = TRUE; + if(strcmp(yyvsp[-1].id,"self")==0) + push_self(yyvsp[-1].id, TRUE); + else { + g_free(yyvsp[-1].id); + yyerror(_("parse error")); + YYERROR; + } + ; break;} -case 69: -#line 513 "parse.y" +case 111: +#line 1117 "parse.y" { + vararg = FALSE; has_self = TRUE; - if(strcmp(yyvsp[0].id,"this")==0) { - push_self(yyvsp[0].id); - print_error(TRUE,_("Use of 'this' is " - "depreciated, use 'self' " - "instead"),line_no); - } else if(strcmp(yyvsp[0].id,"self")==0) - push_self(yyvsp[0].id); + if(strcmp(yyvsp[0].id,"self")==0) + push_self(yyvsp[0].id, TRUE); else { g_free(yyvsp[0].id); yyerror(_("parse error")); @@ -1467,17 +2302,12 @@ case 69: } ; break;} -case 70: -#line 528 "parse.y" +case 112: +#line 1128 "parse.y" { has_self = TRUE; - if(strcmp(yyvsp[-2].id,"this")==0) { - push_self(yyvsp[-2].id); - print_error(TRUE,_("Use of 'this' is " - "depreciated, use 'self' " - "instead"),line_no); - } else if(strcmp(yyvsp[-2].id,"self")==0) - push_self(yyvsp[-2].id); + if(strcmp(yyvsp[-2].id,"self")==0) + push_self(yyvsp[-2].id, FALSE); else { g_free(yyvsp[-2].id); yyerror(_("parse error")); @@ -1485,53 +2315,96 @@ case 70: } ; break;} -case 71: -#line 543 "parse.y" +case 113: +#line 1138 "parse.y" +{ + has_self = TRUE; + if(strcmp(yyvsp[-3].id,"self")==0) + push_self(yyvsp[-3].id, TRUE); + else { + g_free(yyvsp[-3].id); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 114: +#line 1148 "parse.y" +{ + has_self = TRUE; + if(strcmp(yyvsp[-2].id,"self")==0) + push_self(yyvsp[-2].id, TRUE); + else { + g_free(yyvsp[-2].id); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 115: +#line 1158 "parse.y" { has_self = FALSE; ; break;} -case 72: -#line 546 "parse.y" +case 116: +#line 1161 "parse.y" { vararg = TRUE; ; break;} -case 73: -#line 547 "parse.y" +case 117: +#line 1162 "parse.y" { vararg = FALSE; ; break;} -case 74: -#line 550 "parse.y" +case 118: +#line 1165 "parse.y" { ; ; break;} -case 75: -#line 551 "parse.y" +case 119: +#line 1166 "parse.y" { ; ; break;} -case 76: -#line 554 "parse.y" +case 120: +#line 1169 "parse.y" { - push_funcarg(yyvsp[0].id); + push_funcarg(yyvsp[0].id,NULL); ; break;} -case 77: -#line 557 "parse.y" +case 121: +#line 1172 "parse.y" +{ + push_funcarg(yyvsp[-1].id,yyvsp[0].id); + ; + break;} +case 122: +#line 1175 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); YYERROR; } g_free(yyvsp[-2].id); - push_funcarg(yyvsp[-4].id); + push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 78: -#line 567 "parse.y" +case 123: +#line 1183 "parse.y" +{ + if(strcmp(yyvsp[-2].id,"check")!=0) { + yyerror(_("parse error")); + YYERROR; + } + g_free(yyvsp[-2].id); + push_funcarg(yyvsp[-5].id,yyvsp[-4].id); + ; + break;} +case 124: +#line 1193 "parse.y" { ; ; break;} -case 79: -#line 568 "parse.y" +case 125: +#line 1194 "parse.y" { ; ; break;} -case 80: -#line 571 "parse.y" +case 126: +#line 1197 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { Node *node = new_check(TYPE_CHECK,NULL); @@ -1546,66 +2419,66 @@ case 80: g_free(yyvsp[0].id); ; break;} -case 81: -#line 584 "parse.y" +case 127: +#line 1210 "parse.y" { Node *node = new_check(GT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 82: -#line 588 "parse.y" +case 128: +#line 1214 "parse.y" { Node *node = new_check(LT_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 83: -#line 592 "parse.y" +case 129: +#line 1218 "parse.y" { Node *node = new_check(GE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 84: -#line 596 "parse.y" +case 130: +#line 1222 "parse.y" { Node *node = new_check(LE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 85: -#line 600 "parse.y" +case 131: +#line 1226 "parse.y" { Node *node = new_check(EQ_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 86: -#line 604 "parse.y" +case 132: +#line 1230 "parse.y" { Node *node = new_check(NE_CHECK,yyvsp[0].id); checks = g_list_append(checks,node); ; break;} -case 87: -#line 610 "parse.y" +case 133: +#line 1236 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 88: -#line 611 "parse.y" +case 134: +#line 1237 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 89: -#line 615 "parse.y" +case 135: +#line 1241 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } /* the action file gets copied in in place of this dollarsign */ -#line 498 "/usr/lib/bison.simple" +#line 543 "/usr/lib/bison.simple" yyvsp -= yylen; yyssp -= yylen; @@ -1800,6 +2673,30 @@ yyerrhandle: yystate = yyn; goto yynewstate; + + yyacceptlab: + /* YYACCEPT comes here. */ + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 0; + + yyabortlab: + /* YYABORT comes here. */ + if (yyfree_stacks) + { + free (yyss); + free (yyvs); +#ifdef YYLSP_NEEDED + free (yyls); +#endif + } + return 1; } -#line 618 "parse.y" +#line 1244 "parse.y"