[llvm-commits] [llvm] r50211 - in /llvm/branches/ggreif/use-diet: examples/BrainF/ include/llvm/ lib/AsmParser/ lib/Bitcode/Reader/ lib/CodeGen/ lib/Linker/ lib/Transforms/IPO/ lib/Transforms/Instrumentation/ lib/Transforms/Utils/ lib/VMCore/ tools/bugpoint/ tools/llvm2cpp/

Gabor Greif ggreif at gmail.com
Thu Apr 24 08:48:40 PDT 2008


Author: ggreif
Date: Thu Apr 24 10:48:39 2008
New Revision: 50211

URL: http://llvm.org/viewvc/llvm-project?rev=50211&view=rev
Log:
undo the API change that was needed in the interim.

Modified:
    llvm/branches/ggreif/use-diet/examples/BrainF/BrainF.cpp
    llvm/branches/ggreif/use-diet/include/llvm/GlobalVariable.h
    llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.cpp.cvs
    llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.h.cvs
    llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.y
    llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.y.cvs
    llvm/branches/ggreif/use-diet/lib/Bitcode/Reader/BitcodeReader.cpp
    llvm/branches/ggreif/use-diet/lib/CodeGen/MachineModuleInfo.cpp
    llvm/branches/ggreif/use-diet/lib/CodeGen/ShadowStackCollector.cpp
    llvm/branches/ggreif/use-diet/lib/Linker/LinkModules.cpp
    llvm/branches/ggreif/use-diet/lib/Transforms/IPO/ExtractGV.cpp
    llvm/branches/ggreif/use-diet/lib/Transforms/IPO/GlobalOpt.cpp
    llvm/branches/ggreif/use-diet/lib/Transforms/IPO/SimplifyLibCalls.cpp
    llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/BlockProfiling.cpp
    llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/EdgeProfiling.cpp
    llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/RSProfiling.cpp
    llvm/branches/ggreif/use-diet/lib/Transforms/Utils/CloneModule.cpp
    llvm/branches/ggreif/use-diet/lib/Transforms/Utils/LowerInvoke.cpp
    llvm/branches/ggreif/use-diet/lib/VMCore/Core.cpp
    llvm/branches/ggreif/use-diet/lib/VMCore/Module.cpp
    llvm/branches/ggreif/use-diet/tools/bugpoint/ExtractFunction.cpp
    llvm/branches/ggreif/use-diet/tools/bugpoint/Miscompilation.cpp
    llvm/branches/ggreif/use-diet/tools/llvm2cpp/CppWriter.cpp

Modified: llvm/branches/ggreif/use-diet/examples/BrainF/BrainF.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/examples/BrainF/BrainF.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/examples/BrainF/BrainF.cpp (original)
+++ llvm/branches/ggreif/use-diet/examples/BrainF/BrainF.cpp Thu Apr 24 10:48:39 2008
@@ -124,7 +124,7 @@
     Constant *msg_0 = ConstantArray::
       get("Error: The head has left the tape.", true);
 
-    GlobalVariable *aberrormsg = GlobalVariable::Create(
+    GlobalVariable *aberrormsg = new GlobalVariable(
       msg_0->getType(),
       true,
       GlobalValue::InternalLinkage,

Modified: llvm/branches/ggreif/use-diet/include/llvm/GlobalVariable.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/include/llvm/GlobalVariable.h?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/include/llvm/GlobalVariable.h (original)
+++ llvm/branches/ggreif/use-diet/include/llvm/GlobalVariable.h Thu Apr 24 10:48:39 2008
@@ -33,6 +33,7 @@
 
 class GlobalVariable : public GlobalValue {
   friend class SymbolTableListTraits<GlobalVariable, Module>;
+  void *operator new(size_t, unsigned);       // Do not implement
   void operator=(const GlobalVariable &);     // Do not implement
   GlobalVariable(const GlobalVariable &);     // Do not implement
 
@@ -45,39 +46,23 @@
   bool isConstantGlobal : 1;           // Is this a global constant?
   bool isThreadLocalSymbol : 1;        // Is this symbol "Thread Local"?
 
-private:
-  /// GlobalVariable ctor - for internal use.
-  GlobalVariable(const Type *Ty, bool isConstant, LinkageTypes Linkage,
-                 Constant *Initializer, const std::string &Name,
-                 Module *Parent, bool ThreadLocal, unsigned AddressSpace);
-  /// GlobalVariable ctor - for internal use.
-  GlobalVariable(const Type *Ty, bool isConstant, LinkageTypes Linkage,
-                 Constant *Initializer, const std::string &Name,
-                 GlobalVariable *InsertBefore, bool ThreadLocal,
-                 unsigned AddressSpace);
-
 public:
-  /// GlobalVariable creator - If a parent module is specified, the global is
-  /// automatically inserted into the end of the specified modules global list.
-  static GlobalVariable *Create(const Type *Ty, bool isConstant, LinkageTypes Linkage,
-                                Constant *Initializer = 0, const std::string &Name = "",
-                                Module *Parent = 0, bool ThreadLocal = false, 
-                                unsigned AddressSpace = 0) {
-    return new (1) GlobalVariable(Ty, isConstant, Linkage,
-                                  Initializer, Name, Parent,
-                                  ThreadLocal, AddressSpace);
+  // allocate space for exactly one operand
+  void *operator new(size_t s) {
+    return User::operator new(s, 1);
   }
-
-  /// GlobalVariable creator - This creates a global and inserts it before the
+  /// GlobalVariable ctor - If a parent module is specified, the global is
+  /// automatically inserted into the end of the specified modules global list.
+  GlobalVariable(const Type *Ty, bool isConstant, LinkageTypes Linkage,
+                 Constant *Initializer = 0, const std::string &Name = "",
+                 Module *Parent = 0, bool ThreadLocal = false,
+                 unsigned AddressSpace = 0);
+  /// GlobalVariable ctor - This creates a global and inserts it before the
   /// specified other global.
-  static GlobalVariable *Create(const Type *Ty, bool isConstant, LinkageTypes Linkage,
-                                Constant *Initializer, const std::string &Name,
-                                GlobalVariable *InsertBefore, bool ThreadLocal = false, 
-                                unsigned AddressSpace = 0) {
-    return new (1) GlobalVariable(Ty, isConstant, Linkage,
-                                  Initializer, Name, InsertBefore,
-                                  ThreadLocal, AddressSpace);
-  }
+  GlobalVariable(const Type *Ty, bool isConstant, LinkageTypes Linkage,
+                 Constant *Initializer, const std::string &Name,
+                 GlobalVariable *InsertBefore, bool ThreadLocal = false,
+                 unsigned AddressSpace = 0);
 
   ~GlobalVariable() {
     NumOperands = 1; // FIXME: needed by operator delete

Modified: llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.cpp.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.cpp.cvs?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.cpp.cvs Thu Apr 24 10:48:39 2008
@@ -1,167 +1,386 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/*  A Bison parser, made from /Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y
-    by GNU Bison version 1.28  */
+/* Skeleton implementation for Bison's Yacc-like parsers in C
 
-#define YYBISON 1  /* Identify Bison output.  */
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
+   This program is free software; you can redistribute it and/or modify
+   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., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton 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
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+/* Substitute the variable and function names.  */
 #define yyparse llvmAsmparse
-#define yylex llvmAsmlex
+#define yylex   llvmAsmlex
 #define yyerror llvmAsmerror
-#define yylval llvmAsmlval
-#define yychar llvmAsmchar
+#define yylval  llvmAsmlval
+#define yychar  llvmAsmchar
 #define yydebug llvmAsmdebug
 #define yynerrs llvmAsmnerrs
-#define	ESINT64VAL	257
-#define	EUINT64VAL	258
-#define	ESAPINTVAL	259
-#define	EUAPINTVAL	260
-#define	LOCALVAL_ID	261
-#define	GLOBALVAL_ID	262
-#define	FPVAL	263
-#define	VOID	264
-#define	INTTYPE	265
-#define	FLOAT	266
-#define	DOUBLE	267
-#define	X86_FP80	268
-#define	FP128	269
-#define	PPC_FP128	270
-#define	LABEL	271
-#define	TYPE	272
-#define	LOCALVAR	273
-#define	GLOBALVAR	274
-#define	LABELSTR	275
-#define	STRINGCONSTANT	276
-#define	ATSTRINGCONSTANT	277
-#define	PCTSTRINGCONSTANT	278
-#define	ZEROINITIALIZER	279
-#define	TRUETOK	280
-#define	FALSETOK	281
-#define	BEGINTOK	282
-#define	ENDTOK	283
-#define	DECLARE	284
-#define	DEFINE	285
-#define	GLOBAL	286
-#define	CONSTANT	287
-#define	SECTION	288
-#define	ALIAS	289
-#define	VOLATILE	290
-#define	THREAD_LOCAL	291
-#define	TO	292
-#define	DOTDOTDOT	293
-#define	NULL_TOK	294
-#define	UNDEF	295
-#define	INTERNAL	296
-#define	LINKONCE	297
-#define	WEAK	298
-#define	APPENDING	299
-#define	DLLIMPORT	300
-#define	DLLEXPORT	301
-#define	EXTERN_WEAK	302
-#define	OPAQUE	303
-#define	EXTERNAL	304
-#define	TARGET	305
-#define	TRIPLE	306
-#define	ALIGN	307
-#define	ADDRSPACE	308
-#define	DEPLIBS	309
-#define	CALL	310
-#define	TAIL	311
-#define	ASM_TOK	312
-#define	MODULE	313
-#define	SIDEEFFECT	314
-#define	CC_TOK	315
-#define	CCC_TOK	316
-#define	FASTCC_TOK	317
-#define	COLDCC_TOK	318
-#define	X86_STDCALLCC_TOK	319
-#define	X86_FASTCALLCC_TOK	320
-#define	DATALAYOUT	321
-#define	UNWINDS	322
-#define	RET	323
-#define	BR	324
-#define	SWITCH	325
-#define	INVOKE	326
-#define	UNWIND	327
-#define	UNREACHABLE	328
-#define	ADD	329
-#define	SUB	330
-#define	MUL	331
-#define	UDIV	332
-#define	SDIV	333
-#define	FDIV	334
-#define	UREM	335
-#define	SREM	336
-#define	FREM	337
-#define	AND	338
-#define	OR	339
-#define	XOR	340
-#define	SHL	341
-#define	LSHR	342
-#define	ASHR	343
-#define	ICMP	344
-#define	FCMP	345
-#define	EQ	346
-#define	NE	347
-#define	SLT	348
-#define	SGT	349
-#define	SLE	350
-#define	SGE	351
-#define	ULT	352
-#define	UGT	353
-#define	ULE	354
-#define	UGE	355
-#define	OEQ	356
-#define	ONE	357
-#define	OLT	358
-#define	OGT	359
-#define	OLE	360
-#define	OGE	361
-#define	ORD	362
-#define	UNO	363
-#define	UEQ	364
-#define	UNE	365
-#define	MALLOC	366
-#define	ALLOCA	367
-#define	FREE	368
-#define	LOAD	369
-#define	STORE	370
-#define	GETELEMENTPTR	371
-#define	TRUNC	372
-#define	ZEXT	373
-#define	SEXT	374
-#define	FPTRUNC	375
-#define	FPEXT	376
-#define	BITCAST	377
-#define	UITOFP	378
-#define	SITOFP	379
-#define	FPTOUI	380
-#define	FPTOSI	381
-#define	INTTOPTR	382
-#define	PTRTOINT	383
-#define	PHI_TOK	384
-#define	SELECT	385
-#define	VAARG	386
-#define	EXTRACTELEMENT	387
-#define	INSERTELEMENT	388
-#define	SHUFFLEVECTOR	389
-#define	GETRESULT	390
-#define	SIGNEXT	391
-#define	ZEROEXT	392
-#define	NORETURN	393
-#define	INREG	394
-#define	SRET	395
-#define	NOUNWIND	396
-#define	NOALIAS	397
-#define	BYVAL	398
-#define	NEST	399
-#define	READNONE	400
-#define	READONLY	401
-#define	GC	402
-#define	DEFAULT	403
-#define	HIDDEN	404
-#define	PROTECTED	405
 
-#line 14 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ESINT64VAL = 258,
+     EUINT64VAL = 259,
+     ESAPINTVAL = 260,
+     EUAPINTVAL = 261,
+     LOCALVAL_ID = 262,
+     GLOBALVAL_ID = 263,
+     FPVAL = 264,
+     VOID = 265,
+     INTTYPE = 266,
+     FLOAT = 267,
+     DOUBLE = 268,
+     X86_FP80 = 269,
+     FP128 = 270,
+     PPC_FP128 = 271,
+     LABEL = 272,
+     TYPE = 273,
+     LOCALVAR = 274,
+     GLOBALVAR = 275,
+     LABELSTR = 276,
+     STRINGCONSTANT = 277,
+     ATSTRINGCONSTANT = 278,
+     PCTSTRINGCONSTANT = 279,
+     ZEROINITIALIZER = 280,
+     TRUETOK = 281,
+     FALSETOK = 282,
+     BEGINTOK = 283,
+     ENDTOK = 284,
+     DECLARE = 285,
+     DEFINE = 286,
+     GLOBAL = 287,
+     CONSTANT = 288,
+     SECTION = 289,
+     ALIAS = 290,
+     VOLATILE = 291,
+     THREAD_LOCAL = 292,
+     TO = 293,
+     DOTDOTDOT = 294,
+     NULL_TOK = 295,
+     UNDEF = 296,
+     INTERNAL = 297,
+     LINKONCE = 298,
+     WEAK = 299,
+     APPENDING = 300,
+     DLLIMPORT = 301,
+     DLLEXPORT = 302,
+     EXTERN_WEAK = 303,
+     OPAQUE = 304,
+     EXTERNAL = 305,
+     TARGET = 306,
+     TRIPLE = 307,
+     ALIGN = 308,
+     ADDRSPACE = 309,
+     DEPLIBS = 310,
+     CALL = 311,
+     TAIL = 312,
+     ASM_TOK = 313,
+     MODULE = 314,
+     SIDEEFFECT = 315,
+     CC_TOK = 316,
+     CCC_TOK = 317,
+     FASTCC_TOK = 318,
+     COLDCC_TOK = 319,
+     X86_STDCALLCC_TOK = 320,
+     X86_FASTCALLCC_TOK = 321,
+     DATALAYOUT = 322,
+     UNWINDS = 323,
+     RET = 324,
+     BR = 325,
+     SWITCH = 326,
+     INVOKE = 327,
+     UNWIND = 328,
+     UNREACHABLE = 329,
+     ADD = 330,
+     SUB = 331,
+     MUL = 332,
+     UDIV = 333,
+     SDIV = 334,
+     FDIV = 335,
+     UREM = 336,
+     SREM = 337,
+     FREM = 338,
+     AND = 339,
+     OR = 340,
+     XOR = 341,
+     SHL = 342,
+     LSHR = 343,
+     ASHR = 344,
+     ICMP = 345,
+     FCMP = 346,
+     EQ = 347,
+     NE = 348,
+     SLT = 349,
+     SGT = 350,
+     SLE = 351,
+     SGE = 352,
+     ULT = 353,
+     UGT = 354,
+     ULE = 355,
+     UGE = 356,
+     OEQ = 357,
+     ONE = 358,
+     OLT = 359,
+     OGT = 360,
+     OLE = 361,
+     OGE = 362,
+     ORD = 363,
+     UNO = 364,
+     UEQ = 365,
+     UNE = 366,
+     MALLOC = 367,
+     ALLOCA = 368,
+     FREE = 369,
+     LOAD = 370,
+     STORE = 371,
+     GETELEMENTPTR = 372,
+     TRUNC = 373,
+     ZEXT = 374,
+     SEXT = 375,
+     FPTRUNC = 376,
+     FPEXT = 377,
+     BITCAST = 378,
+     UITOFP = 379,
+     SITOFP = 380,
+     FPTOUI = 381,
+     FPTOSI = 382,
+     INTTOPTR = 383,
+     PTRTOINT = 384,
+     PHI_TOK = 385,
+     SELECT = 386,
+     VAARG = 387,
+     EXTRACTELEMENT = 388,
+     INSERTELEMENT = 389,
+     SHUFFLEVECTOR = 390,
+     GETRESULT = 391,
+     SIGNEXT = 392,
+     ZEROEXT = 393,
+     NORETURN = 394,
+     INREG = 395,
+     SRET = 396,
+     NOUNWIND = 397,
+     NOALIAS = 398,
+     BYVAL = 399,
+     NEST = 400,
+     READNONE = 401,
+     READONLY = 402,
+     GC = 403,
+     DEFAULT = 404,
+     HIDDEN = 405,
+     PROTECTED = 406
+   };
+#endif
+/* Tokens.  */
+#define ESINT64VAL 258
+#define EUINT64VAL 259
+#define ESAPINTVAL 260
+#define EUAPINTVAL 261
+#define LOCALVAL_ID 262
+#define GLOBALVAL_ID 263
+#define FPVAL 264
+#define VOID 265
+#define INTTYPE 266
+#define FLOAT 267
+#define DOUBLE 268
+#define X86_FP80 269
+#define FP128 270
+#define PPC_FP128 271
+#define LABEL 272
+#define TYPE 273
+#define LOCALVAR 274
+#define GLOBALVAR 275
+#define LABELSTR 276
+#define STRINGCONSTANT 277
+#define ATSTRINGCONSTANT 278
+#define PCTSTRINGCONSTANT 279
+#define ZEROINITIALIZER 280
+#define TRUETOK 281
+#define FALSETOK 282
+#define BEGINTOK 283
+#define ENDTOK 284
+#define DECLARE 285
+#define DEFINE 286
+#define GLOBAL 287
+#define CONSTANT 288
+#define SECTION 289
+#define ALIAS 290
+#define VOLATILE 291
+#define THREAD_LOCAL 292
+#define TO 293
+#define DOTDOTDOT 294
+#define NULL_TOK 295
+#define UNDEF 296
+#define INTERNAL 297
+#define LINKONCE 298
+#define WEAK 299
+#define APPENDING 300
+#define DLLIMPORT 301
+#define DLLEXPORT 302
+#define EXTERN_WEAK 303
+#define OPAQUE 304
+#define EXTERNAL 305
+#define TARGET 306
+#define TRIPLE 307
+#define ALIGN 308
+#define ADDRSPACE 309
+#define DEPLIBS 310
+#define CALL 311
+#define TAIL 312
+#define ASM_TOK 313
+#define MODULE 314
+#define SIDEEFFECT 315
+#define CC_TOK 316
+#define CCC_TOK 317
+#define FASTCC_TOK 318
+#define COLDCC_TOK 319
+#define X86_STDCALLCC_TOK 320
+#define X86_FASTCALLCC_TOK 321
+#define DATALAYOUT 322
+#define UNWINDS 323
+#define RET 324
+#define BR 325
+#define SWITCH 326
+#define INVOKE 327
+#define UNWIND 328
+#define UNREACHABLE 329
+#define ADD 330
+#define SUB 331
+#define MUL 332
+#define UDIV 333
+#define SDIV 334
+#define FDIV 335
+#define UREM 336
+#define SREM 337
+#define FREM 338
+#define AND 339
+#define OR 340
+#define XOR 341
+#define SHL 342
+#define LSHR 343
+#define ASHR 344
+#define ICMP 345
+#define FCMP 346
+#define EQ 347
+#define NE 348
+#define SLT 349
+#define SGT 350
+#define SLE 351
+#define SGE 352
+#define ULT 353
+#define UGT 354
+#define ULE 355
+#define UGE 356
+#define OEQ 357
+#define ONE 358
+#define OLT 359
+#define OGT 360
+#define OLE 361
+#define OGE 362
+#define ORD 363
+#define UNO 364
+#define UEQ 365
+#define UNE 366
+#define MALLOC 367
+#define ALLOCA 368
+#define FREE 369
+#define LOAD 370
+#define STORE 371
+#define GETELEMENTPTR 372
+#define TRUNC 373
+#define ZEXT 374
+#define SEXT 375
+#define FPTRUNC 376
+#define FPEXT 377
+#define BITCAST 378
+#define UITOFP 379
+#define SITOFP 380
+#define FPTOUI 381
+#define FPTOSI 382
+#define INTTOPTR 383
+#define PTRTOINT 384
+#define PHI_TOK 385
+#define SELECT 386
+#define VAARG 387
+#define EXTRACTELEMENT 388
+#define INSERTELEMENT 389
+#define SHUFFLEVECTOR 390
+#define GETRESULT 391
+#define SIGNEXT 392
+#define ZEROEXT 393
+#define NORETURN 394
+#define INREG 395
+#define SRET 396
+#define NOUNWIND 397
+#define NOALIAS 398
+#define BYVAL 399
+#define NEST 400
+#define READNONE 401
+#define READONLY 402
+#define GC 403
+#define DEFAULT 404
+#define HIDDEN 405
+#define PROTECTED 406
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 14 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -647,7 +866,7 @@
      V = Function::Create(FTy, GlobalValue::ExternalLinkage);
    else
      V = new GlobalVariable(ElTy, false, GlobalValue::ExternalLinkage, 0, "",
-                            (Module*)0, false, PTy->getAddressSpace());
+                                (Module*)0, false, PTy->getAddressSpace());
    break;
   }
   default:
@@ -936,7 +1155,7 @@
   // Otherwise there is no existing GV to use, create one now.
   GlobalVariable *GV =
     new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name,
-                       CurModule.CurrentModule, IsThreadLocal, AddressSpace);
+                           CurModule.CurrentModule, IsThreadLocal, AddressSpace);
   GV->setVisibility(Visibility);
   InsertValue(GV, CurModule.Values);
   return GV;
@@ -1097,8 +1316,29 @@
 }
 
 
-#line 950 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.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
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 950 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -1143,1227 +1383,1913 @@
   llvm::Instruction::OtherOps       OtherOpVal;
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
-} YYSTYPE;
-#include <stdio.h>
-
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
+}
+/* Line 187 of yacc.c.  */
+#line 1389 "llvmAsmParser.tab.c"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
 
-#define	YYFINAL		635
-#define	YYFLAG		-32768
-#define	YYNTBASE	166
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 405 ? yytranslate[x] : 250)
-
-static const short 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,   152,
-   153,   156,     2,   155,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,   161,
-   154,   162,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-   158,   157,   160,     2,     2,     2,     2,     2,   165,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,   159,
-     2,     2,   163,     2,   164,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     3,     4,     5,     6,
-     7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-    17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-    27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-    37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-    47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-    57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-    67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-    77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-    87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-    97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-   107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-   117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-   127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-   137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-   147,   148,   149,   150,   151
-};
+/* Copy the second part of user declarations.  */
 
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     2,     4,     6,     8,    10,    12,    14,    16,    18,
-    20,    22,    24,    26,    28,    30,    32,    34,    36,    38,
-    40,    42,    44,    46,    48,    50,    52,    54,    56,    58,
-    60,    62,    64,    66,    68,    70,    72,    74,    76,    78,
-    80,    82,    84,    86,    88,    90,    92,    94,    96,    98,
-   100,   102,   104,   106,   108,   110,   112,   114,   116,   118,
-   120,   122,   124,   126,   127,   132,   133,   136,   137,   139,
-   141,   143,   144,   147,   149,   151,   153,   155,   157,   159,
-   161,   163,   164,   166,   168,   170,   171,   173,   175,   176,
-   178,   180,   182,   184,   185,   187,   189,   190,   192,   194,
-   196,   198,   200,   203,   205,   207,   209,   211,   213,   215,
-   217,   219,   221,   224,   225,   228,   230,   232,   234,   236,
-   238,   240,   241,   244,   245,   248,   249,   252,   253,   257,
-   260,   261,   263,   264,   268,   270,   273,   275,   277,   279,
-   281,   283,   285,   287,   289,   291,   295,   297,   300,   306,
-   312,   318,   324,   328,   331,   337,   342,   345,   347,   349,
-   351,   355,   357,   361,   363,   364,   366,   370,   375,   379,
-   383,   388,   393,   397,   404,   410,   413,   416,   419,   422,
-   425,   428,   431,   434,   437,   440,   443,   446,   453,   459,
-   468,   475,   482,   490,   498,   505,   514,   523,   527,   529,
-   531,   533,   535,   536,   539,   546,   548,   549,   551,   554,
-   555,   559,   560,   564,   568,   572,   576,   577,   586,   587,
-   597,   598,   608,   614,   617,   621,   623,   627,   631,   635,
-   639,   641,   642,   648,   652,   654,   658,   660,   661,   672,
-   674,   676,   681,   683,   685,   688,   692,   693,   695,   697,
-   699,   701,   703,   705,   707,   709,   711,   715,   717,   723,
-   725,   727,   729,   731,   733,   735,   738,   740,   744,   747,
-   750,   754,   757,   758,   762,   764,   769,   772,   775,   779,
-   789,   799,   808,   823,   825,   827,   834,   840,   843,   850,
-   858,   863,   868,   875,   882,   883,   884,   888,   891,   893,
-   899,   905,   912,   919,   924,   931,   936,   941,   948,   955,
-   958,   967,   969,   971,   972,   976,   983,   987,   994,   997,
-  1003,  1011,  1017
-};
 
-static const short yyrhs[] = {    75,
-     0,    76,     0,    77,     0,    78,     0,    79,     0,    80,
-     0,    81,     0,    82,     0,    83,     0,    87,     0,    88,
-     0,    89,     0,    84,     0,    85,     0,    86,     0,   118,
-     0,   119,     0,   120,     0,   121,     0,   122,     0,   123,
-     0,   124,     0,   125,     0,   126,     0,   127,     0,   128,
-     0,   129,     0,    92,     0,    93,     0,    94,     0,    95,
-     0,    96,     0,    97,     0,    98,     0,    99,     0,   100,
-     0,   101,     0,   102,     0,   103,     0,   104,     0,   105,
-     0,   106,     0,   107,     0,   108,     0,   109,     0,   110,
-     0,   111,     0,    98,     0,    99,     0,   100,     0,   101,
-     0,    26,     0,    27,     0,    11,     0,    12,     0,    13,
-     0,    16,     0,    15,     0,    14,     0,    19,     0,    22,
-     0,    24,     0,   173,     0,     0,    54,   152,     4,   153,
-     0,     0,   173,   154,     0,     0,    20,     0,    23,     0,
-   179,     0,     0,   177,   154,     0,    42,     0,    44,     0,
-    43,     0,    45,     0,    47,     0,    46,     0,    48,     0,
-    50,     0,     0,   149,     0,   150,     0,   151,     0,     0,
-    46,     0,    48,     0,     0,    42,     0,    43,     0,    44,
-     0,    47,     0,     0,    44,     0,    42,     0,     0,    62,
-     0,    63,     0,    64,     0,    65,     0,    66,     0,    61,
-     4,     0,   138,     0,   119,     0,   137,     0,   120,     0,
-   140,     0,   141,     0,   143,     0,   144,     0,   145,     0,
-    53,     4,     0,     0,   188,   187,     0,   139,     0,   142,
-     0,   138,     0,   137,     0,   146,     0,   147,     0,     0,
-   190,   189,     0,     0,   148,    22,     0,     0,    53,     4,
-     0,     0,   155,    53,     4,     0,    34,    22,     0,     0,
-   194,     0,     0,   155,   197,   196,     0,   194,     0,    53,
-     4,     0,    11,     0,    12,     0,    13,     0,    16,     0,
-    15,     0,    14,     0,    17,     0,    49,     0,   198,     0,
-   199,   175,   156,     0,   233,     0,   157,     4,     0,   199,
-   152,   203,   153,   190,     0,    10,   152,   203,   153,   190,
-     0,   158,     4,   159,   199,   160,     0,   161,     4,   159,
-   199,   162,     0,   163,   204,   164,     0,   163,   164,     0,
-   161,   163,   204,   164,   162,     0,   161,   163,   164,   162,
-     0,   199,   188,     0,   199,     0,    10,     0,   200,     0,
-   202,   155,   200,     0,   202,     0,   202,   155,    39,     0,
-    39,     0,     0,   199,     0,   204,   155,   199,     0,   199,
-   158,   207,   160,     0,   199,   158,   160,     0,   199,   165,
-    22,     0,   199,   161,   207,   162,     0,   199,   163,   207,
-   164,     0,   199,   163,   164,     0,   199,   161,   163,   207,
-   164,   162,     0,   199,   161,   163,   164,   162,     0,   199,
-    40,     0,   199,    41,     0,   199,   233,     0,   199,   206,
-     0,   199,    25,     0,   171,     3,     0,   171,     5,     0,
-   171,     4,     0,   171,     6,     0,    11,    26,     0,    11,
-    27,     0,   172,     9,     0,   168,   152,   205,    38,   199,
-   153,     0,   117,   152,   205,   245,   153,     0,   131,   152,
-   205,   155,   205,   155,   205,   153,     0,   166,   152,   205,
-   155,   205,   153,     0,   167,   152,   205,   155,   205,   153,
-     0,    90,   169,   152,   205,   155,   205,   153,     0,    91,
-   170,   152,   205,   155,   205,   153,     0,   133,   152,   205,
-   155,   205,   153,     0,   134,   152,   205,   155,   205,   155,
-   205,   153,     0,   135,   152,   205,   155,   205,   155,   205,
-   153,     0,   207,   155,   205,     0,   205,     0,    32,     0,
-    33,     0,    37,     0,     0,   201,   233,     0,   123,   152,
-   210,    38,   199,   153,     0,   212,     0,     0,   213,     0,
-   212,   213,     0,     0,    31,   214,   229,     0,     0,    30,
-   215,   230,     0,    59,    58,   219,     0,   176,    18,   199,
-     0,   176,    18,    10,     0,     0,   178,   182,   209,   208,
-   205,   175,   216,   196,     0,     0,   178,   180,   182,   209,
-   208,   205,   175,   217,   196,     0,     0,   178,   181,   182,
-   209,   208,   199,   175,   218,   196,     0,   178,   182,    35,
-   185,   210,     0,    51,   220,     0,    55,   154,   221,     0,
-    22,     0,    52,   154,    22,     0,    67,   154,    22,     0,
-   158,   222,   160,     0,   222,   155,    22,     0,    22,     0,
-     0,   223,   155,   199,   188,   174,     0,   199,   188,   174,
-     0,   223,     0,   223,   155,    39,     0,    39,     0,     0,
-   186,   201,   177,   152,   224,   153,   190,   195,   192,   191,
-     0,    28,     0,   163,     0,   184,   182,   225,   226,     0,
-    29,     0,   164,     0,   237,   228,     0,   183,   182,   225,
-     0,     0,    60,     0,     3,     0,     4,     0,     9,     0,
-    26,     0,    27,     0,    40,     0,    41,     0,    25,     0,
-   161,   207,   162,     0,   206,     0,    58,   231,    22,   155,
-    22,     0,     7,     0,     8,     0,   173,     0,   177,     0,
-   233,     0,   232,     0,   199,   234,     0,   235,     0,   236,
-   155,   235,     0,   237,   238,     0,   227,   238,     0,   239,
-   176,   240,     0,   239,   242,     0,     0,    68,    38,   234,
-     0,    21,     0,    21,    68,    38,   234,     0,    69,   236,
-     0,    69,    10,     0,    70,    17,   234,     0,    70,    11,
-   234,   155,    17,   234,   155,    17,   234,     0,    71,   171,
-   234,   155,    17,   234,   158,   241,   160,     0,    71,   171,
-   234,   155,    17,   234,   158,   160,     0,    72,   186,   201,
-   234,   152,   244,   153,   190,    38,    17,   234,    73,    17,
-   234,     0,    73,     0,    74,     0,   241,   171,   232,   155,
-    17,   234,     0,   171,   232,   155,    17,   234,     0,   176,
-   247,     0,   199,   158,   234,   155,   234,   160,     0,   243,
-   155,   158,   234,   155,   234,   160,     0,   199,   188,   234,
-   188,     0,    17,   188,   234,   188,     0,   244,   155,   199,
-   188,   234,   188,     0,   244,   155,    17,   188,   234,   188,
-     0,     0,     0,   245,   155,   235,     0,    57,    56,     0,
-    56,     0,   166,   199,   234,   155,   234,     0,   167,   199,
-   234,   155,   234,     0,    90,   169,   199,   234,   155,   234,
-     0,    91,   170,   199,   234,   155,   234,     0,   168,   235,
-    38,   199,     0,   131,   235,   155,   235,   155,   235,     0,
-   132,   235,   155,   199,     0,   133,   235,   155,   235,     0,
-   134,   235,   155,   235,   155,   235,     0,   135,   235,   155,
-   235,   155,   235,     0,   130,   243,     0,   246,   186,   201,
-   234,   152,   244,   153,   190,     0,   249,     0,    36,     0,
-     0,   112,   199,   193,     0,   112,   199,   155,    11,   234,
-   193,     0,   113,   199,   193,     0,   113,   199,   155,    11,
-   234,   193,     0,   114,   235,     0,   248,   115,   199,   234,
-   193,     0,   248,   116,   235,   155,   199,   234,   193,     0,
-   136,   199,   233,   155,     4,     0,   117,   199,   234,   245,
-     0
-};
+/* Line 216 of yacc.c.  */
+#line 1402 "llvmAsmParser.tab.c"
 
+#ifdef short
+# undef short
 #endif
 
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-  1112,  1112,  1112,  1112,  1112,  1112,  1112,  1112,  1112,  1113,
-  1113,  1113,  1113,  1113,  1113,  1114,  1114,  1114,  1114,  1114,
-  1114,  1114,  1115,  1115,  1115,  1115,  1115,  1118,  1118,  1119,
-  1119,  1120,  1120,  1121,  1121,  1122,  1122,  1126,  1126,  1127,
-  1127,  1128,  1128,  1129,  1129,  1130,  1130,  1131,  1131,  1132,
-  1132,  1133,  1134,  1139,  1140,  1140,  1140,  1140,  1140,  1142,
-  1142,  1142,  1143,  1143,  1145,  1146,  1150,  1154,  1159,  1159,
-  1161,  1162,  1167,  1173,  1174,  1175,  1176,  1177,  1181,  1182,
-  1183,  1187,  1188,  1189,  1190,  1194,  1195,  1196,  1200,  1201,
-  1202,  1203,  1204,  1208,  1209,  1210,  1213,  1213,  1214,  1215,
-  1216,  1217,  1218,  1226,  1227,  1228,  1229,  1230,  1231,  1232,
-  1233,  1234,  1235,  1239,  1240,  1245,  1246,  1247,  1248,  1249,
-  1250,  1253,  1254,  1259,  1260,  1267,  1267,  1274,  1274,  1284,
-  1292,  1292,  1298,  1298,  1300,  1305,  1318,  1318,  1318,  1318,
-  1318,  1318,  1318,  1321,  1325,  1329,  1336,  1341,  1349,  1379,
-  1404,  1409,  1419,  1429,  1433,  1443,  1450,  1459,  1466,  1471,
-  1476,  1483,  1484,  1491,  1498,  1506,  1512,  1524,  1552,  1568,
-  1595,  1623,  1649,  1669,  1695,  1715,  1727,  1734,  1800,  1810,
-  1820,  1826,  1836,  1842,  1852,  1857,  1862,  1875,  1887,  1909,
-  1917,  1923,  1934,  1939,  1944,  1950,  1956,  1965,  1969,  1977,
-  1977,  1980,  1980,  1983,  1995,  2016,  2021,  2029,  2030,  2034,
-  2034,  2038,  2038,  2041,  2044,  2068,  2079,  2087,  2090,  2096,
-  2099,  2106,  2110,  2150,  2153,  2159,  2169,  2173,  2178,  2180,
-  2185,  2190,  2199,  2209,  2220,  2224,  2233,  2242,  2247,  2373,
-  2373,  2375,  2384,  2384,  2386,  2391,  2403,  2407,  2412,  2416,
-  2420,  2424,  2428,  2432,  2436,  2440,  2444,  2469,  2473,  2483,
-  2487,  2491,  2496,  2503,  2503,  2509,  2518,  2523,  2528,  2532,
-  2541,  2550,  2559,  2563,  2567,  2572,  2578,  2586,  2590,  2595,
-  2605,  2624,  2633,  2714,  2718,  2725,  2736,  2749,  2759,  2770,
-  2780,  2791,  2799,  2809,  2816,  2819,  2820,  2827,  2831,  2836,
-  2852,  2869,  2883,  2897,  2909,  2917,  2924,  2930,  2936,  2942,
-  2957,  3043,  3048,  3052,  3059,  3066,  3074,  3081,  3089,  3097,
-  3111,  3128,  3136
-};
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
 #endif
 
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
 
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
 
