[llvm-commits] CVS: llvm/lib/AsmParser/Lexer.cpp.cvs llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs

Anton Korobeynikov asl at math.spbu.ru
Sun Apr 29 11:38:42 PDT 2007



Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.41 -> 1.42
llvmAsmParser.cpp.cvs updated: 1.96 -> 1.97
llvmAsmParser.h.cvs updated: 1.74 -> 1.75
---
Log message:

Regenerate


---
Diffs of the changes:  (+4388 -3815)

 Lexer.cpp.cvs         | 3055 +++++++++++++++--------------
 llvmAsmParser.cpp.cvs | 5093 ++++++++++++++++++++++++++------------------------
 llvmAsmParser.h.cvs   |   55 
 3 files changed, 4388 insertions(+), 3815 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.41 llvm/lib/AsmParser/Lexer.cpp.cvs:1.42
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.41	Sat Apr 28 11:07:31 2007
+++ llvm/lib/AsmParser/Lexer.cpp.cvs	Sun Apr 29 13:38:24 2007
@@ -1,50 +1,93 @@
-#define yy_create_buffer llvmAsm_create_buffer
-#define yy_delete_buffer llvmAsm_delete_buffer
-#define yy_scan_buffer llvmAsm_scan_buffer
-#define yy_scan_string llvmAsm_scan_string
-#define yy_scan_bytes llvmAsm_scan_bytes
-#define yy_flex_debug llvmAsm_flex_debug
-#define yy_init_buffer llvmAsm_init_buffer
-#define yy_flush_buffer llvmAsm_flush_buffer
-#define yy_load_buffer_state llvmAsm_load_buffer_state
-#define yy_switch_to_buffer llvmAsm_switch_to_buffer
-#define yyin llvmAsmin
-#define yyleng llvmAsmleng
-#define yylex llvmAsmlex
-#define yyout llvmAsmout
-#define yyrestart llvmAsmrestart
-#define yytext llvmAsmtext
-#define yylineno llvmAsmlineno
+#line 2 "Lexer.cpp"
 
-#line 20 "Lexer.cpp"
-/* A lexical scanner generated by flex*/
+#line 4 "Lexer.cpp"
 
-/* Scanner skeleton version:
- * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.41 2007/04/28 16:07:31 reid Exp $
- */
+#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 <unistd.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>
+#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,80 +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 llvmAsmrestart(llvmAsmin  )
 
 #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 llvmAsmleng;
 
-extern int yyleng;
-extern FILE *yyin, *yyout;
+extern FILE *llvmAsmin, *llvmAsmout;
 
 #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 llvmAsmlex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-llvmAsmlineno 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 < llvmAsmleng; ++yyl )\
+                    if ( llvmAsmtext[yyl] == '\n' )\
+                        --llvmAsmlineno;\
+            }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 llvmAsmtext. */ \
+        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 llvmAsmtext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* Some routines like yy_flex_realloc() are emitted as static but are
-   not called by all lexers. This generates warnings in some compilers,
-   notably GCC. Arrange to suppress these. */
-#ifdef __GNUC__
-#define YY_MAY_BE_UNUSED __attribute__((unused))
-#else
-#define YY_MAY_BE_UNUSED
-#endif
+#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;
@@ -205,12 +239,16 @@
 	 */
 	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
@@ -220,199 +258,203 @@
 	 * 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 llvmAsmrestart()), so that the user can continue scanning by
+	 * just pointing llvmAsmin 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 llvmAsmtext is formed. */
 static char yy_hold_char;
-
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
+int llvmAsmleng;
 
 /* 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 llvmAsmwrap()'s to do buffer switches
+ * instead of setting up a fresh llvmAsmin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void llvmAsmrestart (FILE *input_file  );
+void llvmAsm_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE llvmAsm_create_buffer (FILE *file,int size  );
+void llvmAsm_delete_buffer (YY_BUFFER_STATE b  );
+void llvmAsm_flush_buffer (YY_BUFFER_STATE b  );
+void llvmAsmpush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void llvmAsmpop_buffer_state (void );
+
+static void llvmAsmensure_buffer_stack (void );
+static void llvmAsm_load_buffer_state (void );
+static void llvmAsm_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER llvmAsm_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE llvmAsm_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE llvmAsm_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE llvmAsm_scan_bytes (yyconst char *bytes,int len  );
+
+void *llvmAsmalloc (yy_size_t  );
+void *llvmAsmrealloc (void *,yy_size_t  );
+void llvmAsmfree (void *  );
 
-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 )
-
-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 ));
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
+#define yy_new_buffer llvmAsm_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 ){ \
+        llvmAsmensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            llvmAsm_create_buffer(llvmAsmin,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 ){\
+        llvmAsmensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            llvmAsm_create_buffer(llvmAsmin,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 llvmAsmwrap(n) 1
 #define YY_SKIP_YYWRAP
+
 typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
+FILE *llvmAsmin = (FILE *) 0, *llvmAsmout = (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 llvmAsmlineno;
+
+int llvmAsmlineno = 1;
+
+extern char *llvmAsmtext;
+#define yytext_ptr llvmAsmtext
+
+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 llvmAsmtext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
+	(yytext_ptr) = yy_bp; \
+	llvmAsmleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 137
-#define YY_END_OF_BUFFER 138
-static yyconst short int yy_acclist[218] =
-    {   0,
-      138,  136,  137,  135,  136,  137,  135,  137,  136,  137,
-      136,  137,  136,  137,  136,  137,  136,  137,  136,  137,
-      128,  136,  137,  128,  136,  137,    1,  136,  137,  136,
-      137,  136,  137,  136,  137,  136,  137,  136,  137,  136,
-      137,  136,  137,  136,  137,  136,  137,  136,  137,  136,
-      137,  136,  137,  136,  137,  136,  137,  136,  137,  136,
-      137,  136,  137,  136,  137,  136,  137,  136,  137,  136,
-      137,  136,  137,  136,  137,  126,  124,  122,  131,  129,
-      133,  128,    1,  123,  132,  108,   37,   71,   53,   72,
-       67,   24,  126,  122,  133,   21,  133,  134,  127,  123,
-
-       54,   66,   35,   38,    3,   56,   81,   86,   84,   85,
-       83,   82,   87,   91,  107,   76,   74,   63,   75,   73,
-       55,   89,   80,   78,   79,   77,   90,   88,   68,  125,
-      133,  133,   65,   92,   70,   59,  115,   62,   69,  116,
-       64,   23,  130,   58,   95,   61,   44,   25,    4,   51,
-       57,   60,   47,   12,   94,  133,   33,   31,    2,    5,
-       48,   97,   43,   50,  117,   93,   22,  114,   40,    7,
-       49,   39,  101,  100,    8,   16,  110,  113,   34,   52,
-      105,   99,  109,   26,   27,   98,  111,  106,  104,    6,
-       28,   96,   32,    9,   18,   10,  102,   11,   46,   45,
-
-      103,   30,   13,   15,   14,   29,   36,   17,  112,   19,
-      118,  120,  121,   41,  119,   42,   20
-    } ;
+	(yy_c_buf_p) = yy_cp;
 
-static yyconst short int yy_accept[553] =
+#define YY_NUM_RULES 138
+#define YY_END_OF_BUFFER 139
+/* 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[560] =
     {   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,   76,   76,
-       77,   77,   78,   79,   80,   80,   81,   81,   82,   83,
-       83,   84,   84,   85,   86,   86,   86,   86,   86,   86,
-       86,   86,   87,   87,   88,   88,   88,   88,   88,   88,
-       88,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   91,   91,   91,   91,   91,   91,   91,   91,
-
-       92,   92,   92,   92,   92,   92,   92,   92,   92,   92,
-       92,   92,   92,   92,   92,   92,   92,   93,   93,   93,
-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-       93,   93,   93,   94,   95,   96,   97,   98,   98,   99,
-       99,  100,  101,  102,  102,  102,  103,  103,  103,  104,
-      104,  104,  104,  105,  105,  105,  105,  105,  105,  105,
-      105,  105,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  107,  107,  107,  107,
-      108,  109,  110,  111,  112,  113,  113,  114,  115,  115,
-
-      116,  116,  116,  116,  116,  116,  117,  118,  119,  119,
-      119,  119,  120,  121,  121,  121,  122,  122,  122,  122,
-      122,  122,  122,  122,  122,  123,  124,  125,  125,  126,
-      127,  127,  128,  129,  129,  129,  129,  129,  129,  129,
-      129,  129,  130,  130,  130,  131,  132,  132,  132,  132,
-      133,  133,  133,  133,  133,  134,  134,  134,  135,  135,
-      135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
-      135,  135,  136,  137,  137,  137,  137,  137,  138,  139,
-      139,  139,  139,  140,  140,  140,  140,  140,  140,  140,
-      140,  141,  142,  142,  142,  142,  142,  143,  143,  143,
-
-      144,  145,  145,  145,  146,  146,  146,  146,  147,  148,
-      148,  148,  149,  149,  149,  149,  150,  150,  151,  152,
-      152,  152,  152,  152,  153,  153,  154,  154,  155,  155,
-      155,  156,  157,  158,  159,  159,  159,  160,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-      161,  161,  162,  163,  163,  163,  163,  163,  163,  163,
-      164,  164,  164,  164,  164,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  166,  166,
-      166,  166,  166,  167,  167,  168,  168,  168,  168,  168,
-      168,  168,  168,  169,  169,  169,  170,  170,  170,  170,
-
-      171,  171,  171,  171,  172,  172,  172,  173,  174,  175,
-      175,  175,  176,  177,  177,  177,  177,  178,  178,  179,
-      180,  180,  180,  181,  181,  181,  182,  182,  182,  183,
-      184,  185,  185,  186,  187,  187,  188,  189,  189,  189,
-      189,  189,  189,  190,  190,  190,  191,  192,  192,  192,
-      192,  192,  192,  193,  193,  193,  193,  193,  193,  193,
-      193,  193,  194,  194,  194,  194,  194,  194,  194,  194,
-      194,  194,  195,  195,  195,  195,  195,  196,  196,  196,
-      196,  197,  198,  199,  200,  201,  202,  202,  202,  202,
-      202,  203,  203,  203,  203,  204,  204,  205,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      207,  207,  207,  207,  207,  207,  208,  208,  208,  208,
-      208,  208,  209,  209,  209,  209,  209,  209,  210,  210,
-      210,  210,  210,  210,  210,  210,  211,  211,  211,  211,
-      211,  212,  213,  214,  214,  215,  215,  216,  217,  217,
-      218,  218
+        0,    0,  139,  137,  136,  136,  137,  137,  137,  137,
+      137,  137,  129,  129,    1,  137,  137,  137,  137,  137,
+      137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+      137,  137,  137,  137,  137,  137,  137,  137,    0,  127,
+        0,  125,  123,  132,    0,  130,    0,  134,  129,    0,
+        1,    0,  124,  133,    0,    0,    0,    0,    0,    0,
+        0,  109,    0,   38,    0,    0,    0,    0,    0,    0,
+       72,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   54,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   73,    0,    0,    0,    0,    0,    0,    0,   68,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   25,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  127,  123,  134,   22,  134,    0,  135,
+        0,  128,  124,   55,    0,    0,   67,    0,    0,   36,
+        0,    0,    0,   39,    0,    0,    0,    0,    0,    0,
+        0,    0,    3,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   57,    0,    0,    0,
+       82,   87,   85,   86,   84,   83,    0,   88,   92,    0,
+
+        0,  108,    0,    0,    0,    0,    0,   77,   75,   64,
+        0,    0,    0,   76,   74,    0,    0,   56,    0,    0,
+        0,    0,    0,    0,    0,    0,   90,   81,   79,    0,
+       80,   78,    0,   91,   89,    0,    0,    0,    0,    0,
+        0,    0,    0,   69,    0,    0,  126,  134,    0,    0,
+        0,  134,    0,    0,    0,    0,   66,    0,    0,   93,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,   71,   60,    0,    0,    0,    0,  116,
+       63,    0,    0,    0,   70,    0,    0,    0,    0,    0,
+        0,    0,  117,   65,    0,    0,    0,    0,   24,    0,
+
+        0,    0,  131,   59,    0,    0,   96,    0,    0,    0,
+       62,   45,    0,    0,   26,    0,    0,    0,    4,    0,
+       52,   58,    0,    0,    0,    0,   61,    0,   48,    0,
+       12,    0,    0,   95,  134,   34,   32,    0,    0,    2,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    5,    0,   49,   98,    0,    0,    0,    0,
+        0,    0,   44,    0,    0,    0,    0,   51,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  118,    0,    0,    0,    0,   94,    0,   23,    0,
+        0,    0,    0,    0,    0,    0,  115,    0,    0,   41,
+
+        0,    0,    0,    7,    0,    0,    0,   50,    0,    0,
+       40,  102,  101,    0,    0,    8,   16,    0,    0,    0,
+      111,    0,  114,   35,    0,    0,   53,    0,    0,    0,
+      106,    0,    0,  100,  110,   27,    0,   28,   99,    0,
+      112,  107,    0,    0,    0,    0,    0,  105,    0,    0,
+        6,   29,    0,    0,    0,    0,    0,   97,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   33,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    9,    0,    0,
+        0,    0,   19,    0,    0,    0,   10,  103,   11,   47,
+       46,    0,  104,    0,    0,    0,    0,   31,    0,    0,
+
+        0,   13,    0,   15,   14,    0,    0,    0,    0,   17,
+        0,    0,    0,    0,    0,    0,    0,   30,    0,    0,
+        0,    0,    0,   37,    0,    0,    0,    0,    0,   18,
+        0,    0,    0,    0,    0,  113,    0,    0,    0,    0,
+        0,    0,    0,   20,    0,    0,    0,    0,  119,  121,
+      122,    0,   42,    0,  120,   43,    0,   21,    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 +486,7 @@
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[45] =
+static yyconst flex_int32_t yy_meta[45] =
     {   0,
         1,    1,    2,    3,    4,    1,    1,    4,    4,    4,
         4,    4,    4,    5,    1,    1,    4,    4,    4,    4,
@@ -453,137 +495,139 @@
         4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[560] =
+static yyconst flex_int16_t yy_base[568] =
     {   0,
-        0,    0, 1201, 1202, 1202, 1202, 1196, 1185,   35,   39,
+        0,    0, 1217, 1218, 1218, 1218, 1212, 1201,   35,   39,
        43,   49,   55,   61,    0,   72,   64,   67,   66,   86,
-       76,  106,   91,   65,  133,  121,  117,   99,  152,   95,
-       78,  179,  137,  211,  139,   90,  148,   93, 1194, 1202,
-     1183, 1202,    0,   49,  185,  217,  116,  238,  254,  259,
-        0, 1192,    0,  200,  125,  149,  146,  153,  177,   63,
-      154, 1181,  160,  161,  208,  185,  264,  171,  113,  210,
-     1180,  222,  260,  228,  186,  261,  271,  110,  273,  274,
-      230,  289,  277,  278,  240,  290,  292,  205,  291,  232,
-      296, 1179,  299,  303,  305,  306,  310,  313,  309,  318,
-
-      311,  314,  317,  322,  328,  329,  338,  331,  335,  339,
-      333,  332,  346,  340,  352,  355, 1178,  358,  360,  361,
-      364,  368,  365,  369,  381,  376,  382,  388,  367,  396,
-      384,  395, 1177,    0,  414, 1176,  429,  447,    0, 1185,
-     1202,    0, 1174,  409,  397, 1173,  420,  414, 1172,  405,
-      399,  422, 1171,  442,  431,  449,  432,  450,  437,  452,
-      456, 1170,  457,  435,  459,  460,  461,  465,  370,  469,
-      468,  472,  470,  475,  473,  476,  489,  490,  492,  494,
-      481,  497,  495,  502,  498, 1169,  503,  501,  505, 1168,
-     1167, 1166, 1165, 1164, 1163,  507, 1162, 1161,  508, 1160,
-
-      537,  512,  515,  510,  525, 1159, 1158, 1157,  516,  542,
-      531, 1156, 1155,  537,  529, 1154,  553,  555,  231,  556,
-      558,  557,  559,  560, 1153, 1152, 1151,  562, 1150, 1149,
-      563, 1148, 1147,  564,  565,  509,  524,  576,  582,  568,
-      584, 1146,  572,  570, 1202,  599,  608,  614,  618,  623,
-      608,  624,  592,  625, 1145,  626,  587, 1144,  627,  628,
-      629,  630,  632,  633,  634,  637,  639,  638,  640,  580,
-      641, 1143, 1142,  648,  651,  653,  656, 1141, 1140,  657,
-      658,  659, 1139,  665,  661,  663,  667,  674,  666,  668,
-     1138, 1137,  671,  679,  670,  680, 1136,  684,  691,    0,
-
-     1135,  688,  692, 1134,  693,  696,  697, 1133, 1132,  701,
-      705, 1131,  712,  714,  699, 1130,  716, 1129, 1128,  717,
-      718,  719,  703, 1127,  723, 1126,  726, 1125,  730,  732,
-     1124,  737, 1123, 1122,  731,  738, 1121,  739,  740,  743,
-      751,  742,  744,  752,  755,  756,  758,  760,  761, 1120,
-      763, 1119, 1118,  765,  766,  767,  772,  770,  773, 1117,
-      774,  777,  781,  783, 1116,  784,  788,  787,  789,  790,
-      799,  792,  794,  800,  803,  805,  807, 1115,  808,  810,
-      811,  812, 1114,  815, 1113,  817,  823,  818,  826,  831,
-      828,  829, 1112,  836,  833, 1111,  838,  698,  839, 1110,
-
-      841,  842,  843, 1109,  848,  844, 1108, 1107, 1106,  851,
-      846, 1105, 1104,  845,  860,  858, 1103,  865, 1102, 1101,
-      867,  869, 1100,  870,  872, 1099,  871,  874, 1098, 1097,
-     1096,  875, 1095, 1094,  878, 1093, 1092,  876,  877,  884,
-      883,  886, 1091,  879,  894, 1090, 1089,  895,  896,  898,
-      899,  901, 1088,  902,  905,  906,  907,  909,  908,  914,
-      910, 1087,  916,  920,  924,  927,  928,  931,  935,  932,
-      936, 1086,  937,  939,  941,  944, 1085,  945,  946,  947,
-     1074, 1064, 1063, 1062, 1061, 1060,  949,  950,  951,  953,
-     1059,  966,  967,  968, 1058,  952, 1057, 1056,  969,  971,
-
-      972,  977,  978,  979,  980,  983,  984,  985,  987, 1055,
-      989,  991,  992,  995,  997, 1053, 1000, 1007,  998, 1002,
-     1009, 1049, 1010, 1011, 1013, 1015, 1016, 1046, 1022, 1019,
-     1023, 1024, 1026, 1028, 1029, 1045, 1033, 1036,  371, 1030,
-      599,  522,  474, 1039,  434, 1040,  282,  279, 1043,  244,
-     1202, 1079, 1081,  212, 1086, 1089,  167, 1093,  108
+       76,  106,   91,   65,  133,  121,  117,   99,  152,  125,
+       78,  179,  137,  211,  139,   90,  154,   93, 1210, 1218,
+     1199, 1218,    0,   49,  185,  217,  113,  238,  254,  259,
+        0, 1208,    0,  200,  110,  155,  111,   75,  148,  134,
+      163, 1197,  160,  177,  208,  178,  264,  194,  205,  200,
+     1196,  219,  260,  222,  218,  167,  261,  231,  273,  228,
+      277,  282,  274,  287,  288,   98,  240,  289,  290,  292,
+      296, 1195,  293,  298,  299,  307,  316,  294,  319,  321,
+
+      308,  305,  323,  303,  300,  329,  333,  332,  334,  338,
+      336,  344,  339,  348,  337,  352,  335, 1194,  353,  363,
+      365,  364,  370,  368,  371,  377,  372,  384,  391,  369,
+      390,  376,  393, 1193,    0,  404, 1192,  426,  444,    0,
+     1201, 1218,    0, 1190,  406,  397, 1189,  409,  410, 1188,
+      413,  420,  417, 1187,  439,  411,  429,  431,  445,  446,
+      450,  449, 1186,  451,  452,  453,  454,  455,  457,  458,
+      465,  466,  468,  472,  471,  469,  482,  485,  488,  490,
+      491,  493,  494,  496,  497,  499, 1185,  500,  502,  505,
+     1184, 1183, 1182, 1181, 1180, 1179,  504, 1178, 1177,  506,
+
+      507, 1176,  536,  511,  514,  516,  517, 1175, 1174, 1173,
+      548,  519,  536, 1172, 1171,  549,  528, 1170,  527,  552,
+      553,  554,  556,  557,  560,  558, 1169, 1168, 1167,  561,
+     1166, 1165,  562, 1164, 1163,  569,  563,  571,  581,  574,
+      585,  578,  589, 1162,  582,  586, 1218,  599,  618,  608,
+      622,  627,  590,  628,  515,  629, 1161,  630,  602, 1160,
+      592,  631,  633,  632,  634,  636,  635,  637,  640,  639,
+      645,  643,  657, 1159, 1158,  642,  644,  658,  659, 1157,
+     1156,  660,  664,  662, 1155,  667,  669,  671,  673,  674,
+      678,  677, 1154, 1153,  680,  682,  685,  675, 1152,  686,
+
+      687,  688,    0, 1151,  690,  695, 1150,  701,  700,  705,
+     1149, 1148,  708,  706, 1147,  713,  715,  717, 1146,  719,
+     1145, 1144,  720,  724,  722,  725, 1143,  726, 1142,  729,
+     1141,  734,  730, 1140,  740, 1139, 1138,  740,  732, 1137,
+      742,  747,  750,  752,  749,  751,  759,  754,  760,  762,
+      763,  767, 1136,  768, 1135, 1134,  764,  769,  770,  777,
+      773,  779, 1133,  782,  784,  785,  786, 1132,  790,  791,
+      793,  792,  795,  794,  807,  798,  800,  801,  810,  811,
+      813, 1131,  814,  816,  820,  818, 1130,  821, 1129,  823,
+      830,  824,  832,  837,  834,  835, 1128,  838,  842, 1127,
+
+      844,  845,  847, 1126,  848,  849,  850, 1125,  854,  851,
+     1124, 1123, 1122,  855,  856, 1121, 1120,  867,  864,  861,
+     1119,  872, 1118, 1117,  865,  876, 1116,  878,  879,  881,
+     1115,  882,  884, 1114, 1113, 1112,  883, 1111, 1110,  890,
+     1109, 1108,  889,  886,  891,  893,  896, 1107,  898,  901,
+     1106, 1105,  904,  906,  908,  911,  913, 1104,  915,  916,
+      917,  912,  919,  918,  921,  931,  924, 1103,  937,  939,
+      938,  940,  942,  943,  945,  944,  947, 1102,  950,  955,
+      956,  951, 1101,  957,  958,  960, 1090, 1079, 1078, 1077,
+     1076,  962, 1074,  964,  969,  965,  978, 1073,  981,  966,
+
+      982, 1072,  983, 1071, 1070,  986,  987,  988,  991, 1069,
+      990,  993,  994,  995,  999, 1000, 1003, 1064, 1004, 1001,
+     1006, 1010, 1013, 1062, 1015, 1014, 1022, 1023, 1025, 1061,
+     1030, 1027, 1028, 1029, 1031,  910, 1033, 1034, 1036, 1035,
+     1032, 1043, 1044,  641, 1052, 1055, 1045, 1056,  599,  522,
+      470, 1057,  467, 1058,  373,  245, 1059,  244, 1218, 1095,
+     1097,  200, 1102, 1105,  167, 1109,   73
     } ;
 
-static yyconst short int yy_def[560] =
+static yyconst flex_int16_t yy_def[568] =
     {   0,
-      551,    1,  551,  551,  551,  551,  552,  553,  554,  551,
-      553,  553,  553,  553,  555,  556,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  552,  551,
-      553,  551,  557,  551,  551,  553,  553,  553,  553,  553,
-      555,  558,  559,  551,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  551,  557,  551,  553,  553,  553,   50,  558,
-      551,  559,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-
-       50,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  551,  551,  551,  551,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  201,
-
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  551,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-        0,  551,  551,  551,  551,  551,  551,  551,  551
+      559,    1,  559,  559,  559,  559,  560,  561,  562,  559,
+      561,  561,  561,  561,  563,  564,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  560,  559,
+      561,  559,  565,  559,  559,  561,  561,  561,  561,  561,
+      563,  566,  567,  559,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  559,  565,  559,  561,  561,  561,   50,
+      566,  559,  567,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+
+      561,  561,   50,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  559,  559,  559,  559,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+
+      561,  561,  203,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  559,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,    0,  559,
+      559,  559,  559,  559,  559,  559,  559
     } ;
 
-static yyconst short int yy_nxt[1247] =
+static yyconst flex_int16_t yy_nxt[1263] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,   16,    8,    8,    8,   17,
@@ -592,120 +636,122 @@
        36,   37,    8,   38,   44,   44,   44,   44,   45,   45,
        45,   45,   46,   46,   46,   46,   42,   47,   44,   44,
        44,   44,   42,   48,   49,   49,   49,   49,   42,   48,
-       49,   49,   49,   49,   42,   52,   42,   42,   42,   42,
-       42,   54,   54,   54,   54,   63,   55,   64,  150,   42,
+       49,   49,   49,   49,   42,   52,  143,   42,   42,   42,
+       42,   54,   54,   54,   54,   63,   55,   64,   42,   42,
        60,   42,   81,   56,   61,   57,   50,   58,   65,   42,
 
-       59,  103,   62,   42,   42,   66,   42,   70,   42,   67,
-       71,  142,   42,  129,   79,   68,  132,   72,   69,   42,
-       80,  101,   92,   42,  136,   73,   42,   74,   75,   42,
-       42,   93,  102,  171,   42,   76,   89,   94,   42,   77,
-       85,   78,   82,   82,   82,   82,   42,  143,   86,   90,
-       42,  161,   42,   87,   83,   91,  115,   88,  127,   42,
-      130,   42,   42,  116,   84,   42,   42,   42,  146,  117,
-      134,  128,  118,   42,   42,   95,  144,   96,  145,  119,
-      131,   97,  153,   98,   42,   99,  147,  100,  104,  152,
-       42,  151,   42,  135,   45,   45,   45,   45,   42,   42,
-
-      160,  105,  106,  148,  107,  108,  109,  149,  110,   54,
-       54,   54,   54,  167,  111,   43,  112,  113,   42,  114,
-      104,   42,  156,   42,   42,   48,   46,   46,   46,   46,
-       42,  183,  162,  120,  121,   42,  122,  154,  123,  155,
-      124,   42,  125,   42,   42,   42,  126,  137,  137,  137,
-      137,   42,  174,   42,  185,  138,  313,   42,  166,  163,
-      180,  138,   48,   49,   49,   49,   49,   42,  139,  139,
-      139,  139,   42,   42,   42,  139,  139,   42,  139,  139,
-      139,  139,  139,  139,   42,  157,   42,   42,  158,  164,
-       42,   42,   42,  168,  169,   42,  165,  159,   82,   82,
-
-       82,   82,   42,   42,   42,   42,  173,  175,  170,   42,
-      172,  182,   42,  176,  177,  178,   42,  179,   42,   42,
-      184,  181,   42,   42,   42,  186,   42,   42,  196,  191,
-       42,   42,  189,  193,  187,   42,  195,  188,  198,  190,
-      197,   42,   42,  192,   42,   42,   42,  194,   42,  199,
-      203,   42,   42,   42,  200,  202,  214,  210,  204,   42,
-      208,  206,  212,  201,  215,   42,  216,  217,   42,  209,
-      205,   42,  211,   42,   42,  207,  213,   42,   42,  218,
-       42,   42,   42,   42,   42,  221,  240,  219,  224,   42,
-      220,  226,  229,  223,   42,   42,  222,   42,  225,  236,
-
-      237,   42,  228,  231,  232,  227,  230,  241,   42,   42,
-       42,  275,   42,  233,  546,  238,  234,  239,   42,  242,
-      257,  235,   42,  246,  246,  246,  246,   42,  251,  253,
-      243,  247,  256,   42,  252,   42,  244,  247,  137,  137,
-      137,  137,   42,  254,   42,   42,  138,   42,   42,  255,
-       42,  258,  138,  248,  249,   42,  250,  250,  250,  250,
-       42,  262,   42,   42,  259,   42,  264,  260,  261,   42,
-       42,  270,   42,   42,   42,  265,  267,  263,   42,  266,
-      268,   42,   42,   42,  274,   42,   42,   42,   42,   42,
-      281,  278,  269,  272,   42,  280,  271,  282,  279,  284,
-
-      273,  276,   42,   42,  277,   42,  283,   42,   42,  290,
-       42,   42,  285,  286,   42,   42,   42,  289,   42,  291,
-       42,   42,   42,   42,  288,   42,  295,  287,   42,   42,
-      292,  293,  296,  303,  297,   42,  294,   42,   42,  324,
-      305,  298,   42,  325,   42,  299,  300,  300,  300,  300,
-       42,  301,  302,  300,  300,   42,  300,  300,  300,  300,
-      300,  300,  304,  307,  310,  306,   42,  308,   42,   42,
-       42,   42,   42,   42,  309,   42,   42,   42,   42,  314,
-      316,   42,  318,   42,  312,   42,  321,  322,  317,   42,
-      311,  315,  323,   42,  320,   42,  328,   42,  326,  319,
-
-       42,  327,  329,  350,  330,   42,  338,  331,  246,  246,
-      246,  246,   42,  335,  248,  248,  247,  332,  332,  332,
-      332,   42,  247,  332,  332,  332,  332,  250,  250,  250,
-      250,   42,  250,  250,  250,  250,   42,   42,   42,   42,
-       42,   42,   42,   42,  333,   42,   42,   42,  339,  342,
-       42,   42,   42,   42,   42,  334,  336,  337,  341,  349,
-      344,   42,  351,  343,   42,  340,   42,  346,  347,   42,
-       42,   42,   42,  348,   42,  345,   42,  358,   42,   42,
-       42,   42,  359,   42,   42,  352,  357,   42,  353,  354,
-      360,  355,   42,   42,  356,  365,  361,   42,  362,  363,
-
-      366,   42,  364,  367,   42,   42,   42,  369,  368,   42,
-       42,   42,   42,  374,   42,  373,   42,  375,   42,  376,
-      370,  377,  371,  372,  378,   42,  379,   42,  382,   42,
-       42,   42,   42,  381,  387,  380,   42,  383,  386,   42,
-      445,  384,  385,   42,   42,   42,  332,  332,  332,  332,
-      393,   42,   42,   42,  390,   42,   42,   42,  388,  392,
-      394,  396,  397,  389,   42,   42,  391,  400,   42,   42,
-      398,   42,  401,   42,   42,  395,   42,  399,   42,   42,
-       42,  404,  406,   42,  407,   42,   42,   42,  402,  403,
-       42,  405,  408,  409,   42,  411,   42,   42,  410,  412,
-
-       42,   42,   42,   42,  413,   42,  417,   42,  415,  419,
-      420,  414,   42,   42,  416,  418,   42,  422,   42,  424,
-       42,   42,  423,   42,   42,   42,  425,  421,   42,  428,
-       42,   42,  427,  432,  430,  433,   42,  426,  435,   42,
-      429,   42,   42,  437,   42,  436,   42,  431,  434,   42,
-      439,   42,   42,  438,   42,   42,   42,   42,   42,   42,
-      441,   42,  446,  442,   42,  440,  450,  451,  455,  444,
-      443,   42,  453,   42,  448,  449,  454,  447,   42,  456,
-       42,  452,   42,   42,   42,   42,  458,   42,   42,   42,
-       42,   42,   42,  465,  463,  457,   42,   42,  464,   42,
-
-      460,  461,  459,  462,  466,  467,  469,   42,   42,   42,
-      470,   42,   42,  468,   42,   42,  472,  471,   42,   42,
-       42,   42,   42,   42,  478,  479,  473,   42,  477,   42,
-      474,  475,  483,   42,  480,  481,  485,   42,  476,  484,
-       42,   42,  482,  488,   42,   42,  490,  486,   42,   42,
-       42,  491,   42,  489,   42,  487,  493,   42,   42,   42,
-       42,  495,   42,   42,   42,   42,   42,  499,  492,  494,
-      502,  504,  503,  506,  500,  496,  497,  501,  498,   42,
-       42,   42,   42,  505,   42,   42,  508,  507,  511,  510,
-       42,   42,   42,   42,  512,  509,   42,   42,   42,  515,
-
-       42,  517,   42,  519,   42,   42,  521,  514,   42,  513,
-       42,   42,  518,   42,  520,   42,  516,  522,  525,  527,
-       42,  523,   42,   42,   42,  524,   42,  529,   42,   42,
-      528,  530,   42,  532,  526,   42,   42,   42,  531,   42,
-      538,   42,   42,   42,  534,  536,   42,  535,  533,   42,
-      539,  537,   42,   42,  544,  540,   42,  545,   42,   42,
-      548,  541,   42,  549,  543,  542,   42,  547,   42,   42,
-       42,   42,   42,   42,   42,   42,   42,   42,  550,   39,
-       39,   39,   39,   39,   41,   41,   51,   42,   51,   51,
-       51,   53,   53,  140,  140,  140,  140,  140,   42,   42,
+       59,  104,   62,   42,   42,   66,   42,   70,  148,   67,
+       71,   42,   42,  130,   79,   68,  133,   72,   69,   42,
+       80,  137,   92,   42,   42,   73,   42,   74,   75,  182,
+       42,   93,  144,  147,   42,   76,   89,   94,   42,   77,
+       85,   78,   82,   82,   82,   82,   42,   42,   86,   90,
+       42,  101,   42,   87,   83,   91,  116,   88,  128,  151,
+      102,   42,  103,  117,   84,   42,  131,   42,   42,  118,
+      135,  129,  119,   42,  149,   95,   42,   96,  150,  120,
+       42,   97,  145,   98,  146,   99,  132,  100,  105,  153,
+       42,   42,   42,  136,   45,   45,   45,   45,  154,  169,
+
+      152,  106,  107,   43,  108,  109,  110,   42,  111,   54,
+       54,   54,   54,   42,  112,  157,  113,  114,   42,  115,
+      105,   42,  163,  161,   42,   48,   46,   46,   46,   46,
+       42,   42,   42,  121,  122,   42,  123,  155,  124,  156,
+      125,   42,  126,  162,   42,  168,  127,  138,  138,  138,
+      138,   42,  167,   42,  172,  139,  164,   42,   42,  183,
+      174,  139,   48,   49,   49,   49,   49,   42,  140,  140,
+      140,  140,   42,   42,   42,  140,  140,   42,  140,  140,
+      140,  140,  140,  140,  170,  158,   42,   42,  159,  165,
+       42,   82,   82,   82,   82,   42,  166,  160,  171,  175,
+
+       42,   42,   42,   42,  176,   42,   42,   42,  181,   42,
+      173,   42,   42,   42,  186,  184,   42,  196,   42,  185,
+       42,   42,  177,  178,  179,  187,  180,  190,  188,   42,
+      192,  189,   42,  191,   42,  199,   42,  200,  197,  194,
+      202,  203,   42,  198,  193,   42,   42,   42,   42,   42,
+       42,   42,   42,  195,  205,  208,  204,   42,  201,  214,
+      212,   42,  206,  210,  219,   42,   42,  216,  218,  209,
+      222,  217,  211,  215,  207,  213,   42,   42,   42,  220,
+      223,   42,   42,   42,   42,   42,   42,  221,  242,   42,
+       42,  224,  226,  228,  231,  238,  225,   42,  227,  233,
+
+      234,  243,  239,   42,   42,  230,   42,  229,  232,  235,
+       42,  244,  236,  248,  248,  248,  248,  237,  240,   42,
+      241,  249,   42,   42,   42,  253,   42,  249,  245,  255,
+       42,  254,  256,   42,  246,  138,  138,  138,  138,   42,
+      258,  259,   42,  139,   42,  257,  260,  262,  263,  139,
+      250,  251,   42,  252,  252,  252,  252,   42,   42,   42,
+      264,  261,   42,   42,   42,   42,   42,   42,   42,  269,
+       42,   42,  265,  267,  270,  266,  276,  268,   42,   42,
+       42,   42,   42,   42,   42,   42,  271,  274,  272,  280,
+      273,  282,  283,  284,  275,   42,  281,  278,   42,  277,
+
+      279,   42,  285,   42,   42,  286,   42,   42,  287,   42,
+       42,  288,   42,   42,  291,   42,  293,   42,   42,   42,
+       42,  292,  290,  297,   42,  289,  295,   42,   42,   42,
+       42,  294,   42,  298,  299,   42,  338,  296,  300,  306,
+       42,   42,  309,  301,  302,  303,  303,  303,  303,   42,
+      304,  305,  303,  303,  307,  303,  303,  303,  303,  303,
+      303,   42,   42,  313,  314,   42,   42,   42,  310,   42,
+       42,   42,  308,   42,   42,   42,   42,  317,  316,  311,
+      319,  315,   42,  321,   42,  324,  312,   42,  320,  318,
+      326,   42,  325,  323,   42,   42,  329,  322,   42,   42,
+
+      328,  327,   42,   42,  330,   42,  331,  332,  248,  248,
+      248,  248,   42,  342,  333,   42,  249,  335,  335,  335,
+      335,  341,  249,  334,  250,  250,  336,  335,  335,  335,
+      335,  252,  252,  252,  252,   42,  252,  252,  252,  252,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,  345,   42,   42,   42,   42,   42,   42,   42,  337,
+      339,  340,  344,  347,  352,  346,  353,  349,  343,  350,
+       42,   42,   42,   42,  351,   42,  348,   42,  354,  355,
+       42,  356,   42,  361,   42,  362,   42,   42,   42,  360,
+       42,   42,  363,   42,  357,   42,  358,  359,   42,   42,
+
+       42,   42,  367,   42,  364,  366,  365,  368,   42,  369,
+      375,  371,  370,   42,   42,  373,  378,  377,   42,   42,
+      376,   42,  372,  380,  374,  379,   42,  383,   42,  381,
+       42,  382,   42,   42,  385,   42,  384,   42,   42,   42,
+      387,  390,   42,   42,  388,   42,  386,   42,  389,  335,
+      335,  335,  335,   42,  398,   42,  391,  396,  394,  397,
+       42,  392,   42,   42,   42,   42,  393,   42,  400,  401,
+      395,  402,   42,   42,  404,   42,   42,   42,  399,  405,
+       42,   42,   42,   42,  403,  408,   42,  406,  410,  411,
+       42,  412,   42,  407,  409,   42,  413,   42,   42,   42,
+
+      415,  414,  416,   42,   42,   42,   42,   42,   42,  421,
+      417,   42,  423,   42,   42,  419,  424,  427,  420,  418,
+       42,  422,  426,   42,   42,  429,   42,   42,  428,   42,
+      425,   42,  430,   42,   42,  433,   42,   42,  431,  432,
+      435,  438,  437,   42,  440,   42,  434,   42,   42,  442,
+       42,   42,  441,  436,  439,   42,  444,   42,   42,  443,
+       42,   42,   42,   42,   42,  447,  446,   42,   42,   42,
+      451,  445,  455,  456,   42,  449,  458,   42,   42,  448,
+       42,  453,  454,  461,  452,   42,  459,  450,  457,   42,
+      460,   42,   42,  463,   42,   42,   42,   42,  462,   42,
+
+      464,  471,   42,   42,   42,  469,   42,  465,  470,   42,
+      467,   42,  468,  475,   42,  466,  472,   42,  473,   42,
+      476,   42,  474,   42,   42,   42,   42,  477,   42,   42,
+       42,   42,   42,  479,   42,  478,  484,   42,  485,  480,
+      483,  481,  489,  491,   42,  486,  487,  488,  482,  490,
+       42,   42,   42,   42,  492,   42,   42,   42,   42,  497,
+       42,  493,  495,   42,   42,  498,  500,  496,   42,   42,
+       42,   42,  502,   42,  506,   42,  494,   42,   42,   42,
+      499,  501,   42,  509,  510,  516,  507,  511,  503,  508,
+      512,   42,  504,  505,   42,   42,   42,  513,  514,   42,
+
+       42,   42,  515,   42,   42,  519,   42,   42,   42,  517,
+      520,  523,   42,   42,   42,  525,   42,   42,  527,   42,
+      518,  522,  529,   42,  526,  521,   42,   42,   42,  528,
+      524,  531,  530,  533,  535,   42,   42,  536,   42,  532,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+      534,  537,  538,  540,  539,  546,   42,   42,   42,  542,
+      544,  543,  545,  547,  541,   42,  548,  549,   42,   42,
+       42,   42,   42,  552,   42,   42,  553,   42,  556,  551,
+      550,  557,   42,   42,   42,   42,   42,   42,  554,   42,
+       42,   42,   42,  555,  558,   39,   39,   39,   39,   39,
 
+       41,   41,   51,   42,   51,   51,   51,   53,   53,  141,
+      141,  141,  141,  141,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
@@ -714,17 +760,17 @@
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-       42,   42,   42,   42,   42,   42,   42,   42,  141,   42,
-      245,   42,   42,   42,   42,  141,   42,  133,   42,   40,
 
-      551,    3,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551
+       42,   42,   42,   42,  142,   42,  247,   42,   42,   42,
+       42,  142,   42,  134,   42,   40,  559,    3,  559,  559,
+      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+      559,  559
     } ;
 
-static yyconst short int yy_chk[1247] =
+static yyconst flex_int16_t yy_chk[1263] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -733,154 +779,166 @@
         1,    1,    1,    1,    9,    9,    9,    9,   10,   10,
        10,   10,   11,   11,   11,   11,   11,   12,   44,   44,
        44,   44,   12,   13,   13,   13,   13,   13,   13,   14,
-       14,   14,   14,   14,   14,   16,   60,   17,   24,   19,
-       18,   16,   16,   16,   16,   19,   17,   19,   60,   21,
+       14,   14,   14,   14,   14,   16,  567,   17,   24,   19,
+       18,   16,   16,   16,   16,   19,   17,   19,   58,   21,
        18,   31,   24,   17,   18,   17,   13,   17,   19,   20,
 
-       17,   31,   18,   36,   23,   20,   38,   21,   30,   20,
-       21,  559,   28,   36,   23,   20,   38,   21,   20,   22,
-       23,   30,   28,   78,   47,   22,   69,   22,   22,   47,
-       27,   28,   30,   78,   26,   22,   27,   28,   55,   22,
-       26,   22,   25,   25,   25,   25,   25,   55,   26,   27,
-       33,   69,   35,   26,   25,   27,   33,   26,   35,   57,
-       37,   37,   56,   33,   25,   29,   58,   61,   57,   33,
-      557,   35,   33,   63,   64,   29,   56,   29,   56,   33,
-       37,   29,   64,   29,   68,   29,   58,   29,   32,   63,
-       59,   61,   32,   45,   45,   45,   45,   45,   66,   75,
-
-       68,   32,   32,   59,   32,   32,   32,   59,   32,   54,
-       54,   54,   54,   75,   32,  554,   32,   32,   88,   32,
-       34,   65,   66,   70,   34,   46,   46,   46,   46,   46,
-       46,   88,   70,   34,   34,   72,   34,   65,   34,   65,
-       34,   74,   34,   81,  219,   90,   34,   48,   48,   48,
-       48,   48,   81,   85,   90,   48,  219,  550,   74,   72,
-       85,   48,   49,   49,   49,   49,   49,   49,   50,   50,
-       50,   50,   50,   73,   76,   50,   50,   67,   50,   50,
-       50,   50,   50,   50,   77,   67,   79,   80,   67,   73,
-       83,   84,  548,   76,   77,  547,   73,   67,   82,   82,
-
-       82,   82,   82,   86,   89,   87,   80,   83,   77,   91,
-       79,   87,   93,   84,   84,   84,   94,   84,   95,   96,
-       89,   86,   99,   97,  101,   91,   98,  102,   99,   96,
-      103,  100,   94,   97,   93,  104,   98,   93,  101,   95,
-      100,  105,  106,   96,  108,  112,  111,   97,  109,  102,
-      106,  107,  110,  114,  103,  105,  111,  109,  106,  113,
-      108,  107,  110,  104,  112,  115,  113,  114,  116,  108,
-      106,  118,  109,  119,  120,  107,  110,  121,  123,  115,
-      129,  122,  124,  169,  539,  118,  129,  115,  120,  126,
-      116,  122,  124,  119,  125,  127,  118,  131,  121,  126,
-
-      127,  128,  123,  125,  125,  122,  124,  130,  132,  130,
-      145,  169,  151,  125,  539,  128,  125,  128,  150,  131,
-      151,  125,  144,  135,  135,  135,  135,  148,  144,  145,
-      132,  135,  150,  147,  144,  152,  132,  135,  137,  137,
-      137,  137,  137,  147,  155,  157,  137,  545,  164,  148,
-      159,  152,  137,  138,  138,  154,  138,  138,  138,  138,
-      138,  157,  156,  158,  154,  160,  159,  155,  156,  161,
-      163,  164,  165,  166,  167,  160,  161,  158,  168,  160,
-      163,  171,  170,  173,  168,  172,  175,  543,  174,  176,
-      173,  171,  163,  166,  181,  172,  165,  174,  171,  176,
-
-      167,  170,  177,  178,  170,  179,  175,  180,  183,  181,
-      182,  185,  177,  178,  188,  184,  187,  180,  189,  182,
-      196,  199,  236,  204,  179,  202,  187,  178,  203,  209,
-      183,  184,  188,  204,  189,  542,  185,  237,  205,  236,
-      209,  196,  215,  237,  211,  199,  201,  201,  201,  201,
-      214,  202,  203,  201,  201,  210,  201,  201,  201,  201,
-      201,  201,  205,  211,  215,  210,  217,  214,  218,  220,
-      222,  221,  223,  224,  214,  228,  231,  234,  235,  220,
-      222,  240,  223,  244,  218,  243,  231,  234,  222,  238,
-      217,  221,  235,  270,  228,  239,  240,  241,  238,  224,
-
-      257,  239,  241,  270,  243,  253,  257,  244,  246,  246,
-      246,  246,  541,  253,  247,  247,  246,  247,  247,  247,
-      247,  251,  246,  248,  248,  248,  248,  249,  249,  249,
-      249,  249,  250,  250,  250,  250,  250,  252,  254,  256,
-      259,  260,  261,  262,  251,  263,  264,  265,  259,  262,
-      266,  268,  267,  269,  271,  252,  254,  256,  261,  269,
-      264,  274,  271,  263,  275,  260,  276,  266,  267,  277,
-      280,  281,  282,  268,  285,  265,  286,  281,  284,  289,
-      287,  290,  282,  295,  293,  274,  280,  288,  275,  276,
-      284,  276,  294,  296,  277,  289,  285,  298,  286,  287,
-
-      290,  302,  288,  293,  299,  303,  305,  295,  294,  306,
-      307,  398,  315,  303,  310,  302,  323,  305,  311,  306,
-      296,  307,  298,  299,  310,  313,  311,  314,  315,  317,
-      320,  321,  322,  314,  323,  313,  325,  317,  322,  327,
-      398,  320,  321,  329,  335,  330,  332,  332,  332,  332,
-      335,  336,  338,  339,  329,  342,  340,  343,  325,  330,
-      336,  339,  340,  327,  341,  344,  329,  343,  345,  346,
-      341,  347,  344,  348,  349,  338,  351,  342,  354,  355,
-      356,  347,  349,  358,  351,  357,  359,  361,  345,  346,
-      362,  348,  354,  355,  363,  357,  364,  366,  356,  358,
-
-      368,  367,  369,  370,  359,  372,  364,  373,  362,  367,
-      368,  361,  371,  374,  363,  366,  375,  370,  376,  372,
-      377,  379,  371,  380,  381,  382,  373,  369,  384,  376,
-      386,  388,  375,  381,  379,  382,  387,  374,  386,  389,
-      377,  391,  392,  388,  390,  387,  395,  380,  384,  394,
-      390,  397,  399,  389,  401,  402,  403,  406,  414,  411,
-      392,  405,  399,  394,  410,  391,  405,  405,  414,  397,
-      395,  416,  410,  415,  402,  403,  411,  401,  418,  415,
-      421,  406,  422,  424,  427,  425,  418,  428,  432,  438,
-      439,  435,  444,  432,  427,  416,  441,  440,  428,  442,
-
-      422,  424,  421,  425,  435,  438,  440,  445,  448,  449,
-      441,  450,  451,  439,  452,  454,  444,  442,  455,  456,
-      457,  459,  458,  461,  452,  454,  445,  460,  451,  463,
-      448,  449,  458,  464,  455,  456,  460,  465,  450,  459,
-      466,  467,  457,  464,  468,  470,  466,  461,  469,  471,
-      473,  467,  474,  465,  475,  463,  469,  476,  478,  479,
-      480,  471,  487,  488,  489,  496,  490,  476,  468,  470,
-      480,  488,  487,  490,  478,  473,  474,  479,  475,  492,
-      493,  494,  499,  489,  500,  501,  493,  492,  499,  496,
-      502,  503,  504,  505,  500,  494,  506,  507,  508,  503,
-
-      509,  505,  511,  507,  512,  513,  509,  502,  514,  501,
-      515,  519,  506,  517,  508,  520,  504,  511,  514,  517,
-      518,  512,  521,  523,  524,  513,  525,  519,  526,  527,
-      518,  520,  530,  523,  515,  529,  531,  532,  521,  533,
-      530,  534,  535,  540,  525,  527,  537,  526,  524,  538,
-      531,  529,  544,  546,  537,  532,  549,  538,  536,  528,
-      544,  533,  522,  546,  535,  534,  516,  540,  510,  498,
-      497,  495,  491,  486,  485,  484,  483,  482,  549,  552,
-      552,  552,  552,  552,  553,  553,  555,  481,  555,  555,
-      555,  556,  556,  558,  558,  558,  558,  558,  477,  472,
-
-      462,  453,  447,  446,  443,  437,  436,  434,  433,  431,
-      430,  429,  426,  423,  420,  419,  417,  413,  412,  409,
-      408,  407,  404,  400,  396,  393,  385,  383,  378,  365,
-      360,  353,  352,  350,  337,  334,  333,  331,  328,  326,
-      324,  319,  318,  316,  312,  309,  308,  304,  301,  297,
-      292,  291,  283,  279,  278,  273,  272,  258,  255,  242,
-      233,  232,  230,  229,  227,  226,  225,  216,  213,  212,
-      208,  207,  206,  200,  198,  197,  195,  194,  193,  192,
-      191,  190,  186,  162,  153,  149,  146,  143,  140,  136,
-      133,  117,   92,   71,   62,   52,   41,   39,    8,    7,
-
-        3,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
-      551,  551,  551,  551,  551,  551
+       17,   31,   18,   36,   23,   20,   38,   21,   58,   20,
+       21,   86,   28,   36,   23,   20,   38,   21,   20,   22,
+       23,   47,   28,   55,   57,   22,   47,   22,   22,   86,
+       27,   28,   55,   57,   26,   22,   27,   28,   30,   22,
+       26,   22,   25,   25,   25,   25,   25,   60,   26,   27,
+       33,   30,   35,   26,   25,   27,   33,   26,   35,   60,
+       30,   59,   30,   33,   25,   29,   37,   37,   56,   33,
+      565,   35,   33,   63,   59,   29,   61,   29,   59,   33,
+       76,   29,   56,   29,   56,   29,   37,   29,   32,   63,
+       64,   66,   32,   45,   45,   45,   45,   45,   64,   76,
+
+       61,   32,   32,  562,   32,   32,   32,   68,   32,   54,
+       54,   54,   54,   70,   32,   66,   32,   32,   69,   32,
+       34,   65,   70,   68,   34,   46,   46,   46,   46,   46,
+       46,   75,   72,   34,   34,   74,   34,   65,   34,   65,
+       34,   80,   34,   69,   78,   75,   34,   48,   48,   48,
+       48,   48,   74,   87,   78,   48,   72,  558,  556,   87,
+       80,   48,   49,   49,   49,   49,   49,   49,   50,   50,
+       50,   50,   50,   73,   77,   50,   50,   67,   50,   50,
+       50,   50,   50,   50,   77,   67,   79,   83,   67,   73,
+       81,   82,   82,   82,   82,   82,   73,   67,   77,   81,
+
+       84,   85,   88,   89,   83,   90,   93,   98,   85,   91,
+       79,   94,   95,  105,   90,   88,  104,   98,  102,   89,
+       96,  101,   84,   84,   84,   91,   84,   94,   93,   97,
+       96,   93,   99,   95,  100,  101,  103,  102,   99,   97,
+      104,  105,  106,  100,   96,  108,  107,  109,  117,  111,
+      115,  110,  113,   97,  107,  108,  106,  112,  103,  111,
+      110,  114,  107,  109,  115,  116,  119,  112,  114,  108,
+      117,  113,  109,  111,  107,  110,  120,  122,  121,  116,
+      119,  124,  130,  123,  125,  127,  555,  116,  130,  132,
+      126,  119,  121,  123,  125,  127,  120,  128,  122,  126,
+
+      126,  131,  128,  131,  129,  124,  133,  123,  125,  126,
+      146,  132,  126,  136,  136,  136,  136,  126,  129,  145,
+      129,  136,  148,  149,  156,  145,  151,  136,  133,  146,
+      153,  145,  148,  152,  133,  138,  138,  138,  138,  138,
+      151,  152,  157,  138,  158,  149,  153,  156,  157,  138,
+      139,  139,  155,  139,  139,  139,  139,  139,  159,  160,
+      158,  155,  162,  161,  164,  165,  166,  167,  168,  162,
+      169,  170,  159,  161,  164,  160,  169,  161,  171,  172,
+      553,  173,  176,  551,  175,  174,  164,  167,  165,  172,
+      166,  173,  174,  175,  168,  177,  172,  171,  178,  170,
+
+      171,  179,  176,  180,  181,  177,  182,  183,  178,  184,
+      185,  179,  186,  188,  181,  189,  183,  197,  190,  200,
+      201,  182,  180,  188,  204,  179,  185,  205,  255,  206,
+      207,  184,  212,  189,  190,  550,  255,  186,  197,  206,
+      219,  217,  212,  200,  201,  203,  203,  203,  203,  213,
+      204,  205,  203,  203,  207,  203,  203,  203,  203,  203,
+      203,  211,  216,  217,  219,  220,  221,  222,  213,  223,
+      224,  226,  211,  225,  230,  233,  237,  222,  221,  216,
+      224,  220,  236,  225,  238,  233,  216,  240,  224,  223,
+      237,  242,  236,  230,  239,  245,  240,  226,  241,  246,
+
+      239,  238,  243,  253,  241,  261,  242,  243,  248,  248,
+      248,  248,  549,  261,  245,  259,  248,  250,  250,  250,
+      250,  259,  248,  246,  249,  249,  253,  249,  249,  249,
+      249,  251,  251,  251,  251,  251,  252,  252,  252,  252,
+      252,  254,  256,  258,  262,  264,  263,  265,  267,  266,
+      268,  264,  270,  269,  544,  276,  272,  277,  271,  254,
+      256,  258,  263,  266,  271,  265,  272,  268,  262,  269,
+      273,  278,  279,  282,  270,  284,  267,  283,  273,  276,
+      286,  277,  287,  283,  288,  284,  289,  290,  298,  282,
+      292,  291,  286,  295,  278,  296,  278,  279,  297,  300,
+
+      301,  302,  290,  305,  287,  289,  288,  291,  306,  292,
+      301,  296,  295,  309,  308,  298,  306,  305,  310,  314,
+      302,  313,  297,  309,  300,  308,  316,  314,  317,  310,
+      318,  313,  320,  323,  317,  325,  316,  324,  326,  328,
+      320,  325,  330,  333,  323,  339,  318,  332,  324,  335,
+      335,  335,  335,  338,  339,  341,  326,  333,  332,  338,
+      342,  328,  345,  343,  346,  344,  330,  348,  342,  343,
+      332,  344,  347,  349,  346,  350,  351,  357,  341,  347,
+      352,  354,  358,  359,  345,  350,  361,  348,  352,  354,
+      360,  357,  362,  349,  351,  364,  358,  365,  366,  367,
+
+      360,  359,  361,  369,  370,  372,  371,  374,  373,  367,
+      362,  376,  370,  377,  378,  365,  371,  374,  366,  364,
+      375,  369,  373,  379,  380,  376,  381,  383,  375,  384,
+      372,  386,  377,  385,  388,  380,  390,  392,  378,  379,
+      383,  386,  385,  391,  390,  393,  381,  395,  396,  392,
+      394,  398,  391,  384,  388,  399,  394,  401,  402,  393,
+      403,  405,  406,  407,  410,  398,  396,  409,  414,  415,
+      403,  395,  409,  409,  420,  401,  414,  419,  425,  399,
+      418,  406,  407,  419,  405,  422,  415,  402,  410,  426,
+      418,  428,  429,  422,  430,  432,  437,  433,  420,  444,
+
+      425,  437,  443,  440,  445,  432,  446,  426,  433,  447,
+      429,  449,  430,  445,  450,  428,  440,  453,  443,  454,
+      446,  455,  444,  536,  456,  462,  457,  447,  459,  460,
+      461,  464,  463,  450,  465,  449,  457,  467,  459,  453,
+      456,  454,  463,  465,  466,  460,  461,  462,  455,  464,
+      469,  471,  470,  472,  466,  473,  474,  476,  475,  472,
+      477,  467,  470,  479,  482,  473,  475,  471,  480,  481,
+      484,  485,  477,  486,  482,  492,  469,  494,  496,  500,
+      474,  476,  495,  486,  492,  500,  484,  494,  479,  485,
+      495,  497,  480,  481,  499,  501,  503,  496,  497,  506,
+
+      507,  508,  499,  511,  509,  506,  512,  513,  514,  501,
+      507,  511,  515,  516,  520,  513,  517,  519,  515,  521,
+      503,  509,  517,  522,  514,  508,  523,  526,  525,  516,
+      512,  520,  519,  522,  525,  527,  528,  526,  529,  521,
+      532,  533,  534,  531,  535,  541,  537,  538,  540,  539,
+      523,  527,  528,  531,  529,  538,  542,  543,  547,  533,
+      535,  534,  537,  539,  532,  545,  540,  541,  546,  548,
+      552,  554,  557,  545,  530,  524,  546,  518,  552,  543,
+      542,  554,  510,  505,  504,  502,  498,  493,  547,  491,
+      490,  489,  488,  548,  557,  560,  560,  560,  560,  560,
+
+      561,  561,  563,  487,  563,  563,  563,  564,  564,  566,
+      566,  566,  566,  566,  483,  478,  468,  458,  452,  451,
+      448,  442,  441,  439,  438,  436,  435,  434,  431,  427,
+      424,  423,  421,  417,  416,  413,  412,  411,  408,  404,
+      400,  397,  389,  387,  382,  368,  363,  356,  355,  353,
+      340,  337,  336,  334,  331,  329,  327,  322,  321,  319,
+      315,  312,  311,  307,  304,  299,  294,  293,  285,  281,
+      280,  275,  274,  260,  257,  244,  235,  234,  232,  231,
+      229,  228,  227,  218,  215,  214,  210,  209,  208,  202,
+      199,  198,  196,  195,  194,  193,  192,  191,  187,  163,
+
+      154,  150,  147,  144,  141,  137,  134,  118,   92,   71,
+       62,   52,   41,   39,    8,    7,    3,  559,  559,  559,
+      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+      559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+      559,  559
     } ;
 
-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[139] =
+    {   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, 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 llvmAsm_flex_debug;
+int llvmAsm_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 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-#define INITIAL 0
+char *llvmAsmtext;
+#line 1 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
 //                     The LLVM Compiler Infrastructure
@@ -893,8 +951,7 @@
 //  This file implements the flex scanner for LLVM assembly languages files.
 //
 //===----------------------------------------------------------------------===*/
-#define YY_NEVER_INTERACTIVE 1
-#line 28 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 28 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -903,10 +960,10 @@
 #include <cstdlib>
 
 void set_scan_file(FILE * F){
-  yy_switch_to_buffer(yy_create_buffer( F, YY_BUF_SIZE ) );
+  llvmAsm_switch_to_buffer(llvmAsm_create_buffer(F,YY_BUF_SIZE ) );
 }
 void set_scan_string (const char * str) {
-  yy_scan_string (str);
+  llvmAsm_scan_string (str);
 }
 
 // Construct a token value for a non-obsolete token
@@ -1027,7 +1084,23 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1031 "Lexer.cpp"
+#line 1088 "Lexer.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.
@@ -1035,65 +1108,30 @@
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
+extern "C" int llvmAsmwrap (void );
 #else
-extern int yywrap YY_PROTO(( void ));
-#endif
+extern int llvmAsmwrap (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. */
@@ -1102,12 +1140,11 @@
 #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( llvmAsmtext, llvmAsmleng, 1, llvmAsmout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1115,21 +1152,35 @@
  */
 #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( llvmAsmin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
+		if ( c == EOF && ferror( llvmAsmin ) ) \
 			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, llvmAsmin))==0 && ferror(llvmAsmin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(llvmAsmin); \
+			} \
+		}\
+\
+
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -1150,14 +1201,20 @@
 #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
 
-/* Code executed at the beginning of each rule, after yytext and yyleng
+extern int llvmAsmlex (void);
+
+#define YY_DECL int llvmAsmlex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after llvmAsmtext and llvmAsmleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -1172,370 +1229,375 @@
 #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 = NULL, *yy_bp = NULL;
+	register char *yy_cp, *yy_bp;
 	register int yy_act;
-
-#line 190 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+    
+#line 190 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 
 
-#line 1185 "Lexer.cpp"
+#line 1244 "Lexer.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 ( ! llvmAsmin )
+			llvmAsmin = stdin;
 
-		if ( ! yyout )
-			yyout = stdout;
+		if ( ! llvmAsmout )
+			llvmAsmout = stdout;
 
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
+		if ( ! YY_CURRENT_BUFFER ) {
+			llvmAsmensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE );
+		}
 
-		yy_load_buffer_state();
+		llvmAsm_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 llvmAsmtext. */
+		*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];
-				if ( yy_current_state >= 552 )
+				if ( yy_current_state >= 560 )
 					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 != 551 );
+		while ( yy_current_state != 559 );
+		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 < llvmAsmleng; ++yyl )
+				if ( llvmAsmtext[yyl] == '\n' )
+					   
+    llvmAsmlineno++;
+;
 			}
 
 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 192 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 192 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 194 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 195 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 196 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 197 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 198 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 199 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DEFINE; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 200 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 201 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 202 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 203 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 204 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 205 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 206 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 207 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 207 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 208 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return HIDDEN; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return EXTERN_WEAK; }
+#line 209 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return PROTECTED; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return EXTERNAL; }
+#line 210 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return EXTERN_WEAK; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return THREAD_LOCAL; }
+#line 211 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return EXTERNAL; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return ZEROINITIALIZER; }
+#line 212 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return THREAD_LOCAL; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return DOTDOTDOT; }
+#line 213 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ZEROINITIALIZER; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return UNDEF; }
+#line 214 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return DOTDOTDOT; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return NULL_TOK; }
+#line 215 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return UNDEF; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return TO; }
+#line 216 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return NULL_TOK; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return TAIL; }
+#line 217 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return TO; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return TARGET; }
+#line 218 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return TAIL; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return TRIPLE; }
+#line 219 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return TARGET; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return DEPLIBS; }
+#line 220 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return TRIPLE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return DATALAYOUT; }
+#line 221 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return DEPLIBS; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 222 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return VOLATILE; }
+#line 222 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return DATALAYOUT; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return ALIGN;  }
+#line 223 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return VOLATILE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return SECTION; }
+#line 224 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ALIGN;  }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return ALIAS; }
+#line 225 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SECTION; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 226 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return MODULE; }
+#line 226 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ALIAS; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 227 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return ASM_TOK; }
+#line 227 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return MODULE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return SIDEEFFECT; }
+#line 228 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ASM_TOK; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 230 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return CC_TOK; }
+#line 229 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SIDEEFFECT; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return CCC_TOK; }
+#line 231 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return CC_TOK; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return FASTCC_TOK; }
+#line 232 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return CCC_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return COLDCC_TOK; }
+#line 233 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return FASTCC_TOK; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return X86_STDCALLCC_TOK; }
+#line 234 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return COLDCC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return X86_FASTCALLCC_TOK; }
+#line 235 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 237 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return INREG; }
+#line 236 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 238 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return SRET;  }
+#line 238 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return INREG; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 239 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return NOUNWIND; }
+#line 239 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SRET;  }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 240 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return NORETURN; }
+#line 240 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return NOUNWIND; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 242 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::VoidTy,  VOID);  }
+#line 241 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return NORETURN; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 243 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::FloatTy, FLOAT); }
+#line 243 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::VoidTy,  VOID);  }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 244 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::DoubleTy,DOUBLE);}
+#line 244 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::FloatTy, FLOAT); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 245 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::LabelTy, LABEL); }
+#line 245 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::DoubleTy,DOUBLE);}
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 246 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return TYPE;   }
+#line 246 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::LabelTy, LABEL); }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 247 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return OPAQUE; }
+#line 247 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return TYPE;   }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 248 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ uint64_t NumBits = atoull(yytext+1);
+#line 248 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OPAQUE; }
+	YY_BREAK
+case 54:
+YY_RULE_SETUP
+#line 249 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ uint64_t NumBits = atoull(llvmAsmtext+1);
                   if (NumBits < IntegerType::MIN_INT_BITS || 
                       NumBits > IntegerType::MAX_INT_BITS)
                     GenerateError("Bitwidth for integer type out of range!");
@@ -1543,412 +1605,415 @@
                   RET_TY(Ty, INTTYPE);
                 }
 	YY_BREAK
-case 54:
+case 55:
 YY_RULE_SETUP
-#line 256 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 257 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
-case 55:
+case 56:
 YY_RULE_SETUP
-#line 257 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 258 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
-case 56:
+case 57:
 YY_RULE_SETUP
-#line 258 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 259 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
-case 57:
+case 58:
 YY_RULE_SETUP
-#line 259 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 260 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
-case 58:
+case 59:
 YY_RULE_SETUP
-#line 260 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 261 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
-case 59:
+case 60:
 YY_RULE_SETUP
-#line 261 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 262 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
-case 60:
+case 61:
 YY_RULE_SETUP
-#line 262 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 263 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
-case 61:
+case 62:
 YY_RULE_SETUP
-#line 263 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 264 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
-case 62:
+case 63:
 YY_RULE_SETUP
-#line 264 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 265 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
-case 63:
+case 64:
 YY_RULE_SETUP
-#line 265 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 266 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Shl, SHL); }
 	YY_BREAK
-case 64:
+case 65:
 YY_RULE_SETUP
-#line 266 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 267 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, LShr, LSHR); }
 	YY_BREAK
-case 65:
+case 66:
 YY_RULE_SETUP
-#line 267 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 268 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, AShr, ASHR); }
 	YY_BREAK
-case 66:
+case 67:
 YY_RULE_SETUP
-#line 268 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 269 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
-case 67:
+case 68:
 YY_RULE_SETUP
-#line 269 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 270 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
-case 68:
+case 69:
 YY_RULE_SETUP
-#line 270 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 271 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
-case 69:
+case 70:
 YY_RULE_SETUP
-#line 271 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 272 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal,  ICmp,  ICMP); }
 	YY_BREAK
-case 70:
+case 71:
 YY_RULE_SETUP
-#line 272 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 273 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal,  FCmp,  FCMP); }
 	YY_BREAK
-case 71:
+case 72:
 YY_RULE_SETUP
-#line 274 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 275 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return EQ;  }
 	YY_BREAK
-case 72:
+case 73:
 YY_RULE_SETUP
-#line 275 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 276 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return NE;  }
 	YY_BREAK
-case 73:
+case 74:
 YY_RULE_SETUP
-#line 276 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 277 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SLT; }
 	YY_BREAK
-case 74:
+case 75:
 YY_RULE_SETUP
-#line 277 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 278 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SGT; }
 	YY_BREAK
-case 75:
+case 76:
 YY_RULE_SETUP
-#line 278 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 279 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SLE; }
 	YY_BREAK
-case 76:
+case 77:
 YY_RULE_SETUP
-#line 279 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 280 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SGE; }
 	YY_BREAK
-case 77:
+case 78:
 YY_RULE_SETUP
-#line 280 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 281 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ULT; }
 	YY_BREAK
-case 78:
+case 79:
 YY_RULE_SETUP
-#line 281 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 282 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UGT; }
 	YY_BREAK
-case 79:
+case 80:
 YY_RULE_SETUP
-#line 282 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 283 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ULE; }
 	YY_BREAK
-case 80:
+case 81:
 YY_RULE_SETUP
-#line 283 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 284 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UGE; }
 	YY_BREAK
-case 81:
+case 82:
 YY_RULE_SETUP
-#line 284 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 285 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return OEQ; }
 	YY_BREAK
-case 82:
+case 83:
 YY_RULE_SETUP
-#line 285 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 286 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ONE; }
 	YY_BREAK
-case 83:
+case 84:
 YY_RULE_SETUP
-#line 286 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 287 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return OLT; }
 	YY_BREAK
-case 84:
+case 85:
 YY_RULE_SETUP
-#line 287 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 288 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return OGT; }
 	YY_BREAK
-case 85:
+case 86:
 YY_RULE_SETUP
-#line 288 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 289 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return OLE; }
 	YY_BREAK
-case 86:
+case 87:
 YY_RULE_SETUP
-#line 289 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 290 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return OGE; }
 	YY_BREAK
-case 87:
+case 88:
 YY_RULE_SETUP
-#line 290 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 291 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ORD; }
 	YY_BREAK
-case 88:
+case 89:
 YY_RULE_SETUP
-#line 291 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 292 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UNO; }
 	YY_BREAK
-case 89:
+case 90:
 YY_RULE_SETUP
-#line 292 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 293 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UEQ; }
 	YY_BREAK
-case 90:
+case 91:
 YY_RULE_SETUP
-#line 293 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 294 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UNE; }
 	YY_BREAK
-case 91:
+case 92:
 YY_RULE_SETUP
-#line 295 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 296 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
-case 92:
+case 93:
 YY_RULE_SETUP
-#line 296 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 297 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
-case 93:
+case 94:
 YY_RULE_SETUP
-#line 297 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 298 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, Trunc, TRUNC); }
 	YY_BREAK
-case 94:
+case 95:
 YY_RULE_SETUP
-#line 298 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 299 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, ZExt, ZEXT); }
 	YY_BREAK
-case 95:
+case 96:
 YY_RULE_SETUP
-#line 299 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 300 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, SExt, SEXT); }
 	YY_BREAK
-case 96:
+case 97:
 YY_RULE_SETUP
-#line 300 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 301 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
 	YY_BREAK
-case 97:
+case 98:
 YY_RULE_SETUP
-#line 301 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 302 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPExt, FPEXT); }
 	YY_BREAK
-case 98:
+case 99:
 YY_RULE_SETUP
-#line 302 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 303 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, UIToFP, UITOFP); }
 	YY_BREAK
-case 99:
+case 100:
 YY_RULE_SETUP
-#line 303 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 304 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, SIToFP, SITOFP); }
 	YY_BREAK
-case 100:
+case 101:
 YY_RULE_SETUP
-#line 304 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 305 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPToUI, FPTOUI); }
 	YY_BREAK
-case 101:
+case 102:
 YY_RULE_SETUP
-#line 305 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 306 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPToSI, FPTOSI); }
 	YY_BREAK
-case 102:
+case 103:
 YY_RULE_SETUP
-#line 306 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 307 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
 	YY_BREAK
-case 103:
+case 104:
 YY_RULE_SETUP
-#line 307 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 308 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
 	YY_BREAK
-case 104:
+case 105:
 YY_RULE_SETUP
-#line 308 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 309 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, BitCast, BITCAST); }
 	YY_BREAK
-case 105:
+case 106:
 YY_RULE_SETUP
-#line 309 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 310 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
-case 106:
+case 107:
 YY_RULE_SETUP
-#line 310 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 311 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
-case 107:
+case 108:
 YY_RULE_SETUP
-#line 311 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 312 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
-case 108:
+case 109:
 YY_RULE_SETUP
-#line 312 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 313 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
-case 109:
+case 110:
 YY_RULE_SETUP
-#line 313 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 314 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
-case 110:
+case 111:
 YY_RULE_SETUP
-#line 314 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 315 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
-case 111:
+case 112:
 YY_RULE_SETUP
-#line 315 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 316 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
-case 112:
+case 113:
 YY_RULE_SETUP
-#line 316 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 317 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
-case 113:
+case 114:
 YY_RULE_SETUP
-#line 318 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 319 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
-case 114:
+case 115:
 YY_RULE_SETUP
-#line 319 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 320 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
-case 115:
+case 116:
 YY_RULE_SETUP
-#line 320 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 321 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
-case 116:
+case 117:
 YY_RULE_SETUP
-#line 321 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 322 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
-case 117:
+case 118:
 YY_RULE_SETUP
-#line 322 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 323 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
-case 118:
+case 119:
 YY_RULE_SETUP
-#line 323 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 324 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
-case 119:
+case 120:
 YY_RULE_SETUP
-#line 325 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 326 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
-case 120:
+case 121:
 YY_RULE_SETUP
-#line 326 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 327 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
-case 121:
+case 122:
 YY_RULE_SETUP
-#line 327 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 328 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
 	YY_BREAK
-case 122:
+case 123:
 YY_RULE_SETUP
-#line 330 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 331 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  UnEscapeLexed(yytext+1);
-                  llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
+                  UnEscapeLexed(llvmAsmtext+1);
+                  llvmAsmlval.StrVal = strdup(llvmAsmtext+1);             // Skip %
                   return LOCALVAR;
                 }
 	YY_BREAK
-case 123:
+case 124:
 YY_RULE_SETUP
-#line 335 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 336 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  UnEscapeLexed(yytext+1);
-                  llvmAsmlval.StrVal = strdup(yytext+1);             // Skip @
+                  UnEscapeLexed(llvmAsmtext+1);
+                  llvmAsmlval.StrVal = strdup(llvmAsmtext+1);             // Skip @
                   return GLOBALVAR;
                 }
 	YY_BREAK
-case 124:
+case 125:
 YY_RULE_SETUP
-#line 340 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 341 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  yytext[strlen(yytext)-1] = 0;  // nuke colon
-                  UnEscapeLexed(yytext);
-                  llvmAsmlval.StrVal = strdup(yytext);
+                  llvmAsmtext[strlen(llvmAsmtext)-1] = 0;  // nuke colon
+                  UnEscapeLexed(llvmAsmtext);
+                  llvmAsmlval.StrVal = strdup(llvmAsmtext);
                   return LABELSTR;
                 }
 	YY_BREAK
-case 125:
+case 126:
+/* rule 126 can match eol */
 YY_RULE_SETUP
-#line 346 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 347 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
-                  UnEscapeLexed(yytext+1);
-                  llvmAsmlval.StrVal = strdup(yytext+1);
+                  llvmAsmtext[strlen(llvmAsmtext)-2] = 0;  // nuke colon, end quote
+                  UnEscapeLexed(llvmAsmtext+1);
+                  llvmAsmlval.StrVal = strdup(llvmAsmtext+1);
                   return LABELSTR;
                 }
 	YY_BREAK
-case 126:
+case 127:
+/* rule 127 can match eol */
 YY_RULE_SETUP
-#line 353 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 354 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.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
-                   llvmAsmlval.StrVal = strdup(yytext+1);  // Nuke start quote
+                   llvmAsmtext[strlen(llvmAsmtext)-1] = 0;           // nuke end quote
+                   llvmAsmlval.StrVal = strdup(llvmAsmtext+1);  // Nuke start quote
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 127:
+case 128:
+/* rule 128 can match eol */
 YY_RULE_SETUP
-#line 362 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 363 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                     yytext[strlen(yytext)-1] = 0;           // nuke end quote
-                     llvmAsmlval.StrVal = strdup(yytext+2);  // Nuke @, quote
+                     llvmAsmtext[strlen(llvmAsmtext)-1] = 0;           // nuke end quote
+                     llvmAsmlval.StrVal = strdup(llvmAsmtext+2);  // Nuke @, quote
                      return ATSTRINGCONSTANT;
                    }
 	YY_BREAK
-case 128:
+case 129:
 YY_RULE_SETUP
-#line 368 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ int len = strlen(yytext); 
+#line 369 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ int len = strlen(llvmAsmtext); 
                   uint32_t numBits = ((len * 64) / 19) + 1;
-                  APInt Tmp(numBits, yytext, len, 10);
+                  APInt Tmp(numBits, llvmAsmtext, len, 10);
                   uint32_t activeBits = Tmp.getActiveBits();
                   if (activeBits > 0 && activeBits < numBits)
                     Tmp.trunc(activeBits);
@@ -1961,12 +2026,12 @@
                   }
                 }
 	YY_BREAK
-case 129:
+case 130:
 YY_RULE_SETUP
-#line 382 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ int len = strlen(yytext); 
+#line 383 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ int len = strlen(llvmAsmtext); 
                   uint32_t numBits = (((len-1) * 64) / 19) + 2;
-                  APInt Tmp(numBits, yytext, len, 10);
+                  APInt Tmp(numBits, llvmAsmtext, len, 10);
                   uint32_t minBits = Tmp.getMinSignedBits();
                   if (minBits > 0 && minBits < numBits)
                     Tmp.trunc(minBits);
@@ -1979,19 +2044,19 @@
                   }
                 }
 	YY_BREAK
-case 130:
+case 131:
 YY_RULE_SETUP
-#line 397 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ int len = strlen(yytext+3) - 3;
+#line 398 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ int len = strlen(llvmAsmtext+3) - 3;
                    uint32_t bits = len * 4;
-                   APInt Tmp(bits, yytext+3, len, 16);
+                   APInt Tmp(bits, llvmAsmtext+3, len, 16);
                    uint32_t activeBits = Tmp.getActiveBits();
                    if (activeBits > 0 && activeBits < bits)
                      Tmp.trunc(activeBits);
                    if (Tmp.getBitWidth() > 64) {
                      llvmAsmlval.APIntVal = new APInt(Tmp);
-                     return yytext[0] == 's' ? ESAPINTVAL : EUAPINTVAL;
-                   } else if (yytext[0] == 's') {
+                     return llvmAsmtext[0] == 's' ? ESAPINTVAL : EUAPINTVAL;
+                   } else if (llvmAsmtext[0] == 's') {
                      llvmAsmlval.SInt64Val = Tmp.getSExtValue();
                      return ESINT64VAL;
                    } else {
@@ -2000,88 +2065,89 @@
                    }
                  }
 	YY_BREAK
