diff --git a/ast/agrampar.codes.h b/ast/agrampar.codes.h
index d8f5456..6bf243d 100644
--- a/ast/agrampar.codes.h
+++ b/ast/agrampar.codes.h
@@ -1,34 +1,5 @@
-# define YYTOKENTYPE
-#define TOK_NAME 258
-#define TOK_INTLIT 259
-#define TOK_EMBEDDED_CODE 260
-#define TOK_LBRACE 261
-#define TOK_RBRACE 262
-#define TOK_SEMICOLON 263
-#define TOK_ARROW 264
-#define TOK_LPAREN 265
-#define TOK_RPAREN 266
-#define TOK_LANGLE 267
-#define TOK_RANGLE 268
-#define TOK_STAR 269
-#define TOK_AMPERSAND 270
-#define TOK_COMMA 271
-#define TOK_EQUALS 272
-#define TOK_COLON 273
-#define TOK_CLASS 274
-#define TOK_PUBLIC 275
-#define TOK_PRIVATE 276
-#define TOK_PROTECTED 277
-#define TOK_VERBATIM 278
-#define TOK_IMPL_VERBATIM 279
-#define TOK_XML_VERBATIM 280
-#define TOK_CTOR 281
-#define TOK_DTOR 282
-#define TOK_PURE_VIRTUAL 283
-#define TOK_CUSTOM 284
-#define TOK_OPTION 285
-#define TOK_NEW 286
-#define TOK_ENUM 287
+// # define YYTOKENTYPE
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
+#include "agrampar.tab.h"
diff --git a/ast/agrampar.tab.h b/ast/agrampar.tab.h
index 9215e87..6025033 100644
--- a/ast/agrampar.tab.h
+++ b/ast/agrampar.tab.h
@@ -1,24 +1,21 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* Skeleton interface 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 interface 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
-   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.
-
+   
    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
@@ -29,10 +26,11 @@
    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.  */
 
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -71,45 +69,16 @@
      TOK_ENUM = 287
    };
 #endif
-/* Tokens.  */
-#define TOK_NAME 258
-#define TOK_INTLIT 259
-#define TOK_EMBEDDED_CODE 260
-#define TOK_LBRACE 261
-#define TOK_RBRACE 262
-#define TOK_SEMICOLON 263
-#define TOK_ARROW 264
-#define TOK_LPAREN 265
-#define TOK_RPAREN 266
-#define TOK_LANGLE 267
-#define TOK_RANGLE 268
-#define TOK_STAR 269
-#define TOK_AMPERSAND 270
-#define TOK_COMMA 271
-#define TOK_EQUALS 272
-#define TOK_COLON 273
-#define TOK_CLASS 274
-#define TOK_PUBLIC 275
-#define TOK_PRIVATE 276
-#define TOK_PROTECTED 277
-#define TOK_VERBATIM 278
-#define TOK_IMPL_VERBATIM 279
-#define TOK_XML_VERBATIM 280
-#define TOK_CTOR 281
-#define TOK_DTOR 282
-#define TOK_PURE_VIRTUAL 283
-#define TOK_CUSTOM 284
-#define TOK_OPTION 285
-#define TOK_NEW 286
-#define TOK_ENUM 287
-
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 69 "agrampar.y"
 {
+
+/* Line 2068 of yacc.c  */
+#line 69 "agrampar.y"
+
   ASTSpecFile *file;
   ASTList<ToplevelForm> *formList;
   TF_class *tfClass;
@@ -128,14 +97,17 @@ typedef union YYSTYPE
   ASTList<BaseClass> *baseClassList;
   BaseClass *baseClass;
   CustomCode *customCode;
-}
-/* Line 1529 of yacc.c.  */
-#line 134 "agrampar.tab.h"
-	YYSTYPE;
+
+
+
+/* Line 2068 of yacc.c  */
+#line 105 "agrampar.tab.h"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
 
+