regenerate

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45424 91177308-0d34-0410-b5e6-96231b3b80d8

5 files changed, 5813 insertions, 4328 deletions

diff --git a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
index 764e468..8161bee 100644
--- a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
+++ b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
@@ -1,50 +1,93 @@
-#define yy_create_buffer Upgrade_create_buffer
-#define yy_delete_buffer Upgrade_delete_buffer
-#define yy_scan_buffer Upgrade_scan_buffer
-#define yy_scan_string Upgrade_scan_string
-#define yy_scan_bytes Upgrade_scan_bytes
-#define yy_flex_debug Upgrade_flex_debug
-#define yy_init_buffer Upgrade_init_buffer
-#define yy_flush_buffer Upgrade_flush_buffer
-#define yy_load_buffer_state Upgrade_load_buffer_state
-#define yy_switch_to_buffer Upgrade_switch_to_buffer
-#define yyin Upgradein
-#define yyleng Upgradeleng
-#define yylex Upgradelex
-#define yyout Upgradeout
-#define yyrestart Upgraderestart
-#define yytext Upgradetext
-#define yylineno Upgradelineno
-
-#line 20 "UpgradeLexer.cpp"
-/* A lexical scanner generated by flex */
+#line 2 "UpgradeLexer.cpp"
 
-/* Scanner skeleton version:
- * $Header: /cvs/root/flex/flex/skel.c,v 1.2 2004/05/07 00:28:17 jkh Exp $
- */
+#line 4 "UpgradeLexer.cpp"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 33
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
 
+/* begin standard C headers. */
 #include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+/* end standard C headers. */
 
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
 #endif
 
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
-#ifdef __cplusplus
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
 
-#include <stdlib.h>
-#include <unistd.h>
+#endif /* ! FLEXINT_H */
 
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
+#ifdef __cplusplus
 
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
@@ -53,34 +96,17 @@
 
 #if __STDC__
 
-#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -95,71 +121,88 @@
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN (yy_start) = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE Upgraderestart(Upgradein  )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE (16384*64)
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
 
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+extern int Upgradeleng;
 
-extern int yyleng;
-extern FILE *yyin, *yyout;
+extern FILE *Upgradein, *Upgradeout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE Upgradelex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-Upgradelineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < Upgradeleng; ++yyl )\
+                    if ( Upgradetext[yyl] == '\n' )\
+                        --Upgradelineno;\
+            }while(0)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
+		/* Undo effects of setting up Upgradetext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up Upgradetext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, yytext_ptr )
+#define unput(c) yyunput( c, (yytext_ptr)  )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-typedef unsigned int yy_size_t;
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
 
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -196,12 +239,16 @@ struct yy_buffer_state
 	 */
 	int yy_at_bol;
 
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
+
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -211,208 +258,210 @@ struct yy_buffer_state
 	 * possible backing-up.
 	 *
 	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
+	 * (via Upgraderestart()), so that the user can continue scanning by
+	 * just pointing Upgradein at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
+
 	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-static YY_BUFFER_STATE yy_current_buffer = 0;
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER yy_current_buffer
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
 
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when yytext is formed. */
+/* yy_hold_char holds the character lost when Upgradetext is formed. */
 static char yy_hold_char;
-
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
+int Upgradeleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
+static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
+/* Flag which is used to allow Upgradewrap()'s to do buffer switches
+ * instead of setting up a fresh Upgradein.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void Upgraderestart (FILE *input_file  );
+void Upgrade_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE Upgrade_create_buffer (FILE *file,int size  );
+void Upgrade_delete_buffer (YY_BUFFER_STATE b  );
+void Upgrade_flush_buffer (YY_BUFFER_STATE b  );
+void Upgradepush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void Upgradepop_buffer_state (void );
+
+static void Upgradeensure_buffer_stack (void );
+static void Upgrade_load_buffer_state (void );
+static void Upgrade_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
+#define YY_FLUSH_BUFFER Upgrade_flush_buffer(YY_CURRENT_BUFFER )
 
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+YY_BUFFER_STATE Upgrade_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE Upgrade_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE Upgrade_scan_bytes (yyconst char *bytes,int len  );
 
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
+void *Upgradealloc (yy_size_t  );
+void *Upgraderealloc (void *,yy_size_t  );
+void Upgradefree (void *  );
 
-#define yy_new_buffer yy_create_buffer
+#define yy_new_buffer Upgrade_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        Upgradeensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            Upgrade_create_buffer(Upgradein,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
+	if ( ! YY_CURRENT_BUFFER ){\
+        Upgradeensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            Upgrade_create_buffer(Upgradein,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
-#define YY_USES_REJECT
+/* Begin user sect3 */
 
-#define yywrap() 1
+#define Upgradewrap(n) 1
 #define YY_SKIP_YYWRAP
+
 typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
+FILE *Upgradein = (FILE *) 0, *Upgradeout = (FILE *) 0;
+
 typedef int yy_state_type;
-extern int yylineno;
-int yylineno = 1;
-extern char *yytext;
-#define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
+extern int Upgradelineno;
+
+int Upgradelineno = 1;
+
+extern char *Upgradetext;
+#define yytext_ptr Upgradetext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
+ * corresponding action - sets up Upgradetext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
+	(yytext_ptr) = yy_bp; \
+	Upgradeleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
+	(yy_c_buf_p) = yy_cp;
 
 #define YY_NUM_RULES 161
 #define YY_END_OF_BUFFER 162
-static yyconst short int yy_acclist[241] =
-    {   0,
-      162,  160,  161,  159,  160,  161,  159,  161,  160,  161,
-      160,  161,  160,  161,  160,  161,  160,  161,  160,  161,
-      152,  160,  161,  152,  160,  161,    1,  160,  161,  160,
-      161,  160,  161,  160,  161,  160,  161,  160,  161,  160,
-      161,  160,  161,  160,  161,  160,  161,  160,  161,  160,
-      161,  160,  161,  160,  161,  160,  161,  160,  161,  160,
-      161,  160,  161,  160,  161,  160,  161,  160,  161,  160,
-      161,  160,  161,  151,  149,  148,  148,  155,  153,  157,
-      152,    1,  134,   41,   94,   62,   50,   95,   80,   23,
-      151,  148,  148,  156,  157,   20,  157,  158,   68,   79,
-
-       39,   34,   42,   71,    3,   53,   56,   59,   54,   70,
-       25,  104,  109,  107,  108,  106,  105,  110,  114,   75,
-      133,   99,   97,   88,   89,   98,   96,   69,  112,  103,
-      101,  102,  100,  113,  111,   81,  150,  157,  157,   91,
-       61,  115,  116,   93,   74,  141,   78,   92,  142,   57,
-       90,   22,  154,   73,  119,   77,   26,    4,   66,   72,
-       55,   76,   60,   11,  118,  157,   36,    2,    5,   63,
-      121,   65,   48,   83,   87,   85,   86,   84,   82,   51,
-      143,  117,   49,   58,   21,  131,  140,   45,   64,   30,
-       24,   44,  123,  122,    7,  136,   33,  139,   38,   67,
-
-      129,  125,  135,   27,   28,  124,  137,   52,  132,  130,
-      128,   43,    6,   29,  120,   37,    8,   17,    9,  127,
-       10,  126,   35,   12,   14,   13,   32,   40,   15,   31,
-      138,  144,  146,  147,   16,   46,  145,   18,   47,   19
-    } ;
-
-static yyconst short int yy_accept[621] =
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[620] =
     {   0,
-        1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
-       17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
-       40,   42,   44,   46,   48,   50,   52,   54,   56,   58,
-       60,   62,   64,   66,   68,   70,   72,   74,   74,   75,
-       75,   76,   77,   78,   79,   79,   80,   80,   81,   82,
-       82,   83,   83,   83,   83,   83,   83,   83,   83,   83,
-       83,   84,   84,   85,   85,   85,   85,   85,   85,   85,
-       85,   85,   86,   86,   86,   86,   86,   86,   86,   86,
-       86,   86,   87,   87,   87,   88,   88,   88,   88,   88,
-       88,   88,   88,   88,   88,   88,   89,   89,   89,   89,
-
-       89,   89,   89,   89,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   91,   91,   91,   91,   91,   91,   91,   91,
-       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
-       92,   93,   95,   96,   97,   98,   98,   99,   99,  100,
-      100,  100,  101,  101,  101,  102,  102,  103,  103,  103,
-      103,  103,  104,  104,  104,  104,  104,  104,  104,  105,
-      105,  105,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  107,  108,  109,  109,  109,
-      109,  110,  110,  110,  110,  110,  110,  110,  110,  110,
-
-      110,  111,  112,  112,  113,  114,  115,  116,  117,  118,
-      118,  119,  120,  120,  120,  121,  122,  122,  122,  122,
-      122,  122,  122,  122,  123,  124,  125,  125,  126,  126,
-      126,  126,  127,  128,  128,  128,  129,  129,  129,  129,
-      129,  129,  129,  129,  129,  130,  131,  132,  132,  132,
-      133,  133,  134,  134,  135,  135,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  137,  137,
-      137,  138,  139,  139,  139,  139,  140,  140,  140,  140,
-      141,  141,  141,  142,  143,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-
-      144,  145,  146,  146,  146,  146,  146,  147,  148,  148,
-      148,  149,  149,  149,  149,  149,  149,  149,  149,  149,
-      150,  151,  152,  152,  152,  153,  153,  153,  153,  154,
-      154,  155,  155,  155,  155,  155,  155,  155,  156,  156,
-      156,  156,  156,  157,  157,  157,  158,  158,  158,  159,
-      159,  160,  160,  161,  162,  162,  162,  162,  162,  162,
-      162,  163,  163,  163,  163,  163,  164,  164,  165,  165,
-      165,  166,  167,  168,  168,  168,  169,  169,  169,  169,
-      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
-      169,  170,  170,  171,  172,  172,  172,  172,  172,  172,
-
-      172,  172,  172,  172,  172,  173,  173,  173,  173,  173,
-      173,  173,  173,  174,  174,  174,  175,  176,  177,  178,
-      179,  180,  181,  181,  181,  181,  182,  182,  182,  182,
-      183,  184,  184,  185,  186,  186,  186,  186,  186,  186,
-      187,  187,  187,  187,  187,  187,  188,  188,  188,  189,
-      189,  189,  189,  189,  189,  189,  189,  190,  191,  192,
-      192,  192,  193,  194,  195,  195,  195,  196,  196,  196,
-      196,  196,  197,  197,  198,  199,  200,  201,  201,  201,
-      201,  202,  202,  202,  203,  204,  205,  206,  207,  207,
-      207,  208,  209,  210,  211,  211,  211,  211,  211,  211,
-
-      212,  212,  213,  213,  214,  215,  215,  215,  215,  215,
-      215,  216,  216,  216,  216,  216,  216,  216,  216,  216,
-      217,  217,  217,  217,  217,  217,  217,  217,  217,  217,
-      218,  218,  218,  218,  218,  219,  219,  219,  219,  219,
-      220,  221,  222,  222,  223,  223,  223,  223,  223,  224,
-      224,  224,  224,  225,  225,  226,  227,  227,  227,  227,
-      227,  227,  227,  227,  227,  227,  227,  227,  227,  227,
-      228,  228,  228,  228,  228,  228,  228,  228,  229,  229,
-      229,  229,  229,  229,  230,  230,  230,  230,  230,  231,
-      231,  231,  232,  232,  232,  232,  232,  232,  232,  232,
-
-      232,  232,  232,  232,  232,  232,  233,  233,  234,  235,
-      236,  236,  237,  237,  238,  239,  240,  240,  241,  241
+        0,    0,  162,  160,  159,  159,  160,  160,  160,  160,
+      160,  160,  152,  152,    1,  160,  160,  160,  160,  160,
+      160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
+      160,  160,  160,  160,  160,  160,  160,    0,  151,    0,
+      149,  148,  148,  155,    0,  153,    0,  157,  152,    0,
+        1,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      134,    0,   41,    0,    0,    0,    0,    0,    0,    0,
+        0,   94,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   62,    0,    0,   50,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   95,    0,    0,    0,    0,
+
+        0,    0,    0,   80,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   23,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  151,
+      148,  148,  157,   20,  157,    0,  158,    0,   68,    0,
+        0,   79,    0,    0,   39,    0,   34,    0,    0,    0,
+        0,   42,    0,    0,    0,    0,    0,    0,   71,    0,
+        0,    3,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   53,   56,   59,    0,    0,    0,
+       54,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+       70,   25,    0,  104,  109,  107,  108,  106,  105,    0,
+      110,  114,    0,    0,   75,  133,    0,    0,    0,    0,
+        0,    0,    0,   99,   97,   88,    0,   89,    0,    0,
+        0,   98,   96,    0,    0,   69,    0,    0,    0,    0,
+        0,    0,    0,    0,  112,  103,  101,    0,    0,  102,
+        0,  100,    0,  113,    0,  111,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   81,    0,    0,
+      150,  157,    0,    0,    0,  157,    0,    0,    0,   91,
+        0,    0,   61,  115,  116,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+       93,   74,    0,    0,    0,    0,  141,   78,    0,    0,
+       92,    0,    0,    0,    0,    0,    0,    0,    0,  142,
+       57,   90,    0,    0,   22,    0,    0,    0,  154,    0,
+       73,    0,    0,    0,    0,    0,    0,  119,    0,    0,
+        0,    0,   77,    0,    0,   26,    0,    0,    4,    0,
+       66,    0,   72,   55,    0,    0,    0,    0,    0,    0,
+       76,    0,    0,    0,    0,   60,    0,   11,    0,    0,
+      118,  157,   36,    0,    0,    2,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        5,    0,   63,  121,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,   65,    0,    0,    0,    0,    0,
+        0,    0,   48,    0,    0,   83,   87,   85,   86,   84,
+       82,   51,    0,    0,    0,  143,    0,    0,    0,  117,
+       49,    0,   58,   21,    0,    0,    0,    0,    0,  131,
+        0,    0,    0,    0,    0,  140,    0,    0,   45,    0,
+        0,    0,    0,    0,    0,    0,   64,   30,   24,    0,
+        0,   44,  123,  122,    0,    0,    7,    0,    0,    0,
+        0,  136,    0,   33,  139,   38,   67,    0,    0,    0,
+      129,    0,    0,  125,  135,   27,   28,  124,    0,    0,
+      137,   52,  132,  130,    0,    0,    0,    0,    0,  128,
+
+        0,   43,    0,    6,   29,    0,    0,    0,    0,    0,
+      120,    0,    0,    0,    0,    0,    0,    0,    0,   37,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    8,
+        0,    0,    0,    0,   17,    0,    0,    0,    0,    9,
+      127,   10,    0,  126,    0,    0,    0,    0,   35,    0,
+        0,    0,   12,    0,   14,   13,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   32,
+        0,    0,    0,    0,    0,    0,    0,   40,    0,    0,
+        0,    0,    0,   15,    0,    0,    0,    0,   31,    0,
+        0,  138,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,  144,    0,  146,  147,   16,
+        0,   46,    0,  145,   18,   47,    0,   19,    0
     } ;
 
-static yyconst int yy_ec[256] =
+static yyconst flex_int32_t yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
@@ -444,7 +493,7 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[49] =
+static yyconst flex_int32_t yy_meta[49] =
     {   0,
         1,    1,    2,    1,    3,    1,    4,    5,    3,    6,
         6,    6,    6,    6,    6,    6,    6,    7,    1,    1,
@@ -453,7 +502,7 @@ static yyconst int yy_meta[49] =
         3,    3,    3,    3,    3,    3,    3,    3
     } ;
 
-static yyconst short int yy_base[630] =
+static yyconst flex_int16_t yy_base[630] =
     {   0,
         0,    0, 1336, 1337, 1337, 1337, 1331, 1316,   41,    0,
        49,   59,   69, 1287,    0,  112,   69,   72,   93,  113,
@@ -526,7 +575,7 @@ static yyconst short int yy_base[630] =
      1172, 1178,  192, 1186, 1192,   70, 1200, 1203, 1208
     } ;
 
-static yyconst short int yy_def[630] =
+static yyconst flex_int16_t yy_def[630] =
     {   0,
       619,    1,  619,  619,  619,  619,  620,  621,  622,  623,
       621,  621,   11,   13,  624,  622,  621,  621,  621,  621,
@@ -599,7 +648,7 @@ static yyconst short int yy_def[630] =
       619,  619,  619,  619,  619,  619,  619,  619,  619
     } ;
 
-static yyconst short int yy_nxt[1386] =
+static yyconst flex_int16_t yy_nxt[1386] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,   14,   14,   14,   14,    4,   15,   16,
@@ -755,7 +804,7 @@ static yyconst short int yy_nxt[1386] =
       619,  619,  619,  619,  619
     } ;
 
-static yyconst short int yy_chk[1386] =
+static yyconst flex_int16_t yy_chk[1386] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -911,28 +960,40 @@ static yyconst short int yy_chk[1386] =
       619,  619,  619,  619,  619
     } ;
 
-static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
-static char *yy_full_match;
-static int yy_lp;
-#define REJECT \
-{ \
-*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ \
-yy_cp = yy_full_match; /* restore poss. backed-over text */ \
-++yy_lp; \
-goto find_rule; \
-}
+/* Table of booleans, true if rule could match eol. */
+static yyconst flex_int32_t yy_rule_can_match_eol[162] =
+    {   0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 
+    0, 0,     };
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int Upgrade_flex_debug;
+int Upgrade_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
-#define INITIAL 0
+char *Upgradetext;
+#line 1 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 /*===-- UpgradeLexer.l - Scanner for 1.9 assembly files --------*- C++ -*--===//
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -940,8 +1001,7 @@ char *yytext;
 //  This doesn't handle long double constants, since LLVM 1.9 did not have them.
 //
 //===----------------------------------------------------------------------===*/
-#define YY_NEVER_INTERACTIVE 1
-#line 29 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 29 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 #include "UpgradeInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -1082,7 +1142,23 @@ using namespace llvm;
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1086 "UpgradeLexer.cpp"
+#line 1146 "UpgradeLexer.cpp"
+
+#define INITIAL 0
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1090,65 +1166,30 @@ using namespace llvm;
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
+extern "C" int Upgradewrap (void );
 #else
-extern int yywrap YY_PROTO(( void ));
-#endif
+extern int Upgradewrap (void );
 #endif
-
-#ifndef YY_NO_UNPUT
-static inline void yyunput YY_PROTO(( int c, char *buf_ptr ));
 #endif
 
+    static inline void yyunput (int c,char *buf_ptr  );
+    
 #ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
+static int yy_flex_strlen (yyconst char * );
 #endif
 
 #ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
 
+#ifdef __cplusplus
+static int yyinput (void );
 #else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
+static int input (void );
 #endif
 
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
 #endif
 
 /* Amount of stuff to slurp up with each read. */
@@ -1157,12 +1198,11 @@ YY_MALLOC_DECL
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
-
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#define ECHO (void) fwrite( Upgradetext, Upgradeleng, 1, Upgradeout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1170,21 +1210,35 @@ YY_MALLOC_DECL
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
-		int c = '*', n; \
+		int c = '*'; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+			     (c = getc( Upgradein )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
+		if ( c == EOF && ferror( Upgradein ) ) \
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, Upgradein))==0 && ferror(Upgradein)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(Upgradein); \
+			} \
+		}\
+\
+
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -1205,14 +1259,20 @@ YY_MALLOC_DECL
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
 #endif
 
+/* end tables serialization structures and prototypes */
+
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
+#define YY_DECL_IS_OURS 1
+
+extern int Upgradelex (void);
 
-/* Code executed at the beginning of each rule, after yytext and yyleng
+#define YY_DECL int Upgradelex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after Upgradetext and Upgradeleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -1227,60 +1287,67 @@ YY_MALLOC_DECL
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
+/** The main scanner function which does all the work.
+ */
 YY_DECL
-	{
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-
-#line 195 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+    
+#line 195 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 
 
-#line 1240 "UpgradeLexer.cpp"
+#line 1302 "UpgradeLexer.cpp"
 
-	if ( yy_init )
+	if ( !(yy_init) )
 		{
-		yy_init = 0;
+		(yy_init) = 1;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
 #endif
 
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
 
-		if ( ! yyin )
-			yyin = stdin;
+		if ( ! Upgradein )
+			Upgradein = stdin;
 
-		if ( ! yyout )
-			yyout = stdout;
+		if ( ! Upgradeout )
+			Upgradeout = stdout;
 
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
+		if ( ! YY_CURRENT_BUFFER ) {
+			Upgradeensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				Upgrade_create_buffer(Upgradein,YY_BUF_SIZE );
+		}
 
-		yy_load_buffer_state();
+		Upgrade_load_buffer_state( );
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_cp = yy_c_buf_p;
+		yy_cp = (yy_c_buf_p);
 
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
+		/* Support of Upgradetext. */
+		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
 		 * the current run.
 		 */
 		yy_bp = yy_cp;
 
-		yy_current_state = yy_start;
-		yy_state_ptr = yy_state_buf;
-		*yy_state_ptr++ = yy_current_state;
+		yy_current_state = (yy_start);
 yy_match:
 		do
 			{
 			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
@@ -1288,832 +1355,827 @@ yy_match:
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			*yy_state_ptr++ = yy_current_state;
 			++yy_cp;
 			}
 		while ( yy_current_state != 619 );
+		yy_cp = (yy_last_accepting_cpos);
+		yy_current_state = (yy_last_accepting_state);
 
 yy_find_action:
-		yy_current_state = *--yy_state_ptr;
-		yy_lp = yy_accept[yy_current_state];
-find_rule: /* we branch to this label when backing up */
-		for ( ; ; ) /* until we find what rule we matched */
-			{
-			if ( yy_lp && yy_lp < yy_accept[yy_current_state + 1] )
-				{
-				yy_act = yy_acclist[yy_lp];
-					{
-					yy_full_match = yy_cp;
-					break;
-					}
-				}
-			--yy_cp;
-			yy_current_state = *--yy_state_ptr;
-			yy_lp = yy_accept[yy_current_state];
-			}
+		yy_act = yy_accept[yy_current_state];
 
 		YY_DO_BEFORE_ACTION;
 
-		if ( yy_act != YY_END_OF_BUFFER )
+		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
 			{
 			int yyl;
-			for ( yyl = 0; yyl < yyleng; ++yyl )
-				if ( yytext[yyl] == '\n' )
-					++yylineno;
+			for ( yyl = 0; yyl < Upgradeleng; ++yyl )
+				if ( Upgradetext[yyl] == '\n' )
+					   
+    Upgradelineno++;
+;
 			}
 
 do_action:	/* This label is used only to access EOF actions. */
 
-
 		switch ( yy_act )
 	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
 case 1:
 YY_RULE_SETUP
-#line 197 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 197 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 199 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 199 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 200 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 200 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 201 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 201 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 202 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 202 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 203 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 203 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 204 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 204 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 205 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 205 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 206 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 206 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 207 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 207 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 208 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 208 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return WEAK; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 209 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 209 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 210 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 210 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 211 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 211 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 212 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 212 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 213 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 213 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return EXTERNAL; }    /* Deprecated, turn into external */
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 214 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 214 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 215 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 215 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return IMPLEMENTATION; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 216 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 216 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 217 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 217 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 218 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 218 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 219 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 219 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 220 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 220 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return TO; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 221 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 221 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return EXCEPT; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 222 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 222 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return NOT; }  /* Deprecated, turned into XOR */
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 223 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 223 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return TAIL; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 224 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 224 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return TARGET; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 225 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 225 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 226 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 226 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 227 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 227 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return ENDIAN; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 228 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 228 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return POINTERSIZE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 229 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 229 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return DATALAYOUT; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 230 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 230 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return LITTLE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 231 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 231 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return BIG; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 232 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 232 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 233 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 233 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 234 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 234 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return SECTION; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 235 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 235 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return MODULE; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 236 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 236 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return ASM_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 237 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 237 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return SIDEEFFECT; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 239 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 239 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return CC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 240 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 240 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return CCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 241 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 241 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return CSRETCC_TOK; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 242 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 242 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return FASTCC_TOK; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 243 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 243 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return COLDCC_TOK; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 244 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 244 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 245 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 245 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 247 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 247 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(SBYTE,  Type::Int8Ty,  2); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 248 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 248 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(UBYTE,  Type::Int8Ty,  1); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 249 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 249 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(UBYTE,  Type::Int8Ty,  1); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 250 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 250 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(SHORT,  Type::Int16Ty, 2); }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 251 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 251 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(USHORT, Type::Int16Ty, 1); }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 252 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 252 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(USHORT, Type::Int16Ty, 1); }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 253 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 253 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(INT,    Type::Int32Ty, 2); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 254 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 254 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(UINT,   Type::Int32Ty, 1); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 255 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 255 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(UINT,   Type::Int32Ty, 1); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 256 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 256 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(LONG,   Type::Int64Ty, 2); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 257 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 257 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(ULONG,  Type::Int64Ty, 1); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 258 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 258 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(ULONG,  Type::Int64Ty, 1); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 259 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 259 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(VOID,   Type::VoidTy,  0); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 260 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 260 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(BOOL,   Type::Int1Ty,  1); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 261 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 261 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(BOOL,   Type::Int1Ty,  1); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 262 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 262 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(FLOAT,  Type::FloatTy, 0); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 263 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 263 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(DOUBLE, Type::DoubleTy,0); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 264 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 264 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TY(LABEL,  Type::LabelTy, 0); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 265 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 265 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return TYPE;   }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 266 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 266 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return OPAQUE; }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 268 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 268 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, AddOp, ADD); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 269 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 269 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SubOp, SUB); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 270 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 270 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, MulOp, MUL); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 271 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 271 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, DivOp,  DIV); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 272 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 272 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, UDivOp, UDIV); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 273 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 273 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SDivOp, SDIV); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 274 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 274 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, FDivOp, FDIV); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 275 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 275 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, RemOp,  REM); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 276 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 276 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, URemOp, UREM); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 277 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 277 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SRemOp, SREM); }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 278 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 278 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, FRemOp, FREM); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 279 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 279 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, AndOp, AND); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 280 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 280 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, OrOp , OR ); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 281 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 281 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, XorOp, XOR); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 282 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 282 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SetNE, SETNE); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 283 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 283 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 284 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 284 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SetLT, SETLT); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 285 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 285 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SetGT, SETGT); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 286 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 286 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SetLE, SETLE); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 287 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 287 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SetGE, SETGE); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 288 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 288 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, ShlOp, SHL); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 289 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 289 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, ShrOp, SHR); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 290 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 290 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, LShrOp, LSHR); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 291 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 291 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, AShrOp, ASHR); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 293 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 293 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, ICmpOp, ICMP); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 294 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 294 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, FCmpOp, FCMP); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 296 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 296 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return EQ; }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 297 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 297 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return NE; }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 298 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 298 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return SLT; }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 299 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 299 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return SGT; }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 300 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 300 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return SLE; }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 301 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 301 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return SGE; }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 302 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 302 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return ULT; }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 303 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 303 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return UGT; }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 304 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 304 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return ULE; }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 305 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 305 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return UGE; }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 306 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 306 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return OEQ; }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 307 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 307 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return ONE; }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 308 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 308 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return OLT; }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 309 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 309 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return OGT; }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 310 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 310 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return OLE; }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 311 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 311 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return OGE; }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 312 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 312 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return ORD; }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 313 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 313 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return UNO; }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 314 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 314 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return UEQ; }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 315 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 315 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return UNE; }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 317 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 317 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, PHIOp, PHI_TOK); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 318 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 318 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, CallOp, CALL); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 319 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 319 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, CastOp, CAST);  }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 320 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 320 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, TruncOp, TRUNC); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 321 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 321 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, ZExtOp , ZEXT); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 322 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 322 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, SExtOp, SEXT); }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 323 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 323 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, FPTruncOp, FPTRUNC); }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 324 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 324 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, FPExtOp, FPEXT); }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 325 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 325 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, FPToUIOp, FPTOUI); }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 326 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 326 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, FPToSIOp, FPTOSI); }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 327 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 327 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, UIToFPOp, UITOFP); }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 328 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 328 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, SIToFPOp, SITOFP); }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 329 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 329 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, PtrToIntOp, PTRTOINT); }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 330 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 330 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, IntToPtrOp, INTTOPTR); }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 331 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 331 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, BitCastOp, BITCAST); }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 332 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 332 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, SelectOp, SELECT); }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 333 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 333 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return VANEXT_old; }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 334 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 334 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return VAARG_old; }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 335 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 335 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 336 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 336 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(TermOpVal, RetOp, RET); }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 337 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 337 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(TermOpVal, BrOp, BR); }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 338 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 338 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(TermOpVal, SwitchOp, SWITCH); }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 339 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 339 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(TermOpVal, InvokeOp, INVOKE); }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 340 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 340 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { return UNWIND; }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 341 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 341 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(TermOpVal, UnreachableOp, UNREACHABLE); }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 343 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 343 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(MemOpVal, MallocOp, MALLOC); }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 344 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 344 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(MemOpVal, AllocaOp, ALLOCA); }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 345 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 345 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(MemOpVal, FreeOp, FREE); }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 346 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 346 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(MemOpVal, LoadOp, LOAD); }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 347 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 347 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(MemOpVal, StoreOp, STORE); }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 348 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 348 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(MemOpVal, GetElementPtrOp, GETELEMENTPTR); }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 350 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 350 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, ExtractElementOp, EXTRACTELEMENT); }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 351 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 351 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, InsertElementOp, INSERTELEMENT); }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 352 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 352 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, ShuffleVectorOp, SHUFFLEVECTOR); }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 355 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 355 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 {
-                  UnEscapeLexed(yytext+1);
-                  Upgradelval.StrVal = strdup(yytext+1);             // Skip %
+                  UnEscapeLexed(Upgradetext+1);
+                  Upgradelval.StrVal = strdup(Upgradetext+1);             // Skip %
                   return VAR_ID;
                 }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 360 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 360 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 {
-                  yytext[strlen(yytext)-1] = 0;  // nuke colon
-                  UnEscapeLexed(yytext);
-                  Upgradelval.StrVal = strdup(yytext);
+                  Upgradetext[strlen(Upgradetext)-1] = 0;  // nuke colon
+                  UnEscapeLexed(Upgradetext);
+                  Upgradelval.StrVal = strdup(Upgradetext);
                   return LABELSTR;
                 }
 	YY_BREAK
 case 150:
+/* rule 150 can match eol */
 YY_RULE_SETUP
-#line 366 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 366 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 {
-                  yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
-                  UnEscapeLexed(yytext+1);
-                  Upgradelval.StrVal = strdup(yytext+1);
+                  Upgradetext[strlen(Upgradetext)-2] = 0;  // nuke colon, end quote
+                  UnEscapeLexed(Upgradetext+1);
+                  Upgradelval.StrVal = strdup(Upgradetext+1);
                   return LABELSTR;
                 }
 	YY_BREAK
 case 151:
+/* rule 151 can match eol */
 YY_RULE_SETUP
-#line 373 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 373 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { // Note that we cannot unescape a string constant here!  The
                    // string constant might contain a \00 which would not be
                    // understood by the string stuff.  It is valid to make a
                    // [sbyte] c"Hello World\00" constant, for example.
                    //
-                   yytext[strlen(yytext)-1] = 0;           // nuke end quote
-                   Upgradelval.StrVal = strdup(yytext+1);  // Nuke start quote
+                   Upgradetext[strlen(Upgradetext)-1] = 0;           // nuke end quote
+                   Upgradelval.StrVal = strdup(Upgradetext+1);  // Nuke start quote
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 384 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
-{ Upgradelval.UInt64Val = atoull(yytext); return EUINT64VAL; }
+#line 384 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+{ Upgradelval.UInt64Val = atoull(Upgradetext); return EUINT64VAL; }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 385 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 385 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 {
-                  uint64_t Val = atoull(yytext+1);
+                  uint64_t Val = atoull(Upgradetext+1);
                   // +1:  we have bigger negative range
                   if (Val > (uint64_t)INT64_MAX+1)
                     error("Constant too large for signed 64 bits!");
@@ -2123,17 +2185,17 @@ YY_RULE_SETUP
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 393 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 393 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 {
-                   Upgradelval.UInt64Val = HexIntToVal(yytext+3);
-                   return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
+                   Upgradelval.UInt64Val = HexIntToVal(Upgradetext+3);
+                   return Upgradetext[0] == 's' ? ESINT64VAL : EUINT64VAL;
                  }
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 398 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 398 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 {
-                  uint64_t Val = atoull(yytext+1);
+                  uint64_t Val = atoull(Upgradetext+1);
                   if ((unsigned)Val != Val)
                     error("Invalid value number (too large)!");
                   Upgradelval.UIntVal = unsigned(Val);
@@ -2142,9 +2204,9 @@ YY_RULE_SETUP
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 405 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 405 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 {
-                  uint64_t Val = atoull(yytext+2);
+                  uint64_t Val = atoull(Upgradetext+2);
                   // +1:  we have bigger negative range
                   if (Val > (uint64_t)INT32_MAX+1)
                     error("Constant too large for signed 32 bits!");
@@ -2154,66 +2216,67 @@ YY_RULE_SETUP
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 414 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
-{ Upgradelval.FPVal = new APFloat(atof(yytext)); return FPVAL; }
+#line 414 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+{ Upgradelval.FPVal = new APFloat(atof(Upgradetext)); return FPVAL; }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 415 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
-{ Upgradelval.FPVal = new APFloat(HexToFP(yytext)); 
+#line 415 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+{ Upgradelval.FPVal = new APFloat(HexToFP(Upgradetext)); 
                   return FPVAL; 
                 }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 419 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 419 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
                    */
-                  yy_delete_buffer(YY_CURRENT_BUFFER);
+                  Upgrade_delete_buffer(YY_CURRENT_BUFFER);
                   return EOF;
                 }
 	YY_BREAK
 case 159:
+/* rule 159 can match eol */
 YY_RULE_SETUP
-#line 427 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 427 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 428 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
-{ return yytext[0]; }
+#line 428 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+{ return Upgradetext[0]; }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 430 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 430 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2193 "UpgradeLexer.cpp"
+#line 2256 "UpgradeLexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 		YY_RESTORE_YY_MORE_OFFSET
 
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
+			 * just pointed Upgradein at a new source and called
+			 * Upgradelex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = Upgradein;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -2223,13 +2286,13 @@ YY_FATAL_ERROR( "flex scanner jammed" );
 		 * end-of-buffer state).  Contrast this with the test
 		 * in input().
 		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			{ /* This was really a NUL. */
 			yy_state_type yy_next_state;
 
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
 
-			yy_current_state = yy_get_previous_state();
+			yy_current_state = yy_get_previous_state(  );
 
 			/* Okay, we're now positioned to make the NUL
 			 * transition.  We couldn't have
@@ -2242,41 +2305,42 @@ YY_FATAL_ERROR( "flex scanner jammed" );
 
 			yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 
 			if ( yy_next_state )
 				{
 				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
+				yy_cp = ++(yy_c_buf_p);
 				yy_current_state = yy_next_state;
 				goto yy_match;
 				}
 
 			else
 				{
-				yy_cp = yy_c_buf_p;
+				yy_cp = (yy_last_accepting_cpos);
+				yy_current_state = (yy_last_accepting_state);
 				goto yy_find_action;
 				}
 			}
 
-		else switch ( yy_get_next_buffer() )
+		else switch ( yy_get_next_buffer(  ) )
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-				yy_did_buffer_switch_on_eof = 0;
+				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( yywrap() )
+				if ( Upgradewrap( ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
+					 * Upgradetext, we can now set up
 					 * yy_c_buf_p so that if some total
 					 * hoser (like flex itself) wants to
 					 * call the scanner after we return the
 					 * YY_NULL, it'll still work - another
 					 * YY_NULL will get returned.
 					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
 
 					yy_act = YY_STATE_EOF(YY_START);
 					goto do_action;
@@ -2284,30 +2348,30 @@ YY_FATAL_ERROR( "flex scanner jammed" );
 
 				else
 					{
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 					}
 				break;
 				}
 
 			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_match;
 
 			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_find_action;
 			}
 		break;
@@ -2318,8 +2382,7 @@ YY_FATAL_ERROR( "flex scanner jammed" );
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of yylex */
-
+} /* end of Upgradelex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -2328,21 +2391,20 @@ YY_FATAL_ERROR( "flex scanner jammed" );
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
 	register int number_to_move, i;
 	int ret_val;
 
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
 		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
 			{
 			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
@@ -2362,34 +2424,30 @@ static int yy_get_next_buffer()
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
 
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
 
 	else
 		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
+			int num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
 
 			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
@@ -2402,8 +2460,7 @@ static int yy_get_next_buffer()
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
+					Upgraderealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -2413,35 +2470,35 @@ static int yy_get_next_buffer()
 				YY_FATAL_ERROR(
 				"fatal error - scanner input buffer overflow" );
 
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
 
-			num_to_read = yy_current_buffer->yy_buf_size -
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
 						number_to_move - 1;
-#endif
+
 			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
 
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	if ( yy_n_chars == 0 )
+	if ( (yy_n_chars) == 0 )
 		{
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
+			Upgraderestart(Upgradein  );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -2449,30 +2506,32 @@ static int yy_get_next_buffer()
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
 
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
 
 	return ret_val;
-	}
-
+}
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-static yy_state_type yy_get_previous_state()
-	{
+    static yy_state_type yy_get_previous_state (void)
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
 
-	yy_current_state = yy_start;
-	yy_state_ptr = yy_state_buf;
-	*yy_state_ptr++ = yy_current_state;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
@@ -2480,29 +2539,27 @@ static yy_state_type yy_get_previous_state()
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		*yy_state_ptr++ = yy_current_state;
 		}
 
 	return yy_current_state;
-	}
-
+}
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
 	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
 
 	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
@@ -2511,86 +2568,79 @@ yy_state_type yy_current_state;
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 619);
-	if ( ! yy_is_jam )
-		*yy_state_ptr++ = yy_current_state;
 
 	return yy_is_jam ? 0 : yy_current_state;
-	}
-
+}
 
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static inline void yyunput( int c, register char *yy_bp )
-#else
-static inline void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
+    static inline void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
 
-	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
+	/* undo effects of setting up Upgradetext */
+	*yy_cp = (yy_hold_char);
 
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
+		register int number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
-		while ( source > yy_current_buffer->yy_ch_buf )
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
 	*--yy_cp = (char) c;
 
-	if ( c == '\n' )
-		--yylineno;
-
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-#endif	/* ifndef YY_NO_UNPUT */
+    if ( c == '\n' ){
+        --Upgradelineno;
+    }
 
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
 
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput()
+    static int yyinput (void)
 #else
-static int input()
+    static int input  (void)
 #endif
-	{
-	int c;
 
-	*yy_c_buf_p = yy_hold_char;
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
 		{
 		/* yy_c_buf_p now points to the character we want to return.
 		 * If this occurs *before* the EOB characters, then it's a
 		 * valid NUL; if not, then we've hit the end of the buffer.
 		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
+			*(yy_c_buf_p) = '\0';
 
 		else
 			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
+			int offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
 
-			switch ( yy_get_next_buffer() )
+			switch ( yy_get_next_buffer(  ) )
 				{
 				case EOB_ACT_LAST_MATCH:
 					/* This happens because yy_g_n_b()
@@ -2604,16 +2654,16 @@ static int input()
 					 */
 
 					/* Reset buffer status. */
-					yyrestart( yyin );
+					Upgraderestart(Upgradein );
 
-					/* fall through */
+					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap() )
-						return EOF;
+					if ( Upgradewrap( ) )
+						return 0;
 
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -2623,174 +2673,170 @@ static int input()
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
+					(yy_c_buf_p) = (yytext_ptr) + offset;
 					break;
 				}
 			}
 		}
 
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve Upgradetext */
+	(yy_hold_char) = *++(yy_c_buf_p);
 
 	if ( c == '\n' )
-		++yylineno;
+		   
+    Upgradelineno++;
+;
 
 	return c;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+}
+#endif	/* ifndef YY_NO_INPUT */
 
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void Upgraderestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        Upgradeensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            Upgrade_create_buffer(Upgradein,YY_BUF_SIZE );
 	}
 
+	Upgrade_init_buffer(YY_CURRENT_BUFFER,input_file );
+	Upgrade_load_buffer_state( );
+}
 
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void Upgrade_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		Upgradepop_buffer_state();
+	 *		Upgradepush_buffer_state(new_buffer);
+     */
+	Upgradeensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
-	if ( yy_current_buffer )
+	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	Upgrade_load_buffer_state( );
 
 	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
+	 * EOF (Upgradewrap()) processing, but the only time this flag
+	 * is looked at is after Upgradewrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
+	(yy_did_buffer_switch_on_eof) = 1;
+}
 
+static void Upgrade_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	Upgradein = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
 
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE Upgrade_create_buffer  (FILE * file, int  size )
+{
 	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+    
+	b = (YY_BUFFER_STATE) Upgradealloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in Upgrade_create_buffer()" );
 
 	b->yy_buf_size = size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
+	b->yy_ch_buf = (char *) Upgradealloc(b->yy_buf_size + 2  );
 	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in Upgrade_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer( b, file );
+	Upgrade_init_buffer(b,file );
 
 	return b;
-	}
-
+}
 
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
+/** Destroy the buffer.
+ * @param b a buffer created with Upgrade_create_buffer()
+ * 
+ */
+    void Upgrade_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
 	if ( ! b )
 		return;
 
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
+		Upgradefree((void *) b->yy_ch_buf  );
 
+	Upgradefree((void *) b  );
+}
 
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a Upgraderestart() or at EOF.
+ */
+    static void Upgrade_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-	{
-	yy_flush_buffer( b );
+{
+	int oerrno = errno;
+    
+	Upgrade_flush_buffer(b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
+    /* If b is the current buffer, then Upgrade_init_buffer was _probably_
+     * called from Upgraderestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
 
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
+        b->yy_is_interactive = 0;
+    
+	errno = oerrno;
+}
 
-	{
-	if ( ! b )
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void Upgrade_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -2807,31 +2853,123 @@ YY_BUFFER_STATE b;
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
+	if ( b == YY_CURRENT_BUFFER )
+		Upgrade_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void Upgradepush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	Upgradeensure_buffer_stack();
+
+	/* This block is copied from Upgrade_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from Upgrade_switch_to_buffer. */
+	Upgrade_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void Upgradepop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	Upgrade_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		Upgrade_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
 	}
+}
 
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void Upgradeensure_buffer_stack (void)
+{
+	int num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)Upgradealloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
 
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
 
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)Upgraderealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE Upgrade_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+	b = (YY_BUFFER_STATE) Upgradealloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in Upgrade_scan_buffer()" );
 
 	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
@@ -2843,58 +2981,53 @@ yy_size_t size;
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer( b );
+	Upgrade_switch_to_buffer(b  );
 
 	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
+}
 
+/** Setup the input buffer state to scan a string. The next call to Upgradelex() will
+ * scan from a @e copy of @a str.
+ * @param str a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       Upgrade_scan_bytes() instead.
+ */
+YY_BUFFER_STATE Upgrade_scan_string (yyconst char * yystr )
+{
+    
+	return Upgrade_scan_bytes(yystr,strlen(yystr) );
+}
 
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
+/** Setup the input buffer state to scan the given bytes. The next call to Upgradelex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE Upgrade_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
 	int i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
+	n = _yybytes_len + 2;
+	buf = (char *) Upgradealloc(n  );
 	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+		YY_FATAL_ERROR( "out of dynamic memory in Upgrade_scan_bytes()" );
 
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
 
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer( buf, n );
+	b = Upgrade_scan_buffer(buf,n );
 	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+		YY_FATAL_ERROR( "bad buffer in Upgrade_scan_bytes()" );
 
 	/* It's okay to grow etc. this buffer, and we should throw it
 	 * away when we're done.
@@ -2902,148 +3035,199 @@ int len;
 	b->yy_is_our_buffer = 1;
 
 	return b;
-	}
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
 #endif
 
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
 
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
+/* Redefine yyless() so it works in section 3 code. */
 
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up Upgradetext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		Upgradetext[Upgradeleng] = (yy_hold_char); \
+		(yy_c_buf_p) = Upgradetext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		Upgradeleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
 
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
+/* Accessor  methods (get/set functions) to struct members. */
 
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
+/** Get the current line number.
+ * 
+ */
+int Upgradeget_lineno  (void)
+{
+        
+    return Upgradelineno;
+}
 
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
+/** Get the input stream.
+ * 
+ */
+FILE *Upgradeget_in  (void)
+{
+        return Upgradein;
+}
 
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
+/** Get the output stream.
+ * 
+ */
+FILE *Upgradeget_out  (void)
+{
+        return Upgradeout;
+}
 
-	BEGIN(new_state);
-	}
-#endif
+/** Get the length of the current token.
+ * 
+ */
+int Upgradeget_leng  (void)
+{
+        return Upgradeleng;
+}
 
+/** Get the current token.
+ * 
+ */
 
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
+char *Upgradeget_text  (void)
+{
+        return Upgradetext;
+}
 
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void Upgradeset_lineno (int  line_number )
+{
+    
+    Upgradelineno = line_number;
+}
 
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see Upgrade_switch_to_buffer
+ */
+void Upgradeset_in (FILE *  in_str )
+{
+        Upgradein = in_str ;
+}
 
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
+void Upgradeset_out (FILE *  out_str )
+{
+        Upgradeout = out_str ;
+}
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
+int Upgradeget_debug  (void)
+{
+        return Upgrade_flex_debug;
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
+void Upgradeset_debug (int  bdebug )
+{
+        Upgrade_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from Upgradelex_destroy(), so don't allocate here.
+     */
+
+    /* We do not touch Upgradelineno unless the option is enabled. */
+    Upgradelineno =  1;
+    
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    Upgradein = stdin;
+    Upgradeout = stdout;
 #else
-static void yy_fatal_error( msg )
-char msg[];
+    Upgradein = (FILE *) 0;
+    Upgradeout = (FILE *) 0;
 #endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
 
+    /* For future reference: Set errno on error, since we are called by
+     * Upgradelex_init()
+     */
+    return 0;
+}
 
+/* Upgradelex_destroy is for both reentrant and non-reentrant scanners. */
+int Upgradelex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		Upgrade_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		Upgradepop_buffer_state();
+	}
 
-/* Redefine yyless() so it works in section 3 code. */
+	/* Destroy the stack itself. */
+	Upgradefree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
 
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * Upgradelex() is called, initialization will occur. */
+    yy_init_globals( );
 
+    return 0;
+}
 
-/* Internal utility routines. */
+/*
+ * Internal utility routines.
+ */
 
 #ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
 	register int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-	}
+}
 #endif
 
 #ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
+static int yy_flex_strlen (yyconst char * s )
+{
 	register int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-	}
+}
 #endif
 
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
+void *Upgradealloc (yy_size_t  size )
+{
 	return (void *) malloc( size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static inline void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static inline void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
+void *Upgraderealloc  (void * ptr, yy_size_t  size )
+{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -3052,24 +3236,16 @@ yy_size_t size;
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-	}
+}
+
+void Upgradefree (void * ptr )
+{
+	free( (char *) ptr );	/* see Upgraderealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 430 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
 
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
-#line 430 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 
diff --git a/tools/llvm-upgrade/UpgradeLexer.l.cvs b/tools/llvm-upgrade/UpgradeLexer.l.cvs
index 9ab9eee..702c953 100644
--- a/tools/llvm-upgrade/UpgradeLexer.l.cvs
+++ b/tools/llvm-upgrade/UpgradeLexer.l.cvs
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
index 9c7e3c9..d1ff804 100644
--- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
@@ -1,167 +1,386 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/*  A Bison parser, made from /Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.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 Upgradeparse
-#define yylex Upgradelex
+#define yylex   Upgradelex
 #define yyerror Upgradeerror
-#define yylval Upgradelval
-#define yychar Upgradechar
+#define yylval  Upgradelval
+#define yychar  Upgradechar
 #define yydebug Upgradedebug
 #define yynerrs Upgradenerrs
-#define	ESINT64VAL	257
-#define	EUINT64VAL	258
-#define	SINTVAL	259
-#define	UINTVAL	260
-#define	FPVAL	261
-#define	VOID	262
-#define	BOOL	263
-#define	SBYTE	264
-#define	UBYTE	265
-#define	SHORT	266
-#define	USHORT	267
-#define	INT	268
-#define	UINT	269
-#define	LONG	270
-#define	ULONG	271
-#define	FLOAT	272
-#define	DOUBLE	273
-#define	TYPE	274
-#define	LABEL	275
-#define	VAR_ID	276
-#define	LABELSTR	277
-#define	STRINGCONSTANT	278
-#define	IMPLEMENTATION	279
-#define	ZEROINITIALIZER	280
-#define	TRUETOK	281
-#define	FALSETOK	282
-#define	BEGINTOK	283
-#define	ENDTOK	284
-#define	DECLARE	285
-#define	GLOBAL	286
-#define	CONSTANT	287
-#define	SECTION	288
-#define	VOLATILE	289
-#define	TO	290
-#define	DOTDOTDOT	291
-#define	NULL_TOK	292
-#define	UNDEF	293
-#define	CONST	294
-#define	INTERNAL	295
-#define	LINKONCE	296
-#define	WEAK	297
-#define	APPENDING	298
-#define	DLLIMPORT	299
-#define	DLLEXPORT	300
-#define	EXTERN_WEAK	301
-#define	OPAQUE	302
-#define	NOT	303
-#define	EXTERNAL	304
-#define	TARGET	305
-#define	TRIPLE	306
-#define	ENDIAN	307
-#define	POINTERSIZE	308
-#define	LITTLE	309
-#define	BIG	310
-#define	ALIGN	311
-#define	DEPLIBS	312
-#define	CALL	313
-#define	TAIL	314
-#define	ASM_TOK	315
-#define	MODULE	316
-#define	SIDEEFFECT	317
-#define	CC_TOK	318
-#define	CCC_TOK	319
-#define	CSRETCC_TOK	320
-#define	FASTCC_TOK	321
-#define	COLDCC_TOK	322
-#define	X86_STDCALLCC_TOK	323
-#define	X86_FASTCALLCC_TOK	324
-#define	DATALAYOUT	325
-#define	RET	326
-#define	BR	327
-#define	SWITCH	328
-#define	INVOKE	329
-#define	UNREACHABLE	330
-#define	UNWIND	331
-#define	EXCEPT	332
-#define	ADD	333
-#define	SUB	334
-#define	MUL	335
-#define	DIV	336
-#define	UDIV	337
-#define	SDIV	338
-#define	FDIV	339
-#define	REM	340
-#define	UREM	341
-#define	SREM	342
-#define	FREM	343
-#define	AND	344
-#define	OR	345
-#define	XOR	346
-#define	SHL	347
-#define	SHR	348
-#define	ASHR	349
-#define	LSHR	350
-#define	SETLE	351
-#define	SETGE	352
-#define	SETLT	353
-#define	SETGT	354
-#define	SETEQ	355
-#define	SETNE	356
-#define	ICMP	357
-#define	FCMP	358
-#define	MALLOC	359
-#define	ALLOCA	360
-#define	FREE	361
-#define	LOAD	362
-#define	STORE	363
-#define	GETELEMENTPTR	364
-#define	PHI_TOK	365
-#define	SELECT	366
-#define	VAARG	367
-#define	EXTRACTELEMENT	368
-#define	INSERTELEMENT	369
-#define	SHUFFLEVECTOR	370
-#define	VAARG_old	371
-#define	VANEXT_old	372
-#define	EQ	373
-#define	NE	374
-#define	SLT	375
-#define	SGT	376
-#define	SLE	377
-#define	SGE	378
-#define	ULT	379
-#define	UGT	380
-#define	ULE	381
-#define	UGE	382
-#define	OEQ	383
-#define	ONE	384
-#define	OLT	385
-#define	OGT	386
-#define	OLE	387
-#define	OGE	388
-#define	ORD	389
-#define	UNO	390
-#define	UEQ	391
-#define	UNE	392
-#define	CAST	393
-#define	TRUNC	394
-#define	ZEXT	395
-#define	SEXT	396
-#define	FPTRUNC	397
-#define	FPEXT	398
-#define	FPTOUI	399
-#define	FPTOSI	400
-#define	UITOFP	401
-#define	SITOFP	402
-#define	PTRTOINT	403
-#define	INTTOPTR	404
-#define	BITCAST	405
-
-#line 14 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.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,
+     SINTVAL = 260,
+     UINTVAL = 261,
+     FPVAL = 262,
+     VOID = 263,
+     BOOL = 264,
+     SBYTE = 265,
+     UBYTE = 266,
+     SHORT = 267,
+     USHORT = 268,
+     INT = 269,
+     UINT = 270,
+     LONG = 271,
+     ULONG = 272,
+     FLOAT = 273,
+     DOUBLE = 274,
+     TYPE = 275,
+     LABEL = 276,
+     VAR_ID = 277,
+     LABELSTR = 278,
+     STRINGCONSTANT = 279,
+     IMPLEMENTATION = 280,
+     ZEROINITIALIZER = 281,
+     TRUETOK = 282,
+     FALSETOK = 283,
+     BEGINTOK = 284,
+     ENDTOK = 285,
+     DECLARE = 286,
+     GLOBAL = 287,
+     CONSTANT = 288,
+     SECTION = 289,
+     VOLATILE = 290,
+     TO = 291,
+     DOTDOTDOT = 292,
+     NULL_TOK = 293,
+     UNDEF = 294,
+     CONST = 295,
+     INTERNAL = 296,
+     LINKONCE = 297,
+     WEAK = 298,
+     APPENDING = 299,
+     DLLIMPORT = 300,
+     DLLEXPORT = 301,
+     EXTERN_WEAK = 302,
+     OPAQUE = 303,
+     NOT = 304,
+     EXTERNAL = 305,
+     TARGET = 306,
+     TRIPLE = 307,
+     ENDIAN = 308,
+     POINTERSIZE = 309,
+     LITTLE = 310,
+     BIG = 311,
+     ALIGN = 312,
+     DEPLIBS = 313,
+     CALL = 314,
+     TAIL = 315,
+     ASM_TOK = 316,
+     MODULE = 317,
+     SIDEEFFECT = 318,
+     CC_TOK = 319,
+     CCC_TOK = 320,
+     CSRETCC_TOK = 321,
+     FASTCC_TOK = 322,
+     COLDCC_TOK = 323,
+     X86_STDCALLCC_TOK = 324,
+     X86_FASTCALLCC_TOK = 325,
+     DATALAYOUT = 326,
+     RET = 327,
+     BR = 328,
+     SWITCH = 329,
+     INVOKE = 330,
+     UNREACHABLE = 331,
+     UNWIND = 332,
+     EXCEPT = 333,
+     ADD = 334,
+     SUB = 335,
+     MUL = 336,
+     DIV = 337,
+     UDIV = 338,
+     SDIV = 339,
+     FDIV = 340,
+     REM = 341,
+     UREM = 342,
+     SREM = 343,
+     FREM = 344,
+     AND = 345,
+     OR = 346,
+     XOR = 347,
+     SHL = 348,
+     SHR = 349,
+     ASHR = 350,
+     LSHR = 351,
+     SETLE = 352,
+     SETGE = 353,
+     SETLT = 354,
+     SETGT = 355,
+     SETEQ = 356,
+     SETNE = 357,
+     ICMP = 358,
+     FCMP = 359,
+     MALLOC = 360,
+     ALLOCA = 361,
+     FREE = 362,
+     LOAD = 363,
+     STORE = 364,
+     GETELEMENTPTR = 365,
+     PHI_TOK = 366,
+     SELECT = 367,
+     VAARG = 368,
+     EXTRACTELEMENT = 369,
+     INSERTELEMENT = 370,
+     SHUFFLEVECTOR = 371,
+     VAARG_old = 372,
+     VANEXT_old = 373,
+     EQ = 374,
+     NE = 375,
+     SLT = 376,
+     SGT = 377,
+     SLE = 378,
+     SGE = 379,
+     ULT = 380,
+     UGT = 381,
+     ULE = 382,
+     UGE = 383,
+     OEQ = 384,
+     ONE = 385,
+     OLT = 386,
+     OGT = 387,
+     OLE = 388,
+     OGE = 389,
+     ORD = 390,
+     UNO = 391,
+     UEQ = 392,
+     UNE = 393,
+     CAST = 394,
+     TRUNC = 395,
+     ZEXT = 396,
+     SEXT = 397,
+     FPTRUNC = 398,
+     FPEXT = 399,
+     FPTOUI = 400,
+     FPTOSI = 401,
+     UITOFP = 402,
+     SITOFP = 403,
+     PTRTOINT = 404,
+     INTTOPTR = 405,
+     BITCAST = 406
+   };
+#endif
+/* Tokens.  */
+#define ESINT64VAL 258
+#define EUINT64VAL 259
+#define SINTVAL 260
+#define UINTVAL 261
+#define FPVAL 262
+#define VOID 263
+#define BOOL 264
+#define SBYTE 265
+#define UBYTE 266
+#define SHORT 267
+#define USHORT 268
+#define INT 269
+#define UINT 270
+#define LONG 271
+#define ULONG 272
+#define FLOAT 273
+#define DOUBLE 274
+#define TYPE 275
+#define LABEL 276
+#define VAR_ID 277
+#define LABELSTR 278
+#define STRINGCONSTANT 279
+#define IMPLEMENTATION 280
+#define ZEROINITIALIZER 281
+#define TRUETOK 282
+#define FALSETOK 283
+#define BEGINTOK 284
+#define ENDTOK 285
+#define DECLARE 286
+#define GLOBAL 287
+#define CONSTANT 288
+#define SECTION 289
+#define VOLATILE 290
+#define TO 291
+#define DOTDOTDOT 292
+#define NULL_TOK 293
+#define UNDEF 294
+#define CONST 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 NOT 304
+#define EXTERNAL 305
+#define TARGET 306
+#define TRIPLE 307
+#define ENDIAN 308
+#define POINTERSIZE 309
+#define LITTLE 310
+#define BIG 311
+#define ALIGN 312
+#define DEPLIBS 313
+#define CALL 314
+#define TAIL 315
+#define ASM_TOK 316
+#define MODULE 317
+#define SIDEEFFECT 318
+#define CC_TOK 319
+#define CCC_TOK 320
+#define CSRETCC_TOK 321
+#define FASTCC_TOK 322
+#define COLDCC_TOK 323
+#define X86_STDCALLCC_TOK 324
+#define X86_FASTCALLCC_TOK 325
+#define DATALAYOUT 326
+#define RET 327
+#define BR 328
+#define SWITCH 329
+#define INVOKE 330
+#define UNREACHABLE 331
+#define UNWIND 332
+#define EXCEPT 333
+#define ADD 334
+#define SUB 335
+#define MUL 336
+#define DIV 337
+#define UDIV 338
+#define SDIV 339
+#define FDIV 340
+#define REM 341
+#define UREM 342
+#define SREM 343
+#define FREM 344
+#define AND 345
+#define OR 346
+#define XOR 347
+#define SHL 348
+#define SHR 349
+#define ASHR 350
+#define LSHR 351
+#define SETLE 352
+#define SETGE 353
+#define SETLT 354
+#define SETGT 355
+#define SETEQ 356
+#define SETNE 357
+#define ICMP 358
+#define FCMP 359
+#define MALLOC 360
+#define ALLOCA 361
+#define FREE 362
+#define LOAD 363
+#define STORE 364
+#define GETELEMENTPTR 365
+#define PHI_TOK 366
+#define SELECT 367
+#define VAARG 368
+#define EXTRACTELEMENT 369
+#define INSERTELEMENT 370
+#define SHUFFLEVECTOR 371
+#define VAARG_old 372
+#define VANEXT_old 373
+#define EQ 374
+#define NE 375
+#define SLT 376
+#define SGT 377
+#define SLE 378
+#define SGE 379
+#define ULT 380
+#define UGT 381
+#define ULE 382
+#define UGE 383
+#define OEQ 384
+#define ONE 385
+#define OLT 386
+#define OGT 387
+#define OLE 388
+#define OGE 389
+#define ORD 390
+#define UNO 391
+#define UEQ 392
+#define UNE 393
+#define CAST 394
+#define TRUNC 395
+#define ZEXT 396
+#define SEXT 397
+#define FPTRUNC 398
+#define FPEXT 399
+#define FPTOUI 400
+#define FPTOSI 401
+#define UITOFP 402
+#define SITOFP 403
+#define PTRTOINT 404
+#define INTTOPTR 405
+#define BITCAST 406
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 14 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
 
 #include "UpgradeInternals.h"
 #include "llvm/CallingConv.h"
@@ -1828,8 +2047,29 @@ Module* UpgradeAssembly(const std::string &infile, std::istream& in,
 using namespace llvm;
 
 
-#line 1681 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.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 1681 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   std::pair<llvm::PATypeInfo, char*>     *ArgVal;
@@ -1869,1124 +2109,1815 @@ typedef union {
   llvm::ICmpInst::Predicate         IPred;
   llvm::FCmpInst::Predicate         FPred;
   llvm::Module::Endianness          Endianness;
-} YYSTYPE;
-#include <stdio.h>
+}
+/* Line 193 of yacc.c.  */
+#line 2115 "UpgradeParser.tab.c"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations.  */
+
 
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
+/* Line 216 of yacc.c.  */
+#line 2128 "UpgradeParser.tab.c"
+
+#ifdef short
+# undef short
 #endif
+
+#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
 
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
 
-#define	YYFINAL		606
-#define	YYFLAG		-32768
-#define	YYNTBASE	166
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 405 ? yytranslate[x] : 246)
-
-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,   155,
-   156,   164,     2,   153,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,   160,
-   152,   161,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-   157,   154,   159,     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,   158,
-     2,     2,   162,     2,   163,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     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
-};
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
 
-#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,   128,   130,   132,   134,   136,   138,
-   140,   142,   144,   146,   148,   150,   152,   154,   156,   158,
-   161,   162,   164,   166,   168,   170,   172,   174,   176,   177,
-   178,   180,   182,   184,   186,   188,   190,   193,   194,   197,
-   198,   202,   205,   206,   208,   209,   213,   215,   218,   220,
-   222,   224,   226,   228,   230,   232,   234,   236,   238,   240,
-   242,   244,   246,   248,   250,   252,   254,   256,   258,   261,
-   266,   272,   278,   282,   285,   291,   296,   299,   301,   305,
-   307,   311,   313,   314,   319,   323,   327,   332,   337,   341,
-   348,   354,   357,   360,   363,   366,   369,   372,   375,   378,
-   381,   384,   391,   397,   406,   413,   420,   427,   435,   443,
-   450,   457,   466,   475,   479,   481,   483,   485,   487,   490,
-   493,   498,   501,   503,   508,   511,   516,   517,   525,   526,
-   534,   535,   543,   544,   552,   556,   561,   562,   564,   566,
-   568,   572,   576,   580,   584,   588,   592,   594,   595,   597,
-   599,   601,   602,   605,   609,   611,   613,   617,   619,   620,
-   629,   631,   633,   634,   639,   641,   643,   646,   647,   649,
-   651,   652,   653,   659,   660,   662,   664,   666,   668,   670,
-   672,   674,   676,   678,   682,   684,   690,   692,   694,   696,
-   698,   701,   704,   707,   711,   714,   715,   717,   719,   721,
-   724,   727,   731,   741,   751,   760,   774,   776,   778,   785,
-   791,   794,   801,   809,   811,   815,   817,   818,   821,   823,
-   829,   835,   841,   848,   855,   858,   863,   868,   875,   880,
-   885,   890,   895,   902,   909,   912,   920,   922,   925,   926,
-   928,   929,   933,   940,   944,   951,   954,   959,   966
-};
+#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
 
-static const short yyrhs[] = {     5,
-     0,     6,     0,     3,     0,     4,     0,    79,     0,    80,
-     0,    81,     0,    82,     0,    83,     0,    84,     0,    85,
-     0,    86,     0,    87,     0,    88,     0,    89,     0,    90,
-     0,    91,     0,    92,     0,    97,     0,    98,     0,    99,
-     0,   100,     0,   101,     0,   102,     0,   119,     0,   120,
-     0,   121,     0,   122,     0,   123,     0,   124,     0,   125,
-     0,   126,     0,   127,     0,   128,     0,   129,     0,   130,
-     0,   131,     0,   132,     0,   133,     0,   134,     0,   135,
-     0,   136,     0,   137,     0,   138,     0,   125,     0,   126,
-     0,   127,     0,   128,     0,    27,     0,    28,     0,    93,
-     0,    94,     0,    95,     0,    96,     0,   140,     0,   141,
-     0,   142,     0,   143,     0,   144,     0,   145,     0,   146,
-     0,   147,     0,   148,     0,   149,     0,   150,     0,   151,
-     0,   139,     0,    16,     0,    14,     0,    12,     0,    10,
-     0,    17,     0,    15,     0,    13,     0,    11,     0,   175,
-     0,   176,     0,    18,     0,    19,     0,   211,   152,     0,
-     0,    41,     0,    42,     0,    43,     0,    44,     0,    45,
-     0,    46,     0,    47,     0,     0,     0,    65,     0,    66,
-     0,    67,     0,    68,     0,    69,     0,    70,     0,    64,
-     4,     0,     0,    57,     4,     0,     0,   153,    57,     4,
-     0,    34,    24,     0,     0,   184,     0,     0,   153,   187,
-   186,     0,   184,     0,    57,     4,     0,   190,     0,     8,
-     0,   192,     0,     8,     0,   192,     0,     9,     0,    10,
-     0,    11,     0,    12,     0,    13,     0,    14,     0,    15,
-     0,    16,     0,    17,     0,    18,     0,    19,     0,    21,
-     0,   191,     0,    48,     0,   228,     0,   154,     4,     0,
-   189,   155,   194,   156,     0,   157,     4,   158,   192,   159,
-     0,   160,     4,   158,   192,   161,     0,   162,   193,   163,
-     0,   162,   163,     0,   160,   162,   193,   163,   161,     0,
-   160,   162,   163,   161,     0,   192,   164,     0,   192,     0,
-   193,   153,   192,     0,   193,     0,   193,   153,    37,     0,
-    37,     0,     0,   190,   157,   197,   159,     0,   190,   157,
-   159,     0,   190,   165,    24,     0,   190,   160,   197,   161,
-     0,   190,   162,   197,   163,     0,   190,   162,   163,     0,
-   190,   160,   162,   197,   163,   161,     0,   190,   160,   162,
-   163,   161,     0,   190,    38,     0,   190,    39,     0,   190,
-   228,     0,   190,   196,     0,   190,    26,     0,   175,   167,
-     0,   176,     4,     0,     9,    27,     0,     9,    28,     0,
-   178,     7,     0,   174,   155,   195,    36,   190,   156,     0,
-   110,   155,   195,   243,   156,     0,   112,   155,   195,   153,
-   195,   153,   195,   156,     0,   168,   155,   195,   153,   195,
-   156,     0,   169,   155,   195,   153,   195,   156,     0,   170,
-   155,   195,   153,   195,   156,     0,   103,   171,   155,   195,
-   153,   195,   156,     0,   104,   172,   155,   195,   153,   195,
-   156,     0,   173,   155,   195,   153,   195,   156,     0,   114,
-   155,   195,   153,   195,   156,     0,   115,   155,   195,   153,
-   195,   153,   195,   156,     0,   116,   155,   195,   153,   195,
-   153,   195,   156,     0,   197,   153,   195,     0,   195,     0,
-    32,     0,    33,     0,   200,     0,   200,   221,     0,   200,
-   223,     0,   200,    62,    61,   206,     0,   200,    25,     0,
-   201,     0,   201,   179,    20,   188,     0,   201,   223,     0,
-   201,    62,    61,   206,     0,     0,   201,   179,   180,   198,
-   195,   202,   186,     0,     0,   201,   179,    50,   198,   190,
-   203,   186,     0,     0,   201,   179,    45,   198,   190,   204,
-   186,     0,     0,   201,   179,    47,   198,   190,   205,   186,
-     0,   201,    51,   208,     0,   201,    58,   152,   209,     0,
-     0,    24,     0,    56,     0,    55,     0,    53,   152,   207,
-     0,    54,   152,     4,     0,    52,   152,    24,     0,    71,
-   152,    24,     0,   157,   210,   159,     0,   210,   153,    24,
-     0,    24,     0,     0,    22,     0,    24,     0,   211,     0,
-     0,   190,   212,     0,   214,   153,   213,     0,   213,     0,
-   214,     0,   214,   153,    37,     0,    37,     0,     0,   181,
-   188,   211,   155,   215,   156,   185,   182,     0,    29,     0,
-   162,     0,     0,   180,   219,   216,   217,     0,    30,     0,
-   163,     0,   231,   220,     0,     0,    45,     0,    47,     0,
-     0,     0,    31,   224,   222,   225,   216,     0,     0,    63,
-     0,     3,     0,     4,     0,     7,     0,    27,     0,    28,
-     0,    38,     0,    39,     0,    26,     0,   160,   197,   161,
-     0,   196,     0,    61,   226,    24,   153,    24,     0,   166,
-     0,   211,     0,   228,     0,   227,     0,   190,   229,     0,
-   231,   232,     0,   218,   232,     0,   233,   179,   235,     0,
-   233,   237,     0,     0,    23,     0,    77,     0,    78,     0,
-    72,   230,     0,    72,     8,     0,    73,    21,   229,     0,
-    73,     9,   229,   153,    21,   229,   153,    21,   229,     0,
-    74,   177,   229,   153,    21,   229,   157,   236,   159,     0,
-    74,   177,   229,   153,    21,   229,   157,   159,     0,    75,
-   181,   188,   229,   155,   240,   156,    36,    21,   229,   234,
-    21,   229,     0,   234,     0,    76,     0,   236,   177,   227,
-   153,    21,   229,     0,   177,   227,   153,    21,   229,     0,
-   179,   242,     0,   190,   157,   229,   153,   229,   159,     0,
-   238,   153,   157,   229,   153,   229,   159,     0,   230,     0,
-   239,   153,   230,     0,   239,     0,     0,    60,    59,     0,
-    59,     0,   168,   190,   229,   153,   229,     0,   169,   190,
-   229,   153,   229,     0,   170,   190,   229,   153,   229,     0,
-   103,   171,   190,   229,   153,   229,     0,   104,   172,   190,
-   229,   153,   229,     0,    49,   230,     0,   173,   230,   153,
-   230,     0,   174,   230,    36,   190,     0,   112,   230,   153,
-   230,   153,   230,     0,   113,   230,   153,   190,     0,   117,
-   230,   153,   190,     0,   118,   230,   153,   190,     0,   114,
-   230,   153,   230,     0,   115,   230,   153,   230,   153,   230,
-     0,   116,   230,   153,   230,   153,   230,     0,   111,   238,
-     0,   241,   181,   188,   229,   155,   240,   156,     0,   245,
-     0,   153,   239,     0,     0,    35,     0,     0,   105,   190,
-   183,     0,   105,   190,   153,    15,   229,   183,     0,   106,
-   190,   183,     0,   106,   190,   153,    15,   229,   183,     0,
-   107,   230,     0,   244,   108,   190,   229,     0,   244,   109,
-   230,   153,   190,   229,     0,   110,   190,   229,   243,     0
-};
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && 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
 
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-  1821,  1822,  1830,  1831,  1841,  1841,  1841,  1841,  1841,  1841,
-  1841,  1841,  1841,  1841,  1841,  1845,  1845,  1845,  1849,  1849,
-  1849,  1849,  1849,  1849,  1853,  1853,  1854,  1854,  1855,  1855,
-  1856,  1856,  1857,  1857,  1861,  1861,  1862,  1862,  1863,  1863,
-  1864,  1864,  1865,  1865,  1866,  1866,  1867,  1867,  1868,  1869,
-  1872,  1872,  1872,  1872,  1876,  1876,  1876,  1876,  1876,  1876,
-  1876,  1877,  1877,  1877,  1877,  1877,  1877,  1883,  1883,  1883,
-  1883,  1887,  1887,  1887,  1887,  1891,  1891,  1895,  1895,  1900,
-  1903,  1908,  1909,  1910,  1911,  1912,  1913,  1914,  1915,  1919,
-  1920,  1921,  1922,  1923,  1924,  1925,  1926,  1936,  1937,  1945,
-  1946,  1954,  1963,  1964,  1971,  1972,  1976,  1980,  1996,  1997,
-  2004,  2005,  2012,  2020,  2020,  2020,  2020,  2020,  2020,  2020,
-  2021,  2021,  2021,  2021,  2021,  2026,  2030,  2034,  2039,  2048,
-  2075,  2081,  2094,  2105,  2109,  2122,  2126,  2141,  2145,  2152,
-  2153,  2159,  2166,  2178,  2208,  2221,  2244,  2272,  2294,  2305,
-  2327,  2338,  2347,  2352,  2411,  2418,  2426,  2433,  2440,  2444,
-  2448,  2462,  2477,  2489,  2498,  2526,  2539,  2548,  2554,  2560,
-  2571,  2577,  2583,  2594,  2595,  2604,  2605,  2617,  2626,  2627,
-  2628,  2629,  2630,  2646,  2666,  2668,  2670,  2674,  2677,  2682,
-  2685,  2690,  2693,  2699,  2702,  2704,  2706,  2711,  2725,  2726,
-  2730,  2733,  2741,  2745,  2752,  2756,  2760,  2764,  2772,  2772,
-  2776,  2777,  2781,  2789,  2794,  2802,  2803,  2810,  2817,  2821,
-  3009,  3009,  3013,  3013,  3023,  3023,  3027,  3032,  3033,  3034,
-  3038,  3039,  3039,  3051,  3052,  3057,  3058,  3059,  3060,  3064,
-  3068,  3069,  3070,  3071,  3092,  3096,  3111,  3112,  3117,  3117,
-  3125,  3135,  3138,  3147,  3158,  3163,  3172,  3183,  3183,  3186,
-  3190,  3194,  3199,  3209,  3227,  3236,  3309,  3313,  3320,  3332,
-  3347,  3377,  3387,  3397,  3401,  3408,  3409,  3413,  3416,  3422,
-  3441,  3459,  3475,  3489,  3503,  3514,  3532,  3541,  3550,  3557,
-  3578,  3602,  3608,  3614,  3620,  3636,  3728,  3736,  3737,  3741,
-  3742,  3746,  3752,  3759,  3765,  3772,  3779,  3792,  3812
-};
+/* 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
 
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* 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))
 
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
-
-static const char * const yytname[] = {   "$","error","$undefined.","ESINT64VAL",
-"EUINT64VAL","SINTVAL","UINTVAL","FPVAL","VOID","BOOL","SBYTE","UBYTE","SHORT",
-"USHORT","INT","UINT","LONG","ULONG","FLOAT","DOUBLE","TYPE","LABEL","VAR_ID",
-"LABELSTR","STRINGCONSTANT","IMPLEMENTATION","ZEROINITIALIZER","TRUETOK","FALSETOK",
-"BEGINTOK","ENDTOK","DECLARE","GLOBAL","CONSTANT","SECTION","VOLATILE","TO",
-"DOTDOTDOT","NULL_TOK","UNDEF","CONST","INTERNAL","LINKONCE","WEAK","APPENDING",
-"DLLIMPORT","DLLEXPORT","EXTERN_WEAK","OPAQUE","NOT","EXTERNAL","TARGET","TRIPLE",
-"ENDIAN","POINTERSIZE","LITTLE","BIG","ALIGN","DEPLIBS","CALL","TAIL","ASM_TOK",
-"MODULE","SIDEEFFECT","CC_TOK","CCC_TOK","CSRETCC_TOK","FASTCC_TOK","COLDCC_TOK",
-"X86_STDCALLCC_TOK","X86_FASTCALLCC_TOK","DATALAYOUT","RET","BR","SWITCH","INVOKE",
-"UNREACHABLE","UNWIND","EXCEPT","ADD","SUB","MUL","DIV","UDIV","SDIV","FDIV",
-"REM","UREM","SREM","FREM","AND","OR","XOR","SHL","SHR","ASHR","LSHR","SETLE",
-"SETGE","SETLT","SETGT","SETEQ","SETNE","ICMP","FCMP","MALLOC","ALLOCA","FREE",
-"LOAD","STORE","GETELEMENTPTR","PHI_TOK","SELECT","VAARG","EXTRACTELEMENT","INSERTELEMENT",
-"SHUFFLEVECTOR","VAARG_old","VANEXT_old","EQ","NE","SLT","SGT","SLE","SGE","ULT",
-"UGT","ULE","UGE","OEQ","ONE","OLT","OGT","OLE","OGE","ORD","UNO","UEQ","UNE",
-"CAST","TRUNC","ZEXT","SEXT","FPTRUNC","FPEXT","FPTOUI","FPTOSI","UITOFP","SITOFP",
-"PTRTOINT","INTTOPTR","BITCAST","'='","','","'\\\\'","'('","')'","'['","'x'",
-"']'","'<'","'>'","'{'","'}'","'*'","'c'","INTVAL","EINT64VAL","ArithmeticOps",
-"LogicalOps","SetCondOps","IPredicates","FPredicates","ShiftOps","CastOps","SIntType",
-"UIntType","IntType","FPType","OptAssign","OptLinkage","OptCallingConv","OptAlign",
-"OptCAlign","SectionString","OptSection","GlobalVarAttributes","GlobalVarAttribute",
-"TypesV","UpRTypesV","Types","PrimType","UpRTypes","TypeListI","ArgTypeListI",
-"ConstVal","ConstExpr","ConstVector","GlobalType","Module","FunctionList","ConstPool",
-"@1","@2","@3","@4","AsmBlock","BigOrLittle","TargetDefinition","LibrariesDefinition",
-"LibList","Name","OptName","ArgVal","ArgListH","ArgList","FunctionHeaderH","BEGIN",
-"FunctionHeader","@5","END","Function","FnDeclareLinkage","FunctionProto","@6",
-"@7","OptSideEffect","ConstValueRef","SymbolicValueRef","ValueRef","ResolvedVal",
-"BasicBlockList","BasicBlock","InstructionList","Unwind","BBTerminatorInst",
-"JumpTable","Inst","PHIList","ValueRefList","ValueRefListE","OptTailCall","InstVal",
-"IndexList","OptVolatile","MemoryInst", NULL
-};
 #endif
 
-static const short yyr1[] = {     0,
-   166,   166,   167,   167,   168,   168,   168,   168,   168,   168,
-   168,   168,   168,   168,   168,   169,   169,   169,   170,   170,
-   170,   170,   170,   170,   171,   171,   171,   171,   171,   171,
-   171,   171,   171,   171,   172,   172,   172,   172,   172,   172,
-   172,   172,   172,   172,   172,   172,   172,   172,   172,   172,
-   173,   173,   173,   173,   174,   174,   174,   174,   174,   174,
-   174,   174,   174,   174,   174,   174,   174,   175,   175,   175,
-   175,   176,   176,   176,   176,   177,   177,   178,   178,   179,
-   179,   180,   180,   180,   180,   180,   180,   180,   180,   181,
-   181,   181,   181,   181,   181,   181,   181,   182,   182,   183,
-   183,   184,   185,   185,   186,   186,   187,   187,   188,   188,
-   189,   189,   190,   191,   191,   191,   191,   191,   191,   191,
-   191,   191,   191,   191,   191,   192,   192,   192,   192,   192,
-   192,   192,   192,   192,   192,   192,   192,   193,   193,   194,
-   194,   194,   194,   195,   195,   195,   195,   195,   195,   195,
-   195,   195,   195,   195,   195,   195,   195,   195,   195,   195,
-   195,   196,   196,   196,   196,   196,   196,   196,   196,   196,
-   196,   196,   196,   197,   197,   198,   198,   199,   200,   200,
-   200,   200,   200,   201,   201,   201,   202,   201,   203,   201,
-   204,   201,   205,   201,   201,   201,   201,   206,   207,   207,
-   208,   208,   208,   208,   209,   210,   210,   210,   211,   211,
-   212,   212,   213,   214,   214,   215,   215,   215,   215,   216,
-   217,   217,   219,   218,   220,   220,   221,   222,   222,   222,
-   224,   225,   223,   226,   226,   227,   227,   227,   227,   227,
-   227,   227,   227,   227,   227,   227,   228,   228,   229,   229,
-   230,   231,   231,   232,   233,   233,   233,   234,   234,   235,
-   235,   235,   235,   235,   235,   235,   235,   235,   236,   236,
-   237,   238,   238,   239,   239,   240,   240,   241,   241,   242,
-   242,   242,   242,   242,   242,   242,   242,   242,   242,   242,
-   242,   242,   242,   242,   242,   242,   242,   243,   243,   244,
-   244,   245,   245,   245,   245,   245,   245,   245,   245
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  4
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   1630
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  166
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  81
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  310
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  606
+
+/* 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,
+     155,   156,   164,     2,   153,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     160,   152,   161,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,   157,   154,   159,     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,
+     158,     2,     2,   162,     2,   163,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     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 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,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
-     0,     1,     1,     1,     1,     1,     1,     1,     0,     0,
-     1,     1,     1,     1,     1,     1,     2,     0,     2,     0,
-     3,     2,     0,     1,     0,     3,     1,     2,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     2,     4,
-     5,     5,     3,     2,     5,     4,     2,     1,     3,     1,
-     3,     1,     0,     4,     3,     3,     4,     4,     3,     6,
-     5,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     6,     5,     8,     6,     6,     6,     7,     7,     6,
-     6,     8,     8,     3,     1,     1,     1,     1,     2,     2,
-     4,     2,     1,     4,     2,     4,     0,     7,     0,     7,
-     0,     7,     0,     7,     3,     4,     0,     1,     1,     1,
-     3,     3,     3,     3,     3,     3,     1,     0,     1,     1,
-     1,     0,     2,     3,     1,     1,     3,     1,     0,     8,
-     1,     1,     0,     4,     1,     1,     2,     0,     1,     1,
-     0,     0,     5,     0,     1,     1,     1,     1,     1,     1,
-     1,     1,     1,     3,     1,     5,     1,     1,     1,     1,
-     2,     2,     2,     3,     2,     0,     1,     1,     1,     2,
-     2,     3,     9,     9,     8,    13,     1,     1,     6,     5,
-     2,     6,     7,     1,     3,     1,     0,     2,     1,     5,
-     5,     5,     6,     6,     2,     4,     4,     6,     4,     4,
-     4,     4,     6,     6,     2,     7,     1,     2,     0,     1,
-     0,     3,     6,     3,     6,     2,     4,     6,     4
+#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,   131,   133,   135,   137,
+     139,   141,   143,   145,   147,   149,   151,   153,   155,   157,
+     159,   161,   164,   165,   167,   169,   171,   173,   175,   177,
+     179,   180,   181,   183,   185,   187,   189,   191,   193,   196,
+     197,   200,   201,   205,   208,   209,   211,   212,   216,   218,
+     221,   223,   225,   227,   229,   231,   233,   235,   237,   239,
+     241,   243,   245,   247,   249,   251,   253,   255,   257,   259,
+     261,   264,   269,   275,   281,   285,   288,   294,   299,   302,
+     304,   308,   310,   314,   316,   317,   322,   326,   330,   335,
+     340,   344,   351,   357,   360,   363,   366,   369,   372,   375,
+     378,   381,   384,   387,   394,   400,   409,   416,   423,   430,
+     438,   446,   453,   460,   469,   478,   482,   484,   486,   488,
+     490,   493,   496,   501,   504,   506,   511,   514,   519,   520,
+     528,   529,   537,   538,   546,   547,   555,   559,   564,   565,
+     567,   569,   571,   575,   579,   583,   587,   591,   595,   597,
+     598,   600,   602,   604,   605,   608,   612,   614,   616,   620,
+     622,   623,   632,   634,   636,   637,   642,   644,   646,   649,
+     650,   652,   654,   655,   656,   662,   663,   665,   667,   669,
+     671,   673,   675,   677,   679,   681,   685,   687,   693,   695,
+     697,   699,   701,   704,   707,   710,   714,   717,   718,   720,
+     722,   724,   727,   730,   734,   744,   754,   763,   777,   779,
+     781,   788,   794,   797,   804,   812,   814,   818,   820,   821,
+     824,   826,   832,   838,   844,   851,   858,   861,   866,   871,
+     878,   883,   888,   893,   898,   905,   912,   915,   923,   925,
+     928,   929,   931,   932,   936,   943,   947,   954,   957,   962,
+     969
 };
 
-static const short yydefact[] = {   197,
-    89,   183,   182,   231,    82,    83,    84,    85,    86,    87,
-    88,     0,   223,   256,   179,   180,   256,   209,   210,     0,
-     0,     0,    89,     0,   185,   228,     0,    90,   257,   253,
-    81,   225,   226,   227,   252,     0,     0,     0,     0,   195,
-     0,     0,     0,     0,     0,     0,     0,    80,   229,   230,
-   232,   198,   181,     0,    91,    92,    93,    94,    95,    96,
-     0,     0,   301,   255,     0,     0,     0,     0,   208,   196,
-   186,     1,     2,   110,   114,   115,   116,   117,   118,   119,
-   120,   121,   122,   123,   124,   125,   127,     0,     0,     0,
-     0,   247,   184,     0,   109,   126,   113,   248,   128,   176,
-   177,     0,     0,     0,     0,    90,    97,     0,   221,   222,
-   224,   300,     0,   279,     0,     0,     0,     0,    90,   268,
-   258,   259,     5,     6,     7,     8,     9,    10,    11,    12,
-    13,    14,    15,    16,    17,    18,    51,    52,    53,    54,
-    19,    20,    21,    22,    23,    24,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    67,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-    64,    65,    66,     0,     0,     0,     0,     0,   267,   254,
-    90,   271,     0,   297,   203,   200,   199,   201,   202,   204,
-   207,     0,   129,     0,     0,     0,   112,   134,   138,     0,
-   143,   137,   191,   193,   189,   114,   115,   116,   117,   118,
-   119,   120,   121,   122,   123,   124,     0,     0,     0,     0,
-   187,   233,     0,     0,   285,   278,   261,   260,     0,     0,
-    71,    75,    70,    74,    69,    73,    68,    72,    76,    77,
-     0,     0,    25,    26,    27,    28,    29,    30,    31,    32,
-    33,    34,     0,    49,    50,    45,    46,    47,    48,    35,
-    36,    37,    38,    39,    40,    41,    42,    43,    44,     0,
-   100,   100,   306,     0,     0,   295,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,   205,     0,     0,     0,     0,     0,   133,   142,
-   140,     0,   105,   105,   105,   159,   160,     3,     4,   157,
-   158,   161,   156,   152,   153,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   155,   154,   105,   219,   236,   237,   238,   243,   239,
-   240,   241,   242,   234,     0,   245,   250,   249,   251,     0,
-   262,     0,     0,     0,     0,     0,   302,     0,   304,   299,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   206,   111,   111,
-   136,     0,   139,     0,   130,     0,   192,   194,   190,     0,
-     0,     0,     0,     0,     0,     0,   145,   175,     0,     0,
-     0,   149,     0,   146,     0,     0,     0,     0,     0,   188,
-   218,   212,   215,   216,     0,   235,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   309,     0,     0,
-     0,   289,   292,     0,     0,   290,   291,     0,     0,     0,
-   286,   287,     0,   307,     0,   131,   132,   135,   141,     0,
-     0,   107,   105,     0,     0,   299,     0,     0,     0,     0,
-     0,   144,   134,   113,     0,   147,   148,     0,     0,     0,
-     0,     0,   211,   213,     0,   103,     0,   244,     0,     0,
-   277,     0,     0,   100,   101,   100,   274,   298,     0,     0,
-     0,     0,     0,   280,   281,   282,   277,     0,   102,   108,
-   106,     0,     0,     0,     0,     0,     0,     0,   174,   151,
-     0,     0,     0,     0,     0,     0,   217,   214,   104,    98,
-     0,     0,     0,   276,     0,   283,   284,     0,   303,   305,
-     0,     0,     0,   288,   293,   294,     0,   308,     0,     0,
-   163,     0,     0,     0,     0,   150,     0,     0,     0,     0,
-     0,     0,   220,   246,     0,     0,     0,   275,   272,     0,
-   296,     0,     0,     0,   171,     0,     0,   165,   166,   167,
-   170,   162,    99,     0,   265,     0,     0,     0,   273,   168,
-   169,     0,     0,     0,   263,     0,   264,     0,     0,   164,
-   172,   173,     0,     0,     0,     0,     0,     0,   270,     0,
-     0,   269,   266,     0,     0,     0
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
+{
+     200,     0,    -1,     5,    -1,     6,    -1,     3,    -1,     4,
+      -1,    79,    -1,    80,    -1,    81,    -1,    82,    -1,    83,
+      -1,    84,    -1,    85,    -1,    86,    -1,    87,    -1,    88,
+      -1,    89,    -1,    90,    -1,    91,    -1,    92,    -1,    97,
+      -1,    98,    -1,    99,    -1,   100,    -1,   101,    -1,   102,
+      -1,   119,    -1,   120,    -1,   121,    -1,   122,    -1,   123,
+      -1,   124,    -1,   125,    -1,   126,    -1,   127,    -1,   128,
+      -1,   129,    -1,   130,    -1,   131,    -1,   132,    -1,   133,
+      -1,   134,    -1,   135,    -1,   136,    -1,   137,    -1,   138,
+      -1,   125,    -1,   126,    -1,   127,    -1,   128,    -1,    27,
+      -1,    28,    -1,    93,    -1,    94,    -1,    95,    -1,    96,
+      -1,   140,    -1,   141,    -1,   142,    -1,   143,    -1,   144,
+      -1,   145,    -1,   146,    -1,   147,    -1,   148,    -1,   149,
+      -1,   150,    -1,   151,    -1,   139,    -1,    16,    -1,    14,
+      -1,    12,    -1,    10,    -1,    17,    -1,    15,    -1,    13,
+      -1,    11,    -1,   176,    -1,   177,    -1,    18,    -1,    19,
+      -1,   212,   152,    -1,    -1,    41,    -1,    42,    -1,    43,
+      -1,    44,    -1,    45,    -1,    46,    -1,    47,    -1,    -1,
+      -1,    65,    -1,    66,    -1,    67,    -1,    68,    -1,    69,
+      -1,    70,    -1,    64,     4,    -1,    -1,    57,     4,    -1,
+      -1,   153,    57,     4,    -1,    34,    24,    -1,    -1,   185,
+      -1,    -1,   153,   188,   187,    -1,   185,    -1,    57,     4,
+      -1,   191,    -1,     8,    -1,   193,    -1,     8,    -1,   193,
+      -1,     9,    -1,    10,    -1,    11,    -1,    12,    -1,    13,
+      -1,    14,    -1,    15,    -1,    16,    -1,    17,    -1,    18,
+      -1,    19,    -1,    21,    -1,   192,    -1,    48,    -1,   229,
+      -1,   154,     4,    -1,   190,   155,   195,   156,    -1,   157,
+       4,   158,   193,   159,    -1,   160,     4,   158,   193,   161,
+      -1,   162,   194,   163,    -1,   162,   163,    -1,   160,   162,
+     194,   163,   161,    -1,   160,   162,   163,   161,    -1,   193,
+     164,    -1,   193,    -1,   194,   153,   193,    -1,   194,    -1,
+     194,   153,    37,    -1,    37,    -1,    -1,   191,   157,   198,
+     159,    -1,   191,   157,   159,    -1,   191,   165,    24,    -1,
+     191,   160,   198,   161,    -1,   191,   162,   198,   163,    -1,
+     191,   162,   163,    -1,   191,   160,   162,   198,   163,   161,
+      -1,   191,   160,   162,   163,   161,    -1,   191,    38,    -1,
+     191,    39,    -1,   191,   229,    -1,   191,   197,    -1,   191,
+      26,    -1,   176,   168,    -1,   177,     4,    -1,     9,    27,
+      -1,     9,    28,    -1,   179,     7,    -1,   175,   155,   196,
+      36,   191,   156,    -1,   110,   155,   196,   244,   156,    -1,
+     112,   155,   196,   153,   196,   153,   196,   156,    -1,   169,
+     155,   196,   153,   196,   156,    -1,   170,   155,   196,   153,
+     196,   156,    -1,   171,   155,   196,   153,   196,   156,    -1,
+     103,   172,   155,   196,   153,   196,   156,    -1,   104,   173,
+     155,   196,   153,   196,   156,    -1,   174,   155,   196,   153,
+     196,   156,    -1,   114,   155,   196,   153,   196,   156,    -1,
+     115,   155,   196,   153,   196,   153,   196,   156,    -1,   116,
+     155,   196,   153,   196,   153,   196,   156,    -1,   198,   153,
+     196,    -1,   196,    -1,    32,    -1,    33,    -1,   201,    -1,
+     201,   222,    -1,   201,   224,    -1,   201,    62,    61,   207,
+      -1,   201,    25,    -1,   202,    -1,   202,   180,    20,   189,
+      -1,   202,   224,    -1,   202,    62,    61,   207,    -1,    -1,
+     202,   180,   181,   199,   196,   203,   187,    -1,    -1,   202,
+     180,    50,   199,   191,   204,   187,    -1,    -1,   202,   180,
+      45,   199,   191,   205,   187,    -1,    -1,   202,   180,    47,
+     199,   191,   206,   187,    -1,   202,    51,   209,    -1,   202,
+      58,   152,   210,    -1,    -1,    24,    -1,    56,    -1,    55,
+      -1,    53,   152,   208,    -1,    54,   152,     4,    -1,    52,
+     152,    24,    -1,    71,   152,    24,    -1,   157,   211,   159,
+      -1,   211,   153,    24,    -1,    24,    -1,    -1,    22,    -1,
+      24,    -1,   212,    -1,    -1,   191,   213,    -1,   215,   153,
+     214,    -1,   214,    -1,   215,    -1,   215,   153,    37,    -1,
+      37,    -1,    -1,   182,   189,   212,   155,   216,   156,   186,
+     183,    -1,    29,    -1,   162,    -1,    -1,   181,   220,   217,
+     218,    -1,    30,    -1,   163,    -1,   232,   221,    -1,    -1,
+      45,    -1,    47,    -1,    -1,    -1,    31,   225,   223,   226,
+     217,    -1,    -1,    63,    -1,     3,    -1,     4,    -1,     7,
+      -1,    27,    -1,    28,    -1,    38,    -1,    39,    -1,    26,
+      -1,   160,   198,   161,    -1,   197,    -1,    61,   227,    24,
+     153,    24,    -1,   167,    -1,   212,    -1,   229,    -1,   228,
+      -1,   191,   230,    -1,   232,   233,    -1,   219,   233,    -1,
+     234,   180,   236,    -1,   234,   238,    -1,    -1,    23,    -1,
+      77,    -1,    78,    -1,    72,   231,    -1,    72,     8,    -1,
+      73,    21,   230,    -1,    73,     9,   230,   153,    21,   230,
+     153,    21,   230,    -1,    74,   178,   230,   153,    21,   230,
+     157,   237,   159,    -1,    74,   178,   230,   153,    21,   230,
+     157,   159,    -1,    75,   182,   189,   230,   155,   241,   156,
+      36,    21,   230,   235,    21,   230,    -1,   235,    -1,    76,
+      -1,   237,   178,   228,   153,    21,   230,    -1,   178,   228,
+     153,    21,   230,    -1,   180,   243,    -1,   191,   157,   230,
+     153,   230,   159,    -1,   239,   153,   157,   230,   153,   230,
+     159,    -1,   231,    -1,   240,   153,   231,    -1,   240,    -1,
+      -1,    60,    59,    -1,    59,    -1,   169,   191,   230,   153,
+     230,    -1,   170,   191,   230,   153,   230,    -1,   171,   191,
+     230,   153,   230,    -1,   103,   172,   191,   230,   153,   230,
+      -1,   104,   173,   191,   230,   153,   230,    -1,    49,   231,
+      -1,   174,   231,   153,   231,    -1,   175,   231,    36,   191,
+      -1,   112,   231,   153,   231,   153,   231,    -1,   113,   231,
+     153,   191,    -1,   117,   231,   153,   191,    -1,   118,   231,
+     153,   191,    -1,   114,   231,   153,   231,    -1,   115,   231,
+     153,   231,   153,   231,    -1,   116,   231,   153,   231,   153,
+     231,    -1,   111,   239,    -1,   242,   182,   189,   230,   155,
+     241,   156,    -1,   246,    -1,   153,   240,    -1,    -1,    35,
+      -1,    -1,   105,   191,   184,    -1,   105,   191,   153,    15,
+     230,   184,    -1,   106,   191,   184,    -1,   106,   191,   153,
+      15,   230,   184,    -1,   107,   231,    -1,   245,   108,   191,
+     230,    -1,   245,   109,   231,   153,   191,   230,    -1,   110,
+     191,   230,   244,    -1
 };
 
-static const short yydefgoto[] = {    92,
-   310,   327,   328,   329,   253,   270,   330,   331,   217,   218,
-   241,   219,    23,    13,    61,   553,   357,   452,   520,   387,
-   453,    93,    94,   220,    96,    97,   200,   302,   398,   346,
-   399,   102,   604,     1,     2,   334,   305,   303,   304,    53,
-   188,    40,    70,   192,    98,   474,   413,   414,   415,    62,
-   111,    14,    28,    34,    15,    51,    16,    26,   106,   417,
-   347,    99,   349,   487,    17,    30,    31,   179,   180,   577,
-    64,   276,   524,   525,   181,   182,   428,   183,   184
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,  1821,  1821,  1822,  1830,  1831,  1841,  1841,  1841,  1841,
+    1841,  1841,  1841,  1841,  1841,  1841,  1841,  1845,  1845,  1845,
+    1849,  1849,  1849,  1849,  1849,  1849,  1853,  1853,  1854,  1854,
+    1855,  1855,  1856,  1856,  1857,  1857,  1861,  1861,  1862,  1862,
+    1863,  1863,  1864,  1864,  1865,  1865,  1866,  1866,  1867,  1867,
+    1868,  1869,  1872,  1872,  1872,  1872,  1876,  1876,  1876,  1876,
+    1876,  1876,  1876,  1877,  1877,  1877,  1877,  1877,  1877,  1883,
+    1883,  1883,  1883,  1887,  1887,  1887,  1887,  1891,  1891,  1895,
+    1895,  1900,  1903,  1908,  1909,  1910,  1911,  1912,  1913,  1914,
+    1915,  1919,  1920,  1921,  1922,  1923,  1924,  1925,  1926,  1936,
+    1937,  1945,  1946,  1954,  1963,  1964,  1971,  1972,  1976,  1980,
+    1996,  1997,  2004,  2005,  2012,  2020,  2020,  2020,  2020,  2020,
+    2020,  2020,  2021,  2021,  2021,  2021,  2021,  2026,  2030,  2034,
+    2039,  2048,  2075,  2081,  2094,  2105,  2109,  2122,  2126,  2141,
+    2145,  2152,  2153,  2159,  2166,  2178,  2208,  2221,  2244,  2272,
+    2294,  2305,  2327,  2338,  2347,  2352,  2411,  2418,  2426,  2433,
+    2440,  2444,  2448,  2462,  2477,  2489,  2498,  2526,  2539,  2548,
+    2554,  2560,  2571,  2577,  2583,  2594,  2595,  2604,  2605,  2617,
+    2626,  2627,  2628,  2629,  2630,  2646,  2666,  2668,  2670,  2670,
+    2677,  2677,  2685,  2685,  2693,  2693,  2702,  2704,  2706,  2711,
+    2725,  2726,  2730,  2733,  2741,  2745,  2752,  2756,  2760,  2764,
+    2772,  2772,  2776,  2777,  2781,  2789,  2794,  2802,  2803,  2810,
+    2817,  2821,  3009,  3009,  3013,  3013,  3023,  3023,  3027,  3032,
+    3033,  3034,  3038,  3039,  3038,  3051,  3052,  3057,  3058,  3059,
+    3060,  3064,  3068,  3069,  3070,  3071,  3092,  3096,  3111,  3112,
+    3117,  3117,  3125,  3135,  3138,  3147,  3158,  3163,  3172,  3183,
+    3183,  3186,  3190,  3194,  3199,  3209,  3227,  3236,  3309,  3313,
+    3320,  3332,  3347,  3377,  3387,  3397,  3401,  3408,  3409,  3413,
+    3416,  3422,  3441,  3459,  3475,  3489,  3503,  3514,  3532,  3541,
+    3550,  3557,  3578,  3602,  3608,  3614,  3620,  3636,  3728,  3736,
+    3737,  3741,  3742,  3746,  3752,  3759,  3765,  3772,  3779,  3792,
+    3812
 };
+#endif
 
-static const short yypact[] = {-32768,
-   239,   567,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,   -46,-32768,    55,-32768,-32768,   -14,-32768,-32768,    48,
-    -6,   104,   161,    19,-32768,   -34,   155,   249,-32768,-32768,
-    98,-32768,-32768,-32768,-32768,    33,    43,    49,    57,-32768,
-    59,   155,  1265,   150,   150,   150,   150,-32768,-32768,-32768,
--32768,-32768,-32768,   214,-32768,-32768,-32768,-32768,-32768,-32768,
-  1265,   -19,  1479,-32768,   196,   157,   224,   206,   212,-32768,
--32768,-32768,-32768,    87,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,   241,   247,     4,
-    15,-32768,-32768,   108,-32768,-32768,    12,-32768,-32768,-32768,
--32768,  1306,  1306,  1306,  1326,   249,-32768,    98,-32768,-32768,
--32768,-32768,  1306,-32768,   194,  1367,   116,   177,   249,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,   355,   429,  1306,  1306,
-  1306,  1306,  1306,  1306,  1306,  1306,  1306,  1306,  1306,  1306,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,  1306,  1306,  1306,  1306,  1306,-32768,-32768,
-   249,-32768,   106,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,   -32,-32768,   103,   110,    75,-32768,-32768,    12,   -81,
-  1046,-32768,-32768,-32768,-32768,   197,   230,   265,   237,   267,
-   240,   268,   246,   270,   269,   271,   254,   273,   272,   566,
--32768,-32768,   120,   766,-32768,-32768,    87,-32768,   766,   766,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-   766,  1265,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,  1306,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,  1306,
-   136,   137,-32768,   766,   134,   146,   147,   149,   152,   158,
-   174,   176,   179,   766,   766,   766,   180,   262,  1265,  1306,
-  1306,   279,-32768,  1306,  1306,   173,   -27,  1306,-32768,-32768,
-   184,   183,   187,   187,   187,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,   355,   429,   186,   188,   189,
-   190,   191,  1087,  1387,   529,   311,   192,   193,   198,   199,
-   202,-32768,-32768,   187,  1107,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,   286,  1326,-32768,-32768,-32768,-32768,   205,
--32768,   207,   766,   766,   766,     7,-32768,    20,-32768,   208,
-   766,   209,  1306,  1306,  1306,  1306,  1306,  1306,  1306,   210,
-   216,   217,  1306,  1306,   766,   766,   218,-32768,   -12,     9,
--32768,   204,    12,  1148,-32768,     8,-32768,-32768,-32768,   220,
-   221,  1326,  1326,  1326,  1326,  1326,-32768,-32768,    -8,   741,
-   -82,-32768,    -9,-32768,  1326,  1326,  1326,  1326,  1326,-32768,
--32768,    98,-32768,   219,   203,-32768,   343,   -13,   356,   357,
-   228,   226,   233,   766,   383,   766,  1306,-32768,   235,   766,
-   236,-32768,-32768,   243,   244,-32768,-32768,   766,   766,   766,
--32768,-32768,   238,-32768,  1306,-32768,-32768,-32768,-32768,   366,
-   394,-32768,   187,  1326,  1326,   208,   250,   251,   252,   258,
-  1326,-32768,   256,   -25,    11,-32768,-32768,   259,   266,   274,
-   278,   363,-32768,-32768,  1205,   387,   280,-32768,   766,   766,
-  1306,   766,   766,   281,-32768,   281,-32768,   282,   766,   283,
-  1306,  1306,  1306,-32768,-32768,-32768,  1306,   766,-32768,-32768,
--32768,   284,   290,   288,  1326,  1326,  1326,  1326,-32768,-32768,
-   263,  1326,  1326,  1326,  1326,  1306,-32768,-32768,-32768,   368,
-   376,   293,   294,   282,   291,-32768,-32768,   369,-32768,-32768,
-  1306,   264,   766,-32768,-32768,-32768,   296,-32768,  1326,  1326,
--32768,   300,   299,   305,   306,-32768,   308,   310,   313,   314,
-   315,   457,-32768,-32768,   441,    41,   436,-32768,-32768,   325,
--32768,   329,   331,  1326,-32768,  1326,  1326,-32768,-32768,-32768,
--32768,-32768,-32768,   766,-32768,   893,   145,   468,-32768,-32768,
--32768,   334,   335,   336,-32768,   340,-32768,   893,   766,-32768,
--32768,-32768,   473,   342,   182,   766,   475,   479,-32768,   766,
-   766,-32768,-32768,   502,   503,-32768
+#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", "SINTVAL",
+  "UINTVAL", "FPVAL", "VOID", "BOOL", "SBYTE", "UBYTE", "SHORT", "USHORT",
+  "INT", "UINT", "LONG", "ULONG", "FLOAT", "DOUBLE", "TYPE", "LABEL",
+  "VAR_ID", "LABELSTR", "STRINGCONSTANT", "IMPLEMENTATION",
+  "ZEROINITIALIZER", "TRUETOK", "FALSETOK", "BEGINTOK", "ENDTOK",
+  "DECLARE", "GLOBAL", "CONSTANT", "SECTION", "VOLATILE", "TO",
+  "DOTDOTDOT", "NULL_TOK", "UNDEF", "CONST", "INTERNAL", "LINKONCE",
+  "WEAK", "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "OPAQUE",
+  "NOT", "EXTERNAL", "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE",
+  "BIG", "ALIGN", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE",
+  "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK",
+  "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT",
+  "RET", "BR", "SWITCH", "INVOKE", "UNREACHABLE", "UNWIND", "EXCEPT",
+  "ADD", "SUB", "MUL", "DIV", "UDIV", "SDIV", "FDIV", "REM", "UREM",
+  "SREM", "FREM", "AND", "OR", "XOR", "SHL", "SHR", "ASHR", "LSHR",
+  "SETLE", "SETGE", "SETLT", "SETGT", "SETEQ", "SETNE", "ICMP", "FCMP",
+  "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE", "GETELEMENTPTR", "PHI_TOK",
+  "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR",
+  "VAARG_old", "VANEXT_old", "EQ", "NE", "SLT", "SGT", "SLE", "SGE", "ULT",
+  "UGT", "ULE", "UGE", "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE", "ORD",
+  "UNO", "UEQ", "UNE", "CAST", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT",
+  "FPTOUI", "FPTOSI", "UITOFP", "SITOFP", "PTRTOINT", "INTTOPTR",
+  "BITCAST", "'='", "','", "'\\\\'", "'('", "')'", "'['", "'x'", "']'",
+  "'<'", "'>'", "'{'", "'}'", "'*'", "'c'", "$accept", "INTVAL",
+  "EINT64VAL", "ArithmeticOps", "LogicalOps", "SetCondOps", "IPredicates",
+  "FPredicates", "ShiftOps", "CastOps", "SIntType", "UIntType", "IntType",
+  "FPType", "OptAssign", "OptLinkage", "OptCallingConv", "OptAlign",
+  "OptCAlign", "SectionString", "OptSection", "GlobalVarAttributes",
+  "GlobalVarAttribute", "TypesV", "UpRTypesV", "Types", "PrimType",
+  "UpRTypes", "TypeListI", "ArgTypeListI", "ConstVal", "ConstExpr",
+  "ConstVector", "GlobalType", "Module", "FunctionList", "ConstPool", "@1",
+  "@2", "@3", "@4", "AsmBlock", "BigOrLittle", "TargetDefinition",
+  "LibrariesDefinition", "LibList", "Name", "OptName", "ArgVal",
+  "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader",
+  "@5", "END", "Function", "FnDeclareLinkage", "FunctionProto", "@6", "@7",
+  "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef",
+  "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList",
+  "Unwind", "BBTerminatorInst", "JumpTable", "Inst", "PHIList",
+  "ValueRefList", "ValueRefListE", "OptTailCall", "InstVal", "IndexList",
+  "OptVolatile", "MemoryInst", 0
 };
+#endif
 
-static const short yypgoto[] = {-32768,
--32768,   443,   444,   446,   195,   200,   447,   451,  -117,  -114,
-  -539,-32768,   484,   481,  -105,-32768,  -265,    40,-32768,  -236,
--32768,   -58,-32768,   -43,-32768,   -72,   -33,-32768,   -99,   298,
-  -250,    58,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   480,
--32768,-32768,-32768,-32768,    10,-32768,    46,-32768,-32768,   417,
--32768,-32768,-32768,-32768,-32768,-32768,   522,-32768,-32768,-32768,
-  -526,   144,   -88,  -111,-32768,   508,-32768,   -69,-32768,-32768,
--32768,-32768,   100,    31,-32768,-32768,    73,-32768,-32768
+# 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,    61,    44,    92,    40,    41,    91,   120,    93,
+      60,    62,   123,   125,    42,    99
 };
+# endif
 
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,   166,   167,   167,   168,   168,   169,   169,   169,   169,
+     169,   169,   169,   169,   169,   169,   169,   170,   170,   170,
+     171,   171,   171,   171,   171,   171,   172,   172,   172,   172,
+     172,   172,   172,   172,   172,   172,   173,   173,   173,   173,
+     173,   173,   173,   173,   173,   173,   173,   173,   173,   173,
+     173,   173,   174,   174,   174,   174,   175,   175,   175,   175,
+     175,   175,   175,   175,   175,   175,   175,   175,   175,   176,
+     176,   176,   176,   177,   177,   177,   177,   178,   178,   179,
+     179,   180,   180,   181,   181,   181,   181,   181,   181,   181,
+     181,   182,   182,   182,   182,   182,   182,   182,   182,   183,
+     183,   184,   184,   185,   186,   186,   187,   187,   188,   188,
+     189,   189,   190,   190,   191,   192,   192,   192,   192,   192,
+     192,   192,   192,   192,   192,   192,   192,   193,   193,   193,
+     193,   193,   193,   193,   193,   193,   193,   193,   193,   194,
+     194,   195,   195,   195,   195,   196,   196,   196,   196,   196,
+     196,   196,   196,   196,   196,   196,   196,   196,   196,   196,
+     196,   196,   196,   197,   197,   197,   197,   197,   197,   197,
+     197,   197,   197,   197,   197,   198,   198,   199,   199,   200,
+     201,   201,   201,   201,   201,   202,   202,   202,   203,   202,
+     204,   202,   205,   202,   206,   202,   202,   202,   202,   207,
+     208,   208,   209,   209,   209,   209,   210,   211,   211,   211,
+     212,   212,   213,   213,   214,   215,   215,   216,   216,   216,
+     216,   217,   218,   218,   220,   219,   221,   221,   222,   223,
+     223,   223,   225,   226,   224,   227,   227,   228,   228,   228,
+     228,   228,   228,   228,   228,   228,   228,   228,   229,   229,
+     230,   230,   231,   232,   232,   233,   234,   234,   234,   235,
+     235,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     237,   237,   238,   239,   239,   240,   240,   241,   241,   242,
+     242,   243,   243,   243,   243,   243,   243,   243,   243,   243,
+     243,   243,   243,   243,   243,   243,   243,   243,   243,   244,
+     244,   245,   245,   246,   246,   246,   246,   246,   246,   246,
+     246
+};
 
-#define	YYLAST		1630
-
-
-static const short yytable[] = {    95,
-   239,   225,   108,   240,   228,   221,   359,   195,    29,   109,
-    49,    24,    50,   242,    27,    32,   576,    95,   199,    72,
-    73,   424,   197,    75,    76,    77,    78,    79,    80,    81,
-    82,    83,    84,    85,   426,    86,    18,   588,    19,   273,
-    24,   450,   277,   278,   279,   280,   281,   282,   283,   586,
-   231,   232,   233,   234,   235,   236,   237,   238,   203,   204,
-   205,   594,    87,   425,   451,   287,   288,   388,   389,   224,
-   461,   298,   224,   401,   403,   289,   425,    29,   466,    72,
-    73,   299,   197,    75,    76,    77,    78,    79,    80,    81,
-    82,    83,    84,    85,   418,    86,    18,   410,    19,    36,
-    37,    38,   103,   104,   105,   271,   272,   224,   274,   275,
-   224,   224,   224,   224,   224,   224,   224,   223,    39,    18,
-   292,    19,    87,   199,   229,   298,   293,  -138,   199,  -111,
-   284,   285,   286,   224,   224,   382,   230,  -138,   202,   461,
-   350,   351,   110,   461,   461,    41,   446,   478,    33,   465,
-   462,   202,   352,   467,   231,   232,   233,   234,   235,   236,
-   237,   238,   297,   461,    42,   196,  -111,   301,    88,   447,
-    48,    89,   202,   511,    90,   202,    91,   198,    52,   377,
-    43,   100,   101,   353,    65,   360,   231,   232,   233,   234,
-   235,   236,   237,   238,    66,   370,   371,   372,    95,   575,
-    67,     5,     6,     7,     8,    44,    10,    45,    68,   354,
-    46,   186,   187,   290,   291,    69,   501,   107,   529,   185,
-   530,   379,   380,   306,   307,   383,   355,   189,    88,   190,
-   375,    89,   -71,   -71,    90,   191,    91,   296,  -178,   -70,
-   -70,  -112,   -69,   -69,   193,    95,   376,   224,   -68,   -68,
-   194,   431,   226,   433,   434,   435,   308,   309,   121,   122,
-   294,   441,   201,     3,   421,   422,   423,   295,   -75,     4,
-   -74,   -73,   429,   -72,   335,   -78,   311,   -79,   312,     5,
-     6,     7,     8,     9,    10,    11,   443,   444,   356,   358,
-   361,   412,   456,   457,   458,   459,   460,   374,   362,   363,
-    12,   364,   378,   587,   365,   468,   469,   470,   471,   472,
-   366,   383,    54,    55,    56,    57,    58,    59,    60,   224,
-   432,   224,   224,   224,   436,   437,   367,   464,   368,   224,
-   442,   369,   373,   381,   404,   484,   384,   486,   385,   386,
-   392,   490,   393,   394,   395,   396,   405,   406,   416,   494,
-   495,   496,   407,   408,   502,   503,   409,   419,   476,   420,
-   427,   509,   438,   333,   448,   430,   477,   348,   439,   440,
-   445,   475,   348,   348,   454,   455,   479,   480,   482,   534,
-   535,   536,   481,   224,   348,   483,   485,   489,   491,   499,
-   522,   523,   497,   526,   527,   492,   493,   500,   516,   554,
-   532,   498,   505,   506,   507,   542,   543,   544,   545,   538,
-   508,   512,   547,   548,   549,   550,   510,   348,   513,   558,
-   450,   473,   559,   546,   552,   425,   514,   348,   348,   348,
-   515,   412,   521,   528,   531,   533,   539,   224,   239,   562,
-   563,   240,   540,   541,   560,   555,   557,   224,   224,   224,
-   556,   561,   564,   224,   565,   254,   255,   566,   567,   239,
-   573,   574,   240,   568,   582,   569,   583,   584,   570,   571,
-   572,   578,   551,   243,   244,   245,   246,   247,   248,   249,
-   250,   251,   252,   579,   580,   585,   581,   224,   589,   590,
-   591,   592,   593,   596,   597,   600,   348,   348,   348,   601,
-   595,   605,   606,    47,   348,   174,   175,   599,   176,   177,
-   390,   602,   603,   178,    63,   519,   391,   332,   348,   348,
-   518,    71,   222,    25,    35,   598,   488,   537,   504,     0,
-     0,     0,     0,    72,    73,     0,   197,   206,   207,   208,
-   209,   210,   211,   212,   213,   214,   215,   216,     0,    86,
-    18,     0,    19,   256,   257,   258,   259,   260,   261,   262,
-   263,   264,   265,   266,   267,   268,   269,   348,     0,   348,
-    72,    73,     0,   348,     0,     0,    87,     0,     0,     0,
-     0,   348,   348,   348,     0,     0,   -81,    18,    18,    19,
-    19,   313,     0,     0,     0,     0,     0,     4,   -81,   -81,
-     0,     0,     0,   314,   315,     0,     0,   -81,   -81,   -81,
-   -81,   -81,   -81,   -81,     0,     0,   -81,    20,     0,     0,
-     0,     0,   348,   348,    21,   348,   348,     0,    22,     0,
-     0,     0,   348,     0,     0,     0,     0,     0,     0,     0,
-     0,   348,     0,     0,   123,   124,   125,   126,   127,   128,
-   129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-   139,   140,   141,   142,   143,   144,   145,   146,   316,   317,
-     0,     0,     0,     0,     0,   318,   348,   319,     0,   320,
-   321,   322,    88,     0,     0,    89,     0,     0,    90,     0,
-    91,   402,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   161,   162,   163,   164,   165,   166,
-   167,   168,   169,   170,   171,   172,   173,   348,     0,     0,
-     0,     0,   323,     0,     0,   324,     0,   325,     0,     0,
-   326,     0,   348,     0,     0,     0,     0,     0,     0,   348,
-     0,     0,     0,   348,   348,    72,    73,     0,   197,   206,
-   207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     0,    86,    18,     0,    19,     0,     0,     0,   336,   337,
-    72,    73,   338,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,    18,    87,    19,
-     0,   339,   340,   341,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   342,   343,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   344,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   123,   124,   125,   126,   127,   128,
-   129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-   139,   140,   141,   142,   143,   144,   145,   146,   316,   317,
-     0,     0,     0,     0,     0,   318,     0,   319,     0,   320,
-   321,   322,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,    88,   336,   337,    89,     0,   338,
-    90,     0,    91,   463,   161,   162,   163,   164,   165,   166,
-   167,   168,   169,   170,   171,   172,   173,     0,   339,   340,
-   341,     0,     0,     0,     0,   345,     0,     0,     0,     0,
-   342,   343,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   344,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-   132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
-   142,   143,   144,   145,   146,   316,   317,     0,     0,     0,
-     0,     0,   318,     0,   319,     0,   320,   321,   322,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   161,   162,   163,   164,   165,   166,   167,   168,   169,
-   170,   171,   172,   173,     0,     0,     0,     0,     0,     0,
-    72,    73,   345,   197,    75,    76,    77,    78,    79,    80,
-    81,    82,    83,    84,    85,     0,    86,    18,     0,    19,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,   300,     0,     0,     0,     0,     0,     0,     0,
-     0,    72,    73,    87,   197,   206,   207,   208,   209,   210,
-   211,   212,   213,   214,   215,   216,     0,    86,    18,     0,
-    19,    72,    73,     0,   197,    75,    76,    77,    78,    79,
-    80,    81,    82,    83,    84,    85,     0,    86,    18,     0,
-    19,     0,     0,     0,    87,     0,     0,     0,     0,     0,
-     0,     0,     0,   411,     0,     0,     0,     0,     0,     0,
-     0,     0,    72,    73,    87,   197,    75,    76,    77,    78,
-    79,    80,    81,    82,    83,    84,    85,     0,    86,    18,
-     0,    19,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   449,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,    87,     0,     0,     0,    88,
-     0,     0,    89,     0,     0,    90,     0,    91,     0,    72,
-    73,     0,   197,    75,    76,    77,    78,    79,    80,    81,
-    82,    83,    84,    85,     0,    86,    18,     0,    19,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    88,   517,     0,    89,     0,   397,    90,     0,    91,     0,
-     0,     0,    87,     0,     0,     0,     0,     0,     0,     0,
-    88,     0,     0,    89,     0,     0,    90,     0,    91,    72,
-    73,     0,    74,    75,    76,    77,    78,    79,    80,    81,
-    82,    83,    84,    85,     0,    86,    18,     0,    19,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,    88,     0,     0,    89,     0,     0,    90,     0,    91,
-    72,    73,    87,   197,    75,    76,    77,    78,    79,    80,
-    81,    82,    83,    84,    85,     0,    86,    18,     0,    19,
-    72,    73,     0,   197,   206,   207,   208,   209,   210,   211,
-   212,   213,   214,   215,   216,     0,    86,    18,     0,    19,
-     0,     0,     0,    87,     0,     0,     0,     0,    88,     0,
-     0,    89,     0,     0,    90,     0,    91,     0,     0,     0,
-     0,    72,    73,    87,   227,    75,    76,    77,    78,    79,
-    80,    81,    82,    83,    84,    85,     0,    86,    18,     0,
-    19,    72,    73,     0,   197,   206,   207,   208,   209,   210,
-   211,   212,   213,   214,   215,   216,     0,    86,    18,     0,
-    19,     0,     0,     0,    87,     0,     0,     0,    88,     0,
-     0,    89,     0,     0,    90,     0,    91,     0,     0,     0,
-     0,     0,     0,     0,    87,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,    88,
-     0,     0,    89,     0,     0,    90,     0,    91,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,    88,
-     0,     0,    89,     0,     0,    90,     0,    91,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   112,     0,     0,     0,     0,     0,     0,
-    88,     0,     0,    89,     0,     0,    90,   113,    91,     0,
-     0,     0,     0,     0,     0,     0,     0,   114,   115,     0,
-    88,     0,     0,    89,     0,     0,    90,     0,   400,     0,
-   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,     0,     0,   152,   153,
-   154,   155,   156,   157,   158,   159,   160,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   161,   162,   163,
-   164,   165,   166,   167,   168,   169,   170,   171,   172,   173
+/* 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,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     2,     0,     1,     1,     1,     1,     1,     1,     1,
+       0,     0,     1,     1,     1,     1,     1,     1,     2,     0,
+       2,     0,     3,     2,     0,     1,     0,     3,     1,     2,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       2,     4,     5,     5,     3,     2,     5,     4,     2,     1,
+       3,     1,     3,     1,     0,     4,     3,     3,     4,     4,
+       3,     6,     5,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     6,     5,     8,     6,     6,     6,     7,
+       7,     6,     6,     8,     8,     3,     1,     1,     1,     1,
+       2,     2,     4,     2,     1,     4,     2,     4,     0,     7,
+       0,     7,     0,     7,     0,     7,     3,     4,     0,     1,
+       1,     1,     3,     3,     3,     3,     3,     3,     1,     0,
+       1,     1,     1,     0,     2,     3,     1,     1,     3,     1,
+       0,     8,     1,     1,     0,     4,     1,     1,     2,     0,
+       1,     1,     0,     0,     5,     0,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     3,     1,     5,     1,     1,
+       1,     1,     2,     2,     2,     3,     2,     0,     1,     1,
+       1,     2,     2,     3,     9,     9,     8,    13,     1,     1,
+       6,     5,     2,     6,     7,     1,     3,     1,     0,     2,
+       1,     5,     5,     5,     6,     6,     2,     4,     4,     6,
+       4,     4,     4,     4,     6,     6,     2,     7,     1,     2,
+       0,     1,     0,     3,     6,     3,     6,     2,     4,     6,
+       4
 };
 
-static const short yycheck[] = {    43,
-   118,   113,    61,   118,   116,   105,   272,     4,    23,    29,
-    45,     2,    47,   119,    61,    30,   556,    61,    91,     5,
-     6,    15,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,    15,    21,    22,   577,    24,   151,
-    31,    34,   154,   155,   156,   157,   158,   159,   160,   576,
-    10,    11,    12,    13,    14,    15,    16,    17,   102,   103,
-   104,   588,    48,    57,    57,   177,   178,   304,   305,   113,
-   153,   153,   116,   324,   325,   181,    57,    23,   161,     5,
-     6,   163,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,   345,    21,    22,   334,    24,    52,
-    53,    54,    45,    46,    47,   149,   150,   151,   152,   153,
-   154,   155,   156,   157,   158,   159,   160,   108,    71,    22,
-   153,    24,    48,   196,     9,   153,   159,   153,   201,   155,
-   174,   175,   176,   177,   178,   163,    21,   163,   164,   153,
-   229,   230,   162,   153,   153,   152,   159,   161,   163,   400,
-   159,   164,   241,   163,    10,    11,    12,    13,    14,    15,
-    16,    17,   196,   153,    61,   162,   155,   201,   154,   161,
-   152,   157,   164,   163,   160,   164,   162,   163,    24,   291,
-    20,    32,    33,   242,   152,   274,    10,    11,    12,    13,
-    14,    15,    16,    17,   152,   284,   285,   286,   242,   159,
-   152,    41,    42,    43,    44,    45,    46,    47,   152,   253,
-    50,    55,    56,   108,   109,   157,   453,     4,   484,    24,
-   486,   294,   295,    27,    28,   298,   270,     4,   154,    24,
-   289,   157,     3,     4,   160,    24,   162,   163,     0,     3,
-     4,   155,     3,     4,     4,   289,   290,   291,     3,     4,
-     4,   363,    59,   365,   366,   367,     3,     4,    77,    78,
-   158,   373,   155,    25,   353,   354,   355,   158,     4,    31,
-     4,     4,   361,     4,   155,     7,     4,     7,     7,    41,
-    42,    43,    44,    45,    46,    47,   375,   376,   153,   153,
-   157,   335,   392,   393,   394,   395,   396,    36,   153,   153,
-    62,   153,    24,   159,   153,   405,   406,   407,   408,   409,
-   153,   384,    64,    65,    66,    67,    68,    69,    70,   363,
-   364,   365,   366,   367,   368,   369,   153,   400,   153,   373,
-   374,   153,   153,   161,    24,   424,   153,   426,   156,   153,
-   155,   430,   155,   155,   155,   155,   155,   155,    63,   438,
-   439,   440,   155,   155,   454,   455,   155,   153,   156,   153,
-   153,   461,   153,   220,   161,   157,    24,   224,   153,   153,
-   153,   153,   229,   230,   155,   155,    21,    21,   153,   491,
-   492,   493,   155,   427,   241,   153,     4,   153,   153,    24,
-   479,   480,   155,   482,   483,   153,   153,     4,    36,    24,
-   489,   445,   153,   153,   153,   505,   506,   507,   508,   498,
-   153,   153,   512,   513,   514,   515,   161,   274,   153,   531,
-    34,   412,   159,   161,    57,    57,   153,   284,   285,   286,
-   153,   475,   153,   153,   153,   153,   153,   481,   556,   539,
-   540,   556,   153,   156,   533,   153,   156,   491,   492,   493,
-   157,   156,   153,   497,   156,    27,    28,   153,   153,   577,
-     4,    21,   577,   156,   564,   156,   566,   567,   156,   156,
-   156,    36,   516,   119,   120,   121,   122,   123,   124,   125,
-   126,   127,   128,   159,   156,   574,   156,   531,    21,   156,
-   156,   156,   153,    21,   153,    21,   353,   354,   355,    21,
-   589,     0,     0,    23,   361,    63,    63,   596,    63,    63,
-   316,   600,   601,    63,    31,   476,   317,   220,   375,   376,
-   475,    42,   106,     2,    17,   595,   427,   497,   456,    -1,
-    -1,    -1,    -1,     5,     6,    -1,     8,     9,    10,    11,
-    12,    13,    14,    15,    16,    17,    18,    19,    -1,    21,
-    22,    -1,    24,   125,   126,   127,   128,   129,   130,   131,
-   132,   133,   134,   135,   136,   137,   138,   424,    -1,   426,
-     5,     6,    -1,   430,    -1,    -1,    48,    -1,    -1,    -1,
-    -1,   438,   439,   440,    -1,    -1,    20,    22,    22,    24,
-    24,    26,    -1,    -1,    -1,    -1,    -1,    31,    32,    33,
-    -1,    -1,    -1,    38,    39,    -1,    -1,    41,    42,    43,
-    44,    45,    46,    47,    -1,    -1,    50,    51,    -1,    -1,
-    -1,    -1,   479,   480,    58,   482,   483,    -1,    62,    -1,
-    -1,    -1,   489,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,   498,    -1,    -1,    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,
-    -1,    -1,    -1,    -1,    -1,   110,   533,   112,    -1,   114,
-   115,   116,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,
-   162,   163,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,   139,   140,   141,   142,   143,   144,
-   145,   146,   147,   148,   149,   150,   151,   574,    -1,    -1,
-    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,    -1,
-   165,    -1,   589,    -1,    -1,    -1,    -1,    -1,    -1,   596,
-    -1,    -1,    -1,   600,   601,     5,     6,    -1,     8,     9,
-    10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-    -1,    21,    22,    -1,    24,    -1,    -1,    -1,     3,     4,
-     5,     6,     7,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    22,    48,    24,
-    -1,    26,    27,    28,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    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,
-    -1,    -1,    -1,    -1,    -1,   110,    -1,   112,    -1,   114,
-   115,   116,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,   154,     3,     4,   157,    -1,     7,
-   160,    -1,   162,   163,   139,   140,   141,   142,   143,   144,
-   145,   146,   147,   148,   149,   150,   151,    -1,    26,    27,
-    28,    -1,    -1,    -1,    -1,   160,    -1,    -1,    -1,    -1,
-    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    61,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    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,    -1,    -1,    -1,
-    -1,    -1,   110,    -1,   112,    -1,   114,   115,   116,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-   148,   149,   150,   151,    -1,    -1,    -1,    -1,    -1,    -1,
-     5,     6,   160,     8,     9,    10,    11,    12,    13,    14,
-    15,    16,    17,    18,    19,    -1,    21,    22,    -1,    24,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,     5,     6,    48,     8,     9,    10,    11,    12,    13,
-    14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
-    24,     5,     6,    -1,     8,     9,    10,    11,    12,    13,
-    14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
-    24,    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,     5,     6,    48,     8,     9,    10,    11,    12,
-    13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
-    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    48,    -1,    -1,    -1,   154,
-    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,     5,
-     6,    -1,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,    -1,    21,    22,    -1,    24,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-   154,    37,    -1,   157,    -1,   159,   160,    -1,   162,    -1,
-    -1,    -1,    48,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,     5,
-     6,    -1,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,    -1,    21,    22,    -1,    24,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
-     5,     6,    48,     8,     9,    10,    11,    12,    13,    14,
-    15,    16,    17,    18,    19,    -1,    21,    22,    -1,    24,
-     5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
-    15,    16,    17,    18,    19,    -1,    21,    22,    -1,    24,
-    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,   154,    -1,
-    -1,   157,    -1,    -1,   160,    -1,   162,    -1,    -1,    -1,
-    -1,     5,     6,    48,     8,     9,    10,    11,    12,    13,
-    14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
-    24,     5,     6,    -1,     8,     9,    10,    11,    12,    13,
-    14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
-    24,    -1,    -1,    -1,    48,    -1,    -1,    -1,   154,    -1,
-    -1,   157,    -1,    -1,   160,    -1,   162,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,
-    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,
-    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -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,    35,    -1,    -1,    -1,    -1,    -1,    -1,
-   154,    -1,    -1,   157,    -1,    -1,   160,    49,   162,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    59,    60,    -1,
-   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,
-    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,    -1,    -1,   110,   111,
-   112,   113,   114,   115,   116,   117,   118,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,   139,   140,   141,
-   142,   143,   144,   145,   146,   147,   148,   149,   150,   151
+/* 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[] =
+{
+     198,     0,    90,   184,     1,   183,   232,    83,    84,    85,
+      86,    87,    88,    89,     0,   224,   257,   180,   181,   257,
+     210,   211,     0,     0,     0,    90,     0,   186,   229,     0,
+      91,   258,   254,    82,   226,   227,   228,   253,     0,     0,
+       0,     0,   196,     0,     0,     0,     0,     0,     0,     0,
+      81,   230,   231,   233,   199,   182,     0,    92,    93,    94,
+      95,    96,    97,     0,     0,   302,   256,     0,     0,     0,
+       0,   209,   197,   187,     2,     3,   111,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   128,
+       0,     0,     0,     0,   248,   185,     0,   110,   127,   114,
+     249,   129,   177,   178,     0,     0,     0,     0,    91,    98,
+       0,   222,   223,   225,   301,     0,   280,     0,     0,     0,
+       0,    91,   269,   259,   260,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    52,
+      53,    54,    55,    20,    21,    22,    23,    24,    25,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    68,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,     0,     0,     0,     0,
+       0,   268,   255,    91,   272,     0,   298,   204,   201,   200,
+     202,   203,   205,   208,     0,   130,     0,     0,     0,   113,
+     135,   139,     0,   144,   138,   192,   194,   190,   115,   116,
+     117,   118,   119,   120,   121,   122,   123,   124,   125,     0,
+       0,     0,     0,   188,   234,     0,     0,   286,   279,   262,
+     261,     0,     0,    72,    76,    71,    75,    70,    74,    69,
+      73,    77,    78,     0,     0,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,     0,    50,    51,    46,    47,
+      48,    49,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,     0,   101,   101,   307,     0,     0,   296,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   206,     0,     0,     0,     0,
+       0,   134,   143,   141,     0,   106,   106,   106,   160,   161,
+       4,     5,   158,   159,   162,   157,   153,   154,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   156,   155,   106,   220,   237,   238,
+     239,   244,   240,   241,   242,   243,   235,     0,   246,   251,
+     250,   252,     0,   263,     0,     0,     0,     0,     0,   303,
+       0,   305,   300,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     207,   112,   112,   137,     0,   140,     0,   131,     0,   193,
+     195,   191,     0,     0,     0,     0,     0,     0,     0,   146,
+     176,     0,     0,     0,   150,     0,   147,     0,     0,     0,
+       0,     0,   189,   219,   213,   216,   217,     0,   236,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     310,     0,     0,     0,   290,   293,     0,     0,   291,   292,
+       0,     0,     0,   287,   288,     0,   308,     0,   132,   133,
+     136,   142,     0,     0,   108,   106,     0,     0,   300,     0,
+       0,     0,     0,     0,   145,   135,   114,     0,   148,   149,
+       0,     0,     0,     0,     0,   212,   214,     0,   104,     0,
+     245,     0,     0,   278,     0,     0,   101,   102,   101,   275,
+     299,     0,     0,     0,     0,     0,   281,   282,   283,   278,
+       0,   103,   109,   107,     0,     0,     0,     0,     0,     0,
+       0,   175,   152,     0,     0,     0,     0,     0,     0,   218,
+     215,   105,    99,     0,     0,     0,   277,     0,   284,   285,
+       0,   304,   306,     0,     0,     0,   289,   294,   295,     0,
+     309,     0,     0,   164,     0,     0,     0,     0,   151,     0,
+       0,     0,     0,     0,     0,   221,   247,     0,     0,     0,
+     276,   273,     0,   297,     0,     0,     0,   172,     0,     0,
+     166,   167,   168,   171,   163,   100,     0,   266,     0,     0,
+       0,   274,   169,   170,     0,     0,     0,   264,     0,   265,
+       0,     0,   165,   173,   174,     0,     0,     0,     0,     0,
+       0,   271,     0,     0,   270,   267
 };
-/* -*-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.
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,    94,   312,   329,   330,   331,   255,   272,   332,   333,
+     219,   220,   243,   221,    25,    15,    63,   555,   359,   454,
+     522,   389,   455,    95,    96,   222,    98,    99,   202,   304,
+     400,   348,   401,   104,     1,     2,     3,   336,   307,   305,
+     306,    55,   190,    42,    72,   194,   100,   476,   415,   416,
+     417,    64,   113,    16,    30,    36,    17,    53,    18,    28,
+     108,   419,   349,   101,   351,   489,    19,    32,    33,   181,
+     182,   579,    66,   278,   526,   527,   183,   184,   430,   185,
+     186
+};
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -542
+static const yytype_int16 yypact[] =
+{
+    -542,    13,   162,   567,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,    83,  -542,    19,  -542,  -542,   -14,
+    -542,  -542,    50,   -87,    87,   233,    27,  -542,   123,   141,
+     175,  -542,  -542,    98,  -542,  -542,  -542,  -542,    33,    40,
+      66,    68,  -542,    14,   141,  1265,   156,   156,   156,   156,
+    -542,  -542,  -542,  -542,  -542,  -542,   221,  -542,  -542,  -542,
+    -542,  -542,  -542,  1265,   -19,  1479,  -542,   204,   135,   226,
+     227,   235,  -542,  -542,  -542,  -542,    81,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+     256,   257,     4,    15,  -542,  -542,   108,  -542,  -542,    12,
+    -542,  -542,  -542,  -542,  1306,  1306,  1306,  1326,   175,  -542,
+      98,  -542,  -542,  -542,  -542,  1306,  -542,   205,  1367,   116,
+     479,   175,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,   355,
+     429,  1306,  1306,  1306,  1306,  1306,  1306,  1306,  1306,  1306,
+    1306,  1306,  1306,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  1306,  1306,  1306,  1306,
+    1306,  -542,  -542,   175,  -542,    86,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,   -13,  -542,   110,   111,    75,  -542,
+    -542,    12,   -81,  1046,  -542,  -542,  -542,  -542,   174,   208,
+     266,   210,   267,   212,   268,   230,   277,   275,   278,   246,
+     280,   279,   566,  -542,  -542,   136,   766,  -542,  -542,    81,
+    -542,   766,   766,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,   766,  1265,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  1306,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  1306,   137,   145,  -542,   766,   132,   146,   147,
+     148,   149,   151,   152,   158,   160,   766,   766,   766,   161,
+     281,  1265,  1306,  1306,   291,  -542,  1306,  1306,   155,   -27,
+    1306,  -542,  -542,   165,   163,   176,   176,   176,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,   355,   429,
+     172,   177,   178,   179,   182,  1087,  1387,   529,   311,   184,
+     185,   186,   188,   189,  -542,  -542,   176,  1107,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,   282,  1326,  -542,  -542,
+    -542,  -542,   193,  -542,   194,   766,   766,   766,     7,  -542,
+      20,  -542,   195,   766,   192,  1306,  1306,  1306,  1306,  1306,
+    1306,  1306,   200,   201,   206,  1306,  1306,   766,   766,   207,
+    -542,   -59,  -149,  -542,   196,    12,  1148,  -542,    44,  -542,
+    -542,  -542,   203,   211,  1326,  1326,  1326,  1326,  1326,  -542,
+    -542,    -8,   741,   -82,  -542,    10,  -542,  1326,  1326,  1326,
+    1326,  1326,  -542,  -542,    98,  -542,   214,   209,  -542,   337,
+     -34,   342,   348,   215,   218,   219,   766,   371,   766,  1306,
+    -542,   223,   766,   224,  -542,  -542,   225,   234,  -542,  -542,
+     766,   766,   766,  -542,  -542,   228,  -542,  1306,  -542,  -542,
+    -542,  -542,   362,   375,  -542,   176,  1326,  1326,   195,   236,
+     237,   240,   243,  1326,  -542,   238,   -25,    11,  -542,  -542,
+     244,   245,   247,   250,   352,  -542,  -542,  1205,   370,   252,
+    -542,   766,   766,  1306,   766,   766,   258,  -542,   258,  -542,
+     259,   766,   264,  1306,  1306,  1306,  -542,  -542,  -542,  1306,
+     766,  -542,  -542,  -542,   270,   271,   263,  1326,  1326,  1326,
+    1326,  -542,  -542,   260,  1326,  1326,  1326,  1326,  1306,  -542,
+    -542,  -542,   368,   402,   274,   276,   259,   287,  -542,  -542,
+     374,  -542,  -542,  1306,   285,   766,  -542,  -542,  -542,   290,
+    -542,  1326,  1326,  -542,   283,   295,   284,   294,  -542,   296,
+     297,   299,   302,   303,   430,  -542,  -542,   414,    41,   425,
+    -542,  -542,   305,  -542,   306,   310,  1326,  -542,  1326,  1326,
+    -542,  -542,  -542,  -542,  -542,  -542,   766,  -542,   893,   144,
+     448,  -542,  -542,  -542,   314,   315,   316,  -542,   331,  -542,
+     893,   766,  -542,  -542,  -542,   464,   334,   180,   766,   481,
+     482,  -542,   766,   766,  -542,  -542
+};
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -542,  -542,  -542,   435,   439,   441,   191,   197,   442,   445,
+    -119,  -116,  -541,  -542,   478,   489,  -107,  -542,  -267,    37,
+    -542,  -238,  -542,   -60,  -542,   -45,  -542,   -74,   -51,  -542,
+    -101,   300,  -252,   134,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,   473,  -542,  -542,  -542,  -542,     8,  -542,    46,  -542,
+    -542,   410,  -542,  -542,  -542,  -542,  -542,  -542,   518,  -542,
+    -542,  -542,  -528,   142,   -90,  -113,  -542,   505,  -542,   -72,
+    -542,  -542,  -542,  -542,    97,    28,  -542,  -542,    70,  -542,
+    -542
+};
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
-
-/* 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@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 */
-
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
+/* 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 -180
+static const yytype_int16 yytable[] =
+{
+      97,   241,   227,   110,   242,   230,   223,   361,   197,    31,
+     111,    26,   449,     4,   244,   204,    34,   578,    97,   201,
+      74,    75,   426,   199,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,   428,    88,    20,   590,    21,
+     275,    26,    31,   279,   280,   281,   282,   283,   284,   285,
+     588,   233,   234,   235,   236,   237,   238,   239,   240,   205,
+     206,   207,   596,    89,   427,    43,   289,   290,   390,   391,
+     226,   463,   300,   226,   403,   405,   291,   427,   452,   468,
+      74,    75,   301,   199,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,   420,    88,    20,   412,    21,
+     448,   453,    38,    39,    40,   204,   273,   274,   226,   276,
+     277,   226,   226,   226,   226,   226,   226,   226,   225,   463,
+      20,    41,    21,    89,   201,   231,   300,   480,  -139,   201,
+    -112,   286,   287,   288,   226,   226,   384,   232,  -139,   204,
+     294,   352,   353,   112,    29,   463,   295,   299,    44,    35,
+     467,   464,   303,   354,   233,   234,   235,   236,   237,   238,
+     239,   240,  -179,   463,   463,    54,   198,  -112,    51,    90,
+      52,    71,    91,   469,   513,    92,   204,    93,   200,    50,
+     379,   105,   106,   107,   355,    67,   362,     5,   102,   103,
+     188,   189,    68,     6,   292,   293,   372,   373,   374,    97,
+     577,   308,   309,     7,     8,     9,    10,    11,    12,    13,
+     356,   -72,   -72,   -71,   -71,   -70,   -70,   503,    69,   531,
+      70,   532,   381,   382,    14,   109,   385,   357,   187,    90,
+     191,   377,    91,   -69,   -69,    92,  -113,    93,   298,    56,
+      57,    58,    59,    60,    61,    62,    97,   378,   226,   310,
+     311,   192,   433,    45,   435,   436,   437,   123,   124,   193,
+     195,   196,   443,   203,   228,   423,   424,   425,   296,   297,
+     -76,   -75,   -74,   431,     7,     8,     9,    10,    46,    12,
+      47,   -73,   -79,    48,   313,   -80,   314,   445,   446,   363,
+     358,   337,   414,   458,   459,   460,   461,   462,   360,   364,
+     365,   366,   367,   589,   368,   369,   470,   471,   472,   473,
+     474,   370,   385,   371,   375,   380,   383,   376,   386,   387,
+     226,   434,   226,   226,   226,   438,   439,   394,   466,   388,
+     226,   444,   395,   396,   397,   406,   486,   398,   488,   407,
+     408,   409,   492,   410,   411,   418,   421,   422,   429,   432,
+     496,   497,   498,   440,   441,   504,   505,   450,   456,   442,
+     447,   479,   511,   481,   335,   478,   457,   477,   350,   482,
+     483,   484,   485,   350,   350,   487,   491,   493,   494,   502,
+     536,   537,   538,   499,   226,   350,   501,   495,   518,   507,
+     508,   524,   525,   509,   528,   529,   510,   514,   515,   512,
+     516,   534,   500,   517,   452,   523,   544,   545,   546,   547,
+     540,   530,   533,   549,   550,   551,   552,   535,   350,   543,
+     560,   548,   475,   541,   542,   554,   556,   557,   350,   350,
+     350,   427,   414,   558,   575,   576,   566,   568,   226,   241,
+     564,   565,   242,   559,   561,   562,   563,   569,   226,   226,
+     226,   567,   570,   571,   226,   572,   256,   257,   573,   574,
+     241,   580,   582,   242,   581,   584,   583,   585,   586,   591,
+     592,   593,   594,   553,   245,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   595,   598,   587,   599,   226,   233,
+     234,   235,   236,   237,   238,   239,   240,   350,   350,   350,
+     176,   597,   602,   603,   177,   350,   178,   179,   601,   392,
+     180,    65,   604,   605,    49,   521,   393,    73,   224,   350,
+     350,    27,   334,   520,    37,   600,   490,   539,   506,     0,
+       0,     0,     0,     0,    74,    75,     0,   199,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,     0,
+      88,    20,     0,    21,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   350,     0,
+     350,    74,    75,     0,   350,     0,     0,    89,     0,     0,
+       0,     0,   350,   350,   350,     0,     0,   -82,    20,    20,
+      21,    21,   315,     0,     0,     0,     0,     0,     6,   -82,
+     -82,     0,     0,     0,   316,   317,     0,     0,   -82,   -82,
+     -82,   -82,   -82,   -82,   -82,     0,     0,   -82,    22,     0,
+       0,     0,     0,   350,   350,    23,   350,   350,     0,    24,
+       0,     0,     0,   350,     0,     0,     0,     0,     0,     0,
+       0,     0,   350,     0,     0,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   318,
+     319,     0,     0,     0,     0,     0,   320,   350,   321,     0,
+     322,   323,   324,    90,     0,     0,    91,     0,     0,    92,
+       0,    93,   404,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,   350,     0,
+       0,     0,     0,   325,     0,     0,   326,     0,   327,     0,
+       0,   328,     0,   350,     0,     0,     0,     0,     0,     0,
+     350,     0,     0,     0,   350,   350,    74,    75,     0,   199,
+     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
+     218,     0,    88,    20,     0,    21,     0,     0,     0,   338,
+     339,    74,    75,   340,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    20,    89,
+      21,     0,   341,   342,   343,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   344,   345,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   346,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   318,
+     319,     0,     0,     0,     0,     0,   320,     0,   321,     0,
+     322,   323,   324,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    90,   338,   339,    91,     0,
+     340,    92,     0,    93,   465,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,     0,   341,
+     342,   343,     0,     0,     0,     0,   347,     0,     0,     0,
+       0,   344,   345,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   346,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   125,   126,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
+     143,   144,   145,   146,   147,   148,   318,   319,     0,     0,
+       0,     0,     0,   320,     0,   321,     0,   322,   323,   324,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   163,   164,   165,   166,   167,   168,   169,   170,
+     171,   172,   173,   174,   175,     0,     0,     0,     0,     0,
+       0,    74,    75,   347,   199,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,     0,    88,    20,     0,
+      21,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   302,     0,     0,     0,     0,     0,     0,
+       0,     0,    74,    75,    89,   199,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,     0,    88,    20,
+       0,    21,    74,    75,     0,   199,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,     0,    88,    20,
+       0,    21,     0,     0,     0,    89,     0,     0,     0,     0,
+       0,     0,     0,     0,   413,     0,     0,     0,     0,     0,
+       0,     0,     0,    74,    75,    89,   199,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,     0,    88,
+      20,     0,    21,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   451,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    89,     0,     0,     0,
+      90,     0,     0,    91,     0,     0,    92,     0,    93,     0,
+      74,    75,     0,   199,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,     0,    88,    20,     0,    21,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    90,   519,     0,    91,     0,   399,    92,     0,    93,
+       0,     0,     0,    89,     0,     0,     0,     0,     0,     0,
+       0,    90,     0,     0,    91,     0,     0,    92,     0,    93,
+      74,    75,     0,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,     0,    88,    20,     0,    21,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    90,     0,     0,    91,     0,     0,    92,     0,
+      93,    74,    75,    89,   199,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,     0,    88,    20,     0,
+      21,    74,    75,     0,   199,   208,   209,   210,   211,   212,
+     213,   214,   215,   216,   217,   218,     0,    88,    20,     0,
+      21,     0,     0,     0,    89,     0,     0,     0,     0,    90,
+       0,     0,    91,     0,     0,    92,     0,    93,     0,     0,
+       0,     0,    74,    75,    89,   229,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,     0,    88,    20,
+       0,    21,    74,    75,     0,   199,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,     0,    88,    20,
+       0,    21,     0,     0,     0,    89,     0,     0,     0,    90,
+       0,     0,    91,     0,     0,    92,     0,    93,     0,     0,
+       0,     0,     0,     0,     0,    89,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      90,     0,     0,    91,     0,     0,    92,     0,    93,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      90,     0,     0,    91,     0,     0,    92,     0,    93,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   114,     0,     0,     0,     0,     0,
+       0,    90,     0,     0,    91,     0,     0,    92,   115,    93,
+       0,     0,     0,     0,     0,     0,     0,     0,   116,   117,
+       0,    90,     0,     0,    91,     0,     0,    92,     0,   402,
+       0,   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,   152,   153,     0,     0,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175
+};
+
+static const yytype_int16 yycheck[] =
+{
+      45,   120,   115,    63,   120,   118,   107,   274,     4,    23,
+      29,     3,   161,     0,   121,   164,    30,   558,    63,    93,
+       5,     6,    15,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    15,    21,    22,   579,    24,
+     153,    33,    23,   156,   157,   158,   159,   160,   161,   162,
+     578,    10,    11,    12,    13,    14,    15,    16,    17,   104,
+     105,   106,   590,    48,    57,   152,   179,   180,   306,   307,
+     115,   153,   153,   118,   326,   327,   183,    57,    34,   161,
+       5,     6,   163,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,   347,    21,    22,   336,    24,
+     159,    57,    52,    53,    54,   164,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   110,   153,
+      22,    71,    24,    48,   198,     9,   153,   161,   153,   203,
+     155,   176,   177,   178,   179,   180,   163,    21,   163,   164,
+     153,   231,   232,   162,    61,   153,   159,   198,    61,   163,
+     402,   159,   203,   243,    10,    11,    12,    13,    14,    15,
+      16,    17,     0,   153,   153,    24,   162,   155,    45,   154,
+      47,   157,   157,   163,   163,   160,   164,   162,   163,   152,
+     293,    47,    48,    49,   244,   152,   276,    25,    32,    33,
+      55,    56,   152,    31,   108,   109,   286,   287,   288,   244,
+     159,    27,    28,    41,    42,    43,    44,    45,    46,    47,
+     255,     3,     4,     3,     4,     3,     4,   455,   152,   486,
+     152,   488,   296,   297,    62,     4,   300,   272,    24,   154,
+       4,   291,   157,     3,     4,   160,   155,   162,   163,    64,
+      65,    66,    67,    68,    69,    70,   291,   292,   293,     3,
+       4,    24,   365,    20,   367,   368,   369,    77,    78,    24,
+       4,     4,   375,   155,    59,   355,   356,   357,   158,   158,
+       4,     4,     4,   363,    41,    42,    43,    44,    45,    46,
+      47,     4,     7,    50,     4,     7,     7,   377,   378,   157,
+     153,   155,   337,   394,   395,   396,   397,   398,   153,   153,
+     153,   153,   153,   159,   153,   153,   407,   408,   409,   410,
+     411,   153,   386,   153,   153,    24,   161,    36,   153,   156,
+     365,   366,   367,   368,   369,   370,   371,   155,   402,   153,
+     375,   376,   155,   155,   155,    24,   426,   155,   428,   155,
+     155,   155,   432,   155,   155,    63,   153,   153,   153,   157,
+     440,   441,   442,   153,   153,   456,   457,   161,   155,   153,
+     153,    24,   463,    21,   222,   156,   155,   153,   226,    21,
+     155,   153,   153,   231,   232,     4,   153,   153,   153,     4,
+     493,   494,   495,   155,   429,   243,    24,   153,    36,   153,
+     153,   481,   482,   153,   484,   485,   153,   153,   153,   161,
+     153,   491,   447,   153,    34,   153,   507,   508,   509,   510,
+     500,   153,   153,   514,   515,   516,   517,   153,   276,   156,
+     533,   161,   414,   153,   153,    57,    24,   153,   286,   287,
+     288,    57,   477,   157,     4,    21,   153,   153,   483,   558,
+     541,   542,   558,   156,   159,   535,   156,   153,   493,   494,
+     495,   156,   156,   156,   499,   156,    27,    28,   156,   156,
+     579,    36,   156,   579,   159,   566,   156,   568,   569,    21,
+     156,   156,   156,   518,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   153,    21,   576,   153,   533,    10,
+      11,    12,    13,    14,    15,    16,    17,   355,   356,   357,
+      65,   591,    21,    21,    65,   363,    65,    65,   598,   318,
+      65,    33,   602,   603,    25,   478,   319,    44,   108,   377,
+     378,     3,   222,   477,    19,   597,   429,   499,   458,    -1,
+      -1,    -1,    -1,    -1,     5,     6,    -1,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
+      21,    22,    -1,    24,   125,   126,   127,   128,   129,   130,
+     131,   132,   133,   134,   135,   136,   137,   138,   426,    -1,
+     428,     5,     6,    -1,   432,    -1,    -1,    48,    -1,    -1,
+      -1,    -1,   440,   441,   442,    -1,    -1,    20,    22,    22,
+      24,    24,    26,    -1,    -1,    -1,    -1,    -1,    31,    32,
+      33,    -1,    -1,    -1,    38,    39,    -1,    -1,    41,    42,
+      43,    44,    45,    46,    47,    -1,    -1,    50,    51,    -1,
+      -1,    -1,    -1,   481,   482,    58,   484,   485,    -1,    62,
+      -1,    -1,    -1,   491,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   500,    -1,    -1,    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,    -1,    -1,    -1,    -1,    -1,   110,   535,   112,    -1,
+     114,   115,   116,   154,    -1,    -1,   157,    -1,    -1,   160,
+      -1,   162,   163,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,   576,    -1,
+      -1,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,
+      -1,   165,    -1,   591,    -1,    -1,    -1,    -1,    -1,    -1,
+     598,    -1,    -1,    -1,   602,   603,     5,     6,    -1,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    -1,    21,    22,    -1,    24,    -1,    -1,    -1,     3,
+       4,     5,     6,     7,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    22,    48,
+      24,    -1,    26,    27,    28,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    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,    -1,    -1,    -1,    -1,    -1,   110,    -1,   112,    -1,
+     114,   115,   116,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   154,     3,     4,   157,    -1,
+       7,   160,    -1,   162,   163,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,    -1,    26,
+      27,    28,    -1,    -1,    -1,    -1,   160,    -1,    -1,    -1,
+      -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    61,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    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,    -1,    -1,
+      -1,    -1,    -1,   110,    -1,   112,    -1,   114,   115,   116,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,    -1,    -1,    -1,    -1,    -1,
+      -1,     5,     6,   160,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
+      24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     5,     6,    48,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
+      -1,    24,     5,     6,    -1,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
+      -1,    24,    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     5,     6,    48,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    -1,    21,
+      22,    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,    -1,    -1,
+     154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,
+       5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    -1,    21,    22,    -1,    24,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   154,    37,    -1,   157,    -1,   159,   160,    -1,   162,
+      -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
+       5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    -1,    21,    22,    -1,    24,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,
+     162,     5,     6,    48,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
+      24,     5,     6,    -1,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
+      24,    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,   154,
+      -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,    -1,
+      -1,    -1,     5,     6,    48,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
+      -1,    24,     5,     6,    -1,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
+      -1,    24,    -1,    -1,    -1,    48,    -1,    -1,    -1,   154,
+      -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -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,    35,    -1,    -1,    -1,    -1,    -1,
+      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    49,   162,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    59,    60,
+      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
+      -1,    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,    -1,    -1,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   139,   140,
+     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
+     151
+};
 
-/* 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,   200,   201,   202,     0,    25,    31,    41,    42,    43,
+      44,    45,    46,    47,    62,   181,   219,   222,   224,   232,
+      22,    24,    51,    58,    62,   180,   212,   224,   225,    61,
+     220,    23,   233,   234,    30,   163,   221,   233,    52,    53,
+      54,    71,   209,   152,    61,    20,    45,    47,    50,   181,
+     152,    45,    47,   223,    24,   207,    64,    65,    66,    67,
+      68,    69,    70,   182,   217,   180,   238,   152,   152,   152,
+     152,   157,   210,   207,     5,     6,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    21,    48,
+     154,   157,   160,   162,   167,   189,   190,   191,   192,   193,
+     212,   229,    32,    33,   199,   199,   199,   199,   226,     4,
+     189,    29,   162,   218,    35,    49,    59,    60,    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,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   169,   170,   171,   174,
+     175,   235,   236,   242,   243,   245,   246,    24,    55,    56,
+     208,     4,    24,    24,   211,     4,     4,     4,   162,     8,
+     163,   193,   194,   155,   164,   191,   191,   191,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,   176,
+     177,   179,   191,   196,   217,   212,   191,   231,    59,     8,
+     231,     9,    21,    10,    11,    12,    13,    14,    15,    16,
+      17,   176,   177,   178,   182,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   172,    27,    28,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   173,   191,   191,   231,   191,   191,   239,   231,
+     231,   231,   231,   231,   231,   231,   191,   191,   191,   231,
+     231,   182,   108,   109,   153,   159,   158,   158,   163,   194,
+     153,   163,    37,   194,   195,   205,   206,   204,    27,    28,
+       3,     4,   168,     4,     7,    26,    38,    39,   103,   104,
+     110,   112,   114,   115,   116,   157,   160,   162,   165,   169,
+     170,   171,   174,   175,   197,   229,   203,   155,     3,     4,
+       7,    26,    27,    28,    38,    39,    61,   160,   197,   228,
+     229,   230,   230,   230,   230,   189,   191,   191,   153,   184,
+     153,   184,   230,   157,   153,   153,   153,   153,   153,   153,
+     153,   153,   230,   230,   230,   153,    36,   189,   191,   231,
+      24,   193,   193,   161,   163,   193,   153,   156,   153,   187,
+     187,   187,   172,   173,   155,   155,   155,   155,   155,   159,
+     196,   198,   162,   198,   163,   198,    24,   155,   155,   155,
+     155,   155,   187,    37,   191,   214,   215,   216,    63,   227,
+     198,   153,   153,   230,   230,   230,    15,    57,    15,   153,
+     244,   230,   157,   231,   191,   231,   231,   231,   191,   191,
+     153,   153,   153,   231,   191,   230,   230,   153,   159,   161,
+     161,    37,    34,    57,   185,   188,   155,   155,   196,   196,
+     196,   196,   196,   153,   159,   163,   193,   198,   161,   163,
+     196,   196,   196,   196,   196,   212,   213,   153,   156,    24,
+     161,    21,    21,   155,   153,   153,   230,     4,   230,   231,
+     240,   153,   230,   153,   153,   153,   230,   230,   230,   155,
+     191,    24,     4,   187,   196,   196,   244,   153,   153,   153,
+     153,   196,   161,   163,   153,   153,   153,   153,    36,    37,
+     214,   185,   186,   153,   230,   230,   240,   241,   230,   230,
+     153,   184,   184,   153,   230,   153,   231,   231,   231,   241,
+     230,   153,   153,   156,   196,   196,   196,   196,   161,   196,
+     196,   196,   196,   191,    57,   183,    24,   153,   157,   156,
+     231,   159,   230,   156,   196,   196,   153,   156,   153,   153,
+     156,   156,   156,   156,   156,     4,    21,   159,   178,   237,
+      36,   159,   156,   156,   196,   196,   196,   230,   228,   159,
+     178,    21,   156,   156,   156,   153,   228,   230,    21,   153,
+     235,   230,    21,    21,   230,   230
+};
 
 #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 defined YYLTYPE_IS_TRIVIAL && 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;
+    }
+}
+
 
-/* If nonreentrant, generate the variables here */
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
 
-#ifndef YYPURE
+#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]);
+
+  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");
+    }
+}
+
+# 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 indicates the initial size of the parser's stacks	*/
 
+/* 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
 {
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+  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
+{
+  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;
+
+      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: ;
+    }
 
-#else /* __cplusplus */
+  if (! yyres)
+    return yystrlen (yystr);
 
-/* 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)
+  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];
 
-  while (i-- > 0)
-    *t++ = *f++;
+  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;
+
+      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
+{
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
+}
 
-#line 217 "/usr/share/bison.simple"
 
-/* The user can define YYPARSE_PARAM as the name of an argument to be passed
-   into yyparse.  The argument should have type void *.
-   It should actually point to an object.
-   Grammar actions can access the variable by casting it
-   to the proper pointer type.  */
+/* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
-
-/* 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		*/
+/* The look-ahead symbol.  */
+int yychar;
 
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
 
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
+/* Number of syntax errors so far.  */
+int yynerrs;
 
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+
+
+/*----------.
+| 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.  */
+
+  /* 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;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
+
+
+#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;
@@ -2998,574 +3929,584 @@ yyparse(YYPARSE_PARAM_ARG)
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
-  yyssp = yyss - 1;
+  yyssp = yyss;
   yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
 
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
+  goto yysetstate;
 
-  *++yyssp = yystate;
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
 
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
+ yysetstate:
+  *yyssp = yystate;
 
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
       /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
+      YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
+      {
+	/* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	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),
+
+		    &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)
+    {
+        case 3:
+#line 1822 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
     {
-      int i;
+    if ((yyvsp[(1) - (1)].UIntVal) > (uint32_t)INT32_MAX)     // Outside of my range!
+      error("Value too large for type");
+    (yyval.SIntVal) = (int32_t)(yyvsp[(1) - (1)].UIntVal);
+  ;}
+    break;
 
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
+  case 5:
+#line 1831 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if ((yyvsp[(1) - (1)].UInt64Val) > (uint64_t)INT64_MAX)     // Outside of my range!
+      error("Value too large for type");
+    (yyval.SInt64Val) = (int64_t)(yyvsp[(1) - (1)].UInt64Val);
+  ;}
+    break;
 
-      /* 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
+  case 26:
+#line 1853 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.IPred) = ICmpInst::ICMP_EQ; ;}
+    break;
 
+  case 27:
+#line 1853 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.IPred) = ICmpInst::ICMP_NE; ;}
+    break;
 
-  switch (yyn) {
+  case 28:
+#line 1854 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.IPred) = ICmpInst::ICMP_SLT; ;}
+    break;
 
-case 2:
-#line 1822 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (yyvsp[0].UIntVal > (uint32_t)INT32_MAX)     // Outside of my range!
-      error("Value too large for type");
-    yyval.SIntVal = (int32_t)yyvsp[0].UIntVal;
-  ;
-    break;}
-case 4:
-#line 1831 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (yyvsp[0].UInt64Val > (uint64_t)INT64_MAX)     // Outside of my range!
-      error("Value too large for type");
-    yyval.SInt64Val = (int64_t)yyvsp[0].UInt64Val;
-  ;
-    break;}
-case 25:
-#line 1853 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.IPred = ICmpInst::ICMP_EQ; ;
-    break;}
-case 26:
-#line 1853 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.IPred = ICmpInst::ICMP_NE; ;
-    break;}
-case 27:
-#line 1854 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.IPred = ICmpInst::ICMP_SLT; ;
-    break;}
-case 28:
-#line 1854 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.IPred = ICmpInst::ICMP_SGT; ;
-    break;}
-case 29:
-#line 1855 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.IPred = ICmpInst::ICMP_SLE; ;
-    break;}
-case 30:
-#line 1855 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.IPred = ICmpInst::ICMP_SGE; ;
-    break;}
-case 31:
-#line 1856 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.IPred = ICmpInst::ICMP_ULT; ;
-    break;}
-case 32:
-#line 1856 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.IPred = ICmpInst::ICMP_UGT; ;
-    break;}
-case 33:
-#line 1857 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.IPred = ICmpInst::ICMP_ULE; ;
-    break;}
-case 34:
-#line 1857 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.IPred = ICmpInst::ICMP_UGE; ;
-    break;}
-case 35:
-#line 1861 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_OEQ; ;
-    break;}
-case 36:
-#line 1861 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_ONE; ;
-    break;}
-case 37:
-#line 1862 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_OLT; ;
-    break;}
-case 38:
-#line 1862 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_OGT; ;
-    break;}
-case 39:
-#line 1863 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_OLE; ;
-    break;}
-case 40:
-#line 1863 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_OGE; ;
-    break;}
-case 41:
-#line 1864 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_ORD; ;
-    break;}
-case 42:
-#line 1864 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_UNO; ;
-    break;}
-case 43:
-#line 1865 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_UEQ; ;
-    break;}
-case 44:
-#line 1865 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_UNE; ;
-    break;}
-case 45:
-#line 1866 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_ULT; ;
-    break;}
-case 46:
-#line 1866 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_UGT; ;
-    break;}
-case 47:
-#line 1867 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_ULE; ;
-    break;}
-case 48:
-#line 1867 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_UGE; ;
-    break;}
-case 49:
-#line 1868 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_TRUE; ;
-    break;}
-case 50:
-#line 1869 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.FPred = FCmpInst::FCMP_FALSE; ;
-    break;}
-case 80:
-#line 1900 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.StrVal = yyvsp[-1].StrVal;
-  ;
-    break;}
-case 81:
-#line 1903 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.StrVal = 0;
-  ;
-    break;}
-case 82:
-#line 1908 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Linkage = GlobalValue::InternalLinkage; ;
-    break;}
-case 83:
-#line 1909 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Linkage = GlobalValue::LinkOnceLinkage; ;
-    break;}
-case 84:
-#line 1910 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Linkage = GlobalValue::WeakLinkage; ;
-    break;}
-case 85:
-#line 1911 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Linkage = GlobalValue::AppendingLinkage; ;
-    break;}
-case 86:
-#line 1912 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Linkage = GlobalValue::DLLImportLinkage; ;
-    break;}
-case 87:
-#line 1913 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Linkage = GlobalValue::DLLExportLinkage; ;
-    break;}
-case 88:
-#line 1914 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ;
-    break;}
-case 89:
-#line 1915 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
-    break;}
-case 90:
-#line 1919 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.UIntVal = lastCallingConv = OldCallingConv::C; ;
-    break;}
-case 91:
-#line 1920 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.UIntVal = lastCallingConv = OldCallingConv::C; ;
-    break;}
-case 92:
-#line 1921 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.UIntVal = lastCallingConv = OldCallingConv::CSRet; ;
-    break;}
-case 93:
-#line 1922 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.UIntVal = lastCallingConv = OldCallingConv::Fast; ;
-    break;}
-case 94:
-#line 1923 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.UIntVal = lastCallingConv = OldCallingConv::Cold; ;
-    break;}
-case 95:
-#line 1924 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.UIntVal = lastCallingConv = OldCallingConv::X86_StdCall; ;
-    break;}
-case 96:
-#line 1925 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.UIntVal = lastCallingConv = OldCallingConv::X86_FastCall; ;
-    break;}
-case 97:
-#line 1926 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if ((unsigned)yyvsp[0].UInt64Val != yyvsp[0].UInt64Val)
+  case 29:
+#line 1854 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.IPred) = ICmpInst::ICMP_SGT; ;}
+    break;
+
+  case 30:
+#line 1855 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.IPred) = ICmpInst::ICMP_SLE; ;}
+    break;
+
+  case 31:
+#line 1855 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.IPred) = ICmpInst::ICMP_SGE; ;}
+    break;
+
+  case 32:
+#line 1856 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.IPred) = ICmpInst::ICMP_ULT; ;}
+    break;
+
+  case 33:
+#line 1856 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.IPred) = ICmpInst::ICMP_UGT; ;}
+    break;
+
+  case 34:
+#line 1857 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.IPred) = ICmpInst::ICMP_ULE; ;}
+    break;
+
+  case 35:
+#line 1857 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.IPred) = ICmpInst::ICMP_UGE; ;}
+    break;
+
+  case 36:
+#line 1861 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_OEQ; ;}
+    break;
+
+  case 37:
+#line 1861 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_ONE; ;}
+    break;
+
+  case 38:
+#line 1862 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_OLT; ;}
+    break;
+
+  case 39:
+#line 1862 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_OGT; ;}
+    break;
+
+  case 40:
+#line 1863 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_OLE; ;}
+    break;
+
+  case 41:
+#line 1863 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_OGE; ;}
+    break;
+
+  case 42:
+#line 1864 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_ORD; ;}
+    break;
+
+  case 43:
+#line 1864 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_UNO; ;}
+    break;
+
+  case 44:
+#line 1865 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_UEQ; ;}
+    break;
+
+  case 45:
+#line 1865 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_UNE; ;}
+    break;
+
+  case 46:
+#line 1866 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_ULT; ;}
+    break;
+
+  case 47:
+#line 1866 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_UGT; ;}
+    break;
+
+  case 48:
+#line 1867 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_ULE; ;}
+    break;
+
+  case 49:
+#line 1867 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_UGE; ;}
+    break;
+
+  case 50:
+#line 1868 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_TRUE; ;}
+    break;
+
+  case 51:
+#line 1869 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.FPred) = FCmpInst::FCMP_FALSE; ;}
+    break;
+
+  case 81:
+#line 1900 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
+  ;}
+    break;
+
+  case 82:
+#line 1903 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.StrVal) = 0;
+  ;}
+    break;
+
+  case 83:
+#line 1908 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
+    break;
+
+  case 84:
+#line 1909 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
+    break;
+
+  case 85:
+#line 1910 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
+    break;
+
+  case 86:
+#line 1911 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
+    break;
+
+  case 87:
+#line 1912 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+    break;
+
+  case 88:
+#line 1913 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
+    break;
+
+  case 89:
+#line 1914 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
+    break;
+
+  case 90:
+#line 1915 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 91:
+#line 1919 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.UIntVal) = lastCallingConv = OldCallingConv::C; ;}
+    break;
+
+  case 92:
+#line 1920 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.UIntVal) = lastCallingConv = OldCallingConv::C; ;}
+    break;
+
+  case 93:
+#line 1921 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.UIntVal) = lastCallingConv = OldCallingConv::CSRet; ;}
+    break;
+
+  case 94:
+#line 1922 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.UIntVal) = lastCallingConv = OldCallingConv::Fast; ;}
+    break;
+
+  case 95:
+#line 1923 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.UIntVal) = lastCallingConv = OldCallingConv::Cold; ;}
+    break;
+
+  case 96:
+#line 1924 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.UIntVal) = lastCallingConv = OldCallingConv::X86_StdCall; ;}
+    break;
+
+  case 97:
+#line 1925 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.UIntVal) = lastCallingConv = OldCallingConv::X86_FastCall; ;}
+    break;
+
+  case 98:
+#line 1926 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
       error("Calling conv too large");
-    yyval.UIntVal = lastCallingConv = yyvsp[0].UInt64Val;
-  ;
-    break;}
-case 98:
-#line 1936 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.UIntVal = 0; ;
-    break;}
-case 99:
-#line 1937 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.UIntVal = yyvsp[0].UInt64Val;
-    if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
+    (yyval.UIntVal) = lastCallingConv = (yyvsp[(2) - (2)].UInt64Val);
+  ;}
+    break;
+
+  case 99:
+#line 1936 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.UIntVal) = 0; ;}
+    break;
+
+  case 100:
+#line 1937 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
+    if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
       error("Alignment must be a power of two");
-  ;
-    break;}
-case 100:
-#line 1945 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.UIntVal = 0; ;
-    break;}
-case 101:
-#line 1946 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.UIntVal = yyvsp[0].UInt64Val;
-    if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
+  ;}
+    break;
+
+  case 101:
+#line 1945 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.UIntVal) = 0; ;}
+    break;
+
+  case 102:
+#line 1946 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
+    if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
       error("Alignment must be a power of two");
-  ;
-    break;}
-case 102:
-#line 1954 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    for (unsigned i = 0, e = strlen(yyvsp[0].StrVal); i != e; ++i)
-      if (yyvsp[0].StrVal[i] == '"' || yyvsp[0].StrVal[i] == '\\')
+  ;}
+    break;
+
+  case 103:
+#line 1954 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    for (unsigned i = 0, e = strlen((yyvsp[(2) - (2)].StrVal)); i != e; ++i)
+      if ((yyvsp[(2) - (2)].StrVal)[i] == '"' || (yyvsp[(2) - (2)].StrVal)[i] == '\\')
         error("Invalid character in section name");
-    yyval.StrVal = yyvsp[0].StrVal;
-  ;
-    break;}
-case 103:
-#line 1963 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.StrVal = 0; ;
-    break;}
-case 104:
-#line 1964 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.StrVal = yyvsp[0].StrVal; ;
-    break;}
-case 105:
-#line 1971 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{;
-    break;}
-case 106:
-#line 1972 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{;
-    break;}
-case 107:
-#line 1976 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    CurGV->setSection(yyvsp[0].StrVal);
-    free(yyvsp[0].StrVal);
-  ;
-    break;}
-case 108:
-#line 1980 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (yyvsp[0].UInt64Val != 0 && !isPowerOf2_32(yyvsp[0].UInt64Val))
+    (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
+  ;}
+    break;
+
+  case 104:
+#line 1963 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.StrVal) = 0; ;}
+    break;
+
+  case 105:
+#line 1964 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
+    break;
+
+  case 106:
+#line 1971 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {;}
+    break;
+
+  case 107:
+#line 1972 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {;}
+    break;
+
+  case 108:
+#line 1976 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    CurGV->setSection((yyvsp[(1) - (1)].StrVal));
+    free((yyvsp[(1) - (1)].StrVal));
+  ;}
+    break;
+
+  case 109:
+#line 1980 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val)))
       error("Alignment must be a power of two");
-    CurGV->setAlignment(yyvsp[0].UInt64Val);
+    CurGV->setAlignment((yyvsp[(2) - (2)].UInt64Val));
     
-  ;
-    break;}
-case 110:
-#line 1997 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ 
-    yyval.TypeVal.PAT = new PATypeHolder(yyvsp[0].PrimType.T); 
-    yyval.TypeVal.S.makeSignless();
-  ;
-    break;}
-case 112:
-#line 2005 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ 
-    yyval.TypeVal.PAT = new PATypeHolder(yyvsp[0].PrimType.T); 
-    yyval.TypeVal.S.makeSignless();
-  ;
-    break;}
-case 113:
-#line 2012 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+  ;}
+    break;
+
+  case 111:
+#line 1997 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { 
+    (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[(1) - (1)].PrimType).T); 
+    (yyval.TypeVal).S.makeSignless();
+  ;}
+    break;
+
+  case 113:
+#line 2005 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { 
+    (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[(1) - (1)].PrimType).T); 
+    (yyval.TypeVal).S.makeSignless();
+  ;}
+    break;
+
+  case 114:
+#line 2012 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
     if (!UpRefs.empty())
-      error("Invalid upreference in type: " + (*yyvsp[0].TypeVal.PAT)->getDescription());
-    yyval.TypeVal = yyvsp[0].TypeVal;
-  ;
-    break;}
-case 126:
-#line 2026 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ 
-    yyval.TypeVal.PAT = new PATypeHolder(yyvsp[0].PrimType.T);
-    yyval.TypeVal.S.copy(yyvsp[0].PrimType.S);
-  ;
-    break;}
-case 127:
-#line 2030 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.TypeVal.PAT = new PATypeHolder(OpaqueType::get());
-    yyval.TypeVal.S.makeSignless();
-  ;
-    break;}
-case 128:
-#line 2034 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{            // Named types are also simple types...
-    yyval.TypeVal.S.copy(getTypeSign(yyvsp[0].ValIDVal));
-    const Type* tmp = getType(yyvsp[0].ValIDVal);
-    yyval.TypeVal.PAT = new PATypeHolder(tmp);
-  ;
-    break;}
-case 129:
-#line 2039 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{                   // Type UpReference
-    if (yyvsp[0].UInt64Val > (uint64_t)~0U) 
+      error("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal).PAT)->getDescription());
+    (yyval.TypeVal) = (yyvsp[(1) - (1)].TypeVal);
+  ;}
+    break;
+
+  case 127:
+#line 2026 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { 
+    (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[(1) - (1)].PrimType).T);
+    (yyval.TypeVal).S.copy((yyvsp[(1) - (1)].PrimType).S);
+  ;}
+    break;
+
+  case 128:
+#line 2030 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.TypeVal).PAT = new PATypeHolder(OpaqueType::get());
+    (yyval.TypeVal).S.makeSignless();
+  ;}
+    break;
+
+  case 129:
+#line 2034 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {            // Named types are also simple types...
+    (yyval.TypeVal).S.copy(getTypeSign((yyvsp[(1) - (1)].ValIDVal)));
+    const Type* tmp = getType((yyvsp[(1) - (1)].ValIDVal));
+    (yyval.TypeVal).PAT = new PATypeHolder(tmp);
+  ;}
+    break;
+
+  case 130:
+#line 2039 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {                   // Type UpReference
+    if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) 
       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.PAT = new PATypeHolder(OT);
-    yyval.TypeVal.S.makeSignless();
+    UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[(2) - (2)].UInt64Val), OT));  // Add to vector...
+    (yyval.TypeVal).PAT = new PATypeHolder(OT);
+    (yyval.TypeVal).S.makeSignless();
     UR_OUT("New Upreference!\n");
-  ;
-    break;}
-case 130:
-#line 2048 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{           // Function derived type?
-    yyval.TypeVal.S.makeComposite(yyvsp[-3].TypeVal.S);
+  ;}
+    break;
+
+  case 131:
+#line 2048 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {           // Function derived type?
+    (yyval.TypeVal).S.makeComposite((yyvsp[(1) - (4)].TypeVal).S);
     std::vector<const Type*> Params;
-    for (std::list<llvm::PATypeInfo>::iterator I = yyvsp[-1].TypeList->begin(),
-           E = yyvsp[-1].TypeList->end(); I != E; ++I) {
+    for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[(3) - (4)].TypeList)->begin(),
+           E = (yyvsp[(3) - (4)].TypeList)->end(); I != E; ++I) {
       Params.push_back(I->PAT->get());
-      yyval.TypeVal.S.add(I->S);
+      (yyval.TypeVal).S.add(I->S);
     }
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
     if (isVarArg) Params.pop_back();
@@ -3580,152 +4521,165 @@ case 130:
     }
 
     const FunctionType *FTy =
-      FunctionType::get(yyvsp[-3].TypeVal.PAT->get(), Params, isVarArg);
-
-    yyval.TypeVal.PAT = new PATypeHolder( HandleUpRefs(FTy, yyval.TypeVal.S) );
-    delete yyvsp[-3].TypeVal.PAT;  // Delete the return type handle
-    delete yyvsp[-1].TypeList;      // Delete the argument list
-  ;
-    break;}
-case 131:
-#line 2075 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{          // Sized array type?
-    yyval.TypeVal.S.makeComposite(yyvsp[-1].TypeVal.S);
-    yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(ArrayType::get(yyvsp[-1].TypeVal.PAT->get(), 
-                                           (unsigned)yyvsp[-3].UInt64Val), yyval.TypeVal.S));
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 132:
-#line 2081 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{          // Vector type?
-    const llvm::Type* ElemTy = yyvsp[-1].TypeVal.PAT->get();
-    if ((unsigned)yyvsp[-3].UInt64Val != yyvsp[-3].UInt64Val)
+      FunctionType::get((yyvsp[(1) - (4)].TypeVal).PAT->get(), Params, isVarArg);
+
+    (yyval.TypeVal).PAT = new PATypeHolder( HandleUpRefs(FTy, (yyval.TypeVal).S) );
+    delete (yyvsp[(1) - (4)].TypeVal).PAT;  // Delete the return type handle
+    delete (yyvsp[(3) - (4)].TypeList);      // Delete the argument list
+  ;}
+    break;
+
+  case 132:
+#line 2075 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {          // Sized array type?
+    (yyval.TypeVal).S.makeComposite((yyvsp[(4) - (5)].TypeVal).S);
+    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(ArrayType::get((yyvsp[(4) - (5)].TypeVal).PAT->get(), 
+                                           (unsigned)(yyvsp[(2) - (5)].UInt64Val)), (yyval.TypeVal).S));
+    delete (yyvsp[(4) - (5)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 133:
+#line 2081 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {          // Vector type?
+    const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal).PAT->get();
+    if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val))
        error("Unsigned result not equal to signed result");
     if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
        error("Elements of a VectorType must be integer or floating point");
-    if (!isPowerOf2_32(yyvsp[-3].UInt64Val))
+    if (!isPowerOf2_32((yyvsp[(2) - (5)].UInt64Val)))
       error("VectorType length should be a power of 2");
-    yyval.TypeVal.S.makeComposite(yyvsp[-1].TypeVal.S);
-    yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy, 
-                                         (unsigned)yyvsp[-3].UInt64Val), yyval.TypeVal.S));
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 133:
-#line 2094 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{                        // Structure type?
+    (yyval.TypeVal).S.makeComposite((yyvsp[(4) - (5)].TypeVal).S);
+    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy, 
+                                         (unsigned)(yyvsp[(2) - (5)].UInt64Val)), (yyval.TypeVal).S));
+    delete (yyvsp[(4) - (5)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 134:
+#line 2094 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {                        // Structure type?
     std::vector<const Type*> Elements;
-    yyval.TypeVal.S.makeComposite();
-    for (std::list<llvm::PATypeInfo>::iterator I = yyvsp[-1].TypeList->begin(),
-           E = yyvsp[-1].TypeList->end(); I != E; ++I) {
+    (yyval.TypeVal).S.makeComposite();
+    for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
+           E = (yyvsp[(2) - (3)].TypeList)->end(); I != E; ++I) {
       Elements.push_back(I->PAT->get());
-      yyval.TypeVal.S.add(I->S);
+      (yyval.TypeVal).S.add(I->S);
     }
-    yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements), yyval.TypeVal.S));
-    delete yyvsp[-1].TypeList;
-  ;
-    break;}
-case 134:
-#line 2105 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{                                  // Empty structure type?
-    yyval.TypeVal.PAT = new PATypeHolder(StructType::get(std::vector<const Type*>()));
-    yyval.TypeVal.S.makeComposite();
-  ;
-    break;}
-case 135:
-#line 2109 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{                // Packed Structure type?
-    yyval.TypeVal.S.makeComposite();
+    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements), (yyval.TypeVal).S));
+    delete (yyvsp[(2) - (3)].TypeList);
+  ;}
+    break;
+
+  case 135:
+#line 2105 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {                                  // Empty structure type?
+    (yyval.TypeVal).PAT = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+    (yyval.TypeVal).S.makeComposite();
+  ;}
+    break;
+
+  case 136:
+#line 2109 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {                // Packed Structure type?
+    (yyval.TypeVal).S.makeComposite();
     std::vector<const Type*> Elements;
-    for (std::list<llvm::PATypeInfo>::iterator I = yyvsp[-2].TypeList->begin(),
-           E = yyvsp[-2].TypeList->end(); I != E; ++I) {
+    for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
+           E = (yyvsp[(3) - (5)].TypeList)->end(); I != E; ++I) {
       Elements.push_back(I->PAT->get());
-      yyval.TypeVal.S.add(I->S);
+      (yyval.TypeVal).S.add(I->S);
       delete I->PAT;
     }
-    yyval.TypeVal.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true), 
-                                           yyval.TypeVal.S));
-    delete yyvsp[-2].TypeList;
-  ;
-    break;}
-case 136:
-#line 2122 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{                          // Empty packed structure type?
-    yyval.TypeVal.PAT = new PATypeHolder(StructType::get(std::vector<const Type*>(),true));
-    yyval.TypeVal.S.makeComposite();
-  ;
-    break;}
-case 137:
-#line 2126 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{                             // Pointer type?
-    if (yyvsp[-1].TypeVal.PAT->get() == Type::LabelTy)
+    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true), 
+                                           (yyval.TypeVal).S));
+    delete (yyvsp[(3) - (5)].TypeList);
+  ;}
+    break;
+
+  case 137:
+#line 2122 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {                          // Empty packed structure type?
+    (yyval.TypeVal).PAT = new PATypeHolder(StructType::get(std::vector<const Type*>(),true));
+    (yyval.TypeVal).S.makeComposite();
+  ;}
+    break;
+
+  case 138:
+#line 2126 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {                             // Pointer type?
+    if ((yyvsp[(1) - (2)].TypeVal).PAT->get() == Type::LabelTy)
       error("Cannot form a pointer to a basic block");
-    yyval.TypeVal.S.makeComposite(yyvsp[-1].TypeVal.S);
-    yyval.TypeVal.PAT = new  
-      PATypeHolder(HandleUpRefs(PointerType::getUnqual(yyvsp[-1].TypeVal.PAT->get()),
-                                yyval.TypeVal.S));
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 138:
-#line 2141 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.TypeList = new std::list<PATypeInfo>();
-    yyval.TypeList->push_back(yyvsp[0].TypeVal); 
-  ;
-    break;}
-case 139:
-#line 2145 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    (yyval.TypeList=yyvsp[-2].TypeList)->push_back(yyvsp[0].TypeVal);
-  ;
-    break;}
-case 141:
-#line 2153 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+    (yyval.TypeVal).S.makeComposite((yyvsp[(1) - (2)].TypeVal).S);
+    (yyval.TypeVal).PAT = new  
+      PATypeHolder(HandleUpRefs(PointerType::getUnqual((yyvsp[(1) - (2)].TypeVal).PAT->get()),
+                                (yyval.TypeVal).S));
+    delete (yyvsp[(1) - (2)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 139:
+#line 2141 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.TypeList) = new std::list<PATypeInfo>();
+    (yyval.TypeList)->push_back((yyvsp[(1) - (1)].TypeVal)); 
+  ;}
+    break;
+
+  case 140:
+#line 2145 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back((yyvsp[(3) - (3)].TypeVal));
+  ;}
+    break;
+
+  case 142:
+#line 2153 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
     VoidTI.S.makeSignless();
-    (yyval.TypeList=yyvsp[-2].TypeList)->push_back(VoidTI);
-  ;
-    break;}
-case 142:
-#line 2159 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.TypeList = new std::list<PATypeInfo>();
+    ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(VoidTI);
+  ;}
+    break;
+
+  case 143:
+#line 2159 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.TypeList) = new std::list<PATypeInfo>();
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
     VoidTI.S.makeSignless();
-    yyval.TypeList->push_back(VoidTI);
-  ;
-    break;}
-case 143:
-#line 2166 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.TypeList = new std::list<PATypeInfo>();
-  ;
-    break;}
-case 144:
-#line 2178 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ // Nonempty unsized arr
-    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-3].TypeVal.PAT->get());
+    (yyval.TypeList)->push_back(VoidTI);
+  ;}
+    break;
+
+  case 144:
+#line 2166 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.TypeList) = new std::list<PATypeInfo>();
+  ;}
+    break;
+
+  case 145:
+#line 2178 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { // Nonempty unsized arr
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (4)].TypeVal).PAT->get());
     if (ATy == 0)
       error("Cannot make array constant with type: '" + 
-            yyvsp[-3].TypeVal.PAT->get()->getDescription() + "'");
+            (yyvsp[(1) - (4)].TypeVal).PAT->get()->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())
       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!
     std::vector<Constant*> Elems;
-    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
-      Constant *C = (*yyvsp[-1].ConstVector)[i].C;
+    for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) {
+      Constant *C = (*(yyvsp[(3) - (4)].ConstVector))[i].C;
       const Type* ValTy = C->getType();
       if (ETy != ValTy)
         error("Element #" + utostr(i) + " is not of type '" + 
@@ -3733,72 +4687,75 @@ case 144:
               ValTy->getDescription() + "'");
       Elems.push_back(C);
     }
-    yyval.ConstVal.C = ConstantArray::get(ATy, Elems);
-    yyval.ConstVal.S.copy(yyvsp[-3].TypeVal.S);
-    delete yyvsp[-3].TypeVal.PAT; 
-    delete yyvsp[-1].ConstVector;
-  ;
-    break;}
-case 145:
-#line 2208 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal.PAT->get());
+    (yyval.ConstVal).C = ConstantArray::get(ATy, Elems);
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (4)].TypeVal).S);
+    delete (yyvsp[(1) - (4)].TypeVal).PAT; 
+    delete (yyvsp[(3) - (4)].ConstVector);
+  ;}
+    break;
+
+  case 146:
+#line 2208 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (3)].TypeVal).PAT->get());
     if (ATy == 0)
       error("Cannot make array constant with type: '" + 
-            yyvsp[-2].TypeVal.PAT->get()->getDescription() + "'");
+            (yyvsp[(1) - (3)].TypeVal).PAT->get()->getDescription() + "'");
     int NumElements = ATy->getNumElements();
     if (NumElements != -1 && NumElements != 0) 
       error("Type mismatch: constant sized array initialized with 0"
             " arguments, but has size of " + itostr(NumElements) +"");
-    yyval.ConstVal.C = ConstantArray::get(ATy, std::vector<Constant*>());
-    yyval.ConstVal.S.copy(yyvsp[-2].TypeVal.S);
-    delete yyvsp[-2].TypeVal.PAT;
-  ;
-    break;}
-case 146:
-#line 2221 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal.PAT->get());
+    (yyval.ConstVal).C = ConstantArray::get(ATy, std::vector<Constant*>());
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (3)].TypeVal).S);
+    delete (yyvsp[(1) - (3)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 147:
+#line 2221 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (3)].TypeVal).PAT->get());
     if (ATy == 0)
       error("Cannot make array constant with type: '" + 
-            yyvsp[-2].TypeVal.PAT->get()->getDescription() + "'");
+            (yyvsp[(1) - (3)].TypeVal).PAT->get()->getDescription() + "'");
     int NumElements = ATy->getNumElements();
     const Type *ETy = dyn_cast<IntegerType>(ATy->getElementType());
     if (!ETy || cast<IntegerType>(ETy)->getBitWidth() != 8)
       error("String arrays require type i8, not '" + ETy->getDescription() + 
             "'");
-    char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true);
-    if (NumElements != -1 && NumElements != (EndStr-yyvsp[0].StrVal))
+    char *EndStr = UnEscapeLexed((yyvsp[(3) - (3)].StrVal), true);
+    if (NumElements != -1 && NumElements != (EndStr-(yyvsp[(3) - (3)].StrVal)))
       error("Can't build string constant of size " + 
-            itostr((int)(EndStr-yyvsp[0].StrVal)) + " when array has size " + 
+            itostr((int)(EndStr-(yyvsp[(3) - (3)].StrVal))) + " when array has size " + 
             itostr(NumElements) + "");
     std::vector<Constant*> Vals;
-    for (char *C = (char *)yyvsp[0].StrVal; C != (char *)EndStr; ++C)
+    for (char *C = (char *)(yyvsp[(3) - (3)].StrVal); C != (char *)EndStr; ++C)
       Vals.push_back(ConstantInt::get(ETy, *C));
-    free(yyvsp[0].StrVal);
-    yyval.ConstVal.C = ConstantArray::get(ATy, Vals);
-    yyval.ConstVal.S.copy(yyvsp[-2].TypeVal.S);
-    delete yyvsp[-2].TypeVal.PAT;
-  ;
-    break;}
-case 147:
-#line 2244 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ // Nonempty unsized arr
-    const VectorType *PTy = dyn_cast<VectorType>(yyvsp[-3].TypeVal.PAT->get());
+    free((yyvsp[(3) - (3)].StrVal));
+    (yyval.ConstVal).C = ConstantArray::get(ATy, Vals);
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (3)].TypeVal).S);
+    delete (yyvsp[(1) - (3)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 148:
+#line 2244 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { // Nonempty unsized arr
+    const VectorType *PTy = dyn_cast<VectorType>((yyvsp[(1) - (4)].TypeVal).PAT->get());
     if (PTy == 0)
       error("Cannot make packed constant with type: '" + 
-            yyvsp[-3].TypeVal.PAT->get()->getDescription() + "'");
+            (yyvsp[(1) - (4)].TypeVal).PAT->get()->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())
       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!
     std::vector<Constant*> Elems;
-    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
-      Constant *C = (*yyvsp[-1].ConstVector)[i].C;
+    for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) {
+      Constant *C = (*(yyvsp[(3) - (4)].ConstVector))[i].C;
       const Type* ValTy = C->getType();
       if (ETy != ValTy)
         error("Element #" + utostr(i) + " is not of type '" + 
@@ -3806,117 +4763,124 @@ case 147:
               ValTy->getDescription() + "'");
       Elems.push_back(C);
     }
-    yyval.ConstVal.C = ConstantVector::get(PTy, Elems);
-    yyval.ConstVal.S.copy(yyvsp[-3].TypeVal.S);
-    delete yyvsp[-3].TypeVal.PAT;
-    delete yyvsp[-1].ConstVector;
-  ;
-    break;}
-case 148:
-#line 2272 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-3].TypeVal.PAT->get());
+    (yyval.ConstVal).C = ConstantVector::get(PTy, Elems);
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (4)].TypeVal).S);
+    delete (yyvsp[(1) - (4)].TypeVal).PAT;
+    delete (yyvsp[(3) - (4)].ConstVector);
+  ;}
+    break;
+
+  case 149:
+#line 2272 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal).PAT->get());
     if (STy == 0)
       error("Cannot make struct constant with type: '" + 
-            yyvsp[-3].TypeVal.PAT->get()->getDescription() + "'");
-    if (yyvsp[-1].ConstVector->size() != STy->getNumContainedTypes())
+            (yyvsp[(1) - (4)].TypeVal).PAT->get()->getDescription() + "'");
+    if ((yyvsp[(3) - (4)].ConstVector)->size() != STy->getNumContainedTypes())
       error("Illegal number of initializers for structure type");
 
     // Check to ensure that constants are compatible with the type initializer!
     std::vector<Constant*> Fields;
-    for (unsigned i = 0, e = yyvsp[-1].ConstVector->size(); i != e; ++i) {
-      Constant *C = (*yyvsp[-1].ConstVector)[i].C;
+    for (unsigned i = 0, e = (yyvsp[(3) - (4)].ConstVector)->size(); i != e; ++i) {
+      Constant *C = (*(yyvsp[(3) - (4)].ConstVector))[i].C;
       if (C->getType() != STy->getElementType(i))
         error("Expected type '" + STy->getElementType(i)->getDescription() +
               "' for element #" + utostr(i) + " of structure initializer");
       Fields.push_back(C);
     }
-    yyval.ConstVal.C = ConstantStruct::get(STy, Fields);
-    yyval.ConstVal.S.copy(yyvsp[-3].TypeVal.S);
-    delete yyvsp[-3].TypeVal.PAT;
-    delete yyvsp[-1].ConstVector;
-  ;
-    break;}
-case 149:
-#line 2294 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-2].TypeVal.PAT->get());
+    (yyval.ConstVal).C = ConstantStruct::get(STy, Fields);
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (4)].TypeVal).S);
+    delete (yyvsp[(1) - (4)].TypeVal).PAT;
+    delete (yyvsp[(3) - (4)].ConstVector);
+  ;}
+    break;
+
+  case 150:
+#line 2294 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (3)].TypeVal).PAT->get());
     if (STy == 0)
       error("Cannot make struct constant with type: '" + 
-              yyvsp[-2].TypeVal.PAT->get()->getDescription() + "'");
+              (yyvsp[(1) - (3)].TypeVal).PAT->get()->getDescription() + "'");
     if (STy->getNumContainedTypes() != 0)
       error("Illegal number of initializers for structure type");
-    yyval.ConstVal.C = ConstantStruct::get(STy, std::vector<Constant*>());
-    yyval.ConstVal.S.copy(yyvsp[-2].TypeVal.S);
-    delete yyvsp[-2].TypeVal.PAT;
-  ;
-    break;}
-case 150:
-#line 2305 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-5].TypeVal.PAT->get());
+    (yyval.ConstVal).C = ConstantStruct::get(STy, std::vector<Constant*>());
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (3)].TypeVal).S);
+    delete (yyvsp[(1) - (3)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 151:
+#line 2305 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal).PAT->get());
     if (STy == 0)
       error("Cannot make packed struct constant with type: '" + 
-            yyvsp[-5].TypeVal.PAT->get()->getDescription() + "'");
-    if (yyvsp[-2].ConstVector->size() != STy->getNumContainedTypes())
+            (yyvsp[(1) - (6)].TypeVal).PAT->get()->getDescription() + "'");
+    if ((yyvsp[(4) - (6)].ConstVector)->size() != STy->getNumContainedTypes())
       error("Illegal number of initializers for packed structure type");
 
     // Check to ensure that constants are compatible with the type initializer!
     std::vector<Constant*> Fields;
-    for (unsigned i = 0, e = yyvsp[-2].ConstVector->size(); i != e; ++i) {
-      Constant *C = (*yyvsp[-2].ConstVector)[i].C;
+    for (unsigned i = 0, e = (yyvsp[(4) - (6)].ConstVector)->size(); i != e; ++i) {
+      Constant *C = (*(yyvsp[(4) - (6)].ConstVector))[i].C;
       if (C->getType() != STy->getElementType(i))
         error("Expected type '" + STy->getElementType(i)->getDescription() +
               "' for element #" + utostr(i) + " of packed struct initializer");
       Fields.push_back(C);
     }
-    yyval.ConstVal.C = ConstantStruct::get(STy, Fields);
-    yyval.ConstVal.S.copy(yyvsp[-5].TypeVal.S);
-    delete yyvsp[-5].TypeVal.PAT; 
-    delete yyvsp[-2].ConstVector;
-  ;
-    break;}
-case 151:
-#line 2327 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-4].TypeVal.PAT->get());
+    (yyval.ConstVal).C = ConstantStruct::get(STy, Fields);
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (6)].TypeVal).S);
+    delete (yyvsp[(1) - (6)].TypeVal).PAT; 
+    delete (yyvsp[(4) - (6)].ConstVector);
+  ;}
+    break;
+
+  case 152:
+#line 2327 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (5)].TypeVal).PAT->get());
     if (STy == 0)
       error("Cannot make packed struct constant with type: '" + 
-              yyvsp[-4].TypeVal.PAT->get()->getDescription() + "'");
+              (yyvsp[(1) - (5)].TypeVal).PAT->get()->getDescription() + "'");
     if (STy->getNumContainedTypes() != 0)
       error("Illegal number of initializers for packed structure type");
-    yyval.ConstVal.C = ConstantStruct::get(STy, std::vector<Constant*>());
-    yyval.ConstVal.S.copy(yyvsp[-4].TypeVal.S);
-    delete yyvsp[-4].TypeVal.PAT;
-  ;
-    break;}
-case 152:
-#line 2338 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const PointerType *PTy = dyn_cast<PointerType>(yyvsp[-1].TypeVal.PAT->get());
+    (yyval.ConstVal).C = ConstantStruct::get(STy, std::vector<Constant*>());
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (5)].TypeVal).S);
+    delete (yyvsp[(1) - (5)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 153:
+#line 2338 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const PointerType *PTy = dyn_cast<PointerType>((yyvsp[(1) - (2)].TypeVal).PAT->get());
     if (PTy == 0)
       error("Cannot make null pointer constant with type: '" + 
-            yyvsp[-1].TypeVal.PAT->get()->getDescription() + "'");
-    yyval.ConstVal.C = ConstantPointerNull::get(PTy);
-    yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S);
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 153:
-#line 2347 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.ConstVal.C = UndefValue::get(yyvsp[-1].TypeVal.PAT->get());
-    yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S);
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 154:
-#line 2352 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const PointerType *Ty = dyn_cast<PointerType>(yyvsp[-1].TypeVal.PAT->get());
+            (yyvsp[(1) - (2)].TypeVal).PAT->get()->getDescription() + "'");
+    (yyval.ConstVal).C = ConstantPointerNull::get(PTy);
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S);
+    delete (yyvsp[(1) - (2)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 154:
+#line 2347 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.ConstVal).C = UndefValue::get((yyvsp[(1) - (2)].TypeVal).PAT->get());
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S);
+    delete (yyvsp[(1) - (2)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 155:
+#line 2352 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const PointerType *Ty = dyn_cast<PointerType>((yyvsp[(1) - (2)].TypeVal).PAT->get());
     if (Ty == 0)
       error("Global const reference must be a pointer type, not" +
-            yyvsp[-1].TypeVal.PAT->get()->getDescription());
+            (yyvsp[(1) - (2)].TypeVal).PAT->get()->getDescription());
 
     // ConstExprs can exist in the body of a function, thus creating
     // GlobalValues whenever they refer to a variable.  Because we are in
@@ -3927,8 +4891,8 @@ case 154:
     //
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
-    yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S);
-    Value *V = getExistingValue(Ty, yyvsp[0].ValIDVal);
+    (yyvsp[(2) - (2)].ValIDVal).S.copy((yyvsp[(1) - (2)].TypeVal).S);
+    Value *V = getExistingValue(Ty, (yyvsp[(2) - (2)].ValIDVal));
     CurFun.CurrentFunction = SavedCurFn;
 
     // If this is an initializer for a constant pointer, which is referencing a
@@ -3941,14 +4905,14 @@ case 154:
 
       // 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::NameVal) Name = yyvsp[0].ValIDVal.Name;
+        if ((yyvsp[(2) - (2)].ValIDVal).Type == ValID::NameVal) Name = (yyvsp[(2) - (2)].ValIDVal).Name;
 
         // Create the forward referenced global.
         GlobalValue *GV;
@@ -3963,145 +4927,156 @@ case 154:
         }
 
         // 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.C = cast<GlobalValue>(V);
-    yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S);
-    delete yyvsp[-1].TypeVal.PAT;            // Free the type handle
-  ;
-    break;}
-case 155:
-#line 2411 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (yyvsp[-1].TypeVal.PAT->get() != yyvsp[0].ConstVal.C->getType())
+    (yyval.ConstVal).C = cast<GlobalValue>(V);
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S);
+    delete (yyvsp[(1) - (2)].TypeVal).PAT;            // Free the type handle
+  ;}
+    break;
+
+  case 156:
+#line 2411 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if ((yyvsp[(1) - (2)].TypeVal).PAT->get() != (yyvsp[(2) - (2)].ConstVal).C->getType())
       error("Mismatched types for constant expression");
-    yyval.ConstVal = yyvsp[0].ConstVal;
-    yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S);
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 156:
-#line 2418 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *Ty = yyvsp[-1].TypeVal.PAT->get();
+    (yyval.ConstVal) = (yyvsp[(2) - (2)].ConstVal);
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S);
+    delete (yyvsp[(1) - (2)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 157:
+#line 2418 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *Ty = (yyvsp[(1) - (2)].TypeVal).PAT->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
       error("Cannot create a null initialized value of this type");
-    yyval.ConstVal.C = Constant::getNullValue(Ty);
-    yyval.ConstVal.S.copy(yyvsp[-1].TypeVal.S);
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 157:
-#line 2426 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{      // integral constants
-    const Type *Ty = yyvsp[-1].PrimType.T;
-    if (!ConstantInt::isValueValidForType(Ty, yyvsp[0].SInt64Val))
+    (yyval.ConstVal).C = Constant::getNullValue(Ty);
+    (yyval.ConstVal).S.copy((yyvsp[(1) - (2)].TypeVal).S);
+    delete (yyvsp[(1) - (2)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 158:
+#line 2426 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {      // integral constants
+    const Type *Ty = (yyvsp[(1) - (2)].PrimType).T;
+    if (!ConstantInt::isValueValidForType(Ty, (yyvsp[(2) - (2)].SInt64Val)))
       error("Constant value doesn't fit in type");
-    yyval.ConstVal.C = ConstantInt::get(Ty, yyvsp[0].SInt64Val);
-    yyval.ConstVal.S.makeSigned();
-  ;
-    break;}
-case 158:
-#line 2433 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{            // integral constants
-    const Type *Ty = yyvsp[-1].PrimType.T;
-    if (!ConstantInt::isValueValidForType(Ty, yyvsp[0].UInt64Val))
+    (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[(2) - (2)].SInt64Val));
+    (yyval.ConstVal).S.makeSigned();
+  ;}
+    break;
+
+  case 159:
+#line 2433 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {            // integral constants
+    const Type *Ty = (yyvsp[(1) - (2)].PrimType).T;
+    if (!ConstantInt::isValueValidForType(Ty, (yyvsp[(2) - (2)].UInt64Val)))
       error("Constant value doesn't fit in type");
-    yyval.ConstVal.C = ConstantInt::get(Ty, yyvsp[0].UInt64Val);
-    yyval.ConstVal.S.makeUnsigned();
-  ;
-    break;}
-case 159:
-#line 2440 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{                      // Boolean constants
-    yyval.ConstVal.C = ConstantInt::get(Type::Int1Ty, true);
-    yyval.ConstVal.S.makeUnsigned();
-  ;
-    break;}
-case 160:
-#line 2444 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{                     // Boolean constants
-    yyval.ConstVal.C = ConstantInt::get(Type::Int1Ty, false);
-    yyval.ConstVal.S.makeUnsigned();
-  ;
-    break;}
-case 161:
-#line 2448 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{                   // Float & Double constants
-    if (!ConstantFP::isValueValidForType(yyvsp[-1].PrimType.T, *yyvsp[0].FPVal))
+    (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[(2) - (2)].UInt64Val));
+    (yyval.ConstVal).S.makeUnsigned();
+  ;}
+    break;
+
+  case 160:
+#line 2440 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {                      // Boolean constants
+    (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, true);
+    (yyval.ConstVal).S.makeUnsigned();
+  ;}
+    break;
+
+  case 161:
+#line 2444 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {                     // Boolean constants
+    (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, false);
+    (yyval.ConstVal).S.makeUnsigned();
+  ;}
+    break;
+
+  case 162:
+#line 2448 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {                   // Float & Double constants
+    if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].PrimType).T, *(yyvsp[(2) - (2)].FPVal)))
       error("Floating point constant invalid for type");
     // Lexer has no type info, so builds all FP constants as double.
     // Fix this here.
-    if (yyvsp[-1].PrimType.T==Type::FloatTy)
-      yyvsp[0].FPVal->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven);
-    yyval.ConstVal.C = ConstantFP::get(yyvsp[-1].PrimType.T, *yyvsp[0].FPVal);
-    delete yyvsp[0].FPVal;
-    yyval.ConstVal.S.makeSignless();
-  ;
-    break;}
-case 162:
-#line 2462 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type* SrcTy = yyvsp[-3].ConstVal.C->getType();
-    const Type* DstTy = yyvsp[-1].TypeVal.PAT->get();
-    Signedness SrcSign(yyvsp[-3].ConstVal.S);
-    Signedness DstSign(yyvsp[-1].TypeVal.S);
+    if ((yyvsp[(1) - (2)].PrimType).T==Type::FloatTy)
+      (yyvsp[(2) - (2)].FPVal)->convert(APFloat::IEEEsingle, APFloat::rmNearestTiesToEven);
+    (yyval.ConstVal).C = ConstantFP::get((yyvsp[(1) - (2)].PrimType).T, *(yyvsp[(2) - (2)].FPVal));
+    delete (yyvsp[(2) - (2)].FPVal);
+    (yyval.ConstVal).S.makeSignless();
+  ;}
+    break;
+
+  case 163:
+#line 2462 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type* SrcTy = (yyvsp[(3) - (6)].ConstVal).C->getType();
+    const Type* DstTy = (yyvsp[(5) - (6)].TypeVal).PAT->get();
+    Signedness SrcSign((yyvsp[(3) - (6)].ConstVal).S);
+    Signedness DstSign((yyvsp[(5) - (6)].TypeVal).S);
     if (!SrcTy->isFirstClassType())
       error("cast constant expression from a non-primitive type: '" +
             SrcTy->getDescription() + "'");
     if (!DstTy->isFirstClassType())
       error("cast constant expression to a non-primitive type: '" +
             DstTy->getDescription() + "'");
-    yyval.ConstVal.C = cast<Constant>(getCast(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal.C, SrcSign, DstTy, DstSign));
-    yyval.ConstVal.S.copy(DstSign);
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 163:
-#line 2477 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *Ty = yyvsp[-2].ConstVal.C->getType();
+    (yyval.ConstVal).C = cast<Constant>(getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal).C, SrcSign, DstTy, DstSign));
+    (yyval.ConstVal).S.copy(DstSign);
+    delete (yyvsp[(5) - (6)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 164:
+#line 2477 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *Ty = (yyvsp[(3) - (5)].ConstVal).C->getType();
     if (!isa<PointerType>(Ty))
       error("GetElementPtr requires a pointer operand");
 
     std::vector<Constant*> CIndices;
-    upgradeGEPCEIndices(yyvsp[-2].ConstVal.C->getType(), yyvsp[-1].ValueList, CIndices);
-
-    delete yyvsp[-1].ValueList;
-    yyval.ConstVal.C = ConstantExpr::getGetElementPtr(yyvsp[-2].ConstVal.C, &CIndices[0], CIndices.size());
-    yyval.ConstVal.S.copy(getElementSign(yyvsp[-2].ConstVal, CIndices));
-  ;
-    break;}
-case 164:
-#line 2489 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (!yyvsp[-5].ConstVal.C->getType()->isInteger() ||
-        cast<IntegerType>(yyvsp[-5].ConstVal.C->getType())->getBitWidth() != 1)
+    upgradeGEPCEIndices((yyvsp[(3) - (5)].ConstVal).C->getType(), (yyvsp[(4) - (5)].ValueList), CIndices);
+
+    delete (yyvsp[(4) - (5)].ValueList);
+    (yyval.ConstVal).C = ConstantExpr::getGetElementPtr((yyvsp[(3) - (5)].ConstVal).C, &CIndices[0], CIndices.size());
+    (yyval.ConstVal).S.copy(getElementSign((yyvsp[(3) - (5)].ConstVal), CIndices));
+  ;}
+    break;
+
+  case 165:
+#line 2489 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if (!(yyvsp[(3) - (8)].ConstVal).C->getType()->isInteger() ||
+        cast<IntegerType>((yyvsp[(3) - (8)].ConstVal).C->getType())->getBitWidth() != 1)
       error("Select condition must be bool type");
-    if (yyvsp[-3].ConstVal.C->getType() != yyvsp[-1].ConstVal.C->getType())
+    if ((yyvsp[(5) - (8)].ConstVal).C->getType() != (yyvsp[(7) - (8)].ConstVal).C->getType())
       error("Select operand types must match");
-    yyval.ConstVal.C = ConstantExpr::getSelect(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C);
-    yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S);
-  ;
-    break;}
-case 165:
-#line 2498 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *Ty = yyvsp[-3].ConstVal.C->getType();
-    if (Ty != yyvsp[-1].ConstVal.C->getType())
+    (yyval.ConstVal).C = ConstantExpr::getSelect((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C);
+    (yyval.ConstVal).S.copy((yyvsp[(5) - (8)].ConstVal).S);
+  ;}
+    break;
+
+  case 166:
+#line 2498 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *Ty = (yyvsp[(3) - (6)].ConstVal).C->getType();
+    if (Ty != (yyvsp[(5) - (6)].ConstVal).C->getType())
       error("Binary operator types must match");
     // First, make sure we're dealing with the right opcode by upgrading from
     // obsolete versions.
-    Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-5].BinaryOpVal, Ty, yyvsp[-3].ConstVal.S);
+    Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[(1) - (6)].BinaryOpVal), Ty, (yyvsp[(3) - (6)].ConstVal).S);
 
     // HACK: llvm 1.3 and earlier used to emit invalid pointer constant exprs.
     // To retain backward compatibility with these early compilers, we emit a
     // cast to the appropriate integer type automatically if we are in the
     // broken case.  See PR424 for more information.
     if (!isa<PointerType>(Ty)) {
-      yyval.ConstVal.C = ConstantExpr::get(Opcode, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C);
+      (yyval.ConstVal).C = ConstantExpr::get(Opcode, (yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C);
     } else {
       const Type *IntPtrTy = 0;
       switch (CurModule.CurrentModule->getPointerSize()) {
@@ -4109,147 +5084,165 @@ case 165:
       case Module::Pointer64: IntPtrTy = Type::Int64Ty; break;
       default: error("invalid pointer binary constant expr");
       }
-      yyval.ConstVal.C = ConstantExpr::get(Opcode, 
-             ConstantExpr::getCast(Instruction::PtrToInt, yyvsp[-3].ConstVal.C, IntPtrTy),
-             ConstantExpr::getCast(Instruction::PtrToInt, yyvsp[-1].ConstVal.C, IntPtrTy));
-      yyval.ConstVal.C = ConstantExpr::getCast(Instruction::IntToPtr, yyval.ConstVal.C, Ty);
+      (yyval.ConstVal).C = ConstantExpr::get(Opcode, 
+             ConstantExpr::getCast(Instruction::PtrToInt, (yyvsp[(3) - (6)].ConstVal).C, IntPtrTy),
+             ConstantExpr::getCast(Instruction::PtrToInt, (yyvsp[(5) - (6)].ConstVal).C, IntPtrTy));
+      (yyval.ConstVal).C = ConstantExpr::getCast(Instruction::IntToPtr, (yyval.ConstVal).C, Ty);
     }
-    yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S); 
-  ;
-    break;}
-case 166:
-#line 2526 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type* Ty = yyvsp[-3].ConstVal.C->getType();
-    if (Ty != yyvsp[-1].ConstVal.C->getType())
+    (yyval.ConstVal).S.copy((yyvsp[(3) - (6)].ConstVal).S); 
+  ;}
+    break;
+
+  case 167:
+#line 2526 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type* Ty = (yyvsp[(3) - (6)].ConstVal).C->getType();
+    if (Ty != (yyvsp[(5) - (6)].ConstVal).C->getType())
       error("Logical operator types must match");
     if (!Ty->isInteger()) {
       if (!isa<VectorType>(Ty) || 
           !cast<VectorType>(Ty)->getElementType()->isInteger())
         error("Logical operator requires integer operands");
     }
-    Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-5].BinaryOpVal, Ty, yyvsp[-3].ConstVal.S);
-    yyval.ConstVal.C = ConstantExpr::get(Opcode, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C);
-    yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S);
-  ;
-    break;}
-case 167:
-#line 2539 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type* Ty = yyvsp[-3].ConstVal.C->getType();
-    if (Ty != yyvsp[-1].ConstVal.C->getType())
+    Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[(1) - (6)].BinaryOpVal), Ty, (yyvsp[(3) - (6)].ConstVal).S);
+    (yyval.ConstVal).C = ConstantExpr::get(Opcode, (yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C);
+    (yyval.ConstVal).S.copy((yyvsp[(3) - (6)].ConstVal).S);
+  ;}
+    break;
+
+  case 168:
+#line 2539 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type* Ty = (yyvsp[(3) - (6)].ConstVal).C->getType();
+    if (Ty != (yyvsp[(5) - (6)].ConstVal).C->getType())
       error("setcc operand types must match");
     unsigned short pred;
-    Instruction::OtherOps Opcode = getCompareOp(yyvsp[-5].BinaryOpVal, pred, Ty, yyvsp[-3].ConstVal.S);
-    yyval.ConstVal.C = ConstantExpr::getCompare(Opcode, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C);
-    yyval.ConstVal.S.makeUnsigned();
-  ;
-    break;}
-case 168:
-#line 2548 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (yyvsp[-3].ConstVal.C->getType() != yyvsp[-1].ConstVal.C->getType()) 
+    Instruction::OtherOps Opcode = getCompareOp((yyvsp[(1) - (6)].BinaryOpVal), pred, Ty, (yyvsp[(3) - (6)].ConstVal).S);
+    (yyval.ConstVal).C = ConstantExpr::getCompare(Opcode, (yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C);
+    (yyval.ConstVal).S.makeUnsigned();
+  ;}
+    break;
+
+  case 169:
+#line 2548 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if ((yyvsp[(4) - (7)].ConstVal).C->getType() != (yyvsp[(6) - (7)].ConstVal).C->getType()) 
       error("icmp operand types must match");
-    yyval.ConstVal.C = ConstantExpr::getCompare(yyvsp[-5].IPred, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C);
-    yyval.ConstVal.S.makeUnsigned();
-  ;
-    break;}
-case 169:
-#line 2554 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (yyvsp[-3].ConstVal.C->getType() != yyvsp[-1].ConstVal.C->getType()) 
+    (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp[(2) - (7)].IPred), (yyvsp[(4) - (7)].ConstVal).C, (yyvsp[(6) - (7)].ConstVal).C);
+    (yyval.ConstVal).S.makeUnsigned();
+  ;}
+    break;
+
+  case 170:
+#line 2554 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if ((yyvsp[(4) - (7)].ConstVal).C->getType() != (yyvsp[(6) - (7)].ConstVal).C->getType()) 
       error("fcmp operand types must match");
-    yyval.ConstVal.C = ConstantExpr::getCompare(yyvsp[-5].FPred, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C);
-    yyval.ConstVal.S.makeUnsigned();
-  ;
-    break;}
-case 170:
-#line 2560 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (!yyvsp[-1].ConstVal.C->getType()->isInteger() ||
-        cast<IntegerType>(yyvsp[-1].ConstVal.C->getType())->getBitWidth() != 8)
+    (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp[(2) - (7)].FPred), (yyvsp[(4) - (7)].ConstVal).C, (yyvsp[(6) - (7)].ConstVal).C);
+    (yyval.ConstVal).S.makeUnsigned();
+  ;}
+    break;
+
+  case 171:
+#line 2560 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if (!(yyvsp[(5) - (6)].ConstVal).C->getType()->isInteger() ||
+        cast<IntegerType>((yyvsp[(5) - (6)].ConstVal).C->getType())->getBitWidth() != 8)
       error("Shift count for shift constant must be unsigned byte");
-    const Type* Ty = yyvsp[-3].ConstVal.C->getType();
-    if (!yyvsp[-3].ConstVal.C->getType()->isInteger())
+    const Type* Ty = (yyvsp[(3) - (6)].ConstVal).C->getType();
+    if (!(yyvsp[(3) - (6)].ConstVal).C->getType()->isInteger())
       error("Shift constant expression requires integer operand");
-    Constant *ShiftAmt = ConstantExpr::getZExt(yyvsp[-1].ConstVal.C, Ty);
-    yyval.ConstVal.C = ConstantExpr::get(getBinaryOp(yyvsp[-5].BinaryOpVal, Ty, yyvsp[-3].ConstVal.S), yyvsp[-3].ConstVal.C, ShiftAmt);
-    yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S);
-  ;
-    break;}
-case 171:
-#line 2571 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (!ExtractElementInst::isValidOperands(yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C))
+    Constant *ShiftAmt = ConstantExpr::getZExt((yyvsp[(5) - (6)].ConstVal).C, Ty);
+    (yyval.ConstVal).C = ConstantExpr::get(getBinaryOp((yyvsp[(1) - (6)].BinaryOpVal), Ty, (yyvsp[(3) - (6)].ConstVal).S), (yyvsp[(3) - (6)].ConstVal).C, ShiftAmt);
+    (yyval.ConstVal).S.copy((yyvsp[(3) - (6)].ConstVal).S);
+  ;}
+    break;
+
+  case 172:
+#line 2571 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C))
       error("Invalid extractelement operands");
-    yyval.ConstVal.C = ConstantExpr::getExtractElement(yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C);
-    yyval.ConstVal.S.copy(yyvsp[-3].ConstVal.S.get(0));
-  ;
-    break;}
-case 172:
-#line 2577 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (!InsertElementInst::isValidOperands(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C))
+    (yyval.ConstVal).C = ConstantExpr::getExtractElement((yyvsp[(3) - (6)].ConstVal).C, (yyvsp[(5) - (6)].ConstVal).C);
+    (yyval.ConstVal).S.copy((yyvsp[(3) - (6)].ConstVal).S.get(0));
+  ;}
+    break;
+
+  case 173:
+#line 2577 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C))
       error("Invalid insertelement operands");
-    yyval.ConstVal.C = ConstantExpr::getInsertElement(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C);
-    yyval.ConstVal.S.copy(yyvsp[-5].ConstVal.S);
-  ;
-    break;}
-case 173:
-#line 2583 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (!ShuffleVectorInst::isValidOperands(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C))
+    (yyval.ConstVal).C = ConstantExpr::getInsertElement((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C);
+    (yyval.ConstVal).S.copy((yyvsp[(3) - (8)].ConstVal).S);
+  ;}
+    break;
+
+  case 174:
+#line 2583 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C))
       error("Invalid shufflevector operands");
-    yyval.ConstVal.C = ConstantExpr::getShuffleVector(yyvsp[-5].ConstVal.C, yyvsp[-3].ConstVal.C, yyvsp[-1].ConstVal.C);
-    yyval.ConstVal.S.copy(yyvsp[-5].ConstVal.S);
-  ;
-    break;}
-case 174:
-#line 2594 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal); ;
-    break;}
-case 175:
-#line 2595 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.ConstVector = new std::vector<ConstInfo>();
-    yyval.ConstVector->push_back(yyvsp[0].ConstVal);
-  ;
-    break;}
-case 176:
-#line 2604 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.BoolVal = false; ;
-    break;}
-case 177:
-#line 2605 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.BoolVal = true; ;
-    break;}
-case 178:
-#line 2617 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.ModuleVal = ParserResult = yyvsp[0].ModuleVal;
+    (yyval.ConstVal).C = ConstantExpr::getShuffleVector((yyvsp[(3) - (8)].ConstVal).C, (yyvsp[(5) - (8)].ConstVal).C, (yyvsp[(7) - (8)].ConstVal).C);
+    (yyval.ConstVal).S.copy((yyvsp[(3) - (8)].ConstVal).S);
+  ;}
+    break;
+
+  case 175:
+#line 2594 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal)); ;}
+    break;
+
+  case 176:
+#line 2595 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.ConstVector) = new std::vector<ConstInfo>();
+    (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
+  ;}
+    break;
+
+  case 177:
+#line 2604 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.BoolVal) = false; ;}
+    break;
+
+  case 178:
+#line 2605 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.BoolVal) = true; ;}
+    break;
+
+  case 179:
+#line 2617 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.ModuleVal) = ParserResult = (yyvsp[(1) - (1)].ModuleVal);
     CurModule.ModuleDone();
-  ;
-    break;}
-case 179:
-#line 2626 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ModuleVal = yyvsp[-1].ModuleVal; CurFun.FunctionDone(); ;
-    break;}
-case 180:
-#line 2627 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ModuleVal = yyvsp[-1].ModuleVal; ;
-    break;}
-case 181:
-#line 2628 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ModuleVal = yyvsp[-3].ModuleVal; ;
-    break;}
-case 182:
-#line 2629 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ModuleVal = yyvsp[-1].ModuleVal; ;
-    break;}
-case 183:
-#line 2630 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.ModuleVal = CurModule.CurrentModule;
+  ;}
+    break;
+
+  case 180:
+#line 2626 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ModuleVal) = (yyvsp[(1) - (2)].ModuleVal); CurFun.FunctionDone(); ;}
+    break;
+
+  case 181:
+#line 2627 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ModuleVal) = (yyvsp[(1) - (2)].ModuleVal); ;}
+    break;
+
+  case 182:
+#line 2628 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ModuleVal) = (yyvsp[(1) - (4)].ModuleVal); ;}
+    break;
+
+  case 183:
+#line 2629 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ModuleVal) = (yyvsp[(1) - (2)].ModuleVal); ;}
+    break;
+
+  case 184:
+#line 2630 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.ModuleVal) = CurModule.CurrentModule;
     // Emit an error if there are any unresolved types left.
     if (!CurModule.LateResolveTypes.empty()) {
       const ValID &DID = CurModule.LateResolveTypes.begin()->first;
@@ -4259,11 +5252,12 @@ case 183:
         error("Reference to an undefined type: #" + itostr(DID.Num));
       }
     }
-  ;
-    break;}
-case 184:
-#line 2646 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+  ;}
+    break;
+
+  case 185:
+#line 2646 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
     // Eagerly resolve types.  This is not an optimization, this is a
     // requirement that is due to the fact that we could have this:
     //
@@ -4273,243 +5267,275 @@ case 184:
     // 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.PAT->get(), yyvsp[0].TypeVal.S);
+    ResolveTypeTo((yyvsp[(2) - (4)].StrVal), (yyvsp[(4) - (4)].TypeVal).PAT->get(), (yyvsp[(4) - (4)].TypeVal).S);
 
-    if (!setTypeName(yyvsp[0].TypeVal, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) {
+    if (!setTypeName((yyvsp[(4) - (4)].TypeVal), (yyvsp[(2) - (4)].StrVal)) && !(yyvsp[(2) - (4)].StrVal)) {
       // If this is a numbered type that is not a redefinition, add it to the 
       // slot table.
-      CurModule.Types.push_back(yyvsp[0].TypeVal.PAT->get());
-      CurModule.TypeSigns.push_back(yyvsp[0].TypeVal.S);
+      CurModule.Types.push_back((yyvsp[(4) - (4)].TypeVal).PAT->get());
+      CurModule.TypeSigns.push_back((yyvsp[(4) - (4)].TypeVal).S);
     }
-    delete yyvsp[0].TypeVal.PAT;
-  ;
-    break;}
-case 185:
-#line 2666 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{       // Function prototypes can be in const pool
-  ;
-    break;}
-case 186:
-#line 2668 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{  // Asm blocks can be in the const pool
-  ;
-    break;}
-case 187:
-#line 2670 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (yyvsp[0].ConstVal.C == 0) 
+    delete (yyvsp[(4) - (4)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 186:
+#line 2666 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {       // Function prototypes can be in const pool
+  ;}
+    break;
+
+  case 187:
+#line 2668 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {  // Asm blocks can be in the const pool
+  ;}
+    break;
+
+  case 188:
+#line 2670 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if ((yyvsp[(5) - (5)].ConstVal).C == 0) 
       error("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, yyvsp[-2].Linkage, yyvsp[-1].BoolVal, yyvsp[0].ConstVal.C->getType(), yyvsp[0].ConstVal.C, yyvsp[0].ConstVal.S);
-  ;
-    break;}
-case 188:
-#line 2674 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+    CurGV = ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), (yyvsp[(3) - (5)].Linkage), (yyvsp[(4) - (5)].BoolVal), (yyvsp[(5) - (5)].ConstVal).C->getType(), (yyvsp[(5) - (5)].ConstVal).C, (yyvsp[(5) - (5)].ConstVal).S);
+  ;}
+    break;
+
+  case 189:
+#line 2674 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
     CurGV = 0;
-  ;
-    break;}
-case 189:
-#line 2677 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *Ty = yyvsp[0].TypeVal.PAT->get();
-    CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalLinkage, yyvsp[-1].BoolVal, Ty, 0,
-                                yyvsp[0].TypeVal.S);
-    delete yyvsp[0].TypeVal.PAT;
-  ;
-    break;}
-case 190:
-#line 2682 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+  ;}
+    break;
+
+  case 190:
+#line 2677 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *Ty = (yyvsp[(5) - (5)].TypeVal).PAT->get();
+    CurGV = ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), GlobalValue::ExternalLinkage, (yyvsp[(4) - (5)].BoolVal), Ty, 0,
+                                (yyvsp[(5) - (5)].TypeVal).S);
+    delete (yyvsp[(5) - (5)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 191:
+#line 2682 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
     CurGV = 0;
-  ;
-    break;}
-case 191:
-#line 2685 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *Ty = yyvsp[0].TypeVal.PAT->get();
-    CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::DLLImportLinkage, yyvsp[-1].BoolVal, Ty, 0,
-                                yyvsp[0].TypeVal.S);
-    delete yyvsp[0].TypeVal.PAT;
-  ;
-    break;}
-case 192:
-#line 2690 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+  ;}
+    break;
+
+  case 192:
+#line 2685 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *Ty = (yyvsp[(5) - (5)].TypeVal).PAT->get();
+    CurGV = ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[(4) - (5)].BoolVal), Ty, 0,
+                                (yyvsp[(5) - (5)].TypeVal).S);
+    delete (yyvsp[(5) - (5)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 193:
+#line 2690 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
     CurGV = 0;
-  ;
-    break;}
-case 193:
-#line 2693 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *Ty = yyvsp[0].TypeVal.PAT->get();
+  ;}
+    break;
+
+  case 194:
+#line 2693 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *Ty = (yyvsp[(5) - (5)].TypeVal).PAT->get();
     CurGV = 
-      ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalWeakLinkage, yyvsp[-1].BoolVal, Ty, 0, 
-                          yyvsp[0].TypeVal.S);
-    delete yyvsp[0].TypeVal.PAT;
-  ;
-    break;}
-case 194:
-#line 2699 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+      ParseGlobalVariable((yyvsp[(2) - (5)].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[(4) - (5)].BoolVal), Ty, 0, 
+                          (yyvsp[(5) - (5)].TypeVal).S);
+    delete (yyvsp[(5) - (5)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 195:
+#line 2699 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
     CurGV = 0;
-  ;
-    break;}
-case 195:
-#line 2702 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ 
-  ;
-    break;}
-case 196:
-#line 2704 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-  ;
-    break;}
-case 197:
-#line 2706 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ 
-  ;
-    break;}
-case 198:
-#line 2711 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+  ;}
+    break;
+
+  case 196:
+#line 2702 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { 
+  ;}
+    break;
+
+  case 197:
+#line 2704 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+  ;}
+    break;
+
+  case 198:
+#line 2706 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { 
+  ;}
+    break;
+
+  case 199:
+#line 2711 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
     const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
-    char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true);
-    std::string NewAsm(yyvsp[0].StrVal, EndStr);
-    free(yyvsp[0].StrVal);
+    char *EndStr = UnEscapeLexed((yyvsp[(1) - (1)].StrVal), true);
+    std::string NewAsm((yyvsp[(1) - (1)].StrVal), EndStr);
+    free((yyvsp[(1) - (1)].StrVal));
 
     if (AsmSoFar.empty())
       CurModule.CurrentModule->setModuleInlineAsm(NewAsm);
     else
       CurModule.CurrentModule->setModuleInlineAsm(AsmSoFar+"\n"+NewAsm);
-  ;
-    break;}
-case 199:
-#line 2725 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Endianness = Module::BigEndian; ;
-    break;}
-case 200:
-#line 2726 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Endianness = Module::LittleEndian; ;
-    break;}
-case 201:
-#line 2730 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    CurModule.setEndianness(yyvsp[0].Endianness);
-  ;
-    break;}
-case 202:
-#line 2733 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (yyvsp[0].UInt64Val == 32)
+  ;}
+    break;
+
+  case 200:
+#line 2725 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Endianness) = Module::BigEndian; ;}
+    break;
+
+  case 201:
+#line 2726 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Endianness) = Module::LittleEndian; ;}
+    break;
+
+  case 202:
+#line 2730 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    CurModule.setEndianness((yyvsp[(3) - (3)].Endianness));
+  ;}
+    break;
+
+  case 203:
+#line 2733 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if ((yyvsp[(3) - (3)].UInt64Val) == 32)
       CurModule.setPointerSize(Module::Pointer32);
-    else if (yyvsp[0].UInt64Val == 64)
+    else if ((yyvsp[(3) - (3)].UInt64Val) == 64)
       CurModule.setPointerSize(Module::Pointer64);
     else
-      error("Invalid pointer size: '" + utostr(yyvsp[0].UInt64Val) + "'");
-  ;
-    break;}
-case 203:
-#line 2741 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    CurModule.CurrentModule->setTargetTriple(yyvsp[0].StrVal);
-    free(yyvsp[0].StrVal);
-  ;
-    break;}
-case 204:
-#line 2745 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    CurModule.CurrentModule->setDataLayout(yyvsp[0].StrVal);
-    free(yyvsp[0].StrVal);
-  ;
-    break;}
-case 206:
-#line 2756 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-      CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
-      free(yyvsp[0].StrVal);
-  ;
-    break;}
-case 207:
-#line 2760 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
-    free(yyvsp[0].StrVal);
-  ;
-    break;}
-case 208:
-#line 2764 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ ;
-    break;}
-case 212:
-#line 2777 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.StrVal = 0; ;
-    break;}
-case 213:
-#line 2781 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (yyvsp[-1].TypeVal.PAT->get() == Type::VoidTy)
+      error("Invalid pointer size: '" + utostr((yyvsp[(3) - (3)].UInt64Val)) + "'");
+  ;}
+    break;
+
+  case 204:
+#line 2741 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    CurModule.CurrentModule->setTargetTriple((yyvsp[(3) - (3)].StrVal));
+    free((yyvsp[(3) - (3)].StrVal));
+  ;}
+    break;
+
+  case 205:
+#line 2745 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    CurModule.CurrentModule->setDataLayout((yyvsp[(3) - (3)].StrVal));
+    free((yyvsp[(3) - (3)].StrVal));
+  ;}
+    break;
+
+  case 207:
+#line 2756 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+      CurModule.CurrentModule->addLibrary((yyvsp[(3) - (3)].StrVal));
+      free((yyvsp[(3) - (3)].StrVal));
+  ;}
+    break;
+
+  case 208:
+#line 2760 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    CurModule.CurrentModule->addLibrary((yyvsp[(1) - (1)].StrVal));
+    free((yyvsp[(1) - (1)].StrVal));
+  ;}
+    break;
+
+  case 209:
+#line 2764 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { ;}
+    break;
+
+  case 213:
+#line 2777 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.StrVal) = 0; ;}
+    break;
+
+  case 214:
+#line 2781 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if ((yyvsp[(1) - (2)].TypeVal).PAT->get() == Type::VoidTy)
       error("void typed arguments are invalid");
-    yyval.ArgVal = new std::pair<PATypeInfo, char*>(yyvsp[-1].TypeVal, yyvsp[0].StrVal);
-  ;
-    break;}
-case 214:
-#line 2789 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.ArgList = yyvsp[-2].ArgList;
-    yyval.ArgList->push_back(*yyvsp[0].ArgVal);
-    delete yyvsp[0].ArgVal;
-  ;
-    break;}
-case 215:
-#line 2794 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.ArgList = new std::vector<std::pair<PATypeInfo,char*> >();
-    yyval.ArgList->push_back(*yyvsp[0].ArgVal);
-    delete yyvsp[0].ArgVal;
-  ;
-    break;}
-case 216:
-#line 2802 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ArgList = yyvsp[0].ArgList; ;
-    break;}
-case 217:
-#line 2803 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.ArgList = yyvsp[-2].ArgList;
+    (yyval.ArgVal) = new std::pair<PATypeInfo, char*>((yyvsp[(1) - (2)].TypeVal), (yyvsp[(2) - (2)].StrVal));
+  ;}
+    break;
+
+  case 215:
+#line 2789 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
+    (yyval.ArgList)->push_back(*(yyvsp[(3) - (3)].ArgVal));
+    delete (yyvsp[(3) - (3)].ArgVal);
+  ;}
+    break;
+
+  case 216:
+#line 2794 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> >();
+    (yyval.ArgList)->push_back(*(yyvsp[(1) - (1)].ArgVal));
+    delete (yyvsp[(1) - (1)].ArgVal);
+  ;}
+    break;
+
+  case 217:
+#line 2802 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList); ;}
+    break;
+
+  case 218:
+#line 2803 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
     VoidTI.S.makeSignless();
-    yyval.ArgList->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
-  ;
-    break;}
-case 218:
-#line 2810 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.ArgList = new std::vector<std::pair<PATypeInfo,char*> >();
+    (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
+  ;}
+    break;
+
+  case 219:
+#line 2810 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> >();
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
     VoidTI.S.makeSignless();
-    yyval.ArgList->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
-  ;
-    break;}
-case 219:
-#line 2817 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ArgList = 0; ;
-    break;}
-case 220:
-#line 2821 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    UnEscapeLexed(yyvsp[-5].StrVal);
-    std::string FunctionName(yyvsp[-5].StrVal);
-    free(yyvsp[-5].StrVal);  // Free strdup'd memory!
+    (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
+  ;}
+    break;
+
+  case 220:
+#line 2817 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ArgList) = 0; ;}
+    break;
+
+  case 221:
+#line 2821 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    UnEscapeLexed((yyvsp[(3) - (8)].StrVal));
+    std::string FunctionName((yyvsp[(3) - (8)].StrVal));
+    free((yyvsp[(3) - (8)].StrVal));  // Free strdup'd memory!
 
-    const Type* RetTy = yyvsp[-6].TypeVal.PAT->get();
+    const Type* RetTy = (yyvsp[(2) - (8)].TypeVal).PAT->get();
     
     if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
       error("LLVM functions cannot return aggregate types");
 
     Signedness FTySign;
-    FTySign.makeComposite(yyvsp[-6].TypeVal.S);
+    FTySign.makeComposite((yyvsp[(2) - (8)].TypeVal).S);
     std::vector<const Type*> ParamTyList;
 
     // In LLVM 2.0 the signatures of three varargs intrinsics changed to take
@@ -4520,9 +5546,9 @@ case 220:
     } else if (FunctionName == "llvm.va_copy") {
       ParamTyList.push_back(PointerType::getUnqual(Type::Int8Ty));
       ParamTyList.push_back(PointerType::getUnqual(Type::Int8Ty));
-    } else if (yyvsp[-3].ArgList) {   // If there are arguments...
+    } else if ((yyvsp[(5) - (8)].ArgList)) {   // If there are arguments...
       for (std::vector<std::pair<PATypeInfo,char*> >::iterator 
-           I = yyvsp[-3].ArgList->begin(), E = yyvsp[-3].ArgList->end(); I != E; ++I) {
+           I = (yyvsp[(5) - (8)].ArgList)->begin(), E = (yyvsp[(5) - (8)].ArgList)->end(); I != E; ++I) {
         const Type *Ty = I->first.PAT->get();
         ParamTyList.push_back(Ty);
         FTySign.add(I->first.S);
@@ -4535,7 +5561,7 @@ case 220:
 
     const FunctionType *FT = FunctionType::get(RetTy, ParamTyList, isVarArg);
     const PointerType *PFT = PointerType::getUnqual(FT);
-    delete yyvsp[-6].TypeVal.PAT;
+    delete (yyvsp[(2) - (8)].TypeVal).PAT;
 
     ValID ID;
     if (!FunctionName.empty()) {
@@ -4644,16 +5670,16 @@ case 220:
       // argument to another function.
       Fn->setLinkage(CurFun.Linkage);
     }
-    Fn->setCallingConv(upgradeCallingConv(yyvsp[-7].UIntVal));
-    Fn->setAlignment(yyvsp[0].UIntVal);
-    if (yyvsp[-1].StrVal) {
-      Fn->setSection(yyvsp[-1].StrVal);
-      free(yyvsp[-1].StrVal);
+    Fn->setCallingConv(upgradeCallingConv((yyvsp[(1) - (8)].UIntVal)));
+    Fn->setAlignment((yyvsp[(8) - (8)].UIntVal));
+    if ((yyvsp[(7) - (8)].StrVal)) {
+      Fn->setSection((yyvsp[(7) - (8)].StrVal));
+      free((yyvsp[(7) - (8)].StrVal));
     }
 
     // Convert the CSRet calling convention into the corresponding parameter
     // attribute.
-    if (yyvsp[-7].UIntVal == OldCallingConv::CSRet) {
+    if ((yyvsp[(1) - (8)].UIntVal) == OldCallingConv::CSRet) {
       ParamAttrsVector Attrs;
       ParamAttrsWithIndex PAWI;
       PAWI.index = 1;  PAWI.attrs = ParamAttr::StructRet; // first arg
@@ -4662,135 +5688,155 @@ case 220:
     }
 
     // Add all of the arguments we parsed to the function...
-    if (yyvsp[-3].ArgList) {                     // Is null if empty...
+    if ((yyvsp[(5) - (8)].ArgList)) {                     // Is null if empty...
       if (isVarArg) {  // Nuke the last entry
-        assert(yyvsp[-3].ArgList->back().first.PAT->get() == Type::VoidTy && 
-               yyvsp[-3].ArgList->back().second == 0 && "Not a varargs marker");
-        delete yyvsp[-3].ArgList->back().first.PAT;
-        yyvsp[-3].ArgList->pop_back();  // Delete the last entry
+        assert((yyvsp[(5) - (8)].ArgList)->back().first.PAT->get() == Type::VoidTy && 
+               (yyvsp[(5) - (8)].ArgList)->back().second == 0 && "Not a varargs marker");
+        delete (yyvsp[(5) - (8)].ArgList)->back().first.PAT;
+        (yyvsp[(5) - (8)].ArgList)->pop_back();  // Delete the last entry
       }
       Function::arg_iterator ArgIt = Fn->arg_begin();
       Function::arg_iterator ArgEnd = Fn->arg_end();
-      std::vector<std::pair<PATypeInfo,char*> >::iterator I = yyvsp[-3].ArgList->begin();
-      std::vector<std::pair<PATypeInfo,char*> >::iterator E = yyvsp[-3].ArgList->end();
+      std::vector<std::pair<PATypeInfo,char*> >::iterator I = (yyvsp[(5) - (8)].ArgList)->begin();
+      std::vector<std::pair<PATypeInfo,char*> >::iterator E = (yyvsp[(5) - (8)].ArgList)->end();
       for ( ; I != E && ArgIt != ArgEnd; ++I, ++ArgIt) {
         delete I->first.PAT;                      // Delete the typeholder...
         ValueInfo VI; VI.V = ArgIt; VI.S.copy(I->first.S); 
         setValueName(VI, I->second);           // Insert arg into symtab...
         InsertValue(ArgIt);
       }
-      delete yyvsp[-3].ArgList;                     // We're now done with the argument list
+      delete (yyvsp[(5) - (8)].ArgList);                     // We're now done with the argument list
     }
     lastCallingConv = OldCallingConv::C;
-  ;
-    break;}
-case 223:
-#line 3013 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ CurFun.Linkage = yyvsp[0].Linkage; ;
-    break;}
-case 224:
-#line 3013 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.FunctionVal = CurFun.CurrentFunction;
+  ;}
+    break;
+
+  case 224:
+#line 3013 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { CurFun.Linkage = (yyvsp[(1) - (1)].Linkage); ;}
+    break;
+
+  case 225:
+#line 3013 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.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);
-  ;
-    break;}
-case 227:
-#line 3027 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.FunctionVal = yyvsp[-1].FunctionVal;
-  ;
-    break;}
-case 228:
-#line 3032 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Linkage = GlobalValue::ExternalLinkage; ;
-    break;}
-case 229:
-#line 3033 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Linkage = GlobalValue::DLLImportLinkage; ;
-    break;}
-case 230:
-#line 3034 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.Linkage = GlobalValue::ExternalWeakLinkage; ;
-    break;}
-case 231:
-#line 3038 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ CurFun.isDeclare = true; ;
-    break;}
-case 232:
-#line 3039 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ CurFun.Linkage = yyvsp[0].Linkage; ;
-    break;}
-case 233:
-#line 3039 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.FunctionVal = CurFun.CurrentFunction;
+    (yyval.FunctionVal)->setLinkage((yyvsp[(1) - (4)].Linkage));
+  ;}
+    break;
+
+  case 228:
+#line 3027 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
+  ;}
+    break;
+
+  case 229:
+#line 3032 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
+    break;
+
+  case 230:
+#line 3033 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
+    break;
+
+  case 231:
+#line 3034 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
+    break;
+
+  case 232:
+#line 3038 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { CurFun.isDeclare = true; ;}
+    break;
+
+  case 233:
+#line 3039 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { CurFun.Linkage = (yyvsp[(3) - (3)].Linkage); ;}
+    break;
+
+  case 234:
+#line 3039 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.FunctionVal) = CurFun.CurrentFunction;
     CurFun.FunctionDone();
     
-  ;
-    break;}
-case 234:
-#line 3051 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.BoolVal = false; ;
-    break;}
-case 235:
-#line 3052 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.BoolVal = true; ;
-    break;}
-case 236:
-#line 3057 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ValIDVal = ValID::create(yyvsp[0].SInt64Val); ;
-    break;}
-case 237:
-#line 3058 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ValIDVal = ValID::create(yyvsp[0].UInt64Val); ;
-    break;}
-case 238:
-#line 3059 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ValIDVal = ValID::create(yyvsp[0].FPVal); ;
-    break;}
-case 239:
-#line 3060 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ 
-    yyval.ValIDVal = ValID::create(ConstantInt::get(Type::Int1Ty, true));
-    yyval.ValIDVal.S.makeUnsigned();
-  ;
-    break;}
-case 240:
-#line 3064 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ 
-    yyval.ValIDVal = ValID::create(ConstantInt::get(Type::Int1Ty, false)); 
-    yyval.ValIDVal.S.makeUnsigned();
-  ;
-    break;}
-case 241:
-#line 3068 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ValIDVal = ValID::createNull(); ;
-    break;}
-case 242:
-#line 3069 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ValIDVal = ValID::createUndef(); ;
-    break;}
-case 243:
-#line 3070 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ValIDVal = ValID::createZeroInit(); ;
-    break;}
-case 244:
-#line 3071 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ // Nonempty unsized packed vector
-    const Type *ETy = (*yyvsp[-1].ConstVector)[0].C->getType();
-    int NumElements = yyvsp[-1].ConstVector->size(); 
+  ;}
+    break;
+
+  case 235:
+#line 3051 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.BoolVal) = false; ;}
+    break;
+
+  case 236:
+#line 3052 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.BoolVal) = true; ;}
+    break;
+
+  case 237:
+#line 3057 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val)); ;}
+    break;
+
+  case 238:
+#line 3058 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val)); ;}
+    break;
+
+  case 239:
+#line 3059 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal)); ;}
+    break;
+
+  case 240:
+#line 3060 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { 
+    (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, true));
+    (yyval.ValIDVal).S.makeUnsigned();
+  ;}
+    break;
+
+  case 241:
+#line 3064 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { 
+    (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, false)); 
+    (yyval.ValIDVal).S.makeUnsigned();
+  ;}
+    break;
+
+  case 242:
+#line 3068 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ValIDVal) = ValID::createNull(); ;}
+    break;
+
+  case 243:
+#line 3069 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ValIDVal) = ValID::createUndef(); ;}
+    break;
+
+  case 244:
+#line 3070 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ValIDVal) = ValID::createZeroInit(); ;}
+    break;
+
+  case 245:
+#line 3071 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { // Nonempty unsized packed vector
+    const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0].C->getType();
+    int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
     VectorType* pt = VectorType::get(ETy, NumElements);
-    yyval.ValIDVal.S.makeComposite((*yyvsp[-1].ConstVector)[0].S);
-    PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, yyval.ValIDVal.S));
+    (yyval.ValIDVal).S.makeComposite((*(yyvsp[(2) - (3)].ConstVector))[0].S);
+    PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, (yyval.ValIDVal).S));
     
     // Verify all elements are correct type!
     std::vector<Constant*> Elems;
-    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
-      Constant *C = (*yyvsp[-1].ConstVector)[i].C;
+    for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) {
+      Constant *C = (*(yyvsp[(2) - (3)].ConstVector))[i].C;
       const Type *CTy = C->getType();
       if (ETy != CTy)
         error("Element #" + utostr(i) + " is not of type '" + 
@@ -4798,184 +5844,202 @@ case 244:
               CTy->getDescription() + "'");
       Elems.push_back(C);
     }
-    yyval.ValIDVal = ValID::create(ConstantVector::get(pt, Elems));
-    delete PTy; delete yyvsp[-1].ConstVector;
-  ;
-    break;}
-case 245:
-#line 3092 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal.C);
-    yyval.ValIDVal.S.copy(yyvsp[0].ConstVal.S);
-  ;
-    break;}
-case 246:
-#line 3096 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    char *End = UnEscapeLexed(yyvsp[-2].StrVal, true);
-    std::string AsmStr = std::string(yyvsp[-2].StrVal, End);
-    End = UnEscapeLexed(yyvsp[0].StrVal, true);
-    std::string Constraints = std::string(yyvsp[0].StrVal, End);
-    yyval.ValIDVal = ValID::createInlineAsm(AsmStr, Constraints, yyvsp[-3].BoolVal);
-    free(yyvsp[-2].StrVal);
-    free(yyvsp[0].StrVal);
-  ;
-    break;}
-case 247:
-#line 3111 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{  yyval.ValIDVal = ValID::create(yyvsp[0].SIntVal); yyval.ValIDVal.S.makeSignless(); ;
-    break;}
-case 248:
-#line 3112 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{  yyval.ValIDVal = ValID::create(yyvsp[0].StrVal); yyval.ValIDVal.S.makeSignless(); ;
-    break;}
-case 251:
-#line 3125 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ 
-    const Type *Ty = yyvsp[-1].TypeVal.PAT->get();
-    yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S);
-    yyval.ValueVal.V = getVal(Ty, yyvsp[0].ValIDVal); 
-    yyval.ValueVal.S.copy(yyvsp[-1].TypeVal.S);
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 252:
-#line 3135 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.FunctionVal = yyvsp[-1].FunctionVal;
-  ;
-    break;}
-case 253:
-#line 3138 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ // Do not allow functions with 0 basic blocks   
-    yyval.FunctionVal = yyvsp[-1].FunctionVal;
-  ;
-    break;}
-case 254:
-#line 3147 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    ValueInfo VI; VI.V = yyvsp[0].TermInstVal.TI; VI.S.copy(yyvsp[0].TermInstVal.S);
-    setValueName(VI, yyvsp[-1].StrVal);
-    InsertValue(yyvsp[0].TermInstVal.TI);
-    yyvsp[-2].BasicBlockVal->getInstList().push_back(yyvsp[0].TermInstVal.TI);
-    InsertValue(yyvsp[-2].BasicBlockVal);
-    yyval.BasicBlockVal = yyvsp[-2].BasicBlockVal;
-  ;
-    break;}
-case 255:
-#line 3158 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (yyvsp[0].InstVal.I)
-      yyvsp[-1].BasicBlockVal->getInstList().push_back(yyvsp[0].InstVal.I);
-    yyval.BasicBlockVal = yyvsp[-1].BasicBlockVal;
-  ;
-    break;}
-case 256:
-#line 3163 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.BasicBlockVal = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),true);
+    (yyval.ValIDVal) = ValID::create(ConstantVector::get(pt, Elems));
+    delete PTy; delete (yyvsp[(2) - (3)].ConstVector);
+  ;}
+    break;
+
+  case 246:
+#line 3092 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal).C);
+    (yyval.ValIDVal).S.copy((yyvsp[(1) - (1)].ConstVal).S);
+  ;}
+    break;
+
+  case 247:
+#line 3096 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    char *End = UnEscapeLexed((yyvsp[(3) - (5)].StrVal), true);
+    std::string AsmStr = std::string((yyvsp[(3) - (5)].StrVal), End);
+    End = UnEscapeLexed((yyvsp[(5) - (5)].StrVal), true);
+    std::string Constraints = std::string((yyvsp[(5) - (5)].StrVal), End);
+    (yyval.ValIDVal) = ValID::createInlineAsm(AsmStr, Constraints, (yyvsp[(2) - (5)].BoolVal));
+    free((yyvsp[(3) - (5)].StrVal));
+    free((yyvsp[(5) - (5)].StrVal));
+  ;}
+    break;
+
+  case 248:
+#line 3111 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {  (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SIntVal)); (yyval.ValIDVal).S.makeSignless(); ;}
+    break;
+
+  case 249:
+#line 3112 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {  (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].StrVal)); (yyval.ValIDVal).S.makeSignless(); ;}
+    break;
+
+  case 252:
+#line 3125 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { 
+    const Type *Ty = (yyvsp[(1) - (2)].TypeVal).PAT->get();
+    (yyvsp[(2) - (2)].ValIDVal).S.copy((yyvsp[(1) - (2)].TypeVal).S);
+    (yyval.ValueVal).V = getVal(Ty, (yyvsp[(2) - (2)].ValIDVal)); 
+    (yyval.ValueVal).S.copy((yyvsp[(1) - (2)].TypeVal).S);
+    delete (yyvsp[(1) - (2)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 253:
+#line 3135 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
+  ;}
+    break;
+
+  case 254:
+#line 3138 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { // Do not allow functions with 0 basic blocks   
+    (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
+  ;}
+    break;
+
+  case 255:
+#line 3147 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    ValueInfo VI; VI.V = (yyvsp[(3) - (3)].TermInstVal).TI; VI.S.copy((yyvsp[(3) - (3)].TermInstVal).S);
+    setValueName(VI, (yyvsp[(2) - (3)].StrVal));
+    InsertValue((yyvsp[(3) - (3)].TermInstVal).TI);
+    (yyvsp[(1) - (3)].BasicBlockVal)->getInstList().push_back((yyvsp[(3) - (3)].TermInstVal).TI);
+    InsertValue((yyvsp[(1) - (3)].BasicBlockVal));
+    (yyval.BasicBlockVal) = (yyvsp[(1) - (3)].BasicBlockVal);
+  ;}
+    break;
+
+  case 256:
+#line 3158 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if ((yyvsp[(2) - (2)].InstVal).I)
+      (yyvsp[(1) - (2)].BasicBlockVal)->getInstList().push_back((yyvsp[(2) - (2)].InstVal).I);
+    (yyval.BasicBlockVal) = (yyvsp[(1) - (2)].BasicBlockVal);
+  ;}
+    break;
+
+  case 257:
+#line 3163 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),true);
     // Make sure to move the basic block to the correct location in the
     // function, instead of leaving it inserted wherever it was first
     // referenced.
     Function::BasicBlockListType &BBL = 
       CurFun.CurrentFunction->getBasicBlockList();
-    BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal);
-  ;
-    break;}
-case 257:
-#line 3172 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.BasicBlockVal = CurBB = getBBVal(ValID::create(yyvsp[0].StrVal), true);
+    BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal));
+  ;}
+    break;
+
+  case 258:
+#line 3172 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[(1) - (1)].StrVal)), true);
     // Make sure to move the basic block to the correct location in the
     // function, instead of leaving it inserted wherever it was first
     // referenced.
     Function::BasicBlockListType &BBL = 
       CurFun.CurrentFunction->getBasicBlockList();
-    BBL.splice(BBL.end(), BBL, yyval.BasicBlockVal);
-  ;
-    break;}
-case 260:
-#line 3186 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{              // Return with a result...
-    yyval.TermInstVal.TI = new ReturnInst(yyvsp[0].ValueVal.V);
-    yyval.TermInstVal.S.makeSignless();
-  ;
-    break;}
-case 261:
-#line 3190 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{                                       // Return with no result...
-    yyval.TermInstVal.TI = new ReturnInst();
-    yyval.TermInstVal.S.makeSignless();
-  ;
-    break;}
-case 262:
-#line 3194 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{                         // Unconditional Branch...
-    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
-    yyval.TermInstVal.TI = new BranchInst(tmpBB);
-    yyval.TermInstVal.S.makeSignless();
-  ;
-    break;}
-case 263:
-#line 3199 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{  
-    yyvsp[-3].ValIDVal.S.makeSignless();
-    yyvsp[0].ValIDVal.S.makeSignless();
-    BasicBlock* tmpBBA = getBBVal(yyvsp[-3].ValIDVal);
-    BasicBlock* tmpBBB = getBBVal(yyvsp[0].ValIDVal);
-    yyvsp[-6].ValIDVal.S.makeUnsigned();
-    Value* tmpVal = getVal(Type::Int1Ty, yyvsp[-6].ValIDVal);
-    yyval.TermInstVal.TI = new BranchInst(tmpBBA, tmpBBB, tmpVal);
-    yyval.TermInstVal.S.makeSignless();
-  ;
-    break;}
-case 264:
-#line 3209 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyvsp[-6].ValIDVal.S.copy(yyvsp[-7].PrimType.S);
-    Value* tmpVal = getVal(yyvsp[-7].PrimType.T, yyvsp[-6].ValIDVal);
-    yyvsp[-3].ValIDVal.S.makeSignless();
-    BasicBlock* tmpBB = getBBVal(yyvsp[-3].ValIDVal);
-    SwitchInst *S = new SwitchInst(tmpVal, tmpBB, yyvsp[-1].JumpTable->size());
-    yyval.TermInstVal.TI = S;
-    yyval.TermInstVal.S.makeSignless();
-    std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = yyvsp[-1].JumpTable->begin(),
-      E = yyvsp[-1].JumpTable->end();
+    BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal));
+  ;}
+    break;
+
+  case 261:
+#line 3186 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {              // Return with a result...
+    (yyval.TermInstVal).TI = new ReturnInst((yyvsp[(2) - (2)].ValueVal).V);
+    (yyval.TermInstVal).S.makeSignless();
+  ;}
+    break;
+
+  case 262:
+#line 3190 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {                                       // Return with no result...
+    (yyval.TermInstVal).TI = new ReturnInst();
+    (yyval.TermInstVal).S.makeSignless();
+  ;}
+    break;
+
+  case 263:
+#line 3194 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {                         // Unconditional Branch...
+    BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
+    (yyval.TermInstVal).TI = new BranchInst(tmpBB);
+    (yyval.TermInstVal).S.makeSignless();
+  ;}
+    break;
+
+  case 264:
+#line 3199 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {  
+    (yyvsp[(6) - (9)].ValIDVal).S.makeSignless();
+    (yyvsp[(9) - (9)].ValIDVal).S.makeSignless();
+    BasicBlock* tmpBBA = getBBVal((yyvsp[(6) - (9)].ValIDVal));
+    BasicBlock* tmpBBB = getBBVal((yyvsp[(9) - (9)].ValIDVal));
+    (yyvsp[(3) - (9)].ValIDVal).S.makeUnsigned();
+    Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[(3) - (9)].ValIDVal));
+    (yyval.TermInstVal).TI = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+    (yyval.TermInstVal).S.makeSignless();
+  ;}
+    break;
+
+  case 265:
+#line 3209 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyvsp[(3) - (9)].ValIDVal).S.copy((yyvsp[(2) - (9)].PrimType).S);
+    Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType).T, (yyvsp[(3) - (9)].ValIDVal));
+    (yyvsp[(6) - (9)].ValIDVal).S.makeSignless();
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (9)].ValIDVal));
+    SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp[(8) - (9)].JumpTable)->size());
+    (yyval.TermInstVal).TI = S;
+    (yyval.TermInstVal).S.makeSignless();
+    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
         error("Switch case is constant, but not a simple integer");
     }
-    delete yyvsp[-1].JumpTable;
-  ;
-    break;}
-case 265:
-#line 3227 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyvsp[-5].ValIDVal.S.copy(yyvsp[-6].PrimType.S);
-    Value* tmpVal = getVal(yyvsp[-6].PrimType.T, yyvsp[-5].ValIDVal);
-    yyvsp[-2].ValIDVal.S.makeSignless();
-    BasicBlock* tmpBB = getBBVal(yyvsp[-2].ValIDVal);
+    delete (yyvsp[(8) - (9)].JumpTable);
+  ;}
+    break;
+
+  case 266:
+#line 3227 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyvsp[(3) - (8)].ValIDVal).S.copy((yyvsp[(2) - (8)].PrimType).S);
+    Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType).T, (yyvsp[(3) - (8)].ValIDVal));
+    (yyvsp[(6) - (8)].ValIDVal).S.makeSignless();
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (8)].ValIDVal));
     SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
-    yyval.TermInstVal.TI = S;
-    yyval.TermInstVal.S.makeSignless();
-  ;
-    break;}
-case 266:
-#line 3237 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+    (yyval.TermInstVal).TI = S;
+    (yyval.TermInstVal).S.makeSignless();
+  ;}
+    break;
+
+  case 267:
+#line 3237 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
     const PointerType *PFTy;
     const FunctionType *Ty;
     Signedness FTySign;
 
-    if (!(PFTy = dyn_cast<PointerType>(yyvsp[-10].TypeVal.PAT->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>((yyvsp[(3) - (13)].TypeVal).PAT->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
-      FTySign.makeComposite(yyvsp[-10].TypeVal.S);
-      if (yyvsp[-7].ValueList) {
-        for (std::vector<ValueInfo>::iterator I = yyvsp[-7].ValueList->begin(), E = yyvsp[-7].ValueList->end();
+      FTySign.makeComposite((yyvsp[(3) - (13)].TypeVal).S);
+      if ((yyvsp[(6) - (13)].ValueList)) {
+        for (std::vector<ValueInfo>::iterator I = (yyvsp[(6) - (13)].ValueList)->begin(), E = (yyvsp[(6) - (13)].ValueList)->end();
              I != E; ++I) {
           ParamTypes.push_back((*I).V->getType());
           FTySign.add(I->S);
@@ -4983,33 +6047,33 @@ case 266:
       }
       bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy;
       if (isVarArg) ParamTypes.pop_back();
-      Ty = FunctionType::get(yyvsp[-10].TypeVal.PAT->get(), ParamTypes, isVarArg);
+      Ty = FunctionType::get((yyvsp[(3) - (13)].TypeVal).PAT->get(), ParamTypes, isVarArg);
       PFTy = PointerType::getUnqual(Ty);
-      yyval.TermInstVal.S.copy(yyvsp[-10].TypeVal.S);
+      (yyval.TermInstVal).S.copy((yyvsp[(3) - (13)].TypeVal).S);
     } else {
-      FTySign = yyvsp[-10].TypeVal.S;
+      FTySign = (yyvsp[(3) - (13)].TypeVal).S;
       // Get the signedness of the result type. $3 is the pointer to the
       // function type so we get the 0th element to extract the function type,
       // and then the 0th element again to get the result type.
-      yyval.TermInstVal.S.copy(yyvsp[-10].TypeVal.S.get(0).get(0)); 
+      (yyval.TermInstVal).S.copy((yyvsp[(3) - (13)].TypeVal).S.get(0).get(0)); 
     }
 
-    yyvsp[-9].ValIDVal.S.makeComposite(FTySign);
-    Value *V = getVal(PFTy, yyvsp[-9].ValIDVal);   // Get the function we're calling...
-    BasicBlock *Normal = getBBVal(yyvsp[-3].ValIDVal);
-    BasicBlock *Except = getBBVal(yyvsp[0].ValIDVal);
+    (yyvsp[(4) - (13)].ValIDVal).S.makeComposite(FTySign);
+    Value *V = getVal(PFTy, (yyvsp[(4) - (13)].ValIDVal));   // Get the function we're calling...
+    BasicBlock *Normal = getBBVal((yyvsp[(10) - (13)].ValIDVal));
+    BasicBlock *Except = getBBVal((yyvsp[(13) - (13)].ValIDVal));
 
     // Create the call node...
-    if (!yyvsp[-7].ValueList) {                                   // Has no arguments?
+    if (!(yyvsp[(6) - (13)].ValueList)) {                                   // Has no arguments?
       std::vector<Value*> Args;
-      yyval.TermInstVal.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end());
+      (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end());
     } else {                                     // Has arguments?
       // Loop through FunctionType's arguments and ensure they are specified
       // correctly!
       //
       FunctionType::param_iterator I = Ty->param_begin();
       FunctionType::param_iterator E = Ty->param_end();
-      std::vector<ValueInfo>::iterator ArgI = yyvsp[-7].ValueList->begin(), ArgE = yyvsp[-7].ValueList->end();
+      std::vector<ValueInfo>::iterator ArgI = (yyvsp[(6) - (13)].ValueList)->begin(), ArgE = (yyvsp[(6) - (13)].ValueList)->end();
 
       std::vector<Value*> Args;
       for (; ArgI != ArgE && I != E; ++ArgI, ++I) {
@@ -5022,73 +6086,78 @@ case 266:
       if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
         error("Invalid number of parameters detected");
 
-      yyval.TermInstVal.TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end());
+      (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except, Args.begin(), Args.end());
     }
-    cast<InvokeInst>(yyval.TermInstVal.TI)->setCallingConv(upgradeCallingConv(yyvsp[-11].UIntVal));
-    if (yyvsp[-11].UIntVal == OldCallingConv::CSRet) {
+    cast<InvokeInst>((yyval.TermInstVal).TI)->setCallingConv(upgradeCallingConv((yyvsp[(2) - (13)].UIntVal)));
+    if ((yyvsp[(2) - (13)].UIntVal) == OldCallingConv::CSRet) {
       ParamAttrsVector Attrs;
       ParamAttrsWithIndex PAWI;
       PAWI.index = 1;  PAWI.attrs = ParamAttr::StructRet; // first arg
       Attrs.push_back(PAWI);
-      cast<InvokeInst>(yyval.TermInstVal.TI)->setParamAttrs(ParamAttrsList::get(Attrs));
+      cast<InvokeInst>((yyval.TermInstVal).TI)->setParamAttrs(ParamAttrsList::get(Attrs));
     }
-    delete yyvsp[-10].TypeVal.PAT;
-    delete yyvsp[-7].ValueList;
+    delete (yyvsp[(3) - (13)].TypeVal).PAT;
+    delete (yyvsp[(6) - (13)].ValueList);
     lastCallingConv = OldCallingConv::C;
-  ;
-    break;}
-case 267:
-#line 3309 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.TermInstVal.TI = new UnwindInst();
-    yyval.TermInstVal.S.makeSignless();
-  ;
-    break;}
-case 268:
-#line 3313 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.TermInstVal.TI = new UnreachableInst();
-    yyval.TermInstVal.S.makeSignless();
-  ;
-    break;}
-case 269:
-#line 3320 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.JumpTable = yyvsp[-5].JumpTable;
-    yyvsp[-3].ValIDVal.S.copy(yyvsp[-4].PrimType.S);
-    Constant *V = cast<Constant>(getExistingValue(yyvsp[-4].PrimType.T, yyvsp[-3].ValIDVal));
+  ;}
+    break;
+
+  case 268:
+#line 3309 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.TermInstVal).TI = new UnwindInst();
+    (yyval.TermInstVal).S.makeSignless();
+  ;}
+    break;
+
+  case 269:
+#line 3313 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.TermInstVal).TI = new UnreachableInst();
+    (yyval.TermInstVal).S.makeSignless();
+  ;}
+    break;
+
+  case 270:
+#line 3320 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
+    (yyvsp[(3) - (6)].ValIDVal).S.copy((yyvsp[(2) - (6)].PrimType).S);
+    Constant *V = cast<Constant>(getExistingValue((yyvsp[(2) - (6)].PrimType).T, (yyvsp[(3) - (6)].ValIDVal)));
     
     if (V == 0)
       error("May only switch on a constant pool value");
 
-    yyvsp[0].ValIDVal.S.makeSignless();
-    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
-    yyval.JumpTable->push_back(std::make_pair(V, tmpBB));
-  ;
-    break;}
-case 270:
-#line 3332 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.JumpTable = new std::vector<std::pair<Constant*, BasicBlock*> >();
-    yyvsp[-3].ValIDVal.S.copy(yyvsp[-4].PrimType.S);
-    Constant *V = cast<Constant>(getExistingValue(yyvsp[-4].PrimType.T, yyvsp[-3].ValIDVal));
+    (yyvsp[(6) - (6)].ValIDVal).S.makeSignless();
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (6)].ValIDVal));
+    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
+  ;}
+    break;
+
+  case 271:
+#line 3332 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
+    (yyvsp[(2) - (5)].ValIDVal).S.copy((yyvsp[(1) - (5)].PrimType).S);
+    Constant *V = cast<Constant>(getExistingValue((yyvsp[(1) - (5)].PrimType).T, (yyvsp[(2) - (5)].ValIDVal)));
 
     if (V == 0)
       error("May only switch on a constant pool value");
 
-    yyvsp[0].ValIDVal.S.makeSignless();
-    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
-    yyval.JumpTable->push_back(std::make_pair(V, tmpBB)); 
-  ;
-    break;}
-case 271:
-#line 3347 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+    (yyvsp[(5) - (5)].ValIDVal).S.makeSignless();
+    BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (5)].ValIDVal));
+    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); 
+  ;}
+    break;
+
+  case 272:
+#line 3347 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
     bool omit = false;
-    if (yyvsp[-1].StrVal)
-      if (BitCastInst *BCI = dyn_cast<BitCastInst>(yyvsp[0].InstVal.I))
+    if ((yyvsp[(1) - (2)].StrVal))
+      if (BitCastInst *BCI = dyn_cast<BitCastInst>((yyvsp[(2) - (2)].InstVal).I))
         if (BCI->getSrcTy() == BCI->getDestTy() && 
-            BCI->getOperand(0)->getName() == yyvsp[-1].StrVal)
+            BCI->getOperand(0)->getName() == (yyvsp[(1) - (2)].StrVal))
           // This is a useless bit cast causing a name redefinition. It is
           // a bit cast from a type to the same type of an operand with the
           // same name as the name we would give this instruction. Since this
@@ -5103,240 +6172,258 @@ case 271:
           // The bitcast is clearly useless so we omit it.
           omit = true;
     if (omit) {
-      yyval.InstVal.I = 0;
-      yyval.InstVal.S.makeSignless();
+      (yyval.InstVal).I = 0;
+      (yyval.InstVal).S.makeSignless();
     } else {
-      ValueInfo VI; VI.V = yyvsp[0].InstVal.I; VI.S.copy(yyvsp[0].InstVal.S);
-      setValueName(VI, yyvsp[-1].StrVal);
-      InsertValue(yyvsp[0].InstVal.I);
-      yyval.InstVal = yyvsp[0].InstVal;
+      ValueInfo VI; VI.V = (yyvsp[(2) - (2)].InstVal).I; VI.S.copy((yyvsp[(2) - (2)].InstVal).S);
+      setValueName(VI, (yyvsp[(1) - (2)].StrVal));
+      InsertValue((yyvsp[(2) - (2)].InstVal).I);
+      (yyval.InstVal) = (yyvsp[(2) - (2)].InstVal);
     }
-  ;
-    break;}
-case 272:
-#line 3377 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{    // Used for PHI nodes
-    yyval.PHIList.P = new std::list<std::pair<Value*, BasicBlock*> >();
-    yyval.PHIList.S.copy(yyvsp[-5].TypeVal.S);
-    yyvsp[-3].ValIDVal.S.copy(yyvsp[-5].TypeVal.S);
-    Value* tmpVal = getVal(yyvsp[-5].TypeVal.PAT->get(), yyvsp[-3].ValIDVal);
-    yyvsp[-1].ValIDVal.S.makeSignless();
-    BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal);
-    yyval.PHIList.P->push_back(std::make_pair(tmpVal, tmpBB));
-    delete yyvsp[-5].TypeVal.PAT;
-  ;
-    break;}
-case 273:
-#line 3387 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.PHIList = yyvsp[-6].PHIList;
-    yyvsp[-3].ValIDVal.S.copy(yyvsp[-6].PHIList.S);
-    Value* tmpVal = getVal(yyvsp[-6].PHIList.P->front().first->getType(), yyvsp[-3].ValIDVal);
-    yyvsp[-1].ValIDVal.S.makeSignless();
-    BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal);
-    yyvsp[-6].PHIList.P->push_back(std::make_pair(tmpVal, tmpBB));
-  ;
-    break;}
-case 274:
-#line 3397 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{    // Used for call statements, and memory insts...
-    yyval.ValueList = new std::vector<ValueInfo>();
-    yyval.ValueList->push_back(yyvsp[0].ValueVal);
-  ;
-    break;}
-case 275:
-#line 3401 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.ValueList = yyvsp[-2].ValueList;
-    yyvsp[-2].ValueList->push_back(yyvsp[0].ValueVal);
-  ;
-    break;}
-case 277:
-#line 3409 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ValueList = 0; ;
-    break;}
-case 278:
-#line 3413 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.BoolVal = true;
-  ;
-    break;}
-case 279:
-#line 3416 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.BoolVal = false;
-  ;
-    break;}
-case 280:
-#line 3422 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S);
-    yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S);
-    const Type* Ty = yyvsp[-3].TypeVal.PAT->get();
+  ;}
+    break;
+
+  case 273:
+#line 3377 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {    // Used for PHI nodes
+    (yyval.PHIList).P = new std::list<std::pair<Value*, BasicBlock*> >();
+    (yyval.PHIList).S.copy((yyvsp[(1) - (6)].TypeVal).S);
+    (yyvsp[(3) - (6)].ValIDVal).S.copy((yyvsp[(1) - (6)].TypeVal).S);
+    Value* tmpVal = getVal((yyvsp[(1) - (6)].TypeVal).PAT->get(), (yyvsp[(3) - (6)].ValIDVal));
+    (yyvsp[(5) - (6)].ValIDVal).S.makeSignless();
+    BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (6)].ValIDVal));
+    (yyval.PHIList).P->push_back(std::make_pair(tmpVal, tmpBB));
+    delete (yyvsp[(1) - (6)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 274:
+#line 3387 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList);
+    (yyvsp[(4) - (7)].ValIDVal).S.copy((yyvsp[(1) - (7)].PHIList).S);
+    Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList).P->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal));
+    (yyvsp[(6) - (7)].ValIDVal).S.makeSignless();
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (7)].ValIDVal));
+    (yyvsp[(1) - (7)].PHIList).P->push_back(std::make_pair(tmpVal, tmpBB));
+  ;}
+    break;
+
+  case 275:
+#line 3397 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {    // Used for call statements, and memory insts...
+    (yyval.ValueList) = new std::vector<ValueInfo>();
+    (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal));
+  ;}
+    break;
+
+  case 276:
+#line 3401 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
+    (yyvsp[(1) - (3)].ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
+  ;}
+    break;
+
+  case 278:
+#line 3409 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ValueList) = 0; ;}
+    break;
+
+  case 279:
+#line 3413 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.BoolVal) = true;
+  ;}
+    break;
+
+  case 280:
+#line 3416 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.BoolVal) = false;
+  ;}
+    break;
+
+  case 281:
+#line 3422 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyvsp[(3) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S);
+    (yyvsp[(5) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S);
+    const Type* Ty = (yyvsp[(2) - (5)].TypeVal).PAT->get();
     if (!Ty->isInteger() && !Ty->isFloatingPoint() && !isa<VectorType>(Ty))
       error("Arithmetic operator requires integer, FP, or packed operands");
     if (isa<VectorType>(Ty) && 
-        (yyvsp[-4].BinaryOpVal == URemOp || yyvsp[-4].BinaryOpVal == SRemOp || yyvsp[-4].BinaryOpVal == FRemOp || yyvsp[-4].BinaryOpVal == RemOp))
+        ((yyvsp[(1) - (5)].BinaryOpVal) == URemOp || (yyvsp[(1) - (5)].BinaryOpVal) == SRemOp || (yyvsp[(1) - (5)].BinaryOpVal) == FRemOp || (yyvsp[(1) - (5)].BinaryOpVal) == RemOp))
       error("Remainder not supported on vector types");
     // Upgrade the opcode from obsolete versions before we do anything with it.
-    Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-4].BinaryOpVal, Ty, yyvsp[-3].TypeVal.S);
-    Value* val1 = getVal(Ty, yyvsp[-2].ValIDVal); 
-    Value* val2 = getVal(Ty, yyvsp[0].ValIDVal);
-    yyval.InstVal.I = BinaryOperator::create(Opcode, val1, val2);
-    if (yyval.InstVal.I == 0)
+    Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[(1) - (5)].BinaryOpVal), Ty, (yyvsp[(2) - (5)].TypeVal).S);
+    Value* val1 = getVal(Ty, (yyvsp[(3) - (5)].ValIDVal)); 
+    Value* val2 = getVal(Ty, (yyvsp[(5) - (5)].ValIDVal));
+    (yyval.InstVal).I = BinaryOperator::create(Opcode, val1, val2);
+    if ((yyval.InstVal).I == 0)
       error("binary operator returned null");
-    yyval.InstVal.S.copy(yyvsp[-3].TypeVal.S);
-    delete yyvsp[-3].TypeVal.PAT;
-  ;
-    break;}
-case 281:
-#line 3441 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S);
-    yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S);
-    const Type *Ty = yyvsp[-3].TypeVal.PAT->get();
+    (yyval.InstVal).S.copy((yyvsp[(2) - (5)].TypeVal).S);
+    delete (yyvsp[(2) - (5)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 282:
+#line 3441 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyvsp[(3) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S);
+    (yyvsp[(5) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S);
+    const Type *Ty = (yyvsp[(2) - (5)].TypeVal).PAT->get();
     if (!Ty->isInteger()) {
       if (!isa<VectorType>(Ty) ||
           !cast<VectorType>(Ty)->getElementType()->isInteger())
         error("Logical operator requires integral operands");
     }
-    Instruction::BinaryOps Opcode = getBinaryOp(yyvsp[-4].BinaryOpVal, Ty, yyvsp[-3].TypeVal.S);
-    Value* tmpVal1 = getVal(Ty, yyvsp[-2].ValIDVal);
-    Value* tmpVal2 = getVal(Ty, yyvsp[0].ValIDVal);
-    yyval.InstVal.I = BinaryOperator::create(Opcode, tmpVal1, tmpVal2);
-    if (yyval.InstVal.I == 0)
+    Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[(1) - (5)].BinaryOpVal), Ty, (yyvsp[(2) - (5)].TypeVal).S);
+    Value* tmpVal1 = getVal(Ty, (yyvsp[(3) - (5)].ValIDVal));
+    Value* tmpVal2 = getVal(Ty, (yyvsp[(5) - (5)].ValIDVal));
+    (yyval.InstVal).I = BinaryOperator::create(Opcode, tmpVal1, tmpVal2);
+    if ((yyval.InstVal).I == 0)
       error("binary operator returned null");
-    yyval.InstVal.S.copy(yyvsp[-3].TypeVal.S);
-    delete yyvsp[-3].TypeVal.PAT;
-  ;
-    break;}
-case 282:
-#line 3459 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S);
-    yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S);
-    const Type* Ty = yyvsp[-3].TypeVal.PAT->get();
+    (yyval.InstVal).S.copy((yyvsp[(2) - (5)].TypeVal).S);
+    delete (yyvsp[(2) - (5)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 283:
+#line 3459 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyvsp[(3) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S);
+    (yyvsp[(5) - (5)].ValIDVal).S.copy((yyvsp[(2) - (5)].TypeVal).S);
+    const Type* Ty = (yyvsp[(2) - (5)].TypeVal).PAT->get();
     if(isa<VectorType>(Ty))
       error("VectorTypes currently not supported in setcc instructions");
     unsigned short pred;
-    Instruction::OtherOps Opcode = getCompareOp(yyvsp[-4].BinaryOpVal, pred, Ty, yyvsp[-3].TypeVal.S);
-    Value* tmpVal1 = getVal(Ty, yyvsp[-2].ValIDVal);
-    Value* tmpVal2 = getVal(Ty, yyvsp[0].ValIDVal);
-    yyval.InstVal.I = CmpInst::create(Opcode, pred, tmpVal1, tmpVal2);
-    if (yyval.InstVal.I == 0)
+    Instruction::OtherOps Opcode = getCompareOp((yyvsp[(1) - (5)].BinaryOpVal), pred, Ty, (yyvsp[(2) - (5)].TypeVal).S);
+    Value* tmpVal1 = getVal(Ty, (yyvsp[(3) - (5)].ValIDVal));
+    Value* tmpVal2 = getVal(Ty, (yyvsp[(5) - (5)].ValIDVal));
+    (yyval.InstVal).I = CmpInst::create(Opcode, pred, tmpVal1, tmpVal2);
+    if ((yyval.InstVal).I == 0)
       error("binary operator returned null");
-    yyval.InstVal.S.makeUnsigned();
-    delete yyvsp[-3].TypeVal.PAT;
-  ;
-    break;}
-case 283:
-#line 3475 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S);
-    yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S);
-    const Type *Ty = yyvsp[-3].TypeVal.PAT->get();
+    (yyval.InstVal).S.makeUnsigned();
+    delete (yyvsp[(2) - (5)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 284:
+#line 3475 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyvsp[(4) - (6)].ValIDVal).S.copy((yyvsp[(3) - (6)].TypeVal).S);
+    (yyvsp[(6) - (6)].ValIDVal).S.copy((yyvsp[(3) - (6)].TypeVal).S);
+    const Type *Ty = (yyvsp[(3) - (6)].TypeVal).PAT->get();
     if (isa<VectorType>(Ty)) 
       error("VectorTypes currently not supported in icmp instructions");
     else if (!Ty->isInteger() && !isa<PointerType>(Ty))
       error("icmp requires integer or pointer typed operands");
-    Value* tmpVal1 = getVal(Ty, yyvsp[-2].ValIDVal);
-    Value* tmpVal2 = getVal(Ty, yyvsp[0].ValIDVal);
-    yyval.InstVal.I = new ICmpInst(yyvsp[-4].IPred, tmpVal1, tmpVal2);
-    yyval.InstVal.S.makeUnsigned();
-    delete yyvsp[-3].TypeVal.PAT;
-  ;
-    break;}
-case 284:
-#line 3489 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyvsp[-2].ValIDVal.S.copy(yyvsp[-3].TypeVal.S);
-    yyvsp[0].ValIDVal.S.copy(yyvsp[-3].TypeVal.S);
-    const Type *Ty = yyvsp[-3].TypeVal.PAT->get();
+    Value* tmpVal1 = getVal(Ty, (yyvsp[(4) - (6)].ValIDVal));
+    Value* tmpVal2 = getVal(Ty, (yyvsp[(6) - (6)].ValIDVal));
+    (yyval.InstVal).I = new ICmpInst((yyvsp[(2) - (6)].IPred), tmpVal1, tmpVal2);
+    (yyval.InstVal).S.makeUnsigned();
+    delete (yyvsp[(3) - (6)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 285:
+#line 3489 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyvsp[(4) - (6)].ValIDVal).S.copy((yyvsp[(3) - (6)].TypeVal).S);
+    (yyvsp[(6) - (6)].ValIDVal).S.copy((yyvsp[(3) - (6)].TypeVal).S);
+    const Type *Ty = (yyvsp[(3) - (6)].TypeVal).PAT->get();
     if (isa<VectorType>(Ty))
       error("VectorTypes currently not supported in fcmp instructions");
     else if (!Ty->isFloatingPoint())
       error("fcmp instruction requires floating point operands");
-    Value* tmpVal1 = getVal(Ty, yyvsp[-2].ValIDVal);
-    Value* tmpVal2 = getVal(Ty, yyvsp[0].ValIDVal);
-    yyval.InstVal.I = new FCmpInst(yyvsp[-4].FPred, tmpVal1, tmpVal2);
-    yyval.InstVal.S.makeUnsigned();
-    delete yyvsp[-3].TypeVal.PAT;
-  ;
-    break;}
-case 285:
-#line 3503 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+    Value* tmpVal1 = getVal(Ty, (yyvsp[(4) - (6)].ValIDVal));
+    Value* tmpVal2 = getVal(Ty, (yyvsp[(6) - (6)].ValIDVal));
+    (yyval.InstVal).I = new FCmpInst((yyvsp[(2) - (6)].FPred), tmpVal1, tmpVal2);
+    (yyval.InstVal).S.makeUnsigned();
+    delete (yyvsp[(3) - (6)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 286:
+#line 3503 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
     warning("Use of obsolete 'not' instruction: Replacing with 'xor");
-    const Type *Ty = yyvsp[0].ValueVal.V->getType();
+    const Type *Ty = (yyvsp[(2) - (2)].ValueVal).V->getType();
     Value *Ones = ConstantInt::getAllOnesValue(Ty);
     if (Ones == 0)
       error("Expected integral type for not instruction");
-    yyval.InstVal.I = BinaryOperator::create(Instruction::Xor, yyvsp[0].ValueVal.V, Ones);
-    if (yyval.InstVal.I == 0)
+    (yyval.InstVal).I = BinaryOperator::create(Instruction::Xor, (yyvsp[(2) - (2)].ValueVal).V, Ones);
+    if ((yyval.InstVal).I == 0)
       error("Could not create a xor instruction");
-    yyval.InstVal.S.copy(yyvsp[0].ValueVal.S);
-  ;
-    break;}
-case 286:
-#line 3514 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (!yyvsp[0].ValueVal.V->getType()->isInteger() ||
-        cast<IntegerType>(yyvsp[0].ValueVal.V->getType())->getBitWidth() != 8)
+    (yyval.InstVal).S.copy((yyvsp[(2) - (2)].ValueVal).S);
+  ;}
+    break;
+
+  case 287:
+#line 3514 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if (!(yyvsp[(4) - (4)].ValueVal).V->getType()->isInteger() ||
+        cast<IntegerType>((yyvsp[(4) - (4)].ValueVal).V->getType())->getBitWidth() != 8)
       error("Shift amount must be int8");
-    const Type* Ty = yyvsp[-2].ValueVal.V->getType();
+    const Type* Ty = (yyvsp[(2) - (4)].ValueVal).V->getType();
     if (!Ty->isInteger())
       error("Shift constant expression requires integer operand");
     Value* ShiftAmt = 0;
     if (cast<IntegerType>(Ty)->getBitWidth() > Type::Int8Ty->getBitWidth())
-      if (Constant *C = dyn_cast<Constant>(yyvsp[0].ValueVal.V))
+      if (Constant *C = dyn_cast<Constant>((yyvsp[(4) - (4)].ValueVal).V))
         ShiftAmt = ConstantExpr::getZExt(C, Ty);
       else
-        ShiftAmt = new ZExtInst(yyvsp[0].ValueVal.V, Ty, makeNameUnique("shift"), CurBB);
+        ShiftAmt = new ZExtInst((yyvsp[(4) - (4)].ValueVal).V, Ty, makeNameUnique("shift"), CurBB);
     else
-      ShiftAmt = yyvsp[0].ValueVal.V;
-    yyval.InstVal.I = BinaryOperator::create(getBinaryOp(yyvsp[-3].BinaryOpVal, Ty, yyvsp[-2].ValueVal.S), yyvsp[-2].ValueVal.V, ShiftAmt);
-    yyval.InstVal.S.copy(yyvsp[-2].ValueVal.S);
-  ;
-    break;}
-case 287:
-#line 3532 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *DstTy = yyvsp[0].TypeVal.PAT->get();
+      ShiftAmt = (yyvsp[(4) - (4)].ValueVal).V;
+    (yyval.InstVal).I = BinaryOperator::create(getBinaryOp((yyvsp[(1) - (4)].BinaryOpVal), Ty, (yyvsp[(2) - (4)].ValueVal).S), (yyvsp[(2) - (4)].ValueVal).V, ShiftAmt);
+    (yyval.InstVal).S.copy((yyvsp[(2) - (4)].ValueVal).S);
+  ;}
+    break;
+
+  case 288:
+#line 3532 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *DstTy = (yyvsp[(4) - (4)].TypeVal).PAT->get();
     if (!DstTy->isFirstClassType())
       error("cast instruction to a non-primitive type: '" +
             DstTy->getDescription() + "'");
-    yyval.InstVal.I = cast<Instruction>(getCast(yyvsp[-3].CastOpVal, yyvsp[-2].ValueVal.V, yyvsp[-2].ValueVal.S, DstTy, yyvsp[0].TypeVal.S, true));
-    yyval.InstVal.S.copy(yyvsp[0].TypeVal.S);
-    delete yyvsp[0].TypeVal.PAT;
-  ;
-    break;}
-case 288:
-#line 3541 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (!yyvsp[-4].ValueVal.V->getType()->isInteger() ||
-        cast<IntegerType>(yyvsp[-4].ValueVal.V->getType())->getBitWidth() != 1)
+    (yyval.InstVal).I = cast<Instruction>(getCast((yyvsp[(1) - (4)].CastOpVal), (yyvsp[(2) - (4)].ValueVal).V, (yyvsp[(2) - (4)].ValueVal).S, DstTy, (yyvsp[(4) - (4)].TypeVal).S, true));
+    (yyval.InstVal).S.copy((yyvsp[(4) - (4)].TypeVal).S);
+    delete (yyvsp[(4) - (4)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 289:
+#line 3541 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if (!(yyvsp[(2) - (6)].ValueVal).V->getType()->isInteger() ||
+        cast<IntegerType>((yyvsp[(2) - (6)].ValueVal).V->getType())->getBitWidth() != 1)
       error("select condition must be bool");
-    if (yyvsp[-2].ValueVal.V->getType() != yyvsp[0].ValueVal.V->getType())
+    if ((yyvsp[(4) - (6)].ValueVal).V->getType() != (yyvsp[(6) - (6)].ValueVal).V->getType())
       error("select value types should match");
-    yyval.InstVal.I = new SelectInst(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V);
-    yyval.InstVal.S.copy(yyvsp[-2].ValueVal.S);
-  ;
-    break;}
-case 289:
-#line 3550 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *Ty = yyvsp[0].TypeVal.PAT->get();
+    (yyval.InstVal).I = new SelectInst((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V);
+    (yyval.InstVal).S.copy((yyvsp[(4) - (6)].ValueVal).S);
+  ;}
+    break;
+
+  case 290:
+#line 3550 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *Ty = (yyvsp[(4) - (4)].TypeVal).PAT->get();
     NewVarArgs = true;
-    yyval.InstVal.I = new VAArgInst(yyvsp[-2].ValueVal.V, Ty);
-    yyval.InstVal.S.copy(yyvsp[0].TypeVal.S);
-    delete yyvsp[0].TypeVal.PAT;
-  ;
-    break;}
-case 290:
-#line 3557 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type* ArgTy = yyvsp[-2].ValueVal.V->getType();
-    const Type* DstTy = yyvsp[0].TypeVal.PAT->get();
+    (yyval.InstVal).I = new VAArgInst((yyvsp[(2) - (4)].ValueVal).V, Ty);
+    (yyval.InstVal).S.copy((yyvsp[(4) - (4)].TypeVal).S);
+    delete (yyvsp[(4) - (4)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 291:
+#line 3557 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type* ArgTy = (yyvsp[(2) - (4)].ValueVal).V->getType();
+    const Type* DstTy = (yyvsp[(4) - (4)].TypeVal).PAT->get();
     ObsoleteVarArgs = true;
     Function* NF = cast<Function>(CurModule.CurrentModule->
       getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0));
@@ -5348,19 +6435,20 @@ case 290:
     //b = vaarg foo, t
     AllocaInst* foo = new AllocaInst(ArgTy, 0, "vaarg.fix");
     CurBB->getInstList().push_back(foo);
-    CallInst* bar = new CallInst(NF, yyvsp[-2].ValueVal.V);
+    CallInst* bar = new CallInst(NF, (yyvsp[(2) - (4)].ValueVal).V);
     CurBB->getInstList().push_back(bar);
     CurBB->getInstList().push_back(new StoreInst(bar, foo));
-    yyval.InstVal.I = new VAArgInst(foo, DstTy);
-    yyval.InstVal.S.copy(yyvsp[0].TypeVal.S);
-    delete yyvsp[0].TypeVal.PAT;
-  ;
-    break;}
-case 291:
-#line 3578 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type* ArgTy = yyvsp[-2].ValueVal.V->getType();
-    const Type* DstTy = yyvsp[0].TypeVal.PAT->get();
+    (yyval.InstVal).I = new VAArgInst(foo, DstTy);
+    (yyval.InstVal).S.copy((yyvsp[(4) - (4)].TypeVal).S);
+    delete (yyvsp[(4) - (4)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 292:
+#line 3578 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type* ArgTy = (yyvsp[(2) - (4)].ValueVal).V->getType();
+    const Type* DstTy = (yyvsp[(4) - (4)].TypeVal).PAT->get();
     ObsoleteVarArgs = true;
     Function* NF = cast<Function>(CurModule.CurrentModule->
       getOrInsertFunction("llvm.va_copy", ArgTy, ArgTy, (Type *)0));
@@ -5373,76 +6461,81 @@ case 291:
     //b = load foo
     AllocaInst* foo = new AllocaInst(ArgTy, 0, "vanext.fix");
     CurBB->getInstList().push_back(foo);
-    CallInst* bar = new CallInst(NF, yyvsp[-2].ValueVal.V);
+    CallInst* bar = new CallInst(NF, (yyvsp[(2) - (4)].ValueVal).V);
     CurBB->getInstList().push_back(bar);
     CurBB->getInstList().push_back(new StoreInst(bar, foo));
     Instruction* tmp = new VAArgInst(foo, DstTy);
     CurBB->getInstList().push_back(tmp);
-    yyval.InstVal.I = new LoadInst(foo);
-    yyval.InstVal.S.copy(yyvsp[0].TypeVal.S);
-    delete yyvsp[0].TypeVal.PAT;
-  ;
-    break;}
-case 292:
-#line 3602 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (!ExtractElementInst::isValidOperands(yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V))
+    (yyval.InstVal).I = new LoadInst(foo);
+    (yyval.InstVal).S.copy((yyvsp[(4) - (4)].TypeVal).S);
+    delete (yyvsp[(4) - (4)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 293:
+#line 3602 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal).V, (yyvsp[(4) - (4)].ValueVal).V))
       error("Invalid extractelement operands");
-    yyval.InstVal.I = new ExtractElementInst(yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V);
-    yyval.InstVal.S.copy(yyvsp[-2].ValueVal.S.get(0));
-  ;
-    break;}
-case 293:
-#line 3608 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (!InsertElementInst::isValidOperands(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V))
+    (yyval.InstVal).I = new ExtractElementInst((yyvsp[(2) - (4)].ValueVal).V, (yyvsp[(4) - (4)].ValueVal).V);
+    (yyval.InstVal).S.copy((yyvsp[(2) - (4)].ValueVal).S.get(0));
+  ;}
+    break;
+
+  case 294:
+#line 3608 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V))
       error("Invalid insertelement operands");
-    yyval.InstVal.I = new InsertElementInst(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V);
-    yyval.InstVal.S.copy(yyvsp[-4].ValueVal.S);
-  ;
-    break;}
-case 294:
-#line 3614 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    if (!ShuffleVectorInst::isValidOperands(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V))
+    (yyval.InstVal).I = new InsertElementInst((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V);
+    (yyval.InstVal).S.copy((yyvsp[(2) - (6)].ValueVal).S);
+  ;}
+    break;
+
+  case 295:
+#line 3614 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V))
       error("Invalid shufflevector operands");
-    yyval.InstVal.I = new ShuffleVectorInst(yyvsp[-4].ValueVal.V, yyvsp[-2].ValueVal.V, yyvsp[0].ValueVal.V);
-    yyval.InstVal.S.copy(yyvsp[-4].ValueVal.S);
-  ;
-    break;}
-case 295:
-#line 3620 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *Ty = yyvsp[0].PHIList.P->front().first->getType();
+    (yyval.InstVal).I = new ShuffleVectorInst((yyvsp[(2) - (6)].ValueVal).V, (yyvsp[(4) - (6)].ValueVal).V, (yyvsp[(6) - (6)].ValueVal).V);
+    (yyval.InstVal).S.copy((yyvsp[(2) - (6)].ValueVal).S);
+  ;}
+    break;
+
+  case 296:
+#line 3620 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *Ty = (yyvsp[(2) - (2)].PHIList).P->front().first->getType();
     if (!Ty->isFirstClassType())
       error("PHI node operands must be of first class type");
     PHINode *PHI = new PHINode(Ty);
-    PHI->reserveOperandSpace(yyvsp[0].PHIList.P->size());
-    while (yyvsp[0].PHIList.P->begin() != yyvsp[0].PHIList.P->end()) {
-      if (yyvsp[0].PHIList.P->front().first->getType() != Ty) 
+    PHI->reserveOperandSpace((yyvsp[(2) - (2)].PHIList).P->size());
+    while ((yyvsp[(2) - (2)].PHIList).P->begin() != (yyvsp[(2) - (2)].PHIList).P->end()) {
+      if ((yyvsp[(2) - (2)].PHIList).P->front().first->getType() != Ty) 
         error("All elements of a PHI node must be of the same type");
-      PHI->addIncoming(yyvsp[0].PHIList.P->front().first, yyvsp[0].PHIList.P->front().second);
-      yyvsp[0].PHIList.P->pop_front();
+      PHI->addIncoming((yyvsp[(2) - (2)].PHIList).P->front().first, (yyvsp[(2) - (2)].PHIList).P->front().second);
+      (yyvsp[(2) - (2)].PHIList).P->pop_front();
     }
-    yyval.InstVal.I = PHI;
-    yyval.InstVal.S.copy(yyvsp[0].PHIList.S);
-    delete yyvsp[0].PHIList.P;  // Free the list...
-  ;
-    break;}
-case 296:
-#line 3636 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
+    (yyval.InstVal).I = PHI;
+    (yyval.InstVal).S.copy((yyvsp[(2) - (2)].PHIList).S);
+    delete (yyvsp[(2) - (2)].PHIList).P;  // Free the list...
+  ;}
+    break;
+
+  case 297:
+#line 3636 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
     // Handle the short call syntax
     const PointerType *PFTy;
     const FunctionType *FTy;
     Signedness FTySign;
-    if (!(PFTy = dyn_cast<PointerType>(yyvsp[-4].TypeVal.PAT->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>((yyvsp[(3) - (7)].TypeVal).PAT->get())) ||
         !(FTy = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
-      FTySign.makeComposite(yyvsp[-4].TypeVal.S);
-      if (yyvsp[-1].ValueList) {
-        for (std::vector<ValueInfo>::iterator I = yyvsp[-1].ValueList->begin(), E = yyvsp[-1].ValueList->end();
+      FTySign.makeComposite((yyvsp[(3) - (7)].TypeVal).S);
+      if ((yyvsp[(6) - (7)].ValueList)) {
+        for (std::vector<ValueInfo>::iterator I = (yyvsp[(6) - (7)].ValueList)->begin(), E = (yyvsp[(6) - (7)].ValueList)->end();
              I != E; ++I) {
           ParamTypes.push_back((*I).V->getType());
           FTySign.add(I->S);
@@ -5452,38 +6545,38 @@ case 296:
       bool isVarArg = ParamTypes.size() && ParamTypes.back() == Type::VoidTy;
       if (isVarArg) ParamTypes.pop_back();
 
-      const Type *RetTy = yyvsp[-4].TypeVal.PAT->get();
+      const Type *RetTy = (yyvsp[(3) - (7)].TypeVal).PAT->get();
       if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
         error("Functions cannot return aggregate types");
 
       FTy = FunctionType::get(RetTy, ParamTypes, isVarArg);
       PFTy = PointerType::getUnqual(FTy);
-      yyval.InstVal.S.copy(yyvsp[-4].TypeVal.S);
+      (yyval.InstVal).S.copy((yyvsp[(3) - (7)].TypeVal).S);
     } else {
-      FTySign = yyvsp[-4].TypeVal.S;
+      FTySign = (yyvsp[(3) - (7)].TypeVal).S;
       // Get the signedness of the result type. $3 is the pointer to the
       // function type so we get the 0th element to extract the function type,
       // and then the 0th element again to get the result type.
-      yyval.InstVal.S.copy(yyvsp[-4].TypeVal.S.get(0).get(0)); 
+      (yyval.InstVal).S.copy((yyvsp[(3) - (7)].TypeVal).S.get(0).get(0)); 
     }
-    yyvsp[-3].ValIDVal.S.makeComposite(FTySign);
+    (yyvsp[(4) - (7)].ValIDVal).S.makeComposite(FTySign);
 
     // First upgrade any intrinsic calls.
     std::vector<Value*> Args;
-    if (yyvsp[-1].ValueList)
-      for (unsigned i = 0, e = yyvsp[-1].ValueList->size(); i < e; ++i) 
-        Args.push_back((*yyvsp[-1].ValueList)[i].V);
-    Instruction *Inst = upgradeIntrinsicCall(FTy->getReturnType(), yyvsp[-3].ValIDVal, Args);
+    if ((yyvsp[(6) - (7)].ValueList))
+      for (unsigned i = 0, e = (yyvsp[(6) - (7)].ValueList)->size(); i < e; ++i) 
+        Args.push_back((*(yyvsp[(6) - (7)].ValueList))[i].V);
+    Instruction *Inst = upgradeIntrinsicCall(FTy->getReturnType(), (yyvsp[(4) - (7)].ValIDVal), Args);
 
     // If we got an upgraded intrinsic
     if (Inst) {
-      yyval.InstVal.I = Inst;
+      (yyval.InstVal).I = Inst;
     } else {
       // Get the function we're calling
-      Value *V = getVal(PFTy, yyvsp[-3].ValIDVal);
+      Value *V = getVal(PFTy, (yyvsp[(4) - (7)].ValIDVal));
 
       // Check the argument values match
-      if (!yyvsp[-1].ValueList) {                                   // Has no arguments?
+      if (!(yyvsp[(6) - (7)].ValueList)) {                                   // Has no arguments?
         // Make sure no arguments is a good thing!
         if (FTy->getNumParams() != 0)
           error("No arguments passed to a function that expects arguments");
@@ -5493,7 +6586,7 @@ case 296:
         //
         FunctionType::param_iterator I = FTy->param_begin();
         FunctionType::param_iterator E = FTy->param_end();
-        std::vector<ValueInfo>::iterator ArgI = yyvsp[-1].ValueList->begin(), ArgE = yyvsp[-1].ValueList->end();
+        std::vector<ValueInfo>::iterator ArgI = (yyvsp[(6) - (7)].ValueList)->begin(), ArgE = (yyvsp[(6) - (7)].ValueList)->end();
 
         for (; ArgI != ArgE && I != E; ++ArgI, ++I)
           if ((*ArgI).V->getType() != *I)
@@ -5506,375 +6599,383 @@ case 296:
 
       // Create the call instruction
       CallInst *CI = new CallInst(V, Args.begin(), Args.end());
-      CI->setTailCall(yyvsp[-6].BoolVal);
-      CI->setCallingConv(upgradeCallingConv(yyvsp[-5].UIntVal));
+      CI->setTailCall((yyvsp[(1) - (7)].BoolVal));
+      CI->setCallingConv(upgradeCallingConv((yyvsp[(2) - (7)].UIntVal)));
 
-      yyval.InstVal.I = CI;
+      (yyval.InstVal).I = CI;
     }
     // Deal with CSRetCC
-    if (yyvsp[-5].UIntVal == OldCallingConv::CSRet) {
+    if ((yyvsp[(2) - (7)].UIntVal) == OldCallingConv::CSRet) {
       ParamAttrsVector Attrs;
       ParamAttrsWithIndex PAWI;
       PAWI.index = 1;  PAWI.attrs = ParamAttr::StructRet; // first arg
       Attrs.push_back(PAWI);
-      cast<CallInst>(yyval.InstVal.I)->setParamAttrs(ParamAttrsList::get(Attrs));
+      cast<CallInst>((yyval.InstVal).I)->setParamAttrs(ParamAttrsList::get(Attrs));
     }
-    delete yyvsp[-4].TypeVal.PAT;
-    delete yyvsp[-1].ValueList;
+    delete (yyvsp[(3) - (7)].TypeVal).PAT;
+    delete (yyvsp[(6) - (7)].ValueList);
     lastCallingConv = OldCallingConv::C;
-  ;
-    break;}
-case 297:
-#line 3728 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyval.InstVal = yyvsp[0].InstVal;
-  ;
-    break;}
-case 298:
-#line 3736 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ValueList = yyvsp[0].ValueList; ;
-    break;}
-case 299:
-#line 3737 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.ValueList = new std::vector<ValueInfo>(); ;
-    break;}
-case 300:
-#line 3741 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.BoolVal = true; ;
-    break;}
-case 301:
-#line 3742 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{ yyval.BoolVal = false; ;
-    break;}
-case 302:
-#line 3746 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *Ty = yyvsp[-1].TypeVal.PAT->get();
-    yyval.InstVal.S.makeComposite(yyvsp[-1].TypeVal.S);
-    yyval.InstVal.I = new MallocInst(Ty, 0, yyvsp[0].UIntVal);
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 303:
-#line 3752 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *Ty = yyvsp[-4].TypeVal.PAT->get();
-    yyvsp[-1].ValIDVal.S.makeUnsigned();
-    yyval.InstVal.S.makeComposite(yyvsp[-4].TypeVal.S);
-    yyval.InstVal.I = new MallocInst(Ty, getVal(yyvsp[-2].PrimType.T, yyvsp[-1].ValIDVal), yyvsp[0].UIntVal);
-    delete yyvsp[-4].TypeVal.PAT;
-  ;
-    break;}
-case 304:
-#line 3759 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *Ty = yyvsp[-1].TypeVal.PAT->get();
-    yyval.InstVal.S.makeComposite(yyvsp[-1].TypeVal.S);
-    yyval.InstVal.I = new AllocaInst(Ty, 0, yyvsp[0].UIntVal);
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 305:
-#line 3765 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *Ty = yyvsp[-4].TypeVal.PAT->get();
-    yyvsp[-1].ValIDVal.S.makeUnsigned();
-    yyval.InstVal.S.makeComposite(yyvsp[-2].PrimType.S);
-    yyval.InstVal.I = new AllocaInst(Ty, getVal(yyvsp[-2].PrimType.T, yyvsp[-1].ValIDVal), yyvsp[0].UIntVal);
-    delete yyvsp[-4].TypeVal.PAT;
-  ;
-    break;}
-case 306:
-#line 3772 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type *PTy = yyvsp[0].ValueVal.V->getType();
+  ;}
+    break;
+
+  case 298:
+#line 3728 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
+  ;}
+    break;
+
+  case 299:
+#line 3736 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ValueList) = (yyvsp[(2) - (2)].ValueList); ;}
+    break;
+
+  case 300:
+#line 3737 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ValueList) = new std::vector<ValueInfo>(); ;}
+    break;
+
+  case 301:
+#line 3741 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.BoolVal) = true; ;}
+    break;
+
+  case 302:
+#line 3742 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.BoolVal) = false; ;}
+    break;
+
+  case 303:
+#line 3746 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *Ty = (yyvsp[(2) - (3)].TypeVal).PAT->get();
+    (yyval.InstVal).S.makeComposite((yyvsp[(2) - (3)].TypeVal).S);
+    (yyval.InstVal).I = new MallocInst(Ty, 0, (yyvsp[(3) - (3)].UIntVal));
+    delete (yyvsp[(2) - (3)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 304:
+#line 3752 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *Ty = (yyvsp[(2) - (6)].TypeVal).PAT->get();
+    (yyvsp[(5) - (6)].ValIDVal).S.makeUnsigned();
+    (yyval.InstVal).S.makeComposite((yyvsp[(2) - (6)].TypeVal).S);
+    (yyval.InstVal).I = new MallocInst(Ty, getVal((yyvsp[(4) - (6)].PrimType).T, (yyvsp[(5) - (6)].ValIDVal)), (yyvsp[(6) - (6)].UIntVal));
+    delete (yyvsp[(2) - (6)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 305:
+#line 3759 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *Ty = (yyvsp[(2) - (3)].TypeVal).PAT->get();
+    (yyval.InstVal).S.makeComposite((yyvsp[(2) - (3)].TypeVal).S);
+    (yyval.InstVal).I = new AllocaInst(Ty, 0, (yyvsp[(3) - (3)].UIntVal));
+    delete (yyvsp[(2) - (3)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 306:
+#line 3765 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *Ty = (yyvsp[(2) - (6)].TypeVal).PAT->get();
+    (yyvsp[(5) - (6)].ValIDVal).S.makeUnsigned();
+    (yyval.InstVal).S.makeComposite((yyvsp[(4) - (6)].PrimType).S);
+    (yyval.InstVal).I = new AllocaInst(Ty, getVal((yyvsp[(4) - (6)].PrimType).T, (yyvsp[(5) - (6)].ValIDVal)), (yyvsp[(6) - (6)].UIntVal));
+    delete (yyvsp[(2) - (6)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 307:
+#line 3772 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type *PTy = (yyvsp[(2) - (2)].ValueVal).V->getType();
     if (!isa<PointerType>(PTy))
       error("Trying to free nonpointer type '" + PTy->getDescription() + "'");
-    yyval.InstVal.I = new FreeInst(yyvsp[0].ValueVal.V);
-    yyval.InstVal.S.makeSignless();
-  ;
-    break;}
-case 307:
-#line 3779 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    const Type* Ty = yyvsp[-1].TypeVal.PAT->get();
-    yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S);
+    (yyval.InstVal).I = new FreeInst((yyvsp[(2) - (2)].ValueVal).V);
+    (yyval.InstVal).S.makeSignless();
+  ;}
+    break;
+
+  case 308:
+#line 3779 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    const Type* Ty = (yyvsp[(3) - (4)].TypeVal).PAT->get();
+    (yyvsp[(4) - (4)].ValIDVal).S.copy((yyvsp[(3) - (4)].TypeVal).S);
     if (!isa<PointerType>(Ty))
       error("Can't load from nonpointer type: " + Ty->getDescription());
     if (!cast<PointerType>(Ty)->getElementType()->isFirstClassType())
       error("Can't load from pointer of non-first-class type: " +
                      Ty->getDescription());
-    Value* tmpVal = getVal(Ty, yyvsp[0].ValIDVal);
-    yyval.InstVal.I = new LoadInst(tmpVal, "", yyvsp[-3].BoolVal);
-    yyval.InstVal.S.copy(yyvsp[-1].TypeVal.S.get(0));
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 308:
-#line 3792 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyvsp[0].ValIDVal.S.copy(yyvsp[-1].TypeVal.S);
-    const PointerType *PTy = dyn_cast<PointerType>(yyvsp[-1].TypeVal.PAT->get());
+    Value* tmpVal = getVal(Ty, (yyvsp[(4) - (4)].ValIDVal));
+    (yyval.InstVal).I = new LoadInst(tmpVal, "", (yyvsp[(1) - (4)].BoolVal));
+    (yyval.InstVal).S.copy((yyvsp[(3) - (4)].TypeVal).S.get(0));
+    delete (yyvsp[(3) - (4)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 309:
+#line 3792 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyvsp[(6) - (6)].ValIDVal).S.copy((yyvsp[(5) - (6)].TypeVal).S);
+    const PointerType *PTy = dyn_cast<PointerType>((yyvsp[(5) - (6)].TypeVal).PAT->get());
     if (!PTy)
       error("Can't store to a nonpointer type: " + 
-             yyvsp[-1].TypeVal.PAT->get()->getDescription());
+             (yyvsp[(5) - (6)].TypeVal).PAT->get()->getDescription());
     const Type *ElTy = PTy->getElementType();
-    Value *StoreVal = yyvsp[-3].ValueVal.V;
-    Value* tmpVal = getVal(PTy, yyvsp[0].ValIDVal);
-    if (ElTy != yyvsp[-3].ValueVal.V->getType()) {
+    Value *StoreVal = (yyvsp[(3) - (6)].ValueVal).V;
+    Value* tmpVal = getVal(PTy, (yyvsp[(6) - (6)].ValIDVal));
+    if (ElTy != (yyvsp[(3) - (6)].ValueVal).V->getType()) {
       PTy = PointerType::getUnqual(StoreVal->getType());
       if (Constant *C = dyn_cast<Constant>(tmpVal))
         tmpVal = ConstantExpr::getBitCast(C, PTy);
       else
         tmpVal = new BitCastInst(tmpVal, PTy, "upgrd.cast", CurBB);
     }
-    yyval.InstVal.I = new StoreInst(StoreVal, tmpVal, yyvsp[-5].BoolVal);
-    yyval.InstVal.S.makeSignless();
-    delete yyvsp[-1].TypeVal.PAT;
-  ;
-    break;}
-case 309:
-#line 3812 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
-{
-    yyvsp[-1].ValIDVal.S.copy(yyvsp[-2].TypeVal.S);
-    const Type* Ty = yyvsp[-2].TypeVal.PAT->get();
+    (yyval.InstVal).I = new StoreInst(StoreVal, tmpVal, (yyvsp[(1) - (6)].BoolVal));
+    (yyval.InstVal).S.makeSignless();
+    delete (yyvsp[(5) - (6)].TypeVal).PAT;
+  ;}
+    break;
+
+  case 310:
+#line 3812 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+    {
+    (yyvsp[(3) - (4)].ValIDVal).S.copy((yyvsp[(2) - (4)].TypeVal).S);
+    const Type* Ty = (yyvsp[(2) - (4)].TypeVal).PAT->get();
     if (!isa<PointerType>(Ty))
       error("getelementptr insn requires pointer operand");
 
     std::vector<Value*> VIndices;
-    upgradeGEPInstIndices(Ty, yyvsp[0].ValueList, VIndices);
-
-    Value* tmpVal = getVal(Ty, yyvsp[-1].ValIDVal);
-    yyval.InstVal.I = new GetElementPtrInst(tmpVal, VIndices.begin(), VIndices.end());
-    ValueInfo VI; VI.V = tmpVal; VI.S.copy(yyvsp[-2].TypeVal.S);
-    yyval.InstVal.S.copy(getElementSign(VI, VIndices));
-    delete yyvsp[-2].TypeVal.PAT;
-    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
+    upgradeGEPInstIndices(Ty, (yyvsp[(4) - (4)].ValueList), VIndices);
+
+    Value* tmpVal = getVal(Ty, (yyvsp[(3) - (4)].ValIDVal));
+    (yyval.InstVal).I = new GetElementPtrInst(tmpVal, VIndices.begin(), VIndices.end());
+    ValueInfo VI; VI.V = tmpVal; VI.S.copy((yyvsp[(2) - (4)].TypeVal).S);
+    (yyval.InstVal).S.copy(getElementSign(VI, VIndices));
+    delete (yyvsp[(2) - (4)].TypeVal).PAT;
+    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");
+
+/* Line 1267 of yacc.c.  */
+#line 6765 "UpgradeParser.tab.c"
+      default: break;
     }
-#endif
+  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 YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
+      /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
 
-      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.  */
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
 
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
 
-  goto yyerrhandle;
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
 
-yyerrdefault:  /* current state does not do anything special for the error token. */
+  /* 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;
 
-#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
+  /* 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);
+
+/*-------------------------------------.
+| 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
-    }
-  return 0;
 
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
+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);
-#endif
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
     }
-  return 1;
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
-#line 3830 "/Users/clamb/Documents/llvm/llvm/tools/llvm-upgrade/UpgradeParser.y"
+
+
+#line 3830 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
 
 
 int yyerror(const char *ErrorMsg) {
@@ -5907,3 +7008,4 @@ void error(const std::string& ErrorMsg, int LineNo) {
   yyerror(ErrorMsg.c_str());
 }
 
+
diff --git a/tools/llvm-upgrade/UpgradeParser.h.cvs b/tools/llvm-upgrade/UpgradeParser.h.cvs
index 6bacf8e..921dd22 100644
--- a/tools/llvm-upgrade/UpgradeParser.h.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.h.cvs
@@ -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,
+     SINTVAL = 260,
+     UINTVAL = 261,
+     FPVAL = 262,
+     VOID = 263,
+     BOOL = 264,
+     SBYTE = 265,
+     UBYTE = 266,
+     SHORT = 267,
+     USHORT = 268,
+     INT = 269,
+     UINT = 270,
+     LONG = 271,
+     ULONG = 272,
+     FLOAT = 273,
+     DOUBLE = 274,
+     TYPE = 275,
+     LABEL = 276,
+     VAR_ID = 277,
+     LABELSTR = 278,
+     STRINGCONSTANT = 279,
+     IMPLEMENTATION = 280,
+     ZEROINITIALIZER = 281,
+     TRUETOK = 282,
+     FALSETOK = 283,
+     BEGINTOK = 284,
+     ENDTOK = 285,
+     DECLARE = 286,
+     GLOBAL = 287,
+     CONSTANT = 288,
+     SECTION = 289,
+     VOLATILE = 290,
+     TO = 291,
+     DOTDOTDOT = 292,
+     NULL_TOK = 293,
+     UNDEF = 294,
+     CONST = 295,
+     INTERNAL = 296,
+     LINKONCE = 297,
+     WEAK = 298,
+     APPENDING = 299,
+     DLLIMPORT = 300,
+     DLLEXPORT = 301,
+     EXTERN_WEAK = 302,
+     OPAQUE = 303,
+     NOT = 304,
+     EXTERNAL = 305,
+     TARGET = 306,
+     TRIPLE = 307,
+     ENDIAN = 308,
+     POINTERSIZE = 309,
+     LITTLE = 310,
+     BIG = 311,
+     ALIGN = 312,
+     DEPLIBS = 313,
+     CALL = 314,
+     TAIL = 315,
+     ASM_TOK = 316,
+     MODULE = 317,
+     SIDEEFFECT = 318,
+     CC_TOK = 319,
+     CCC_TOK = 320,
+     CSRETCC_TOK = 321,
+     FASTCC_TOK = 322,
+     COLDCC_TOK = 323,
+     X86_STDCALLCC_TOK = 324,
+     X86_FASTCALLCC_TOK = 325,
+     DATALAYOUT = 326,
+     RET = 327,
+     BR = 328,
+     SWITCH = 329,
+     INVOKE = 330,
+     UNREACHABLE = 331,
+     UNWIND = 332,
+     EXCEPT = 333,
+     ADD = 334,
+     SUB = 335,
+     MUL = 336,
+     DIV = 337,
+     UDIV = 338,
+     SDIV = 339,
+     FDIV = 340,
+     REM = 341,
+     UREM = 342,
+     SREM = 343,
+     FREM = 344,
+     AND = 345,
+     OR = 346,
+     XOR = 347,
+     SHL = 348,
+     SHR = 349,
+     ASHR = 350,
+     LSHR = 351,
+     SETLE = 352,
+     SETGE = 353,
+     SETLT = 354,
+     SETGT = 355,
+     SETEQ = 356,
+     SETNE = 357,
+     ICMP = 358,
+     FCMP = 359,
+     MALLOC = 360,
+     ALLOCA = 361,
+     FREE = 362,
+     LOAD = 363,
+     STORE = 364,
+     GETELEMENTPTR = 365,
+     PHI_TOK = 366,
+     SELECT = 367,
+     VAARG = 368,
+     EXTRACTELEMENT = 369,
+     INSERTELEMENT = 370,
+     SHUFFLEVECTOR = 371,
+     VAARG_old = 372,
+     VANEXT_old = 373,
+     EQ = 374,
+     NE = 375,
+     SLT = 376,
+     SGT = 377,
+     SLE = 378,
+     SGE = 379,
+     ULT = 380,
+     UGT = 381,
+     ULE = 382,
+     UGE = 383,
+     OEQ = 384,
+     ONE = 385,
+     OLT = 386,
+     OGT = 387,
+     OLE = 388,
+     OGE = 389,
+     ORD = 390,
+     UNO = 391,
+     UEQ = 392,
+     UNE = 393,
+     CAST = 394,
+     TRUNC = 395,
+     ZEXT = 396,
+     SEXT = 397,
+     FPTRUNC = 398,
+     FPEXT = 399,
+     FPTOUI = 400,
+     FPTOSI = 401,
+     UITOFP = 402,
+     SITOFP = 403,
+     PTRTOINT = 404,
+     INTTOPTR = 405,
+     BITCAST = 406
+   };
+#endif
+/* Tokens.  */
+#define ESINT64VAL 258
+#define EUINT64VAL 259
+#define SINTVAL 260
+#define UINTVAL 261
+#define FPVAL 262
+#define VOID 263
+#define BOOL 264
+#define SBYTE 265
+#define UBYTE 266
+#define SHORT 267
+#define USHORT 268
+#define INT 269
+#define UINT 270
+#define LONG 271
+#define ULONG 272
+#define FLOAT 273
+#define DOUBLE 274
+#define TYPE 275
+#define LABEL 276
+#define VAR_ID 277
+#define LABELSTR 278
+#define STRINGCONSTANT 279
+#define IMPLEMENTATION 280
+#define ZEROINITIALIZER 281
+#define TRUETOK 282
+#define FALSETOK 283
+#define BEGINTOK 284
+#define ENDTOK 285
+#define DECLARE 286
+#define GLOBAL 287
+#define CONSTANT 288
+#define SECTION 289
+#define VOLATILE 290
+#define TO 291
+#define DOTDOTDOT 292
+#define NULL_TOK 293
+#define UNDEF 294
+#define CONST 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 NOT 304
+#define EXTERNAL 305
+#define TARGET 306
+#define TRIPLE 307
+#define ENDIAN 308
+#define POINTERSIZE 309
+#define LITTLE 310
+#define BIG 311
+#define ALIGN 312
+#define DEPLIBS 313
+#define CALL 314
+#define TAIL 315
+#define ASM_TOK 316
+#define MODULE 317
+#define SIDEEFFECT 318
+#define CC_TOK 319
+#define CCC_TOK 320
+#define CSRETCC_TOK 321
+#define FASTCC_TOK 322
+#define COLDCC_TOK 323
+#define X86_STDCALLCC_TOK 324
+#define X86_FASTCALLCC_TOK 325
+#define DATALAYOUT 326
+#define RET 327
+#define BR 328
+#define SWITCH 329
+#define INVOKE 330
+#define UNREACHABLE 331
+#define UNWIND 332
+#define EXCEPT 333
+#define ADD 334
+#define SUB 335
+#define MUL 336
+#define DIV 337
+#define UDIV 338
+#define SDIV 339
+#define FDIV 340
+#define REM 341
+#define UREM 342
+#define SREM 343
+#define FREM 344
+#define AND 345
+#define OR 346
+#define XOR 347
+#define SHL 348
+#define SHR 349
+#define ASHR 350
+#define LSHR 351
+#define SETLE 352
+#define SETGE 353
+#define SETLT 354
+#define SETGT 355
+#define SETEQ 356
+#define SETNE 357
+#define ICMP 358
+#define FCMP 359
+#define MALLOC 360
+#define ALLOCA 361
+#define FREE 362
+#define LOAD 363
+#define STORE 364
+#define GETELEMENTPTR 365
+#define PHI_TOK 366
+#define SELECT 367
+#define VAARG 368
+#define EXTRACTELEMENT 369
+#define INSERTELEMENT 370
+#define SHUFFLEVECTOR 371
+#define VAARG_old 372
+#define VANEXT_old 373
+#define EQ 374
+#define NE 375
+#define SLT 376
+#define SGT 377
+#define SLE 378
+#define SGE 379
+#define ULT 380
+#define UGT 381
+#define ULE 382
+#define UGE 383
+#define OEQ 384
+#define ONE 385
+#define OLT 386
+#define OGT 387
+#define OLE 388
+#define OGE 389
+#define ORD 390
+#define UNO 391
+#define UEQ 392
+#define UNE 393
+#define CAST 394
+#define TRUNC 395
+#define ZEXT 396
+#define SEXT 397
+#define FPTRUNC 398
+#define FPEXT 399
+#define FPTOUI 400
+#define FPTOSI 401
+#define UITOFP 402
+#define SITOFP 403
+#define PTRTOINT 404
+#define INTTOPTR 405
+#define BITCAST 406
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 1681 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeParser.y"
+{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   std::pair<llvm::PATypeInfo, char*>     *ArgVal;
@@ -38,156 +387,14 @@ typedef union {
   llvm::ICmpInst::Predicate         IPred;
   llvm::FCmpInst::Predicate         FPred;
   llvm::Module::Endianness          Endianness;
-} YYSTYPE;
-#define	ESINT64VAL	257
-#define	EUINT64VAL	258
-#define	SINTVAL	259
-#define	UINTVAL	260
-#define	FPVAL	261
-#define	VOID	262
-#define	BOOL	263
-#define	SBYTE	264
-#define	UBYTE	265
-#define	SHORT	266
-#define	USHORT	267
-#define	INT	268
-#define	UINT	269
-#define	LONG	270
-#define	ULONG	271
-#define	FLOAT	272
-#define	DOUBLE	273
-#define	TYPE	274
-#define	LABEL	275
-#define	VAR_ID	276
-#define	LABELSTR	277
-#define	STRINGCONSTANT	278
-#define	IMPLEMENTATION	279
-#define	ZEROINITIALIZER	280
-#define	TRUETOK	281
-#define	FALSETOK	282
-#define	BEGINTOK	283
-#define	ENDTOK	284
-#define	DECLARE	285
-#define	GLOBAL	286
-#define	CONSTANT	287
-#define	SECTION	288
-#define	VOLATILE	289
-#define	TO	290
-#define	DOTDOTDOT	291
-#define	NULL_TOK	292
-#define	UNDEF	293
-#define	CONST	294
-#define	INTERNAL	295
-#define	LINKONCE	296
-#define	WEAK	297
-#define	APPENDING	298
-#define	DLLIMPORT	299
-#define	DLLEXPORT	300
-#define	EXTERN_WEAK	301
-#define	OPAQUE	302
-#define	NOT	303
-#define	EXTERNAL	304
-#define	TARGET	305
-#define	TRIPLE	306
-#define	ENDIAN	307
-#define	POINTERSIZE	308
-#define	LITTLE	309
-#define	BIG	310
-#define	ALIGN	311
-#define	DEPLIBS	312
-#define	CALL	313
-#define	TAIL	314
-#define	ASM_TOK	315
-#define	MODULE	316
-#define	SIDEEFFECT	317
-#define	CC_TOK	318
-#define	CCC_TOK	319
-#define	CSRETCC_TOK	320
-#define	FASTCC_TOK	321
-#define	COLDCC_TOK	322
-#define	X86_STDCALLCC_TOK	323
-#define	X86_FASTCALLCC_TOK	324
-#define	DATALAYOUT	325
-#define	RET	326
-#define	BR	327
-#define	SWITCH	328
-#define	INVOKE	329
-#define	UNREACHABLE	330
-#define	UNWIND	331
-#define	EXCEPT	332
-#define	ADD	333
-#define	SUB	334
-#define	MUL	335
-#define	DIV	336
-#define	UDIV	337
-#define	SDIV	338
-#define	FDIV	339
-#define	REM	340
-#define	UREM	341
-#define	SREM	342
-#define	FREM	343
-#define	AND	344
-#define	OR	345
-#define	XOR	346
-#define	SHL	347
-#define	SHR	348
-#define	ASHR	349
-#define	LSHR	350
-#define	SETLE	351
-#define	SETGE	352
-#define	SETLT	353
-#define	SETGT	354
-#define	SETEQ	355
-#define	SETNE	356
-#define	ICMP	357
-#define	FCMP	358
-#define	MALLOC	359
-#define	ALLOCA	360
-#define	FREE	361
-#define	LOAD	362
-#define	STORE	363
-#define	GETELEMENTPTR	364
-#define	PHI_TOK	365
-#define	SELECT	366
-#define	VAARG	367
-#define	EXTRACTELEMENT	368
-#define	INSERTELEMENT	369
-#define	SHUFFLEVECTOR	370
-#define	VAARG_old	371
-#define	VANEXT_old	372
-#define	EQ	373
-#define	NE	374
-#define	SLT	375
-#define	SGT	376
-#define	SLE	377
-#define	SGE	378
-#define	ULT	379
-#define	UGT	380
-#define	ULE	381
-#define	UGE	382
-#define	OEQ	383
-#define	ONE	384
-#define	OLT	385
-#define	OGT	386
-#define	OLE	387
-#define	OGE	388
-#define	ORD	389
-#define	UNO	390
-#define	UEQ	391
-#define	UNE	392
-#define	CAST	393
-#define	TRUNC	394
-#define	ZEXT	395
-#define	SEXT	396
-#define	FPTRUNC	397
-#define	FPEXT	398
-#define	FPTOUI	399
-#define	FPTOSI	400
-#define	UITOFP	401
-#define	SITOFP	402
-#define	PTRTOINT	403
-#define	INTTOPTR	404
-#define	BITCAST	405
-
+}
+/* Line 1529 of yacc.c.  */
+#line 393 "UpgradeParser.tab.h"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
 
 extern YYSTYPE Upgradelval;
+
diff --git a/tools/llvm-upgrade/UpgradeParser.y.cvs b/tools/llvm-upgrade/UpgradeParser.y.cvs
index bcabaa3..6340d86 100644
--- a/tools/llvm-upgrade/UpgradeParser.y.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.y.cvs
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //