Release 2.0.19

[gob-dx.git] / src / parse.c

diff --git a/src/parse.c b/src/parse.c
index aee046da503de2335bbb7b34a1be8a22cc018a22..0c3a4ad8c8879271154d0b85c3f3b8a04f75ad56 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -1,24 +1,21 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 2.5.  */

 
 

-/* Skeleton implementation for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+/* Bison implementation for Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989-1990, 2000-2011 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
    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.
-
+   the Free Software Foundation, either version 3 of the License, 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.
    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
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work


@@ -29,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.

-
+   

    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 


@@ -47,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
 #define YYBISON 1
 
 /* Bison version.  */

-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "2.5"

 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"


@@ -55,127 +52,20 @@
 /* Pure parsers.  */
 #define YYPURE 0
 
 /* Pure parsers.  */
 #define YYPURE 0
 

-/* Using locations.  */
-#define YYLSP_NEEDED 0
-
+/* Push parsers.  */
+#define YYPUSH 0

 
 

+/* Pull parsers.  */
+#define YYPULL 1

 
 

-/* 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,
-     ADCODE = 280,
-     HTCODE = 281,
-     PHCODE = 282,
-     HCODE = 283,
-     ACODE = 284,
-     ATCODE = 285,
-     STRING = 286,
-     PUBLIC = 287,
-     PRIVATE = 288,
-     PROTECTED = 289,
-     CLASSWIDE = 290,
-     PROPERTY = 291,
-     ARGUMENT = 292,
-     VIRTUAL = 293,
-     SIGNAL = 294,
-     OVERRIDE = 295,
-     NICK = 296,
-     BLURB = 297,
-     MAXIMUM = 298,
-     MINIMUM = 299,
-     DEFAULT_VALUE = 300,
-     ERROR = 301,
-     FLAGS = 302,
-     TYPE = 303,
-     FLAGS_TYPE = 304,
-     ENUM_TYPE = 305,
-     PARAM_TYPE = 306,
-     BOXED_TYPE = 307,
-     OBJECT_TYPE = 308
-   };
-#endif
-/* Tokens.  */
-#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 ADCODE 280
-#define HTCODE 281
-#define PHCODE 282
-#define HCODE 283
-#define ACODE 284
-#define ATCODE 285
-#define STRING 286
-#define PUBLIC 287
-#define PRIVATE 288
-#define PROTECTED 289
-#define CLASSWIDE 290
-#define PROPERTY 291
-#define ARGUMENT 292
-#define VIRTUAL 293
-#define SIGNAL 294
-#define OVERRIDE 295
-#define NICK 296
-#define BLURB 297
-#define MAXIMUM 298
-#define MINIMUM 299
-#define DEFAULT_VALUE 300
-#define ERROR 301
-#define FLAGS 302
-#define TYPE 303
-#define FLAGS_TYPE 304
-#define ENUM_TYPE 305
-#define PARAM_TYPE 306
-#define BOXED_TYPE 307
-#define OBJECT_TYPE 308
-
+/* Using locations.  */
+#define YYLSP_NEEDED 0

 
 
 
 /* Copy the first part of user declarations.  */
 
 
 
 /* Copy the first part of user declarations.  */

+
+/* Line 268 of yacc.c  */

 #line 23 "parse.y"
 
 
 #line 23 "parse.y"
 
 


@@ -249,9 +139,10 @@ yyerror(char *str)
        char *out=NULL;
        char *p;
        
        char *out=NULL;
        char *p;
        