-static const char * const yytname[] = {   "$","error","$undefined.","ESINT64VAL",
-"EUINT64VAL","ESAPINTVAL","EUAPINTVAL","LOCALVAL_ID","GLOBALVAL_ID","FPVAL",
-"VOID","INTTYPE","FLOAT","DOUBLE","X86_FP80","FP128","PPC_FP128","LABEL","TYPE",
-"LOCALVAR","GLOBALVAR","LABELSTR","STRINGCONSTANT","ATSTRINGCONSTANT","PCTSTRINGCONSTANT",
-"ZEROINITIALIZER","TRUETOK","FALSETOK","BEGINTOK","ENDTOK","DECLARE","DEFINE",
-"GLOBAL","CONSTANT","SECTION","ALIAS","VOLATILE","THREAD_LOCAL","TO","DOTDOTDOT",
-"NULL_TOK","UNDEF","INTERNAL","LINKONCE","WEAK","APPENDING","DLLIMPORT","DLLEXPORT",
-"EXTERN_WEAK","OPAQUE","EXTERNAL","TARGET","TRIPLE","ALIGN","ADDRSPACE","DEPLIBS",
-"CALL","TAIL","ASM_TOK","MODULE","SIDEEFFECT","CC_TOK","CCC_TOK","FASTCC_TOK",
-"COLDCC_TOK","X86_STDCALLCC_TOK","X86_FASTCALLCC_TOK","DATALAYOUT","UNWINDS",
-"RET","BR","SWITCH","INVOKE","UNWIND","UNREACHABLE","ADD","SUB","MUL","UDIV",
-"SDIV","FDIV","UREM","SREM","FREM","AND","OR","XOR","SHL","LSHR","ASHR","ICMP",
-"FCMP","EQ","NE","SLT","SGT","SLE","SGE","ULT","UGT","ULE","UGE","OEQ","ONE",
-"OLT","OGT","OLE","OGE","ORD","UNO","UEQ","UNE","MALLOC","ALLOCA","FREE","LOAD",
-"STORE","GETELEMENTPTR","TRUNC","ZEXT","SEXT","FPTRUNC","FPEXT","BITCAST","UITOFP",
-"SITOFP","FPTOUI","FPTOSI","INTTOPTR","PTRTOINT","PHI_TOK","SELECT","VAARG",
-"EXTRACTELEMENT","INSERTELEMENT","SHUFFLEVECTOR","GETRESULT","SIGNEXT","ZEROEXT",
-"NORETURN","INREG","SRET","NOUNWIND","NOALIAS","BYVAL","NEST","READNONE","READONLY",
-"GC","DEFAULT","HIDDEN","PROTECTED","'('","')'","'='","','","'*'","'\\\\'","'['",
-"'x'","']'","'<'","'>'","'{'","'}'","'c'","ArithmeticOps","LogicalOps","CastOps",
-"IPredicates","FPredicates","IntType","FPType","LocalName","OptLocalName","OptAddrSpace",
-"OptLocalAssign","GlobalName","OptGlobalAssign","GlobalAssign","GVInternalLinkage",
-"GVExternalLinkage","GVVisibilityStyle","FunctionDeclareLinkage","FunctionDefineLinkage",
-"AliasLinkage","OptCallingConv","ParamAttr","OptParamAttrs","FuncAttr","OptFuncAttrs",
-"OptGC","OptAlign","OptCAlign","SectionString","OptSection","GlobalVarAttributes",
-"GlobalVarAttribute","PrimType","Types","ArgType","ResultTypes","ArgTypeList",
-"ArgTypeListI","TypeListI","ConstVal","ConstExpr","ConstVector","GlobalType",
-"ThreadLocal","AliaseeRef","Module","DefinitionList","Definition","@1","@2",
-"@3","@4","@5","AsmBlock","TargetDefinition","LibrariesDefinition","LibList",
-"ArgListH","ArgList","FunctionHeaderH","BEGIN","FunctionHeader","END","Function",
-"FunctionProto","OptSideEffect","ConstValueRef","SymbolicValueRef","ValueRef",
-"ResolvedVal","ReturnedVal","BasicBlockList","BasicBlock","InstructionList",
-"BBTerminatorInst","JumpTable","Inst","PHIList","ParamList","IndexList","OptTailCall",
-"InstVal","OptVolatile","MemoryInst", NULL
-};
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
 #endif
 
-static const short yyr1[] = {     0,
-   166,   166,   166,   166,   166,   166,   166,   166,   166,   167,
-   167,   167,   167,   167,   167,   168,   168,   168,   168,   168,
-   168,   168,   168,   168,   168,   168,   168,   169,   169,   169,
-   169,   169,   169,   169,   169,   169,   169,   170,   170,   170,
-   170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
-   170,   170,   170,   171,   172,   172,   172,   172,   172,   173,
-   173,   173,   174,   174,   175,   175,   176,   176,   177,   177,
-   178,   178,   179,   180,   180,   180,   180,   180,   181,   181,
-   181,   182,   182,   182,   182,   183,   183,   183,   184,   184,
-   184,   184,   184,   185,   185,   185,   186,   186,   186,   186,
-   186,   186,   186,   187,   187,   187,   187,   187,   187,   187,
-   187,   187,   187,   188,   188,   189,   189,   189,   189,   189,
-   189,   190,   190,   191,   191,   192,   192,   193,   193,   194,
-   195,   195,   196,   196,   197,   197,   198,   198,   198,   198,
-   198,   198,   198,   199,   199,   199,   199,   199,   199,   199,
-   199,   199,   199,   199,   199,   199,   200,   201,   201,   202,
-   202,   203,   203,   203,   203,   204,   204,   205,   205,   205,
-   205,   205,   205,   205,   205,   205,   205,   205,   205,   205,
-   205,   205,   205,   205,   205,   205,   205,   206,   206,   206,
-   206,   206,   206,   206,   206,   206,   206,   207,   207,   208,
-   208,   209,   209,   210,   210,   211,   211,   212,   212,   214,
-   213,   215,   213,   213,   213,   213,   216,   213,   217,   213,
-   218,   213,   213,   213,   213,   219,   220,   220,   221,   222,
-   222,   222,   223,   223,   224,   224,   224,   224,   225,   226,
-   226,   227,   228,   228,   229,   230,   231,   231,   232,   232,
-   232,   232,   232,   232,   232,   232,   232,   232,   232,   233,
-   233,   233,   233,   234,   234,   235,   236,   236,   237,   237,
-   238,   239,   239,   239,   239,   239,   240,   240,   240,   240,
-   240,   240,   240,   240,   240,   241,   241,   242,   243,   243,
-   244,   244,   244,   244,   244,   245,   245,   246,   246,   247,
-   247,   247,   247,   247,   247,   247,   247,   247,   247,   247,
-   247,   247,   248,   248,   249,   249,   249,   249,   249,   249,
-   249,   249,   249
-};
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
 
-static const short yyr2[] = {     0,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     0,     4,     0,     2,     0,     1,     1,
-     1,     0,     2,     1,     1,     1,     1,     1,     1,     1,
-     1,     0,     1,     1,     1,     0,     1,     1,     0,     1,
-     1,     1,     1,     0,     1,     1,     0,     1,     1,     1,
-     1,     1,     2,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     2,     0,     2,     1,     1,     1,     1,     1,
-     1,     0,     2,     0,     2,     0,     2,     0,     3,     2,
-     0,     1,     0,     3,     1,     2,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     3,     1,     2,     5,     5,
-     5,     5,     3,     2,     5,     4,     2,     1,     1,     1,
-     3,     1,     3,     1,     0,     1,     3,     4,     3,     3,
-     4,     4,     3,     6,     5,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     6,     5,     8,
-     6,     6,     7,     7,     6,     8,     8,     3,     1,     1,
-     1,     1,     0,     2,     6,     1,     0,     1,     2,     0,
-     3,     0,     3,     3,     3,     3,     0,     8,     0,     9,
-     0,     9,     5,     2,     3,     1,     3,     3,     3,     3,
-     1,     0,     5,     3,     1,     3,     1,     0,    10,     1,
-     1,     4,     1,     1,     2,     3,     0,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     3,     1,     5,     1,
-     1,     1,     1,     1,     1,     2,     1,     3,     2,     2,
-     3,     2,     0,     3,     1,     4,     2,     2,     3,     9,
-     9,     8,    14,     1,     1,     6,     5,     2,     6,     7,
-     4,     4,     6,     6,     0,     0,     3,     2,     1,     5,
-     5,     6,     6,     4,     6,     4,     4,     6,     6,     2,
-     8,     1,     1,     0,     3,     6,     3,     6,     2,     5,
-     7,     5,     4
-};
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
 
-static const short yydefact[] = {    72,
-    60,    69,    61,    70,    62,   212,   210,     0,     0,     0,
-     0,     0,     0,    82,    71,    72,   208,    86,    89,     0,
-     0,   224,     0,     0,    67,     0,    73,    74,    76,    75,
-    77,    79,    78,    80,    81,    83,    84,    85,    82,    82,
-   203,   209,    87,    88,    82,   213,    90,    91,    92,    93,
-    82,   273,   211,   273,     0,     0,   232,   225,   226,   214,
-   260,   261,   216,   137,   138,   139,   142,   141,   140,   143,
-   144,     0,     0,     0,     0,   262,   263,   145,   215,   147,
-   203,   203,    94,   202,     0,    97,    97,   275,     0,   270,
-    68,   243,   244,   245,   269,   227,   228,   231,     0,   165,
-   148,     0,     0,     0,     0,   154,   166,     0,     0,   165,
-     0,     0,     0,    96,    95,     0,   200,   201,     0,     0,
-    98,    99,   100,   101,   102,     0,   246,     0,     0,     0,
-   314,   272,     0,   229,   164,   114,   160,   162,     0,     0,
-     0,     0,     0,     0,   153,     0,     0,   146,     0,     0,
-   159,     0,   158,     0,   223,   137,   138,   139,   142,   141,
-   140,     0,     0,    66,    66,   103,     0,   240,   241,   242,
-     0,   249,   250,   251,   256,   252,   253,   254,   255,   247,
-     1,     2,     3,     4,     5,     6,     7,     8,     9,    13,
-    14,    15,    10,    11,    12,     0,     0,     0,    16,    17,
-    18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-     0,     0,     0,     0,     0,     0,     0,     0,   258,   265,
-   264,   274,   313,   299,     0,     0,     0,     0,    97,   284,
-   285,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   271,    97,   288,
-     0,   312,   230,   157,     0,   122,    66,    66,   156,     0,
-   167,     0,   122,    66,    66,     0,   204,   185,   186,   181,
-   183,   182,   184,   187,   180,   176,   177,     0,     0,     0,
-     0,   179,   178,   217,     0,   276,   248,     0,    28,    29,
-    30,    31,    32,    33,    34,    35,    36,    37,     0,    52,
-    53,    48,    49,    50,    51,    38,    39,    40,    41,    42,
-    43,    44,    45,    46,    47,     0,     0,     0,     0,     0,
-     0,   199,     0,     0,     0,     0,   298,   278,    66,   267,
-   277,     0,     0,    54,     0,     0,     0,     0,   128,   128,
-   319,    66,    66,   310,     0,     0,     0,     0,     0,    66,
-    66,    66,     0,     0,     0,     0,     0,   105,   107,   106,
-   104,   108,   109,   110,   111,   112,   115,   163,   161,   150,
-   151,   152,   155,    65,   149,   219,   221,     0,   169,     0,
-     0,     0,   173,     0,   170,   133,   238,     0,     0,     0,
-   296,     0,     0,     0,     0,     0,   257,     0,     0,     0,
-   266,     0,     0,   279,     0,     0,    66,    66,     0,   315,
-     0,   317,   296,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,    66,     0,   113,   119,   118,
-   116,   117,   120,   121,   123,   133,   133,     0,   168,   154,
-   166,     0,   171,   172,     0,   218,   237,   114,   235,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   198,     0,
-     0,     0,   268,     0,     0,     0,     0,     0,     0,     0,
-     0,   323,     0,     0,     0,   306,   307,     0,     0,     0,
-     0,     0,   304,     0,   128,     0,   220,   222,    66,   175,
-     0,     0,     0,   135,   133,    64,     0,   122,   259,     0,
-     0,   189,     0,     0,     0,     0,     0,     0,     0,    66,
-     0,     0,   295,     0,     0,   128,   129,   128,     0,     0,
-     0,     0,     0,   322,   300,   301,   295,     0,   320,    66,
-   205,   174,   130,   136,   134,    63,   234,   236,   114,   131,
-     0,     0,   297,     0,   195,     0,     0,   191,   192,   188,
-     0,     0,   114,   114,     0,   302,   303,   316,   318,     0,
-     0,   305,   308,   309,     0,   128,    64,   132,   126,   193,
-   194,     0,     0,     0,     0,     0,     0,     0,   122,     0,
-   289,     0,   122,   321,   233,     0,   124,   190,   196,   197,
-     0,   282,     0,     0,   105,   107,   114,   114,     0,   114,
-   114,   290,   311,   127,     0,   239,   280,     0,   281,     0,
-   292,   291,     0,     0,     0,   125,     0,     0,     0,   114,
-   114,     0,     0,     0,   294,   293,   287,     0,     0,   286,
-     0,   283,     0,     0,     0
-};
+#if ! defined yyoverflow || YYERROR_VERBOSE
 
-static const short yydefgoto[] = {   216,
-   217,   218,   299,   316,   162,   163,    76,   537,   111,    12,
-    77,    14,    15,    39,    40,    41,    45,    51,   116,   126,
-   367,   254,   435,   370,   606,   587,   410,   494,   569,   446,
-   495,    78,   164,   137,   154,   138,   139,   108,   322,   219,
-   323,   119,    85,   155,   633,    16,    17,    19,    18,   386,
-   436,   437,    60,    22,    58,    99,   449,   450,   127,   170,
-    52,    94,    53,    46,   288,   220,    80,   222,   330,   331,
-    54,    90,    91,   248,   594,   132,   344,   555,   454,   249,
-   250,   251,   252
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 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 (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  43
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   2015
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  166
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  85
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  324
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  635
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   406
+
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     152,   153,   156,     2,   155,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     161,   154,   162,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,   158,   157,   160,     2,     2,     2,     2,     2,   165,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     159,     2,     2,   163,     2,   164,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151
 };
 
-static const short yypact[] = {   504,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,   -13,  -126,   -26,
-   -90,   107,   -69,   256,-32768,   633,-32768,   126,   205,    19,
-    29,-32768,    31,   125,-32768,  1570,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   174,   174,
-   190,-32768,-32768,-32768,   174,-32768,-32768,-32768,-32768,-32768,
-   174,     1,-32768,    -2,   178,   202,   212,-32768,-32768,-32768,
--32768,-32768,    83,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,   251,   257,     8,    33,-32768,-32768,-32768,    74,-32768,
-   223,   223,   253,-32768,    82,   255,   255,   200,   235,-32768,
-   245,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -88,  1124,
--32768,   128,   137,   813,    83,-32768,    74,   -65,   134,  1124,
-   154,    82,    82,-32768,-32768,  1370,-32768,-32768,  1610,   307,
--32768,-32768,-32768,-32768,-32768,  1650,-32768,    -7,   289,   904,
-  1865,-32768,   306,-32768,-32768,    74,-32768,   179,   176,  1690,
-  1690,   177,   -55,  1690,-32768,   338,   198,-32768,  1610,  1690,
-    83,   191,    74,   365,-32768,   342,   344,   345,   351,   361,
-   372,   273,   373,  1180,   332,-32768,   162,-32768,-32768,-32768,
-   904,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   323,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,   329,   489,   238,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-   239,   246,   250,   258,  1610,   261,   263,   264,-32768,-32768,
--32768,-32768,-32768,-32768,   341,  1730,   102,   392,   255,-32768,
--32768,   329,   489,  1690,  1690,  1690,  1690,  1690,  1690,  1690,
-  1690,  1690,  1690,  1690,  1690,  1690,  1690,-32768,   255,-32768,
-    45,-32768,-32768,   221,  1450,-32768,     7,   -29,-32768,   247,
-    74,   265,-32768,   332,   -30,  1370,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,  1410,  1770,   853,
-   386,-32768,-32768,-32768,   279,-32768,-32768,   395,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   280,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,   282,  1610,  1610,  1610,  1610,
-  1610,-32768,   -67,  1610,  1610,  1610,-32768,    83,   764,-32768,
-   285,   904,   904,-32768,   904,  1650,  1690,  1690,    43,    49,
--32768,   764,   -31,   288,   292,   293,   295,   296,   297,    51,
-   764,   764,   397,  1650,  1690,  1690,   449,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   146,
--32768,-32768,-32768,-32768,   146,-32768,   154,   416,-32768,   -62,
-  1078,   -10,-32768,   -15,-32768,   302,  1490,   303,  1610,  1610,
--32768,   304,   309,   312,   313,  1610,-32768,   314,   315,   423,
--32768,  1690,   316,-32768,   317,   904,   764,   764,    25,-32768,
-    26,-32768,-32768,   904,   318,  1690,  1690,  1690,  1690,  1690,
-   319,   320,   322,  1690,   904,   764,   325,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,   302,   302,  1690,-32768,   321,
-  1033,   -11,-32768,-32768,    28,-32768,-32768,    74,   326,   331,
-   456,   327,   330,   152,  1610,  1610,  1610,  1610,-32768,  1610,
-  1610,  1690,-32768,   469,   470,   336,   335,   337,   904,   490,
-   904,   340,   346,   904,   347,    74,-32768,   350,   354,   496,
-   904,   904,    74,   362,   358,  1690,-32768,-32768,    23,-32768,
-   355,   471,   502,-32768,   302,   113,  1530,-32768,-32768,  1610,
-  1610,-32768,  1690,   364,   367,   370,   376,   379,   380,    54,
-   904,   904,  1810,   904,   904,   358,-32768,   358,   904,   381,
-  1690,  1690,  1690,-32768,-32768,-32768,  1810,   484,-32768,   764,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    74,    -8,
-   385,   387,-32768,  1610,-32768,  1610,  1610,-32768,-32768,-32768,
-   384,   383,   114,    74,   180,-32768,-32768,-32768,-32768,   382,
-   904,-32768,-32768,-32768,   197,   358,   113,-32768,   493,-32768,
--32768,   390,   394,   398,   531,     3,   621,   621,-32768,  1850,
--32768,   393,-32768,-32768,-32768,   546,   406,-32768,-32768,-32768,
-   904,-32768,  1321,     9,   405,   408,-32768,-32768,     4,   114,
-    74,-32768,   146,-32768,   540,-32768,-32768,   409,-32768,  1321,
-   221,   221,   548,   621,   621,-32768,   549,   413,   904,-32768,
--32768,   904,   552,   497,   221,   221,-32768,   904,   554,-32768,
-   904,-32768,   572,   574,-32768
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     5,     7,     9,    11,    13,    15,    17,
+      19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
+      39,    41,    43,    45,    47,    49,    51,    53,    55,    57,
+      59,    61,    63,    65,    67,    69,    71,    73,    75,    77,
+      79,    81,    83,    85,    87,    89,    91,    93,    95,    97,
+      99,   101,   103,   105,   107,   109,   111,   113,   115,   117,
+     119,   121,   123,   125,   127,   129,   130,   135,   136,   139,
+     140,   142,   144,   146,   147,   150,   152,   154,   156,   158,
+     160,   162,   164,   166,   167,   169,   171,   173,   174,   176,
+     178,   179,   181,   183,   185,   187,   188,   190,   192,   193,
+     195,   197,   199,   201,   203,   206,   208,   210,   212,   214,
+     216,   218,   220,   222,   224,   227,   228,   231,   233,   235,
+     237,   239,   241,   243,   244,   247,   248,   251,   252,   255,
+     256,   260,   263,   264,   266,   267,   271,   273,   276,   278,
+     280,   282,   284,   286,   288,   290,   292,   294,   298,   300,
+     303,   309,   315,   321,   327,   331,   334,   340,   345,   348,
+     350,   352,   354,   358,   360,   364,   366,   367,   369,   373,
+     378,   382,   386,   391,   396,   400,   407,   413,   416,   419,
+     422,   425,   428,   431,   434,   437,   440,   443,   446,   449,
+     456,   462,   471,   478,   485,   493,   501,   508,   517,   526,
+     530,   532,   534,   536,   538,   539,   542,   549,   551,   552,
+     554,   557,   558,   562,   563,   567,   571,   575,   579,   580,
+     589,   590,   600,   601,   611,   617,   620,   624,   626,   630,
+     634,   638,   642,   644,   645,   651,   655,   657,   661,   663,
+     664,   675,   677,   679,   684,   686,   688,   691,   695,   696,
+     698,   700,   702,   704,   706,   708,   710,   712,   714,   718,
+     720,   726,   728,   730,   732,   734,   736,   738,   741,   743,
+     747,   750,   753,   757,   760,   761,   765,   767,   772,   775,
+     778,   782,   792,   802,   811,   826,   828,   830,   837,   843,
+     846,   853,   861,   866,   871,   878,   885,   886,   887,   891,
+     894,   896,   902,   908,   915,   922,   927,   934,   939,   944,
+     951,   958,   961,   970,   972,   974,   975,   979,   986,   990,
+     997,  1000,  1006,  1014,  1020
 };
 
-static const short yypgoto[] = {   445,
-   446,   448,   348,   349,  -227,-32768,     0,    14,  -100,   492,
-    13,-32768,-32768,-32768,-32768,    67,-32768,-32768,-32768,  -166,
--32768,  -443,-32768,  -257,-32768,-32768,  -337,    44,-32768,  -406,
--32768,-32768,   -24,   352,  -108,-32768,   491,   498,   -81,  -147,
-  -245,    80,   127,   339,-32768,-32768,   587,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   517,-32768,
--32768,-32768,-32768,-32768,-32768,  -506,   -70,   104,  -232,-32768,
--32768,   555,-32768,-32768,-32768,-32768,-32768,    79,   195,-32768,
--32768,-32768,-32768
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
+{
+     212,     0,    -1,    75,    -1,    76,    -1,    77,    -1,    78,
+      -1,    79,    -1,    80,    -1,    81,    -1,    82,    -1,    83,
+      -1,    87,    -1,    88,    -1,    89,    -1,    84,    -1,    85,
+      -1,    86,    -1,   118,    -1,   119,    -1,   120,    -1,   121,
+      -1,   122,    -1,   123,    -1,   124,    -1,   125,    -1,   126,
+      -1,   127,    -1,   128,    -1,   129,    -1,    92,    -1,    93,
+      -1,    94,    -1,    95,    -1,    96,    -1,    97,    -1,    98,
+      -1,    99,    -1,   100,    -1,   101,    -1,   102,    -1,   103,
+      -1,   104,    -1,   105,    -1,   106,    -1,   107,    -1,   108,
+      -1,   109,    -1,   110,    -1,   111,    -1,    98,    -1,    99,
+      -1,   100,    -1,   101,    -1,    26,    -1,    27,    -1,    11,
+      -1,    12,    -1,    13,    -1,    16,    -1,    15,    -1,    14,
+      -1,    19,    -1,    22,    -1,    24,    -1,   174,    -1,    -1,
+      54,   152,     4,   153,    -1,    -1,   174,   154,    -1,    -1,
+      20,    -1,    23,    -1,   180,    -1,    -1,   178,   154,    -1,
+      42,    -1,    44,    -1,    43,    -1,    45,    -1,    47,    -1,
+      46,    -1,    48,    -1,    50,    -1,    -1,   149,    -1,   150,
+      -1,   151,    -1,    -1,    46,    -1,    48,    -1,    -1,    42,
+      -1,    43,    -1,    44,    -1,    47,    -1,    -1,    44,    -1,
+      42,    -1,    -1,    62,    -1,    63,    -1,    64,    -1,    65,
+      -1,    66,    -1,    61,     4,    -1,   138,    -1,   119,    -1,
+     137,    -1,   120,    -1,   140,    -1,   141,    -1,   143,    -1,
+     144,    -1,   145,    -1,    53,     4,    -1,    -1,   189,   188,
+      -1,   139,    -1,   142,    -1,   138,    -1,   137,    -1,   146,
+      -1,   147,    -1,    -1,   191,   190,    -1,    -1,   148,    22,
+      -1,    -1,    53,     4,    -1,    -1,   155,    53,     4,    -1,
+      34,    22,    -1,    -1,   195,    -1,    -1,   155,   198,   197,
+      -1,   195,    -1,    53,     4,    -1,    11,    -1,    12,    -1,
+      13,    -1,    16,    -1,    15,    -1,    14,    -1,    17,    -1,
+      49,    -1,   199,    -1,   200,   176,   156,    -1,   234,    -1,
+     157,     4,    -1,   200,   152,   204,   153,   191,    -1,    10,
+     152,   204,   153,   191,    -1,   158,     4,   159,   200,   160,
+      -1,   161,     4,   159,   200,   162,    -1,   163,   205,   164,
+      -1,   163,   164,    -1,   161,   163,   205,   164,   162,    -1,
+     161,   163,   164,   162,    -1,   200,   189,    -1,   200,    -1,
+      10,    -1,   201,    -1,   203,   155,   201,    -1,   203,    -1,
+     203,   155,    39,    -1,    39,    -1,    -1,   200,    -1,   205,
+     155,   200,    -1,   200,   158,   208,   160,    -1,   200,   158,
+     160,    -1,   200,   165,    22,    -1,   200,   161,   208,   162,
+      -1,   200,   163,   208,   164,    -1,   200,   163,   164,    -1,
+     200,   161,   163,   208,   164,   162,    -1,   200,   161,   163,
+     164,   162,    -1,   200,    40,    -1,   200,    41,    -1,   200,
+     234,    -1,   200,   207,    -1,   200,    25,    -1,   172,     3,
+      -1,   172,     5,    -1,   172,     4,    -1,   172,     6,    -1,
+      11,    26,    -1,    11,    27,    -1,   173,     9,    -1,   169,
+     152,   206,    38,   200,   153,    -1,   117,   152,   206,   246,
+     153,    -1,   131,   152,   206,   155,   206,   155,   206,   153,
+      -1,   167,   152,   206,   155,   206,   153,    -1,   168,   152,
+     206,   155,   206,   153,    -1,    90,   170,   152,   206,   155,
+     206,   153,    -1,    91,   171,   152,   206,   155,   206,   153,
+      -1,   133,   152,   206,   155,   206,   153,    -1,   134,   152,
+     206,   155,   206,   155,   206,   153,    -1,   135,   152,   206,
+     155,   206,   155,   206,   153,    -1,   208,   155,   206,    -1,
+     206,    -1,    32,    -1,    33,    -1,    37,    -1,    -1,   202,
+     234,    -1,   123,   152,   211,    38,   200,   153,    -1,   213,
+      -1,    -1,   214,    -1,   213,   214,    -1,    -1,    31,   215,
+     230,    -1,    -1,    30,   216,   231,    -1,    59,    58,   220,
+      -1,   177,    18,   200,    -1,   177,    18,    10,    -1,    -1,
+     179,   183,   210,   209,   206,   176,   217,   197,    -1,    -1,
+     179,   181,   183,   210,   209,   206,   176,   218,   197,    -1,
+      -1,   179,   182,   183,   210,   209,   200,   176,   219,   197,
+      -1,   179,   183,    35,   186,   211,    -1,    51,   221,    -1,
+      55,   154,   222,    -1,    22,    -1,    52,   154,    22,    -1,
+      67,   154,    22,    -1,   158,   223,   160,    -1,   223,   155,
+      22,    -1,    22,    -1,    -1,   224,   155,   200,   189,   175,
+      -1,   200,   189,   175,    -1,   224,    -1,   224,   155,    39,
+      -1,    39,    -1,    -1,   187,   202,   178,   152,   225,   153,
+     191,   196,   193,   192,    -1,    28,    -1,   163,    -1,   185,
+     183,   226,   227,    -1,    29,    -1,   164,    -1,   238,   229,
+      -1,   184,   183,   226,    -1,    -1,    60,    -1,     3,    -1,
+       4,    -1,     9,    -1,    26,    -1,    27,    -1,    40,    -1,
+      41,    -1,    25,    -1,   161,   208,   162,    -1,   207,    -1,
+      58,   232,    22,   155,    22,    -1,     7,    -1,     8,    -1,
+     174,    -1,   178,    -1,   234,    -1,   233,    -1,   200,   235,
+      -1,   236,    -1,   237,   155,   236,    -1,   238,   239,    -1,
+     228,   239,    -1,   240,   177,   241,    -1,   240,   243,    -1,
+      -1,    68,    38,   235,    -1,    21,    -1,    21,    68,    38,
+     235,    -1,    69,   237,    -1,    69,    10,    -1,    70,    17,
+     235,    -1,    70,    11,   235,   155,    17,   235,   155,    17,
+     235,    -1,    71,   172,   235,   155,    17,   235,   158,   242,
+     160,    -1,    71,   172,   235,   155,    17,   235,   158,   160,
+      -1,    72,   187,   202,   235,   152,   245,   153,   191,    38,
+      17,   235,    73,    17,   235,    -1,    73,    -1,    74,    -1,
+     242,   172,   233,   155,    17,   235,    -1,   172,   233,   155,
+      17,   235,    -1,   177,   248,    -1,   200,   158,   235,   155,
+     235,   160,    -1,   244,   155,   158,   235,   155,   235,   160,
+      -1,   200,   189,   235,   189,    -1,    17,   189,   235,   189,
+      -1,   245,   155,   200,   189,   235,   189,    -1,   245,   155,
+      17,   189,   235,   189,    -1,    -1,    -1,   246,   155,   236,
+      -1,    57,    56,    -1,    56,    -1,   167,   200,   235,   155,
+     235,    -1,   168,   200,   235,   155,   235,    -1,    90,   170,
+     200,   235,   155,   235,    -1,    91,   171,   200,   235,   155,
+     235,    -1,   169,   236,    38,   200,    -1,   131,   236,   155,
+     236,   155,   236,    -1,   132,   236,   155,   200,    -1,   133,
+     236,   155,   236,    -1,   134,   236,   155,   236,   155,   236,
+      -1,   135,   236,   155,   236,   155,   236,    -1,   130,   244,
+      -1,   247,   187,   202,   235,   152,   245,   153,   191,    -1,
+     250,    -1,    36,    -1,    -1,   112,   200,   194,    -1,   112,
+     200,   155,    11,   235,   194,    -1,   113,   200,   194,    -1,
+     113,   200,   155,    11,   235,   194,    -1,   114,   236,    -1,
+     249,   115,   200,   235,   194,    -1,   249,   116,   236,   155,
+     200,   235,   194,    -1,   136,   200,   234,   155,     4,    -1,
+     117,   200,   235,   246,    -1
 };
 
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,  1112,  1112,  1112,  1112,  1112,  1112,  1112,  1112,  1112,
+    1112,  1113,  1113,  1113,  1113,  1113,  1113,  1114,  1114,  1114,
+    1114,  1114,  1114,  1115,  1115,  1115,  1115,  1115,  1115,  1118,
+    1118,  1119,  1119,  1120,  1120,  1121,  1121,  1122,  1122,  1126,
+    1126,  1127,  1127,  1128,  1128,  1129,  1129,  1130,  1130,  1131,
+    1131,  1132,  1132,  1133,  1134,  1139,  1140,  1140,  1140,  1140,
+    1140,  1142,  1142,  1142,  1143,  1143,  1145,  1146,  1150,  1154,
+    1159,  1159,  1161,  1162,  1167,  1173,  1174,  1175,  1176,  1177,
+    1181,  1182,  1183,  1187,  1188,  1189,  1190,  1194,  1195,  1196,
+    1200,  1201,  1202,  1203,  1204,  1208,  1209,  1210,  1213,  1214,
+    1215,  1216,  1217,  1218,  1219,  1226,  1227,  1228,  1229,  1230,
+    1231,  1232,  1233,  1234,  1235,  1239,  1240,  1245,  1246,  1247,
+    1248,  1249,  1250,  1253,  1254,  1259,  1260,  1267,  1268,  1274,
+    1275,  1284,  1292,  1293,  1298,  1299,  1300,  1305,  1318,  1318,
+    1318,  1318,  1318,  1318,  1318,  1321,  1325,  1329,  1336,  1341,
+    1349,  1379,  1404,  1409,  1419,  1429,  1433,  1443,  1450,  1459,
+    1466,  1471,  1476,  1483,  1484,  1491,  1498,  1506,  1512,  1524,
+    1552,  1568,  1595,  1623,  1649,  1669,  1695,  1715,  1727,  1734,
+    1800,  1810,  1820,  1826,  1836,  1842,  1852,  1857,  1862,  1875,
+    1887,  1909,  1917,  1923,  1934,  1939,  1944,  1950,  1956,  1965,
+    1969,  1977,  1977,  1980,  1980,  1983,  1995,  2016,  2021,  2029,
+    2030,  2034,  2034,  2038,  2038,  2041,  2044,  2068,  2080,  2079,
+    2091,  2090,  2100,  2099,  2110,  2150,  2153,  2159,  2169,  2173,
+    2178,  2180,  2185,  2190,  2199,  2209,  2220,  2224,  2233,  2242,
+    2247,  2373,  2373,  2375,  2384,  2384,  2386,  2391,  2403,  2407,
+    2412,  2416,  2420,  2424,  2428,  2432,  2436,  2440,  2444,  2469,
+    2473,  2483,  2487,  2491,  2496,  2503,  2503,  2509,  2518,  2523,
+    2528,  2532,  2541,  2550,  2559,  2563,  2567,  2572,  2579,  2586,
+    2590,  2595,  2605,  2624,  2633,  2714,  2718,  2725,  2736,  2749,
+    2759,  2770,  2780,  2791,  2799,  2809,  2816,  2819,  2820,  2827,
+    2831,  2836,  2852,  2869,  2883,  2897,  2909,  2917,  2924,  2930,
+    2936,  2942,  2957,  3043,  3048,  3052,  3059,  3066,  3074,  3081,
+    3089,  3097,  3111,  3128,  3136
+};
+#endif
 
-#define	YYLAST		2013
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[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", "ESINT64VAL", "EUINT64VAL", "ESAPINTVAL",
+  "EUAPINTVAL", "LOCALVAL_ID", "GLOBALVAL_ID", "FPVAL", "VOID", "INTTYPE",
+  "FLOAT", "DOUBLE", "X86_FP80", "FP128", "PPC_FP128", "LABEL", "TYPE",
+  "LOCALVAR", "GLOBALVAR", "LABELSTR", "STRINGCONSTANT",
+  "ATSTRINGCONSTANT", "PCTSTRINGCONSTANT", "ZEROINITIALIZER", "TRUETOK",
+  "FALSETOK", "BEGINTOK", "ENDTOK", "DECLARE", "DEFINE", "GLOBAL",
+  "CONSTANT", "SECTION", "ALIAS", "VOLATILE", "THREAD_LOCAL", "TO",
+  "DOTDOTDOT", "NULL_TOK", "UNDEF", "INTERNAL", "LINKONCE", "WEAK",
+  "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "OPAQUE",
+  "EXTERNAL", "TARGET", "TRIPLE", "ALIGN", "ADDRSPACE", "DEPLIBS", "CALL",
+  "TAIL", "ASM_TOK", "MODULE", "SIDEEFFECT", "CC_TOK", "CCC_TOK",
+  "FASTCC_TOK", "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK",
+  "DATALAYOUT", "UNWINDS", "RET", "BR", "SWITCH", "INVOKE", "UNWIND",
+  "UNREACHABLE", "ADD", "SUB", "MUL", "UDIV", "SDIV", "FDIV", "UREM",
+  "SREM", "FREM", "AND", "OR", "XOR", "SHL", "LSHR", "ASHR", "ICMP",
+  "FCMP", "EQ", "NE", "SLT", "SGT", "SLE", "SGE", "ULT", "UGT", "ULE",
+  "UGE", "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE", "ORD", "UNO", "UEQ",
+  "UNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE", "GETELEMENTPTR",
+  "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", "BITCAST", "UITOFP",
+  "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT", "PHI_TOK",
+  "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR",
+  "GETRESULT", "SIGNEXT", "ZEROEXT", "NORETURN", "INREG", "SRET",
+  "NOUNWIND", "NOALIAS", "BYVAL", "NEST", "READNONE", "READONLY", "GC",
+  "DEFAULT", "HIDDEN", "PROTECTED", "'('", "')'", "'='", "','", "'*'",
+  "'\\\\'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'", "'c'",
+  "$accept", "ArithmeticOps", "LogicalOps", "CastOps", "IPredicates",
+  "FPredicates", "IntType", "FPType", "LocalName", "OptLocalName",
+  "OptAddrSpace", "OptLocalAssign", "GlobalName", "OptGlobalAssign",
+  "GlobalAssign", "GVInternalLinkage", "GVExternalLinkage",
+  "GVVisibilityStyle", "FunctionDeclareLinkage", "FunctionDefineLinkage",
+  "AliasLinkage", "OptCallingConv", "ParamAttr", "OptParamAttrs",
+  "FuncAttr", "OptFuncAttrs", "OptGC", "OptAlign", "OptCAlign",
+  "SectionString", "OptSection", "GlobalVarAttributes",
+  "GlobalVarAttribute", "PrimType", "Types", "ArgType", "ResultTypes",
+  "ArgTypeList", "ArgTypeListI", "TypeListI", "ConstVal", "ConstExpr",
+  "ConstVector", "GlobalType", "ThreadLocal", "AliaseeRef", "Module",
+  "DefinitionList", "Definition", "@1", "@2", "@3", "@4", "@5", "AsmBlock",
+  "TargetDefinition", "LibrariesDefinition", "LibList", "ArgListH",
+  "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader", "END",
+  "Function", "FunctionProto", "OptSideEffect", "ConstValueRef",
+  "SymbolicValueRef", "ValueRef", "ResolvedVal", "ReturnedVal",
+  "BasicBlockList", "BasicBlock", "InstructionList", "BBTerminatorInst",
+  "JumpTable", "Inst", "PHIList", "ParamList", "IndexList", "OptTailCall",
+  "InstVal", "OptVolatile", "MemoryInst", 0
+};
+#endif
 
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,    40,    41,    61,    44,    42,    92,    91,   120,
+      93,    60,    62,   123,   125,    99
+};
+# endif
 