-case 131:
+case 132:
 YY_RULE_SETUP
-#line 415 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 416 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  uint64_t Val = atoull(yytext+1);
+                  uint64_t Val = atoull(llvmAsmtext+1);
                   if ((unsigned)Val != Val)
                     GenerateError("Invalid value number (too large)!");
                   llvmAsmlval.UIntVal = unsigned(Val);
                   return LOCALVAL_ID;
                 }
 	YY_BREAK
-case 132:
+case 133:
 YY_RULE_SETUP
-#line 422 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 423 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  uint64_t Val = atoull(yytext+1);
+                  uint64_t Val = atoull(llvmAsmtext+1);
                   if ((unsigned)Val != Val)
                     GenerateError("Invalid value number (too large)!");
                   llvmAsmlval.UIntVal = unsigned(Val);
                   return GLOBALVAL_ID;
                 }
 	YY_BREAK
-case 133:
+case 134:
 YY_RULE_SETUP
-#line 430 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
+#line 431 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.FPVal = atof(llvmAsmtext); return FPVAL; }
 	YY_BREAK
-case 134:
+case 135:
 YY_RULE_SETUP
-#line 431 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
+#line 432 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.FPVal = HexToFP(llvmAsmtext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 433 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 434 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
                    */
-                  yy_delete_buffer(YY_CURRENT_BUFFER);
+                  llvmAsm_delete_buffer(YY_CURRENT_BUFFER);
                   return EOF;
                 }
 	YY_BREAK
-case 135:
+case 136:
+/* rule 136 can match eol */
 YY_RULE_SETUP
-#line 441 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 442 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 136:
+case 137:
 YY_RULE_SETUP
-#line 442 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
-{ return yytext[0]; }
+#line 443 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return llvmAsmtext[0]; }
 	YY_BREAK
-case 137:
+case 138:
 YY_RULE_SETUP
-#line 444 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
+#line 445 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2061 "Lexer.cpp"
+#line 2127 "Lexer.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 llvmAsmin at a new source and called
+			 * llvmAsmlex().  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 = llvmAsmin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -2091,13 +2157,13 @@
 		 * 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
@@ -2110,41 +2176,42 @@
 
 			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 ( llvmAsmwrap( ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
+					 * llvmAsmtext, 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;
@@ -2152,30 +2219,30 @@
 
 				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;
@@ -2186,8 +2253,7 @@
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of yylex */
-
+} /* end of llvmAsmlex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -2196,21 +2262,20 @@
  *	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.
@@ -2230,34 +2295,30 @@
 	/* 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 )
 				{
@@ -2270,8 +2331,7 @@
 
 				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 );
+					llvmAsmrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -2281,35 +2341,35 @@
 				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 );
+			llvmAsmrestart(llvmAsmin  );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -2317,149 +2377,141 @@
 	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];
-			if ( yy_current_state >= 552 )
+			if ( yy_current_state >= 560 )
 				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];
-		if ( yy_current_state >= 552 )
+		if ( yy_current_state >= 560 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 551);
-	if ( ! yy_is_jam )
-		*yy_state_ptr++ = yy_current_state;
+	yy_is_jam = (yy_current_state == 559);
 
 	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 llvmAsmtext */
+	*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' ){
+        --llvmAsmlineno;
+    }
 
+	(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()
@@ -2473,16 +2525,16 @@
 					 */
 
 					/* Reset buffer status. */
-					yyrestart( yyin );
+					llvmAsmrestart(llvmAsmin );
 
-					/* fall through */
+					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap() )
+					if ( llvmAsmwrap( ) )
 						return EOF;
 
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -2492,169 +2544,170 @@
 					}
 
 				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 llvmAsmtext */
+	(yy_hold_char) = *++(yy_c_buf_p);
 
 	if ( c == '\n' )
-		++yylineno;
+		   
+    llvmAsmlineno++;
+;
 
 	return c;
-	}
-#endif /* YY_NO_INPUT */
-
-#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 llvmAsmrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        llvmAsmensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE );
 	}
 
+	llvmAsm_init_buffer(YY_CURRENT_BUFFER,input_file );
+	llvmAsm_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 llvmAsm_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		llvmAsmpop_buffer_state();
+	 *		llvmAsmpush_buffer_state(new_buffer);
+     */
+	llvmAsmensure_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;
+	llvmAsm_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 (llvmAsmwrap()) processing, but the only time this flag
+	 * is looked at is after llvmAsmwrap() 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 llvmAsm_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;
+	llvmAsmin = 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 llvmAsm_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) llvmAsmalloc(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 llvmAsm_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 *) llvmAsmalloc(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 llvmAsm_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer( b, file );
+	llvmAsm_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 llvmAsm_create_buffer()
+ * 
+ */
+    void llvmAsm_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 );
-	}
+		llvmAsmfree((void *) b->yy_ch_buf  );
 
+	llvmAsmfree((void *) b  );
+}
 
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a llvmAsmrestart() or at EOF.
+ */
+    static void llvmAsm_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-#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
-
-
-	{
-	yy_flush_buffer( b );
+{
+	int oerrno = errno;
+    
+	llvmAsm_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 llvmAsm_init_buffer was _probably_
+     * called from llvmAsmrestart() 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 llvmAsm_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -2671,31 +2724,123 @@
 	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 )
+		llvmAsm_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 llvmAsmpush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	llvmAsmensure_buffer_stack();
+
+	/* This block is copied from llvmAsm_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 llvmAsm_switch_to_buffer. */
+	llvmAsm_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 llvmAsmpop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	llvmAsm_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		llvmAsm_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 llvmAsmensure_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**)llvmAsmalloc
+								(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**)llvmAsmrealloc
+								((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 llvmAsm_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) llvmAsmalloc(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 llvmAsm_scan_buffer()" );
 
 	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
@@ -2707,58 +2852,53 @@
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer( b );
+	llvmAsm_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 llvmAsmlex() 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
+ *       llvmAsm_scan_bytes() instead.
+ */
+YY_BUFFER_STATE llvmAsm_scan_string (yyconst char * yystr )
+{
+    
+	return llvmAsm_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 llvmAsmlex() 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 llvmAsm_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 *) llvmAsmalloc(n  );
 	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+		YY_FATAL_ERROR( "out of dynamic memory in llvmAsm_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 = llvmAsm_scan_buffer(buf,n );
 	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+		YY_FATAL_ERROR( "bad buffer in llvmAsm_scan_bytes()" );
 
 	/* It's okay to grow etc. this buffer, and we should throw it
 	 * away when we're done.
@@ -2766,148 +2906,199 @@
 	b->yy_is_our_buffer = 1;
 
 	return b;
-	}
-#endif
-
+}
 
-#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;
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
 #endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
 
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
 
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
+/* Redefine yyless() so it works in section 3 code. */
 
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up llvmAsmtext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		llvmAsmtext[llvmAsmleng] = (yy_hold_char); \
+		(yy_c_buf_p) = llvmAsmtext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		llvmAsmleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
 
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
+/* Accessor  methods (get/set functions) to struct members. */
 
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
+/** Get the current line number.
+ * 
+ */
+int llvmAsmget_lineno  (void)
+{
+        
+    return llvmAsmlineno;
+}
 
-	BEGIN(new_state);
-	}
-#endif
+/** Get the input stream.
+ * 
+ */
+FILE *llvmAsmget_in  (void)
+{
+        return llvmAsmin;
+}
 
+/** Get the output stream.
+ * 
+ */
+FILE *llvmAsmget_out  (void)
+{
+        return llvmAsmout;
+}
 
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
+/** Get the length of the current token.
+ * 
+ */
+int llvmAsmget_leng  (void)
+{
+        return llvmAsmleng;
+}
 
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
+/** Get the current token.
+ * 
+ */
 
+char *llvmAsmget_text  (void)
+{
+        return llvmAsmtext;
+}
 
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void llvmAsmset_lineno (int  line_number )
+{
+    
+    llvmAsmlineno = line_number;
+}
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see llvmAsm_switch_to_buffer
+ */
+void llvmAsmset_in (FILE *  in_str )
+{
+        llvmAsmin = in_str ;
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
+void llvmAsmset_out (FILE *  out_str )
+{
+        llvmAsmout = out_str ;
+}
 
+int llvmAsmget_debug  (void)
+{
+        return llvmAsm_flex_debug;
+}
 
+void llvmAsmset_debug (int  bdebug )
+{
+        llvmAsm_flex_debug = bdebug ;
+}
 
-/* Redefine yyless() so it works in section 3 code. */
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from llvmAsmlex_destroy(), so don't allocate here.
+     */
+
+    /* We do not touch llvmAsmlineno unless the option is enabled. */
+    llvmAsmlineno =  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
+    llvmAsmin = stdin;
+    llvmAsmout = stdout;
+#else
+    llvmAsmin = (FILE *) 0;
+    llvmAsmout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * llvmAsmlex_init()
+     */
+    return 0;
+}
 
-#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 )
+/* llvmAsmlex_destroy is for both reentrant and non-reentrant scanners. */
+int llvmAsmlex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		llvmAsm_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		llvmAsmpop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	llvmAsmfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * llvmAsmlex() 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 *llvmAsmalloc (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 *llvmAsmrealloc  (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
@@ -2916,24 +3107,16 @@
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-	}
+}
+
+void llvmAsmfree (void * ptr )
+{
+	free( (char *) ptr );	/* see llvmAsmrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 445 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.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 444 "/proj/llvm/llvm-2/lib/AsmParser/Lexer.l"
 


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.96 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.97
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.96	Sun Apr 29 09:43:30 2007
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Sun Apr 29 13:38:24 2007
@@ -1,7 +1,9 @@
-/* A Bison parser, made from /usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y, by GNU bison 1.75.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,16 +17,24 @@
 
    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.  */
+   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.
 
-/* 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 special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
+/* 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
@@ -34,16 +44,21 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output.  */
-#define YYBISON	1
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
 
 /* Pure parsers.  */
-#define YYPURE	0
+#define YYPURE 0
 
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
-/* If NAME_PREFIX is specified substitute the variables and functions
-   names.  */
+/* Substitute the variable and function names.  */
 #define yyparse llvmAsmparse
 #define yylex   llvmAsmlex
 #define yyerror llvmAsmerror
@@ -191,9 +206,11 @@
      SRET = 387,
      NOUNWIND = 388,
      DEFAULT = 389,
-     HIDDEN = 390
+     HIDDEN = 390,
+     PROTECTED = 391
    };
 #endif
+/* Tokens.  */
 #define ESINT64VAL 258
 #define EUINT64VAL 259
 #define ESAPINTVAL 260
@@ -327,12 +344,13 @@
 #define NOUNWIND 388
 #define DEFAULT 389
 #define HIDDEN 390
+#define PROTECTED 391
 
 
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1287,9 +1305,15 @@
 # define YYERROR_VERBOSE 0
 #endif
 
-#ifndef YYSTYPE
-#line 955 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-typedef union {
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 955 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -1334,98 +1358,212 @@
   llvm::Instruction::OtherOps       OtherOpVal;
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
-} yystype;
-/* Line 188 of /usr/local/share/bison/yacc.c.  */
-#line 1340 "llvmAsmParser.tab.c"
-# define YYSTYPE yystype
+}
+/* Line 187 of yacc.c.  */
+#line 1364 "llvmAsmParser.tab.c"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 
-#ifndef YYLTYPE
-typedef struct yyltype
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-} yyltype;
-# define YYLTYPE yyltype
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
+
 
 /* Copy the second part of user declarations.  */
 
 
-/* Line 213 of /usr/local/share/bison/yacc.c.  */
-#line 1361 "llvmAsmParser.tab.c"
+/* Line 216 of yacc.c.  */
+#line 1377 "llvmAsmParser.tab.c"
 
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#ifdef short
+# undef short
+#endif
 
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
 
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
+#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
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#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
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* 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
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
+#    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 (0)
+   /* 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
-#  if defined (__STDC__) || defined (__cplusplus)
+#  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 */
-#   define YYSIZE_T size_t
+#   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
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
 # endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short yyss;
+  yytype_int16 yyss;
   YYSTYPE yyvs;
   };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
-      + YYSTACK_GAP_MAX)
+     ((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 1 < __GNUC__
+#  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  register YYSIZE_T yyi;		\
+	  YYSIZE_T yyi;				\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];	\
+	    (To)[yyi] = (From)[yyi];		\
 	}					\
-      while (0)
+      while (YYID (0))
 #  endif
 # endif
 
@@ -1440,55 +1578,50 @@
 	YYSIZE_T yynewbytes;						\
 	YYCOPY (&yyptr->Stack, Stack, yysize);				\
 	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;	\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (0)
-
-#endif
+    while (YYID (0))
 
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short yysigned_char;
 #endif
 