-       if(strcmp(yytext,"\n")==0) {
-               out=g_strconcat("Error: ",str," before newline",NULL);
-       } else if(yytext[0]=='\0') {
+       if (strcmp (yytext, "\n") == 0 ||
+           strcmp (yytext, "\r") == 0) {
+               out = g_strconcat ("Error: ", str, " before end of line", NULL);
+       } else if (yytext[0] == '\0') {

                out=g_strconcat("Error: ", str, " at end of input", NULL);
        } else {
                char *tmp = g_strdup(yytext);
                out=g_strconcat("Error: ", str, " at end of input", NULL);
        } else {
                char *tmp = g_strdup(yytext);


@@ -313,7 +204,11 @@ push_function (int scope, int method, char *oid, char *id,
 
        g_assert(scope != CLASS_SCOPE);
        
 
        g_assert(scope != CLASS_SCOPE);
        

-       if(method == INIT_METHOD || method == CLASS_INIT_METHOD) {
+       if(method == INIT_METHOD ||
+          method == CLASS_INIT_METHOD ||
+          method == CONSTRUCTOR_METHOD ||
+          method == DISPOSE_METHOD ||
+          method == FINALIZE_METHOD) {

                type = (Type *)node_new (TYPE_NODE,
                                         "name", "void",
                                         NULL);
                type = (Type *)node_new (TYPE_NODE,
                                         "name", "void",
                                         NULL);


@@ -832,6 +727,9 @@ ensure_property (void)
 
 
 
 
 
 

+/* Line 268 of yacc.c  */
+#line 732 "parse.c"
+

 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 1
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 1


@@ -850,31 +748,153 @@ ensure_property (void)
 # define YYTOKEN_TABLE 0
 #endif
 
 # define YYTOKEN_TABLE 0
 #endif
 

+
+/* 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,
+     CTCODE = 280,
+     ADCODE = 281,
+     HTCODE = 282,
+     PHCODE = 283,
+     HCODE = 284,
+     ACODE = 285,
+     ATCODE = 286,
+     STRING = 287,
+     PUBLIC = 288,
+     PRIVATE = 289,
+     PROTECTED = 290,
+     CLASSWIDE = 291,
+     PROPERTY = 292,
+     ARGUMENT = 293,
+     VIRTUAL = 294,
+     SIGNAL = 295,
+     OVERRIDE = 296,
+     NICK = 297,
+     BLURB = 298,
+     MAXIMUM = 299,
+     MINIMUM = 300,
+     DEFAULT_VALUE = 301,
+     ERROR = 302,
+     FLAGS = 303,
+     TYPE = 304,
+     FLAGS_TYPE = 305,
+     ENUM_TYPE = 306,
+     PARAM_TYPE = 307,
+     BOXED_TYPE = 308,
+     OBJECT_TYPE = 309
+   };
+#endif
+/* Tokens.  */
+#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 CTCODE 280
+#define ADCODE 281
+#define HTCODE 282
+#define PHCODE 283
+#define HCODE 284
+#define ACODE 285
+#define ATCODE 286
+#define STRING 287
+#define PUBLIC 288
+#define PRIVATE 289
+#define PROTECTED 290
+#define CLASSWIDE 291
+#define PROPERTY 292
+#define ARGUMENT 293
+#define VIRTUAL 294
+#define SIGNAL 295
+#define OVERRIDE 296
+#define NICK 297
+#define BLURB 298
+#define MAXIMUM 299
+#define MINIMUM 300
+#define DEFAULT_VALUE 301
+#define ERROR 302
+#define FLAGS 303
+#define TYPE 304
+#define FLAGS_TYPE 305
+#define ENUM_TYPE 306
+#define PARAM_TYPE 307
+#define BOXED_TYPE 308
+#define OBJECT_TYPE 309
+
+
+
+

 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE

-#line 678 "parse.y"

 {
 {

+
+/* Line 293 of yacc.c  */
+#line 683 "parse.y"
+

        char *id;
        GString *cbuf;
        GList *list;
        int line;
        int sigtype;
        char *id;
        GString *cbuf;
        GList *list;
        int line;
        int sigtype;

-}
-/* Line 187 of yacc.c.  */
-#line 865 "parse.c"
-       YYSTYPE;
+
+
+
+/* Line 293 of yacc.c  */
+#line 886 "parse.c"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1

 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

-# define YYSTYPE_IS_TRIVIAL 1

 #endif
 
 
 #endif
 
 

-

 /* Copy the second part of user declarations.  */
 
 
 /* Copy the second part of user declarations.  */
 
 

-/* Line 216 of yacc.c.  */
-#line 878 "parse.c"
+/* Line 343 of yacc.c  */
+#line 898 "parse.c"

 
 #ifdef short
 # undef short
 
 #ifdef short
 # undef short


@@ -924,7 +944,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_

-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS

 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)


@@ -949,14 +969,14 @@ typedef short int yytype_int16;
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static int

-YYID (int i)
+YYID (int yyi)

 #else
 static int
 #else
 static int

-YYID (i)
-    int i;
+YYID (yyi)
+    int yyi;

 #endif
 {
 #endif
 {

-  return i;
+  return yyi;

 }
 #endif
 
 }
 #endif
 


@@ -977,11 +997,11 @@ YYID (i)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca

-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \

      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */

-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0

 #     endif
 #    endif
 #   endif
 #     endif
 #    endif
 #   endif


@@ -1004,24 +1024,24 @@ YYID (i)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif

-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \

        && ! ((defined YYMALLOC || defined malloc) \
             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
        && ! ((defined YYMALLOC || defined malloc) \
             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */

-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0

 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc

-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \

      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free

-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \

      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif


@@ -1037,9 +1057,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {

-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  };
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};

 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)


@@ -1050,6 +1070,27 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 

+# define YYCOPY_NEEDED 1
+
+/* 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_alloc, Stack)                          \
+    do                                                                 \
+      {                                                                        \
+       YYSIZE_T yynewbytes;                                            \
+       YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+       Stack = &yyptr->Stack_alloc;                                    \
+       yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+       yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                        \
+    while (YYID (0))
+
+#endif
+
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED

 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY


@@ -1067,42 +1108,25 @@ union yyalloc
       while (YYID (0))
 #  endif
 # endif
       while (YYID (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 (YYID (0))
-
-#endif
+#endif /* !YYCOPY_NEEDED */

 
 /* YYFINAL -- State number of the termination state.  */
 
 /* YYFINAL -- State number of the termination state.  */

-#define YYFINAL  24
+#define YYFINAL  25

 /* YYLAST -- Last index in YYTABLE.  */
 /* YYLAST -- Last index in YYTABLE.  */

-#define YYLAST   640
+#define YYLAST   641

 
 /* YYNTOKENS -- Number of terminals.  */
 
 /* YYNTOKENS -- Number of terminals.  */

-#define YYNTOKENS  67
+#define YYNTOKENS  68

 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  53
 /* YYNRULES -- Number of rules.  */
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  53
 /* YYNRULES -- Number of rules.  */

-#define YYNRULES  197
+#define YYNRULES  198

 /* YYNRULES -- Number of states.  */
 /* YYNRULES -- Number of states.  */

-#define YYNSTATES  417
+#define YYNSTATES  418

 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2

-#define YYMAXUTOK   308
+#define YYMAXUTOK   309

 
 #define YYTRANSLATE(YYX)                                               \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 #define YYTRANSLATE(YYX)                                               \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)


@@ -1113,16 +1137,16 @@ static const yytype_uint8 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,
        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,    65,     2,     2,     2,     2,     2,     2,
-      56,    57,    62,     2,    60,    66,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,    58,
-      64,    59,    63,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    66,     2,     2,     2,     2,     2,     2,
+      57,    58,    63,     2,    61,    67,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,    59,
+      65,    60,    64,     2,     2,     2,     2,     2,     2,     2,

        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,    54,    61,    55,     2,     2,     2,     2,
+       2,     2,     2,    55,    62,    56,     2,     2,     2,     2,

        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,


@@ -1140,7 +1164,7 @@ static const yytype_uint8 yytranslate[] =
       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,
       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,    53
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG


@@ -1149,130 +1173,131 @@ static const yytype_uint8 yytranslate[] =
 static const yytype_uint16 yyprhs[] =
 {
        0,     0,     3,     7,    10,    13,    15,    17,    19,    21,
 static const yytype_uint16 yyprhs[] =
 {
        0,     0,     3,     7,    10,    13,    15,    17,    19,    21,

-      23,    25,    27,    29,    32,    35,    38,    41,    43,    45,
-      47,    49,    54,    58,    64,    65,    70,    76,    82,    88,
-      95,   103,   110,   118,   121,   123,   125,   128,   132,   134,
-     136,   138,   140,   142,   144,   146,   148,   151,   155,   158,
-     162,   165,   168,   170,   172,   174,   175,   181,   188,   201,
-     211,   218,   222,   223,   235,   244,   250,   254,   255,   259,
-     261,   263,   268,   270,   272,   276,   280,   284,   288,   292,
-     296,   300,   304,   308,   312,   316,   320,   324,   328,   332,
-     336,   340,   342,   348,   350,   354,   355,   359,   361,   364,
-     366,   368,   370,   373,   376,   379,   383,   387,   390,   393,
-     396,   398,   401,   403,   406,   408,   410,   412,   414,   416,
-     418,   420,   422,   424,   426,   428,   430,   432,   435,   438,
-     442,   445,   447,   451,   455,   458,   460,   465,   469,   471,
-     474,   476,   487,   499,   509,   519,   528,   540,   549,   555,
-     558,   563,   570,   571,   573,   576,   578,   580,   583,   586,
-     590,   595,   600,   602,   606,   608,   612,   614,   617,   621,
-     628,   636,   639,   641,   643,   646,   649,   653,   657,   661,
-     665,   673,   682,   686,   688,   692,   694,   702,   711,   715,
-     717,   725,   734,   738,   740,   742,   745,   747
+      23,    25,    27,    29,    31,    34,    37,    40,    43,    45,
+      47,    49,    51,    56,    60,    66,    67,    72,    78,    84,
+      90,    97,   105,   112,   120,   123,   125,   127,   130,   134,
+     136,   138,   140,   142,   144,   146,   148,   150,   153,   157,
+     160,   164,   167,   170,   172,   174,   176,   177,   183,   190,
+     203,   213,   220,   224,   225,   237,   246,   252,   256,   257,
+     261,   263,   265,   270,   272,   274,   278,   282,   286,   290,
+     294,   298,   302,   306,   310,   314,   318,   322,   326,   330,
+     334,   338,   342,   344,   350,   352,   356,   357,   361,   363,
+     366,   368,   370,   372,   375,   378,   381,   385,   389,   392,
+     395,   398,   400,   403,   405,   408,   410,   412,   414,   416,
+     418,   420,   422,   424,   426,   428,   430,   432,   434,   437,
+     440,   444,   447,   449,   453,   457,   460,   462,   467,   471,
+     473,   476,   478,   489,   501,   511,   521,   530,   542,   551,
+     557,   560,   565,   572,   573,   575,   578,   580,   582,   585,
+     588,   592,   597,   602,   604,   608,   610,   614,   616,   619,
+     623,   630,   638,   641,   643,   645,   648,   651,   655,   659,
+     663,   667,   675,   684,   688,   690,   694,   696,   704,   713,
+     717,   719,   727,   736,   740,   742,   744,   747,   749

 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {

-      68,     0,    -1,    70,    71,    70,    -1,    71,    70,    -1,
-      70,    71,    -1,    71,    -1,    24,    -1,    25,    -1,    28,
-      -1,    26,    -1,    27,    -1,    29,    -1,    30,    -1,    70,
-      69,    -1,    70,   112,    -1,    70,   115,    -1,    70,   117,
-      -1,    69,    -1,   112,    -1,   115,    -1,   117,    -1,    72,
-      54,    74,    55,    -1,    72,    54,    55,    -1,     3,    21,
-       4,    21,    73,    -1,    -1,    56,    19,    57,    73,    -1,
-      56,    19,    19,    57,    73,    -1,    56,    19,    21,    57,
-      73,    -1,    56,    19,    20,    57,    73,    -1,    56,    19,
-      31,    31,    57,    73,    -1,    56,    19,    31,    31,    31,
-      57,    73,    -1,    56,    19,    19,    31,    57,    73,    -1,
-      56,    19,    19,    31,    31,    57,    73,    -1,    74,    75,
-      -1,    75,    -1,   103,    -1,    19,   103,    -1,    19,    21,
-     103,    -1,    80,    -1,    81,    -1,    83,    -1,    58,    -1,
-      32,    -1,    33,    -1,    34,    -1,    35,    -1,    19,    19,
-      -1,    19,    54,    24,    -1,    59,   119,    -1,    59,    54,
-      24,    -1,    77,    78,    -1,    78,    77,    -1,    78,    -1,
-      77,    -1,    19,    -1,    -1,    76,    92,    19,    79,    58,
-      -1,    76,    92,    19,    22,    79,    58,    -1,    37,    90,
-      89,    19,    82,    19,    54,    24,    19,    54,    24,    58,
-      -1,    37,    90,    89,    19,    82,    19,    54,    24,    58,
-      -1,    37,    90,    89,    19,    82,    19,    -1,    56,    19,
-      57,    -1,    -1,    36,    19,    19,    84,    19,    54,    24,
-      19,    54,    24,    58,    -1,    36,    19,    19,    84,    19,
-      54,    24,    58,    -1,    36,    19,    19,    84,    58,    -1,
-      56,    85,    57,    -1,    -1,    85,    60,    88,    -1,    88,
-      -1,    31,    -1,    19,    56,    31,    57,    -1,   119,    -1,
-      86,    -1,    41,    59,    86,    -1,    42,    59,    86,    -1,
-      43,    59,   119,    -1,    44,    59,   119,    -1,    45,    59,
-      87,    -1,    47,    59,    91,    -1,    48,    59,    92,    -1,
-      49,    59,    21,    -1,    49,    59,    19,    -1,    50,    59,
-      21,    -1,    50,    59,    19,    -1,    51,    59,    21,    -1,
-      51,    59,    19,    -1,    52,    59,    21,    -1,    52,    59,
-      19,    -1,    53,    59,    21,    -1,    53,    59,    19,    -1,
-      19,    -1,    19,    56,    19,    92,    57,    -1,    19,    -1,
-      56,    91,    57,    -1,    -1,    19,    61,    91,    -1,    19,
-      -1,    93,    97,    -1,    93,    -1,    94,    -1,    19,    -1,
-       5,    19,    -1,    19,     5,    -1,    96,    19,    -1,     5,
-      96,    19,    -1,    96,    19,     5,    -1,    95,    94,    -1,
-      21,    94,    -1,     5,    94,    -1,    21,    -1,    21,     5,
-      -1,    95,    -1,    95,     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,
-      62,    -1,    62,     5,    -1,    62,    97,    -1,    62,     5,
-      97,    -1,    19,   100,    -1,   100,    -1,    76,    19,   100,
-      -1,    19,    76,   100,    -1,    76,   100,    -1,    98,    -1,
-      19,    56,   101,    57,    -1,   101,    60,    19,    -1,    19,
-      -1,    54,    24,    -1,    58,    -1,    39,    90,    99,    92,
-      19,    56,   106,    57,   104,   102,    -1,    76,    39,    90,
-      98,    92,    19,    56,   106,    57,   104,   102,    -1,    38,
-      76,    92,    19,    56,   106,    57,   104,   102,    -1,    76,
-      38,    92,    19,    56,   106,    57,   104,   102,    -1,    38,
-      92,    19,    56,   106,    57,   104,   102,    -1,    40,    56,
-      21,    57,    92,    19,    56,   106,    57,   104,   102,    -1,
-      76,    92,    19,    56,   106,    57,   104,   102,    -1,    19,
-      56,    19,    57,   102,    -1,    19,   105,    -1,    19,   105,
-      19,   105,    -1,    19,   105,    19,   105,    19,   105,    -1,
-      -1,   119,    -1,    54,    24,    -1,     6,    -1,    19,    -1,
-      19,     5,    -1,     5,    19,    -1,    19,    60,   107,    -1,
-      19,     5,    60,   107,    -1,     5,    19,    60,   107,    -1,
-     107,    -1,   108,    60,    10,    -1,   108,    -1,   108,    60,
-     109,    -1,   109,    -1,    92,    19,    -1,    92,    19,    22,
-      -1,    92,    19,    56,    19,   110,    57,    -1,    92,    19,
-      22,    56,    19,   110,    57,    -1,   110,   111,    -1,   111,
-      -1,    19,    -1,    63,   119,    -1,    64,   119,    -1,    63,
-      59,   119,    -1,    64,    59,   119,    -1,    59,    59,   119,
-      -1,    65,    59,   119,    -1,     9,    19,    54,   113,    55,
-      21,    58,    -1,     9,    19,    54,   113,    60,    55,    21,
-      58,    -1,   113,    60,   114,    -1,   114,    -1,    19,    59,
-     119,    -1,    19,    -1,    47,    19,    54,   116,    55,    21,
-      58,    -1,    47,    19,    54,   116,    60,    55,    21,    58,
-      -1,   116,    60,    19,    -1,    19,    -1,    46,    19,    54,
-     118,    55,    21,    58,    -1,    46,    19,    54,   118,    60,
-      55,    21,    58,    -1,   118,    60,    19,    -1,    19,    -1,
-      20,    -1,    66,    20,    -1,    23,    -1,    19,    -1
+      69,     0,    -1,    71,    72,    71,    -1,    72,    71,    -1,
+      71,    72,    -1,    72,    -1,    24,    -1,    26,    -1,    29,
+      -1,    27,    -1,    28,    -1,    30,    -1,    31,    -1,    25,
+      -1,    71,    70,    -1,    71,   113,    -1,    71,   116,    -1,
+      71,   118,    -1,    70,    -1,   113,    -1,   116,    -1,   118,
+      -1,    73,    55,    75,    56,    -1,    73,    55,    56,    -1,
+       3,    21,     4,    21,    74,    -1,    -1,    57,    19,    58,
+      74,    -1,    57,    19,    19,    58,    74,    -1,    57,    19,
+      21,    58,    74,    -1,    57,    19,    20,    58,    74,    -1,
+      57,    19,    32,    32,    58,    74,    -1,    57,    19,    32,
+      32,    32,    58,    74,    -1,    57,    19,    19,    32,    58,
+      74,    -1,    57,    19,    19,    32,    32,    58,    74,    -1,
+      75,    76,    -1,    76,    -1,   104,    -1,    19,   104,    -1,
+      19,    21,   104,    -1,    81,    -1,    82,    -1,    84,    -1,
+      59,    -1,    33,    -1,    34,    -1,    35,    -1,    36,    -1,
+      19,    19,    -1,    19,    55,    24,    -1,    60,   120,    -1,
+      60,    55,    24,    -1,    78,    79,    -1,    79,    78,    -1,
+      79,    -1,    78,    -1,    19,    -1,    -1,    77,    93,    19,
+      80,    59,    -1,    77,    93,    19,    22,    80,    59,    -1,
+      38,    91,    90,    19,    83,    19,    55,    24,    19,    55,
+      24,    59,    -1,    38,    91,    90,    19,    83,    19,    55,
+      24,    59,    -1,    38,    91,    90,    19,    83,    19,    -1,
+      57,    19,    58,    -1,    -1,    37,    19,    19,    85,    19,
+      55,    24,    19,    55,    24,    59,    -1,    37,    19,    19,
+      85,    19,    55,    24,    59,    -1,    37,    19,    19,    85,
+      59,    -1,    57,    86,    58,    -1,    -1,    86,    61,    89,
+      -1,    89,    -1,    32,    -1,    19,    57,    32,    58,    -1,
+     120,    -1,    87,    -1,    42,    60,    87,    -1,    43,    60,
+      87,    -1,    44,    60,   120,    -1,    45,    60,   120,    -1,
+      46,    60,    88,    -1,    48,    60,    92,    -1,    49,    60,
+      93,    -1,    50,    60,    21,    -1,    50,    60,    19,    -1,
+      51,    60,    21,    -1,    51,    60,    19,    -1,    52,    60,
+      21,    -1,    52,    60,    19,    -1,    53,    60,    21,    -1,
+      53,    60,    19,    -1,    54,    60,    21,    -1,    54,    60,
+      19,    -1,    19,    -1,    19,    57,    19,    93,    58,    -1,
+      19,    -1,    57,    92,    58,    -1,    -1,    19,    62,    92,
+      -1,    19,    -1,    94,    98,    -1,    94,    -1,    95,    -1,
+      19,    -1,     5,    19,    -1,    19,     5,    -1,    97,    19,
+      -1,     5,    97,    19,    -1,    97,    19,     5,    -1,    96,
+      95,    -1,    21,    95,    -1,     5,    95,    -1,    21,    -1,
+      21,     5,    -1,    96,    -1,    96,     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,    63,    -1,    63,     5,    -1,    63,    98,    -1,
+      63,     5,    98,    -1,    19,   101,    -1,   101,    -1,    77,
+      19,   101,    -1,    19,    77,   101,    -1,    77,   101,    -1,
+      99,    -1,    19,    57,   102,    58,    -1,   102,    61,    19,
+      -1,    19,    -1,    55,    24,    -1,    59,    -1,    40,    91,
+     100,    93,    19,    57,   107,    58,   105,   103,    -1,    77,
+      40,    91,    99,    93,    19,    57,   107,    58,   105,   103,
+      -1,    39,    77,    93,    19,    57,   107,    58,   105,   103,
+      -1,    77,    39,    93,    19,    57,   107,    58,   105,   103,
+      -1,    39,    93,    19,    57,   107,    58,   105,   103,    -1,
+      41,    57,    21,    58,    93,    19,    57,   107,    58,   105,
+     103,    -1,    77,    93,    19,    57,   107,    58,   105,   103,
+      -1,    19,    57,    19,    58,   103,    -1,    19,   106,    -1,
+      19,   106,    19,   106,    -1,    19,   106,    19,   106,    19,
+     106,    -1,    -1,   120,    -1,    55,    24,    -1,     6,    -1,
+      19,    -1,    19,     5,    -1,     5,    19,    -1,    19,    61,
+     108,    -1,    19,     5,    61,   108,    -1,     5,    19,    61,
+     108,    -1,   108,    -1,   109,    61,    10,    -1,   109,    -1,
+     109,    61,   110,    -1,   110,    -1,    93,    19,    -1,    93,
+      19,    22,    -1,    93,    19,    57,    19,   111,    58,    -1,
+      93,    19,    22,    57,    19,   111,    58,    -1,   111,   112,
+      -1,   112,    -1,    19,    -1,    64,   120,    -1,    65,   120,
+      -1,    64,    60,   120,    -1,    65,    60,   120,    -1,    60,
+      60,   120,    -1,    66,    60,   120,    -1,     9,    19,    55,
+     114,    56,    21,    59,    -1,     9,    19,    55,   114,    61,
+      56,    21,    59,    -1,   114,    61,   115,    -1,   115,    -1,
+      19,    60,   120,    -1,    19,    -1,    48,    19,    55,   117,
+      56,    21,    59,    -1,    48,    19,    55,   117,    61,    56,
+      21,    59,    -1,   117,    61,    19,    -1,    19,    -1,    47,
+      19,    55,   119,    56,    21,    59,    -1,    47,    19,    55,
+     119,    61,    56,    21,    59,    -1,   119,    61,    19,    -1,
+      19,    -1,    20,    -1,    67,    20,    -1,    23,    -1,    19,
+      -1

 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {

-       0,   699,   699,   700,   701,   702,   705,   714,   723,   732,
-     741,   750,   759,   770,   771,   772,   773,   774,   775,   776,
-     777,   780,   785,   792,   809,   810,   818,   830,   839,   851,
-     860,   869,   878,   889,   890,   893,   894,   903,   915,   916,
-     917,   918,   921,   922,   923,   924,   927,   947,   971,   975,
-     983,   984,   985,   986,   987,   995,  1001,  1004,  1009,  1077,
-    1131,  1220,  1228,  1233,  1281,  1317,  1333,  1334,  1337,  1338,
-    1341,  1342,  1354,  1355,  1358,  1364,  1370,  1376,  1382,  1388,
-    1394,  1401,  1407,  1413,  1419,  1425,  1431,  1437,  1443,  1449,
-    1455,  1461,  1486,  1495,  1501,  1502,  1505,  1508,  1514,  1521,
-    1530,  1533,  1536,  1540,  1544,  1548,  1553,  1561,  1565,  1570,
-    1574,  1577,  1581,  1584,  1589,  1590,  1591,  1592,  1593,  1594,
-    1595,  1596,  1597,  1600,  1601,  1602,  1605,  1606,  1607,  1611,
-    1618,  1630,  1636,  1648,  1660,  1663,  1669,  1674,  1677,  1682,
-    1683,  1687,  1710,  1733,  1756,  1779,  1797,  1810,  1820,  1860,
-    1872,  1892,  1923,  1930,  1931,  1937,  1938,  1949,  1960,  1971,
-    1981,  1991,  2001,  2004,  2005,  2008,  2009,  2012,  2015,  2018,
-    2026,  2036,  2037,  2040,  2057,  2064,  2071,  2078,  2085,  2092,
-    2101,  2110,  2121,  2122,  2125,  2145,  2155,  2164,  2175,  2178,
-    2183,  2192,  2203,  2206,  2212,  2213,  2217,  2218
+       0,   704,   704,   705,   706,   707,   710,   719,   728,   737,
+     746,   755,   764,   773,   784,   785,   786,   787,   788,   789,
+     790,   791,   794,   799,   806,   823,   824,   832,   844,   853,
+     865,   874,   883,   892,   903,   904,   907,   908,   917,   929,
+     930,   931,   932,   935,   936,   937,   938,   941,   961,   985,
+     989,   997,   998,   999,  1000,  1001,  1009,  1015,  1018,  1023,
+    1091,  1145,  1234,  1242,  1247,  1295,  1331,  1347,  1348,  1351,
+    1352,  1355,  1356,  1368,  1369,  1372,  1378,  1384,  1390,  1396,
+    1402,  1408,  1415,  1421,  1427,  1433,  1439,  1445,  1451,  1457,
+    1463,  1469,  1475,  1500,  1509,  1515,  1516,  1519,  1522,  1528,
+    1535,  1544,  1547,  1550,  1554,  1558,  1562,  1567,  1575,  1579,
+    1584,  1588,  1591,  1595,  1598,  1603,  1604,  1605,  1606,  1607,
+    1608,  1609,  1610,  1611,  1614,  1615,  1616,  1619,  1620,  1621,
+    1625,  1632,  1644,  1650,  1662,  1674,  1677,  1683,  1688,  1691,
+    1696,  1697,  1701,  1724,  1747,  1770,  1793,  1811,  1824,  1834,
+    1874,  1886,  1906,  1937,  1944,  1945,  1951,  1952,  1963,  1974,
+    1985,  1995,  2005,  2015,  2018,  2019,  2022,  2023,  2026,  2029,
+    2032,  2040,  2050,  2051,  2054,  2071,  2078,  2085,  2092,  2099,
+    2106,  2115,  2124,  2135,  2136,  2139,  2159,  2169,  2178,  2189,
+    2192,  2197,  2206,  2217,  2220,  2226,  2227,  2231,  2232

 };
 #endif
 
 };
 #endif
 


@@ -1284,22 +1309,23 @@ 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",
   "$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", "ADCODE", "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", "methodmods", "retcode", "funcargs", "arglist",
-  "arglist1", "arg", "checklist", "check", "enumcode", "enumvals",
-  "enumval", "flagcode", "flagvals", "errorcode", "errorvals", "numtok", 0
+  "TYPETOKEN", "ARRAY_DIM", "SINGLE_CHAR", "CCODE", "CTCODE", "ADCODE",
+  "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", "methodmods", "retcode", "funcargs",
+  "arglist", "arglist1", "arg", "checklist", "check", "enumcode",
+  "enumvals", "enumval", "flagcode", "flagvals", "errorcode", "errorvals",
+  "numtok", 0

 };
 #endif
 
 };
 #endif
 


@@ -1313,322 +1339,327 @@ static const yytype_uint16 yytoknum[] =
      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,
      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,   308,   123,   125,    40,    41,    59,    61,
-      44,   124,    42,    62,    60,    33,    45
+     305,   306,   307,   308,   309,   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 yytype_uint8 yyr1[] =
 {
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {

-       0,    67,    68,    68,    68,    68,    69,    69,    69,    69,
-      69,    69,    69,    70,    70,    70,    70,    70,    70,    70,
-      70,    71,    71,    72,    73,    73,    73,    73,    73,    73,
-      73,    73,    73,    74,    74,    75,    75,    75,    75,    75,
-      75,    75,    76,    76,    76,    76,    77,    77,    78,    78,
-      79,    79,    79,    79,    79,    79,    80,    80,    81,    81,
-      81,    82,    82,    83,    83,    83,    84,    84,    85,    85,
-      86,    86,    87,    87,    88,    88,    88,    88,    88,    88,
-      88,    88,    88,    88,    88,    88,    88,    88,    88,    88,
-      88,    88,    89,    89,    90,    90,    91,    91,    92,    92,
-      93,    93,    93,    93,    93,    93,    93,    94,    94,    94,
-      94,    94,    94,    94,    95,    95,    95,    95,    95,    95,
-      95,    95,    95,    96,    96,    96,    97,    97,    97,    97,
-      98,    98,    99,    99,    99,    99,   100,   101,   101,   102,
-     102,   103,   103,   103,   103,   103,   103,   103,   103,   104,
-     104,   104,   104,   105,   105,   106,   106,   106,   106,   106,
-     106,   106,   106,   107,   107,   108,   108,   109,   109,   109,
-     109,   110,   110,   111,   111,   111,   111,   111,   111,   111,
-     112,   112,   113,   113,   114,   114,   115,   115,   116,   116,
-     117,   117,   118,   118,   119,   119,   119,   119
+       0,    68,    69,    69,    69,    69,    70,    70,    70,    70,
+      70,    70,    70,    70,    71,    71,    71,    71,    71,    71,
+      71,    71,    72,    72,    73,    74,    74,    74,    74,    74,
+      74,    74,    74,    74,    75,    75,    76,    76,    76,    76,
+      76,    76,    76,    77,    77,    77,    77,    78,    78,    79,
+      79,    80,    80,    80,    80,    80,    80,    81,    81,    82,
+      82,    82,    83,    83,    84,    84,    84,    85,    85,    86,
+      86,    87,    87,    88,    88,    89,    89,    89,    89,    89,
+      89,    89,    89,    89,    89,    89,    89,    89,    89,    89,
+      89,    89,    89,    90,    90,    91,    91,    92,    92,    93,
+      93,    94,    94,    94,    94,    94,    94,    94,    95,    95,
+      95,    95,    95,    95,    95,    96,    96,    96,    96,    96,
+      96,    96,    96,    96,    97,    97,    97,    98,    98,    98,
+      98,    99,    99,   100,   100,   100,   100,   101,   102,   102,
+     103,   103,   104,   104,   104,   104,   104,   104,   104,   104,
+     105,   105,   105,   105,   106,   106,   107,   107,   107,   107,
+     107,   107,   107,   107,   108,   108,   109,   109,   110,   110,
+     110,   110,   111,   111,   112,   112,   112,   112,   112,   112,
+     112,   113,   113,   114,   114,   115,   115,   116,   116,   117,
+     117,   118,   118,   119,   119,   120,   120,   120,   120

 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     3,     2,     2,     1,     1,     1,     1,     1,
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     3,     2,     2,     1,     1,     1,     1,     1,

-       1,     1,     1,     2,     2,     2,     2,     1,     1,     1,
-       1,     4,     3,     5,     0,     4,     5,     5,     5,     6,
-       7,     6,     7,     2,     1,     1,     2,     3,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     3,     2,     3,
-       2,     2,     1,     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,
+       1,     1,     1,     1,     2,     2,     2,     2,     1,     1,
+       1,     1,     4,     3,     5,     0,     4,     5,     5,     5,
+       6,     7,     6,     7,     2,     1,     1,     2,     3,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     3,     2,
+       3,     2,     2,     1,     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,     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,     6,     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
+       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,     6,     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

 };
 
 };
 

-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE doesn't specify something else to do.  Zero

    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {

-       0,     0,     0,     6,     7,     9,    10,     8,    11,    12,
-       0,     0,     0,    17,     0,     5,     0,    18,    19,    20,
-       0,     0,     0,     0,     1,    13,     4,    14,    15,    16,
-       3,     0,     0,     0,     0,     0,     2,     0,    42,    43,
-      44,    45,     0,    95,     0,    95,     0,    22,    41,     0,
-      34,     0,    38,    39,    40,    35,    24,   185,     0,   183,
-     193,     0,   189,     0,     0,     0,     0,     0,    36,     0,
-       0,     0,     0,   114,   123,   124,   125,   121,   122,   118,
-     116,   117,   119,   120,   115,   101,   110,     0,     0,    99,
-     100,   112,     0,     0,     0,    21,    33,     0,    95,     0,
-       0,    23,     0,     0,     0,     0,     0,     0,     0,    37,
-       0,     0,    67,    97,     0,    93,     0,     0,   102,   109,
-       0,   103,   111,   108,     0,     0,   126,    98,   113,   107,
-     104,     0,     0,   135,     0,   131,     0,     0,     0,    55,
-       0,   197,   194,   196,     0,   184,     0,     0,   182,     0,
-     192,     0,     0,   188,     0,     0,     0,     0,     0,     0,
-      94,     0,    62,   105,     0,     0,   127,   128,   106,     0,
-       0,     0,   130,     0,   134,     0,     0,     0,     0,     0,
-      54,    55,     0,     0,    53,    52,     0,     0,     0,     0,
-       0,    24,   195,   180,     0,   190,     0,   186,     0,     0,
-     140,   148,    91,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    69,     0,    65,    96,
-       0,     0,     0,     0,     0,   114,   101,     0,     0,   162,
-     164,   166,   129,   138,     0,   133,   132,     0,     0,     0,
-       0,    46,     0,     0,     0,     0,    48,    50,     0,    51,
-      56,     0,    24,    24,    24,     0,    25,   181,   191,   187,
-     139,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    66,     0,     0,     0,     0,    60,     0,
-     102,   103,     0,   167,   152,     0,   136,     0,     0,     0,
-       0,     0,    47,    57,   152,    49,     0,    24,    26,    28,
-      27,     0,    24,     0,    70,    74,    75,    76,    77,   197,
-      73,    78,    72,    79,    80,    82,    81,    84,    83,    86,
-      85,    88,    87,    90,    89,    68,     0,    92,    61,     0,
-     152,     0,     0,   159,   168,     0,     0,     0,   163,   165,
-     137,     0,     0,   152,     0,     0,    24,    31,    24,    29,
-       0,     0,    64,     0,     0,   161,   160,     0,     0,     0,
-     149,   153,   145,   152,     0,     0,     0,   147,    32,    30,
-       0,     0,     0,    59,   143,     0,   173,     0,     0,     0,
-       0,     0,   172,   154,     0,     0,   152,   144,   152,    71,
-       0,     0,     0,     0,     0,   174,     0,   175,     0,   169,
-     171,   150,   141,     0,     0,    63,     0,   170,   178,   176,
-     177,   179,     0,   146,   142,    58,   151
+       0,     0,     0,     6,    13,     7,     9,    10,     8,    11,
+      12,     0,     0,     0,    18,     0,     5,     0,    19,    20,
+      21,     0,     0,     0,     0,     1,    14,     4,    15,    16,
+      17,     3,     0,     0,     0,     0,     0,     2,     0,    43,
+      44,    45,    46,     0,    96,     0,    96,     0,    23,    42,
+       0,    35,     0,    39,    40,    41,    36,    25,   186,     0,
+     184,   194,     0,   190,     0,     0,     0,     0,     0,    37,
+       0,     0,     0,     0,   115,   124,   125,   126,   122,   123,
+     119,   117,   118,   120,   121,   116,   102,   111,     0,     0,
+     100,   101,   113,     0,     0,     0,    22,    34,     0,    96,
+       0,     0,    24,     0,     0,     0,     0,     0,     0,     0,
+      38,     0,     0,    68,    98,     0,    94,     0,     0,   103,
+     110,     0,   104,   112,   109,     0,     0,   127,    99,   114,
+     108,   105,     0,     0,   136,     0,   132,     0,     0,     0,
+      56,     0,   198,   195,   197,     0,   185,     0,     0,   183,
+       0,   193,     0,     0,   189,     0,     0,     0,     0,     0,
+       0,    95,     0,    63,   106,     0,     0,   128,   129,   107,
+       0,     0,     0,   131,     0,   135,     0,     0,     0,     0,
+       0,    55,    56,     0,     0,    54,    53,     0,     0,     0,
+       0,     0,    25,   196,   181,     0,   191,     0,   187,     0,
+       0,   141,   149,    92,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    70,     0,    66,
+      97,     0,     0,     0,     0,     0,   115,   102,     0,     0,
+     163,   165,   167,   130,   139,     0,   134,   133,     0,     0,
+       0,     0,    47,     0,     0,     0,     0,    49,    51,     0,
+      52,    57,     0,    25,    25,    25,     0,    26,   182,   192,
+     188,   140,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    67,     0,     0,     0,     0,    61,
+       0,   103,   104,     0,   168,   153,     0,   137,     0,     0,
+       0,     0,     0,    48,    58,   153,    50,     0,    25,    27,
+      29,    28,     0,    25,     0,    71,    75,    76,    77,    78,
+     198,    74,    79,    73,    80,    81,    83,    82,    85,    84,
+      87,    86,    89,    88,    91,    90,    69,     0,    93,    62,
+       0,   153,     0,     0,   160,   169,     0,     0,     0,   164,
+     166,   138,     0,     0,   153,     0,     0,    25,    32,    25,
+      30,     0,     0,    65,     0,     0,   162,   161,     0,     0,
+       0,   150,   154,   146,   153,     0,     0,     0,   148,    33,
+      31,     0,     0,     0,    60,   144,     0,   174,     0,     0,
+       0,     0,     0,   173,   155,     0,     0,   153,   145,   153,
+      72,     0,     0,     0,     0,     0,   175,     0,   176,     0,
+     170,   172,   151,   142,     0,     0,    64,     0,   171,   179,
+     177,   178,   180,     0,   147,   143,    59,   152

 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {

-      -1,    12,    13,    14,    15,    16,   101,    49,    50,    51,
-     184,   185,   186,    52,    53,   222,    54,   158,   215,   305,
-     311,   216,   116,    71,   114,   227,    89,    90,    91,    92,
-     127,   133,   134,   135,   234,   201,    55,   337,   360,   228,
-     229,   230,   231,   381,   382,    17,    58,    59,    18,    63,
-      19,    61,   361
+      -1,    13,    14,    15,    16,    17,   102,    50,    51,    52,
+     185,   186,   187,    53,    54,   223,    55,   159,   216,   306,
+     312,   217,   117,    72,   115,   228,    90,    91,    92,    93,
+     128,   134,   135,   136,   235,   202,    56,   338,   361,   229,
+     230,   231,   232,   382,   383,    18,    59,    60,    19,    64,
+      20,    62,   362

 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */

-#define YYPACT_NINF -326
+#define YYPACT_NINF -360

 static const yytype_int16 yypact[] =
 {
 static const yytype_int16 yypact[] =
 {

-     145,    13,    77,  -326,  -326,  -326,  -326,  -326,  -326,  -326,
-     108,   196,   146,  -326,   145,   205,   168,  -326,  -326,  -326,
-     264,   173,   221,   232,  -326,  -326,   205,  -326,  -326,  -326,
-     205,   161,   259,   276,   283,   301,   205,   222,  -326,  -326,
-    -326,  -326,   309,   273,   327,   273,   281,  -326,  -326,   170,
-    -326,   292,  -326,  -326,  -326,  -326,   291,   290,   -27,  -326,
-    -326,    40,  -326,   127,   294,   250,   332,   292,  -326,   333,
-     334,   335,   375,  -326,  -326,  -326,  -326,  -326,  -326,  -326,
-    -326,  -326,  -326,  -326,  -326,   350,   443,   392,   337,   295,
-    -326,   457,   339,   239,   357,  -326,  -326,   392,   273,   366,
-     376,  -326,    27,   381,    71,   391,    95,   398,   124,  -326,
-     372,   417,   390,   389,   394,   396,   434,   471,  -326,  -326,
-     446,  -326,   471,  -326,   447,   411,     4,  -326,   471,  -326,
-     474,   231,   461,  -326,   392,  -326,   424,   472,   475,   122,
-     192,  -326,  -326,  -326,   470,  -326,   435,   476,  -326,   437,
-    -326,   477,   438,  -326,   478,   163,   444,   274,     0,   334,
-    -326,   482,   448,  -326,   449,   409,   295,  -326,  -326,   450,
-     483,   484,  -326,     6,  -326,   488,   392,   452,     6,   392,
-      64,    38,   409,    32,   451,   490,   453,    80,   455,   456,
-     485,   291,  -326,  -326,   459,  -326,   460,  -326,   462,   491,
-    -326,  -326,  -326,   463,   464,   465,   466,   467,   468,   469,
-     473,   479,   480,   481,   486,   -30,  -326,   487,  -326,  -326,
-     392,   495,   500,   409,   426,   489,    11,   502,   492,  -326,
-     493,  -326,  -326,  -326,   126,  -326,  -326,   494,   510,   409,
-     511,  -326,   507,   496,   498,   509,  -326,  -326,    64,  -326,
-    -326,   187,   291,   291,   291,   189,  -326,  -326,  -326,  -326,
-    -326,    85,    85,    27,    27,    18,   334,   392,    -6,   219,
-     226,   260,   293,  -326,   274,   512,   499,   501,   497,   503,
-     128,   179,   392,   100,   515,   358,  -326,   516,   409,   505,
-     506,   508,  -326,  -326,   515,  -326,   513,   291,  -326,  -326,
-    -326,   514,   291,   517,  -326,  -326,  -326,  -326,  -326,   517,
-    -326,  -326,  -326,  -326,  -326,  -326,  -326,  -326,  -326,  -326,
-    -326,  -326,  -326,  -326,  -326,  -326,    12,  -326,  -326,   518,
-     515,   392,   392,  -326,   519,   524,    69,   163,  -326,  -326,
-    -326,   520,   409,   515,   409,   163,   291,  -326,   291,  -326,
-     521,   522,  -326,    61,   163,  -326,  -326,   525,    66,   523,
-     529,  -326,  -326,   515,   526,   163,   527,  -326,  -326,  -326,
-     528,   533,   532,  -326,  -326,    66,  -326,   530,    83,   101,
-     531,    75,  -326,  -326,    69,   163,   515,  -326,   515,  -326,
-     504,   535,    88,    27,    27,  -326,    27,  -326,    27,  -326,
-    -326,   546,  -326,   163,   163,  -326,   534,  -326,  -326,  -326,
-    -326,  -326,    69,  -326,  -326,  -326,  -326
+     162,    -2,     6,  -360,  -360,  -360,  -360,  -360,  -360,  -360,
+    -360,    16,    90,   131,  -360,   162,   210,    77,  -360,  -360,
+    -360,   156,   126,   160,   167,  -360,  -360,   210,  -360,  -360,
+    -360,   210,   161,   223,   153,   230,   231,   210,   226,  -360,
+    -360,  -360,  -360,   244,   207,   309,   207,   214,  -360,  -360,
+     192,  -360,   292,  -360,  -360,  -360,  -360,   215,   242,   -28,
+    -360,  -360,   151,  -360,   152,   255,   300,   310,   292,  -360,
+     319,   330,   336,   376,  -360,  -360,  -360,  -360,  -360,  -360,
+    -360,  -360,  -360,  -360,  -360,  -360,   351,   444,   393,   338,
+     295,  -360,   458,   360,   327,   365,  -360,  -360,   393,   207,
+     377,   384,  -360,     7,   392,    92,   399,    98,   409,   100,
+    -360,   379,   428,   394,   390,   395,   397,   447,   472,  -360,
+    -360,   448,  -360,   472,  -360,   449,   423,     5,  -360,   472,
+    -360,   476,   149,   463,  -360,   393,  -360,   433,   473,   475,
+      58,   184,  -360,  -360,  -360,   477,  -360,   436,   478,  -360,
+     437,  -360,   479,   439,  -360,   480,   159,   445,   236,    -4,
+     330,  -360,   484,   450,  -360,   451,   410,   295,  -360,  -360,
+     452,   485,   486,  -360,    69,  -360,   487,   393,   453,    69,
+     393,   115,    -3,   410,    18,   454,   492,   456,   117,   455,
+     459,   488,   215,  -360,  -360,   457,  -360,   460,  -360,   462,
+     494,  -360,  -360,  -360,   464,   465,   466,   467,   468,   469,
+     470,   471,   474,   481,   482,   483,   185,  -360,   489,  -360,
+    -360,   393,   493,   503,   410,   427,   490,     8,   504,   491,
+    -360,   495,  -360,  -360,  -360,   212,  -360,  -360,   496,   513,
+     410,   514,  -360,   511,   498,   497,   512,  -360,  -360,   115,
+    -360,  -360,   120,   215,   215,   215,   121,  -360,  -360,  -360,
+    -360,  -360,   110,   110,     7,     7,    63,   330,   393,   119,
+     202,   235,   274,   333,  -360,   236,   515,   500,   501,   499,
+     502,   289,   290,   393,    -8,   518,   359,  -360,   519,   410,
+     505,   506,   508,  -360,  -360,   518,  -360,   509,   215,  -360,
+    -360,  -360,   510,   215,   516,  -360,  -360,  -360,  -360,  -360,
+     516,  -360,  -360,  -360,  -360,  -360,  -360,  -360,  -360,  -360,
+    -360,  -360,  -360,  -360,  -360,  -360,  -360,    13,  -360,  -360,
+     521,   518,   393,   393,  -360,   517,   527,    70,   159,  -360,
+    -360,  -360,   520,   410,   518,   410,   159,   215,  -360,   215,
+    -360,   529,   522,  -360,    65,   159,  -360,  -360,   528,    32,
+     526,   532,  -360,  -360,   518,   523,   159,   524,  -360,  -360,
+    -360,   525,   539,   530,  -360,  -360,    32,  -360,   531,    27,
+      83,   533,    56,  -360,  -360,    70,   159,   518,  -360,   518,
+    -360,   507,   545,    81,     7,     7,  -360,     7,  -360,     7,
+    -360,  -360,   551,  -360,   159,   159,  -360,   535,  -360,  -360,
+    -360,  -360,  -360,    70,  -360,  -360,  -360,  -360

 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {

-    -326,  -326,    -4,   102,   552,  -326,  -189,  -326,   538,   -26,
-     352,   383,   387,  -326,  -326,  -326,  -326,  -326,  -326,     5,
-    -326,   298,  -326,   -24,  -154,   -43,  -326,   -69,  -326,   -66,
-     -57,   431,  -326,   -96,  -326,  -325,   -23,  -287,  -297,  -178,
-    -259,  -326,   289,   203,  -216,   154,  -326,   536,   212,  -326,
-     223,  -326,  -102
+    -360,  -360,    21,    15,   537,  -360,  -190,  -360,   534,   -27,
+     354,   386,   398,  -360,  -360,  -360,  -360,  -360,  -360,   -90,
+    -360,   297,  -360,   -37,  -155,   -44,  -360,   -70,  -360,   -67,
+     -23,   440,  -360,    -5,  -360,  -326,    85,  -288,  -278,  -179,
+    -262,  -360,   301,   199,  -359,   237,  -360,   536,   238,  -360,
+     322,  -360,  -103

 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
 };
 
 /* 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 -159
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -160

 static const yytype_int16 yytable[] =
 {
 static const yytype_int16 yytable[] =
 {

-     145,    88,   256,   119,   244,   219,   120,   345,    99,   166,
-      25,    67,   362,   315,    68,   316,   281,   123,    87,   217,
-     367,    93,   129,   333,   111,   169,    25,   273,   103,   374,
-     274,   351,    25,   104,    20,   172,   174,   309,   142,    67,
-     387,   143,   109,   354,   124,   279,   141,   142,   119,   304,
-     143,   141,   142,   119,   137,   143,   365,   180,   218,   119,
-     402,   290,   170,   298,   299,   300,   126,   132,  -156,   167,
-     352,   282,   355,   356,   138,   235,   385,   236,   413,   414,
-     372,   246,   172,   241,   144,   376,   245,   401,   141,   142,
-      57,   175,   143,   144,   376,   105,    21,   183,   144,   403,
-     106,   404,   141,   142,   303,   171,   143,   376,   347,   232,
-     341,   251,   313,   349,   150,   416,   304,    30,   242,   373,
-     141,   142,   334,   359,   143,   377,   147,    22,    36,   378,
-     379,   380,   399,   238,   377,   144,   240,   252,   378,   379,
-     380,   180,   394,   153,   181,   407,    24,   377,     1,   144,
-     151,   378,   379,   380,     2,   119,   335,   368,   120,   369,
-     396,   307,   308,   312,   364,   400,   366,   144,    27,     3,
-       4,     5,     6,     7,     8,     9,   400,   276,   182,   154,
-      37,   183,   107,   286,    27,  -158,   287,   108,   331,    37,
-      27,    10,    11,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,   187,   188,   189,     2,    23,    47,   199,   296,    48,
-     301,   200,    31,   190,   314,    95,    28,    33,    48,     3,
-       4,     5,     6,     7,     8,     9,  -157,    29,   317,   332,
-     318,    64,    28,    65,   297,   319,   302,   320,    28,   191,
-     169,    10,    11,    29,    38,    39,    40,    41,   131,    29,
-      44,    45,    46,    38,    39,    40,    41,   306,    32,    64,
-     310,    38,    39,    40,    41,    34,   395,   397,    66,   321,
-      56,   322,    38,    39,    40,    41,    35,   170,    44,    45,
-      46,   408,   409,   202,   410,    57,   411,    72,    73,    74,
-      75,    76,    60,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,   323,    86,   324,   203,   204,   205,   206,   207,
-      62,   208,   209,   210,   211,   212,   213,   214,    69,    70,
-      97,    98,    72,    73,    74,    75,    76,    94,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,   100,    86,   102,
-      66,   110,   112,   113,   115,   121,   125,   126,   130,    38,
-      39,    40,    41,    72,    73,    74,    75,    76,   338,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,   136,    86,
-     117,    73,    74,    75,    76,   139,    77,    78,    79,    80,
-      81,    82,    83,    84,   118,   140,    86,    72,    73,    74,
-      75,    76,   146,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,   149,    86,   224,   225,    74,    75,    76,   152,
-      77,    78,    79,    80,    81,    82,    83,    84,   226,   155,
-      86,   117,    73,    74,    75,    76,   156,    77,    78,    79,
-      80,    81,    82,    83,    84,   280,   157,    86,   122,    73,
-     159,   160,   161,   162,    77,    78,    79,    80,    81,    82,
-      83,    84,   128,    73,    86,   163,   164,   165,    77,    78,
-      79,    80,    81,    82,    83,    84,   117,    73,    86,   168,
-     173,   176,    77,    78,    79,    80,    81,    82,    83,    84,
-     192,   177,    86,   193,   178,   195,   197,   194,   196,   198,
-     182,   220,   233,   169,   221,   223,   170,   237,   239,   248,
-     183,   250,   253,   254,   277,   260,   255,   257,   258,   278,
-     259,   283,   261,   262,   263,   264,   265,   266,   267,   289,
-     291,   292,   268,   295,   336,   340,   326,   249,   269,   270,
-     271,   275,   353,   358,   375,   272,  -155,   383,   384,   284,
-     288,   329,   370,   285,   293,   294,   327,   390,   328,   406,
-     330,   342,   405,   343,   344,   412,    26,   247,   243,   179,
-     346,   348,   325,   350,   339,   357,   371,   363,   392,     0,
-       0,     0,     0,   386,   388,   389,   391,    96,     0,   393,
-     398,     0,   415,     0,     0,     0,     0,     0,     0,     0,
+     146,    89,   257,   120,   245,   220,   121,   346,   100,    94,
+     167,    68,   363,   282,   335,   218,   181,   124,    88,    21,
+     368,   334,   130,   401,   112,    22,   142,   143,   104,   375,
+     144,    31,   352,   105,   401,    23,    26,   142,   143,    68,
+     388,   144,    37,   355,   125,   280,   142,   143,   120,   336,
+     144,   377,    26,   120,   138,   219,   366,   184,    26,   120,
+     403,   291,   139,   299,   300,   301,  -157,   133,   127,   283,
+     356,   357,   353,   246,   145,   377,   386,   181,   414,   415,
+     182,   247,   310,   143,   373,   145,   144,   395,   170,   142,
+     143,   176,   378,   144,   145,   305,   379,   380,   381,   404,
+     377,   405,   142,   143,   168,   172,   144,   402,   348,    24,
+     342,    58,   314,   350,   400,   183,   378,   151,   184,   154,
+     379,   380,   381,    69,   374,   360,   171,   173,   175,   304,
+     145,    25,    32,   239,   242,   417,   241,   145,   316,   408,
+     317,   378,   305,   397,   233,   379,   380,   381,   148,   252,
+     145,   110,   297,   302,   152,   120,   155,   369,   121,   370,
+      33,   308,   309,   313,   365,     1,   367,   236,   170,   237,
+     243,     2,    58,   307,   173,   253,   311,   277,   298,   303,
+      38,    34,    39,    40,    41,    42,     3,     4,     5,     6,
+       7,     8,     9,    10,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,   188,   189,   190,   171,   106,   108,    11,
+      12,    38,   107,   109,   200,    35,   191,    48,   201,     2,
+      49,   318,    36,   319,   315,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,     3,     4,     5,     6,     7,     8,
+       9,    10,   192,   274,    57,    65,   275,    66,    96,    61,
+      63,    49,    28,    29,   320,   203,   321,    11,    12,    39,
+      40,    41,    42,    70,    71,    45,    46,    47,    28,    29,
+     287,    95,   101,   288,    28,    29,   396,   398,   204,   205,
+     206,   207,   208,    67,   209,   210,   211,   212,   213,   214,
+     215,   409,   410,   322,   411,   323,   412,    73,    74,    75,
+      76,    77,   103,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    67,    87,    73,    74,    75,    76,    77,    65,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,   111,
+      87,    98,    99,    39,    40,    41,    42,    30,   113,    45,
+      46,    47,    39,    40,    41,    42,   132,  -159,  -158,   114,
+     332,   333,   324,    30,   325,   116,   122,   126,   127,    30,
+      39,    40,    41,    42,    73,    74,    75,    76,    77,   339,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,   131,
+      87,   118,    74,    75,    76,    77,   137,    78,    79,    80,
+      81,    82,    83,    84,    85,   119,   140,    87,    73,    74,
+      75,    76,    77,   141,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,   147,    87,   225,   226,    75,    76,    77,
+     150,    78,    79,    80,    81,    82,    83,    84,    85,   227,
+     153,    87,   118,    74,    75,    76,    77,   156,    78,    79,
+      80,    81,    82,    83,    84,    85,   281,   157,    87,   123,
+      74,   158,   160,   161,   162,    78,    79,    80,    81,    82,
+      83,    84,    85,   129,    74,    87,   163,   164,   165,    78,
+      79,    80,    81,    82,    83,    84,    85,   118,    74,    87,
+     166,   169,   174,    78,    79,    80,    81,    82,    83,    84,
+      85,   177,   178,    87,   179,   194,   196,   193,   198,   195,
+     197,   199,   183,   221,   234,   170,   238,   222,   224,   171,
+     240,   249,   278,   254,   184,   251,   258,   255,   261,   259,
+     256,   260,   279,   284,   262,   263,   264,   265,   266,   267,
+     268,   269,   290,   292,   270,   293,   296,   337,   341,   327,
+     250,   271,   272,   273,   276,   354,   359,   376,  -156,   285,
+     384,   385,    27,   289,   330,   295,   286,   294,   328,   329,
+     331,   371,   343,   391,   344,   345,   406,   347,   349,   407,
+     413,   248,   326,   351,   358,   393,     0,   372,   364,   180,
+     244,   387,   389,   390,    97,   392,     0,   340,     0,     0,
+       0,   394,     0,   399,   416,     0,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-     148
+       0,   149

 };
 
 };
 

+#define yypact_value_is_default(yystate) \
+  ((yystate) == (-360))
+
+#define yytable_value_is_error(yytable_value) \
+  YYID (0)
+

 static const yytype_int16 yycheck[] =
 {
 static const yytype_int16 yycheck[] =
 {

-     102,    44,   191,    72,   182,   159,    72,   294,    51,     5,
-      14,    37,   337,    19,    37,    21,     5,    86,    44,    19,
-     345,    45,    91,   282,    67,    19,    30,    57,    55,   354,
-      60,    19,    36,    60,    21,   131,   132,    19,    20,    65,
-     365,    23,    65,   330,    87,   223,    19,    20,   117,    31,
-      23,    19,    20,   122,    97,    23,   343,    19,    58,   128,
-     385,   239,    56,   252,   253,   254,    62,    93,    57,   126,
-      58,    60,   331,   332,    98,   171,   363,   173,   403,   404,
-      19,   183,   178,    19,    66,    19,    54,   384,    19,    20,
-      19,   134,    23,    66,    19,    55,    19,    59,    66,   386,
-      60,   388,    19,    20,    19,   131,    23,    19,   297,   166,
-     288,    31,   266,   302,    19,   412,    31,    15,    54,    58,
-      19,    20,    22,    54,    23,    59,    55,    19,    26,    63,
-      64,    65,    57,   176,    59,    66,   179,    57,    63,    64,
-      65,    19,    59,    19,    22,    57,     0,    59,     3,    66,
-      55,    63,    64,    65,     9,   224,    56,   346,   224,   348,
-      59,   263,   264,   265,   342,   381,   344,    66,    14,    24,
-      25,    26,    27,    28,    29,    30,   392,   220,    56,    55,
-      19,    59,    55,    57,    30,    57,    60,    60,    60,    19,
-      36,    46,    47,    32,    33,    34,    35,    36,    37,    38,
-      39,    40,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    19,    20,    21,     9,    19,    55,    54,    31,    58,
-      31,    58,    54,    31,   267,    55,    14,    54,    58,    24,
-      25,    26,    27,    28,    29,    30,    57,    14,    19,    60,
-      21,    19,    30,    21,    57,    19,    57,    21,    36,    57,
-      19,    46,    47,    30,    32,    33,    34,    35,    19,    36,
-      38,    39,    40,    32,    33,    34,    35,   262,     4,    19,
-     265,    32,    33,    34,    35,    54,   378,   379,    56,    19,
-      21,    21,    32,    33,    34,    35,    54,    56,    38,    39,
-      40,   393,   394,    19,   396,    19,   398,     5,     6,     7,
-       8,     9,    19,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    19,    21,    21,    41,    42,    43,    44,    45,
-      19,    47,    48,    49,    50,    51,    52,    53,    19,    56,
-      38,    39,     5,     6,     7,     8,     9,    56,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    56,    21,    59,
-      56,    19,    19,    19,    19,     5,    19,    62,    19,    32,
-      33,    34,    35,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    21,    21,
-       5,     6,     7,     8,     9,    19,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    19,    21,     5,     6,     7,
-       8,     9,    21,    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,    57,
-      21,     5,     6,     7,     8,     9,    19,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    56,    21,     5,     6,
-      61,    57,    56,    19,    11,    12,    13,    14,    15,    16,
-      17,    18,     5,     6,    21,    19,    19,    56,    11,    12,
-      13,    14,    15,    16,    17,    18,     5,     6,    21,     5,
-      19,    57,    11,    12,    13,    14,    15,    16,    17,    18,
-      20,    19,    21,    58,    19,    58,    58,    21,    21,    21,
-      56,    19,    19,    19,    56,    56,    56,    19,    56,    19,
-      59,    58,    57,    57,    19,    24,    31,    58,    58,    19,
-      58,    19,    59,    59,    59,    59,    59,    59,    59,    19,
-      19,    24,    59,    24,    19,    19,    24,   185,    59,    59,
-      59,    54,    24,    19,    19,    59,    57,    24,    19,    57,
-      56,    54,    31,    60,    58,    57,    57,    24,    57,    24,
-      57,    56,    58,    57,    56,    19,    14,   184,   181,   138,
-      57,    57,   274,    56,   285,    56,    54,    57,   375,    -1,
-      -1,    -1,    -1,    57,    57,    57,    54,    49,    -1,    59,
-      59,    -1,    58,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     103,    45,   192,    73,   183,   160,    73,   295,    52,    46,
+       5,    38,   338,     5,    22,    19,    19,    87,    45,    21,
+     346,   283,    92,   382,    68,    19,    19,    20,    56,   355,
+      23,    16,    19,    61,   393,    19,    15,    19,    20,    66,
+     366,    23,    27,   331,    88,   224,    19,    20,   118,    57,
+      23,    19,    31,   123,    98,    59,   344,    60,    37,   129,
+     386,   240,    99,   253,   254,   255,    58,    94,    63,    61,
+     332,   333,    59,    55,    67,    19,   364,    19,   404,   405,
+      22,   184,    19,    20,    19,    67,    23,    60,    19,    19,
+      20,   135,    60,    23,    67,    32,    64,    65,    66,   387,
+      19,   389,    19,    20,   127,   132,    23,   385,   298,    19,
+     289,    19,   267,   303,    58,    57,    60,    19,    60,    19,
+      64,    65,    66,    38,    59,    55,    57,   132,   133,    19,
+      67,     0,    55,   177,    19,   413,   180,    67,    19,    58,
+      21,    60,    32,    60,   167,    64,    65,    66,    56,    32,
+      67,    66,    32,    32,    56,   225,    56,   347,   225,   349,
+       4,   264,   265,   266,   343,     3,   345,   172,    19,   174,
+      55,     9,    19,   263,   179,    58,   266,   221,    58,    58,
+      19,    55,    33,    34,    35,    36,    24,    25,    26,    27,
+      28,    29,    30,    31,    33,    34,    35,    36,    37,    38,
+      39,    40,    41,    19,    20,    21,    57,    56,    56,    47,
+      48,    19,    61,    61,    55,    55,    32,    56,    59,     9,
+      59,    19,    55,    21,   268,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    24,    25,    26,    27,    28,    29,
+      30,    31,    58,    58,    21,    19,    61,    21,    56,    19,
+      19,    59,    15,    15,    19,    19,    21,    47,    48,    33,
+      34,    35,    36,    19,    57,    39,    40,    41,    31,    31,
+      58,    57,    57,    61,    37,    37,   379,   380,    42,    43,
+      44,    45,    46,    57,    48,    49,    50,    51,    52,    53,
+      54,   394,   395,    19,   397,    21,   399,     5,     6,     7,
+       8,     9,    60,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    57,    21,     5,     6,     7,     8,     9,    19,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    19,
+      21,    39,    40,    33,    34,    35,    36,    15,    19,    39,
+      40,    41,    33,    34,    35,    36,    19,    58,    58,    19,
+      61,    61,    19,    31,    21,    19,     5,    19,    63,    37,
+      33,    34,    35,    36,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    19,
+      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,    58,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    19,    21,     5,
+       6,    57,    62,    58,    57,    11,    12,    13,    14,    15,
+      16,    17,    18,     5,     6,    21,    19,    19,    19,    11,
+      12,    13,    14,    15,    16,    17,    18,     5,     6,    21,
+      57,     5,    19,    11,    12,    13,    14,    15,    16,    17,
+      18,    58,    19,    21,    19,    59,    59,    20,    59,    21,
+      21,    21,    57,    19,    19,    19,    19,    57,    57,    57,
+      57,    19,    19,    58,    60,    59,    59,    58,    24,    59,
+      32,    59,    19,    19,    60,    60,    60,    60,    60,    60,
+      60,    60,    19,    19,    60,    24,    24,    19,    19,    24,
+     186,    60,    60,    60,    55,    24,    19,    19,    58,    58,
+      24,    19,    15,    57,    55,    58,    61,    59,    58,    58,
+      58,    32,    57,    24,    58,    57,    59,    58,    58,    24,
+      19,   185,   275,    57,    57,   376,    -1,    55,    58,   139,
+     182,    58,    58,    58,    50,    55,    -1,   286,    -1,    -1,
+      -1,    60,    -1,    60,    59,    -1,    -1,    -1,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-     104
+      -1,   105

 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing


@@ -1636,47 +1667,47 @@ static const yytype_int16 yycheck[] =
 static const yytype_uint8 yystos[] =
 {
        0,     3,     9,    24,    25,    26,    27,    28,    29,    30,
 static const yytype_uint8 yystos[] =
 {
        0,     3,     9,    24,    25,    26,    27,    28,    29,    30,

-      46,    47,    68,    69,    70,    71,    72,   112,   115,   117,
-      21,    19,    19,    19,     0,    69,    71,   112,   115,   117,
-      70,    54,     4,    54,    54,    54,    70,    19,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    55,    58,    74,
-      75,    76,    80,    81,    83,   103,    21,    19,   113,   114,
-      19,   118,    19,   116,    19,    21,    56,    76,   103,    19,
-      56,    90,     5,     6,     7,     8,     9,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    21,    76,    92,    93,
-      94,    95,    96,    90,    56,    55,    75,    38,    39,    92,
-      56,    73,    59,    55,    60,    55,    60,    55,    60,   103,
-      19,    92,    19,    19,    91,    19,    89,     5,    19,    94,
-      96,     5,     5,    94,    92,    19,    62,    97,     5,    94,
-      19,    19,    76,    98,    99,   100,    21,    92,    90,    19,
-      19,    19,    20,    23,    66,   119,    21,    55,   114,    21,
-      19,    55,    21,    19,    55,    57,    19,    56,    84,    61,
-      57,    56,    19,    19,    19,    56,     5,    97,     5,    19,
-      56,    76,   100,    19,   100,    92,    57,    19,    19,    98,
-      19,    22,    56,    59,    77,    78,    79,    19,    20,    21,
-      31,    57,    20,    58,    21,    58,    21,    58,    21,    54,
-      58,   102,    19,    41,    42,    43,    44,    45,    47,    48,
-      49,    50,    51,    52,    53,    85,    88,    19,    58,    91,
-      19,    56,    82,    56,     5,     6,    19,    92,   106,   107,
-     108,   109,    97,    19,   101,   100,   100,    19,    92,    56,
-      92,    19,    54,    79,   106,    54,   119,    78,    19,    77,
-      58,    31,    57,    57,    57,    31,    73,    58,    58,    58,
-      24,    59,    59,    59,    59,    59,    59,    59,    59,    59,
-      59,    59,    59,    57,    60,    54,    92,    19,    19,   106,
-      19,     5,    60,    19,    57,    60,    57,    60,    56,    19,
-     106,    19,    24,    58,    57,    24,    31,    57,    73,    73,
-      73,    31,    57,    19,    31,    86,    86,   119,   119,    19,
-      86,    87,   119,    91,    92,    19,    21,    19,    21,    19,
-      21,    19,    21,    19,    21,    88,    24,    57,    57,    54,
-      57,    60,    60,   107,    22,    56,    19,   104,    10,   109,
-      19,   106,    56,    57,    56,   104,    57,    73,    57,    73,
-      56,    19,    58,    24,   104,   107,   107,    56,    19,    54,
-     105,   119,   102,    57,   106,   104,   106,   102,    73,    73,
-      31,    54,    19,    58,   102,    19,    19,    59,    63,    64,
-      65,   110,   111,    24,    19,   104,    57,   102,    57,    57,
-      24,    54,   110,    59,    59,   119,    59,   119,    59,    57,
-     111,   105,   102,   104,   104,    58,    24,    57,   119,   119,
-     119,   119,    19,   102,   102,    58,   105
+      31,    47,    48,    69,    70,    71,    72,    73,   113,   116,
+     118,    21,    19,    19,    19,     0,    70,    72,   113,   116,
+     118,    71,    55,     4,    55,    55,    55,    71,    19,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    56,    59,
+      75,    76,    77,    81,    82,    84,   104,    21,    19,   114,
+     115,    19,   119,    19,   117,    19,    21,    57,    77,   104,
+      19,    57,    91,     5,     6,     7,     8,     9,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    21,    77,    93,
+      94,    95,    96,    97,    91,    57,    56,    76,    39,    40,
+      93,    57,    74,    60,    56,    61,    56,    61,    56,    61,
+     104,    19,    93,    19,    19,    92,    19,    90,     5,    19,
+      95,    97,     5,     5,    95,    93,    19,    63,    98,     5,
+      95,    19,    19,    77,    99,   100,   101,    21,    93,    91,
+      19,    19,    19,    20,    23,    67,   120,    21,    56,   115,
+      21,    19,    56,    21,    19,    56,    58,    19,    57,    85,
+      62,    58,    57,    19,    19,    19,    57,     5,    98,     5,
+      19,    57,    77,   101,    19,   101,    93,    58,    19,    19,
+      99,    19,    22,    57,    60,    78,    79,    80,    19,    20,
+      21,    32,    58,    20,    59,    21,    59,    21,    59,    21,
+      55,    59,   103,    19,    42,    43,    44,    45,    46,    48,
+      49,    50,    51,    52,    53,    54,    86,    89,    19,    59,
+      92,    19,    57,    83,    57,     5,     6,    19,    93,   107,
+     108,   109,   110,    98,    19,   102,   101,   101,    19,    93,
+      57,    93,    19,    55,    80,   107,    55,   120,    79,    19,
+      78,    59,    32,    58,    58,    58,    32,    74,    59,    59,
+      59,    24,    60,    60,    60,    60,    60,    60,    60,    60,
+      60,    60,    60,    60,    58,    61,    55,    93,    19,    19,
+     107,    19,     5,    61,    19,    58,    61,    58,    61,    57,
+      19,   107,    19,    24,    59,    58,    24,    32,    58,    74,
+      74,    74,    32,    58,    19,    32,    87,    87,   120,   120,
+      19,    87,    88,   120,    92,    93,    19,    21,    19,    21,
+      19,    21,    19,    21,    19,    21,    89,    24,    58,    58,
+      55,    58,    61,    61,   108,    22,    57,    19,   105,    10,
+     110,    19,   107,    57,    58,    57,   105,    58,    74,    58,
+      74,    57,    19,    59,    24,   105,   108,   108,    57,    19,
+      55,   106,   120,   103,    58,   107,   105,   107,   103,    74,
+      74,    32,    55,    19,    59,   103,    19,    19,    60,    64,
+      65,    66,   111,   112,    24,    19,   105,    58,   103,    58,
+      58,    24,    55,   111,    60,    60,   120,    60,   120,    60,
+      58,   112,   106,   103,   105,   105,    59,    24,    58,   120,
+     120,   120,   120,    19,   103,   103,    59,   106

 };
 
 #define yyerrok                (yyerrstatus = 0)
 };
 
 #define yyerrok                (yyerrstatus = 0)


@@ -1691,9 +1722,18 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
 
 /* 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.  */
+   Once GCC version 2 has supplanted version 1, this can go.  However,
+   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
+   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+   discussed.  */

 
 #define YYFAIL         goto yyerrlab
 
 #define YYFAIL         goto yyerrlab

+#if defined YYFAIL
+  /* This is here to suppress warnings from the GCC cpp's
+     -Wunused-macros.  Normally we don't worry about that warning, but
+     some users do, and we want to make it easy for users to remove
+     YYFAIL uses, which will produce warnings from Bison 2.5.  */
+#endif

 
 #define YYRECOVERING()  (!!yyerrstatus)
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
 


@@ -1703,7 +1743,6 @@ do                                                                \
     {                                                          \
       yychar = (Token);                                                \
       yylval = (Value);                                                \
     {                                                          \
       yychar = (Token);                                                \
       yylval = (Value);                                                \

-      yytoken = YYTRANSLATE (yychar);                          \

       YYPOPSTACK (1);                                          \
       goto yybackup;                                           \
     }                                                          \
       YYPOPSTACK (1);                                          \
       goto yybackup;                                           \
     }                                                          \


@@ -1745,19 +1784,10 @@ while (YYID (0))
 #endif
 
 
 #endif
 
 

-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
+/* This macro is provided for backward compatibility. */

 
 #ifndef YY_LOCATION_PRINT
 
 #ifndef YY_LOCATION_PRINT

-# if YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)                 \
-     fprintf (File, "%d.%d-%d.%d",                     \
-             (Loc).first_line, (Loc).first_column,     \
-             (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)

 #endif
 
 
 #endif
 
 


@@ -1861,17 +1891,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void

-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)

 #else
 static void
 #else
 static void

-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
+yy_stack_print (yybottom, yytop)
+    yytype_int16 *yybottom;
+    yytype_int16 *yytop;

 #endif
 {
   YYFPRINTF (stderr, "Stack now");
 #endif
 {
   YYFPRINTF (stderr, "Stack now");

-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }

   YYFPRINTF (stderr, "\n");
 }
 
   YYFPRINTF (stderr, "\n");
 }
 


@@ -1905,11 +1938,11 @@ yy_reduce_print (yyvsp, yyrule)
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {

-      fprintf (stderr, "   $%d = ", yyi + 1);
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);

       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
                       &(yyvsp[(yyi + 1) - (yynrhs)])
                                       );
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
                       &(yyvsp[(yyi + 1) - (yynrhs)])
                                       );

-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "\n");

     }
 }
 
     }
 }
 


@@ -1946,7 +1979,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
 # define YYMAXDEPTH 10000
 #endif
 

-\f

 
 #if YYERROR_VERBOSE
 
 
 #if YYERROR_VERBOSE
 


@@ -2049,115 +2081,142 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
 }
 # endif
 