-static const short yytable[] = {    11,
-   335,    79,   412,   341,   496,   375,   345,   346,   347,   348,
-   349,   103,    13,   334,   353,    11,   282,   167,    88,   334,
-   168,    88,   109,   109,   109,   492,    92,    23,    13,   487,
-   488,    24,   380,   382,   384,   469,   471,   165,    20,    61,
-    62,   613,   105,    64,    65,    66,    67,    68,    69,    70,
-   107,     1,     2,    21,     3,     4,     5,    61,    62,   221,
-   109,   492,   336,    25,   284,    89,   133,   264,    89,     1,
-     2,   134,     3,     4,     5,   136,   109,   470,   470,   107,
-   493,    71,   354,   267,    27,   136,   608,   396,   535,   144,
-    11,   153,   396,   283,   397,   567,   109,   439,   145,   144,
-   221,   153,   109,   618,   109,    81,    82,   109,   260,   577,
-   578,    86,   332,   117,   118,   257,   258,    87,   333,   261,
-   110,   110,   110,   427,    26,   265,   414,   109,   429,   430,
-   431,     1,   372,   432,     3,   442,     5,   433,   434,   396,
-   429,   430,   431,   396,   396,   432,    59,   529,   444,   433,
-   434,   443,   491,   611,   612,   169,   614,   615,   110,   355,
-   356,    93,   592,   376,   377,   357,   371,  -143,   609,   463,
-   104,    43,    55,    44,   110,   531,   625,   626,   558,   285,
-   559,     2,    56,   475,     4,   477,   478,   479,    57,    72,
-    73,   149,   150,    74,   110,    75,   106,   409,   -66,    96,
-   110,   329,   110,   411,   -66,   110,   550,   112,   113,   339,
-   340,   329,   342,   343,   329,   329,   329,   329,   329,   350,
-   351,   352,   329,    97,    83,   110,    84,   406,   584,   -66,
-   136,   358,   359,    98,   100,   391,   392,   393,   394,   395,
-   540,   153,   398,   399,   400,   425,    47,    48,    49,   360,
-   361,    50,   362,   363,   101,   364,   365,   366,   221,    84,
-   102,   221,   221,     1,   221,  -143,     3,   129,     5,  -143,
-   543,   221,   130,   357,   286,   270,   271,   272,   273,   421,
-   221,   221,   429,   430,   431,   146,   140,   432,   562,   563,
-   564,   433,   434,   282,   114,   141,   115,    28,    29,    30,
-    31,    32,    33,    34,   502,    35,   503,   452,   453,   148,
-   166,   153,   407,   408,   459,   120,   121,   122,   123,   124,
-   125,   599,    36,    37,    38,   603,   171,   253,   256,   153,
-   426,   329,   579,   255,   580,   221,   221,   221,   259,   358,
-   359,   262,   266,   221,   -54,   -54,   -54,   -54,   593,   583,
-   263,   580,   -55,   -56,   221,   221,   441,   360,   361,   -59,
-   362,   363,   448,   364,   365,   366,   610,   268,   269,   -58,
-   283,    61,    62,   504,   505,   506,   507,   329,   508,   509,
-   -57,   274,   287,     1,     2,   109,     3,     4,     5,   317,
-   318,   329,   476,   329,   329,   329,   327,   319,   221,   483,
-   221,   320,   334,   221,    36,    37,    38,   385,   373,   321,
-   221,   221,   324,   489,   325,   326,   388,   374,   541,   542,
-   289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-   387,   389,   401,   390,   424,   403,   404,   510,   405,   402,
-   221,   221,   415,   221,   221,   413,   416,   417,   221,   418,
-   419,   420,   428,   438,   422,   423,   445,   451,   455,   221,
-   462,   530,   572,   456,   573,   574,   457,   458,   460,   461,
-   464,   465,   539,   480,   481,   474,   482,   499,   329,   486,
-   497,   500,   490,   498,   501,   511,   512,   513,   554,   514,
-   221,   515,   533,   517,   503,   536,   329,   329,   329,   524,
-   519,   521,   554,  -207,   522,   534,   221,   221,   523,   466,
-   467,   468,   528,   527,   300,   301,   532,   473,   544,   545,
-   221,   -68,     1,     2,   546,     3,     4,     5,   484,   485,
-   547,   548,   549,     6,     7,   561,   470,   570,   575,   571,
-   576,   581,   588,   221,   221,   586,   589,   591,   221,   604,
-   590,   221,   602,   605,     8,   601,   -17,   221,     9,   -18,
-   221,   616,    10,   617,   619,   622,   536,   623,   628,   629,
-   631,   634,   516,   635,   518,   245,   246,   520,   247,   337,
-   585,   338,   131,   568,   525,   526,   302,   303,   304,   305,
-   306,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-   147,   143,    42,   128,   378,   565,   369,   472,    95,     0,
-     0,     0,     0,     0,   551,   552,     0,   556,   557,     0,
-     0,     0,   560,   172,   173,     0,     0,    61,    62,   174,
-     0,     0,  -206,   566,     0,     0,     0,     0,     0,     1,
-     2,     0,     3,     4,     5,   175,   176,   177,     0,     0,
-   -68,     1,     2,     0,     3,     4,     5,     0,     0,     0,
-   178,   179,     6,     7,   582,     0,     0,     0,     0,     0,
-     0,     0,     0,   357,     0,     0,     0,     0,   180,     0,
-   597,   598,     0,     8,     0,     0,     0,     9,     0,     0,
-     0,    10,     0,     0,   607,   181,   182,   183,   184,   185,
-   186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
-   196,   197,     0,     0,     0,     0,     0,   620,   621,     0,
-     0,     0,   624,     0,     0,   627,     0,     0,     0,     0,
-     0,   630,     0,     0,   632,     0,     0,   198,   199,   595,
-   596,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     0,   211,     0,   212,   213,   214,     0,   360,   361,     0,
-   362,   363,     0,   364,   365,   366,   172,   173,     0,     0,
-    61,    62,   174,     0,     0,     0,     0,     0,     0,     0,
-     0,   215,     1,     2,     0,     3,     4,     5,   175,   176,
-   177,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   178,   179,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   109,     0,    61,
-    62,   180,   105,    64,    65,    66,    67,    68,    69,    70,
-     0,     1,     2,     0,     3,     4,     5,     0,   181,   182,
-   183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-   193,   194,   195,   196,   197,     0,     0,     0,     0,    61,
-    62,    71,   105,   156,   157,   158,   159,   160,   161,    70,
-     0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
-   198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
-   208,   209,   210,     0,   211,     0,   212,   213,   214,     0,
-     0,    71,     0,     0,     0,     0,   172,   173,     0,     0,
-    61,    62,   174,     0,     0,   110,     0,     0,     0,     0,
-     0,     0,     1,     2,   215,     3,     4,     5,   175,   176,
-   177,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   178,   179,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   180,     0,     0,     0,     0,     0,     0,     0,    72,
-    73,     0,     0,    74,     0,    75,   142,     0,   181,   182,
-   183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-   193,   194,   195,   196,   197,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,    72,
-    73,     0,     0,    74,     0,    75,   383,     0,     0,     0,
-   198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
-   208,   209,   210,     0,   211,     0,   212,   213,   214,    61,
-    62,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     1,     2,     0,     3,     4,     5,   275,     0,     0,
-     0,     0,     0,     0,   215,     0,     0,     0,     0,     0,
-     0,     0,   276,   277,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,    61,    62,   109,   105,   156,   157,
-   158,   159,   160,   161,    70,     0,     1,     2,     0,     3,
-     4,     5,     0,     0,     0,     0,     0,   181,   182,   183,
-   184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
-   194,   195,   196,   197,     0,     0,    71,     0,     0,     0,
-    61,    62,     0,   105,    64,    65,    66,    67,    68,    69,
-    70,     0,     1,     2,     0,     3,     4,     5,     0,   198,
-   199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-   209,   210,   135,   211,     0,   212,   213,   214,     0,     0,
-     0,     0,    71,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   110,     0,    61,    62,   -66,     0,
-   278,     0,     0,   279,     0,   280,     0,   281,     1,     2,
-     0,     3,     4,     5,   275,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   276,
-   277,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   109,    72,    73,     0,     0,    74,     0,
-    75,   440,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   181,   182,   183,   184,   185,   186,
-   187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-   197,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    72,    73,     0,     0,    74,     0,    75,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   198,   199,   200,   201,
-   202,   203,   204,   205,   206,   207,   208,   209,   210,     0,
-   211,     0,   212,   213,   214,     0,     0,     0,     0,     0,
-     0,     0,     0,   172,   173,     0,     0,     0,     0,   174,
-     0,   110,     0,     0,     0,     0,     0,   278,     0,     0,
-   279,     0,   280,     0,   281,   175,   176,   177,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   178,   179,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    61,    62,   180,   151,
-    64,    65,    66,    67,    68,    69,    70,     0,     1,     2,
-     0,     3,     4,     5,     0,   181,   182,   183,   184,   185,
-   186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
-   196,   197,     0,     0,     0,     0,    61,    62,    71,   105,
-   156,   157,   158,   159,   160,   161,    70,     0,     1,     2,
-     0,     3,     4,     5,     0,     0,     0,   198,   199,   200,
-   201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
-     0,   211,     0,   212,   213,   214,    61,    62,    71,   105,
-    64,    65,    66,    67,    68,    69,    70,     0,     1,     2,
-     0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-     0,   215,     0,     0,     0,     0,     0,     0,   368,     0,
-     0,     0,   152,     0,     0,     0,    61,    62,    71,   105,
-    64,    65,    66,    67,    68,    69,    70,     0,     1,     2,
-     0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    72,    73,   447,     0,
-    74,     0,    75,     0,     0,     0,    61,    62,    71,   105,
-    64,    65,    66,    67,    68,    69,    70,     0,     1,     2,
-     0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    72,    73,   538,   379,
-    74,     0,    75,     0,     0,     0,    61,    62,    71,    63,
-    64,    65,    66,    67,    68,    69,    70,     0,     1,     2,
-     0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    72,    73,     0,     0,
-    74,     0,    75,     0,     0,     0,    61,    62,    71,   105,
-   156,   157,   158,   159,   160,   161,    70,     0,     1,     2,
-     0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    72,    73,     0,     0,
-    74,     0,    75,     0,     0,     0,    61,    62,    71,   151,
-    64,    65,    66,    67,    68,    69,    70,     0,     1,     2,
-     0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    72,    73,     0,     0,
-    74,     0,    75,     0,     0,     0,    61,    62,    71,   105,
-    64,    65,    66,    67,    68,    69,    70,     0,     1,     2,
-     0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    72,    73,     0,     0,
-    74,     0,    75,     0,     0,     0,    61,    62,    71,   328,
-    64,    65,    66,    67,    68,    69,    70,     0,     1,     2,
-     0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    72,    73,     0,     0,
-    74,     0,    75,     0,     0,     0,    61,    62,    71,   105,
-   156,   157,   158,   159,   160,   161,    70,     0,     1,     2,
-     0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    72,    73,     0,     0,
-    74,     0,    75,     0,     0,     0,    61,    62,    71,   105,
-    64,    65,    66,    67,    68,    69,   553,     0,     1,     2,
-     0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    72,    73,     0,     0,
-    74,     0,    75,     0,     0,     0,    61,    62,    71,   105,
-    64,    65,    66,    67,    68,    69,   600,     0,     1,     2,
-     0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    72,    73,     0,     0,
-    74,     0,    75,     0,     0,     0,     0,     0,    71,     0,
-   223,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   224,   225,     0,     0,     0,     0,    72,    73,     0,     0,
-    74,     0,   381,   226,   227,   228,   229,   230,   231,   181,
-   182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-   192,   193,   194,   195,   232,   233,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,    72,    73,     0,     0,
-    74,     0,    75,     0,     0,     0,   234,   235,   236,     0,
-     0,   237,   199,   200,   201,   202,   203,   204,   205,   206,
-   207,   208,   209,   210,   238,   239,   240,   241,   242,   243,
-   244,     0,     0,     0,     0,     0,    72,    73,     0,     0,
-    74,     0,    75
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,   166,   167,   167,   167,   167,   167,   167,   167,   167,
+     167,   168,   168,   168,   168,   168,   168,   169,   169,   169,
+     169,   169,   169,   169,   169,   169,   169,   169,   169,   170,
+     170,   170,   170,   170,   170,   170,   170,   170,   170,   171,
+     171,   171,   171,   171,   171,   171,   171,   171,   171,   171,
+     171,   171,   171,   171,   171,   172,   173,   173,   173,   173,
+     173,   174,   174,   174,   175,   175,   176,   176,   177,   177,
+     178,   178,   179,   179,   180,   181,   181,   181,   181,   181,
+     182,   182,   182,   183,   183,   183,   183,   184,   184,   184,
+     185,   185,   185,   185,   185,   186,   186,   186,   187,   187,
+     187,   187,   187,   187,   187,   188,   188,   188,   188,   188,
+     188,   188,   188,   188,   188,   189,   189,   190,   190,   190,
+     190,   190,   190,   191,   191,   192,   192,   193,   193,   194,
+     194,   195,   196,   196,   197,   197,   198,   198,   199,   199,
+     199,   199,   199,   199,   199,   200,   200,   200,   200,   200,
+     200,   200,   200,   200,   200,   200,   200,   200,   201,   202,
+     202,   203,   203,   204,   204,   204,   204,   205,   205,   206,
+     206,   206,   206,   206,   206,   206,   206,   206,   206,   206,
+     206,   206,   206,   206,   206,   206,   206,   206,   206,   207,
+     207,   207,   207,   207,   207,   207,   207,   207,   207,   208,
+     208,   209,   209,   210,   210,   211,   211,   212,   212,   213,
+     213,   215,   214,   216,   214,   214,   214,   214,   217,   214,
+     218,   214,   219,   214,   214,   214,   214,   220,   221,   221,
+     222,   223,   223,   223,   224,   224,   225,   225,   225,   225,
+     226,   227,   227,   228,   229,   229,   230,   231,   232,   232,
+     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
+     233,   234,   234,   234,   234,   235,   235,   236,   237,   237,
+     238,   238,   239,   240,   240,   240,   240,   240,   241,   241,
+     241,   241,   241,   241,   241,   241,   241,   242,   242,   243,
+     244,   244,   245,   245,   245,   245,   245,   246,   246,   247,
+     247,   248,   248,   248,   248,   248,   248,   248,   248,   248,
+     248,   248,   248,   248,   249,   249,   250,   250,   250,   250,
+     250,   250,   250,   250,   250
 };
 
-static const short yycheck[] = {     0,
-   228,    26,   340,   236,   448,   263,   239,   240,   241,   242,
-   243,     4,     0,    11,   247,    16,   164,   126,    21,    11,
-    28,    21,    54,    54,    54,    34,    29,   154,    16,   436,
-   437,    58,   278,   279,   280,    11,    11,   119,    52,     7,
-     8,    38,    10,    11,    12,    13,    14,    15,    16,    17,
-    75,    19,    20,    67,    22,    23,    24,     7,     8,   130,
-    54,    34,   229,   154,   165,    68,   155,   149,    68,    19,
-    20,   160,    22,    23,    24,   100,    54,    53,    53,   104,
-    53,    49,   249,   154,   154,   110,   593,   155,   495,   155,
-    91,   116,   155,   164,   162,   539,    54,   160,   164,   155,
-   171,   126,    54,   610,    54,    39,    40,    54,   164,   553,
-   554,    45,    11,    32,    33,   140,   141,    51,    17,   144,
-   152,   152,   152,   356,    18,   150,   158,    54,   137,   138,
-   139,    19,   162,   142,    22,   381,    24,   146,   147,   155,
-   137,   138,   139,   155,   155,   142,    22,   485,   164,   146,
-   147,   162,   164,   597,   598,   163,   600,   601,   152,   115,
-   116,   164,   160,   264,   265,    53,   160,    54,   160,   402,
-   163,    46,   154,    48,   152,   153,   620,   621,   516,   167,
-   518,    20,   154,   416,    23,   418,   419,   420,   158,   157,
-   158,   112,   113,   161,   152,   163,   164,   155,   156,    22,
-   152,   226,   152,   155,   156,   152,   153,    81,    82,   234,
-   235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-   245,   246,   247,    22,    35,   152,    37,   336,   566,   156,
-   255,   119,   120,    22,   152,   317,   318,   319,   320,   321,
-   498,   266,   324,   325,   326,   354,    42,    43,    44,   137,
-   138,    47,   140,   141,     4,   143,   144,   145,   329,    37,
-     4,   332,   333,    19,   335,   152,    22,    68,    24,   156,
-   503,   342,    38,    53,   171,     3,     4,     5,     6,   350,
-   351,   352,   137,   138,   139,   152,   159,   142,   521,   522,
-   523,   146,   147,   441,    42,   159,    44,    42,    43,    44,
-    45,    46,    47,    48,   153,    50,   155,   389,   390,   156,
-     4,   336,   337,   338,   396,    61,    62,    63,    64,    65,
-    66,   579,   149,   150,   151,   583,    38,    22,   153,   354,
-   355,   356,   153,   155,   155,   406,   407,   408,   162,   119,
-   120,     4,   152,   414,     3,     4,     5,     6,   576,   153,
-   153,   155,     9,     9,   425,   426,   381,   137,   138,     9,
-   140,   141,   387,   143,   144,   145,   594,    26,    27,     9,
-   441,     7,     8,   455,   456,   457,   458,   402,   460,   461,
-     9,     9,    60,    19,    20,    54,    22,    23,    24,   152,
-   152,   416,   417,   418,   419,   420,    56,   152,   469,   424,
-   471,   152,    11,   474,   149,   150,   151,    22,   162,   152,
-   481,   482,   152,   438,   152,   152,    22,   153,   500,   501,
-    92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
-   152,   152,   329,   152,    38,   332,   333,   462,   335,   155,
-   511,   512,   155,   514,   515,   342,   155,   155,   519,   155,
-   155,   155,     4,    38,   351,   352,   155,   155,   155,   530,
-    38,   486,   544,   155,   546,   547,   155,   155,   155,   155,
-   155,   155,   497,   155,   155,   158,   155,    22,   503,   155,
-   155,   155,   162,   153,   155,    17,    17,   152,   513,   155,
-   561,   155,    22,     4,   155,   496,   521,   522,   523,     4,
-   155,   155,   527,     0,   155,     4,   577,   578,   155,   406,
-   407,   408,   155,   152,    26,    27,   162,   414,   155,   153,
-   591,    18,    19,    20,   155,    22,    23,    24,   425,   426,
-   155,   153,   153,    30,    31,   155,    53,   153,   155,   153,
-   158,   160,   153,   614,   615,    53,   153,    17,   619,     4,
-   153,   622,   160,   148,    51,   580,   152,   628,    55,   152,
-   631,    22,    59,   155,    17,    17,   567,   155,    17,    73,
-    17,     0,   469,     0,   471,   131,   131,   474,   131,   232,
-   567,   233,    91,   540,   481,   482,    98,    99,   100,   101,
-   102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-   110,   104,    16,    87,   266,   527,   255,   413,    54,    -1,
-    -1,    -1,    -1,    -1,   511,   512,    -1,   514,   515,    -1,
-    -1,    -1,   519,     3,     4,    -1,    -1,     7,     8,     9,
-    -1,    -1,     0,   530,    -1,    -1,    -1,    -1,    -1,    19,
-    20,    -1,    22,    23,    24,    25,    26,    27,    -1,    -1,
-    18,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
-    40,    41,    30,    31,   561,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    53,    -1,    -1,    -1,    -1,    58,    -1,
-   577,   578,    -1,    51,    -1,    -1,    -1,    55,    -1,    -1,
-    -1,    59,    -1,    -1,   591,    75,    76,    77,    78,    79,
-    80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-    90,    91,    -1,    -1,    -1,    -1,    -1,   614,   615,    -1,
-    -1,    -1,   619,    -1,    -1,   622,    -1,    -1,    -1,    -1,
-    -1,   628,    -1,    -1,   631,    -1,    -1,   117,   118,   119,
-   120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-    -1,   131,    -1,   133,   134,   135,    -1,   137,   138,    -1,
-   140,   141,    -1,   143,   144,   145,     3,     4,    -1,    -1,
-     7,     8,     9,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,   161,    19,    20,    -1,    22,    23,    24,    25,    26,
-    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    54,    -1,     7,
-     8,    58,    10,    11,    12,    13,    14,    15,    16,    17,
-    -1,    19,    20,    -1,    22,    23,    24,    -1,    75,    76,
-    77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-    87,    88,    89,    90,    91,    -1,    -1,    -1,    -1,     7,
-     8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
-    -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
-   117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-   127,   128,   129,    -1,   131,    -1,   133,   134,   135,    -1,
-    -1,    49,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,
-     7,     8,     9,    -1,    -1,   152,    -1,    -1,    -1,    -1,
-    -1,    -1,    19,    20,   161,    22,    23,    24,    25,    26,
-    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    58,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
-   158,    -1,    -1,   161,    -1,   163,   164,    -1,    75,    76,
-    77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-    87,    88,    89,    90,    91,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
-   158,    -1,    -1,   161,    -1,   163,   164,    -1,    -1,    -1,
-   117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-   127,   128,   129,    -1,   131,    -1,   133,   134,   135,     7,
-     8,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    19,    20,    -1,    22,    23,    24,    25,    -1,    -1,
-    -1,    -1,    -1,    -1,   161,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,     7,     8,    54,    10,    11,    12,
-    13,    14,    15,    16,    17,    -1,    19,    20,    -1,    22,
-    23,    24,    -1,    -1,    -1,    -1,    -1,    75,    76,    77,
-    78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-    88,    89,    90,    91,    -1,    -1,    49,    -1,    -1,    -1,
-     7,     8,    -1,    10,    11,    12,    13,    14,    15,    16,
-    17,    -1,    19,    20,    -1,    22,    23,    24,    -1,   117,
-   118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-   128,   129,    39,   131,    -1,   133,   134,   135,    -1,    -1,
-    -1,    -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,   152,    -1,     7,     8,   156,    -1,
-   158,    -1,    -1,   161,    -1,   163,    -1,   165,    19,    20,
-    -1,    22,    23,    24,    25,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,
-    41,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    54,   157,   158,    -1,    -1,   161,    -1,
-   163,   164,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    75,    76,    77,    78,    79,    80,
-    81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-    91,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-   157,   158,    -1,    -1,   161,    -1,   163,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   117,   118,   119,   120,
-   121,   122,   123,   124,   125,   126,   127,   128,   129,    -1,
-   131,    -1,   133,   134,   135,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,     3,     4,    -1,    -1,    -1,    -1,     9,
-    -1,   152,    -1,    -1,    -1,    -1,    -1,   158,    -1,    -1,
-   161,    -1,   163,    -1,   165,    25,    26,    27,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    40,    41,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    58,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    75,    76,    77,    78,    79,
-    80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-    90,    91,    -1,    -1,    -1,    -1,     7,     8,    49,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    -1,    -1,   117,   118,   119,
-   120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-    -1,   131,    -1,   133,   134,   135,     7,     8,    49,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,   161,    -1,    -1,    -1,    -1,    -1,    -1,    39,    -1,
-    -1,    -1,   123,    -1,    -1,    -1,     7,     8,    49,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   157,   158,    39,    -1,
-   161,    -1,   163,    -1,    -1,    -1,     7,     8,    49,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   157,   158,    39,   160,
-   161,    -1,   163,    -1,    -1,    -1,     7,     8,    49,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   157,   158,    -1,    -1,
-   161,    -1,   163,    -1,    -1,    -1,     7,     8,    49,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   157,   158,    -1,    -1,
-   161,    -1,   163,    -1,    -1,    -1,     7,     8,    49,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   157,   158,    -1,    -1,
-   161,    -1,   163,    -1,    -1,    -1,     7,     8,    49,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   157,   158,    -1,    -1,
-   161,    -1,   163,    -1,    -1,    -1,     7,     8,    49,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   157,   158,    -1,    -1,
-   161,    -1,   163,    -1,    -1,    -1,     7,     8,    49,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   157,   158,    -1,    -1,
-   161,    -1,   163,    -1,    -1,    -1,     7,     8,    49,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   157,   158,    -1,    -1,
-   161,    -1,   163,    -1,    -1,    -1,     7,     8,    49,    10,
-    11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   157,   158,    -1,    -1,
-   161,    -1,   163,    -1,    -1,    -1,    -1,    -1,    49,    -1,
-    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    56,    57,    -1,    -1,    -1,    -1,   157,   158,    -1,    -1,
-   161,    -1,   163,    69,    70,    71,    72,    73,    74,    75,
-    76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-    86,    87,    88,    89,    90,    91,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   157,   158,    -1,    -1,
-   161,    -1,   163,    -1,    -1,    -1,   112,   113,   114,    -1,
-    -1,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-   126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-   136,    -1,    -1,    -1,    -1,    -1,   157,   158,    -1,    -1,
-   161,    -1,   163
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     0,     4,     0,     2,     0,
+       1,     1,     1,     0,     2,     1,     1,     1,     1,     1,
+       1,     1,     1,     0,     1,     1,     1,     0,     1,     1,
+       0,     1,     1,     1,     1,     0,     1,     1,     0,     1,
+       1,     1,     1,     1,     2,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     2,     0,     2,     1,     1,     1,
+       1,     1,     1,     0,     2,     0,     2,     0,     2,     0,
+       3,     2,     0,     1,     0,     3,     1,     2,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     3,     1,     2,
+       5,     5,     5,     5,     3,     2,     5,     4,     2,     1,
+       1,     1,     3,     1,     3,     1,     0,     1,     3,     4,
+       3,     3,     4,     4,     3,     6,     5,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     6,
+       5,     8,     6,     6,     7,     7,     6,     8,     8,     3,
+       1,     1,     1,     1,     0,     2,     6,     1,     0,     1,
+       2,     0,     3,     0,     3,     3,     3,     3,     0,     8,
+       0,     9,     0,     9,     5,     2,     3,     1,     3,     3,
+       3,     3,     1,     0,     5,     3,     1,     3,     1,     0,
+      10,     1,     1,     4,     1,     1,     2,     3,     0,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     1,
+       5,     1,     1,     1,     1,     1,     1,     2,     1,     3,
+       2,     2,     3,     2,     0,     3,     1,     4,     2,     2,
+       3,     9,     9,     8,    14,     1,     1,     6,     5,     2,
+       6,     7,     4,     4,     6,     6,     0,     0,     3,     2,
+       1,     5,     5,     6,     6,     4,     6,     4,     4,     6,
+       6,     2,     8,     1,     1,     0,     3,     6,     3,     6,
+       2,     5,     7,     5,     4
 };
-/* -*-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.
+/* 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 yytype_uint16 yydefact[] =
+{
+      73,    61,    70,    62,    71,    63,   213,   211,     0,     0,
+       0,     0,     0,     0,    83,    72,     0,    73,   209,    87,
+      90,     0,     0,   225,     0,     0,    68,     0,    74,    75,
+      77,    76,    78,    80,    79,    81,    82,    84,    85,    86,
+      83,    83,   204,     1,   210,    88,    89,    83,   214,    91,
+      92,    93,    94,    83,   274,   212,   274,     0,     0,   233,
+     226,   227,   215,   261,   262,   217,   138,   139,   140,   143,
+     142,   141,   144,   145,     0,     0,     0,     0,   263,   264,
+     146,   216,   148,   204,   204,    95,   203,     0,    98,    98,
+     276,     0,   271,    69,   244,   245,   246,   270,   228,   229,
+     232,     0,   166,   149,     0,     0,     0,     0,   155,   167,
+       0,     0,   166,     0,     0,     0,    97,    96,     0,   201,
+     202,     0,     0,    99,   100,   101,   102,   103,     0,   247,
+       0,     0,     0,   315,   273,     0,   230,   165,   115,   161,
+     163,     0,     0,     0,     0,     0,     0,   154,     0,     0,
+     147,     0,     0,   160,     0,   159,     0,   224,   138,   139,
+     140,   143,   142,   141,     0,     0,    67,    67,   104,     0,
+     241,   242,   243,     0,   250,   251,   252,   257,   253,   254,
+     255,   256,   248,     2,     3,     4,     5,     6,     7,     8,
+       9,    10,    14,    15,    16,    11,    12,    13,     0,     0,
+       0,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,     0,     0,     0,     0,     0,     0,     0,
+       0,   259,   266,   265,   275,   314,   300,     0,     0,     0,
+       0,    98,   285,   286,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     272,    98,   289,     0,   313,   231,   158,     0,   123,    67,
+      67,   157,     0,   168,     0,   123,    67,    67,     0,   205,
+     186,   187,   182,   184,   183,   185,   188,   181,   177,   178,
+       0,     0,     0,     0,   180,   179,   218,     0,   277,   249,
+       0,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,     0,    53,    54,    49,    50,    51,    52,    39,    40,
+      41,    42,    43,    44,    45,    46,    47,    48,     0,     0,
+       0,     0,     0,     0,   200,     0,     0,     0,     0,   299,
+     279,    67,   268,   278,     0,     0,    55,     0,     0,     0,
+       0,   129,   129,   320,    67,    67,   311,     0,     0,     0,
+       0,     0,    67,    67,    67,     0,     0,     0,     0,     0,
+     106,   108,   107,   105,   109,   110,   111,   112,   113,   116,
+     164,   162,   151,   152,   153,   156,    66,   150,   220,   222,
+       0,   170,     0,     0,     0,   174,     0,   171,   134,   239,
+       0,     0,     0,   297,     0,     0,     0,     0,     0,   258,
+       0,     0,     0,   267,     0,     0,   280,     0,     0,    67,
+      67,     0,   316,     0,   318,   297,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    67,     0,
+     114,   120,   119,   117,   118,   121,   122,   124,   134,   134,
+       0,   169,   155,   167,     0,   172,   173,     0,   219,   238,
+     115,   236,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   199,     0,     0,     0,   269,     0,     0,     0,     0,
+       0,     0,     0,     0,   324,     0,     0,     0,   307,   308,
+       0,     0,     0,     0,     0,   305,     0,   129,     0,   221,
+     223,    67,   176,     0,     0,     0,   136,   134,    65,     0,
+     123,   260,     0,     0,   190,     0,     0,     0,     0,     0,
+       0,     0,    67,     0,     0,   296,     0,     0,   129,   130,
+     129,     0,     0,     0,     0,     0,   323,   301,   302,   296,
+       0,   321,    67,   206,   175,   131,   137,   135,    64,   235,
+     237,   115,   132,     0,     0,   298,     0,   196,     0,     0,
+     192,   193,   189,     0,     0,   115,   115,     0,   303,   304,
+     317,   319,     0,     0,   306,   309,   310,     0,   129,    65,
+     133,   127,   194,   195,     0,     0,     0,     0,     0,     0,
+       0,   123,     0,   290,     0,   123,   322,   234,     0,   125,
+     191,   197,   198,     0,   283,     0,     0,   106,   108,   115,
+     115,     0,   115,   115,   291,   312,   128,     0,   240,   281,
+       0,   282,     0,   293,   292,     0,     0,     0,   126,     0,
+       0,     0,   115,   115,     0,     0,     0,   295,   294,   288,
+       0,     0,   287,     0,   284
+};
 
-   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.
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,   218,   219,   220,   301,   318,   164,   165,    78,   539,
+     113,    12,    79,    14,    15,    40,    41,    42,    47,    53,
+     118,   128,   369,   256,   437,   372,   608,   589,   412,   496,
+     571,   448,   497,    80,   166,   139,   156,   140,   141,   110,
+     324,   221,   325,   121,    87,   157,    16,    17,    18,    20,
+      19,   388,   438,   439,    62,    23,    60,   101,   451,   452,
+     129,   172,    54,    96,    55,    48,   290,   222,    82,   224,
+     332,   333,    56,    92,    93,   250,   596,   134,   346,   557,
+     456,   251,   252,   253,   254
+};
 
-   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.
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -524
+static const yytype_int16 yypact[] =
+{
+     369,  -524,  -524,  -524,  -524,  -524,  -524,  -524,    46,  -130,
+      11,   -89,    62,   -59,   258,  -524,   135,   506,  -524,   227,
+     130,   -12,    26,  -524,    -1,   180,  -524,  1572,  -524,  -524,
+    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
+     119,   119,   250,  -524,  -524,  -524,  -524,   119,  -524,  -524,
+    -524,  -524,  -524,   119,    39,  -524,    -2,   214,   221,   229,
+    -524,  -524,  -524,  -524,  -524,    59,  -524,  -524,  -524,  -524,
+    -524,  -524,  -524,  -524,   262,   268,     8,    35,  -524,  -524,
+    -524,     9,  -524,   195,   195,   244,  -524,   162,   233,   233,
+     186,   238,  -524,   127,  -524,  -524,  -524,  -524,  -524,  -524,
+    -524,    50,  1126,  -524,   133,   161,   815,    59,  -524,     9,
+     -88,   172,  1126,   181,   162,   162,  -524,  -524,  1372,  -524,
+    -524,  1612,   337,  -524,  -524,  -524,  -524,  -524,  1652,  -524,
+      -3,   314,   906,  1867,  -524,   334,  -524,  -524,     9,  -524,
+     205,   208,  1692,  1692,   200,   -64,  1692,  -524,   359,   211,
+    -524,  1612,  1692,    59,   216,     9,   410,  -524,   223,   357,
+     361,   362,   363,   365,   275,   366,  1182,   329,  -524,    97,
+    -524,  -524,  -524,   906,  -524,  -524,  -524,  -524,  -524,  -524,
+    -524,  -524,   324,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
+    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,   511,   491,
+     234,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
+    -524,  -524,  -524,   252,   253,   259,   260,  1612,   263,   267,
+     271,  -524,  -524,  -524,  -524,  -524,  -524,   354,  1732,    68,
+     374,   233,  -524,  -524,   511,   491,  1692,  1692,  1692,  1692,
+    1692,  1692,  1692,  1692,  1692,  1692,  1692,  1692,  1692,  1692,
+    -524,   233,  -524,   197,  -524,  -524,   210,  1452,  -524,   -31,
+       2,  -524,   264,     9,   237,  -524,   329,   -25,  1372,  -524,
+    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
+    1412,  1772,   855,   403,  -524,  -524,  -524,   279,  -524,  -524,
+     405,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
+    -524,   284,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
+    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,   285,  1612,
+    1612,  1612,  1612,  1612,  -524,   -46,  1612,  1612,  1612,  -524,
+      59,   766,  -524,   287,   906,   906,  -524,   906,  1652,  1692,
+    1692,    45,    51,  -524,   766,    17,   290,   294,   295,   297,
+     298,   299,    14,   766,   766,   417,  1652,  1692,  1692,   452,
+    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
+    -524,  -524,   189,  -524,  -524,  -524,  -524,   189,  -524,   181,
+     421,  -524,   102,  1080,   -32,  -524,   -49,  -524,   305,  1492,
+     306,  1612,  1612,  -524,   308,   311,   315,   316,  1612,  -524,
+     317,   318,   431,  -524,  1692,   319,  -524,   321,   906,   766,
+     766,    24,  -524,    28,  -524,  -524,   906,   320,  1692,  1692,
+    1692,  1692,  1692,   322,   325,   327,  1692,   906,   766,   328,
+    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,   305,   305,
+    1692,  -524,   323,  1035,   -17,  -524,  -524,    30,  -524,  -524,
+       9,   331,   326,   462,   332,   333,   154,  1612,  1612,  1612,
+    1612,  -524,  1612,  1612,  1692,  -524,   472,   473,   340,   339,
+     341,   906,   493,   906,   347,   348,   906,   349,     9,  -524,
+     352,   353,   507,   906,   906,     9,   343,   360,  1692,  -524,
+    -524,    38,  -524,   371,   494,   515,  -524,   305,   115,  1532,
+    -524,  -524,  1612,  1612,  -524,  1692,   367,   368,   372,   379,
+     382,   385,    56,   906,   906,  1812,   906,   906,   360,  -524,
+     360,   906,   384,  1692,  1692,  1692,  -524,  -524,  -524,  1812,
+     487,  -524,   766,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
+    -524,     9,    -6,   388,   389,  -524,  1612,  -524,  1612,  1612,
+    -524,  -524,  -524,   390,   386,    33,     9,   166,  -524,  -524,
+    -524,  -524,   383,   906,  -524,  -524,  -524,   170,   360,   115,
+    -524,   495,  -524,  -524,   396,   397,   399,   536,     3,   623,
+     623,  -524,  1852,  -524,   395,  -524,  -524,  -524,   552,   411,
+    -524,  -524,  -524,   906,  -524,  1323,     7,   412,   414,  -524,
+    -524,     6,    33,     9,  -524,   189,  -524,   540,  -524,  -524,
+     413,  -524,  1323,   210,   210,   550,   623,   623,  -524,   553,
+     416,   906,  -524,  -524,   906,   555,   500,   210,   210,  -524,
+     906,   557,  -524,   906,  -524
+};
 
-   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.  */
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -524,   443,   445,   446,   350,   346,  -229,  -524,     0,    16,
+    -141,   489,    13,  -524,  -524,  -524,  -524,    61,  -524,  -524,
+    -524,  -190,  -524,  -444,  -524,  -263,  -524,  -524,  -337,    41,
+    -524,  -407,  -524,  -524,   -24,   356,  -108,  -524,   474,   508,
+     -81,  -150,  -207,   228,   261,   351,  -524,  -524,   598,  -524,
+    -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,  -524,
+     527,  -524,  -524,  -524,  -524,  -524,  -524,  -523,   -70,   104,
+    -234,  -524,  -524,   566,  -524,  -524,  -524,  -524,  -524,    94,
+     209,  -524,  -524,  -524,  -524
+};
 
