]> git.draconx.ca Git - gob-dx.git/blobdiff - src/parse.c
Release 2.0.10
[gob-dx.git] / src / parse.c
index 231684732d9c361d8efe8ffff2312033636ce2a7..762e14c4b3010cabfc31573d7c10b460cb106833 100644 (file)
+/* A Bison parser, made by GNU Bison 1.875c.  */
 
-/*  A Bison parser, made from parse.y
-    by GNU Bison version 1.28  */
-
-#define YYBISON 1  /* Identify Bison output.  */
-
-#define        CLASS   257
-#define        FROM    258
-#define        CONST   259
-#define        VOID    260
-#define        STRUCT  261
-#define        UNION   262
-#define        ENUM    263
-#define        THREEDOTS       264
-#define        SIGNED  265
-#define        UNSIGNED        266
-#define        LONG    267
-#define        SHORT   268
-#define        INT     269
-#define        FLOAT   270
-#define        DOUBLE  271
-#define        CHAR    272
-#define        ONERROR 273
-#define        TOKEN   274
-#define        NUMBER  275
-#define        TYPETOKEN       276
-#define        CCODE   277
-#define        HCODE   278
-#define        PUBLIC  279
-#define        PRIVATE 280
-#define        ARGUMENT        281
-#define        VIRTUAL 282
-#define        SIGNAL  283
-#define        OVERRIDE        284
-
-#line 21 "parse.y"
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Written by Richard Stallman by simplifying the original so called
+   ``semantic'' parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     CLASS = 258,
+     FROM = 259,
+     CONST = 260,
+     VOID = 261,
+     STRUCT = 262,
+     UNION = 263,
+     ENUM = 264,
+     THREEDOTS = 265,
+     SIGNED = 266,
+     UNSIGNED = 267,
+     LONG = 268,
+     SHORT = 269,
+     INT = 270,
+     FLOAT = 271,
+     DOUBLE = 272,
+     CHAR = 273,
+     TOKEN = 274,
+     NUMBER = 275,
+     TYPETOKEN = 276,
+     ARRAY_DIM = 277,
+     SINGLE_CHAR = 278,
+     CCODE = 279,
+     HTCODE = 280,
+     PHCODE = 281,
+     HCODE = 282,
+     ACODE = 283,
+     ATCODE = 284,
+     STRING = 285,
+     PUBLIC = 286,
+     PRIVATE = 287,
+     PROTECTED = 288,
+     CLASSWIDE = 289,
+     PROPERTY = 290,
+     ARGUMENT = 291,
+     VIRTUAL = 292,
+     SIGNAL = 293,
+     OVERRIDE = 294,
+     NICK = 295,
+     BLURB = 296,
+     MAXIMUM = 297,
+     MINIMUM = 298,
+     DEFAULT_VALUE = 299,
+     ERROR = 300,
+     FLAGS = 301,
+     TYPE = 302,
+     FLAGS_TYPE = 303,
+     ENUM_TYPE = 304,
+     PARAM_TYPE = 305,
+     BOXED_TYPE = 306,
+     OBJECT_TYPE = 307
+   };
+#endif
+#define CLASS 258
+#define FROM 259
+#define CONST 260
+#define VOID 261
+#define STRUCT 262
+#define UNION 263
+#define ENUM 264
+#define THREEDOTS 265
+#define SIGNED 266
+#define UNSIGNED 267
+#define LONG 268
+#define SHORT 269
+#define INT 270
+#define FLOAT 271
+#define DOUBLE 272
+#define CHAR 273
+#define TOKEN 274
+#define NUMBER 275
+#define TYPETOKEN 276
+#define ARRAY_DIM 277
+#define SINGLE_CHAR 278
+#define CCODE 279
+#define HTCODE 280
+#define PHCODE 281
+#define HCODE 282
+#define ACODE 283
+#define ATCODE 284
+#define STRING 285
+#define PUBLIC 286
+#define PRIVATE 287
+#define PROTECTED 288
+#define CLASSWIDE 289
+#define PROPERTY 290
+#define ARGUMENT 291
+#define VIRTUAL 292
+#define SIGNAL 293
+#define OVERRIDE 294
+#define NICK 295
+#define BLURB 296
+#define MAXIMUM 297
+#define MINIMUM 298
+#define DEFAULT_VALUE 299
+#define ERROR 300
+#define FLAGS 301
+#define TYPE 302
+#define FLAGS_TYPE 303
+#define ENUM_TYPE 304
+#define PARAM_TYPE 305
+#define BOXED_TYPE 306
+#define OBJECT_TYPE 307
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 23 "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;
+
 void free(void *ptr);
 int yylex(void);
 
 extern int ccode_line;
 extern int line_no;
+extern gboolean for_cpp;
 
 extern char *yytext;
 
@@ -79,77 +232,171 @@ yyerror(char *str)
        if(strcmp(yytext,"\n")==0) {
                out=g_strconcat("Error: ",str," before newline",NULL);
        } else if(yytext[0]=='\0') {
-               out=g_strconcat("Error: ",str," at end of input",NULL);
+               out=g_strconcat("Error: ", str, " at end of input", NULL);
        } else {
                char *tmp = g_strdup(yytext);
-               while((p=strchr(tmp,'\n')))
+               while((p=strchr(tmp, '\n')))
                        *p='.';
 
-               out=g_strconcat("Error: ",str," before '",tmp,"'",NULL);
+               out=g_strconcat("Error: ", str, " before '", tmp, "'", NULL);
                g_free(tmp);
        }
 
-       fprintf(stderr,"%s:%d: %s\n",filename,line_no,out);
+       fprintf(stderr, "%s:%d: %s\n", filename, line_no, out);
        g_free(out);
        
        exit(1);
 }
 
-static void
-push_variable(char *name, int scope, int line_no)
+static Type *
+pop_type(void)
 {
-       Node *var;
        Type *type = typestack->data;
        typestack = g_list_remove(typestack,typestack->data);
+       return type;
+}
+
+static void
+push_variable (char *name, int scope, int line_no, char *postfix)
+{
+       Node *var;
+       Type *type = pop_type ();
+
+       type->postfix = postfix;
        
-       var = new_variable(scope,type,name,line_no);
+       var = node_new (VARIABLE_NODE,
+                       "scope", scope,
+                       "vtype:steal", type,
+                       "id:steal", name,
+                       "line_no", line_no,
+                       "destructor_unref", destructor_unref,
+                       "destructor:steal", destructor,
+                       "destructor_line", destructor_line,
+                       "destructor_simple", destructor_simple,
+                       "initializer:steal", initializer,
+                       "initializer_line", initializer_line,
+                       NULL);
        class_nodes = g_list_append(class_nodes, var);
 }
 
 static void
-push_function(int scope, char *oid, char *id, char *onerror,
-             GString *cbuf,int line_no, int ccode_line, int vararg)
+push_function (int scope, int method, char *oid, char *id,
+              GString *cbuf, int line_no, int ccode_line,
+              gboolean vararg, GList *flags)
 {
        Node *node;
        Type *type;
+       char *c_cbuf;
+
+       g_assert(scope != CLASS_SCOPE);
        
-       if(scope!=INIT_METHOD && scope!=CLASS_INIT_METHOD) {
-               type = typestack->data;
-               typestack = g_list_remove(typestack,typestack->data);
+       if(method == INIT_METHOD || method == CLASS_INIT_METHOD) {
+               type = (Type *)node_new (TYPE_NODE,
+                                        "name", "void",
+                                        NULL);
        } else {
-               type = (Type *)new_type(0,g_strdup("void"));
+               type = pop_type();
        }
        
        /* a complicated and ugly test to figure out if we have
           the wrong number of types for a signal */
-       if((scope == SIGNAL_FIRST_METHOD ||
-           scope == SIGNAL_LAST_METHOD ||
-           scope == PRIVATE_SIGNAL_FIRST_METHOD ||
-           scope == PRIVATE_SIGNAL_LAST_METHOD) &&
+       if((method == SIGNAL_FIRST_METHOD ||
+           method == SIGNAL_LAST_METHOD) &&
           g_list_length(gtktypes) != g_list_length(funcargs) &&
           !(g_list_length(funcargs) == 1 &&
             g_list_length(gtktypes) == 2 &&
-            strcmp(gtktypes->next->data,"NONE")==0)) {
-               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"));
+                       }
+               }
        }
-       node = new_method(scope,type,oid,gtktypes,id,funcargs,
-                         onerror,cbuf,line_no,ccode_line,vararg);
+       if(cbuf) {
+               char *p;
+               c_cbuf = p = cbuf->str;
+               while(p && *p && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))
+                       p++;
+               if(!p || !*p)
+                       c_cbuf = NULL;
+       } else
+               c_cbuf = NULL;
+
+       node = node_new (METHOD_NODE,
+                        "scope", scope,
+                        "method", method,
+                        "mtype:steal", type,
+                        "otype:steal", oid,
+                        "gtktypes:steal", gtktypes,
+                        "flags:steal", flags,
+                        "id:steal", id,
+                        "args:steal", funcargs,
+                        "onerror:steal", onerror,
+                        "defreturn:steal", defreturn,
+                        "cbuf:steal", c_cbuf,
+                        "line_no", line_no,
+                        "ccode_line", ccode_line,
+                        "vararg", vararg,
+                        "unique_id", method_unique_id++,
+                        NULL);
+
+       last_added_method = (Method *)node;
+
+       if(cbuf)
+               g_string_free(cbuf,
+                             /*only free segment if we haven't passed it
+                               above */
+                             c_cbuf?FALSE:TRUE);
        gtktypes = NULL;
        funcargs = NULL;
 
+       onerror = NULL;
+       defreturn = NULL;
+
        class_nodes = g_list_append(class_nodes, node);
 }
 
 static void
-push_funcarg(char *name)
+free_all_global_state(void)
+{
+       g_free(onerror);
+       onerror = NULL;
+       g_free(defreturn);
+       defreturn = NULL;
+
+       g_free(chunk_size);
+       chunk_size = NULL;
+       
+       g_list_foreach(gtktypes, (GFunc)g_free, NULL);
+       g_list_free(gtktypes);
+       gtktypes = NULL;
+
+       node_list_free (funcargs);
+       funcargs = NULL;
+}
+
+static void
+push_funcarg(char *name, char *postfix)
 {
        Node *node;
-       Type *type = typestack->data;
-       typestack = g_list_remove(typestack,typestack->data);
+       Type *type = pop_type();
+
+       type->postfix = postfix;
        
-       node = new_funcarg(type,name,checks);
+       node = node_new (FUNCARG_NODE,
+                        "atype:steal", type,
+                        "name:steal", name,
+                        "checks:steal", checks,
+                        NULL);
        checks = NULL;
        
        funcargs = g_list_append(funcargs, node);
@@ -167,608 +414,1469 @@ push_init_arg(char *name, int is_class)
        else
                tn = g_strdup(((Class *)class)->otype);
 
-       type = new_type(1,tn);
-       node = new_funcarg((Type *)type,name,NULL);
+       type = node_new (TYPE_NODE,
+                        "name:steal", tn,
+                        "pointer", "*",
+                        NULL);
+       node = node_new (FUNCARG_NODE,
+                        "atype:steal", (Type *)type,
+                        "name:steal", name,
+                        NULL);
        funcargs = g_list_prepend(funcargs, node);
 }
 
 static void
-push_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));
-       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 = g_strdup ("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) {
+                       char *type = make_me_type (prop->extra_gtktype,
+                                                  "G_TYPE_BOXED");
+                       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,
+                                             type,
+                                             root, prop->name,
+                                             type,
+                                             root, prop->name);
+                       get = g_strdup_printf("g_value_set_boxed (VAL, %s->%s);",
+                                             root, prop->name);
+                       g_free (type);
+               } 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 (for_cpp) {
+                               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);
+                               }  else if (strcmp (prop->gtktype, "POINTER") == 0) {
+                                       setcast = "(gpointer) ";
+                                       getcast = g_strdup_printf ("(%s%s) ",
+                                                                 prop->ptype->name,
+                                                                 prop->ptype->pointer ? prop->ptype->pointer : "");
+                               }
+                       }
+
+                       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);
+       } 
+}
+
 
-#line 174 "parse.y"
-typedef union {
+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);
+}
+
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 628 "parse.y"
+typedef union YYSTYPE {
        char *id;
        GString *cbuf;
        GList *list;
        int line;
        int sigtype;
 } YYSTYPE;
-#ifndef YYDEBUG
-#define YYDEBUG 1
+/* Line 191 of yacc.c.  */
+#line 793 "parse.c"
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
-#include <stdio.h>
 
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
-#endif
 
+/* Copy the second part of user declarations.  */
 
 
-#define        YYFINAL         198
-#define        YYFLAG          -32768
-#define        YYNTBASE        45
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 284 ? yytranslate[x] : 73)
-
-static const char yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    43,     2,     2,     2,     2,     2,     2,    34,
-    35,    37,     2,    38,    44,     2,     2,     2,    40,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,    33,    42,
-    39,    41,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    31,    36,    32,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     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
-};
+/* Line 214 of yacc.c.  */
+#line 805 "parse.c"
 
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     4,     7,    10,    12,    15,    18,    20,    22,    27,
-    32,    35,    38,    41,    43,    45,    47,    52,    57,    69,
-    78,    82,    83,    87,    89,    91,    94,    96,    99,   102,
-   105,   107,   110,   113,   115,   117,   119,   121,   124,   126,
-   128,   131,   133,   136,   138,   140,   142,   144,   146,   149,
-   151,   155,   159,   162,   165,   167,   172,   176,   178,   181,
-   183,   193,   203,   212,   225,   235,   245,   251,   254,   258,
-   261,   262,   264,   266,   270,   272,   276,   278,   282,   284,
-   287,   294,   297,   299,   301,   304,   307,   311,   315,   319,
-   323,   325,   328
-};
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
 