-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.

 
 

-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
-    {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-        constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-                   + sizeof yyexpecting - 1
-                   + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-                      * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* 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 + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-       if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-         {
-           if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-             {
-               yycount = 1;
-               yysize = yysize0;
-               yyformat[sizeof yyunexpected - 1] = '\0';
-               break;
-             }
-           yyarg[yycount++] = yytname[yyx];
-           yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-           yysize_overflow |= (yysize1 < yysize);
-           yysize = yysize1;
-           yyfmt = yystpcpy (yyfmt, yyprefix);
-           yyprefix = yyor;
-         }
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  YYSIZE_T yysize1;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = 0;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - Assume YYFAIL is not used.  It's too flawed to consider.  See
+       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+       for details.  YYERROR is fine as it does not invoke this
+       function.
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+                if (! (yysize <= yysize1
+                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                  return 2;
+                yysize = yysize1;
+              }
+        }
+    }

 
 

-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }

 
 

-      if (yysize_overflow)
-       return YYSIZE_MAXIMUM;
+  yysize1 = yysize + yystrlen (yyformat);
+  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+    return 2;
+  yysize = yysize1;

 
 

-      if (yyresult)
-       {
-         /* Avoid sprintf, as that infringes on the user's name space.
-            Don't have undefined behavior even if the translation
-            produced a string with the wrong number of "%s"s.  */
-         char *yyp = yyresult;
-         int yyi = 0;
-         while ((*yyp = *yyf) != '\0')
-           {
-             if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-               {
-                 yyp += yytnamerr (yyp, yyarg[yyi++]);
-                 yyf += 2;
-               }
-             else
-               {
-                 yyp++;
-                 yyf++;
-               }
-           }
-       }
-      return yysize;
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;

     }
     }

