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