-static const short yyrhs[] = {    46,
-    47,    46,     0,    47,    46,     0,    46,    47,     0,    47,
-     0,    46,    23,     0,    46,    24,     0,    23,     0,    24,
-     0,    48,    31,    49,    32,     0,     3,    22,     4,    22,
-     0,    49,    64,     0,    49,    50,     0,    49,    51,     0,
-    64,     0,    50,     0,    51,     0,    25,    54,    20,    33,
-     0,    26,    54,    20,    33,     0,    27,    52,    20,    20,
-    20,    31,    23,    20,    31,    23,    33,     0,    27,    52,
-    20,    20,    20,    31,    23,    33,     0,    34,    53,    35,
-     0,     0,    20,    36,    53,     0,    20,     0,    55,     0,
-     5,    55,     0,    56,     0,    56,    59,     0,    12,    57,
-     0,    11,    57,     0,    57,     0,    12,    18,     0,    11,
-    18,     0,    18,     0,    17,     0,    16,     0,    20,     0,
-    58,    20,     0,    22,     0,     6,     0,    13,    15,     0,
-    13,     0,    14,    15,     0,    14,     0,    15,     0,     9,
-     0,     8,     0,     7,     0,    37,    59,     0,    37,     0,
-    26,    20,    61,     0,    20,    26,    61,     0,    26,    61,
-     0,    20,    61,     0,    61,     0,    20,    34,    62,    35,
-     0,    62,    38,    20,     0,    20,     0,    31,    23,     0,
-    33,     0,    29,    60,    54,    20,    34,    66,    35,    65,
-    63,     0,    28,    26,    54,    20,    34,    66,    35,    65,
-    63,     0,    28,    54,    20,    34,    66,    35,    65,    63,
-     0,    30,    34,    22,    35,    54,    20,    34,    66,    35,
-    65,    31,    23,     0,    25,    54,    20,    34,    66,    35,
-    65,    31,    23,     0,    26,    54,    20,    34,    66,    35,
-    65,    31,    23,     0,    20,    34,    20,    35,    63,     0,
-    19,    72,     0,    19,    31,    23,     0,    39,    40,     0,
-     0,     6,     0,    20,     0,    20,    38,    67,     0,    67,
-     0,    68,    38,    10,     0,    68,     0,    68,    38,    69,
-     0,    69,     0,    54,    20,     0,    54,    20,    34,    20,
-    70,    35,     0,    70,    71,     0,    71,     0,    20,     0,
-    41,    72,     0,    42,    72,     0,    41,    39,    72,     0,
-    42,    39,    72,     0,    39,    39,    72,     0,    43,    39,
-    72,     0,    21,     0,    44,    21,     0,    20,     0
-};
+# ifndef YYFREE
+#  define YYFREE free
+# endif
+# ifndef YYMALLOC
+#  define YYMALLOC malloc
+# endif
 
-#endif
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-   193,   194,   195,   196,   199,   203,   207,   211,   217,   224,
-   229,   230,   231,   232,   233,   234,   237,   240,   244,   273,
-   299,   300,   303,   306,   312,   313,   321,   325,   332,   335,
-   338,   341,   344,   347,   350,   353,   356,   359,   363,   366,
-   371,   374,   377,   380,   383,   388,   391,   394,   399,   400,
-   403,   415,   427,   430,   442,   447,   452,   455,   460,   461,
-   465,   475,   485,   495,   501,   506,   511,   532,   533,   537,
-   538,   541,   542,   553,   563,   566,   567,   570,   571,   574,
-   577,   587,   588,   591,   604,   608,   612,   616,   620,   624,
-   630,   631,   635
-};
-#endif
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   define YYSTACK_ALLOC alloca
+#  endif
+# else
+#  if defined (alloca) || defined (_ALLOCA_H)
+#   define YYSTACK_ALLOC alloca
+#  else
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   endif
+#  endif
+# endif
 
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+# else
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
+#  endif
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+# endif
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
 