-/* 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.  */
-
-/* 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 */
+/* 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 -209
+static const yytype_int16 yytable[] =
+{
+      11,   337,   377,    81,   343,   414,   498,   347,   348,   349,
+     350,   351,   105,    13,   336,   355,   284,    11,   336,    90,
+     169,    63,    64,   111,    24,   170,   286,    94,   494,   111,
+      13,   489,   490,     1,     2,   471,     3,     4,     5,   473,
+     167,   338,    63,    64,   615,   107,    66,    67,    68,    69,
+      70,    71,    72,   109,     1,     2,   111,     3,     4,     5,
+      90,   356,   223,   111,   494,    26,    91,   146,   111,    25,
+     266,   111,   610,   382,   384,   386,   147,   472,   138,   334,
+      27,   472,   109,   495,    73,   335,   269,  -144,   138,   620,
+     537,   146,   111,    11,   155,    28,   285,   569,    21,   111,
+     262,    83,    84,   223,   155,   111,   398,    91,    88,   398,
+     111,   579,   580,    22,    89,   446,   399,     2,   259,   260,
+       4,   112,   263,   398,   429,   378,   379,   112,   267,   373,
+     445,   431,   432,   433,     1,    43,   434,     3,   398,     5,
+     435,   436,    57,   431,   432,   433,     1,   493,   434,     3,
+     531,     5,   435,   436,   112,   613,   614,    59,   616,   617,
+     171,   112,    95,   594,   374,   -67,   112,   611,   359,   112,
+     465,   106,    49,    50,    51,   416,   444,    52,   627,   628,
+      58,   560,   287,   561,   477,  -144,   479,   480,   481,  -144,
+     112,   533,    74,    75,   119,   120,    76,   112,    77,   108,
+     411,   -67,    61,   112,   331,   135,   413,   -67,   112,   552,
+     136,   102,   341,   342,   331,   344,   345,   331,   331,   331,
+     331,   331,   352,   353,   354,   331,   -55,   -55,   -55,   -55,
+     408,   586,    86,   138,   360,   361,    98,   542,   393,   394,
+     395,   396,   397,    99,   155,   400,   401,   402,   427,   270,
+     271,   100,   362,   363,   131,   364,   365,   398,   366,   367,
+     368,   223,   441,   359,   223,   223,   103,   223,    37,    38,
+      39,   545,   104,    45,   223,    46,   132,   288,   272,   273,
+     274,   275,   423,   223,   223,    85,   116,    86,   117,   564,
+     565,   566,   142,   284,   122,   123,   124,   125,   126,   127,
+      29,    30,    31,    32,    33,    34,    35,   504,    36,   505,
+     454,   455,   357,   358,   155,   409,   410,   461,   601,   581,
+     143,   582,   605,   585,   148,   582,   431,   432,   433,   360,
+     361,   434,   155,   428,   331,   435,   436,   150,   223,   223,
+     223,   168,   151,   152,   114,   115,   223,   362,   363,   595,
+     364,   365,   173,   366,   367,   368,   255,   223,   223,   443,
+     257,   258,   261,   264,   265,   450,   -56,   612,   268,  -208,
+     -57,   -60,   -59,   285,   -58,   276,   506,   507,   508,   509,
+     331,   510,   511,   111,   289,   336,   319,   -69,     1,     2,
+     376,     3,     4,     5,   331,   478,   331,   331,   331,     6,
+       7,   223,   485,   223,   320,   321,   223,    37,    38,    39,
+     329,   322,   323,   223,   223,   326,   491,    63,    64,   327,
+       8,   543,   544,   328,     9,   387,   375,   390,    10,     1,
+       2,   389,     3,     4,     5,   403,   391,   392,   405,   406,
+     512,   407,   404,   223,   223,   417,   223,   223,   415,   418,
+     419,   223,   420,   421,   422,   426,   430,   424,   425,   440,
+     447,   453,   223,   457,   532,   574,   458,   575,   576,   464,
+     459,   460,   462,   463,   466,   541,   467,   482,   476,   500,
+     483,   331,   484,   488,   501,   492,   499,   502,   503,   513,
+     514,   556,   515,   223,   516,   529,   517,   519,   538,   331,
+     331,   331,   505,   521,   523,   556,  -207,   524,   525,   223,
+     223,   526,   468,   469,   470,   530,   535,   302,   303,   536,
+     475,   547,   546,   223,   -69,     1,     2,   548,     3,     4,
+       5,   486,   487,   534,   549,   550,     6,     7,   551,   563,
+     472,   572,   573,   583,   578,   577,   223,   223,   588,   590,
+     591,   223,   592,   593,   223,   604,   606,     8,   603,   607,
+     223,     9,   618,   223,   -18,    10,   -19,   621,   619,   538,
+     624,   625,   630,   631,   633,   518,   247,   520,   248,   249,
+     522,   340,   133,   570,   339,   587,   149,   527,   528,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   371,   145,    44,   130,   553,   554,   380,
+     558,   559,    97,   567,   474,   562,   174,   175,     0,     0,
+      63,    64,   176,     0,     0,     0,   568,     0,     0,     0,
+       0,     0,     1,     2,     0,     3,     4,     5,   177,   178,
+     179,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   180,   181,     0,     0,   584,     0,     0,
+       0,     0,     0,     0,     0,     0,   359,     0,     0,     0,
+       0,   182,     0,   599,   600,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   609,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,     0,     0,     0,     0,     0,
+     622,   623,     0,     0,     0,   626,     0,     0,   629,     0,
+       0,     0,     0,     0,   632,     0,     0,   634,     0,     0,
+     200,   201,   597,   598,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,     0,   213,     0,   214,   215,   216,     0,
+     362,   363,     0,   364,   365,     0,   366,   367,   368,   174,
+     175,     0,     0,    63,    64,   176,     0,     0,     0,     0,
+       0,     0,     0,     0,   217,     1,     2,     0,     3,     4,
+       5,   177,   178,   179,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   180,   181,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     111,     0,    63,    64,   182,   107,    66,    67,    68,    69,
+      70,    71,    72,     0,     1,     2,     0,     3,     4,     5,
+       0,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,     0,     0,
+       0,     0,    63,    64,    73,   107,   158,   159,   160,   161,
+     162,   163,    72,     0,     1,     2,     0,     3,     4,     5,
+       0,     0,     0,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,     0,   213,     0,   214,
+     215,   216,     0,     0,    73,     0,     0,     0,     0,   174,
+     175,     0,     0,    63,    64,   176,     0,     0,   112,     0,
+       0,     0,     0,     0,     0,     1,     2,   217,     3,     4,
+       5,   177,   178,   179,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   180,   181,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   182,     0,     0,     0,     0,     0,
+       0,     0,    74,    75,     0,     0,    76,     0,    77,   144,
+       0,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    74,    75,     0,     0,    76,     0,    77,   385,
+       0,     0,     0,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,     0,   213,     0,   214,
+     215,   216,    63,    64,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     1,     2,     0,     3,     4,     5,
+     277,     0,     0,     0,     0,     0,     0,   217,     0,     0,
+       0,     0,     0,     0,     0,   278,   279,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    63,    64,   111,
+     107,   158,   159,   160,   161,   162,   163,    72,     0,     1,
+       2,     0,     3,     4,     5,     0,     0,     0,     0,     0,
+     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
+     193,   194,   195,   196,   197,   198,   199,     0,     0,    73,
+       0,     0,     0,    63,    64,     0,   107,    66,    67,    68,
+      69,    70,    71,    72,     0,     1,     2,     0,     3,     4,
+       5,     0,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,   210,   211,   212,   137,   213,     0,   214,   215,
+     216,     0,     0,     0,     0,    73,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   112,     0,    63,
+      64,   -67,     0,   280,     0,     0,   281,     0,   282,     0,
+     283,     1,     2,     0,     3,     4,     5,   277,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   278,   279,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   111,    74,    75,     0,
+       0,    76,     0,    77,   442,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   183,   184,   185,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    74,    75,     0,     0,    76,     0,    77,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   200,
+     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
+     211,   212,     0,   213,     0,   214,   215,   216,     0,     0,
+       0,     0,     0,     0,     0,     0,   174,   175,     0,     0,
+       0,     0,   176,     0,   112,     0,     0,     0,     0,     0,
+     280,     0,     0,   281,     0,   282,     0,   283,   177,   178,
+     179,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   180,   181,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    63,
+      64,   182,   153,    66,    67,    68,    69,    70,    71,    72,
+       0,     1,     2,     0,     3,     4,     5,     0,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,     0,     0,     0,     0,    63,
+      64,    73,   107,   158,   159,   160,   161,   162,   163,    72,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,   211,   212,     0,   213,     0,   214,   215,   216,    63,
+      64,    73,   107,    66,    67,    68,    69,    70,    71,    72,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,     0,   217,     0,     0,     0,     0,     0,
+       0,   370,     0,     0,     0,   154,     0,     0,     0,    63,
+      64,    73,   107,    66,    67,    68,    69,    70,    71,    72,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+      75,   449,     0,    76,     0,    77,     0,     0,     0,    63,
+      64,    73,   107,    66,    67,    68,    69,    70,    71,    72,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+      75,   540,   381,    76,     0,    77,     0,     0,     0,    63,
+      64,    73,    65,    66,    67,    68,    69,    70,    71,    72,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+      75,     0,     0,    76,     0,    77,     0,     0,     0,    63,
+      64,    73,   107,   158,   159,   160,   161,   162,   163,    72,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+      75,     0,     0,    76,     0,    77,     0,     0,     0,    63,
+      64,    73,   153,    66,    67,    68,    69,    70,    71,    72,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+      75,     0,     0,    76,     0,    77,     0,     0,     0,    63,
+      64,    73,   107,    66,    67,    68,    69,    70,    71,    72,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+      75,     0,     0,    76,     0,    77,     0,     0,     0,    63,
+      64,    73,   330,    66,    67,    68,    69,    70,    71,    72,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+      75,     0,     0,    76,     0,    77,     0,     0,     0,    63,
+      64,    73,   107,   158,   159,   160,   161,   162,   163,    72,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+      75,     0,     0,    76,     0,    77,     0,     0,     0,    63,
+      64,    73,   107,    66,    67,    68,    69,    70,    71,   555,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+      75,     0,     0,    76,     0,    77,     0,     0,     0,    63,
+      64,    73,   107,    66,    67,    68,    69,    70,    71,   602,
+       0,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+      75,     0,     0,    76,     0,    77,     0,     0,     0,     0,
+       0,    73,     0,   225,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   226,   227,     0,     0,     0,     0,    74,
+      75,     0,     0,    76,     0,   383,   228,   229,   230,   231,
+     232,   233,   183,   184,   185,   186,   187,   188,   189,   190,
+     191,   192,   193,   194,   195,   196,   197,   234,   235,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+      75,     0,     0,    76,     0,    77,     0,     0,     0,   236,
+     237,   238,     0,     0,   239,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   210,   211,   212,   240,   241,   242,
+     243,   244,   245,   246,     0,     0,     0,     0,     0,    74,
+      75,     0,     0,    76,     0,    77
+};
 
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
+static const yytype_int16 yycheck[] =
+{
+       0,   230,   265,    27,   238,   342,   450,   241,   242,   243,
+     244,   245,     4,     0,    11,   249,   166,    17,    11,    21,
+     128,     7,     8,    54,   154,    28,   167,    29,    34,    54,
+      17,   438,   439,    19,    20,    11,    22,    23,    24,    11,
+     121,   231,     7,     8,    38,    10,    11,    12,    13,    14,
+      15,    16,    17,    77,    19,    20,    54,    22,    23,    24,
+      21,   251,   132,    54,    34,   154,    68,   155,    54,    58,
+     151,    54,   595,   280,   281,   282,   164,    53,   102,    11,
+      18,    53,   106,    53,    49,    17,   156,    54,   112,   612,
+     497,   155,    54,    93,   118,   154,   166,   541,    52,    54,
+     164,    40,    41,   173,   128,    54,   155,    68,    47,   155,
+      54,   555,   556,    67,    53,   164,   162,    20,   142,   143,
+      23,   152,   146,   155,   358,   266,   267,   152,   152,   160,
+     162,   137,   138,   139,    19,     0,   142,    22,   155,    24,
+     146,   147,   154,   137,   138,   139,    19,   164,   142,    22,
+     487,    24,   146,   147,   152,   599,   600,   158,   602,   603,
+     163,   152,   164,   160,   162,   156,   152,   160,    53,   152,
+     404,   163,    42,    43,    44,   158,   383,    47,   622,   623,
+     154,   518,   169,   520,   418,   152,   420,   421,   422,   156,
+     152,   153,   157,   158,    32,    33,   161,   152,   163,   164,
+     155,   156,    22,   152,   228,   155,   155,   156,   152,   153,
+     160,   152,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,     3,     4,     5,     6,
+     338,   568,    37,   257,   119,   120,    22,   500,   319,   320,
+     321,   322,   323,    22,   268,   326,   327,   328,   356,    26,
+      27,    22,   137,   138,    68,   140,   141,   155,   143,   144,
+     145,   331,   160,    53,   334,   335,     4,   337,   149,   150,
+     151,   505,     4,    46,   344,    48,    38,   173,     3,     4,
+       5,     6,   352,   353,   354,    35,    42,    37,    44,   523,
+     524,   525,   159,   443,    61,    62,    63,    64,    65,    66,
+      42,    43,    44,    45,    46,    47,    48,   153,    50,   155,
+     391,   392,   115,   116,   338,   339,   340,   398,   581,   153,
+     159,   155,   585,   153,   152,   155,   137,   138,   139,   119,
+     120,   142,   356,   357,   358,   146,   147,   156,   408,   409,
+     410,     4,   114,   115,    83,    84,   416,   137,   138,   578,
+     140,   141,    38,   143,   144,   145,    22,   427,   428,   383,
+     155,   153,   162,     4,   153,   389,     9,   596,   152,     0,
+       9,     9,     9,   443,     9,     9,   457,   458,   459,   460,
+     404,   462,   463,    54,    60,    11,   152,    18,    19,    20,
+     153,    22,    23,    24,   418,   419,   420,   421,   422,    30,
+      31,   471,   426,   473,   152,   152,   476,   149,   150,   151,
+      56,   152,   152,   483,   484,   152,   440,     7,     8,   152,
+      51,   502,   503,   152,    55,    22,   162,    22,    59,    19,
+      20,   152,    22,    23,    24,   331,   152,   152,   334,   335,
+     464,   337,   155,   513,   514,   155,   516,   517,   344,   155,
+     155,   521,   155,   155,   155,    38,     4,   353,   354,    38,
+     155,   155,   532,   155,   488,   546,   155,   548,   549,    38,
+     155,   155,   155,   155,   155,   499,   155,   155,   158,   153,
+     155,   505,   155,   155,    22,   162,   155,   155,   155,    17,
+      17,   515,   152,   563,   155,   152,   155,     4,   498,   523,
+     524,   525,   155,   155,   155,   529,     0,   155,   155,   579,
+     580,     4,   408,   409,   410,   155,    22,    26,    27,     4,
+     416,   153,   155,   593,    18,    19,    20,   155,    22,    23,
+      24,   427,   428,   162,   155,   153,    30,    31,   153,   155,
+      53,   153,   153,   160,   158,   155,   616,   617,    53,   153,
+     153,   621,   153,    17,   624,   160,     4,    51,   582,   148,
+     630,    55,    22,   633,   152,    59,   152,    17,   155,   569,
+      17,   155,    17,    73,    17,   471,   133,   473,   133,   133,
+     476,   235,    93,   542,   234,   569,   112,   483,   484,    98,
+      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+     109,   110,   111,    92,    93,    94,    95,    96,    97,    98,
+      99,   100,   101,   257,   106,    17,    89,   513,   514,   268,
+     516,   517,    56,   529,   415,   521,     3,     4,    -1,    -1,
+       7,     8,     9,    -1,    -1,    -1,   532,    -1,    -1,    -1,
+      -1,    -1,    19,    20,    -1,    22,    23,    24,    25,    26,
+      27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    40,    41,    -1,    -1,   563,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,    -1,    -1,
+      -1,    58,    -1,   579,   580,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   593,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    -1,    -1,    -1,    -1,    -1,
+     616,   617,    -1,    -1,    -1,   621,    -1,    -1,   624,    -1,
+      -1,    -1,    -1,    -1,   630,    -1,    -1,   633,    -1,    -1,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,    -1,   131,    -1,   133,   134,   135,    -1,
+     137,   138,    -1,   140,   141,    -1,   143,   144,   145,     3,
+       4,    -1,    -1,     7,     8,     9,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   161,    19,    20,    -1,    22,    23,
+      24,    25,    26,    27,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    40,    41,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      54,    -1,     7,     8,    58,    10,    11,    12,    13,    14,
+      15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
+      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    -1,    -1,
+      -1,    -1,     7,     8,    49,    10,    11,    12,    13,    14,
+      15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
+      -1,    -1,    -1,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,    -1,   131,    -1,   133,
+     134,   135,    -1,    -1,    49,    -1,    -1,    -1,    -1,     3,
+       4,    -1,    -1,     7,     8,     9,    -1,    -1,   152,    -1,
+      -1,    -1,    -1,    -1,    -1,    19,    20,   161,    22,    23,
+      24,    25,    26,    27,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    40,    41,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    58,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   157,   158,    -1,    -1,   161,    -1,   163,   164,
+      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   157,   158,    -1,    -1,   161,    -1,   163,   164,
+      -1,    -1,    -1,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,    -1,   131,    -1,   133,
+     134,   135,     7,     8,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    19,    20,    -1,    22,    23,    24,
+      25,    -1,    -1,    -1,    -1,    -1,    -1,   161,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    40,    41,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    54,
+      10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
+      20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    -1,    -1,    49,
+      -1,    -1,    -1,     7,     8,    -1,    10,    11,    12,    13,
+      14,    15,    16,    17,    -1,    19,    20,    -1,    22,    23,
+      24,    -1,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,    39,   131,    -1,   133,   134,
+     135,    -1,    -1,    -1,    -1,    49,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   152,    -1,     7,
+       8,   156,    -1,   158,    -1,    -1,   161,    -1,   163,    -1,
+     165,    19,    20,    -1,    22,    23,    24,    25,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    54,   157,   158,    -1,
+      -1,   161,    -1,   163,   164,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   157,   158,    -1,    -1,   161,    -1,   163,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,    -1,   131,    -1,   133,   134,   135,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     3,     4,    -1,    -1,
+      -1,    -1,     9,    -1,   152,    -1,    -1,    -1,    -1,    -1,
+     158,    -1,    -1,   161,    -1,   163,    -1,   165,    25,    26,
+      27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,
+       8,    58,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    -1,    -1,    -1,    -1,     7,
+       8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,    -1,   131,    -1,   133,   134,   135,     7,
+       8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   161,    -1,    -1,    -1,    -1,    -1,
+      -1,    39,    -1,    -1,    -1,   123,    -1,    -1,    -1,     7,
+       8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
+     158,    39,    -1,   161,    -1,   163,    -1,    -1,    -1,     7,
+       8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
+     158,    39,   160,   161,    -1,   163,    -1,    -1,    -1,     7,
+       8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
+     158,    -1,    -1,   161,    -1,   163,    -1,    -1,    -1,     7,
+       8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
+     158,    -1,    -1,   161,    -1,   163,    -1,    -1,    -1,     7,
+       8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
+     158,    -1,    -1,   161,    -1,   163,    -1,    -1,    -1,     7,
+       8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
+     158,    -1,    -1,   161,    -1,   163,    -1,    -1,    -1,     7,
+       8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
+     158,    -1,    -1,   161,    -1,   163,    -1,    -1,    -1,     7,
+       8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
+     158,    -1,    -1,   161,    -1,   163,    -1,    -1,    -1,     7,
+       8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
+     158,    -1,    -1,   161,    -1,   163,    -1,    -1,    -1,     7,
+       8,    49,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
+     158,    -1,    -1,   161,    -1,   163,    -1,    -1,    -1,    -1,
+      -1,    49,    -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    56,    57,    -1,    -1,    -1,    -1,   157,
+     158,    -1,    -1,   161,    -1,   163,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   157,
+     158,    -1,    -1,   161,    -1,   163,    -1,    -1,    -1,   112,
+     113,   114,    -1,    -1,   117,   118,   119,   120,   121,   122,
+     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,   136,    -1,    -1,    -1,    -1,    -1,   157,
+     158,    -1,    -1,   161,    -1,   163
+};
 
-/* 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.  */
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,    19,    20,    22,    23,    24,    30,    31,    51,    55,
+      59,   174,   177,   178,   179,   180,   212,   213,   214,   216,
+     215,    52,    67,   221,   154,    58,   154,    18,   154,    42,
+      43,    44,    45,    46,    47,    48,    50,   149,   150,   151,
+     181,   182,   183,     0,   214,    46,    48,   184,   231,    42,
+      43,    44,    47,   185,   228,   230,   238,   154,   154,   158,
+     222,    22,   220,     7,     8,    10,    11,    12,    13,    14,
+      15,    16,    17,    49,   157,   158,   161,   163,   174,   178,
+     199,   200,   234,   183,   183,    35,    37,   210,   183,   183,
+      21,    68,   239,   240,    29,   164,   229,   239,    22,    22,
+      22,   223,   152,     4,     4,     4,   163,    10,   164,   200,
+     205,    54,   152,   176,   210,   210,    42,    44,   186,    32,
+      33,   209,    61,    62,    63,    64,    65,    66,   187,   226,
+     226,    68,    38,   177,   243,   155,   160,    39,   200,   201,
+     203,   204,   159,   159,   164,   205,   155,   164,   152,   204,
+     156,   209,   209,    10,   123,   200,   202,   211,    11,    12,
+      13,    14,    15,    16,   172,   173,   200,   206,     4,   202,
+      28,   163,   227,    38,     3,     4,     9,    25,    26,    27,
+      40,    41,    58,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   131,   133,   134,   135,   161,   167,   168,
+     169,   207,   233,   234,   235,    36,    56,    57,    69,    70,
+      71,    72,    73,    74,    90,    91,   112,   113,   114,   117,
+     130,   131,   132,   133,   134,   135,   136,   167,   168,   169,
+     241,   247,   248,   249,   250,    22,   189,   155,   153,   200,
+     200,   162,   164,   200,     4,   153,   206,   200,   152,   234,
+      26,    27,     3,     4,     5,     6,     9,    25,    40,    41,
+     158,   161,   163,   165,   207,   234,   176,   178,   235,    60,
+     232,    92,    93,    94,    95,    96,    97,    98,    99,   100,
+     101,   170,    26,    27,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   171,   152,
+     152,   152,   152,   152,   206,   208,   152,   152,   152,    56,
+      10,   200,   236,   237,    11,    17,    11,   172,   187,   170,
+     171,   200,   200,   236,   200,   200,   244,   236,   236,   236,
+     236,   236,   200,   200,   200,   236,   187,   115,   116,    53,
+     119,   120,   137,   138,   140,   141,   143,   144,   145,   188,
+      39,   201,   191,   160,   162,   162,   153,   191,   176,   176,
+     211,   160,   208,   163,   208,   164,   208,    22,   217,   152,
+      22,   152,   152,   206,   206,   206,   206,   206,   155,   162,
+     206,   206,   206,   235,   155,   235,   235,   235,   202,   200,
+     200,   155,   194,   155,   194,   235,   158,   155,   155,   155,
+     155,   155,   155,   234,   235,   235,    38,   202,   200,   236,
+       4,   137,   138,   139,   142,   146,   147,   190,   218,   219,
+      38,   160,   164,   200,   208,   162,   164,   155,   197,    39,
+     200,   224,   225,   155,   206,   206,   246,   155,   155,   155,
+     155,   206,   155,   155,    38,   236,   155,   155,   235,   235,
+     235,    11,    53,    11,   246,   235,   158,   236,   200,   236,
+     236,   236,   155,   155,   155,   200,   235,   235,   155,   197,
+     197,   200,   162,   164,    34,    53,   195,   198,   189,   155,
+     153,    22,   155,   155,   153,   155,   206,   206,   206,   206,
+     206,   206,   200,    17,    17,   152,   155,   155,   235,     4,
+     235,   155,   235,   155,   155,   155,     4,   235,   235,   152,
+     155,   194,   200,   153,   162,    22,     4,   197,   174,   175,
+      39,   200,   191,   206,   206,   236,   155,   153,   155,   155,
+     153,   153,   153,   235,   235,    17,   200,   245,   235,   235,
+     194,   194,   235,   155,   236,   236,   236,   245,   235,   189,
+     195,   196,   153,   153,   206,   206,   206,   155,   158,   189,
+     189,   153,   155,   160,   235,   153,   194,   175,    53,   193,
+     153,   153,   153,    17,   160,   172,   242,   119,   120,   235,
+     235,   191,    17,   200,   160,   191,     4,   148,   192,   235,
+     233,   160,   172,   189,   189,    38,   189,   189,    22,   155,
+     233,    17,   235,   235,    17,   155,   235,   189,   189,   235,
+      17,    73,   235,    17,   235
+};
 
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
+#define YYEMPTY		(-2)
 #define YYEOF		0
+
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
+#define YYABORT		goto yyabortlab
+#define YYERROR		goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
+
 #define YYFAIL		goto yyerrlab
+
 #define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
+
+#define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
-while (0)
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;							\
+    }								\
+while (YYID (0))
+
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
-#ifndef YYPURE
-#define YYLEX		yylex()
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (YYID (0))
 #endif
 
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #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)
+# define YYLEX yylex ()
 #endif
-#endif /* not YYLSP_NEEDED */
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
 #endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
 
-/* If nonreentrant, generate the variables here */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-#ifndef YYPURE
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
 
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
 
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; 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 (YYID (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 __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
+    int yyrule;
 #endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
+}
 
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
+# define YY_REDUCE_PRINT(Rule)		\
+do {					\
+  if (yydebug)				\
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, 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).
 
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
 
 #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;
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
 {
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
-  while (i-- > 0)
-    *t++ = *f++;
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
 }
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
 
-#else /* __cplusplus */
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
 
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
 
-  while (i-- > 0)
-    *t++ = *f++;
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
 }
+#endif /* YYERROR_VERBOSE */
+
 
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
 #endif