+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;

 }
 #endif /* YYERROR_VERBOSE */
 }
 #endif /* YYERROR_VERBOSE */

-\f

 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |


@@ -2189,10 +2248,9 @@ yydestruct (yymsg, yytype, yyvaluep)
        break;
     }
 }
        break;
     }
 }

-\f

 
 

-/* Prevent warnings from -Wmissing-prototypes.  */

 
 

+/* Prevent warnings from -Wmissing-prototypes.  */

 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);


@@ -2208,18 +2266,16 @@ int yyparse ();
 #endif /* ! YYPARSE_PARAM */
 
 
 #endif /* ! YYPARSE_PARAM */
 
 

-
-/* The look-ahead symbol.  */
+/* The lookahead symbol.  */

 int yychar;
 
 int yychar;
 

-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */

 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
 int yynerrs;
 
 
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
 int yynerrs;
 
 

-

 /*----------.
 | yyparse.  |
 `----------*/
 /*----------.
 | yyparse.  |
 `----------*/


@@ -2246,66 +2302,66 @@ yyparse ()
 #endif
 #endif
 {
 #endif
 #endif
 {

-  
-  int yystate;
-  int yyn;
-  int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-  /* 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.  */
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;

 
 

-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
+    /* The stacks and their tools:
+       `yyss': related to states.
+       `yyvs': related to semantic values.

 
 

-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
+       Refer to the stacks thru separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */

 
 

+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;

 
 

+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;

 
 

-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
-
-  YYSIZE_T yystacksize = YYINITDEPTH;
+    YYSIZE_T yystacksize;

 
 

+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken;

   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
 

+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))

 
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
 
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 

