[llvm-commits] CVS: llvm/utils/TableGen/FileLexer.cpp FileParser.cpp FileParser.h

John Criswell criswell at cs.uiuc.edu
Tue Jan 17 09:01:57 PST 2006



Changes in directory llvm/utils/TableGen:

FileLexer.cpp updated: 1.3 -> 1.4
FileParser.cpp updated: 1.10 -> 1.11
FileParser.h updated: 1.4 -> 1.5
---
Log message:

Regenerated the Lex and Yacc output files on Linux.  It seems that our
Linux machines don't like the source code generated on MacOS X for some
reason.


---
Diffs of the changes:  (+1652 -1195)

 FileLexer.cpp  |   74 -
 FileParser.cpp | 2655 ++++++++++++++++++++++++++++++++-------------------------
 FileParser.h   |  111 +-
 3 files changed, 1652 insertions(+), 1188 deletions(-)


Index: llvm/utils/TableGen/FileLexer.cpp
diff -u llvm/utils/TableGen/FileLexer.cpp:1.3 llvm/utils/TableGen/FileLexer.cpp:1.4
--- llvm/utils/TableGen/FileLexer.cpp:1.3	Mon Sep 12 00:30:06 2005
+++ llvm/utils/TableGen/FileLexer.cpp	Tue Jan 17 11:01:34 2006
@@ -21,7 +21,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /home/vadve/shared/PublicCVS/llvm/utils/TableGen/FileLexer.cpp,v 1.3 2005/09/12 05:30:06 lattner Exp $
+ * $Header: /home/vadve/shared/PublicCVS/llvm/utils/TableGen/FileLexer.cpp,v 1.4 2006/01/17 17:01:34 criswell Exp $
  */
 
 #define FLEX_SCANNER
@@ -489,7 +489,7 @@
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-#line 1 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 1 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 #define INITIAL 0
 /*===-- FileLexer.l - Scanner for TableGen Files ----------------*- C++ -*-===//
 // 
@@ -507,7 +507,7 @@
 #define YY_NEVER_INTERACTIVE 1
 #define comment 1
 
-#line 30 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 30 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 #include "Record.h"
 typedef std::pair<llvm::Record*, std::vector<llvm::Init*>*> SubClassRefTy;
 #include "FileParser.h"
@@ -795,7 +795,7 @@
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 176 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 176 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 
 
 #line 802 "Lexer.cpp"
@@ -891,165 +891,165 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 178 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 178 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { /* Ignore comments */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 180 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 180 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { HandleInclude(yytext); }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 181 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 181 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { Filelval.StrVal = new std::string(yytext+2, yytext+yyleng-2);
                  return CODEFRAGMENT; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 184 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 184 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return INT; }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 185 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 185 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return BIT; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 186 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 186 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return BITS; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 187 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 187 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return STRING; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 188 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 188 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return LIST; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 189 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 189 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return CODE; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 190 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 190 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return DAG; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 192 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 192 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return CLASS; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 193 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 193 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return DEF; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 194 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 194 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return FIELD; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 195 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 195 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return LET; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 196 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 196 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return IN; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 198 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 198 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return SRATOK; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 199 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 199 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return SRLTOK; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 200 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 200 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return SHLTOK; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 203 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 203 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { Filelval.StrVal = new std::string(yytext, yytext+yyleng);
                  return ID; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 205 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 205 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { Filelval.StrVal = new std::string(yytext+1, yytext+yyleng);
                  return VARNAME; } 
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 208 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 208 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { Filelval.StrVal = new std::string(yytext+1, yytext+yyleng-1);
                  return STRVAL; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 211 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 211 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { Filelval.IntVal = ParseInt(Filetext); return INTVAL; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 213 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 213 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 216 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 216 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { BEGIN(comment); CommentDepth++; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 217 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 217 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 {} /* eat anything that's not a '*' or '/' */
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 218 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 218 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 {} /* eat up '*'s not followed by '/'s */
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 219 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 219 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { ++CommentDepth; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 220 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 220 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 {} /* eat up /'s not followed by *'s */
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 221 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 221 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { if (!--CommentDepth) { BEGIN(INITIAL); } }
 	YY_BREAK
 case YY_STATE_EOF(comment):
-#line 222 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 222 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { err() << "Unterminated comment!\n"; exit(1); }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 224 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 224 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 { return Filetext[0]; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 226 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 226 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
 #line 1056 "Lexer.cpp"
@@ -1932,5 +1932,5 @@
 	return 0;
 	}
 #endif
-#line 226 "/home/vadve/lattner/llvm/utils/TableGen/FileLexer.l"
+#line 226 "/home/vadve/criswell/llvm/utils/TableGen/FileLexer.l"
 


Index: llvm/utils/TableGen/FileParser.cpp
diff -u llvm/utils/TableGen/FileParser.cpp:1.10 llvm/utils/TableGen/FileParser.cpp:1.11
--- llvm/utils/TableGen/FileParser.cpp:1.10	Tue Jan 10 13:05:34 2006
+++ llvm/utils/TableGen/FileParser.cpp	Tue Jan 17 11:01:34 2006
@@ -1,38 +1,115 @@
+/* A Bison parser, made by GNU Bison 1.875.  */
 
-/*  A Bison parser, made from /Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y
-    by GNU Bison version 1.28  */
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
 
-#define YYBISON 1  /* Identify Bison output.  */
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Written by Richard Stallman by simplifying the original so called
+   ``semantic'' parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+/* If NAME_PREFIX is specified substitute the variables and functions
+   names.  */
 #define yyparse Fileparse
-#define yylex Filelex
+#define yylex   Filelex
 #define yyerror Fileerror
-#define yylval Filelval
-#define yychar Filechar
+#define yylval  Filelval
+#define yychar  Filechar
 #define yydebug Filedebug
 #define yynerrs Filenerrs
-#define	INT	257
-#define	BIT	258
-#define	STRING	259
-#define	BITS	260
-#define	LIST	261
-#define	CODE	262
-#define	DAG	263
-#define	CLASS	264
-#define	DEF	265
-#define	FIELD	266
-#define	LET	267
-#define	IN	268
-#define	SHLTOK	269
-#define	SRATOK	270
-#define	SRLTOK	271
-#define	INTVAL	272
-#define	ID	273
-#define	VARNAME	274
-#define	STRVAL	275
-#define	CODEFRAGMENT	276
 
-#line 14 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     INT = 258,
+     BIT = 259,
+     STRING = 260,
+     BITS = 261,
+     LIST = 262,
+     CODE = 263,
+     DAG = 264,
+     CLASS = 265,
+     DEF = 266,
+     FIELD = 267,
+     LET = 268,
+     IN = 269,
+     SHLTOK = 270,
+     SRATOK = 271,
+     SRLTOK = 272,
+     INTVAL = 273,
+     ID = 274,
+     VARNAME = 275,
+     STRVAL = 276,
+     CODEFRAGMENT = 277
+   };
+#endif
+#define INT 258
+#define BIT 259
+#define STRING 260
+#define BITS 261
+#define LIST 262
+#define CODE 263
+#define DAG 264
+#define CLASS 265
+#define DEF 266
+#define FIELD 267
+#define LET 268
+#define IN 269
+#define SHLTOK 270
+#define SRATOK 271
+#define SRLTOK 272
+#define INTVAL 273
+#define ID 274
+#define VARNAME 275
+#define STRVAL 276
+#define CODEFRAGMENT 277
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 14 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
 
 #include "Record.h"
 #include "llvm/ADT/StringExtras.h"
@@ -207,8 +284,23 @@
 using namespace llvm;
 
 
-#line 189 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-typedef union {
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 189 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+typedef union YYSTYPE {
   std::string*                StrVal;
   int                         IntVal;
   llvm::RecTy*                Ty;
@@ -220,541 +312,835 @@
   std::vector<SubClassRefTy>* SubClassList;
   std::vector<std::pair<llvm::Init*, std::string> >* DagValueList;
 } YYSTYPE;
-#include <stdio.h>
+/* Line 191 of yacc.c.  */
+#line 316 "FileParser.tab.c"
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 214 of yacc.c.  */
+#line 328 "FileParser.tab.c"
+
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
+# else
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
+#    define YYSTACK_ALLOC alloca
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+# else
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
+#  endif
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
+# endif
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+
+
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+	 || (YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  short yyss;
+  YYSTYPE yyvs;
+  };
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  register YYSIZE_T yyi;		\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (0)
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (0)
 
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
 #endif
 
+#if defined (__STDC__) || defined (__cplusplus)
+   typedef signed char yysigned_char;
+#else
+   typedef short yysigned_char;
+#endif
 
-
-#define	YYFINAL		160
-#define	YYFLAG		-32768
-#define	YYNTBASE	38
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 276 ? yytranslate[x] : 78)
-
-static const char yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,    32,
-    33,     2,     2,    34,    36,    31,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,    35,    37,    23,
-    25,    24,    26,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-    29,     2,    30,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    27,     2,    28,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
-     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-    17,    18,    19,    20,    21,    22
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL  20
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   163
+
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS  38
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS  41
+/* YYNRULES -- Number of rules. */
+#define YYNRULES  89
+/* YYNRULES -- Number of states. */
+#define YYNSTATES  160
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   277
+
+#define YYTRANSLATE(YYX) 						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const unsigned char yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+      32,    33,     2,     2,    34,    36,    31,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    35,    37,
+      23,    25,    24,    26,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    29,     2,    30,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    27,     2,    28,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22
 };
 
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     2,     4,     6,    11,    13,    18,    20,    22,    24,
-    25,    27,    28,    31,    33,    35,    37,    39,    43,    48,
-    50,    55,    59,    63,    68,    73,    80,    87,    94,    95,
-    98,   101,   106,   107,   109,   111,   115,   118,   122,   128,
-   133,   135,   136,   140,   141,   143,   145,   149,   154,   157,
-   164,   165,   168,   170,   174,   176,   181,   183,   187,   188,
-   191,   193,   197,   201,   202,   204,   206,   207,   209,   211,
-   213,   214,   218,   219,   220,   227,   231,   233,   235,   240,
-   242,   246,   247,   252,   257,   260,   262,   265
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const unsigned short yyprhs[] =
+{
+       0,     0,     3,     5,     7,     9,    14,    16,    21,    23,
+      25,    27,    28,    30,    31,    34,    36,    38,    40,    42,
+      46,    51,    53,    58,    62,    66,    71,    76,    83,    90,
+      97,    98,   101,   104,   109,   110,   112,   114,   118,   121,
+     125,   131,   136,   138,   139,   143,   144,   146,   148,   152,
+     157,   160,   167,   168,   171,   173,   177,   179,   184,   186,
+     190,   191,   194,   196,   200,   204,   205,   207,   209,   210,
+     212,   214,   216,   217,   221,   222,   223,   230,   234,   236,
+     238,   243,   245,   249,   250,   255,   260,   263,   265,   268
 };
 
-static const short yyrhs[] = {    19,
-     0,     5,     0,     4,     0,     6,    23,    18,    24,     0,
-     3,     0,     7,    23,    39,    24,     0,     8,     0,     9,
-     0,    38,     0,     0,    12,     0,     0,    25,    42,     0,
-    18,     0,    21,     0,    22,     0,    26,     0,    27,    49,
-    28,     0,    19,    23,    50,    24,     0,    19,     0,    42,
-    27,    47,    28,     0,    29,    49,    30,     0,    42,    31,
-    19,     0,    32,    19,    45,    33,     0,    42,    29,    47,
-    30,     0,    15,    32,    42,    34,    42,    33,     0,    16,
-    32,    42,    34,    42,    33,     0,    17,    32,    42,    34,
-    42,    33,     0,     0,    35,    20,     0,    42,    43,     0,
-    44,    34,    42,    43,     0,     0,    44,     0,    18,     0,
-    18,    36,    18,     0,    18,    18,     0,    46,    34,    18,
-     0,    46,    34,    18,    36,    18,     0,    46,    34,    18,
-    18,     0,    46,     0,     0,    27,    47,    28,     0,     0,
-    50,     0,    42,     0,    50,    34,    42,     0,    40,    39,
-    19,    41,     0,    51,    37,     0,    13,    19,    48,    25,
-    42,    37,     0,     0,    53,    52,     0,    37,     0,    27,
-    53,    28,     0,    38,     0,    38,    23,    50,    24,     0,
-    55,     0,    56,    34,    55,     0,     0,    35,    56,     0,
-    51,     0,    58,    34,    51,     0,    23,    58,    24,     0,
-     0,    59,     0,    19,     0,     0,    61,     0,    62,     0,
-    62,     0,     0,    57,    66,    54,     0,     0,     0,    10,
-    63,    68,    60,    69,    65,     0,    11,    64,    65,     0,
-    67,     0,    70,     0,    19,    48,    25,    42,     0,    72,
-     0,    73,    34,    72,     0,     0,    13,    75,    73,    14,
-     0,    74,    27,    76,    28,     0,    74,    71,     0,    71,
-     0,    76,    71,     0,    76,     0
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const yysigned_char yyrhs[] =
+{
+      78,     0,    -1,    19,    -1,     5,    -1,     4,    -1,     6,
+      23,    18,    24,    -1,     3,    -1,     7,    23,    40,    24,
+      -1,     8,    -1,     9,    -1,    39,    -1,    -1,    12,    -1,
+      -1,    25,    43,    -1,    18,    -1,    21,    -1,    22,    -1,
+      26,    -1,    27,    50,    28,    -1,    19,    23,    51,    24,
+      -1,    19,    -1,    43,    27,    48,    28,    -1,    29,    50,
+      30,    -1,    43,    31,    19,    -1,    32,    19,    46,    33,
+      -1,    43,    29,    48,    30,    -1,    15,    32,    43,    34,
+      43,    33,    -1,    16,    32,    43,    34,    43,    33,    -1,
+      17,    32,    43,    34,    43,    33,    -1,    -1,    35,    20,
+      -1,    43,    44,    -1,    45,    34,    43,    44,    -1,    -1,
+      45,    -1,    18,    -1,    18,    36,    18,    -1,    18,    18,
+      -1,    47,    34,    18,    -1,    47,    34,    18,    36,    18,
+      -1,    47,    34,    18,    18,    -1,    47,    -1,    -1,    27,
+      48,    28,    -1,    -1,    51,    -1,    43,    -1,    51,    34,
+      43,    -1,    41,    40,    19,    42,    -1,    52,    37,    -1,
+      13,    19,    49,    25,    43,    37,    -1,    -1,    54,    53,
+      -1,    37,    -1,    27,    54,    28,    -1,    39,    -1,    39,
+      23,    51,    24,    -1,    56,    -1,    57,    34,    56,    -1,
+      -1,    35,    57,    -1,    52,    -1,    59,    34,    52,    -1,
+      23,    59,    24,    -1,    -1,    60,    -1,    19,    -1,    -1,
+      62,    -1,    63,    -1,    63,    -1,    -1,    58,    67,    55,
+      -1,    -1,    -1,    10,    64,    69,    61,    70,    66,    -1,
+      11,    65,    66,    -1,    68,    -1,    71,    -1,    19,    49,
+      25,    43,    -1,    73,    -1,    74,    34,    73,    -1,    -1,
+      13,    76,    74,    14,    -1,    75,    27,    77,    28,    -1,
+      75,    72,    -1,    72,    -1,    77,    72,    -1,    77,    -1
 };
 
-#endif
-
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-   223,   234,   236,   238,   240,   242,   244,   246,   248,   252,
-   252,   254,   254,   256,   258,   261,   264,   266,   279,   307,
-   322,   329,   332,   339,   347,   355,   361,   367,   375,   378,
-   382,   387,   393,   396,   399,   402,   415,   429,   431,   444,
-   460,   462,   462,   466,   468,   472,   475,   479,   489,   491,
-   497,   497,   498,   498,   500,   502,   506,   511,   516,   519,
-   523,   526,   531,   532,   532,   534,   534,   536,   543,   561,
-   573,   587,   592,   594,   596,   600,   609,   609,   611,   616,
-   616,   619,   619,   622,   625,   629,   629,   631
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const unsigned short yyrline[] =
+{
+       0,   223,   223,   234,   236,   238,   240,   242,   244,   246,
+     248,   252,   252,   254,   254,   256,   258,   261,   264,   266,
+     279,   307,   322,   329,   332,   339,   347,   355,   361,   367,
+     375,   378,   382,   387,   393,   396,   399,   402,   415,   429,
+     431,   444,   460,   462,   462,   466,   468,   472,   475,   479,
+     489,   491,   497,   497,   498,   498,   500,   502,   506,   511,
+     516,   519,   523,   526,   531,   532,   532,   534,   534,   536,
+     543,   561,   573,   573,   592,   594,   592,   600,   609,   609,
+     611,   616,   616,   619,   619,   622,   625,   629,   629,   631
 };
 #endif
 
-
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
-
-static const char * const yytname[] = {   "$","error","$undefined.","INT","BIT",
-"STRING","BITS","LIST","CODE","DAG","CLASS","DEF","FIELD","LET","IN","SHLTOK",
-"SRATOK","SRLTOK","INTVAL","ID","VARNAME","STRVAL","CODEFRAGMENT","'<'","'>'",
-"'='","'?'","'{'","'}'","'['","']'","'.'","'('","')'","','","':'","'-'","';'",
-"ClassID","Type","OptPrefix","OptValue","Value","OptVarName","DagArgListNE",
-"DagArgList","RBitList","BitList","OptBitList","ValueList","ValueListNE","Declaration",
-"BodyItem","BodyList","Body","SubClassRef","ClassListNE","ClassList","DeclListNE",
-"TemplateArgList","OptTemplateArgList","OptID","ObjectName","ClassName","DefName",
-"ObjectBody","@1","ClassInst","@2","@3","DefInst","Object","LETItem","LETList",
-"LETCommand","@4","ObjectList","File", NULL
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "INT", "BIT", "STRING", "BITS", "LIST", 
+  "CODE", "DAG", "CLASS", "DEF", "FIELD", "LET", "IN", "SHLTOK", "SRATOK", 
+  "SRLTOK", "INTVAL", "ID", "VARNAME", "STRVAL", "CODEFRAGMENT", "'<'", 
+  "'>'", "'='", "'?'", "'{'", "'}'", "'['", "']'", "'.'", "'('", "')'", 
+  "','", "':'", "'-'", "';'", "$accept", "ClassID", "Type", "OptPrefix", 
+  "OptValue", "Value", "OptVarName", "DagArgListNE", "DagArgList", 
+  "RBitList", "BitList", "OptBitList", "ValueList", "ValueListNE", 
+  "Declaration", "BodyItem", "BodyList", "Body", "SubClassRef", 
+  "ClassListNE", "ClassList", "DeclListNE", "TemplateArgList", 
+  "OptTemplateArgList", "OptID", "ObjectName", "ClassName", "DefName", 
+  "ObjectBody", "@1", "ClassInst", "@2", "@3", "DefInst", "Object", 
+  "LETItem", "LETList", "LETCommand", "@4", "ObjectList", "File", 0
 };
 #endif
 
-static const short yyr1[] = {     0,
-    38,    39,    39,    39,    39,    39,    39,    39,    39,    40,
-    40,    41,    41,    42,    42,    42,    42,    42,    42,    42,
-    42,    42,    42,    42,    42,    42,    42,    42,    43,    43,
-    44,    44,    45,    45,    46,    46,    46,    46,    46,    46,
-    47,    48,    48,    49,    49,    50,    50,    51,    52,    52,
-    53,    53,    54,    54,    55,    55,    56,    56,    57,    57,
-    58,    58,    59,    60,    60,    61,    61,    62,    63,    64,
-    66,    65,    68,    69,    67,    70,    71,    71,    72,    73,
-    73,    75,    74,    71,    71,    76,    76,    77
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const unsigned short yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,    60,    62,    61,    63,   123,   125,    91,
+      93,    46,    40,    41,    44,    58,    45,    59
 };
+# endif
 
-static const short yyr2[] = {     0,
-     1,     1,     1,     4,     1,     4,     1,     1,     1,     0,
-     1,     0,     2,     1,     1,     1,     1,     3,     4,     1,
-     4,     3,     3,     4,     4,     6,     6,     6,     0,     2,
-     2,     4,     0,     1,     1,     3,     2,     3,     5,     4,
-     1,     0,     3,     0,     1,     1,     3,     4,     2,     6,
-     0,     2,     1,     3,     1,     4,     1,     3,     0,     2,
-     1,     3,     3,     0,     1,     1,     0,     1,     1,     1,
-     0,     3,     0,     0,     6,     3,     1,     1,     4,     1,
-     3,     0,     4,     4,     2,     1,     2,     1
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const unsigned char yyr1[] =
+{
+       0,    38,    39,    40,    40,    40,    40,    40,    40,    40,
+      40,    41,    41,    42,    42,    43,    43,    43,    43,    43,
+      43,    43,    43,    43,    43,    43,    43,    43,    43,    43,
+      44,    44,    45,    45,    46,    46,    47,    47,    47,    47,
+      47,    47,    48,    49,    49,    50,    50,    51,    51,    52,
+      53,    53,    54,    54,    55,    55,    56,    56,    57,    57,
+      58,    58,    59,    59,    60,    61,    61,    62,    62,    63,
+      64,    65,    67,    66,    69,    70,    68,    71,    72,    72,
+      73,    74,    74,    76,    75,    72,    72,    77,    77,    78
 };
 
-static const short yydefact[] = {     0,
-    67,    67,    82,    77,    78,    86,     0,    88,    66,    68,
-    69,    73,    70,    59,     0,     0,    85,    87,    64,     0,
-    71,    76,    42,    80,     0,     0,    10,    65,    74,     1,
-    55,    57,    60,     0,     0,     0,    83,     0,    84,    11,
-     0,    61,     0,    59,     0,     0,    51,    53,    72,    35,
-    41,     0,     0,    81,     5,     3,     2,     0,     0,     7,
-     8,     9,     0,    63,    10,    75,     0,     0,     0,    14,
-    20,    15,    16,    17,    44,    44,     0,    46,     0,    58,
-    10,    37,     0,     0,    43,    79,     0,     0,    12,    62,
-     0,     0,     0,     0,     0,    45,     0,    33,     0,     0,
-     0,    56,     0,     0,    54,     0,    52,    36,    38,     0,
-     0,     0,    48,     0,     0,     0,     0,    18,    22,    29,
-    34,     0,     0,     0,    23,    47,    42,    49,    40,     0,
-     4,     6,    13,     0,     0,     0,    19,     0,    31,     0,
-    24,    21,    25,     0,    39,     0,     0,     0,    30,    29,
-     0,    26,    27,    28,    32,     0,    50,     0,     0,     0
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const unsigned char yyr2[] =
+{
+       0,     2,     1,     1,     1,     4,     1,     4,     1,     1,
+       1,     0,     1,     0,     2,     1,     1,     1,     1,     3,
+       4,     1,     4,     3,     3,     4,     4,     6,     6,     6,
+       0,     2,     2,     4,     0,     1,     1,     3,     2,     3,
+       5,     4,     1,     0,     3,     0,     1,     1,     3,     4,
+       2,     6,     0,     2,     1,     3,     1,     4,     1,     3,
+       0,     2,     1,     3,     3,     0,     1,     1,     0,     1,
+       1,     1,     0,     3,     0,     0,     6,     3,     1,     1,
+       4,     1,     3,     0,     4,     4,     2,     1,     2,     1
 };
 
-static const short yydefgoto[] = {    31,
-    63,    41,   113,    78,   139,   121,   122,    51,    52,    36,
-    95,    96,    42,   107,    81,    49,    32,    33,    21,    43,
-    28,    29,    10,    11,    12,    14,    22,    34,     4,    19,
-    44,     5,     6,    24,    25,     7,    15,     8,   158
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const unsigned char yydefact[] =
+{
+       0,    68,    68,    83,    78,    79,    87,     0,    89,     0,
+      67,    69,    70,    74,    71,    60,     0,     0,    86,    88,
+       1,    65,     0,    72,    77,    43,    81,     0,     0,    11,
+      66,    75,     2,    56,    58,    61,     0,     0,     0,    84,
+       0,    85,    12,     0,    62,     0,    60,     0,     0,    52,
+      54,    73,    36,    42,     0,     0,    82,     6,     4,     3,
+       0,     0,     8,     9,    10,     0,    64,    11,    76,     0,
+       0,     0,    15,    21,    16,    17,    18,    45,    45,     0,
+      47,     0,    59,    11,    38,     0,     0,    44,    80,     0,
+       0,    13,    63,     0,     0,     0,     0,     0,    46,     0,
+      34,     0,     0,     0,    57,     0,     0,    55,     0,    53,
+      37,    39,     0,     0,     0,    49,     0,     0,     0,     0,
+      19,    23,    30,    35,     0,     0,     0,    24,    48,    43,
+      50,    41,     0,     5,     7,    14,     0,     0,     0,    20,
+       0,    32,     0,    25,    22,    26,     0,    40,     0,     0,
+       0,    31,    30,     0,    27,    28,    29,    33,     0,    51
 };
 
-static const short yypact[] = {    56,
-    -4,    -4,-32768,-32768,-32768,-32768,     1,    56,-32768,-32768,
--32768,-32768,-32768,     8,     2,    56,-32768,-32768,    23,    30,
--32768,-32768,    50,-32768,   -11,    -3,    66,-32768,-32768,-32768,
-    62,-32768,    55,    34,    61,    68,-32768,     2,-32768,-32768,
-    49,-32768,    -8,     8,    15,    30,-32768,-32768,-32768,   -14,
-    82,    67,    15,-32768,-32768,-32768,-32768,    95,    97,-32768,
--32768,-32768,    77,-32768,    66,-32768,    89,    90,    91,-32768,
-   101,-32768,-32768,-32768,    15,    15,   106,    73,    39,-32768,
-     7,-32768,   108,   109,-32768,    73,   110,    49,   104,-32768,
-    15,    15,    15,    15,   102,    98,   103,    15,    61,    61,
-   112,-32768,    15,   115,-32768,    99,-32768,-32768,    -9,   111,
-   113,    15,-32768,    57,    63,    72,    41,-32768,-32768,    45,
-   105,   107,   114,   116,-32768,    73,    50,-32768,-32768,   120,
--32768,-32768,    73,    15,    15,    15,-32768,   121,-32768,    15,
--32768,-32768,-32768,   118,-32768,    78,    81,    86,-32768,    45,
-    15,-32768,-32768,-32768,-32768,    33,-32768,   144,   145,-32768
+/* YYDEFGOTO[NTERM-NUM]. */
+static const short yydefgoto[] =
+{
+      -1,    33,    65,    43,   115,    80,   141,   123,   124,    53,
+      54,    38,    97,    98,    44,   109,    83,    51,    34,    35,
+      23,    45,    30,    31,    11,    12,    13,    15,    24,    36,
+       4,    21,    46,     5,     6,    26,    27,     7,    16,     8,
+       9
 };
 
-static const short yypgoto[] = {   -40,
-    59,-32768,-32768,   -53,    -1,-32768,-32768,-32768,   -82,    21,
-    74,   -43,   -52,-32768,-32768,-32768,   117,-32768,-32768,-32768,
--32768,-32768,-32768,   149,-32768,-32768,   122,-32768,-32768,-32768,
--32768,-32768,    -2,   119,-32768,-32768,-32768,   136,-32768
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -82
+static const yysigned_char yypact[] =
+{
+     114,   -12,   -12,   -82,   -82,   -82,   -82,     4,   114,    16,
+     -82,   -82,   -82,   -82,   -82,    -3,    10,   114,   -82,   -82,
+     -82,    12,    17,   -82,   -82,    14,   -82,    -9,    -2,    35,
+     -82,   -82,   -82,    26,   -82,    28,   -14,    46,    42,   -82,
+      10,   -82,   -82,    69,   -82,     3,    -3,    39,    17,   -82,
+     -82,   -82,    -8,    36,    41,    39,   -82,   -82,   -82,   -82,
+      56,    57,   -82,   -82,   -82,    66,   -82,    35,   -82,    52,
+      54,    58,   -82,    72,   -82,   -82,   -82,    39,    39,    87,
+      91,     9,   -82,     6,   -82,   108,   110,   -82,    91,   111,
+      69,   105,   -82,    39,    39,    39,    39,   103,    98,   104,
+      39,    46,    46,   116,   -82,    39,   117,   -82,    96,   -82,
+     -82,    -6,   113,   115,    39,   -82,    65,    73,    74,    29,
+     -82,   -82,    62,   106,   109,   118,   119,   -82,    91,    14,
+     -82,   -82,   120,   -82,   -82,    91,    39,    39,    39,   -82,
+     121,   -82,    39,   -82,   -82,   -82,   122,   -82,    82,    83,
+      90,   -82,    62,    39,   -82,   -82,   -82,   -82,    15,   -82
 };
 
-
-#define	YYLAST		166
-
-
-static const short yytable[] = {    86,
-    62,    79,    37,    82,    17,    18,     1,     2,   129,     3,
-     1,     2,    90,     3,     9,    64,   123,   124,    40,   104,
-    23,    83,    38,    18,    39,    65,   130,    16,   106,    67,
-    68,    69,    70,    71,   105,    72,    73,   114,   115,   116,
-    74,    75,    20,    76,   120,    27,    77,    62,    30,   126,
-   117,    55,    56,    57,    58,    59,    60,    61,   133,    99,
-    47,   100,   102,   101,   137,     1,     2,    30,     3,   157,
-    48,    99,   103,   100,   103,   101,    35,    40,    50,   138,
-   146,   147,   148,    99,    45,   100,   150,   101,    46,    99,
-   134,   100,    53,   101,    85,    89,   135,   156,    99,    99,
-   100,   100,   101,   101,    99,   136,   100,    99,   101,   100,
-   152,   101,    99,   153,   100,    84,   101,    87,   154,    88,
-    91,    92,    93,    94,    98,   108,   109,   110,   112,   118,
-   125,   103,   119,   127,   131,   128,   132,   145,   140,   141,
-   149,   142,   151,   159,   160,   143,   111,   144,   155,    97,
-    13,    26,     0,     0,     0,     0,    54,     0,     0,     0,
-     0,     0,    80,     0,     0,    66
+/* YYPGOTO[NTERM-NUM].  */
+static const short yypgoto[] =
+{
+     -82,   -42,    53,   -82,   -82,   -55,    -7,   -82,   -82,   -82,
+     -81,    19,    75,   -45,   -61,   -82,   -82,   -82,   102,   -82,
+     -82,   -82,   -82,   -82,   -82,   142,   -82,   -82,   112,   -82,
+     -82,   -82,   -82,   -82,    -4,   123,   -82,   -82,   -82,   134,
+     -82
 };
 
-static const short yycheck[] = {    53,
-    41,    45,    14,    18,     7,     8,    10,    11,    18,    13,
-    10,    11,    65,    13,    19,    24,    99,   100,    12,    13,
-    19,    36,    34,    26,    28,    34,    36,    27,    81,    15,
-    16,    17,    18,    19,    28,    21,    22,    91,    92,    93,
-    26,    27,    35,    29,    98,    23,    32,    88,    19,   103,
-    94,     3,     4,     5,     6,     7,     8,     9,   112,    27,
-    27,    29,    24,    31,    24,    10,    11,    19,    13,    37,
-    37,    27,    34,    29,    34,    31,    27,    12,    18,    35,
-   134,   135,   136,    27,    23,    29,   140,    31,    34,    27,
-    34,    29,    25,    31,    28,    19,    34,   151,    27,    27,
-    29,    29,    31,    31,    27,    34,    29,    27,    31,    29,
-    33,    31,    27,    33,    29,    34,    31,    23,    33,    23,
-    32,    32,    32,    23,    19,    18,    18,    18,    25,    28,
-    19,    34,    30,    19,    24,    37,    24,    18,    34,    33,
-    20,    28,    25,     0,     0,    30,    88,   127,   150,    76,
-     2,    16,    -1,    -1,    -1,    -1,    38,    -1,    -1,    -1,
-    -1,    -1,    46,    -1,    -1,    44
+/* 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 -1
+static const unsigned char yytable[] =
+{
+      88,    64,    81,    18,    19,    39,    92,    10,     1,     2,
+      84,     3,   131,    49,     1,     2,    20,     3,    42,   106,
+     125,   126,   108,    50,    19,    40,    41,    66,    85,    25,
+     132,    17,    22,   104,   107,    29,    32,    67,   116,   117,
+     118,    37,   101,   105,   102,   122,   103,    42,    64,    47,
+     128,   119,   159,   139,    69,    70,    71,    72,    73,   135,
+      74,    75,    48,   105,    52,    76,    77,    55,    78,    87,
+      86,    79,    57,    58,    59,    60,    61,    62,    63,    89,
+      90,   148,   149,   150,    93,    91,    94,   152,    32,   101,
+      95,   102,   101,   103,   102,    96,   103,   140,   158,   136,
+     101,   101,   102,   102,   103,   103,   100,   137,   138,   101,
+     101,   102,   102,   103,   103,   154,   155,   101,   101,   102,
+     102,   103,   103,   156,     1,     2,   110,     3,   111,   112,
+     114,   120,   105,   130,   121,   127,   129,   133,   147,   134,
+     142,   151,   143,   113,    14,   157,   144,   153,   146,   145,
+      82,    28,     0,    99,     0,     0,     0,     0,    68,     0,
+       0,     0,     0,    56
 };
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison.simple"
-/* This file comes from bison-1.28.  */
 
-/* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+static const short yycheck[] =
+{
+      55,    43,    47,     7,     8,    14,    67,    19,    10,    11,
+      18,    13,    18,    27,    10,    11,     0,    13,    12,    13,
+     101,   102,    83,    37,    28,    34,    28,    24,    36,    19,
+      36,    27,    35,    24,    28,    23,    19,    34,    93,    94,
+      95,    27,    27,    34,    29,   100,    31,    12,    90,    23,
+     105,    96,    37,    24,    15,    16,    17,    18,    19,   114,
+      21,    22,    34,    34,    18,    26,    27,    25,    29,    28,
+      34,    32,     3,     4,     5,     6,     7,     8,     9,    23,
+      23,   136,   137,   138,    32,    19,    32,   142,    19,    27,
+      32,    29,    27,    31,    29,    23,    31,    35,   153,    34,
+      27,    27,    29,    29,    31,    31,    19,    34,    34,    27,
+      27,    29,    29,    31,    31,    33,    33,    27,    27,    29,
+      29,    31,    31,    33,    10,    11,    18,    13,    18,    18,
+      25,    28,    34,    37,    30,    19,    19,    24,    18,    24,
+      34,    20,    33,    90,     2,   152,    28,    25,   129,    30,
+      48,    17,    -1,    78,    -1,    -1,    -1,    -1,    46,    -1,
+      -1,    -1,    -1,    40
+};
 
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
-
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-	 instead, just don't use alloca.  */
-#include <malloc.h>
-#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible at ilog.fr says this works for HPUX 9.05 and up,
-		 and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
-#endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const unsigned char yystos[] =
+{
+       0,    10,    11,    13,    68,    71,    72,    75,    77,    78,
+      19,    62,    63,    64,    63,    65,    76,    27,    72,    72,
+       0,    69,    35,    58,    66,    19,    73,    74,    77,    23,
+      60,    61,    19,    39,    56,    57,    67,    27,    49,    14,
+      34,    28,    12,    41,    52,    59,    70,    23,    34,    27,
+      37,    55,    18,    47,    48,    25,    73,     3,     4,     5,
+       6,     7,     8,     9,    39,    40,    24,    34,    66,    15,
+      16,    17,    18,    19,    21,    22,    26,    27,    29,    32,
+      43,    51,    56,    54,    18,    36,    34,    28,    43,    23,
+      23,    19,    52,    32,    32,    32,    23,    50,    51,    50,
+      19,    27,    29,    31,    24,    34,    13,    28,    52,    53,
+      18,    18,    18,    40,    25,    42,    43,    43,    43,    51,
+      28,    30,    43,    45,    46,    48,    48,    19,    43,    19,
+      37,    18,    36,    24,    24,    43,    34,    34,    34,    24,
+      35,    44,    34,    33,    28,    30,    49,    18,    43,    43,
+      43,    20,    43,    25,    33,    33,    33,    44,    43,    37
+};
 
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# endif
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
 #endif
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
 
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
+#define YYEMPTY		(-2)
 #define YYEOF		0
+
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
+#define YYABORT		goto yyabortlab
 #define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
+
 #define YYFAIL		goto yyerrlab
+
 #define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
+
+#define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
-      yychar1 = YYTRANSLATE (yychar);				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
       YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
+    { 								\
+      yyerror ("syntax error: cannot back up");\
+      YYERROR;							\
+    }								\
 while (0)
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
-#ifndef YYPURE
-#define YYLEX		yylex()
-#endif
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+   are run).  */
 
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)         \
+  Current.first_line   = Rhs[1].first_line;      \
+  Current.first_column = Rhs[1].first_column;    \
+  Current.last_line    = Rhs[N].last_line;       \
+  Current.last_column  = Rhs[N].last_column;
 #endif
-#else /* not YYLSP_NEEDED */
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
 #ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
+# define YYLEX yylex (YYLEX_PARAM)
 #else
-#define YYLEX		yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
+# define YYLEX yylex ()
 #endif
 
-/* If nonreentrant, generate the variables here */
+/* Enable debugging if requested.  */
+#if YYDEBUG
 
-#ifndef YYPURE
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (0)
+
+# define YYDSYMPRINT(Args)			\
+do {						\
+  if (yydebug)					\
+    yysymprint Args;				\
+} while (0)
+
+# define YYDSYMPRINTF(Title, Token, Value, Location)		\
+do {								\
+  if (yydebug)							\
+    {								\
+      YYFPRINTF (stderr, "%s ", Title);				\
+      yysymprint (stderr, 					\
+                  Token, Value);	\
+      YYFPRINTF (stderr, "\n");					\
+    }								\
+} while (0)
 
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (cinluded).                                                   |
+`------------------------------------------------------------------*/
 
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_stack_print (short *bottom, short *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    short *bottom;
+    short *top;
 #endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (/* Nothing. */; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
 
-int yynerrs;			/*  number of parse errors so far       */
-#endif  /* not YYPURE */
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (0)
 
-#if YYDEBUG != 0
-int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yy_reduce_print (int yyrule)
+#else
+static void
+yy_reduce_print (yyrule)
+    int yyrule;
 #endif
+{
+  int yyi;
+  unsigned int yylineno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
+             yyrule - 1, yylineno);
+  /* Print the symbols being reduced, and their result.  */
+  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
+    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
+  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+}
 
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (Rule);		\
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YYDSYMPRINT(Args)
+# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
 
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
+# define YYINITDEPTH 200
 #endif
 
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
 
 #if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
+# undef YYMAXDEPTH
 #endif
 
 #ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
+# define YYMAXDEPTH 10000
 #endif
+
 
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
-
-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
-#else				/* not GNU C or C++ */
-#ifndef __cplusplus
 
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined (__GLIBC__) && defined (_STRING_H)
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+#   if defined (__STDC__) || defined (__cplusplus)
+yystrlen (const char *yystr)
+#   else
+yystrlen (yystr)
+     const char *yystr;
+#   endif
+{
+  register const char *yys = yystr;
+
+  while (*yys++ != '\0')
+    continue;
 
-  while (i-- > 0)
-    *t++ = *f++;
+  return yys - yystr - 1;
 }
+#  endif
+# endif
 
-#else /* __cplusplus */
+# ifndef yystpcpy
+#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+#   if defined (__STDC__) || defined (__cplusplus)
+yystpcpy (char *yydest, const char *yysrc)
+#   else
+yystpcpy (yydest, yysrc)
+     char *yydest;
+     const char *yysrc;
+#   endif
+{
+  register char *yyd = yydest;
+  register const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+#endif /* !YYERROR_VERBOSE */
+
+
 
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
+#if YYDEBUG
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
+#else
 static void
-__yy_memcpy (char *to, char *from, unsigned int count)
+yysymprint (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE *yyvaluep;
+#endif
 {
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+
+  if (yytype < YYNTOKENS)
+    {
+      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+    }
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-  while (i-- > 0)
-    *t++ = *f++;
+  switch (yytype)
+    {
+      default:
+        break;
+    }
+  YYFPRINTF (yyoutput, ")");
 }
 
+#endif /* ! YYDEBUG */
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+#if defined (__STDC__) || defined (__cplusplus)
+static void
+yydestruct (int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yytype, yyvaluep)
+    int yytype;
+    YYSTYPE *yyvaluep;
 #endif
-#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvaluep;
+
+  switch (yytype)
+    {
+
+      default:
+        break;
+    }
+}
 
-#line 217 "/usr/share/bison.simple"
 
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
+/* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM);
+# else
+int yyparse ();
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
 
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
 #ifdef YYPARSE_PARAM
-int yyparse (void *);
+# if defined (__STDC__) || defined (__cplusplus)
+int yyparse (void *YYPARSE_PARAM)
+# else
+int yyparse (YYPARSE_PARAM)
+  void *YYPARSE_PARAM;
+# endif
+#else /* ! YYPARSE_PARAM */
+#if defined (__STDC__) || defined (__cplusplus)
+int
+yyparse (void)
 #else
-int yyparse (void);
+int
+yyparse ()
+
 #endif
 #endif
-
-int
-yyparse(YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
 {
+  
   register int yystate;
   register int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
   register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
 
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  register YYSTYPE *yyvsp;
 
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
 
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
 
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
 #define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
 
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
+  YYSIZE_T yystacksize = YYINITDEPTH;
 
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
 
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
 
+  /* When reducing, the number of symbols on the RHS of the reduced
+     rule.  */
   int yylen;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
+  YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
@@ -766,110 +1152,96 @@
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
-  yyssp = yyss - 1;
+  yyssp = yyss;
   yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
 
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
+  goto yysetstate;
 
-  *++yyssp = yystate;
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed. so pushing a state here evens the stacks.
+     */
+  yyssp++;
 
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
+ yysetstate:
+  *yyssp = yystate;
 
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
       /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
+      YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
+      {
+	/* Give user a chance to reallocate the stack. Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	short *yyss1 = yyss;
+
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow ("parser stack overflow",
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
 
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
+		    &yystacksize);
+
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
 #else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyoverflowlab;
+# else
       /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  if (yyfree_stacks)
-	    {
-	      free (yyss);
-	      free (yyvs);
-#ifdef YYLSP_NEEDED
-	      free (yyls);
-#endif
-	    }
-	  return 2;
-	}
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyoverflowlab;
       yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
+      if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-		   size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-		   size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-		   size * (unsigned int) sizeof (*yylsp));
-#endif
+
+      {
+	short *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyoverflowlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+
+#  undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
 #endif /* no yyoverflow */
 
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
 
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
 
-      if (yyssp >= yyss + yystacksize - 1)
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
 	YYABORT;
     }
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
   goto yybackup;
- yybackup:
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
 
 /* Do appropriate processing given the current state.  */
 /* Read a lookahead token if we need one and don't already have one.  */
@@ -878,236 +1250,217 @@
   /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
-  if (yyn == YYFLAG)
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
 
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
+      YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
+  if (yychar <= YYEOF)
     {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
-      if (yydebug)
-	{
-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise meaning
-	     of a token, for further debugging info.  */
-#ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-#endif
-	  fprintf (stderr, ")\n");
-	}
-#endif
+      yytoken = YYTRANSLATE (yychar);
+      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
     }
 
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
     goto yydefault;
-
   yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
+  if (yyn <= 0)
     {
-      if (yyn == YYFLAG)
+      if (yyn == 0 || yyn == YYTABLE_NINF)
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
-  else if (yyn == 0)
-    goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
   /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
+  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
 
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
 
   yystate = yyn;
   goto yynewstate;
 
-/* Do the default action for the current state.  */
-yydefault:
 
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
   yyn = yydefact[yystate];
   if (yyn == 0)
     goto yyerrlab;
+  goto yyreduce;
+
 
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
 yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
   yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      int i;
-
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
 
-      /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
 
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
 
-  switch (yyn) {
 
-case 1:
-#line 223 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 223 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.Rec = Records.getClass(*yyvsp[0].StrVal);
     if (yyval.Rec == 0) {
       err() << "Couldn't find class '" << *yyvsp[0].StrVal << "'!\n";
       exit(1);
     }
     delete yyvsp[0].StrVal;
-  ;
-    break;}
-case 2:
-#line 234 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{                       // string type
+  ;}
+    break;
+
+  case 3:
+#line 234 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {                       // string type
     yyval.Ty = new StringRecTy();
-  ;
-    break;}
-case 3:
-#line 236 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{                           // bit type
+  ;}
+    break;
+
+  case 4:
+#line 236 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {                           // bit type
     yyval.Ty = new BitRecTy();
-  ;
-    break;}
-case 4:
-#line 238 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{           // bits<x> type
+  ;}
+    break;
+
+  case 5:
+#line 238 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {           // bits<x> type
     yyval.Ty = new BitsRecTy(yyvsp[-1].IntVal);
-  ;
-    break;}
-case 5:
-#line 240 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{                           // int type
+  ;}
+    break;
+
+  case 6:
+#line 240 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {                           // int type
     yyval.Ty = new IntRecTy();
-  ;
-    break;}
-case 6:
-#line 242 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{          // list<x> type
+  ;}
+    break;
+
+  case 7:
+#line 242 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {          // list<x> type
     yyval.Ty = new ListRecTy(yyvsp[-1].Ty);
-  ;
-    break;}
-case 7:
-#line 244 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{                          // code type
+  ;}
+    break;
+
+  case 8:
+#line 244 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {                          // code type
     yyval.Ty = new CodeRecTy();
-  ;
-    break;}
-case 8:
-#line 246 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{                           // dag type
+  ;}
+    break;
+
+  case 9:
+#line 246 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {                           // dag type
     yyval.Ty = new DagRecTy();
-  ;
-    break;}
-case 9:
-#line 248 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{                       // Record Type
+  ;}
+    break;
+
+  case 10:
+#line 248 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {                       // Record Type
     yyval.Ty = new RecordRecTy(yyvsp[0].Rec);
-  ;
-    break;}
-case 10:
-#line 252 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{ yyval.IntVal = 0; ;
-    break;}
-case 11:
-#line 252 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{ yyval.IntVal = 1; ;
-    break;}
-case 12:
-#line 254 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{ yyval.Initializer = 0; ;
-    break;}
-case 13:
-#line 254 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{ yyval.Initializer = yyvsp[0].Initializer; ;
-    break;}
-case 14:
-#line 256 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 11:
+#line 252 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    { yyval.IntVal = 0; ;}
+    break;
+
+  case 12:
+#line 252 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    { yyval.IntVal = 1; ;}
+    break;
+
+  case 13:
+#line 254 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    { yyval.Initializer = 0; ;}
+    break;
+
+  case 14:
+#line 254 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    { yyval.Initializer = yyvsp[0].Initializer; ;}
+    break;
+
+  case 15:
+#line 256 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.Initializer = new IntInit(yyvsp[0].IntVal);
-  ;
-    break;}
-case 15:
-#line 258 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 16:
+#line 258 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.Initializer = new StringInit(*yyvsp[0].StrVal);
     delete yyvsp[0].StrVal;
-  ;
-    break;}
-case 16:
-#line 261 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 17:
+#line 261 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.Initializer = new CodeInit(*yyvsp[0].StrVal);
     delete yyvsp[0].StrVal;
-  ;
-    break;}
-case 17:
-#line 264 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 18:
+#line 264 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.Initializer = new UnsetInit();
-  ;
-    break;}
-case 18:
-#line 266 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 19:
+#line 266 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     BitsInit *Init = new BitsInit(yyvsp[-1].FieldList->size());
     for (unsigned i = 0, e = yyvsp[-1].FieldList->size(); i != e; ++i) {
       struct Init *Bit = (*yyvsp[-1].FieldList)[i]->convertInitializerTo(new BitRecTy());
@@ -1120,11 +1473,12 @@
     }
     yyval.Initializer = Init;
     delete yyvsp[-1].FieldList;
-  ;
-    break;}
-case 19:
-#line 279 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 20:
+#line 279 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     // This is a CLASS<initvalslist> expression.  This is supposed to synthesize
     // a new anonymous definition, deriving from CLASS<initvalslist> with no
     // body.
@@ -1152,11 +1506,12 @@
     
     // Restore the old CurRec
     CurRec = OldRec;
-  ;
-    break;}
-case 20:
-#line 307 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 21:
+#line 307 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     if (const RecordVal *RV = (CurRec ? CurRec->getValue(*yyvsp[0].StrVal) : 0)) {
       yyval.Initializer = new VarInit(*yyvsp[0].StrVal, RV->getType());
     } else if (CurRec && CurRec->isTemplateArg(CurRec->getName()+":"+*yyvsp[0].StrVal)) {
@@ -1171,40 +1526,44 @@
     }
     
     delete yyvsp[0].StrVal;
-  ;
-    break;}
-case 21:
-#line 322 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 22:
+#line 322 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.Initializer = yyvsp[-3].Initializer->convertInitializerBitRange(*yyvsp[-1].BitList);
     if (yyval.Initializer == 0) {
       err() << "Invalid bit range for value '" << *yyvsp[-3].Initializer << "'!\n";
       exit(1);
     }
     delete yyvsp[-1].BitList;
-  ;
-    break;}
-case 22:
-#line 329 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 23:
+#line 329 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.Initializer = new ListInit(*yyvsp[-1].FieldList);
     delete yyvsp[-1].FieldList;
-  ;
-    break;}
-case 23:
-#line 332 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 24:
+#line 332 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     if (!yyvsp[-2].Initializer->getFieldType(*yyvsp[0].StrVal)) {
       err() << "Cannot access field '" << *yyvsp[0].StrVal << "' of value '" << *yyvsp[-2].Initializer << "!\n";
       exit(1);
     }
     yyval.Initializer = new FieldInit(yyvsp[-2].Initializer, *yyvsp[0].StrVal);
     delete yyvsp[0].StrVal;
-  ;
-    break;}
-case 24:
-#line 339 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 25:
+#line 339 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     Record *D = Records.getDef(*yyvsp[-2].StrVal);
     if (D == 0) {
       err() << "Invalid def '" << *yyvsp[-2].StrVal << "'!\n";
@@ -1212,11 +1571,12 @@
     }
     yyval.Initializer = new DagInit(D, *yyvsp[-1].DagValueList);
     delete yyvsp[-2].StrVal; delete yyvsp[-1].DagValueList;
-  ;
-    break;}
-case 25:
-#line 347 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 26:
+#line 347 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     std::reverse(yyvsp[-1].BitList->begin(), yyvsp[-1].BitList->end());
     yyval.Initializer = yyvsp[-3].Initializer->convertInitListSlice(*yyvsp[-1].BitList);
     if (yyval.Initializer == 0) {
@@ -1224,86 +1584,97 @@
       exit(1);
     }
     delete yyvsp[-1].BitList;
-  ;
-    break;}
-case 26:
-#line 355 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 27:
+#line 355 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.Initializer = yyvsp[-3].Initializer->getBinaryOp(Init::SHL, yyvsp[-1].Initializer);
     if (yyval.Initializer == 0) {
       err() << "Cannot shift values '" << *yyvsp[-3].Initializer << "' and '" << *yyvsp[-1].Initializer << "'!\n";
       exit(1);
     }
-  ;
-    break;}
-case 27:
-#line 361 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 28:
+#line 361 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.Initializer = yyvsp[-3].Initializer->getBinaryOp(Init::SRA, yyvsp[-1].Initializer);
     if (yyval.Initializer == 0) {
       err() << "Cannot shift values '" << *yyvsp[-3].Initializer << "' and '" << *yyvsp[-1].Initializer << "'!\n";
       exit(1);
     }
-  ;
-    break;}
-case 28:
-#line 367 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 29:
+#line 367 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.Initializer = yyvsp[-3].Initializer->getBinaryOp(Init::SRL, yyvsp[-1].Initializer);
     if (yyval.Initializer == 0) {
       err() << "Cannot shift values '" << *yyvsp[-3].Initializer << "' and '" << *yyvsp[-1].Initializer << "'!\n";
       exit(1);
     }
-  ;
-    break;}
-case 29:
-#line 375 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 30:
+#line 375 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.StrVal = new std::string();
-  ;
-    break;}
-case 30:
-#line 378 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 31:
+#line 378 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.StrVal = yyvsp[0].StrVal;
-  ;
-    break;}
-case 31:
-#line 382 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 32:
+#line 382 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.DagValueList = new std::vector<std::pair<Init*, std::string> >();
     yyval.DagValueList->push_back(std::make_pair(yyvsp[-1].Initializer, *yyvsp[0].StrVal));
     delete yyvsp[0].StrVal;
-  ;
-    break;}
-case 32:
-#line 387 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 33:
+#line 387 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyvsp[-3].DagValueList->push_back(std::make_pair(yyvsp[-1].Initializer, *yyvsp[0].StrVal));
     delete yyvsp[0].StrVal;
     yyval.DagValueList = yyvsp[-3].DagValueList;
-  ;
-    break;}
-case 33:
-#line 393 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 34:
+#line 393 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.DagValueList = new std::vector<std::pair<Init*, std::string> >();
-  ;
-    break;}
-case 34:
-#line 396 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{ yyval.DagValueList = yyvsp[0].DagValueList; ;
-    break;}
-case 35:
-#line 399 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 35:
+#line 396 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    { yyval.DagValueList = yyvsp[0].DagValueList; ;}
+    break;
+
+  case 36:
+#line 399 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.BitList = new std::vector<unsigned>();
     yyval.BitList->push_back(yyvsp[0].IntVal);
-  ;
-    break;}
-case 36:
-#line 402 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 37:
+#line 402 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     if (yyvsp[-2].IntVal < 0 || yyvsp[0].IntVal < 0) {
       err() << "Invalid range: " << yyvsp[-2].IntVal << "-" << yyvsp[0].IntVal << "!\n";
       exit(1);
@@ -1316,11 +1687,12 @@
       for (int i = yyvsp[-2].IntVal; i >= yyvsp[0].IntVal; --i)
         yyval.BitList->push_back(i);
     }
-  ;
-    break;}
-case 37:
-#line 415 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 38:
+#line 415 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyvsp[0].IntVal = -yyvsp[0].IntVal;
     if (yyvsp[-1].IntVal < 0 || yyvsp[0].IntVal < 0) {
       err() << "Invalid range: " << yyvsp[-1].IntVal << "-" << yyvsp[0].IntVal << "!\n";
@@ -1334,17 +1706,19 @@
       for (int i = yyvsp[-1].IntVal; i >= yyvsp[0].IntVal; --i)
         yyval.BitList->push_back(i);
     }
-  ;
-    break;}
-case 38:
-#line 429 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 39:
+#line 429 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     (yyval.BitList=yyvsp[-2].BitList)->push_back(yyvsp[0].IntVal);
-  ;
-    break;}
-case 39:
-#line 431 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 40:
+#line 431 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     if (yyvsp[-2].IntVal < 0 || yyvsp[0].IntVal < 0) {
       err() << "Invalid range: " << yyvsp[-2].IntVal << "-" << yyvsp[0].IntVal << "!\n";
       exit(1);
@@ -1357,11 +1731,12 @@
       for (int i = yyvsp[-2].IntVal; i >= yyvsp[0].IntVal; --i)
         yyval.BitList->push_back(i);
     }
-  ;
-    break;}
-case 40:
-#line 444 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 41:
+#line 444 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyvsp[0].IntVal = -yyvsp[0].IntVal;
     if (yyvsp[-1].IntVal < 0 || yyvsp[0].IntVal < 0) {
       err() << "Invalid range: " << yyvsp[-1].IntVal << "-" << yyvsp[0].IntVal << "!\n";
@@ -1375,48 +1750,56 @@
       for (int i = yyvsp[-1].IntVal; i >= yyvsp[0].IntVal; --i)
         yyval.BitList->push_back(i);
     }
-  ;
-    break;}
-case 41:
-#line 460 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{ yyval.BitList = yyvsp[0].BitList; std::reverse(yyvsp[0].BitList->begin(), yyvsp[0].BitList->end()); ;
-    break;}
-case 42:
-#line 462 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{ yyval.BitList = 0; ;
-    break;}
-case 43:
-#line 462 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{ yyval.BitList = yyvsp[-1].BitList; ;
-    break;}
-case 44:
-#line 466 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 42:
+#line 460 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    { yyval.BitList = yyvsp[0].BitList; std::reverse(yyvsp[0].BitList->begin(), yyvsp[0].BitList->end()); ;}
+    break;
+
+  case 43:
+#line 462 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    { yyval.BitList = 0; ;}
+    break;
+
+  case 44:
+#line 462 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    { yyval.BitList = yyvsp[-1].BitList; ;}
+    break;
+
+  case 45:
+#line 466 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.FieldList = new std::vector<Init*>();
-  ;
-    break;}
-case 45:
-#line 468 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 46:
+#line 468 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.FieldList = yyvsp[0].FieldList;
-  ;
-    break;}
-case 46:
-#line 472 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 47:
+#line 472 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.FieldList = new std::vector<Init*>();
     yyval.FieldList->push_back(yyvsp[0].Initializer);
-  ;
-    break;}
-case 47:
-#line 475 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 48:
+#line 475 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     (yyval.FieldList = yyvsp[-2].FieldList)->push_back(yyvsp[0].Initializer);
-  ;
-    break;}
-case 48:
-#line 479 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 49:
+#line 479 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
   std::string DecName = *yyvsp[-1].StrVal;
   if (ParsingTemplateArgs)
     DecName = CurRec->getName() + ":" + DecName;
@@ -1424,99 +1807,114 @@
   addValue(RecordVal(DecName, yyvsp[-2].Ty, yyvsp[-3].IntVal));
   setValue(DecName, 0, yyvsp[0].Initializer);
   yyval.StrVal = new std::string(DecName);
-;
-    break;}
-case 49:
-#line 489 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+;}
+    break;
+
+  case 50:
+#line 489 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
   delete yyvsp[-1].StrVal;
-;
-    break;}
-case 50:
-#line 491 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+;}
+    break;
+
+  case 51:
+#line 491 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
   setValue(*yyvsp[-4].StrVal, yyvsp[-3].BitList, yyvsp[-1].Initializer);
   delete yyvsp[-4].StrVal;
   delete yyvsp[-3].BitList;
-;
-    break;}
-case 55:
-#line 500 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+;}
+    break;
+
+  case 56:
+#line 500 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.SubClassRef = new SubClassRefTy(yyvsp[0].Rec, new std::vector<Init*>());
-  ;
-    break;}
-case 56:
-#line 502 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 57:
+#line 502 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.SubClassRef = new SubClassRefTy(yyvsp[-3].Rec, yyvsp[-1].FieldList);
-  ;
-    break;}
-case 57:
-#line 506 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 58:
+#line 506 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.SubClassList = new std::vector<SubClassRefTy>();
     yyval.SubClassList->push_back(*yyvsp[0].SubClassRef);
     delete yyvsp[0].SubClassRef;
-  ;
-    break;}
-case 58:
-#line 511 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 59:
+#line 511 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     (yyval.SubClassList=yyvsp[-2].SubClassList)->push_back(*yyvsp[0].SubClassRef);
     delete yyvsp[0].SubClassRef;
-  ;
-    break;}
-case 59:
-#line 516 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 60:
+#line 516 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.SubClassList = new std::vector<SubClassRefTy>();
-  ;
-    break;}
-case 60:
-#line 519 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 61:
+#line 519 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     yyval.SubClassList = yyvsp[0].SubClassList;
-  ;
-    break;}
-case 61:
-#line 523 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 62:
+#line 523 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
   CurRec->addTemplateArg(*yyvsp[0].StrVal);
   delete yyvsp[0].StrVal;
-;
-    break;}
-case 62:
-#line 526 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+;}
+    break;
+
+  case 63:
+#line 526 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
   CurRec->addTemplateArg(*yyvsp[0].StrVal);
   delete yyvsp[0].StrVal;
-;
-    break;}
-case 63:
-#line 531 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{;
-    break;}
-case 66:
-#line 534 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{ yyval.StrVal = yyvsp[0].StrVal; ;
-    break;}
-case 67:
-#line 534 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{ yyval.StrVal = new std::string(); ;
-    break;}
-case 68:
-#line 536 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+;}
+    break;
+
+  case 64:
+#line 531 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {;}
+    break;
+
+  case 67:
+#line 534 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    { yyval.StrVal = yyvsp[0].StrVal; ;}
+    break;
+
+  case 68:
+#line 534 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    { yyval.StrVal = new std::string(); ;}
+    break;
+
+  case 69:
+#line 536 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
   static unsigned AnonCounter = 0;
   if (yyvsp[0].StrVal->empty())
     *yyvsp[0].StrVal = "anonymous."+utostr(AnonCounter++);
   yyval.StrVal = yyvsp[0].StrVal;
-;
-    break;}
-case 69:
-#line 543 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+;}
+    break;
+
+  case 70:
+#line 543 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
   // If a class of this name already exists, it must be a forward ref.
   if ((CurRec = Records.getClass(*yyvsp[0].StrVal))) {
     // If the body was previously defined, this is an error.
@@ -1532,11 +1930,12 @@
     Records.addClass(CurRec);
   }
   delete yyvsp[0].StrVal;
-;
-    break;}
-case 70:
-#line 561 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+;}
+    break;
+
+  case 71:
+#line 561 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
   CurRec = new Record(*yyvsp[0].StrVal);
   delete yyvsp[0].StrVal;
   
@@ -1546,11 +1945,12 @@
     exit(1);
   }
   Records.addDef(CurRec);
-;
-    break;}
-case 71:
-#line 573 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+;}
+    break;
+
+  case 72:
+#line 573 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
            for (unsigned i = 0, e = yyvsp[0].SubClassList->size(); i != e; ++i) {
              addSubClass((*yyvsp[0].SubClassList)[i].first, *(*yyvsp[0].SubClassList)[i].second);
              // Delete the template arg values for the class
@@ -1564,304 +1964,294 @@
                setValue(LetStack[i][j].Name,
                         LetStack[i][j].HasBits ? &LetStack[i][j].Bits : 0,
                         LetStack[i][j].Value);
-         ;
-    break;}
-case 72:
-#line 587 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+         ;}
+    break;
+
+  case 73:
+#line 587 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
            yyval.Rec = CurRec;
            CurRec = 0;
-         ;
-    break;}
-case 73:
-#line 592 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+         ;}
+    break;
+
+  case 74:
+#line 592 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
                 ParsingTemplateArgs = true;
-            ;
-    break;}
-case 74:
-#line 594 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+            ;}
+    break;
+
+  case 75:
+#line 594 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
                 ParsingTemplateArgs = false;
-            ;
-    break;}
-case 75:
-#line 596 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+            ;}
+    break;
+
+  case 76:
+#line 596 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
         yyval.Rec = yyvsp[0].Rec;
-     ;
-    break;}
-case 76:
-#line 600 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+     ;}
+    break;
+
+  case 77:
+#line 600 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
   yyvsp[0].Rec->resolveReferences();
 
   // If ObjectBody has template arguments, it's an error.
   assert(yyvsp[0].Rec->getTemplateArgs().empty() && "How'd this get template args?");
   yyval.Rec = yyvsp[0].Rec;
-;
-    break;}
-case 79:
-#line 611 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+;}
+    break;
+
+  case 80:
+#line 611 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
   LetStack.back().push_back(LetRecord(*yyvsp[-3].StrVal, yyvsp[-2].BitList, yyvsp[0].Initializer));
   delete yyvsp[-3].StrVal; delete yyvsp[-2].BitList;
-;
-    break;}
-case 82:
-#line 619 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{ LetStack.push_back(std::vector<LetRecord>()); ;
-    break;}
-case 84:
-#line 622 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+;}
+    break;
+
+  case 83:
+#line 619 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    { LetStack.push_back(std::vector<LetRecord>()); ;}
+    break;
+
+  case 85:
+#line 622 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     LetStack.pop_back();
-  ;
-    break;}
-case 85:
-#line 625 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{
+  ;}
+    break;
+
+  case 86:
+#line 625 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {
     LetStack.pop_back();
-  ;
-    break;}
-case 86:
-#line 629 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{;
-    break;}
-case 87:
-#line 629 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{;
-    break;}
-case 88:
-#line 631 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
-{;
-    break;}
-}
-   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/share/bison.simple"
+  ;}
+    break;
+
+  case 87:
+#line 629 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {;}
+    break;
+
+  case 88:
+#line 629 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {;}
+    break;
+
+  case 89:
+#line 631 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+    {;}
+    break;
+
+
+    }
+
+/* Line 999 of yacc.c.  */
+#line 2056 "FileParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
 
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
+
+  YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
 
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
-#endif
 
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
 
   yyn = yyr1[yyn];
 
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTBASE];
+    yystate = yydefgoto[yyn - YYNTOKENS];
 
   goto yynewstate;
 
-yyerrlab:   /* here on detecting error */
 
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
       ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
+#if YYERROR_VERBOSE
       yyn = yypact[yystate];
 
-      if (yyn > YYFLAG && yyn < YYLAST)
+      if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
-	  int size = 0;
-	  char *msg;
-	  int x, count;
-
-	  count = 0;
-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
-	    if (yycheck[x + yyn] == x)
-	      size += strlen(yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
-	  if (msg != 0)
+	  YYSIZE_T yysize = 0;
+	  int yytype = YYTRANSLATE (yychar);
+	  char *yymsg;
+	  int yyx, yycount;
+
+	  yycount = 0;
+	  /* Start YYX at -YYN if negative to avoid negative indexes in
+	     YYCHECK.  */
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("syntax error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[yytype]);
+	  yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg != 0)
 	    {
-	      strcpy(msg, "parse error");
+	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
+	      yyp = yystpcpy (yyp, yytname[yytype]);
 
-	      if (count < 5)
+	      if (yycount < 5)
 		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
+		  yycount = 0;
+		  for (yyx = yyn < 0 ? -yyn : 0;
+		       yyx < (int) (sizeof (yytname) / sizeof (char *));
+		       yyx++)
+		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
+			const char *yyq = ! yycount ? ", expecting " : " or ";
+			yyp = yystpcpy (yyp, yyq);
+			yyp = yystpcpy (yyp, yytname[yyx]);
+			yycount++;
 		      }
 		}
-	      yyerror(msg);
-	      free(msg);
+	      yyerror (yymsg);
+	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    yyerror ("parse error; also virtual memory exceeded");
+	    yyerror ("syntax error; also virtual memory exhausted");
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
+	yyerror ("syntax error");
     }
 
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
+
 
   if (yyerrstatus == 3)
     {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
+      /* If just tried and failed to reuse lookahead token after an
+	 error, discard it.  */
 
-      /* return failure if at end of input */
+      /* Return failure if at end of input.  */
       if (yychar == YYEOF)
-	YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
+        {
+	  /* Pop the error token.  */
+          YYPOPSTACK;
+	  /* Pop the rest of the stack.  */
+	  while (yyss < yyssp)
+	    {
+	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+	      yydestruct (yystos[*yyssp], yyvsp);
+	      YYPOPSTACK;
+	    }
+	  YYABORT;
+        }
 
+      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
+      yydestruct (yytoken, &yylval);
       yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
 
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-yyerrdefault:  /* current state does not do anything special for the error token. */
+    }
 
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
-#endif
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
 
-yyerrpop:   /* pop the current state because it cannot handle the error token */
 
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
+/*----------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action.  |
+`----------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
-#if YYDEBUG != 0
-  if (yydebug)
+  for (;;)
     {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-yyerrhandle:
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
 
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
 
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
+      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+      yydestruct (yystos[yystate], yyvsp);
+      yyvsp--;
+      yystate = *--yyssp;
 
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
+      YY_STACK_PRINT (yyss, yyssp);
     }
-  else if (yyn == 0)
-    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
+  YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
+
 
   yystate = yyn;
   goto yynewstate;
 
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 0;
 
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here.  |
+`----------------------------------------------*/
+yyoverflowlab:
+  yyerror ("parser stack overflow");
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
 #endif
-    }
-  return 1;
+  return yyresult;
 }
-#line 633 "/Users/bocchino/vllvm-checkin/src/utils/TableGen/FileParser.y"
+
+
+#line 633 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
 
 
 int yyerror(const char *ErrorMsg) {
   err() << "Error parsing: " << ErrorMsg << "\n";
   exit(1);
 }
+


Index: llvm/utils/TableGen/FileParser.h
diff -u llvm/utils/TableGen/FileParser.h:1.4 llvm/utils/TableGen/FileParser.h:1.5
--- llvm/utils/TableGen/FileParser.h:1.4	Thu Sep 29 23:11:27 2005
+++ llvm/utils/TableGen/FileParser.h	Tue Jan 17 11:01:34 2006
@@ -1,4 +1,83 @@
-typedef union {
+/* A Bison parser, made by GNU Bison 1.875.  */
+
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     INT = 258,
+     BIT = 259,
+     STRING = 260,
+     BITS = 261,
+     LIST = 262,
+     CODE = 263,
+     DAG = 264,
+     CLASS = 265,
+     DEF = 266,
+     FIELD = 267,
+     LET = 268,
+     IN = 269,
+     SHLTOK = 270,
+     SRATOK = 271,
+     SRLTOK = 272,
+     INTVAL = 273,
+     ID = 274,
+     VARNAME = 275,
+     STRVAL = 276,
+     CODEFRAGMENT = 277
+   };
+#endif
+#define INT 258
+#define BIT 259
+#define STRING 260
+#define BITS 261
+#define LIST 262
+#define CODE 263
+#define DAG 264
+#define CLASS 265
+#define DEF 266
+#define FIELD 267
+#define LET 268
+#define IN 269
+#define SHLTOK 270
+#define SRATOK 271
+#define SRLTOK 272
+#define INTVAL 273
+#define ID 274
+#define VARNAME 275
+#define STRVAL 276
+#define CODEFRAGMENT 277
+
+
+
+
+#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#line 189 "/home/vadve/criswell/llvm/utils/TableGen/FileParser.y"
+typedef union YYSTYPE {
   std::string*                StrVal;
   int                         IntVal;
   llvm::RecTy*                Ty;
@@ -10,26 +89,14 @@
   std::vector<SubClassRefTy>* SubClassList;
   std::vector<std::pair<llvm::Init*, std::string> >* DagValueList;
 } YYSTYPE;
-#define	INT	257
-#define	BIT	258
-#define	STRING	259
-#define	BITS	260
-#define	LIST	261
-#define	CODE	262
-#define	DAG	263
-#define	CLASS	264
-#define	DEF	265
-#define	FIELD	266
-#define	LET	267
-#define	IN	268
-#define	SHLTOK	269
-#define	SRATOK	270
-#define	SRLTOK	271
-#define	INTVAL	272
-#define	ID	273
-#define	VARNAME	274
-#define	STRVAL	275
-#define	CODEFRAGMENT	276
-
+/* Line 1240 of yacc.c.  */
+#line 93 "FileParser.tab.h"
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
 
 extern YYSTYPE Filelval;
+
+
+






More information about the llvm-commits mailing list