-#endif
-
-#line 217 "/usr/share/bison.simple"
+{
+  YYUSE (yyvaluep);
 
-/* 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.  */
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-#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 */
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
 
-/* 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 (void);
+int yyparse ();
 #endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
 #endif
+#endif /* ! YYPARSE_PARAM */
 
-int
-yyparse(YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
-{
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
-
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
-
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
-
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
 
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+
+/* The look-ahead symbol.  */
+int yychar;
+
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
 #else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
 #endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
 
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
-
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
 #endif
 #endif
+{
+  
+  int yystate;
+  int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
 
-  int yylen;
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
@@ -2375,732 +3301,779 @@
      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;
+	yytype_int16 *yyss1 = yyss;
+
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+	yyoverflow (YY_("memory exhausted"),
+		    &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 yyexhaustedlab;
+# 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 yyexhaustedlab;
       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
+
+      {
+	yytype_int16 *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyexhaustedlab;
+	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:
 
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
 
+  /* First try to decide what to do without reference to look-ahead 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.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead 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);
+      YY_SYMBOL_PRINT ("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.  */
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the token being shifted unless it is eof.  */
+  /* Discard the shifted token unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
+  yystate = yyn;
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
 
-  /* 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)
+  /* 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];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
     {
-      int i;
+        case 29:
+#line 1118 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
+    break;
 
-      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
-
-
-  switch (yyn) {
-
-case 28:
-#line 1118 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_EQ; ;
-    break;}
-case 29:
-#line 1118 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_NE; ;
-    break;}
-case 30:
-#line 1119 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_SLT; ;
-    break;}
-case 31:
-#line 1119 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_SGT; ;
-    break;}
-case 32:
-#line 1120 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_SLE; ;
-    break;}
-case 33:
-#line 1120 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_SGE; ;
-    break;}
-case 34:
-#line 1121 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_ULT; ;
-    break;}
-case 35:
-#line 1121 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_UGT; ;
-    break;}
-case 36:
-#line 1122 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_ULE; ;
-    break;}
-case 37:
-#line 1122 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.IPredicate = ICmpInst::ICMP_UGE; ;
-    break;}
-case 38:
-#line 1126 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_OEQ; ;
-    break;}
-case 39:
-#line 1126 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_ONE; ;
-    break;}
-case 40:
-#line 1127 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_OLT; ;
-    break;}
-case 41:
-#line 1127 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_OGT; ;
-    break;}
-case 42:
-#line 1128 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_OLE; ;
-    break;}
-case 43:
-#line 1128 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_OGE; ;
-    break;}
-case 44:
-#line 1129 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_ORD; ;
-    break;}
-case 45:
-#line 1129 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_UNO; ;
-    break;}
-case 46:
-#line 1130 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_UEQ; ;
-    break;}
-case 47:
-#line 1130 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_UNE; ;
-    break;}
-case 48:
-#line 1131 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_ULT; ;
-    break;}
-case 49:
-#line 1131 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_UGT; ;
-    break;}
-case 50:
-#line 1132 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_ULE; ;
-    break;}
-case 51:
-#line 1132 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_UGE; ;
-    break;}
-case 52:
-#line 1133 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_TRUE; ;
-    break;}
-case 53:
-#line 1134 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.FPredicate = FCmpInst::FCMP_FALSE; ;
-    break;}
-case 64:
-#line 1143 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.StrVal = 0; ;
-    break;}
-case 65:
-#line 1145 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal=yyvsp[-1].UInt64Val; ;
-    break;}
-case 66:
-#line 1146 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal=0; ;
-    break;}
-case 67:
-#line 1150 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.StrVal = yyvsp[-1].StrVal;
+  case 30:
+#line 1118 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
+    break;
+
+  case 31:
+#line 1119 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
+    break;
+
+  case 32:
+#line 1119 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
+    break;
+
+  case 33:
+#line 1120 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
+    break;
+
+  case 34:
+#line 1120 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
+    break;
+
+  case 35:
+#line 1121 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
+    break;
+
+  case 36:
+#line 1121 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
+    break;
+
+  case 37:
+#line 1122 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
+    break;
+
+  case 38:
+#line 1122 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
+    break;
+
+  case 39:
+#line 1126 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
+    break;
+
+  case 40:
+#line 1126 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
+    break;
+
+  case 41:
+#line 1127 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
+    break;
+
+  case 42:
+#line 1127 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
+    break;
+
+  case 43:
+#line 1128 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
+    break;
+
+  case 44:
+#line 1128 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
+    break;
+
+  case 45:
+#line 1129 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
+    break;
+
+  case 46:
+#line 1129 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
+    break;
+
+  case 47:
+#line 1130 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
+    break;
+
+  case 48:
+#line 1130 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
+    break;
+
+  case 49:
+#line 1131 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
+    break;
+
+  case 50:
+#line 1131 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
+    break;
+
+  case 51:
+#line 1132 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
+    break;
+
+  case 52:
+#line 1132 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
+    break;
+
+  case 53:
+#line 1133 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
+    break;
+
+  case 54:
+#line 1134 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
+    break;
+
+  case 65:
+#line 1143 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = 0; ;}
+    break;
+
+  case 66:
+#line 1145 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal)=(yyvsp[(3) - (4)].UInt64Val); ;}
+    break;
+
+  case 67:
+#line 1146 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal)=0; ;}
+    break;
+
+  case 68:
+#line 1150 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 68:
-#line 1154 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.StrVal = 0;
+  ;}
+    break;
+
+  case 69:
+#line 1154 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 72:
-#line 1162 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.StrVal = 0;
+  ;}
+    break;
+
+  case 73:
+#line 1162 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 73:
-#line 1167 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.StrVal = yyvsp[-1].StrVal;
+  ;}
+    break;
+
+  case 74:
+#line 1167 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 74:
-#line 1173 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::InternalLinkage; ;
-    break;}
-case 75:
-#line 1174 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::WeakLinkage; ;
-    break;}
-case 76:
-#line 1175 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::LinkOnceLinkage; ;
-    break;}
-case 77:
-#line 1176 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::AppendingLinkage; ;
-    break;}
-case 78:
-#line 1177 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::DLLExportLinkage; ;
-    break;}
-case 79:
-#line 1181 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::DLLImportLinkage; ;
-    break;}
-case 80:
-#line 1182 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ;
-    break;}
-case 81:
-#line 1183 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
-    break;}
-case 82:
-#line 1187 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Visibility = GlobalValue::DefaultVisibility;   ;
-    break;}
-case 83:
-#line 1188 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Visibility = GlobalValue::DefaultVisibility;   ;
-    break;}
-case 84:
-#line 1189 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Visibility = GlobalValue::HiddenVisibility;    ;
-    break;}
-case 85:
-#line 1190 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Visibility = GlobalValue::ProtectedVisibility; ;
-    break;}
-case 86:
-#line 1194 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
-    break;}
-case 87:
-#line 1195 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::DLLImportLinkage; ;
-    break;}
-case 88:
-#line 1196 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ;
-    break;}
-case 89:
-#line 1200 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
-    break;}
-case 90:
-#line 1201 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::InternalLinkage; ;
-    break;}
-case 91:
-#line 1202 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::LinkOnceLinkage; ;
-    break;}
-case 92:
-#line 1203 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::WeakLinkage; ;
-    break;}
-case 93:
-#line 1204 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::DLLExportLinkage; ;
-    break;}
-case 94:
-#line 1208 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
-    break;}
-case 95:
-#line 1209 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::WeakLinkage; ;
-    break;}
-case 96:
-#line 1210 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.Linkage = GlobalValue::InternalLinkage; ;
-    break;}
-case 97:
-#line 1213 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::C; ;
-    break;}
-case 98:
-#line 1214 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::C; ;
-    break;}
-case 99:
-#line 1215 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::Fast; ;
-    break;}
-case 100:
-#line 1216 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::Cold; ;
-    break;}
-case 101:
-#line 1217 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::X86_StdCall; ;
-    break;}
-case 102:
-#line 1218 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = CallingConv::X86_FastCall; ;
-    break;}
-case 103:
-#line 1219 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-                   if ((unsigned)yyvsp[0].UInt64Val != yyvsp[0].UInt64Val)
+  ;}
+    break;
+
+  case 75:
+#line 1173 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
+    break;
+
+  case 76:
+#line 1174 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+    break;
+
+  case 77:
+#line 1175 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
+    break;
+
+  case 78:
+#line 1176 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
+    break;
+
+  case 79:
+#line 1177 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
+    break;
+
+  case 80:
+#line 1181 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+    break;
+
+  case 81:
+#line 1182 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
+    break;
+
+  case 82:
+#line 1183 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 83:
+#line 1187 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
+    break;
+
+  case 84:
+#line 1188 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
+    break;
+
+  case 85:
+#line 1189 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::HiddenVisibility;    ;}
+    break;
+
+  case 86:
+#line 1190 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;}
+    break;
+
+  case 87:
+#line 1194 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 88:
+#line 1195 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+    break;
+
+  case 89:
+#line 1196 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
+    break;
+
+  case 90:
+#line 1200 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 91:
+#line 1201 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
+    break;
+
+  case 92:
+#line 1202 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
+    break;
+
+  case 93:
+#line 1203 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+    break;
+
+  case 94:
+#line 1204 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
+    break;
+
+  case 95:
+#line 1208 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 96:
+#line 1209 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+    break;
+
+  case 97:
+#line 1210 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
+    break;
+
+  case 98:
+#line 1213 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::C; ;}
+    break;
+
+  case 99:
+#line 1214 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::C; ;}
+    break;
+
+  case 100:
+#line 1215 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::Fast; ;}
+    break;
+
+  case 101:
+#line 1216 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::Cold; ;}
+    break;
+
+  case 102:
+#line 1217 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
+    break;
+
+  case 103:
+#line 1218 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
+    break;
+
+  case 104:
+#line 1219 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+                   if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
                      GEN_ERROR("Calling conv too large");
-                   yyval.UIntVal = yyvsp[0].UInt64Val;
+                   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
                   CHECK_FOR_ERROR
-                 ;
-    break;}
-case 104:
-#line 1226 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::ZExt;      ;
-    break;}
-case 105:
-#line 1227 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::ZExt;      ;
-    break;}
-case 106:
-#line 1228 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::SExt;      ;
-    break;}
-case 107:
-#line 1229 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::SExt;      ;
-    break;}
-case 108:
-#line 1230 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::InReg;     ;
-    break;}
-case 109:
-#line 1231 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::StructRet; ;
-    break;}
-case 110:
-#line 1232 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::NoAlias;   ;
-    break;}
-case 111:
-#line 1233 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::ByVal;     ;
-    break;}
-case 112:
-#line 1234 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::Nest;      ;
-    break;}
-case 113:
-#line 1235 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = 
-                          ParamAttr::constructAlignmentFromInt(yyvsp[0].UInt64Val);    ;
-    break;}
-case 114:
-#line 1239 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::None; ;
-    break;}
-case 115:
-#line 1240 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-                yyval.ParamAttrs = yyvsp[-1].ParamAttrs | yyvsp[0].ParamAttrs;
-              ;
-    break;}
-case 116:
-#line 1245 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::NoReturn; ;
-    break;}
-case 117:
-#line 1246 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::NoUnwind; ;
-    break;}
-case 118:
-#line 1247 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::ZExt;     ;
-    break;}
-case 119:
-#line 1248 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::SExt;     ;
-    break;}
-case 120:
-#line 1249 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::ReadNone; ;
-    break;}
-case 121:
-#line 1250 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::ReadOnly; ;
-    break;}
-case 122:
-#line 1253 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamAttrs = ParamAttr::None; ;
-    break;}
-case 123:
-#line 1254 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-                yyval.ParamAttrs = yyvsp[-1].ParamAttrs | yyvsp[0].ParamAttrs;
-              ;
-    break;}
-case 124:
-#line 1259 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.StrVal = 0; ;
-    break;}
-case 125:
-#line 1260 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-                yyval.StrVal = yyvsp[0].StrVal;
-              ;
-    break;}
-case 126:
-#line 1267 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = 0; ;
-    break;}
-case 127:
-#line 1268 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  yyval.UIntVal = yyvsp[0].UInt64Val;
-  if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
+                 ;}
+    break;
+
+  case 105:
+#line 1226 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
+    break;
+
+  case 106:
+#line 1227 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
+    break;
+
+  case 107:
+#line 1228 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
+    break;
+
+  case 108:
+#line 1229 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
+    break;
+
+  case 109:
+#line 1230 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
+    break;
+
+  case 110:
+#line 1231 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::StructRet; ;}
+    break;
+
+  case 111:
+#line 1232 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::NoAlias;   ;}
+    break;
+
+  case 112:
+#line 1233 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ByVal;     ;}
+    break;
+
+  case 113:
+#line 1234 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::Nest;      ;}
+    break;
+
+  case 114:
+#line 1235 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = 
+                          ParamAttr::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
+    break;
+
+  case 115:
+#line 1239 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::None; ;}
+    break;
+
+  case 116:
+#line 1240 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+                (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
+              ;}
+    break;
+
+  case 117:
+#line 1245 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;}
+    break;
+
+  case 118:
+#line 1246 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;}
+    break;
+
+  case 119:
+#line 1247 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ZExt;     ;}
+    break;
+
+  case 120:
+#line 1248 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::SExt;     ;}
+    break;
+
+  case 121:
+#line 1249 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ReadNone; ;}
+    break;
+
+  case 122:
+#line 1250 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ReadOnly; ;}
+    break;
+
+  case 123:
+#line 1253 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::None; ;}
+    break;
+
+  case 124:
+#line 1254 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+                (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
+              ;}
+    break;
+
+  case 125:
+#line 1259 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = 0; ;}
+    break;
+
+  case 126:
+#line 1260 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+                (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
+              ;}
+    break;
+
+  case 127:
+#line 1267 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = 0; ;}
+    break;
+
+  case 128:
+#line 1268 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+  (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
+  if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
     GEN_ERROR("Alignment must be a power of two");
   CHECK_FOR_ERROR
-;
-    break;}
-case 128:
-#line 1274 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.UIntVal = 0; ;
-    break;}
-case 129:
-#line 1275 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  yyval.UIntVal = yyvsp[0].UInt64Val;
-  if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
+;}
+    break;
+
+  case 129:
+#line 1274 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = 0; ;}
+    break;
+
+  case 130:
+#line 1275 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+  (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
+  if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
     GEN_ERROR("Alignment must be a power of two");
   CHECK_FOR_ERROR
-;
-    break;}
-case 130:
-#line 1284 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  for (unsigned i = 0, e = yyvsp[0].StrVal->length(); i != e; ++i)
-    if ((*yyvsp[0].StrVal)[i] == '"' || (*yyvsp[0].StrVal)[i] == '\\')
+;}
+    break;
+
+  case 131:
+#line 1284 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+  for (unsigned i = 0, e = (yyvsp[(2) - (2)].StrVal)->length(); i != e; ++i)
+    if ((*(yyvsp[(2) - (2)].StrVal))[i] == '"' || (*(yyvsp[(2) - (2)].StrVal))[i] == '\\')
       GEN_ERROR("Invalid character in section name");
-  yyval.StrVal = yyvsp[0].StrVal;
+  (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
   CHECK_FOR_ERROR
-;
-    break;}
-case 131:
-#line 1292 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.StrVal = 0; ;
-    break;}
-case 132:
-#line 1293 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.StrVal = yyvsp[0].StrVal; ;
-    break;}
-case 133:
-#line 1298 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{;
-    break;}
-case 134:
-#line 1299 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{;
-    break;}
-case 135:
-#line 1300 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    CurGV->setSection(*yyvsp[0].StrVal);
-    delete yyvsp[0].StrVal;
+;}
+    break;
+
+  case 132:
+#line 1292 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = 0; ;}
+    break;
+
+  case 133:
+#line 1293 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
+    break;
+
+  case 134:
+#line 1298 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {;}
+    break;
+
+  case 135:
+#line 1299 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {;}
+    break;
+
+  case 136:
+#line 1300 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    CurGV->setSection(*(yyvsp[(1) - (1)].StrVal));
+    delete (yyvsp[(1) - (1)].StrVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 136:
-#line 1305 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[0].UInt64Val != 0 && !isPowerOf2_32(yyvsp[0].UInt64Val))
+  ;}
+    break;
+
+  case 137:
+#line 1305 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two");
-    CurGV->setAlignment(yyvsp[0].UInt64Val);
+    CurGV->setAlignment((yyvsp[(2) - (2)].UInt64Val));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 144:
-#line 1321 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeVal = new PATypeHolder(OpaqueType::get());
+  ;}
+    break;
+
+  case 145:
+#line 1321 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 145:
-#line 1325 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType);
+  ;}
+    break;
+
+  case 146:
+#line 1325 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 146:
-#line 1329 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                             // Pointer type?
-    if (*yyvsp[-2].TypeVal == Type::LabelTy)
+  ;}
+    break;
+
+  case 147:
+#line 1329 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                             // Pointer type?
+    if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(PointerType::get(*yyvsp[-2].TypeVal, yyvsp[-1].UIntVal)));
-    delete yyvsp[-2].TypeVal;
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(PointerType::get(*(yyvsp[(1) - (3)].TypeVal), (yyvsp[(2) - (3)].UIntVal))));
+    delete (yyvsp[(1) - (3)].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 148:
+#line 1336 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {            // Named types are also simple types...
+    const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 147:
-#line 1336 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{            // Named types are also simple types...
-    const Type* tmp = getTypeVal(yyvsp[0].ValIDVal);
-    CHECK_FOR_ERROR
-    yyval.TypeVal = new PATypeHolder(tmp);
-  ;
-    break;}
-case 148:
-#line 1341 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                   // Type UpReference
-    if (yyvsp[0].UInt64Val > (uint64_t)~0U) GEN_ERROR("Value out of range");
+    (yyval.TypeVal) = new PATypeHolder(tmp);
+  ;}
+    break;
+
+  case 149:
+#line 1341 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                   // Type UpReference
+    if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
-    UpRefs.push_back(UpRefRecord((unsigned)yyvsp[0].UInt64Val, OT));  // Add to vector...
-    yyval.TypeVal = new PATypeHolder(OT);
+    UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[(2) - (2)].UInt64Val), OT));  // Add to vector...
+    (yyval.TypeVal) = new PATypeHolder(OT);
     UR_OUT("New Upreference!\n");
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 149:
-#line 1349 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 150:
+#line 1349 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
-    const Type* RetTy = *yyvsp[-4].TypeVal;
+    const Type* RetTy = *(yyvsp[(1) - (5)].TypeVal);
     if (!(RetTy->isFirstClassType() || RetTy == Type::VoidTy ||
           isa<OpaqueType>(RetTy)))
       GEN_ERROR("LLVM Functions cannot return aggregates");
 
     std::vector<const Type*> Params;
-    TypeWithAttrsList::iterator I = yyvsp[-2].TypeWithAttrsList->begin(), E = yyvsp[-2].TypeWithAttrsList->end();
+    TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end();
     for (; I != E; ++I ) {
       const Type *Ty = I->Ty->get();
       Params.push_back(Ty);
@@ -3116,19 +4089,20 @@
     CHECK_FOR_ERROR
 
     FunctionType *FT = FunctionType::get(RetTy, Params, isVarArg);
-    delete yyvsp[-2].TypeWithAttrsList;   // Delete the argument list
-    delete yyvsp[-4].TypeVal;   // Delete the return type handle
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(FT)); 
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 150:
-#line 1379 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[(3) - (5)].TypeWithAttrsList);   // Delete the argument list
+    delete (yyvsp[(1) - (5)].TypeVal);   // Delete the return type handle
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); 
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 151:
+#line 1379 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
     std::vector<const Type*> Params;
-    TypeWithAttrsList::iterator I = yyvsp[-2].TypeWithAttrsList->begin(), E = yyvsp[-2].TypeWithAttrsList->end();
+    TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end();
     for ( ; I != E; ++I ) {
       const Type* Ty = I->Ty->get();
       Params.push_back(Ty);
@@ -3143,282 +4117,303 @@
 
     CHECK_FOR_ERROR
 
-    FunctionType *FT = FunctionType::get(yyvsp[-4].PrimType, Params, isVarArg);
-    delete yyvsp[-2].TypeWithAttrsList;      // Delete the argument list
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(FT)); 
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 151:
-#line 1404 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{          // Sized array type?
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(ArrayType::get(*yyvsp[-1].TypeVal, (unsigned)yyvsp[-3].UInt64Val)));
-    delete yyvsp[-1].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 152:
-#line 1409 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{          // Vector type?
-     const llvm::Type* ElemTy = yyvsp[-1].TypeVal->get();
-     if ((unsigned)yyvsp[-3].UInt64Val != yyvsp[-3].UInt64Val)
+    FunctionType *FT = FunctionType::get((yyvsp[(1) - (5)].PrimType), Params, isVarArg);
+    delete (yyvsp[(3) - (5)].TypeWithAttrsList);      // Delete the argument list
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); 
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 152:
+#line 1404 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {          // Sized array type?
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (unsigned)(yyvsp[(2) - (5)].UInt64Val))));
+    delete (yyvsp[(4) - (5)].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 153:
+#line 1409 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {          // Vector type?
+     const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal)->get();
+     if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val))
         GEN_ERROR("Unsigned result not equal to signed result");
      if (!ElemTy->isFloatingPoint() && !ElemTy->isInteger())
         GEN_ERROR("Element type of a VectorType must be primitive");
-     yyval.TypeVal = new PATypeHolder(HandleUpRefs(VectorType::get(*yyvsp[-1].TypeVal, (unsigned)yyvsp[-3].UInt64Val)));
-     delete yyvsp[-1].TypeVal;
+     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(VectorType::get(*(yyvsp[(4) - (5)].TypeVal), (unsigned)(yyvsp[(2) - (5)].UInt64Val))));
+     delete (yyvsp[(4) - (5)].TypeVal);
      CHECK_FOR_ERROR
-  ;
-    break;}
-case 153:
-#line 1419 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                        // Structure type?
+  ;}
+    break;
+
+  case 154:
+#line 1419 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                        // Structure type?
     std::vector<const Type*> Elements;
-    for (std::list<llvm::PATypeHolder>::iterator I = yyvsp[-1].TypeList->begin(),
-           E = yyvsp[-1].TypeList->end(); I != E; ++I)
+    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
+           E = (yyvsp[(2) - (3)].TypeList)->end(); I != E; ++I)
       Elements.push_back(*I);
 
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
-    delete yyvsp[-1].TypeList;
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
+    delete (yyvsp[(2) - (3)].TypeList);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 154:
-#line 1429 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                                  // Empty structure type?
-    yyval.TypeVal = new PATypeHolder(StructType::get(std::vector<const Type*>()));
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 155:
-#line 1433 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 155:
+#line 1429 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                                  // Empty structure type?
+    (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 156:
+#line 1433 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     std::vector<const Type*> Elements;
-    for (std::list<llvm::PATypeHolder>::iterator I = yyvsp[-2].TypeList->begin(),
-           E = yyvsp[-2].TypeList->end(); I != E; ++I)
+    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
+           E = (yyvsp[(3) - (5)].TypeList)->end(); I != E; ++I)
       Elements.push_back(*I);
 
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
-    delete yyvsp[-2].TypeList;
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
+    delete (yyvsp[(3) - (5)].TypeList);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 156:
-#line 1443 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                         // Empty structure type?
-    yyval.TypeVal = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 157:
-#line 1450 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 157:
+#line 1443 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                         // Empty structure type?
+    (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 158:
+#line 1450 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
-    yyval.TypeWithAttrs.Ty = yyvsp[-1].TypeVal; 
-    yyval.TypeWithAttrs.Attrs = ParamAttr::None;
-  ;
-    break;}
-case 158:
-#line 1459 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.TypeWithAttrs).Ty = (yyvsp[(1) - (2)].TypeVal); 
+    (yyval.TypeWithAttrs).Attrs = ParamAttr::None;
+  ;}
+    break;
+
+  case 159:
+#line 1459 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
-    if (!(*yyvsp[0].TypeVal)->isFirstClassType() && !isa<StructType>(yyvsp[0].TypeVal->get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription());
+    if (!(*(yyvsp[(1) - (1)].TypeVal))->isFirstClassType() && !isa<StructType>((yyvsp[(1) - (1)].TypeVal)->get()))
       GEN_ERROR("LLVM functions cannot return aggregate types");
-    yyval.TypeVal = yyvsp[0].TypeVal;
-  ;
-    break;}
-case 159:
-#line 1466 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeVal = new PATypeHolder(Type::VoidTy);
-  ;
-    break;}
-case 160:
-#line 1471 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeWithAttrsList = new TypeWithAttrsList();
-    yyval.TypeWithAttrsList->push_back(yyvsp[0].TypeWithAttrs);
+    (yyval.TypeVal) = (yyvsp[(1) - (1)].TypeVal);
+  ;}
+    break;
+
+  case 160:
+#line 1466 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
+  ;}
+    break;
+
+  case 161:
+#line 1471 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
+    (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 161:
-#line 1476 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    (yyval.TypeWithAttrsList=yyvsp[-2].TypeWithAttrsList)->push_back(yyvsp[0].TypeWithAttrs);
+  ;}
+    break;
+
+  case 162:
+#line 1476 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 163:
-#line 1484 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeWithAttrsList=yyvsp[-2].TypeWithAttrsList;
+  ;}
+    break;
+
+  case 164:
+#line 1484 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
-    yyval.TypeWithAttrsList->push_back(TWA);
+    (yyval.TypeWithAttrsList)->push_back(TWA);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 164:
-#line 1491 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeWithAttrsList = new TypeWithAttrsList;
+  ;}
+    break;
+
+  case 165:
+#line 1491 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
-    yyval.TypeWithAttrsList->push_back(TWA);
+    (yyval.TypeWithAttrsList)->push_back(TWA);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 165:
-#line 1498 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeWithAttrsList = new TypeWithAttrsList();
+  ;}
+    break;
+
+  case 166:
+#line 1498 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 166:
-#line 1506 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TypeList = new std::list<PATypeHolder>();
-    yyval.TypeList->push_back(*yyvsp[0].TypeVal); 
-    delete yyvsp[0].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 167:
-#line 1512 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    (yyval.TypeList=yyvsp[-2].TypeList)->push_back(*yyvsp[0].TypeVal); 
-    delete yyvsp[0].TypeVal;
+  ;}
+    break;
+
+  case 167:
+#line 1506 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeList) = new std::list<PATypeHolder>();
+    (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); 
+    delete (yyvsp[(1) - (1)].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 168:
-#line 1524 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ // Nonempty unsized arr
+  ;}
+    break;
+
+  case 168:
+#line 1512 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); 
+    delete (yyvsp[(3) - (3)].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 169:
+#line 1524 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { // Nonempty unsized arr
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-3].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*yyvsp[-3].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'");
     const Type *ETy = ATy->getElementType();
     int NumElements = ATy->getNumElements();
 
     // Verify that we have the correct size...
-    if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size())
+    if (NumElements != -1 && NumElements != (int)(yyvsp[(3) - (4)].ConstVector)->size())
       GEN_ERROR("Type mismatch: constant sized array initialized with " +
-                     utostr(yyvsp[-1].ConstVector->size()) +  " arguments, but has size of " + 
+                     utostr((yyvsp[(3) - (4)].ConstVector)->size()) +  " arguments, but has size of " + 
                      itostr(NumElements) + "");
 
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
-      if (ETy != (*yyvsp[-1].ConstVector)[i]->getType())
+    for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) {
+      if (ETy != (*(yyvsp[(3) - (4)].ConstVector))[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
                        ETy->getDescription() +"' as required!\nIt is of type '"+
-                       (*yyvsp[-1].ConstVector)[i]->getType()->getDescription() + "'.");
+                       (*(yyvsp[(3) - (4)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
 
-    yyval.ConstVal = ConstantArray::get(ATy, *yyvsp[-1].ConstVector);
-    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
+    (yyval.ConstVal) = ConstantArray::get(ATy, *(yyvsp[(3) - (4)].ConstVector));
+    delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 169:
-#line 1552 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 170:
+#line 1552 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (3)].TypeVal)->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*yyvsp[-2].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'");
 
     int NumElements = ATy->getNumElements();
     if (NumElements != -1 && NumElements != 0) 
       GEN_ERROR("Type mismatch: constant sized array initialized with 0"
                      " arguments, but has size of " + itostr(NumElements) +"");
-    yyval.ConstVal = ConstantArray::get(ATy, std::vector<Constant*>());
-    delete yyvsp[-2].TypeVal;
+    (yyval.ConstVal) = ConstantArray::get(ATy, std::vector<Constant*>());
+    delete (yyvsp[(1) - (3)].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 170:
-#line 1568 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 171:
+#line 1568 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (3)].TypeVal)->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*yyvsp[-2].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'");
 
     int NumElements = ATy->getNumElements();
     const Type *ETy = ATy->getElementType();
-    if (NumElements != -1 && NumElements != int(yyvsp[0].StrVal->length()))
+    if (NumElements != -1 && NumElements != int((yyvsp[(3) - (3)].StrVal)->length()))
       GEN_ERROR("Can't build string constant of size " + 
-                     itostr((int)(yyvsp[0].StrVal->length())) +
+                     itostr((int)((yyvsp[(3) - (3)].StrVal)->length())) +
                      " when array has size " + itostr(NumElements) + "");
     std::vector<Constant*> Vals;
     if (ETy == Type::Int8Ty) {
-      for (unsigned i = 0; i < yyvsp[0].StrVal->length(); ++i)
-        Vals.push_back(ConstantInt::get(ETy, (*yyvsp[0].StrVal)[i]));
+      for (unsigned i = 0; i < (yyvsp[(3) - (3)].StrVal)->length(); ++i)
+        Vals.push_back(ConstantInt::get(ETy, (*(yyvsp[(3) - (3)].StrVal))[i]));
     } else {
-      delete yyvsp[0].StrVal;
+      delete (yyvsp[(3) - (3)].StrVal);
       GEN_ERROR("Cannot build string arrays of non byte sized elements");
     }
-    delete yyvsp[0].StrVal;
-    yyval.ConstVal = ConstantArray::get(ATy, Vals);
-    delete yyvsp[-2].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 171:
-#line 1595 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ // Nonempty unsized arr
+    delete (yyvsp[(3) - (3)].StrVal);
+    (yyval.ConstVal) = ConstantArray::get(ATy, Vals);
+    delete (yyvsp[(1) - (3)].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 172:
+#line 1595 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { // Nonempty unsized arr
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    const VectorType *PTy = dyn_cast<VectorType>(yyvsp[-3].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
+    const VectorType *PTy = dyn_cast<VectorType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (PTy == 0)
       GEN_ERROR("Cannot make packed constant with type: '" + 
-                     (*yyvsp[-3].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'");
     const Type *ETy = PTy->getElementType();
     int NumElements = PTy->getNumElements();
 
     // Verify that we have the correct size...
-    if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size())
+    if (NumElements != -1 && NumElements != (int)(yyvsp[(3) - (4)].ConstVector)->size())
       GEN_ERROR("Type mismatch: constant sized packed initialized with " +
-                     utostr(yyvsp[-1].ConstVector->size()) +  " arguments, but has size of " + 
+                     utostr((yyvsp[(3) - (4)].ConstVector)->size()) +  " arguments, but has size of " + 
                      itostr(NumElements) + "");
 
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
-      if (ETy != (*yyvsp[-1].ConstVector)[i]->getType())
+    for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) {
+      if (ETy != (*(yyvsp[(3) - (4)].ConstVector))[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
            ETy->getDescription() +"' as required!\nIt is of type '"+
-           (*yyvsp[-1].ConstVector)[i]->getType()->getDescription() + "'.");
+           (*(yyvsp[(3) - (4)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
 
-    yyval.ConstVal = ConstantVector::get(PTy, *yyvsp[-1].ConstVector);
-    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
+    (yyval.ConstVal) = ConstantVector::get(PTy, *(yyvsp[(3) - (4)].ConstVector));
+    delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 172:
-#line 1623 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-3].TypeVal->get());
+  ;}
+    break;
+
+  case 173:
+#line 1623 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*yyvsp[-3].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'");
 
-    if (yyvsp[-1].ConstVector->size() != STy->getNumContainedTypes())
+    if ((yyvsp[(3) - (4)].ConstVector)->size() != STy->getNumContainedTypes())
       GEN_ERROR("Illegal number of initializers for structure type");
 
     // Check to ensure that constants are compatible with the type initializer!
-    for (unsigned i = 0, e = yyvsp[-1].ConstVector->size(); i != e; ++i)
-      if ((*yyvsp[-1].ConstVector)[i]->getType() != STy->getElementType(i))
+    for (unsigned i = 0, e = (yyvsp[(3) - (4)].ConstVector)->size(); i != e; ++i)
+      if ((*(yyvsp[(3) - (4)].ConstVector))[i]->getType() != STy->getElementType(i))
         GEN_ERROR("Expected type '" +
                        STy->getElementType(i)->getDescription() +
                        "' for element #" + utostr(i) +
@@ -3429,20 +4424,21 @@
       GEN_ERROR("Unpacked Initializer to vector type '" +
                 STy->getDescription() + "'");
 
-    yyval.ConstVal = ConstantStruct::get(STy, *yyvsp[-1].ConstVector);
-    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
+    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[(3) - (4)].ConstVector));
+    delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 173:
-#line 1649 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 174:
+#line 1649 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-2].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (3)].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*yyvsp[-2].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
       GEN_ERROR("Illegal number of initializers for structure type");
@@ -3452,25 +4448,26 @@
       GEN_ERROR("Unpacked Initializer to vector type '" +
                 STy->getDescription() + "'");
 
-    yyval.ConstVal = ConstantStruct::get(STy, std::vector<Constant*>());
-    delete yyvsp[-2].TypeVal;
+    (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
+    delete (yyvsp[(1) - (3)].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 174:
-#line 1669 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-5].TypeVal->get());
+  ;}
+    break;
+
+  case 175:
+#line 1669 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*yyvsp[-5].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (6)].TypeVal))->getDescription() + "'");
 
-    if (yyvsp[-2].ConstVector->size() != STy->getNumContainedTypes())
+    if ((yyvsp[(4) - (6)].ConstVector)->size() != STy->getNumContainedTypes())
       GEN_ERROR("Illegal number of initializers for structure type");
 
     // Check to ensure that constants are compatible with the type initializer!
-    for (unsigned i = 0, e = yyvsp[-2].ConstVector->size(); i != e; ++i)
-      if ((*yyvsp[-2].ConstVector)[i]->getType() != STy->getElementType(i))
+    for (unsigned i = 0, e = (yyvsp[(4) - (6)].ConstVector)->size(); i != e; ++i)
+      if ((*(yyvsp[(4) - (6)].ConstVector))[i]->getType() != STy->getElementType(i))
         GEN_ERROR("Expected type '" +
                        STy->getElementType(i)->getDescription() +
                        "' for element #" + utostr(i) +
@@ -3481,20 +4478,21 @@
       GEN_ERROR("Vector initializer to non-vector type '" + 
                 STy->getDescription() + "'");
 
-    yyval.ConstVal = ConstantStruct::get(STy, *yyvsp[-2].ConstVector);
-    delete yyvsp[-5].TypeVal; delete yyvsp[-2].ConstVector;
+    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[(4) - (6)].ConstVector));
+    delete (yyvsp[(1) - (6)].TypeVal); delete (yyvsp[(4) - (6)].ConstVector);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 175:
-#line 1695 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 176:
+#line 1695 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-4].TypeVal)->getDescription());
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-4].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (5)].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*yyvsp[-4].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (5)].TypeVal))->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
       GEN_ERROR("Illegal number of initializers for structure type");
@@ -3504,44 +4502,47 @@
       GEN_ERROR("Vector initializer to non-vector type '" + 
                 STy->getDescription() + "'");
 
-    yyval.ConstVal = ConstantStruct::get(STy, std::vector<Constant*>());
-    delete yyvsp[-4].TypeVal;
+    (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
+    delete (yyvsp[(1) - (5)].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 176:
-#line 1715 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 177:
+#line 1715 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    const PointerType *PTy = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    const PointerType *PTy = dyn_cast<PointerType>((yyvsp[(1) - (2)].TypeVal)->get());
     if (PTy == 0)
       GEN_ERROR("Cannot make null pointer constant with type: '" + 
-                     (*yyvsp[-1].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (2)].TypeVal))->getDescription() + "'");
 
-    yyval.ConstVal = ConstantPointerNull::get(PTy);
-    delete yyvsp[-1].TypeVal;
+    (yyval.ConstVal) = ConstantPointerNull::get(PTy);
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 177:
-#line 1727 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 178:
+#line 1727 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    yyval.ConstVal = UndefValue::get(yyvsp[-1].TypeVal->get());
-    delete yyvsp[-1].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 178:
-#line 1734 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    (yyval.ConstVal) = UndefValue::get((yyvsp[(1) - (2)].TypeVal)->get());
+    delete (yyvsp[(1) - (2)].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 179:
+#line 1734 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    const PointerType *Ty = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    const PointerType *Ty = dyn_cast<PointerType>((yyvsp[(1) - (2)].TypeVal)->get());
     if (Ty == 0)
-      GEN_ERROR("Global const reference must be a pointer type " + (*yyvsp[-1].TypeVal)->getDescription());
+      GEN_ERROR("Global const reference must be a pointer type " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
 
     // ConstExprs can exist in the body of a function, thus creating
     // GlobalValues whenever they refer to a variable.  Because we are in
@@ -3553,7 +4554,7 @@
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
 
-    Value *V = getExistingVal(Ty, yyvsp[0].ValIDVal);
+    Value *V = getExistingVal(Ty, (yyvsp[(2) - (2)].ValIDVal));
     CHECK_FOR_ERROR
 
     CurFun.CurrentFunction = SavedCurFn;
@@ -3568,16 +4569,16 @@
 
       // First check to see if the forward references value is already created!
       PerModuleInfo::GlobalRefsType::iterator I =
-        CurModule.GlobalRefs.find(std::make_pair(PT, yyvsp[0].ValIDVal));
+        CurModule.GlobalRefs.find(std::make_pair(PT, (yyvsp[(2) - (2)].ValIDVal)));
     
       if (I != CurModule.GlobalRefs.end()) {
         V = I->second;             // Placeholder already exists, use it...
-        yyvsp[0].ValIDVal.destroy();
+        (yyvsp[(2) - (2)].ValIDVal).destroy();
       } else {
         std::string Name;
-        if (yyvsp[0].ValIDVal.Type == ValID::GlobalName)
-          Name = yyvsp[0].ValIDVal.getName();
-        else if (yyvsp[0].ValIDVal.Type != ValID::GlobalID)
+        if ((yyvsp[(2) - (2)].ValIDVal).Type == ValID::GlobalName)
+          Name = (yyvsp[(2) - (2)].ValIDVal).getName();
+        else if ((yyvsp[(2) - (2)].ValIDVal).Type != ValID::GlobalID)
           GEN_ERROR("Invalid reference to global");
 
         // Create the forward referenced global.
@@ -3588,347 +4589,382 @@
                                 CurModule.CurrentModule);
         } else {
           GV = new GlobalVariable(PT->getElementType(), false,
-                                  GlobalValue::ExternalWeakLinkage, 0,
-                                  Name, CurModule.CurrentModule);
+                                      GlobalValue::ExternalWeakLinkage, 0,
+                                      Name, CurModule.CurrentModule);
         }
 
         // Keep track of the fact that we have a forward ref to recycle it
-        CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, yyvsp[0].ValIDVal), GV));
+        CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, (yyvsp[(2) - (2)].ValIDVal)), GV));
         V = GV;
       }
     }
 
-    yyval.ConstVal = cast<GlobalValue>(V);
-    delete yyvsp[-1].TypeVal;            // Free the type handle
+    (yyval.ConstVal) = cast<GlobalValue>(V);
+    delete (yyvsp[(1) - (2)].TypeVal);            // Free the type handle
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 179:
-#line 1800 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 180:
+#line 1800 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    if (yyvsp[-1].TypeVal->get() != yyvsp[0].ConstVal->getType())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    if ((yyvsp[(1) - (2)].TypeVal)->get() != (yyvsp[(2) - (2)].ConstVal)->getType())
       GEN_ERROR("Mismatched types for constant expression: " + 
-        (*yyvsp[-1].TypeVal)->getDescription() + " and " + yyvsp[0].ConstVal->getType()->getDescription());
-    yyval.ConstVal = yyvsp[0].ConstVal;
-    delete yyvsp[-1].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 180:
-#line 1810 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+        (*(yyvsp[(1) - (2)].TypeVal))->getDescription() + " and " + (yyvsp[(2) - (2)].ConstVal)->getType()->getDescription());
+    (yyval.ConstVal) = (yyvsp[(2) - (2)].ConstVal);
+    delete (yyvsp[(1) - (2)].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 181:
+#line 1810 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    const Type *Ty = yyvsp[-1].TypeVal->get();
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    const Type *Ty = (yyvsp[(1) - (2)].TypeVal)->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
       GEN_ERROR("Cannot create a null initialized value of this type");
-    yyval.ConstVal = Constant::getNullValue(Ty);
-    delete yyvsp[-1].TypeVal;
+    (yyval.ConstVal) = Constant::getNullValue(Ty);
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 181:
-#line 1820 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{      // integral constants
-    if (!ConstantInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].SInt64Val))
+  ;}
+    break;
+
+  case 182:
+#line 1820 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {      // integral constants
+    if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
-    yyval.ConstVal = ConstantInt::get(yyvsp[-1].PrimType, yyvsp[0].SInt64Val, true);
+    (yyval.ConstVal) = ConstantInt::get((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val), true);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 182:
-#line 1826 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{      // arbitrary precision integer constants
-    uint32_t BitWidth = cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth();
-    if (yyvsp[0].APIntVal->getBitWidth() > BitWidth) {
+  ;}
+    break;
+
+  case 183:
+#line 1826 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {      // arbitrary precision integer constants
+    uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
+    if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
       GEN_ERROR("Constant value does not fit in type");
     }
-    yyvsp[0].APIntVal->sextOrTrunc(BitWidth);
-    yyval.ConstVal = ConstantInt::get(*yyvsp[0].APIntVal);
-    delete yyvsp[0].APIntVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 183:
-#line 1836 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{      // integral constants
-    if (!ConstantInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].UInt64Val))
+    (yyvsp[(2) - (2)].APIntVal)->sextOrTrunc(BitWidth);
+    (yyval.ConstVal) = ConstantInt::get(*(yyvsp[(2) - (2)].APIntVal));
+    delete (yyvsp[(2) - (2)].APIntVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 184:
+#line 1836 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {      // integral constants
+    if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
-    yyval.ConstVal = ConstantInt::get(yyvsp[-1].PrimType, yyvsp[0].UInt64Val, false);
+    (yyval.ConstVal) = ConstantInt::get((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val), false);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 184:
-#line 1842 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{      // arbitrary precision integer constants
-    uint32_t BitWidth = cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth();
-    if (yyvsp[0].APIntVal->getBitWidth() > BitWidth) {
+  ;}
+    break;
+
+  case 185:
+#line 1842 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {      // arbitrary precision integer constants
+    uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
+    if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
       GEN_ERROR("Constant value does not fit in type");
     } 
-    yyvsp[0].APIntVal->zextOrTrunc(BitWidth);
-    yyval.ConstVal = ConstantInt::get(*yyvsp[0].APIntVal);
-    delete yyvsp[0].APIntVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 185:
-#line 1852 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                      // Boolean constants
-    assert(cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth() == 1 && "Not Bool?");
-    yyval.ConstVal = ConstantInt::getTrue();
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 186:
-#line 1857 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                     // Boolean constants
-    assert(cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth() == 1 && "Not Bool?");
-    yyval.ConstVal = ConstantInt::getFalse();
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 187:
-#line 1862 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                   // Floating point constants
-    if (!ConstantFP::isValueValidForType(yyvsp[-1].PrimType, *yyvsp[0].FPVal))
+    (yyvsp[(2) - (2)].APIntVal)->zextOrTrunc(BitWidth);
+    (yyval.ConstVal) = ConstantInt::get(*(yyvsp[(2) - (2)].APIntVal));
+    delete (yyvsp[(2) - (2)].APIntVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 186:
+#line 1852 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                      // Boolean constants
+    assert(cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?");
+    (yyval.ConstVal) = ConstantInt::getTrue();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 187:
+#line 1857 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                     // Boolean constants
+    assert(cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?");
+    (yyval.ConstVal) = ConstantInt::getFalse();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 188:
+#line 1862 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                   // Floating point constants
+    if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].PrimType), *(yyvsp[(2) - (2)].FPVal)))
       GEN_ERROR("Floating point constant invalid for type");
     // Lexer has no type info, so builds all float and double FP constants 
     // as double.  Fix this here.  Long double is done right.
-    if (&yyvsp[0].FPVal->getSemantics()==&APFloat::IEEEdouble && yyvsp[-1].PrimType==Type::FloatTy)
-      yyvsp[0].FPVal->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven);
-    yyval.ConstVal = ConstantFP::get(yyvsp[-1].PrimType, *yyvsp[0].FPVal);
-    delete yyvsp[0].FPVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 188:
-#line 1875 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    if (&(yyvsp[(2) - (2)].FPVal)->getSemantics()==&APFloat::IEEEdouble && (yyvsp[(1) - (2)].PrimType)==Type::FloatTy)
+      (yyvsp[(2) - (2)].FPVal)->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven);
+    (yyval.ConstVal) = ConstantFP::get((yyvsp[(1) - (2)].PrimType), *(yyvsp[(2) - (2)].FPVal));
+    delete (yyvsp[(2) - (2)].FPVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 189:
+#line 1875 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    Constant *Val = yyvsp[-3].ConstVal;
-    const Type *DestTy = yyvsp[-1].TypeVal->get();
-    if (!CastInst::castIsValid(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, DestTy))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
+    Constant *Val = (yyvsp[(3) - (6)].ConstVal);
+    const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
+    if (!CastInst::castIsValid((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'"); 
-    yyval.ConstVal = ConstantExpr::getCast(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, DestTy);
-    delete yyvsp[-1].TypeVal;
-  ;
-    break;}
-case 189:
-#line 1887 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!isa<PointerType>(yyvsp[-2].ConstVal->getType()))
+    (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy);
+    delete (yyvsp[(5) - (6)].TypeVal);
+  ;}
+    break;
+
+  case 190:
+#line 1887 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
 
     const Type *IdxTy =
-      GetElementPtrInst::getIndexedType(yyvsp[-2].ConstVal->getType(), yyvsp[-1].ValueList->begin(), yyvsp[-1].ValueList->end(),
+      GetElementPtrInst::getIndexedType((yyvsp[(3) - (5)].ConstVal)->getType(), (yyvsp[(4) - (5)].ValueList)->begin(), (yyvsp[(4) - (5)].ValueList)->end(),
                                         true);
     if (!IdxTy)
       GEN_ERROR("Index list invalid for constant getelementptr");
 
     SmallVector<Constant*, 8> IdxVec;
-    for (unsigned i = 0, e = yyvsp[-1].ValueList->size(); i != e; ++i)
-      if (Constant *C = dyn_cast<Constant>((*yyvsp[-1].ValueList)[i]))
+    for (unsigned i = 0, e = (yyvsp[(4) - (5)].ValueList)->size(); i != e; ++i)
+      if (Constant *C = dyn_cast<Constant>((*(yyvsp[(4) - (5)].ValueList))[i]))
         IdxVec.push_back(C);
       else
         GEN_ERROR("Indices to constant getelementptr must be constants");
 
-    delete yyvsp[-1].ValueList;
+    delete (yyvsp[(4) - (5)].ValueList);
 
-    yyval.ConstVal = ConstantExpr::getGetElementPtr(yyvsp[-2].ConstVal, &IdxVec[0], IdxVec.size());
+    (yyval.ConstVal) = ConstantExpr::getGetElementPtr((yyvsp[(3) - (5)].ConstVal), &IdxVec[0], IdxVec.size());
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 190:
-#line 1909 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-5].ConstVal->getType() != Type::Int1Ty)
+  ;}
+    break;
+
+  case 191:
+#line 1909 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+    if ((yyvsp[(5) - (8)].ConstVal)->getType() != (yyvsp[(7) - (8)].ConstVal)->getType())
       GEN_ERROR("Select operand types must match");
-    yyval.ConstVal = ConstantExpr::getSelect(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::getSelect((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 191:
-#line 1917 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+  ;}
+    break;
+
+  case 192:
+#line 1917 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
     CHECK_FOR_ERROR;
-    yyval.ConstVal = ConstantExpr::get(yyvsp[-5].BinaryOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
-  ;
-    break;}
-case 192:
-#line 1923 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+    (yyval.ConstVal) = ConstantExpr::get((yyvsp[(1) - (6)].BinaryOpVal), (yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal));
+  ;}
+    break;
+
+  case 193:
+#line 1923 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
-    if (!yyvsp[-3].ConstVal->getType()->isInteger()) {
-      if (Instruction::isShift(yyvsp[-5].BinaryOpVal) || !isa<VectorType>(yyvsp[-3].ConstVal->getType()) || 
-          !cast<VectorType>(yyvsp[-3].ConstVal->getType())->getElementType()->isInteger())
+    if (!(yyvsp[(3) - (6)].ConstVal)->getType()->isInteger()) {
+      if (Instruction::isShift((yyvsp[(1) - (6)].BinaryOpVal)) || !isa<VectorType>((yyvsp[(3) - (6)].ConstVal)->getType()) || 
+          !cast<VectorType>((yyvsp[(3) - (6)].ConstVal)->getType())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands");
     }
-    yyval.ConstVal = ConstantExpr::get(yyvsp[-5].BinaryOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::get((yyvsp[(1) - (6)].BinaryOpVal), (yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 193:
-#line 1934 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+  ;}
+    break;
+
+  case 194:
+#line 1934 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
-    yyval.ConstVal = ConstantExpr::getICmp(yyvsp[-5].IPredicate, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
-  ;
-    break;}
-case 194:
-#line 1939 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+    (yyval.ConstVal) = ConstantExpr::getICmp((yyvsp[(2) - (7)].IPredicate), (yyvsp[(4) - (7)].ConstVal), (yyvsp[(6) - (7)].ConstVal));
+  ;}
+    break;
+
+  case 195:
+#line 1939 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
-    yyval.ConstVal = ConstantExpr::getFCmp(yyvsp[-5].FPredicate, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
-  ;
-    break;}
-case 195:
-#line 1944 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!ExtractElementInst::isValidOperands(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
+    (yyval.ConstVal) = ConstantExpr::getFCmp((yyvsp[(2) - (7)].FPredicate), (yyvsp[(4) - (7)].ConstVal), (yyvsp[(6) - (7)].ConstVal));
+  ;}
+    break;
+
+  case 196:
+#line 1944 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
-    yyval.ConstVal = ConstantExpr::getExtractElement(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::getExtractElement((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 196:
-#line 1950 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!InsertElementInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
+  ;}
+    break;
+
+  case 197:
+#line 1950 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
       GEN_ERROR("Invalid insertelement operands");
-    yyval.ConstVal = ConstantExpr::getInsertElement(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::getInsertElement((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 197:
-#line 1956 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!ShuffleVectorInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
+  ;}
+    break;
+
+  case 198:
+#line 1956 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands");
-    yyval.ConstVal = ConstantExpr::getShuffleVector(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::getShuffleVector((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 198:
-#line 1965 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal);
+  ;}
+    break;
+
+  case 199:
+#line 1965 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 199:
-#line 1969 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ConstVector = new std::vector<Constant*>();
-    yyval.ConstVector->push_back(yyvsp[0].ConstVal);
+  ;}
+    break;
+
+  case 200:
+#line 1969 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ConstVector) = new std::vector<Constant*>();
+    (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 200:
-#line 1977 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.BoolVal = false; ;
-    break;}
-case 201:
-#line 1977 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.BoolVal = true; ;
-    break;}
-case 202:
-#line 1980 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.BoolVal = true; ;
-    break;}
-case 203:
-#line 1980 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.BoolVal = false; ;
-    break;}
-case 204:
-#line 1983 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    const Type* VTy = yyvsp[-1].TypeVal->get();
-    Value *V = getVal(VTy, yyvsp[0].ValIDVal);
+  ;}
+    break;
+
+  case 201:
+#line 1977 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = false; ;}
+    break;
+
+  case 202:
+#line 1977 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = true; ;}
+    break;
+
+  case 203:
+#line 1980 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = true; ;}
+    break;
+
+  case 204:
+#line 1980 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = false; ;}
+    break;
+
+  case 205:
+#line 1983 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get();
+    Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal));
     CHECK_FOR_ERROR
     GlobalValue* Aliasee = dyn_cast<GlobalValue>(V);
     if (!Aliasee)
       GEN_ERROR("Aliases can be created only to global values");
 
-    yyval.ConstVal = Aliasee;
+    (yyval.ConstVal) = Aliasee;
     CHECK_FOR_ERROR
-    delete yyvsp[-1].TypeVal;
-   ;
-    break;}
-case 205:
-#line 1995 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    Constant *Val = yyvsp[-3].ConstVal;
-    const Type *DestTy = yyvsp[-1].TypeVal->get();
-    if (!CastInst::castIsValid(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, DestTy))
+    delete (yyvsp[(1) - (2)].TypeVal);
+   ;}
+    break;
+
+  case 206:
+#line 1995 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    Constant *Val = (yyvsp[(3) - (6)].ConstVal);
+    const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
+    if (!CastInst::castIsValid((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'");
     
-    yyval.ConstVal = ConstantExpr::getCast(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, DestTy);
+    (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy);
     CHECK_FOR_ERROR
-    delete yyvsp[-1].TypeVal;
-   ;
-    break;}
-case 206:
-#line 2016 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ModuleVal = ParserResult = CurModule.CurrentModule;
+    delete (yyvsp[(5) - (6)].TypeVal);
+   ;}
+    break;
+
+  case 207:
+#line 2016 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
     CHECK_FOR_ERROR;
-  ;
-    break;}
-case 207:
-#line 2021 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ModuleVal = ParserResult = CurModule.CurrentModule;
+  ;}
+    break;
+
+  case 208:
+#line 2021 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
     CHECK_FOR_ERROR;
-  ;
-    break;}
-case 210:
-#line 2034 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ CurFun.isDeclare = false; ;
-    break;}
-case 211:
-#line 2034 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 211:
+#line 2034 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { CurFun.isDeclare = false; ;}
+    break;
+
+  case 212:
+#line 2034 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 212:
-#line 2038 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ CurFun.isDeclare = true; ;
-    break;}
-case 213:
-#line 2038 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 213:
+#line 2038 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { CurFun.isDeclare = true; ;}
+    break;
+
+  case 214:
+#line 2038 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 214:
-#line 2041 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 215:
+#line 2041 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 215:
-#line 2044 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 216:
+#line 2044 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
     // Eagerly resolve types.  This is not an optimization, this is a
     // requirement that is due to the fact that we could have this:
     //
@@ -3938,100 +4974,108 @@
     // If types are not resolved eagerly, then the two types will not be
     // determined to be the same type!
     //
-    ResolveTypeTo(yyvsp[-2].StrVal, *yyvsp[0].TypeVal);
+    ResolveTypeTo((yyvsp[(1) - (3)].StrVal), *(yyvsp[(3) - (3)].TypeVal));
 
-    if (!setTypeName(*yyvsp[0].TypeVal, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) {
+    if (!setTypeName(*(yyvsp[(3) - (3)].TypeVal), (yyvsp[(1) - (3)].StrVal)) && !(yyvsp[(1) - (3)].StrVal)) {
       CHECK_FOR_ERROR
       // If this is a named type that is not a redefinition, add it to the slot
       // table.
-      CurModule.Types.push_back(*yyvsp[0].TypeVal);
+      CurModule.Types.push_back(*(yyvsp[(3) - (3)].TypeVal));
     }
 
-    delete yyvsp[0].TypeVal;
+    delete (yyvsp[(3) - (3)].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 216:
-#line 2068 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    ResolveTypeTo(yyvsp[-2].StrVal, yyvsp[0].PrimType);
+  ;}
+    break;
+
+  case 217:
+#line 2068 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType));
 
-    if (!setTypeName(yyvsp[0].PrimType, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) {
+    if (!setTypeName((yyvsp[(3) - (3)].PrimType), (yyvsp[(1) - (3)].StrVal)) && !(yyvsp[(1) - (3)].StrVal)) {
       CHECK_FOR_ERROR
       // If this is a named type that is not a redefinition, add it to the slot
       // table.
-      CurModule.Types.push_back(yyvsp[0].PrimType);
+      CurModule.Types.push_back((yyvsp[(3) - (3)].PrimType));
     }
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 217:
-#line 2080 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ 
+  ;}
+    break;
+
+  case 218:
+#line 2080 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { 
     /* "Externally Visible" Linkage */
-    if (yyvsp[-1].ConstVal == 0) 
+    if ((yyvsp[(5) - (6)].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable(yyvsp[-5].StrVal, GlobalValue::ExternalLinkage,
-                                yyvsp[-4].Visibility, yyvsp[-2].BoolVal, yyvsp[-1].ConstVal->getType(), yyvsp[-1].ConstVal, yyvsp[-3].BoolVal, yyvsp[0].UIntVal);
+    CurGV = ParseGlobalVariable((yyvsp[(1) - (6)].StrVal), GlobalValue::ExternalLinkage,
+                                (yyvsp[(2) - (6)].Visibility), (yyvsp[(4) - (6)].BoolVal), (yyvsp[(5) - (6)].ConstVal)->getType(), (yyvsp[(5) - (6)].ConstVal), (yyvsp[(3) - (6)].BoolVal), (yyvsp[(6) - (6)].UIntVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 218:
-#line 2087 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 219:
+#line 2087 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CurGV = 0;
-  ;
-    break;}
-case 219:
-#line 2091 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-1].ConstVal == 0) 
+  ;}
+    break;
+
+  case 220:
+#line 2091 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[(6) - (7)].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable(yyvsp[-6].StrVal, yyvsp[-5].Linkage, yyvsp[-4].Visibility, yyvsp[-2].BoolVal, yyvsp[-1].ConstVal->getType(), yyvsp[-1].ConstVal, yyvsp[-3].BoolVal, yyvsp[0].UIntVal);
+    CurGV = ParseGlobalVariable((yyvsp[(1) - (7)].StrVal), (yyvsp[(2) - (7)].Linkage), (yyvsp[(3) - (7)].Visibility), (yyvsp[(5) - (7)].BoolVal), (yyvsp[(6) - (7)].ConstVal)->getType(), (yyvsp[(6) - (7)].ConstVal), (yyvsp[(4) - (7)].BoolVal), (yyvsp[(7) - (7)].UIntVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 220:
-#line 2096 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 221:
+#line 2096 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CurGV = 0;
-  ;
-    break;}
-case 221:
-#line 2100 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 222:
+#line 2100 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    CurGV = ParseGlobalVariable(yyvsp[-6].StrVal, yyvsp[-5].Linkage, yyvsp[-4].Visibility, yyvsp[-2].BoolVal, *yyvsp[-1].TypeVal, 0, yyvsp[-3].BoolVal, yyvsp[0].UIntVal);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription());
+    CurGV = ParseGlobalVariable((yyvsp[(1) - (7)].StrVal), (yyvsp[(2) - (7)].Linkage), (yyvsp[(3) - (7)].Visibility), (yyvsp[(5) - (7)].BoolVal), *(yyvsp[(6) - (7)].TypeVal), 0, (yyvsp[(4) - (7)].BoolVal), (yyvsp[(7) - (7)].UIntVal));
     CHECK_FOR_ERROR
-    delete yyvsp[-1].TypeVal;
-  ;
-    break;}
-case 222:
-#line 2106 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[(6) - (7)].TypeVal);
+  ;}
+    break;
+
+  case 223:
+#line 2106 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     CurGV = 0;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 223:
-#line 2110 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 224:
+#line 2110 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     std::string Name;
-    if (yyvsp[-4].StrVal) {
-      Name = *yyvsp[-4].StrVal;
-      delete yyvsp[-4].StrVal;
+    if ((yyvsp[(1) - (5)].StrVal)) {
+      Name = *(yyvsp[(1) - (5)].StrVal);
+      delete (yyvsp[(1) - (5)].StrVal);
     }
     if (Name.empty())
       GEN_ERROR("Alias name cannot be empty");
     
-    Constant* Aliasee = yyvsp[0].ConstVal;
+    Constant* Aliasee = (yyvsp[(5) - (5)].ConstVal);
     if (Aliasee == 0)
       GEN_ERROR(std::string("Invalid aliasee for alias: ") + Name);
 
-    GlobalAlias* GA = new GlobalAlias(Aliasee->getType(), yyvsp[-1].Linkage, Name, Aliasee,
+    GlobalAlias* GA = new GlobalAlias(Aliasee->getType(), (yyvsp[(4) - (5)].Linkage), Name, Aliasee,
                                       CurModule.CurrentModule);
-    GA->setVisibility(yyvsp[-3].Visibility);
+    GA->setVisibility((yyvsp[(2) - (5)].Visibility));
     InsertValue(GA, CurModule.Values);
     
     
@@ -4055,150 +5099,165 @@
     ID.destroy();
     
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 224:
-#line 2150 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ 
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 225:
-#line 2153 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 225:
+#line 2150 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { 
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 226:
-#line 2159 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 226:
+#line 2153 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 227:
+#line 2159 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   if (AsmSoFar.empty())
-    CurModule.CurrentModule->setModuleInlineAsm(*yyvsp[0].StrVal);
+    CurModule.CurrentModule->setModuleInlineAsm(*(yyvsp[(1) - (1)].StrVal));
   else
-    CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+*yyvsp[0].StrVal);
-  delete yyvsp[0].StrVal;
+    CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+*(yyvsp[(1) - (1)].StrVal));
+  delete (yyvsp[(1) - (1)].StrVal);
   CHECK_FOR_ERROR
-;
-    break;}
-case 227:
-#line 2169 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    CurModule.CurrentModule->setTargetTriple(*yyvsp[0].StrVal);
-    delete yyvsp[0].StrVal;
-  ;
-    break;}
-case 228:
-#line 2173 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    CurModule.CurrentModule->setDataLayout(*yyvsp[0].StrVal);
-    delete yyvsp[0].StrVal;
-  ;
-    break;}
-case 230:
-#line 2180 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-          CurModule.CurrentModule->addLibrary(*yyvsp[0].StrVal);
-          delete yyvsp[0].StrVal;
+;}
+    break;
+
+  case 228:
+#line 2169 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal));
+    delete (yyvsp[(3) - (3)].StrVal);
+  ;}
+    break;
+
+  case 229:
+#line 2173 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal));
+    delete (yyvsp[(3) - (3)].StrVal);
+  ;}
+    break;
+
+  case 231:
+#line 2180 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+          CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal));
+          delete (yyvsp[(3) - (3)].StrVal);
           CHECK_FOR_ERROR
-        ;
-    break;}
-case 231:
-#line 2185 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-          CurModule.CurrentModule->addLibrary(*yyvsp[0].StrVal);
-          delete yyvsp[0].StrVal;
+        ;}
+    break;
+
+  case 232:
+#line 2185 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+          CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal));
+          delete (yyvsp[(1) - (1)].StrVal);
           CHECK_FOR_ERROR
