X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/dd11885aadcfaafae2d6268c381b0aac94cbc149..489e97ede850a8de01ca3bd653dce9c25dcd54a1:/src/parse.c diff --git a/src/parse.c b/src/parse.c index 7b6e9eb..948309f 100644 --- a/src/parse.c +++ b/src/parse.c @@ -24,47 +24,74 @@ #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 ARGUMENT 286 -#define VIRTUAL 287 -#define SIGNAL 288 -#define OVERRIDE 289 - -#line 21 "parse.y" +#define SINGLE_CHAR 277 +#define CCODE 278 +#define HTCODE 279 +#define PHCODE 280 +#define HCODE 281 +#define ACODE 282 +#define ATCODE 283 +#define STRING 284 +#define PUBLIC 285 +#define PRIVATE 286 +#define PROTECTED 287 +#define CLASSWIDE 288 +#define PROPERTY 289 +#define ARGUMENT 290 +#define VIRTUAL 291 +#define SIGNAL 292 +#define OVERRIDE 293 +#define NICK 294 +#define BLURB 295 +#define MAXIMUM 296 +#define MINIMUM 297 +#define DEFAULT_VALUE 298 +#define ERROR 299 +#define FLAGS 300 +#define TYPE 301 +#define FLAGS_TYPE 302 +#define ENUM_TYPE 303 +#define PARAM_TYPE 304 +#define BOXED_TYPE 305 +#define OBJECT_TYPE 306 + +#line 22 "parse.y" #include "config.h" #include #include +#include #include #include "treefuncs.h" #include "main.h" #include "util.h" +/* FIXME: add gettext support */ #define _(x) (x) GList *nodes = NULL; static GList *class_nodes = NULL; Node *class = NULL; - +GList *enums = NULL; +static GList *enum_vals = NULL; +static GList *flag_vals = NULL; +static GList *error_vals = NULL; + +static char *chunk_size = NULL; +static char *bonobo_object_class = NULL; +static GList *interfaces = 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 gboolean destructor_unref = FALSE; static char *destructor = NULL; static int destructor_line = 0; static gboolean destructor_simple = TRUE; @@ -76,6 +103,8 @@ static char *defreturn = NULL; static GList *gtktypes = NULL; +static Property *property = NULL; + /* this can be a global as we will only do one function at a time anyway */ static int the_scope = NO_SCOPE; @@ -122,33 +151,45 @@ pop_type(void) } static void -push_variable(char *name, int scope, int line_no, char *postfix) +push_variable (char *name, int scope, int line_no, char *postfix) { Node *var; - Type *type = pop_type(); + Type *type = pop_type (); type->postfix = postfix; - var = new_variable(scope, type, name, line_no, - destructor, destructor_line, - destructor_simple, - initializer, initializer_line); + var = node_new (VARIABLE_NODE, + "scope", scope, + "vtype:steal", type, + "id:steal", name, + "line_no", line_no, + "destructor_unref", destructor_unref, + "destructor:steal", destructor, + "destructor_line", destructor_line, + "destructor_simple", destructor_simple, + "initializer:steal", initializer, + "initializer_line", initializer_line, + NULL); class_nodes = g_list_append(class_nodes, var); } static void -push_function(int scope, int method, char *oid, char *id, - 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 *)node_new (TYPE_NODE, + "name", "void", + NULL); } else { - type = (Type *)new_type(0,g_strdup("void"),NULL); + type = pop_type(); } /* a complicated and ugly test to figure out if we have @@ -159,18 +200,18 @@ push_function(int scope, int method, char *oid, char *id, !(g_list_length(funcargs) == 1 && g_list_length(gtktypes) == 2 && strcmp(gtktypes->next->data, "NONE")==0)) { - print_error(TRUE, _("The number of GTK arguments and " - "function arguments for a signal " - "don't seem to match"), line_no); + error_print(GOB_WARN, line_no, + _("The number of GTK arguments and " + "function arguments for a signal " + "don't seem to match")); } if(g_list_length(gtktypes) > 2) { GList *li; for(li = gtktypes->next; li; li = li->next) { if(strcmp(li->data, "NONE")==0) { - print_error(FALSE, + error_print(GOB_ERROR, line_no, _("NONE can only appear in an " - "argument list by itself"), - line_no); + "argument list by itself")); } } } @@ -184,9 +225,25 @@ push_function(int scope, int method, char *oid, char *id, } else c_cbuf = NULL; - node = new_method(scope, method, type, oid, gtktypes, flags, - id, funcargs, onerror, defreturn, c_cbuf, line_no, - ccode_line, vararg); + node = node_new (METHOD_NODE, + "scope", scope, + "method", method, + "mtype:steal", type, + "otype:steal", oid, + "gtktypes:steal", gtktypes, + "flags:steal", flags, + "id:steal", id, + "args:steal", funcargs, + "onerror:steal", onerror, + "defreturn:steal", defreturn, + "cbuf:steal", c_cbuf, + "line_no", line_no, + "ccode_line", ccode_line, + "vararg", vararg, + "unique_id", method_unique_id++, + NULL); + + last_added_method = (Method *)node; if(cbuf) g_string_free(cbuf, @@ -210,11 +267,14 @@ free_all_global_state(void) g_free(defreturn); defreturn = NULL; + g_free(chunk_size); + chunk_size = NULL; + g_list_foreach(gtktypes, (GFunc)g_free, NULL); g_list_free(gtktypes); gtktypes = NULL; - free_node_list(funcargs); + node_list_free (funcargs); funcargs = NULL; } @@ -226,7 +286,11 @@ push_funcarg(char *name, char *postfix) type->postfix = postfix; - node = new_funcarg(type, name, checks); + node = node_new (FUNCARG_NODE, + "atype:steal", type, + "name:steal", name, + "checks:steal", checks, + NULL); checks = NULL; funcargs = g_list_append(funcargs, node); @@ -244,21 +308,38 @@ push_init_arg(char *name, int is_class) else tn = g_strdup(((Class *)class)->otype); - type = new_type(1,tn,NULL); - node = new_funcarg((Type *)type,name,NULL); + type = node_new (TYPE_NODE, + "name:steal", tn, + "pointer", "*", + NULL); + node = node_new (FUNCARG_NODE, + "atype:steal", (Type *)type, + "name:steal", 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); - 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); + type = node_new (TYPE_NODE, + "name", ((Class *)class)->otype, + "pointer", constant ? "const *" : "*", + NULL); + ch = g_list_append (ch, node_new (CHECK_NODE, + "chtype", NULL_CHECK, + NULL)); + ch = g_list_append (ch, node_new (CHECK_NODE, + "chtype", TYPE_CHECK, + NULL)); + node = node_new (FUNCARG_NODE, + "atype:steal", (Type *)type, + "name:steal", id, + "checks:steal", ch, + NULL); funcargs = g_list_prepend(funcargs, node); } @@ -266,7 +347,6 @@ static Variable * find_var_or_die(const char *id, int line) { GList *li; - char *s; for(li = class_nodes; li != NULL; li = li->next) { Variable *var; @@ -278,8 +358,7 @@ find_var_or_die(const char *id, int line) return var; } - s = g_strdup_printf(_("Variable %s not defined here"), id); - print_error(FALSE, s, line); + error_printf(GOB_ERROR, line, _("Variable %s not defined here"), id); g_assert_not_reached(); return NULL; @@ -304,8 +383,273 @@ set_return_value(char *type, char *val) return FALSE; } +static void +export_accessors (const char *var_name, + gboolean do_get, + int get_lineno, + gboolean do_set, + int set_lineno, + Type *type, + const char *gtktype, + int lineno) +{ + Type *the_type; + + if (type != NULL) + the_type = (Type *)node_copy ((Node *)type); + else + the_type = get_tree_type (gtktype, TRUE); + + if (the_type == NULL) { + error_print (GOB_ERROR, line_no, + _("Cannot determine type of property or argument")); + return; + } + + if (do_get) { + char *get_id = g_strdup_printf ("get_%s", var_name); + GString *get_cbuf = g_string_new (NULL); + Node *node1 = node_new (TYPE_NODE, + "name", the_type->name, + "pointer", the_type->pointer, + "postfix", the_type->postfix, + NULL); + Node *node3 = node_new (TYPE_NODE, + "name", class->class.otype, + "pointer", "*", + NULL); + + g_string_sprintf (get_cbuf, + "\t%s%s val; " + "g_object_get (G_OBJECT (self), \"%s\", " + "&val, NULL); " + "return val;\n", + the_type->name, + the_type->pointer ? the_type->pointer : "", + var_name); + + 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, get_lineno, + lineno, FALSE, NULL); + } + + if (do_set) { + char *set_id = g_strdup_printf ("set_%s", var_name); + GString *set_cbuf = g_string_new (NULL); + Node *node1 = node_new (TYPE_NODE, + "name", the_type->name, + "pointer", the_type->pointer, + "postfix", the_type->postfix, + NULL); + Node *node2 = node_new (TYPE_NODE, + "name", "void", + NULL); + Node *node3 = node_new (TYPE_NODE, + "name", class->class.otype, + "pointer", "*", + NULL); + + g_string_sprintf (set_cbuf, + "\tg_object_set (G_OBJECT (self), " + "\"%s\", val, NULL);\n", + var_name); + + typestack = g_list_prepend (typestack, node2); + typestack = g_list_prepend (typestack, node1); + typestack = g_list_prepend (typestack, node3); + + push_funcarg ("self", FALSE); + push_funcarg ("val", FALSE); + + typestack = g_list_prepend (typestack, node2); + push_function (PUBLIC_SCOPE, REGULAR_METHOD, NULL, + set_id, set_cbuf, set_lineno, + lineno, FALSE, NULL); + } + + node_free ((Node *)the_type); +} + +static char * +get_prop_enum_flag_cast (Property *prop) +{ + char *tmp, *ret; + if (prop->extra_gtktype == NULL || + /* HACK! just in case someone made this + * work with 2.0.0 by using the TYPE + * macro directly */ + ((strstr (prop->extra_gtktype, "_TYPE_") != NULL || + strstr (prop->extra_gtktype, "TYPE_") == prop->extra_gtktype) && + strchr (prop->extra_gtktype, ':') == NULL)) { + if (prop->ptype != NULL) + return get_type (prop->ptype, TRUE); + else + return g_strdup (""); + } + tmp = remove_sep (prop->extra_gtktype); + ret = g_strdup_printf ("(%s) ", tmp); + g_free (tmp); + return ret; +} + +static void +property_link_and_export (Node *node) +{ + Property *prop = (Property *)node; + + if (prop->link) { + const char *root; + char *get = NULL, *set = NULL; + Variable *var; + + if (prop->set != NULL || + prop->get != NULL) { + error_print (GOB_ERROR, prop->line_no, + _("Property linking requested, but " + "getters and setters exist")); + } + + var = find_var_or_die (prop->name, prop->line_no); + 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, prop->line_no, + _("Self aliases needed when autolinking to a classwide member")); + } else { + root = "self"; + } + + if (strcmp (prop->gtktype, "STRING") == 0) { + set = g_strdup_printf("{ char *old = %s->%s; " + "%s->%s = g_value_dup_string (VAL); g_free (old); }", + root, prop->name, + root, prop->name); + get = g_strdup_printf("g_value_set_string (VAL, %s->%s);", + root, prop->name); + } else if (strcmp (prop->gtktype, "OBJECT") == 0) { + char *cast; + if (prop->extra_gtktype != NULL) { + cast = remove_sep (prop->extra_gtktype); + } else { + cast = "void"; + } + set = g_strdup_printf("{ GObject *___old = (GObject *)%s->%s; " + "%s->%s = (%s *)g_value_dup_object (VAL); " + "if (___old != NULL) { " + "g_object_unref (G_OBJECT (___old)); " + "} " + "}", + root, prop->name, + root, prop->name, + cast); + get = g_strdup_printf ("g_value_set_object (VAL, " + "(gpointer)%s->%s);", + root, prop->name); + g_free (cast); + } else if (strcmp (prop->gtktype, "BOXED") == 0) { + if (prop->extra_gtktype == NULL) { + error_print (GOB_ERROR, prop->line_no, + _("Property linking requested for BOXED, but " + "boxed_type not set")); + } + set = g_strdup_printf("{ gpointer ___old = (gpointer)%s->%s; " + "gpointer ___new = (gpointer)g_value_get_boxed (VAL); " + "if (___new != ___old) { " + "if (___old != NULL) g_boxed_free (%s, ___old); " + "if (___new != NULL) %s->%s = g_boxed_copy (%s, ___new); " + "else %s->%s = NULL;" + "} " + "}", + root, prop->name, + prop->extra_gtktype, + root, prop->name, + prop->extra_gtktype, + root, prop->name); + get = g_strdup_printf("g_value_set_object (VAL, %s->%s);", + root, prop->name); + } else { + char *set_func; + char *get_func; + const char *getcast = ""; + const char *setcast = ""; + char *to_free = NULL; + set_func = g_strdup_printf ("g_value_set_%s", prop->gtktype); + g_strdown (set_func); + get_func = g_strdup_printf ("g_value_get_%s", prop->gtktype); + g_strdown (get_func); + + if (strcmp (prop->gtktype, "FLAGS") == 0) { + setcast = "(guint) "; + getcast = to_free = + get_prop_enum_flag_cast (prop); + } else if (strcmp (prop->gtktype, "ENUM") == 0) { + setcast = "(gint) "; + getcast = to_free = + get_prop_enum_flag_cast (prop); + } + + set = g_strdup_printf("%s->%s = %s%s (VAL);", + root, prop->name, + getcast, + get_func); + get = g_strdup_printf("%s (VAL, %s%s->%s);", + set_func, + setcast, + root, prop->name); + + g_free (get_func); + g_free (set_func); + g_free (to_free); + } + + node_set (node, + "get:steal", get, + "get_line", prop->line_no, + "set:steal", set, + "set_line", prop->line_no, + NULL); + } + + if (prop->export) { + export_accessors (prop->name, + prop->get != NULL, prop->get_line, + prop->set != NULL, prop->set_line, + prop->ptype, + prop->gtktype, + prop->line_no); + } +} + + +static char * +debool (char *s) +{ + if (strcmp (s, "BOOL") == 0) { + error_print (GOB_WARN, line_no, + _("BOOL type is deprecated, please use BOOLEAN")); + g_free (s); + return g_strdup ("BOOLEAN"); + } else { + return s; + } +} + +static void +ensure_property (void) +{ + if (property == NULL) + property = (Property *)node_new (PROPERTY_NODE, NULL); +} + -#line 288 "parse.y" +#line 616 "parse.y" typedef union { char *id; GString *cbuf; @@ -327,26 +671,26 @@ typedef union { -#define YYFINAL 242 +#define YYFINAL 398 #define YYFLAG -32768 -#define YYNTBASE 49 +#define YYNTBASE 66 -#define YYTRANSLATE(x) ((unsigned)(x) <= 289 ? yytranslate[x] : 86) +#define YYTRANSLATE(x) ((unsigned)(x) <= 306 ? yytranslate[x] : 118) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 47, 2, 2, 2, 2, 2, 2, 40, - 41, 43, 2, 44, 48, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 38, 46, - 39, 45, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 64, 2, 2, 2, 2, 2, 2, 55, + 56, 61, 2, 59, 65, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 57, 63, + 58, 62, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 36, 42, 37, 2, 2, 2, 2, 2, + 2, 2, 53, 60, 54, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -362,86 +706,130 @@ static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30, 31, 32, 33, 34, 35 + 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, + 47, 48, 49, 50, 51, 52 }; #if YYDEBUG != 0 static const short yyprhs[] = { 0, 0, 4, 7, 10, 12, 14, 16, 18, 20, 22, - 24, 27, 29, 34, 38, 43, 46, 48, 50, 52, - 54, 56, 58, 60, 62, 65, 69, 72, 76, 79, - 82, 84, 86, 87, 93, 100, 112, 121, 127, 133, - 135, 139, 140, 144, 146, 148, 151, 153, 156, 159, - 162, 164, 167, 170, 172, 174, 176, 178, 181, 183, - 185, 188, 190, 193, 195, 197, 199, 201, 203, 206, - 208, 211, 213, 217, 221, 224, 226, 231, 235, 237, - 240, 242, 253, 265, 275, 285, 294, 306, 315, 321, - 324, 329, 330, 332, 335, 337, 339, 343, 345, 349, - 351, 355, 357, 360, 364, 371, 379, 382, 384, 386, - 389, 392, 396, 400, 404, 408, 410, 413 + 24, 27, 30, 33, 36, 38, 40, 42, 44, 49, + 53, 59, 60, 66, 72, 78, 81, 83, 85, 88, + 92, 94, 96, 98, 100, 102, 104, 106, 108, 111, + 115, 118, 122, 125, 128, 130, 132, 133, 139, 146, + 159, 169, 176, 180, 181, 193, 202, 208, 212, 213, + 217, 219, 221, 226, 228, 230, 234, 238, 242, 246, + 250, 254, 258, 262, 266, 270, 274, 278, 282, 286, + 290, 294, 298, 300, 306, 308, 312, 313, 317, 319, + 322, 324, 326, 328, 331, 334, 337, 341, 345, 348, + 351, 354, 356, 359, 361, 364, 366, 368, 370, 372, + 374, 376, 378, 380, 382, 384, 386, 388, 390, 393, + 396, 400, 403, 405, 409, 413, 416, 418, 423, 427, + 429, 432, 434, 445, 457, 467, 477, 486, 498, 507, + 513, 516, 521, 522, 524, 527, 529, 531, 534, 537, + 541, 546, 551, 553, 557, 559, 563, 565, 568, 572, + 579, 587, 590, 592, 594, 597, 600, 604, 608, 612, + 616, 624, 633, 637, 639, 643, 645, 653, 662, 666, + 668, 676, 685, 689, 691, 693, 696, 698 }; -static const short yyrhs[] = { 51, - 52, 51, 0, 52, 51, 0, 51, 52, 0, 52, - 0, 23, 0, 26, 0, 24, 0, 25, 0, 27, - 0, 28, 0, 51, 50, 0, 50, 0, 53, 36, - 54, 37, 0, 53, 36, 37, 0, 3, 21, 4, - 21, 0, 54, 55, 0, 55, 0, 76, 0, 60, - 0, 61, 0, 38, 0, 29, 0, 30, 0, 31, - 0, 19, 19, 0, 19, 36, 23, 0, 39, 85, - 0, 39, 36, 23, 0, 57, 58, 0, 58, 57, - 0, 58, 0, 57, 0, 0, 56, 65, 19, 59, - 38, 0, 56, 65, 19, 22, 59, 38, 0, 32, - 63, 62, 19, 19, 36, 23, 19, 36, 23, 38, - 0, 32, 63, 62, 19, 19, 36, 23, 38, 0, - 32, 63, 62, 19, 19, 0, 19, 40, 19, 65, - 41, 0, 19, 0, 40, 64, 41, 0, 0, 19, - 42, 64, 0, 19, 0, 66, 0, 5, 66, 0, - 67, 0, 67, 70, 0, 12, 68, 0, 11, 68, - 0, 68, 0, 12, 18, 0, 11, 18, 0, 18, - 0, 17, 0, 16, 0, 19, 0, 69, 19, 0, - 21, 0, 6, 0, 13, 15, 0, 13, 0, 14, - 15, 0, 14, 0, 15, 0, 9, 0, 8, 0, - 7, 0, 43, 70, 0, 43, 0, 19, 73, 0, - 73, 0, 56, 19, 73, 0, 19, 56, 73, 0, - 56, 73, 0, 71, 0, 19, 40, 74, 41, 0, - 74, 44, 19, 0, 19, 0, 36, 23, 0, 38, - 0, 34, 63, 72, 65, 19, 40, 79, 41, 77, - 75, 0, 56, 34, 63, 71, 65, 19, 40, 79, - 41, 77, 75, 0, 33, 56, 65, 19, 40, 79, - 41, 77, 75, 0, 56, 33, 65, 19, 40, 79, - 41, 77, 75, 0, 33, 65, 19, 40, 79, 41, - 77, 75, 0, 35, 40, 21, 41, 65, 19, 40, - 79, 41, 77, 75, 0, 56, 65, 19, 40, 79, - 41, 77, 75, 0, 19, 40, 19, 41, 75, 0, - 19, 78, 0, 19, 78, 19, 78, 0, 0, 85, - 0, 36, 23, 0, 6, 0, 19, 0, 19, 44, - 80, 0, 80, 0, 81, 44, 10, 0, 81, 0, - 81, 44, 82, 0, 82, 0, 65, 19, 0, 65, - 19, 22, 0, 65, 19, 40, 19, 83, 41, 0, - 65, 19, 22, 40, 19, 83, 41, 0, 83, 84, - 0, 84, 0, 19, 0, 45, 85, 0, 46, 85, - 0, 45, 39, 85, 0, 46, 39, 85, 0, 39, - 39, 85, 0, 47, 39, 85, 0, 20, 0, 48, - 20, 0, 19, 0 +static const short yyrhs[] = { 68, + 69, 68, 0, 69, 68, 0, 68, 69, 0, 69, + 0, 24, 0, 27, 0, 25, 0, 26, 0, 28, + 0, 29, 0, 68, 67, 0, 68, 110, 0, 68, + 113, 0, 68, 115, 0, 67, 0, 110, 0, 113, + 0, 115, 0, 70, 53, 72, 54, 0, 70, 53, + 54, 0, 3, 21, 4, 21, 71, 0, 0, 55, + 19, 19, 56, 71, 0, 55, 19, 21, 56, 71, + 0, 55, 19, 20, 56, 71, 0, 72, 73, 0, + 73, 0, 101, 0, 19, 101, 0, 19, 21, 101, + 0, 78, 0, 79, 0, 81, 0, 57, 0, 31, + 0, 32, 0, 33, 0, 34, 0, 19, 19, 0, + 19, 53, 24, 0, 58, 117, 0, 58, 53, 24, + 0, 75, 76, 0, 76, 75, 0, 76, 0, 75, + 0, 0, 74, 90, 19, 77, 57, 0, 74, 90, + 19, 22, 77, 57, 0, 36, 88, 87, 19, 80, + 19, 53, 24, 19, 53, 24, 57, 0, 36, 88, + 87, 19, 80, 19, 53, 24, 57, 0, 36, 88, + 87, 19, 80, 19, 0, 55, 19, 56, 0, 0, + 35, 19, 19, 82, 19, 53, 24, 19, 53, 24, + 57, 0, 35, 19, 19, 82, 19, 53, 24, 57, + 0, 35, 19, 19, 82, 57, 0, 55, 83, 56, + 0, 0, 83, 59, 86, 0, 86, 0, 30, 0, + 19, 55, 30, 56, 0, 117, 0, 84, 0, 40, + 58, 84, 0, 41, 58, 84, 0, 42, 58, 117, + 0, 43, 58, 117, 0, 44, 58, 85, 0, 46, + 58, 89, 0, 47, 58, 90, 0, 48, 58, 21, + 0, 48, 58, 19, 0, 49, 58, 21, 0, 49, + 58, 19, 0, 50, 58, 21, 0, 50, 58, 19, + 0, 51, 58, 21, 0, 51, 58, 19, 0, 52, + 58, 21, 0, 52, 58, 19, 0, 19, 0, 19, + 55, 19, 90, 56, 0, 19, 0, 55, 89, 56, + 0, 0, 19, 60, 89, 0, 19, 0, 91, 95, + 0, 91, 0, 92, 0, 19, 0, 5, 19, 0, + 19, 5, 0, 94, 19, 0, 5, 94, 19, 0, + 94, 19, 5, 0, 93, 92, 0, 21, 92, 0, + 5, 92, 0, 21, 0, 21, 5, 0, 93, 0, + 93, 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, 61, 0, 61, + 5, 0, 61, 95, 0, 61, 5, 95, 0, 19, + 98, 0, 98, 0, 74, 19, 98, 0, 19, 74, + 98, 0, 74, 98, 0, 96, 0, 19, 55, 99, + 56, 0, 99, 59, 19, 0, 19, 0, 53, 24, + 0, 57, 0, 38, 88, 97, 90, 19, 55, 104, + 56, 102, 100, 0, 74, 38, 88, 96, 90, 19, + 55, 104, 56, 102, 100, 0, 37, 74, 90, 19, + 55, 104, 56, 102, 100, 0, 74, 37, 90, 19, + 55, 104, 56, 102, 100, 0, 37, 90, 19, 55, + 104, 56, 102, 100, 0, 39, 55, 21, 56, 90, + 19, 55, 104, 56, 102, 100, 0, 74, 90, 19, + 55, 104, 56, 102, 100, 0, 19, 55, 19, 56, + 100, 0, 19, 103, 0, 19, 103, 19, 103, 0, + 0, 117, 0, 53, 24, 0, 6, 0, 19, 0, + 19, 5, 0, 5, 19, 0, 19, 59, 105, 0, + 19, 5, 59, 105, 0, 5, 19, 59, 105, 0, + 105, 0, 106, 59, 10, 0, 106, 0, 106, 59, + 107, 0, 107, 0, 90, 19, 0, 90, 19, 22, + 0, 90, 19, 55, 19, 108, 56, 0, 90, 19, + 22, 55, 19, 108, 56, 0, 108, 109, 0, 109, + 0, 19, 0, 62, 117, 0, 63, 117, 0, 62, + 58, 117, 0, 63, 58, 117, 0, 58, 58, 117, + 0, 64, 58, 117, 0, 9, 19, 53, 111, 54, + 21, 57, 0, 9, 19, 53, 111, 59, 54, 21, + 57, 0, 111, 59, 112, 0, 112, 0, 19, 58, + 117, 0, 19, 0, 46, 19, 53, 114, 54, 21, + 57, 0, 46, 19, 53, 114, 59, 54, 21, 57, + 0, 114, 59, 19, 0, 19, 0, 45, 19, 53, + 116, 54, 21, 57, 0, 45, 19, 53, 116, 59, + 54, 21, 57, 0, 116, 59, 19, 0, 19, 0, + 20, 0, 65, 20, 0, 23, 0, 19, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 306, 307, 308, 309, 312, 318, 324, 330, 336, 342, - 350, 351, 354, 359, 366, 371, 372, 375, 376, 377, - 378, 381, 382, 383, 386, 399, 415, 419, 427, 428, - 429, 430, 431, 437, 440, 444, 479, 507, 572, 581, - 587, 588, 591, 594, 600, 601, 609, 613, 620, 623, - 626, 629, 632, 635, 638, 641, 644, 647, 651, 654, - 659, 662, 665, 668, 671, 676, 679, 682, 687, 688, - 692, 704, 710, 722, 734, 737, 743, 748, 751, 756, - 757, 761, 772, 783, 794, 805, 816, 822, 827, 848, - 859, 878, 884, 885, 891, 892, 903, 913, 916, 917, - 920, 921, 924, 927, 930, 938, 948, 949, 952, 965, - 969, 973, 977, 981, 985, 991, 992, 996 + 637, 638, 639, 640, 643, 652, 661, 670, 679, 688, + 699, 700, 701, 702, 703, 704, 705, 706, 709, 714, + 721, 735, 736, 748, 757, 771, 772, 775, 776, 785, + 797, 798, 799, 800, 803, 804, 805, 806, 809, 829, + 853, 857, 865, 866, 867, 868, 869, 875, 878, 883, + 951, 1005, 1093, 1101, 1106, 1154, 1190, 1206, 1207, 1210, + 1211, 1214, 1215, 1227, 1228, 1231, 1237, 1243, 1249, 1255, + 1261, 1267, 1274, 1280, 1286, 1292, 1298, 1304, 1310, 1316, + 1322, 1328, 1334, 1354, 1363, 1369, 1370, 1373, 1376, 1382, + 1389, 1398, 1401, 1404, 1408, 1412, 1416, 1421, 1429, 1433, + 1438, 1442, 1445, 1449, 1452, 1457, 1458, 1459, 1460, 1461, + 1462, 1463, 1464, 1465, 1468, 1469, 1470, 1473, 1474, 1475, + 1479, 1486, 1498, 1504, 1516, 1528, 1531, 1537, 1542, 1545, + 1550, 1551, 1555, 1571, 1587, 1603, 1619, 1630, 1636, 1646, + 1669, 1680, 1699, 1705, 1706, 1712, 1713, 1724, 1735, 1746, + 1756, 1766, 1776, 1779, 1780, 1783, 1784, 1787, 1790, 1793, + 1801, 1811, 1812, 1815, 1832, 1839, 1846, 1853, 1860, 1867, + 1876, 1885, 1896, 1897, 1900, 1920, 1930, 1939, 1950, 1953, + 1958, 1967, 1978, 1981, 1987, 1988, 1992, 1993 }; #endif @@ -451,195 +839,299 @@ 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","TOKEN","NUMBER","TYPETOKEN","ARRAY_DIM", -"CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","PUBLIC","PRIVATE","PROTECTED", -"ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE","'{'","'}'","';'","'='","'('","')'", -"'|'","'*'","','","'>'","'<'","'!'","'-'","prog","ccode","ccodes","class","classdec", -"classcode","thing","scope","destructor","initializer","varoptions","variable", -"argument","argtype","flags","flaglist","type","type1","type2","integer","tspecifier", -"stars","simplesigtype","fullsigtype","sigtype","tokenlist","codenocode","method", -"returnvals","retcode","funcargs","arglist","arglist1","arg","checklist","check", -"numtok", NULL +"SINGLE_CHAR","CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","STRING","PUBLIC", +"PRIVATE","PROTECTED","CLASSWIDE","PROPERTY","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE", +"NICK","BLURB","MAXIMUM","MINIMUM","DEFAULT_VALUE","ERROR","FLAGS","TYPE","FLAGS_TYPE", +"ENUM_TYPE","PARAM_TYPE","BOXED_TYPE","OBJECT_TYPE","'{'","'}'","'('","')'", +"';'","'='","','","'|'","'*'","'>'","'<'","'!'","'-'","prog","ccode","ccodes", +"class","classdec","classflags","classcode","thing","scope","destructor","initializer", +"varoptions","variable","argument","export","property","param_spec","param_spec_list", +"string","anyval","param_spec_value","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","enumcode","enumvals","enumval", +"flagcode","flagvals","errorcode","errorvals","numtok", NULL }; #endif static const short yyr1[] = { 0, - 49, 49, 49, 49, 50, 50, 50, 50, 50, 50, - 51, 51, 52, 52, 53, 54, 54, 55, 55, 55, - 55, 56, 56, 56, 57, 57, 58, 58, 59, 59, - 59, 59, 59, 60, 60, 61, 61, 61, 62, 62, - 63, 63, 64, 64, 65, 65, 66, 66, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 68, 68, 68, 68, 68, 69, 69, 69, 70, 70, - 71, 71, 72, 72, 72, 72, 73, 74, 74, 75, - 75, 76, 76, 76, 76, 76, 76, 76, 76, 77, - 77, 77, 78, 78, 79, 79, 79, 79, 80, 80, - 81, 81, 82, 82, 82, 82, 83, 83, 84, 84, - 84, 84, 84, 84, 84, 85, 85, 85 + 66, 66, 66, 66, 67, 67, 67, 67, 67, 67, + 68, 68, 68, 68, 68, 68, 68, 68, 69, 69, + 70, 71, 71, 71, 71, 72, 72, 73, 73, 73, + 73, 73, 73, 73, 74, 74, 74, 74, 75, 75, + 76, 76, 77, 77, 77, 77, 77, 78, 78, 79, + 79, 79, 80, 80, 81, 81, 81, 82, 82, 83, + 83, 84, 84, 85, 85, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 87, 87, 88, 88, 89, 89, 90, + 90, 91, 91, 91, 91, 91, 91, 91, 92, 92, + 92, 92, 92, 92, 92, 93, 93, 93, 93, 93, + 93, 93, 93, 93, 94, 94, 94, 95, 95, 95, + 95, 96, 96, 97, 97, 97, 97, 98, 99, 99, + 100, 100, 101, 101, 101, 101, 101, 101, 101, 101, + 102, 102, 102, 103, 103, 104, 104, 104, 104, 104, + 104, 104, 104, 105, 105, 106, 106, 107, 107, 107, + 107, 108, 108, 109, 109, 109, 109, 109, 109, 109, + 110, 110, 111, 111, 112, 112, 113, 113, 114, 114, + 115, 115, 116, 116, 117, 117, 117, 117 }; static const short yyr2[] = { 0, 3, 2, 2, 1, 1, 1, 1, 1, 1, 1, - 2, 1, 4, 3, 4, 2, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 3, 2, 3, 2, 2, - 1, 1, 0, 5, 6, 11, 8, 5, 5, 1, - 3, 0, 3, 1, 1, 2, 1, 2, 2, 2, - 1, 2, 2, 1, 1, 1, 1, 2, 1, 1, - 2, 1, 2, 1, 1, 1, 1, 1, 2, 1, - 2, 1, 3, 3, 2, 1, 4, 3, 1, 2, - 1, 10, 11, 9, 9, 8, 11, 8, 5, 2, - 4, 0, 1, 2, 1, 1, 3, 1, 3, 1, - 3, 1, 2, 3, 6, 7, 2, 1, 1, 2, - 2, 3, 3, 3, 3, 1, 2, 1 + 2, 2, 2, 2, 1, 1, 1, 1, 4, 3, + 5, 0, 5, 5, 5, 2, 1, 1, 2, 3, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, + 2, 3, 2, 2, 1, 1, 0, 5, 6, 12, + 9, 6, 3, 0, 11, 8, 5, 3, 0, 3, + 1, 1, 4, 1, 1, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 1, 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, + 7, 8, 3, 1, 3, 1, 7, 8, 3, 1, + 7, 8, 3, 1, 1, 2, 1, 1 }; static const short yydefact[] = { 0, - 0, 5, 7, 8, 6, 9, 10, 12, 0, 4, - 0, 0, 11, 3, 2, 0, 0, 1, 0, 22, - 23, 24, 42, 0, 42, 0, 14, 21, 0, 17, - 0, 19, 20, 18, 15, 0, 0, 0, 0, 60, - 68, 67, 66, 0, 0, 62, 64, 65, 56, 55, - 54, 57, 59, 0, 0, 45, 47, 51, 0, 0, - 0, 13, 16, 0, 42, 0, 0, 44, 0, 40, - 0, 46, 53, 50, 52, 49, 61, 63, 0, 0, - 70, 48, 58, 0, 0, 76, 0, 72, 0, 0, - 0, 33, 0, 0, 41, 0, 0, 0, 0, 69, - 0, 0, 0, 71, 0, 75, 0, 0, 0, 0, - 0, 0, 33, 0, 0, 32, 31, 0, 0, 81, - 89, 43, 0, 38, 0, 60, 57, 0, 0, 98, - 100, 102, 79, 0, 74, 73, 0, 0, 0, 0, - 25, 0, 0, 118, 116, 0, 0, 27, 0, 29, - 30, 34, 80, 0, 0, 0, 0, 103, 92, 0, - 77, 0, 0, 0, 0, 0, 26, 35, 28, 117, - 92, 39, 0, 92, 97, 104, 0, 0, 0, 99, - 101, 78, 0, 0, 92, 0, 0, 0, 37, 0, - 0, 0, 0, 90, 93, 86, 92, 0, 0, 0, - 88, 0, 84, 0, 109, 0, 0, 0, 0, 0, - 108, 94, 0, 0, 92, 85, 92, 0, 0, 0, - 0, 110, 0, 111, 0, 105, 107, 91, 82, 0, - 0, 36, 106, 114, 112, 113, 115, 87, 83, 0, - 0, 0 + 0, 0, 5, 7, 8, 6, 9, 10, 0, 0, + 15, 0, 4, 0, 16, 17, 18, 0, 0, 0, + 0, 11, 3, 12, 13, 14, 2, 0, 0, 0, + 0, 0, 1, 0, 35, 36, 37, 38, 0, 87, + 0, 87, 0, 20, 34, 0, 27, 0, 31, 32, + 33, 28, 22, 176, 0, 174, 184, 0, 180, 0, + 0, 0, 0, 0, 29, 0, 0, 0, 0, 106, + 115, 116, 117, 113, 114, 110, 108, 109, 111, 112, + 107, 93, 102, 0, 0, 91, 92, 104, 0, 0, + 0, 19, 26, 0, 87, 0, 0, 21, 0, 0, + 0, 0, 0, 0, 0, 30, 0, 0, 59, 89, + 0, 85, 0, 0, 94, 101, 0, 95, 103, 100, + 0, 0, 118, 90, 105, 99, 96, 0, 0, 127, + 0, 123, 0, 0, 0, 47, 0, 188, 185, 187, + 0, 175, 0, 0, 173, 0, 183, 0, 0, 179, + 0, 0, 0, 0, 0, 0, 86, 0, 54, 97, + 0, 0, 119, 120, 98, 0, 0, 0, 122, 0, + 126, 0, 0, 0, 0, 0, 0, 47, 0, 0, + 46, 45, 0, 0, 0, 0, 186, 171, 0, 181, + 0, 177, 0, 0, 132, 140, 83, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 61, 0, 57, 88, 0, 0, 0, 0, 0, 106, + 93, 0, 0, 153, 155, 157, 121, 130, 0, 125, + 124, 0, 0, 0, 0, 39, 0, 0, 0, 0, + 41, 43, 44, 48, 22, 22, 22, 172, 182, 178, + 131, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 58, 0, 0, 0, 0, 52, 0, + 94, 95, 0, 158, 143, 0, 128, 0, 0, 0, + 0, 0, 40, 49, 143, 42, 23, 25, 24, 0, + 62, 66, 67, 68, 69, 188, 65, 70, 64, 71, + 72, 74, 73, 76, 75, 78, 77, 80, 79, 82, + 81, 60, 0, 84, 53, 0, 143, 0, 0, 150, + 159, 0, 0, 0, 154, 156, 129, 0, 0, 143, + 0, 0, 0, 0, 56, 0, 0, 152, 151, 0, + 0, 0, 141, 144, 137, 143, 0, 0, 0, 139, + 0, 0, 0, 51, 135, 0, 164, 0, 0, 0, + 0, 0, 163, 145, 0, 0, 143, 136, 143, 63, + 0, 0, 0, 0, 0, 165, 0, 166, 0, 160, + 162, 142, 133, 0, 0, 55, 0, 161, 169, 167, + 168, 170, 138, 134, 50, 0, 0, 0 }; -static const short yydefgoto[] = { 240, - 8, 9, 10, 11, 29, 30, 31, 116, 117, 118, - 32, 33, 71, 38, 69, 128, 56, 57, 58, 59, - 82, 86, 87, 88, 134, 121, 34, 179, 194, 129, - 130, 131, 132, 210, 211, 195 +static const short yydefgoto[] = { 396, + 11, 12, 13, 14, 98, 46, 47, 48, 181, 182, + 183, 49, 50, 217, 51, 155, 210, 292, 298, 211, + 113, 68, 111, 222, 86, 87, 88, 89, 124, 130, + 131, 132, 229, 196, 52, 324, 343, 223, 224, 225, + 226, 362, 363, 15, 55, 56, 16, 60, 17, 58, + 344 }; -static const short yypact[] = { 136, - -17,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 136, 167, - -16, 13,-32768, 167, 167, 150, 15, 167, 19,-32768, --32768,-32768, 27, 137, 27, 37,-32768,-32768, 170,-32768, - 107,-32768,-32768,-32768,-32768, 25, 61, 98, 254,-32768, --32768,-32768,-32768, 263, 269, 114, 118,-32768,-32768,-32768, --32768,-32768,-32768, 221, 116,-32768, 104,-32768, 138, 73, - 151,-32768,-32768, 221, 27, 154, 133, 155, 157, 156, - 159,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 187, 184, - 104,-32768,-32768, 146, 212,-32768, 221,-32768, 200, 229, - 239, 43, 96, 61,-32768, 245, 255, 240, 238,-32768, - 246, 260, 266,-32768, -8,-32768, 270, 221, 248, -8, - 221, 36, 3, -1, 238, 251, 272, 256, 273,-32768, --32768,-32768, 221, 257, 238, 258, 57, 276, 259,-32768, - 253,-32768,-32768, 64,-32768,-32768, 252, 279, 238, 282, --32768, 280, 264,-32768,-32768, 281, 285,-32768, 265,-32768, --32768,-32768,-32768, 267, 284, 268, 221, 5, 291, 204, --32768, 292, 238, 274, 271, 275,-32768,-32768,-32768,-32768, - 291,-32768, -10, 291,-32768, 277, 294, 18, 96,-32768, --32768,-32768, 278, 238, 291, 238, 96, 286,-32768, 96, - 297, 91, 295, 301,-32768,-32768, 291, 283, 96, 287, --32768, 298,-32768, 91,-32768, 288, -5, 10, 290, 29, --32768,-32768, 18, 96, 291,-32768, 291, 293, 50, 4, - 4,-32768, 4,-32768, 4,-32768,-32768,-32768,-32768, 96, - 96,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 323, - 325,-32768 +static const short yypact[] = { 137, + 16, 24,-32768,-32768,-32768,-32768,-32768,-32768, 45, 99, +-32768, 137, 170, 72,-32768,-32768,-32768, 106, 73, 81, + 98,-32768, 170,-32768,-32768,-32768, 170, 154, 111, 151, + 183, 186, 170, 215,-32768,-32768,-32768,-32768, 187, 158, + 310, 158, 182,-32768,-32768, 188,-32768, 276,-32768,-32768, +-32768,-32768, 195, 210, 69,-32768,-32768, 113,-32768, 115, + 214, 301, 190, 276,-32768, 248, 252, 254, 357,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768, 269, 425, 374, 267, 235,-32768, 439, 284, 444, + 290,-32768,-32768, 374, 158, 293, 311,-32768, 74, 315, + 76, 316, 84, 339, 90,-32768, 321, 348, 329, 334, + 345, 356, 399, 453,-32768,-32768, 409,-32768, 453,-32768, + 413, 378, 2,-32768, 453,-32768, 429, 224, 416,-32768, + 374,-32768, 392, 428, 430, 126, 220,-32768,-32768,-32768, + 441,-32768, 405, 451,-32768, 422,-32768, 452, 423,-32768, + 460, -32, 427, 258, 21, 252,-32768, 464, 431,-32768, + 432, 391, 235,-32768,-32768, 433, 465, 466,-32768, -6, +-32768, 470, 374, 435, -6, 374, 26, 0, 391, 7, + 434, 472, 436, 438, 440, 442,-32768,-32768, 443,-32768, + 445,-32768, 446, 471,-32768,-32768,-32768, 447, 448, 449, + 450, 454, 455, 456, 457, 458, 459, 461, 462, 91, +-32768, 468,-32768,-32768, 374, 478, 480, 391, 408, 467, + 6, 482, 469,-32768, 463,-32768,-32768,-32768, 112,-32768, +-32768, 473, 485, 391, 490,-32768, 486, 474, 476, 487, +-32768,-32768,-32768,-32768, 195, 195, 195,-32768,-32768,-32768, +-32768, 1, 1, 74, 74, 9, 252, 374, 139, 157, + 191, 209, 212,-32768, 258, 494, 477, 479, 481, 483, + 121, 144, 374, 94, 505, 340,-32768, 507, 391, 475, + 484, 488,-32768,-32768, 505,-32768,-32768,-32768,-32768, 489, +-32768,-32768,-32768,-32768,-32768, 489,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, 47,-32768,-32768, 503, 505, 374, 374,-32768, + 491, 510, 27, -32,-32768,-32768,-32768, 492, 391, 505, + 391, -32, 506, 496,-32768, 54, -32,-32768,-32768, 518, + 57, 514, 522,-32768,-32768, 505, 495, -32, 497,-32768, + 498, 521, 499,-32768,-32768, 57,-32768, 500, 64, 66, + 501, 50,-32768,-32768, 27, -32, 505,-32768, 505,-32768, + 493, 523, 79, 74, 74,-32768, 74,-32768, 74,-32768, +-32768,-32768,-32768, -32, -32,-32768, 504,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768, 542, 555,-32768 }; static const short yypgoto[] = {-32768, - 69, 117, 317,-32768,-32768, 303, -21, 213, 217, 222, --32768,-32768,-32768, -19, 242, -23, 299,-32768, 126,-32768, - 261, 243,-32768, -24,-32768, -174,-32768, -164, 124, -113, - 182,-32768, 180, 139, -120, -114 + 202, 104, 544,-32768, 17,-32768, 511, -29, 380, 379, + 385,-32768,-32768,-32768,-32768,-32768,-32768, -52,-32768, 299, +-32768, -27, -152, -40,-32768, -66,-32768, -60, -107, 437, +-32768, -93,-32768, -314, -20, -279, 200, -177, -218,-32768, + 291, 213, -266, 205,-32768, 502, 232,-32768, 239,-32768, + -99 }; -#define YYLAST 343 - - -static const short yytable[] = { 148, - 55, 149, 54, 12, 196, 60, 187, 66, 188, 190, - 101, 156, 201, 144, 145, 203, 17, 144, 145, 16, - 199, 112, 144, 145, 216, 165, 176, 189, 144, 145, - 79, 102, 214, 221, 146, 35, 144, 145, 85, 229, - 90, 114, 147, 67, 177, 91, 147, 205, 223, 183, - 230, 147, 231, 193, 141, 238, 239, 147, 36, 104, - 106, 112, 103, 107, 113, 147, 37, 206, 205, 226, - 198, 142, 200, 207, 208, 209, 61, 13, 135, 68, - 136, 114, 115, 13, 138, 104, 13, 140, 206, 227, - 233, 84, 222, 224, 207, 208, 209, -96, 227, 154, - 157, 20, 21, 22, 161, 234, 235, 162, 236, 205, - 237, 39, 40, 41, 42, 43, 70, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 15, 53, 77, 206, - 18, 119, 78, 120, 80, 207, 208, 209, 1, 64, - 65, 39, 40, 41, 42, 43, 81, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 83, 53, 2, 3, - 4, 5, 6, 7, 101, 20, 21, 22, 19, 74, - 76, 89, 92, 93, 20, 21, 22, 97, 20, 21, - 22, 23, 24, 25, 26, 102, 27, 28, 19, 2, - 3, 4, 5, 6, 7, 96, 94, 95, 20, 21, - 22, 23, 24, 25, 26, 98, 62, 28, 39, 40, - 41, 42, 43, 180, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 99, 53, 39, 40, 41, 42, 43, - 105, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 108, 53, 39, 126, 41, 42, 43, 109, 44, 45, - 46, 47, 48, 49, 50, 51, 127, 110, 53, 40, - 41, 42, 43, 123, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 124, 53, 46, 47, 48, 133, 125, - 73, 46, 47, 48, 101, 102, 75, 139, 137, 114, - 112, 163, 155, 152, 158, 153, 160, 164, -95, 159, - 166, 168, 167, 169, 170, 171, 173, 172, 174, 178, - 182, 185, 192, 184, 186, 204, 191, 212, 197, 213, - 218, 202, 241, 215, 242, 14, 220, 217, 225, 151, - 232, 63, 150, 111, 143, 122, 228, 72, 175, 181, - 0, 100, 219 +#define YYLAST 603 + + +static const short yytable[] = { 142, + 85, 239, 116, 214, 64, 332, 163, 96, 117, 345, + 272, 84, 166, 65, 90, 164, 120, 350, 177, 290, + 194, 126, 355, 108, 195, 138, 139, 296, 139, 140, + 291, 140, 64, 368, 169, 171, 18, 337, 291, 212, + 270, 106, 19, 121, 236, 138, 139, 116, 167, 140, + 348, 383, 116, 134, 320, 227, 281, 180, 116, 240, + 129, -147, 123, 20, 273, 334, 366, 135, 357, 393, + 394, 141, 353, 141, 230, 357, 231, 213, 237, 342, + 241, 169, 138, 139, 138, 139, 140, 384, 140, 385, + 172, 141, 138, 139, 54, 381, 140, 357, 168, 338, + 339, 328, 147, 335, 300, 380, 381, 358, 150, 29, + 354, 359, 360, 361, 358, 321, 27, 21, 359, 360, + 361, 375, 100, 377, 28, 30, 33, 101, 141, 144, + 141, 53, 233, 31, 388, 235, 358, 148, 141, 1, + 359, 360, 361, 151, 177, 2, 264, 178, 322, 265, + 32, 347, 116, 349, 294, 295, 299, 302, 117, 303, + 3, 4, 5, 6, 7, 8, 102, 277, 104, 54, + 278, 103, 34, 105, 267, 304, -149, 305, 2, 318, + 179, 9, 10, 180, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 3, 4, 5, 6, 7, 8, -148, + 293, 57, 319, 297, 59, 66, 34, 44, 107, 306, + 45, 307, 67, 22, 9, 10, 24, 301, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 308, 22, 309, + 310, 24, 311, 61, 22, 62, 91, 24, 184, 185, + 186, 92, 166, 25, 45, 35, 36, 37, 38, 97, + 26, 41, 42, 43, 35, 36, 37, 38, 25, 376, + 378, 287, 288, 289, 25, 26, 109, 99, 63, 63, + 110, 26, 112, 118, 389, 390, 197, 391, 167, 392, + 69, 70, 71, 72, 73, 122, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 123, 83, 198, 199, 200, + 201, 202, 127, 203, 204, 205, 206, 207, 208, 209, + 133, 136, 94, 95, 69, 70, 71, 72, 73, 61, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 137, + 83, 35, 36, 37, 38, 143, 146, 41, 42, 43, + 35, 36, 37, 38, 69, 70, 71, 72, 73, 325, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 149, + 83, 114, 70, 71, 72, 73, 153, 74, 75, 76, + 77, 78, 79, 80, 81, 115, 152, 83, 69, 70, + 71, 72, 73, 154, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 156, 83, 219, 220, 71, 72, 73, + 157, 74, 75, 76, 77, 78, 79, 80, 81, 221, + 158, 83, 114, 70, 71, 72, 73, 159, 74, 75, + 76, 77, 78, 79, 80, 81, 271, 160, 83, 119, + 70, 161, 162, 165, 170, 74, 75, 76, 77, 78, + 79, 80, 81, 125, 70, 83, 174, 173, 175, 74, + 75, 76, 77, 78, 79, 80, 81, 114, 70, 83, + 187, 188, 128, 74, 75, 76, 77, 78, 79, 80, + 81, 189, 191, 83, 35, 36, 37, 38, 190, 192, + 193, 179, 215, 228, 166, 216, 218, 167, 232, 234, + 177, 180, 244, 245, 251, 246, 268, 247, 269, 248, + 274, 249, 250, 280, 252, 253, 254, 255, 282, 283, + 286, 256, 257, 258, 259, 260, 261, 313, 262, 263, + 266, 276, -146, 323, 275, 327, 336, 279, 341, 329, + 284, 285, 314, 316, 315, 351, 356, 364, 317, 330, + 365, 397, 331, 333, 371, 340, 387, 346, 352, 386, + 367, 372, 369, 370, 398, 23, 93, 374, 379, 242, + 395, 243, 238, 312, 382, 0, 326, 0, 373, 0, + 0, 176, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 145 }; -static const short yycheck[] = { 114, - 24, 115, 24, 21, 179, 25, 171, 31, 19, 174, - 19, 125, 187, 19, 20, 190, 4, 19, 20, 36, - 185, 19, 19, 20, 199, 139, 22, 38, 19, 20, - 54, 40, 197, 39, 36, 21, 19, 20, 60, 214, - 64, 39, 48, 19, 40, 65, 48, 19, 39, 163, - 215, 48, 217, 36, 19, 230, 231, 48, 40, 84, - 85, 19, 84, 87, 22, 48, 40, 39, 19, 41, - 184, 36, 186, 45, 46, 47, 40, 9, 103, 19, - 105, 39, 40, 15, 108, 110, 18, 111, 39, 210, - 41, 19, 207, 208, 45, 46, 47, 41, 219, 123, - 44, 29, 30, 31, 41, 220, 221, 44, 223, 19, - 225, 5, 6, 7, 8, 9, 19, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 10, 21, 15, 39, - 14, 36, 15, 38, 19, 45, 46, 47, 3, 33, - 34, 5, 6, 7, 8, 9, 43, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 19, 21, 23, 24, - 25, 26, 27, 28, 19, 29, 30, 31, 19, 44, - 45, 21, 19, 41, 29, 30, 31, 19, 29, 30, - 31, 32, 33, 34, 35, 40, 37, 38, 19, 23, - 24, 25, 26, 27, 28, 40, 42, 41, 29, 30, - 31, 32, 33, 34, 35, 19, 37, 38, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 40, 21, 5, 6, 7, 8, 9, - 19, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 41, 21, 5, 6, 7, 8, 9, 19, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 19, 21, 6, - 7, 8, 9, 19, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 19, 21, 13, 14, 15, 19, 40, - 18, 13, 14, 15, 19, 40, 18, 40, 19, 39, - 19, 40, 36, 38, 19, 23, 44, 19, 41, 41, - 19, 38, 23, 23, 20, 41, 23, 41, 41, 19, - 19, 41, 19, 40, 40, 19, 40, 23, 41, 19, - 23, 36, 0, 41, 0, 9, 39, 41, 39, 117, - 38, 29, 116, 91, 113, 94, 213, 39, 157, 160, - -1, 81, 204 +static const short yycheck[] = { 99, + 41, 179, 69, 156, 34, 285, 5, 48, 69, 324, + 5, 41, 19, 34, 42, 123, 83, 332, 19, 19, + 53, 88, 337, 64, 57, 19, 20, 19, 20, 23, + 30, 23, 62, 348, 128, 129, 21, 317, 30, 19, + 218, 62, 19, 84, 19, 19, 20, 114, 55, 23, + 330, 366, 119, 94, 273, 163, 234, 58, 125, 53, + 90, 56, 61, 19, 59, 19, 346, 95, 19, 384, + 385, 65, 19, 65, 168, 19, 170, 57, 53, 53, + 180, 175, 19, 20, 19, 20, 23, 367, 23, 369, + 131, 65, 19, 20, 19, 362, 23, 19, 128, 318, + 319, 279, 19, 57, 257, 56, 373, 58, 19, 4, + 57, 62, 63, 64, 58, 22, 13, 19, 62, 63, + 64, 58, 54, 58, 53, 53, 23, 59, 65, 54, + 65, 21, 173, 53, 56, 176, 58, 54, 65, 3, + 62, 63, 64, 54, 19, 9, 56, 22, 55, 59, + 53, 329, 219, 331, 254, 255, 256, 19, 219, 21, + 24, 25, 26, 27, 28, 29, 54, 56, 54, 19, + 59, 59, 19, 59, 215, 19, 56, 21, 9, 59, + 55, 45, 46, 58, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 24, 25, 26, 27, 28, 29, 56, + 253, 19, 59, 256, 19, 19, 19, 54, 19, 19, + 57, 21, 55, 12, 45, 46, 12, 258, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 19, 27, 21, + 19, 27, 21, 19, 33, 21, 55, 33, 19, 20, + 21, 54, 19, 12, 57, 31, 32, 33, 34, 55, + 12, 37, 38, 39, 31, 32, 33, 34, 27, 359, + 360, 245, 246, 247, 33, 27, 19, 58, 55, 55, + 19, 33, 19, 5, 374, 375, 19, 377, 55, 379, + 5, 6, 7, 8, 9, 19, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 61, 21, 40, 41, 42, + 43, 44, 19, 46, 47, 48, 49, 50, 51, 52, + 21, 19, 37, 38, 5, 6, 7, 8, 9, 19, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, + 21, 31, 32, 33, 34, 21, 21, 37, 38, 39, + 31, 32, 33, 34, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 21, + 21, 5, 6, 7, 8, 9, 19, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 56, 21, 5, 6, + 7, 8, 9, 55, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 60, 21, 5, 6, 7, 8, 9, + 56, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 55, 21, 5, 6, 7, 8, 9, 19, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 19, 21, 5, + 6, 19, 55, 5, 19, 11, 12, 13, 14, 15, + 16, 17, 18, 5, 6, 21, 19, 56, 19, 11, + 12, 13, 14, 15, 16, 17, 18, 5, 6, 21, + 20, 57, 19, 11, 12, 13, 14, 15, 16, 17, + 18, 21, 21, 21, 31, 32, 33, 34, 57, 57, + 21, 55, 19, 19, 19, 55, 55, 55, 19, 55, + 19, 58, 57, 56, 24, 56, 19, 56, 19, 57, + 19, 57, 57, 19, 58, 58, 58, 58, 19, 24, + 24, 58, 58, 58, 58, 58, 58, 24, 58, 58, + 53, 59, 56, 19, 56, 19, 24, 55, 19, 55, + 57, 56, 56, 53, 56, 30, 19, 24, 56, 56, + 19, 0, 55, 55, 24, 55, 24, 56, 53, 57, + 56, 53, 56, 56, 0, 12, 46, 58, 58, 181, + 57, 182, 178, 265, 365, -1, 276, -1, 356, -1, + -1, 135, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 101 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1185,295 +1677,497 @@ yyreduce: switch (yyn) { case 1: -#line 306 "parse.y" +#line 637 "parse.y" { ; ; break;} case 2: -#line 307 "parse.y" +#line 638 "parse.y" { ; ; break;} case 3: -#line 308 "parse.y" +#line 639 "parse.y" { ; ; break;} case 4: -#line 309 "parse.y" +#line 640 "parse.y" { ; ; break;} case 5: -#line 312 "parse.y" +#line 643 "parse.y" { - Node *node = new_ccode(C_CCODE,(yyvsp[0].cbuf)->str, - ccode_line); + Node *node = node_new (CCODE_NODE, + "cctype", C_CCODE, + "cbuf:steal", (yyvsp[0].cbuf)->str, + "line_no", ccode_line, + NULL); nodes = g_list_append(nodes,node); g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 6: -#line 318 "parse.y" +#line 652 "parse.y" { - Node *node = new_ccode(H_CCODE,(yyvsp[0].cbuf)->str, - ccode_line); + Node *node = node_new (CCODE_NODE, + "cctype", H_CCODE, + "cbuf:steal", (yyvsp[0].cbuf)->str, + "line_no", ccode_line, + NULL); nodes = g_list_append(nodes,node); g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 7: -#line 324 "parse.y" +#line 661 "parse.y" { - Node *node = new_ccode(HT_CCODE,(yyvsp[0].cbuf)->str, - ccode_line); + Node *node = node_new (CCODE_NODE, + "cctype", HT_CCODE, + "cbuf:steal", (yyvsp[0].cbuf)->str, + "line_no", ccode_line, + NULL); nodes = g_list_append(nodes,node); g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 8: -#line 330 "parse.y" +#line 670 "parse.y" { - Node *node = new_ccode(PH_CCODE,(yyvsp[0].cbuf)->str, - ccode_line); + Node *node = node_new (CCODE_NODE, + "cctype", PH_CCODE, + "cbuf:steal", (yyvsp[0].cbuf)->str, + "line_no", ccode_line, + NULL); nodes = g_list_append(nodes,node); g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 9: -#line 336 "parse.y" +#line 679 "parse.y" { - Node *node = new_ccode(A_CCODE,(yyvsp[0].cbuf)->str, - ccode_line); + Node *node = node_new (CCODE_NODE, + "cctype", A_CCODE, + "cbuf:steal", (yyvsp[0].cbuf)->str, + "line_no", ccode_line, + NULL); nodes = g_list_append(nodes,node); g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 10: -#line 342 "parse.y" +#line 688 "parse.y" { - Node *node = new_ccode(AT_CCODE,(yyvsp[0].cbuf)->str, - ccode_line); + Node *node = node_new (CCODE_NODE, + "cctype", AT_CCODE, + "cbuf:steal", (yyvsp[0].cbuf)->str, + "line_no", ccode_line, + NULL); nodes = g_list_append(nodes,node); g_string_free(yyvsp[0].cbuf,FALSE); ; break;} case 11: -#line 350 "parse.y" +#line 699 "parse.y" { ; ; break;} case 12: -#line 351 "parse.y" +#line 700 "parse.y" { ; ; break;} case 13: -#line 354 "parse.y" +#line 701 "parse.y" +{ ; ; + break;} +case 14: +#line 702 "parse.y" +{ ; ; + break;} +case 15: +#line 703 "parse.y" +{ ; ; + break;} +case 16: +#line 704 "parse.y" +{ ; ; + break;} +case 17: +#line 705 "parse.y" +{ ; ; + break;} +case 18: +#line 706 "parse.y" +{ ; ; + break;} +case 19: +#line 709 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 14: -#line 359 "parse.y" +case 20: +#line 714 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 15: -#line 366 "parse.y" -{ - class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); +case 21: +#line 721 "parse.y" +{ + class = node_new (CLASS_NODE, + "otype:steal", yyvsp[-3].id, + "ptype:steal", yyvsp[-1].id, + "bonobo_object_class:steal", bonobo_object_class, + "interfaces:steal", interfaces, + "chunk_size:steal", chunk_size, + NULL); + bonobo_object_class = NULL; + chunk_size = NULL; + interfaces = NULL; ; break;} -case 16: -#line 371 "parse.y" +case 23: +#line 736 "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,"BonoboObject") == 0) { + g_free (bonobo_object_class); + bonobo_object_class = g_strdup(yyvsp[-2].id); + } else { + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 24: +#line 748 "parse.y" +{ + if (strcmp (yyvsp[-3].id, "interface") == 0) { + interfaces = g_list_append (interfaces, + g_strdup (yyvsp[-2].id)); + } else { + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 25: +#line 757 "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 26: +#line 771 "parse.y" { ; ; break;} -case 17: -#line 372 "parse.y" +case 27: +#line 772 "parse.y" { ; ; break;} -case 18: -#line 375 "parse.y" +case 28: +#line 775 "parse.y" { ; ; break;} -case 19: -#line 376 "parse.y" +case 29: +#line 776 "parse.y" +{ + if (strcmp (yyvsp[-1].id, "BonoboObject") != 0) { + g_free (yyvsp[-1].id); + yyerror (_("parse error")); + YYERROR; + } + g_free (yyvsp[-1].id); + last_added_method->bonobo_object_func = TRUE; + ; + break;} +case 30: +#line 785 "parse.y" +{ + if (strcmp (yyvsp[-2].id, "interface") != 0) { + g_free (yyvsp[-2].id); + g_free (yyvsp[-1].id); + yyerror (_("parse error")); + YYERROR; + } + g_free (yyvsp[-2].id); + node_set ((Node *)last_added_method, + "interface:steal", yyvsp[-1].id, + NULL); + ; + break;} +case 31: +#line 797 "parse.y" { ; ; break;} -case 20: -#line 377 "parse.y" +case 32: +#line 798 "parse.y" { ; ; break;} -case 21: -#line 378 "parse.y" +case 33: +#line 799 "parse.y" +{ ; ; + break;} +case 34: +#line 800 "parse.y" { ; ; break;} -case 22: -#line 381 "parse.y" +case 35: +#line 803 "parse.y" { the_scope = PUBLIC_SCOPE; ; break;} -case 23: -#line 382 "parse.y" +case 36: +#line 804 "parse.y" { the_scope = PRIVATE_SCOPE; ; break;} -case 24: -#line 383 "parse.y" +case 37: +#line 805 "parse.y" { the_scope = PROTECTED_SCOPE; ; break;} -case 25: -#line 386 "parse.y" +case 38: +#line 806 "parse.y" +{ the_scope = CLASS_SCOPE; ; + break;} +case 39: +#line 809 "parse.y" { - if(strcmp(yyvsp[-1].id, "destroywith")==0) { - g_free(yyvsp[-1].id); + if (strcmp (yyvsp[-1].id, "destroywith") == 0) { + g_free (yyvsp[-1].id); + destructor_unref = FALSE; + destructor = yyvsp[0].id; + destructor_line = line_no; + destructor_simple = TRUE; + } else if (strcmp (yyvsp[-1].id, "unrefwith") == 0) { + g_free (yyvsp[-1].id); + destructor_unref = TRUE; 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")); + g_free (yyvsp[-1].id); + g_free (yyvsp[0].id); + yyerror (_("parse error")); YYERROR; } ; break;} -case 26: -#line 399 "parse.y" +case 40: +#line 829 "parse.y" { - if(strcmp(yyvsp[-2].id, "destroy")==0) { + if (strcmp (yyvsp[-2].id, "destroy") == 0) { g_free(yyvsp[-2].id); + destructor_unref = FALSE; destructor = (yyvsp[0].cbuf)->str; g_string_free(yyvsp[0].cbuf, FALSE); destructor_line = ccode_line; destructor_simple = FALSE; + } else if (strcmp (yyvsp[-2].id, "unref") == 0) { + g_free (yyvsp[-2].id); + destructor_unref = TRUE; + 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")); + g_free (yyvsp[-2].id); + g_string_free (yyvsp[0].cbuf, TRUE); + yyerror (_("parse error")); YYERROR; } ; break;} -case 27: -#line 415 "parse.y" +case 41: +#line 853 "parse.y" { initializer = yyvsp[0].id; initializer_line = ccode_line; ; break;} -case 28: -#line 419 "parse.y" +case 42: +#line 857 "parse.y" { initializer = (yyvsp[0].cbuf)->str; initializer_line = ccode_line; g_string_free(yyvsp[0].cbuf, FALSE); ; break;} -case 29: -#line 427 "parse.y" +case 43: +#line 865 "parse.y" { ; ; break;} -case 30: -#line 428 "parse.y" +case 44: +#line 866 "parse.y" { ; ; break;} -case 31: -#line 429 "parse.y" +case 45: +#line 867 "parse.y" { destructor = NULL; ; break;} -case 32: -#line 430 "parse.y" +case 46: +#line 868 "parse.y" { initializer = NULL; ; break;} -case 33: -#line 431 "parse.y" +case 47: +#line 869 "parse.y" { destructor = NULL; initializer = NULL; ; break;} -case 34: -#line 437 "parse.y" +case 48: +#line 875 "parse.y" { push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} -case 35: -#line 440 "parse.y" +case 49: +#line 878 "parse.y" { push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} -case 36: -#line 444 "parse.y" +case 50: +#line 883 "parse.y" { + Node *node = NULL; if(strcmp(yyvsp[-6].id,"get")==0 && strcmp(yyvsp[-3].id,"set")==0) { - Node *node; Type *type = pop_type(); - g_free(yyvsp[-6].id); g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-8].id,type,yyvsp[-9].list,yyvsp[-7].id, - (yyvsp[-4].cbuf)->str,yyvsp[-5].line, - (yyvsp[-1].cbuf)->str,yyvsp[-2].line, - yyvsp[-10].line); - g_string_free(yyvsp[-4].cbuf,FALSE); - g_string_free(yyvsp[-1].cbuf,FALSE); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + node = node_new (ARGUMENT_NODE, + "gtktype:steal", yyvsp[-9].id, + "atype:steal", type, + "flags:steal", yyvsp[-10].list, + "name:steal", yyvsp[-8].id, + "get:steal", (yyvsp[-4].cbuf)->str, + "get_line", yyvsp[-5].line, + "set:steal", (yyvsp[-1].cbuf)->str, + "set_line", yyvsp[-2].line, + "line_no", yyvsp[-11].line, + NULL); + class_nodes = g_list_append(class_nodes,node); + + g_string_free (yyvsp[-4].cbuf, FALSE); + g_string_free (yyvsp[-1].cbuf, FALSE); + } else if(strcmp(yyvsp[-6].id,"set")==0 && strcmp(yyvsp[-3].id,"get")==0) { - Node *node; Type *type = pop_type(); - g_free(yyvsp[-6].id); g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-8].id,type,yyvsp[-9].list,yyvsp[-7].id, - (yyvsp[-1].cbuf)->str,yyvsp[-2].line, - (yyvsp[-4].cbuf)->str,yyvsp[-5].line, - yyvsp[-10].line); - g_string_free(yyvsp[-1].cbuf,FALSE); - g_string_free(yyvsp[-4].cbuf,FALSE); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + node = node_new (ARGUMENT_NODE, + "gtktype:steal", yyvsp[-9].id, + "atype:steal", type, + "flags:steal", yyvsp[-10].list, + "name:steal", yyvsp[-8].id, + "get:steal", (yyvsp[-1].cbuf)->str, + "get_line", yyvsp[-2].line, + "set:steal", (yyvsp[-4].cbuf)->str, + "set_line", yyvsp[-5].line, + "line_no", yyvsp[-11].line, + NULL); + g_string_free (yyvsp[-1].cbuf, FALSE); + g_string_free (yyvsp[-4].cbuf, FALSE); class_nodes = g_list_append(class_nodes,node); } else { - g_free(yyvsp[-8].id); g_free(yyvsp[-7].id); - g_free(yyvsp[-6].id); g_free(yyvsp[-3].id); - g_list_foreach(yyvsp[-9].list,(GFunc)g_free,NULL); - g_string_free(yyvsp[-1].cbuf,TRUE); - g_string_free(yyvsp[-4].cbuf,TRUE); - yyerror(_("parse error")); + g_free (yyvsp[-9].id); + g_free (yyvsp[-8].id); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + g_list_foreach (yyvsp[-10].list, (GFunc)g_free, NULL); + g_list_free (yyvsp[-10].list); + g_string_free (yyvsp[-1].cbuf, TRUE); + g_string_free (yyvsp[-4].cbuf, TRUE); + yyerror (_("parse error")); YYERROR; } + + if (yyvsp[-7].id != NULL) { + Argument *arg = (Argument *)node; + export_accessors (arg->name, + arg->get != NULL, arg->get_line, + arg->set != NULL, arg->set_line, + arg->atype, + arg->gtktype, + arg->line_no); + g_free (yyvsp[-7].id); + } + ; break;} -case 37: -#line 479 "parse.y" +case 51: +#line 951 "parse.y" { - if(strcmp(yyvsp[-3].id,"get")==0) { - Node *node; + Node *node = NULL; + if(strcmp(yyvsp[-3].id, "get") == 0) { 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; + g_free (yyvsp[-3].id); + node = node_new (ARGUMENT_NODE, + "gtktype:steal", yyvsp[-6].id, + "atype:steal", type, + "flags:steal", yyvsp[-7].list, + "name:steal", yyvsp[-5].id, + "get:steal", (yyvsp[-1].cbuf)->str, + "get_line", yyvsp[-2].line, + "line_no", yyvsp[-8].line, + NULL); + + g_string_free (yyvsp[-1].cbuf, FALSE); + class_nodes = g_list_append(class_nodes, node); + } else if(strcmp(yyvsp[-3].id, "set") == 0) { Type *type = pop_type(); - g_free(yyvsp[-3].id); - node = new_argument(yyvsp[-5].id,type,yyvsp[-6].list,yyvsp[-4].id, - NULL,0,(yyvsp[-1].cbuf)->str, - yyvsp[-2].line, yyvsp[-7].line); - g_string_free(yyvsp[-1].cbuf,FALSE); - class_nodes = g_list_append(class_nodes,node); + g_free (yyvsp[-3].id); + node = node_new (ARGUMENT_NODE, + "gtktype:steal", yyvsp[-6].id, + "atype:steal", type, + "flags:steal", yyvsp[-7].list, + "name:steal", yyvsp[-5].id, + "set:steal", (yyvsp[-1].cbuf)->str, + "set_line", yyvsp[-2].line, + "line_no", yyvsp[-8].line, + NULL); + + g_string_free (yyvsp[-1].cbuf, FALSE); + class_nodes = g_list_append (class_nodes, node); } else { - g_free(yyvsp[-3].id); g_free(yyvsp[-5].id); - g_free(yyvsp[-4].id); - g_list_foreach(yyvsp[-6].list,(GFunc)g_free,NULL); - g_string_free(yyvsp[-1].cbuf,TRUE); + g_free (yyvsp[-3].id); + g_free (yyvsp[-6].id); + g_free (yyvsp[-5].id); + g_list_foreach (yyvsp[-7].list, (GFunc)g_free, NULL); + g_list_free (yyvsp[-7].list); + g_string_free (yyvsp[-1].cbuf, TRUE); yyerror(_("parse error")); YYERROR; } + + if (yyvsp[-4].id != NULL) { + Argument *arg = (Argument *)node; + export_accessors (arg->name, + arg->get != NULL, arg->get_line, + arg->set != NULL, arg->set_line, + arg->atype, + arg->gtktype, + arg->line_no); + g_free (yyvsp[-4].id); + } ; break;} -case 38: -#line 507 "parse.y" +case 52: +#line 1005 "parse.y" { Node *node; char *get, *set = NULL; @@ -1481,261 +2175,652 @@ case 38: Type *type; char *root; - if(strcmp(yyvsp[0].id,"link")!=0 && - strcmp(yyvsp[0].id,"stringlink")!=0 && - strcmp(yyvsp[0].id,"objectlink")!=0) { - g_free(yyvsp[0].id); g_free(yyvsp[-2].id); - g_free(yyvsp[-1].id); - g_list_foreach(yyvsp[-3].list,(GFunc)g_free,NULL); + if(strcmp(yyvsp[0].id, "link")!=0 && + strcmp(yyvsp[0].id, "stringlink")!=0 && + strcmp(yyvsp[0].id, "objectlink")!=0) { + g_free(yyvsp[0].id); + g_free(yyvsp[-3].id); + g_free(yyvsp[-2].id); + g_list_foreach(yyvsp[-4].list,(GFunc)g_free,NULL); + g_list_free(yyvsp[-4].list); yyerror(_("parse error")); YYERROR; } type = pop_type(); - var = find_var_or_die(yyvsp[-1].id, yyvsp[-4].line); + var = find_var_or_die(yyvsp[-2].id, yyvsp[-5].line); if(var->scope == PRIVATE_SCOPE) root = "self->_priv"; - else + else if(var->scope == CLASS_SCOPE) { + root = "SELF_GET_CLASS(self)"; + if(no_self_alias) + error_print(GOB_ERROR, yyvsp[-5].line, + _("Self aliases needed when autolinking to a classwide member")); + } else root = "self"; - if(strcmp(yyvsp[0].id,"link")==0) { + if(strcmp(yyvsp[0].id, "link")==0) { set = g_strdup_printf("%s->%s = ARG;", - root, yyvsp[-1].id); - } else if(strcmp(yyvsp[0].id,"stringlink")==0) { - set = g_strdup_printf("g_free(%s->%s); " - "%s->%s = g_strdup(ARG);", - root, yyvsp[-1].id, - root, yyvsp[-1].id); - } else if(strcmp(yyvsp[0].id,"objectlink")==0) { + root, yyvsp[-2].id); + } 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(%s->%s) " - "gtk_object_unref(GTK_OBJECT(%s->%s)); " - "%s->%s = ARG; " - "if(%s->%s) " - "gtk_object_ref(GTK_OBJECT(%s->%s)); ", - root, yyvsp[-1].id, - root, yyvsp[-1].id, - root, yyvsp[-1].id, - root, yyvsp[-1].id, - root, yyvsp[-1].id); + "if (ARG != NULL) " + "g_object_ref (G_OBJECT (ARG)); " + "if (%s->%s != NULL) " + "g_object_unref (G_OBJECT (%s->%s)); " + "%s->%s = ARG;", + root, yyvsp[-2].id, + root, yyvsp[-2].id, + root, yyvsp[-2].id); } else { g_assert_not_reached(); } - /* get is the same for everything */ - get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-1].id); - - g_free(yyvsp[0].id); - - - if(!type) - type = copy_type(var->vtype); - - node = new_argument(yyvsp[-2].id, type, yyvsp[-3].list, - yyvsp[-1].id, get, yyvsp[-4].line, - set, yyvsp[-4].line, yyvsp[-4].line); - class_nodes = g_list_append(class_nodes,node); + get = g_strdup_printf("ARG = %s->%s;", root, yyvsp[-2].id); + + g_free (yyvsp[0].id); + + if (type == NULL) + type = (Type *)node_copy ((Node *)var->vtype); + + node = node_new (ARGUMENT_NODE, + "gtktype:steal", yyvsp[-3].id, + "atype:steal", type, + "flags:steal", yyvsp[-4].list, + "name:steal", yyvsp[-2].id, + "get:steal", get, + "get_line", yyvsp[-5].line, + "set:steal", set, + "set_line", yyvsp[-5].line, + "line_no", yyvsp[-5].line, + NULL); + + if (yyvsp[-1].id != NULL) { + Argument *arg = (Argument *)node; + export_accessors (arg->name, + arg->get != NULL, arg->get_line, + arg->set != NULL, arg->set_line, + arg->atype, + arg->gtktype, + arg->line_no); + g_free (yyvsp[-1].id); + } + + class_nodes = g_list_append (class_nodes, node); ; break;} -case 39: -#line 572 "parse.y" +case 53: +#line 1093 "parse.y" { - if(strcmp(yyvsp[-2].id,"type")!=0) { - g_free(yyvsp[-4].id); - g_free(yyvsp[-2].id); - yyerror(_("parse error")); + if (strcmp (yyvsp[-1].id, "export")!=0) { + g_free (yyvsp[-1].id); + yyerror (_("parse error")); YYERROR; } - yyval.id = yyvsp[-4].id; + yyval.id = yyvsp[-1].id; ; break;} -case 40: -#line 581 "parse.y" +case 54: +#line 1101 "parse.y" { - yyval.id = yyvsp[0].id; - typestack = g_list_prepend(typestack,NULL); + yyval.id = NULL; ; break;} -case 41: -#line 587 "parse.y" -{ yyval.list = yyvsp[-1].list; ; +case 55: +#line 1106 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "line_no", yyvsp[-10].line, + "gtktype:steal", debool (yyvsp[-9].id), + "name:steal", yyvsp[-8].id, + NULL); + if (strcmp (yyvsp[-6].id, "get") == 0 && + strcmp (yyvsp[-3].id, "set") == 0) { + node_set ((Node *)property, + "get:steal", (yyvsp[-4].cbuf)->str, + "get_line", yyvsp[-5].line, + "set:steal", (yyvsp[-1].cbuf)->str, + "set_line", yyvsp[-2].line, + NULL); + g_string_free (yyvsp[-4].cbuf, FALSE); + g_string_free (yyvsp[-1].cbuf, FALSE); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + } else if (strcmp (yyvsp[-6].id, "set") == 0 && + strcmp (yyvsp[-3].id, "get") == 0) { + node_set ((Node *)property, + "get:steal", (yyvsp[-1].cbuf)->str, + "get_line", yyvsp[-2].line, + "set:steal", (yyvsp[-4].cbuf)->str, + "set_line", yyvsp[-5].line, + NULL); + g_string_free (yyvsp[-4].cbuf, FALSE); + g_string_free (yyvsp[-1].cbuf, FALSE); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + } else { + g_string_free (yyvsp[-4].cbuf, TRUE); + g_string_free (yyvsp[-1].cbuf, TRUE); + g_free (yyvsp[-6].id); + g_free (yyvsp[-3].id); + node_free ((Node *)property); + property = NULL; + yyerror (_("parse error")); + YYERROR; + } + property_link_and_export ((Node *)property); + if (property != NULL) { + class_nodes = g_list_append (class_nodes, + property); + property = NULL; + } + ; break;} -case 42: -#line 588 "parse.y" -{ yyval.list = NULL; ; +case 56: +#line 1154 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "line_no", yyvsp[-7].line, + "gtktype:steal", debool (yyvsp[-6].id), + "name:steal", yyvsp[-5].id, + NULL); + if (strcmp (yyvsp[-3].id, "get") == 0) { + node_set ((Node *)property, + "get:steal", (yyvsp[-1].cbuf)->str, + "get_line", yyvsp[-2].line, + NULL); + g_string_free (yyvsp[-1].cbuf, FALSE); + g_free (yyvsp[-3].id); + } else if (strcmp (yyvsp[-3].id, "set") == 0) { + node_set ((Node *)property, + "set:steal", (yyvsp[-1].cbuf)->str, + "set_line", yyvsp[-2].line, + NULL); + g_string_free (yyvsp[-1].cbuf, FALSE); + g_free (yyvsp[-3].id); + } else { + g_string_free (yyvsp[-1].cbuf, TRUE); + g_free (yyvsp[-3].id); + node_free ((Node *)property); + property = NULL; + yyerror (_("parse error")); + YYERROR; + } + property_link_and_export ((Node *)property); + if (property != NULL) { + class_nodes = g_list_append (class_nodes, + property); + property = NULL; + } + ; break;} -case 43: -#line 591 "parse.y" -{ - yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); - ; +case 57: +#line 1190 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "line_no", yyvsp[-4].line, + "gtktype:steal", debool (yyvsp[-3].id), + "name:steal", yyvsp[-2].id, + NULL); + property_link_and_export ((Node *)property); + if (property != NULL) { + class_nodes = g_list_append (class_nodes, + property); + property = NULL; + } + ; break;} -case 44: -#line 594 "parse.y" -{ - yyval.list = g_list_append(NULL,yyvsp[0].id); - ; +case 58: +#line 1206 "parse.y" +{ ; ; break;} -case 45: -#line 600 "parse.y" +case 59: +#line 1207 "parse.y" { ; ; break;} -case 46: -#line 601 "parse.y" -{ - Type *type = typestack->data; - char *oldname = type->name; - type->name = g_strconcat("const ",oldname,NULL); - g_free(oldname); - ; +case 60: +#line 1210 "parse.y" +{ ; ; break;} -case 47: -#line 609 "parse.y" -{ - Node *node = new_type(0,yyvsp[0].id,NULL); - typestack = g_list_prepend(typestack,node); - ; +case 61: +#line 1211 "parse.y" +{ ; ; break;} -case 48: -#line 613 "parse.y" -{ - Node *node = new_type(stars,yyvsp[-1].id,NULL); - stars = 0; - typestack = g_list_prepend(typestack,node); - ; +case 62: +#line 1214 "parse.y" +{ yyval.id = yyvsp[0].id; ; break;} -case 49: -#line 620 "parse.y" +case 63: +#line 1215 "parse.y" { - yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL); - ; + if (strcmp (yyvsp[-3].id, "_") != 0) { + g_free (yyvsp[-3].id); + yyerror(_("parse error")); + YYERROR; + } + g_free (yyvsp[-3].id); + yyval.id = g_strconcat ("_(", yyvsp[-1].id, ")", NULL); + g_free (yyvsp[-1].id); + ; break;} -case 50: -#line 623 "parse.y" +case 64: +#line 1227 "parse.y" +{ yyval.id = yyvsp[0].id; ; + break;} +case 65: +#line 1228 "parse.y" +{ yyval.id = yyvsp[0].id; ; + break;} +case 66: +#line 1231 "parse.y" { - yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL); - ; + ensure_property (); + node_set ((Node *)property, + "nick:steal", yyvsp[0].id, + NULL); + ; break;} -case 51: -#line 626 "parse.y" +case 67: +#line 1237 "parse.y" { - yyval.id = g_strdup(yyvsp[0].id); - ; + ensure_property (); + node_set ((Node *)property, + "blurb:steal", yyvsp[0].id, + NULL); + ; break;} -case 52: -#line 629 "parse.y" +case 68: +#line 1243 "parse.y" { - yyval.id = g_strdup("unsigned char"); - ; + ensure_property (); + node_set ((Node *)property, + "maximum:steal", yyvsp[0].id, + NULL); + ; break;} -case 53: -#line 632 "parse.y" +case 69: +#line 1249 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "minimum:steal", yyvsp[0].id, + NULL); + ; + break;} +case 70: +#line 1255 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "default_value:steal", yyvsp[0].id, + NULL); + ; + break;} +case 71: +#line 1261 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "flags:steal", yyvsp[0].list, + NULL); + ; + break;} +case 72: +#line 1267 "parse.y" +{ + Type *type = pop_type (); + ensure_property (); + node_set ((Node *)property, + "ptype:steal", type, + NULL); + ; + break;} +case 73: +#line 1274 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 74: +#line 1280 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 75: +#line 1286 "parse.y" { - yyval.id = g_strdup("signed char"); + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 76: +#line 1292 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 77: +#line 1298 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 78: +#line 1304 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 79: +#line 1310 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 80: +#line 1316 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 81: +#line 1322 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 82: +#line 1328 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 83: +#line 1334 "parse.y" +{ + ensure_property (); + if (strcmp (yyvsp[0].id, "link") == 0) { + g_free(yyvsp[0].id); + node_set ((Node *)property, + "link", TRUE, + NULL); + } else if (strcmp (yyvsp[0].id, "export") == 0) { + g_free(yyvsp[0].id); + node_set ((Node *)property, + "export", TRUE, + NULL); + } else { + g_free(yyvsp[0].id); + yyerror(_("parse error")); + YYERROR; + } + ; + break;} +case 84: +#line 1354 "parse.y" +{ + if(strcmp(yyvsp[-2].id,"type")!=0) { + g_free(yyvsp[-4].id); + g_free(yyvsp[-2].id); + yyerror(_("parse error")); + YYERROR; + } + yyval.id = debool (yyvsp[-4].id); ; break;} -case 54: -#line 635 "parse.y" +case 85: +#line 1363 "parse.y" { - yyval.id = g_strdup("char"); + yyval.id = debool (yyvsp[0].id); + typestack = g_list_prepend(typestack,NULL); ; break;} -case 55: -#line 638 "parse.y" +case 86: +#line 1369 "parse.y" +{ yyval.list = yyvsp[-1].list; ; + break;} +case 87: +#line 1370 "parse.y" +{ yyval.list = NULL; ; + break;} +case 88: +#line 1373 "parse.y" { - yyval.id = g_strdup("double"); + yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 56: -#line 641 "parse.y" +case 89: +#line 1376 "parse.y" { - yyval.id = g_strdup("float"); + yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 57: -#line 644 "parse.y" +case 90: +#line 1382 "parse.y" +{ + Node *node = node_new (TYPE_NODE, + "name:steal", yyvsp[-1].id, + "pointer:steal", yyvsp[0].id, + NULL); + typestack = g_list_prepend(typestack,node); + ; + break;} +case 91: +#line 1389 "parse.y" +{ + Node *node = node_new (TYPE_NODE, + "name:steal", yyvsp[0].id, + NULL); + typestack = g_list_prepend(typestack,node); + ; + break;} +case 92: +#line 1398 "parse.y" { yyval.id = yyvsp[0].id; - ; + ; break;} -case 58: -#line 647 "parse.y" +case 93: +#line 1401 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); + yyval.id = yyvsp[0].id; + ; + break;} +case 94: +#line 1404 "parse.y" +{ + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); - ; + ; break;} -case 59: -#line 651 "parse.y" +case 95: +#line 1408 "parse.y" { - yyval.id = yyvsp[0].id; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} -case 60: -#line 654 "parse.y" +case 96: +#line 1412 "parse.y" { - yyval.id = g_strdup("void"); - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} -case 61: -#line 659 "parse.y" +case 97: +#line 1416 "parse.y" { - yyval.id = "long int"; - ; + yyval.id = g_strconcat("const ", yyvsp[-1].id, " ", + yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} -case 62: -#line 662 "parse.y" +case 98: +#line 1421 "parse.y" { - yyval.id = "long"; - ; + yyval.id = g_strconcat(yyvsp[-2].id, " ", + yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} -case 63: -#line 665 "parse.y" +case 99: +#line 1429 "parse.y" { - yyval.id = "short int"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} -case 64: -#line 668 "parse.y" +case 100: +#line 1433 "parse.y" { - yyval.id = "short"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[-1].id); + g_free(yyvsp[0].id); + ; break;} -case 65: -#line 671 "parse.y" +case 101: +#line 1438 "parse.y" { - yyval.id = "int"; - ; + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} -case 66: -#line 676 "parse.y" +case 102: +#line 1442 "parse.y" { - yyval.id = "enum "; - ; + yyval.id = yyvsp[0].id; + ; break;} -case 67: -#line 679 "parse.y" +case 103: +#line 1445 "parse.y" { - yyval.id = "union "; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} -case 68: -#line 682 "parse.y" +case 104: +#line 1449 "parse.y" { - yyval.id = "struct "; - ; + yyval.id = g_strdup(yyvsp[0].id); + ; break;} -case 69: -#line 687 "parse.y" -{ stars++; ; +case 105: +#line 1452 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + ; break;} -case 70: -#line 688 "parse.y" -{ stars++; ; +case 106: +#line 1457 "parse.y" +{ yyval.id = "void"; ; break;} -case 71: -#line 692 "parse.y" +case 107: +#line 1458 "parse.y" +{ yyval.id = "char"; ; + break;} +case 108: +#line 1459 "parse.y" +{ yyval.id = "short"; ; + break;} +case 109: +#line 1460 "parse.y" +{ yyval.id = "int"; ; + break;} +case 110: +#line 1461 "parse.y" +{ yyval.id = "long"; ; + break;} +case 111: +#line 1462 "parse.y" +{ yyval.id = "float"; ; + break;} +case 112: +#line 1463 "parse.y" +{ yyval.id = "double"; ; + break;} +case 113: +#line 1464 "parse.y" +{ yyval.id = "signed"; ; + break;} +case 114: +#line 1465 "parse.y" +{ yyval.id = "unsigned"; ; + break;} +case 115: +#line 1468 "parse.y" +{ yyval.id = "struct"; ; + break;} +case 116: +#line 1469 "parse.y" +{ yyval.id = "union"; ; + break;} +case 117: +#line 1470 "parse.y" +{ yyval.id = "enum"; ; + break;} +case 118: +#line 1473 "parse.y" +{ yyval.id = g_strdup("*"); ; + break;} +case 119: +#line 1474 "parse.y" +{ yyval.id = g_strdup("* const"); ; + break;} +case 120: +#line 1475 "parse.y" +{ + yyval.id = g_strconcat("*", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 121: +#line 1479 "parse.y" +{ + yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 122: +#line 1486 "parse.y" { if(strcmp(yyvsp[-1].id, "first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1749,14 +2834,14 @@ case 71: g_free(yyvsp[-1].id); ; break;} -case 72: -#line 704 "parse.y" +case 123: +#line 1498 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 73: -#line 710 "parse.y" +case 124: +#line 1504 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1770,8 +2855,8 @@ case 73: g_free(yyvsp[-1].id); ; break;} -case 74: -#line 722 "parse.y" +case 125: +#line 1516 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1785,47 +2870,47 @@ case 74: g_free(yyvsp[-2].id); ; break;} -case 75: -#line 734 "parse.y" +case 126: +#line 1528 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 76: -#line 737 "parse.y" +case 127: +#line 1531 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 77: -#line 743 "parse.y" +case 128: +#line 1537 "parse.y" { - gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id); + gtktypes = g_list_prepend(gtktypes, debool (yyvsp[-3].id)); ; break;} -case 78: -#line 748 "parse.y" +case 129: +#line 1542 "parse.y" { - gtktypes = g_list_append(gtktypes, yyvsp[0].id); + gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id)); ; break;} -case 79: -#line 751 "parse.y" +case 130: +#line 1545 "parse.y" { - gtktypes = g_list_append(gtktypes, yyvsp[0].id); + gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id)); ; break;} -case 80: -#line 756 "parse.y" +case 131: +#line 1550 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 81: -#line 757 "parse.y" +case 132: +#line 1551 "parse.y" { yyval.cbuf = NULL; ; break;} -case 82: -#line 761 "parse.y" +case 133: +#line 1555 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1833,13 +2918,18 @@ case 82: free_all_global_state(); YYERROR; } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } push_function(the_scope, yyvsp[-7].sigtype,NULL, yyvsp[-5].id, yyvsp[0].cbuf,yyvsp[-9].line, ccode_line, vararg, yyvsp[-8].list); ; break;} -case 83: -#line 772 "parse.y" +case 134: +#line 1571 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1847,13 +2937,18 @@ case 83: free_all_global_state(); YYERROR; } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } push_function(the_scope, yyvsp[-7].sigtype, NULL, yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-9].line, ccode_line, vararg, yyvsp[-8].list); ; break;} -case 84: -#line 783 "parse.y" +case 135: +#line 1587 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1861,13 +2956,18 @@ case 84: free_all_global_state(); YYERROR; } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-8].line, ccode_line, vararg, NULL); ; break;} -case 85: -#line 794 "parse.y" +case 136: +#line 1603 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1875,13 +2975,18 @@ case 85: free_all_global_state(); YYERROR; } + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} -case 86: -#line 805 "parse.y" +case 137: +#line 1619 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1894,8 +2999,8 @@ case 86: ccode_line, vararg, NULL); ; break;} -case 87: -#line 816 "parse.y" +case 138: +#line 1630 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, yyvsp[-5].id, yyvsp[0].cbuf, @@ -1903,16 +3008,21 @@ case 87: vararg, NULL); ; break;} -case 88: -#line 822 "parse.y" +case 139: +#line 1636 "parse.y" { + if(the_scope == CLASS_SCOPE) { + yyerror(_("a method cannot be of class scope")); + free_all_global_state(); + YYERROR; + } push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line, ccode_line, vararg, NULL); ; break;} -case 89: -#line 827 "parse.y" +case 140: +#line 1646 "parse.y" { if(strcmp(yyvsp[-4].id, "init")==0) { push_init_arg(yyvsp[-2].id,FALSE); @@ -1927,14 +3037,16 @@ case 89: } else { g_free(yyvsp[-4].id); g_free(yyvsp[-2].id); - g_string_free(yyvsp[-2].cbuf,TRUE); - yyerror(_("parse error")); + g_string_free(yyvsp[0].cbuf,TRUE); + yyerror(_("parse error " + "(untyped blocks must be init or " + "class_init)")); YYERROR; } ; break;} -case 90: -#line 848 "parse.y" +case 141: +#line 1669 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -1947,8 +3059,8 @@ case 90: g_free(yyvsp[-1].id); ; break;} -case 91: -#line 859 "parse.y" +case 142: +#line 1680 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -1969,35 +3081,35 @@ case 91: g_free(yyvsp[-1].id); ; break;} -case 92: -#line 878 "parse.y" +case 143: +#line 1699 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; ; break;} -case 93: -#line 884 "parse.y" +case 144: +#line 1705 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 94: -#line 885 "parse.y" +case 145: +#line 1706 "parse.y" { yyval.id = (yyvsp[1].cbuf)->str; g_string_free(yyvsp[1].cbuf, FALSE); ; break;} -case 95: -#line 891 "parse.y" +case 146: +#line 1712 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 96: -#line 892 "parse.y" +case 147: +#line 1713 "parse.y" { vararg = FALSE; has_self = TRUE; if(strcmp(yyvsp[0].id,"self")==0) - push_self(yyvsp[0].id); + push_self(yyvsp[0].id, FALSE); else { g_free(yyvsp[0].id); yyerror(_("parse error")); @@ -2005,12 +3117,40 @@ case 96: } ; break;} -case 97: -#line 903 "parse.y" +case 148: +#line 1724 "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 149: +#line 1735 "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 150: +#line 1746 "parse.y" { has_self = TRUE; if(strcmp(yyvsp[-2].id,"self")==0) - push_self(yyvsp[-2].id); + push_self(yyvsp[-2].id, FALSE); else { g_free(yyvsp[-2].id); yyerror(_("parse error")); @@ -2018,40 +3158,66 @@ case 97: } ; break;} -case 98: -#line 913 "parse.y" +case 151: +#line 1756 "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 152: +#line 1766 "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 153: +#line 1776 "parse.y" { has_self = FALSE; ; break;} -case 99: -#line 916 "parse.y" +case 154: +#line 1779 "parse.y" { vararg = TRUE; ; break;} -case 100: -#line 917 "parse.y" +case 155: +#line 1780 "parse.y" { vararg = FALSE; ; break;} -case 101: -#line 920 "parse.y" +case 156: +#line 1783 "parse.y" { ; ; break;} -case 102: -#line 921 "parse.y" +case 157: +#line 1784 "parse.y" { ; ; break;} -case 103: -#line 924 "parse.y" +case 158: +#line 1787 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 104: -#line 927 "parse.y" +case 159: +#line 1790 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 105: -#line 930 "parse.y" +case 160: +#line 1793 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -2061,8 +3227,8 @@ case 105: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 106: -#line 938 "parse.y" +case 161: +#line 1801 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -2072,22 +3238,26 @@ case 106: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 107: -#line 948 "parse.y" +case 162: +#line 1811 "parse.y" { ; ; break;} -case 108: -#line 949 "parse.y" +case 163: +#line 1812 "parse.y" { ; ; break;} -case 109: -#line 952 "parse.y" +case 164: +#line 1815 "parse.y" { if(strcmp(yyvsp[0].id,"type")==0) { - Node *node = new_check(TYPE_CHECK,NULL); + Node *node = node_new (CHECK_NODE, + "chtype", TYPE_CHECK, + NULL); checks = g_list_append(checks,node); } else if(strcmp(yyvsp[0].id,"null")==0) { - Node *node = new_check(NULL_CHECK,NULL); + Node *node = node_new (CHECK_NODE, + "chtype", NULL_CHECK, + NULL); checks = g_list_append(checks,node); } else { yyerror(_("parse error")); @@ -2096,61 +3266,221 @@ case 109: g_free(yyvsp[0].id); ; break;} -case 110: -#line 965 "parse.y" +case 165: +#line 1832 "parse.y" { - Node *node = new_check(GT_CHECK,yyvsp[0].id); + Node *node = node_new (CHECK_NODE, + "chtype", GT_CHECK, + "number:steal", yyvsp[0].id, + NULL); checks = g_list_append(checks,node); ; break;} -case 111: -#line 969 "parse.y" +case 166: +#line 1839 "parse.y" { - Node *node = new_check(LT_CHECK,yyvsp[0].id); + Node *node = node_new (CHECK_NODE, + "chtype", LT_CHECK, + "number:steal", yyvsp[0].id, + NULL); checks = g_list_append(checks,node); ; break;} -case 112: -#line 973 "parse.y" +case 167: +#line 1846 "parse.y" { - Node *node = new_check(GE_CHECK,yyvsp[0].id); + Node *node = node_new (CHECK_NODE, + "chtype", GE_CHECK, + "number:steal", yyvsp[0].id, + NULL); checks = g_list_append(checks,node); ; break;} -case 113: -#line 977 "parse.y" +case 168: +#line 1853 "parse.y" { - Node *node = new_check(LE_CHECK,yyvsp[0].id); + Node *node = node_new (CHECK_NODE, + "chtype", LE_CHECK, + "number:steal", yyvsp[0].id, + NULL); checks = g_list_append(checks,node); ; break;} -case 114: -#line 981 "parse.y" +case 169: +#line 1860 "parse.y" { - Node *node = new_check(EQ_CHECK,yyvsp[0].id); + Node *node = node_new (CHECK_NODE, + "chtype", EQ_CHECK, + "number:steal", yyvsp[0].id, + NULL); checks = g_list_append(checks,node); ; break;} -case 115: -#line 985 "parse.y" +case 170: +#line 1867 "parse.y" { - Node *node = new_check(NE_CHECK,yyvsp[0].id); + Node *node = node_new (CHECK_NODE, + "chtype", NE_CHECK, + "number:steal", yyvsp[0].id, + NULL); checks = g_list_append(checks,node); ; break;} -case 116: -#line 991 "parse.y" +case 171: +#line 1876 "parse.y" +{ + Node *node = node_new (ENUMDEF_NODE, + "etype:steal", yyvsp[-1].id, + "prefix:steal", yyvsp[-5].id, + "values:steal", enum_vals, + NULL); + enum_vals = NULL; + nodes = g_list_append (nodes, node); + ; + break;} +case 172: +#line 1885 "parse.y" +{ + Node *node = node_new (ENUMDEF_NODE, + "etype:steal", yyvsp[-1].id, + "prefix:steal", yyvsp[-6].id, + "values:steal", enum_vals, + NULL); + enum_vals = NULL; + nodes = g_list_append (nodes, node); + ; + break;} +case 173: +#line 1896 "parse.y" +{;; + break;} +case 174: +#line 1897 "parse.y" +{;; + break;} +case 175: +#line 1900 "parse.y" +{ + Node *node; + char *num = yyvsp[0].id; + + /* A float value, that's a bad enum */ + if (num[0] >= '0' && + num[0] <= '9' && + strchr (num, '.') != NULL) { + g_free (yyvsp[-2].id); + g_free (num); + yyerror(_("parse error (enumerator value not integer constant)")); + YYERROR; + } + + node = node_new (ENUMVALUE_NODE, + "name:steal", yyvsp[-2].id, + "value:steal", num, + NULL); + enum_vals = g_list_append (enum_vals, node); + ; + break;} +case 176: +#line 1920 "parse.y" +{ + Node *node; + + node = node_new (ENUMVALUE_NODE, + "name:steal", yyvsp[0].id, + NULL); + enum_vals = g_list_append (enum_vals, node); + ; + break;} +case 177: +#line 1930 "parse.y" +{ + Node *node = node_new (FLAGS_NODE, + "ftype:steal", yyvsp[-1].id, + "prefix:steal", yyvsp[-5].id, + "values:steal", flag_vals, + NULL); + flag_vals = NULL; + nodes = g_list_append (nodes, node); + ; + break;} +case 178: +#line 1939 "parse.y" +{ + Node *node = node_new (FLAGS_NODE, + "ftype:steal", yyvsp[-1].id, + "prefix:steal", yyvsp[-6].id, + "values:steal", flag_vals, + NULL); + flag_vals = NULL; + nodes = g_list_append (nodes, node); + ; + break;} +case 179: +#line 1950 "parse.y" +{ + flag_vals = g_list_append (flag_vals, yyvsp[0].id); + ; + break;} +case 180: +#line 1953 "parse.y" +{ + flag_vals = g_list_append (flag_vals, yyvsp[0].id); + ; + break;} +case 181: +#line 1958 "parse.y" +{ + Node *node = node_new (ERROR_NODE, + "etype:steal", yyvsp[-1].id, + "prefix:steal", yyvsp[-5].id, + "values:steal", error_vals, + NULL); + error_vals = NULL; + nodes = g_list_append (nodes, node); + ; + break;} +case 182: +#line 1967 "parse.y" +{ + Node *node = node_new (ERROR_NODE, + "etype:steal", yyvsp[-1].id, + "prefix:steal", yyvsp[-6].id, + "values:steal", error_vals, + NULL); + error_vals = NULL; + nodes = g_list_append (nodes, node); + ; + break;} +case 183: +#line 1978 "parse.y" +{ + error_vals = g_list_append (error_vals, yyvsp[0].id); + ; + break;} +case 184: +#line 1981 "parse.y" +{ + error_vals = g_list_append (error_vals, yyvsp[0].id); + ; + break;} +case 185: +#line 1987 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 117: -#line 992 "parse.y" +case 186: +#line 1988 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 118: -#line 996 "parse.y" +case 187: +#line 1992 "parse.y" +{ yyval.id = yyvsp[0].id; ; + break;} +case 188: +#line 1993 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2375,5 +3705,5 @@ yyerrhandle: } return 1; } -#line 999 "parse.y" +#line 1996 "parse.y"