-/* YYFINAL -- State number of the termination state. */
-#define YYFINAL  41
-#define YYLAST   1600
-
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  150
-/* YYNNTS -- Number of nonterminals. */
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  42
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   1491
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  151
+/* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  82
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  296
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  580
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  297
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  581
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   390
+#define YYMAXUTOK   391
 
-#define YYTRANSLATE(X) \
-  ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK)
+#define YYTRANSLATE(YYX)						\
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
+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,
-     140,   141,   138,     2,   137,     2,     2,     2,     2,     2,
+     141,   142,   139,     2,   138,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     145,   136,   146,     2,     2,     2,     2,     2,     2,     2,
+     146,   137,   147,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   142,   139,   144,     2,     2,     2,     2,     2,   149,
+       2,   143,   140,   145,     2,     2,     2,     2,     2,   150,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     143,     2,     2,   147,     2,   148,     2,     2,     2,     2,
+     144,     2,     2,   148,     2,   149,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1515,13 +1648,13 @@
      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
+     135,   136
 };
 
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned short yyprhs[] =
+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,
@@ -1531,34 +1664,34 @@
       99,   101,   103,   105,   107,   109,   111,   113,   115,   117,
      119,   121,   122,   125,   126,   128,   130,   132,   133,   136,
      138,   140,   142,   144,   146,   148,   150,   152,   153,   155,
-     157,   158,   160,   162,   163,   165,   167,   169,   171,   172,
-     174,   176,   177,   179,   181,   183,   185,   187,   190,   192,
-     194,   196,   198,   199,   202,   204,   206,   208,   209,   212,
-     213,   216,   217,   221,   224,   225,   227,   228,   232,   234,
-     237,   239,   241,   243,   245,   247,   249,   252,   254,   257,
-     263,   269,   275,   281,   285,   288,   294,   299,   302,   304,
-     306,   308,   312,   314,   318,   320,   321,   323,   327,   332,
-     336,   340,   345,   350,   354,   361,   367,   370,   373,   376,
-     379,   382,   385,   388,   391,   394,   397,   400,   403,   410,
-     416,   425,   432,   439,   447,   455,   462,   471,   480,   484,
-     486,   488,   490,   492,   493,   496,   503,   505,   506,   508,
-     511,   512,   516,   517,   521,   525,   529,   533,   534,   542,
-     543,   552,   553,   562,   568,   571,   575,   577,   581,   585,
-     589,   593,   595,   596,   602,   606,   608,   612,   614,   615,
-     625,   627,   629,   634,   636,   638,   641,   645,   646,   648,
-     650,   652,   654,   656,   658,   660,   662,   664,   668,   670,
-     676,   678,   680,   682,   684,   686,   688,   691,   694,   697,
-     701,   704,   705,   707,   710,   713,   717,   727,   737,   746,
-     761,   763,   765,   772,   778,   781,   788,   796,   800,   806,
-     807,   808,   812,   815,   817,   823,   829,   836,   843,   848,
-     855,   860,   865,   872,   879,   882,   891,   893,   895,   896,
-     900,   907,   911,   918,   921,   927,   935
+     157,   159,   160,   162,   164,   165,   167,   169,   171,   173,
+     174,   176,   178,   179,   181,   183,   185,   187,   189,   192,
+     194,   196,   198,   200,   201,   204,   206,   208,   210,   211,
+     214,   215,   218,   219,   223,   226,   227,   229,   230,   234,
+     236,   239,   241,   243,   245,   247,   249,   251,   254,   256,
+     259,   265,   271,   277,   283,   287,   290,   296,   301,   304,
+     306,   308,   310,   314,   316,   320,   322,   323,   325,   329,
+     334,   338,   342,   347,   352,   356,   363,   369,   372,   375,
+     378,   381,   384,   387,   390,   393,   396,   399,   402,   405,
+     412,   418,   427,   434,   441,   449,   457,   464,   473,   482,
+     486,   488,   490,   492,   494,   495,   498,   505,   507,   508,
+     510,   513,   514,   518,   519,   523,   527,   531,   535,   536,
+     544,   545,   554,   555,   564,   570,   573,   577,   579,   583,
+     587,   591,   595,   597,   598,   604,   608,   610,   614,   616,
+     617,   627,   629,   631,   636,   638,   640,   643,   647,   648,
+     650,   652,   654,   656,   658,   660,   662,   664,   666,   670,
+     672,   678,   680,   682,   684,   686,   688,   690,   693,   696,
+     699,   703,   706,   707,   709,   712,   715,   719,   729,   739,
+     748,   763,   765,   767,   774,   780,   783,   790,   798,   802,
+     808,   809,   810,   814,   817,   819,   825,   831,   838,   845,
+     850,   857,   862,   867,   874,   881,   884,   893,   895,   897,
+     898,   902,   909,   913,   920,   923,   929,   937
 };
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const short yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
 {
-     194,     0,    -1,    69,    -1,    70,    -1,    71,    -1,    72,
+     195,     0,    -1,    69,    -1,    70,    -1,    71,    -1,    72,
       -1,    73,    -1,    74,    -1,    75,    -1,    76,    -1,    77,
       -1,    81,    -1,    82,    -1,    83,    -1,    78,    -1,    79,
       -1,    80,    -1,   112,    -1,   113,    -1,   114,    -1,   115,
@@ -1569,179 +1702,181 @@
       -1,    98,    -1,    99,    -1,   100,    -1,   101,    -1,   102,
       -1,   103,    -1,   104,    -1,   105,    -1,    92,    -1,    93,
       -1,    94,    -1,    95,    -1,    22,    -1,    23,    -1,    11,
-      -1,    12,    -1,    13,    -1,    16,    -1,    19,    -1,   158,
-      -1,    -1,   158,   136,    -1,    -1,    17,    -1,    20,    -1,
-     163,    -1,    -1,   161,   136,    -1,    38,    -1,    40,    -1,
+      -1,    12,    -1,    13,    -1,    16,    -1,    19,    -1,   159,
+      -1,    -1,   159,   137,    -1,    -1,    17,    -1,    20,    -1,
+     164,    -1,    -1,   162,   137,    -1,    38,    -1,    40,    -1,
       39,    -1,    41,    -1,    43,    -1,    42,    -1,    44,    -1,
-      46,    -1,    -1,   134,    -1,   135,    -1,    -1,    42,    -1,
-      44,    -1,    -1,    38,    -1,    39,    -1,    40,    -1,    43,
-      -1,    -1,    40,    -1,    38,    -1,    -1,    57,    -1,    58,
-      -1,    59,    -1,    60,    -1,    61,    -1,    56,     4,    -1,
-     113,    -1,   114,    -1,   131,    -1,   132,    -1,    -1,   172,
-     171,    -1,   130,    -1,   133,    -1,   171,    -1,    -1,   174,
-     173,    -1,    -1,    49,     4,    -1,    -1,   137,    49,     4,
-      -1,    30,    19,    -1,    -1,   177,    -1,    -1,   137,   180,
-     179,    -1,   177,    -1,    49,     4,    -1,    11,    -1,    12,
-      -1,    13,    -1,    14,    -1,    45,    -1,   181,    -1,   182,
-     138,    -1,   216,    -1,   139,     4,    -1,   182,   140,   186,
-     141,   174,    -1,    10,   140,   186,   141,   174,    -1,   142,
-       4,   143,   182,   144,    -1,   145,     4,   143,   182,   146,
-      -1,   147,   187,   148,    -1,   147,   148,    -1,   145,   147,
-     187,   148,   146,    -1,   145,   147,   148,   146,    -1,   182,
-     172,    -1,   182,    -1,    10,    -1,   183,    -1,   185,   137,
-     183,    -1,   185,    -1,   185,   137,    35,    -1,    35,    -1,
-      -1,   182,    -1,   187,   137,   182,    -1,   182,   142,   190,
-     144,    -1,   182,   142,   144,    -1,   182,   149,    19,    -1,
-     182,   145,   190,   146,    -1,   182,   147,   190,   148,    -1,
-     182,   147,   148,    -1,   182,   145,   147,   190,   148,   146,
-      -1,   182,   145,   147,   148,   146,    -1,   182,    36,    -1,
-     182,    37,    -1,   182,   216,    -1,   182,   189,    -1,   182,
-      21,    -1,   156,     3,    -1,   156,     5,    -1,   156,     4,
-      -1,   156,     6,    -1,    11,    22,    -1,    11,    23,    -1,
-     157,     9,    -1,   153,   140,   188,    34,   182,   141,    -1,
-     111,   140,   188,   227,   141,    -1,   125,   140,   188,   137,
-     188,   137,   188,   141,    -1,   151,   140,   188,   137,   188,
-     141,    -1,   152,   140,   188,   137,   188,   141,    -1,    84,
-     154,   140,   188,   137,   188,   141,    -1,    85,   155,   140,
-     188,   137,   188,   141,    -1,   127,   140,   188,   137,   188,
-     141,    -1,   128,   140,   188,   137,   188,   137,   188,   141,
-      -1,   129,   140,   188,   137,   188,   137,   188,   141,    -1,
-     190,   137,   188,    -1,   188,    -1,    28,    -1,    29,    -1,
-      33,    -1,    -1,   184,   216,    -1,   117,   140,   193,    34,
-     182,   141,    -1,   195,    -1,    -1,   196,    -1,   195,   196,
-      -1,    -1,    27,   197,   212,    -1,    -1,    26,   198,   213,
-      -1,    54,    53,   202,    -1,   160,    15,   182,    -1,   160,
-      15,    10,    -1,    -1,   162,   166,   192,   191,   188,   199,
-     179,    -1,    -1,   162,   164,   166,   192,   191,   188,   200,
-     179,    -1,    -1,   162,   165,   166,   192,   191,   182,   201,
-     179,    -1,   162,   166,    31,   169,   193,    -1,    47,   203,
-      -1,    50,   136,   204,    -1,    19,    -1,    48,   136,    19,
-      -1,    62,   136,    19,    -1,   142,   205,   144,    -1,   205,
-     137,    19,    -1,    19,    -1,    -1,   206,   137,   182,   172,
-     159,    -1,   182,   172,   159,    -1,   206,    -1,   206,   137,
-      35,    -1,    35,    -1,    -1,   170,   184,   161,   140,   207,
-     141,   174,   178,   175,    -1,    24,    -1,   147,    -1,   168,
-     166,   208,   209,    -1,    25,    -1,   148,    -1,   219,   211,
-      -1,   167,   166,   208,    -1,    -1,    55,    -1,     3,    -1,
-       4,    -1,     9,    -1,    22,    -1,    23,    -1,    36,    -1,
-      37,    -1,    21,    -1,   145,   190,   146,    -1,   189,    -1,
-      53,   214,    19,   137,    19,    -1,     7,    -1,     8,    -1,
-     158,    -1,   161,    -1,   216,    -1,   215,    -1,   182,   217,
-      -1,   219,   220,    -1,   210,   220,    -1,   221,   160,   222,
-      -1,   221,   224,    -1,    -1,    18,    -1,    63,   218,    -1,
-      63,    10,    -1,    64,    14,   217,    -1,    64,    11,   217,
-     137,    14,   217,   137,    14,   217,    -1,    65,   156,   217,
-     137,    14,   217,   142,   223,   144,    -1,    65,   156,   217,
-     137,    14,   217,   142,   144,    -1,    66,   170,   184,   217,
-     140,   226,   141,   174,    34,    14,   217,    67,    14,   217,
-      -1,    67,    -1,    68,    -1,   223,   156,   215,   137,    14,
-     217,    -1,   156,   215,   137,    14,   217,    -1,   160,   229,
-      -1,   182,   142,   217,   137,   217,   144,    -1,   225,   137,
-     142,   217,   137,   217,   144,    -1,   182,   217,   172,    -1,
-     226,   137,   182,   217,   172,    -1,    -1,    -1,   227,   137,
-     218,    -1,    52,    51,    -1,    51,    -1,   151,   182,   217,
-     137,   217,    -1,   152,   182,   217,   137,   217,    -1,    84,
-     154,   182,   217,   137,   217,    -1,    85,   155,   182,   217,
-     137,   217,    -1,   153,   218,    34,   182,    -1,   125,   218,
-     137,   218,   137,   218,    -1,   126,   218,   137,   182,    -1,
-     127,   218,   137,   218,    -1,   128,   218,   137,   218,   137,
-     218,    -1,   129,   218,   137,   218,   137,   218,    -1,   124,
-     225,    -1,   228,   170,   184,   217,   140,   226,   141,   174,
-      -1,   231,    -1,    32,    -1,    -1,   106,   182,   176,    -1,
-     106,   182,   137,    11,   217,   176,    -1,   107,   182,   176,
-      -1,   107,   182,   137,    11,   217,   176,    -1,   108,   218,
-      -1,   230,   109,   182,   217,   176,    -1,   230,   110,   218,
-     137,   182,   217,   176,    -1,   111,   182,   217,   227,    -1
+      46,    -1,    -1,   134,    -1,   135,    -1,   136,    -1,    -1,
+      42,    -1,    44,    -1,    -1,    38,    -1,    39,    -1,    40,
+      -1,    43,    -1,    -1,    40,    -1,    38,    -1,    -1,    57,
+      -1,    58,    -1,    59,    -1,    60,    -1,    61,    -1,    56,
+       4,    -1,   113,    -1,   114,    -1,   131,    -1,   132,    -1,
+      -1,   173,   172,    -1,   130,    -1,   133,    -1,   172,    -1,
+      -1,   175,   174,    -1,    -1,    49,     4,    -1,    -1,   138,
+      49,     4,    -1,    30,    19,    -1,    -1,   178,    -1,    -1,
+     138,   181,   180,    -1,   178,    -1,    49,     4,    -1,    11,
+      -1,    12,    -1,    13,    -1,    14,    -1,    45,    -1,   182,
+      -1,   183,   139,    -1,   217,    -1,   140,     4,    -1,   183,
+     141,   187,   142,   175,    -1,    10,   141,   187,   142,   175,
+      -1,   143,     4,   144,   183,   145,    -1,   146,     4,   144,
+     183,   147,    -1,   148,   188,   149,    -1,   148,   149,    -1,
+     146,   148,   188,   149,   147,    -1,   146,   148,   149,   147,
+      -1,   183,   173,    -1,   183,    -1,    10,    -1,   184,    -1,
+     186,   138,   184,    -1,   186,    -1,   186,   138,    35,    -1,
+      35,    -1,    -1,   183,    -1,   188,   138,   183,    -1,   183,
+     143,   191,   145,    -1,   183,   143,   145,    -1,   183,   150,
+      19,    -1,   183,   146,   191,   147,    -1,   183,   148,   191,
+     149,    -1,   183,   148,   149,    -1,   183,   146,   148,   191,
+     149,   147,    -1,   183,   146,   148,   149,   147,    -1,   183,
+      36,    -1,   183,    37,    -1,   183,   217,    -1,   183,   190,
+      -1,   183,    21,    -1,   157,     3,    -1,   157,     5,    -1,
+     157,     4,    -1,   157,     6,    -1,    11,    22,    -1,    11,
+      23,    -1,   158,     9,    -1,   154,   141,   189,    34,   183,
+     142,    -1,   111,   141,   189,   228,   142,    -1,   125,   141,
+     189,   138,   189,   138,   189,   142,    -1,   152,   141,   189,
+     138,   189,   142,    -1,   153,   141,   189,   138,   189,   142,
+      -1,    84,   155,   141,   189,   138,   189,   142,    -1,    85,
+     156,   141,   189,   138,   189,   142,    -1,   127,   141,   189,
+     138,   189,   142,    -1,   128,   141,   189,   138,   189,   138,
+     189,   142,    -1,   129,   141,   189,   138,   189,   138,   189,
+     142,    -1,   191,   138,   189,    -1,   189,    -1,    28,    -1,
+      29,    -1,    33,    -1,    -1,   185,   217,    -1,   117,   141,
+     194,    34,   183,   142,    -1,   196,    -1,    -1,   197,    -1,
+     196,   197,    -1,    -1,    27,   198,   213,    -1,    -1,    26,
+     199,   214,    -1,    54,    53,   203,    -1,   161,    15,   183,
+      -1,   161,    15,    10,    -1,    -1,   163,   167,   193,   192,
+     189,   200,   180,    -1,    -1,   163,   165,   167,   193,   192,
+     189,   201,   180,    -1,    -1,   163,   166,   167,   193,   192,
+     183,   202,   180,    -1,   163,   167,    31,   170,   194,    -1,
+      47,   204,    -1,    50,   137,   205,    -1,    19,    -1,    48,
+     137,    19,    -1,    62,   137,    19,    -1,   143,   206,   145,
+      -1,   206,   138,    19,    -1,    19,    -1,    -1,   207,   138,
+     183,   173,   160,    -1,   183,   173,   160,    -1,   207,    -1,
+     207,   138,    35,    -1,    35,    -1,    -1,   171,   185,   162,
+     141,   208,   142,   175,   179,   176,    -1,    24,    -1,   148,
+      -1,   169,   167,   209,   210,    -1,    25,    -1,   149,    -1,
+     220,   212,    -1,   168,   167,   209,    -1,    -1,    55,    -1,
+       3,    -1,     4,    -1,     9,    -1,    22,    -1,    23,    -1,
+      36,    -1,    37,    -1,    21,    -1,   146,   191,   147,    -1,
+     190,    -1,    53,   215,    19,   138,    19,    -1,     7,    -1,
+       8,    -1,   159,    -1,   162,    -1,   217,    -1,   216,    -1,
+     183,   218,    -1,   220,   221,    -1,   211,   221,    -1,   222,
+     161,   223,    -1,   222,   225,    -1,    -1,    18,    -1,    63,
+     219,    -1,    63,    10,    -1,    64,    14,   218,    -1,    64,
+      11,   218,   138,    14,   218,   138,    14,   218,    -1,    65,
+     157,   218,   138,    14,   218,   143,   224,   145,    -1,    65,
+     157,   218,   138,    14,   218,   143,   145,    -1,    66,   171,
+     185,   218,   141,   227,   142,   175,    34,    14,   218,    67,
+      14,   218,    -1,    67,    -1,    68,    -1,   224,   157,   216,
+     138,    14,   218,    -1,   157,   216,   138,    14,   218,    -1,
+     161,   230,    -1,   183,   143,   218,   138,   218,   145,    -1,
+     226,   138,   143,   218,   138,   218,   145,    -1,   183,   218,
+     173,    -1,   227,   138,   183,   218,   173,    -1,    -1,    -1,
+     228,   138,   219,    -1,    52,    51,    -1,    51,    -1,   152,
+     183,   218,   138,   218,    -1,   153,   183,   218,   138,   218,
+      -1,    84,   155,   183,   218,   138,   218,    -1,    85,   156,
+     183,   218,   138,   218,    -1,   154,   219,    34,   183,    -1,
+     125,   219,   138,   219,   138,   219,    -1,   126,   219,   138,
+     183,    -1,   127,   219,   138,   219,    -1,   128,   219,   138,
+     219,   138,   219,    -1,   129,   219,   138,   219,   138,   219,
+      -1,   124,   226,    -1,   229,   171,   185,   218,   141,   227,
+     142,   175,    -1,   232,    -1,    32,    -1,    -1,   106,   183,
+     177,    -1,   106,   183,   138,    11,   218,   177,    -1,   107,
+     183,   177,    -1,   107,   183,   138,    11,   218,   177,    -1,
+     108,   219,    -1,   231,   109,   183,   218,   177,    -1,   231,
+     110,   219,   138,   183,   218,   177,    -1,   111,   183,   218,
+     228,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short yyrline[] =
+static const yytype_uint16 yyrline[] =
 {
        0,  1111,  1111,  1111,  1111,  1111,  1111,  1111,  1111,  1111,
     1111,  1112,  1112,  1112,  1112,  1112,  1112,  1113,  1113,  1113,
-    1113,  1113,  1113,  1113,  1114,  1114,  1114,  1114,  1114,  1117,
+    1113,  1113,  1113,  1114,  1114,  1114,  1114,  1114,  1114,  1117,
     1117,  1118,  1118,  1119,  1119,  1120,  1120,  1121,  1121,  1125,
     1125,  1126,  1126,  1127,  1127,  1128,  1128,  1129,  1129,  1130,
     1130,  1131,  1131,  1132,  1133,  1138,  1139,  1139,  1141,  1141,
     1142,  1142,  1146,  1150,  1155,  1155,  1157,  1158,  1163,  1169,
     1170,  1171,  1172,  1173,  1177,  1178,  1179,  1183,  1184,  1185,
-    1189,  1190,  1191,  1195,  1196,  1197,  1198,  1199,  1203,  1204,
-    1205,  1208,  1208,  1209,  1210,  1211,  1212,  1213,  1221,  1222,
-    1223,  1224,  1227,  1228,  1233,  1234,  1235,  1238,  1239,  1246,
-    1246,  1253,  1253,  1262,  1270,  1270,  1276,  1276,  1278,  1283,
-    1296,  1296,  1296,  1296,  1299,  1303,  1307,  1314,  1319,  1327,
-    1357,  1388,  1393,  1405,  1415,  1419,  1429,  1436,  1443,  1450,
-    1455,  1460,  1467,  1468,  1475,  1482,  1490,  1496,  1508,  1536,
-    1552,  1581,  1609,  1635,  1655,  1681,  1701,  1713,  1720,  1786,
-    1796,  1806,  1812,  1822,  1828,  1838,  1843,  1848,  1856,  1868,
-    1890,  1898,  1904,  1915,  1920,  1925,  1931,  1937,  1946,  1950,
-    1958,  1958,  1961,  1961,  1964,  1975,  1996,  2001,  2009,  2010,
-    2014,  2014,  2018,  2018,  2021,  2024,  2048,  2059,  2059,  2070,
-    2069,  2079,  2078,  2089,  2104,  2107,  2113,  2126,  2130,  2135,
-    2137,  2142,  2147,  2156,  2166,  2177,  2181,  2190,  2199,  2204,
-    2326,  2326,  2328,  2337,  2337,  2339,  2344,  2356,  2360,  2365,
-    2369,  2373,  2377,  2381,  2385,  2389,  2393,  2397,  2422,  2426,
-    2440,  2444,  2448,  2452,  2458,  2458,  2464,  2473,  2477,  2486,
-    2495,  2504,  2508,  2513,  2517,  2521,  2526,  2536,  2555,  2564,
-    2644,  2648,  2655,  2666,  2679,  2689,  2700,  2710,  2719,  2728,
-    2731,  2732,  2739,  2743,  2748,  2769,  2786,  2800,  2814,  2826,
-    2834,  2841,  2847,  2853,  2859,  2874,  2959,  2964,  2968,  2975,
-    2982,  2990,  2997,  3005,  3013,  3027,  3044
+    1186,  1190,  1191,  1192,  1196,  1197,  1198,  1199,  1200,  1204,
+    1205,  1206,  1209,  1210,  1211,  1212,  1213,  1214,  1215,  1222,
+    1223,  1224,  1225,  1228,  1229,  1234,  1235,  1236,  1239,  1240,
+    1247,  1248,  1254,  1255,  1263,  1271,  1272,  1277,  1278,  1279,
+    1284,  1297,  1297,  1297,  1297,  1300,  1304,  1308,  1315,  1320,
+    1328,  1358,  1389,  1394,  1406,  1416,  1420,  1430,  1437,  1444,
+    1451,  1456,  1461,  1468,  1469,  1476,  1483,  1491,  1497,  1509,
+    1537,  1553,  1582,  1610,  1636,  1656,  1682,  1702,  1714,  1721,
+    1787,  1797,  1807,  1813,  1823,  1829,  1839,  1844,  1849,  1857,
+    1869,  1891,  1899,  1905,  1916,  1921,  1926,  1932,  1938,  1947,
+    1951,  1959,  1959,  1962,  1962,  1965,  1976,  1997,  2002,  2010,
+    2011,  2015,  2015,  2019,  2019,  2022,  2025,  2049,  2060,  2060,
+    2071,  2070,  2080,  2079,  2090,  2105,  2108,  2114,  2127,  2131,
+    2136,  2138,  2143,  2148,  2157,  2167,  2178,  2182,  2191,  2200,
+    2205,  2327,  2327,  2329,  2338,  2338,  2340,  2345,  2357,  2361,
+    2366,  2370,  2374,  2378,  2382,  2386,  2390,  2394,  2398,  2423,
+    2427,  2441,  2445,  2449,  2453,  2459,  2459,  2465,  2474,  2478,
+    2487,  2496,  2505,  2509,  2514,  2518,  2522,  2527,  2537,  2556,
+    2565,  2645,  2649,  2656,  2667,  2680,  2690,  2701,  2711,  2720,
+    2729,  2732,  2733,  2740,  2744,  2749,  2770,  2787,  2801,  2815,
+    2827,  2835,  2842,  2848,  2854,  2860,  2875,  2960,  2965,  2969,
+    2976,  2983,  2991,  2998,  3006,  3014,  3028,  3045
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL", "ESAPINTVAL", 
-  "EUAPINTVAL", "LOCALVAL_ID", "GLOBALVAL_ID", "FPVAL", "VOID", "INTTYPE", 
-  "FLOAT", "DOUBLE", "LABEL", "TYPE", "LOCALVAR", "GLOBALVAR", "LABELSTR", 
-  "STRINGCONSTANT", "ATSTRINGCONSTANT", "ZEROINITIALIZER", "TRUETOK", 
-  "FALSETOK", "BEGINTOK", "ENDTOK", "DECLARE", "DEFINE", "GLOBAL", 
-  "CONSTANT", "SECTION", "ALIAS", "VOLATILE", "THREAD_LOCAL", "TO", 
-  "DOTDOTDOT", "NULL_TOK", "UNDEF", "INTERNAL", "LINKONCE", "WEAK", 
-  "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "OPAQUE", 
-  "EXTERNAL", "TARGET", "TRIPLE", "ALIGN", "DEPLIBS", "CALL", "TAIL", 
-  "ASM_TOK", "MODULE", "SIDEEFFECT", "CC_TOK", "CCC_TOK", "FASTCC_TOK", 
-  "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT", 
-  "RET", "BR", "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", "ADD", "SUB", 
-  "MUL", "UDIV", "SDIV", "FDIV", "UREM", "SREM", "FREM", "AND", "OR", 
-  "XOR", "SHL", "LSHR", "ASHR", "ICMP", "FCMP", "EQ", "NE", "SLT", "SGT", 
-  "SLE", "SGE", "ULT", "UGT", "ULE", "UGE", "OEQ", "ONE", "OLT", "OGT", 
-  "OLE", "OGE", "ORD", "UNO", "UEQ", "UNE", "MALLOC", "ALLOCA", "FREE", 
-  "LOAD", "STORE", "GETELEMENTPTR", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", 
-  "FPEXT", "BITCAST", "UITOFP", "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", 
-  "PTRTOINT", "PHI_TOK", "SELECT", "VAARG", "EXTRACTELEMENT", 
-  "INSERTELEMENT", "SHUFFLEVECTOR", "NORETURN", "INREG", "SRET", 
-  "NOUNWIND", "DEFAULT", "HIDDEN", "'='", "','", "'*'", "'\\\\'", "'('", 
-  "')'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'", "'c'", 
-  "$accept", "ArithmeticOps", "LogicalOps", "CastOps", "IPredicates", 
-  "FPredicates", "IntType", "FPType", "LocalName", "OptLocalName", 
-  "OptLocalAssign", "GlobalName", "OptGlobalAssign", "GlobalAssign", 
-  "GVInternalLinkage", "GVExternalLinkage", "GVVisibilityStyle", 
-  "FunctionDeclareLinkage", "FunctionDefineLinkage", "AliasLinkage", 
-  "OptCallingConv", "ParamAttr", "OptParamAttrs", "FuncAttr", 
-  "OptFuncAttrs", "OptAlign", "OptCAlign", "SectionString", "OptSection", 
-  "GlobalVarAttributes", "GlobalVarAttribute", "PrimType", "Types", 
-  "ArgType", "ResultTypes", "ArgTypeList", "ArgTypeListI", "TypeListI", 
-  "ConstVal", "ConstExpr", "ConstVector", "GlobalType", "ThreadLocal", 
-  "AliaseeRef", "Module", "DefinitionList", "Definition", "@1", "@2", 
-  "@3", "@4", "@5", "AsmBlock", "TargetDefinition", "LibrariesDefinition", 
-  "LibList", "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", 
-  "FunctionHeader", "END", "Function", "FunctionProto", "OptSideEffect", 
-  "ConstValueRef", "SymbolicValueRef", "ValueRef", "ResolvedVal", 
-  "BasicBlockList", "BasicBlock", "InstructionList", "BBTerminatorInst", 
-  "JumpTable", "Inst", "PHIList", "ValueRefList", "IndexList", 
-  "OptTailCall", "InstVal", "OptVolatile", "MemoryInst", 0
+  "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL", "ESAPINTVAL",
+  "EUAPINTVAL", "LOCALVAL_ID", "GLOBALVAL_ID", "FPVAL", "VOID", "INTTYPE",
+  "FLOAT", "DOUBLE", "LABEL", "TYPE", "LOCALVAR", "GLOBALVAR", "LABELSTR",
+  "STRINGCONSTANT", "ATSTRINGCONSTANT", "ZEROINITIALIZER", "TRUETOK",
+  "FALSETOK", "BEGINTOK", "ENDTOK", "DECLARE", "DEFINE", "GLOBAL",
+  "CONSTANT", "SECTION", "ALIAS", "VOLATILE", "THREAD_LOCAL", "TO",
+  "DOTDOTDOT", "NULL_TOK", "UNDEF", "INTERNAL", "LINKONCE", "WEAK",
+  "APPENDING", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "OPAQUE",
+  "EXTERNAL", "TARGET", "TRIPLE", "ALIGN", "DEPLIBS", "CALL", "TAIL",
+  "ASM_TOK", "MODULE", "SIDEEFFECT", "CC_TOK", "CCC_TOK", "FASTCC_TOK",
+  "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT",
+  "RET", "BR", "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", "ADD", "SUB",
+  "MUL", "UDIV", "SDIV", "FDIV", "UREM", "SREM", "FREM", "AND", "OR",
+  "XOR", "SHL", "LSHR", "ASHR", "ICMP", "FCMP", "EQ", "NE", "SLT", "SGT",
+  "SLE", "SGE", "ULT", "UGT", "ULE", "UGE", "OEQ", "ONE", "OLT", "OGT",
+  "OLE", "OGE", "ORD", "UNO", "UEQ", "UNE", "MALLOC", "ALLOCA", "FREE",
+  "LOAD", "STORE", "GETELEMENTPTR", "TRUNC", "ZEXT", "SEXT", "FPTRUNC",
+  "FPEXT", "BITCAST", "UITOFP", "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR",
+  "PTRTOINT", "PHI_TOK", "SELECT", "VAARG", "EXTRACTELEMENT",
+  "INSERTELEMENT", "SHUFFLEVECTOR", "NORETURN", "INREG", "SRET",
+  "NOUNWIND", "DEFAULT", "HIDDEN", "PROTECTED", "'='", "','", "'*'",
+  "'\\\\'", "'('", "')'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'",
+  "'c'", "$accept", "ArithmeticOps", "LogicalOps", "CastOps",
+  "IPredicates", "FPredicates", "IntType", "FPType", "LocalName",
+  "OptLocalName", "OptLocalAssign", "GlobalName", "OptGlobalAssign",
+  "GlobalAssign", "GVInternalLinkage", "GVExternalLinkage",
+  "GVVisibilityStyle", "FunctionDeclareLinkage", "FunctionDefineLinkage",
+  "AliasLinkage", "OptCallingConv", "ParamAttr", "OptParamAttrs",
+  "FuncAttr", "OptFuncAttrs", "OptAlign", "OptCAlign", "SectionString",
+  "OptSection", "GlobalVarAttributes", "GlobalVarAttribute", "PrimType",
+  "Types", "ArgType", "ResultTypes", "ArgTypeList", "ArgTypeListI",
+  "TypeListI", "ConstVal", "ConstExpr", "ConstVector", "GlobalType",
+  "ThreadLocal", "AliaseeRef", "Module", "DefinitionList", "Definition",
+  "@1", "@2", "@3", "@4", "@5", "AsmBlock", "TargetDefinition",
+  "LibrariesDefinition", "LibList", "ArgListH", "ArgList",
+  "FunctionHeaderH", "BEGIN", "FunctionHeader", "END", "Function",
+  "FunctionProto", "OptSideEffect", "ConstValueRef", "SymbolicValueRef",
+  "ValueRef", "ResolvedVal", "BasicBlockList", "BasicBlock",
+  "InstructionList", "BBTerminatorInst", "JumpTable", "Inst", "PHIList",
+  "ValueRefList", "IndexList", "OptTailCall", "InstVal", "OptVolatile",
+  "MemoryInst", 0
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short yytoknum[] =
+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,
@@ -1756,48 +1891,49 @@
      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,    61,    44,    42,    92,
-      40,    41,    91,   120,    93,    60,    62,   123,   125,    99
+     385,   386,   387,   388,   389,   390,   391,    61,    44,    42,
+      92,    40,    41,    91,   120,    93,    60,    62,   123,   125,
+      99
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
+static const yytype_uint8 yyr1[] =
 {
-       0,   150,   151,   151,   151,   151,   151,   151,   151,   151,
-     151,   152,   152,   152,   152,   152,   152,   153,   153,   153,
-     153,   153,   153,   153,   153,   153,   153,   153,   153,   154,
+       0,   151,   152,   152,   152,   152,   152,   152,   152,   152,
+     152,   153,   153,   153,   153,   153,   153,   154,   154,   154,
      154,   154,   154,   154,   154,   154,   154,   154,   154,   155,
-     155,   155,   155,   155,   155,   155,   155,   155,   155,   155,
-     155,   155,   155,   155,   155,   156,   157,   157,   158,   158,
-     159,   159,   160,   160,   161,   161,   162,   162,   163,   164,
-     164,   164,   164,   164,   165,   165,   165,   166,   166,   166,
-     167,   167,   167,   168,   168,   168,   168,   168,   169,   169,
-     169,   170,   170,   170,   170,   170,   170,   170,   171,   171,
-     171,   171,   172,   172,   173,   173,   173,   174,   174,   175,
-     175,   176,   176,   177,   178,   178,   179,   179,   180,   180,
-     181,   181,   181,   181,   182,   182,   182,   182,   182,   182,
-     182,   182,   182,   182,   182,   182,   182,   183,   184,   184,
-     185,   185,   186,   186,   186,   186,   187,   187,   188,   188,
-     188,   188,   188,   188,   188,   188,   188,   188,   188,   188,
-     188,   188,   188,   188,   188,   188,   188,   188,   189,   189,
-     189,   189,   189,   189,   189,   189,   189,   189,   190,   190,
-     191,   191,   192,   192,   193,   193,   194,   194,   195,   195,
-     197,   196,   198,   196,   196,   196,   196,   199,   196,   200,
-     196,   201,   196,   196,   196,   196,   202,   203,   203,   204,
-     205,   205,   205,   206,   206,   207,   207,   207,   207,   208,
-     209,   209,   210,   211,   211,   212,   213,   214,   214,   215,
-     215,   215,   215,   215,   215,   215,   215,   215,   215,   215,
-     216,   216,   216,   216,   217,   217,   218,   219,   219,   220,
-     221,   221,   221,   222,   222,   222,   222,   222,   222,   222,
-     222,   222,   223,   223,   224,   225,   225,   226,   226,   226,
-     227,   227,   228,   228,   229,   229,   229,   229,   229,   229,
-     229,   229,   229,   229,   229,   229,   229,   230,   230,   231,
-     231,   231,   231,   231,   231,   231,   231
+     155,   155,   155,   155,   155,   155,   155,   155,   155,   156,
+     156,   156,   156,   156,   156,   156,   156,   156,   156,   156,
+     156,   156,   156,   156,   156,   157,   158,   158,   159,   159,
+     160,   160,   161,   161,   162,   162,   163,   163,   164,   165,
+     165,   165,   165,   165,   166,   166,   166,   167,   167,   167,
+     167,   168,   168,   168,   169,   169,   169,   169,   169,   170,
+     170,   170,   171,   171,   171,   171,   171,   171,   171,   172,
+     172,   172,   172,   173,   173,   174,   174,   174,   175,   175,
+     176,   176,   177,   177,   178,   179,   179,   180,   180,   181,
+     181,   182,   182,   182,   182,   183,   183,   183,   183,   183,
+     183,   183,   183,   183,   183,   183,   183,   183,   184,   185,
+     185,   186,   186,   187,   187,   187,   187,   188,   188,   189,
+     189,   189,   189,   189,   189,   189,   189,   189,   189,   189,
+     189,   189,   189,   189,   189,   189,   189,   189,   189,   190,
+     190,   190,   190,   190,   190,   190,   190,   190,   190,   191,
+     191,   192,   192,   193,   193,   194,   194,   195,   195,   196,
+     196,   198,   197,   199,   197,   197,   197,   197,   200,   197,
+     201,   197,   202,   197,   197,   197,   197,   203,   204,   204,
+     205,   206,   206,   206,   207,   207,   208,   208,   208,   208,
+     209,   210,   210,   211,   212,   212,   213,   214,   215,   215,
+     216,   216,   216,   216,   216,   216,   216,   216,   216,   216,
+     216,   217,   217,   217,   217,   218,   218,   219,   220,   220,
+     221,   222,   222,   222,   223,   223,   223,   223,   223,   223,
+     223,   223,   223,   224,   224,   225,   226,   226,   227,   227,
+     227,   228,   228,   229,   229,   230,   230,   230,   230,   230,
+     230,   230,   230,   230,   230,   230,   230,   230,   231,   231,
+     232,   232,   232,   232,   232,   232,   232,   232
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
+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,
@@ -1807,611 +1943,577 @@
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     0,     2,     0,     1,     1,     1,     0,     2,     1,
        1,     1,     1,     1,     1,     1,     1,     0,     1,     1,
-       0,     1,     1,     0,     1,     1,     1,     1,     0,     1,
-       1,     0,     1,     1,     1,     1,     1,     2,     1,     1,
-       1,     1,     0,     2,     1,     1,     1,     0,     2,     0,
-       2,     0,     3,     2,     0,     1,     0,     3,     1,     2,
-       1,     1,     1,     1,     1,     1,     2,     1,     2,     5,
-       5,     5,     5,     3,     2,     5,     4,     2,     1,     1,
-       1,     3,     1,     3,     1,     0,     1,     3,     4,     3,
-       3,     4,     4,     3,     6,     5,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     6,     5,
-       8,     6,     6,     7,     7,     6,     8,     8,     3,     1,
-       1,     1,     1,     0,     2,     6,     1,     0,     1,     2,
-       0,     3,     0,     3,     3,     3,     3,     0,     7,     0,
-       8,     0,     8,     5,     2,     3,     1,     3,     3,     3,
-       3,     1,     0,     5,     3,     1,     3,     1,     0,     9,
-       1,     1,     4,     1,     1,     2,     3,     0,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     3,     1,     5,
-       1,     1,     1,     1,     1,     1,     2,     2,     2,     3,
-       2,     0,     1,     2,     2,     3,     9,     9,     8,    14,
-       1,     1,     6,     5,     2,     6,     7,     3,     5,     0,
-       0,     3,     2,     1,     5,     5,     6,     6,     4,     6,
-       4,     4,     6,     6,     2,     8,     1,     1,     0,     3,
-       6,     3,     6,     2,     5,     7,     4
+       1,     0,     1,     1,     0,     1,     1,     1,     1,     0,
+       1,     1,     0,     1,     1,     1,     1,     1,     2,     1,
+       1,     1,     1,     0,     2,     1,     1,     1,     0,     2,
+       0,     2,     0,     3,     2,     0,     1,     0,     3,     1,
+       2,     1,     1,     1,     1,     1,     1,     2,     1,     2,
+       5,     5,     5,     5,     3,     2,     5,     4,     2,     1,
+       1,     1,     3,     1,     3,     1,     0,     1,     3,     4,
+       3,     3,     4,     4,     3,     6,     5,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     6,
+       5,     8,     6,     6,     7,     7,     6,     8,     8,     3,
+       1,     1,     1,     1,     0,     2,     6,     1,     0,     1,
+       2,     0,     3,     0,     3,     3,     3,     3,     0,     7,
+       0,     8,     0,     8,     5,     2,     3,     1,     3,     3,
+       3,     3,     1,     0,     5,     3,     1,     3,     1,     0,
+       9,     1,     1,     4,     1,     1,     2,     3,     0,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     1,
+       5,     1,     1,     1,     1,     1,     1,     2,     2,     2,
+       3,     2,     0,     1,     2,     2,     3,     9,     9,     8,
+      14,     1,     1,     6,     5,     2,     6,     7,     3,     5,
+       0,     0,     3,     2,     1,     5,     5,     6,     6,     4,
+       6,     4,     4,     6,     6,     2,     8,     1,     1,     0,
+       3,     6,     3,     6,     2,     5,     7,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
    STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
-static const unsigned short yydefact[] =
+static const yytype_uint16 yydefact[] =
 {
-      67,    58,    64,    59,    65,   192,   190,     0,     0,     0,
-       0,     0,     0,    77,    66,     0,    67,   188,    80,    83,
-       0,     0,   204,     0,     0,    62,     0,    68,    69,    71,
-      70,    72,    74,    73,    75,    76,    78,    79,    77,    77,
-     183,     1,   189,    81,    82,    77,   193,    84,    85,    86,
-      87,    77,   251,   191,   251,     0,     0,   212,   205,   206,
-     194,   240,   241,   196,   120,   121,   122,   123,   124,     0,
-       0,     0,     0,   242,   243,   125,   195,   127,   183,   183,
-      88,   182,     0,    91,    91,   252,   248,    63,   223,   224,
-     225,   247,   207,   208,   211,     0,   145,   128,     0,     0,
-       0,     0,   134,   146,     0,   126,   145,     0,     0,    90,
-      89,     0,   180,   181,     0,     0,    92,    93,    94,    95,
-      96,     0,   226,     0,   288,   250,     0,   209,   144,   102,
-     140,   142,     0,     0,     0,     0,     0,     0,   133,     0,
-       0,     0,   139,     0,   138,     0,   203,   120,   121,   122,
-       0,     0,     0,   197,    97,     0,   220,   221,   222,   287,
-     273,     0,     0,     0,     0,    91,   260,   261,     2,     3,
-       4,     5,     6,     7,     8,     9,    10,    14,    15,    16,
-      11,    12,    13,     0,     0,     0,     0,     0,     0,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     249,    91,   264,     0,   286,   210,   137,     0,   107,     0,
-       0,   136,     0,   147,   107,   199,   201,     0,   184,   165,
-     166,   161,   163,   162,   164,   167,   160,   156,   157,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   159,   158,   116,     0,   272,   254,     0,
-     253,     0,     0,    55,     0,     0,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,     0,    53,    54,    49,
-      50,    51,    52,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,     0,   111,   111,   293,     0,     0,   284,
+      67,    58,    64,    59,    65,   193,   191,     0,     0,     0,
+       0,     0,     0,    77,    66,     0,    67,   189,    81,    84,
+       0,     0,   205,     0,     0,    62,     0,    68,    69,    71,
+      70,    72,    74,    73,    75,    76,    78,    79,    80,    77,
+      77,   184,     1,   190,    82,    83,    77,   194,    85,    86,
+      87,    88,    77,   252,   192,   252,     0,     0,   213,   206,
+     207,   195,   241,   242,   197,   121,   122,   123,   124,   125,
+       0,     0,     0,     0,   243,   244,   126,   196,   128,   184,
+     184,    89,   183,     0,    92,    92,   253,   249,    63,   224,
+     225,   226,   248,   208,   209,   212,     0,   146,   129,     0,
+       0,     0,     0,   135,   147,     0,   127,   146,     0,     0,
+      91,    90,     0,   181,   182,     0,     0,    93,    94,    95,
+      96,    97,     0,   227,     0,   289,   251,     0,   210,   145,
+     103,   141,   143,     0,     0,     0,     0,     0,     0,   134,
+       0,     0,     0,   140,     0,   139,     0,   204,   121,   122,
+     123,     0,     0,     0,   198,    98,     0,   221,   222,   223,
+     288,   274,     0,     0,     0,     0,    92,   261,   262,     2,
+       3,     4,     5,     6,     7,     8,     9,    10,    14,    15,
+      16,    11,    12,    13,     0,     0,     0,     0,     0,     0,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   250,    92,   265,     0,   287,   211,   138,     0,   108,
+       0,     0,   137,     0,   148,   108,   200,   202,     0,   185,
+     166,   167,   162,   164,   163,   165,   168,   161,   157,   158,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    98,    99,   100,   101,   103,   143,   141,   130,   131,
-     132,   135,   129,   116,   116,     0,     0,     0,     0,     0,
-       0,     0,     0,   149,   179,     0,     0,     0,   153,     0,
-     150,     0,     0,     0,     0,   198,   218,   229,   230,   231,
-     236,   232,   233,   234,   235,   227,     0,   238,   245,   244,
-     246,     0,   255,     0,     0,     0,     0,     0,   289,     0,
-     291,   270,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   104,   105,   106,   108,   200,
-     202,     0,     0,     0,   270,     0,     0,     0,     0,     0,
-     148,   134,   146,     0,   151,   152,     0,     0,     0,     0,
-       0,   118,   116,   217,   102,   215,     0,   228,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   296,     0,
-       0,     0,   280,   281,     0,     0,     0,     0,   278,     0,
-     111,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     178,   155,     0,     0,     0,     0,   113,   119,   117,    61,
-       0,   107,     0,   237,     0,     0,   269,     0,     0,   111,
-     112,   111,     0,     0,     0,     0,     0,     0,   274,   275,
-     269,     0,   294,     0,   185,     0,     0,   169,     0,     0,
-       0,     0,   154,     0,     0,     0,    60,   214,   216,   102,
-     114,     0,     0,     0,     0,     0,   276,   277,   290,   292,
-     271,     0,     0,   279,   282,   283,     0,   111,     0,     0,
-       0,   175,     0,     0,   171,   172,   168,    61,   115,   109,
-     239,     0,     0,   102,     0,   107,   265,     0,   107,   295,
-     173,   174,     0,     0,     0,   213,     0,   219,     0,   258,
-       0,     0,   267,     0,     0,   266,   285,   170,   176,   177,
-     110,   256,     0,   257,     0,   102,     0,     0,     0,   268,
-       0,     0,     0,     0,   263,     0,     0,   262,     0,   259
+       0,     0,     0,     0,   160,   159,   117,     0,   273,   255,
+       0,   254,     0,     0,    55,     0,     0,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,     0,    53,    54,
+      49,    50,    51,    52,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,     0,   112,   112,   294,     0,     0,
+     285,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    99,   100,   101,   102,   104,   144,   142,   131,
+     132,   133,   136,   130,   117,   117,     0,     0,     0,     0,
+       0,     0,     0,     0,   150,   180,     0,     0,     0,   154,
+       0,   151,     0,     0,     0,     0,   199,   219,   230,   231,
+     232,   237,   233,   234,   235,   236,   228,     0,   239,   246,
+     245,   247,     0,   256,     0,     0,     0,     0,     0,   290,
+       0,   292,   271,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   105,   106,   107,   109,
+     201,   203,     0,     0,     0,   271,     0,     0,     0,     0,
+       0,   149,   135,   147,     0,   152,   153,     0,     0,     0,
+       0,     0,   119,   117,   218,   103,   216,     0,   229,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   297,
+       0,     0,     0,   281,   282,     0,     0,     0,     0,   279,
+       0,   112,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   179,   156,     0,     0,     0,     0,   114,   120,   118,
+      61,     0,   108,     0,   238,     0,     0,   270,     0,     0,
+     112,   113,   112,     0,     0,     0,     0,     0,     0,   275,
+     276,   270,     0,   295,     0,   186,     0,     0,   170,     0,
+       0,     0,     0,   155,     0,     0,     0,    60,   215,   217,
+     103,   115,     0,     0,     0,     0,     0,   277,   278,   291,
+     293,   272,     0,     0,   280,   283,   284,     0,   112,     0,
+       0,     0,   176,     0,     0,   172,   173,   169,    61,   116,
+     110,   240,     0,     0,   103,     0,   108,   266,     0,   108,
+     296,   174,   175,     0,     0,     0,   214,     0,   220,     0,
+     259,     0,     0,   268,     0,     0,   267,   286,   171,   177,
+     178,   111,   257,     0,   258,     0,   103,     0,     0,     0,
+     269,     0,     0,     0,     0,   264,     0,     0,   263,     0,
+     260
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
-static const short yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
 {
-      -1,   250,   251,   252,   276,   293,   150,   151,    73,   497,
-      11,    74,    13,    14,    38,    39,    40,    45,    51,   111,
-     121,   315,   216,   388,   318,   547,   368,   411,   529,   345,
-     412,    75,   152,   130,   145,   131,   132,   104,   334,   357,
-     335,   114,    82,   146,    15,    16,    17,    19,    18,   255,
-     323,   324,    60,    22,    58,    95,   415,   416,   122,   158,
-      52,    90,    53,    46,   418,   358,    77,   360,   260,    54,
-      86,    87,   210,   551,   125,   299,   505,   428,   211,   212,
-     213,   214
+      -1,   251,   252,   253,   277,   294,   151,   152,    74,   498,
+      11,    75,    13,    14,    39,    40,    41,    46,    52,   112,
+     122,   316,   217,   389,   319,   548,   369,   412,   530,   346,
+     413,    76,   153,   131,   146,   132,   133,   105,   335,   358,
+     336,   115,    83,   147,    15,    16,    17,    19,    18,   256,
+     324,   325,    61,    22,    59,    96,   416,   417,   123,   159,
+      53,    91,    54,    47,   419,   359,    78,   361,   261,    55,
+      87,    88,   211,   552,   126,   300,   506,   429,   212,   213,
+     214,   215
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -472
-static const short yypact[] =
+#define YYPACT_NINF -460
+static const yytype_int16 yypact[] =
 {
-      50,  -472,  -472,  -472,  -472,  -472,  -472,   -20,  -110,    93,
-     -64,   160,    68,    14,  -472,   185,   203,  -472,    77,   199,
-      76,    81,  -472,    79,   205,  -472,  1214,  -472,  -472,  -472,
-    -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,    56,    56,
-     137,  -472,  -472,  -472,  -472,    56,  -472,  -472,  -472,  -472,
-    -472,    56,   210,  -472,     2,   236,   246,   277,  -472,  -472,
-    -472,  -472,  -472,   170,  -472,  -472,  -472,  -472,  -472,   315,
-     318,     6,   368,  -472,  -472,  -472,   154,  -472,   287,   287,
-     255,  -472,   207,   281,   281,  -472,  -472,    82,  -472,  -472,
-    -472,  -472,  -472,  -472,  -472,    -1,  1109,  -472,   184,   188,
-     685,   170,  -472,   154,   -49,  -472,  1109,   207,   207,  -472,
-    -472,   777,  -472,  -472,  1230,   326,  -472,  -472,  -472,  -472,
-    -472,  1269,  -472,    -7,  1471,  -472,   324,  -472,  -472,   154,
-    -472,   208,   206,  1312,  1312,   200,   -43,  1312,  -472,   213,
-    1230,  1312,   170,   215,   154,   316,  -472,    40,   339,   350,
-     256,   352,   856,  -472,  -472,    86,  -472,  -472,  -472,  -472,
-    -472,   311,  1372,   187,   356,   281,  -472,  -472,  -472,  -472,
-    -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
-    -472,  -472,  -472,   394,   177,  1312,  1312,  1312,  1312,  -472,
-    -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
-    -472,  1312,  1312,  1312,  1312,  1312,  1312,  1312,  1312,  1312,
-    -472,   281,  -472,   122,  -472,  -472,   -40,  1126,  -472,    67,
-      49,  -472,   222,   154,  -472,  -472,   154,   777,  -472,  -472,
-    -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,   394,
-     177,   229,   232,   234,   237,   243,  1156,  1386,   898,   367,
-     249,   251,   252,  -472,  -472,   257,   258,  -472,   170,   606,
-    -472,   733,   733,  -472,   733,  1269,  -472,  -472,  -472,  -472,
-    -472,  -472,  -472,  -472,  -472,  -472,  1312,  -472,  -472,  -472,
-    -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
-    -472,  -472,  -472,  1312,   -89,   108,  -472,   606,   116,   259,
-     260,   262,   263,   266,   267,   606,   606,   361,  1269,  1312,
-    1312,  -472,  -472,  -472,  -472,  -472,  -472,  -472,    41,  -472,
-    -472,  -472,    41,   257,   257,   371,   268,   270,  1230,  1230,
-    1230,  1230,  1230,  -472,  -472,    15,   937,  -113,  -472,   -35,
-    -472,  1230,  1230,  1230,    29,  -472,  1170,  -472,  -472,  -472,
-    -472,  -472,  -472,  -472,  -472,   351,  1230,  -472,  -472,  -472,
-    -472,   274,  -472,   275,   733,   606,   606,    12,  -472,    19,
-    -472,  -472,   733,   265,  1312,  1312,  1312,  1312,  1312,   278,
-     284,  1312,   733,   606,   285,  -472,  -472,  -472,  -472,  -472,
-    -472,  1312,  1230,  1230,  -472,   286,   289,   290,   291,  1230,
-    -472,   283,   856,   -30,  -472,  -472,   296,   297,   403,   419,
-     436,  -472,   257,  -472,   154,   305,   302,  -472,   425,    -8,
-     431,   432,   308,   312,   317,   733,   449,   733,   321,   327,
-     733,   328,   154,  -472,   329,   330,   733,   733,   154,   323,
-     332,  1312,   126,   333,   334,   -57,  1230,  1230,  1230,  1230,
-    -472,  -472,   331,  1230,  1230,  1312,  -472,  -472,  -472,    13,
-    1200,  -472,   335,  -472,   733,   733,  1312,   733,   733,   332,
-    -472,   332,  1312,   733,   336,  1312,  1312,  1312,  -472,  -472,
-    1312,   426,  -472,   606,  -472,  1230,  1230,  -472,   337,   349,
-     355,   358,  -472,   357,   359,   149,  -472,  -472,  -472,   154,
-       1,   457,   360,   354,   606,    -2,  -472,  -472,  -472,  -472,
-    -472,   362,   733,  -472,  -472,  -472,    28,   332,   363,   364,
-    1230,  -472,  1230,  1230,  -472,  -472,  -472,    13,  -472,   450,
-    -472,   487,    -3,  -472,  1312,  -472,  -472,   370,  -472,  -472,
-    -472,  -472,   376,   377,   378,  -472,   498,  -472,   733,  -472,
-     986,     3,   -40,   606,    83,  -472,    41,  -472,  -472,  -472,
-    -472,  -472,   366,  -472,   986,  -472,   494,   497,   375,   -40,
-     733,   733,   506,   455,  -472,   733,   510,  -472,   733,  -472
+      30,  -460,  -460,  -460,  -460,  -460,  -460,    -4,  -118,    45,
+    -108,    70,    36,   432,  -460,   151,   558,  -460,   148,   200,
+      49,    71,  -460,    82,   150,  -460,  1184,  -460,  -460,  -460,
+    -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,   189,
+     189,   250,  -460,  -460,  -460,  -460,   189,  -460,  -460,  -460,
+    -460,  -460,   189,   196,  -460,   -14,   239,   248,   277,  -460,
+    -460,  -460,  -460,  -460,   129,  -460,  -460,  -460,  -460,  -460,
+     307,   313,     4,   368,  -460,  -460,  -460,   192,  -460,   295,
+     295,   294,  -460,    26,   163,   163,  -460,  -460,   155,  -460,
+    -460,  -460,  -460,  -460,  -460,  -460,  -114,    54,  -460,   194,
+     195,   932,   129,  -460,   192,  -117,  -460,    54,    26,    26,
+    -460,  -460,  1028,  -460,  -460,  1198,   336,  -460,  -460,  -460,
+    -460,  -460,  1225,  -460,    -6,  1362,  -460,   322,  -460,  -460,
+     192,  -460,   204,   201,  1240,  1240,   197,   -55,  1240,  -460,
+     205,  1198,  1240,   129,   207,   192,    88,  -460,    97,   337,
+     340,   274,   346,   757,  -460,  -460,   184,  -460,  -460,  -460,
+    -460,  -460,   305,  1261,   251,   349,   163,  -460,  -460,  -460,
+    -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,
+    -460,  -460,  -460,  -460,   395,   443,  1240,  1240,  1240,  1240,
+    -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,
+    -460,  -460,  1240,  1240,  1240,  1240,  1240,  1240,  1240,  1240,
+    1240,  -460,   163,  -460,   137,  -460,  -460,   -80,   120,  -460,
+      31,   109,  -460,   215,   192,  -460,  -460,   192,  1028,  -460,
+    -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,
+     395,   443,   222,   227,   228,   231,   232,  1042,  1276,   973,
+     358,   242,   245,   249,  -460,  -460,   253,   252,  -460,   129,
+     607,  -460,   735,   735,  -460,   735,  1225,  -460,  -460,  -460,
+    -460,  -460,  -460,  -460,  -460,  -460,  -460,  1240,  -460,  -460,
+    -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,
+    -460,  -460,  -460,  -460,  1240,   152,   156,  -460,   607,   118,
+     254,   258,   259,   260,   261,   262,   607,   607,   361,  1225,
+    1240,  1240,  -460,  -460,  -460,  -460,  -460,  -460,  -460,    99,
+    -460,  -460,  -460,    99,   253,   253,   367,   263,   264,  1198,
+    1198,  1198,  1198,  1198,  -460,  -460,   -85,  1012,     3,  -460,
+     -27,  -460,  1198,  1198,  1198,    29,  -460,  1082,  -460,  -460,
+    -460,  -460,  -460,  -460,  -460,  -460,   351,  1198,  -460,  -460,
+    -460,  -460,   269,  -460,   270,   735,   607,   607,    14,  -460,
+      32,  -460,  -460,   735,   266,  1240,  1240,  1240,  1240,  1240,
+     273,   276,  1240,   735,   607,   278,  -460,  -460,  -460,  -460,
+    -460,  -460,  1240,  1198,  1198,  -460,   284,   285,   286,   289,
+    1198,  -460,   265,   757,     9,  -460,  -460,   290,   291,   396,
+     415,   431,  -460,   253,  -460,   192,   300,   297,  -460,   422,
+       7,   429,   430,   304,   308,   309,   735,   445,   735,   312,
+     316,   735,   317,   192,  -460,   321,   326,   735,   735,   192,
+     327,   329,  1240,    94,   339,   353,   -63,  1198,  1198,  1198,
+    1198,  -460,  -460,   350,  1198,  1198,  1240,  -460,  -460,  -460,
+      74,  1118,  -460,   355,  -460,   735,   735,  1240,   735,   735,
+     329,  -460,   329,  1240,   735,   360,  1240,  1240,  1240,  -460,
+    -460,  1240,   447,  -460,   607,  -460,  1198,  1198,  -460,   362,
+     357,   363,   364,  -460,   365,   370,   179,  -460,  -460,  -460,
+     192,    85,   484,   366,   372,   607,   -24,  -460,  -460,  -460,
+    -460,  -460,   373,   735,  -460,  -460,  -460,     6,   329,   371,
+     377,  1198,  -460,  1198,  1198,  -460,  -460,  -460,    74,  -460,
+     456,  -460,   492,     1,  -460,  1240,  -460,  -460,   375,  -460,
+    -460,  -460,  -460,   379,   381,   383,  -460,   505,  -460,   735,
+    -460,   888,    11,   -80,   607,   141,  -460,    99,  -460,  -460,
+    -460,  -460,  -460,   388,  -460,   888,  -460,   515,   516,   393,
+     -80,   735,   735,   518,   482,  -460,   735,   536,  -460,   735,
+    -460
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const short yypgoto[] =
+static const yytype_int16 yypgoto[] =
 {
-    -472,   401,   404,   405,   292,   294,  -161,  -472,     0,     8,
-     443,     9,  -472,  -472,  -472,  -472,    44,  -472,  -472,  -472,
-    -147,  -307,  -409,  -472,  -220,  -472,  -283,    36,  -472,  -284,
-    -472,  -472,   -25,   320,  -114,  -472,   433,   438,   -29,  -150,
-    -226,   198,   238,   313,  -472,  -472,   525,  -472,  -472,  -472,
-    -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,   458,  -472,
-    -472,  -472,  -472,  -472,  -472,  -471,  -139,    96,  -168,  -472,
-     489,  -472,  -472,  -472,  -472,  -472,    64,   151,  -472,  -472,
-    -472,  -472
+    -460,   426,   427,   428,   314,   315,  -163,  -460,     0,    27,
+     469,    10,  -460,  -460,  -460,  -460,   236,  -460,  -460,  -460,
+    -143,  -306,  -409,  -460,  -220,  -460,  -281,    58,  -460,  -297,
+    -460,  -460,   -25,   342,  -113,  -460,   462,   470,   -29,  -150,
+    -208,   198,   257,   335,  -460,  -460,   556,  -460,  -460,  -460,
+    -460,  -460,  -460,  -460,  -460,  -460,  -460,  -460,   491,  -460,
+    -460,  -460,  -460,  -460,  -460,  -459,  -139,    96,  -168,  -460,
+     524,  -460,  -460,  -460,  -460,  -460,   100,   187,  -460,  -460,
+    -460,  -460
 };
 
 /* 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, parse error.  */