-static const char * const yytname[] = {   "$","error","$undefined.","CLASS",
-"FROM","CONST","VOID","STRUCT","UNION","ENUM","THREEDOTS","SIGNED","UNSIGNED",
-"LONG","SHORT","INT","FLOAT","DOUBLE","CHAR","ONERROR","TOKEN","NUMBER","TYPETOKEN",
-"CCODE","HCODE","PUBLIC","PRIVATE","ARGUMENT","VIRTUAL","SIGNAL","OVERRIDE",
-"'{'","'}'","';'","'('","')'","'|'","'*'","','","'='","'1'","'>'","'<'","'!'",
-"'-'","prog","ccodes","class","classdec","classcode","variable","argument","argflags",
-"flaglist","type","type1","type2","integer","tspecifier","stars","fullsigtype",
-"sigtype","tokenlist","codenocode","method","onerror","funcargs","arglist","arglist1",
-"arg","checklist","check","numtok", NULL
-};
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+        || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  short yyss;
+  YYSTYPE yyvs;
+  };
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))                                \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined (__GNUC__) && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)             \
+      do                                       \
+       {                                       \
+         register YYSIZE_T yyi;                \
+         for (yyi = 0; yyi < (Count); yyi++)   \
+           (To)[yyi] = (From)[yyi];            \
+       }                                       \
+      while (0)
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)                                       \
+    do                                                                 \
+      {                                                                        \
+       YYSIZE_T yynewbytes;                                            \
+       YYCOPY (&yyptr->Stack, Stack, yysize);                          \
+       Stack = &yyptr->Stack;                                          \
+       yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+       yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                        \
+    while (0)
+
 #endif
 
-static const short yyr1[] = {     0,
-    45,    45,    45,    45,    46,    46,    46,    46,    47,    48,
-    49,    49,    49,    49,    49,    49,    50,    50,    51,    51,
-    52,    52,    53,    53,    54,    54,    55,    55,    56,    56,
-    56,    56,    56,    56,    56,    56,    56,    56,    56,    56,
-    57,    57,    57,    57,    57,    58,    58,    58,    59,    59,
-    60,    60,    60,    60,    60,    61,    62,    62,    63,    63,
-    64,    64,    64,    64,    64,    64,    64,    65,    65,    65,
-    65,    66,    66,    66,    66,    67,    67,    68,    68,    69,
-    69,    70,    70,    71,    71,    71,    71,    71,    71,    71,
-    72,    72,    72
+#if defined (__STDC__) || defined (__cplusplus)
+   typedef signed char yysigned_char;
+#else
+   typedef short yysigned_char;
+#endif
+
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL  23
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   572
+
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS  66
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS  53
+/* YYNRULES -- Number of rules. */
+#define YYNRULES  189
+/* YYNRULES -- Number of states. */
+#define YYNSTATES  398
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   307
+
+#define YYTRANSLATE(YYX)                                               \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const unsigned 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,    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,    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,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52
 };
 
-static const short yyr2[] = {     0,
-     3,     2,     2,     1,     2,     2,     1,     1,     4,     4,
-     2,     2,     2,     1,     1,     1,     4,     4,    11,     8,
-     3,     0,     3,     1,     1,     2,     1,     2,     2,     2,
-     1,     2,     2,     1,     1,     1,     1,     2,     1,     1,
-     2,     1,     2,     1,     1,     1,     1,     1,     2,     1,
-     3,     3,     2,     2,     1,     4,     3,     1,     2,     1,
-     9,     9,     8,    12,     9,     9,     5,     2,     3,     2,
-     0,     1,     1,     3,     1,     3,     1,     3,     1,     2,
-     6,     2,     1,     1,     2,     2,     3,     3,     3,     3,
-     1,     2,     1
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const unsigned short yyprhs[] =
+{
+       0,     0,     3,     7,    10,    13,    15,    17,    19,    21,
+      23,    25,    27,    30,    33,    36,    39,    41,    43,    45,
+      47,    52,    56,    62,    63,    69,    75,    81,    84,    86,
+      88,    91,    95,    97,    99,   101,   103,   105,   107,   109,
+     111,   114,   118,   121,   125,   128,   131,   133,   135,   136,
+     142,   149,   162,   172,   179,   183,   184,   196,   205,   211,
+     215,   216,   220,   222,   224,   229,   231,   233,   237,   241,
+     245,   249,   253,   257,   261,   265,   269,   273,   277,   281,
+     285,   289,   293,   297,   301,   303,   309,   311,   315,   316,
+     320,   322,   325,   327,   329,   331,   334,   337,   340,   344,
+     348,   351,   354,   357,   359,   362,   364,   367,   369,   371,
+     373,   375,   377,   379,   381,   383,   385,   387,   389,   391,
+     393,   396,   399,   403,   406,   408,   412,   416,   419,   421,
+     426,   430,   432,   435,   437,   448,   460,   470,   480,   489,
+     501,   510,   516,   519,   524,   525,   527,   530,   532,   534,
+     537,   540,   544,   549,   554,   556,   560,   562,   566,   568,
+     571,   575,   582,   590,   593,   595,   597,   600,   603,   607,
+     611,   615,   619,   627,   636,   640,   642,   646,   648,   656,
+     665,   669,   671,   679,   688,   692,   694,   696,   699,   701
 };
 
-static const short yydefact[] = {     0,
-     0,     7,     8,     0,     4,     0,     0,     5,     6,     3,
-     2,     0,     0,     1,     0,     0,     0,    22,     0,     0,
-     0,     0,    15,    16,    14,    10,     0,     0,    40,    48,
-    47,    46,     0,     0,    42,    44,    45,    36,    35,    34,
-    37,    39,     0,    25,    27,    31,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,    55,     0,     9,    12,    13,
-    11,     0,    26,    33,    30,    32,    29,    41,    43,     0,
-    50,    28,    38,     0,    24,     0,     0,     0,     0,     0,
-     0,     0,    54,     0,    53,     0,     0,     0,    17,     0,
-    49,    18,     0,     0,    21,     0,     0,     0,    52,    58,
-     0,    51,     0,     0,     0,    60,    67,    40,    37,     0,
-     0,    75,    77,    79,     0,    23,     0,     0,     0,    56,
-     0,     0,     0,    59,     0,    80,    71,     0,    71,     0,
-     0,    71,    57,     0,     0,    74,     0,     0,     0,     0,
-    76,    78,     0,     0,    71,     0,    71,     0,     0,    93,
-    91,     0,     0,    68,    70,     0,     0,     0,    20,     0,
-    63,     0,     0,    84,     0,     0,     0,     0,     0,    83,
-    69,    92,    65,    66,     0,    62,    61,    71,     0,     0,
-    85,     0,    86,     0,    81,    82,     0,     0,    89,    87,
-    88,    90,    19,     0,    64,     0,     0,     0
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const yysigned_char yyrhs[] =
+{
+      67,     0,    -1,    69,    70,    69,    -1,    70,    69,    -1,
+      69,    70,    -1,    70,    -1,    24,    -1,    27,    -1,    25,
+      -1,    26,    -1,    28,    -1,    29,    -1,    69,    68,    -1,
+      69,   111,    -1,    69,   114,    -1,    69,   116,    -1,    68,
+      -1,   111,    -1,   114,    -1,   116,    -1,    71,    53,    73,
+      54,    -1,    71,    53,    54,    -1,     3,    21,     4,    21,
+      72,    -1,    -1,    55,    19,    19,    56,    72,    -1,    55,
+      19,    21,    56,    72,    -1,    55,    19,    20,    56,    72,
+      -1,    73,    74,    -1,    74,    -1,   102,    -1,    19,   102,
+      -1,    19,    21,   102,    -1,    79,    -1,    80,    -1,    82,
+      -1,    57,    -1,    31,    -1,    32,    -1,    33,    -1,    34,
+      -1,    19,    19,    -1,    19,    53,    24,    -1,    58,   118,
+      -1,    58,    53,    24,    -1,    76,    77,    -1,    77,    76,
+      -1,    77,    -1,    76,    -1,    -1,    75,    91,    19,    78,
+      57,    -1,    75,    91,    19,    22,    78,    57,    -1,    36,
+      89,    88,    19,    81,    19,    53,    24,    19,    53,    24,
+      57,    -1,    36,    89,    88,    19,    81,    19,    53,    24,
+      57,    -1,    36,    89,    88,    19,    81,    19,    -1,    55,
+      19,    56,    -1,    -1,    35,    19,    19,    83,    19,    53,
+      24,    19,    53,    24,    57,    -1,    35,    19,    19,    83,
+      19,    53,    24,    57,    -1,    35,    19,    19,    83,    57,
+      -1,    55,    84,    56,    -1,    -1,    84,    59,    87,    -1,
+      87,    -1,    30,    -1,    19,    55,    30,    56,    -1,   118,
+      -1,    85,    -1,    40,    58,    85,    -1,    41,    58,    85,
+      -1,    42,    58,   118,    -1,    43,    58,   118,    -1,    44,
+      58,    86,    -1,    46,    58,    90,    -1,    47,    58,    91,
+      -1,    48,    58,    21,    -1,    48,    58,    19,    -1,    49,
+      58,    21,    -1,    49,    58,    19,    -1,    50,    58,    21,
+      -1,    50,    58,    19,    -1,    51,    58,    21,    -1,    51,
+      58,    19,    -1,    52,    58,    21,    -1,    52,    58,    19,
+      -1,    19,    -1,    19,    55,    19,    91,    56,    -1,    19,
+      -1,    55,    90,    56,    -1,    -1,    19,    60,    90,    -1,
+      19,    -1,    92,    96,    -1,    92,    -1,    93,    -1,    19,
+      -1,     5,    19,    -1,    19,     5,    -1,    95,    19,    -1,
+       5,    95,    19,    -1,    95,    19,     5,    -1,    94,    93,
+      -1,    21,    93,    -1,     5,    93,    -1,    21,    -1,    21,
+       5,    -1,    94,    -1,    94,     5,    -1,     6,    -1,    18,
+      -1,    14,    -1,    15,    -1,    13,    -1,    16,    -1,    17,
+      -1,    11,    -1,    12,    -1,     7,    -1,     8,    -1,     9,
+      -1,    61,    -1,    61,     5,    -1,    61,    96,    -1,    61,
+       5,    96,    -1,    19,    99,    -1,    99,    -1,    75,    19,
+      99,    -1,    19,    75,    99,    -1,    75,    99,    -1,    97,
+      -1,    19,    55,   100,    56,    -1,   100,    59,    19,    -1,
+      19,    -1,    53,    24,    -1,    57,    -1,    38,    89,    98,
+      91,    19,    55,   105,    56,   103,   101,    -1,    75,    38,
+      89,    97,    91,    19,    55,   105,    56,   103,   101,    -1,
+      37,    75,    91,    19,    55,   105,    56,   103,   101,    -1,
+      75,    37,    91,    19,    55,   105,    56,   103,   101,    -1,
+      37,    91,    19,    55,   105,    56,   103,   101,    -1,    39,
+      55,    21,    56,    91,    19,    55,   105,    56,   103,   101,
+      -1,    75,    91,    19,    55,   105,    56,   103,   101,    -1,
+      19,    55,    19,    56,   101,    -1,    19,   104,    -1,    19,
+     104,    19,   104,    -1,    -1,   118,    -1,    53,    24,    -1,
+       6,    -1,    19,    -1,    19,     5,    -1,     5,    19,    -1,
+      19,    59,   106,    -1,    19,     5,    59,   106,    -1,     5,
+      19,    59,   106,    -1,   106,    -1,   107,    59,    10,    -1,
+     107,    -1,   107,    59,   108,    -1,   108,    -1,    91,    19,
+      -1,    91,    19,    22,    -1,    91,    19,    55,    19,   109,
+      56,    -1,    91,    19,    22,    55,    19,   109,    56,    -1,
+     109,   110,    -1,   110,    -1,    19,    -1,    62,   118,    -1,
+      63,   118,    -1,    62,    58,   118,    -1,    63,    58,   118,
+      -1,    58,    58,   118,    -1,    64,    58,   118,    -1,     9,
+      19,    53,   112,    54,    21,    57,    -1,     9,    19,    53,
+     112,    59,    54,    21,    57,    -1,   112,    59,   113,    -1,
+     113,    -1,    19,    58,   118,    -1,    19,    -1,    46,    19,
+      53,   115,    54,    21,    57,    -1,    46,    19,    53,   115,
+      59,    54,    21,    57,    -1,   115,    59,    19,    -1,    19,
+      -1,    45,    19,    53,   117,    54,    21,    57,    -1,    45,
+      19,    53,   117,    59,    54,    21,    57,    -1,   117,    59,
+      19,    -1,    19,    -1,    20,    -1,    65,    20,    -1,    23,
+      -1,    19,    -1
 };
 
-static const short yydefgoto[] = {   196,
-     4,     5,     6,    22,    23,    24,    50,    76,   110,    44,
-    45,    46,    47,    72,    55,    56,   101,   107,    25,   140,
-   111,   112,   113,   114,   169,   170,   154
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const unsigned short yyrline[] =
+{
+       0,   649,   649,   650,   651,   652,   655,   664,   673,   682,
+     691,   700,   711,   712,   713,   714,   715,   716,   717,   718,
+     721,   726,   733,   747,   748,   760,   769,   783,   784,   787,
+     788,   797,   809,   810,   811,   812,   815,   816,   817,   818,
+     821,   841,   865,   869,   877,   878,   879,   880,   881,   887,
+     890,   895,   963,  1017,  1106,  1114,  1119,  1167,  1203,  1219,
+    1220,  1223,  1224,  1227,  1228,  1240,  1241,  1244,  1250,  1256,
+    1262,  1268,  1274,  1280,  1287,  1293,  1299,  1305,  1311,  1317,
+    1323,  1329,  1335,  1341,  1347,  1372,  1381,  1387,  1388,  1391,
+    1394,  1400,  1407,  1416,  1419,  1422,  1426,  1430,  1434,  1439,
+    1447,  1451,  1456,  1460,  1463,  1467,  1470,  1475,  1476,  1477,
+    1478,  1479,  1480,  1481,  1482,  1483,  1486,  1487,  1488,  1491,
+    1492,  1493,  1497,  1504,  1516,  1522,  1534,  1546,  1549,  1555,
+    1560,  1563,  1568,  1569,  1573,  1589,  1605,  1621,  1637,  1648,
+    1654,  1664,  1687,  1698,  1717,  1723,  1724,  1730,  1731,  1742,
+    1753,  1764,  1774,  1784,  1794,  1797,  1798,  1801,  1802,  1805,
+    1808,  1811,  1819,  1829,  1830,  1833,  1850,  1857,  1864,  1871,
+    1878,  1885,  1894,  1903,  1914,  1915,  1918,  1938,  1948,  1957,
+    1968,  1971,  1976,  1985,  1996,  1999,  2005,  2006,  2010,  2011
 };
+#endif
 
-static const short yypact[] = {    21,
-   -18,-32768,-32768,    68,    66,    20,    54,-32768,-32768,    66,
-   155,   171,     0,   155,    48,   116,   116,    52,    61,   -14,
-    59,   160,-32768,-32768,-32768,-32768,    29,   151,-32768,-32768,
--32768,-32768,    81,   189,   111,   120,-32768,-32768,-32768,-32768,
--32768,-32768,   117,-32768,    64,-32768,   124,   133,   135,   152,
-   116,   154,   150,   163,   116,-32768,   186,-32768,-32768,-32768,
--32768,   158,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   148,
-    64,-32768,-32768,   161,   173,   175,   191,   192,   179,   180,
-   195,   196,-32768,    28,-32768,   197,   183,    86,-32768,   134,
--32768,-32768,   134,   135,-32768,   199,   187,   134,-32768,-32768,
-   -22,-32768,   188,   116,   200,-32768,-32768,   185,    18,   204,
-   190,-32768,   193,-32768,   194,-32768,   201,   134,   198,-32768,
-   206,   134,   207,-32768,   116,   202,    41,    98,    41,   205,
-   203,    41,-32768,   208,   210,-32768,   214,    -6,   209,   211,
--32768,-32768,   215,    26,    41,    86,    41,   134,    22,-32768,
--32768,   212,   216,-32768,-32768,   217,   218,   219,-32768,    86,
--32768,    86,   213,-32768,   220,    -3,     8,   221,    -9,-32768,
--32768,-32768,-32768,-32768,   222,-32768,-32768,    41,    -1,    -1,
--32768,    -1,-32768,    -1,-32768,-32768,   223,   224,-32768,-32768,
--32768,-32768,-32768,   228,-32768,   230,   239,-32768
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "CLASS", "FROM", "CONST", "VOID",
+  "STRUCT", "UNION", "ENUM", "THREEDOTS", "SIGNED", "UNSIGNED", "LONG",
+  "SHORT", "INT", "FLOAT", "DOUBLE", "CHAR", "TOKEN", "NUMBER",
+  "TYPETOKEN", "ARRAY_DIM", "SINGLE_CHAR", "CCODE", "HTCODE", "PHCODE",
+  "HCODE", "ACODE", "ATCODE", "STRING", "PUBLIC", "PRIVATE", "PROTECTED",
+  "CLASSWIDE", "PROPERTY", "ARGUMENT", "VIRTUAL", "SIGNAL", "OVERRIDE",
+  "NICK", "BLURB", "MAXIMUM", "MINIMUM", "DEFAULT_VALUE", "ERROR", "FLAGS",
+  "TYPE", "FLAGS_TYPE", "ENUM_TYPE", "PARAM_TYPE", "BOXED_TYPE",
+  "OBJECT_TYPE", "'{'", "'}'", "'('", "')'", "';'", "'='", "','", "'|'",
+  "'*'", "'>'", "'<'", "'!'", "'-'", "$accept", "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", 0
 };
+#endif
 
-static const short yypgoto[] = {-32768,
-    45,   243,-32768,-32768,   231,   232,-32768,   164,   -16,   229,
--32768,   172,-32768,   181,-32768,   -44,-32768,    15,   240,  -124,
-   -91,   136,-32768,   137,-32768,    94,   -82
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const unsigned short yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   123,   125,    40,    41,    59,    61,    44,
+     124,    42,    62,    60,    33,    45
 };
+# endif
 
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const unsigned char yyr1[] =
+{
+       0,    66,    67,    67,    67,    67,    68,    68,    68,    68,
+      68,    68,    69,    69,    69,    69,    69,    69,    69,    69,
+      70,    70,    71,    72,    72,    72,    72,    73,    73,    74,
+      74,    74,    74,    74,    74,    74,    75,    75,    75,    75,
+      76,    76,    77,    77,    78,    78,    78,    78,    78,    79,
+      79,    80,    80,    80,    81,    81,    82,    82,    82,    83,
+      83,    84,    84,    85,    85,    86,    86,    87,    87,    87,
+      87,    87,    87,    87,    87,    87,    87,    87,    87,    87,
+      87,    87,    87,    87,    87,    88,    88,    89,    89,    90,
+      90,    91,    91,    92,    92,    92,    92,    92,    92,    92,
+      93,    93,    93,    93,    93,    93,    93,    94,    94,    94,
+      94,    94,    94,    94,    94,    94,    95,    95,    95,    96,
+      96,    96,    96,    97,    97,    98,    98,    98,    98,    99,
+     100,   100,   101,   101,   102,   102,   102,   102,   102,   102,
+     102,   102,   103,   103,   103,   104,   104,   105,   105,   105,
+     105,   105,   105,   105,   105,   106,   106,   107,   107,   108,
+     108,   108,   108,   109,   109,   110,   110,   110,   110,   110,
+     110,   110,   111,   111,   112,   112,   113,   113,   114,   114,
+     115,   115,   116,   116,   117,   117,   118,   118,   118,   118
+};
 
-#define        YYLAST          265
-
-
-static const short yytable[] = {    43,
-    48,   115,    52,     7,   143,    53,   119,   146,    83,    85,
-   164,    54,   120,   150,   151,   121,   150,   151,   150,   151,
-   160,    26,   162,     1,   152,   185,   131,   150,   151,   165,
-   134,   166,   167,   168,    78,   180,    99,   153,    86,   102,
-   153,   164,   153,     2,     3,   158,   182,    80,    62,    11,
-    12,   153,   -73,   188,    14,   125,   163,    13,   159,   138,
-   165,    82,   166,   167,   168,    28,    29,    30,    31,    32,
-     1,    33,    34,    35,    36,    37,    38,    39,    40,   139,
-    41,    27,    42,   181,   183,    49,    51,   123,     2,     3,
-     8,     9,    57,    35,    36,    37,   189,   190,    64,   191,
-    71,   192,    28,    29,    30,    31,    32,   141,    33,    34,
-    35,    36,    37,    38,    39,    40,   105,    41,   106,    42,
-    28,    29,    30,    31,    32,    68,    33,    34,    35,    36,
-    37,    38,    39,    40,    69,    41,    70,    42,    28,   108,
-    30,    31,    32,    73,    33,    34,    35,    36,    37,    38,
-    39,    40,    74,   109,    75,    42,    29,    30,    31,    32,
-   161,    33,    34,    35,    36,    37,    38,    39,    40,    80,
-    41,    77,    42,    79,   176,    81,   177,     8,     9,    15,
-    89,    90,    84,    82,    16,    17,    18,    19,    20,    21,
-    15,    58,    88,    92,    93,    16,    17,    18,    19,    20,
-    21,    35,    36,    37,    65,    67,    66,    87,    94,    95,
-    96,    97,    98,    82,    80,   100,   103,   104,   117,   -72,
-   118,   122,   124,   126,   127,   133,   135,   144,   129,   197,
-   128,   130,   132,   149,   171,   137,   172,   145,   198,   173,
-   174,   156,   147,   148,   187,   157,    10,   178,   155,   175,
-   195,    91,    59,    60,   194,   193,    63,   116,   179,   184,
-   136,    61,   186,     0,   142
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const unsigned char yyr2[] =
+{
+       0,     2,     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 yycheck[] = {    16,
-    17,    93,    19,    22,   129,    20,    98,   132,    53,    54,
-    20,    26,    35,    20,    21,    38,    20,    21,    20,    21,
-   145,    22,   147,     3,    31,    35,   118,    20,    21,    39,
-   122,    41,    42,    43,    51,    39,    81,    44,    55,    84,
-    44,    20,    44,    23,    24,    20,    39,    20,    20,     5,
-    31,    44,    35,   178,    10,    38,   148,     4,    33,    19,
-    39,    34,    41,    42,    43,     5,     6,     7,     8,     9,
-     3,    11,    12,    13,    14,    15,    16,    17,    18,    39,
-    20,    34,    22,   166,   167,    34,    26,   104,    23,    24,
-    23,    24,    34,    13,    14,    15,   179,   180,    18,   182,
-    37,   184,     5,     6,     7,     8,     9,    10,    11,    12,
-    13,    14,    15,    16,    17,    18,    31,    20,    33,    22,
-     5,     6,     7,     8,     9,    15,    11,    12,    13,    14,
-    15,    16,    17,    18,    15,    20,    20,    22,     5,     6,
-     7,     8,     9,    20,    11,    12,    13,    14,    15,    16,
-    17,    18,    20,    20,    20,    22,     6,     7,     8,     9,
-   146,    11,    12,    13,    14,    15,    16,    17,    18,    20,
-    20,    20,    22,    20,   160,    26,   162,    23,    24,    20,
-    33,    34,    20,    34,    25,    26,    27,    28,    29,    30,
-    20,    32,    35,    33,    34,    25,    26,    27,    28,    29,
-    30,    13,    14,    15,    33,    34,    18,    22,    36,    35,
-    20,    20,    34,    34,    20,    20,    20,    35,    20,    35,
-    34,    34,    23,    20,    35,    20,    20,    23,    35,     0,
-    38,    31,    35,    20,    23,    34,    21,    35,     0,    23,
-    23,    31,    35,    34,    23,    31,     4,    35,    40,    31,
-    23,    71,    22,    22,    31,    33,    28,    94,    39,    39,
-   125,    22,   169,    -1,   128
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const unsigned char yydefact[] =
+{
+       0,     0,     0,     6,     8,     9,     7,    10,    11,     0,
+       0,     0,    16,     0,     5,     0,    17,    18,    19,     0,
+       0,     0,     0,     1,    12,     4,    13,    14,    15,     3,
+       0,     0,     0,     0,     0,     2,     0,    36,    37,    38,
+      39,     0,    88,     0,    88,     0,    21,    35,     0,    28,
+       0,    32,    33,    34,    29,    23,   177,     0,   175,   185,
+       0,   181,     0,     0,     0,     0,     0,    30,     0,     0,
+       0,     0,   107,   116,   117,   118,   114,   115,   111,   109,
+     110,   112,   113,   108,    94,   103,     0,     0,    92,    93,
+     105,     0,     0,     0,    20,    27,     0,    88,     0,     0,
+      22,     0,     0,     0,     0,     0,     0,     0,    31,     0,
+       0,    60,    90,     0,    86,     0,     0,    95,   102,     0,
+      96,   104,   101,     0,     0,   119,    91,   106,   100,    97,
+       0,     0,   128,     0,   124,     0,     0,     0,    48,     0,
+     189,   186,   188,     0,   176,     0,     0,   174,     0,   184,
+       0,     0,   180,     0,     0,     0,     0,     0,     0,    87,
+       0,    55,    98,     0,     0,   120,   121,    99,     0,     0,
+       0,   123,     0,   127,     0,     0,     0,     0,     0,     0,
+      48,     0,     0,    47,    46,     0,     0,     0,     0,   187,
+     172,     0,   182,     0,   178,     0,     0,   133,   141,    84,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    62,     0,    58,    89,     0,     0,     0,
+       0,     0,   107,    94,     0,     0,   154,   156,   158,   122,
+     131,     0,   126,   125,     0,     0,     0,     0,    40,     0,
+       0,     0,     0,    42,    44,    45,    49,    23,    23,    23,
+     173,   183,   179,   132,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    59,     0,     0,     0,
+       0,    53,     0,    95,    96,     0,   159,   144,     0,   129,
+       0,     0,     0,     0,     0,    41,    50,   144,    43,    24,
+      26,    25,     0,    63,    67,    68,    69,    70,   189,    66,
+      71,    65,    72,    73,    75,    74,    77,    76,    79,    78,
+      81,    80,    83,    82,    61,     0,    85,    54,     0,   144,
+       0,     0,   151,   160,     0,     0,     0,   155,   157,   130,
+       0,     0,   144,     0,     0,     0,     0,    57,     0,     0,
+     153,   152,     0,     0,     0,   142,   145,   138,   144,     0,
+       0,     0,   140,     0,     0,     0,    52,   136,     0,   165,
+       0,     0,     0,     0,     0,   164,   146,     0,     0,   144,
+     137,   144,    64,     0,     0,     0,     0,     0,   166,     0,
+     167,     0,   161,   163,   143,   134,     0,     0,    56,     0,
+     162,   170,   168,   169,   171,   139,   135,    51
 };
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/lib/bison.simple"
-/* This file comes from bison-1.28.  */
 
-/* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+/* YYDEFGOTO[NTERM-NUM]. */
+static const short yydefgoto[] =
+{
+      -1,    11,    12,    13,    14,    15,   100,    48,    49,    50,
+     183,   184,   185,    51,    52,   219,    53,   157,   212,   294,
+     300,   213,   115,    70,   113,   224,    88,    89,    90,    91,
+     126,   132,   133,   134,   231,   198,    54,   326,   345,   225,
+     226,   227,   228,   364,   365,    16,    57,    58,    17,    62,
+      18,    60,   346
+};
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -317
+static const short yypact[] =
+{
+     137,     4,    45,  -317,  -317,  -317,  -317,  -317,  -317,    99,
+     106,   134,  -317,   137,   170,    98,  -317,  -317,  -317,   156,
+     124,   125,   157,  -317,  -317,   170,  -317,  -317,  -317,   170,
+     154,   181,   209,   214,   222,   170,   215,  -317,  -317,  -317,
+    -317,   225,   196,   310,   196,   204,  -317,  -317,   188,  -317,
+     276,  -317,  -317,  -317,  -317,   217,   216,   113,  -317,  -317,
+     117,  -317,   146,   241,   301,   267,   276,  -317,   284,   292,
+     293,   357,  -317,  -317,  -317,  -317,  -317,  -317,  -317,  -317,
+    -317,  -317,  -317,  -317,   325,   425,   374,   317,   299,  -317,
+     439,   318,   231,   346,  -317,  -317,   374,   196,   358,   365,
+    -317,    74,   373,    76,   380,    84,   390,    90,  -317,   362,
+     409,   377,   375,   378,   392,   414,   453,  -317,  -317,   429,
+    -317,   453,  -317,   430,   406,     2,  -317,   453,  -317,   457,
+     224,   444,  -317,   374,  -317,   416,   454,   456,   126,   149,
+    -317,  -317,  -317,   458,  -317,   419,   459,  -317,   420,  -317,
+     460,   422,  -317,   461,    70,   428,   258,    21,   292,  -317,
+     465,   431,  -317,   432,   391,   299,  -317,  -317,   433,   466,
+     470,  -317,    -6,  -317,   471,   374,   436,    -6,   374,    26,
+       0,   391,     7,   434,   474,   437,   440,   441,   442,  -317,
+    -317,   438,  -317,   443,  -317,   445,   475,  -317,  -317,  -317,
+     446,   447,   448,   449,   450,   451,   452,   455,   462,   463,
+     464,   467,    91,  -317,   473,  -317,  -317,   374,   482,   484,
+     391,   408,   468,     6,   492,   472,  -317,   476,  -317,  -317,
+    -317,   147,  -317,  -317,   477,   493,   391,   495,  -317,   491,
+     479,   478,   494,  -317,  -317,  -317,  -317,   217,   217,   217,
+    -317,  -317,  -317,  -317,     1,     1,    74,    74,     9,   292,
+     374,   218,   219,   247,   248,   252,  -317,   258,   499,   481,
+     483,   480,   485,   153,   158,   374,    94,   497,   340,  -317,
+     498,   391,   487,   488,   490,  -317,  -317,   497,  -317,  -317,
+    -317,  -317,   496,  -317,  -317,  -317,  -317,  -317,   496,  -317,
+    -317,  -317,  -317,  -317,  -317,  -317,  -317,  -317,  -317,  -317,
+    -317,  -317,  -317,  -317,  -317,    47,  -317,  -317,   503,   497,
+     374,   374,  -317,   500,   510,    27,    70,  -317,  -317,  -317,
+     501,   391,   497,   391,    70,   489,   505,  -317,    54,    70,
+    -317,  -317,   511,    57,   507,   519,  -317,  -317,   497,   504,
+      70,   506,  -317,   508,   516,   512,  -317,  -317,    57,  -317,
+     509,    64,    66,   513,    50,  -317,  -317,    27,    70,   497,
+    -317,   497,  -317,   486,   522,    79,    74,    74,  -317,    74,
+    -317,    74,  -317,  -317,  -317,  -317,    70,    70,  -317,   502,
+    -317,  -317,  -317,  -317,  -317,  -317,  -317,  -317
+};
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+/* YYPGOTO[NTERM-NUM].  */
+static const short yypgoto[] =
+{
+    -317,  -317,     8,    82,   534,  -317,   -17,  -317,   515,   -31,
+     364,   366,   370,  -317,  -317,  -317,  -317,  -317,  -317,   -54,
+    -317,   285,  -317,   -29,  -154,   -42,  -317,   -68,  -317,   -62,
+    -109,   417,  -317,   -95,  -317,  -316,   -22,  -281,   186,  -179,
+    -220,  -317,   278,   203,  -247,    97,  -317,   469,   145,  -317,
+     200,  -317,  -101
+};
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -151
+static const short yytable[] =
+{
+     144,    87,   241,   118,   216,    66,   334,   165,    98,   119,
+     347,   274,    86,   168,    67,    92,   166,   122,   352,   179,
+     292,    24,   128,   357,   110,    19,   140,   141,   298,   141,
+     142,   293,   142,    66,   370,   171,   173,    24,   339,   293,
+     214,   272,   108,    24,   123,   238,   140,   141,   118,   169,
+     142,   350,   385,   118,   136,   322,   229,   283,   182,   118,
+     242,   131,  -148,   125,    20,   275,   336,   368,   137,   359,
+     395,   396,   143,   355,   143,   232,   359,   233,   215,   239,
+     344,   243,   171,   140,   141,   140,   141,   142,   386,   142,
+     387,   174,   143,   140,   141,    56,    29,   142,   359,   170,
+     340,   341,   330,   149,   337,   302,   382,    35,   360,   152,
+      26,   356,   361,   362,   363,   360,   323,   383,    21,   361,
+     362,   363,   377,   196,   379,    22,    26,   197,   383,   143,
+     146,   143,    26,   235,    23,   390,   237,   360,   150,   143,
+       1,   361,   362,   363,   153,   179,     2,   266,   180,   324,
+     267,    30,   349,   118,   351,   296,   297,   301,    27,   119,
+      31,     3,     4,     5,     6,     7,     8,   102,   186,   187,
+     188,   104,   103,    36,    27,   269,   105,    32,    33,     2,
+      27,   181,     9,    10,   182,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,     3,     4,     5,     6,     7,     8,
+     106,   295,    55,   279,   299,   107,   280,    36,    46,  -150,
+      34,    47,   320,    28,  -149,     9,    10,   321,   303,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    56,    28,
+     289,   290,   291,    59,    63,    28,    64,   304,   306,   305,
+     307,    61,    94,   168,    68,    47,    37,    38,    39,    40,
+     130,    69,    43,    44,    45,    37,    38,    39,    40,    93,
+     378,   380,    37,    38,    39,    40,   308,   310,   309,   311,
+      65,   312,    99,   313,   101,   391,   392,   199,   393,   169,
+     394,    71,    72,    73,    74,    75,   109,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    65,    85,   200,   201,
+     202,   203,   204,   111,   205,   206,   207,   208,   209,   210,
+     211,   112,   114,    96,    97,    71,    72,    73,    74,    75,
+      63,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+     120,    85,    37,    38,    39,    40,   124,   129,    43,    44,
+      45,    37,    38,    39,    40,    71,    72,    73,    74,    75,
+     327,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+     125,    85,   116,    72,    73,    74,    75,   135,    76,    77,
+      78,    79,    80,    81,    82,    83,   117,   138,    85,    71,
+      72,    73,    74,    75,   139,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,   145,    85,   221,   222,    73,    74,
+      75,   148,    76,    77,    78,    79,    80,    81,    82,    83,
+     223,   151,    85,   116,    72,    73,    74,    75,   154,    76,
+      77,    78,    79,    80,    81,    82,    83,   273,   155,    85,
+     121,    72,   156,   161,   159,   158,    76,    77,    78,    79,
+      80,    81,    82,    83,   127,    72,    85,   160,   162,   163,
+      76,    77,    78,    79,    80,    81,    82,    83,   116,    72,
+      85,   164,   167,   172,    76,    77,    78,    79,    80,    81,
+      82,    83,   175,   176,    85,   177,   190,   192,   189,   194,
+     191,   193,   195,   181,   217,   230,   218,   220,   169,   168,
+     234,   236,   182,   179,   246,   250,   247,   248,   249,   253,
+     251,   270,   252,   271,   254,   255,   256,   257,   258,   259,
+     260,   276,   282,   261,   284,   285,   325,   329,   288,   353,
+     262,   263,   264,   315,  -147,   265,   268,   338,   277,   343,
+     358,   366,   281,   318,   287,   278,   286,   316,   367,   317,
+     373,   319,   331,   388,   332,   333,   389,    25,   245,   244,
+     240,   335,   314,   384,   178,   342,   328,   348,   354,   397,
+     369,   375,   371,    95,   372,   374,     0,   376,     0,     0,
+       0,   381,   147
+};
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+static const short yycheck[] =
+{
+     101,    43,   181,    71,   158,    36,   287,     5,    50,    71,
+     326,     5,    43,    19,    36,    44,   125,    85,   334,    19,
+      19,    13,    90,   339,    66,    21,    19,    20,    19,    20,
+      23,    30,    23,    64,   350,   130,   131,    29,   319,    30,
+      19,   220,    64,    35,    86,    19,    19,    20,   116,    55,
+      23,   332,   368,   121,    96,   275,   165,   236,    58,   127,
+      53,    92,    56,    61,    19,    59,    19,   348,    97,    19,
+     386,   387,    65,    19,    65,   170,    19,   172,    57,    53,
+      53,   182,   177,    19,    20,    19,    20,    23,   369,    23,
+     371,   133,    65,    19,    20,    19,    14,    23,    19,   130,
+     320,   321,   281,    19,    57,   259,    56,    25,    58,    19,
+      13,    57,    62,    63,    64,    58,    22,   364,    19,    62,
+      63,    64,    58,    53,    58,    19,    29,    57,   375,    65,
+      54,    65,    35,   175,     0,    56,   178,    58,    54,    65,
+       3,    62,    63,    64,    54,    19,     9,    56,    22,    55,
+      59,    53,   331,   221,   333,   256,   257,   258,    13,   221,
+       4,    24,    25,    26,    27,    28,    29,    54,    19,    20,
+      21,    54,    59,    19,    29,   217,    59,    53,    53,     9,
+      35,    55,    45,    46,    58,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    24,    25,    26,    27,    28,    29,
+      54,   255,    21,    56,   258,    59,    59,    19,    54,    56,
+      53,    57,    59,    13,    56,    45,    46,    59,   260,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    19,    29,
+     247,   248,   249,    19,    19,    35,    21,    19,    19,    21,
+      21,    19,    54,    19,    19,    57,    31,    32,    33,    34,
+      19,    55,    37,    38,    39,    31,    32,    33,    34,    55,
+     361,   362,    31,    32,    33,    34,    19,    19,    21,    21,
+      55,    19,    55,    21,    58,   376,   377,    19,   379,    55,
+     381,     5,     6,     7,     8,     9,    19,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    55,    21,    40,    41,
+      42,    43,    44,    19,    46,    47,    48,    49,    50,    51,
+      52,    19,    19,    37,    38,     5,     6,     7,     8,     9,
+      19,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+       5,    21,    31,    32,    33,    34,    19,    19,    37,    38,
+      39,    31,    32,    33,    34,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      61,    21,     5,     6,     7,     8,     9,    21,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    19,    21,     5,
+       6,     7,     8,     9,    19,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    21,    21,     5,     6,     7,     8,
+       9,    21,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    21,    21,     5,     6,     7,     8,     9,    56,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    19,    21,
+       5,     6,    55,    19,    56,    60,    11,    12,    13,    14,
+      15,    16,    17,    18,     5,     6,    21,    55,    19,    19,
+      11,    12,    13,    14,    15,    16,    17,    18,     5,     6,
+      21,    55,     5,    19,    11,    12,    13,    14,    15,    16,
+      17,    18,    56,    19,    21,    19,    57,    57,    20,    57,
+      21,    21,    21,    55,    19,    19,    55,    55,    55,    19,
+      19,    55,    58,    19,    57,    57,    56,    56,    56,    24,
+      57,    19,    57,    19,    58,    58,    58,    58,    58,    58,
+      58,    19,    19,    58,    19,    24,    19,    19,    24,    30,
+      58,    58,    58,    24,    56,    58,    53,    24,    56,    19,
+      19,    24,    55,    53,    56,    59,    57,    56,    19,    56,
+      24,    56,    55,    57,    56,    55,    24,    13,   184,   183,
+     180,    55,   267,   367,   137,    55,   278,    56,    53,    57,
+      56,   358,    56,    48,    56,    53,    -1,    58,    -1,    -1,
+      -1,    58,   103
+};
 
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const unsigned char yystos[] =
+{
+       0,     3,     9,    24,    25,    26,    27,    28,    29,    45,
+      46,    67,    68,    69,    70,    71,   111,   114,   116,    21,
+      19,    19,    19,     0,    68,    70,   111,   114,   116,    69,
+      53,     4,    53,    53,    53,    69,    19,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    54,    57,    73,    74,
+      75,    79,    80,    82,   102,    21,    19,   112,   113,    19,
+     117,    19,   115,    19,    21,    55,    75,   102,    19,    55,
+      89,     5,     6,     7,     8,     9,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    21,    75,    91,    92,    93,
+      94,    95,    89,    55,    54,    74,    37,    38,    91,    55,
+      72,    58,    54,    59,    54,    59,    54,    59,   102,    19,
+      91,    19,    19,    90,    19,    88,     5,    19,    93,    95,
+       5,     5,    93,    91,    19,    61,    96,     5,    93,    19,
+      19,    75,    97,    98,    99,    21,    91,    89,    19,    19,
+      19,    20,    23,    65,   118,    21,    54,   113,    21,    19,
+      54,    21,    19,    54,    56,    19,    55,    83,    60,    56,
+      55,    19,    19,    19,    55,     5,    96,     5,    19,    55,
+      75,    99,    19,    99,    91,    56,    19,    19,    97,    19,
+      22,    55,    58,    76,    77,    78,    19,    20,    21,    20,
+      57,    21,    57,    21,    57,    21,    53,    57,   101,    19,
+      40,    41,    42,    43,    44,    46,    47,    48,    49,    50,
+      51,    52,    84,    87,    19,    57,    90,    19,    55,    81,
+      55,     5,     6,    19,    91,   105,   106,   107,   108,    96,
+      19,   100,    99,    99,    19,    91,    55,    91,    19,    53,
+      78,   105,    53,   118,    77,    76,    57,    56,    56,    56,
+      57,    57,    57,    24,    58,    58,    58,    58,    58,    58,
+      58,    58,    58,    58,    58,    58,    56,    59,    53,    91,
+      19,    19,   105,    19,     5,    59,    19,    56,    59,    56,
+      59,    55,    19,   105,    19,    24,    57,    56,    24,    72,
+      72,    72,    19,    30,    85,    85,   118,   118,    19,    85,
+      86,   118,    90,    91,    19,    21,    19,    21,    19,    21,
+      19,    21,    19,    21,    87,    24,    56,    56,    53,    56,
+      59,    59,   106,    22,    55,    19,   103,    10,   108,    19,
+     105,    55,    56,    55,   103,    55,    19,    57,    24,   103,
+     106,   106,    55,    19,    53,   104,   118,   101,    56,   105,
+     103,   105,   101,    30,    53,    19,    57,   101,    19,    19,
+      58,    62,    63,    64,   109,   110,    24,    19,   103,    56,
+     101,    56,    56,    24,    53,   109,    58,    58,   118,    58,
+     118,    58,    56,   110,   104,   101,   103,   103,    57,    24,
+      56,   118,   118,   118,   118,   101,   101,    57
+};
 
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-        instead, just don't use alloca.  */
-#include <malloc.h>
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
 #endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-                and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
 #endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
-
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# endif
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
 #endif
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
 
 #define yyerrok                (yyerrstatus = 0)
 #define yyclearin      (yychar = YYEMPTY)
-#define YYEMPTY                -2
+#define YYEMPTY                (-2)
 #define YYEOF          0
+
 #define YYACCEPT       goto yyacceptlab
-#define YYABORT        goto yyabortlab
-#define YYERROR                goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
+#define YYABORT                goto yyabortlab
+#define YYERROR                goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
+
 #define YYFAIL         goto yyerrlab
+
 #define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
+
+#define YYBACKUP(Token, Value)                                 \
 do                                                             \
   if (yychar == YYEMPTY && yylen == 1)                         \
-    { yychar = (token), yylval = (value);                      \
-      yychar1 = YYTRANSLATE (yychar);                          \
+    {                                                          \
+      yychar = (Token);                                                \
+      yylval = (Value);                                                \
+      yytoken = YYTRANSLATE (yychar);                          \
       YYPOPSTACK;                                              \
       goto yybackup;                                           \
     }                                                          \
   else                                                         \
-    { yyerror ("syntax error: cannot back up"); YYERROR; }     \
+    {                                                          \
+      yyerror ("syntax error: cannot back up");\
+      YYERROR;                                                 \
+    }                                                          \
 while (0)
 
 #define YYTERROR       1
 #define YYERRCODE      256
 
-#ifndef YYPURE
-#define YYLEX          yylex()
-#endif
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+   are run).  */
 
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX          yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX          yylex(&yylval, &yylloc)
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)               \
+   ((Current).first_line   = (Rhs)[1].first_line,      \
+    (Current).first_column = (Rhs)[1].first_column,    \
+    (Current).last_line    = (Rhs)[N].last_line,       \
+    (Current).last_column  = (Rhs)[N].last_column)
 #endif
-#else /* not YYLSP_NEEDED */
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
 #ifdef YYLEX_PARAM
-#define YYLEX          yylex(&yylval, YYLEX_PARAM)
+# define YYLEX yylex (YYLEX_PARAM)
 #else
-#define YYLEX          yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
+# define YYLEX yylex ()
 #endif
 
-/* If nonreentrant, generate the variables here */
-
-#ifndef YYPURE
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                       \
+do {                                           \
+  if (yydebug)                                 \
+    YYFPRINTF Args;                            \
+} while (0)
+
+# define YYDSYMPRINT(Args)                     \
+do {                                           \
+  if (yydebug)                                 \
+    yysymprint Args;                           \
+} while (0)
+
+# define YYDSYMPRINTF(Title, Token, Value, Location)           \
+do {                                                           \
+  if (yydebug)                                                 \
+    {                                                          \
+      YYFPRINTF (stderr, "%s ", Title);                                \
+      yysymprint (stderr,                                      \
+                  Token, Value);       \
+      YYFPRINTF (stderr, "\n");                                        \
+    }                                                          \
+} while (0)
 
-int    yychar;                 /*  the lookahead symbol                */
-YYSTYPE        yylval;                 /*  the semantic value of the           */
-                               /*  lookahead symbol                    */
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
 
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;                        /*  location data for the lookahead     */
-                               /*  symbol                              */
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_stack_print (short *bottom, short *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    short *bottom;
+    short *top;
 #endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (/* Nothing. */; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
 
-int yynerrs;                   /*  number of parse errors so far       */
-#endif  /* not YYPURE */
+# define YY_STACK_PRINT(Bottom, Top)                           \
+do {                                                           \
+  if (yydebug)                                                 \
+    yy_stack_print ((Bottom), (Top));                          \
+} while (0)
 
-#if YYDEBUG != 0
-int yydebug;                   /*  nonzero means print parse trace     */
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
-#endif
 
-/*  YYINITDEPTH indicates the initial size of the parser's stacks      */
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_reduce_print (int yyrule)
+#else
+static void
+yy_reduce_print (yyrule)
+    int yyrule;
+#endif
+{
+  int yyi;
+  unsigned int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+             yyrule - 1, yylno);
+  /* Print the symbols being reduced, and their result.  */
+  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
+  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+}
 
+# define YY_REDUCE_PRINT(Rule)         \
+do {                                   \
+  if (yydebug)                         \
+    yy_reduce_print (Rule);            \
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YYDSYMPRINT(Args)
+# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef        YYINITDEPTH
-#define YYINITDEPTH 200
+# define YYINITDEPTH 200
 #endif
 
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
 
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
+#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
+# undef YYMAXDEPTH
 #endif
 
 #ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
+# define YYMAXDEPTH 10000
 #endif
+
 \f
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
-
-#if __GNUC__ > 1               /* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)     __builtin_memcpy(TO,FROM,COUNT)
-#else                          /* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined (__GLIBC__) && defined (_STRING_H)
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+#   if defined (__STDC__) || defined (__cplusplus)
+yystrlen (const char *yystr)
+#   else
+yystrlen (yystr)
+     const char *yystr;
+#   endif
+{
+  register const char *yys = yystr;
+
+  while (*yys++ != '\0')
+    continue;
+
+  return yys - yystr - 1;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+#   if defined (__STDC__) || defined (__cplusplus)
+yystpcpy (char *yydest, const char *yysrc)
+#   else
+yystpcpy (yydest, yysrc)
+     char *yydest;
+     const char *yysrc;
+#   endif
 {
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+  register char *yyd = yydest;
+  register const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
 
-  while (i-- > 0)
-    *t++ = *f++;
+  return yyd - 1;
 }
+#  endif
+# endif
 
-#else /* __cplusplus */
+#endif /* !YYERROR_VERBOSE */
 
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
+\f
+
+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
+#else
 static void
-__yy_memcpy (char *to, char *from, unsigned int count)
+yysymprint (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
 {
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+
+  if (yytype < YYNTOKENS)
+    {
+      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+    }
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-  while (i-- > 0)
-    *t++ = *f++;
+  switch (yytype)
+    {
+      default:
+        break;
+    }
+  YYFPRINTF (yyoutput, ")");
 }
 
+#endif /* ! YYDEBUG */
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yydestruct (int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yytype, yyvaluep)
+    int yytype;
+    YYSTYPE *yyvaluep;
 #endif
-#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+
+  switch (yytype)
+    {
+
+      default:
+        break;
+    }
+}
 \f
-#line 217 "/usr/lib/bison.simple"
 
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
+/* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-#ifdef YYPARSE_PARAM
-int yyparse (void *);
-#else
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM);
+# else
+int yyparse ();
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
 int yyparse (void);
+#else
+int yyparse ();
 #endif
-#endif
+#endif /* ! YYPARSE_PARAM */
 
-int
-yyparse(YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;     /*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;             /*  lookahead token as an internal (translated) token number */
 
-  short        yyssa[YYINITDEPTH];     /*  the state stack                     */
-  YYSTYPE yyvsa[YYINITDEPTH];  /*  the semantic value stack            */
 
-  short *yyss = yyssa;         /*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;       /*  to allow yyoverflow to reallocate them elsewhere */
+/* The lookahead symbol.  */
+int yychar;
 
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];  /*  the location stack                  */
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
 
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
+/* Number of syntax errors so far.  */
+int yynerrs;
 
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
 
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
 
-  YYSTYPE yyval;               /*  the variable used to return         */
-                               /*  semantic values from the action     */
-                               /*  routines                            */
+/*----------.
+| yyparse.  |
+`----------*/
 
-  int yylen;
+#ifdef YYPARSE_PARAM
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM)
+# else
+int yyparse (YYPARSE_PARAM)
+  void *YYPARSE_PARAM;
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int
+yyparse (void)
+#else
+int
+yyparse ()
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
 #endif
+#endif
+{
+  
+  register int yystate;
+  register int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  short        yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
+  register short *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  register YYSTYPE *yyvsp;
+
+
+
+#define YYPOPSTACK   (yyvsp--, yyssp--)
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
+  /* When reducing, the number of symbols on the RHS of the reduced
+     rule.  */
+  int yylen;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
@@ -780,110 +1888,96 @@ yyparse(YYPARSE_PARAM_ARG)
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
-  yyssp = yyss - 1;
+  yyssp = yyss;
   yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
 
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
+  goto yysetstate;
 
-  *++yyssp = yystate;
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed. so pushing a state here evens the stacks.
+     */
+  yyssp++;
 
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
+ yysetstate:
+  *yyssp = yystate;
 
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
       /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
+      YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-        the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-        but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-                &yyss1, size * sizeof (*yyssp),
-                &yyvs1, size * sizeof (*yyvsp),
-                &yyls1, size * sizeof (*yylsp),
-                &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-                &yyss1, size * sizeof (*yyssp),
-                &yyvs1, size * sizeof (*yyvsp),
-                &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
+      {
+       /* Give user a chance to reallocate the stack. Use copies of
+          these so that the &'s don't force the real ones into
+          memory.  */
+       YYSTYPE *yyvs1 = yyvs;
+       short *yyss1 = yyss;
+
+
+       /* Each stack pointer address is followed by the size of the
+          data in use in that stack, in bytes.  This used to be a
+          conditional around just the two extra args, but that might
+          be undefined if yyoverflow is a macro.  */
+       yyoverflow ("parser stack overflow",
+                   &yyss1, yysize * sizeof (*yyssp),
+                   &yyvs1, yysize * sizeof (*yyvsp),
+
+                   &yystacksize);
+
+       yyss = yyss1;
+       yyvs = yyvs1;
+      }
 #else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyoverflowlab;
+# else
       /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-       {
-         yyerror("parser stack overflow");
-         if (yyfree_stacks)
-           {
-             free (yyss);
-             free (yyvs);
-#ifdef YYLSP_NEEDED
-             free (yyls);
-#endif
-           }
-         return 2;
-       }
+      if (YYMAXDEPTH <= yystacksize)
+       goto yyoverflowlab;
       yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
+      if (YYMAXDEPTH < yystacksize)
        yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-                  size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-                  size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-                  size * (unsigned int) sizeof (*yylsp));
-#endif
+
+      {
+       short *yyss1 = yyss;
+       union yyalloc *yyptr =
+         (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+       if (! yyptr)
+         goto yyoverflowlab;
+       YYSTACK_RELOCATE (yyss);
+       YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+       if (yyss1 != yyssa)
+         YYSTACK_FREE (yyss1);
+      }
+# endif
 #endif /* no yyoverflow */
 
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
 
-#if YYDEBUG != 0
-      if (yydebug)
-       fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
 
-      if (yyssp >= yyss + yystacksize - 1)
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                 (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
        YYABORT;
     }
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
   goto yybackup;
- yybackup:
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
 
 /* Do appropriate processing given the current state.  */
 /* Read a lookahead token if we need one and don't already have one.  */
@@ -892,1020 +1986,2325 @@ yynewstate:
   /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
-  if (yyn == YYFLAG)
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
 
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
-#if YYDEBUG != 0
-      if (yydebug)
-       fprintf(stderr, "Reading a token: ");
-#endif
+      YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)             /* This means end of input. */
+  if (yychar <= YYEOF)
     {
-      yychar1 = 0;
-      yychar = YYEOF;          /* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-       fprintf(stderr, "Now at end of input.\n");
-#endif
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
-      if (yydebug)
-       {
-         fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-         /* Give the individual parser a way to print the precise meaning
-            of a token, for further debugging info.  */
-#ifdef YYPRINT
-         YYPRINT (stderr, yychar, yylval);
-#endif
-         fprintf (stderr, ")\n");
-       }
-#endif
+      yytoken = YYTRANSLATE (yychar);
+      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
     }
 
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
     goto yydefault;
-
   yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
+  if (yyn <= 0)
     {
-      if (yyn == YYFLAG)
+      if (yyn == 0 || yyn == YYTABLE_NINF)
        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
-  else if (yyn == 0)
-    goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
   /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
+  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
 
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
 
   yystate = yyn;
   goto yynewstate;
 
-/* Do the default action for the current state.  */
-yydefault:
 
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
   yyn = yydefact[yystate];
   if (yyn == 0)
     goto yyerrlab;
+  goto yyreduce;
+
 
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
 yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
   yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
 
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      int i;
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
 
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-              yyn, yyrline[yyn]);
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
 
-      /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-       fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
 
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 649 "parse.y"
+    { ; }
+    break;
+
+  case 3:
+#line 650 "parse.y"
+    { ; }
+    break;
+
+  case 4:
+#line 651 "parse.y"
+    { ; }
+    break;
+
+  case 5:
+#line 652 "parse.y"
+    { ; }
+    break;
+
+  case 6:
+#line 655 "parse.y"
+    {
+                       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;
 
-  switch (yyn) {
-
-case 1:
-#line 193 "parse.y"
-{ ; ;
-    break;}
-case 2:
-#line 194 "parse.y"
-{ ; ;
-    break;}
-case 3:
-#line 195 "parse.y"
-{ ; ;
-    break;}
-case 4:
-#line 196 "parse.y"
-{ ; ;
-    break;}
-case 5:
-#line 199 "parse.y"
-{
-                       Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line);
+  case 7:
+#line 664 "parse.y"
+    {
+                       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);
-                                       ;
-    break;}
-case 6:
-#line 203 "parse.y"
-{
-                       Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
+                                       }
+    break;
+
+  case 8:
+#line 673 "parse.y"
+    {
+                       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);
-                                       ;
-    break;}
-case 7:
-#line 207 "parse.y"
-{
-                       Node *node = new_ccode(FALSE,yyvsp[0].cbuf,ccode_line);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
+                                       }
+    break;
+
+  case 9:
+#line 682 "parse.y"
+    {
+                       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);
-                                       ;
-    break;}
-case 8:
-#line 211 "parse.y"
-{
-                       Node *node = new_ccode(TRUE,yyvsp[0].cbuf,ccode_line);
+                       g_string_free(yyvsp[0].cbuf,FALSE);
+                                       }
+    break;
+
+  case 10:
+#line 691 "parse.y"
+    {
+                       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);
-                                       ;
-    break;}
-case 9:
-#line 217 "parse.y"
-{
+                       g_string_free(yyvsp[0].cbuf,FALSE);
+                                       }
+    break;
+
+  case 11:
+#line 700 "parse.y"
+    {
+                       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 12:
+#line 711 "parse.y"
+    { ; }
+    break;
+
+  case 13:
+#line 712 "parse.y"
+    { ; }
+    break;
+
+  case 14:
+#line 713 "parse.y"
+    { ; }
+    break;
+
+  case 15:
+#line 714 "parse.y"
+    { ; }
+    break;
+
+  case 16:
+#line 715 "parse.y"
+    { ; }
+    break;
+
+  case 17:
+#line 716 "parse.y"
+    { ; }
+    break;
+
+  case 18:
+#line 717 "parse.y"
+    { ; }
+    break;
+
+  case 19:
+#line 718 "parse.y"
+    { ; }
+    break;
+
+  case 20:
+#line 721 "parse.y"
+    {
                        ((Class *)class)->nodes = class_nodes;
                        class_nodes = NULL;
                        nodes = g_list_append(nodes,class);
-                                               ;
-    break;}
-case 10:
-#line 224 "parse.y"
-{
-                       class = new_class(yyvsp[-2].id,yyvsp[0].id,NULL);
-                                               ;
-    break;}
-case 11:
-#line 229 "parse.y"
-{ ; ;
-    break;}
-case 12:
-#line 230 "parse.y"
-{ ; ;
-    break;}
-case 13:
-#line 231 "parse.y"
-{ ; ;
-    break;}
-case 14:
-#line 232 "parse.y"
-{ ; ;
-    break;}
-case 15:
-#line 233 "parse.y"
-{ ; ;
-    break;}
-case 16:
-#line 234 "parse.y"
-{ ; ;
-    break;}
-case 17:
-#line 237 "parse.y"
-{
-                       push_variable(yyvsp[-1].id,PUBLIC_SCOPE,yyvsp[-3].line);
-                                               ;
-    break;}
-case 18:
-#line 240 "parse.y"
-{
-                       push_variable(yyvsp[-1].id,PRIVATE_SCOPE,yyvsp[-3].line);
-                                               ;
-    break;}
-case 19:
-#line 244 "parse.y"
-{
+                                               }
+    break;
+
+  case 21:
+#line 726 "parse.y"
+    {
+                       ((Class *)class)->nodes = NULL;
+                       class_nodes = NULL;
+                       nodes = g_list_append(nodes,class);
+                                               }
+    break;
+
+  case 22:
+#line 733 "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 24:
+#line 748 "parse.y"
+    {
+                       if(strcmp(yyvsp[-3].id,"chunks") == 0) {
+                               g_free (chunk_size);
+                               chunk_size = g_strdup(yyvsp[-2].id);
+                       } else if(strcmp(yyvsp[-3].id,"BonoboObject") == 0) {
+                               g_free (bonobo_object_class);
+                               bonobo_object_class = g_strdup(yyvsp[-2].id);
+                       } else {
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+               }
+    break;
+
+  case 25:
+#line 760 "parse.y"
+    {
+                       if (strcmp (yyvsp[-3].id, "interface") == 0) {
+                               interfaces = g_list_append (interfaces,
+                                                           g_strdup (yyvsp[-2].id));
+                       } else {
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+               }
+    break;
+
+  case 26:
+#line 769 "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 27:
+#line 783 "parse.y"
+    { ; }
+    break;
+
+  case 28:
+#line 784 "parse.y"
+    { ; }
+    break;
+
+  case 29:
+#line 787 "parse.y"
+    { ; }
+    break;
+
+  case 30:
+#line 788 "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 31:
+#line 797 "parse.y"
+    {
+                       if (strcmp (yyvsp[-2].id, "interface") != 0) {
+                               g_free (yyvsp[-2].id);
+                               g_free (yyvsp[-1].id);
+                               yyerror (_("parse error"));
+                               YYERROR;
+                       }
+                       g_free (yyvsp[-2].id);
+                       node_set ((Node *)last_added_method,
+                                 "interface:steal", yyvsp[-1].id,
+                                 NULL);
+                                               }
+    break;
+
+  case 32:
+#line 809 "parse.y"
+    { ; }
+    break;
+
+  case 33:
+#line 810 "parse.y"
+    { ; }
+    break;
+
+  case 34:
+#line 811 "parse.y"
+    { ; }
+    break;
+
+  case 35:
+#line 812 "parse.y"
+    { ; }
+    break;
+
+  case 36:
+#line 815 "parse.y"
+    { the_scope = PUBLIC_SCOPE; }
+    break;
+
+  case 37:
+#line 816 "parse.y"
+    { the_scope = PRIVATE_SCOPE; }
+    break;
+
+  case 38:
+#line 817 "parse.y"
+    { the_scope = PROTECTED_SCOPE; }
+    break;
+
+  case 39:
+#line 818 "parse.y"
+    { the_scope = CLASS_SCOPE; }
+    break;
+
+  case 40:
+#line 821 "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 41:
+#line 841 "parse.y"
+    {
+                       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 42:
+#line 865 "parse.y"
+    {
+                       initializer = yyvsp[0].id;
+                       initializer_line = ccode_line;
+                               }
+    break;
+
+  case 43:
+#line 869 "parse.y"
+    {
+                       initializer = (yyvsp[0].cbuf)->str;
+                       initializer_line = ccode_line;
+                       g_string_free(yyvsp[0].cbuf, FALSE);
+                               }
+    break;
+
+  case 44:
+#line 877 "parse.y"
+    { ; }
+    break;
+
+  case 45:
+#line 878 "parse.y"
+    { ; }
+    break;
+
+  case 46:
+#line 879 "parse.y"
+    { destructor = NULL; }
+    break;
+
+  case 47:
+#line 880 "parse.y"
+    { initializer = NULL; }
+    break;
+
+  case 48:
+#line 881 "parse.y"
+    {
+                       destructor = NULL;
+                       initializer = NULL;
+                                       }
+    break;
+
+  case 49:
+#line 887 "parse.y"
+    {
+                       push_variable(yyvsp[-2].id, the_scope,yyvsp[-4].line, NULL);
+                                               }
+    break;
+
+  case 50:
+#line 890 "parse.y"
+    {
+                       push_variable(yyvsp[-3].id, the_scope, yyvsp[-5].line, yyvsp[-2].id);
+                                               }
+    break;
+
+  case 51:
+#line 895 "parse.y"
+    {
+                       Node *node = NULL;
                        if(strcmp(yyvsp[-6].id,"get")==0 &&
                           strcmp(yyvsp[-3].id,"set")==0) {
-                               Node *node;
-                               g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
-                               node = new_argument(yyvsp[-8].id,yyvsp[-9].list,yyvsp[-7].id,
-                                                   yyvsp[-4].cbuf,yyvsp[-5].line,
-                                                   yyvsp[-1].cbuf,yyvsp[-2].line,
-                                                   yyvsp[-10].line);
+                               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) {
-                               Node *node;
-                               g_free(yyvsp[-6].id); g_free(yyvsp[-3].id);
-                               node = new_argument(yyvsp[-8].id,yyvsp[-9].list,yyvsp[-7].id,
-                                                   yyvsp[-1].cbuf,yyvsp[-2].line,
-                                                   yyvsp[-4].cbuf,yyvsp[-5].line,
-                                                   yyvsp[-10].line);
+                               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[-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);
+                               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 52:
+#line 963 "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;
                        }
-                                               ;
-    break;}
-case 20:
-#line 273 "parse.y"
-{
-                       if(strcmp(yyvsp[-3].id,"get")==0) {
-                               Node *node;
-                               g_free(yyvsp[-3].id);
-                               node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id,
-                                                   yyvsp[-1].cbuf,yyvsp[-2].line,NULL,0,
-                                                   yyvsp[-7].line);
-                               class_nodes = g_list_append(class_nodes,node);
-                       } else if(strcmp(yyvsp[-3].id,"set")==0) {
-                               Node *node;
+
+                       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 53:
+#line 1017 "parse.y"
+    {
+                       Node *node;
+                       char *get, *set = NULL;
+                       Variable *var;
+                       Type *type;
+                       const 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);
-                               node = new_argument(yyvsp[-5].id,yyvsp[-6].list,yyvsp[-4].id,
-                                                   NULL,0,yyvsp[-1].cbuf,yyvsp[-2].line,
-                                                   yyvsp[-7].line);
-                               class_nodes = g_list_append(class_nodes,node);
+                               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 {
-                               g_free(yyvsp[-3].id); g_free(yyvsp[-5].id);
+                               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 54:
+#line 1106 "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 55:
+#line 1114 "parse.y"
+    {
+                       yyval.id = NULL;
+                                               }
+    break;
+
+  case 56:
+#line 1119 "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 57:
+#line 1167 "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 58:
+#line 1203 "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 59:
+#line 1219 "parse.y"
+    { ; }
+    break;
+
+  case 60:
+#line 1220 "parse.y"
+    { ; }
+    break;
+
+  case 61:
+#line 1223 "parse.y"
+    { ; }
+    break;
+
+  case 62:
+#line 1224 "parse.y"
+    { ; }
+    break;
+
+  case 63:
+#line 1227 "parse.y"
+    { yyval.id = yyvsp[0].id; }
+    break;
+
+  case 64:
+#line 1228 "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 65:
+#line 1240 "parse.y"
+    { yyval.id = yyvsp[0].id; }
+    break;
+
+  case 66:
+#line 1241 "parse.y"
+    { yyval.id = yyvsp[0].id; }
+    break;
+
+  case 67:
+#line 1244 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "nick:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 68:
+#line 1250 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "blurb:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 69:
+#line 1256 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "maximum:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 70:
+#line 1262 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "minimum:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 71:
+#line 1268 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "default_value:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 72:
+#line 1274 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "flags:steal", yyvsp[0].list,
+                         NULL);
+                 }
+    break;
+
+  case 73:
+#line 1280 "parse.y"
+    {
+               Type *type = pop_type ();
+               ensure_property ();
+               node_set ((Node *)property,
+                         "ptype:steal", type,
+                         NULL);
+                 }
+    break;
+
+  case 74:
+#line 1287 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 75:
+#line 1293 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 76:
+#line 1299 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 77:
+#line 1305 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 78:
+#line 1311 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 79:
+#line 1317 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 80:
+#line 1323 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 81:
+#line 1329 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 82:
+#line 1335 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 83:
+#line 1341 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", yyvsp[0].id,
+                         NULL);
+                 }
+    break;
+
+  case 84:
+#line 1347 "parse.y"
+    {
+               ensure_property ();
+               if (strcmp (yyvsp[0].id, "override") == 0) {
+                       g_free(yyvsp[0].id);
+                       node_set ((Node *)property,
+                                 "override", TRUE,
+                                 NULL);
+               } else 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 85:
+#line 1372 "parse.y"
+    {
+                       if(strcmp(yyvsp[-2].id,"type")!=0) {
                                g_free(yyvsp[-4].id);
-                               g_list_foreach(yyvsp[-6].list,(GFunc)g_free,NULL);
-                               g_string_free(yyvsp[-1].cbuf,TRUE);
+                               g_free(yyvsp[-2].id);
                                yyerror(_("parse error"));
                                YYERROR;
                        }
-                                               ;
-    break;}
-case 21:
-#line 299 "parse.y"
-{ yyval.list = yyvsp[-1].list; ;
-    break;}
-case 22:
-#line 300 "parse.y"
-{ yyval.list = NULL; ;
-    break;}
-case 23:
-#line 303 "parse.y"
-{
+                       yyval.id = debool (yyvsp[-4].id);
+                                               }
+    break;
+
+  case 86:
+#line 1381 "parse.y"
+    {
+                       yyval.id = debool (yyvsp[0].id);
+                       typestack = g_list_prepend(typestack,NULL);
+                                               }
+    break;
+
+  case 87:
+#line 1387 "parse.y"
+    { yyval.list = yyvsp[-1].list; }
+    break;
+
+  case 88:
+#line 1388 "parse.y"
+    { yyval.list = NULL; }
+    break;
+
+  case 89:
+#line 1391 "parse.y"
+    {
                        yyval.list = g_list_append(yyvsp[0].list,yyvsp[-2].id);
-                                               ;
-    break;}
-case 24:
-#line 306 "parse.y"
-{
+                                               }
+    break;
+
+  case 90:
+#line 1394 "parse.y"
+    {
                        yyval.list = g_list_append(NULL,yyvsp[0].id);
-                                               ;
-    break;}
-case 25:
-#line 312 "parse.y"
-{ ; ;
-    break;}
-case 26:
-#line 313 "parse.y"
-{
-                       Type *type = typestack->data;
-                       char *oldname = type->name;
-                       type->name = g_strconcat("const ",oldname,NULL);
-                       g_free(oldname);
-                                               ;
-    break;}
-case 27:
-#line 321 "parse.y"
-{
-                       Node *node = new_type(0,yyvsp[0].id);
+                                               }
+    break;
+
+  case 91:
+#line 1400 "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 28:
-#line 325 "parse.y"
-{
-                       Node *node = new_type(stars,yyvsp[-1].id);
-                       stars = 0;
+                                                       }
+    break;
+
+  case 92:
+#line 1407 "parse.y"
+    {
+                       Node *node = node_new (TYPE_NODE, 
+                                              "name:steal", yyvsp[0].id,
+                                              NULL);
                        typestack = g_list_prepend(typestack,node);
-                                               ;
-    break;}
-case 29:
-#line 332 "parse.y"
-{
-                       yyval.id = g_strconcat("unsigned ",yyvsp[0].id,NULL);
-                                               ;
-    break;}
-case 30:
-#line 335 "parse.y"
-{
-                       yyval.id = g_strconcat("signed ",yyvsp[0].id,NULL);
-                                               ;
-    break;}
-case 31:
-#line 338 "parse.y"
-{
-                       yyval.id = g_strdup(yyvsp[0].id);
-                                               ;
-    break;}
-case 32:
-#line 341 "parse.y"
-{
-                       yyval.id = g_strdup("unsigned char");
-                                               ;
-    break;}
-case 33:
-#line 344 "parse.y"
-{
-                       yyval.id = g_strdup("signed char");
-                                               ;
-    break;}
-case 34:
-#line 347 "parse.y"
-{
-                       yyval.id = g_strdup("char");
-                                               ;
-    break;}
-case 35:
-#line 350 "parse.y"
-{
-                       yyval.id = g_strdup("double");
-                                               ;
-    break;}
-case 36:
-#line 353 "parse.y"
-{
-                       yyval.id = g_strdup("float");
-                                               ;
-    break;}
-case 37:
-#line 356 "parse.y"
-{
+                                                       }
+    break;
+
+  case 93:
+#line 1416 "parse.y"
+    {
                        yyval.id = yyvsp[0].id;
-                                               ;
-    break;}
-case 38:
-#line 359 "parse.y"
-{
-                       yyval.id = g_strconcat(yyvsp[-1].id,yyvsp[0].id,NULL);
+                                                       }
+    break;
+
+  case 94:
+#line 1419 "parse.y"
+    {
+                       yyval.id = yyvsp[0].id;
+                                                       }
+    break;
+
+  case 95:
+#line 1422 "parse.y"
+    {
+                       yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
                        g_free(yyvsp[0].id);
-                                               ;
-    break;}
-case 39:
-#line 363 "parse.y"
-{
+                                                       }
+    break;
+
+  case 96:
+#line 1426 "parse.y"
+    {
+                       yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+                       g_free(yyvsp[-1].id);
+                                                       }
+    break;
+
+  case 97:
+#line 1430 "parse.y"
+    {
+                       yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       }
+    break;
+
+  case 98:
+#line 1434 "parse.y"
+    {
+                       yyval.id = g_strconcat("const ", yyvsp[-1].id, " ",
+                                            yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       }
+    break;
+
+  case 99:
+#line 1439 "parse.y"
+    {
+                       yyval.id = g_strconcat(yyvsp[-2].id, " ",
+                                            yyvsp[-1].id, " const", NULL);
+                       g_free(yyvsp[-1].id);
+                                                       }
+    break;
+
+  case 100:
+#line 1447 "parse.y"
+    {
+                       yyval.id = g_strconcat(yyvsp[-1].id, " ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       }
+    break;
+
+  case 101:
+#line 1451 "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 102:
+#line 1456 "parse.y"
+    {
+                       yyval.id = g_strconcat("const ", yyvsp[0].id, NULL);
+                       g_free(yyvsp[0].id);
+                                                       }
+    break;
+
+  case 103:
+#line 1460 "parse.y"
+    {
                        yyval.id = yyvsp[0].id;
-                                               ;
-    break;}
-case 40:
-#line 366 "parse.y"
-{
-                       yyval.id = g_strdup("void");
-                                               ;
-    break;}
-case 41:
-#line 371 "parse.y"
-{
-                       yyval.id = "long int";
-                                               ;
-    break;}
-case 42:
-#line 374 "parse.y"
-{
-                       yyval.id = "long";
-                                               ;
-    break;}
-case 43:
-#line 377 "parse.y"
-{
-                       yyval.id = "short int";
-                                               ;
-    break;}
-case 44:
-#line 380 "parse.y"
-{
-                       yyval.id = "short";
-                                               ;
-    break;}
-case 45:
-#line 383 "parse.y"
-{
-                       yyval.id = "int";
-                                               ;
-    break;}
-case 46:
-#line 388 "parse.y"
-{
-                       yyval.id = "enum ";
-                                               ;
-    break;}
-case 47:
-#line 391 "parse.y"
-{
-                       yyval.id = "union ";
-                                               ;
-    break;}
-case 48:
-#line 394 "parse.y"
-{
-                       yyval.id = "struct ";
-                                               ;
-    break;}
-case 49:
-#line 399 "parse.y"
-{ stars++; ;
-    break;}
-case 50:
-#line 400 "parse.y"
-{ stars++; ;
-    break;}
-case 51:
-#line 403 "parse.y"
-{
-                       if(strcmp(yyvsp[-1].id,"first")==0)
-                               yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD;
-                       else if(strcmp(yyvsp[-1].id,"last")==0)
-                               yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
+                                                       }
+    break;
+
+  case 104:
+#line 1463 "parse.y"
+    {
+                       yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+                       g_free(yyvsp[-1].id);
+                                                       }
+    break;
+
+  case 105:
+#line 1467 "parse.y"
+    {
+                       yyval.id = g_strdup(yyvsp[0].id);
+                                                       }
+    break;
+
+  case 106:
+#line 1470 "parse.y"
+    {
+                       yyval.id = g_strconcat(yyvsp[-1].id, " const", NULL);
+                                                       }
+    break;
+
+  case 107:
+#line 1475 "parse.y"
+    { yyval.id = "void"; }
+    break;
+
+  case 108:
+#line 1476 "parse.y"
+    { yyval.id = "char"; }
+    break;
+
+  case 109:
+#line 1477 "parse.y"
+    { yyval.id = "short"; }
+    break;
+
+  case 110:
+#line 1478 "parse.y"
+    { yyval.id = "int"; }
+    break;
+
+  case 111:
+#line 1479 "parse.y"
+    { yyval.id = "long"; }
+    break;
+
+  case 112:
+#line 1480 "parse.y"
+    { yyval.id = "float"; }
+    break;
+
+  case 113:
+#line 1481 "parse.y"
+    { yyval.id = "double"; }
+    break;
+
+  case 114:
+#line 1482 "parse.y"
+    { yyval.id = "signed"; }
+    break;
+
+  case 115:
+#line 1483 "parse.y"
+    { yyval.id = "unsigned"; }
+    break;
+
+  case 116:
+#line 1486 "parse.y"
+    { yyval.id = "struct"; }
+    break;
+
+  case 117:
+#line 1487 "parse.y"
+    { yyval.id = "union"; }
+    break;
+
+  case 118:
+#line 1488 "parse.y"
+    { yyval.id = "enum"; }
+    break;
+
+  case 119:
+#line 1491 "parse.y"
+    { yyval.id = g_strdup("*"); }
+    break;
+
+  case 120:
+#line 1492 "parse.y"
+    { yyval.id = g_strdup("* const"); }
+    break;
+
+  case 121:
+#line 1493 "parse.y"
+    {
+                               yyval.id = g_strconcat("*", yyvsp[0].id, NULL);
+                               g_free(yyvsp[0].id);
+                                       }
+    break;
+
+  case 122:
+#line 1497 "parse.y"
+    {
+                               yyval.id = g_strconcat("* const", yyvsp[0].id, NULL);
+                               g_free(yyvsp[0].id);
+                                       }
+    break;
+
+  case 123:
+#line 1504 "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 52:
-#line 415 "parse.y"
-{
-                       if(strcmp(yyvsp[-2].id,"first")==0)
-                               yyval.sigtype = PRIVATE_SIGNAL_FIRST_METHOD;
-                       else if(strcmp(yyvsp[-2].id,"last")==0)
-                               yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
+                                       }
+    break;
+
+  case 124:
+#line 1516 "parse.y"
+    {
+                       yyval.sigtype = SIGNAL_LAST_METHOD;
+                                       }
+    break;
+
+  case 125:
+#line 1522 "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[-2].id);
+                               g_free(yyvsp[-1].id);
                                YYERROR;
                        }
-                       g_free(yyvsp[-2].id);
-                                       ;
-    break;}
-case 53:
-#line 427 "parse.y"
-{
-                       yyval.sigtype = PRIVATE_SIGNAL_LAST_METHOD;
-                                       ;
-    break;}
-case 54:
-#line 430 "parse.y"
-{
-                       if(strcmp(yyvsp[-1].id,"first")==0)
+                       g_free(yyvsp[-1].id);
+                                       }
+    break;
+
+  case 126:
+#line 1534 "parse.y"
+    {
+                       if(strcmp(yyvsp[-2].id,"first")==0)
                                yyval.sigtype = SIGNAL_FIRST_METHOD;
-                       else if(strcmp(yyvsp[-1].id,"last")==0)
+                       else if(strcmp(yyvsp[-2].id,"last")==0)
                                yyval.sigtype = SIGNAL_LAST_METHOD;
                        else {
                                yyerror(_("signal must be 'first' or 'last'"));
-                               g_free(yyvsp[-1].id);
+                               g_free(yyvsp[-2].id);
                                YYERROR;
                        }
-                       g_free(yyvsp[-1].id);
-                                       ;
-    break;}
-case 55:
-#line 442 "parse.y"
-{
+                       g_free(yyvsp[-2].id);
+                                       }
+    break;
+
+  case 127:
+#line 1546 "parse.y"
+    {
                        yyval.sigtype = SIGNAL_LAST_METHOD;
-                                       ;
-    break;}
-case 56:
-#line 447 "parse.y"
-{
-                       gtktypes = g_list_prepend(gtktypes,yyvsp[-3].id);
-                                               ;
-    break;}
-case 57:
-#line 452 "parse.y"
-{
-                       gtktypes = g_list_append(gtktypes,yyvsp[0].id);
-                                               ;
-    break;}
-case 58:
-#line 455 "parse.y"
-{ 
-                       gtktypes = g_list_append(gtktypes,yyvsp[0].id);
-                                                       ;
-    break;}
-case 59:
-#line 460 "parse.y"
-{ yyval.cbuf=yyvsp[0].cbuf; ;
-    break;}
-case 60:
-#line 461 "parse.y"
-{ yyval.cbuf = NULL; ;
-    break;}
-case 61:
-#line 465 "parse.y"
-{
+                                       }
+    break;
+
+  case 128:
+#line 1549 "parse.y"
+    {
+                       /* the_scope was default thus public */
+                       the_scope = PUBLIC_SCOPE;
+                                       }
+    break;
+
+  case 129:
+#line 1555 "parse.y"
+    {
+                       gtktypes = g_list_prepend(gtktypes, debool (yyvsp[-3].id));
+                                               }
+    break;
+
+  case 130:
+#line 1560 "parse.y"
+    {
+                       gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id));
+                                               }
+    break;
+
+  case 131:
+#line 1563 "parse.y"
+    { 
+                       gtktypes = g_list_append(gtktypes, debool (yyvsp[0].id));
+                                                       }
+    break;
+
+  case 132:
+#line 1568 "parse.y"
+    { yyval.cbuf = yyvsp[0].cbuf; }
+    break;
+
+  case 133:
+#line 1569 "parse.y"
+    { yyval.cbuf = NULL; }
+    break;
+
+  case 134:
+#line 1573 "parse.y"
+    {
                        if(!has_self) {
                                yyerror(_("signal without 'self' as "
                                          "first parameter"));
+                               free_all_global_state();
                                YYERROR;
                        }
-                       push_function(yyvsp[-7].sigtype,NULL,
-                                     yyvsp[-5].id, yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
-                                     ccode_line,vararg);
-                                                                       ;
-    break;}
-case 62:
-#line 475 "parse.y"
-{
+                       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 135:
+#line 1589 "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[0].cbuf, yyvsp[-9].line,
+                                     ccode_line, vararg, yyvsp[-8].list);
+                                                                       }
+    break;
+
+  case 136:
+#line 1605 "parse.y"
+    {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "
                                          "first parameter"));
+                               free_all_global_state();
                                YYERROR;
                        }
-                       push_function(PRIVATE_VIRTUAL_METHOD, NULL, yyvsp[-5].id,
-                                     yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-8].line,
-                                     ccode_line,vararg);
-                                                                       ;
-    break;}
-case 63:
-#line 485 "parse.y"
-{
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+                                     yyvsp[0].cbuf, yyvsp[-8].line,
+                                     ccode_line, vararg, NULL);
+                                                                       }
+    break;
+
+  case 137:
+#line 1621 "parse.y"
+    {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "
                                          "first parameter"));
