X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/509cf0693fc440c71bdd3e71ea8947a6b4eb0bcf..346ae1bbcbbe87e79fe2db1f019f014ea64e2175:/src/parse.c diff --git a/src/parse.c b/src/parse.c index a3b796c..a7c88bf 100644 --- a/src/parse.c +++ b/src/parse.c @@ -24,48 +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 CLASSWIDE 286 -#define ARGUMENT 287 -#define VIRTUAL 288 -#define SIGNAL 289 -#define OVERRIDE 290 - -#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; @@ -77,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; @@ -123,24 +151,32 @@ 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; @@ -148,10 +184,12 @@ push_function(int scope, int method, char *oid, char *id, 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 @@ -162,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")); } } } @@ -187,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, method_unique_id++); + 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, @@ -213,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; } @@ -229,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); @@ -247,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); } @@ -269,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; @@ -281,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; @@ -307,8 +383,233 @@ 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 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) { + set = g_strdup_printf("{ GtkObject *___old = (GtkObject *)%s->%s; " + "GtkObject *___new = (GtkObject *)gtk_value_get_object (VAL); " + "if (___new != NULL) { " + "gtk_object_ref (GTK_OBJECT (___new)); " + "%s->%s = GTK_OBJECT (___new); " + "} else { " + "%s->%s = NULL; " + "} " + "if (___old != NULL) { " + "gtk_object_unref (GTK_OBJECT (___old)); " + "} " + "}", + root, prop->name, + root, prop->name, + root, prop->name); + get = g_strdup_printf("g_value_set_object (VAL, %s->%s);", + root, prop->name); + } 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)gtk_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; + 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); + + set = g_strdup_printf("%s->%s = %s (VAL);", + root, prop->name, + get_func); + get = g_strdup_printf("%s (VAL, %s->%s);", + set_func, + root, prop->name); + + g_free (get_func); + g_free (set_func); + } + + 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 290 "parse.y" +#line 576 "parse.y" typedef union { char *id; GString *cbuf; @@ -330,26 +631,26 @@ typedef union { -#define YYFINAL 243 +#define YYFINAL 393 #define YYFLAG -32768 -#define YYNTBASE 50 +#define YYNTBASE 66 -#define YYTRANSLATE(x) ((unsigned)(x) <= 290 ? yytranslate[x] : 87) +#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, 48, 2, 2, 2, 2, 2, 2, 41, - 42, 44, 2, 45, 49, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 39, 47, - 40, 46, 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, 37, 43, 38, 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, @@ -365,86 +666,128 @@ 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, 36 + 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, 64, 67, 71, 74, 78, - 81, 84, 86, 88, 89, 95, 102, 114, 123, 129, - 135, 137, 141, 142, 146, 148, 150, 153, 155, 158, - 161, 164, 166, 169, 172, 174, 176, 178, 180, 183, - 185, 187, 190, 192, 195, 197, 199, 201, 203, 205, - 208, 210, 213, 215, 219, 223, 226, 228, 233, 237, - 239, 242, 244, 255, 267, 277, 287, 296, 308, 317, - 323, 326, 331, 332, 334, 337, 339, 341, 345, 347, - 351, 353, 357, 359, 362, 366, 373, 381, 384, 386, - 388, 391, 394, 398, 402, 406, 410, 412, 415 + 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, 280, 286, + 288, 292, 293, 297, 299, 302, 304, 306, 308, 311, + 314, 317, 321, 325, 328, 331, 334, 336, 339, 341, + 344, 346, 348, 350, 352, 354, 356, 358, 360, 362, + 364, 366, 368, 370, 373, 376, 380, 383, 385, 389, + 393, 396, 398, 403, 407, 409, 412, 414, 425, 437, + 447, 457, 466, 478, 487, 493, 496, 501, 502, 504, + 507, 509, 511, 514, 517, 521, 526, 531, 533, 537, + 539, 543, 545, 548, 552, 559, 567, 570, 572, 574, + 577, 580, 584, 588, 592, 596, 604, 613, 617, 619, + 623, 625, 633, 642, 646, 648, 656, 665, 669, 671, + 673, 676, 678 }; -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, - 55, 38, 0, 54, 37, 38, 0, 3, 21, 4, - 21, 0, 55, 56, 0, 56, 0, 77, 0, 61, - 0, 62, 0, 39, 0, 29, 0, 30, 0, 31, - 0, 32, 0, 19, 19, 0, 19, 37, 23, 0, - 40, 86, 0, 40, 37, 23, 0, 58, 59, 0, - 59, 58, 0, 59, 0, 58, 0, 0, 57, 66, - 19, 60, 39, 0, 57, 66, 19, 22, 60, 39, - 0, 33, 64, 63, 19, 19, 37, 23, 19, 37, - 23, 39, 0, 33, 64, 63, 19, 19, 37, 23, - 39, 0, 33, 64, 63, 19, 19, 0, 19, 41, - 19, 66, 42, 0, 19, 0, 41, 65, 42, 0, - 0, 19, 43, 65, 0, 19, 0, 67, 0, 5, - 67, 0, 68, 0, 68, 71, 0, 12, 69, 0, - 11, 69, 0, 69, 0, 12, 18, 0, 11, 18, - 0, 18, 0, 17, 0, 16, 0, 19, 0, 70, - 19, 0, 21, 0, 6, 0, 13, 15, 0, 13, - 0, 14, 15, 0, 14, 0, 15, 0, 9, 0, - 8, 0, 7, 0, 44, 71, 0, 44, 0, 19, - 74, 0, 74, 0, 57, 19, 74, 0, 19, 57, - 74, 0, 57, 74, 0, 72, 0, 19, 41, 75, - 42, 0, 75, 45, 19, 0, 19, 0, 37, 23, - 0, 39, 0, 35, 64, 73, 66, 19, 41, 80, - 42, 78, 76, 0, 57, 35, 64, 72, 66, 19, - 41, 80, 42, 78, 76, 0, 34, 57, 66, 19, - 41, 80, 42, 78, 76, 0, 57, 34, 66, 19, - 41, 80, 42, 78, 76, 0, 34, 66, 19, 41, - 80, 42, 78, 76, 0, 36, 41, 21, 42, 66, - 19, 41, 80, 42, 78, 76, 0, 57, 66, 19, - 41, 80, 42, 78, 76, 0, 19, 41, 19, 42, - 76, 0, 19, 79, 0, 19, 79, 19, 79, 0, - 0, 86, 0, 37, 23, 0, 6, 0, 19, 0, - 19, 45, 81, 0, 81, 0, 82, 45, 10, 0, - 82, 0, 82, 45, 83, 0, 83, 0, 66, 19, - 0, 66, 19, 22, 0, 66, 19, 41, 19, 84, - 42, 0, 66, 19, 22, 41, 19, 84, 42, 0, - 84, 85, 0, 85, 0, 19, 0, 46, 86, 0, - 47, 86, 0, 46, 40, 86, 0, 47, 40, 86, - 0, 40, 40, 86, 0, 48, 40, 86, 0, 20, - 0, 49, 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, 19, + 0, 49, 58, 19, 0, 50, 58, 19, 0, 51, + 58, 19, 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, - 308, 309, 310, 311, 314, 320, 326, 332, 338, 344, - 352, 353, 356, 361, 368, 373, 374, 377, 378, 379, - 380, 383, 384, 385, 386, 389, 402, 418, 422, 430, - 431, 432, 433, 434, 440, 443, 447, 482, 510, 580, - 589, 595, 596, 599, 602, 608, 609, 617, 621, 628, - 631, 634, 637, 640, 643, 646, 649, 652, 655, 659, - 662, 667, 670, 673, 676, 679, 684, 687, 690, 695, - 696, 700, 712, 718, 730, 742, 745, 751, 756, 759, - 764, 765, 769, 785, 801, 817, 833, 844, 850, 860, - 883, 894, 913, 919, 920, 926, 927, 938, 948, 951, - 952, 955, 956, 959, 962, 965, 973, 983, 984, 987, - 1000, 1004, 1008, 1012, 1016, 1020, 1026, 1027, 1031 + 597, 598, 599, 600, 603, 612, 621, 630, 639, 648, + 659, 660, 661, 662, 663, 664, 665, 666, 669, 674, + 681, 695, 696, 708, 717, 731, 732, 735, 736, 745, + 757, 758, 759, 760, 763, 764, 765, 766, 769, 789, + 813, 817, 825, 826, 827, 828, 829, 835, 838, 843, + 911, 965, 1053, 1061, 1066, 1114, 1150, 1166, 1167, 1170, + 1171, 1174, 1175, 1187, 1188, 1191, 1197, 1203, 1209, 1215, + 1221, 1227, 1234, 1240, 1246, 1252, 1258, 1264, 1284, 1293, + 1299, 1300, 1303, 1306, 1312, 1319, 1328, 1331, 1334, 1338, + 1342, 1346, 1351, 1359, 1363, 1368, 1372, 1375, 1379, 1382, + 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1398, + 1399, 1400, 1403, 1404, 1405, 1409, 1416, 1428, 1434, 1446, + 1458, 1461, 1467, 1472, 1475, 1480, 1481, 1485, 1501, 1517, + 1533, 1549, 1560, 1566, 1576, 1599, 1610, 1629, 1635, 1636, + 1642, 1643, 1654, 1665, 1676, 1686, 1696, 1706, 1709, 1710, + 1713, 1714, 1717, 1720, 1723, 1731, 1741, 1742, 1745, 1762, + 1769, 1776, 1783, 1790, 1797, 1806, 1815, 1826, 1827, 1830, + 1850, 1860, 1869, 1880, 1883, 1888, 1897, 1908, 1911, 1917, + 1918, 1922, 1923 }; #endif @@ -454,195 +797,295 @@ 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", -"CLASSWIDE","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, - 50, 50, 50, 50, 51, 51, 51, 51, 51, 51, - 52, 52, 53, 53, 54, 55, 55, 56, 56, 56, - 56, 57, 57, 57, 57, 58, 58, 59, 59, 60, - 60, 60, 60, 60, 61, 61, 62, 62, 62, 63, - 63, 64, 64, 65, 65, 66, 66, 67, 67, 68, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 69, 69, 69, 69, 69, 70, 70, 70, 71, - 71, 72, 72, 73, 73, 73, 73, 74, 75, 75, - 76, 76, 77, 77, 77, 77, 77, 77, 77, 77, - 78, 78, 78, 79, 79, 80, 80, 80, 80, 81, - 81, 82, 82, 83, 83, 83, 83, 84, 84, 85, - 85, 85, 85, 85, 85, 85, 86, 86, 86 + 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, 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, 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, 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, 25, 43, 0, 43, 0, 14, 21, 0, - 17, 0, 19, 20, 18, 15, 0, 0, 0, 0, - 61, 69, 68, 67, 0, 0, 63, 65, 66, 57, - 56, 55, 58, 60, 0, 0, 46, 48, 52, 0, - 0, 0, 13, 16, 0, 43, 0, 0, 45, 0, - 41, 0, 47, 54, 51, 53, 50, 62, 64, 0, - 0, 71, 49, 59, 0, 0, 77, 0, 73, 0, - 0, 0, 34, 0, 0, 42, 0, 0, 0, 0, - 70, 0, 0, 0, 72, 0, 76, 0, 0, 0, - 0, 0, 0, 34, 0, 0, 33, 32, 0, 0, - 82, 90, 44, 0, 39, 0, 61, 58, 0, 0, - 99, 101, 103, 80, 0, 75, 74, 0, 0, 0, - 0, 26, 0, 0, 119, 117, 0, 0, 28, 0, - 30, 31, 35, 81, 0, 0, 0, 0, 104, 93, - 0, 78, 0, 0, 0, 0, 0, 27, 36, 29, - 118, 93, 40, 0, 93, 98, 105, 0, 0, 0, - 100, 102, 79, 0, 0, 93, 0, 0, 0, 38, - 0, 0, 0, 0, 91, 94, 87, 93, 0, 0, - 0, 89, 0, 85, 0, 110, 0, 0, 0, 0, - 0, 109, 95, 0, 0, 93, 86, 93, 0, 0, - 0, 0, 111, 0, 112, 0, 106, 108, 92, 83, - 0, 0, 37, 107, 115, 113, 114, 116, 88, 84, + 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, 82, + 0, 82, 0, 20, 34, 0, 27, 0, 31, 32, + 33, 28, 22, 171, 0, 169, 179, 0, 175, 0, + 0, 0, 0, 0, 29, 0, 0, 0, 0, 101, + 110, 111, 112, 108, 109, 105, 103, 104, 106, 107, + 102, 88, 97, 0, 0, 86, 87, 99, 0, 0, + 0, 19, 26, 0, 82, 0, 0, 21, 0, 0, + 0, 0, 0, 0, 0, 30, 0, 0, 59, 84, + 0, 80, 0, 0, 89, 96, 0, 90, 98, 95, + 0, 0, 113, 85, 100, 94, 91, 0, 0, 122, + 0, 118, 0, 0, 0, 47, 0, 183, 180, 182, + 0, 170, 0, 0, 168, 0, 178, 0, 0, 174, + 0, 0, 0, 0, 0, 0, 81, 0, 54, 92, + 0, 0, 114, 115, 93, 0, 0, 0, 117, 0, + 121, 0, 0, 0, 0, 0, 0, 47, 0, 0, + 46, 45, 0, 0, 0, 0, 181, 166, 0, 176, + 0, 172, 0, 0, 127, 135, 78, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 61, 0, 57, 83, 0, 0, 0, 0, 0, 101, + 88, 0, 0, 148, 150, 152, 116, 125, 0, 120, + 119, 0, 0, 0, 0, 39, 0, 0, 0, 0, + 41, 43, 44, 48, 22, 22, 22, 167, 177, 173, + 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 58, 0, 0, 0, 0, 52, 0, + 89, 90, 0, 153, 138, 0, 123, 0, 0, 0, + 0, 0, 40, 49, 138, 42, 23, 25, 24, 0, + 62, 66, 67, 68, 69, 183, 65, 70, 64, 71, + 72, 73, 74, 75, 76, 77, 60, 0, 79, 53, + 0, 138, 0, 0, 145, 154, 0, 0, 0, 149, + 151, 124, 0, 0, 138, 0, 0, 0, 0, 56, + 0, 0, 147, 146, 0, 0, 0, 136, 139, 132, + 138, 0, 0, 0, 134, 0, 0, 0, 51, 130, + 0, 159, 0, 0, 0, 0, 0, 158, 140, 0, + 0, 138, 131, 138, 63, 0, 0, 0, 0, 0, + 160, 0, 161, 0, 155, 157, 137, 128, 0, 0, + 55, 0, 156, 164, 162, 163, 165, 133, 129, 50, 0, 0, 0 }; -static const short yydefgoto[] = { 241, - 8, 9, 10, 11, 30, 31, 32, 117, 118, 119, - 33, 34, 72, 39, 70, 129, 57, 58, 59, 60, - 83, 87, 88, 89, 135, 122, 35, 180, 195, 130, - 131, 132, 133, 211, 212, 196 +static const short yydefgoto[] = { 391, + 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, 319, 338, 223, 224, 225, + 226, 357, 358, 15, 55, 56, 16, 60, 17, 58, + 339 }; -static const short yypact[] = { 158, - 13,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 158, 185, - -26, 44,-32768, 185, 185, 168, 51, 185, 33,-32768, --32768,-32768,-32768, 43, 138, 43, 46,-32768,-32768, 186, --32768, 107,-32768,-32768,-32768,-32768, 67, 71, 82, 271, --32768,-32768,-32768,-32768, 176, 280, 95, 102,-32768,-32768, --32768,-32768,-32768,-32768, 238, 108,-32768, 86,-32768, 112, - 73, 111,-32768,-32768, 238, 43, 114, 92, 105, 96, - 121, 144,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 145, - 131, 86,-32768,-32768, 147, 154,-32768, 238,-32768, 133, - 161, 177, 152, 41, 71,-32768, 195, 204, 200, 255, --32768, 207, 239, 246,-32768, 1,-32768, 256, 238, 240, - 1, 238, 8, -10, -5, 255, 155, 272, 257, 274, --32768,-32768,-32768, 238, 262, 255, 258, 20, 282, 260, --32768, 259,-32768,-32768, 34,-32768,-32768, 264, 284, 255, - 287,-32768, 285, 268,-32768,-32768, 286, 290,-32768, 269, --32768,-32768,-32768,-32768, 270, 291, 273, 238, -3, 294, - 221,-32768, 297, 255, 276, 277, 279,-32768,-32768,-32768, --32768, 294,-32768, -15, 294,-32768, 281, 299, -2, 41, --32768,-32768,-32768, 283, 255, 294, 255, 41, 289,-32768, - 41, 302, 89, 300, 305,-32768,-32768, 294, 288, 41, - 292,-32768, 304,-32768, 89,-32768, 293, 3, 9, 295, - 35,-32768,-32768, -2, 41, 294,-32768, 294, 298, 49, - 17, 17,-32768, 17,-32768, 17,-32768,-32768,-32768,-32768, - 41, 41,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 328, 329,-32768 +static const short yypact[] = { 168, + 18, 21,-32768,-32768,-32768,-32768,-32768,-32768, 41, 89, +-32768, 168, 213, 56,-32768,-32768,-32768, 138, 77, 109, + 110,-32768, 213,-32768,-32768,-32768, 213, 167, 123, 153, + 155, 189, 213, 230,-32768,-32768,-32768,-32768, 190, 156, + 309, 156, 161,-32768,-32768, 196,-32768, 275,-32768,-32768, +-32768,-32768, 162, 165, -17,-32768,-32768, -13,-32768, 91, + 164, 300, 201, 275,-32768, 206, 207, 217, 356,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768, 247, 424, 373, 235, 199,-32768, 438, 238, 443, + 244,-32768,-32768, 373, 156, 253, 255,-32768, 6, 245, + -1, 256, 26, 258, 73,-32768, 222, 276, 274, 242, + 254, 280, 292, 452,-32768,-32768, 317,-32768, 452,-32768, + 340, 311, 2,-32768, 452,-32768, 371, 157, 364,-32768, + 373,-32768, 337, 381, 391, 88, 224,-32768,-32768,-32768, + 397,-32768, 370, 410,-32768, 375,-32768, 412, 377,-32768, + 425, -34, 392, 257, -7, 207,-32768, 429, 405,-32768, + 406, 390, 199,-32768,-32768, 416, 453, 459,-32768, 14, +-32768, 460, 373, 426, 14, 373, 13, 9, 390, 59, + 422, 463, 427, 430, 431, 432,-32768,-32768, 428,-32768, + 433,-32768, 434, 465,-32768,-32768,-32768, 435, 436, 437, + 439, 440, 441, 442, 444, 445, 446, 447, 448, 122, +-32768, 454,-32768,-32768, 373, 464, 473, 390, 407, 455, + 5, 477, 456,-32768, 449,-32768,-32768,-32768, 124,-32768, +-32768, 458, 482, 390, 490,-32768, 486, 457, 461, 491, +-32768,-32768,-32768,-32768, 162, 162, 162,-32768,-32768,-32768, +-32768, 84, 84, 6, 6, 64, 207, 373, 497, 499, + 500, 501, 502,-32768, 257, 498, 467, 468, 472, 470, + 126, 128, 373, 63, 508, 339,-32768, 509, 390, 474, + 475, 478,-32768,-32768, 508,-32768,-32768,-32768,-32768, 479, +-32768,-32768,-32768,-32768,-32768, 479,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768, -2,-32768,-32768, + 506, 508, 373, 373,-32768, 480, 513, 70, -34,-32768, +-32768,-32768, 481, 390, 508, 390, -34, 510, 483,-32768, + 16, -34,-32768,-32768, 519, 106, 515, 522,-32768,-32768, + 508, 487, -34, 488,-32768, 489, 518, 493,-32768,-32768, + 106,-32768, 492, 76, 82, 494, 57,-32768,-32768, 70, + -34, 508,-32768, 508,-32768, 496, 523, 103, 6, 6, +-32768, 6,-32768, 6,-32768,-32768,-32768,-32768, -34, -34, +-32768, 503,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 548, 549,-32768 }; static const short yypgoto[] = {-32768, - 52, 45, 322,-32768,-32768, 306, -22, 214, 222, 224, --32768,-32768,-32768, -20, 245, -24, 301,-32768, 53,-32768, - 261, 250,-32768, 54,-32768, -175,-32768, -165, 130, -114, - 187,-32768, 188, 141, -151, -115 + 99, 125, 539,-32768, 1,-32768, 511, -28, 372, 374, + 378,-32768,-32768,-32768,-32768,-32768,-32768, -46,-32768, 293, +-32768, -27, -151, -40,-32768, -67,-32768, -66, -112, 450, +-32768, -98,-32768, -305, -14, -276, 202, -175, -216,-32768, + 283, 210, -240, 104,-32768, 462, 127,-32768, 146,-32768, + -99 }; -#define YYLAST 349 - - -static const short yytable[] = { 149, - 56, 150, 55, 189, 197, 61, 188, 67, 113, 191, - 16, 157, 202, 145, 146, 204, 145, 146, 177, 102, - 200, 145, 146, 190, 217, 166, 142, 145, 146, 115, - 80, 147, 215, 12, 194, 145, 146, 178, 86, 230, - 91, 103, 222, 148, 143, 92, 148, 17, 224, 184, - 231, 148, 232, 206, 15, 239, 240, 148, 18, 228, - 13, -97, 104, 108, 158, 148, 13, 206, 228, 13, - 199, 36, 201, 37, 207, 162, 227, 120, 163, 121, - 208, 209, 210, 38, 139, 68, 62, 141, 207, 69, - 234, 85, 223, 225, 208, 209, 210, 75, 77, 155, - 71, 20, 21, 22, 23, 235, 236, 206, 237, 78, - 238, 40, 41, 42, 43, 44, 79, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 81, 54, 207, 82, - 84, 90, 93, 94, 208, 209, 210, 96, 105, 107, - 65, 66, 40, 41, 42, 43, 44, 95, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 136, 54, 137, - 1, 97, 98, 99, 105, 102, 20, 21, 22, 23, - 113, 100, 106, 114, 109, 20, 21, 22, 23, 110, - 2, 3, 4, 5, 6, 7, 19, 103, 47, 48, - 49, 115, 116, 74, 115, 111, 20, 21, 22, 23, - 24, 25, 26, 27, 19, 28, 29, 2, 3, 4, - 5, 6, 7, 124, 20, 21, 22, 23, 24, 25, - 26, 27, 125, 63, 29, 40, 41, 42, 43, 44, - 181, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 126, 54, 40, 41, 42, 43, 44, 103, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 134, 54, 40, - 127, 42, 43, 44, 102, 45, 46, 47, 48, 49, - 50, 51, 52, 128, 138, 54, 41, 42, 43, 44, - 140, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 113, 54, 47, 48, 49, 153, 154, 76, 156, -96, - 159, 160, 165, 161, 164, 167, 169, 168, 170, 171, - 172, 173, 179, 174, 175, 183, 185, 193, 186, 187, - 205, 192, 213, 214, 198, 203, 219, 242, 243, 216, - 14, 152, 221, 218, 226, 64, 233, 144, 151, 123, - 73, 112, 101, 229, 176, 220, 0, 0, 182 +#define YYLAST 585 + + +static const short yytable[] = { 142, + 85, 116, 117, 239, 214, 64, 163, 96, 327, 272, + 164, 212, 84, 340, 90, 120, 329, 54, 194, 65, + 126, 345, 195, 108, 138, 139, 350, 177, 140, 169, + 171, 236, 166, 64, 348, 332, 100, 363, 18, 19, + 102, 101, 270, 121, 147, 103, 116, 106, 343, 213, + 227, 116, 144, 134, 330, 378, 315, 116, 281, 20, + -142, 129, 123, 273, 361, 237, 180, 135, 167, 230, + 141, 231, 349, 388, 389, 352, 169, 138, 139, 148, + 241, 140, 296, 139, 316, 379, 140, 380, 138, 139, + 172, 150, 140, 291, 138, 139, 333, 334, 140, 168, + 138, 139, 290, 323, 140, 300, 177, 21, 28, 178, + 22, 240, 375, 291, 353, 24, 376, 317, 354, 355, + 356, 352, 337, 141, 352, 22, 151, 376, 141, 30, + 24, 22, 233, 370, 141, 235, 24, 27, 25, 372, + 141, 29, 179, 53, 104, 180, 141, 33, 342, 105, + 344, 116, 117, 25, 294, 295, 299, 26, 383, 25, + 353, 31, 32, 353, 354, 355, 356, 354, 355, 356, + 1, 54, 26, 57, 267, 166, 2, 264, 26, 277, + 265, -144, 278, -143, 313, 34, 314, 35, 36, 37, + 38, 3, 4, 5, 6, 7, 8, 35, 36, 37, + 38, 39, 40, 41, 42, 43, 293, 59, 66, 297, + 67, 167, 9, 10, 34, 91, 97, 301, 63, 107, + 44, 2, 99, 45, 109, 110, 35, 36, 37, 38, + 39, 40, 41, 42, 43, 112, 3, 4, 5, 6, + 7, 8, 184, 185, 186, 287, 288, 289, 61, 92, + 62, 118, 45, 122, 371, 373, 127, 9, 10, 123, + 35, 36, 37, 38, 133, 143, 41, 42, 43, 384, + 385, 136, 386, 137, 387, 197, 146, 152, 149, 69, + 70, 71, 72, 73, 63, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 153, 83, 198, 199, 200, 201, + 202, 156, 203, 204, 205, 206, 207, 208, 209, 157, + 159, 94, 95, 69, 70, 71, 72, 73, 61, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 154, 83, + 35, 36, 37, 38, 158, 160, 41, 42, 43, 35, + 36, 37, 38, 69, 70, 71, 72, 73, 320, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 161, 83, + 114, 70, 71, 72, 73, 162, 74, 75, 76, 77, + 78, 79, 80, 81, 115, 165, 83, 69, 70, 71, + 72, 73, 170, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 173, 83, 219, 220, 71, 72, 73, 174, + 74, 75, 76, 77, 78, 79, 80, 81, 221, 175, + 83, 114, 70, 71, 72, 73, 187, 74, 75, 76, + 77, 78, 79, 80, 81, 271, 188, 83, 119, 70, + 189, 190, 191, 192, 74, 75, 76, 77, 78, 79, + 80, 81, 125, 70, 83, 193, 179, 215, 74, 75, + 76, 77, 78, 79, 80, 81, 114, 70, 83, 216, + 218, 128, 74, 75, 76, 77, 78, 79, 80, 81, + 167, 228, 83, 35, 36, 37, 38, 166, 232, 180, + 234, 177, 268, 244, 248, 245, 246, 247, 251, 249, + 250, 269, 252, 253, 254, 274, 255, 256, 257, 258, + 280, 259, 260, 261, 262, 263, 266, 276, 282, 283, + -141, 275, 279, 284, 286, 302, 285, 303, 304, 305, + 306, 308, 309, 310, 311, 312, 318, 322, 324, 331, + 325, 336, 326, 328, 335, 347, 341, 351, 359, 346, + 360, 366, 362, 364, 365, 367, 382, 392, 393, 369, + 23, 374, 381, 243, 242, 238, 93, 307, 321, 390, + 368, 377, 145, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 176 }; -static const short yycheck[] = { 115, - 25, 116, 25, 19, 180, 26, 172, 32, 19, 175, - 37, 126, 188, 19, 20, 191, 19, 20, 22, 19, - 186, 19, 20, 39, 200, 140, 19, 19, 20, 40, - 55, 37, 198, 21, 37, 19, 20, 41, 61, 215, - 65, 41, 40, 49, 37, 66, 49, 4, 40, 164, - 216, 49, 218, 19, 10, 231, 232, 49, 14, 211, - 9, 42, 85, 88, 45, 49, 15, 19, 220, 18, - 185, 21, 187, 41, 40, 42, 42, 37, 45, 39, - 46, 47, 48, 41, 109, 19, 41, 112, 40, 19, - 42, 19, 208, 209, 46, 47, 48, 45, 46, 124, - 19, 29, 30, 31, 32, 221, 222, 19, 224, 15, - 226, 5, 6, 7, 8, 9, 15, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 19, 21, 40, 44, - 19, 21, 19, 42, 46, 47, 48, 42, 85, 86, - 34, 35, 5, 6, 7, 8, 9, 43, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 104, 21, 106, - 3, 41, 19, 19, 111, 19, 29, 30, 31, 32, - 19, 41, 19, 22, 42, 29, 30, 31, 32, 19, - 23, 24, 25, 26, 27, 28, 19, 41, 13, 14, - 15, 40, 41, 18, 40, 19, 29, 30, 31, 32, - 33, 34, 35, 36, 19, 38, 39, 23, 24, 25, - 26, 27, 28, 19, 29, 30, 31, 32, 33, 34, - 35, 36, 19, 38, 39, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 41, 21, 5, 6, 7, 8, 9, 41, 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, 19, 21, 6, 7, 8, 9, - 41, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 19, 21, 13, 14, 15, 39, 23, 18, 37, 42, - 19, 42, 19, 45, 41, 19, 39, 23, 23, 20, - 42, 42, 19, 23, 42, 19, 41, 19, 42, 41, - 19, 41, 23, 19, 42, 37, 23, 0, 0, 42, - 9, 118, 40, 42, 40, 30, 39, 114, 117, 95, - 40, 92, 82, 214, 158, 205, -1, -1, 161 +static const short yycheck[] = { 99, + 41, 69, 69, 179, 156, 34, 5, 48, 285, 5, + 123, 19, 41, 319, 42, 83, 19, 19, 53, 34, + 88, 327, 57, 64, 19, 20, 332, 19, 23, 128, + 129, 19, 19, 62, 19, 312, 54, 343, 21, 19, + 54, 59, 218, 84, 19, 59, 114, 62, 325, 57, + 163, 119, 54, 94, 57, 361, 273, 125, 234, 19, + 56, 90, 61, 59, 341, 53, 58, 95, 55, 168, + 65, 170, 57, 379, 380, 19, 175, 19, 20, 54, + 180, 23, 19, 20, 22, 362, 23, 364, 19, 20, + 131, 19, 23, 30, 19, 20, 313, 314, 23, 128, + 19, 20, 19, 279, 23, 257, 19, 19, 53, 22, + 12, 53, 56, 30, 58, 12, 357, 55, 62, 63, + 64, 19, 53, 65, 19, 27, 54, 368, 65, 53, + 27, 33, 173, 58, 65, 176, 33, 13, 12, 58, + 65, 4, 55, 21, 54, 58, 65, 23, 324, 59, + 326, 219, 219, 27, 254, 255, 256, 12, 56, 33, + 58, 53, 53, 58, 62, 63, 64, 62, 63, 64, + 3, 19, 27, 19, 215, 19, 9, 56, 33, 56, + 59, 56, 59, 56, 59, 19, 59, 31, 32, 33, + 34, 24, 25, 26, 27, 28, 29, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 253, 19, 19, 256, + 55, 55, 45, 46, 19, 55, 55, 258, 55, 19, + 54, 9, 58, 57, 19, 19, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 19, 24, 25, 26, 27, + 28, 29, 19, 20, 21, 245, 246, 247, 19, 54, + 21, 5, 57, 19, 354, 355, 19, 45, 46, 61, + 31, 32, 33, 34, 21, 21, 37, 38, 39, 369, + 370, 19, 372, 19, 374, 19, 21, 56, 21, 5, + 6, 7, 8, 9, 55, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 19, 21, 40, 41, 42, 43, + 44, 60, 46, 47, 48, 49, 50, 51, 52, 56, + 19, 37, 38, 5, 6, 7, 8, 9, 19, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 55, 21, + 31, 32, 33, 34, 55, 19, 37, 38, 39, 31, + 32, 33, 34, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 19, 21, + 5, 6, 7, 8, 9, 55, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 5, 21, 5, 6, 7, + 8, 9, 19, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 56, 21, 5, 6, 7, 8, 9, 19, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 19, + 21, 5, 6, 7, 8, 9, 20, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 57, 21, 5, 6, + 21, 57, 21, 57, 11, 12, 13, 14, 15, 16, + 17, 18, 5, 6, 21, 21, 55, 19, 11, 12, + 13, 14, 15, 16, 17, 18, 5, 6, 21, 55, + 55, 19, 11, 12, 13, 14, 15, 16, 17, 18, + 55, 19, 21, 31, 32, 33, 34, 19, 19, 58, + 55, 19, 19, 57, 57, 56, 56, 56, 24, 57, + 57, 19, 58, 58, 58, 19, 58, 58, 58, 58, + 19, 58, 58, 58, 58, 58, 53, 59, 19, 24, + 56, 56, 55, 57, 24, 19, 56, 19, 19, 19, + 19, 24, 56, 56, 53, 56, 19, 19, 55, 24, + 56, 19, 55, 55, 55, 53, 56, 19, 24, 30, + 19, 24, 56, 56, 56, 53, 24, 0, 0, 58, + 12, 58, 57, 182, 181, 178, 46, 265, 276, 57, + 351, 360, 101, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 135 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/lib/bison.simple" @@ -1188,299 +1631,497 @@ yyreduce: switch (yyn) { case 1: -#line 308 "parse.y" +#line 597 "parse.y" { ; ; break;} case 2: -#line 309 "parse.y" +#line 598 "parse.y" { ; ; break;} case 3: -#line 310 "parse.y" +#line 599 "parse.y" { ; ; break;} case 4: -#line 311 "parse.y" +#line 600 "parse.y" { ; ; break;} case 5: -#line 314 "parse.y" +#line 603 "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 320 "parse.y" +#line 612 "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 326 "parse.y" +#line 621 "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 332 "parse.y" +#line 630 "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 338 "parse.y" +#line 639 "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 344 "parse.y" +#line 648 "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 352 "parse.y" +#line 659 "parse.y" { ; ; break;} case 12: -#line 353 "parse.y" +#line 660 "parse.y" { ; ; break;} case 13: -#line 356 "parse.y" +#line 661 "parse.y" +{ ; ; + break;} +case 14: +#line 662 "parse.y" +{ ; ; + break;} +case 15: +#line 663 "parse.y" +{ ; ; + break;} +case 16: +#line 664 "parse.y" +{ ; ; + break;} +case 17: +#line 665 "parse.y" +{ ; ; + break;} +case 18: +#line 666 "parse.y" +{ ; ; + break;} +case 19: +#line 669 "parse.y" { ((Class *)class)->nodes = class_nodes; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 14: -#line 361 "parse.y" +case 20: +#line 674 "parse.y" { ((Class *)class)->nodes = NULL; class_nodes = NULL; nodes = g_list_append(nodes,class); ; break;} -case 15: -#line 368 "parse.y" -{ - class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL); +case 21: +#line 681 "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 373 "parse.y" +case 23: +#line 696 "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 708 "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 717 "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 731 "parse.y" { ; ; break;} -case 17: -#line 374 "parse.y" +case 27: +#line 732 "parse.y" { ; ; break;} -case 18: -#line 377 "parse.y" +case 28: +#line 735 "parse.y" { ; ; break;} -case 19: -#line 378 "parse.y" +case 29: +#line 736 "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 745 "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 757 "parse.y" { ; ; break;} -case 20: -#line 379 "parse.y" +case 32: +#line 758 "parse.y" { ; ; break;} -case 21: -#line 380 "parse.y" +case 33: +#line 759 "parse.y" +{ ; ; + break;} +case 34: +#line 760 "parse.y" { ; ; break;} -case 22: -#line 383 "parse.y" +case 35: +#line 763 "parse.y" { the_scope = PUBLIC_SCOPE; ; break;} -case 23: -#line 384 "parse.y" +case 36: +#line 764 "parse.y" { the_scope = PRIVATE_SCOPE; ; break;} -case 24: -#line 385 "parse.y" +case 37: +#line 765 "parse.y" { the_scope = PROTECTED_SCOPE; ; break;} -case 25: -#line 386 "parse.y" +case 38: +#line 766 "parse.y" { the_scope = CLASS_SCOPE; ; break;} -case 26: -#line 389 "parse.y" +case 39: +#line 769 "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 27: -#line 402 "parse.y" +case 40: +#line 789 "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 28: -#line 418 "parse.y" +case 41: +#line 813 "parse.y" { initializer = yyvsp[0].id; initializer_line = ccode_line; ; break;} -case 29: -#line 422 "parse.y" +case 42: +#line 817 "parse.y" { initializer = (yyvsp[0].cbuf)->str; initializer_line = ccode_line; g_string_free(yyvsp[0].cbuf, FALSE); ; break;} -case 30: -#line 430 "parse.y" +case 43: +#line 825 "parse.y" { ; ; break;} -case 31: -#line 431 "parse.y" +case 44: +#line 826 "parse.y" { ; ; break;} -case 32: -#line 432 "parse.y" +case 45: +#line 827 "parse.y" { destructor = NULL; ; break;} -case 33: -#line 433 "parse.y" +case 46: +#line 828 "parse.y" { initializer = NULL; ; break;} -case 34: -#line 434 "parse.y" +case 47: +#line 829 "parse.y" { destructor = NULL; initializer = NULL; ; break;} -case 35: -#line 440 "parse.y" +case 48: +#line 835 "parse.y" { push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL); ; break;} -case 36: -#line 443 "parse.y" +case 49: +#line 838 "parse.y" { push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id); ; break;} -case 37: -#line 447 "parse.y" +case 50: +#line 843 "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 38: -#line 482 "parse.y" +case 51: +#line 911 "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 39: -#line 510 "parse.y" +case 52: +#line 965 "parse.y" { Node *node; char *get, *set = NULL; @@ -1489,265 +2130,606 @@ case 39: char *root; if(strcmp(yyvsp[0].id, "link")!=0 && - strcmp(yyvsp[0].id, "stringlink")!=0 && + strcmp(yyvsp[0].id, "stringlink")!=0 && strcmp(yyvsp[0].id, "objectlink")!=0) { - g_free(yyvsp[0].id); g_free(yyvsp[-2].id); - g_free(yyvsp[-1].id); - g_list_foreach(yyvsp[-3].list,(GFunc)g_free,NULL); + g_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 if(var->scope == CLASS_SCOPE) - root = "SELF_CLASS(GTK_OBJECT(self)->klass)"; - 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) { set = g_strdup_printf("%s->%s = ARG;", - root, yyvsp[-1].id); + root, yyvsp[-2].id); } else if(strcmp(yyvsp[0].id, "stringlink")==0) { - set = g_strdup_printf("g_free(%s->%s); " - "%s->%s = g_strdup(ARG);", - root, yyvsp[-1].id, - root, yyvsp[-1].id); + 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, - 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 40: -#line 580 "parse.y" +case 53: +#line 1053 "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 41: -#line 589 "parse.y" +case 54: +#line 1061 "parse.y" { - yyval.id = yyvsp[0].id; - typestack = g_list_prepend(typestack,NULL); + yyval.id = NULL; ; break;} -case 42: -#line 595 "parse.y" -{ yyval.list = yyvsp[-1].list; ; +case 55: +#line 1066 "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 43: -#line 596 "parse.y" -{ yyval.list = NULL; ; +case 56: +#line 1114 "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 44: -#line 599 "parse.y" -{ - yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); - ; +case 57: +#line 1150 "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 45: -#line 602 "parse.y" -{ - yyval.list = g_list_append(NULL,yyvsp[0].id); - ; +case 58: +#line 1166 "parse.y" +{ ; ; break;} -case 46: -#line 608 "parse.y" +case 59: +#line 1167 "parse.y" { ; ; break;} -case 47: -#line 609 "parse.y" -{ - Type *type = typestack->data; - char *oldname = type->name; - type->name = g_strconcat("const ",oldname,NULL); - g_free(oldname); - ; +case 60: +#line 1170 "parse.y" +{ ; ; break;} -case 48: -#line 617 "parse.y" -{ - Node *node = new_type(0,yyvsp[0].id,NULL); - typestack = g_list_prepend(typestack,node); - ; +case 61: +#line 1171 "parse.y" +{ ; ; break;} -case 49: -#line 621 "parse.y" -{ - Node *node = new_type(stars,yyvsp[-1].id,NULL); - stars = 0; - typestack = g_list_prepend(typestack,node); - ; +case 62: +#line 1174 "parse.y" +{ yyval.id = yyvsp[0].id; ; break;} -case 50: -#line 628 "parse.y" +case 63: +#line 1175 "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 51: -#line 631 "parse.y" +case 64: +#line 1187 "parse.y" +{ yyval.id = yyvsp[0].id; ; + break;} +case 65: +#line 1188 "parse.y" +{ yyval.id = yyvsp[0].id; ; + break;} +case 66: +#line 1191 "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 52: -#line 634 "parse.y" +case 67: +#line 1197 "parse.y" { - yyval.id = g_strdup(yyvsp[0].id); - ; + ensure_property (); + node_set ((Node *)property, + "blurb:steal", yyvsp[0].id, + NULL); + ; break;} -case 53: -#line 637 "parse.y" +case 68: +#line 1203 "parse.y" { - yyval.id = g_strdup("unsigned char"); - ; + ensure_property (); + node_set ((Node *)property, + "maximum:steal", yyvsp[0].id, + NULL); + ; break;} -case 54: -#line 640 "parse.y" +case 69: +#line 1209 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "minimum:steal", yyvsp[0].id, + NULL); + ; + break;} +case 70: +#line 1215 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "default_value:steal", yyvsp[0].id, + NULL); + ; + break;} +case 71: +#line 1221 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "flags:steal", yyvsp[0].list, + NULL); + ; + break;} +case 72: +#line 1227 "parse.y" +{ + Type *type = pop_type (); + ensure_property (); + node_set ((Node *)property, + "ptype:steal", type, + NULL); + ; + break;} +case 73: +#line 1234 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 74: +#line 1240 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 75: +#line 1246 "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 1252 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 77: +#line 1258 "parse.y" +{ + ensure_property (); + node_set ((Node *)property, + "extra_gtktype:steal", yyvsp[0].id, + NULL); + ; + break;} +case 78: +#line 1264 "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 79: +#line 1284 "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 55: -#line 643 "parse.y" +case 80: +#line 1293 "parse.y" { - yyval.id = g_strdup("char"); + yyval.id = debool (yyvsp[0].id); + typestack = g_list_prepend(typestack,NULL); ; break;} -case 56: -#line 646 "parse.y" +case 81: +#line 1299 "parse.y" +{ yyval.list = yyvsp[-1].list; ; + break;} +case 82: +#line 1300 "parse.y" +{ yyval.list = NULL; ; + break;} +case 83: +#line 1303 "parse.y" { - yyval.id = g_strdup("double"); + yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id); ; break;} -case 57: -#line 649 "parse.y" +case 84: +#line 1306 "parse.y" { - yyval.id = g_strdup("float"); + yyval.list = g_list_append(NULL,yyvsp[0].id); ; break;} -case 58: -#line 652 "parse.y" +case 85: +#line 1312 "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 86: +#line 1319 "parse.y" +{ + Node *node = node_new (TYPE_NODE, + "name:steal", yyvsp[0].id, + NULL); + typestack = g_list_prepend(typestack,node); + ; + break;} +case 87: +#line 1328 "parse.y" { yyval.id = yyvsp[0].id; - ; + ; break;} -case 59: -#line 655 "parse.y" +case 88: +#line 1331 "parse.y" +{ + yyval.id = yyvsp[0].id; + ; + break;} +case 89: +#line 1334 "parse.y" { - yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL); + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); g_free(yyvsp[0].id); - ; + ; break;} -case 60: -#line 659 "parse.y" +case 90: +#line 1338 "parse.y" { - yyval.id = yyvsp[0].id; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} -case 61: -#line 662 "parse.y" +case 91: +#line 1342 "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 62: -#line 667 "parse.y" +case 92: +#line 1346 "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 63: -#line 670 "parse.y" +case 93: +#line 1351 "parse.y" { - yyval.id = "long"; - ; + yyval.id = g_strconcat(yyvsp[-2].id, " ", + yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} -case 64: -#line 673 "parse.y" +case 94: +#line 1359 "parse.y" { - yyval.id = "short int"; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} -case 65: -#line 676 "parse.y" +case 95: +#line 1363 "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 66: -#line 679 "parse.y" +case 96: +#line 1368 "parse.y" { - yyval.id = "int"; - ; + yyval.id = g_strconcat("const ", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; break;} -case 67: -#line 684 "parse.y" +case 97: +#line 1372 "parse.y" { - yyval.id = "enum "; - ; + yyval.id = yyvsp[0].id; + ; break;} -case 68: -#line 687 "parse.y" +case 98: +#line 1375 "parse.y" { - yyval.id = "union "; - ; + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + g_free(yyvsp[-1].id); + ; break;} -case 69: -#line 690 "parse.y" +case 99: +#line 1379 "parse.y" { - yyval.id = "struct "; - ; + yyval.id = g_strdup(yyvsp[0].id); + ; break;} -case 70: -#line 695 "parse.y" -{ stars++; ; +case 100: +#line 1382 "parse.y" +{ + yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL); + ; break;} -case 71: -#line 696 "parse.y" -{ stars++; ; +case 101: +#line 1387 "parse.y" +{ yyval.id = "void"; ; break;} -case 72: -#line 700 "parse.y" +case 102: +#line 1388 "parse.y" +{ yyval.id = "char"; ; + break;} +case 103: +#line 1389 "parse.y" +{ yyval.id = "short"; ; + break;} +case 104: +#line 1390 "parse.y" +{ yyval.id = "int"; ; + break;} +case 105: +#line 1391 "parse.y" +{ yyval.id = "long"; ; + break;} +case 106: +#line 1392 "parse.y" +{ yyval.id = "float"; ; + break;} +case 107: +#line 1393 "parse.y" +{ yyval.id = "double"; ; + break;} +case 108: +#line 1394 "parse.y" +{ yyval.id = "signed"; ; + break;} +case 109: +#line 1395 "parse.y" +{ yyval.id = "unsigned"; ; + break;} +case 110: +#line 1398 "parse.y" +{ yyval.id = "struct"; ; + break;} +case 111: +#line 1399 "parse.y" +{ yyval.id = "union"; ; + break;} +case 112: +#line 1400 "parse.y" +{ yyval.id = "enum"; ; + break;} +case 113: +#line 1403 "parse.y" +{ yyval.id = g_strdup("*"); ; + break;} +case 114: +#line 1404 "parse.y" +{ yyval.id = g_strdup("* const"); ; + break;} +case 115: +#line 1405 "parse.y" +{ + yyval.id = g_strconcat("*", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 116: +#line 1409 "parse.y" +{ + yyval.id = g_strconcat("* const", yyvsp[0].id, NULL); + g_free(yyvsp[0].id); + ; + break;} +case 117: +#line 1416 "parse.y" { if(strcmp(yyvsp[-1].id, "first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1761,14 +2743,14 @@ case 72: g_free(yyvsp[-1].id); ; break;} -case 73: -#line 712 "parse.y" +case 118: +#line 1428 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 74: -#line 718 "parse.y" +case 119: +#line 1434 "parse.y" { if(strcmp(yyvsp[-1].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1782,8 +2764,8 @@ case 74: g_free(yyvsp[-1].id); ; break;} -case 75: -#line 730 "parse.y" +case 120: +#line 1446 "parse.y" { if(strcmp(yyvsp[-2].id,"first")==0) yyval.sigtype = SIGNAL_FIRST_METHOD; @@ -1797,47 +2779,47 @@ case 75: g_free(yyvsp[-2].id); ; break;} -case 76: -#line 742 "parse.y" +case 121: +#line 1458 "parse.y" { yyval.sigtype = SIGNAL_LAST_METHOD; ; break;} -case 77: -#line 745 "parse.y" +case 122: +#line 1461 "parse.y" { /* the_scope was default thus public */ the_scope = PUBLIC_SCOPE; ; break;} -case 78: -#line 751 "parse.y" +case 123: +#line 1467 "parse.y" { - gtktypes = g_list_prepend(gtktypes, yyvsp[-3].id); + gtktypes = g_list_prepend(gtktypes, debool (yyvsp[-3].id)); ; break;} -case 79: -#line 756 "parse.y" +case 124: +#line 1472 "parse.y" { - gtktypes = g_list_append(gtktypes, yyvsp[0].id); + gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id)); ; break;} -case 80: -#line 759 "parse.y" +case 125: +#line 1475 "parse.y" { - gtktypes = g_list_append(gtktypes, yyvsp[0].id); + gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id)); ; break;} -case 81: -#line 764 "parse.y" +case 126: +#line 1480 "parse.y" { yyval.cbuf = yyvsp[0].cbuf; ; break;} -case 82: -#line 765 "parse.y" +case 127: +#line 1481 "parse.y" { yyval.cbuf = NULL; ; break;} -case 83: -#line 769 "parse.y" +case 128: +#line 1485 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1855,8 +2837,8 @@ case 83: ccode_line, vararg, yyvsp[-8].list); ; break;} -case 84: -#line 785 "parse.y" +case 129: +#line 1501 "parse.y" { if(!has_self) { yyerror(_("signal without 'self' as " @@ -1874,8 +2856,8 @@ case 84: ccode_line, vararg, yyvsp[-8].list); ; break;} -case 85: -#line 801 "parse.y" +case 130: +#line 1517 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1893,8 +2875,8 @@ case 85: ccode_line, vararg, NULL); ; break;} -case 86: -#line 817 "parse.y" +case 131: +#line 1533 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1912,8 +2894,8 @@ case 86: ccode_line, vararg, NULL); ; break;} -case 87: -#line 833 "parse.y" +case 132: +#line 1549 "parse.y" { if(!has_self) { yyerror(_("virtual method without 'self' as " @@ -1926,8 +2908,8 @@ case 87: ccode_line, vararg, NULL); ; break;} -case 88: -#line 844 "parse.y" +case 133: +#line 1560 "parse.y" { push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id, yyvsp[-5].id, yyvsp[0].cbuf, @@ -1935,8 +2917,8 @@ case 88: vararg, NULL); ; break;} -case 89: -#line 850 "parse.y" +case 134: +#line 1566 "parse.y" { if(the_scope == CLASS_SCOPE) { yyerror(_("a method cannot be of class scope")); @@ -1948,8 +2930,8 @@ case 89: vararg, NULL); ; break;} -case 90: -#line 860 "parse.y" +case 135: +#line 1576 "parse.y" { if(strcmp(yyvsp[-4].id, "init")==0) { push_init_arg(yyvsp[-2].id,FALSE); @@ -1972,8 +2954,8 @@ case 90: } ; break;} -case 91: -#line 883 "parse.y" +case 136: +#line 1599 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -1986,8 +2968,8 @@ case 91: g_free(yyvsp[-1].id); ; break;} -case 92: -#line 894 "parse.y" +case 137: +#line 1610 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; @@ -2008,35 +2990,35 @@ case 92: g_free(yyvsp[-1].id); ; break;} -case 93: -#line 913 "parse.y" +case 138: +#line 1629 "parse.y" { g_free(onerror); onerror = NULL; g_free(defreturn); defreturn = NULL; ; break;} -case 94: -#line 919 "parse.y" +case 139: +#line 1635 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 95: -#line 920 "parse.y" +case 140: +#line 1636 "parse.y" { yyval.id = (yyvsp[1].cbuf)->str; g_string_free(yyvsp[1].cbuf, FALSE); ; break;} -case 96: -#line 926 "parse.y" +case 141: +#line 1642 "parse.y" { vararg = FALSE; has_self = FALSE; ; break;} -case 97: -#line 927 "parse.y" +case 142: +#line 1643 "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")); @@ -2044,12 +3026,40 @@ case 97: } ; break;} -case 98: -#line 938 "parse.y" +case 143: +#line 1654 "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 144: +#line 1665 "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 145: +#line 1676 "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")); @@ -2057,40 +3067,66 @@ case 98: } ; break;} -case 99: -#line 948 "parse.y" +case 146: +#line 1686 "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 147: +#line 1696 "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 148: +#line 1706 "parse.y" { has_self = FALSE; ; break;} -case 100: -#line 951 "parse.y" +case 149: +#line 1709 "parse.y" { vararg = TRUE; ; break;} -case 101: -#line 952 "parse.y" +case 150: +#line 1710 "parse.y" { vararg = FALSE; ; break;} -case 102: -#line 955 "parse.y" +case 151: +#line 1713 "parse.y" { ; ; break;} -case 103: -#line 956 "parse.y" +case 152: +#line 1714 "parse.y" { ; ; break;} -case 104: -#line 959 "parse.y" +case 153: +#line 1717 "parse.y" { push_funcarg(yyvsp[0].id,NULL); ; break;} -case 105: -#line 962 "parse.y" +case 154: +#line 1720 "parse.y" { push_funcarg(yyvsp[-1].id,yyvsp[0].id); ; break;} -case 106: -#line 965 "parse.y" +case 155: +#line 1723 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -2100,8 +3136,8 @@ case 106: push_funcarg(yyvsp[-4].id,NULL); ; break;} -case 107: -#line 973 "parse.y" +case 156: +#line 1731 "parse.y" { if(strcmp(yyvsp[-2].id,"check")!=0) { yyerror(_("parse error")); @@ -2111,22 +3147,26 @@ case 107: push_funcarg(yyvsp[-5].id,yyvsp[-4].id); ; break;} -case 108: -#line 983 "parse.y" +case 157: +#line 1741 "parse.y" { ; ; break;} -case 109: -#line 984 "parse.y" +case 158: +#line 1742 "parse.y" { ; ; break;} -case 110: -#line 987 "parse.y" +case 159: +#line 1745 "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")); @@ -2135,61 +3175,221 @@ case 110: g_free(yyvsp[0].id); ; break;} -case 111: -#line 1000 "parse.y" +case 160: +#line 1762 "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 112: -#line 1004 "parse.y" +case 161: +#line 1769 "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 113: -#line 1008 "parse.y" +case 162: +#line 1776 "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 114: -#line 1012 "parse.y" +case 163: +#line 1783 "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 115: -#line 1016 "parse.y" +case 164: +#line 1790 "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 116: -#line 1020 "parse.y" +case 165: +#line 1797 "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 117: -#line 1026 "parse.y" +case 166: +#line 1806 "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 167: +#line 1815 "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 168: +#line 1826 "parse.y" +{;; + break;} +case 169: +#line 1827 "parse.y" +{;; + break;} +case 170: +#line 1830 "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 171: +#line 1850 "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 172: +#line 1860 "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 173: +#line 1869 "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 174: +#line 1880 "parse.y" +{ + flag_vals = g_list_append (flag_vals, yyvsp[0].id); + ; + break;} +case 175: +#line 1883 "parse.y" +{ + flag_vals = g_list_append (flag_vals, yyvsp[0].id); + ; + break;} +case 176: +#line 1888 "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 177: +#line 1897 "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 178: +#line 1908 "parse.y" +{ + error_vals = g_list_append (error_vals, yyvsp[0].id); + ; + break;} +case 179: +#line 1911 "parse.y" +{ + error_vals = g_list_append (error_vals, yyvsp[0].id); + ; + break;} +case 180: +#line 1917 "parse.y" { yyval.id = yyvsp[0].id; ; break;} -case 118: -#line 1027 "parse.y" +case 181: +#line 1918 "parse.y" { yyval.id = g_strconcat("-",yyvsp[0].id,NULL); g_free(yyvsp[0].id); ; break;} -case 119: -#line 1031 "parse.y" +case 182: +#line 1922 "parse.y" +{ yyval.id = yyvsp[0].id; ; + break;} +case 183: +#line 1923 "parse.y" { yyval.id = yyvsp[0].id; ; break;} } @@ -2414,5 +3614,5 @@ yyerrhandle: } return 1; } -#line 1034 "parse.y" +#line 1926 "parse.y"