+  yytoken = 0;
+  yyss = yyssa;
+  yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+

   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;

-  yychar = YYEMPTY;            /* Cause a token to be read.  */
+  yychar = YYEMPTY; /* Cause a token to be read.  */

 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
   /* Initialize stack pointers.
      Waste one element of value and location stack
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */

-

   yyssp = yyss;
   yyvsp = yyvs;
 
   yyssp = yyss;
   yyvsp = yyvs;
 


@@ -2335,7 +2391,6 @@ yyparse ()
        YYSTYPE *yyvs1 = yyvs;
        yytype_int16 *yyss1 = yyss;
 
        YYSTYPE *yyvs1 = yyvs;
        yytype_int16 *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
        /* 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


@@ -2343,7 +2398,6 @@ yyparse ()
        yyoverflow (YY_("memory exhausted"),
                    &yyss1, yysize * sizeof (*yyssp),
                    &yyvs1, yysize * sizeof (*yyvsp),
        yyoverflow (YY_("memory exhausted"),
                    &yyss1, yysize * sizeof (*yyssp),
                    &yyvs1, yysize * sizeof (*yyvsp),

-

                    &yystacksize);
 
        yyss = yyss1;
                    &yystacksize);
 
        yyss = yyss1;


@@ -2366,9 +2420,8 @@ yyparse ()
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)
          goto yyexhaustedlab;
          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
        if (! yyptr)
          goto yyexhaustedlab;

-       YYSTACK_RELOCATE (yyss);
-       YYSTACK_RELOCATE (yyvs);
-
+       YYSTACK_RELOCATE (yyss_alloc, yyss);
+       YYSTACK_RELOCATE (yyvs_alloc, yyvs);

 #  undef YYSTACK_RELOCATE
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);
 #  undef YYSTACK_RELOCATE
        if (yyss1 != yyssa)
          YYSTACK_FREE (yyss1);


@@ -2379,7 +2432,6 @@ yyparse ()
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 

-

       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
                  (unsigned long int) yystacksize));
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
                  (unsigned long int) yystacksize));
 


@@ -2389,6 +2441,9 @@ yyparse ()
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 

+  if (yystate == YYFINAL)
+    YYACCEPT;
+

   goto yybackup;
 
 /*-----------.
   goto yybackup;
 
 /*-----------.


@@ -2397,16 +2452,16 @@ yyparse ()
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a

-     look-ahead token if we need one and don't already have one.  */
+     lookahead token if we need one and don't already have one.  */

 
 

-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */

   yyn = yypact[yystate];
   yyn = yypact[yystate];

-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))

     goto yydefault;
 
     goto yydefault;
 

-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */

 
 

-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */

   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));


@@ -2432,26 +2487,22 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
   yyn = yytable[yyn];
   if (yyn <= 0)
     {

-      if (yyn == 0 || yyn == YYTABLE_NINF)
-       goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;

       yyn = -yyn;
       goto yyreduce;
     }
 
       yyn = -yyn;
       goto yyreduce;
     }
 

-  if (yyn == YYFINAL)
-    YYACCEPT;
-

   /* 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--;
 

-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */

   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 

-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;

 
   yystate = yyn;
   *++yyvsp = yylval;
 
   yystate = yyn;
   *++yyvsp = yylval;