-#define YYTABLE_NINF -188
-static const short yytable[] =
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -189
+static const yytype_int16 yytable[] =
 {
-      10,    76,   253,   264,   322,   459,   228,   155,   263,    12,
-      99,   387,   370,   254,   263,   387,    10,   156,   265,   296,
-      85,   337,   339,   425,   399,    12,    23,    88,    20,     1,
-     427,   409,     3,   404,   300,   301,   302,   303,   304,   389,
-     390,   307,    21,   -55,   -55,   -55,   -55,   103,   367,   105,
-    -187,   106,    28,    29,    30,    31,    32,    33,    34,   409,
-      35,   426,   229,   230,   308,   -63,     1,     2,   426,     3,
-       4,   129,    25,   311,   312,   103,     5,     6,   410,   562,
-     472,   129,    78,    79,   487,   153,   144,    10,   137,    83,
-     527,   313,   314,   568,   137,    84,   144,     7,     1,   138,
-       8,     3,   399,     2,     9,   222,     4,   399,   219,   220,
-     403,   225,   223,   405,   311,   312,   226,   566,   452,    43,
-     359,    44,   359,   359,   552,   359,   311,   312,   458,   399,
-     419,   385,   313,   314,   386,   534,   126,   259,   463,   535,
-     157,   549,   384,   127,   313,   314,    24,   563,    36,    37,
-      89,   364,   399,   100,   311,   312,   569,   482,   359,   400,
-     294,   295,   259,   297,   256,   534,   359,   359,    80,   538,
-      81,   385,   313,   314,   386,    26,   298,   259,   259,   259,
-     259,   259,   305,   306,   259,    41,   508,   105,   509,   106,
-      36,    37,   129,   387,   382,   320,   311,   312,   261,   277,
-     278,   262,   144,  -186,    27,   105,   431,   106,   433,   434,
-     435,   319,    55,   385,   313,   314,   386,    56,   -63,     1,
-       2,    57,     3,     4,    59,   359,   359,   359,    85,     5,
-       6,   309,   310,   359,   539,   112,   113,    47,    48,    49,
-     144,   500,    50,   359,   359,   369,   105,   387,   106,   387,
-       7,   365,   253,     8,   105,    92,   106,     9,   372,   231,
-     232,   233,   234,   254,   105,    93,   106,   484,   366,   279,
-     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
-     290,   291,   292,   144,   383,   259,   359,   105,   359,   106,
-     526,   359,   105,   109,   106,   110,    94,   359,   359,   394,
-     395,   396,   397,   398,   510,   140,   141,   513,   514,   515,
-      96,   402,   406,   407,   408,   554,   107,   108,   556,    97,
-      81,   414,    98,    61,    62,   359,   359,   133,   359,   359,
-     154,   134,     1,     2,   359,     3,     4,   115,   116,   117,
-     118,   119,   120,   215,   359,   217,   221,   218,   -56,   259,
-     432,   259,   259,   259,   224,   227,   438,   361,   362,   -57,
-     363,   235,   257,   443,   444,   359,   442,   263,   321,   328,
-     450,   550,   329,   359,   330,    61,    62,   331,   101,    64,
-      65,    66,    67,   332,     1,     2,   340,     3,     4,   341,
-     564,   342,   343,   371,   344,   381,   373,   374,   346,   375,
-     376,   379,   380,   377,   378,   391,   417,   430,   392,   359,
-     393,   420,   421,    68,   359,   436,   483,   488,   489,   490,
-     491,   437,   441,   446,   493,   494,   447,   448,   449,   451,
-     495,   359,   359,   453,   454,   499,   359,   455,   456,   359,
-     457,   504,   460,   461,   462,   464,   465,   259,   466,   467,
-     259,   259,   259,   470,   468,   504,   518,   519,   472,   496,
-     422,   423,   424,   480,   473,   475,   476,   477,   429,   481,
-     485,   486,   501,   512,   520,   426,   530,   492,   439,   440,
-     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
-     521,   542,   522,   543,   544,   523,   532,   531,   524,   546,
-     525,   548,   560,   567,   540,   541,   536,    69,   570,   553,
-      70,   571,   572,    71,   555,    72,   102,   557,   558,   559,
-     575,   469,   576,   471,   578,   207,   474,   496,   208,   209,
-     124,   326,   478,   479,   327,   545,   528,   317,   136,   139,
-     325,    42,   123,    91,   516,   445,     0,     0,     0,     0,
+      10,    77,   265,   254,    86,   323,   460,   229,   100,   156,
+      12,    89,   264,   388,   255,   371,    10,   388,   157,    23,
+     297,   138,   264,   266,   127,   426,    12,   390,   391,    25,
+    -188,   128,   139,   312,   313,   301,   302,   303,   304,   305,
+     338,   340,   308,   428,    20,   -63,     1,     2,   104,     3,
+       4,   314,   315,   400,   113,   114,     5,     6,    21,   410,
+     401,    62,    63,   427,   102,    65,    66,    67,    68,   309,
+       1,     2,   130,     3,     4,   473,   104,     7,   411,   488,
+       8,   427,   130,   138,     9,    26,   154,   145,    10,   129,
+       1,   528,   563,     3,   223,    62,    63,   145,    24,    69,
+     -55,   -55,   -55,   -55,     1,     2,   569,     3,     4,   220,
+     221,   400,   226,   224,   535,   410,   459,   227,   536,   230,
+     231,   360,   406,   360,   360,   553,   360,    62,    63,   404,
+     102,    65,    66,    67,    68,    90,     1,     2,   260,     3,
+       4,   400,   158,   385,   535,   400,   550,   400,   539,   420,
+     405,    42,   101,   365,   464,   317,   564,   570,   453,   360,
+     483,   295,   296,   260,   298,    69,   257,   360,   360,    60,
+     106,     1,   107,    27,     3,   567,   320,   299,   260,   260,
+     260,   260,   260,   306,   307,   260,    56,   312,   313,   509,
+      44,   510,    45,   130,    70,   388,   383,    71,   312,   313,
+      72,     2,    73,   145,     4,   314,   315,   432,    57,   434,
+     435,   436,   312,   313,    86,   386,   314,   315,   387,   116,
+     117,   118,   119,   120,   121,    58,   360,   360,   360,   386,
+     314,   315,   387,   106,   360,   107,   485,   540,    48,    49,
+      50,   145,   501,    51,   360,   360,   310,   311,   106,   388,
+     107,   388,   366,   254,   312,   313,   321,   106,    93,   107,
+      70,   373,   262,    71,   255,   263,    72,    94,    73,   367,
+      97,   386,   314,   315,   387,    79,    80,   232,   233,   234,
+     235,    81,    84,    82,   145,   384,   260,   360,    85,   360,
+     368,   106,   360,   107,   370,   106,    95,   107,   360,   360,
+     395,   396,   397,   398,   399,   511,   141,   142,   514,   515,
+     516,    98,   403,   407,   408,   409,   555,    99,   106,   557,
+     107,   527,   415,    36,    37,    38,   360,   360,    82,   360,
+     360,   106,   110,   107,   111,   360,   108,   109,   134,   135,
+     155,   216,   218,   219,   222,   360,   -56,   225,   228,   -57,
+     260,   433,   260,   260,   260,   236,   258,   439,   362,   363,
+     264,   364,   322,   329,   444,   445,   360,   443,   330,   331,
+     551,   451,   332,   333,   360,    62,    63,   341,   102,    65,
+      66,    67,    68,   342,     1,     2,   343,     3,     4,   565,
+     344,   345,   374,   347,   372,   382,   375,   376,   377,   378,
+     379,   392,   380,   381,   393,   394,   418,   421,   422,   431,
+     360,   437,   452,    69,   438,   360,   442,   484,   489,   490,
+     491,   492,   447,   448,   449,   494,   495,   450,   454,   455,
+     456,   496,   360,   360,   457,   458,   500,   360,   461,   462,
+     360,   463,   505,   465,   466,   467,   468,   469,   260,   471,
+     473,   260,   260,   260,   474,   476,   505,   519,   520,   477,
+     497,   423,   424,   425,   478,   278,   279,   482,   481,   430,
+      28,    29,    30,    31,    32,    33,    34,   486,    35,   440,
+     441,   267,   268,   269,   270,   271,   272,   273,   274,   275,
+     276,   487,   543,   502,   544,   545,   427,   493,   513,   522,
+     521,   523,   524,   531,   532,   547,   549,   525,    70,   561,
+     554,    71,   526,   541,    72,   533,    73,   103,   537,   542,
+     556,   558,   470,   559,   472,   560,   568,   475,   497,   571,
+     572,   573,   576,   479,   480,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   577,
+     579,   208,   209,   210,   327,   546,   328,   125,  -187,   529,
+     318,   503,   504,   326,   507,   508,    36,    37,    38,   140,
+     512,   137,    43,   -63,     1,     2,   124,     3,     4,    92,
+     518,   517,   446,     0,     5,     6,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     502,   503,     0,   506,   507,     0,     0,     0,     0,   511,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   517,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     533,     0,     0,     0,     0,     0,     0,     0,   537,   347,
-     348,     0,     0,    61,    62,   349,     0,     0,     0,     0,
-       0,     0,     1,     2,     0,     3,     4,   350,   351,   352,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   353,   354,   561,     0,     0,     0,     0,   565,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   355,
-       0,     0,     0,     0,     0,     0,   573,   574,     0,     0,
-       0,   577,     0,     0,   579,   168,   169,   170,   171,   172,
+       0,   534,     0,     0,     0,     7,     0,     0,     8,   538,
+     348,   349,     9,     0,    62,    63,   350,     0,     0,     0,
+       0,     0,     0,     1,     2,     0,     3,     4,   351,   352,
+     353,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   354,   355,   562,     0,     0,     0,     0,
+     566,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     356,     0,     0,     0,     0,     0,     0,   574,   575,     0,
+       0,     0,   578,     0,     0,   580,   169,   170,   171,   172,
      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     239,   240,    61,    62,     0,   101,    64,    65,    66,    67,
-       0,     1,     2,     0,     3,     4,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   241,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-      68,   242,     0,   243,   244,   245,   347,   348,     0,     0,
-      61,    62,   349,     0,   105,     0,   106,     0,     0,     1,
-       2,   356,     3,     4,   350,   351,   352,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   353,
-     354,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    61,    62,   355,   142,    64,    65,
-      66,    67,     0,     1,     2,     0,     3,     4,     0,     0,
-       0,     0,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   239,   240,     0,
-       0,     0,    68,     0,    69,     0,     0,    70,     0,     0,
-      71,     0,    72,   135,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   241,   189,   190,   191,   192,   193,
-     194,   195,   196,   197,   198,   199,   200,     0,   242,     0,
-     243,   244,   245,    61,    62,     0,     0,     0,     0,     0,
-       0,     0,     1,     2,     0,     3,     4,   236,   356,     0,
+     183,   240,   241,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   237,   238,   143,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    61,    62,     0,   101,   147,
-     148,   149,    67,     0,     1,     2,    69,     3,     4,    70,
-       0,     0,    71,     0,    72,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     239,   240,     0,    68,    61,    62,     0,   101,   147,   148,
-     149,    67,     0,     1,     2,     0,     3,     4,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   241,   189,   190,
+       0,     0,     0,     0,     0,     0,     0,     0,   242,   190,
      191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-       0,   242,    68,   243,   244,   245,     0,     0,     0,   347,
-     348,     0,     0,     0,   105,   349,   106,     0,   246,     0,
-       0,   247,     0,   248,     0,   249,     0,   350,   351,   352,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   353,   354,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    69,     0,   355,
-      70,     0,     0,    71,     0,    72,   338,     0,     0,     0,
-       0,     0,     0,     0,     0,   168,   169,   170,   171,   172,
+     201,     0,   243,     0,   244,   245,   246,     0,   348,   349,
+       0,     0,    62,    63,   350,     0,   106,     0,   107,     0,
+       0,     1,     2,   357,     3,     4,   351,   352,   353,     0,
+       0,     0,     0,     0,    62,    63,     0,     0,     0,     0,
+       0,   354,   355,     1,     2,     0,     3,     4,   237,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   356,     0,
+       0,     0,     0,   238,   239,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   240,
+     241,     0,     0,     0,     0,     0,   169,   170,   171,   172,
      173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     239,   240,     0,     0,     0,     0,    69,     0,     0,    70,
-       0,     0,    71,     0,    72,   401,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   241,   189,   190,
+     183,   240,   241,     0,     0,     0,   242,   190,   191,   192,
+     193,   194,   195,   196,   197,   198,   199,   200,   201,     0,
+     243,     0,   244,   245,   246,     0,     0,     0,   242,   190,
      191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-       0,   242,     0,   243,   244,   245,    61,    62,     0,   101,
-      64,    65,    66,    67,     0,     1,     2,     0,     3,     4,
-       0,   356,     0,    61,    62,     0,   101,    64,    65,    66,
-      67,     0,     1,     2,   128,     3,     4,     0,     0,     0,
-       0,     0,     0,     0,    68,     0,     0,     0,     0,     0,
-       0,   316,     0,    61,    62,     0,   101,   147,   148,   149,
-      67,    68,     1,     2,     0,     3,     4,    61,    62,     0,
-     101,    64,    65,    66,    67,     0,     1,     2,     0,     3,
-       4,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    68,     0,     0,     0,   413,     0,    61,    62,     0,
-     101,    64,    65,    66,    67,    68,     1,     2,     0,     3,
-       4,    61,    62,     0,    63,    64,    65,    66,    67,     0,
-       1,     2,     0,     3,     4,   498,     0,    61,    62,     0,
-     101,   147,   148,   149,    67,    68,     1,     2,    69,     3,
-       4,    70,     0,     0,    71,     0,    72,     0,     0,    68,
-       0,     0,     0,     0,     0,    69,     0,     0,    70,     0,
-       0,    71,     0,    72,     0,    68,    61,    62,     0,   142,
-      64,    65,    66,    67,     0,     1,     2,     0,     3,     4,
-       0,     0,     0,     0,     0,    69,     0,     0,    70,     0,
-     333,    71,     0,    72,     0,     0,     0,     0,     0,    69,
-       0,     0,    70,     0,    68,    71,     0,    72,     0,    61,
-      62,     0,   101,    64,    65,    66,    67,     0,     1,     2,
-       0,     3,     4,     0,     0,     0,     0,     0,     0,    69,
-       0,     0,    70,     0,     0,    71,     0,    72,     0,     0,
-       0,     0,     0,    69,     0,     0,    70,    68,     0,    71,
-       0,    72,     0,     0,     0,     0,     0,     0,     0,    69,
-       0,     0,    70,     0,     0,    71,     0,    72,     0,    61,
-      62,     0,   258,    64,    65,    66,    67,     0,     1,     2,
-       0,     3,     4,    61,    62,     0,   101,   147,   148,   149,
-      67,     0,     1,     2,     0,     3,     4,     0,    69,     0,
-       0,    70,     0,     0,    71,     0,    72,    68,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    68,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    69,     0,     0,    70,     0,     0,    71,     0,    72,
+     201,   357,   243,     0,   244,   245,   246,     0,     0,     0,
+       0,   348,   349,     0,     0,     0,   106,   350,   107,     0,
+     247,     0,     0,   248,     0,   249,     0,   250,     0,   351,
+     352,   353,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   354,   355,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    62,
+      63,   356,   102,    65,    66,    67,    68,     0,     1,     2,
+       0,     3,     4,     0,     0,     0,     0,   169,   170,   171,
+     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+     182,   183,   240,   241,     0,     0,     0,    69,     0,     0,
+      62,    63,     0,   102,   148,   149,   150,    68,     0,     1,
+       2,     0,     3,     4,     0,     0,     0,     0,     0,   242,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,     0,   243,     0,   244,   245,   246,    69,    62,
+      63,     0,   102,   148,   149,   150,    68,     0,     1,     2,
+       0,     3,     4,     0,   357,    62,    63,     0,   143,    65,
+      66,    67,    68,     0,     1,     2,     0,     3,     4,    62,
+      63,     0,   102,   148,   149,   150,    68,    69,     1,     2,
+       0,     3,     4,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    70,    69,     0,    71,     0,     0,    72,     0,
+      73,   136,     0,     0,     0,     0,     0,    69,     0,    62,
+      63,     0,   102,    65,    66,    67,    68,     0,     1,     2,
+       0,     3,     4,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    70,     0,     0,    71,   414,     0,    72,
+       0,    73,   339,     0,     0,    62,    63,    69,   102,    65,
+      66,    67,    68,     0,     1,     2,     0,     3,     4,     0,
+       0,     0,     0,     0,     0,   144,     0,     0,     0,     0,
+       0,     0,    70,   499,     0,    71,     0,     0,    72,     0,
+      73,   402,     0,    69,     0,     0,     0,     0,    70,     0,
+       0,    71,     0,     0,    72,     0,    73,     0,     0,     0,
+       0,     0,    70,     0,     0,    71,     0,   334,    72,     0,
+      73,    62,    63,     0,    64,    65,    66,    67,    68,     0,
+       1,     2,     0,     3,     4,    62,    63,     0,   102,   148,
+     149,   150,    68,     0,     1,     2,     0,     3,     4,     0,
+       0,     0,    70,     0,     0,    71,     0,     0,    72,    69,
+      73,     0,    62,    63,     0,   143,    65,    66,    67,    68,
+       0,     1,     2,    69,     3,     4,     0,    62,    63,     0,
+     102,    65,    66,    67,    68,     0,     1,     2,    70,     3,
+       4,    71,     0,     0,    72,     0,    73,     0,    62,    63,
+      69,   259,    65,    66,    67,    68,     0,     1,     2,     0,
+       3,     4,     0,    62,    63,    69,   102,   148,   149,   150,
+      68,     0,     1,     2,     0,     3,     4,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    69,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    69,     0,     0,    70,     0,     0,    71,     0,     0,
+      72,     0,    73,     0,     0,     0,     0,     0,    70,     0,
+       0,    71,     0,     0,    72,     0,    73,     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,   159,     0,     0,     0,     0,     0,     0,
-       0,    69,     0,     0,    70,     0,     0,    71,     0,    72,
-       0,     0,   160,   161,     0,    69,     0,     0,    70,     0,
-       0,    71,     0,   336,   162,   163,   164,   165,   166,   167,
+       0,     0,     0,     0,     0,    70,     0,     0,    71,     0,
+       0,    72,     0,    73,     0,     0,     0,     0,     0,     0,
+      70,     0,     0,    71,     0,     0,    72,     0,    73,     0,
+       0,     0,     0,     0,   160,     0,     0,     0,     0,     0,
+       0,    70,     0,     0,    71,     0,     0,    72,     0,    73,
+       0,     0,     0,   161,   162,     0,    70,     0,     0,    71,
+       0,     0,    72,     0,   337,   163,   164,   165,   166,   167,
      168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,     0,     0,     0,
+     178,   179,   180,   181,   182,   183,   184,   185,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   185,   186,   187,
-       0,     0,   188,   189,   190,   191,   192,   193,   194,   195,
+       0,     0,     0,     0,     0,     0,     0,     0,   186,   187,
+     188,     0,     0,   189,   190,   191,   192,   193,   194,   195,
      196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
-     206
+     206,   207
 };
 
-static const short yycheck[] =
+static const yytype_int16 yycheck[] =
 {
-       0,    26,   152,   164,   224,   414,   145,   121,    11,     0,
-       4,   318,   295,   152,    11,   322,    16,    24,   165,   187,
-      18,   247,   248,    11,   137,    16,   136,    25,    48,    16,
-      11,    30,    19,   146,   202,   203,   204,   205,   206,   323,
-     324,   209,    62,     3,     4,     5,     6,    72,   137,   138,
-       0,   140,    38,    39,    40,    41,    42,    43,    44,    30,
-      46,    49,    22,    23,   211,    15,    16,    17,    49,    19,
-      20,    96,   136,   113,   114,   100,    26,    27,    49,   550,
-     137,   106,    38,    39,   141,   114,   111,    87,   137,    45,
-     499,   131,   132,   564,   137,    51,   121,    47,    16,   148,
-      50,    19,   137,    17,    54,   148,    20,   137,   133,   134,
-     336,   140,   137,   148,   113,   114,   141,    34,   148,    42,
-     259,    44,   261,   262,   533,   264,   113,   114,   412,   137,
-     356,   130,   131,   132,   133,   137,   137,   162,   146,   141,
-     147,   144,   310,   144,   131,   132,    53,   144,   134,   135,
-     148,   265,   137,   147,   113,   114,   565,   440,   297,   144,
-     185,   186,   187,   188,   155,   137,   305,   306,    31,   141,
-      33,   130,   131,   132,   133,    15,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,     0,   469,   138,   471,   140,
-     134,   135,   217,   500,   308,   146,   113,   114,    11,    22,
-      23,    14,   227,     0,   136,   138,   374,   140,   376,   377,
-     378,   144,   136,   130,   131,   132,   133,   136,    15,    16,
-      17,   142,    19,    20,    19,   364,   365,   366,    18,    26,
-      27,   109,   110,   372,   517,    28,    29,    38,    39,    40,
-     265,   461,    43,   382,   383,   137,   138,   554,   140,   556,
-      47,   276,   402,    50,   138,    19,   140,    54,   142,     3,
-       4,     5,     6,   402,   138,    19,   140,   141,   293,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   308,   309,   310,   425,   138,   427,   140,
-     141,   430,   138,    38,   140,    40,    19,   436,   437,   328,
-     329,   330,   331,   332,   472,   107,   108,   475,   476,   477,
-     140,   336,   341,   342,   343,   535,    78,    79,   538,     4,
-      33,   346,     4,     7,     8,   464,   465,   143,   467,   468,
-       4,   143,    16,    17,   473,    19,    20,    56,    57,    58,
-      59,    60,    61,    19,   483,   137,   146,   141,     9,   374,
-     375,   376,   377,   378,   141,   140,   381,   261,   262,     9,
-     264,     9,    51,   392,   393,   504,   391,    11,   146,   140,
-     399,   532,   140,   512,   140,     7,     8,   140,    10,    11,
-      12,    13,    14,   140,    16,    17,    19,    19,    20,   140,
-     551,   140,   140,   297,   137,    34,   137,   137,   140,   137,
-     137,   305,   306,   137,   137,    34,    55,   142,   140,   548,
-     140,   137,   137,    45,   553,   137,   441,   446,   447,   448,
-     449,   137,   137,   137,   453,   454,   137,   137,   137,   146,
-     455,   570,   571,   137,   137,   460,   575,    34,    19,   578,
-       4,   466,   137,   141,    19,    14,    14,   472,   140,   137,
-     475,   476,   477,     4,   137,   480,   485,   486,   137,   459,
-     364,   365,   366,   140,   137,   137,   137,   137,   372,   137,
-     137,   137,   137,   137,   137,    49,    19,   146,   382,   383,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-     141,   520,   137,   522,   523,   137,   142,   137,   141,    49,
-     141,    14,     4,   137,   141,   141,   144,   139,    14,   534,
-     142,    14,   137,   145,   144,   147,   148,   141,   141,   141,
-      14,   425,    67,   427,    14,   124,   430,   527,   124,   124,
-      87,   239,   436,   437,   240,   527,   500,   217,   100,   106,
-     227,    16,    84,    54,   480,   394,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     464,   465,    -1,   467,   468,    -1,    -1,    -1,    -1,   473,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   483,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       0,    26,   165,   153,    18,   225,   415,   146,     4,   122,
+       0,    25,    11,   319,   153,   296,    16,   323,    24,   137,
+     188,   138,    11,   166,   138,    11,    16,   324,   325,   137,
+       0,   145,   149,   113,   114,   203,   204,   205,   206,   207,
+     248,   249,   210,    11,    48,    15,    16,    17,    73,    19,
+      20,   131,   132,   138,    28,    29,    26,    27,    62,    30,
+     145,     7,     8,    49,    10,    11,    12,    13,    14,   212,
+      16,    17,    97,    19,    20,   138,   101,    47,    49,   142,
+      50,    49,   107,   138,    54,    15,   115,   112,    88,    35,
+      16,   500,   551,    19,   149,     7,     8,   122,    53,    45,
+       3,     4,     5,     6,    16,    17,   565,    19,    20,   134,
+     135,   138,   141,   138,   138,    30,   413,   142,   142,    22,
+      23,   260,   149,   262,   263,   534,   265,     7,     8,   337,
+      10,    11,    12,    13,    14,   149,    16,    17,   163,    19,
+      20,   138,   148,   311,   138,   138,   145,   138,   142,   357,
+     147,     0,   148,   266,   147,    35,   145,   566,   149,   298,
+     441,   186,   187,   188,   189,    45,   156,   306,   307,    19,
+     139,    16,   141,   137,    19,    34,   145,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   137,   113,   114,   470,
+      42,   472,    44,   218,   140,   501,   309,   143,   113,   114,
+     146,    17,   148,   228,    20,   131,   132,   375,   137,   377,
+     378,   379,   113,   114,    18,   130,   131,   132,   133,    56,
+      57,    58,    59,    60,    61,   143,   365,   366,   367,   130,
+     131,   132,   133,   139,   373,   141,   142,   518,    38,    39,
+      40,   266,   462,    43,   383,   384,   109,   110,   139,   555,
+     141,   557,   277,   403,   113,   114,   147,   139,    19,   141,
+     140,   143,    11,   143,   403,    14,   146,    19,   148,   294,
+     141,   130,   131,   132,   133,    39,    40,     3,     4,     5,
+       6,    31,    46,    33,   309,   310,   311,   426,    52,   428,
+     138,   139,   431,   141,   138,   139,    19,   141,   437,   438,
+     329,   330,   331,   332,   333,   473,   108,   109,   476,   477,
+     478,     4,   337,   342,   343,   344,   536,     4,   139,   539,
+     141,   142,   347,   134,   135,   136,   465,   466,    33,   468,
+     469,   139,    38,   141,    40,   474,    79,    80,   144,   144,
+       4,    19,   138,   142,   147,   484,     9,   142,   141,     9,
+     375,   376,   377,   378,   379,     9,    51,   382,   262,   263,
+      11,   265,   147,   141,   393,   394,   505,   392,   141,   141,
+     533,   400,   141,   141,   513,     7,     8,    19,    10,    11,
+      12,    13,    14,   141,    16,    17,   141,    19,    20,   552,
+     141,   138,   138,   141,   298,    34,   138,   138,   138,   138,
+     138,    34,   306,   307,   141,   141,    55,   138,   138,   143,
+     549,   138,   147,    45,   138,   554,   138,   442,   447,   448,
+     449,   450,   138,   138,   138,   454,   455,   138,   138,   138,
+      34,   456,   571,   572,    19,     4,   461,   576,   138,   142,
+     579,    19,   467,    14,    14,   141,   138,   138,   473,     4,
+     138,   476,   477,   478,   138,   138,   481,   486,   487,   138,
+     460,   365,   366,   367,   138,    22,    23,   138,   141,   373,
+      38,    39,    40,    41,    42,    43,    44,   138,    46,   383,
+     384,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,   138,   521,   138,   523,   524,    49,   147,   138,   142,
+     138,   138,   138,    19,   138,    49,    14,   142,   140,     4,
+     535,   143,   142,   142,   146,   143,   148,   149,   145,   142,
+     145,   142,   426,   142,   428,   142,   138,   431,   528,    14,
+      14,   138,    14,   437,   438,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,    67,
+      14,   125,   125,   125,   240,   528,   241,    88,     0,   501,
+     218,   465,   466,   228,   468,   469,   134,   135,   136,   107,
+     474,   101,    16,    15,    16,    17,    85,    19,    20,    55,
+     484,   481,   395,    -1,    26,    27,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     504,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   512,     3,
-       4,    -1,    -1,     7,     8,     9,    -1,    -1,    -1,    -1,
-      -1,    -1,    16,    17,    -1,    19,    20,    21,    22,    23,
+      -1,   505,    -1,    -1,    -1,    47,    -1,    -1,    50,   513,
+       3,     4,    54,    -1,     7,     8,     9,    -1,    -1,    -1,
+      -1,    -1,    -1,    16,    17,    -1,    19,    20,    21,    22,
+      23,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    36,    37,   549,    -1,    -1,    -1,    -1,
+     554,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      53,    -1,    -1,    -1,    -1,    -1,    -1,   571,   572,    -1,
+      -1,    -1,   576,    -1,    -1,   579,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    36,    37,   548,    -1,    -1,    -1,    -1,   553,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,
-      -1,    -1,    -1,    -1,    -1,    -1,   570,   571,    -1,    -1,
-      -1,   575,    -1,    -1,   578,    69,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,     7,     8,    -1,    10,    11,    12,    13,    14,
-      -1,    16,    17,    -1,    19,    20,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-      45,   125,    -1,   127,   128,   129,     3,     4,    -1,    -1,
-       7,     8,     9,    -1,   138,    -1,   140,    -1,    -1,    16,
-      17,   145,    19,    20,    21,    22,    23,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    36,
-      37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     7,     8,    53,    10,    11,    12,
-      13,    14,    -1,    16,    17,    -1,    19,    20,    -1,    -1,
-      -1,    -1,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    -1,
-      -1,    -1,    45,    -1,   139,    -1,    -1,   142,    -1,    -1,
-     145,    -1,   147,   148,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,    -1,   125,    -1,
-     127,   128,   129,     7,     8,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    16,    17,    -1,    19,    20,    21,   145,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    36,    37,   117,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     7,     8,    -1,    10,    11,
-      12,    13,    14,    -1,    16,    17,   139,    19,    20,   142,
-      -1,    -1,   145,    -1,   147,    69,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    45,     7,     8,    -1,    10,    11,    12,
-      13,    14,    -1,    16,    17,    -1,    19,    20,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-      -1,   125,    45,   127,   128,   129,    -1,    -1,    -1,     3,
-       4,    -1,    -1,    -1,   138,     9,   140,    -1,   142,    -1,
-      -1,   145,    -1,   147,    -1,   149,    -1,    21,    22,    23,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    36,    37,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   139,    -1,    53,
-     142,    -1,    -1,   145,    -1,   147,   148,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    69,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    -1,    -1,    -1,    -1,   139,    -1,    -1,   142,
-      -1,    -1,   145,    -1,   147,   148,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-      -1,   125,    -1,   127,   128,   129,     7,     8,    -1,    10,
-      11,    12,    13,    14,    -1,    16,    17,    -1,    19,    20,
-      -1,   145,    -1,     7,     8,    -1,    10,    11,    12,    13,
-      14,    -1,    16,    17,    35,    19,    20,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    45,    -1,    -1,    -1,    -1,    -1,
-      -1,    35,    -1,     7,     8,    -1,    10,    11,    12,    13,
-      14,    45,    16,    17,    -1,    19,    20,     7,     8,    -1,
-      10,    11,    12,    13,    14,    -1,    16,    17,    -1,    19,
-      20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    45,    -1,    -1,    -1,    35,    -1,     7,     8,    -1,
-      10,    11,    12,    13,    14,    45,    16,    17,    -1,    19,
-      20,     7,     8,    -1,    10,    11,    12,    13,    14,    -1,
-      16,    17,    -1,    19,    20,    35,    -1,     7,     8,    -1,
-      10,    11,    12,    13,    14,    45,    16,    17,   139,    19,
-      20,   142,    -1,    -1,   145,    -1,   147,    -1,    -1,    45,
-      -1,    -1,    -1,    -1,    -1,   139,    -1,    -1,   142,    -1,
-      -1,   145,    -1,   147,    -1,    45,     7,     8,    -1,    10,
-      11,    12,    13,    14,    -1,    16,    17,    -1,    19,    20,
-      -1,    -1,    -1,    -1,    -1,   139,    -1,    -1,   142,    -1,
-     144,   145,    -1,   147,    -1,    -1,    -1,    -1,    -1,   139,
-      -1,    -1,   142,    -1,    45,   145,    -1,   147,    -1,     7,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
+     123,    -1,   125,    -1,   127,   128,   129,    -1,     3,     4,
+      -1,    -1,     7,     8,     9,    -1,   139,    -1,   141,    -1,
+      -1,    16,    17,   146,    19,    20,    21,    22,    23,    -1,
+      -1,    -1,    -1,    -1,     7,     8,    -1,    -1,    -1,    -1,
+      -1,    36,    37,    16,    17,    -1,    19,    20,    21,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,
+      -1,    -1,    -1,    36,    37,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    -1,    -1,    -1,    -1,    -1,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    -1,    -1,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,    -1,
+     125,    -1,   127,   128,   129,    -1,    -1,    -1,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
+     123,   146,   125,    -1,   127,   128,   129,    -1,    -1,    -1,
+      -1,     3,     4,    -1,    -1,    -1,   139,     9,   141,    -1,
+     143,    -1,    -1,   146,    -1,   148,    -1,   150,    -1,    21,
+      22,    23,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    36,    37,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,
+       8,    53,    10,    11,    12,    13,    14,    -1,    16,    17,
+      -1,    19,    20,    -1,    -1,    -1,    -1,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    -1,    -1,    -1,    45,    -1,    -1,
+       7,     8,    -1,    10,    11,    12,    13,    14,    -1,    16,
+      17,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
+     122,   123,    -1,   125,    -1,   127,   128,   129,    45,     7,
        8,    -1,    10,    11,    12,    13,    14,    -1,    16,    17,
-      -1,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,   139,
-      -1,    -1,   142,    -1,    -1,   145,    -1,   147,    -1,    -1,
-      -1,    -1,    -1,   139,    -1,    -1,   142,    45,    -1,   145,
-      -1,   147,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   139,
-      -1,    -1,   142,    -1,    -1,   145,    -1,   147,    -1,     7,
+      -1,    19,    20,    -1,   146,     7,     8,    -1,    10,    11,
+      12,    13,    14,    -1,    16,    17,    -1,    19,    20,     7,
+       8,    -1,    10,    11,    12,    13,    14,    45,    16,    17,
+      -1,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   140,    45,    -1,   143,    -1,    -1,   146,    -1,
+     148,   149,    -1,    -1,    -1,    -1,    -1,    45,    -1,     7,
        8,    -1,    10,    11,    12,    13,    14,    -1,    16,    17,
-      -1,    19,    20,     7,     8,    -1,    10,    11,    12,    13,
-      14,    -1,    16,    17,    -1,    19,    20,    -1,   139,    -1,
-      -1,   142,    -1,    -1,   145,    -1,   147,    45,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    45,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   139,    -1,    -1,   142,    -1,    -1,   145,    -1,   147,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   140,    -1,    -1,   143,    35,    -1,   146,
+      -1,   148,   149,    -1,    -1,     7,     8,    45,    10,    11,
+      12,    13,    14,    -1,    16,    17,    -1,    19,    20,    -1,
+      -1,    -1,    -1,    -1,    -1,   117,    -1,    -1,    -1,    -1,
+      -1,    -1,   140,    35,    -1,   143,    -1,    -1,   146,    -1,
+     148,   149,    -1,    45,    -1,    -1,    -1,    -1,   140,    -1,
+      -1,   143,    -1,    -1,   146,    -1,   148,    -1,    -1,    -1,
+      -1,    -1,   140,    -1,    -1,   143,    -1,   145,   146,    -1,
+     148,     7,     8,    -1,    10,    11,    12,    13,    14,    -1,
+      16,    17,    -1,    19,    20,     7,     8,    -1,    10,    11,
+      12,    13,    14,    -1,    16,    17,    -1,    19,    20,    -1,
+      -1,    -1,   140,    -1,    -1,   143,    -1,    -1,   146,    45,
+     148,    -1,     7,     8,    -1,    10,    11,    12,    13,    14,
+      -1,    16,    17,    45,    19,    20,    -1,     7,     8,    -1,
+      10,    11,    12,    13,    14,    -1,    16,    17,   140,    19,
+      20,   143,    -1,    -1,   146,    -1,   148,    -1,     7,     8,
+      45,    10,    11,    12,    13,    14,    -1,    16,    17,    -1,
+      19,    20,    -1,     7,     8,    45,    10,    11,    12,    13,
+      14,    -1,    16,    17,    -1,    19,    20,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    45,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    45,    -1,    -1,   140,    -1,    -1,   143,    -1,    -1,
+     146,    -1,   148,    -1,    -1,    -1,    -1,    -1,   140,    -1,
+      -1,   143,    -1,    -1,   146,    -1,   148,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   140,    -1,    -1,   143,    -1,
+      -1,   146,    -1,   148,    -1,    -1,    -1,    -1,    -1,    -1,
+     140,    -1,    -1,   143,    -1,    -1,   146,    -1,   148,    -1,
+      -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,
+      -1,   140,    -1,    -1,   143,    -1,    -1,   146,    -1,   148,
+      -1,    -1,    -1,    51,    52,    -1,   140,    -1,    -1,   143,
+      -1,    -1,   146,    -1,   148,    63,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   139,    -1,    -1,   142,    -1,    -1,   145,    -1,   147,
-      -1,    -1,    51,    52,    -1,   139,    -1,    -1,   142,    -1,
-      -1,   145,    -1,   147,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   106,   107,   108,
-      -1,    -1,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   106,   107,
+     108,    -1,    -1,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
+static const yytype_uint8 yystos[] =
 {
        0,    16,    17,    19,    20,    26,    27,    47,    50,    54,
-     158,   160,   161,   162,   163,   194,   195,   196,   198,   197,
-      48,    62,   203,   136,    53,   136,    15,   136,    38,    39,
-      40,    41,    42,    43,    44,    46,   134,   135,   164,   165,
-     166,     0,   196,    42,    44,   167,   213,    38,    39,    40,
-      43,   168,   210,   212,   219,   136,   136,   142,   204,    19,
-     202,     7,     8,    10,    11,    12,    13,    14,    45,   139,
-     142,   145,   147,   158,   161,   181,   182,   216,   166,   166,
-      31,    33,   192,   166,   166,    18,   220,   221,    25,   148,
-     211,   220,    19,    19,    19,   205,   140,     4,     4,     4,
-     147,    10,   148,   182,   187,   138,   140,   192,   192,    38,
-      40,   169,    28,    29,   191,    56,    57,    58,    59,    60,
-      61,   170,   208,   208,   160,   224,   137,   144,    35,   182,
-     183,   185,   186,   143,   143,   148,   187,   137,   148,   186,
-     191,   191,    10,   117,   182,   184,   193,    11,    12,    13,
-     156,   157,   182,   188,     4,   184,    24,   147,   209,    32,
-      51,    52,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,   106,   107,   108,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   129,   151,   152,   153,
-     222,   228,   229,   230,   231,    19,   172,   137,   141,   182,
-     182,   146,   148,   182,   141,   188,   182,   140,   216,    22,
-      23,     3,     4,     5,     6,     9,    21,    36,    37,    84,
-      85,   111,   125,   127,   128,   129,   142,   145,   147,   149,
-     151,   152,   153,   189,   216,   199,   161,    51,    10,   182,
-     218,    11,    14,    11,   156,   170,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    95,   154,    22,    23,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   155,   182,   182,   218,   182,   182,   225,
-     218,   218,   218,   218,   218,   182,   182,   218,   170,   109,
-     110,   113,   114,   131,   132,   171,    35,   183,   174,   144,
-     146,   146,   174,   200,   201,   193,   154,   155,   140,   140,
-     140,   140,   140,   144,   188,   190,   147,   190,   148,   190,
-      19,   140,   140,   140,   137,   179,   140,     3,     4,     9,
-      21,    22,    23,    36,    37,    53,   145,   189,   215,   216,
-     217,   217,   217,   217,   184,   182,   182,   137,   176,   137,
-     176,   217,   142,   137,   137,   137,   137,   137,   137,   217,
-     217,    34,   184,   182,   218,   130,   133,   171,   173,   179,
-     179,    34,   140,   140,   188,   188,   188,   188,   188,   137,
-     144,   148,   182,   190,   146,   148,   188,   188,   188,    30,
-      49,   177,   180,    35,   182,   206,   207,    55,   214,   190,
-     137,   137,   217,   217,   217,    11,    49,    11,   227,   217,
-     142,   218,   182,   218,   218,   218,   137,   137,   182,   217,
-     217,   137,   182,   188,   188,   227,   137,   137,   137,   137,
-     188,   146,   148,   137,   137,    34,    19,     4,   179,   172,
-     137,   141,    19,   146,    14,    14,   140,   137,   137,   217,
-       4,   217,   137,   137,   217,   137,   137,   137,   217,   217,
-     140,   137,   176,   182,   141,   137,   137,   141,   188,   188,
-     188,   188,   146,   188,   188,   182,   158,   159,    35,   182,
-     174,   137,   217,   217,   182,   226,   217,   217,   176,   176,
-     218,   217,   137,   218,   218,   218,   226,   217,   188,   188,
-     137,   141,   137,   137,   141,   141,   141,   172,   177,   178,
-      19,   137,   142,   217,   137,   141,   144,   217,   141,   176,
-     141,   141,   188,   188,   188,   159,    49,   175,    14,   144,
-     156,   223,   172,   182,   174,   144,   174,   141,   141,   141,
-       4,   217,   215,   144,   156,   217,    34,   137,   215,   172,
-      14,    14,   137,   217,   217,    14,    67,   217,    14,   217
+     159,   161,   162,   163,   164,   195,   196,   197,   199,   198,
+      48,    62,   204,   137,    53,   137,    15,   137,    38,    39,
+      40,    41,    42,    43,    44,    46,   134,   135,   136,   165,
+     166,   167,     0,   197,    42,    44,   168,   214,    38,    39,
+      40,    43,   169,   211,   213,   220,   137,   137,   143,   205,
+      19,   203,     7,     8,    10,    11,    12,    13,    14,    45,
+     140,   143,   146,   148,   159,   162,   182,   183,   217,   167,
+     167,    31,    33,   193,   167,   167,    18,   221,   222,    25,
+     149,   212,   221,    19,    19,    19,   206,   141,     4,     4,
+       4,   148,    10,   149,   183,   188,   139,   141,   193,   193,
+      38,    40,   170,    28,    29,   192,    56,    57,    58,    59,
+      60,    61,   171,   209,   209,   161,   225,   138,   145,    35,
+     183,   184,   186,   187,   144,   144,   149,   188,   138,   149,
+     187,   192,   192,    10,   117,   183,   185,   194,    11,    12,
+      13,   157,   158,   183,   189,     4,   185,    24,   148,   210,
+      32,    51,    52,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,   106,   107,   108,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
+     122,   123,   124,   125,   126,   127,   128,   129,   152,   153,
+     154,   223,   229,   230,   231,   232,    19,   173,   138,   142,
+     183,   183,   147,   149,   183,   142,   189,   183,   141,   217,
+      22,    23,     3,     4,     5,     6,     9,    21,    36,    37,
+      84,    85,   111,   125,   127,   128,   129,   143,   146,   148,
+     150,   152,   153,   154,   190,   217,   200,   162,    51,    10,
+     183,   219,    11,    14,    11,   157,   171,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    95,   155,    22,    23,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   156,   183,   183,   219,   183,   183,
+     226,   219,   219,   219,   219,   219,   183,   183,   219,   171,
+     109,   110,   113,   114,   131,   132,   172,    35,   184,   175,
+     145,   147,   147,   175,   201,   202,   194,   155,   156,   141,
+     141,   141,   141,   141,   145,   189,   191,   148,   191,   149,
+     191,    19,   141,   141,   141,   138,   180,   141,     3,     4,
+       9,    21,    22,    23,    36,    37,    53,   146,   190,   216,
+     217,   218,   218,   218,   218,   185,   183,   183,   138,   177,
+     138,   177,   218,   143,   138,   138,   138,   138,   138,   138,
+     218,   218,    34,   185,   183,   219,   130,   133,   172,   174,
+     180,   180,    34,   141,   141,   189,   189,   189,   189,   189,
+     138,   145,   149,   183,   191,   147,   149,   189,   189,   189,
+      30,    49,   178,   181,    35,   183,   207,   208,    55,   215,
+     191,   138,   138,   218,   218,   218,    11,    49,    11,   228,
+     218,   143,   219,   183,   219,   219,   219,   138,   138,   183,
+     218,   218,   138,   183,   189,   189,   228,   138,   138,   138,
+     138,   189,   147,   149,   138,   138,    34,    19,     4,   180,
+     173,   138,   142,    19,   147,    14,    14,   141,   138,   138,
+     218,     4,   218,   138,   138,   218,   138,   138,   138,   218,
+     218,   141,   138,   177,   183,   142,   138,   138,   142,   189,
+     189,   189,   189,   147,   189,   189,   183,   159,   160,    35,
+     183,   175,   138,   218,   218,   183,   227,   218,   218,   177,
+     177,   219,   218,   138,   219,   219,   219,   227,   218,   189,
+     189,   138,   142,   138,   138,   142,   142,   142,   173,   178,
+     179,    19,   138,   143,   218,   138,   142,   145,   218,   142,
+     177,   142,   142,   189,   189,   189,   160,    49,   176,    14,
+     145,   157,   224,   173,   183,   175,   145,   175,   142,   142,
+     142,     4,   218,   216,   145,   157,   218,    34,   138,   216,
+     173,    14,    14,   138,   218,   218,    14,    67,   218,    14,
+     218
 };
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
 #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
+#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.
@@ -2427,34 +2529,71 @@
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
+      yytoken = YYTRANSLATE (yychar);				\
+      YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");			\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
-while (0)
+while (YYID (0))
+
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
 
+/* 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)           \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
+# 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
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
 
+
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
-#define YYLEX	yylex ()
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -2468,20 +2607,155 @@
 do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
-} while (0)
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} while (0)
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (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, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#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");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)				\
+do {								\
+  if (yydebug)							\
+    yy_stack_print ((Bottom), (Top));				\
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| 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 YYDSYMPRINT(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
 
+
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
 # define YYINITDEPTH 200
@@ -2491,13 +2765,9 @@
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
@@ -2507,45 +2777,47 @@
 #if YYERROR_VERBOSE
 
 # ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
+#  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
-#   if defined (__STDC__) || defined (__cplusplus)
 yystrlen (const char *yystr)
-#   else
+#else
+static YYSIZE_T
 yystrlen (yystr)
-     const char *yystr;
-#   endif
+    const char *yystr;
+#endif
 {
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
     continue;
-
-  return yys - yystr - 1;
+  return yylen;
 }
 #  endif
 # endif
 
 # ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#  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 *
-#   if defined (__STDC__) || defined (__cplusplus)
 yystpcpy (char *yydest, const char *yysrc)
-#   else
+#else
+static char *
 yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
+    char *yydest;
+    const char *yysrc;
+#endif
 {
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -2555,124 +2827,265 @@
 #  endif
 # endif
 
-#endif /* !YYERROR_VERBOSE */
+# 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: ;
+    }
 
