]> git.draconx.ca Git - gob-dx.git/blobdiff - src/parse.c
Release 1.99.1
[gob-dx.git] / src / parse.c
index eeafa039d17d49b35f46622e802fe4c287bb6164..8a806d818b80921f2fd543ce093fc141c820f7d3 100644 (file)
 
 /*  A Bison parser, made from parse.y
- by  GNU Bison version 1.25
-  */
+    by GNU Bison version 1.28  */
 
 #define YYBISON 1  /* Identify Bison output.  */
 
-#define        CLASS   258
-#define        FROM    259
+#define        CLASS   257
+#define        FROM    258
+#define        CONST   259
 #define        VOID    260
 #define        STRUCT  261
 #define        UNION   262
 #define        ENUM    263
-#define        SIGNED  264
-#define        UNSIGNED        265
-#define        LONG    266
-#define        SHORT   267
-#define        INT     268
-#define        FLOAT   269
-#define        DOUBLE  270
-#define        CHAR    271
-#define        FIRST   272
-#define        LAST    273
-#define        ONERROR 274
-#define        TOKEN   275
-#define        NUMBER  276
-#define        TYPETOKEN       277
+#define        THREEDOTS       264
+#define        SIGNED  265
+#define        UNSIGNED        266
+#define        LONG    267
+#define        SHORT   268
+#define        INT     269
+#define        FLOAT   270
+#define        DOUBLE  271
+#define        CHAR    272
+#define        TOKEN   273
+#define        NUMBER  274
+#define        TYPETOKEN       275
+#define        ARRAY_DIM       276
+#define        SINGLE_CHAR     277
 #define        CCODE   278
-#define        HCODE   279
-#define        PUBLIC  280
-#define        PRIVATE 281
-#define        ARGUMENT        282
-#define        VIRTUAL 283
-#define        SIGNAL  284
-#define        OVERRIDE        285
-
-#line 21 "parse.y"
+#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        FLAGS   299
+#define        TYPE    300
+#define        FLAGS_TYPE      301
+#define        ENUM_TYPE       302
+#define        PARAM_TYPE      303
+#define        BOXED_TYPE      304
+#define        OBJECT_TYPE     305
+
+#line 22 "parse.y"
 
 
 #include "config.h"
 #include <glib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
-#include "tree.h"
+#include "treefuncs.h"
+#include "main.h"
+#include "util.h"
 
 #define _(x) (x)
        
-extern char *filename;
-       
 GList *nodes = NULL;
 
 static GList *class_nodes = NULL;
 Node *class = NULL;
 
+static char *chunk_size = NULL;
+static char *bonobo_x_class = NULL;
 static GList *typestack = NULL;
-static int stars = 0;
 static GList *funcargs = NULL;
 static GList *checks = NULL;
-static int has_this = FALSE;
+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;
+static char *initializer = NULL;
+static int initializer_line = 0;
+
+static char *onerror = NULL;
+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;
+
 void free(void *ptr);
 int yylex(void);
 
@@ -78,63 +119,171 @@ yyerror(char *str)
        if(strcmp(yytext,"\n")==0) {
                out=g_strconcat("Error: ",str," before newline",NULL);
        } else if(yytext[0]=='\0') {
-               out=g_strconcat("Error: ",str," at end of input",NULL);
+               out=g_strconcat("Error: ", str, " at end of input", NULL);
        } else {
                char *tmp = g_strdup(yytext);
-               while((p=strchr(tmp,'\n')))
+               while((p=strchr(tmp, '\n')))
                        *p='.';
 
-               out=g_strconcat("Error: ",str," before '",tmp,"'",NULL);
+               out=g_strconcat("Error: ", str, " before '", tmp, "'", NULL);
                g_free(tmp);
        }
 
-       fprintf(stderr,"%s:%d: %s\n",filename,line_no,out);
+       fprintf(stderr, "%s:%d: %s\n", filename, line_no, out);
        g_free(out);
        
        exit(1);
 }
 
-static void
-push_variable(char *name, int scope)
+static Type *
+pop_type(void)
 {
-       Node *var;
        Type *type = typestack->data;
        typestack = g_list_remove(typestack,typestack->data);
+       return type;
+}
+
+static void
+push_variable (char *name, int scope, int line_no, char *postfix)
+{
+       Node *var;
+       Type *type = pop_type ();
+
+       type->postfix = postfix;
        
-       var = new_variable(scope,type,name);
+       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, char *oid, char *id, char *onerror,
-             GString *cbuf,int line_no, int ccode_line)
+push_function (int scope, int method, char *oid, char *id,
+              GString *cbuf, int line_no, int ccode_line,
+              gboolean vararg, GList *flags)
 {
        Node *node;
        Type *type;
+       char *c_cbuf;
+
+       g_assert(scope != CLASS_SCOPE);
        
-       if(scope!=INIT_METHOD && scope!=CLASS_INIT_METHOD) {
-               type = typestack->data;
-               typestack = g_list_remove(typestack,typestack->data);
+       if(method == INIT_METHOD || method == CLASS_INIT_METHOD) {
+               type = (Type *)node_new (TYPE_NODE,
+                                        "name", "void",
+                                        NULL);
        } else {
-               type = (Type *)new_type(0,g_strdup("void"));
+               type = pop_type();
        }
        
-       node = new_method(scope,type,oid,gtktypes,id,funcargs,
-                         onerror,cbuf,line_no,ccode_line);
+       /* a complicated and ugly test to figure out if we have
+          the wrong number of types for a signal */
+       if((method == SIGNAL_FIRST_METHOD ||
+           method == SIGNAL_LAST_METHOD) &&
+          g_list_length(gtktypes) != g_list_length(funcargs) &&
+          !(g_list_length(funcargs) == 1 &&
+            g_list_length(gtktypes) == 2 &&
+            strcmp(gtktypes->next->data, "NONE")==0)) {
+               error_print(GOB_WARN, line_no,
+                           _("The number of GTK arguments and "
+                             "function arguments for a signal "
+                             "don't seem to match"));
+       }
+       if(g_list_length(gtktypes) > 2) {
+               GList *li;
+               for(li = gtktypes->next; li; li = li->next) {
+                       if(strcmp(li->data, "NONE")==0) {
+                               error_print(GOB_ERROR, line_no,
+                                           _("NONE can only appear in an "
+                                             "argument list by itself"));
+                       }
+               }
+       }
+       if(cbuf) {
+               char *p;
+               c_cbuf = p = cbuf->str;
+               while(p && *p && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))
+                       p++;
+               if(!p || !*p)
+                       c_cbuf = NULL;
+       } else
+               c_cbuf = NULL;
+
+       node = 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,
+                             /*only free segment if we haven't passed it
+                               above */
+                             c_cbuf?FALSE:TRUE);
        gtktypes = NULL;
        funcargs = NULL;
 
+       onerror = NULL;
+       defreturn = NULL;
+
        class_nodes = g_list_append(class_nodes, node);
 }
 
 static void
-push_funcarg(char *name)
+free_all_global_state(void)
+{
+       g_free(onerror);
+       onerror = NULL;
+       g_free(defreturn);
+       defreturn = NULL;
+
+       g_free(chunk_size);
+       chunk_size = NULL;
+       
+       g_list_foreach(gtktypes, (GFunc)g_free, NULL);
+       g_list_free(gtktypes);
+       gtktypes = NULL;
+
+       node_list_free (funcargs);
+       funcargs = NULL;
+}
+
+static void
+push_funcarg(char *name, char *postfix)
 {
        Node *node;
-       Type *type = typestack->data;
-       typestack = g_list_remove(typestack,typestack->data);
+       Type *type = pop_type();
+
+       type->postfix = postfix;
        
-       node = new_funcarg(type,name,checks);
+       node = node_new (FUNCARG_NODE,
+                        "atype:steal", type,
+                        "name:steal", name,
+                        "checks:steal", checks,
+                        NULL);
        checks = NULL;
        
        funcargs = g_list_append(funcargs, node);
@@ -152,31 +301,314 @@ push_init_arg(char *name, int is_class)
        else
                tn = g_strdup(((Class *)class)->otype);
 
-       type = new_type(1,tn);
-       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_this(char *this)
+push_self(char *id, gboolean constant)
 {
        Node *node;
        Node *type;
        GList *ch = NULL;
-       type = new_type(1,g_strdup(((Class *)class)->otype));
-       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,this,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);
 }
 