@@ -2491,27 +2542,37 @@ yyreduce:
   switch (yyn)
     {
         case 2:
   switch (yyn)
     {
         case 2:

-#line 699 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 704 "parse.y"

     { ; }
     break;
 
   case 3:
     { ; }
     break;
 
   case 3:

-#line 700 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 705 "parse.y"

     { ; }
     break;
 
   case 4:
     { ; }
     break;
 
   case 4:

-#line 701 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 706 "parse.y"

     { ; }
     break;
 
   case 5:
     { ; }
     break;
 
   case 5:

-#line 702 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 707 "parse.y"

     { ; }
     break;
 
   case 6:
     { ; }
     break;
 
   case 6:

-#line 705 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 710 "parse.y"

     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", C_CCODE,
     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", C_CCODE,


@@ -2524,7 +2585,9 @@ yyreduce:
     break;
 
   case 7:
     break;
 
   case 7:

-#line 714 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 719 "parse.y"

     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", AD_CCODE,
     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", AD_CCODE,


@@ -2537,7 +2600,9 @@ yyreduce:
     break;
 
   case 8:
     break;
 
   case 8:

-#line 723 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 728 "parse.y"

     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", H_CCODE,
     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", H_CCODE,


@@ -2550,7 +2615,9 @@ yyreduce:
     break;
 
   case 9:
     break;
 
   case 9:

-#line 732 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 737 "parse.y"

     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", HT_CCODE,
     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", HT_CCODE,


@@ -2563,7 +2630,9 @@ yyreduce:
     break;
 
   case 10:
     break;
 
   case 10:

-#line 741 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 746 "parse.y"

     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", PH_CCODE,
     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", PH_CCODE,


@@ -2576,7 +2645,9 @@ yyreduce:
     break;
 
   case 11:
     break;
 
   case 11:

-#line 750 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 755 "parse.y"

     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", A_CCODE,
     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", A_CCODE,


@@ -2589,7 +2660,9 @@ yyreduce:
     break;
 
   case 12:
     break;
 
   case 12:

-#line 759 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 764 "parse.y"

     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", AT_CCODE,
     {
                        Node *node = node_new (CCODE_NODE,
                                               "cctype", AT_CCODE,


@@ -2602,47 +2675,80 @@ yyreduce:
     break;
 
   case 13:
     break;
 
   case 13:

-#line 770 "parse.y"
-    { ; }
+
+/* Line 1806 of yacc.c  */
+#line 773 "parse.y"
+    {
+                       Node *node = node_new (CCODE_NODE,
+                                              "cctype", CT_CCODE,
+                                              "cbuf:steal", ((yyvsp[(1) - (1)].cbuf))->str,
+                                              "line_no", ccode_line,
+                                              NULL);
+                       nodes = g_list_append(nodes,node);
+                       g_string_free((yyvsp[(1) - (1)].cbuf),FALSE);
+                                       }

     break;
 
   case 14:
     break;
 
   case 14:

-#line 771 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 784 "parse.y"

     { ; }
     break;
 
   case 15:
     { ; }
     break;
 
   case 15:

-#line 772 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 785 "parse.y"

     { ; }
     break;
 
   case 16:
     { ; }
     break;
 
   case 16:

-#line 773 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 786 "parse.y"

     { ; }
     break;
 
   case 17:
     { ; }
     break;
 
   case 17:

-#line 774 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 787 "parse.y"

     { ; }
     break;
 
   case 18:
     { ; }
     break;
 
   case 18:

-#line 775 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 788 "parse.y"

     { ; }
     break;
 
   case 19:
     { ; }
     break;
 
   case 19:

-#line 776 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 789 "parse.y"

     { ; }
     break;
 
   case 20:
     { ; }
     break;
 
   case 20:

-#line 777 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 790 "parse.y"

     { ; }
     break;
 
   case 21:
     { ; }
     break;
 
   case 21:

-#line 780 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 791 "parse.y"
+    { ; }
+    break;
+
+  case 22:
+
+/* Line 1806 of yacc.c  */
+#line 794 "parse.y"

     {
                        ((Class *)class)->nodes = class_nodes;
                        class_nodes = NULL;
     {
                        ((Class *)class)->nodes = class_nodes;
                        class_nodes = NULL;


@@ -2650,8 +2756,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 22:
-#line 785 "parse.y"
+  case 23:
+
+/* Line 1806 of yacc.c  */
+#line 799 "parse.y"

     {
                        ((Class *)class)->nodes = NULL;
                        class_nodes = NULL;
     {
                        ((Class *)class)->nodes = NULL;
                        class_nodes = NULL;


@@ -2659,8 +2767,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 23:
-#line 792 "parse.y"
+  case 24:
+
+/* Line 1806 of yacc.c  */
+#line 806 "parse.y"

     {
                        class = node_new (CLASS_NODE,
                                          "otype:steal", (yyvsp[(2) - (5)].id),
     {
                        class = node_new (CLASS_NODE,
                                          "otype:steal", (yyvsp[(2) - (5)].id),


@@ -2678,8 +2788,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 25:
-#line 810 "parse.y"
+  case 26:
+
+/* Line 1806 of yacc.c  */
+#line 824 "parse.y"

     {
                        if(strcmp((yyvsp[(2) - (4)].id),"abstract") == 0) {
                                abstract = TRUE;
     {
                        if(strcmp((yyvsp[(2) - (4)].id),"abstract") == 0) {
                                abstract = TRUE;


@@ -2690,8 +2802,10 @@ yyreduce:
                }
     break;
 
                }
     break;
 

-  case 26:
-#line 818 "parse.y"
+  case 27:
+
+/* Line 1806 of yacc.c  */
+#line 832 "parse.y"

     {
                        if(strcmp((yyvsp[(2) - (5)].id),"chunks") == 0) {
                                g_free (chunk_size);
     {
                        if(strcmp((yyvsp[(2) - (5)].id),"chunks") == 0) {
                                g_free (chunk_size);


@@ -2706,8 +2820,10 @@ yyreduce:
                }
     break;
 
                }
     break;
 

-  case 27:
-#line 830 "parse.y"
+  case 28:
+
+/* Line 1806 of yacc.c  */
+#line 844 "parse.y"

     {
                        if (strcmp ((yyvsp[(2) - (5)].id), "interface") == 0) {
                                interfaces = g_list_append (interfaces,
     {
                        if (strcmp ((yyvsp[(2) - (5)].id), "interface") == 0) {
                                interfaces = g_list_append (interfaces,


@@ -2719,8 +2835,10 @@ yyreduce:
                }
     break;
 
                }
     break;
 

-  case 28:
-#line 839 "parse.y"
+  case 29:
+
+/* Line 1806 of yacc.c  */
+#line 853 "parse.y"

     {
                        if(strcmp((yyvsp[(2) - (5)].id),"chunks") == 0) {
                                g_free (chunk_size);
     {
                        if(strcmp((yyvsp[(2) - (5)].id),"chunks") == 0) {
                                g_free (chunk_size);


@@ -2735,8 +2853,10 @@ yyreduce:
                }
     break;
 
                }
     break;
 

-  case 29:
-#line 851 "parse.y"
+  case 30:
+
+/* Line 1806 of yacc.c  */
+#line 865 "parse.y"

     {
                        if (strcmp ((yyvsp[(2) - (6)].id), "GladeXML") == 0) {
                                glade_xml = TRUE;
     {
                        if (strcmp ((yyvsp[(2) - (6)].id), "GladeXML") == 0) {
                                glade_xml = TRUE;


@@ -2748,8 +2868,10 @@ yyreduce:
                }
     break;
 
                }
     break;
 

-  case 30:
-#line 860 "parse.y"
+  case 31:
+
+/* Line 1806 of yacc.c  */
+#line 874 "parse.y"

     {
                        if (strcmp ((yyvsp[(2) - (7)].id), "GladeXML") == 0) {
                                glade_xml = TRUE;
     {
                        if (strcmp ((yyvsp[(2) - (7)].id), "GladeXML") == 0) {
                                glade_xml = TRUE;


@@ -2761,8 +2883,10 @@ yyreduce:
                }
     break;
 
                }
     break;
 

-  case 31:
-#line 869 "parse.y"
+  case 32:
+
+/* Line 1806 of yacc.c  */
+#line 883 "parse.y"

     {
                        if (strcmp ((yyvsp[(2) - (6)].id), "GladeXML") == 0) {
                                glade_xml = TRUE;
     {
                        if (strcmp ((yyvsp[(2) - (6)].id), "GladeXML") == 0) {
                                glade_xml = TRUE;


@@ -2774,8 +2898,10 @@ yyreduce:
                }
     break;
 
                }
     break;
 

-  case 32:
-#line 878 "parse.y"
+  case 33:
+
+/* Line 1806 of yacc.c  */
+#line 892 "parse.y"

     {
                        if (strcmp ((yyvsp[(2) - (7)].id), "GladeXML") == 0) {
                                glade_xml = TRUE;
     {
                        if (strcmp ((yyvsp[(2) - (7)].id), "GladeXML") == 0) {
                                glade_xml = TRUE;


@@ -2787,23 +2913,31 @@ yyreduce:
                }
     break;
 
                }
     break;
 

-  case 33:
-#line 889 "parse.y"
-    { ; }
-    break;
-

   case 34:
   case 34:

-#line 890 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 903 "parse.y"

     { ; }
     break;
 
   case 35:
     { ; }
     break;
 
   case 35:

-#line 893 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 904 "parse.y"

     { ; }
     break;
 
   case 36:
     { ; }
     break;
 
   case 36:

-#line 894 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 907 "parse.y"
+    { ; }
+    break;
+
+  case 37:
+
+/* Line 1806 of yacc.c  */
+#line 908 "parse.y"

     {
                        if (strcmp ((yyvsp[(1) - (2)].id), "BonoboObject") != 0) {
                                g_free ((yyvsp[(1) - (2)].id));
     {
                        if (strcmp ((yyvsp[(1) - (2)].id), "BonoboObject") != 0) {
                                g_free ((yyvsp[(1) - (2)].id));


@@ -2815,8 +2949,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 37:
-#line 903 "parse.y"
+  case 38:
+
+/* Line 1806 of yacc.c  */
+#line 917 "parse.y"

     {
                        if (strcmp ((yyvsp[(1) - (3)].id), "interface") != 0) {
                                g_free ((yyvsp[(1) - (3)].id));
     {
                        if (strcmp ((yyvsp[(1) - (3)].id), "interface") != 0) {
                                g_free ((yyvsp[(1) - (3)].id));


@@ -2831,48 +2967,66 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 38:
-#line 915 "parse.y"
-    { ; }
-    break;
-

   case 39:
   case 39:

-#line 916 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 929 "parse.y"

     { ; }
     break;
 
   case 40:
     { ; }
     break;
 
   case 40:

-#line 917 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 930 "parse.y"

     { ; }
     break;
 
   case 41:
     { ; }
     break;
 
   case 41:

-#line 918 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 931 "parse.y"

     { ; }
     break;
 
   case 42:
     { ; }
     break;
 
   case 42:

-#line 921 "parse.y"
-    { the_scope = PUBLIC_SCOPE; }
+
+/* Line 1806 of yacc.c  */
+#line 932 "parse.y"
+    { ; }

     break;
 
   case 43:
     break;
 
   case 43:

-#line 922 "parse.y"
-    { the_scope = PRIVATE_SCOPE; }
+
+/* Line 1806 of yacc.c  */
+#line 935 "parse.y"
+    { the_scope = PUBLIC_SCOPE; }

     break;
 
   case 44:
     break;
 
   case 44:

-#line 923 "parse.y"
-    { the_scope = PROTECTED_SCOPE; }
+
+/* Line 1806 of yacc.c  */
+#line 936 "parse.y"
+    { the_scope = PRIVATE_SCOPE; }

     break;
 
   case 45:
     break;
 
   case 45:

-#line 924 "parse.y"
-    { the_scope = CLASS_SCOPE; }
+
+/* Line 1806 of yacc.c  */
+#line 937 "parse.y"
+    { the_scope = PROTECTED_SCOPE; }

     break;
 
   case 46:
     break;
 
   case 46:

-#line 927 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 938 "parse.y"
+    { the_scope = CLASS_SCOPE; }
+    break;
+
+  case 47:
+
+/* Line 1806 of yacc.c  */
+#line 941 "parse.y"

     {
                        if (strcmp ((yyvsp[(1) - (2)].id), "destroywith") == 0) {
                                g_free ((yyvsp[(1) - (2)].id));
     {
                        if (strcmp ((yyvsp[(1) - (2)].id), "destroywith") == 0) {
                                g_free ((yyvsp[(1) - (2)].id));


@@ -2895,8 +3049,10 @@ yyreduce:
                                }
     break;
 
                                }
     break;
 

-  case 47:
-#line 947 "parse.y"
+  case 48:
+
+/* Line 1806 of yacc.c  */
+#line 961 "parse.y"

     {
                        if (strcmp ((yyvsp[(1) - (3)].id), "destroy") == 0) {
                                g_free((yyvsp[(1) - (3)].id));
     {
                        if (strcmp ((yyvsp[(1) - (3)].id), "destroy") == 0) {
                                g_free((yyvsp[(1) - (3)].id));


@@ -2921,16 +3077,20 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 48:
-#line 971 "parse.y"
+  case 49:
+
+/* Line 1806 of yacc.c  */
+#line 985 "parse.y"

     {
                        initializer = (yyvsp[(2) - (2)].id);
                        initializer_line = ccode_line;
                                }
     break;
 
     {
                        initializer = (yyvsp[(2) - (2)].id);
                        initializer_line = ccode_line;
                                }
     break;
 

-  case 49:
-#line 975 "parse.y"
+  case 50:
+
+/* Line 1806 of yacc.c  */
+#line 989 "parse.y"

     {
                        initializer = ((yyvsp[(3) - (3)].cbuf))->str;
                        initializer_line = ccode_line;
     {
                        initializer = ((yyvsp[(3) - (3)].cbuf))->str;
                        initializer_line = ccode_line;


@@ -2938,28 +3098,38 @@ yyreduce:
                                }
     break;
 
                                }
     break;
 

-  case 50:
-#line 983 "parse.y"
+  case 51:
+
+/* Line 1806 of yacc.c  */
+#line 997 "parse.y"

     { ; }
     break;
 
     { ; }
     break;
 

-  case 51:
-#line 984 "parse.y"
+  case 52:
+
+/* Line 1806 of yacc.c  */
+#line 998 "parse.y"

     { ; }
     break;
 
     { ; }
     break;
 

-  case 52:
-#line 985 "parse.y"
+  case 53:
+
+/* Line 1806 of yacc.c  */
+#line 999 "parse.y"

     { destructor = NULL; }
     break;
 
     { destructor = NULL; }
     break;
 

-  case 53:
-#line 986 "parse.y"
+  case 54:
+
+/* Line 1806 of yacc.c  */
+#line 1000 "parse.y"

     { initializer = NULL; }
     break;
 
     { initializer = NULL; }
     break;
 

-  case 54:
-#line 987 "parse.y"
+  case 55:
+
+/* Line 1806 of yacc.c  */
+#line 1001 "parse.y"

     {
                        if (strcmp ((yyvsp[(1) - (1)].id), "GladeXML") == 0) {
                                glade_widget = TRUE;
     {
                        if (strcmp ((yyvsp[(1) - (1)].id), "GladeXML") == 0) {
                                glade_widget = TRUE;


@@ -2970,30 +3140,38 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 55:
-#line 995 "parse.y"
+  case 56:
+
+/* Line 1806 of yacc.c  */
+#line 1009 "parse.y"

     {
                        destructor = NULL;
                        initializer = NULL;
                                        }
     break;
 
     {
                        destructor = NULL;
                        initializer = NULL;
                                        }
     break;
 

-  case 56:
-#line 1001 "parse.y"
+  case 57:
+
+/* Line 1806 of yacc.c  */
+#line 1015 "parse.y"

     {
                        push_variable((yyvsp[(3) - (5)].id), the_scope,(yyvsp[(1) - (5)].line), NULL);
                                                }
     break;
 
     {
                        push_variable((yyvsp[(3) - (5)].id), the_scope,(yyvsp[(1) - (5)].line), NULL);
                                                }
     break;
 

-  case 57:
-#line 1004 "parse.y"
+  case 58:
+
+/* Line 1806 of yacc.c  */
+#line 1018 "parse.y"

     {
                        push_variable((yyvsp[(3) - (6)].id), the_scope, (yyvsp[(1) - (6)].line), (yyvsp[(4) - (6)].id));
                                                }
     break;
 
     {
                        push_variable((yyvsp[(3) - (6)].id), the_scope, (yyvsp[(1) - (6)].line), (yyvsp[(4) - (6)].id));
                                                }
     break;
 

-  case 58:
-#line 1009 "parse.y"
+  case 59:
+
+/* Line 1806 of yacc.c  */
+#line 1023 "parse.y"

     {
                        Node *node = NULL;
                        if(strcmp((yyvsp[(6) - (12)].id),"get")==0 &&
     {
                        Node *node = NULL;
                        if(strcmp((yyvsp[(6) - (12)].id),"get")==0 &&


@@ -3064,8 +3242,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 59:
-#line 1077 "parse.y"
+  case 60:
+
+/* Line 1806 of yacc.c  */
+#line 1091 "parse.y"

     {
                        Node *node = NULL;
                        if(strcmp((yyvsp[(6) - (9)].id), "get") == 0) {
     {
                        Node *node = NULL;
                        if(strcmp((yyvsp[(6) - (9)].id), "get") == 0) {


@@ -3122,8 +3302,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 60:
-#line 1131 "parse.y"
+  case 61:
+
+/* Line 1806 of yacc.c  */
+#line 1145 "parse.y"

     {
                        Node *node;
                        char *get, *set = NULL;
     {
                        Node *node;
                        char *get, *set = NULL;


@@ -3213,8 +3395,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 61:
-#line 1220 "parse.y"
+  case 62:
+
+/* Line 1806 of yacc.c  */
+#line 1234 "parse.y"

     {
                        if (strcmp ((yyvsp[(2) - (3)].id), "export")!=0) {
                                g_free ((yyvsp[(2) - (3)].id)); 
     {
                        if (strcmp ((yyvsp[(2) - (3)].id), "export")!=0) {
                                g_free ((yyvsp[(2) - (3)].id)); 


@@ -3225,15 +3409,19 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 62:
-#line 1228 "parse.y"
+  case 63:
+
+/* Line 1806 of yacc.c  */
+#line 1242 "parse.y"

     {
                        (yyval.id) = NULL;
                                                }
     break;
 
     {
                        (yyval.id) = NULL;
                                                }
     break;
 

-  case 63:
-#line 1233 "parse.y"
+  case 64:
+
+/* Line 1806 of yacc.c  */
+#line 1247 "parse.y"

     {
                        ensure_property ();
                        node_set ((Node *)property,
     {
                        ensure_property ();
                        node_set ((Node *)property,


@@ -3284,8 +3472,10 @@ yyreduce:
                }
     break;
 
                }
     break;
 

-  case 64:
-#line 1281 "parse.y"
+  case 65:
+
+/* Line 1806 of yacc.c  */
+#line 1295 "parse.y"

     {
                        ensure_property ();
                        node_set ((Node *)property,
     {
                        ensure_property ();
                        node_set ((Node *)property,


@@ -3324,8 +3514,10 @@ yyreduce:
                }
     break;
 
                }
     break;
 

-  case 65:
-#line 1317 "parse.y"
+  case 66:
+
+/* Line 1806 of yacc.c  */
+#line 1331 "parse.y"

     {
                        ensure_property ();
                        node_set ((Node *)property,
     {
                        ensure_property ();
                        node_set ((Node *)property,


@@ -3342,33 +3534,45 @@ yyreduce:
                }
     break;
 
                }
     break;
 

-  case 66:
-#line 1333 "parse.y"
-    { ; }
-    break;
-

   case 67:
   case 67:

-#line 1334 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1347 "parse.y"

     { ; }
     break;
 
   case 68:
     { ; }
     break;
 
   case 68:

-#line 1337 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1348 "parse.y"

     { ; }
     break;
 
   case 69:
     { ; }
     break;
 
   case 69:

-#line 1338 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1351 "parse.y"

     { ; }
     break;
 
   case 70:
     { ; }
     break;
 
   case 70:

-#line 1341 "parse.y"
-    { (yyval.id) = (yyvsp[(1) - (1)].id); }
+
+/* Line 1806 of yacc.c  */
+#line 1352 "parse.y"
+    { ; }

     break;
 
   case 71:
     break;
 
   case 71:

-#line 1342 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1355 "parse.y"
+    { (yyval.id) = (yyvsp[(1) - (1)].id); }
+    break;
+
+  case 72:
+
+/* Line 1806 of yacc.c  */
+#line 1356 "parse.y"

     {
                        if (strcmp ((yyvsp[(1) - (4)].id), "_") != 0) {
                                g_free ((yyvsp[(1) - (4)].id));
     {
                        if (strcmp ((yyvsp[(1) - (4)].id), "_") != 0) {
                                g_free ((yyvsp[(1) - (4)].id));


@@ -3381,99 +3585,109 @@ yyreduce:
                }
     break;
 
                }
     break;
 

-  case 72:
-#line 1354 "parse.y"
-    { (yyval.id) = (yyvsp[(1) - (1)].id); }
-    break;
-

   case 73:
   case 73:

-#line 1355 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1368 "parse.y"

     { (yyval.id) = (yyvsp[(1) - (1)].id); }
     break;
 
   case 74:
     { (yyval.id) = (yyvsp[(1) - (1)].id); }
     break;
 
   case 74:

-#line 1358 "parse.y"
-    {
-               ensure_property ();
-               node_set ((Node *)property,
-                         "nick:steal", (yyvsp[(3) - (3)].id),
-                         NULL);
-                 }
+
+/* Line 1806 of yacc.c  */
+#line 1369 "parse.y"
+    { (yyval.id) = (yyvsp[(1) - (1)].id); }

     break;
 
   case 75:
     break;
 
   case 75:

-#line 1364 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1372 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,

-                         "blurb:steal", (yyvsp[(3) - (3)].id),
+                         "nick:steal", (yyvsp[(3) - (3)].id),

                          NULL);
                  }
     break;
 
   case 76:
                          NULL);
                  }
     break;
 
   case 76:

-#line 1370 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1378 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,

-                         "maximum:steal", (yyvsp[(3) - (3)].id),
+                         "blurb:steal", (yyvsp[(3) - (3)].id),

                          NULL);
                  }
     break;
 
   case 77:
                          NULL);
                  }
     break;
 
   case 77:

-#line 1376 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1384 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,

-                         "minimum:steal", (yyvsp[(3) - (3)].id),
+                         "maximum:steal", (yyvsp[(3) - (3)].id),

                          NULL);
                  }
     break;
 
   case 78:
                          NULL);
                  }
     break;
 
   case 78:

-#line 1382 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1390 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,

-                         "default_value:steal", (yyvsp[(3) - (3)].id),
+                         "minimum:steal", (yyvsp[(3) - (3)].id),

                          NULL);
                  }
     break;
 
   case 79:
                          NULL);
                  }
     break;
 
   case 79:

-#line 1388 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1396 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,

-                         "flags:steal", (yyvsp[(3) - (3)].list),
+                         "default_value:steal", (yyvsp[(3) - (3)].id),

                          NULL);
                  }
     break;
 
   case 80:
                          NULL);
                  }
     break;
 
   case 80:

-#line 1394 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1402 "parse.y"

     {
     {

-               Type *type = pop_type ();

                ensure_property ();
                node_set ((Node *)property,
                ensure_property ();
                node_set ((Node *)property,

-                         "ptype:steal", type,
+                         "flags:steal", (yyvsp[(3) - (3)].list),

                          NULL);
                  }
     break;
 
   case 81:
                          NULL);
                  }
     break;
 
   case 81:

-#line 1401 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1408 "parse.y"

     {
     {

+               Type *type = pop_type ();

                ensure_property ();
                node_set ((Node *)property,
                ensure_property ();
                node_set ((Node *)property,

-                         "extra_gtktype:steal", (yyvsp[(3) - (3)].id),
+                         "ptype:steal", type,

                          NULL);
                  }
     break;
 
   case 82:
                          NULL);
                  }
     break;
 
   case 82:

-#line 1407 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1415 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,


@@ -3483,7 +3697,9 @@ yyreduce:
     break;
 
   case 83:
     break;
 
   case 83:

-#line 1413 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1421 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,


@@ -3493,7 +3709,9 @@ yyreduce:
     break;
 
   case 84:
     break;
 
   case 84:

-#line 1419 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1427 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,


@@ -3503,7 +3721,9 @@ yyreduce:
     break;
 
   case 85:
     break;
 
   case 85:

-#line 1425 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1433 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,


@@ -3513,7 +3733,9 @@ yyreduce:
     break;
 
   case 86:
     break;
 
   case 86:

-#line 1431 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1439 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,


@@ -3523,7 +3745,9 @@ yyreduce:
     break;
 
   case 87:
     break;
 
   case 87:

-#line 1437 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1445 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,


@@ -3533,7 +3757,9 @@ yyreduce:
     break;
 
   case 88:
     break;
 
   case 88:

-#line 1443 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1451 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,


@@ -3543,7 +3769,9 @@ yyreduce:
     break;
 
   case 89:
     break;
 
   case 89:

-#line 1449 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1457 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,


@@ -3553,7 +3781,9 @@ yyreduce:
     break;
 
   case 90:
     break;
 
   case 90:

-#line 1455 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1463 "parse.y"

     {
                ensure_property ();
                node_set ((Node *)property,
     {
                ensure_property ();
                node_set ((Node *)property,


@@ -3563,7 +3793,21 @@ yyreduce:
     break;
 
   case 91:
     break;
 
   case 91:

-#line 1461 "parse.y"
+
+/* Line 1806 of yacc.c  */
+#line 1469 "parse.y"
+    {
+               ensure_property ();
+               node_set ((Node *)property,
+                         "extra_gtktype:steal", (yyvsp[(3) - (3)].id),
+                         NULL);
+                 }
+    break;
+
+  case 92:
+
+/* Line 1806 of yacc.c  */
+#line 1475 "parse.y"

     {
                ensure_property ();
                if (strcmp ((yyvsp[(1) - (1)].id), "override") == 0) {
     {
                ensure_property ();
                if (strcmp ((yyvsp[(1) - (1)].id), "override") == 0) {


@@ -3589,8 +3833,10 @@ yyreduce:
                  }
     break;
 
                  }
     break;
 

-  case 92:
-#line 1486 "parse.y"
+  case 93:
+
+/* Line 1806 of yacc.c  */
+#line 1500 "parse.y"

     {
                        if(strcmp((yyvsp[(3) - (5)].id),"type")!=0) {
                                g_free((yyvsp[(1) - (5)].id));
     {
                        if(strcmp((yyvsp[(3) - (5)].id),"type")!=0) {
                                g_free((yyvsp[(1) - (5)].id));


@@ -3602,40 +3848,52 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 93:
-#line 1495 "parse.y"
+  case 94:
+
+/* Line 1806 of yacc.c  */
+#line 1509 "parse.y"

     {
                        (yyval.id) = debool ((yyvsp[(1) - (1)].id));
                        typestack = g_list_prepend(typestack,NULL);
                                                }
     break;
 
     {
                        (yyval.id) = debool ((yyvsp[(1) - (1)].id));
                        typestack = g_list_prepend(typestack,NULL);
                                                }
     break;
 

-  case 94:
-#line 1501 "parse.y"
+  case 95:
+
+/* Line 1806 of yacc.c  */
+#line 1515 "parse.y"

     { (yyval.list) = (yyvsp[(2) - (3)].list); }
     break;
 
     { (yyval.list) = (yyvsp[(2) - (3)].list); }
     break;
 

-  case 95:
-#line 1502 "parse.y"
+  case 96:
+
+/* Line 1806 of yacc.c  */
+#line 1516 "parse.y"

     { (yyval.list) = NULL; }
     break;
 
     { (yyval.list) = NULL; }
     break;
 

-  case 96:
-#line 1505 "parse.y"
+  case 97:
+
+/* Line 1806 of yacc.c  */
+#line 1519 "parse.y"

     {
                        (yyval.list) = g_list_append((yyvsp[(3) - (3)].list),(yyvsp[(1) - (3)].id));
                                                }
     break;
 
     {
                        (yyval.list) = g_list_append((yyvsp[(3) - (3)].list),(yyvsp[(1) - (3)].id));
                                                }
     break;
 

-  case 97:
-#line 1508 "parse.y"
+  case 98:
+
+/* Line 1806 of yacc.c  */
+#line 1522 "parse.y"

     {
                        (yyval.list) = g_list_append(NULL,(yyvsp[(1) - (1)].id));
                                                }
     break;
 
     {
                        (yyval.list) = g_list_append(NULL,(yyvsp[(1) - (1)].id));
                                                }
     break;
 

-  case 98:
-#line 1514 "parse.y"
+  case 99:
+
+/* Line 1806 of yacc.c  */
+#line 1528 "parse.y"

     {
                        Node *node = node_new (TYPE_NODE, 
                                               "name:steal", (yyvsp[(1) - (2)].id),
     {
                        Node *node = node_new (TYPE_NODE, 
                                               "name:steal", (yyvsp[(1) - (2)].id),


@@ -3645,8 +3903,10 @@ yyreduce:
                                                        }
     break;
 
                                                        }
     break;
 

-  case 99:
-#line 1521 "parse.y"
+  case 100:
+
+/* Line 1806 of yacc.c  */
+#line 1535 "parse.y"

     {
                        Node *node = node_new (TYPE_NODE, 
                                               "name:steal", (yyvsp[(1) - (1)].id),
     {
                        Node *node = node_new (TYPE_NODE, 
                                               "name:steal", (yyvsp[(1) - (1)].id),


@@ -3655,46 +3915,58 @@ yyreduce:
                                                        }
     break;
 
                                                        }
     break;
 

-  case 100:
-#line 1530 "parse.y"
+  case 101:
+
+/* Line 1806 of yacc.c  */
+#line 1544 "parse.y"

     {
                        (yyval.id) = (yyvsp[(1) - (1)].id);
                                                        }
     break;
 
     {
                        (yyval.id) = (yyvsp[(1) - (1)].id);
                                                        }
     break;
 

-  case 101:
-#line 1533 "parse.y"
+  case 102:
+
+/* Line 1806 of yacc.c  */
+#line 1547 "parse.y"

     {
                        (yyval.id) = (yyvsp[(1) - (1)].id);
                                                        }
     break;
 
     {
                        (yyval.id) = (yyvsp[(1) - (1)].id);
                                                        }
     break;
 

-  case 102:
-#line 1536 "parse.y"
+  case 103:
+
+/* Line 1806 of yacc.c  */
+#line 1550 "parse.y"

     {
                        (yyval.id) = g_strconcat("const ", (yyvsp[(2) - (2)].id), NULL);
                        g_free((yyvsp[(2) - (2)].id));
                                                        }
     break;
 
     {
                        (yyval.id) = g_strconcat("const ", (yyvsp[(2) - (2)].id), NULL);
                        g_free((yyvsp[(2) - (2)].id));
                                                        }
     break;
 

-  case 103:
-#line 1540 "parse.y"
+  case 104:
+
+/* Line 1806 of yacc.c  */
+#line 1554 "parse.y"

     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " const", NULL);
                        g_free((yyvsp[(1) - (2)].id));
                                                        }
     break;
 
     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " const", NULL);
                        g_free((yyvsp[(1) - (2)].id));
                                                        }
     break;
 

-  case 104:
-#line 1544 "parse.y"
+  case 105:
+
+/* Line 1806 of yacc.c  */
+#line 1558 "parse.y"

     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " ", (yyvsp[(2) - (2)].id), NULL);
                        g_free((yyvsp[(2) - (2)].id));
                                                        }
     break;
 
     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " ", (yyvsp[(2) - (2)].id), NULL);
                        g_free((yyvsp[(2) - (2)].id));
                                                        }
     break;
 

-  case 105:
-#line 1548 "parse.y"
+  case 106:
+
+/* Line 1806 of yacc.c  */
+#line 1562 "parse.y"

     {
                        (yyval.id) = g_strconcat("const ", (yyvsp[(2) - (3)].id), " ",
                                             (yyvsp[(3) - (3)].id), NULL);
     {
                        (yyval.id) = g_strconcat("const ", (yyvsp[(2) - (3)].id), " ",
                                             (yyvsp[(3) - (3)].id), NULL);


@@ -3702,8 +3974,10 @@ yyreduce:
                                                        }
     break;
 
                                                        }
     break;
 

-  case 106:
-#line 1553 "parse.y"
+  case 107:
+
+/* Line 1806 of yacc.c  */
+#line 1567 "parse.y"

     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (3)].id), " ",
                                             (yyvsp[(2) - (3)].id), " const", NULL);
     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (3)].id), " ",
                                             (yyvsp[(2) - (3)].id), " const", NULL);


@@ -3711,16 +3985,20 @@ yyreduce:
                                                        }
     break;
 
                                                        }
     break;
 

-  case 107:
-#line 1561 "parse.y"
+  case 108:
+
+/* Line 1806 of yacc.c  */
+#line 1575 "parse.y"

     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " ", (yyvsp[(2) - (2)].id), NULL);
                        g_free((yyvsp[(2) - (2)].id));
                                                        }
     break;
 
     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " ", (yyvsp[(2) - (2)].id), NULL);
                        g_free((yyvsp[(2) - (2)].id));
                                                        }
     break;
 

-  case 108:
-#line 1565 "parse.y"
+  case 109:
+
+/* Line 1806 of yacc.c  */
+#line 1579 "parse.y"

     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " ", (yyvsp[(2) - (2)].id), NULL);
                        g_free((yyvsp[(1) - (2)].id));
     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " ", (yyvsp[(2) - (2)].id), NULL);
                        g_free((yyvsp[(1) - (2)].id));


@@ -3728,131 +4006,175 @@ yyreduce:
                                                        }
     break;
 
                                                        }
     break;
 

-  case 109:
-#line 1570 "parse.y"
+  case 110:
+
+/* Line 1806 of yacc.c  */
+#line 1584 "parse.y"

     {
                        (yyval.id) = g_strconcat("const ", (yyvsp[(2) - (2)].id), NULL);
                        g_free((yyvsp[(2) - (2)].id));
                                                        }
     break;
 
     {
                        (yyval.id) = g_strconcat("const ", (yyvsp[(2) - (2)].id), NULL);
                        g_free((yyvsp[(2) - (2)].id));
                                                        }
     break;
 

-  case 110:
-#line 1574 "parse.y"
+  case 111:
+
+/* Line 1806 of yacc.c  */
+#line 1588 "parse.y"

     {
                        (yyval.id) = (yyvsp[(1) - (1)].id);
                                                        }
     break;
 
     {
                        (yyval.id) = (yyvsp[(1) - (1)].id);
                                                        }
     break;
 

-  case 111:
-#line 1577 "parse.y"
+  case 112:
+
+/* Line 1806 of yacc.c  */
+#line 1591 "parse.y"

     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " const", NULL);
                        g_free((yyvsp[(1) - (2)].id));
                                                        }
     break;
 
     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " const", NULL);
                        g_free((yyvsp[(1) - (2)].id));
                                                        }
     break;
 

-  case 112:
-#line 1581 "parse.y"
+  case 113:
+
+/* Line 1806 of yacc.c  */
+#line 1595 "parse.y"

     {
                        (yyval.id) = g_strdup((yyvsp[(1) - (1)].id));
                                                        }
     break;
 
     {
                        (yyval.id) = g_strdup((yyvsp[(1) - (1)].id));
                                                        }
     break;
 

-  case 113:
-#line 1584 "parse.y"
+  case 114:
+
+/* Line 1806 of yacc.c  */
+#line 1598 "parse.y"

     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " const", NULL);
                                                        }
     break;
 
     {
                        (yyval.id) = g_strconcat((yyvsp[(1) - (2)].id), " const", NULL);
                                                        }
     break;
 

-  case 114:
-#line 1589 "parse.y"
+  case 115:
+
+/* Line 1806 of yacc.c  */
+#line 1603 "parse.y"

     { (yyval.id) = "void"; }
     break;
 
     { (yyval.id) = "void"; }
     break;
 

-  case 115:
-#line 1590 "parse.y"
+  case 116:
+
+/* Line 1806 of yacc.c  */
+#line 1604 "parse.y"

     { (yyval.id) = "char"; }
     break;
 
     { (yyval.id) = "char"; }
     break;
 

-  case 116:
-#line 1591 "parse.y"
+  case 117:
+
+/* Line 1806 of yacc.c  */
+#line 1605 "parse.y"

     { (yyval.id) = "short"; }
     break;
 
     { (yyval.id) = "short"; }
     break;
 

-  case 117:
-#line 1592 "parse.y"
+  case 118:
+
+/* Line 1806 of yacc.c  */
+#line 1606 "parse.y"

     { (yyval.id) = "int"; }
     break;
 
     { (yyval.id) = "int"; }
     break;
 

-  case 118:
-#line 1593 "parse.y"
+  case 119:
+
+/* Line 1806 of yacc.c  */
+#line 1607 "parse.y"

     { (yyval.id) = "long"; }
     break;
 
     { (yyval.id) = "long"; }
     break;
 

-  case 119:
-#line 1594 "parse.y"
+  case 120:
+
+/* Line 1806 of yacc.c  */
+#line 1608 "parse.y"

     { (yyval.id) = "float"; }
     break;
 
     { (yyval.id) = "float"; }
     break;
 

-  case 120:
-#line 1595 "parse.y"
+  case 121:
+
+/* Line 1806 of yacc.c  */
+#line 1609 "parse.y"

     { (yyval.id) = "double"; }
     break;
 
     { (yyval.id) = "double"; }
     break;
 

-  case 121:
-#line 1596 "parse.y"
+  case 122:
+
+/* Line 1806 of yacc.c  */
+#line 1610 "parse.y"

     { (yyval.id) = "signed"; }
     break;
 
     { (yyval.id) = "signed"; }
     break;
 

-  case 122:
-#line 1597 "parse.y"
+  case 123:
+
+/* Line 1806 of yacc.c  */
+#line 1611 "parse.y"

     { (yyval.id) = "unsigned"; }
     break;
 
     { (yyval.id) = "unsigned"; }
     break;
 

-  case 123:
-#line 1600 "parse.y"
+  case 124:
+
+/* Line 1806 of yacc.c  */
+#line 1614 "parse.y"

     { (yyval.id) = "struct"; }
     break;
 
     { (yyval.id) = "struct"; }
     break;
 

-  case 124:
-#line 1601 "parse.y"
+  case 125:
+
+/* Line 1806 of yacc.c  */
+#line 1615 "parse.y"

     { (yyval.id) = "union"; }
     break;
 
     { (yyval.id) = "union"; }
     break;
 

-  case 125:
-#line 1602 "parse.y"
+  case 126:
+
+/* Line 1806 of yacc.c  */
+#line 1616 "parse.y"

     { (yyval.id) = "enum"; }
     break;
 
     { (yyval.id) = "enum"; }
     break;
 

-  case 126:
-#line 1605 "parse.y"
+  case 127:
+
+/* Line 1806 of yacc.c  */
+#line 1619 "parse.y"

     { (yyval.id) = g_strdup("*"); }
     break;
 
     { (yyval.id) = g_strdup("*"); }
     break;
 

-  case 127:
-#line 1606 "parse.y"
+  case 128:
+
+/* Line 1806 of yacc.c  */
+#line 1620 "parse.y"

     { (yyval.id) = g_strdup("* const"); }
     break;
 
     { (yyval.id) = g_strdup("* const"); }
     break;
 

-  case 128:
-#line 1607 "parse.y"
+  case 129:
+
+/* Line 1806 of yacc.c  */
+#line 1621 "parse.y"

     {
                                (yyval.id) = g_strconcat("*", (yyvsp[(2) - (2)].id), NULL);
                                g_free((yyvsp[(2) - (2)].id));
                                        }
     break;
 
     {
                                (yyval.id) = g_strconcat("*", (yyvsp[(2) - (2)].id), NULL);
                                g_free((yyvsp[(2) - (2)].id));
                                        }
     break;
 

-  case 129:
-#line 1611 "parse.y"
+  case 130:
+
+/* Line 1806 of yacc.c  */
+#line 1625 "parse.y"

     {
                                (yyval.id) = g_strconcat("* const", (yyvsp[(3) - (3)].id), NULL);
                                g_free((yyvsp[(3) - (3)].id));
                                        }
     break;
 
     {
                                (yyval.id) = g_strconcat("* const", (yyvsp[(3) - (3)].id), NULL);
                                g_free((yyvsp[(3) - (3)].id));
                                        }
     break;
 

-  case 130:
-#line 1618 "parse.y"
+  case 131:
+
+/* Line 1806 of yacc.c  */
+#line 1632 "parse.y"

     {
                        if(strcmp((yyvsp[(1) - (2)].id), "first")==0)
                                (yyval.sigtype) = SIGNAL_FIRST_METHOD;
     {
                        if(strcmp((yyvsp[(1) - (2)].id), "first")==0)
                                (yyval.sigtype) = SIGNAL_FIRST_METHOD;


@@ -3867,15 +4189,19 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 131:
-#line 1630 "parse.y"
+  case 132:
+
+/* Line 1806 of yacc.c  */
+#line 1644 "parse.y"

     {
                        (yyval.sigtype) = SIGNAL_LAST_METHOD;
                                        }
     break;
 
     {
                        (yyval.sigtype) = SIGNAL_LAST_METHOD;
                                        }
     break;
 

-  case 132:
-#line 1636 "parse.y"
+  case 133:
+
+/* Line 1806 of yacc.c  */
+#line 1650 "parse.y"

     {
                        if(strcmp((yyvsp[(2) - (3)].id),"first")==0)
                                (yyval.sigtype) = SIGNAL_FIRST_METHOD;
     {
                        if(strcmp((yyvsp[(2) - (3)].id),"first")==0)
                                (yyval.sigtype) = SIGNAL_FIRST_METHOD;


@@ -3890,8 +4216,10 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 133:
-#line 1648 "parse.y"
+  case 134:
+
+/* Line 1806 of yacc.c  */
+#line 1662 "parse.y"

     {
                        if(strcmp((yyvsp[(1) - (3)].id),"first")==0)
                                (yyval.sigtype) = SIGNAL_FIRST_METHOD;
     {
                        if(strcmp((yyvsp[(1) - (3)].id),"first")==0)
                                (yyval.sigtype) = SIGNAL_FIRST_METHOD;


@@ -3906,54 +4234,70 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 134:
-#line 1660 "parse.y"
+  case 135:
+
+/* Line 1806 of yacc.c  */
+#line 1674 "parse.y"

     {
                        (yyval.sigtype) = SIGNAL_LAST_METHOD;
                                        }
     break;
 
     {
                        (yyval.sigtype) = SIGNAL_LAST_METHOD;
                                        }
     break;
 

-  case 135:
-#line 1663 "parse.y"
+  case 136:
+
+/* Line 1806 of yacc.c  */
+#line 1677 "parse.y"

     {
                        /* the_scope was default thus public */
                        the_scope = PUBLIC_SCOPE;
                                        }
     break;
 
     {
                        /* the_scope was default thus public */
                        the_scope = PUBLIC_SCOPE;
                                        }
     break;
 

-  case 136:
-#line 1669 "parse.y"
+  case 137:
+
+/* Line 1806 of yacc.c  */
+#line 1683 "parse.y"

     {
                        gtktypes = g_list_prepend(gtktypes, debool ((yyvsp[(1) - (4)].id)));
                                                }
     break;
 
     {
                        gtktypes = g_list_prepend(gtktypes, debool ((yyvsp[(1) - (4)].id)));
                                                }
     break;
 

-  case 137:
-#line 1674 "parse.y"
+  case 138:
+
+/* Line 1806 of yacc.c  */
+#line 1688 "parse.y"

     {
                        gtktypes = g_list_append(gtktypes, debool ((yyvsp[(3) - (3)].id)));
                                                }
     break;
 
     {
                        gtktypes = g_list_append(gtktypes, debool ((yyvsp[(3) - (3)].id)));
                                                }
     break;
 

-  case 138:
-#line 1677 "parse.y"
+  case 139:
+
+/* Line 1806 of yacc.c  */
+#line 1691 "parse.y"

     { 
                        gtktypes = g_list_append(gtktypes, debool ((yyvsp[(1) - (1)].id)));
                                                        }
     break;
 
     { 
                        gtktypes = g_list_append(gtktypes, debool ((yyvsp[(1) - (1)].id)));
                                                        }
     break;
 

-  case 139:
-#line 1682 "parse.y"
+  case 140:
+
+/* Line 1806 of yacc.c  */
+#line 1696 "parse.y"

     { (yyval.cbuf) = (yyvsp[(2) - (2)].cbuf); }
     break;
 
     { (yyval.cbuf) = (yyvsp[(2) - (2)].cbuf); }
     break;
 

-  case 140:
-#line 1683 "parse.y"
+  case 141:
+
+/* Line 1806 of yacc.c  */
+#line 1697 "parse.y"

     { (yyval.cbuf) = NULL; }
     break;
 
     { (yyval.cbuf) = NULL; }
     break;
 

-  case 141:
-#line 1687 "parse.y"
+  case 142:
+
+/* Line 1806 of yacc.c  */
+#line 1701 "parse.y"

     {
                        if(!has_self) {
                                yyerror(_("signal without 'self' as "
     {
                        if(!has_self) {
                                yyerror(_("signal without 'self' as "


@@ -3979,8 +4323,10 @@ yyreduce:
                                                                        }
     break;
 
                                                                        }
     break;
 

-  case 142:
-#line 1710 "parse.y"
+  case 143:
+
+/* Line 1806 of yacc.c  */
+#line 1724 "parse.y"

     {
                        if(!has_self) {
                                yyerror(_("signal without 'self' as "
     {
                        if(!has_self) {
                                yyerror(_("signal without 'self' as "


@@ -4006,8 +4352,10 @@ yyreduce:
                                                                        }
     break;
 
                                                                        }
     break;
 

-  case 143:
-#line 1733 "parse.y"
+  case 144:
+
+/* Line 1806 of yacc.c  */
+#line 1747 "parse.y"

     {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "
     {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "


@@ -4033,8 +4381,10 @@ yyreduce:
                                                                        }
     break;
 
                                                                        }
     break;
 

-  case 144:
-#line 1756 "parse.y"
+  case 145:
+
+/* Line 1806 of yacc.c  */
+#line 1770 "parse.y"

     {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "
     {
                        if(!has_self) {
                                yyerror(_("virtual method without 'self' as "


@@ -4060,8 +4410,10 @@ yyreduce:
                                                                        }
     break;
 
                                                                        }
     break;
 

-  case 145:
-#line 1779 "parse.y"
+  case 146:
+
+/* Line 1806 of yacc.c  */
+#line 1793 "parse.y"

     {
                        if(!has_self) {
                                yyerror(_("virtual method without 'szelf' as "
     {
                        if(!has_self) {
                                yyerror(_("virtual method without 'szelf' as "


@@ -4082,8 +4434,10 @@ yyreduce:
                                                                        }
     break;
 
                                                                        }
     break;
 

-  case 146:
-#line 1797 "parse.y"
+  case 147:
+
+/* Line 1806 of yacc.c  */
+#line 1811 "parse.y"

     {
                        if (funcattrs != NULL) {
                                char *error = g_strdup_printf
     {
                        if (funcattrs != NULL) {
                                char *error = g_strdup_printf


@@ -4099,8 +4453,10 @@ yyreduce:
                                                                        }
     break;
 
                                                                        }
     break;
 

-  case 147:
-#line 1810 "parse.y"
+  case 148:
+
+/* Line 1806 of yacc.c  */
+#line 1824 "parse.y"

     {
                        if(the_scope == CLASS_SCOPE) {
                                yyerror(_("a method cannot be of class scope"));
     {
                        if(the_scope == CLASS_SCOPE) {
                                yyerror(_("a method cannot be of class scope"));


@@ -4113,8 +4469,10 @@ yyreduce:
                                                                }
     break;
 
                                                                }
     break;
 

-  case 148:
-#line 1820 "parse.y"
+  case 149:
+
+/* Line 1806 of yacc.c  */
+#line 1834 "parse.y"

     {
                        if(strcmp((yyvsp[(1) - (5)].id), "init")==0) {
                                push_init_arg((yyvsp[(3) - (5)].id),FALSE);
     {
                        if(strcmp((yyvsp[(1) - (5)].id), "init")==0) {
                                push_init_arg((yyvsp[(3) - (5)].id),FALSE);


@@ -4155,8 +4513,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 149:
-#line 1860 "parse.y"
+  case 150:
+
+/* Line 1806 of yacc.c  */
+#line 1874 "parse.y"

     {
                        g_free(funcattrs); funcattrs = NULL;
                        g_free(onerror); onerror = NULL;
     {
                        g_free(funcattrs); funcattrs = NULL;
                        g_free(onerror); onerror = NULL;


@@ -4171,8 +4531,10 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 150:
-#line 1872 "parse.y"
+  case 151:
+
+/* Line 1806 of yacc.c  */
+#line 1886 "parse.y"

     {
                        g_free(funcattrs); funcattrs = NULL;
                        g_free(onerror); onerror = NULL;
     {
                        g_free(funcattrs); funcattrs = NULL;
                        g_free(onerror); onerror = NULL;


@@ -4195,8 +4557,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 151:
-#line 1892 "parse.y"
+  case 152:
+
+/* Line 1806 of yacc.c  */
+#line 1906 "parse.y"

     {
                        g_free(funcattrs); funcattrs = NULL;
                        g_free(onerror); onerror = NULL;
     {
                        g_free(funcattrs); funcattrs = NULL;
                        g_free(onerror); onerror = NULL;


@@ -4230,8 +4594,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 152:
-#line 1923 "parse.y"
+  case 153:
+
+/* Line 1806 of yacc.c  */
+#line 1937 "parse.y"

     {
                        g_free(funcattrs); funcattrs = NULL;
                        g_free(onerror); onerror = NULL;
     {
                        g_free(funcattrs); funcattrs = NULL;
                        g_free(onerror); onerror = NULL;


@@ -4239,26 +4605,34 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 153:
-#line 1930 "parse.y"
+  case 154:
+
+/* Line 1806 of yacc.c  */
+#line 1944 "parse.y"

     { (yyval.id) = (yyvsp[(1) - (1)].id); }
     break;
 
     { (yyval.id) = (yyvsp[(1) - (1)].id); }
     break;
 

-  case 154:
-#line 1931 "parse.y"
+  case 155:
+
+/* Line 1806 of yacc.c  */
+#line 1945 "parse.y"

     {
                        (yyval.id) = ((yyvsp[(2) - (2)].cbuf))->str;
                        g_string_free((yyvsp[(2) - (2)].cbuf), FALSE);
                                        }
     break;
 
     {
                        (yyval.id) = ((yyvsp[(2) - (2)].cbuf))->str;
                        g_string_free((yyvsp[(2) - (2)].cbuf), FALSE);
                                        }
     break;
 

-  case 155:
-#line 1937 "parse.y"
+  case 156:
+
+/* Line 1806 of yacc.c  */
+#line 1951 "parse.y"

     { vararg = FALSE; has_self = FALSE; }
     break;
 
     { vararg = FALSE; has_self = FALSE; }
     break;
 

-  case 156:
-#line 1938 "parse.y"
+  case 157:
+
+/* Line 1806 of yacc.c  */
+#line 1952 "parse.y"

     {
                        vararg = FALSE;
                        has_self = TRUE;
     {
                        vararg = FALSE;
                        has_self = TRUE;


@@ -4272,8 +4646,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 157:
-#line 1949 "parse.y"
+  case 158:
+
+/* Line 1806 of yacc.c  */
+#line 1963 "parse.y"

     {
                        vararg = FALSE;
                        has_self = TRUE;
     {
                        vararg = FALSE;
                        has_self = TRUE;


@@ -4287,8 +4663,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 158:
-#line 1960 "parse.y"
+  case 159:
+
+/* Line 1806 of yacc.c  */
+#line 1974 "parse.y"

     {
                        vararg = FALSE;
                        has_self = TRUE;
     {
                        vararg = FALSE;
                        has_self = TRUE;


@@ -4302,8 +4680,10 @@ yyreduce:
                                                }
     break;
 
                                                }
     break;
 

-  case 159:
-#line 1971 "parse.y"
+  case 160:
+
+/* Line 1806 of yacc.c  */
+#line 1985 "parse.y"

     {
                        has_self = TRUE;
                        if(strcmp((yyvsp[(1) - (3)].id),"self")==0)
     {
                        has_self = TRUE;
                        if(strcmp((yyvsp[(1) - (3)].id),"self")==0)


@@ -4316,8 +4696,10 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 160:
-#line 1981 "parse.y"
+  case 161:
+
+/* Line 1806 of yacc.c  */
+#line 1995 "parse.y"

     {
                        has_self = TRUE;
                        if(strcmp((yyvsp[(1) - (4)].id),"self")==0)
     {
                        has_self = TRUE;
                        if(strcmp((yyvsp[(1) - (4)].id),"self")==0)


@@ -4330,8 +4712,10 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 161:
-#line 1991 "parse.y"
+  case 162:
+
+/* Line 1806 of yacc.c  */
+#line 2005 "parse.y"

     {
                        has_self = TRUE;
                        if(strcmp((yyvsp[(2) - (4)].id),"self")==0)
     {
                        has_self = TRUE;
                        if(strcmp((yyvsp[(2) - (4)].id),"self")==0)


@@ -4344,47 +4728,63 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 162:
-#line 2001 "parse.y"
+  case 163:
+
+/* Line 1806 of yacc.c  */
+#line 2015 "parse.y"

     { has_self = FALSE; }
     break;
 
     { has_self = FALSE; }
     break;
 

-  case 163:
-#line 2004 "parse.y"
+  case 164:
+
+/* Line 1806 of yacc.c  */
+#line 2018 "parse.y"

     { vararg = TRUE; }
     break;
 
     { vararg = TRUE; }
     break;
 

-  case 164:
-#line 2005 "parse.y"
+  case 165:
+
+/* Line 1806 of yacc.c  */
+#line 2019 "parse.y"

     { vararg = FALSE; }
     break;
 
     { vararg = FALSE; }
     break;
 

-  case 165:
-#line 2008 "parse.y"
+  case 166:
+
+/* Line 1806 of yacc.c  */
+#line 2022 "parse.y"

     { ; }
     break;
 
     { ; }
     break;
 

-  case 166:
-#line 2009 "parse.y"
+  case 167:
+
+/* Line 1806 of yacc.c  */
+#line 2023 "parse.y"

     { ; }
     break;
 
     { ; }
     break;
 

-  case 167:
-#line 2012 "parse.y"
+  case 168:
+
+/* Line 1806 of yacc.c  */
+#line 2026 "parse.y"

     {
                        push_funcarg((yyvsp[(2) - (2)].id),NULL);
                                                                }
     break;
 
     {
                        push_funcarg((yyvsp[(2) - (2)].id),NULL);
                                                                }
     break;
 

-  case 168:
-#line 2015 "parse.y"
+  case 169:
+
+/* Line 1806 of yacc.c  */
+#line 2029 "parse.y"

     {
                        push_funcarg((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].id));
                                                                }
     break;
 
     {
                        push_funcarg((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].id));
                                                                }
     break;
 

-  case 169:
-#line 2018 "parse.y"
+  case 170:
+
+/* Line 1806 of yacc.c  */
+#line 2032 "parse.y"

     {
                        if(strcmp((yyvsp[(4) - (6)].id),"check")!=0) {
                                yyerror(_("parse error"));
     {
                        if(strcmp((yyvsp[(4) - (6)].id),"check")!=0) {
                                yyerror(_("parse error"));


@@ -4395,8 +4795,10 @@ yyreduce:
                                                                }
     break;
 
                                                                }
     break;
 

-  case 170:
-#line 2026 "parse.y"
+  case 171:
+
+/* Line 1806 of yacc.c  */
+#line 2040 "parse.y"

     {
                        if(strcmp((yyvsp[(5) - (7)].id),"check")!=0) {
                                yyerror(_("parse error"));
     {
                        if(strcmp((yyvsp[(5) - (7)].id),"check")!=0) {
                                yyerror(_("parse error"));


@@ -4407,18 +4809,24 @@ yyreduce:
                                                                }
     break;
 
                                                                }
     break;
 

-  case 171:
-#line 2036 "parse.y"
+  case 172:
+
+/* Line 1806 of yacc.c  */
+#line 2050 "parse.y"

     { ; }
     break;
 
     { ; }
     break;
 

-  case 172:
-#line 2037 "parse.y"
+  case 173:
+
+/* Line 1806 of yacc.c  */
+#line 2051 "parse.y"

     { ; }
     break;
 
     { ; }
     break;
 

-  case 173:
-#line 2040 "parse.y"
+  case 174:
+
+/* Line 1806 of yacc.c  */
+#line 2054 "parse.y"

     {
                        if(strcmp((yyvsp[(1) - (1)].id),"type")==0) {
                                Node *node = node_new (CHECK_NODE,
     {
                        if(strcmp((yyvsp[(1) - (1)].id),"type")==0) {
                                Node *node = node_new (CHECK_NODE,


@@ -4438,8 +4846,10 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 174:
-#line 2057 "parse.y"
+  case 175:
+
+/* Line 1806 of yacc.c  */
+#line 2071 "parse.y"

     {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", GT_CHECK,
     {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", GT_CHECK,


@@ -4449,8 +4859,10 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 175:
-#line 2064 "parse.y"
+  case 176:
+
+/* Line 1806 of yacc.c  */
+#line 2078 "parse.y"

     {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", LT_CHECK,
     {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", LT_CHECK,


@@ -4460,8 +4872,10 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 176:
-#line 2071 "parse.y"
+  case 177:
+
+/* Line 1806 of yacc.c  */
+#line 2085 "parse.y"

     {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", GE_CHECK,
     {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", GE_CHECK,


@@ -4471,8 +4885,10 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 177:
-#line 2078 "parse.y"
+  case 178:
+
+/* Line 1806 of yacc.c  */
+#line 2092 "parse.y"

     {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", LE_CHECK,
     {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", LE_CHECK,


@@ -4482,8 +4898,10 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 178:
-#line 2085 "parse.y"
+  case 179:
+
+/* Line 1806 of yacc.c  */
+#line 2099 "parse.y"

     {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", EQ_CHECK,
     {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", EQ_CHECK,


@@ -4493,8 +4911,10 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 179:
-#line 2092 "parse.y"
+  case 180:
+
+/* Line 1806 of yacc.c  */
+#line 2106 "parse.y"

     {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", NE_CHECK,
     {
                        Node *node = node_new (CHECK_NODE,
                                               "chtype", NE_CHECK,


@@ -4504,8 +4924,10 @@ yyreduce:
                                        }
     break;
 
                                        }
     break;
 

-  case 180:
-#line 2101 "parse.y"
+  case 181:
+
+/* Line 1806 of yacc.c  */
+#line 2115 "parse.y"

     {
                        Node *node = node_new (ENUMDEF_NODE,
                                               "etype:steal", (yyvsp[(6) - (7)].id),
     {
                        Node *node = node_new (ENUMDEF_NODE,
                                               "etype:steal", (yyvsp[(6) - (7)].id),


@@ -4517,8 +4939,10 @@ yyreduce:
                        }
     break;
 
                        }
     break;
 

-  case 181:
-#line 2110 "parse.y"
+  case 182:
+
+/* Line 1806 of yacc.c  */
+#line 2124 "parse.y"

     {
                        Node *node = node_new (ENUMDEF_NODE,
                                               "etype:steal", (yyvsp[(7) - (8)].id),
     {
                        Node *node = node_new (ENUMDEF_NODE,
                                               "etype:steal", (yyvsp[(7) - (8)].id),


@@ -4530,18 +4954,24 @@ yyreduce:
                        }
     break;
 
                        }
     break;
 

-  case 182:
-#line 2121 "parse.y"
+  case 183:
+
+/* Line 1806 of yacc.c  */
+#line 2135 "parse.y"

     {;}
     break;
 
     {;}
     break;
 

-  case 183:
-#line 2122 "parse.y"
+  case 184:
+
+/* Line 1806 of yacc.c  */
+#line 2136 "parse.y"

     {;}
     break;
 
     {;}
     break;
 

-  case 184:
-#line 2125 "parse.y"
+  case 185:
+
+/* Line 1806 of yacc.c  */
+#line 2139 "parse.y"

     {
                        Node *node;
                        char *num = (yyvsp[(3) - (3)].id);
     {
                        Node *node;
                        char *num = (yyvsp[(3) - (3)].id);


@@ -4564,8 +4994,10 @@ yyreduce:
                        }
     break;
 
                        }
     break;
 

-  case 185:
-#line 2145 "parse.y"
+  case 186:
+
+/* Line 1806 of yacc.c  */
+#line 2159 "parse.y"

     {
                        Node *node;
 
     {
                        Node *node;
 


@@ -4576,8 +5008,10 @@ yyreduce:
        }
     break;
 
        }
     break;
 

-  case 186:
-#line 2155 "parse.y"
+  case 187:
+
+/* Line 1806 of yacc.c  */
+#line 2169 "parse.y"

     {
                        Node *node = node_new (FLAGS_NODE,
                                               "ftype:steal", (yyvsp[(6) - (7)].id),
     {
                        Node *node = node_new (FLAGS_NODE,
                                               "ftype:steal", (yyvsp[(6) - (7)].id),


@@ -4589,8 +5023,10 @@ yyreduce:
                        }
     break;
 
                        }
     break;
 

-  case 187:
-#line 2164 "parse.y"
+  case 188:
+
+/* Line 1806 of yacc.c  */
+#line 2178 "parse.y"

     {
                        Node *node = node_new (FLAGS_NODE,
                                               "ftype:steal", (yyvsp[(7) - (8)].id),
     {
                        Node *node = node_new (FLAGS_NODE,
                                               "ftype:steal", (yyvsp[(7) - (8)].id),


@@ -4602,22 +5038,28 @@ yyreduce:
                        }
     break;
 
                        }
     break;
 

-  case 188:
-#line 2175 "parse.y"
+  case 189:
+
+/* Line 1806 of yacc.c  */
+#line 2189 "parse.y"

     {
                        flag_vals = g_list_append (flag_vals, (yyvsp[(3) - (3)].id));
                }
     break;
 
     {
                        flag_vals = g_list_append (flag_vals, (yyvsp[(3) - (3)].id));
                }
     break;
 

-  case 189:
-#line 2178 "parse.y"
+  case 190:
+
+/* Line 1806 of yacc.c  */
+#line 2192 "parse.y"

     {
                        flag_vals = g_list_append (flag_vals, (yyvsp[(1) - (1)].id));
                }
     break;
 
     {
                        flag_vals = g_list_append (flag_vals, (yyvsp[(1) - (1)].id));
                }
     break;
 

-  case 190:
-#line 2183 "parse.y"
+  case 191:
+
+/* Line 1806 of yacc.c  */
+#line 2197 "parse.y"

     {
                        Node *node = node_new (ERROR_NODE,
                                               "etype:steal", (yyvsp[(6) - (7)].id),
     {
                        Node *node = node_new (ERROR_NODE,
                                               "etype:steal", (yyvsp[(6) - (7)].id),


@@ -4629,8 +5071,10 @@ yyreduce:
                        }
     break;
 
                        }
     break;
 

-  case 191:
-#line 2192 "parse.y"
+  case 192:
+
+/* Line 1806 of yacc.c  */
+#line 2206 "parse.y"

     {
                        Node *node = node_new (ERROR_NODE,
                                               "etype:steal", (yyvsp[(7) - (8)].id),
     {
                        Node *node = node_new (ERROR_NODE,
                                               "etype:steal", (yyvsp[(7) - (8)].id),


@@ -4642,48 +5086,72 @@ yyreduce:
                        }
     break;
 
                        }
     break;
 

-  case 192:
-#line 2203 "parse.y"
+  case 193:
+
+/* Line 1806 of yacc.c  */
+#line 2217 "parse.y"

     {
                        error_vals = g_list_append (error_vals, (yyvsp[(3) - (3)].id));
                }
     break;
 
     {
                        error_vals = g_list_append (error_vals, (yyvsp[(3) - (3)].id));
                }
     break;
 

-  case 193:
-#line 2206 "parse.y"
+  case 194:
+
+/* Line 1806 of yacc.c  */
+#line 2220 "parse.y"

     {
                        error_vals = g_list_append (error_vals, (yyvsp[(1) - (1)].id));
                }
     break;
 
     {
                        error_vals = g_list_append (error_vals, (yyvsp[(1) - (1)].id));
                }
     break;
 

-  case 194:
-#line 2212 "parse.y"
+  case 195:
+
+/* Line 1806 of yacc.c  */
+#line 2226 "parse.y"

     { (yyval.id) = (yyvsp[(1) - (1)].id); }
     break;
 
     { (yyval.id) = (yyvsp[(1) - (1)].id); }
     break;
 

-  case 195:
-#line 2213 "parse.y"
+  case 196:
+
+/* Line 1806 of yacc.c  */
+#line 2227 "parse.y"

     {
                        (yyval.id) = g_strconcat("-",(yyvsp[(2) - (2)].id),NULL);
                        g_free((yyvsp[(2) - (2)].id));
                                        }
     break;
 
     {
                        (yyval.id) = g_strconcat("-",(yyvsp[(2) - (2)].id),NULL);
                        g_free((yyvsp[(2) - (2)].id));
                                        }
     break;
 

-  case 196:
-#line 2217 "parse.y"
+  case 197:
+
+/* Line 1806 of yacc.c  */
+#line 2231 "parse.y"

     { (yyval.id) = (yyvsp[(1) - (1)].id); }
     break;
 
     { (yyval.id) = (yyvsp[(1) - (1)].id); }
     break;
 

-  case 197:
-#line 2218 "parse.y"
+  case 198:
+
+/* Line 1806 of yacc.c  */
+#line 2232 "parse.y"

     { (yyval.id) = (yyvsp[(1) - (1)].id); }
     break;
 
 
     { (yyval.id) = (yyvsp[(1) - (1)].id); }
     break;
 
 

-/* Line 1267 of yacc.c.  */
-#line 4685 "parse.c"
+
+/* Line 1806 of yacc.c  */
+#line 5142 "parse.c"

       default: break;
     }
       default: break;
     }

+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */

   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);


@@ -4692,7 +5160,6 @@ yyreduce:
 
   *++yyvsp = yyval;
 
 
   *++yyvsp = yyval;
 

-

   /* 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.  */


@@ -4712,6 +5179,10 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:

+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+

   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {


@@ -4719,37 +5190,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else

+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)

       {
       {

-       YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-       if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-         {
-           YYSIZE_T yyalloc = 2 * yysize;
-           if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-             yyalloc = YYSTACK_ALLOC_MAXIMUM;
-           if (yymsg != yymsgbuf)
-             YYSTACK_FREE (yymsg);
-           yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-           if (yymsg)
-             yymsg_alloc = yyalloc;
-           else
-             {
-               yymsg = yymsgbuf;
-               yymsg_alloc = sizeof yymsgbuf;
-             }
-         }
-
-       if (0 < yysize && yysize <= yymsg_alloc)
-         {
-           (void) yysyntax_error (yymsg, yystate, yychar);
-           yyerror (yymsg);
-         }
-       else
-         {
-           yyerror (YY_("syntax error"));
-           if (yysize != 0)
-             goto yyexhaustedlab;
-         }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;

       }
       }

+# undef YYSYNTAX_ERROR

 #endif
     }
 
 #endif
     }
 


@@ -4757,7 +5227,7 @@ yyerrlab:
 
   if (yyerrstatus == 3)
     {
 
   if (yyerrstatus == 3)
     {

-      /* If just tried and failed to reuse look-ahead token after an
+      /* If just tried and failed to reuse lookahead token after an

         error, discard it.  */
 
       if (yychar <= YYEOF)
         error, discard it.  */
 
       if (yychar <= YYEOF)


@@ -4774,7 +5244,7 @@ yyerrlab:
        }
     }
 
        }
     }
 

-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error

      token.  */
   goto yyerrlab1;
 
      token.  */
   goto yyerrlab1;
 


@@ -4808,7 +5278,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
   for (;;)
     {
       yyn = yypact[yystate];

-      if (yyn != YYPACT_NINF)
+      if (!yypact_value_is_default (yyn))

        {
          yyn += YYTERROR;
          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
        {
          yyn += YYTERROR;
          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)


@@ -4831,9 +5301,6 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
       YY_STACK_PRINT (yyss, yyssp);
     }
 

-  if (yyn == YYFINAL)
-    YYACCEPT;
-

   *++yyvsp = yylval;
 
 
   *++yyvsp = yylval;
 
 


@@ -4858,7 +5325,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
   yyresult = 1;
   goto yyreturn;
 

-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE

 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/


@@ -4869,9 +5336,14 @@ yyexhaustedlab:
 #endif
 
 yyreturn:
 #endif
 
 yyreturn:

-  if (yychar != YYEOF && yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-                yytoken, &yylval);
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }

   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);


@@ -4895,6 +5367,8 @@ yyreturn:
 }
 
 
 }
 
 

-#line 2221 "parse.y"
+
+/* Line 2067 of yacc.c  */
+#line 2235 "parse.y"