-
+  if (! yyres)
+    return yystrlen (yystr);
 
-#if YYDEBUG
-/*-----------------------------.
-| Print this symbol on YYOUT.  |
-`-----------------------------*/
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
 
-static void
-#if defined (__STDC__) || defined (__cplusplus)
-yysymprint (FILE* yyout, int yytype, YYSTYPE yyvalue)
-#else
-yysymprint (yyout, yytype, yyvalue)
-    FILE* yyout;
-    int yytype;
-    YYSTYPE yyvalue;
-#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)
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvalue;
+  int yyn = yypact[yystate];
 
-  if (yytype < YYNTOKENS)
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
     {
-      YYFPRINTF (yyout, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyout, yytoknum[yytype], yyvalue);
+      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
-    }
-  else
-    YYFPRINTF (yyout, "nterm %s (", yytname[yytype]);
+      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;
 
-  switch (yytype)
-    {
-      default:
-        break;
+      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;
     }
-  YYFPRINTF (yyout, ")");
 }
-#endif /* YYDEBUG. */
-
+#endif /* YYERROR_VERBOSE */
+
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-#if defined (__STDC__) || defined (__cplusplus)
-yydestruct (int yytype, YYSTYPE yyvalue)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
-yydestruct (yytype, yyvalue)
+static void
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
     int yytype;
-    YYSTYPE yyvalue;
+    YYSTYPE *yyvaluep;
 #endif
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvalue;
+  YYUSE (yyvaluep);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
   switch (yytype)
     {
+
       default:
-        break;
+	break;
     }
 }
-
 
 
-/* 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
-# if defined (__STDC__) || defined (__cplusplus)
-#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL
-# else
-#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-# endif
-#else /* !YYPARSE_PARAM */
-# define YYPARSE_PARAM_ARG
-# define YYPARSE_PARAM_DECL
-#endif /* !YYPARSE_PARAM */
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-# ifdef YYPARSE_PARAM
-int yyparse (void *);
-# else
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void);
-# endif
+#else
+int yyparse ();
 #endif
+#endif /* ! YYPARSE_PARAM */
 
 
-/* The lookahead symbol.  */
+
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
-/* Number of parse errors so far.  */
+/* Number of syntax errors so far.  */
 int yynerrs;
 
 
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 int
-yyparse (YYPARSE_PARAM_ARG)
-     YYPARSE_PARAM_DECL
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
 {
   
-  register int yystate;
-  register int yyn;
+  int yystate;
+  int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yychar1 = 0;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -2683,18 +3096,18 @@
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;
 
 
 
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
@@ -2703,9 +3116,9 @@
   YYSTYPE yyval;
 
 
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
-  int yylen;
+  /* 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"));
 
@@ -2729,32 +3142,31 @@
 `------------------------------------------------------------*/
  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.
-     */
+     have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
  yysetstate:
   *yyssp = yystate;
 
-  if (yyssp >= yyss + yystacksize - 1)
+  if (yyss + yystacksize - 1 <= yyssp)
     {
       /* Get the current used size of the three stacks, in elements.  */
       YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack. Use copies of
+	/* 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;
+	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 ("parser stack overflow",
+	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
 
@@ -2765,21 +3177,21 @@
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
+      goto yyexhaustedlab;
 # else
       /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	goto yyoverflowlab;
+      if (YYMAXDEPTH <= yystacksize)
+	goto yyexhaustedlab;
       yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
+      if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyoverflowlab;
+	  goto yyexhaustedlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
 
@@ -2797,7 +3209,7 @@
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
 
-      if (yyssp >= yyss + yystacksize - 1)
+      if (yyss + yystacksize - 1 <= yyssp)
 	YYABORT;
     }
 
@@ -2810,51 +3222,38 @@
 `-----------*/
 yybackup:
 
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* 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 == 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)
     {
       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.  */
-
+      yychar = yytoken = YYEOF;
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yychar1 = YYTRANSLATE (yychar);
-
-      /* We have to keep this `#if YYDEBUG', since we use variables
-	 which are defined only if `YYDEBUG' is set.  */
-      YYDPRINTF ((stderr, "Next token is "));
-      YYDSYMPRINT ((stderr, yychar1, yylval));
-      YYDPRINTF ((stderr, "\n"));
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
-  /* If the proper action on seeing token YYCHAR1 is to reduce or to
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
      detect an error, take that action.  */
-  yyn += yychar1;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yychar1)
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
     goto yydefault;
   yyn = yytable[yyn];
   if (yyn <= 0)
@@ -2868,24 +3267,22 @@
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
-	      yychar, yytname[yychar1]));
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* 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;
 
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
+  goto yynewstate;
 
 
 /*-----------------------------------------------------------.
@@ -2916,535 +3313,524 @@
   yyval = yyvsp[1-yylen];
 
 
-
-#if YYDEBUG
-  /* We have to keep this `#if YYDEBUG', since we use variables which
-     are defined only if `YYDEBUG' is set.  */
-  if (yydebug)
-    {
-      int yyi;
-
-      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-		 yyn - 1, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (yyi = yyprhs[yyn]; yyrhs[yyi] >= 0; yyi++)
-	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
+  YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
         case 29:
-#line 1117 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.IPredicate = ICmpInst::ICMP_EQ; }
+#line 1117 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 30:
-#line 1117 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.IPredicate = ICmpInst::ICMP_NE; }
+#line 1117 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 31:
-#line 1118 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.IPredicate = ICmpInst::ICMP_SLT; }
+#line 1118 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 32:
-#line 1118 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.IPredicate = ICmpInst::ICMP_SGT; }
+#line 1118 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 33:
-#line 1119 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.IPredicate = ICmpInst::ICMP_SLE; }
+#line 1119 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 34:
-#line 1119 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.IPredicate = ICmpInst::ICMP_SGE; }
+#line 1119 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 35:
-#line 1120 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.IPredicate = ICmpInst::ICMP_ULT; }
+#line 1120 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 36:
-#line 1120 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.IPredicate = ICmpInst::ICMP_UGT; }
+#line 1120 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 37:
-#line 1121 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.IPredicate = ICmpInst::ICMP_ULE; }
+#line 1121 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 38:
-#line 1121 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.IPredicate = ICmpInst::ICMP_UGE; }
+#line 1121 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 39:
-#line 1125 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_OEQ; }
+#line 1125 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 40:
-#line 1125 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_ONE; }
+#line 1125 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 41:
-#line 1126 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_OLT; }
+#line 1126 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 42:
-#line 1126 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_OGT; }
+#line 1126 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 43:
-#line 1127 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_OLE; }
+#line 1127 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 44:
-#line 1127 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_OGE; }
+#line 1127 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 45:
-#line 1128 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_ORD; }
+#line 1128 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 46:
-#line 1128 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_UNO; }
+#line 1128 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 47:
-#line 1129 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_UEQ; }
+#line 1129 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 48:
-#line 1129 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_UNE; }
+#line 1129 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 49:
-#line 1130 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_ULT; }
+#line 1130 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 50:
-#line 1130 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_UGT; }
+#line 1130 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 51:
-#line 1131 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_ULE; }
+#line 1131 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 52:
-#line 1131 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_UGE; }
+#line 1131 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 53:
-#line 1132 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_TRUE; }
+#line 1132 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 54:
-#line 1133 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.FPredicate = FCmpInst::FCMP_FALSE; }
+#line 1133 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 61:
-#line 1142 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.StrVal = 0; }
+#line 1142 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = 0; ;}
     break;
 
   case 62:
-#line 1146 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1146 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.StrVal = yyvsp[-1].StrVal;
+    (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 63:
-#line 1150 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.StrVal = 0;
+    (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 67:
-#line 1158 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1158 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.StrVal = 0;
+    (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 68:
-#line 1163 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1163 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.StrVal = yyvsp[-1].StrVal;
+    (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 69:
-#line 1169 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::InternalLinkage; }
+#line 1169 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 70:
-#line 1170 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::WeakLinkage; }
+#line 1170 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 71:
-#line 1171 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::LinkOnceLinkage; }
+#line 1171 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 72:
-#line 1172 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::AppendingLinkage; }
+#line 1172 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 73:
-#line 1173 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::DLLExportLinkage; }
+#line 1173 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 74:
-#line 1177 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::DLLImportLinkage; }
+#line 1177 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 75:
-#line 1178 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::ExternalWeakLinkage; }
+#line 1178 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 76:
-#line 1179 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::ExternalLinkage; }
+#line 1179 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 77:
-#line 1183 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Visibility = GlobalValue::DefaultVisibility; }
+#line 1183 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 78:
-#line 1184 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Visibility = GlobalValue::DefaultVisibility; }
+#line 1184 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::DefaultVisibility;   ;}
     break;
 
   case 79:
-#line 1185 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Visibility = GlobalValue::HiddenVisibility;  }
+#line 1185 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::HiddenVisibility;    ;}
     break;
 
   case 80:
-#line 1189 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::ExternalLinkage; }
+#line 1186 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Visibility) = GlobalValue::ProtectedVisibility; ;}
     break;
 
   case 81:
-#line 1190 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::DLLImportLinkage; }
+#line 1190 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 82:
-#line 1191 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::ExternalWeakLinkage; }
+#line 1191 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 83:
-#line 1195 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::ExternalLinkage; }
+#line 1192 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 84:
-#line 1196 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::InternalLinkage; }
+#line 1196 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 85:
-#line 1197 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::LinkOnceLinkage; }
+#line 1197 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 86:
-#line 1198 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::WeakLinkage; }
+#line 1198 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 87:
-#line 1199 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::DLLExportLinkage; }
+#line 1199 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 88:
-#line 1203 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::ExternalLinkage; }
+#line 1200 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 89:
-#line 1204 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::WeakLinkage; }
+#line 1204 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 90:
-#line 1205 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.Linkage = GlobalValue::InternalLinkage; }
+#line 1205 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 91:
-#line 1208 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.UIntVal = CallingConv::C; }
+#line 1206 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 92:
-#line 1209 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.UIntVal = CallingConv::C; }
+#line 1209 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 93:
-#line 1210 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.UIntVal = CallingConv::Fast; }
+#line 1210 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 94:
-#line 1211 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.UIntVal = CallingConv::Cold; }
+#line 1211 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 95:
-#line 1212 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.UIntVal = CallingConv::X86_StdCall; }
+#line 1212 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 96:
-#line 1213 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.UIntVal = CallingConv::X86_FastCall; }
+#line 1213 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 97:
-#line 1214 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-                   if ((unsigned)yyvsp[0].UInt64Val != yyvsp[0].UInt64Val)
-                     GEN_ERROR("Calling conv too large");
-                   yyval.UIntVal = yyvsp[0].UInt64Val;
-                  CHECK_FOR_ERROR
-                 }
+#line 1214 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 98:
-#line 1221 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.ParamAttrs = ParamAttr::ZExt;      }
+#line 1215 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {
+                   if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
+                     GEN_ERROR("Calling conv too large");
+                   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
+                  CHECK_FOR_ERROR
+                 ;}
     break;
 
   case 99:
-#line 1222 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.ParamAttrs = ParamAttr::SExt;      }
+#line 1222 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 100:
-#line 1223 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.ParamAttrs = ParamAttr::InReg;     }
+#line 1223 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 101:
-#line 1224 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.ParamAttrs = ParamAttr::StructRet; }
+#line 1224 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
     break;
 
   case 102:
-#line 1227 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.ParamAttrs = ParamAttr::None; }
+#line 1225 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::StructRet; ;}
     break;
 
   case 103:
-#line 1228 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-                yyval.ParamAttrs = yyvsp[-1].ParamAttrs | yyvsp[0].ParamAttrs;
-              }
+#line 1228 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 104:
-#line 1233 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.ParamAttrs = ParamAttr::NoReturn; }
+#line 1229 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {
+                (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
+              ;}
     break;
 
   case 105:
-#line 1234 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.ParamAttrs = ParamAttr::NoUnwind; }
+#line 1234 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;}
     break;
 
-  case 107:
-#line 1238 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.ParamAttrs = ParamAttr::None; }
+  case 106:
+#line 1235 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;}
     break;
 
   case 108:
-#line 1239 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-                yyval.ParamAttrs = yyvsp[-1].ParamAttrs | yyvsp[0].ParamAttrs;
-              }
+#line 1239 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 109:
-#line 1246 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.UIntVal = 0; }
+#line 1240 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {
+                (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
+              ;}
     break;
 
   case 110:
-#line 1247 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1247 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = 0; ;}
+    break;
+
+  case 111:
+#line 1248 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-  yyval.UIntVal = yyvsp[0].UInt64Val;
-  if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
+  (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
+  if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
     GEN_ERROR("Alignment must be a power of two");
   CHECK_FOR_ERROR
-}
+;}
     break;
 
-  case 111:
-#line 1253 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.UIntVal = 0; }
+  case 112:
+#line 1254 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 112:
-#line 1254 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 113:
+#line 1255 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-  yyval.UIntVal = yyvsp[0].UInt64Val;
-  if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
+  (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
+  if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
     GEN_ERROR("Alignment must be a power of two");
   CHECK_FOR_ERROR
-}
+;}
     break;
 
-  case 113:
-#line 1262 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 114:
+#line 1263 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-  for (unsigned i = 0, e = strlen(yyvsp[0].StrVal); i != e; ++i)
-    if (yyvsp[0].StrVal[i] == '"' || yyvsp[0].StrVal[i] == '\\')
+  for (unsigned i = 0, e = strlen((yyvsp[(2) - (2)].StrVal)); i != e; ++i)
+    if ((yyvsp[(2) - (2)].StrVal)[i] == '"' || (yyvsp[(2) - (2)].StrVal)[i] == '\\')
       GEN_ERROR("Invalid character in section name");
-  yyval.StrVal = yyvsp[0].StrVal;
+  (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
   CHECK_FOR_ERROR
-}
-    break;
-
-  case 114:
-#line 1270 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.StrVal = 0; }
+;}
     break;
 
   case 115:
-#line 1271 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.StrVal = yyvsp[0].StrVal; }
+#line 1271 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = 0; ;}
     break;
 
   case 116:
-#line 1276 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {}
+#line 1272 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
   case 117:
-#line 1277 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {}
+#line 1277 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {;}
     break;
 
   case 118:
-#line 1278 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurGV->setSection(yyvsp[0].StrVal);
-    free(yyvsp[0].StrVal);
-    CHECK_FOR_ERROR
-  }
+#line 1278 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {;}
     break;
 
   case 119:
-#line 1283 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1279 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (yyvsp[0].UInt64Val != 0 && !isPowerOf2_32(yyvsp[0].UInt64Val))
-      GEN_ERROR("Alignment must be a power of two");
-    CurGV->setAlignment(yyvsp[0].UInt64Val);
+    CurGV->setSection((yyvsp[(1) - (1)].StrVal));
+    free((yyvsp[(1) - (1)].StrVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 124:
-#line 1299 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 120:
+#line 1284 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.TypeVal = new PATypeHolder(OpaqueType::get());
+    if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val)))
+      GEN_ERROR("Alignment must be a power of two");
+    CurGV->setAlignment((yyvsp[(2) - (2)].UInt64Val));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 125:
-#line 1303 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1300 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType);
+    (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 126:
-#line 1307 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1304 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 127:
+#line 1308 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
-    if (*yyvsp[-1].TypeVal == Type::LabelTy)
+    if (*(yyvsp[(1) - (2)].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(PointerType::get(*yyvsp[-1].TypeVal)));
-    delete yyvsp[-1].TypeVal;
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(PointerType::get(*(yyvsp[(1) - (2)].TypeVal))));
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 127:
-#line 1314 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 128:
+#line 1315 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
-    const Type* tmp = getTypeVal(yyvsp[0].ValIDVal);
+    const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.TypeVal = new PATypeHolder(tmp);
-  }
+    (yyval.TypeVal) = new PATypeHolder(tmp);
+  ;}
     break;
 
-  case 128:
-#line 1319 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 129:
+#line 1320 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                   // Type UpReference
-    if (yyvsp[0].UInt64Val > (uint64_t)~0U) GEN_ERROR("Value out of range");
+    if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
-    UpRefs.push_back(UpRefRecord((unsigned)yyvsp[0].UInt64Val, OT));  // Add to vector...
-    yyval.TypeVal = new PATypeHolder(OT);
+    UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[(2) - (2)].UInt64Val), OT));  // Add to vector...
+    (yyval.TypeVal) = new PATypeHolder(OT);
     UR_OUT("New Upreference!\n");
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 129:
-#line 1327 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 130:
+#line 1328 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     ParamAttrsVector Attrs;
-    if (yyvsp[0].ParamAttrs != ParamAttr::None) {
-      ParamAttrsWithIndex X; X.index = 0; X.attrs = yyvsp[0].ParamAttrs;
+    if ((yyvsp[(5) - (5)].ParamAttrs) != ParamAttr::None) {
+      ParamAttrsWithIndex X; X.index = 0; X.attrs = (yyvsp[(5) - (5)].ParamAttrs);
       Attrs.push_back(X);
     }
     unsigned index = 1;
-    TypeWithAttrsList::iterator I = yyvsp[-2].TypeWithAttrsList->begin(), E = yyvsp[-2].TypeWithAttrsList->end();
+    TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end();
     for (; I != E; ++I, ++index) {
       const Type *Ty = I->Ty->get();
       Params.push_back(Ty);
@@ -3460,24 +3846,24 @@
     ParamAttrsList *ActualAttrs = 0;
     if (!Attrs.empty())
       ActualAttrs = ParamAttrsList::get(Attrs);
-    FunctionType *FT = FunctionType::get(*yyvsp[-4].TypeVal, Params, isVarArg, ActualAttrs);
-    delete yyvsp[-2].TypeWithAttrsList;   // Delete the argument list
-    delete yyvsp[-4].TypeVal;   // Delete the return type handle
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(FT)); 
+    FunctionType *FT = FunctionType::get(*(yyvsp[(1) - (5)].TypeVal), Params, isVarArg, ActualAttrs);
+    delete (yyvsp[(3) - (5)].TypeWithAttrsList);   // Delete the argument list
+    delete (yyvsp[(1) - (5)].TypeVal);   // Delete the return type handle
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); 
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 130:
-#line 1357 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 131:
+#line 1358 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     ParamAttrsVector Attrs;
-    if (yyvsp[0].ParamAttrs != ParamAttr::None) {
-      ParamAttrsWithIndex X; X.index = 0; X.attrs = yyvsp[0].ParamAttrs;
+    if ((yyvsp[(5) - (5)].ParamAttrs) != ParamAttr::None) {
+      ParamAttrsWithIndex X; X.index = 0; X.attrs = (yyvsp[(5) - (5)].ParamAttrs);
       Attrs.push_back(X);
     }
-    TypeWithAttrsList::iterator I = yyvsp[-2].TypeWithAttrsList->begin(), E = yyvsp[-2].TypeWithAttrsList->end();
+    TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end();
     unsigned index = 1;
     for ( ; I != E; ++I, ++index) {
       const Type* Ty = I->Ty->get();
@@ -3495,305 +3881,305 @@
     if (!Attrs.empty())
       ActualAttrs = ParamAttrsList::get(Attrs);
 
-    FunctionType *FT = FunctionType::get(yyvsp[-4].PrimType, Params, isVarArg, ActualAttrs);
-    delete yyvsp[-2].TypeWithAttrsList;      // Delete the argument list
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(FT)); 
+    FunctionType *FT = FunctionType::get((yyvsp[(1) - (5)].PrimType), Params, isVarArg, ActualAttrs);
+    delete (yyvsp[(3) - (5)].TypeWithAttrsList);      // Delete the argument list
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); 
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 131:
-#line 1388 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 132:
+#line 1389 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(ArrayType::get(*yyvsp[-1].TypeVal, (unsigned)yyvsp[-3].UInt64Val)));
-    delete yyvsp[-1].TypeVal;
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (unsigned)(yyvsp[(2) - (5)].UInt64Val))));
+    delete (yyvsp[(4) - (5)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 132:
-#line 1393 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 133:
+#line 1394 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {          // Vector type?
-     const llvm::Type* ElemTy = yyvsp[-1].TypeVal->get();
-     if ((unsigned)yyvsp[-3].UInt64Val != yyvsp[-3].UInt64Val)
+     const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal)->get();
+     if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val))
         GEN_ERROR("Unsigned result not equal to signed result");
      if (!ElemTy->isFloatingPoint() && !ElemTy->isInteger())
         GEN_ERROR("Element type of a VectorType must be primitive");
-     if (!isPowerOf2_32(yyvsp[-3].UInt64Val))
+     if (!isPowerOf2_32((yyvsp[(2) - (5)].UInt64Val)))
        GEN_ERROR("Vector length should be a power of 2");
-     yyval.TypeVal = new PATypeHolder(HandleUpRefs(VectorType::get(*yyvsp[-1].TypeVal, (unsigned)yyvsp[-3].UInt64Val)));
-     delete yyvsp[-1].TypeVal;
+     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(VectorType::get(*(yyvsp[(4) - (5)].TypeVal), (unsigned)(yyvsp[(2) - (5)].UInt64Val))));
+     delete (yyvsp[(4) - (5)].TypeVal);
      CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 133:
-#line 1405 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 134:
+#line 1406 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
-    for (std::list<llvm::PATypeHolder>::iterator I = yyvsp[-1].TypeList->begin(),
-           E = yyvsp[-1].TypeList->end(); I != E; ++I)
+    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
+           E = (yyvsp[(2) - (3)].TypeList)->end(); I != E; ++I)
       Elements.push_back(*I);
 
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
-    delete yyvsp[-1].TypeList;
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
+    delete (yyvsp[(2) - (3)].TypeList);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 134:
-#line 1415 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 135:
+#line 1416 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
-    yyval.TypeVal = new PATypeHolder(StructType::get(std::vector<const Type*>()));
+    (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 135:
-#line 1419 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 136:
+#line 1420 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
-    for (std::list<llvm::PATypeHolder>::iterator I = yyvsp[-2].TypeList->begin(),
-           E = yyvsp[-2].TypeList->end(); I != E; ++I)
+    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
+           E = (yyvsp[(3) - (5)].TypeList)->end(); I != E; ++I)
       Elements.push_back(*I);
 
-    yyval.TypeVal = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
-    delete yyvsp[-2].TypeList;
+    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
+    delete (yyvsp[(3) - (5)].TypeList);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 136:
-#line 1429 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 137:
+#line 1430 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
-    yyval.TypeVal = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
+    (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 137:
-#line 1436 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 138:
+#line 1437 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { 
-    yyval.TypeWithAttrs.Ty = yyvsp[-1].TypeVal; 
-    yyval.TypeWithAttrs.Attrs = yyvsp[0].ParamAttrs; 
-  }
+    (yyval.TypeWithAttrs).Ty = (yyvsp[(1) - (2)].TypeVal); 
+    (yyval.TypeWithAttrs).Attrs = (yyvsp[(2) - (2)].ParamAttrs); 
+  ;}
     break;
 
-  case 138:
-#line 1443 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 139:
+#line 1444 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
-    if (!(*yyvsp[0].TypeVal)->isFirstClassType())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription());
+    if (!(*(yyvsp[(1) - (1)].TypeVal))->isFirstClassType())
       GEN_ERROR("LLVM functions cannot return aggregate types");
-    yyval.TypeVal = yyvsp[0].TypeVal;
-  }
-    break;
-
-  case 139:
-#line 1450 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    yyval.TypeVal = new PATypeHolder(Type::VoidTy);
-  }
+    (yyval.TypeVal) = (yyvsp[(1) - (1)].TypeVal);
+  ;}
     break;
 
   case 140:
-#line 1455 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1451 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.TypeWithAttrsList = new TypeWithAttrsList();
-    yyval.TypeWithAttrsList->push_back(yyvsp[0].TypeWithAttrs);
-    CHECK_FOR_ERROR
-  }
+    (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
+  ;}
     break;
 
   case 141:
-#line 1460 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1456 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.TypeWithAttrsList=yyvsp[-2].TypeWithAttrsList)->push_back(yyvsp[0].TypeWithAttrs);
+    (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
+    (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 143:
-#line 1468 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 142:
+#line 1461 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.TypeWithAttrsList=yyvsp[-2].TypeWithAttrsList;
-    TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
-    TWA.Ty = new PATypeHolder(Type::VoidTy);
-    yyval.TypeWithAttrsList->push_back(TWA);
+    ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 144:
-#line 1475 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1469 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.TypeWithAttrsList = new TypeWithAttrsList;
+    (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
-    yyval.TypeWithAttrsList->push_back(TWA);
+    (yyval.TypeWithAttrsList)->push_back(TWA);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 145:
-#line 1482 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1476 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.TypeWithAttrsList = new TypeWithAttrsList();
+    (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
+    TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
+    TWA.Ty = new PATypeHolder(Type::VoidTy);
+    (yyval.TypeWithAttrsList)->push_back(TWA);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 146:
-#line 1490 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1483 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.TypeList = new std::list<PATypeHolder>();
-    yyval.TypeList->push_back(*yyvsp[0].TypeVal); 
-    delete yyvsp[0].TypeVal;
+    (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 147:
-#line 1496 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1491 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.TypeList=yyvsp[-2].TypeList)->push_back(*yyvsp[0].TypeVal); 
-    delete yyvsp[0].TypeVal;
+    (yyval.TypeList) = new std::list<PATypeHolder>();
+    (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); 
+    delete (yyvsp[(1) - (1)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 148:
-#line 1508 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1497 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {
+    ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); 
+    delete (yyvsp[(3) - (3)].TypeVal);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 149:
+#line 1509 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-3].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*yyvsp[-3].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'");
     const Type *ETy = ATy->getElementType();
     int NumElements = ATy->getNumElements();
 
     // Verify that we have the correct size...
-    if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size())
+    if (NumElements != -1 && NumElements != (int)(yyvsp[(3) - (4)].ConstVector)->size())
       GEN_ERROR("Type mismatch: constant sized array initialized with " +
-                     utostr(yyvsp[-1].ConstVector->size()) +  " arguments, but has size of " + 
+                     utostr((yyvsp[(3) - (4)].ConstVector)->size()) +  " arguments, but has size of " + 
                      itostr(NumElements) + "");
 
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
-      if (ETy != (*yyvsp[-1].ConstVector)[i]->getType())
+    for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) {
+      if (ETy != (*(yyvsp[(3) - (4)].ConstVector))[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
                        ETy->getDescription() +"' as required!\nIt is of type '"+
-                       (*yyvsp[-1].ConstVector)[i]->getType()->getDescription() + "'.");
+                       (*(yyvsp[(3) - (4)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
 
-    yyval.ConstVal = ConstantArray::get(ATy, *yyvsp[-1].ConstVector);
-    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
+    (yyval.ConstVal) = ConstantArray::get(ATy, *(yyvsp[(3) - (4)].ConstVector));
+    delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 149:
-#line 1536 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 150:
+#line 1537 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (3)].TypeVal)->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*yyvsp[-2].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'");
 
     int NumElements = ATy->getNumElements();
     if (NumElements != -1 && NumElements != 0) 
       GEN_ERROR("Type mismatch: constant sized array initialized with 0"
                      " arguments, but has size of " + itostr(NumElements) +"");
-    yyval.ConstVal = ConstantArray::get(ATy, std::vector<Constant*>());
-    delete yyvsp[-2].TypeVal;
+    (yyval.ConstVal) = ConstantArray::get(ATy, std::vector<Constant*>());
+    delete (yyvsp[(1) - (3)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 150:
-#line 1552 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 151:
+#line 1553 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (3)].TypeVal)->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*yyvsp[-2].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'");
 
     int NumElements = ATy->getNumElements();
     const Type *ETy = ATy->getElementType();
-    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)))
       GEN_ERROR("Can't build string constant of size " + 
-                     itostr((int)(EndStr-yyvsp[0].StrVal)) +
+                     itostr((int)(EndStr-(yyvsp[(3) - (3)].StrVal))) +
                      " when array has size " + itostr(NumElements) + "");
     std::vector<Constant*> Vals;
     if (ETy == Type::Int8Ty) {
-      for (unsigned char *C = (unsigned char *)yyvsp[0].StrVal; 
+      for (unsigned char *C = (unsigned char *)(yyvsp[(3) - (3)].StrVal); 
         C != (unsigned char*)EndStr; ++C)
       Vals.push_back(ConstantInt::get(ETy, *C));
     } else {
-      free(yyvsp[0].StrVal);
+      free((yyvsp[(3) - (3)].StrVal));
       GEN_ERROR("Cannot build string arrays of non byte sized elements");
     }
-    free(yyvsp[0].StrVal);
-    yyval.ConstVal = ConstantArray::get(ATy, Vals);
-    delete yyvsp[-2].TypeVal;
+    free((yyvsp[(3) - (3)].StrVal));
+    (yyval.ConstVal) = ConstantArray::get(ATy, Vals);
+    delete (yyvsp[(1) - (3)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 151:
-#line 1581 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 152:
+#line 1582 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    const VectorType *PTy = dyn_cast<VectorType>(yyvsp[-3].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
+    const VectorType *PTy = dyn_cast<VectorType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (PTy == 0)
       GEN_ERROR("Cannot make packed constant with type: '" + 
-                     (*yyvsp[-3].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'");
     const Type *ETy = PTy->getElementType();
     int NumElements = PTy->getNumElements();
 
     // Verify that we have the correct size...
-    if (NumElements != -1 && NumElements != (int)yyvsp[-1].ConstVector->size())
+    if (NumElements != -1 && NumElements != (int)(yyvsp[(3) - (4)].ConstVector)->size())
       GEN_ERROR("Type mismatch: constant sized packed initialized with " +
-                     utostr(yyvsp[-1].ConstVector->size()) +  " arguments, but has size of " + 
+                     utostr((yyvsp[(3) - (4)].ConstVector)->size()) +  " arguments, but has size of " + 
                      itostr(NumElements) + "");
 
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
-      if (ETy != (*yyvsp[-1].ConstVector)[i]->getType())
+    for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) {
+      if (ETy != (*(yyvsp[(3) - (4)].ConstVector))[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
            ETy->getDescription() +"' as required!\nIt is of type '"+
-           (*yyvsp[-1].ConstVector)[i]->getType()->getDescription() + "'.");
+           (*(yyvsp[(3) - (4)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
 
-    yyval.ConstVal = ConstantVector::get(PTy, *yyvsp[-1].ConstVector);
-    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
+    (yyval.ConstVal) = ConstantVector::get(PTy, *(yyvsp[(3) - (4)].ConstVector));
+    delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 152:
-#line 1609 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 153:
+#line 1610 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-3].TypeVal->get());
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*yyvsp[-3].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'");
 
-    if (yyvsp[-1].ConstVector->size() != STy->getNumContainedTypes())
+    if ((yyvsp[(3) - (4)].ConstVector)->size() != STy->getNumContainedTypes())
       GEN_ERROR("Illegal number of initializers for structure type");
 
     // Check to ensure that constants are compatible with the type initializer!
-    for (unsigned i = 0, e = yyvsp[-1].ConstVector->size(); i != e; ++i)
-      if ((*yyvsp[-1].ConstVector)[i]->getType() != STy->getElementType(i))
+    for (unsigned i = 0, e = (yyvsp[(3) - (4)].ConstVector)->size(); i != e; ++i)
+      if ((*(yyvsp[(3) - (4)].ConstVector))[i]->getType() != STy->getElementType(i))
         GEN_ERROR("Expected type '" +
                        STy->getElementType(i)->getDescription() +
                        "' for element #" + utostr(i) +
@@ -3804,21 +4190,21 @@
       GEN_ERROR("Unpacked Initializer to vector type '" +
                 STy->getDescription() + "'");
 
-    yyval.ConstVal = ConstantStruct::get(STy, *yyvsp[-1].ConstVector);
-    delete yyvsp[-3].TypeVal; delete yyvsp[-1].ConstVector;
+    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[(3) - (4)].ConstVector));
+    delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 153:
-#line 1635 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 154:
+#line 1636 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-2].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (3)].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*yyvsp[-2].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
       GEN_ERROR("Illegal number of initializers for structure type");
@@ -3828,26 +4214,26 @@
       GEN_ERROR("Unpacked Initializer to vector type '" +
                 STy->getDescription() + "'");
 
-    yyval.ConstVal = ConstantStruct::get(STy, std::vector<Constant*>());
-    delete yyvsp[-2].TypeVal;
+    (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
+    delete (yyvsp[(1) - (3)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 154:
-#line 1655 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 155:
+#line 1656 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-5].TypeVal->get());
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*yyvsp[-5].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (6)].TypeVal))->getDescription() + "'");
 
-    if (yyvsp[-2].ConstVector->size() != STy->getNumContainedTypes())
+    if ((yyvsp[(4) - (6)].ConstVector)->size() != STy->getNumContainedTypes())
       GEN_ERROR("Illegal number of initializers for structure type");
 
     // Check to ensure that constants are compatible with the type initializer!
-    for (unsigned i = 0, e = yyvsp[-2].ConstVector->size(); i != e; ++i)
-      if ((*yyvsp[-2].ConstVector)[i]->getType() != STy->getElementType(i))
+    for (unsigned i = 0, e = (yyvsp[(4) - (6)].ConstVector)->size(); i != e; ++i)
+      if ((*(yyvsp[(4) - (6)].ConstVector))[i]->getType() != STy->getElementType(i))
         GEN_ERROR("Expected type '" +
                        STy->getElementType(i)->getDescription() +
                        "' for element #" + utostr(i) +
@@ -3858,21 +4244,21 @@
       GEN_ERROR("Vector initializer to non-vector type '" + 
                 STy->getDescription() + "'");
 
-    yyval.ConstVal = ConstantStruct::get(STy, *yyvsp[-2].ConstVector);
-    delete yyvsp[-5].TypeVal; delete yyvsp[-2].ConstVector;
+    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[(4) - (6)].ConstVector));
+    delete (yyvsp[(1) - (6)].TypeVal); delete (yyvsp[(4) - (6)].ConstVector);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 155:
-#line 1681 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 156:
+#line 1682 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-4].TypeVal)->getDescription());
-    const StructType *STy = dyn_cast<StructType>(yyvsp[-4].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (5)].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*yyvsp[-4].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (5)].TypeVal))->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
       GEN_ERROR("Illegal number of initializers for structure type");
@@ -3882,45 +4268,45 @@
       GEN_ERROR("Vector initializer to non-vector type '" + 
                 STy->getDescription() + "'");
 
-    yyval.ConstVal = ConstantStruct::get(STy, std::vector<Constant*>());
-    delete yyvsp[-4].TypeVal;
+    (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
+    delete (yyvsp[(1) - (5)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 156:
-#line 1701 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 157:
+#line 1702 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    const PointerType *PTy = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    const PointerType *PTy = dyn_cast<PointerType>((yyvsp[(1) - (2)].TypeVal)->get());
     if (PTy == 0)
       GEN_ERROR("Cannot make null pointer constant with type: '" + 
-                     (*yyvsp[-1].TypeVal)->getDescription() + "'");
+                     (*(yyvsp[(1) - (2)].TypeVal))->getDescription() + "'");
 
-    yyval.ConstVal = ConstantPointerNull::get(PTy);
-    delete yyvsp[-1].TypeVal;
+    (yyval.ConstVal) = ConstantPointerNull::get(PTy);
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 157:
-#line 1713 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 158:
+#line 1714 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    yyval.ConstVal = UndefValue::get(yyvsp[-1].TypeVal->get());
-    delete yyvsp[-1].TypeVal;
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    (yyval.ConstVal) = UndefValue::get((yyvsp[(1) - (2)].TypeVal)->get());
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 158:
-#line 1720 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 159:
+#line 1721 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    const PointerType *Ty = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    const PointerType *Ty = dyn_cast<PointerType>((yyvsp[(1) - (2)].TypeVal)->get());
     if (Ty == 0)
       GEN_ERROR("Global const reference must be a pointer type");
 
@@ -3934,7 +4320,7 @@
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
 
-    Value *V = getExistingVal(Ty, yyvsp[0].ValIDVal);
+    Value *V = getExistingVal(Ty, (yyvsp[(2) - (2)].ValIDVal));
     CHECK_FOR_ERROR
 
     CurFun.CurrentFunction = SavedCurFn;
@@ -3949,16 +4335,16 @@
 
       // First check to see if the forward references value is already created!
       PerModuleInfo::GlobalRefsType::iterator I =
-        CurModule.GlobalRefs.find(std::make_pair(PT, yyvsp[0].ValIDVal));
+        CurModule.GlobalRefs.find(std::make_pair(PT, (yyvsp[(2) - (2)].ValIDVal)));
     
       if (I != CurModule.GlobalRefs.end()) {
         V = I->second;             // Placeholder already exists, use it...
-        yyvsp[0].ValIDVal.destroy();
+        (yyvsp[(2) - (2)].ValIDVal).destroy();
       } else {
         std::string Name;
-        if (yyvsp[0].ValIDVal.Type == ValID::GlobalName)
-          Name = yyvsp[0].ValIDVal.Name;
-        else if (yyvsp[0].ValIDVal.Type != ValID::GlobalID)
+        if ((yyvsp[(2) - (2)].ValIDVal).Type == ValID::GlobalName)
+          Name = (yyvsp[(2) - (2)].ValIDVal).Name;
+        else if ((yyvsp[(2) - (2)].ValIDVal).Type != ValID::GlobalID)
           GEN_ERROR("Invalid reference to global");
 
         // Create the forward referenced global.
@@ -3974,371 +4360,371 @@
         }
 
         // Keep track of the fact that we have a forward ref to recycle it
-        CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, yyvsp[0].ValIDVal), GV));
+        CurModule.GlobalRefs.insert(std::make_pair(std::make_pair(PT, (yyvsp[(2) - (2)].ValIDVal)), GV));
         V = GV;
       }
     }
 
-    yyval.ConstVal = cast<GlobalValue>(V);
-    delete yyvsp[-1].TypeVal;            // Free the type handle
+    (yyval.ConstVal) = cast<GlobalValue>(V);
+    delete (yyvsp[(1) - (2)].TypeVal);            // Free the type handle
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 159:
-#line 1786 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 160:
+#line 1787 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    if (yyvsp[-1].TypeVal->get() != yyvsp[0].ConstVal->getType())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    if ((yyvsp[(1) - (2)].TypeVal)->get() != (yyvsp[(2) - (2)].ConstVal)->getType())
       GEN_ERROR("Mismatched types for constant expression: " + 
-        (*yyvsp[-1].TypeVal)->getDescription() + " and " + yyvsp[0].ConstVal->getType()->getDescription());
-    yyval.ConstVal = yyvsp[0].ConstVal;
-    delete yyvsp[-1].TypeVal;
+        (*(yyvsp[(1) - (2)].TypeVal))->getDescription() + " and " + (yyvsp[(2) - (2)].ConstVal)->getType()->getDescription());
+    (yyval.ConstVal) = (yyvsp[(2) - (2)].ConstVal);
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 160:
-#line 1796 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 161:
+#line 1797 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    const Type *Ty = yyvsp[-1].TypeVal->get();
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    const Type *Ty = (yyvsp[(1) - (2)].TypeVal)->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
       GEN_ERROR("Cannot create a null initialized value of this type");
-    yyval.ConstVal = Constant::getNullValue(Ty);
-    delete yyvsp[-1].TypeVal;
+    (yyval.ConstVal) = Constant::getNullValue(Ty);
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 161:
-#line 1806 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 162:
+#line 1807 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
-    if (!ConstantInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].SInt64Val))
+    if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
-    yyval.ConstVal = ConstantInt::get(yyvsp[-1].PrimType, yyvsp[0].SInt64Val, true);
+    (yyval.ConstVal) = ConstantInt::get((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val), true);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 162:
-#line 1812 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 163:
+#line 1813 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
-    uint32_t BitWidth = cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth();
-    if (yyvsp[0].APIntVal->getBitWidth() > BitWidth) {
+    uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
+    if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
       GEN_ERROR("Constant value does not fit in type");
     }
-    yyvsp[0].APIntVal->sextOrTrunc(BitWidth);
-    yyval.ConstVal = ConstantInt::get(*yyvsp[0].APIntVal);
-    delete yyvsp[0].APIntVal;
+    (yyvsp[(2) - (2)].APIntVal)->sextOrTrunc(BitWidth);
+    (yyval.ConstVal) = ConstantInt::get(*(yyvsp[(2) - (2)].APIntVal));
+    delete (yyvsp[(2) - (2)].APIntVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 163:
-#line 1822 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 164:
+#line 1823 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
-    if (!ConstantInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].UInt64Val))
+    if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
-    yyval.ConstVal = ConstantInt::get(yyvsp[-1].PrimType, yyvsp[0].UInt64Val, false);
+    (yyval.ConstVal) = ConstantInt::get((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val), false);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 164:
-#line 1828 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 165:
+#line 1829 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
-    uint32_t BitWidth = cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth();
-    if (yyvsp[0].APIntVal->getBitWidth() > BitWidth) {
+    uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
+    if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
       GEN_ERROR("Constant value does not fit in type");
     } 
-    yyvsp[0].APIntVal->zextOrTrunc(BitWidth);
-    yyval.ConstVal = ConstantInt::get(*yyvsp[0].APIntVal);
-    delete yyvsp[0].APIntVal;
+    (yyvsp[(2) - (2)].APIntVal)->zextOrTrunc(BitWidth);
+    (yyval.ConstVal) = ConstantInt::get(*(yyvsp[(2) - (2)].APIntVal));
+    delete (yyvsp[(2) - (2)].APIntVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 165:
-#line 1838 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 166:
+#line 1839 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
-    assert(cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth() == 1 && "Not Bool?");
-    yyval.ConstVal = ConstantInt::getTrue();
+    assert(cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?");
+    (yyval.ConstVal) = ConstantInt::getTrue();
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 166:
-#line 1843 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 167:
+#line 1844 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
-    assert(cast<IntegerType>(yyvsp[-1].PrimType)->getBitWidth() == 1 && "Not Bool?");
-    yyval.ConstVal = ConstantInt::getFalse();
+    assert(cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?");
+    (yyval.ConstVal) = ConstantInt::getFalse();
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 167:
-#line 1848 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 168:
+#line 1849 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                   // Float & Double constants
-    if (!ConstantFP::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].FPVal))
+    if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].FPVal)))
       GEN_ERROR("Floating point constant invalid for type");
-    yyval.ConstVal = ConstantFP::get(yyvsp[-1].PrimType, yyvsp[0].FPVal);
+    (yyval.ConstVal) = ConstantFP::get((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].FPVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 168:
-#line 1856 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 169:
+#line 1857 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    Constant *Val = yyvsp[-3].ConstVal;
-    const Type *DestTy = yyvsp[-1].TypeVal->get();
-    if (!CastInst::castIsValid(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, DestTy))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
+    Constant *Val = (yyvsp[(3) - (6)].ConstVal);
+    const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
+    if (!CastInst::castIsValid((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'"); 
-    yyval.ConstVal = ConstantExpr::getCast(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, DestTy);
-    delete yyvsp[-1].TypeVal;
-  }
+    (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy);
+    delete (yyvsp[(5) - (6)].TypeVal);
+  ;}
     break;
 
-  case 169:
-#line 1868 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 170:
+#line 1869 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!isa<PointerType>(yyvsp[-2].ConstVal->getType()))
+    if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
 
     const Type *IdxTy =
-      GetElementPtrInst::getIndexedType(yyvsp[-2].ConstVal->getType(), &(*yyvsp[-1].ValueList)[0], yyvsp[-1].ValueList->size(),
+      GetElementPtrInst::getIndexedType((yyvsp[(3) - (5)].ConstVal)->getType(), &(*(yyvsp[(4) - (5)].ValueList))[0], (yyvsp[(4) - (5)].ValueList)->size(),
                                         true);
     if (!IdxTy)
       GEN_ERROR("Index list invalid for constant getelementptr");
 
     SmallVector<Constant*, 8> IdxVec;
-    for (unsigned i = 0, e = yyvsp[-1].ValueList->size(); i != e; ++i)
-      if (Constant *C = dyn_cast<Constant>((*yyvsp[-1].ValueList)[i]))
+    for (unsigned i = 0, e = (yyvsp[(4) - (5)].ValueList)->size(); i != e; ++i)
+      if (Constant *C = dyn_cast<Constant>((*(yyvsp[(4) - (5)].ValueList))[i]))
         IdxVec.push_back(C);
       else
         GEN_ERROR("Indices to constant getelementptr must be constants");
 
-    delete yyvsp[-1].ValueList;
+    delete (yyvsp[(4) - (5)].ValueList);
 
-    yyval.ConstVal = ConstantExpr::getGetElementPtr(yyvsp[-2].ConstVal, &IdxVec[0], IdxVec.size());
+    (yyval.ConstVal) = ConstantExpr::getGetElementPtr((yyvsp[(3) - (5)].ConstVal), &IdxVec[0], IdxVec.size());
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 170:
-#line 1890 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 171:
+#line 1891 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (yyvsp[-5].ConstVal->getType() != Type::Int1Ty)
+    if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+    if ((yyvsp[(5) - (8)].ConstVal)->getType() != (yyvsp[(7) - (8)].ConstVal)->getType())
       GEN_ERROR("Select operand types must match");
-    yyval.ConstVal = ConstantExpr::getSelect(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::getSelect((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 171:
-#line 1898 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 172:
+#line 1899 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+    if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
     CHECK_FOR_ERROR;
-    yyval.ConstVal = ConstantExpr::get(yyvsp[-5].BinaryOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
-  }
+    (yyval.ConstVal) = ConstantExpr::get((yyvsp[(1) - (6)].BinaryOpVal), (yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal));
+  ;}
     break;
 
-  case 172:
-#line 1904 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 173:
+#line 1905 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
+    if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
-    if (!yyvsp[-3].ConstVal->getType()->isInteger()) {
-      if (Instruction::isShift(yyvsp[-5].BinaryOpVal) || !isa<VectorType>(yyvsp[-3].ConstVal->getType()) || 
-          !cast<VectorType>(yyvsp[-3].ConstVal->getType())->getElementType()->isInteger())
+    if (!(yyvsp[(3) - (6)].ConstVal)->getType()->isInteger()) {
+      if (Instruction::isShift((yyvsp[(1) - (6)].BinaryOpVal)) || !isa<VectorType>((yyvsp[(3) - (6)].ConstVal)->getType()) || 
+          !cast<VectorType>((yyvsp[(3) - (6)].ConstVal)->getType())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands");
     }
-    yyval.ConstVal = ConstantExpr::get(yyvsp[-5].BinaryOpVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    (yyval.ConstVal) = ConstantExpr::get((yyvsp[(1) - (6)].BinaryOpVal), (yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal));
     CHECK_FOR_ERROR
-  }
-    break;
-
-  case 173:
-#line 1915 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
-      GEN_ERROR("icmp operand types must match");
-    yyval.ConstVal = ConstantExpr::getICmp(yyvsp[-5].IPredicate, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
-  }
+  ;}
     break;
 
   case 174:
-#line 1920 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1916 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
-      GEN_ERROR("fcmp operand types must match");
-    yyval.ConstVal = ConstantExpr::getFCmp(yyvsp[-5].FPredicate, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
-  }
+    if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
+      GEN_ERROR("icmp operand types must match");
+    (yyval.ConstVal) = ConstantExpr::getICmp((yyvsp[(2) - (7)].IPredicate), (yyvsp[(4) - (7)].ConstVal), (yyvsp[(6) - (7)].ConstVal));
+  ;}
     break;
 
   case 175:
-#line 1925 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1921 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!ExtractElementInst::isValidOperands(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
-      GEN_ERROR("Invalid extractelement operands");
-    yyval.ConstVal = ConstantExpr::getExtractElement(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
-    CHECK_FOR_ERROR
-  }
+    if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
+      GEN_ERROR("fcmp operand types must match");
+    (yyval.ConstVal) = ConstantExpr::getFCmp((yyvsp[(2) - (7)].FPredicate), (yyvsp[(4) - (7)].ConstVal), (yyvsp[(6) - (7)].ConstVal));
+  ;}
     break;
 
   case 176:
-#line 1931 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1926 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!InsertElementInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
-      GEN_ERROR("Invalid insertelement operands");
-    yyval.ConstVal = ConstantExpr::getInsertElement(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)))
+      GEN_ERROR("Invalid extractelement operands");
+    (yyval.ConstVal) = ConstantExpr::getExtractElement((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 177:
-#line 1937 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1932 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!ShuffleVectorInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
-      GEN_ERROR("Invalid shufflevector operands");
-    yyval.ConstVal = ConstantExpr::getShuffleVector(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal);
+    if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
+      GEN_ERROR("Invalid insertelement operands");
+    (yyval.ConstVal) = ConstantExpr::getInsertElement((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 178:
-#line 1946 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1938 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal);
+    if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
+      GEN_ERROR("Invalid shufflevector operands");
+    (yyval.ConstVal) = ConstantExpr::getShuffleVector((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 179:
-#line 1950 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1947 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.ConstVector = new std::vector<Constant*>();
-    yyval.ConstVector->push_back(yyvsp[0].ConstVal);
+    ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 180:
-#line 1958 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.BoolVal = false; }
+#line 1951 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ConstVector) = new std::vector<Constant*>();
+    (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
+    CHECK_FOR_ERROR
+  ;}
     break;
 
   case 181:
-#line 1958 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.BoolVal = true; }
+#line 1959 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = false; ;}
     break;
 
   case 182:
-#line 1961 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.BoolVal = true; }
+#line 1959 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = true; ;}
     break;
 
   case 183:
-#line 1961 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.BoolVal = false; }
+#line 1962 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = true; ;}
     break;
 
   case 184:
-#line 1964 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1962 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = false; ;}
+    break;
+
+  case 185:
+#line 1965 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    const Type* VTy = yyvsp[-1].TypeVal->get();
-    Value *V = getVal(VTy, yyvsp[0].ValIDVal);
+    const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get();
+    Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal));
     GlobalValue* Aliasee = dyn_cast<GlobalValue>(V);
     if (!Aliasee)
       GEN_ERROR("Aliases can be created only to global values");
 
-    yyval.ConstVal = Aliasee;
+    (yyval.ConstVal) = Aliasee;
     CHECK_FOR_ERROR
-    delete yyvsp[-1].TypeVal;
-   }
+    delete (yyvsp[(1) - (2)].TypeVal);
+   ;}
     break;
 
-  case 185:
-#line 1975 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 186:
+#line 1976 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    Constant *Val = yyvsp[-3].ConstVal;
-    const Type *DestTy = yyvsp[-1].TypeVal->get();
-    if (!CastInst::castIsValid(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, DestTy))
+    Constant *Val = (yyvsp[(3) - (6)].ConstVal);
+    const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
+    if (!CastInst::castIsValid((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'");
     
-    yyval.ConstVal = ConstantExpr::getCast(yyvsp[-5].CastOpVal, yyvsp[-3].ConstVal, DestTy);
+    (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy);
     CHECK_FOR_ERROR
-    delete yyvsp[-1].TypeVal;
-   }
+    delete (yyvsp[(5) - (6)].TypeVal);
+   ;}
     break;
 
-  case 186:
-#line 1996 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 187:
+#line 1997 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.ModuleVal = ParserResult = CurModule.CurrentModule;
+    (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
     CHECK_FOR_ERROR;
-  }
+  ;}
     break;
 
-  case 187:
-#line 2001 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 188:
+#line 2002 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.ModuleVal = ParserResult = CurModule.CurrentModule;
+    (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
     CHECK_FOR_ERROR;
-  }
+  ;}
     break;
 
-  case 190:
-#line 2014 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { CurFun.isDeclare = false; }
+  case 191:
+#line 2015 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { CurFun.isDeclare = false; ;}
     break;
 
-  case 191:
-#line 2014 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 192:
+#line 2015 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 192:
-#line 2018 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { CurFun.isDeclare = true; }
+  case 193:
+#line 2019 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { CurFun.isDeclare = true; ;}
     break;
 
-  case 193:
-#line 2018 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 194:
+#line 2019 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 194:
-#line 2021 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 195:
+#line 2022 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 195:
-#line 2024 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 196:
+#line 2025 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
     // Eagerly resolve types.  This is not an optimization, this is a
     // requirement that is due to the fact that we could have this:
     //
@@ -4348,271 +4734,271 @@
     // If types are not resolved eagerly, then the two types will not be
     // determined to be the same type!
     //
-    ResolveTypeTo(yyvsp[-2].StrVal, *yyvsp[0].TypeVal);
+    ResolveTypeTo((yyvsp[(1) - (3)].StrVal), *(yyvsp[(3) - (3)].TypeVal));
 
-    if (!setTypeName(*yyvsp[0].TypeVal, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) {
+    if (!setTypeName(*(yyvsp[(3) - (3)].TypeVal), (yyvsp[(1) - (3)].StrVal)) && !(yyvsp[(1) - (3)].StrVal)) {
       CHECK_FOR_ERROR
       // If this is a named type that is not a redefinition, add it to the slot
       // table.
-      CurModule.Types.push_back(*yyvsp[0].TypeVal);
+      CurModule.Types.push_back(*(yyvsp[(3) - (3)].TypeVal));
     }
 
-    delete yyvsp[0].TypeVal;
+    delete (yyvsp[(3) - (3)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 196:
-#line 2048 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 197:
+#line 2049 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    ResolveTypeTo(yyvsp[-2].StrVal, yyvsp[0].PrimType);
+    ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType));
 
-    if (!setTypeName(yyvsp[0].PrimType, yyvsp[-2].StrVal) && !yyvsp[-2].StrVal) {
+    if (!setTypeName((yyvsp[(3) - (3)].PrimType), (yyvsp[(1) - (3)].StrVal)) && !(yyvsp[(1) - (3)].StrVal)) {
       CHECK_FOR_ERROR
       // If this is a named type that is not a redefinition, add it to the slot
       // table.
-      CurModule.Types.push_back(yyvsp[0].PrimType);
+      CurModule.Types.push_back((yyvsp[(3) - (3)].PrimType));
     }
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 197:
-#line 2059 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 198:
+#line 2060 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { 
     /* "Externally Visible" Linkage */
-    if (yyvsp[0].ConstVal == 0) 
+    if ((yyvsp[(5) - (5)].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable(yyvsp[-4].StrVal, GlobalValue::ExternalLinkage,
-                                yyvsp[-3].Visibility, yyvsp[-1].BoolVal, yyvsp[0].ConstVal->getType(), yyvsp[0].ConstVal, yyvsp[-2].BoolVal);
+    CurGV = ParseGlobalVariable((yyvsp[(1) - (5)].StrVal), GlobalValue::ExternalLinkage,
+                                (yyvsp[(2) - (5)].Visibility), (yyvsp[(4) - (5)].BoolVal), (yyvsp[(5) - (5)].ConstVal)->getType(), (yyvsp[(5) - (5)].ConstVal), (yyvsp[(3) - (5)].BoolVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 198:
-#line 2066 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 199:
+#line 2067 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
-  }
+  ;}
     break;
 
-  case 199:
-#line 2070 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 200:
+#line 2071 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (yyvsp[0].ConstVal == 0) 
+    if ((yyvsp[(6) - (6)].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable(yyvsp[-5].StrVal, yyvsp[-4].Linkage, yyvsp[-3].Visibility, yyvsp[-1].BoolVal, yyvsp[0].ConstVal->getType(), yyvsp[0].ConstVal, yyvsp[-2].BoolVal);
+    CurGV = ParseGlobalVariable((yyvsp[(1) - (6)].StrVal), (yyvsp[(2) - (6)].Linkage), (yyvsp[(3) - (6)].Visibility), (yyvsp[(5) - (6)].BoolVal), (yyvsp[(6) - (6)].ConstVal)->getType(), (yyvsp[(6) - (6)].ConstVal), (yyvsp[(4) - (6)].BoolVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 200:
-#line 2075 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 201:
+#line 2076 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
-  }
+  ;}
     break;
 
-  case 201:
-#line 2079 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 202:
+#line 2080 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
-    CurGV = ParseGlobalVariable(yyvsp[-5].StrVal, yyvsp[-4].Linkage, yyvsp[-3].Visibility, yyvsp[-1].BoolVal, *yyvsp[0].TypeVal, 0, yyvsp[-2].BoolVal);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (6)].TypeVal))->getDescription());
+    CurGV = ParseGlobalVariable((yyvsp[(1) - (6)].StrVal), (yyvsp[(2) - (6)].Linkage), (yyvsp[(3) - (6)].Visibility), (yyvsp[(5) - (6)].BoolVal), *(yyvsp[(6) - (6)].TypeVal), 0, (yyvsp[(4) - (6)].BoolVal));
     CHECK_FOR_ERROR
-    delete yyvsp[0].TypeVal;
-  }
+    delete (yyvsp[(6) - (6)].TypeVal);
+  ;}
     break;
 
-  case 202:
-#line 2085 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 203:
+#line 2086 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 203:
-#line 2089 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 204:
+#line 2090 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    std::string Name(yyvsp[-4].StrVal);
+    std::string Name((yyvsp[(1) - (5)].StrVal));
     if (Name.empty())
       GEN_ERROR("Alias name cannot be empty");
     
-    Constant* Aliasee = yyvsp[0].ConstVal;
+    Constant* Aliasee = (yyvsp[(5) - (5)].ConstVal);
     if (Aliasee == 0)
-      GEN_ERROR(std::string("Invalid aliasee for alias: ") + yyvsp[-4].StrVal);
+      GEN_ERROR(std::string("Invalid aliasee for alias: ") + (yyvsp[(1) - (5)].StrVal));
 
-    GlobalAlias* GA = new GlobalAlias(Aliasee->getType(), yyvsp[-1].Linkage, Name, Aliasee,
+    GlobalAlias* GA = new GlobalAlias(Aliasee->getType(), (yyvsp[(4) - (5)].Linkage), Name, Aliasee,
                                       CurModule.CurrentModule);
-    GA->setVisibility(yyvsp[-3].Visibility);
+    GA->setVisibility((yyvsp[(2) - (5)].Visibility));
     InsertValue(GA, CurModule.Values);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 204:
-#line 2104 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 205:
+#line 2105 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 205:
-#line 2107 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 206:
+#line 2108 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 206:
-#line 2113 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 207:
+#line 2114 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.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);
   CHECK_FOR_ERROR
-}
-    break;
-
-  case 207:
-#line 2126 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    CurModule.CurrentModule->setTargetTriple(yyvsp[0].StrVal);
-    free(yyvsp[0].StrVal);
-  }
+;}
     break;
 
   case 208:
-#line 2130 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2127 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    CurModule.CurrentModule->setDataLayout(yyvsp[0].StrVal);
-    free(yyvsp[0].StrVal);
-  }
+    CurModule.CurrentModule->setTargetTriple((yyvsp[(3) - (3)].StrVal));
+    free((yyvsp[(3) - (3)].StrVal));
+  ;}
     break;
 
-  case 210:
-#line 2137 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 209:
+#line 2131 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-          CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
-          free(yyvsp[0].StrVal);
-          CHECK_FOR_ERROR
-        }
+    CurModule.CurrentModule->setDataLayout((yyvsp[(3) - (3)].StrVal));
+    free((yyvsp[(3) - (3)].StrVal));
+  ;}
     break;
 
   case 211:
-#line 2142 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2138 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-          CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
-          free(yyvsp[0].StrVal);
+          CurModule.CurrentModule->addLibrary((yyvsp[(3) - (3)].StrVal));
+          free((yyvsp[(3) - (3)].StrVal));
           CHECK_FOR_ERROR
-        }
+        ;}
     break;
 
   case 212:
-#line 2147 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2143 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
+          CurModule.CurrentModule->addLibrary((yyvsp[(1) - (1)].StrVal));
+          free((yyvsp[(1) - (1)].StrVal));
           CHECK_FOR_ERROR
-        }
+        ;}
     break;
 
   case 213:
-#line 2156 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2148 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    if (*yyvsp[-2].TypeVal == Type::VoidTy)
-      GEN_ERROR("void typed arguments are invalid");
-    ArgListEntry E; E.Attrs = yyvsp[-1].ParamAttrs; E.Ty = yyvsp[-2].TypeVal; E.Name = yyvsp[0].StrVal;
-    yyval.ArgList = yyvsp[-4].ArgList;
-    yyvsp[-4].ArgList->push_back(E);
-    CHECK_FOR_ERROR
-  }
+          CHECK_FOR_ERROR
+        ;}
     break;
 
   case 214:
-#line 2166 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2157 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    if (*yyvsp[-2].TypeVal == Type::VoidTy)
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
+    if (*(yyvsp[(3) - (5)].TypeVal) == Type::VoidTy)
       GEN_ERROR("void typed arguments are invalid");