-        ;
-    break;}
-case 232:
-#line 2190 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+        ;}
+    break;
+
+  case 233:
+#line 2190 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
           CHECK_FOR_ERROR
-        ;
-    break;}
-case 233:
-#line 2199 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+        ;}
+    break;
+
+  case 234:
+#line 2199 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    if (*yyvsp[-2].TypeVal == Type::VoidTy)
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
+    if (*(yyvsp[(3) - (5)].TypeVal) == Type::VoidTy)
       GEN_ERROR("void typed arguments are invalid");
-    ArgListEntry E; E.Attrs = yyvsp[-1].ParamAttrs; E.Ty = yyvsp[-2].TypeVal; E.Name = yyvsp[0].StrVal;
-    yyval.ArgList = yyvsp[-4].ArgList;
-    yyvsp[-4].ArgList->push_back(E);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 234:
-#line 2209 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    ArgListEntry E; E.Attrs = (yyvsp[(4) - (5)].ParamAttrs); E.Ty = (yyvsp[(3) - (5)].TypeVal); E.Name = (yyvsp[(5) - (5)].StrVal);
+    (yyval.ArgList) = (yyvsp[(1) - (5)].ArgList);
+    (yyvsp[(1) - (5)].ArgList)->push_back(E);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 235:
+#line 2209 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    if (*yyvsp[-2].TypeVal == Type::VoidTy)
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
+    if (*(yyvsp[(1) - (3)].TypeVal) == Type::VoidTy)
       GEN_ERROR("void typed arguments are invalid");
-    ArgListEntry E; E.Attrs = yyvsp[-1].ParamAttrs; E.Ty = yyvsp[-2].TypeVal; E.Name = yyvsp[0].StrVal;
-    yyval.ArgList = new ArgListType;
-    yyval.ArgList->push_back(E);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 235:
-#line 2220 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ArgList = yyvsp[0].ArgList;
+    ArgListEntry E; E.Attrs = (yyvsp[(2) - (3)].ParamAttrs); E.Ty = (yyvsp[(1) - (3)].TypeVal); E.Name = (yyvsp[(3) - (3)].StrVal);
+    (yyval.ArgList) = new ArgListType;
+    (yyval.ArgList)->push_back(E);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 236:
-#line 2224 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ArgList = yyvsp[-2].ArgList;
+  ;}
+    break;
+
+  case 236:
+#line 2220 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 237:
+#line 2224 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
     E.Attrs = ParamAttr::None;
-    yyval.ArgList->push_back(E);
+    (yyval.ArgList)->push_back(E);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 237:
-#line 2233 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ArgList = new ArgListType;
+  ;}
+    break;
+
+  case 238:
+#line 2233 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
     E.Attrs = ParamAttr::None;
-    yyval.ArgList->push_back(E);
+    (yyval.ArgList)->push_back(E);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 238:
-#line 2242 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ArgList = 0;
+  ;}
+    break;
+
+  case 239:
+#line 2242 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 239:
-#line 2248 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  std::string FunctionName(*yyvsp[-7].StrVal);
-  delete yyvsp[-7].StrVal;  // Free strdup'd memory!
+  ;}
+    break;
+
+  case 240:
+#line 2248 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+  std::string FunctionName(*(yyvsp[(3) - (10)].StrVal));
+  delete (yyvsp[(3) - (10)].StrVal);  // Free strdup'd memory!
   
   // Check the function result for abstractness if this is a define. We should
   // have no abstract types at this point
-  if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(yyvsp[-8].TypeVal))
-    GEN_ERROR("Reference to abstract result: "+ yyvsp[-8].TypeVal->get()->getDescription());
+  if (!CurFun.isDeclare && CurModule.TypeIsUnresolved((yyvsp[(2) - (10)].TypeVal)))
+    GEN_ERROR("Reference to abstract result: "+ (yyvsp[(2) - (10)].TypeVal)->get()->getDescription());
 
   std::vector<const Type*> ParamTypeList;
   SmallVector<ParamAttrsWithIndex, 8> Attrs;
-  if (yyvsp[-3].ParamAttrs != ParamAttr::None)
-    Attrs.push_back(ParamAttrsWithIndex::get(0, yyvsp[-3].ParamAttrs));
-  if (yyvsp[-5].ArgList) {   // If there are arguments...
+  if ((yyvsp[(7) - (10)].ParamAttrs) != ParamAttr::None)
+    Attrs.push_back(ParamAttrsWithIndex::get(0, (yyvsp[(7) - (10)].ParamAttrs)));
+  if ((yyvsp[(5) - (10)].ArgList)) {   // If there are arguments...
     unsigned index = 1;
-    for (ArgListType::iterator I = yyvsp[-5].ArgList->begin(); I != yyvsp[-5].ArgList->end(); ++I, ++index) {
+    for (ArgListType::iterator I = (yyvsp[(5) - (10)].ArgList)->begin(); I != (yyvsp[(5) - (10)].ArgList)->end(); ++I, ++index) {
       const Type* Ty = I->Ty->get();
       if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(I->Ty))
         GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
@@ -4215,9 +5274,9 @@
   if (!Attrs.empty())
     PAL = PAListPtr::get(Attrs.begin(), Attrs.end());
 
-  FunctionType *FT = FunctionType::get(*yyvsp[-8].TypeVal, ParamTypeList, isVarArg);
+  FunctionType *FT = FunctionType::get(*(yyvsp[(2) - (10)].TypeVal), ParamTypeList, isVarArg);
   const PointerType *PFT = PointerType::getUnqual(FT);
-  delete yyvsp[-8].TypeVal;
+  delete (yyvsp[(2) - (10)].TypeVal);
 
   ValID ID;
   if (!FunctionName.empty()) {
@@ -4271,31 +5330,31 @@
     Fn->setLinkage(CurFun.Linkage);
     Fn->setVisibility(CurFun.Visibility);
   }
-  Fn->setCallingConv(yyvsp[-9].UIntVal);
+  Fn->setCallingConv((yyvsp[(1) - (10)].UIntVal));
   Fn->setParamAttrs(PAL);
-  Fn->setAlignment(yyvsp[-1].UIntVal);
-  if (yyvsp[-2].StrVal) {
-    Fn->setSection(*yyvsp[-2].StrVal);
-    delete yyvsp[-2].StrVal;
-  }
-  if (yyvsp[0].StrVal) {
-    Fn->setCollector(yyvsp[0].StrVal->c_str());
-    delete yyvsp[0].StrVal;
+  Fn->setAlignment((yyvsp[(9) - (10)].UIntVal));
+  if ((yyvsp[(8) - (10)].StrVal)) {
+    Fn->setSection(*(yyvsp[(8) - (10)].StrVal));
+    delete (yyvsp[(8) - (10)].StrVal);
+  }
+  if ((yyvsp[(10) - (10)].StrVal)) {
+    Fn->setCollector((yyvsp[(10) - (10)].StrVal)->c_str());
+    delete (yyvsp[(10) - (10)].StrVal);
   }
 
   // Add all of the arguments we parsed to the function...
-  if (yyvsp[-5].ArgList) {                     // Is null if empty...
+  if ((yyvsp[(5) - (10)].ArgList)) {                     // Is null if empty...
     if (isVarArg) {  // Nuke the last entry
-      assert(yyvsp[-5].ArgList->back().Ty->get() == Type::VoidTy && yyvsp[-5].ArgList->back().Name == 0 &&
+      assert((yyvsp[(5) - (10)].ArgList)->back().Ty->get() == Type::VoidTy && (yyvsp[(5) - (10)].ArgList)->back().Name == 0 &&
              "Not a varargs marker!");
-      delete yyvsp[-5].ArgList->back().Ty;
-      yyvsp[-5].ArgList->pop_back();  // Delete the last entry
+      delete (yyvsp[(5) - (10)].ArgList)->back().Ty;
+      (yyvsp[(5) - (10)].ArgList)->pop_back();  // Delete the last entry
     }
     Function::arg_iterator ArgIt = Fn->arg_begin();
     Function::arg_iterator ArgEnd = Fn->arg_end();
     unsigned Idx = 1;
-    for (ArgListType::iterator I = yyvsp[-5].ArgList->begin(); 
-         I != yyvsp[-5].ArgList->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
+    for (ArgListType::iterator I = (yyvsp[(5) - (10)].ArgList)->begin(); 
+         I != (yyvsp[(5) - (10)].ArgList)->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
       delete I->Ty;                          // Delete the typeholder...
       setValueName(ArgIt, I->Name);       // Insert arg into symtab...
       CHECK_FOR_ERROR
@@ -4303,114 +5362,128 @@
       Idx++;
     }
 
-    delete yyvsp[-5].ArgList;                     // We're now done with the argument list
+    delete (yyvsp[(5) - (10)].ArgList);                     // We're now done with the argument list
   }
   CHECK_FOR_ERROR
-;
-    break;}
-case 242:
-#line 2375 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  yyval.FunctionVal = CurFun.CurrentFunction;
+;}
+    break;
+
+  case 243:
+#line 2375 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+  (yyval.FunctionVal) = CurFun.CurrentFunction;
 
   // Make sure that we keep track of the linkage type even if there was a
   // previous "declare".
-  yyval.FunctionVal->setLinkage(yyvsp[-3].Linkage);
-  yyval.FunctionVal->setVisibility(yyvsp[-2].Visibility);
-;
-    break;}
-case 245:
-#line 2386 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  yyval.FunctionVal = yyvsp[-1].FunctionVal;
+  (yyval.FunctionVal)->setLinkage((yyvsp[(1) - (4)].Linkage));
+  (yyval.FunctionVal)->setVisibility((yyvsp[(2) - (4)].Visibility));
+;}
+    break;
+
+  case 246:
+#line 2386 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+  (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
   CHECK_FOR_ERROR
-;
-    break;}
-case 246:
-#line 2391 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    CurFun.CurrentFunction->setLinkage(yyvsp[-2].Linkage);
-    CurFun.CurrentFunction->setVisibility(yyvsp[-1].Visibility);
-    yyval.FunctionVal = CurFun.CurrentFunction;
+;}
+    break;
+
+  case 247:
+#line 2391 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage));
+    CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility));
+    (yyval.FunctionVal) = CurFun.CurrentFunction;
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 247:
-#line 2403 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = false;
+  ;}
+    break;
+
+  case 248:
+#line 2403 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 248:
-#line 2407 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = true;
+  ;}
+    break;
+
+  case 249:
+#line 2407 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 249:
-#line 2412 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{    // A reference to a direct constant
-    yyval.ValIDVal = ValID::create(yyvsp[0].SInt64Val);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 250:
-#line 2416 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::create(yyvsp[0].UInt64Val);
+  ;}
+    break;
+
+  case 250:
+#line 2412 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {    // A reference to a direct constant
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 251:
-#line 2420 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                     // Perhaps it's an FP constant?
-    yyval.ValIDVal = ValID::create(yyvsp[0].FPVal);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 252:
-#line 2424 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::create(ConstantInt::getTrue());
+  ;}
+    break;
+
+  case 251:
+#line 2416 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 253:
-#line 2428 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::create(ConstantInt::getFalse());
+  ;}
+    break;
+
+  case 252:
+#line 2420 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                     // Perhaps it's an FP constant?
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 254:
-#line 2432 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::createNull();
+  ;}
+    break;
+
+  case 253:
+#line 2424 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 255:
-#line 2436 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::createUndef();
+  ;}
+    break;
+
+  case 254:
+#line 2428 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 255:
+#line 2432 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::createNull();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 256:
+#line 2436 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 256:
-#line 2440 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{     // A vector zero constant.
-    yyval.ValIDVal = ValID::createZeroInit();
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 257:
-#line 2444 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ // Nonempty unsized packed vector
-    const Type *ETy = (*yyvsp[-1].ConstVector)[0]->getType();
-    int NumElements = yyvsp[-1].ConstVector->size(); 
+  ;}
+    break;
+
+  case 257:
+#line 2440 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {     // A vector zero constant.
+    (yyval.ValIDVal) = ValID::createZeroInit();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 258:
+#line 2444 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { // Nonempty unsized packed vector
+    const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
+    int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
     
     VectorType* pt = VectorType::get(ETy, NumElements);
     PATypeHolder* PTy = new PATypeHolder(
@@ -4422,266 +5495,290 @@
                                          );
     
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
-      if (ETy != (*yyvsp[-1].ConstVector)[i]->getType())
+    for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) {
+      if (ETy != (*(yyvsp[(2) - (3)].ConstVector))[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
                      ETy->getDescription() +"' as required!\nIt is of type '" +
-                     (*yyvsp[-1].ConstVector)[i]->getType()->getDescription() + "'.");
+                     (*(yyvsp[(2) - (3)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
 
-    yyval.ValIDVal = ValID::create(ConstantVector::get(pt, *yyvsp[-1].ConstVector));
-    delete PTy; delete yyvsp[-1].ConstVector;
+    (yyval.ValIDVal) = ValID::create(ConstantVector::get(pt, *(yyvsp[(2) - (3)].ConstVector)));
+    delete PTy; delete (yyvsp[(2) - (3)].ConstVector);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 258:
-#line 2469 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal);
+  ;}
+    break;
+
+  case 259:
+#line 2469 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 259:
-#line 2473 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::createInlineAsm(*yyvsp[-2].StrVal, *yyvsp[0].StrVal, yyvsp[-3].BoolVal);
-    delete yyvsp[-2].StrVal;
-    delete yyvsp[0].StrVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 260:
-#line 2483 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{  // Is it an integer reference...?
-    yyval.ValIDVal = ValID::createLocalID(yyvsp[0].UIntVal);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 261:
-#line 2487 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValIDVal = ValID::createGlobalID(yyvsp[0].UIntVal);
+  ;}
+    break;
+
+  case 260:
+#line 2473 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::createInlineAsm(*(yyvsp[(3) - (5)].StrVal), *(yyvsp[(5) - (5)].StrVal), (yyvsp[(2) - (5)].BoolVal));
+    delete (yyvsp[(3) - (5)].StrVal);
+    delete (yyvsp[(5) - (5)].StrVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 262:
-#line 2491 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                   // Is it a named reference...?
-    yyval.ValIDVal = ValID::createLocalName(*yyvsp[0].StrVal);
-    delete yyvsp[0].StrVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 263:
-#line 2496 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                   // Is it a named reference...?
-    yyval.ValIDVal = ValID::createGlobalName(*yyvsp[0].StrVal);
-    delete yyvsp[0].StrVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 266:
-#line 2509 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 261:
+#line 2483 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {  // Is it an integer reference...?
+    (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 262:
+#line 2487 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 263:
+#line 2491 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                   // Is it a named reference...?
+    (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal));
+    delete (yyvsp[(1) - (1)].StrVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 264:
+#line 2496 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                   // Is it a named reference...?
+    (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal));
+    delete (yyvsp[(1) - (1)].StrVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 267:
+#line 2509 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    yyval.ValueVal = getVal(*yyvsp[-1].TypeVal, yyvsp[0].ValIDVal); 
-    delete yyvsp[-1].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 267:
-#line 2518 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValueList = new std::vector<Value *>();
-    yyval.ValueList->push_back(yyvsp[0].ValueVal); 
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    (yyval.ValueVal) = getVal(*(yyvsp[(1) - (2)].TypeVal), (yyvsp[(2) - (2)].ValIDVal)); 
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 268:
-#line 2523 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    (yyval.ValueList=yyvsp[-2].ValueList)->push_back(yyvsp[0].ValueVal); 
+  ;}
+    break;
+
+  case 268:
+#line 2518 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValueList) = new std::vector<Value *>();
+    (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal)); 
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 269:
-#line 2528 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.FunctionVal = yyvsp[-1].FunctionVal;
+  ;}
+    break;
+
+  case 269:
+#line 2523 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal)); 
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 270:
+#line 2528 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 271:
+#line 2532 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { // Do not allow functions with 0 basic blocks   
+    (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 272:
+#line 2541 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
+    CHECK_FOR_ERROR
+    InsertValue((yyvsp[(3) - (3)].TermInstVal));
+    (yyvsp[(1) - (3)].BasicBlockVal)->getInstList().push_back((yyvsp[(3) - (3)].TermInstVal));
+    (yyval.BasicBlockVal) = (yyvsp[(1) - (3)].BasicBlockVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 273:
+#line 2550 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[(2) - (2)].InstVal)))
+      if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
+        if (CI2->getParent() == 0)
+          (yyvsp[(1) - (2)].BasicBlockVal)->getInstList().push_back(CI2);
+    (yyvsp[(1) - (2)].BasicBlockVal)->getInstList().push_back((yyvsp[(2) - (2)].InstVal));
+    (yyval.BasicBlockVal) = (yyvsp[(1) - (2)].BasicBlockVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 274:
+#line 2559 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {          // Empty space between instruction lists
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum), 0);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 275:
+#line 2563 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {   // Only the unwind to block
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum), getBBVal((yyvsp[(3) - (3)].ValIDVal)));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 276:
+#line 2567 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {             // Labelled (named) basic block
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)), 0);
+    delete (yyvsp[(1) - (1)].StrVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 277:
+#line 2572 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (4)].StrVal)), getBBVal((yyvsp[(4) - (4)].ValIDVal)));
+    delete (yyvsp[(1) - (4)].StrVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 278:
+#line 2579 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { // Return with a result...
+    ValueList &VL = *(yyvsp[(2) - (2)].ValueList);
+    assert(!VL.empty() && "Invalid ret operands!");
+    (yyval.TermInstVal) = ReturnInst::Create(&VL[0], VL.size());
+    delete (yyvsp[(2) - (2)].ValueList);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 279:
+#line 2586 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                                    // Return with no result...
+    (yyval.TermInstVal) = ReturnInst::Create();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 280:
+#line 2590 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {                           // Unconditional Branch...
+    BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 270:
-#line 2532 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ // Do not allow functions with 0 basic blocks   
-    yyval.FunctionVal = yyvsp[-1].FunctionVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 271:
-#line 2541 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    setValueName(yyvsp[0].TermInstVal, yyvsp[-1].StrVal);
+    (yyval.TermInstVal) = BranchInst::Create(tmpBB);
+  ;}
+    break;
+
+  case 281:
+#line 2595 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {  
+    assert(cast<IntegerType>((yyvsp[(2) - (9)].PrimType))->getBitWidth() == 1 && "Not Bool?");
+    BasicBlock* tmpBBA = getBBVal((yyvsp[(6) - (9)].ValIDVal));
     CHECK_FOR_ERROR
-    InsertValue(yyvsp[0].TermInstVal);
-    yyvsp[-2].BasicBlockVal->getInstList().push_back(yyvsp[0].TermInstVal);
-    yyval.BasicBlockVal = yyvsp[-2].BasicBlockVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 272:
-#line 2550 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (CastInst *CI1 = dyn_cast<CastInst>(yyvsp[0].InstVal))
-      if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
-        if (CI2->getParent() == 0)
-          yyvsp[-1].BasicBlockVal->getInstList().push_back(CI2);
-    yyvsp[-1].BasicBlockVal->getInstList().push_back(yyvsp[0].InstVal);
-    yyval.BasicBlockVal = yyvsp[-1].BasicBlockVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 273:
-#line 2559 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{          // Empty space between instruction lists
-    yyval.BasicBlockVal = defineBBVal(ValID::createLocalID(CurFun.NextValNum), 0);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 274:
-#line 2563 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{   // Only the unwind to block
-    yyval.BasicBlockVal = defineBBVal(ValID::createLocalID(CurFun.NextValNum), getBBVal(yyvsp[0].ValIDVal));
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 275:
-#line 2567 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{             // Labelled (named) basic block
-    yyval.BasicBlockVal = defineBBVal(ValID::createLocalName(*yyvsp[0].StrVal), 0);
-    delete yyvsp[0].StrVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 276:
-#line 2572 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BasicBlockVal = defineBBVal(ValID::createLocalName(*yyvsp[-3].StrVal), getBBVal(yyvsp[0].ValIDVal));
-    delete yyvsp[-3].StrVal;
+    BasicBlock* tmpBBB = getBBVal((yyvsp[(9) - (9)].ValIDVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 277:
-#line 2579 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ // Return with a result...
-    ValueList &VL = *yyvsp[0].ValueList;
-    assert(!VL.empty() && "Invalid ret operands!");
-    yyval.TermInstVal = ReturnInst::Create(&VL[0], VL.size());
-    delete yyvsp[0].ValueList;
+    Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 278:
-#line 2586 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                                    // Return with no result...
-    yyval.TermInstVal = ReturnInst::Create();
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 279:
-#line 2590 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{                           // Unconditional Branch...
-    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
-    CHECK_FOR_ERROR
-    yyval.TermInstVal = BranchInst::Create(tmpBB);
-  ;
-    break;}
-case 280:
-#line 2595 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{  
-    assert(cast<IntegerType>(yyvsp[-7].PrimType)->getBitWidth() == 1 && "Not Bool?");
-    BasicBlock* tmpBBA = getBBVal(yyvsp[-3].ValIDVal);
-    CHECK_FOR_ERROR
-    BasicBlock* tmpBBB = getBBVal(yyvsp[0].ValIDVal);
-    CHECK_FOR_ERROR
-    Value* tmpVal = getVal(Type::Int1Ty, yyvsp[-6].ValIDVal);
-    CHECK_FOR_ERROR
-    yyval.TermInstVal = BranchInst::Create(tmpBBA, tmpBBB, tmpVal);
-  ;
-    break;}
-case 281:
-#line 2605 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    Value* tmpVal = getVal(yyvsp[-7].PrimType, yyvsp[-6].ValIDVal);
+    (yyval.TermInstVal) = BranchInst::Create(tmpBBA, tmpBBB, tmpVal);
+  ;}
+    break;
+
+  case 282:
+#line 2605 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal(yyvsp[-3].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (9)].ValIDVal));
     CHECK_FOR_ERROR