+                               free_all_global_state();
                                YYERROR;
                        }
-                       push_function(VIRTUAL_METHOD, NULL, yyvsp[-5].id,
-                                     yyvsp[-1].id, yyvsp[0].cbuf,yyvsp[-7].line,
-                                     ccode_line,vararg);
-                                                                       ;
-    break;}
-case 64:
-#line 495 "parse.y"
-{
-                       push_function(OVERRIDE_METHOD, yyvsp[-9].id,
-                                     yyvsp[-6].id, yyvsp[-2].id, yyvsp[0].cbuf,
-                                     yyvsp[-11].line,yyvsp[-1].line,
-                                     vararg);
-                                                                       ;
-    break;}
-case 65:
-#line 501 "parse.y"
-{
-                       push_function(PUBLIC_SCOPE, NULL, yyvsp[-6].id,
-                                     yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line,
-                                     vararg);
-                                                               ;
-    break;}
-case 66:
-#line 506 "parse.y"
-{
-                       push_function(PRIVATE_SCOPE, NULL, yyvsp[-6].id,
-                                     yyvsp[-2].id, yyvsp[0].cbuf,yyvsp[-8].line,yyvsp[-1].line,
-                                     vararg);
-                                                               ;
-    break;}
-case 67:
-#line 511 "parse.y"
-{
-                       if(strcmp(yyvsp[-4].id,"init")==0) {
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(the_scope, VIRTUAL_METHOD, NULL, yyvsp[-5].id,
+                                     yyvsp[0].cbuf, yyvsp[-7].line,
+                                     ccode_line, vararg, NULL);
+                                                                       }
+    break;
+
+  case 138:
+#line 1637 "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[0].cbuf, yyvsp[-7].line,
+                                     ccode_line, vararg, NULL);
+                                                                       }
+    break;
+
+  case 139:
+#line 1648 "parse.y"
+    {
+                       push_function(NO_SCOPE, OVERRIDE_METHOD, yyvsp[-8].id,
+                                     yyvsp[-5].id, yyvsp[0].cbuf,
+                                     yyvsp[-10].line, ccode_line,
+                                     vararg, NULL);
+                                                                       }
+    break;
+
+  case 140:
+#line 1654 "parse.y"
+    {
+                       if(the_scope == CLASS_SCOPE) {
+                               yyerror(_("a method cannot be of class scope"));
+                               free_all_global_state();
+                               YYERROR;
+                       }
+                       push_function(the_scope, REGULAR_METHOD, NULL, yyvsp[-5].id,
+                                     yyvsp[0].cbuf, yyvsp[-7].line, ccode_line,
+                                     vararg, NULL);
+                                                               }
+    break;
+
+  case 141:
+#line 1664 "parse.y"
+    {
+                       if(strcmp(yyvsp[-4].id, "init")==0) {
                                push_init_arg(yyvsp[-2].id,FALSE);
-                               push_function(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) {
+                               push_function(NO_SCOPE, INIT_METHOD, NULL,
+                                             yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line,
+                                             ccode_line, FALSE, NULL);
+                       } else if(strcmp(yyvsp[-4].id, "class_init")==0) {
                                push_init_arg(yyvsp[-2].id,TRUE);
-                               push_function(CLASS_INIT_METHOD, NULL, 
-                                             yyvsp[-4].id, NULL, yyvsp[0].cbuf,yyvsp[-3].line,
-                                             ccode_line,FALSE);
+                               push_function(NO_SCOPE, CLASS_INIT_METHOD, NULL,
+                                             yyvsp[-4].id, yyvsp[0].cbuf, yyvsp[-3].line,
+                                             ccode_line, FALSE, NULL);
                        } else {
                                g_free(yyvsp[-4].id);
                                g_free(yyvsp[-2].id);
-                               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 142:
+#line 1687 "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;
                        }
-                                               ;
-    break;}
-case 68:
-#line 532 "parse.y"
-{ yyval.id = yyvsp[0].id; ;
-    break;}
-case 69:
-#line 533 "parse.y"
-{
+                       g_free(yyvsp[-1].id);
+                                       }
+    break;
+
+  case 143:
+#line 1698 "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 144:
+#line 1717 "parse.y"
+    {
+                       g_free(onerror); onerror = NULL;
+                       g_free(defreturn); defreturn = NULL;
+                                       }
+    break;
+
+  case 145:
+#line 1723 "parse.y"
+    { yyval.id = yyvsp[0].id; }
+    break;
+
+  case 146:
+#line 1724 "parse.y"
+    {
                        yyval.id = (yyvsp[0].cbuf)->str;
-                       g_string_free(yyvsp[0].cbuf,FALSE);
-                                       ;
-    break;}
-case 70:
-#line 537 "parse.y"
-{ ; ;
-    break;}
-case 71:
-#line 538 "parse.y"
-{ yyval.id = NULL; ;
-    break;}
-case 72:
-#line 541 "parse.y"
-{ vararg = FALSE; has_self = FALSE; ;
-    break;}
-case 73:
-#line 542 "parse.y"
-{
+                       g_string_free(yyvsp[0].cbuf, FALSE);
+                                       }
+    break;
+
+  case 147:
+#line 1730 "parse.y"
+    { vararg = FALSE; has_self = FALSE; }
+    break;
+
+  case 148:
+#line 1731 "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"));
                                YYERROR;
                        }
-                                               ;
-    break;}
-case 74:
-#line 553 "parse.y"
-{
+                                               }
+    break;
+
+  case 149:
+#line 1742 "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 150:
+#line 1753 "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 151:
+#line 1764 "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"));
                                YYERROR;
                        }
-                                       ;
-    break;}
-case 75:
-#line 563 "parse.y"
-{ has_self = FALSE; ;
-    break;}
-case 76:
-#line 566 "parse.y"
-{ vararg = TRUE; ;
-    break;}
-case 77:
-#line 567 "parse.y"
-{ vararg = FALSE; ;
-    break;}
-case 78:
-#line 570 "parse.y"
-{ ; ;
-    break;}
-case 79:
-#line 571 "parse.y"
-{ ; ;
-    break;}
-case 80:
-#line 574 "parse.y"
-{
-                       push_funcarg(yyvsp[0].id);
-                                                               ;
-    break;}
-case 81:
-#line 577 "parse.y"
-{
+                                       }
+    break;
+
+  case 152:
+#line 1774 "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 153:
+#line 1784 "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 154:
+#line 1794 "parse.y"
+    { has_self = FALSE; }
+    break;
+
+  case 155:
+#line 1797 "parse.y"
+    { vararg = TRUE; }
+    break;
+
+  case 156:
+#line 1798 "parse.y"
+    { vararg = FALSE; }
+    break;
+
+  case 157:
+#line 1801 "parse.y"
+    { ; }
+    break;
+
+  case 158:
+#line 1802 "parse.y"
+    { ; }
+    break;
+
+  case 159:
+#line 1805 "parse.y"
+    {
+                       push_funcarg(yyvsp[0].id,NULL);
+                                                               }
+    break;
+
+  case 160:
+#line 1808 "parse.y"
+    {
+                       push_funcarg(yyvsp[-1].id,yyvsp[0].id);
+                                                               }
+    break;
+
+  case 161:
+#line 1811 "parse.y"
+    {
                        if(strcmp(yyvsp[-2].id,"check")!=0) {
                                yyerror(_("parse error"));
                                YYERROR;
                        }
                        g_free(yyvsp[-2].id);
-                       push_funcarg(yyvsp[-4].id);
-                                                               ;
-    break;}
-case 82:
-#line 587 "parse.y"
-{ ; ;
-    break;}
-case 83:
-#line 588 "parse.y"
-{ ; ;
-    break;}
-case 84:
-#line 591 "parse.y"
-{
+                       push_funcarg(yyvsp[-4].id,NULL);
+                                                               }
+    break;
+
+  case 162:
+#line 1819 "parse.y"
+    {
+                       if(strcmp(yyvsp[-2].id,"check")!=0) {
+                               yyerror(_("parse error"));
+                               YYERROR;
+                       }
+                       g_free(yyvsp[-2].id);
+                       push_funcarg(yyvsp[-5].id,yyvsp[-4].id);
+                                                               }
+    break;
+
+  case 163:
+#line 1829 "parse.y"
+    { ; }
+    break;
+
+  case 164:
+#line 1830 "parse.y"
+    { ; }
+    break;
+
+  case 165:
+#line 1833 "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"));
                                YYERROR;
                        }
                        g_free(yyvsp[0].id);