-    ArgListEntry E; E.Attrs = yyvsp[-1].ParamAttrs; E.Ty = yyvsp[-2].TypeVal; E.Name = yyvsp[0].StrVal;
-    yyval.ArgList = new ArgListType;
-    yyval.ArgList->push_back(E);
+    ArgListEntry E; E.Attrs = (yyvsp[(4) - (5)].ParamAttrs); E.Ty = (yyvsp[(3) - (5)].TypeVal); E.Name = (yyvsp[(5) - (5)].StrVal);
+    (yyval.ArgList) = (yyvsp[(1) - (5)].ArgList);
+    (yyvsp[(1) - (5)].ArgList)->push_back(E);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 215:
-#line 2177 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2167 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.ArgList = yyvsp[0].ArgList;
+    if (!UpRefs.empty())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
+    if (*(yyvsp[(1) - (3)].TypeVal) == Type::VoidTy)
+      GEN_ERROR("void typed arguments are invalid");
+    ArgListEntry E; E.Attrs = (yyvsp[(2) - (3)].ParamAttrs); E.Ty = (yyvsp[(1) - (3)].TypeVal); E.Name = (yyvsp[(3) - (3)].StrVal);
+    (yyval.ArgList) = new ArgListType;
+    (yyval.ArgList)->push_back(E);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 216:
-#line 2181 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2178 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.ArgList = yyvsp[-2].ArgList;
+    (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 217:
+#line 2182 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
     E.Attrs = ParamAttr::None;
-    yyval.ArgList->push_back(E);
+    (yyval.ArgList)->push_back(E);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 217:
-#line 2190 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 218:
+#line 2191 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.ArgList = new ArgListType;
+    (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
     E.Attrs = ParamAttr::None;
-    yyval.ArgList->push_back(E);
+    (yyval.ArgList)->push_back(E);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 218:
-#line 2199 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 219:
+#line 2200 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.ArgList = 0;
+    (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 219:
-#line 2205 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 220:
+#line 2206 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-  UnEscapeLexed(yyvsp[-6].StrVal);
-  std::string FunctionName(yyvsp[-6].StrVal);
-  free(yyvsp[-6].StrVal);  // Free strdup'd memory!
+  UnEscapeLexed((yyvsp[(3) - (9)].StrVal));
+  std::string FunctionName((yyvsp[(3) - (9)].StrVal));
+  free((yyvsp[(3) - (9)].StrVal));  // Free strdup'd memory!
   
   // Check the function result for abstractness if this is a define. We should
   // have no abstract types at this point
-  if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(yyvsp[-7].TypeVal))
-    GEN_ERROR("Reference to abstract result: "+ yyvsp[-7].TypeVal->get()->getDescription());
+  if (!CurFun.isDeclare && CurModule.TypeIsUnresolved((yyvsp[(2) - (9)].TypeVal)))
+    GEN_ERROR("Reference to abstract result: "+ (yyvsp[(2) - (9)].TypeVal)->get()->getDescription());
 
   std::vector<const Type*> ParamTypeList;
   ParamAttrsVector Attrs;
-  if (yyvsp[-2].ParamAttrs != ParamAttr::None) {
-    ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = yyvsp[-2].ParamAttrs;
+  if ((yyvsp[(7) - (9)].ParamAttrs) != ParamAttr::None) {
+    ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[(7) - (9)].ParamAttrs);
     Attrs.push_back(PAWI);
   }
-  if (yyvsp[-4].ArgList) {   // If there are arguments...
+  if ((yyvsp[(5) - (9)].ArgList)) {   // If there are arguments...
     unsigned index = 1;
-    for (ArgListType::iterator I = yyvsp[-4].ArgList->begin(); I != yyvsp[-4].ArgList->end(); ++I, ++index) {
+    for (ArgListType::iterator I = (yyvsp[(5) - (9)].ArgList)->begin(); I != (yyvsp[(5) - (9)].ArgList)->end(); ++I, ++index) {
       const Type* Ty = I->Ty->get();
       if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(I->Ty))
         GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
@@ -4632,9 +5018,9 @@
   if (!Attrs.empty())
     PAL = ParamAttrsList::get(Attrs);
 
-  FunctionType *FT = FunctionType::get(*yyvsp[-7].TypeVal, ParamTypeList, isVarArg, PAL);
+  FunctionType *FT = FunctionType::get(*(yyvsp[(2) - (9)].TypeVal), ParamTypeList, isVarArg, PAL);
   const PointerType *PFT = PointerType::get(FT);
-  delete yyvsp[-7].TypeVal;
+  delete (yyvsp[(2) - (9)].TypeVal);
 
   ValID ID;
   if (!FunctionName.empty()) {
@@ -4683,26 +5069,26 @@
     Fn->setLinkage(CurFun.Linkage);
     Fn->setVisibility(CurFun.Visibility);
   }
-  Fn->setCallingConv(yyvsp[-8].UIntVal);
-  Fn->setAlignment(yyvsp[0].UIntVal);
-  if (yyvsp[-1].StrVal) {
-    Fn->setSection(yyvsp[-1].StrVal);
-    free(yyvsp[-1].StrVal);
+  Fn->setCallingConv((yyvsp[(1) - (9)].UIntVal));
+  Fn->setAlignment((yyvsp[(9) - (9)].UIntVal));
+  if ((yyvsp[(8) - (9)].StrVal)) {
+    Fn->setSection((yyvsp[(8) - (9)].StrVal));
+    free((yyvsp[(8) - (9)].StrVal));
   }
 
   // Add all of the arguments we parsed to the function...
-  if (yyvsp[-4].ArgList) {                     // Is null if empty...
+  if ((yyvsp[(5) - (9)].ArgList)) {                     // Is null if empty...
     if (isVarArg) {  // Nuke the last entry
-      assert(yyvsp[-4].ArgList->back().Ty->get() == Type::VoidTy && yyvsp[-4].ArgList->back().Name == 0 &&
+      assert((yyvsp[(5) - (9)].ArgList)->back().Ty->get() == Type::VoidTy && (yyvsp[(5) - (9)].ArgList)->back().Name == 0 &&
              "Not a varargs marker!");
-      delete yyvsp[-4].ArgList->back().Ty;
-      yyvsp[-4].ArgList->pop_back();  // Delete the last entry
+      delete (yyvsp[(5) - (9)].ArgList)->back().Ty;
+      (yyvsp[(5) - (9)].ArgList)->pop_back();  // Delete the last entry
     }
     Function::arg_iterator ArgIt = Fn->arg_begin();
     Function::arg_iterator ArgEnd = Fn->arg_end();
     unsigned Idx = 1;
-    for (ArgListType::iterator I = yyvsp[-4].ArgList->begin(); 
-         I != yyvsp[-4].ArgList->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
+    for (ArgListType::iterator I = (yyvsp[(5) - (9)].ArgList)->begin(); 
+         I != (yyvsp[(5) - (9)].ArgList)->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
       delete I->Ty;                          // Delete the typeholder...
       setValueName(ArgIt, I->Name);          // Insert arg into symtab...
       CHECK_FOR_ERROR
@@ -4710,128 +5096,128 @@
       Idx++;
     }
 
-    delete yyvsp[-4].ArgList;                     // We're now done with the argument list
+    delete (yyvsp[(5) - (9)].ArgList);                     // We're now done with the argument list
   }
   CHECK_FOR_ERROR
-}
+;}
     break;
 
-  case 222:
-#line 2328 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 223:
+#line 2329 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-  yyval.FunctionVal = CurFun.CurrentFunction;
+  (yyval.FunctionVal) = CurFun.CurrentFunction;
 
   // Make sure that we keep track of the linkage type even if there was a
   // previous "declare".
-  yyval.FunctionVal->setLinkage(yyvsp[-3].Linkage);
-  yyval.FunctionVal->setVisibility(yyvsp[-2].Visibility);
-}
-    break;
-
-  case 225:
-#line 2339 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-  yyval.FunctionVal = yyvsp[-1].FunctionVal;
-  CHECK_FOR_ERROR
-}
+  (yyval.FunctionVal)->setLinkage((yyvsp[(1) - (4)].Linkage));
+  (yyval.FunctionVal)->setVisibility((yyvsp[(2) - (4)].Visibility));
+;}
     break;
 
   case 226:
-#line 2344 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2340 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    CurFun.CurrentFunction->setLinkage(yyvsp[-2].Linkage);
-    CurFun.CurrentFunction->setVisibility(yyvsp[-1].Visibility);
-    yyval.FunctionVal = CurFun.CurrentFunction;
-    CurFun.FunctionDone();
-    CHECK_FOR_ERROR
-  }
+  (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
+  CHECK_FOR_ERROR
+;}
     break;
 
   case 227:
-#line 2356 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2345 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.BoolVal = false;
+    CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage));
+    CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility));
+    (yyval.FunctionVal) = CurFun.CurrentFunction;
+    CurFun.FunctionDone();
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 228:
-#line 2360 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2357 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.BoolVal = true;
+    (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 229:
-#line 2365 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {    // A reference to a direct constant
-    yyval.ValIDVal = ValID::create(yyvsp[0].SInt64Val);
+#line 2361 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 230:
-#line 2369 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    yyval.ValIDVal = ValID::create(yyvsp[0].UInt64Val);
+#line 2366 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {    // A reference to a direct constant
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 231:
-#line 2373 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {                     // Perhaps it's an FP constant?
-    yyval.ValIDVal = ValID::create(yyvsp[0].FPVal);
+#line 2370 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 232:
-#line 2377 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    yyval.ValIDVal = ValID::create(ConstantInt::getTrue());
+#line 2374 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {                     // Perhaps it's an FP constant?
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 233:
-#line 2381 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2378 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.ValIDVal = ValID::create(ConstantInt::getFalse());
+    (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 234:
-#line 2385 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2382 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.ValIDVal = ValID::createNull();
+    (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 235:
-#line 2389 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2386 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.ValIDVal = ValID::createUndef();
+    (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 236:
-#line 2393 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {     // A vector zero constant.
-    yyval.ValIDVal = ValID::createZeroInit();
+#line 2390 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 237:
-#line 2397 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2394 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {     // A vector zero constant.
+    (yyval.ValIDVal) = ValID::createZeroInit();
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 238:
+#line 2398 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
-    const Type *ETy = (*yyvsp[-1].ConstVector)[0]->getType();
-    int NumElements = yyvsp[-1].ConstVector->size(); 
+    const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
+    int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
     
     VectorType* pt = VectorType::get(ETy, NumElements);
     PATypeHolder* PTy = new PATypeHolder(
@@ -4843,233 +5229,233 @@
                                          );
     
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < yyvsp[-1].ConstVector->size(); i++) {
-      if (ETy != (*yyvsp[-1].ConstVector)[i]->getType())
+    for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) {
+      if (ETy != (*(yyvsp[(2) - (3)].ConstVector))[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
                      ETy->getDescription() +"' as required!\nIt is of type '" +
-                     (*yyvsp[-1].ConstVector)[i]->getType()->getDescription() + "'.");
+                     (*(yyvsp[(2) - (3)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
 
-    yyval.ValIDVal = ValID::create(ConstantVector::get(pt, *yyvsp[-1].ConstVector));
-    delete PTy; delete yyvsp[-1].ConstVector;
+    (yyval.ValIDVal) = ValID::create(ConstantVector::get(pt, *(yyvsp[(2) - (3)].ConstVector)));
+    delete PTy; delete (yyvsp[(2) - (3)].ConstVector);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 238:
-#line 2422 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 239:
+#line 2423 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal);
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 239:
-#line 2426 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 240:
+#line 2427 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.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);
+    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));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 240:
-#line 2440 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 241:
+#line 2441 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
-    yyval.ValIDVal = ValID::createLocalID(yyvsp[0].UIntVal);
+    (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 241:
-#line 2444 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 242:
+#line 2445 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.ValIDVal = ValID::createGlobalID(yyvsp[0].UIntVal);
+    (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 242:
-#line 2448 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 243:
+#line 2449 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
-    yyval.ValIDVal = ValID::createLocalName(yyvsp[0].StrVal);
+    (yyval.ValIDVal) = ValID::createLocalName((yyvsp[(1) - (1)].StrVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 243:
-#line 2452 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 244:
+#line 2453 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
-    yyval.ValIDVal = ValID::createGlobalName(yyvsp[0].StrVal);
+    (yyval.ValIDVal) = ValID::createGlobalName((yyvsp[(1) - (1)].StrVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 246:
-#line 2464 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 247:
+#line 2465 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    yyval.ValueVal = getVal(*yyvsp[-1].TypeVal, yyvsp[0].ValIDVal); 
-    delete yyvsp[-1].TypeVal;
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    (yyval.ValueVal) = getVal(*(yyvsp[(1) - (2)].TypeVal), (yyvsp[(2) - (2)].ValIDVal)); 
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 247:
-#line 2473 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 248:
+#line 2474 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.FunctionVal = yyvsp[-1].FunctionVal;
+    (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 248:
-#line 2477 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 249:
+#line 2478 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
-    yyval.FunctionVal = yyvsp[-1].FunctionVal;
+    (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 249:
-#line 2486 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 250:
+#line 2487 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    setValueName(yyvsp[0].TermInstVal, yyvsp[-1].StrVal);
+    setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
     CHECK_FOR_ERROR
-    InsertValue(yyvsp[0].TermInstVal);
-    yyvsp[-2].BasicBlockVal->getInstList().push_back(yyvsp[0].TermInstVal);
-    yyval.BasicBlockVal = yyvsp[-2].BasicBlockVal;
+    InsertValue((yyvsp[(3) - (3)].TermInstVal));
+    (yyvsp[(1) - (3)].BasicBlockVal)->getInstList().push_back((yyvsp[(3) - (3)].TermInstVal));
+    (yyval.BasicBlockVal) = (yyvsp[(1) - (3)].BasicBlockVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 250:
-#line 2495 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 251:
+#line 2496 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (CastInst *CI1 = dyn_cast<CastInst>(yyvsp[0].InstVal))
+    if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[(2) - (2)].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
         if (CI2->getParent() == 0)
-          yyvsp[-1].BasicBlockVal->getInstList().push_back(CI2);
-    yyvsp[-1].BasicBlockVal->getInstList().push_back(yyvsp[0].InstVal);
-    yyval.BasicBlockVal = yyvsp[-1].BasicBlockVal;
+          (yyvsp[(1) - (2)].BasicBlockVal)->getInstList().push_back(CI2);
+    (yyvsp[(1) - (2)].BasicBlockVal)->getInstList().push_back((yyvsp[(2) - (2)].InstVal));
+    (yyval.BasicBlockVal) = (yyvsp[(1) - (2)].BasicBlockVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 251:
-#line 2504 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 252:
+#line 2505 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
-    yyval.BasicBlockVal = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 252:
-#line 2508 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 253:
+#line 2509 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
-    yyval.BasicBlockVal = defineBBVal(ValID::createLocalName(yyvsp[0].StrVal));
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName((yyvsp[(1) - (1)].StrVal)));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 253:
-#line 2513 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 254:
+#line 2514 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {              // Return with a result...
-    yyval.TermInstVal = new ReturnInst(yyvsp[0].ValueVal);
+    (yyval.TermInstVal) = new ReturnInst((yyvsp[(2) - (2)].ValueVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 254:
-#line 2517 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 255:
+#line 2518 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
-    yyval.TermInstVal = new ReturnInst();
+    (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 255:
-#line 2521 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 256:
+#line 2522 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
-    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.TermInstVal = new BranchInst(tmpBB);
-  }
+    (yyval.TermInstVal) = new BranchInst(tmpBB);
+  ;}
     break;
 
-  case 256:
-#line 2526 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 257:
+#line 2527 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {  
-    assert(cast<IntegerType>(yyvsp[-7].PrimType)->getBitWidth() == 1 && "Not Bool?");
-    BasicBlock* tmpBBA = getBBVal(yyvsp[-3].ValIDVal);
+    assert(cast<IntegerType>((yyvsp[(2) - (9)].PrimType))->getBitWidth() == 1 && "Not Bool?");
+    BasicBlock* tmpBBA = getBBVal((yyvsp[(6) - (9)].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock* tmpBBB = getBBVal(yyvsp[0].ValIDVal);
+    BasicBlock* tmpBBB = getBBVal((yyvsp[(9) - (9)].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal = getVal(Type::Int1Ty, yyvsp[-6].ValIDVal);
+    Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.TermInstVal = new BranchInst(tmpBBA, tmpBBB, tmpVal);
-  }
+    (yyval.TermInstVal) = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+  ;}
     break;
 
-  case 257:
-#line 2536 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 258:
+#line 2537 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    Value* tmpVal = getVal(yyvsp[-7].PrimType, yyvsp[-6].ValIDVal);
+    Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal(yyvsp[-3].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (9)].ValIDVal));
     CHECK_FOR_ERROR
-    SwitchInst *S = new SwitchInst(tmpVal, tmpBB, yyvsp[-1].JumpTable->size());
-    yyval.TermInstVal = S;
+    SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp[(8) - (9)].JumpTable)->size());
+    (yyval.TermInstVal) = S;
 
-    std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = yyvsp[-1].JumpTable->begin(),
-      E = yyvsp[-1].JumpTable->end();
+    std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = (yyvsp[(8) - (9)].JumpTable)->begin(),
+      E = (yyvsp[(8) - (9)].JumpTable)->end();
     for (; I != E; ++I) {
       if (ConstantInt *CI = dyn_cast<ConstantInt>(I->first))
           S->addCase(CI, I->second);
       else
         GEN_ERROR("Switch case is constant, but not a simple integer");
     }
-    delete yyvsp[-1].JumpTable;
+    delete (yyvsp[(8) - (9)].JumpTable);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 258:
-#line 2555 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 259:
+#line 2556 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    Value* tmpVal = getVal(yyvsp[-6].PrimType, yyvsp[-5].ValIDVal);
+    Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal(yyvsp[-2].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (8)].ValIDVal));
     CHECK_FOR_ERROR
     SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
-    yyval.TermInstVal = S;
+    (yyval.TermInstVal) = S;
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 259:
-#line 2565 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 260:
+#line 2566 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
     const PointerType *PFTy = 0;
     const FunctionType *Ty = 0;
-    if (!(PFTy = dyn_cast<PointerType>(yyvsp[-11].TypeVal->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>((yyvsp[(3) - (14)].TypeVal)->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
       ParamAttrsVector Attrs;
-      if (yyvsp[-6].ParamAttrs != ParamAttr::None) {
+      if ((yyvsp[(8) - (14)].ParamAttrs) != ParamAttr::None) {
         ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = 8;
         Attrs.push_back(PAWI);
       }
-      ValueRefList::iterator I = yyvsp[-8].ValueRefList->begin(), E = yyvsp[-8].ValueRefList->end();
+      ValueRefList::iterator I = (yyvsp[(6) - (14)].ValueRefList)->begin(), E = (yyvsp[(6) - (14)].ValueRefList)->end();
       unsigned index = 1;
       for (; I != E; ++I, ++index) {
         const Type *Ty = I->Val->getType();
@@ -5085,22 +5471,22 @@
       ParamAttrsList *PAL = 0;
       if (!Attrs.empty())
         PAL = ParamAttrsList::get(Attrs);
-      Ty = FunctionType::get(yyvsp[-11].TypeVal->get(), ParamTypes, false, PAL);
+      Ty = FunctionType::get((yyvsp[(3) - (14)].TypeVal)->get(), ParamTypes, false, PAL);
       PFTy = PointerType::get(Ty);
     }
 
-    delete yyvsp[-11].TypeVal;
+    delete (yyvsp[(3) - (14)].TypeVal);
 
-    Value *V = getVal(PFTy, yyvsp[-10].ValIDVal);   // Get the function we're calling...
+    Value *V = getVal(PFTy, (yyvsp[(4) - (14)].ValIDVal));   // Get the function we're calling...
     CHECK_FOR_ERROR
-    BasicBlock *Normal = getBBVal(yyvsp[-3].ValIDVal);
+    BasicBlock *Normal = getBBVal((yyvsp[(11) - (14)].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock *Except = getBBVal(yyvsp[0].ValIDVal);
+    BasicBlock *Except = getBBVal((yyvsp[(14) - (14)].ValIDVal));
     CHECK_FOR_ERROR
 
     // Check the arguments
     ValueList Args;
-    if (yyvsp[-8].ValueRefList->empty()) {                                   // Has no arguments?
+    if ((yyvsp[(6) - (14)].ValueRefList)->empty()) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
       if (Ty->getNumParams() != 0)
         GEN_ERROR("No arguments passed to a function that "
@@ -5110,7 +5496,7 @@
       // correctly!
       FunctionType::param_iterator I = Ty->param_begin();
       FunctionType::param_iterator E = Ty->param_end();
-      ValueRefList::iterator ArgI = yyvsp[-8].ValueRefList->begin(), ArgE = yyvsp[-8].ValueRefList->end();
+      ValueRefList::iterator ArgI = (yyvsp[(6) - (14)].ValueRefList)->begin(), ArgE = (yyvsp[(6) - (14)].ValueRefList)->end();
 
       for (; ArgI != ArgE && I != E; ++ArgI, ++I) {
         if (ArgI->Val->getType() != *I)
@@ -5129,348 +5515,348 @@
 
     // Create the InvokeInst
     InvokeInst *II = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
-    II->setCallingConv(yyvsp[-12].UIntVal);
-    yyval.TermInstVal = II;
-    delete yyvsp[-8].ValueRefList;
+    II->setCallingConv((yyvsp[(2) - (14)].UIntVal));
+    (yyval.TermInstVal) = II;
+    delete (yyvsp[(6) - (14)].ValueRefList);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 260:
-#line 2644 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 261:
+#line 2645 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.TermInstVal = new UnwindInst();
+    (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 261:
-#line 2648 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 262:
+#line 2649 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.TermInstVal = new UnreachableInst();
+    (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 262:
-#line 2655 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 263:
+#line 2656 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.JumpTable = yyvsp[-5].JumpTable;
-    Constant *V = cast<Constant>(getExistingVal(yyvsp[-4].PrimType, yyvsp[-3].ValIDVal));
+    (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
+    Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
     CHECK_FOR_ERROR
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value");
 
-    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.JumpTable->push_back(std::make_pair(V, tmpBB));
-  }
+    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
+  ;}
     break;
 
-  case 263:
-#line 2666 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 264:
+#line 2667 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.JumpTable = new std::vector<std::pair<Constant*, BasicBlock*> >();
-    Constant *V = cast<Constant>(getExistingVal(yyvsp[-4].PrimType, yyvsp[-3].ValIDVal));
+    (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
+    Constant *V = cast<Constant>(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
     CHECK_FOR_ERROR
 
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value");
 
-    BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.JumpTable->push_back(std::make_pair(V, tmpBB)); 
-  }
+    (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); 
+  ;}
     break;
 
-  case 264:
-#line 2679 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 265:
+#line 2680 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
-    setValueName(yyvsp[0].InstVal, yyvsp[-1].StrVal);
+    setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
     CHECK_FOR_ERROR
-    InsertValue(yyvsp[0].InstVal);
-    yyval.InstVal = yyvsp[0].InstVal;
+    InsertValue((yyvsp[(2) - (2)].InstVal));
+    (yyval.InstVal) = (yyvsp[(2) - (2)].InstVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 265:
-#line 2689 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 266:
+#line 2690 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-5].TypeVal)->getDescription());
-    yyval.PHIList = new std::list<std::pair<Value*, BasicBlock*> >();
-    Value* tmpVal = getVal(*yyvsp[-5].TypeVal, yyvsp[-3].ValIDVal);
-    CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal);
-    CHECK_FOR_ERROR
-    yyval.PHIList->push_back(std::make_pair(tmpVal, tmpBB));
-    delete yyvsp[-5].TypeVal;
-  }
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
+    (yyval.PHIList) = new std::list<std::pair<Value*, BasicBlock*> >();
+    Value* tmpVal = getVal(*(yyvsp[(1) - (6)].TypeVal), (yyvsp[(3) - (6)].ValIDVal));
+    CHECK_FOR_ERROR
+    BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (6)].ValIDVal));
+    CHECK_FOR_ERROR
+    (yyval.PHIList)->push_back(std::make_pair(tmpVal, tmpBB));
+    delete (yyvsp[(1) - (6)].TypeVal);
+  ;}
     break;
 
-  case 266:
-#line 2700 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 267:
+#line 2701 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.PHIList = yyvsp[-6].PHIList;
-    Value* tmpVal = getVal(yyvsp[-6].PHIList->front().first->getType(), yyvsp[-3].ValIDVal);
+    (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList);
+    Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList)->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal(yyvsp[-1].ValIDVal);
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (7)].ValIDVal));
     CHECK_FOR_ERROR
-    yyvsp[-6].PHIList->push_back(std::make_pair(tmpVal, tmpBB));
-  }
+    (yyvsp[(1) - (7)].PHIList)->push_back(std::make_pair(tmpVal, tmpBB));
+  ;}
     break;
 
-  case 267:
-#line 2710 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 268:
+#line 2711 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {    
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
     // Used for call and invoke instructions
-    yyval.ValueRefList = new ValueRefList();
-    ValueRefListEntry E; E.Attrs = yyvsp[0].ParamAttrs; E.Val = getVal(yyvsp[-2].TypeVal->get(), yyvsp[-1].ValIDVal);
-    yyval.ValueRefList->push_back(E);
-    delete yyvsp[-2].TypeVal;
-  }
+    (yyval.ValueRefList) = new ValueRefList();
+    ValueRefListEntry E; E.Attrs = (yyvsp[(3) - (3)].ParamAttrs); E.Val = getVal((yyvsp[(1) - (3)].TypeVal)->get(), (yyvsp[(2) - (3)].ValIDVal));
+    (yyval.ValueRefList)->push_back(E);
+    delete (yyvsp[(1) - (3)].TypeVal);
+  ;}
     break;
 
-  case 268:
-#line 2719 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 269:
+#line 2720 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    yyval.ValueRefList = yyvsp[-4].ValueRefList;
-    ValueRefListEntry E; E.Attrs = yyvsp[0].ParamAttrs; E.Val = getVal(yyvsp[-2].TypeVal->get(), yyvsp[-1].ValIDVal);
-    yyval.ValueRefList->push_back(E);
-    delete yyvsp[-2].TypeVal;
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
+    (yyval.ValueRefList) = (yyvsp[(1) - (5)].ValueRefList);
+    ValueRefListEntry E; E.Attrs = (yyvsp[(5) - (5)].ParamAttrs); E.Val = getVal((yyvsp[(3) - (5)].TypeVal)->get(), (yyvsp[(4) - (5)].ValIDVal));
+    (yyval.ValueRefList)->push_back(E);
+    delete (yyvsp[(3) - (5)].TypeVal);
     CHECK_FOR_ERROR
-  }
-    break;
-
-  case 269:
-#line 2728 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.ValueRefList = new ValueRefList(); }
+  ;}
     break;
 
   case 270:
-#line 2731 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    { yyval.ValueList = new std::vector<Value*>(); }
+#line 2729 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ValueRefList) = new ValueRefList(); ;}
     break;
 
   case 271:
-#line 2732 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    yyval.ValueList = yyvsp[-2].ValueList;
-    yyval.ValueList->push_back(yyvsp[0].ValueVal);
-    CHECK_FOR_ERROR
-  }
+#line 2732 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
   case 272:
-#line 2739 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2733 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.BoolVal = true;
+    (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
+    (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 273:
-#line 2743 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2740 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.BoolVal = false;
+    (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 274:
-#line 2748 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2744 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {
+    (yyval.BoolVal) = false;
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 275:
+#line 2749 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    if (!(*yyvsp[-3].TypeVal)->isInteger() && !(*yyvsp[-3].TypeVal)->isFloatingPoint() && 
-        !isa<VectorType>((*yyvsp[-3].TypeVal).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
+    if (!(*(yyvsp[(2) - (5)].TypeVal))->isInteger() && !(*(yyvsp[(2) - (5)].TypeVal))->isFloatingPoint() && 
+        !isa<VectorType>((*(yyvsp[(2) - (5)].TypeVal)).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands");
-    if (isa<VectorType>((*yyvsp[-3].TypeVal).get()) && 
-        (yyvsp[-4].BinaryOpVal == Instruction::URem || 
-         yyvsp[-4].BinaryOpVal == Instruction::SRem ||
-         yyvsp[-4].BinaryOpVal == Instruction::FRem))
+    if (isa<VectorType>((*(yyvsp[(2) - (5)].TypeVal)).get()) && 
+        ((yyvsp[(1) - (5)].BinaryOpVal) == Instruction::URem || 
+         (yyvsp[(1) - (5)].BinaryOpVal) == Instruction::SRem ||
+         (yyvsp[(1) - (5)].BinaryOpVal) == Instruction::FRem))
       GEN_ERROR("Remainder not supported on vector types");
-    Value* val1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal); 
+    Value* val1 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(3) - (5)].ValIDVal)); 
     CHECK_FOR_ERROR
-    Value* val2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
+    Value* val2 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(5) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = BinaryOperator::create(yyvsp[-4].BinaryOpVal, val1, val2);
-    if (yyval.InstVal == 0)
+    (yyval.InstVal) = BinaryOperator::create((yyvsp[(1) - (5)].BinaryOpVal), val1, val2);
+    if ((yyval.InstVal) == 0)
       GEN_ERROR("binary operator returned null");
-    delete yyvsp[-3].TypeVal;
-  }
+    delete (yyvsp[(2) - (5)].TypeVal);
+  ;}
     break;
 
-  case 275:
-#line 2769 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 276:
+#line 2770 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    if (!(*yyvsp[-3].TypeVal)->isInteger()) {
-      if (Instruction::isShift(yyvsp[-4].BinaryOpVal) || !isa<VectorType>(yyvsp[-3].TypeVal->get()) ||
-          !cast<VectorType>(yyvsp[-3].TypeVal->get())->getElementType()->isInteger())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
+    if (!(*(yyvsp[(2) - (5)].TypeVal))->isInteger()) {
+      if (Instruction::isShift((yyvsp[(1) - (5)].BinaryOpVal)) || !isa<VectorType>((yyvsp[(2) - (5)].TypeVal)->get()) ||
+          !cast<VectorType>((yyvsp[(2) - (5)].TypeVal)->get())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands");
     }
-    Value* tmpVal1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal);
+    Value* tmpVal1 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(3) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
+    Value* tmpVal2 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(5) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = BinaryOperator::create(yyvsp[-4].BinaryOpVal, tmpVal1, tmpVal2);
-    if (yyval.InstVal == 0)
+    (yyval.InstVal) = BinaryOperator::create((yyvsp[(1) - (5)].BinaryOpVal), tmpVal1, tmpVal2);
+    if ((yyval.InstVal) == 0)
       GEN_ERROR("binary operator returned null");
-    delete yyvsp[-3].TypeVal;
-  }
+    delete (yyvsp[(2) - (5)].TypeVal);
+  ;}
     break;
 
-  case 276:
-#line 2786 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 277:
+#line 2787 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    if (isa<VectorType>((*yyvsp[-3].TypeVal).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
+    if (isa<VectorType>((*(yyvsp[(3) - (6)].TypeVal)).get()))
       GEN_ERROR("Vector types not supported by icmp instruction");
-    Value* tmpVal1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal);
+    Value* tmpVal1 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(4) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
+    Value* tmpVal2 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(6) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = CmpInst::create(yyvsp[-5].OtherOpVal, yyvsp[-4].IPredicate, tmpVal1, tmpVal2);
-    if (yyval.InstVal == 0)
+    (yyval.InstVal) = CmpInst::create((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(2) - (6)].IPredicate), tmpVal1, tmpVal2);
+    if ((yyval.InstVal) == 0)
       GEN_ERROR("icmp operator returned null");
-    delete yyvsp[-3].TypeVal;
-  }
+    delete (yyvsp[(3) - (6)].TypeVal);
+  ;}
     break;
 
-  case 277:
-#line 2800 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 278:
+#line 2801 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-3].TypeVal)->getDescription());
-    if (isa<VectorType>((*yyvsp[-3].TypeVal).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
+    if (isa<VectorType>((*(yyvsp[(3) - (6)].TypeVal)).get()))
       GEN_ERROR("Vector types not supported by fcmp instruction");
-    Value* tmpVal1 = getVal(*yyvsp[-3].TypeVal, yyvsp[-2].ValIDVal);
+    Value* tmpVal1 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(4) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*yyvsp[-3].TypeVal, yyvsp[0].ValIDVal);
+    Value* tmpVal2 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(6) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = CmpInst::create(yyvsp[-5].OtherOpVal, yyvsp[-4].FPredicate, tmpVal1, tmpVal2);
-    if (yyval.InstVal == 0)
+    (yyval.InstVal) = CmpInst::create((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(2) - (6)].FPredicate), tmpVal1, tmpVal2);
+    if ((yyval.InstVal) == 0)
       GEN_ERROR("fcmp operator returned null");
-    delete yyvsp[-3].TypeVal;
-  }
+    delete (yyvsp[(3) - (6)].TypeVal);
+  ;}
     break;
 
-  case 278:
-#line 2814 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 279:
+#line 2815 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
-    Value* Val = yyvsp[-2].ValueVal;
-    const Type* DestTy = yyvsp[0].TypeVal->get();
-    if (!CastInst::castIsValid(yyvsp[-3].CastOpVal, Val, DestTy))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
+    Value* Val = (yyvsp[(2) - (4)].ValueVal);
+    const Type* DestTy = (yyvsp[(4) - (4)].TypeVal)->get();
+    if (!CastInst::castIsValid((yyvsp[(1) - (4)].CastOpVal), Val, DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'"); 
-    yyval.InstVal = CastInst::create(yyvsp[-3].CastOpVal, Val, DestTy);
-    delete yyvsp[0].TypeVal;
-  }
+    (yyval.InstVal) = CastInst::create((yyvsp[(1) - (4)].CastOpVal), Val, DestTy);
+    delete (yyvsp[(4) - (4)].TypeVal);
+  ;}
     break;
 
-  case 279:
-#line 2826 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 280:
+#line 2827 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (yyvsp[-4].ValueVal->getType() != Type::Int1Ty)
+    if ((yyvsp[(2) - (6)].ValueVal)->getType() != Type::Int1Ty)
       GEN_ERROR("select condition must be boolean");
-    if (yyvsp[-2].ValueVal->getType() != yyvsp[0].ValueVal->getType())
+    if ((yyvsp[(4) - (6)].ValueVal)->getType() != (yyvsp[(6) - (6)].ValueVal)->getType())
       GEN_ERROR("select value types should match");
-    yyval.InstVal = new SelectInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = new SelectInst((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 280:
-#line 2834 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 281:
+#line 2835 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
-    yyval.InstVal = new VAArgInst(yyvsp[-2].ValueVal, *yyvsp[0].TypeVal);
-    delete yyvsp[0].TypeVal;
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
+    (yyval.InstVal) = new VAArgInst((yyvsp[(2) - (4)].ValueVal), *(yyvsp[(4) - (4)].TypeVal));
+    delete (yyvsp[(4) - (4)].TypeVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 281:
-#line 2841 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 282:
+#line 2842 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!ExtractElementInst::isValidOperands(yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
+    if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
-    yyval.InstVal = new ExtractElementInst(yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = new ExtractElementInst((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 282:
-#line 2847 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 283:
+#line 2848 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!InsertElementInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
+    if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid insertelement operands");
-    yyval.InstVal = new InsertElementInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = new InsertElementInst((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 283:
-#line 2853 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 284:
+#line 2854 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!ShuffleVectorInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
+    if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands");
-    yyval.InstVal = new ShuffleVectorInst(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal);
+    (yyval.InstVal) = new ShuffleVectorInst((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal));
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 284:
-#line 2859 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 285:
+#line 2860 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    const Type *Ty = yyvsp[0].PHIList->front().first->getType();
+    const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
       GEN_ERROR("PHI node operands must be of first class type");
-    yyval.InstVal = new PHINode(Ty);
-    ((PHINode*)yyval.InstVal)->reserveOperandSpace(yyvsp[0].PHIList->size());
-    while (yyvsp[0].PHIList->begin() != yyvsp[0].PHIList->end()) {
-      if (yyvsp[0].PHIList->front().first->getType() != Ty) 
+    (yyval.InstVal) = new PHINode(Ty);
+    ((PHINode*)(yyval.InstVal))->reserveOperandSpace((yyvsp[(2) - (2)].PHIList)->size());
+    while ((yyvsp[(2) - (2)].PHIList)->begin() != (yyvsp[(2) - (2)].PHIList)->end()) {
+      if ((yyvsp[(2) - (2)].PHIList)->front().first->getType() != Ty) 
         GEN_ERROR("All elements of a PHI node must be of the same type");
-      cast<PHINode>(yyval.InstVal)->addIncoming(yyvsp[0].PHIList->front().first, yyvsp[0].PHIList->front().second);
-      yyvsp[0].PHIList->pop_front();
+      cast<PHINode>((yyval.InstVal))->addIncoming((yyvsp[(2) - (2)].PHIList)->front().first, (yyvsp[(2) - (2)].PHIList)->front().second);
+      (yyvsp[(2) - (2)].PHIList)->pop_front();
     }
-    delete yyvsp[0].PHIList;  // Free the list...
+    delete (yyvsp[(2) - (2)].PHIList);  // Free the list...
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
-  case 285:
-#line 2875 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 286:
+#line 2876 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
     const PointerType *PFTy = 0;
     const FunctionType *Ty = 0;
-    if (!(PFTy = dyn_cast<PointerType>(yyvsp[-5].TypeVal->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>((yyvsp[(3) - (8)].TypeVal)->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
       ParamAttrsVector Attrs;
-      if (yyvsp[0].ParamAttrs != ParamAttr::None) {
-        ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = yyvsp[0].ParamAttrs;
+      if ((yyvsp[(8) - (8)].ParamAttrs) != ParamAttr::None) {
+        ParamAttrsWithIndex PAWI; PAWI.index = 0; PAWI.attrs = (yyvsp[(8) - (8)].ParamAttrs);
         Attrs.push_back(PAWI);
       }
       unsigned index = 1;
-      ValueRefList::iterator I = yyvsp[-2].ValueRefList->begin(), E = yyvsp[-2].ValueRefList->end();
+      ValueRefList::iterator I = (yyvsp[(6) - (8)].ValueRefList)->begin(), E = (yyvsp[(6) - (8)].ValueRefList)->end();
       for (; I != E; ++I, ++index) {
         const Type *Ty = I->Val->getType();
         if (Ty == Type::VoidTy)
@@ -5486,11 +5872,11 @@
       if (!Attrs.empty())
         PAL = ParamAttrsList::get(Attrs);
 
-      Ty = FunctionType::get(yyvsp[-5].TypeVal->get(), ParamTypes, false, PAL);
+      Ty = FunctionType::get((yyvsp[(3) - (8)].TypeVal)->get(), ParamTypes, false, PAL);
       PFTy = PointerType::get(Ty);
     }
 
-    Value *V = getVal(PFTy, yyvsp[-4].ValIDVal);   // Get the function we're calling...
+    Value *V = getVal(PFTy, (yyvsp[(4) - (8)].ValIDVal));   // Get the function we're calling...
     CHECK_FOR_ERROR
 
     // Check for call to invalid intrinsic to avoid crashing later.
@@ -5504,7 +5890,7 @@
 
     // Check the arguments 
     ValueList Args;
-    if (yyvsp[-2].ValueRefList->empty()) {                                   // Has no arguments?
+    if ((yyvsp[(6) - (8)].ValueRefList)->empty()) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
       if (Ty->getNumParams() != 0)
         GEN_ERROR("No arguments passed to a function that "
@@ -5515,7 +5901,7 @@
       //
       FunctionType::param_iterator I = Ty->param_begin();
       FunctionType::param_iterator E = Ty->param_end();
-      ValueRefList::iterator ArgI = yyvsp[-2].ValueRefList->begin(), ArgE = yyvsp[-2].ValueRefList->end();
+      ValueRefList::iterator ArgI = (yyvsp[(6) - (8)].ValueRefList)->begin(), ArgE = (yyvsp[(6) - (8)].ValueRefList)->end();
 
       for (; ArgI != ArgE && I != E; ++ArgI, ++I) {
         if (ArgI->Val->getType() != *I)
@@ -5532,174 +5918,164 @@
     }
     // Create the call node
     CallInst *CI = new CallInst(V, &Args[0], Args.size());
-    CI->setTailCall(yyvsp[-7].BoolVal);
-    CI->setCallingConv(yyvsp[-6].UIntVal);
-    yyval.InstVal = CI;
-    delete yyvsp[-2].ValueRefList;
-    delete yyvsp[-5].TypeVal;
+    CI->setTailCall((yyvsp[(1) - (8)].BoolVal));
+    CI->setCallingConv((yyvsp[(2) - (8)].UIntVal));
+    (yyval.InstVal) = CI;
+    delete (yyvsp[(6) - (8)].ValueRefList);
+    delete (yyvsp[(3) - (8)].TypeVal);
     CHECK_FOR_ERROR
-  }
-    break;
-
-  case 286:
-#line 2959 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-    {
-    yyval.InstVal = yyvsp[0].InstVal;
-    CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 287:
-#line 2964 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2960 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.BoolVal = true;
+    (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 288:
-#line 2968 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2965 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    yyval.BoolVal = false;
+    (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 289:
-#line 2975 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2969 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    yyval.InstVal = new MallocInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
-    delete yyvsp[-1].TypeVal;
+    (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
-  }
+  ;}
     break;
 
   case 290:
-#line 2982 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2976 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-4].TypeVal)->getDescription());
-    Value* tmpVal = getVal(yyvsp[-2].PrimType, yyvsp[-1].ValIDVal);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
+    (yyval.InstVal) = new MallocInst(*(yyvsp[(2) - (3)].TypeVal), 0, (yyvsp[(3) - (3)].UIntVal));
+    delete (yyvsp[(2) - (3)].TypeVal);
     CHECK_FOR_ERROR
-    yyval.InstVal = new MallocInst(*yyvsp[-4].TypeVal, tmpVal, yyvsp[0].UIntVal);
-    delete yyvsp[-4].TypeVal;
-  }
+  ;}
     break;
 
   case 291:
-#line 2990 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2983 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-1].TypeVal)->getDescription());
-    yyval.InstVal = new AllocaInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
-    delete yyvsp[-1].TypeVal;
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
+    Value* tmpVal = getVal((yyvsp[(4) - (6)].PrimType), (yyvsp[(5) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-  }
+    (yyval.InstVal) = new MallocInst(*(yyvsp[(2) - (6)].TypeVal), tmpVal, (yyvsp[(6) - (6)].UIntVal));
+    delete (yyvsp[(2) - (6)].TypeVal);
+  ;}
     break;
 
   case 292:
-#line 2997 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2991 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-4].TypeVal)->getDescription());
-    Value* tmpVal = getVal(yyvsp[-2].PrimType, yyvsp[-1].ValIDVal);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
+    (yyval.InstVal) = new AllocaInst(*(yyvsp[(2) - (3)].TypeVal), 0, (yyvsp[(3) - (3)].UIntVal));
+    delete (yyvsp[(2) - (3)].TypeVal);
     CHECK_FOR_ERROR
-    yyval.InstVal = new AllocaInst(*yyvsp[-4].TypeVal, tmpVal, yyvsp[0].UIntVal);
-    delete yyvsp[-4].TypeVal;
-  }
+  ;}
     break;
 
   case 293:
-#line 3005 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2998 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!isa<PointerType>(yyvsp[0].ValueVal->getType()))
-      GEN_ERROR("Trying to free nonpointer type " + 
-                     yyvsp[0].ValueVal->getType()->getDescription() + "");
-    yyval.InstVal = new FreeInst(yyvsp[0].ValueVal);
+    if (!UpRefs.empty())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
+    Value* tmpVal = getVal((yyvsp[(4) - (6)].PrimType), (yyvsp[(5) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-  }
+    (yyval.InstVal) = new AllocaInst(*(yyvsp[(2) - (6)].TypeVal), tmpVal, (yyvsp[(6) - (6)].UIntVal));
+    delete (yyvsp[(2) - (6)].TypeVal);
+  ;}
     break;
 
   case 294:
-#line 3013 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3006 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {
+    if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
+      GEN_ERROR("Trying to free nonpointer type " + 
+                     (yyvsp[(2) - (2)].ValueVal)->getType()->getDescription() + "");
+    (yyval.InstVal) = new FreeInst((yyvsp[(2) - (2)].ValueVal));
+    CHECK_FOR_ERROR
+  ;}
+    break;
+
+  case 295:
+#line 3014 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    if (!isa<PointerType>(yyvsp[-2].TypeVal->get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
+    if (!isa<PointerType>((yyvsp[(3) - (5)].TypeVal)->get()))
       GEN_ERROR("Can't load from nonpointer type: " +
-                     (*yyvsp[-2].TypeVal)->getDescription());
-    if (!cast<PointerType>(yyvsp[-2].TypeVal->get())->getElementType()->isFirstClassType())
+                     (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
+    if (!cast<PointerType>((yyvsp[(3) - (5)].TypeVal)->get())->getElementType()->isFirstClassType())
       GEN_ERROR("Can't load from pointer of non-first-class type: " +
-                     (*yyvsp[-2].TypeVal)->getDescription());
-    Value* tmpVal = getVal(*yyvsp[-2].TypeVal, yyvsp[-1].ValIDVal);
+                     (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
+    Value* tmpVal = getVal(*(yyvsp[(3) - (5)].TypeVal), (yyvsp[(4) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = new LoadInst(tmpVal, "", yyvsp[-4].BoolVal, yyvsp[0].UIntVal);
-    delete yyvsp[-2].TypeVal;
-  }
+    (yyval.InstVal) = new LoadInst(tmpVal, "", (yyvsp[(1) - (5)].BoolVal), (yyvsp[(5) - (5)].UIntVal));
+    delete (yyvsp[(3) - (5)].TypeVal);
+  ;}
     break;
 
-  case 295:
-#line 3027 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 296:
+#line 3028 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    const PointerType *PT = dyn_cast<PointerType>(yyvsp[-2].TypeVal->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
+    const PointerType *PT = dyn_cast<PointerType>((yyvsp[(5) - (7)].TypeVal)->get());
     if (!PT)
       GEN_ERROR("Can't store to a nonpointer type: " +
-                     (*yyvsp[-2].TypeVal)->getDescription());
+                     (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
     const Type *ElTy = PT->getElementType();
-    if (ElTy != yyvsp[-4].ValueVal->getType())
-      GEN_ERROR("Can't store '" + yyvsp[-4].ValueVal->getType()->getDescription() +
+    if (ElTy != (yyvsp[(3) - (7)].ValueVal)->getType())
+      GEN_ERROR("Can't store '" + (yyvsp[(3) - (7)].ValueVal)->getType()->getDescription() +
                      "' into space of type '" + ElTy->getDescription() + "'");
 
-    Value* tmpVal = getVal(*yyvsp[-2].TypeVal, yyvsp[-1].ValIDVal);
+    Value* tmpVal = getVal(*(yyvsp[(5) - (7)].TypeVal), (yyvsp[(6) - (7)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = new StoreInst(yyvsp[-4].ValueVal, tmpVal, yyvsp[-6].BoolVal, yyvsp[0].UIntVal);
-    delete yyvsp[-2].TypeVal;
-  }
+    (yyval.InstVal) = new StoreInst((yyvsp[(3) - (7)].ValueVal), tmpVal, (yyvsp[(1) - (7)].BoolVal), (yyvsp[(7) - (7)].UIntVal));
+    delete (yyvsp[(5) - (7)].TypeVal);
+  ;}
     break;
 
-  case 296:
-#line 3044 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+  case 297:
+#line 3045 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*yyvsp[-2].TypeVal)->getDescription());
-    if (!isa<PointerType>(yyvsp[-2].TypeVal->get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
+    if (!isa<PointerType>((yyvsp[(2) - (4)].TypeVal)->get()))
       GEN_ERROR("getelementptr insn requires pointer operand");
 
-    if (!GetElementPtrInst::getIndexedType(*yyvsp[-2].TypeVal, &(*yyvsp[0].ValueList)[0], yyvsp[0].ValueList->size(), true))
+    if (!GetElementPtrInst::getIndexedType(*(yyvsp[(2) - (4)].TypeVal), &(*(yyvsp[(4) - (4)].ValueList))[0], (yyvsp[(4) - (4)].ValueList)->size(), true))
       GEN_ERROR("Invalid getelementptr indices for type '" +
-                     (*yyvsp[-2].TypeVal)->getDescription()+ "'");
-    Value* tmpVal = getVal(*yyvsp[-2].TypeVal, yyvsp[-1].ValIDVal);
+                     (*(yyvsp[(2) - (4)].TypeVal))->getDescription()+ "'");
+    Value* tmpVal = getVal(*(yyvsp[(2) - (4)].TypeVal), (yyvsp[(3) - (4)].ValIDVal));
     CHECK_FOR_ERROR
-    yyval.InstVal = new GetElementPtrInst(tmpVal, &(*yyvsp[0].ValueList)[0], yyvsp[0].ValueList->size());
-    delete yyvsp[-2].TypeVal; 
-    delete yyvsp[0].ValueList;
-  }
+    (yyval.InstVal) = new GetElementPtrInst(tmpVal, &(*(yyvsp[(4) - (4)].ValueList))[0], (yyvsp[(4) - (4)].ValueList)->size());
+    delete (yyvsp[(2) - (4)].TypeVal); 
+    delete (yyvsp[(4) - (4)].ValueList);
+  ;}
     break;
 
 
+/* Line 1267 of yacc.c.  */
+#line 6072 "llvmAsmParser.tab.c"
+      default: break;
     }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
-/* Line 1016 of /usr/local/share/bison/yacc.c.  */
-#line 5688 "llvmAsmParser.tab.c"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-
-
-#if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
-#endif
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
 
@@ -5727,95 +6103,93 @@
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  int yytype = YYTRANSLATE (yychar);
-	  char *yymsg;
-	  int yyx, yycount;
-
-	  yycount = 0;
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("parse error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[yytype]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
-
-	      if (yycount < 5)
-		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
-		}
-	      yyerror (yymsg);
+#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);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exhausted");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror ("parse error");
+	    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 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
-yyerrlab1:
+
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
-      /* Return failure if at end of input.  */
-      if (yychar == YYEOF)
-        {
-	  /* Pop the error token.  */
-          YYPOPSTACK;
-	  /* Pop the rest of the stack.  */
-	  while (yyssp > yyss)
-	    {
-	      YYDPRINTF ((stderr, "Error: popping "));
-	      YYDSYMPRINT ((stderr,
-			    yystos[*yyssp],
-			    *yyvsp));
-	      YYDPRINTF ((stderr, "\n"));
-	      yydestruct (yystos[*yyssp], *yyvsp);
-	      YYPOPSTACK;
-	    }
-	  YYABORT;
-        }
-
-      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
-		  yychar, yytname[yychar1]));
-      yydestruct (yychar1, yylval);
-      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
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
+  goto yyerrlab1;
 
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -5836,36 +6210,23 @@
       if (yyssp == yyss)
 	YYABORT;
 
-      YYDPRINTF ((stderr, "Error: popping "));
-      YYDSYMPRINT ((stderr,
-		    yystos[*yyssp], *yyvsp));
-      YYDPRINTF ((stderr, "\n"));
-
-      yydestruct (yystos[yystate], *yyvsp);
-      yyvsp--;
-      yystate = *--yyssp;
-
 
-#if YYDEBUG
-      if (yydebug)
-	{
-	  short *yyssp1 = yyss - 1;
-	  YYFPRINTF (stderr, "Error: state stack now");
-	  while (yyssp1 != yyssp)
-	    YYFPRINTF (stderr, " %d", *++yyssp1);
-	  YYFPRINTF (stderr, "\n");
-	}
-#endif
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
     }
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
   *++yyvsp = yylval;
 
 
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
   yystate = yyn;
   goto yynewstate;
 
@@ -5885,25 +6246,43 @@
   goto yyreturn;
 
 #ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-  return yyresult;
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }
 
 
-#line 3061 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 3062 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions


Index: llvm/lib/AsmParser/llvmAsmParser.h.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.74 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.75
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.74	Sun Apr 29 09:43:31 2007
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Sun Apr 29 13:38:24 2007
@@ -1,7 +1,9 @@
-/* A Bison parser, made from /usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y, by GNU bison 1.75.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* 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
@@ -15,16 +17,21 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, 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.  */
+/* 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.
 
-#ifndef BISON_LLVMASMPARSER_TAB_H
-# define BISON_LLVMASMPARSER_TAB_H
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -164,9 +171,11 @@
      SRET = 387,
      NOUNWIND = 388,
      DEFAULT = 389,
-     HIDDEN = 390
+     HIDDEN = 390,
+     PROTECTED = 391
    };
 #endif
+/* Tokens.  */
 #define ESINT64VAL 258
 #define EUINT64VAL 259
 #define ESAPINTVAL 260
@@ -300,13 +309,15 @@
 #define NOUNWIND 388
 #define DEFAULT 389
 #define HIDDEN 390
+#define PROTECTED 391
 
 
 
 
-#ifndef YYSTYPE
-#line 955 "/usr/home/jeffc/llvm/lib/AsmParser/llvmAsmParser.y"
-typedef union {
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 955 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -351,14 +362,14 @@
   llvm::Instruction::OtherOps       OtherOpVal;
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
-} yystype;
-/* Line 1237 of /usr/local/share/bison/yacc.c.  */
-#line 357 "llvmAsmParser.tab.h"
-# define YYSTYPE yystype
+}
+/* Line 1489 of yacc.c.  */
+#line 368 "llvmAsmParser.tab.h"
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 extern YYSTYPE llvmAsmlval;
 
-
-#endif /* not BISON_LLVMASMPARSER_TAB_H */
-






More information about the llvm-commits mailing list