-    SwitchInst *S = SwitchInst::Create(tmpVal, tmpBB, yyvsp[-1].JumpTable->size());
-    yyval.TermInstVal = S;
+    SwitchInst *S = SwitchInst::Create(tmpVal, tmpBB, (yyvsp[(8) - (9)].JumpTable)->size());
+    (yyval.TermInstVal) = S;
 
-    std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = yyvsp[-1].JumpTable->begin(),
-      E = yyvsp[-1].JumpTable->end();
+    std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = (yyvsp[(8) - (9)].JumpTable)->begin(),
+      E = (yyvsp[(8) - (9)].JumpTable)->end();
     for (; I != E; ++I) {
       if (ConstantInt *CI = dyn_cast<ConstantInt>(I->first))
           S->addCase(CI, I->second);
       else
         GEN_ERROR("Switch case is constant, but not a simple integer");
     }
-    delete yyvsp[-1].JumpTable;
+    delete (yyvsp[(8) - (9)].JumpTable);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 282:
-#line 2624 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    Value* tmpVal = getVal(yyvsp[-6].PrimType, yyvsp[-5].ValIDVal);
+  ;}
+    break;
+
+  case 283:
+#line 2624 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal(yyvsp[-2].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (8)].ValIDVal));
     CHECK_FOR_ERROR
     SwitchInst *S = SwitchInst::Create(tmpVal, tmpBB, 0);
-    yyval.TermInstVal = S;
+    (yyval.TermInstVal) = S;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 283:
-#line 2634 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 284:
+#line 2634 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
 
     // Handle the short syntax
     const PointerType *PFTy = 0;
     const FunctionType *Ty = 0;
-    if (!(PFTy = dyn_cast<PointerType>(yyvsp[-11].TypeVal->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>((yyvsp[(3) - (14)].TypeVal)->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
-      ParamList::iterator I = yyvsp[-8].ParamList->begin(), E = yyvsp[-8].ParamList->end();
+      ParamList::iterator I = (yyvsp[(6) - (14)].ParamList)->begin(), E = (yyvsp[(6) - (14)].ParamList)->end();
       for (; I != E; ++I) {
         const Type *Ty = I->Val->getType();
         if (Ty == Type::VoidTy)
           GEN_ERROR("Short call syntax cannot be used with varargs");
         ParamTypes.push_back(Ty);
       }
-      Ty = FunctionType::get(yyvsp[-11].TypeVal->get(), ParamTypes, false);
+      Ty = FunctionType::get((yyvsp[(3) - (14)].TypeVal)->get(), ParamTypes, false);
       PFTy = PointerType::getUnqual(Ty);
     }
 
-    delete yyvsp[-11].TypeVal;
+    delete (yyvsp[(3) - (14)].TypeVal);
 
-    Value *V = getVal(PFTy, yyvsp[-10].ValIDVal);   // Get the function we're calling...
+    Value *V = getVal(PFTy, (yyvsp[(4) - (14)].ValIDVal));   // Get the function we're calling...
     CHECK_FOR_ERROR
-    BasicBlock *Normal = getBBVal(yyvsp[-3].ValIDVal);
+    BasicBlock *Normal = getBBVal((yyvsp[(11) - (14)].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock *Except = getBBVal(yyvsp[0].ValIDVal);
+    BasicBlock *Except = getBBVal((yyvsp[(14) - (14)].ValIDVal));
     CHECK_FOR_ERROR
 
     SmallVector<ParamAttrsWithIndex, 8> Attrs;
-    if (yyvsp[-6].ParamAttrs != ParamAttr::None)
-      Attrs.push_back(ParamAttrsWithIndex::get(0, yyvsp[-6].ParamAttrs));
+    if ((yyvsp[(8) - (14)].ParamAttrs) != ParamAttr::None)
+      Attrs.push_back(ParamAttrsWithIndex::get(0, (yyvsp[(8) - (14)].ParamAttrs)));
 
     // Check the arguments
     ValueList Args;
-    if (yyvsp[-8].ParamList->empty()) {                                   // Has no arguments?
+    if ((yyvsp[(6) - (14)].ParamList)->empty()) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
       if (Ty->getNumParams() != 0)
         GEN_ERROR("No arguments passed to a function that "
@@ -4691,7 +5788,7 @@
       // correctly!
       FunctionType::param_iterator I = Ty->param_begin();
       FunctionType::param_iterator E = Ty->param_end();
-      ParamList::iterator ArgI = yyvsp[-8].ParamList->begin(), ArgE = yyvsp[-8].ParamList->end();
+      ParamList::iterator ArgI = (yyvsp[(6) - (14)].ParamList)->begin(), ArgE = (yyvsp[(6) - (14)].ParamList)->end();
       unsigned index = 1;
 
       for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) {
@@ -4720,347 +5817,375 @@
 
     // Create the InvokeInst
     InvokeInst *II = InvokeInst::Create(V, Normal, Except, Args.begin(),Args.end());
-    II->setCallingConv(yyvsp[-12].UIntVal);
+    II->setCallingConv((yyvsp[(2) - (14)].UIntVal));
     II->setParamAttrs(PAL);
-    yyval.TermInstVal = II;
-    delete yyvsp[-8].ParamList;
+    (yyval.TermInstVal) = II;
+    delete (yyvsp[(6) - (14)].ParamList);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 284:
-#line 2714 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TermInstVal = new UnwindInst();
+  ;}
+    break;
+
+  case 285:
+#line 2714 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 285:
-#line 2718 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.TermInstVal = new UnreachableInst();
+  ;}
+    break;
+
+  case 286:
+#line 2718 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 286:
-#line 2725 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.JumpTable = yyvsp[-5].JumpTable;
-    Constant *V = cast<Constant>(getExistingVal(yyvsp[-4].PrimType, yyvsp[-3].ValIDVal));
+  ;}
+    break;
+
+  case 287:
+#line 2725 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
+    Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
     CHECK_FOR_ERROR
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value");
 
-    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.JumpTable->push_back(std::make_pair(V, tmpBB));
-  ;
-    break;}
-case 287:
-#line 2736 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.JumpTable = new std::vector<std::pair<Constant*, BasicBlock*> >();
-    Constant *V = cast<Constant>(getExistingVal(yyvsp[-4].PrimType, yyvsp[-3].ValIDVal));
+    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
+  ;}
+    break;
+
+  case 288:
+#line 2736 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
+    Constant *V = cast<Constant>(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
     CHECK_FOR_ERROR
 
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value");
 
-    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.JumpTable->push_back(std::make_pair(V, tmpBB)); 
-  ;
-    break;}
-case 288:
-#line 2749 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); 
+  ;}
+    break;
+
+  case 289:
+#line 2749 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     // Is this definition named?? if so, assign the name...
-    setValueName(yyvsp[0].InstVal, yyvsp[-1].StrVal);
+    setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
     CHECK_FOR_ERROR
-    InsertValue(yyvsp[0].InstVal);
-    yyval.InstVal = yyvsp[0].InstVal;
+    InsertValue((yyvsp[(2) - (2)].InstVal));
+    (yyval.InstVal) = (yyvsp[(2) - (2)].InstVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 289:
-#line 2759 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{    // Used for PHI nodes
+  ;}
+    break;
+
+  case 290:
+#line 2759 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {    // Used for PHI nodes
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-5].TypeVal)->getDescription());
-    yyval.PHIList = new std::list<std::pair<Value*, BasicBlock*> >();
-    Value* tmpVal = getVal(*yyvsp[-5].TypeVal, yyvsp[-3].ValIDVal);
-    CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal);
-    CHECK_FOR_ERROR
-    yyval.PHIList->push_back(std::make_pair(tmpVal, tmpBB));
-    delete yyvsp[-5].TypeVal;
-  ;
-    break;}
-case 290:
-#line 2770 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.PHIList = yyvsp[-6].PHIList;
-    Value* tmpVal = getVal(yyvsp[-6].PHIList->front().first->getType(), yyvsp[-3].ValIDVal);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
+    (yyval.PHIList) = new std::list<std::pair<Value*, BasicBlock*> >();
+    Value* tmpVal = getVal(*(yyvsp[(1) - (6)].TypeVal), (yyvsp[(3) - (6)].ValIDVal));
+    CHECK_FOR_ERROR
+    BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (6)].ValIDVal));
+    CHECK_FOR_ERROR
+    (yyval.PHIList)->push_back(std::make_pair(tmpVal, tmpBB));
+    delete (yyvsp[(1) - (6)].TypeVal);
+  ;}
+    break;
+
+  case 291:
+#line 2770 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList);
+    Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList)->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (7)].ValIDVal));
     CHECK_FOR_ERROR
-    yyvsp[-6].PHIList->push_back(std::make_pair(tmpVal, tmpBB));
-  ;
-    break;}
-case 291:
-#line 2780 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyvsp[(1) - (7)].PHIList)->push_back(std::make_pair(tmpVal, tmpBB));
+  ;}
+    break;
+
+  case 292:
+#line 2780 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
     // Used for call and invoke instructions
-    yyval.ParamList = new ParamList();
-    ParamListEntry E; E.Attrs = yyvsp[-2].ParamAttrs | yyvsp[0].ParamAttrs; E.Val = getVal(yyvsp[-3].TypeVal->get(), yyvsp[-1].ValIDVal);
-    yyval.ParamList->push_back(E);
-    delete yyvsp[-3].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 292:
-#line 2791 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.ParamList) = new ParamList();
+    ParamListEntry E; E.Attrs = (yyvsp[(2) - (4)].ParamAttrs) | (yyvsp[(4) - (4)].ParamAttrs); E.Val = getVal((yyvsp[(1) - (4)].TypeVal)->get(), (yyvsp[(3) - (4)].ValIDVal));
+    (yyval.ParamList)->push_back(E);
+    delete (yyvsp[(1) - (4)].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 293:
+#line 2791 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     // Labels are only valid in ASMs
-    yyval.ParamList = new ParamList();
-    ParamListEntry E; E.Attrs = yyvsp[-2].ParamAttrs | yyvsp[0].ParamAttrs; E.Val = getBBVal(yyvsp[-1].ValIDVal);
-    yyval.ParamList->push_back(E);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 293:
-#line 2799 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.ParamList) = new ParamList();
+    ParamListEntry E; E.Attrs = (yyvsp[(2) - (4)].ParamAttrs) | (yyvsp[(4) - (4)].ParamAttrs); E.Val = getBBVal((yyvsp[(3) - (4)].ValIDVal));
+    (yyval.ParamList)->push_back(E);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 294:
+#line 2799 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    yyval.ParamList = yyvsp[-5].ParamList;
-    ParamListEntry E; E.Attrs = yyvsp[-2].ParamAttrs | yyvsp[0].ParamAttrs; E.Val = getVal(yyvsp[-3].TypeVal->get(), yyvsp[-1].ValIDVal);
-    yyval.ParamList->push_back(E);
-    delete yyvsp[-3].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 294:
-#line 2809 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
+    (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList);
+    ParamListEntry E; E.Attrs = (yyvsp[(4) - (6)].ParamAttrs) | (yyvsp[(6) - (6)].ParamAttrs); E.Val = getVal((yyvsp[(3) - (6)].TypeVal)->get(), (yyvsp[(5) - (6)].ValIDVal));
+    (yyval.ParamList)->push_back(E);
+    delete (yyvsp[(3) - (6)].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 295:
+#line 2809 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     // FIXME: Remove trailing OptParamAttrs in LLVM 3.0, it was a mistake in 2.0
-    yyval.ParamList = yyvsp[-5].ParamList;
-    ParamListEntry E; E.Attrs = yyvsp[-2].ParamAttrs | yyvsp[0].ParamAttrs; E.Val = getBBVal(yyvsp[-1].ValIDVal);
-    yyval.ParamList->push_back(E);
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 295:
-#line 2816 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ParamList = new ParamList(); ;
-    break;}
-case 296:
-#line 2819 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{ yyval.ValueList = new std::vector<Value*>(); ;
-    break;}
-case 297:
-#line 2820 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.ValueList = yyvsp[-2].ValueList;
-    yyval.ValueList->push_back(yyvsp[0].ValueVal);
+    (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList);
+    ParamListEntry E; E.Attrs = (yyvsp[(4) - (6)].ParamAttrs) | (yyvsp[(6) - (6)].ParamAttrs); E.Val = getBBVal((yyvsp[(5) - (6)].ValIDVal));
+    (yyval.ParamList)->push_back(E);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 298:
-#line 2827 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = true;
+  ;}
+    break;
+
+  case 296:
+#line 2816 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamList) = new ParamList(); ;}
+    break;
+
+  case 297:
+#line 2819 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ValueList) = new std::vector<Value*>(); ;}
+    break;
+
+  case 298:
+#line 2820 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
+    (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 299:
-#line 2831 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = false;
+  ;}
+    break;
+
+  case 299:
+#line 2827 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 300:
-#line 2836 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 300:
+#line 2831 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = false;
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 301:
+#line 2836 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    if (!(*yyvsp[-3].TypeVal)->isInteger() && !(*yyvsp[-3].TypeVal)->isFloatingPoint() && 
-        !isa<VectorType>((*yyvsp[-3].TypeVal).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
+    if (!(*(yyvsp[(2) - (5)].TypeVal))->isInteger() && !(*(yyvsp[(2) - (5)].TypeVal))->isFloatingPoint() && 
+        !isa<VectorType>((*(yyvsp[(2) - (5)].TypeVal)).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands");
-    Value* val1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal); 
+    Value* val1 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(3) - (5)].ValIDVal)); 
     CHECK_FOR_ERROR
-    Value* val2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
+    Value* val2 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(5) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = BinaryOperator::create(yyvsp[-4].BinaryOpVal, val1, val2);
-    if (yyval.InstVal == 0)
+    (yyval.InstVal) = BinaryOperator::create((yyvsp[(1) - (5)].BinaryOpVal), val1, val2);
+    if ((yyval.InstVal) == 0)
       GEN_ERROR("binary operator returned null");
-    delete yyvsp[-3].TypeVal;
-  ;
-    break;}
-case 301:
-#line 2852 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[(2) - (5)].TypeVal);
+  ;}
+    break;
+
+  case 302:
+#line 2852 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    if (!(*yyvsp[-3].TypeVal)->isInteger()) {
-      if (Instruction::isShift(yyvsp[-4].BinaryOpVal) || !isa<VectorType>(yyvsp[-3].TypeVal->get()) ||
-          !cast<VectorType>(yyvsp[-3].TypeVal->get())->getElementType()->isInteger())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
+    if (!(*(yyvsp[(2) - (5)].TypeVal))->isInteger()) {
+      if (Instruction::isShift((yyvsp[(1) - (5)].BinaryOpVal)) || !isa<VectorType>((yyvsp[(2) - (5)].TypeVal)->get()) ||
+          !cast<VectorType>((yyvsp[(2) - (5)].TypeVal)->get())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands");
     }
-    Value* tmpVal1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal);
+    Value* tmpVal1 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(3) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
+    Value* tmpVal2 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(5) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = BinaryOperator::create(yyvsp[-4].BinaryOpVal, tmpVal1, tmpVal2);
-    if (yyval.InstVal == 0)
+    (yyval.InstVal) = BinaryOperator::create((yyvsp[(1) - (5)].BinaryOpVal), tmpVal1, tmpVal2);
+    if ((yyval.InstVal) == 0)
       GEN_ERROR("binary operator returned null");
-    delete yyvsp[-3].TypeVal;
-  ;
-    break;}
-case 302:
-#line 2869 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[(2) - (5)].TypeVal);
+  ;}
+    break;
+
+  case 303:
+#line 2869 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    if (isa<VectorType>((*yyvsp[-3].TypeVal).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
+    if (isa<VectorType>((*(yyvsp[(3) - (6)].TypeVal)).get()))
       GEN_ERROR("Vector types not supported by icmp instruction");
-    Value* tmpVal1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal);
+    Value* tmpVal1 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(4) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
+    Value* tmpVal2 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(6) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = CmpInst::create(yyvsp[-5].OtherOpVal, yyvsp[-4].IPredicate, tmpVal1, tmpVal2);
-    if (yyval.InstVal == 0)
+    (yyval.InstVal) = CmpInst::create((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(2) - (6)].IPredicate), tmpVal1, tmpVal2);
+    if ((yyval.InstVal) == 0)
       GEN_ERROR("icmp operator returned null");
-    delete yyvsp[-3].TypeVal;
-  ;
-    break;}
-case 303:
-#line 2883 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[(3) - (6)].TypeVal);
+  ;}
+    break;
+
+  case 304:
+#line 2883 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    if (isa<VectorType>((*yyvsp[-3].TypeVal).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
+    if (isa<VectorType>((*(yyvsp[(3) - (6)].TypeVal)).get()))
       GEN_ERROR("Vector types not supported by fcmp instruction");
-    Value* tmpVal1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal);
+    Value* tmpVal1 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(4) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
+    Value* tmpVal2 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(6) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = CmpInst::create(yyvsp[-5].OtherOpVal, yyvsp[-4].FPredicate, tmpVal1, tmpVal2);
-    if (yyval.InstVal == 0)
+    (yyval.InstVal) = CmpInst::create((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(2) - (6)].FPredicate), tmpVal1, tmpVal2);
+    if ((yyval.InstVal) == 0)
       GEN_ERROR("fcmp operator returned null");
-    delete yyvsp[-3].TypeVal;
-  ;
-    break;}
-case 304:
-#line 2897 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    delete (yyvsp[(3) - (6)].TypeVal);
+  ;}
+    break;
+
+  case 305:
+#line 2897 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
-    Value* Val = yyvsp[-2].ValueVal;
-    const Type* DestTy = yyvsp[0].TypeVal->get();
-    if (!CastInst::castIsValid(yyvsp[-3].CastOpVal, Val, DestTy))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
+    Value* Val = (yyvsp[(2) - (4)].ValueVal);
+    const Type* DestTy = (yyvsp[(4) - (4)].TypeVal)->get();
+    if (!CastInst::castIsValid((yyvsp[(1) - (4)].CastOpVal), Val, DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'"); 
-    yyval.InstVal = CastInst::create(yyvsp[-3].CastOpVal, Val, DestTy);
-    delete yyvsp[0].TypeVal;
-  ;
-    break;}
-case 305:
-#line 2909 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (yyvsp[-4].ValueVal->getType() != Type::Int1Ty)
+    (yyval.InstVal) = CastInst::create((yyvsp[(1) - (4)].CastOpVal), Val, DestTy);
+    delete (yyvsp[(4) - (4)].TypeVal);
+  ;}
+    break;
+
+  case 306:
+#line 2909 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if ((yyvsp[(2) - (6)].ValueVal)->getType() != Type::Int1Ty)
       GEN_ERROR("select condition must be boolean");
-    if (yyvsp[-2].ValueVal->getType() != yyvsp[0].ValueVal->getType())
+    if ((yyvsp[(4) - (6)].ValueVal)->getType() != (yyvsp[(6) - (6)].ValueVal)->getType())
       GEN_ERROR("select value types should match");