-                                       ;
-    break;}
-case 85:
-#line 604 "parse.y"
-{
-                       Node *node = new_check(GT_CHECK,yyvsp[0].id);
+                                       }
+    break;
+
+  case 166:
+#line 1850 "parse.y"
+    {
+                       Node *node = node_new (CHECK_NODE,
+                                              "chtype", GT_CHECK,
+                                              "number:steal", yyvsp[0].id,
+                                              NULL);
                        checks = g_list_append(checks,node);
-                                       ;
-    break;}
-case 86:
-#line 608 "parse.y"
-{
-                       Node *node = new_check(LT_CHECK,yyvsp[0].id);
+                                       }
+    break;
+
+  case 167:
+#line 1857 "parse.y"
+    {
+                       Node *node = node_new (CHECK_NODE,
+                                              "chtype", LT_CHECK,
+                                              "number:steal", yyvsp[0].id,
+                                              NULL);
                        checks = g_list_append(checks,node);
-                                       ;
-    break;}
-case 87:
-#line 612 "parse.y"
-{
-                       Node *node = new_check(GE_CHECK,yyvsp[0].id);
+                                       }
+    break;
+
+  case 168:
+#line 1864 "parse.y"
+    {
+                       Node *node = node_new (CHECK_NODE,
+                                              "chtype", GE_CHECK,
+                                              "number:steal", yyvsp[0].id,
+                                              NULL);
                        checks = g_list_append(checks,node);
-                                       ;
-    break;}
-case 88:
-#line 616 "parse.y"
-{
-                       Node *node = new_check(LE_CHECK,yyvsp[0].id);
+                                       }
+    break;
+
+  case 169:
+#line 1871 "parse.y"
+    {
+                       Node *node = node_new (CHECK_NODE,
+                                              "chtype", LE_CHECK,
+                                              "number:steal", yyvsp[0].id,
+                                              NULL);
                        checks = g_list_append(checks,node);
-                                       ;
-    break;}
-case 89:
-#line 620 "parse.y"
-{
-                       Node *node = new_check(EQ_CHECK,yyvsp[0].id);
+                                       }
+    break;
+
+  case 170:
+#line 1878 "parse.y"
+    {
+                       Node *node = node_new (CHECK_NODE,
+                                              "chtype", EQ_CHECK,
+                                              "number:steal", yyvsp[0].id,
+                                              NULL);
                        checks = g_list_append(checks,node);
-                                       ;
-    break;}
-case 90:
-#line 624 "parse.y"
-{
-                       Node *node = new_check(NE_CHECK,yyvsp[0].id);
+                                       }
+    break;
+
+  case 171:
+#line 1885 "parse.y"
+    {
+                       Node *node = node_new (CHECK_NODE,
+                                              "chtype", NE_CHECK,
+                                              "number:steal", yyvsp[0].id,
+                                              NULL);
                        checks = g_list_append(checks,node);
-                                       ;
-    break;}
-case 91:
-#line 630 "parse.y"
-{ yyval.id = yyvsp[0].id; ;
-    break;}
-case 92:
-#line 631 "parse.y"
-{
+                                       }
+    break;
+
+  case 172:
+#line 1894 "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 173:
+#line 1903 "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 174:
+#line 1914 "parse.y"
+    {;}
+    break;
+
+  case 175:
+#line 1915 "parse.y"
+    {;}
+    break;
+
+  case 176:
+#line 1918 "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 177:
+#line 1938 "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 178:
+#line 1948 "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 179:
+#line 1957 "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 180:
+#line 1968 "parse.y"
+    {
+                       flag_vals = g_list_append (flag_vals, yyvsp[0].id);
+               }
+    break;
+
+  case 181:
+#line 1971 "parse.y"
+    {
+                       flag_vals = g_list_append (flag_vals, yyvsp[0].id);
+               }
+    break;
+
+  case 182:
+#line 1976 "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 183:
+#line 1985 "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 184:
+#line 1996 "parse.y"
+    {
+                       error_vals = g_list_append (error_vals, yyvsp[0].id);
+               }
+    break;
+
+  case 185:
+#line 1999 "parse.y"
+    {
+                       error_vals = g_list_append (error_vals, yyvsp[0].id);
+               }
+    break;
+
+  case 186:
+#line 2005 "parse.y"
+    { yyval.id = yyvsp[0].id; }
+    break;
+
+  case 187:
+#line 2006 "parse.y"
+    {
                        yyval.id = g_strconcat("-",yyvsp[0].id,NULL);
                        g_free(yyvsp[0].id);
-                                       ;
-    break;}
-case 93:
-#line 635 "parse.y"
-{ yyval.id = yyvsp[0].id; ;
-    break;}
-}
-   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/lib/bison.simple"
+                                       }
+    break;
+
+  case 188:
+#line 2010 "parse.y"
+    { yyval.id = yyvsp[0].id; }
+    break;
+
+  case 189:
+#line 2011 "parse.y"
+    { yyval.id = yyvsp[0].id; }
+    break;
+
+
+    }
+
+/* Line 1000 of yacc.c.  */
+#line 4084 "parse.c"
 \f
   yyvsp -= yylen;
   yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
 
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-       fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
+
+  YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
 
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
-#endif
 
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
 
   yyn = yyr1[yyn];
 
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTBASE];
+    yystate = yydefgoto[yyn - YYNTOKENS];
 
   goto yynewstate;
 