+static Variable *
+find_var_or_die(const char *id, int line)
+{
+       GList *li;
+
+       for(li = class_nodes; li != NULL; li = li->next) {
+               Variable *var;
+               Node *node = li->data;
+               if(node->type != VARIABLE_NODE)
+                       continue;
+               var = li->data;
+               if(strcmp(var->id, id)==0)
+                       return var;
+       }
+
+       error_printf(GOB_ERROR, line, _("Variable %s not defined here"), id);
+
+       g_assert_not_reached();
+       return NULL;
+}
+
+static gboolean
+set_return_value(char *type, char *val)
+{
+       if(strcmp(type, "onerror")==0) {
+               if(!onerror) {
+                       onerror = val;
+                       return TRUE;
+               } else
+                       return FALSE;
+       } else if(strcmp(type, "defreturn")==0) {
+               if(!defreturn) {
+                       defreturn = val;
+                       return TRUE;
+               } else
+                       return FALSE;
+       }
+       return FALSE;
+}
+
+static void
+export_accessors (const char *var_name,
+                 gboolean do_get,
+                 gboolean do_set,
+                 int get_lineno,
+                 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("g_free (%s->%s); "
+                                             "%s->%s = g_value_dup_string (VAL);",
+                                             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->get_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 158 "parse.y"
+#line 570 "parse.y"
 typedef union {
        char *id;
        GString *cbuf;
        GList *list;
        int line;
+       int sigtype;
 } YYSTYPE;
 #ifndef YYDEBUG
 #define YYDEBUG 1
@@ -192,26 +624,26 @@ typedef union {
 
 
 
-#define        YYFINAL         190
+#define        YYFINAL         340
 #define        YYFLAG          -32768
-#define        YYNTBASE        45
+#define        YYNTBASE        65
 
-#define YYTRANSLATE(x) ((unsigned)(x) <= 285 ? yytranslate[x] : 69)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 305 ? yytranslate[x] : 110)
 
 static const char yytranslate[] = {     0,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    43,     2,     2,     2,     2,     2,     2,    34,
-    35,    37,     2,    38,    44,     2,     2,     2,    40,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,    33,    42,
-    39,    41,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,    63,     2,     2,     2,     2,     2,     2,    54,
+    55,    60,     2,    58,    64,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,    56,    62,
+    57,    61,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    31,    36,    32,     2,     2,     2,     2,     2,
+     2,     2,    52,    59,    53,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -224,75 +656,117 @@ static const char yytranslate[] = {     0,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     2,     3,     4,     5,
-     6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-    26,    27,    28,    29,    30
+     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
+     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+    17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+    27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+    37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+    47,    48,    49,    50,    51
 };
 
 #if YYDEBUG != 0
 static const short yyprhs[] = {     0,
-     0,     4,     7,    10,    12,    15,    18,    20,    22,    27,
-    32,    35,    38,    41,    43,    45,    47,    52,    57,    69,
-    78,    82,    83,    87,    89,    91,    94,    97,   100,   102,
-   105,   108,   110,   112,   114,   116,   119,   121,   123,   126,
-   128,   131,   133,   135,   137,   139,   141,   144,   146,   151,
-   155,   157,   169,   180,   191,   201,   211,   220,   233,   243,
-   253,   259,   266,   269,   273,   276,   277,   279,   281,   285,
-   287,   291,   293,   296,   303,   306,   308,   310,   313,   316,
-   320,   324,   328,   332,   334,   337
+     0,     4,     7,    10,    12,    14,    16,    18,    20,    22,
+    24,    27,    29,    34,    38,    44,    45,    51,    57,    60,
+    62,    64,    67,    69,    71,    73,    75,    77,    79,    81,
+    83,    86,    90,    93,    97,   100,   103,   105,   107,   108,
+   114,   121,   134,   144,   151,   155,   156,   168,   177,   183,
+   187,   188,   192,   194,   196,   201,   203,   205,   209,   213,
+   217,   221,   225,   229,   233,   237,   241,   245,   249,   253,
+   255,   261,   263,   267,   268,   272,   274,   277,   279,   281,
+   283,   286,   289,   292,   296,   300,   303,   306,   309,   311,
+   314,   316,   319,   321,   323,   325,   327,   329,   331,   333,
+   335,   337,   339,   341,   343,   345,   348,   351,   355,   358,
+   360,   364,   368,   371,   373,   378,   382,   384,   387,   389,
+   400,   412,   422,   432,   441,   453,   462,   468,   471,   476,
+   477,   479,   482,   484,   486,   489,   492,   496,   501,   506,
+   508,   512,   514,   518,   520,   523,   527,   534,   542,   545,
+   547,   549,   552,   555,   559,   563,   567,   571,   573,   576,
+   578
 };
 
-static const short yyrhs[] = {    46,
-    47,    46,     0,    47,    46,     0,    46,    47,     0,    47,
-     0,    46,    23,     0,    46,    24,     0,    23,     0,    24,
-     0,    48,    31,    49,    32,     0,     3,    22,     4,    22,
-     0,    49,    61,     0,    49,    50,     0,    49,    51,     0,
-    61,     0,    50,     0,    51,     0,    25,    54,    20,    33,
-     0,    26,    54,    20,    33,     0,    27,    52,    20,    20,
-    20,    31,    23,    20,    31,    23,    33,     0,    27,    52,
-    20,    20,    20,    31,    23,    33,     0,    34,    53,    35,
-     0,     0,    20,    36,    53,     0,    20,     0,    55,     0,
-    55,    58,     0,    10,    56,     0,     9,    56,     0,    56,
-     0,    10,    16,     0,     9,    16,     0,    16,     0,    15,
-     0,    14,     0,    20,     0,    57,    20,     0,    22,     0,
-     5,     0,    11,    13,     0,    11,     0,    12,    13,     0,
-    12,     0,    13,     0,     8,     0,     7,     0,     6,     0,
-    37,    58,     0,    37,     0,    20,    34,    60,    35,     0,
-    60,    38,    20,     0,    20,     0,    29,    20,    59,    54,
-    20,    34,    63,    35,    62,    31,    23,     0,    29,    20,
-    59,    54,    20,    34,    63,    35,    62,    33,     0,    29,
-    59,    54,    20,    34,    63,    35,    62,    31,    23,     0,
-    29,    59,    54,    20,    34,    63,    35,    62,    33,     0,
-    28,    54,    20,    34,    63,    35,    62,    31,    23,     0,
-    28,    54,    20,    34,    63,    35,    62,    33,     0,    30,
-    34,    22,    35,    54,    20,    34,    63,    35,    62,    31,
-    23,     0,    25,    54,    20,    34,    63,    35,    62,    31,
-    23,     0,    26,    54,    20,    34,    63,    35,    62,    31,
-    23,     0,    20,    34,    20,    35,    33,     0,    20,    34,
-    20,    35,    31,    23,     0,    19,    68,     0,    19,    31,
-    23,     0,    39,    40,     0,     0,     5,     0,    20,     0,
-    20,    38,    64,     0,    64,     0,    64,    38,    65,     0,
-    65,     0,    54,    20,     0,    54,    20,    34,    20,    66,
-    35,     0,    66,    67,     0,    67,     0,    20,     0,    41,
-    68,     0,    42,    68,     0,    41,    39,    68,     0,    42,
-    39,    68,     0,    39,    39,    68,     0,    43,    39,    68,
-     0,    21,     0,    44,    21,     0,    20,     0
+static const short yyrhs[] = {    67,
+    68,    67,     0,    68,    67,     0,    67,    68,     0,    68,
+     0,    24,     0,    27,     0,    25,     0,    26,     0,    28,
+     0,    29,     0,    67,    66,     0,    66,     0,    69,    52,
+    71,    53,     0,    69,    52,    53,     0,     3,    21,     4,
+    21,    70,     0,     0,    54,    19,    19,    55,    70,     0,
+    54,    19,    20,    55,    70,     0,    71,    72,     0,    72,
+     0,   100,     0,    19,   100,     0,    77,     0,    78,     0,
+    80,     0,    56,     0,    31,     0,    32,     0,    33,     0,
+    34,     0,    19,    19,     0,    19,    52,    24,     0,    57,
+   109,     0,    57,    52,    24,     0,    74,    75,     0,    75,
+    74,     0,    75,     0,    74,     0,     0,    73,    89,    19,
+    76,    56,     0,    73,    89,    19,    22,    76,    56,     0,
+    36,    87,    86,    19,    79,    19,    52,    24,    19,    52,
+    24,    56,     0,    36,    87,    86,    19,    79,    19,    52,
+    24,    56,     0,    36,    87,    86,    19,    79,    19,     0,
+    54,    19,    55,     0,     0,    35,    19,    19,    81,    19,
+    52,    24,    19,    52,    24,    56,     0,    35,    19,    19,
+    81,    19,    52,    24,    56,     0,    35,    19,    19,    81,
+    56,     0,    54,    82,    55,     0,     0,    82,    58,    85,
+     0,    85,     0,    30,     0,    19,    54,    30,    55,     0,
+   109,     0,    83,     0,    40,    57,    83,     0,    41,    57,
+    83,     0,    42,    57,   109,     0,    43,    57,   109,     0,
+    44,    57,    84,     0,    45,    57,    88,     0,    46,    57,
+    89,     0,    47,    57,    19,     0,    48,    57,    19,     0,
+    49,    57,    19,     0,    50,    57,    19,     0,    51,    57,
+    19,     0,    19,     0,    19,    54,    19,    89,    55,     0,
+    19,     0,    54,    88,    55,     0,     0,    19,    59,    88,
+     0,    19,     0,    90,    94,     0,    90,     0,    91,     0,
+    19,     0,     5,    19,     0,    19,     5,     0,    93,    19,
+     0,     5,    93,    19,     0,    93,    19,     5,     0,    92,
+    91,     0,    21,    91,     0,     5,    91,     0,    21,     0,
+    21,     5,     0,    92,     0,    92,     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,    60,     0,    60,     5,     0,    60,    94,     0,
+    60,     5,    94,     0,    19,    97,     0,    97,     0,    73,
+    19,    97,     0,    19,    73,    97,     0,    73,    97,     0,
+    95,     0,    19,    54,    98,    55,     0,    98,    58,    19,
+     0,    19,     0,    52,    24,     0,    56,     0,    38,    87,
+    96,    89,    19,    54,   103,    55,   101,    99,     0,    73,
+    38,    87,    95,    89,    19,    54,   103,    55,   101,    99,
+     0,    37,    73,    89,    19,    54,   103,    55,   101,    99,
+     0,    73,    37,    89,    19,    54,   103,    55,   101,    99,
+     0,    37,    89,    19,    54,   103,    55,   101,    99,     0,
+    39,    54,    21,    55,    89,    19,    54,   103,    55,   101,
+    99,     0,    73,    89,    19,    54,   103,    55,   101,    99,
+     0,    19,    54,    19,    55,    99,     0,    19,   102,     0,
+    19,   102,    19,   102,     0,     0,   109,     0,    52,    24,
+     0,     6,     0,    19,     0,    19,     5,     0,     5,    19,
+     0,    19,    58,   104,     0,    19,     5,    58,   104,     0,
+     5,    19,    58,   104,     0,   104,     0,   105,    58,    10,
+     0,   105,     0,   105,    58,   106,     0,   106,     0,    89,
+    19,     0,    89,    19,    22,     0,    89,    19,    54,    19,
+   107,    55,     0,    89,    19,    22,    54,    19,   107,    55,
+     0,   107,   108,     0,   108,     0,    19,     0,    61,   109,
+     0,    62,   109,     0,    61,    57,   109,     0,    62,    57,
+   109,     0,    57,    57,   109,     0,    63,    57,   109,     0,
+    20,     0,    64,    20,     0,    23,     0,    19,     0
 };
 
 #endif
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   176,   177,   178,   179,   182,   186,   190,   194,   200,   207,
-   212,   213,   214,   215,   216,   217,   220,   223,   227,   254,
-   278,   279,   282,   285,   291,   295,   302,   305,   308,   311,
-   314,   317,   320,   323,   326,   329,   333,   336,   341,   344,
-   347,   350,   353,   358,   361,   364,   369,   370,   373,   378,
-   381,   387,   408,   428,   437,   446,   450,   454,   458,   462,
-   466,   482,   503,   504,   508,   509,   514,   515,   525,   535,
-   538,   539,   542,   545,   555,   556,   559,   572,   576,   580,
-   584,   588,   592,   598,   599,   603
+   591,   592,   593,   594,   597,   606,   615,   624,   633,   642,
+   653,   654,   657,   662,   669,   679,   680,   692,   706,   707,
+   710,   711,   719,   720,   721,   722,   725,   726,   727,   728,
+   731,   751,   775,   779,   787,   788,   789,   790,   791,   797,
+   800,   805,   873,   927,  1015,  1023,  1028,  1076,  1112,  1128,
+  1129,  1132,  1133,  1136,  1137,  1149,  1150,  1153,  1159,  1165,
+  1171,  1177,  1183,  1189,  1196,  1202,  1208,  1214,  1220,  1226,
+  1246,  1255,  1261,  1262,  1265,  1268,  1274,  1281,  1290,  1293,
+  1296,  1300,  1304,  1308,  1313,  1321,  1325,  1330,  1334,  1337,
+  1341,  1344,  1349,  1350,  1351,  1352,  1353,  1354,  1355,  1356,
+  1357,  1360,  1361,  1362,  1365,  1366,  1367,  1371,  1378,  1390,
+  1396,  1408,  1420,  1423,  1429,  1434,  1437,  1442,  1443,  1447,
+  1463,  1479,  1495,  1511,  1522,  1528,  1538,  1561,  1572,  1591,
+  1597,  1598,  1604,  1605,  1616,  1627,  1638,  1648,  1658,  1668,
+  1671,  1672,  1675,  1676,  1679,  1682,  1685,  1693,  1703,  1704,
+  1707,  1724,  1731,  1738,  1745,  1752,  1759,  1768,  1769,  1773,
+  1774
 };
 #endif
 
@@ -300,151 +774,264 @@ static const short yyrline[] = { 0,
 #if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
 
 static const char * const yytname[] = {   "$","error","$undefined.","CLASS",
-"FROM","VOID","STRUCT","UNION","ENUM","SIGNED","UNSIGNED","LONG","SHORT","INT",
-"FLOAT","DOUBLE","CHAR","FIRST","LAST","ONERROR","TOKEN","NUMBER","TYPETOKEN",
-"CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE",
-"'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'","'<'","'!'",
-"'-'","prog","ccodes","class","classdec","classcode","variable","argument","argflags",
-"flaglist","type","type1","integer","tspecifier","stars","sigtype","tokenlist",
-"method","onerror","funcargs","arglist","arg","checklist","check","numtok", NULL
+"FROM","CONST","VOID","STRUCT","UNION","ENUM","THREEDOTS","SIGNED","UNSIGNED",
+"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","TOKEN","NUMBER","TYPETOKEN","ARRAY_DIM",
+"SINGLE_CHAR","CCODE","HTCODE","PHCODE","HCODE","ACODE","ATCODE","STRING","PUBLIC",
+"PRIVATE","PROTECTED","CLASSWIDE","PROPERTY","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE",
+"NICK","BLURB","MAXIMUM","MINIMUM","DEFAULT_VALUE","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","numtok", NULL
 };
 #endif
 
 static const short yyr1[] = {     0,
-    45,    45,    45,    45,    46,    46,    46,    46,    47,    48,
-    49,    49,    49,    49,    49,    49,    50,    50,    51,    51,
-    52,    52,    53,    53,    54,    54,    55,    55,    55,    55,
-    55,    55,    55,    55,    55,    55,    55,    55,    56,    56,
-    56,    56,    56,    57,    57,    57,    58,    58,    59,    60,
-    60,    61,    61,    61,    61,    61,    61,    61,    61,    61,
-    61,    61,    62,    62,    62,    62,    63,    63,    63,    63,
-    64,    64,    65,    65,    66,    66,    67,    67,    67,    67,
-    67,    67,    67,    68,    68,    68
+    65,    65,    65,    65,    66,    66,    66,    66,    66,    66,
+    67,    67,    68,    68,    69,    70,    70,    70,    71,    71,
+    72,    72,    72,    72,    72,    72,    73,    73,    73,    73,
+    74,    74,    75,    75,    76,    76,    76,    76,    76,    77,
+    77,    78,    78,    78,    79,    79,    80,    80,    80,    81,
+    81,    82,    82,    83,    83,    84,    84,    85,    85,    85,
+    85,    85,    85,    85,    85,    85,    85,    85,    85,    85,
+    86,    86,    87,    87,    88,    88,    89,    89,    90,    90,
+    90,    90,    90,    90,    90,    91,    91,    91,    91,    91,
+    91,    91,    92,    92,    92,    92,    92,    92,    92,    92,
+    92,    93,    93,    93,    94,    94,    94,    94,    95,    95,
+    96,    96,    96,    96,    97,    98,    98,    99,    99,   100,
+   100,   100,   100,   100,   100,   100,   100,   101,   101,   101,
+   102,   102,   103,   103,   103,   103,   103,   103,   103,   103,
+   104,   104,   105,   105,   106,   106,   106,   106,   107,   107,
+   108,   108,   108,   108,   108,   108,   108,   109,   109,   109,
+   109
 };
 
 static const short yyr2[] = {     0,
-     3,     2,     2,     1,     2,     2,     1,     1,     4,     4,
-     2,     2,     2,     1,     1,     1,     4,     4,    11,     8,
-     3,     0,     3,     1,     1,     2,     2,     2,     1,     2,
-     2,     1,     1,     1,     1,     2,     1,     1,     2,     1,
-     2,     1,     1,     1,     1,     1,     2,     1,     4,     3,
-     1,    11,    10,    10,     9,     9,     8,    12,     9,     9,
-     5,     6,     2,     3,     2,     0,     1,     1,     3,     1,
-     3,     1,     2,     6,     2,     1,     1,     2,     2,     3,
-     3,     3,     3,     1,     2,     1
+     3,     2,     2,     1,     1,     1,     1,     1,     1,     1,
+     2,     1,     4,     3,     5,     0,     5,     5,     2,     1,
+     1,     2,     1,     1,     1,     1,     1,     1,     1,     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,     1,     2,     1,
+     1
 };
 
 static const short yydefact[] = {     0,
-     0,     7,     8,     0,     4,     0,     0,     5,     6,     3,
-     2,     0,     0,     1,     0,     0,     0,    22,     0,     0,
-     0,     0,    15,    16,    14,    10,     0,    38,    46,    45,
-    44,     0,     0,    40,    42,    43,    34,    33,    32,    35,
-    37,     0,    25,    29,     0,     0,     0,     0,     0,     0,
-     0,     0,     9,    12,    13,    11,     0,    31,    28,    30,
-    27,    39,    41,     0,    48,    26,    36,     0,    24,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,    17,     0,
-    47,    18,     0,     0,    21,     0,     0,    51,     0,     0,
-     0,     0,     0,    61,    38,    35,     0,     0,    70,    72,
-     0,    23,     0,     0,    49,     0,     0,     0,     0,    62,
-     0,    73,    66,     0,    66,     0,    66,    50,     0,     0,
-     0,    69,     0,     0,     0,     0,    71,     0,     0,     0,
-     0,    66,     0,     0,    86,    84,     0,     0,    63,    65,
-     0,     0,     0,    20,     0,    57,    66,     0,     0,    77,
-     0,     0,     0,     0,     0,    76,    64,    85,    59,    60,
-     0,    56,     0,     0,    55,    66,     0,     0,    78,     0,
-    79,     0,    74,    75,     0,     0,    53,    54,     0,    82,
-    80,    81,    83,    19,    52,     0,    58,     0,     0,     0
+     0,     5,     7,     8,     6,     9,    10,    12,     0,     4,
+     0,     0,    11,     3,     2,     0,     0,     1,     0,    27,
+    28,    29,    30,     0,    74,     0,    74,     0,    14,    26,
+     0,    20,     0,    23,    24,    25,    21,    16,     0,     0,
+     0,    22,     0,     0,     0,     0,    93,   102,   103,   104,
+   100,   101,    97,    95,    96,    98,    99,    94,    80,    89,
+     0,     0,    78,    79,    91,     0,     0,     0,    13,    19,
+     0,    74,     0,     0,    15,     0,     0,    51,    76,     0,
+    72,     0,     0,    81,    88,     0,    82,    90,    87,     0,
+     0,   105,    77,    92,    86,    83,     0,     0,   114,     0,
+   110,     0,     0,     0,    39,     0,     0,     0,     0,     0,
+     0,    73,     0,    46,    84,     0,     0,   106,   107,    85,
+     0,     0,     0,   109,     0,   113,     0,     0,     0,     0,
+     0,     0,    39,     0,     0,    38,    37,     0,     0,     0,
+     0,   119,   127,    70,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,    53,     0,    49,
+    75,     0,     0,     0,     0,     0,    93,    80,     0,     0,
+   140,   142,   144,   108,   117,     0,   112,   111,     0,     0,
+     0,     0,    31,     0,     0,     0,   161,   158,   160,     0,
+     0,    33,    35,    36,    40,    16,    16,   118,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+    50,     0,     0,     0,     0,    44,     0,    81,    82,     0,
+   145,   130,     0,   115,     0,     0,     0,     0,     0,    32,
+    41,   130,    34,   159,    17,    18,     0,    54,    58,    59,
+    60,    61,   161,    57,    62,    56,    63,    64,    65,    66,
+    67,    68,    69,    52,     0,    71,    45,     0,   130,     0,
+     0,   137,   146,     0,     0,     0,   141,   143,   116,     0,
+     0,   130,     0,     0,     0,     0,    48,     0,     0,   139,
+   138,     0,     0,     0,   128,   131,   124,   130,     0,     0,
+     0,   126,     0,     0,     0,    43,   122,     0,   151,     0,
+     0,     0,     0,     0,   150,   132,     0,     0,   130,   123,
+   130,    55,     0,     0,     0,     0,     0,   152,     0,   153,
+     0,   147,   149,   129,   120,     0,     0,    47,     0,   148,
+   156,   154,   155,   157,   125,   121,    42,     0,     0,     0
 };
 
-static const short yydefgoto[] = {   188,
-     4,     5,     6,    22,    23,    24,    48,    70,    97,    43,
-    44,    45,    66,    51,    89,    25,   126,    98,    99,   100,
-   155,   156,   139
+static const short yydefgoto[] = {   338,
+     8,     9,    10,    11,    75,    31,    32,    33,   136,   137,
+   138,    34,    35,   164,    36,   110,   157,   239,   245,   158,
+    82,    45,    80,   169,    63,    64,    65,    66,    93,    99,
+   100,   101,   176,   143,    37,   266,   285,   170,   171,   172,
+   173,   304,   305,   286
 };
 
-static const short yypact[] = {    33,
-    11,-32768,-32768,    44,    51,   -19,    18,-32768,-32768,    51,
-    79,    52,    61,    79,     4,    85,    85,    70,    85,     9,
-    72,   101,-32768,-32768,-32768,-32768,    32,-32768,-32768,-32768,
--32768,   123,   129,   107,   109,-32768,-32768,-32768,-32768,-32768,
--32768,   112,    87,-32768,   128,   130,   131,   132,   133,   -10,
-    85,   127,-32768,-32768,-32768,-32768,   119,-32768,-32768,-32768,
--32768,-32768,-32768,   104,    87,-32768,-32768,   110,   120,   122,
-   135,   124,   125,   140,    85,   141,   134,    27,-32768,   103,
--32768,-32768,   103,   131,-32768,   142,   103,-32768,   -12,   143,
-   136,    85,   144,-32768,   137,    16,   145,   138,   126,-32768,
-   139,-32768,   146,   147,-32768,   148,   149,   103,   151,-32768,
-    85,   150,     6,    85,     6,   152,     6,-32768,   103,   153,
-   155,   126,   156,   -13,   154,   159,-32768,   160,    -5,    30,
-   157,     6,   103,    23,-32768,-32768,   158,   164,-32768,-32768,
-   163,   170,   165,-32768,   172,-32768,     6,    40,   162,-32768,
-   161,    -7,     0,   166,     7,-32768,-32768,-32768,-32768,-32768,
-   175,-32768,    55,   176,-32768,     6,    -4,    -4,-32768,    -4,
--32768,    -4,-32768,-32768,   168,   179,-32768,-32768,   173,-32768,
--32768,-32768,-32768,-32768,-32768,   180,-32768,   178,   187,-32768
+static const short yypact[] = {   144,
+    -7,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   144,   407,
+   -21,    40,-32768,   407,   407,   121,    71,   407,   166,-32768,
+-32768,-32768,-32768,    78,    45,   266,    45,    54,-32768,-32768,
+   156,-32768,   216,-32768,-32768,-32768,-32768,    92,    94,    97,
+   216,-32768,   157,   159,   160,   313,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   158,   381,
+   330,   164,   136,-32768,   395,   183,   257,   185,-32768,-32768,
+   330,    45,   200,   207,-32768,   184,   221,   187,   188,   189,
+   192,   223,   409,-32768,-32768,   229,-32768,   409,-32768,   230,
+   197,     1,-32768,   409,-32768,   247,   182,   236,-32768,   330,
+-32768,   201,   238,   239,    68,    10,    61,   232,   219,    22,
+   159,-32768,   273,   240,-32768,   241,   347,   136,-32768,-32768,
+   242,   274,   297,-32768,    -4,-32768,   304,   330,   279,    -4,
+   330,    60,    -9,   347,     0,   283,   331,   301,   312,   319,
+   360,-32768,-32768,-32768,   332,   333,   334,   346,   348,   361,
+   362,   371,   372,   380,   382,   383,   106,-32768,   336,-32768,
+-32768,   330,   385,   398,   347,   364,   386,     7,   419,   387,
+-32768,   388,-32768,-32768,-32768,   107,-32768,-32768,   389,   425,
+   347,   426,-32768,   423,   392,   394,-32768,-32768,-32768,   427,
+   430,-32768,-32768,-32768,-32768,    92,    92,-32768,    13,    13,
+    37,    37,     5,   159,   330,   433,   434,   435,   436,   437,
+-32768,   219,   438,   402,   403,   408,   404,   152,   153,   330,
+    66,   442,   296,-32768,   444,   347,   410,   411,   413,-32768,
+-32768,   442,-32768,-32768,-32768,-32768,   414,-32768,-32768,-32768,
+-32768,-32768,   414,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,    39,-32768,-32768,   441,   442,   330,
+   330,-32768,   415,   451,    19,    61,-32768,-32768,-32768,   416,
+   347,   442,   347,    61,   443,   420,-32768,    53,    61,-32768,
+-32768,   455,    88,   452,   456,-32768,-32768,   442,   422,    61,
+   424,-32768,   428,   454,   429,-32768,-32768,    88,-32768,   431,
+    57,    62,   432,    72,-32768,-32768,    19,    61,   442,-32768,
+   442,-32768,   439,   458,    81,    37,    37,-32768,    37,-32768,
+    37,-32768,-32768,-32768,-32768,    61,    61,-32768,   440,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,   480,   484,-32768
 };
 
 static const short yypgoto[] = {-32768,
-     1,   202,-32768,-32768,   185,   186,-32768,    82,   -16,-32768,
-   114,-32768,   115,   167,-32768,   188,  -113,   -78,    68,    95,
--32768,    56,   -83
+    87,   118,   476,-32768,   -66,-32768,   459,    -8,   349,   351,
+   358,-32768,-32768,-32768,-32768,-32768,-32768,   -85,-32768,   280,
+-32768,   -18,  -106,   -25,-32768,   -43,-32768,   -42,   -65,   390,
+-32768,   120,-32768,  -253,   474,  -225,   190,  -132,  -150,-32768,
+   275,   202,  -211,  -135
 };
 
 
-#define        YYLAST          217
-
-
-static const short yytable[] = {    42,
-    46,   128,    49,   130,   101,    11,   135,   136,   104,    73,
-    14,    12,   135,   136,   143,   135,   136,   137,   148,   135,
-   136,    13,   105,    74,   124,   106,   150,   144,    50,   120,
-   138,   168,     7,   163,    76,     1,   138,    27,   170,   138,
-   131,   173,   150,   138,   125,   151,     1,   152,   153,   154,
-   -68,    57,   179,   111,   149,     2,     3,    93,    90,    94,
-   145,   151,   146,   152,   153,   154,     8,     9,   169,   171,
-   164,    15,   165,     2,     3,   109,    16,    17,    18,    19,
-    20,    21,    26,   180,   181,   176,   182,   177,   183,    28,
-    29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
-    39,     8,     9,    47,    40,    52,    41,    95,    29,    30,
-    31,    32,    33,    34,    35,    36,    37,    38,    39,    62,
-    15,    63,    96,    65,    41,    16,    17,    18,    19,    20,
-    21,    64,    53,    34,    35,    36,    79,    80,    58,    34,
-    35,    36,    82,    83,    60,    59,    61,    67,    77,    68,
-    69,    71,    72,    78,    86,    84,    85,    87,    74,    88,
-    91,   103,   107,   114,   112,   102,   110,   118,    92,   108,
-   121,   -67,   113,   115,   129,   134,   116,   189,   122,    81,
-   157,   117,   119,   123,   158,   159,   190,   132,   133,   141,
-   142,   147,   160,   140,   162,   161,   166,   175,   178,   167,
-   184,   185,   187,   186,   172,    10,    54,    55,   127,    56,
-   174,     0,     0,     0,     0,     0,    75
+#define        YYLAST          500
+
+
+static const short yytable[] = {   192,
+    62,   186,    85,    86,   161,   118,   274,    73,    67,   132,
+    41,   219,   287,    12,   121,    77,    89,    61,   187,   188,
+   292,    95,   189,   243,   188,   297,   119,   189,   139,   140,
+    16,   237,   217,   279,   238,    90,   310,   187,   188,    85,
+   159,   189,   238,    17,    85,   103,   290,   135,   228,   122,
+    85,   190,   174,   104,   325,   187,   188,   276,    98,   189,
+    92,  -134,   308,   191,   220,   241,   242,   246,   191,   262,
+   284,   295,   335,   336,   127,   187,   188,   160,   183,   189,
+   187,   188,   191,   326,   189,   327,   132,   263,   123,   133,
+   299,    38,   323,   270,   277,    13,    43,   247,    44,   299,
+   191,    13,   180,   323,    13,   182,   299,    68,   296,   280,
+   281,   184,   141,   317,   240,    76,   142,   244,   319,   264,
+   191,   134,    85,    86,   135,   191,   322,    15,   300,   235,
+   236,    18,   301,   302,   303,   330,   214,   300,   289,    19,
+   291,   301,   302,   303,   300,    74,     1,    40,   301,   302,
+   303,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+   211,   224,    87,   212,   225,   318,   320,     2,     3,     4,
+     5,     6,     7,    29,    19,    78,    30,    79,    81,   248,
+   331,   332,    91,   333,    39,   334,    20,    21,    22,    23,
+    24,    25,    26,    27,    28,    92,    20,    21,    22,    23,
+   121,    96,    26,    27,    28,   102,  -136,  -135,    69,   260,
+   261,    30,    20,    21,    22,    23,   124,   126,   105,    40,
+    46,    47,    48,    49,    50,   106,    51,    52,    53,    54,
+    55,    56,    57,    58,    59,   122,    60,   144,   107,   108,
+   109,   114,   177,   112,   178,   113,   111,   115,   116,   124,
+   117,   120,    71,    72,   125,   128,   129,   130,   145,   146,
+   147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+    46,    47,    48,    49,    50,    97,    51,    52,    53,    54,
+    55,    56,    57,    58,    59,   134,    60,    20,    21,    22,
+    23,   162,   175,   163,   165,   122,    20,    21,    22,    23,
+    46,    47,    48,    49,    50,   267,    51,    52,    53,    54,
+    55,    56,    57,    58,    59,   121,    60,    83,    47,    48,
+    49,    50,   179,    51,    52,    53,    54,    55,    56,    57,
+    58,    84,   181,    60,    46,    47,    48,    49,    50,   135,
+    51,    52,    53,    54,    55,    56,    57,    58,    59,   132,
+    60,   166,   167,    48,    49,    50,   195,    51,    52,    53,
+    54,    55,    56,    57,    58,   168,   196,    60,    83,    47,
+    48,    49,    50,   197,    51,    52,    53,    54,    55,    56,
+    57,    58,   218,   198,    60,    88,    47,   213,   199,   200,
+   201,    51,    52,    53,    54,    55,    56,    57,    58,    94,
+    47,    60,   202,   215,   203,    51,    52,    53,    54,    55,
+    56,    57,    58,    83,    47,    60,   216,   204,   205,    51,
+    52,    53,    54,    55,    56,    57,    58,   206,   207,    60,
+     2,     3,     4,     5,     6,     7,   208,   221,   209,   210,
+  -133,   222,   226,   227,   229,   223,   230,   231,   232,   234,
+   233,   249,   250,   251,   252,   253,   256,   257,   259,   258,
+   265,   255,   269,   271,   278,   272,   273,   275,   282,   283,
+   288,   294,   293,   298,   307,   306,   309,   313,   311,   339,
+   314,   329,   312,   340,    14,   194,   193,   316,   321,    70,
+   185,   254,    42,   131,   328,   337,   324,   268,     0,   315
 };
 
-static const short yycheck[] = {    16,
-    17,   115,    19,   117,    83,     5,    20,    21,    87,    20,
-    10,    31,    20,    21,    20,    20,    21,    31,   132,    20,
-    21,     4,    35,    34,    19,    38,    20,    33,    20,   108,
-    44,    39,    22,   147,    51,     3,    44,    34,    39,    44,
-   119,    35,    20,    44,    39,    39,     3,    41,    42,    43,
-    35,    20,   166,    38,   133,    23,    24,    31,    75,    33,
-    31,    39,    33,    41,    42,    43,    23,    24,   152,   153,
-    31,    20,    33,    23,    24,    92,    25,    26,    27,    28,
-    29,    30,    22,   167,   168,    31,   170,    33,   172,     5,
-     6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    23,    24,    34,    20,    34,    22,     5,     6,     7,
-     8,     9,    10,    11,    12,    13,    14,    15,    16,    13,
-    20,    13,    20,    37,    22,    25,    26,    27,    28,    29,
-    30,    20,    32,    11,    12,    13,    33,    34,    16,    11,
-    12,    13,    33,    34,    16,    32,    33,    20,    22,    20,
-    20,    20,    20,    35,    20,    36,    35,    34,    34,    20,
-    20,    20,    20,    38,    20,    84,    23,    20,    35,    34,
-    20,    35,    35,    35,    23,    20,    31,     0,   111,    65,
-    23,    35,    34,    34,    21,    23,     0,    35,    34,    31,
-    31,    35,    23,    40,    23,    31,    35,    23,    23,    39,
-    33,    23,    23,    31,    39,     4,    22,    22,   114,    22,
-   155,    -1,    -1,    -1,    -1,    -1,    50
+static const short yycheck[] = {   135,
+    26,   134,    46,    46,   111,     5,   232,    33,    27,    19,
+    19,     5,   266,    21,    19,    41,    60,    26,    19,    20,
+   274,    65,    23,    19,    20,   279,    92,    23,    19,    20,
+    52,    19,   165,   259,    30,    61,   290,    19,    20,    83,
+    19,    23,    30,     4,    88,    71,   272,    57,   181,    54,
+    94,    52,   118,    72,   308,    19,    20,    19,    67,    23,
+    60,    55,   288,    64,    58,   201,   202,   203,    64,   220,
+    52,    19,   326,   327,   100,    19,    20,    56,    19,    23,
+    19,    20,    64,   309,    23,   311,    19,    22,    97,    22,
+    19,    21,   304,   226,    56,     9,    19,   204,    54,    19,
+    64,    15,   128,   315,    18,   131,    19,    54,    56,   260,
+   261,    52,    52,    57,   200,    19,    56,   203,    57,    54,
+    64,    54,   166,   166,    57,    64,    55,    10,    57,   196,
+   197,    14,    61,    62,    63,    55,   162,    57,   271,    19,
+   273,    61,    62,    63,    57,    54,     3,    54,    61,    62,
+    63,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+    55,    55,     5,    58,    58,   301,   302,    24,    25,    26,
+    27,    28,    29,    53,    19,    19,    56,    19,    19,   205,
+   316,   317,    19,   319,    19,   321,    31,    32,    33,    34,
+    35,    36,    37,    38,    39,    60,    31,    32,    33,    34,
+    19,    19,    37,    38,    39,    21,    55,    55,    53,    58,
+    58,    56,    31,    32,    33,    34,    97,    98,    19,    54,
+     5,     6,     7,     8,     9,    19,    11,    12,    13,    14,
+    15,    16,    17,    18,    19,    54,    21,    19,    55,    19,
+    54,    19,   123,    55,   125,    54,    59,    19,    19,   130,
+    54,     5,    37,    38,    19,    55,    19,    19,    40,    41,
+    42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+     5,     6,     7,     8,     9,    19,    11,    12,    13,    14,
+    15,    16,    17,    18,    19,    54,    21,    31,    32,    33,
+    34,    19,    19,    54,    54,    54,    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,    19,    11,    12,    13,    14,    15,    16,    17,
+    18,    19,    54,    21,     5,     6,     7,     8,     9,    57,
+    11,    12,    13,    14,    15,    16,    17,    18,    19,    19,
+    21,     5,     6,     7,     8,     9,    56,    11,    12,    13,
+    14,    15,    16,    17,    18,    19,    55,    21,     5,     6,
+     7,     8,     9,    55,    11,    12,    13,    14,    15,    16,
+    17,    18,    19,    24,    21,     5,     6,    52,    57,    57,
+    57,    11,    12,    13,    14,    15,    16,    17,    18,     5,
+     6,    21,    57,    19,    57,    11,    12,    13,    14,    15,
+    16,    17,    18,     5,     6,    21,    19,    57,    57,    11,
+    12,    13,    14,    15,    16,    17,    18,    57,    57,    21,
+    24,    25,    26,    27,    28,    29,    57,    19,    57,    57,
+    55,    55,    54,    19,    19,    58,    24,    56,    55,    20,
+    24,    19,    19,    19,    19,    19,    55,    55,    55,    52,
+    19,    24,    19,    54,    24,    55,    54,    54,    54,    19,
+    55,    52,    30,    19,    19,    24,    55,    24,    55,     0,
+    52,    24,    55,     0,     9,   137,   136,    57,    57,    31,
+   133,   212,    19,   104,    56,    56,   307,   223,    -1,   298
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line 3 "/usr/lib/bison.simple"
+/* This file comes from bison-1.28.  */
 
 /* Skeleton output parser for bison,
    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -461,46 +1048,66 @@ static const short yycheck[] = {    16,
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
    This special exception was added by the Free Software Foundation
    in version 1.24 of Bison.  */
 
-#ifndef alloca
+/* This is the parser code that is written into each bison parser
+  when the %semantic_parser declaration is not specified in the grammar.
+  It was written by Richard Stallman by simplifying the hairy parser
+  used when %semantic_parser is specified.  */
+
+#ifndef YYSTACK_USE_ALLOCA
+#ifdef alloca
+#define YYSTACK_USE_ALLOCA
+#else /* alloca not defined */
 #ifdef __GNUC__
+#define YYSTACK_USE_ALLOCA
 #define alloca __builtin_alloca
 #else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#define YYSTACK_USE_ALLOCA
 #include <alloca.h>
 #else /* not sparc */
-#if defined (MSDOS) && !defined (__TURBOC__)
+/* We think this test detects Watcom and Microsoft C.  */
+/* This used to test MSDOS, but that is a bad idea
+   since that symbol is in the user namespace.  */
+#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#if 0 /* No need for malloc.h, which pollutes the namespace;
+        instead, just don't use alloca.  */
 #include <malloc.h>
+#endif
 #else /* not MSDOS, or __TURBOC__ */
 #if defined(_AIX)
-#include <malloc.h>
+/* I don't know what this was needed for, but it pollutes the namespace.
+   So I turned it off.   rms, 2 May 1997.  */
+/* #include <malloc.h>  */
  #pragma alloca
-#else /* not MSDOS, __TURBOC__, or _AIX */
-#ifdef __hpux
-#ifdef __cplusplus
-extern "C" {
-void *alloca (unsigned int);
-};
-#else /* not __cplusplus */
-void *alloca ();
-#endif /* not __cplusplus */
+#define YYSTACK_USE_ALLOCA
+#else /* not MSDOS, or __TURBOC__, or _AIX */
+#if 0
+#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
+                and on HPUX 10.  Eventually we can turn this on.  */
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
 #endif /* __hpux */
+#endif
 #endif /* not _AIX */
 #endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc.  */
-#endif /* not GNU C.  */
-#endif /* alloca not defined.  */
+#endif /* not sparc */
+#endif /* not GNU C */
+#endif /* alloca not defined */
+#endif /* YYSTACK_USE_ALLOCA not defined */
 
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
+#ifdef YYSTACK_USE_ALLOCA
+#define YYSTACK_ALLOC alloca
+#else
+#define YYSTACK_ALLOC malloc
+#endif
 
 /* Note: there must be only one dollar sign in this file.
    It is replaced by the list of actions, each action
@@ -510,8 +1117,8 @@ void *alloca ();
 #define yyclearin      (yychar = YYEMPTY)
 #define YYEMPTY                -2
 #define YYEOF          0
-#define YYACCEPT       return(0)
-#define YYABORT        return(1)
+#define YYACCEPT       goto yyacceptlab
+#define YYABORT        goto yyabortlab
 #define YYERROR                goto yyerrlab1
 /* Like YYERROR except do call yyerror.
    This remains here temporarily to ease the
@@ -592,12 +1199,12 @@ int yydebug;                     /*  nonzero means print parse trace     */
 #ifndef YYMAXDEPTH
 #define YYMAXDEPTH 10000
 #endif
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-int yyparse (void);
-#endif
 \f
+/* Define __yy_memcpy.  Note that the size argument
+   should be passed with type unsigned int, because that is what the non-GCC
+   definitions require.  With GCC, __builtin_memcpy takes an arg
+   of type size_t, but it can handle unsigned int.  */
+
 #if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */
 #define __yy_memcpy(TO,FROM,COUNT)     __builtin_memcpy(TO,FROM,COUNT)
 #else                          /* not GNU C or C++ */
@@ -609,7 +1216,7 @@ static void
 __yy_memcpy (to, from, count)
      char *to;
      char *from;
-     int count;
+     unsigned int count;
 {
   register char *f = from;
   register char *t = to;
@@ -624,10 +1231,10 @@ __yy_memcpy (to, from, count)
 /* This is the most reliable way to avoid incompatibilities
    in available built-in functions on various systems.  */
 static void
-__yy_memcpy (char *to, char *from, int count)
+__yy_memcpy (char *to, char *from, unsigned int count)
 {
-  register char *f = from;
   register char *t = to;
+  register char *f = from;
   register int i = count;
 
   while (i-- > 0)
@@ -637,7 +1244,7 @@ __yy_memcpy (char *to, char *from, int count)
 #endif
 #endif
 \f
-#line 196 "/usr/lib/bison.simple"
+#line 217 "/usr/lib/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -658,6 +1265,15 @@ __yy_memcpy (char *to, char *from, int count)
 #define YYPARSE_PARAM_DECL
 #endif /* not YYPARSE_PARAM */
 
+/* Prevent warning if -Wstrict-prototypes.  */
+#ifdef __GNUC__
+#ifdef YYPARSE_PARAM
+int yyparse (void *);
+#else
+int yyparse (void);
+#endif
+#endif
+
 int
 yyparse(YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
@@ -686,6 +1302,7 @@ yyparse(YYPARSE_PARAM_ARG)
 #endif
 
   int yystacksize = YYINITDEPTH;
+  int yyfree_stacks = 0;
 
 #ifdef YYPURE
   int yychar;
@@ -770,18 +1387,32 @@ yynewstate:
       if (yystacksize >= YYMAXDEPTH)
        {
          yyerror("parser stack overflow");
+         if (yyfree_stacks)
+           {
+             free (yyss);
+             free (yyvs);
+#ifdef YYLSP_NEEDED
+             free (yyls);
+#endif
+           }
          return 2;
        }
       yystacksize *= 2;
       if (yystacksize > YYMAXDEPTH)
        yystacksize = YYMAXDEPTH;
-      yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
-      yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
+#ifndef YYSTACK_USE_ALLOCA
+      yyfree_stacks = 1;
+#endif
+      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
+      __yy_memcpy ((char *)yyss, (char *)yyss1,
+                  size * (unsigned int) sizeof (*yyssp));
+      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
+      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
+                  size * (unsigned int) sizeof (*yyvsp));
 #ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
+      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
+      __yy_memcpy ((char *)yyls, (char *)yyls1,
+                  size * (unsigned int) sizeof (*yylsp));
 #endif
 #endif /* no yyoverflow */
 
@@ -942,512 +1573,1366 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 176 "parse.y"
+#line 591 "parse.y"
 { ; ;
     break;}
 case 2:
-#line 177 "parse.y"
+#line 592 "parse.y"
 { ; ;
     break;}
 case 3:
-#line 178 "parse.y"
+#line 593 "parse.y"
 { ; ;
     break;}
 case 4:
-#line 179 "parse.y"
+#line 594 "parse.y"
 { ; ;
     break;}
 case 5:
-#line 182 "parse.y"
+#line 597 "parse.y"
 {
-                       Node *node = new_ccode(FALSE,yyvsp[0].cbuf,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 186 "parse.y"
+#line 606 "parse.y"
 {
-                       Node *node = new_ccode(TRUE,yyvsp[0].cbuf,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 190 "parse.y"
+#line 615 "parse.y"
 {
-                       Node *node = new_ccode(FALSE,yyvsp[0].cbuf,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 194 "parse.y"
+#line 624 "parse.y"
 {
-                       Node *node = new_ccode(TRUE,yyvsp[0].cbuf,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 200 "parse.y"
+#line 633 "parse.y"
 {
-                       ((Class *)class)->nodes = class_nodes;
-                       class_nodes = NULL;
-                       nodes = g_list_append(nodes,class);
-                                               ;
+                       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 207 "parse.y"
+#line 642 "parse.y"
 {
-                       class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
-                                               ;
+                       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 212 "parse.y"
+#line 653 "parse.y"
 { ; ;
     break;}
 case 12:
-#line 213 "parse.y"
+#line 654 "parse.y"
 { ; ;
     break;}
 case 13:
-#line 214 "parse.y"
-{ ; ;
+#line 657 "parse.y"
+{
+                       ((Class *)class)->nodes = class_nodes;
+                       class_nodes = NULL;
+                       nodes = g_list_append(nodes,class);
+                                               ;
     break;}
 case 14:
-#line 215 "parse.y"
-{ ; ;
-    break;}
-case 15:
-#line 216 "parse.y"
-{ ; ;
-    break;}
-case 16:
-#line 217 "parse.y"
-{ ; ;
-    break;}
-case 17:
-#line 220 "parse.y"
+#line 662 "parse.y"
 {
-                       push_variable(yyvsp[-1].id,PUBLIC_SCOPE);
+                       ((Class *)class)->nodes = NULL;
+                       class_nodes = NULL;
+                       nodes = g_list_append(nodes,class);
                                                ;
     break;}
-case 18:
-#line 223 "parse.y"
-{
-                       push_variable(yyvsp[-1].id,PRIVATE_SCOPE);
+case 15:
+#line 669 "parse.y"
+{
+                       class = node_new (CLASS_NODE,
+                                         "otype:steal", yyvsp[-3].id,
+                                         "ptype:steal", yyvsp[-1].id,
+                                         "bonobo_x_class:steal", bonobo_x_class,
+                                         "chunk_size:steal", chunk_size,
+                                         NULL);
                                                ;
     break;}
-case 19:
-#line 227 "parse.y"
-{
-                       if(strcmp(yyvsp[-6].id,"get")==0 &&
-                          strcmp(yyvsp[-3].id,"set")==0) {
-                               Node *node;
-                               g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
-                               node = new_argument(yyvsp[-8].id,yyvsp[-9].list,yyvsp[-7].id,
-                                                   yyvsp[-4].cbuf,yyvsp[-5].line,
-                                                   yyvsp[-1].cbuf,yyvsp[-2].line);
-                               class_nodes = g_list_append(class_nodes,node);
-                       } else if(strcmp(yyvsp[-6].id,"set")==0 &&
-                               strcmp(yyvsp[-3].id,"get")==0) {
-                               Node *node;
-                               g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
-                               node = new_argument(yyvsp[-8].id,yyvsp[-9].list,yyvsp[-7].id,
-                                                   yyvsp[-1].cbuf,yyvsp[-2].line,
-                                                   yyvsp[-4].cbuf,yyvsp[-5].line);
-                               class_nodes = g_list_append(class_nodes,node);
+case 17:
+#line 680 "parse.y"
+{
+                       if(strcmp(yyvsp[-3].id,"chunks") == 0) {
+                               g_free (chunk_size);
+                               chunk_size = g_strdup(yyvsp[-2].id);
+                       } else if(strcmp(yyvsp[-3].id,"BonoboX") == 0) {
+                               g_free (bonobo_x_class);
+                               bonobo_x_class = g_strdup(yyvsp[-2].id);
                        } else {
-                               g_free(yyvsp[-8].id); g_free(yyvsp[-7].id);
-                               g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
-                               g_list_foreach(yyvsp[-9].list,(GFunc)g_free,NULL);
-                               g_string_free(yyvsp[-1].cbuf,TRUE);
-                               g_string_free(yyvsp[-4].cbuf,TRUE);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
-                                               ;
+               ;
     break;}
-case 20:
-#line 254 "parse.y"
-{
-                       if(strcmp(yyvsp[-3].id,"get")==0) {
-                               Node *node;
-                               g_free(yyvsp[-3].id);
-                               node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id,
-                                                   yyvsp[-1].cbuf,yyvsp[-2].line,NULL,0);
-                               class_nodes = g_list_append(class_nodes,node);
-                       } else if(strcmp(yyvsp[-3].id,"set")==0) {
-                               Node *node;
-                               g_free(yyvsp[-3].id);
-                               node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id,
-                                                   NULL,0,yyvsp[-1].cbuf,yyvsp[-2].line);
-                               class_nodes = g_list_append(class_nodes,node);
+case 18:
+#line 692 "parse.y"
+{
+                       if(strcmp(yyvsp[-3].id,"chunks") == 0) {
+                               g_free (chunk_size);
+                               if(atoi(yyvsp[-2].id) != 0)
+                                       chunk_size = g_strdup(yyvsp[-2].id);
+                               else
+                                       chunk_size = NULL;
                        } else {
-                               g_free(yyvsp[-3].id); g_free(yyvsp[-5].id);
-                               g_free(yyvsp[-4].id);
-                               g_list_foreach(yyvsp[-6].list,(GFunc)g_free,NULL);
-                               g_string_free(yyvsp[-1].cbuf,TRUE);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
-                                               ;
+               ;
+    break;}
+case 19:
+#line 706 "parse.y"
+{ ; ;
+    break;}
+case 20:
+#line 707 "parse.y"
+{ ; ;
     break;}
 case 21:
-#line 278 "parse.y"
-{ yyval.list = yyvsp[-1].list; ;
+#line 710 "parse.y"
+{ ; ;
     break;}
 case 22:
-#line 279 "parse.y"
-{ yyval.list = NULL; ;
-    break;}
-case 23:
-#line 282 "parse.y"
+#line 711 "parse.y"
 {
-                       yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
+                       if (strcmp (yyvsp[-1].id, "BonoboX") != 0) {
+                               g_free(yyvsp[-1].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       last_added_method->bonobo_x_func = TRUE;
                                                ;
     break;}
+case 23:
+#line 719 "parse.y"
+{ ; ;
+    break;}
 case 24:
-#line 285 "parse.y"
-{
-                       yyval.list = g_list_append(NULL,yyvsp[0].id);
-                                               ;
+#line 720 "parse.y"
+{ ; ;
     break;}
 case 25:
-#line 291 "parse.y"
-{
-                       Node *node = new_type(0,yyvsp[0].id);
-                       typestack = g_list_prepend(typestack,node);
-                                               ;
+#line 721 "parse.y"
+{ ; ;
     break;}
 case 26:
-#line 295 "parse.y"
-{
-                       Node *node = new_type(stars,yyvsp[-1].id);
-                       stars = 0;
-                       typestack = g_list_prepend(typestack,node);
-                                               ;
+#line 722 "parse.y"
+{ ; ;
     break;}
 case 27:
-#line 302 "parse.y"
-{
-                       yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
-                                               ;
+#line 725 "parse.y"
+{ the_scope = PUBLIC_SCOPE; ;
     break;}
 case 28:
-#line 305 "parse.y"
-{
-                       yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
-                                               ;
+#line 726 "parse.y"
+{ the_scope = PRIVATE_SCOPE; ;
     break;}
 case 29:
-#line 308 "parse.y"
-{
-                       yyval.id = g_strdup(yyvsp[0].id);
-                                               ;
+#line 727 "parse.y"
+{ the_scope = PROTECTED_SCOPE; ;
     break;}
 case 30:
-#line 311 "parse.y"
-{
-                       yyval.id = g_strdup("unsigned char");
-                                               ;
+#line 728 "parse.y"
+{ the_scope = CLASS_SCOPE; ;
     break;}
 case 31:
-#line 314 "parse.y"
-{
-                       yyval.id = g_strdup("signed char");
-                                               ;
+#line 731 "parse.y"
+{
+                       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"));
+                               YYERROR;
+                       }
+                               ;
     break;}
 case 32:
-#line 317 "parse.y"
+#line 751 "parse.y"
 {
-                       yyval.id = g_strdup("char");
-                                               ;
+                       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"));
+                               YYERROR;
+                       }
+                                       ;
     break;}
 case 33:
-#line 320 "parse.y"
+#line 775 "parse.y"
 {
-                       yyval.id = g_strdup("double");
-                                               ;
+                       initializer = yyvsp[0].id;
+                       initializer_line = ccode_line;
+                               ;
     break;}
 case 34:
-#line 323 "parse.y"
+#line 779 "parse.y"
 {
-                       yyval.id = g_strdup("float");
-                                               ;
+                       initializer = (yyvsp[0].cbuf)->str;
+                       initializer_line = ccode_line;
+                       g_string_free(yyvsp[0].cbuf, FALSE);
+                               ;
     break;}
 case 35:
-#line 326 "parse.y"
-{
-                       yyval.id = yyvsp[0].id;
-                                               ;
+#line 787 "parse.y"
+{ ; ;
     break;}
 case 36:
-#line 329 "parse.y"
-{
-                       yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL);
-                       g_free(yyvsp[0].id);
-                                               ;
+#line 788 "parse.y"
+{ ; ;
     break;}
 case 37:
-#line 333 "parse.y"
-{
-                       yyval.id = yyvsp[0].id;
-                                               ;
+#line 789 "parse.y"
+{ destructor = NULL; ;
     break;}
 case 38:
-#line 336 "parse.y"
-{
-                       yyval.id = g_strdup("void");
-                                               ;
+#line 790 "parse.y"
+{ initializer = NULL; ;
     break;}
 case 39:
-#line 341 "parse.y"
+#line 791 "parse.y"
 {
-                       yyval.id = "long int";
-                                               ;
+                       destructor = NULL;
+                       initializer = NULL;
+                                       ;
     break;}
 case 40:
-#line 344 "parse.y"
+#line 797 "parse.y"
 {
-                       yyval.id = "long";
+                       push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL);
                                                ;
     break;}
 case 41:
-#line 347 "parse.y"
+#line 800 "parse.y"
 {
-                       yyval.id = "short int";
+                       push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
                                                ;
     break;}
 case 42:
-#line 350 "parse.y"
+#line 805 "parse.y"
 {
-                       yyval.id = "short";
+                       Node *node = NULL;
+                       if(strcmp(yyvsp[-6].id,"get")==0 &&
+                          strcmp(yyvsp[-3].id,"set")==0) {
+                               Type *type = pop_type();
+                               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) {
+                               Type *type = pop_type();
+                               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[-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 43:
-#line 353 "parse.y"
-{
-                       yyval.id = "int";
+#line 873 "parse.y"
+{
+                       Node *node = NULL;
+                       if(strcmp(yyvsp[-3].id, "get") == 0) {
+                               Type *type = pop_type();
+                               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 = 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[-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 44:
-#line 358 "parse.y"
-{
-                       yyval.id = "enum ";
+#line 927 "parse.y"
+{
+                       Node *node;
+                       char *get, *set = NULL;
+                       Variable *var;
+                       Type *type;
+                       char *root;
+                       
+                       if(strcmp(yyvsp[0].id, "link")!=0 &&
+                          strcmp(yyvsp[0].id, "stringlink")!=0 && 
+                          strcmp(yyvsp[0].id, "objectlink")!=0) {
+                               g_free(yyvsp[0].id); 
+                               g_free(yyvsp[-3].id);
+                               g_free(yyvsp[-2].id);
+                               g_list_foreach(yyvsp[-4].list,(GFunc)g_free,NULL);
+                               g_list_free(yyvsp[-4].list);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+
+                       type = pop_type();
+
+                       var = find_var_or_die(yyvsp[-2].id, yyvsp[-5].line);
+                       if(var->scope == PRIVATE_SCOPE)
+                               root = "self->_priv";
+                       else if(var->scope == CLASS_SCOPE) {
+                               root = "SELF_GET_CLASS(self)";
+                               if(no_self_alias)
+                                       error_print(GOB_ERROR, yyvsp[-5].line,
+                                                   _("Self aliases needed when autolinking to a classwide member"));
+                       } else
+                               root = "self";
+
+                       if(strcmp(yyvsp[0].id, "link")==0) {
+                               set = g_strdup_printf("%s->%s = ARG;",
+                                                     root, yyvsp[-2].id);
+                       } else if(strcmp(yyvsp[0].id, "stringlink")==0) {
+                               set = g_strdup_printf("g_free (%s->%s); "
+                                                     "%s->%s = g_strdup (ARG);",
+                                                     root, yyvsp[-2].id,
+                                                     root, yyvsp[-2].id);
+                       } else if(strcmp(yyvsp[0].id, "objectlink")==0) {
+                               set = g_strdup_printf(
+                                 "if (ARG != NULL) "
+                                  "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 = 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 45:
-#line 361 "parse.y"
+#line 1015 "parse.y"
 {
-                       yyval.id = "union ";
+                       if (strcmp (yyvsp[-1].id, "export")!=0) {
+                               g_free (yyvsp[-1].id); 
+                               yyerror (_("parse error"));
+                               YYERROR;
+                       }
+                       yyval.id = yyvsp[-1].id;
                                                ;
     break;}
 case 46:
-#line 364 "parse.y"
+#line 1023 "parse.y"
 {
-                       yyval.id = "struct ";
+                       yyval.id = NULL;
                                                ;
     break;}
 case 47:
-#line 369 "parse.y"
-{ stars++; ;
+#line 1028 "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 48:
-#line 370 "parse.y"
-{ stars++; ;
+#line 1076 "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 49:
-#line 373 "parse.y"
+#line 1112 "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 50:
+#line 1128 "parse.y"
+{ ; ;
+    break;}
+case 51:
+#line 1129 "parse.y"
+{ ; ;
+    break;}
+case 52:
+#line 1132 "parse.y"
+{ ; ;
+    break;}
+case 53:
+#line 1133 "parse.y"
+{ ; ;
+    break;}
+case 54:
+#line 1136 "parse.y"
+{ yyval.id = yyvsp[0].id; ;
+    break;}
+case 55:
+#line 1137 "parse.y"
+{
+                       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 56:
+#line 1149 "parse.y"
+{ yyval.id = yyvsp[0].id; ;
+    break;}
+case 57:
+#line 1150 "parse.y"
+{ yyval.id = yyvsp[0].id; ;
+    break;}
+case 58:
+#line 1153 "parse.y"
+{
+               ensure_property ();
+               node_set ((Node *)property,
+                         "nick:steal", yyvsp[0].id,
+                         NULL);
+                 ;
+    break;}
+case 59:
+#line 1159 "parse.y"
+{
+               ensure_property ();
+               node_set ((Node *)property,
+                         "blurb:steal", yyvsp[0].id,
+                         NULL);
+                 ;
+    break;}
+case 60:
+#line 1165 "parse.y"
+{
+               ensure_property ();
+               node_set ((Node *)property,
+                         "maximum:steal", yyvsp[0].id,
+                         NULL);
+                 ;
+    break;}
+case 61:
+#line 1171 "parse.y"
+{
+               ensure_property ();
+               node_set ((Node *)property,
+                         "minimum:steal", yyvsp[0].id,
+                         NULL);
+                 ;
+    break;}
+case 62:
+#line 1177 "parse.y"
+{
+               ensure_property ();
+               node_set ((Node *)property,
+                         "default_value:steal", yyvsp[0].id,
+                         NULL);
+                 ;
+    break;}
+case 63:
+#line 1183 "parse.y"
+{
+               ensure_property ();
+               node_set ((Node *)property,
+                         "flags:steal", yyvsp[0].list,
+                         NULL);
+                 ;
+    break;}
+case 64:
+#line 1189 "parse.y"
+{
+               Type *type = pop_type ();
+               ensure_property ();
+               node_set ((Node *)property,
+                         "ptype:steal", type,
+                         NULL);
+                 ;
+    break;}
+case 65:
+#line 1196 "parse.y"
+{
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 ;
+    break;}
+case 66:
+#line 1202 "parse.y"
+{
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 ;
+    break;}
+case 67:
+#line 1208 "parse.y"
+{
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 ;
+    break;}
+case 68:
+#line 1214 "parse.y"
+{
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 ;
+    break;}
+case 69:
+#line 1220 "parse.y"
+{
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 ;
+    break;}
+case 70:
+#line 1226 "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 71:
+#line 1246 "parse.y"
 {
-                       gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
+                       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 50:
-#line 378 "parse.y"
+case 72:
+#line 1255 "parse.y"
 {
-                       gtktypes = g_list_append(gtktypes,yyvsp[0].id);
+                       yyval.id = debool (yyvsp[0].id);
+                       typestack = g_list_prepend(typestack,NULL);
                                                ;
     break;}
-case 51:
-#line 381 "parse.y"
-{ 
-                       gtktypes = g_list_append(gtktypes,yyvsp[0].id);
-                                                       ;
+case 73:
+#line 1261 "parse.y"
+{ yyval.list = yyvsp[-1].list; ;
     break;}
-case 52:
-#line 387 "parse.y"
+case 74:
+#line 1262 "parse.y"
+{ yyval.list = NULL; ;
+    break;}
+case 75:
+#line 1265 "parse.y"
+{
+                       yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
+                                               ;
+    break;}
+case 76:
+#line 1268 "parse.y"
+{
+                       yyval.list = g_list_append(NULL,yyvsp[0].id);
+                                               ;
+    break;}
+case 77:
+#line 1274 "parse.y"
 {
-                       int sigtype = SIGNAL_LAST_METHOD;
-                       if(strcmp(yyvsp[-9].id,"first")==0)
-                               sigtype = SIGNAL_FIRST_METHOD;
-                       else if(strcmp(yyvsp[-9].id,"last")==0)
-                               sigtype = SIGNAL_LAST_METHOD;
+                       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 78:
+#line 1281 "parse.y"
+{
+                       Node *node = node_new (TYPE_NODE, 
+                                              "name:steal", yyvsp[0].id,
+                                              NULL);
+                       typestack = g_list_prepend(typestack,node);
+                                                       ;
+    break;}
+case 79:
+#line 1290 "parse.y"
+{
+                       yyval.id = yyvsp[0].id;
+                                                       ;
+    break;}
+case 80:
+#line 1293 "parse.y"
+{
+                       yyval.id = yyvsp[0].id;
+                                                       ;
+    break;}
+case 81:
+#line 1296 "parse.y"
+{
+                       yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
+    break;}
+case 82:
+#line 1300 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+                       g_free(yyvsp[-1].id);
+                                                       ;
+    break;}
+case 83:
+#line 1304 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
+    break;}
+case 84:
+#line 1308 "parse.y"
+{
+                       yyval.id = g_strconcat("const ", yyvsp[-1].id, " ",
+                                            yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
+    break;}
+case 85:
+#line 1313 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-2].id, " ",
+                                            yyvsp[-1].id, " const", NULL);
+                       g_free(yyvsp[-1].id);
+                                                       ;
+    break;}
+case 86:
+#line 1321 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
+    break;}
+case 87:
+#line 1325 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[-1].id);
+                       g_free(yyvsp[0].id);
+                                                       ;
+    break;}
+case 88:
+#line 1330 "parse.y"
+{
+                       yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       ;
+    break;}
+case 89:
+#line 1334 "parse.y"
+{
+                       yyval.id = yyvsp[0].id;
+                                                       ;
+    break;}
+case 90:
+#line 1337 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+                       g_free(yyvsp[-1].id);
+                                                       ;
+    break;}
+case 91:
+#line 1341 "parse.y"
+{
+                       yyval.id = g_strdup(yyvsp[0].id);
+                                                       ;
+    break;}
+case 92:
+#line 1344 "parse.y"
+{
+                       yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+                                                       ;
+    break;}
+case 93:
+#line 1349 "parse.y"
+{ yyval.id = "void"; ;
+    break;}
+case 94:
+#line 1350 "parse.y"
+{ yyval.id = "char"; ;
+    break;}
+case 95:
+#line 1351 "parse.y"
+{ yyval.id = "short"; ;
+    break;}
+case 96:
+#line 1352 "parse.y"
+{ yyval.id = "int"; ;
+    break;}
+case 97:
+#line 1353 "parse.y"
+{ yyval.id = "long"; ;
+    break;}
+case 98:
+#line 1354 "parse.y"
+{ yyval.id = "float"; ;
+    break;}
+case 99:
+#line 1355 "parse.y"
+{ yyval.id = "double"; ;
+    break;}
+case 100:
+#line 1356 "parse.y"
+{ yyval.id = "signed"; ;
+    break;}
+case 101:
+#line 1357 "parse.y"
+{ yyval.id = "unsigned"; ;
+    break;}
+case 102:
+#line 1360 "parse.y"
+{ yyval.id = "struct"; ;
+    break;}
+case 103:
+#line 1361 "parse.y"
+{ yyval.id = "union"; ;
+    break;}
+case 104:
+#line 1362 "parse.y"
+{ yyval.id = "enum"; ;
+    break;}
+case 105:
+#line 1365 "parse.y"
+{ yyval.id = g_strdup("*"); ;
+    break;}
+case 106:
+#line 1366 "parse.y"
+{ yyval.id = g_strdup("* const"); ;
+    break;}
+case 107:
+#line 1367 "parse.y"
+{
+                               yyval.id = g_strconcat("*", yyvsp[0].id, NULL);
+                               g_free(yyvsp[0].id);
+                                       ;
+    break;}
+case 108:
+#line 1371 "parse.y"
+{
+                               yyval.id = g_strconcat("* const", yyvsp[0].id, NULL);
+                               g_free(yyvsp[0].id);
+                                       ;
+    break;}
+case 109:
+#line 1378 "parse.y"
+{
+                       if(strcmp(yyvsp[-1].id, "first")==0)
+                               yyval.sigtype = SIGNAL_FIRST_METHOD;
+                       else if(strcmp(yyvsp[-1].id, "last")==0)
+                               yyval.sigtype = SIGNAL_LAST_METHOD;
                        else {
                                yyerror(_("signal must be 'first' or 'last'"));
-                               g_free(yyvsp[-9].id);
+                               g_free(yyvsp[-1].id);
                                YYERROR;
                        }
-                       g_free(yyvsp[-9].id);
-
-                       if(!has_this) {
-                               yyerror(_("signal without 'this' as "
-                                         "first parameter"));
+                       g_free(yyvsp[-1].id);
+                                       ;
+    break;}
+case 110:
+#line 1390 "parse.y"
+{
+                       yyval.sigtype = SIGNAL_LAST_METHOD;
+                                       ;
+    break;}
+case 111:
+#line 1396 "parse.y"
+{
+                       if(strcmp(yyvsp[-1].id,"first")==0)
+                               yyval.sigtype = SIGNAL_FIRST_METHOD;
+                       else if(strcmp(yyvsp[-1].id,"last")==0)
+                               yyval.sigtype = SIGNAL_LAST_METHOD;
+                       else {
+                               yyerror(_("signal must be 'first' or 'last'"));
+                               g_free(yyvsp[-1].id);
                                YYERROR;
                        }
-                       push_function(sigtype,NULL,
-                                     yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-10].line,yyvsp[-1].line);
-                                                                       ;
+                       g_free(yyvsp[-1].id);
+                                       ;
     break;}
-case 53:
-#line 408 "parse.y"
+case 112:
+#line 1408 "parse.y"
 {
-                       int sigtype = SIGNAL_LAST_METHOD;
-                       if(strcmp(yyvsp[-8].id,"first")==0)
-                               sigtype = SIGNAL_FIRST_METHOD;
-                       else if(strcmp(yyvsp[-8].id,"last")==0)
-                               sigtype = SIGNAL_LAST_METHOD;
+                       if(strcmp(yyvsp[-2].id,"first")==0)
+                               yyval.sigtype = SIGNAL_FIRST_METHOD;
+                       else if(strcmp(yyvsp[-2].id,"last")==0)
+                               yyval.sigtype = SIGNAL_LAST_METHOD;
                        else {
                                yyerror(_("signal must be 'first' or 'last'"));
-                               g_free(yyvsp[-8].id);
+                               g_free(yyvsp[-2].id);
                                YYERROR;
                        }
-                       g_free(yyvsp[-8].id);
-                       if(!has_this) {
-                               yyerror(_("signal without 'this' as "
+                       g_free(yyvsp[-2].id);
+                                       ;
+    break;}
+case 113:
+#line 1420 "parse.y"
+{
+                       yyval.sigtype = SIGNAL_LAST_METHOD;
+                                       ;
+    break;}
+case 114:
+#line 1423 "parse.y"
+{
+                       /* the_scope was default thus public */
+                       the_scope = PUBLIC_SCOPE;
+                                       ;
+    break;}
+case 115:
+#line 1429 "parse.y"
+{
+                       gtktypes = g_list_prepend(gtktypes, debool (yyvsp[-3].id));
+                                               ;
+    break;}
+case 116:
+#line 1434 "parse.y"
+{
+                       gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id));
+                                               ;
+    break;}
+case 117:
+#line 1437 "parse.y"
+{ 
+                       gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id));
+                                                       ;
+    break;}
+case 118:
+#line 1442 "parse.y"
+{ yyval.cbuf = yyvsp[0].cbuf; ;
+    break;}
+case 119:
+#line 1443 "parse.y"
+{ yyval.cbuf = NULL; ;
+    break;}
+case 120:
+#line 1447 "parse.y"
+{
+                       if(!has_self) {
+                               yyerror(_("signal without 'self' as "
                                          "first parameter"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
                                YYERROR;
                        }
-                       push_function(sigtype, NULL,
-                                     yyvsp[-5].id, yyvsp[-1].id, NULL,yyvsp[-9].line,0);
+                       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 54:
-#line 428 "parse.y"
+case 121:
+#line 1463 "parse.y"
 {
-                       if(!has_this) {
-                               yyerror(_("signal without 'this' as "
+                       if(!has_self) {
+                               yyerror(_("signal without 'self' as "
                                          "first parameter"));
+                               free_all_global_state();
                                YYERROR;
                        }
-                       push_function(SIGNAL_LAST_METHOD, NULL,
-                                     yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-9].line,yyvsp[-1].line);
+                       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 55:
-#line 437 "parse.y"
+case 122:
+#line 1479 "parse.y"
 {
-                       if(!has_this) {
-                               yyerror(_("signal without 'this' as "
+                       if(!has_self) {
+                               yyerror(_("virtual method without 'self' as "
                                          "first parameter"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
                                YYERROR;
                        }
-                       push_function(SIGNAL_LAST_METHOD, NULL, yyvsp[-5].id,
-                                     yyvsp[-1].id, NULL,yyvsp[-8].line,0);
+                       push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+                                     yyvsp[0].cbuf, yyvsp[-8].line,
+                                     ccode_line, vararg, NULL);
                                                                        ;
     break;}
-case 56:
-#line 446 "parse.y"
+case 123:
+#line 1495 "parse.y"
 {
-                       push_function(VIRTUAL_METHOD, NULL, yyvsp[-6].id,
-                                     yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line);
+                       if(!has_self) {
+                               yyerror(_("virtual method without 'self' as "
+                                         "first parameter"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+                                     yyvsp[0].cbuf, yyvsp[-7].line,
+                                     ccode_line, vararg, NULL);
                                                                        ;
     break;}
-case 57:
-#line 450 "parse.y"
+case 124:
+#line 1511 "parse.y"
 {
-                       push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id,
-                                     yyvsp[-1].id, NULL,yyvsp[-7].line,0);
+                       if(!has_self) {
+                               yyerror(_("virtual method without 'self' as "
+                                         "first parameter"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(PUBLIC_SCOPE, VIRTUAL_METHOD, NULL,
+                                     yyvsp[-5].id, yyvsp[0].cbuf, yyvsp[-7].line,
+                                     ccode_line, vararg, NULL);
                                                                        ;
     break;}
-case 58:
-#line 454 "parse.y"
+case 125:
+#line 1522 "parse.y"
 {
-                       push_function(OVERRIDE_METHOD, yyvsp[-9].id,
-                                     yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-11].line,yyvsp[-1].line);
+                       push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id,
+                                     yyvsp[-5].id, yyvsp[0].cbuf,
+                                     yyvsp[-10].line, ccode_line,
+                                     vararg, NULL);
                                                                        ;
     break;}
-case 59:
-#line 458 "parse.y"
+case 126:
+#line 1528 "parse.y"
 {
-                       push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id,
-                                     yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line);
-                                                               ;
-    break;}
-case 60:
-#line 462 "parse.y"
-{
-                       push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id,
-                                     yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line);
+                       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 61:
-#line 466 "parse.y"
+case 127:
+#line 1538 "parse.y"
 {
-                       if(strcmp(yyvsp[-4].id,"init")==0) {
+                       if(strcmp(yyvsp[-4].id, "init")==0) {
                                push_init_arg(yyvsp[-2].id,FALSE);
-                               push_function(INIT_METHOD, NULL, yyvsp[-4].id, 
-                                             NULL, NULL,yyvsp[-3].line,0);
-                       } else if(strcmp(yyvsp[-4].id,"class_init")==0) {
+                               push_function(NO_SCOPE, INIT_METHOD, NULL,
+                                             yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line,
+                                             ccode_line, FALSE, NULL);
+                       } else if(strcmp(yyvsp[-4].id, "class_init")==0) {
                                push_init_arg(yyvsp[-2].id,TRUE);
-                               push_function(CLASS_INIT_METHOD, NULL,
-                                             yyvsp[-4].id, NULL, NULL,yyvsp[-3].line,0);
+                               push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL,
+                                             yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line,
+                                             ccode_line, FALSE, NULL);
                        } else {
                                g_free(yyvsp[-4].id);
                                g_free(yyvsp[-2].id);
-                               yyerror(_("parse error"));
+                               g_string_free(yyvsp[0].cbuf,TRUE);
+                               yyerror(_("parse error "
+                                         "(untyped blocks must be init or "
+                                         "class_init)"));
                                YYERROR;
                        }
                                                ;
     break;}
-case 62:
-#line 482 "parse.y"
-{
-                       if(strcmp(yyvsp[-5].id,"init")==0) {
-                               push_init_arg(yyvsp[-3].id,FALSE);
-                               push_function(INIT_METHOD, NULL,
-                                             yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line,
-                                             yyvsp[-1].line);
-                       } else if(strcmp(yyvsp[-5].id,"class_init")==0) {
-                               push_init_arg(yyvsp[-3].id,TRUE);
-                               push_function(CLASS_INIT_METHOD, NULL, 
-                                             yyvsp[-5].id, NULL, yyvsp[0].cbuf,yyvsp[-4].line,
-                                             yyvsp[-1].line);
-                       } else {
-                               g_free(yyvsp[-5].id);
-                               g_free(yyvsp[-3].id);
-                               g_string_free(yyvsp[-3].cbuf,TRUE);
+case 128:
+#line 1561 "parse.y"
+{
+                       g_free(onerror); onerror = NULL;
+                       g_free(defreturn); defreturn = NULL;
+                       if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) {
+                               g_free(yyvsp[-1].id);
+                               g_free(yyvsp[0].id);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
+                       g_free(yyvsp[-1].id);
+                                       ;
+    break;}
+case 129:
+#line 1572 "parse.y"
+{
+                       g_free(onerror); onerror = NULL;
+                       g_free(defreturn); defreturn = NULL;
+                       if(!set_return_value(yyvsp[-3].id, yyvsp[-2].id)) {
+                               g_free(yyvsp[-3].id); g_free(yyvsp[-2].id);
+                               g_free(yyvsp[-1].id); g_free(yyvsp[0].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       if(!set_return_value(yyvsp[-1].id, yyvsp[0].id)) {
+                               onerror = defreturn = NULL;
+                               g_free(yyvsp[-3].id); g_free(yyvsp[-2].id);
+                               g_free(yyvsp[-1].id); g_free(yyvsp[0].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       g_free(yyvsp[-3].id);
+                       g_free(yyvsp[-1].id);
                                                ;
     break;}
-case 63:
-#line 503 "parse.y"
+case 130:
+#line 1591 "parse.y"
+{
+                       g_free(onerror); onerror = NULL;
+                       g_free(defreturn); defreturn = NULL;
+                                       ;
+    break;}
+case 131:
+#line 1597 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
-case 64:
-#line 504 "parse.y"
+case 132:
+#line 1598 "parse.y"
 {
-                       yyval.id = (yyvsp[0].cbuf)->str;
-                       g_string_free(yyvsp[0].cbuf,FALSE);
+                       yyval.id = (yyvsp[1].cbuf)->str;
+                       g_string_free(yyvsp[1].cbuf, FALSE);
                                        ;
     break;}
-case 65:
-#line 508 "parse.y"
-{ ; ;
+case 133:
+#line 1604 "parse.y"
+{ vararg = FALSE; has_self = FALSE; ;
     break;}
-case 66:
-#line 509 "parse.y"
-{ yyval.id = NULL; ;
+case 134:
+#line 1605 "parse.y"
+{
+                       vararg = FALSE;
+                       has_self = TRUE;
+                       if(strcmp(yyvsp[0].id,"self")==0)
+                               push_self(yyvsp[0].id, FALSE);
+                       else {
+                               g_free(yyvsp[0].id);
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                                               ;
     break;}
-case 67:
-#line 514 "parse.y"
-{ has_this = FALSE; ;
+case 135:
+#line 1616 "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 68:
-#line 515 "parse.y"
+case 136:
+#line 1627 "parse.y"
 {
-                       has_this = TRUE;
-                       if(strcmp(yyvsp[0].id,"this")==0)
-                               push_this(yyvsp[0].id);
+                       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"));
@@ -1455,12 +2940,12 @@ case 68:
                        }
                                                ;
     break;}
-case 69:
-#line 525 "parse.y"
+case 137:
+#line 1638 "parse.y"
 {
-                       has_this = TRUE;
-                       if(strcmp(yyvsp[-2].id,"this")==0)
-                               push_this(yyvsp[-2].id);
+                       has_self = TRUE;
+                       if(strcmp(yyvsp[-2].id,"self")==0)
+                               push_self(yyvsp[-2].id, FALSE);
                        else {
                                g_free(yyvsp[-2].id);
                                yyerror(_("parse error"));
@@ -1468,51 +2953,106 @@ case 69:
                        }
                                        ;
     break;}
-case 70:
-#line 535 "parse.y"
-{ has_this = FALSE; ;
+case 138:
+#line 1648 "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 71:
-#line 538 "parse.y"
+case 139:
+#line 1658 "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 140:
+#line 1668 "parse.y"
+{ has_self = FALSE; ;
+    break;}
+case 141:
+#line 1671 "parse.y"
+{ vararg = TRUE; ;
+    break;}
+case 142:
+#line 1672 "parse.y"
+{ vararg = FALSE; ;
+    break;}
+case 143:
+#line 1675 "parse.y"
 { ; ;
     break;}
-case 72:
-#line 539 "parse.y"
+case 144:
+#line 1676 "parse.y"
 { ; ;
     break;}
-case 73:
-#line 542 "parse.y"
+case 145:
+#line 1679 "parse.y"
 {
-                       push_funcarg(yyvsp[0].id);
+                       push_funcarg(yyvsp[0].id,NULL);
                                                                ;
     break;}
-case 74:
-#line 545 "parse.y"
+case 146:
+#line 1682 "parse.y"
+{
+                       push_funcarg(yyvsp[-1].id,yyvsp[0].id);
+                                                               ;
+    break;}
+case 147:
+#line 1685 "parse.y"
 {
                        if(strcmp(yyvsp[-2].id,"check")!=0) {
                                yyerror(_("parse error"));
                                YYERROR;
                        }
                        g_free(yyvsp[-2].id);
-                       push_funcarg(yyvsp[-4].id);
+                       push_funcarg(yyvsp[-4].id,NULL);
                                                                ;
     break;}
-case 75:
-#line 555 "parse.y"
+case 148:
+#line 1693 "parse.y"
+{
+                       if(strcmp(yyvsp[-2].id,"check")!=0) {
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       g_free(yyvsp[-2].id);
+                       push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
+                                                               ;
+    break;}
+case 149:
+#line 1703 "parse.y"
 { ; ;
     break;}
-case 76:
-#line 556 "parse.y"
+case 150:
+#line 1704 "parse.y"
 { ; ;
     break;}
-case 77:
-#line 559 "parse.y"
+case 151:
+#line 1707 "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"));
@@ -1521,66 +3061,88 @@ case 77:
                        g_free(yyvsp[0].id);
                                        ;
     break;}
-case 78:
-#line 572 "parse.y"
+case 152:
+#line 1724 "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 79:
-#line 576 "parse.y"
+case 153:
+#line 1731 "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 80:
-#line 580 "parse.y"
+case 154:
+#line 1738 "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 81:
-#line 584 "parse.y"
+case 155:
+#line 1745 "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 82:
-#line 588 "parse.y"
+case 156:
+#line 1752 "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 83:
-#line 592 "parse.y"
+case 157:
+#line 1759 "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 84:
-#line 598 "parse.y"
+case 158:
+#line 1768 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
-case 85:
-#line 599 "parse.y"
+case 159:
+#line 1769 "parse.y"
 {
                        yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
                        g_free(yyvsp[0].id);
                                        ;
     break;}
-case 86:
-#line 603 "parse.y"
+case 160:
+#line 1773 "parse.y"
+{ yyval.id = yyvsp[0].id; ;
+    break;}
+case 161:
+#line 1774 "parse.y"
 { yyval.id = yyvsp[0].id; ;
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/lib/bison.simple"
+#line 543 "/usr/lib/bison.simple"
 \f
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1775,6 +3337,30 @@ yyerrhandle:
 
   yystate = yyn;
   goto yynewstate;
+
+ yyacceptlab:
+  /* YYACCEPT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
+#endif
+    }
+  return 0;
+
+ yyabortlab:
+  /* YYABORT comes here.  */
+  if (yyfree_stacks)
+    {
+      free (yyss);
+      free (yyvs);
+#ifdef YYLSP_NEEDED
+      free (yyls);
+#endif
+    }
+  return 1;
 }
-#line 606 "parse.y"
+#line 1777 "parse.y"