-    yyval.InstVal = SelectInst::Create(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = SelectInst::Create((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 306:
-#line 2917 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 307:
+#line 2917 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
-    yyval.InstVal = new VAArgInst(yyvsp[-2].ValueVal, *yyvsp[0].TypeVal);
-    delete yyvsp[0].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 307:
-#line 2924 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!ExtractElementInst::isValidOperands(yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
+    (yyval.InstVal) = new VAArgInst((yyvsp[(2) - (4)].ValueVal), *(yyvsp[(4) - (4)].TypeVal));
+    delete (yyvsp[(4) - (4)].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 308:
+#line 2924 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
-    yyval.InstVal = new ExtractElementInst(yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = new ExtractElementInst((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 308:
-#line 2930 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!InsertElementInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
+  ;}
+    break;
+
+  case 309:
+#line 2930 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid insertelement operands");
-    yyval.InstVal = InsertElementInst::Create(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = InsertElementInst::Create((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 309:
-#line 2936 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!ShuffleVectorInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
+  ;}
+    break;
+
+  case 310:
+#line 2936 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands");
-    yyval.InstVal = new ShuffleVectorInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = new ShuffleVectorInst((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 310:
-#line 2942 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    const Type *Ty = yyvsp[0].PHIList->front().first->getType();
+  ;}
+    break;
+
+  case 311:
+#line 2942 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
       GEN_ERROR("PHI node operands must be of first class type");
-    yyval.InstVal = PHINode::Create(Ty);
-    ((PHINode*)yyval.InstVal)->reserveOperandSpace(yyvsp[0].PHIList->size());
-    while (yyvsp[0].PHIList->begin() != yyvsp[0].PHIList->end()) {
-      if (yyvsp[0].PHIList->front().first->getType() != Ty) 
+    (yyval.InstVal) = PHINode::Create(Ty);
+    ((PHINode*)(yyval.InstVal))->reserveOperandSpace((yyvsp[(2) - (2)].PHIList)->size());
+    while ((yyvsp[(2) - (2)].PHIList)->begin() != (yyvsp[(2) - (2)].PHIList)->end()) {
+      if ((yyvsp[(2) - (2)].PHIList)->front().first->getType() != Ty) 
         GEN_ERROR("All elements of a PHI node must be of the same type");
-      cast<PHINode>(yyval.InstVal)->addIncoming(yyvsp[0].PHIList->front().first, yyvsp[0].PHIList->front().second);
-      yyvsp[0].PHIList->pop_front();
+      cast<PHINode>((yyval.InstVal))->addIncoming((yyvsp[(2) - (2)].PHIList)->front().first, (yyvsp[(2) - (2)].PHIList)->front().second);
+      (yyvsp[(2) - (2)].PHIList)->pop_front();
     }
-    delete yyvsp[0].PHIList;  // Free the list...
+    delete (yyvsp[(2) - (2)].PHIList);  // Free the list...
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 311:
-#line 2958 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 312:
+#line 2958 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
 
     // Handle the short syntax
     const PointerType *PFTy = 0;
     const FunctionType *Ty = 0;
-    if (!(PFTy = dyn_cast<PointerType>(yyvsp[-5].TypeVal->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>((yyvsp[(3) - (8)].TypeVal)->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
-      ParamList::iterator I = yyvsp[-2].ParamList->begin(), E = yyvsp[-2].ParamList->end();
+      ParamList::iterator I = (yyvsp[(6) - (8)].ParamList)->begin(), E = (yyvsp[(6) - (8)].ParamList)->end();
       for (; I != E; ++I) {
         const Type *Ty = I->Val->getType();
         if (Ty == Type::VoidTy)
           GEN_ERROR("Short call syntax cannot be used with varargs");
         ParamTypes.push_back(Ty);
       }
-      Ty = FunctionType::get(yyvsp[-5].TypeVal->get(), ParamTypes, false);
+      Ty = FunctionType::get((yyvsp[(3) - (8)].TypeVal)->get(), ParamTypes, false);
       PFTy = PointerType::getUnqual(Ty);
     }
 
-    Value *V = getVal(PFTy, yyvsp[-4].ValIDVal);   // Get the function we're calling...
+    Value *V = getVal(PFTy, (yyvsp[(4) - (8)].ValIDVal));   // Get the function we're calling...
     CHECK_FOR_ERROR
 
     // Check for call to invalid intrinsic to avoid crashing later.
@@ -5074,11 +6199,11 @@
 
     // Set up the ParamAttrs for the function
     SmallVector<ParamAttrsWithIndex, 8> Attrs;
-    if (yyvsp[0].ParamAttrs != ParamAttr::None)
-      Attrs.push_back(ParamAttrsWithIndex::get(0, yyvsp[0].ParamAttrs));
+    if ((yyvsp[(8) - (8)].ParamAttrs) != ParamAttr::None)
+      Attrs.push_back(ParamAttrsWithIndex::get(0, (yyvsp[(8) - (8)].ParamAttrs)));
     // Check the arguments 
     ValueList Args;
-    if (yyvsp[-2].ParamList->empty()) {                                   // Has no arguments?
+    if ((yyvsp[(6) - (8)].ParamList)->empty()) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
       if (Ty->getNumParams() != 0)
         GEN_ERROR("No arguments passed to a function that "
@@ -5088,7 +6213,7 @@
       // correctly.  Also, gather any parameter attributes.
       FunctionType::param_iterator I = Ty->param_begin();
       FunctionType::param_iterator E = Ty->param_end();
-      ParamList::iterator ArgI = yyvsp[-2].ParamList->begin(), ArgE = yyvsp[-2].ParamList->end();
+      ParamList::iterator ArgI = (yyvsp[(6) - (8)].ParamList)->begin(), ArgE = (yyvsp[(6) - (8)].ParamList)->end();
       unsigned index = 1;
 
       for (; ArgI != ArgE && I != E; ++ArgI, ++I, ++index) {
@@ -5117,377 +6242,384 @@
 
     // Create the call node
     CallInst *CI = CallInst::Create(V, Args.begin(), Args.end());
-    CI->setTailCall(yyvsp[-7].BoolVal);
-    CI->setCallingConv(yyvsp[-6].UIntVal);
+    CI->setTailCall((yyvsp[(1) - (8)].BoolVal));
+    CI->setCallingConv((yyvsp[(2) - (8)].UIntVal));
     CI->setParamAttrs(PAL);
-    yyval.InstVal = CI;
-    delete yyvsp[-2].ParamList;
-    delete yyvsp[-5].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 312:
-#line 3043 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.InstVal = yyvsp[0].InstVal;
+    (yyval.InstVal) = CI;
+    delete (yyvsp[(6) - (8)].ParamList);
+    delete (yyvsp[(3) - (8)].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 313:
-#line 3048 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = true;
+  ;}
+    break;
+
+  case 313:
+#line 3043 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 314:
-#line 3052 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    yyval.BoolVal = false;
+  ;}
+    break;
+
+  case 314:
+#line 3048 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 315:
-#line 3059 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 315:
+#line 3052 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = false;
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 316:
+#line 3059 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    yyval.InstVal = new MallocInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
-    delete yyvsp[-1].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 316:
-#line 3066 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
+    (yyval.InstVal) = new MallocInst(*(yyvsp[(2) - (3)].TypeVal), 0, (yyvsp[(3) - (3)].UIntVal));
+    delete (yyvsp[(2) - (3)].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 317:
+#line 3066 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-4].TypeVal)->getDescription());
-    Value* tmpVal = getVal(yyvsp[-2].PrimType, yyvsp[-1].ValIDVal);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
+    Value* tmpVal = getVal((yyvsp[(4) - (6)].PrimType), (yyvsp[(5) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = new MallocInst(*yyvsp[-4].TypeVal, tmpVal, yyvsp[0].UIntVal);
-    delete yyvsp[-4].TypeVal;
-  ;
-    break;}
-case 317:
-#line 3074 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.InstVal) = new MallocInst(*(yyvsp[(2) - (6)].TypeVal), tmpVal, (yyvsp[(6) - (6)].UIntVal));
+    delete (yyvsp[(2) - (6)].TypeVal);
+  ;}
+    break;
+
+  case 318:
+#line 3074 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    yyval.InstVal = new AllocaInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
-    delete yyvsp[-1].TypeVal;
-    CHECK_FOR_ERROR
-  ;
-    break;}
-case 318:
-#line 3081 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
+    (yyval.InstVal) = new AllocaInst(*(yyvsp[(2) - (3)].TypeVal), 0, (yyvsp[(3) - (3)].UIntVal));
+    delete (yyvsp[(2) - (3)].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 319:
+#line 3081 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-4].TypeVal)->getDescription());
-    Value* tmpVal = getVal(yyvsp[-2].PrimType, yyvsp[-1].ValIDVal);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
+    Value* tmpVal = getVal((yyvsp[(4) - (6)].PrimType), (yyvsp[(5) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = new AllocaInst(*yyvsp[-4].TypeVal, tmpVal, yyvsp[0].UIntVal);
-    delete yyvsp[-4].TypeVal;
-  ;
-    break;}
-case 319:
-#line 3089 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-    if (!isa<PointerType>(yyvsp[0].ValueVal->getType()))
+    (yyval.InstVal) = new AllocaInst(*(yyvsp[(2) - (6)].TypeVal), tmpVal, (yyvsp[(6) - (6)].UIntVal));
+    delete (yyvsp[(2) - (6)].TypeVal);
+  ;}
+    break;
+
+  case 320:
+#line 3089 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
-                     yyvsp[0].ValueVal->getType()->getDescription() + "");
-    yyval.InstVal = new FreeInst(yyvsp[0].ValueVal);
+                     (yyvsp[(2) - (2)].ValueVal)->getType()->getDescription() + "");
+    (yyval.InstVal) = new FreeInst((yyvsp[(2) - (2)].ValueVal));
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 320:
-#line 3097 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 321:
+#line 3097 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    if (!isa<PointerType>(yyvsp[-2].TypeVal->get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
+    if (!isa<PointerType>((yyvsp[(3) - (5)].TypeVal)->get()))
       GEN_ERROR("Can't load from nonpointer type: " +
-                     (*yyvsp[-2].TypeVal)->getDescription());
-    if (!cast<PointerType>(yyvsp[-2].TypeVal->get())->getElementType()->isFirstClassType())
+                     (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
+    if (!cast<PointerType>((yyvsp[(3) - (5)].TypeVal)->get())->getElementType()->isFirstClassType())
       GEN_ERROR("Can't load from pointer of non-first-class type: " +
-                     (*yyvsp[-2].TypeVal)->getDescription());
-    Value* tmpVal = getVal(*yyvsp[-2].TypeVal, yyvsp[-1].ValIDVal);
+                     (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
+    Value* tmpVal = getVal(*(yyvsp[(3) - (5)].TypeVal), (yyvsp[(4) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = new LoadInst(tmpVal, "", yyvsp[-4].BoolVal, yyvsp[0].UIntVal);
-    delete yyvsp[-2].TypeVal;
-  ;
-    break;}
-case 321:
-#line 3111 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+    (yyval.InstVal) = new LoadInst(tmpVal, "", (yyvsp[(1) - (5)].BoolVal), (yyvsp[(5) - (5)].UIntVal));
+    delete (yyvsp[(3) - (5)].TypeVal);
+  ;}
+    break;
+
+  case 322:
+#line 3111 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    const PointerType *PT = dyn_cast<PointerType>(yyvsp[-2].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
+    const PointerType *PT = dyn_cast<PointerType>((yyvsp[(5) - (7)].TypeVal)->get());
     if (!PT)
       GEN_ERROR("Can't store to a nonpointer type: " +
-                     (*yyvsp[-2].TypeVal)->getDescription());
+                     (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
     const Type *ElTy = PT->getElementType();
-    if (ElTy != yyvsp[-4].ValueVal->getType())
-      GEN_ERROR("Can't store '" + yyvsp[-4].ValueVal->getType()->getDescription() +
+    if (ElTy != (yyvsp[(3) - (7)].ValueVal)->getType())
+      GEN_ERROR("Can't store '" + (yyvsp[(3) - (7)].ValueVal)->getType()->getDescription() +
                      "' into space of type '" + ElTy->getDescription() + "'");
 
-    Value* tmpVal = getVal(*yyvsp[-2].TypeVal, yyvsp[-1].ValIDVal);
+    Value* tmpVal = getVal(*(yyvsp[(5) - (7)].TypeVal), (yyvsp[(6) - (7)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = new StoreInst(yyvsp[-4].ValueVal, tmpVal, yyvsp[-6].BoolVal, yyvsp[0].UIntVal);
-    delete yyvsp[-2].TypeVal;
-  ;
-    break;}
-case 322:
-#line 3128 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
-  Value *TmpVal = getVal(yyvsp[-3].TypeVal->get(), yyvsp[-2].ValIDVal);
-  if (!GetResultInst::isValidOperands(TmpVal, yyvsp[0].UInt64Val))
+    (yyval.InstVal) = new StoreInst((yyvsp[(3) - (7)].ValueVal), tmpVal, (yyvsp[(1) - (7)].BoolVal), (yyvsp[(7) - (7)].UIntVal));
+    delete (yyvsp[(5) - (7)].TypeVal);
+  ;}
+    break;
+
+  case 323:
+#line 3128 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
+  Value *TmpVal = getVal((yyvsp[(2) - (5)].TypeVal)->get(), (yyvsp[(3) - (5)].ValIDVal));
+  if (!GetResultInst::isValidOperands(TmpVal, (yyvsp[(5) - (5)].UInt64Val)))
       GEN_ERROR("Invalid getresult operands");
-    yyval.InstVal = new GetResultInst(TmpVal, yyvsp[0].UInt64Val);
-    delete yyvsp[-3].TypeVal;
+    (yyval.InstVal) = new GetResultInst(TmpVal, (yyvsp[(5) - (5)].UInt64Val));
+    delete (yyvsp[(2) - (5)].TypeVal);
     CHECK_FOR_ERROR
-  ;
-    break;}
-case 323:
-#line 3136 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
-{
+  ;}
+    break;
+
+  case 324:
+#line 3136 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+    {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    if (!isa<PointerType>(yyvsp[-2].TypeVal->get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
+    if (!isa<PointerType>((yyvsp[(2) - (4)].TypeVal)->get()))
       GEN_ERROR("getelementptr insn requires pointer operand");
 
-    if (!GetElementPtrInst::getIndexedType(*yyvsp[-2].TypeVal, yyvsp[0].ValueList->begin(), yyvsp[0].ValueList->end(), true))
+    if (!GetElementPtrInst::getIndexedType(*(yyvsp[(2) - (4)].TypeVal), (yyvsp[(4) - (4)].ValueList)->begin(), (yyvsp[(4) - (4)].ValueList)->end(), true))
       GEN_ERROR("Invalid getelementptr indices for type '" +
-                     (*yyvsp[-2].TypeVal)->getDescription()+ "'");
-    Value* tmpVal = getVal(*yyvsp[-2].TypeVal, yyvsp[-1].ValIDVal);
+                     (*(yyvsp[(2) - (4)].TypeVal))->getDescription()+ "'");
+    Value* tmpVal = getVal(*(yyvsp[(2) - (4)].TypeVal), (yyvsp[(3) - (4)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = GetElementPtrInst::Create(tmpVal, yyvsp[0].ValueList->begin(), yyvsp[0].ValueList->end());
-    delete yyvsp[-2].TypeVal; 
-    delete yyvsp[0].ValueList;
-  ;
-    break;}
-}
-   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/share/bison.simple"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
+    (yyval.InstVal) = GetElementPtrInst::Create(tmpVal, (yyvsp[(4) - (4)].ValueList)->begin(), (yyvsp[(4) - (4)].ValueList)->end());
+    delete (yyvsp[(2) - (4)].TypeVal); 
+    delete (yyvsp[(4) - (4)].ValueList);
+  ;}
+    break;
 
-#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
+
+/* Line 1267 of yacc.c.  */
+#line 6409 "llvmAsmParser.tab.c"
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  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
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && 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)
-	    {
-	      strcpy(msg, "parse error");
-
-	      if (count < 5)
-		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
-		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
-		      }
-		}
-	      yyerror(msg);
-	      free(msg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exceeded");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
     }
 
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
+
 
   if (yyerrstatus == 3)
     {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
 
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
-      yychar = YYEMPTY;
+      if (yychar <= YYEOF)
+	{
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
+	}
+      else
+	{
+	  yydestruct ("Error: discarding",
+		      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;
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
 
-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
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  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 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+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;
 
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
     }
-  else if (yyn == 0)
-    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
-
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   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)
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
     {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
 #endif
-    }
-  return 1;
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
-#line 3153 "/Users/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+
+
+#line 3153 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions
@@ -5562,3 +6694,4 @@
   GenerateError(errMsg);
   return 0;
 }
+

Modified: llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.h.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.h.cvs?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.h.cvs Thu Apr 24 10:48:39 2008
@@ -1,4 +1,353 @@
-typedef union {
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   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., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     ESINT64VAL = 258,
+     EUINT64VAL = 259,
+     ESAPINTVAL = 260,
+     EUAPINTVAL = 261,
+     LOCALVAL_ID = 262,
+     GLOBALVAL_ID = 263,
+     FPVAL = 264,
+     VOID = 265,
+     INTTYPE = 266,
+     FLOAT = 267,
+     DOUBLE = 268,
+     X86_FP80 = 269,
+     FP128 = 270,
+     PPC_FP128 = 271,
+     LABEL = 272,
+     TYPE = 273,
+     LOCALVAR = 274,
+     GLOBALVAR = 275,
+     LABELSTR = 276,
+     STRINGCONSTANT = 277,
+     ATSTRINGCONSTANT = 278,
+     PCTSTRINGCONSTANT = 279,
+     ZEROINITIALIZER = 280,
+     TRUETOK = 281,
+     FALSETOK = 282,
+     BEGINTOK = 283,
+     ENDTOK = 284,
+     DECLARE = 285,
+     DEFINE = 286,
+     GLOBAL = 287,
+     CONSTANT = 288,
+     SECTION = 289,
+     ALIAS = 290,
+     VOLATILE = 291,
+     THREAD_LOCAL = 292,
+     TO = 293,
+     DOTDOTDOT = 294,
+     NULL_TOK = 295,
+     UNDEF = 296,
+     INTERNAL = 297,
+     LINKONCE = 298,
+     WEAK = 299,
+     APPENDING = 300,
+     DLLIMPORT = 301,
+     DLLEXPORT = 302,
+     EXTERN_WEAK = 303,
+     OPAQUE = 304,
+     EXTERNAL = 305,
+     TARGET = 306,
+     TRIPLE = 307,
+     ALIGN = 308,
+     ADDRSPACE = 309,
+     DEPLIBS = 310,
+     CALL = 311,
+     TAIL = 312,
+     ASM_TOK = 313,
+     MODULE = 314,
+     SIDEEFFECT = 315,
+     CC_TOK = 316,
+     CCC_TOK = 317,
+     FASTCC_TOK = 318,
+     COLDCC_TOK = 319,
+     X86_STDCALLCC_TOK = 320,
+     X86_FASTCALLCC_TOK = 321,
+     DATALAYOUT = 322,
+     UNWINDS = 323,
+     RET = 324,
+     BR = 325,
+     SWITCH = 326,
+     INVOKE = 327,
+     UNWIND = 328,
+     UNREACHABLE = 329,
+     ADD = 330,
+     SUB = 331,
+     MUL = 332,
+     UDIV = 333,
+     SDIV = 334,
+     FDIV = 335,
+     UREM = 336,
+     SREM = 337,
+     FREM = 338,
+     AND = 339,
+     OR = 340,
+     XOR = 341,
+     SHL = 342,
+     LSHR = 343,
+     ASHR = 344,
+     ICMP = 345,
+     FCMP = 346,
+     EQ = 347,
+     NE = 348,
+     SLT = 349,
+     SGT = 350,
+     SLE = 351,
+     SGE = 352,
+     ULT = 353,
+     UGT = 354,
+     ULE = 355,
+     UGE = 356,
+     OEQ = 357,
+     ONE = 358,
+     OLT = 359,
+     OGT = 360,
+     OLE = 361,
+     OGE = 362,
+     ORD = 363,
+     UNO = 364,
+     UEQ = 365,
+     UNE = 366,
+     MALLOC = 367,
+     ALLOCA = 368,
+     FREE = 369,
+     LOAD = 370,
+     STORE = 371,
+     GETELEMENTPTR = 372,
+     TRUNC = 373,
+     ZEXT = 374,
+     SEXT = 375,
+     FPTRUNC = 376,
+     FPEXT = 377,
+     BITCAST = 378,
+     UITOFP = 379,
+     SITOFP = 380,
+     FPTOUI = 381,
+     FPTOSI = 382,
+     INTTOPTR = 383,
+     PTRTOINT = 384,
+     PHI_TOK = 385,
+     SELECT = 386,
+     VAARG = 387,
+     EXTRACTELEMENT = 388,
+     INSERTELEMENT = 389,
+     SHUFFLEVECTOR = 390,
+     GETRESULT = 391,
+     SIGNEXT = 392,
+     ZEROEXT = 393,
+     NORETURN = 394,
+     INREG = 395,
+     SRET = 396,
+     NOUNWIND = 397,
+     NOALIAS = 398,
+     BYVAL = 399,
+     NEST = 400,
+     READNONE = 401,
+     READONLY = 402,
+     GC = 403,
+     DEFAULT = 404,
+     HIDDEN = 405,
+     PROTECTED = 406
+   };
+#endif
+/* Tokens.  */
+#define ESINT64VAL 258
+#define EUINT64VAL 259
+#define ESAPINTVAL 260
+#define EUAPINTVAL 261
+#define LOCALVAL_ID 262
+#define GLOBALVAL_ID 263
+#define FPVAL 264
+#define VOID 265
+#define INTTYPE 266
+#define FLOAT 267
+#define DOUBLE 268
+#define X86_FP80 269
+#define FP128 270
+#define PPC_FP128 271
+#define LABEL 272
+#define TYPE 273
+#define LOCALVAR 274
+#define GLOBALVAR 275
+#define LABELSTR 276
+#define STRINGCONSTANT 277
+#define ATSTRINGCONSTANT 278
+#define PCTSTRINGCONSTANT 279
+#define ZEROINITIALIZER 280
+#define TRUETOK 281
+#define FALSETOK 282
+#define BEGINTOK 283
+#define ENDTOK 284
+#define DECLARE 285
+#define DEFINE 286
+#define GLOBAL 287
+#define CONSTANT 288
+#define SECTION 289
+#define ALIAS 290
+#define VOLATILE 291
+#define THREAD_LOCAL 292
+#define TO 293
+#define DOTDOTDOT 294
+#define NULL_TOK 295
+#define UNDEF 296
+#define INTERNAL 297
+#define LINKONCE 298
+#define WEAK 299
+#define APPENDING 300
+#define DLLIMPORT 301
+#define DLLEXPORT 302
+#define EXTERN_WEAK 303
+#define OPAQUE 304
+#define EXTERNAL 305
+#define TARGET 306
+#define TRIPLE 307
+#define ALIGN 308
+#define ADDRSPACE 309
+#define DEPLIBS 310
+#define CALL 311
+#define TAIL 312
+#define ASM_TOK 313
+#define MODULE 314
+#define SIDEEFFECT 315
+#define CC_TOK 316
+#define CCC_TOK 317
+#define FASTCC_TOK 318
+#define COLDCC_TOK 319
+#define X86_STDCALLCC_TOK 320
+#define X86_FASTCALLCC_TOK 321
+#define DATALAYOUT 322
+#define UNWINDS 323
+#define RET 324
+#define BR 325
+#define SWITCH 326
+#define INVOKE 327
+#define UNWIND 328
+#define UNREACHABLE 329
+#define ADD 330
+#define SUB 331
+#define MUL 332
+#define UDIV 333
+#define SDIV 334
+#define FDIV 335
+#define UREM 336
+#define SREM 337
+#define FREM 338
+#define AND 339
+#define OR 340
+#define XOR 341
+#define SHL 342
+#define LSHR 343
+#define ASHR 344
+#define ICMP 345
+#define FCMP 346
+#define EQ 347
+#define NE 348
+#define SLT 349
+#define SGT 350
+#define SLE 351
+#define SGE 352
+#define ULT 353
+#define UGT 354
+#define ULE 355
+#define UGE 356
+#define OEQ 357
+#define ONE 358
+#define OLT 359
+#define OGT 360
+#define OLE 361
+#define OGE 362
+#define ORD 363
+#define UNO 364
+#define UEQ 365
+#define UNE 366
+#define MALLOC 367
+#define ALLOCA 368
+#define FREE 369
+#define LOAD 370
+#define STORE 371
+#define GETELEMENTPTR 372
+#define TRUNC 373
+#define ZEXT 374
+#define SEXT 375
+#define FPTRUNC 376
+#define FPEXT 377
+#define BITCAST 378
+#define UITOFP 379
+#define SITOFP 380
+#define FPTOUI 381
+#define FPTOSI 382
+#define INTTOPTR 383
+#define PTRTOINT 384
+#define PHI_TOK 385
+#define SELECT 386
+#define VAARG 387
+#define EXTRACTELEMENT 388
+#define INSERTELEMENT 389
+#define SHUFFLEVECTOR 390
+#define GETRESULT 391
+#define SIGNEXT 392
+#define ZEROEXT 393
+#define NORETURN 394
+#define INREG 395
+#define SRET 396
+#define NOUNWIND 397
+#define NOALIAS 398
+#define BYVAL 399
+#define NEST 400
+#define READNONE 401
+#define READONLY 402
+#define GC 403
+#define DEFAULT 404
+#define HIDDEN 405
+#define PROTECTED 406
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 950 "/home/ggreif/llvm/lib/AsmParser/llvmAsmParser.y"
+{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -43,156 +392,14 @@
   llvm::Instruction::OtherOps       OtherOpVal;
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
-} YYSTYPE;
-#define	ESINT64VAL	257
-#define	EUINT64VAL	258
-#define	ESAPINTVAL	259
-#define	EUAPINTVAL	260
-#define	LOCALVAL_ID	261
-#define	GLOBALVAL_ID	262
-#define	FPVAL	263
-#define	VOID	264
-#define	INTTYPE	265
-#define	FLOAT	266
-#define	DOUBLE	267
-#define	X86_FP80	268
-#define	FP128	269
-#define	PPC_FP128	270
-#define	LABEL	271
-#define	TYPE	272
-#define	LOCALVAR	273
-#define	GLOBALVAR	274
-#define	LABELSTR	275
-#define	STRINGCONSTANT	276
-#define	ATSTRINGCONSTANT	277
-#define	PCTSTRINGCONSTANT	278
-#define	ZEROINITIALIZER	279
-#define	TRUETOK	280
-#define	FALSETOK	281
-#define	BEGINTOK	282
-#define	ENDTOK	283
-#define	DECLARE	284
-#define	DEFINE	285
-#define	GLOBAL	286
-#define	CONSTANT	287
-#define	SECTION	288
-#define	ALIAS	289
-#define	VOLATILE	290
-#define	THREAD_LOCAL	291
-#define	TO	292
-#define	DOTDOTDOT	293
-#define	NULL_TOK	294
-#define	UNDEF	295
-#define	INTERNAL	296
-#define	LINKONCE	297
-#define	WEAK	298
-#define	APPENDING	299
-#define	DLLIMPORT	300
-#define	DLLEXPORT	301
-#define	EXTERN_WEAK	302
-#define	OPAQUE	303
-#define	EXTERNAL	304
-#define	TARGET	305
-#define	TRIPLE	306
-#define	ALIGN	307
-#define	ADDRSPACE	308
-#define	DEPLIBS	309
-#define	CALL	310
-#define	TAIL	311
-#define	ASM_TOK	312
-#define	MODULE	313
-#define	SIDEEFFECT	314
-#define	CC_TOK	315
-#define	CCC_TOK	316
-#define	FASTCC_TOK	317
-#define	COLDCC_TOK	318
-#define	X86_STDCALLCC_TOK	319
-#define	X86_FASTCALLCC_TOK	320
-#define	DATALAYOUT	321
-#define	UNWINDS	322
-#define	RET	323
-#define	BR	324
-#define	SWITCH	325
-#define	INVOKE	326
-#define	UNWIND	327
-#define	UNREACHABLE	328
-#define	ADD	329
-#define	SUB	330
-#define	MUL	331
-#define	UDIV	332
-#define	SDIV	333
-#define	FDIV	334
-#define	UREM	335
-#define	SREM	336
-#define	FREM	337
-#define	AND	338
-#define	OR	339
-#define	XOR	340
-#define	SHL	341
-#define	LSHR	342
-#define	ASHR	343
-#define	ICMP	344
-#define	FCMP	345
-#define	EQ	346
-#define	NE	347
-#define	SLT	348
-#define	SGT	349
-#define	SLE	350
-#define	SGE	351
-#define	ULT	352
-#define	UGT	353
-#define	ULE	354
-#define	UGE	355
-#define	OEQ	356
-#define	ONE	357
-#define	OLT	358
-#define	OGT	359
-#define	OLE	360
-#define	OGE	361
-#define	ORD	362
-#define	UNO	363
-#define	UEQ	364
-#define	UNE	365
-#define	MALLOC	366
-#define	ALLOCA	367
-#define	FREE	368
-#define	LOAD	369
-#define	STORE	370
-#define	GETELEMENTPTR	371
-#define	TRUNC	372
-#define	ZEXT	373
-#define	SEXT	374
-#define	FPTRUNC	375
-#define	FPEXT	376
-#define	BITCAST	377
-#define	UITOFP	378
-#define	SITOFP	379
-#define	FPTOUI	380
-#define	FPTOSI	381
-#define	INTTOPTR	382
-#define	PTRTOINT	383
-#define	PHI_TOK	384
-#define	SELECT	385
-#define	VAARG	386
-#define	EXTRACTELEMENT	387
-#define	INSERTELEMENT	388
-#define	SHUFFLEVECTOR	389
-#define	GETRESULT	390
-#define	SIGNEXT	391
-#define	ZEROEXT	392
-#define	NORETURN	393
-#define	INREG	394
-#define	SRET	395
-#define	NOUNWIND	396
-#define	NOALIAS	397
-#define	BYVAL	398
-#define	NEST	399
-#define	READNONE	400
-#define	READONLY	401
-#define	GC	402
-#define	DEFAULT	403
-#define	HIDDEN	404
-#define	PROTECTED	405
-
+}
+/* Line 1489 of yacc.c.  */
+#line 398 "llvmAsmParser.tab.h"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
 
 extern YYSTYPE llvmAsmlval;
+

Modified: llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.y
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.y?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.y Thu Apr 24 10:48:39 2008
@@ -495,7 +495,7 @@
    if (const FunctionType *FTy = dyn_cast<FunctionType>(ElTy))
      V = Function::Create(FTy, GlobalValue::ExternalLinkage);
    else
-     V = GlobalVariable::Create(ElTy, false, GlobalValue::ExternalLinkage, 0, "",
+     V = new GlobalVariable(ElTy, false, GlobalValue::ExternalLinkage, 0, "",
                                 (Module*)0, false, PTy->getAddressSpace());
    break;
   }
@@ -784,7 +784,7 @@
 
   // Otherwise there is no existing GV to use, create one now.
   GlobalVariable *GV =
-    GlobalVariable::Create(Ty, isConstantGlobal, Linkage, Initializer, Name,
+    new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name,
                            CurModule.CurrentModule, IsThreadLocal, AddressSpace);
   GV->setVisibility(Visibility);
   InsertValue(GV, CurModule.Values);
@@ -1782,7 +1782,7 @@
           GV = Function::Create(FTy, GlobalValue::ExternalWeakLinkage, Name,
                                 CurModule.CurrentModule);
         } else {
-          GV = GlobalVariable::Create(PT->getElementType(), false,
+          GV = new GlobalVariable(PT->getElementType(), false,
                                       GlobalValue::ExternalWeakLinkage, 0,
                                       Name, CurModule.CurrentModule);
         }

Modified: llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.y.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.y.cvs?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/branches/ggreif/use-diet/lib/AsmParser/llvmAsmParser.y.cvs Thu Apr 24 10:48:39 2008
@@ -496,7 +496,7 @@
      V = Function::Create(FTy, GlobalValue::ExternalLinkage);
    else
      V = new GlobalVariable(ElTy, false, GlobalValue::ExternalLinkage, 0, "",
-                            (Module*)0, false, PTy->getAddressSpace());
+                                (Module*)0, false, PTy->getAddressSpace());
    break;
   }
   default:
@@ -785,7 +785,7 @@
   // Otherwise there is no existing GV to use, create one now.
   GlobalVariable *GV =
     new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name,
-                       CurModule.CurrentModule, IsThreadLocal, AddressSpace);
+                           CurModule.CurrentModule, IsThreadLocal, AddressSpace);
   GV->setVisibility(Visibility);
   InsertValue(GV, CurModule.Values);
   return GV;
@@ -1783,8 +1783,8 @@
                                 CurModule.CurrentModule);
         } else {
           GV = new GlobalVariable(PT->getElementType(), false,
-                                  GlobalValue::ExternalWeakLinkage, 0,
-                                  Name, CurModule.CurrentModule);
+                                      GlobalValue::ExternalWeakLinkage, 0,
+                                      Name, CurModule.CurrentModule);
         }
 
         // Keep track of the fact that we have a forward ref to recycle it

Modified: llvm/branches/ggreif/use-diet/lib/Bitcode/Reader/BitcodeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/Bitcode/Reader/BitcodeReader.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/Bitcode/Reader/BitcodeReader.cpp Thu Apr 24 10:48:39 2008
@@ -1055,7 +1055,7 @@
         isThreadLocal = Record[7];
 
       GlobalVariable *NewGV =
-        GlobalVariable::Create(Ty, isConstant, Linkage, 0, "", TheModule, 
+        new GlobalVariable(Ty, isConstant, Linkage, 0, "", TheModule, 
                            isThreadLocal, AddressSpace);
       NewGV->setAlignment(Alignment);
       if (!Section.empty())

Modified: llvm/branches/ggreif/use-diet/lib/CodeGen/MachineModuleInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/CodeGen/MachineModuleInfo.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/CodeGen/MachineModuleInfo.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/CodeGen/MachineModuleInfo.cpp Thu Apr 24 10:48:39 2008
@@ -337,7 +337,7 @@
     }
     
     Constant *CA = ConstantArray::get(AT, ArrayElements);
-    GlobalVariable *CAGV = GlobalVariable::Create(AT, true,
+    GlobalVariable *CAGV = new GlobalVariable(AT, true,
                                               GlobalValue::InternalLinkage,
                                               CA, "llvm.dbg.array",
                                               SR.getModule());
@@ -1333,7 +1333,7 @@
     // Construct string as an llvm constant.
     Constant *ConstStr = ConstantArray::get(String);
     // Otherwise create and return a new string global.
-    GlobalVariable *StrGV = GlobalVariable::Create(ConstStr->getType(), true,
+    GlobalVariable *StrGV = new GlobalVariable(ConstStr->getType(), true,
                                                GlobalVariable::InternalLinkage,
                                                ConstStr, ".str", M);
     StrGV->setSection("llvm.metadata");
@@ -1357,11 +1357,11 @@
   const StructType *Ty = getTagType(DD);
 
   // Create the GlobalVariable early to prevent infinite recursion.
-  GlobalVariable *GV = GlobalVariable::Create(Ty, true, DD->getLinkage(),
+  GlobalVariable *GV = new GlobalVariable(Ty, true, DD->getLinkage(),
                                           NULL, DD->getDescString(), M);
   GV->setSection("llvm.metadata");
 
-  // Insert GlobalVariable::Create in DescGlobals map.
+  // Insert new GlobalVariable in DescGlobals map.
   Slot = GV;
  
   // Set up elements vector

Modified: llvm/branches/ggreif/use-diet/lib/CodeGen/ShadowStackCollector.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/CodeGen/ShadowStackCollector.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/CodeGen/ShadowStackCollector.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/CodeGen/ShadowStackCollector.cpp Thu Apr 24 10:48:39 2008
@@ -229,7 +229,7 @@
   //        to be a ModulePass (which means it cannot be in the 'llc' pipeline
   //        (which uses a FunctionPassManager (which segfaults (not asserts) if
   //        provided a ModulePass))).
-  Constant *GV = GlobalVariable::Create(FrameMap->getType(), true,
+  Constant *GV = new GlobalVariable(FrameMap->getType(), true,
                                     GlobalVariable::InternalLinkage,
                                     FrameMap, "__gc_" + F.getName(),
                                     F.getParent());
@@ -292,7 +292,7 @@
   if (!Head) {
     // If the root chain does not exist, insert a new one with linkonce
     // linkage!
-    Head = GlobalVariable::Create(StackEntryPtrTy, false,
+    Head = new GlobalVariable(StackEntryPtrTy, false,
                               GlobalValue::LinkOnceLinkage,
                               Constant::getNullValue(StackEntryPtrTy),
                               "llvm_gc_root_chain", &M);

Modified: llvm/branches/ggreif/use-diet/lib/Linker/LinkModules.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/Linker/LinkModules.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/Linker/LinkModules.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/Linker/LinkModules.cpp Thu Apr 24 10:48:39 2008
@@ -499,7 +499,7 @@
       // symbol over in the dest module... the initializer will be filled in
       // later by LinkGlobalInits...
       GlobalVariable *NewDGV =
-        GlobalVariable::Create(SGV->getType()->getElementType(),
+        new GlobalVariable(SGV->getType()->getElementType(),
                            SGV->isConstant(), SGV->getLinkage(), /*init*/0,
                            SGV->getName(), Dest);
       // Propagate alignment, visibility and section info.
@@ -523,7 +523,7 @@
       // AppendingVars map.  The name is cleared out so that no linkage is
       // performed.
       GlobalVariable *NewDGV =
-        GlobalVariable::Create(SGV->getType()->getElementType(),
+        new GlobalVariable(SGV->getType()->getElementType(),
                            SGV->isConstant(), SGV->getLinkage(), /*init*/0,
                            "", Dest);
 
@@ -558,7 +558,7 @@
         // DGV and create a new one of the appropriate type.
         if (SGV->getType() != DGVar->getType()) {
           GlobalVariable *NewDGV =
-            GlobalVariable::Create(SGV->getType()->getElementType(),
+            new GlobalVariable(SGV->getType()->getElementType(),
                                DGVar->isConstant(), DGVar->getLinkage(),
                                /*init*/0, DGVar->getName(), Dest);
           CopyGVAttributes(NewDGV, DGVar);
@@ -1034,7 +1034,7 @@
       
       // Create the new global variable...
       GlobalVariable *NG =
-        GlobalVariable::Create(NewType, G1->isConstant(), G1->getLinkage(),
+        new GlobalVariable(NewType, G1->isConstant(), G1->getLinkage(),
                            /*init*/0, First->first, M, G1->isThreadLocal());
 
       // Propagate alignment, visibility and section info.

Modified: llvm/branches/ggreif/use-diet/lib/Transforms/IPO/ExtractGV.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/Transforms/IPO/ExtractGV.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/Transforms/IPO/ExtractGV.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/Transforms/IPO/ExtractGV.cpp Thu Apr 24 10:48:39 2008
@@ -106,7 +106,7 @@
         }
         ArrayType *AT = ArrayType::get(SBP, AUGs.size());
         Constant *Init = ConstantArray::get(AT, AUGs);
-        GlobalValue *gv = GlobalVariable::Create(AT, false, 
+        GlobalValue *gv = new GlobalVariable(AT, false, 
                                              GlobalValue::AppendingLinkage, 
                                              Init, "llvm.used", &M);
         gv->setSection("llvm.metadata");

Modified: llvm/branches/ggreif/use-diet/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/Transforms/IPO/GlobalOpt.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/Transforms/IPO/GlobalOpt.cpp Thu Apr 24 10:48:39 2008
@@ -473,7 +473,7 @@
       Constant *In = getAggregateConstantElement(Init,
                                             ConstantInt::get(Type::Int32Ty, i));
       assert(In && "Couldn't get element of initializer?");
-      GlobalVariable *NGV = GlobalVariable::Create(STy->getElementType(i), false,
+      GlobalVariable *NGV = new GlobalVariable(STy->getElementType(i), false,
                                                GlobalVariable::InternalLinkage,
                                                In, GV->getName()+"."+utostr(i),
                                                (Module *)NULL,
@@ -498,7 +498,7 @@
                                             ConstantInt::get(Type::Int32Ty, i));
       assert(In && "Couldn't get element of initializer?");
 
-      GlobalVariable *NGV = GlobalVariable::Create(STy->getElementType(), false,
+      GlobalVariable *NGV = new GlobalVariable(STy->getElementType(), false,
                                                GlobalVariable::InternalLinkage,
                                                In, GV->getName()+"."+utostr(i),
                                                (Module *)NULL,
@@ -799,7 +799,7 @@
   // Create the new global variable.  The contents of the malloc'd memory is
   // undefined, so initialize with an undef value.
   Constant *Init = UndefValue::get(MI->getAllocatedType());
-  GlobalVariable *NewGV = GlobalVariable::Create(MI->getAllocatedType(), false,
+  GlobalVariable *NewGV = new GlobalVariable(MI->getAllocatedType(), false,
                                              GlobalValue::InternalLinkage, Init,
                                              GV->getName()+".body",
                                              (Module *)NULL,
@@ -817,7 +817,7 @@
   // If there is a comparison against null, we will insert a global bool to
   // keep track of whether the global was initialized yet or not.
   GlobalVariable *InitBool =
-    GlobalVariable::Create(Type::Int1Ty, false, GlobalValue::InternalLinkage,
+    new GlobalVariable(Type::Int1Ty, false, GlobalValue::InternalLinkage,
                        ConstantInt::getFalse(), GV->getName()+".init",
                        (Module *)NULL, GV->isThreadLocal());
   bool InitBoolUsed = false;
@@ -1132,7 +1132,7 @@
     const Type *PFieldTy = PointerType::getUnqual(FieldTy);
     
     GlobalVariable *NGV =
-      GlobalVariable::Create(PFieldTy, false, GlobalValue::InternalLinkage,
+      new GlobalVariable(PFieldTy, false, GlobalValue::InternalLinkage,
                          Constant::getNullValue(PFieldTy),
                          GV->getName() + ".f" + utostr(FieldNo), GV,
                          GV->isThreadLocal());
@@ -1356,7 +1356,7 @@
   DOUT << "   *** SHRINKING TO BOOL: " << *GV;
   
   // Create the new global, initializing it to false.
-  GlobalVariable *NewGV = GlobalVariable::Create(Type::Int1Ty, false,
+  GlobalVariable *NewGV = new GlobalVariable(Type::Int1Ty, false,
          GlobalValue::InternalLinkage, ConstantInt::getFalse(),
                                              GV->getName()+".b",
                                              (Module *)NULL,
@@ -1754,7 +1754,7 @@
   }
   
   // Create the new global and insert it next to the existing list.
-  GlobalVariable *NGV = GlobalVariable::Create(CA->getType(), GCL->isConstant(),
+  GlobalVariable *NGV = new GlobalVariable(CA->getType(), GCL->isConstant(),
                                            GCL->getLinkage(), CA, "",
                                            (Module *)NULL,
                                            GCL->isThreadLocal());
@@ -1992,7 +1992,7 @@
     } else if (AllocaInst *AI = dyn_cast<AllocaInst>(CurInst)) {
       if (AI->isArrayAllocation()) return false;  // Cannot handle array allocs.
       const Type *Ty = AI->getType()->getElementType();
-      AllocaTmps.push_back(GlobalVariable::Create(Ty, false,
+      AllocaTmps.push_back(new GlobalVariable(Ty, false,
                                               GlobalValue::InternalLinkage,
                                               UndefValue::get(Ty),
                                               AI->getName()));

Modified: llvm/branches/ggreif/use-diet/lib/Transforms/IPO/SimplifyLibCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/Transforms/IPO/SimplifyLibCalls.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/Transforms/IPO/SimplifyLibCalls.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/Transforms/IPO/SimplifyLibCalls.cpp Thu Apr 24 10:48:39 2008
@@ -1232,7 +1232,7 @@
       // pass to be run after this pass, to merge duplicate strings.
       FormatStr.erase(FormatStr.end()-1);
       Constant *Init = ConstantArray::get(FormatStr, true);
-      Constant *GV = GlobalVariable::Create(Init->getType(), true,
+      Constant *GV = new GlobalVariable(Init->getType(), true,
                                         GlobalVariable::InternalLinkage,
                                         Init, "str",
                                      CI->getParent()->getParent()->getParent());

Modified: llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/BlockProfiling.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/BlockProfiling.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/BlockProfiling.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/BlockProfiling.cpp Thu Apr 24 10:48:39 2008
@@ -64,7 +64,7 @@
 
   const Type *ATy = ArrayType::get(Type::Int32Ty, NumFunctions);
   GlobalVariable *Counters =
-    GlobalVariable::Create(ATy, false, GlobalValue::InternalLinkage,
+    new GlobalVariable(ATy, false, GlobalValue::InternalLinkage,
                        Constant::getNullValue(ATy), "FuncProfCounters", &M);
 
   // Instrument all of the functions...
@@ -109,7 +109,7 @@
 
   const Type *ATy = ArrayType::get(Type::Int32Ty, NumBlocks);
   GlobalVariable *Counters =
-    GlobalVariable::Create(ATy, false, GlobalValue::InternalLinkage,
+    new GlobalVariable(ATy, false, GlobalValue::InternalLinkage,
                        Constant::getNullValue(ATy), "BlockProfCounters", &M);
 
   // Instrument all of the blocks...

Modified: llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/EdgeProfiling.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/EdgeProfiling.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/EdgeProfiling.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/EdgeProfiling.cpp Thu Apr 24 10:48:39 2008
@@ -65,7 +65,7 @@
 
   const Type *ATy = ArrayType::get(Type::Int32Ty, NumEdges);
   GlobalVariable *Counters =
-    GlobalVariable::Create(ATy, false, GlobalValue::InternalLinkage,
+    new GlobalVariable(ATy, false, GlobalValue::InternalLinkage,
                        Constant::getNullValue(ATy), "EdgeProfCounters", &M);
 
   // Instrument all of the edges...

Modified: llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/RSProfiling.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/RSProfiling.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/RSProfiling.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/Transforms/Instrumentation/RSProfiling.cpp Thu Apr 24 10:48:39 2008
@@ -193,7 +193,7 @@
                                          uint64_t resetval) : T(t) {
   ConstantInt* Init = ConstantInt::get(T, resetval); 
   ResetValue = Init;
-  Counter = GlobalVariable::Create(T, false, GlobalValue::InternalLinkage,
+  Counter = new GlobalVariable(T, false, GlobalValue::InternalLinkage,
                                Init, "RandomSteeringCounter", &M);
 }
 
@@ -230,7 +230,7 @@
   : AI(0), T(t) {
   ConstantInt* Init = ConstantInt::get(T, resetval);
   ResetValue  = Init;
-  Counter = GlobalVariable::Create(T, false, GlobalValue::InternalLinkage,
+  Counter = new GlobalVariable(T, false, GlobalValue::InternalLinkage,
                                Init, "RandomSteeringCounter", &M);
 }
 

Modified: llvm/branches/ggreif/use-diet/lib/Transforms/Utils/CloneModule.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/Transforms/Utils/CloneModule.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/Transforms/Utils/CloneModule.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/Transforms/Utils/CloneModule.cpp Thu Apr 24 10:48:39 2008
@@ -56,7 +56,7 @@
   //
   for (Module::const_global_iterator I = M->global_begin(), E = M->global_end();
        I != E; ++I)
-    ValueMap[I] = GlobalVariable::Create(I->getType()->getElementType(), false,
+    ValueMap[I] = new GlobalVariable(I->getType()->getElementType(), false,
                                      GlobalValue::ExternalLinkage, 0,
                                      I->getName(), New);
 

Modified: llvm/branches/ggreif/use-diet/lib/Transforms/Utils/LowerInvoke.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/Transforms/Utils/LowerInvoke.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/Transforms/Utils/LowerInvoke.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/Transforms/Utils/LowerInvoke.cpp Thu Apr 24 10:48:39 2008
@@ -138,7 +138,7 @@
     // Now that we've done that, insert the jmpbuf list head global, unless it
     // already exists.
     if (!(JBListHead = M.getGlobalVariable("llvm.sjljeh.jblist", PtrJBList))) {
-      JBListHead = GlobalVariable::Create(PtrJBList, false,
+      JBListHead = new GlobalVariable(PtrJBList, false,
                                       GlobalValue::LinkOnceLinkage,
                                       Constant::getNullValue(PtrJBList),
                                       "llvm.sjljeh.jblist", &M);
@@ -166,7 +166,7 @@
       ConstantArray::get("ERROR: Exception thrown, but not caught!\n");
     AbortMessageLength = Msg->getNumOperands()-1;  // don't include \0
 
-    GlobalVariable *MsgGV = GlobalVariable::Create(Msg->getType(), true,
+    GlobalVariable *MsgGV = new GlobalVariable(Msg->getType(), true,
                                                GlobalValue::InternalLinkage,
                                                Msg, "abortmsg", M);
     std::vector<Constant*> GEPIdx(2, Constant::getNullValue(Type::Int32Ty));
@@ -179,7 +179,7 @@
                          " program with -enable-correct-eh-support.\n");
     AbortMessageLength = Msg->getNumOperands()-1;  // don't include \0
 
-    GlobalVariable *MsgGV = GlobalVariable::Create(Msg->getType(), true,
+    GlobalVariable *MsgGV = new GlobalVariable(Msg->getType(), true,
                                                GlobalValue::InternalLinkage,
                                                Msg, "abortmsg", M);
     std::vector<Constant*> GEPIdx(2, Constant::getNullValue(Type::Int32Ty));

Modified: llvm/branches/ggreif/use-diet/lib/VMCore/Core.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/VMCore/Core.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/VMCore/Core.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/VMCore/Core.cpp Thu Apr 24 10:48:39 2008
@@ -592,7 +592,7 @@
 /*--.. Operations on global variables ......................................--*/
 
 LLVMValueRef LLVMAddGlobal(LLVMModuleRef M, LLVMTypeRef Ty, const char *Name) {
-  return wrap(GlobalVariable::Create(unwrap(Ty), false,
+  return wrap(new GlobalVariable(unwrap(Ty), false,
                                  GlobalValue::ExternalLinkage, 0, Name,
                                  unwrap(M)));
 }

Modified: llvm/branches/ggreif/use-diet/lib/VMCore/Module.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/lib/VMCore/Module.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/lib/VMCore/Module.cpp (original)
+++ llvm/branches/ggreif/use-diet/lib/VMCore/Module.cpp Thu Apr 24 10:48:39 2008
@@ -38,7 +38,7 @@
   return Ret;
 }
 GlobalVariable *ilist_traits<GlobalVariable>::createSentinel() {
-  GlobalVariable *Ret = GlobalVariable::Create(Type::Int32Ty, false,
+  GlobalVariable *Ret = new GlobalVariable(Type::Int32Ty, false,
                                            GlobalValue::ExternalLinkage);
   // This should not be garbage monitored.
   LeakDetector::removeGarbageObject(Ret);

Modified: llvm/branches/ggreif/use-diet/tools/bugpoint/ExtractFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/tools/bugpoint/ExtractFunction.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/tools/bugpoint/ExtractFunction.cpp (original)
+++ llvm/branches/ggreif/use-diet/tools/bugpoint/ExtractFunction.cpp Thu Apr 24 10:48:39 2008
@@ -233,7 +233,7 @@
   GV->eraseFromParent();
   if (!M1Tors.empty()) {
     Constant *M1Init = GetTorInit(M1Tors);
-    GlobalVariable::Create(M1Init->getType(), false, GlobalValue::AppendingLinkage,
+    new GlobalVariable(M1Init->getType(), false, GlobalValue::AppendingLinkage,
                        M1Init, GlobalName, M1);
   }
 
@@ -244,7 +244,7 @@
   GV->eraseFromParent();
   if (!M2Tors.empty()) {
     Constant *M2Init = GetTorInit(M2Tors);
-    GlobalVariable::Create(M2Init->getType(), false, GlobalValue::AppendingLinkage,
+    new GlobalVariable(M2Init->getType(), false, GlobalValue::AppendingLinkage,
                        M2Init, GlobalName, M2);
   }
 }

Modified: llvm/branches/ggreif/use-diet/tools/bugpoint/Miscompilation.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/tools/bugpoint/Miscompilation.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/tools/bugpoint/Miscompilation.cpp (original)
+++ llvm/branches/ggreif/use-diet/tools/bugpoint/Miscompilation.cpp Thu Apr 24 10:48:39 2008
@@ -693,7 +693,7 @@
         // 1. Add a string constant with its name to the global file
         Constant *InitArray = ConstantArray::get(F->getName());
         GlobalVariable *funcName =
-          GlobalVariable::Create(InitArray->getType(), true /*isConstant*/,
+          new GlobalVariable(InitArray->getType(), true /*isConstant*/,
                              GlobalValue::InternalLinkage, InitArray,
                              F->getName() + "_name", Safe);
 
@@ -712,7 +712,7 @@
           // Create a new global to hold the cached function pointer.
           Constant *NullPtr = ConstantPointerNull::get(F->getType());
           GlobalVariable *Cache =
-            GlobalVariable::Create(F->getType(), false,GlobalValue::InternalLinkage,
+            new GlobalVariable(F->getType(), false,GlobalValue::InternalLinkage,
                                NullPtr,F->getName()+".fpcache", F->getParent());
 
           // Construct a new stub function that will re-route calls to F

Modified: llvm/branches/ggreif/use-diet/tools/llvm2cpp/CppWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/use-diet/tools/llvm2cpp/CppWriter.cpp?rev=50211&r1=50210&r2=50211&view=diff

==============================================================================
--- llvm/branches/ggreif/use-diet/tools/llvm2cpp/CppWriter.cpp (original)
+++ llvm/branches/ggreif/use-diet/tools/llvm2cpp/CppWriter.cpp Thu Apr 24 10:48:39 2008
@@ -989,7 +989,7 @@
      nl(Out) << "if (!" << getCppName(GV) << ") {";
      in(); nl(Out) << getCppName(GV);
   }
-  Out << " = GlobalVariable::Create(";
+  Out << " = new GlobalVariable(";
   nl(Out) << "/*Type=*/";
   printCppName(GV->getType()->getElementType());
   Out << ",";
@@ -1083,7 +1083,7 @@
   switch (I->getOpcode()) {
     case Instruction::Ret: {
       const ReturnInst* ret = cast<ReturnInst>(I);
-      Out << "new ReturnInst("
+      Out << "ReturnInst::Create("
           << (ret->getReturnValue()
               ? opNames[0] + ", "
               : "")





More information about the llvm-commits mailing list