-yyerrlab:   /* here on detecting error */
 
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
       ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
+#if YYERROR_VERBOSE
       yyn = yypact[yystate];
 
-      if (yyn > YYFLAG && yyn < YYLAST)
+      if (YYPACT_NINF < yyn && yyn < YYLAST)
        {
-         int size = 0;
-         char *msg;
-         int x, count;
-
-         count = 0;
-         /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-         for (x = (yyn < 0 ? -yyn : 0);
-              x < (sizeof(yytname) / sizeof(char *)); x++)
-           if (yycheck[x + yyn] == x)
-             size += strlen(yytname[x]) + 15, count++;
-         msg = (char *) malloc(size + 15);
-         if (msg != 0)
+         YYSIZE_T yysize = 0;
+         int yytype = YYTRANSLATE (yychar);
+         const char* yyprefix;
+         char *yymsg;
+         int yyx;
+
+         /* Start YYX at -YYN if negative to avoid negative indexes in
+            YYCHECK.  */
+         int yyxbegin = yyn < 0 ? -yyn : 0;
+
+         /* Stay within bounds of both yycheck and yytname.  */
+         int yychecklim = YYLAST - yyn;
+         int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+         int yycount = 0;
+
+         yyprefix = ", expecting ";
+         for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+           if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+             {
+               yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
+               yycount += 1;
+               if (yycount == 5)
+                 {
+                   yysize = 0;
+                   break;
+                 }
+             }
+         yysize += (sizeof ("syntax error, unexpected ")
+                    + yystrlen (yytname[yytype]));
+         yymsg = (char *) YYSTACK_ALLOC (yysize);
+         if (yymsg != 0)
            {
-             strcpy(msg, "parse error");
+             char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+             yyp = yystpcpy (yyp, yytname[yytype]);
 
-             if (count < 5)
+             if (yycount < 5)
                {
-                 count = 0;
-                 for (x = (yyn < 0 ? -yyn : 0);
-                      x < (sizeof(yytname) / sizeof(char *)); x++)
-                   if (yycheck[x + yyn] == x)
+                 yyprefix = ", expecting ";
+                 for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+                   if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
                      {
-                       strcat(msg, count == 0 ? ", expecting `" : " or `");
-                       strcat(msg, yytname[x]);
-                       strcat(msg, "'");
-                       count++;
+                       yyp = yystpcpy (yyp, yyprefix);
+                       yyp = yystpcpy (yyp, yytname[yyx]);
+                       yyprefix = " or ";
                      }
                }
-             yyerror(msg);
-             free(msg);
+             yyerror (yymsg);
+             YYSTACK_FREE (yymsg);
            }
          else
-           yyerror ("parse error; also virtual memory exceeded");
+           yyerror ("syntax error; also virtual memory exhausted");
        }
       else
 #endif /* YYERROR_VERBOSE */
-       yyerror("parse error");
+       yyerror ("syntax error");
     }
 
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
+
 
   if (yyerrstatus == 3)
     {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-       YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-       fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
+      /* If just tried and failed to reuse lookahead token after an
+        error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* If at end of input, pop the error token,
+            then the rest of the stack, then return failure.  */
+         if (yychar == YYEOF)
+            for (;;)
+              {
+                YYPOPSTACK;
+                if (yyssp == yyss)
+                  YYABORT;
+                YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+                yydestruct (yystos[*yyssp], yyvsp);
+              }
+        }
+      else
+       {
+         YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+         yydestruct (yytoken, &yylval);
+         yychar = YYEMPTY;
 
-      yychar = YYEMPTY;
+       }
     }
 
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
-
-  yyerrstatus = 3;             /* Each real token shifted decrements this */
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
 
-  goto yyerrhandle;
 
-yyerrdefault:  /* current state does not do anything special for the error token. */
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
 
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
+#ifdef __GNUC__
+  /* Pacify GCC when the user code never invokes YYERROR and the label
+     yyerrorlab therefore never appears in user code.  */
+  if (0)
+     goto yyerrorlab;
 #endif
 
-yyerrpop:   /* pop the current state because it cannot handle the error token */
-
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
+  yyvsp -= yylen;
+  yyssp -= yylen;
+  yystate = *yyssp;
+  goto yyerrlab1;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-       fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
 
-yyerrhandle:
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;     /* Each real token shifted decrements this.  */
 
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+       {
+         yyn += YYTERROR;
+         if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+           {
+             yyn = yytable[yyn];
+             if (0 < yyn)
+               break;
+           }
+       }
 
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+       YYABORT;
 
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-       goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
+      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+      yydestruct (yystos[yystate], yyvsp);
+      YYPOPSTACK;
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
     }
-  else if (yyn == 0)
-    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
+  YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
+
 
   yystate = yyn;
   goto yynewstate;
 
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here.  |
+`----------------------------------------------*/
+yyoverflowlab:
+  yyerror ("parser stack overflow");
+  yyresult = 2;
+  /* Fall through.  */
 #endif
-    }
-  return 0;
 
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
+yyreturn:
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
 #endif
-    }
-  return 1;
+  return yyresult;
 }
-#line 638 "parse.y"
+
+
+#line 2014 "parse.y"
+