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

Anton Korobeynikov asl at math.spbu.ru
Sun Jan 28 05:37:55 PST 2007



Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.28 -> 1.29
llvmAsmParser.cpp.cvs updated: 1.58 -> 1.59
llvmAsmParser.h.cvs updated: 1.46 -> 1.47
---
Log message:

Regenerate


---
Diffs of the changes:  (+3987 -3606)

 Lexer.cpp.cvs         | 3050 +++++++++++++++++++-----------------
 llvmAsmParser.cpp.cvs | 4189 ++++++++++++++++++++++++++------------------------
 llvmAsmParser.h.cvs   |  354 ++--
 3 files changed, 3987 insertions(+), 3606 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.28 llvm/lib/AsmParser/Lexer.cpp.cvs:1.29
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.28	Fri Jan 26 02:05:27 2007
+++ llvm/lib/AsmParser/Lexer.cpp.cvs	Sun Jan 28 07:37:39 2007
@@ -1,54 +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:
-<<<<<<< Lexer.cpp.cvs
- * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.28 2007/01/26 08:05:27 reid Exp $
-=======
- * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.28 2007/01/26 08:05:27 reid Exp $
->>>>>>> 1.27
- */
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 33
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
 
+/* begin standard C headers. */
 #include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+/* end standard C headers. */
 
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
 #endif
 
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
-#ifdef __cplusplus
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
 
-#include <stdlib.h>
-#include <unistd.h>
+#endif /* ! FLEXINT_H */
 
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
+#ifdef __cplusplus
 
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
@@ -57,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
 
@@ -99,71 +121,88 @@
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN (yy_start) = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE 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 )
+#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;
@@ -200,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
@@ -215,196 +258,201 @@
 	 * 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 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 ));
-static void yy_flex_free YY_PROTO(( void * ));
+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 *  );
 
-#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)
 
+/* Begin user sect3 */
 
-#define YY_USES_REJECT
-
-#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;
+	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 131
-#define YY_END_OF_BUFFER 132
-static yyconst short int yy_acclist[211] =
-    {   0,
-      132,  130,  131,  129,  130,  131,  129,  131,  130,  131,
-      130,  131,  130,  131,  130,  131,  130,  131,  130,  131,
-      122,  130,  131,  122,  130,  131,    1,  130,  131,  130,
-      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
-      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
-      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
-      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
-      131,  130,  131,  121,  119,  118,  118,  125,  123,  127,
-      122,    1,  104,   36,   64,   49,   65,   60,   24,  121,
-      118,  118,  126,  127,   21,  127,  128,   50,   59,   34,
-
-       37,    3,   52,   74,   79,   77,   78,   76,   75,   80,
-       84,  103,   69,   67,   99,   68,   66,   51,   82,   73,
-       71,   72,   70,   83,   81,   61,  120,  127,  127,  101,
-       85,   63,   55,  111,   58,   62,  112,  100,   23,  124,
-       54,   88,   57,   25,    4,   47,   53,   56,   43,   12,
-       87,  127,   31,    2,    5,   44,   90,   46,  113,   86,
-       22,  110,   40,    7,   45,   39,   94,   93,    8,   16,
-      106,  109,   33,   48,   98,   92,  105,   26,   27,   91,
-      107,  102,   97,   38,    6,   28,   89,   32,    9,   18,
-       10,   95,   11,   96,   30,   13,   15,   14,   29,   35,
-
-       17,  108,  114,  116,  117,   41,  115,   19,   42,   20
-    } ;
-
-static yyconst short int yy_accept[537] =
+#define YY_NUM_RULES 134
+#define YY_END_OF_BUFFER 135
+/* 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[539] =
     {   0,
-        1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
-       17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
-       40,   42,   44,   46,   48,   50,   52,   54,   56,   58,
-       60,   62,   64,   66,   68,   70,   72,   74,   74,   75,
-       75,   76,   77,   78,   79,   79,   80,   80,   81,   82,
-       82,   83,   83,   83,   83,   83,   83,   83,   83,   84,
-       84,   85,   85,   85,   85,   85,   85,   85,   85,   86,
-       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-       87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-       87,   88,   88,   88,   88,   88,   88,   88,   89,   89,
-
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       91,   92,   94,   95,   96,   97,   97,   98,   99,   99,
-       99,  100,  100,  100,  101,  101,  101,  101,  102,  102,
-      102,  102,  102,  102,  102,  102,  102,  102,  103,  103,
-      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
-      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
-      103,  103,  104,  104,  105,  106,  107,  108,  109,  110,
-      110,  111,  112,  112,  113,  113,  113,  113,  113,  113,
-
-      114,  115,  116,  116,  116,  116,  117,  118,  118,  118,
-      119,  119,  119,  119,  119,  119,  119,  119,  120,  121,
-      122,  122,  123,  124,  124,  125,  126,  126,  126,  126,
-      126,  126,  126,  126,  126,  127,  127,  127,  128,  129,
-      129,  129,  129,  130,  130,  130,  130,  131,  131,  131,
-      132,  132,  132,  132,  132,  132,  132,  132,  132,  132,
-      132,  132,  132,  132,  132,  133,  134,  134,  134,  134,
-      134,  135,  136,  136,  136,  136,  137,  137,  137,  137,
-      137,  137,  137,  137,  138,  139,  139,  139,  140,  140,
-      140,  141,  142,  142,  142,  143,  143,  143,  143,  144,
-
-      144,  144,  145,  145,  145,  146,  146,  147,  148,  148,
-      148,  148,  148,  149,  149,  150,  150,  151,  151,  151,
-      152,  153,  154,  154,  154,  155,  155,  155,  155,  155,
-      155,  155,  155,  155,  155,  155,  155,  155,  155,  156,
-      156,  157,  158,  158,  158,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,  159,  159,  159,  159,  159,  159,
-      159,  159,  159,  159,  159,  160,  160,  160,  160,  161,
-      161,  162,  162,  162,  162,  162,  162,  162,  162,  163,
-      163,  163,  164,  164,  164,  164,  164,  165,  165,  165,
-      165,  166,  166,  166,  167,  168,  169,  169,  169,  170,
-
-      171,  171,  171,  171,  171,  172,  172,  173,  174,  175,
-      175,  175,  176,  176,  176,  177,  178,  179,  180,  181,
-      181,  182,  183,  183,  183,  183,  183,  183,  184,  184,
-      185,  185,  186,  187,  187,  187,  187,  187,  187,  188,
-      188,  188,  188,  188,  188,  188,  188,  189,  189,  189,
-      189,  189,  189,  189,  189,  189,  190,  190,  190,  190,
-      190,  191,  191,  191,  191,  191,  192,  193,  194,  195,
-      195,  195,  195,  196,  196,  196,  196,  197,  197,  198,
-      199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
-      199,  199,  200,  200,  200,  200,  200,  200,  200,  201,
-
-      201,  201,  201,  201,  202,  202,  202,  202,  202,  202,
-      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
-      203,  203,  203,  204,  204,  205,  206,  206,  207,  207,
-      208,  209,  210,  210,  211,  211
+        0,    0,  135,  133,  132,  132,  133,  133,  133,  133,
+      133,  133,  125,  125,    1,  133,  133,  133,  133,  133,
+      133,  133,  133,  133,  133,  133,  133,  133,  133,  133,
+      133,  133,  133,  133,  133,  133,  133,  133,    0,  123,
+        0,  121,  119,  128,    0,  126,    0,  130,  125,    0,
+        1,    0,  120,  129,    0,    0,    0,    0,    0,    0,
+        0,  105,    0,   36,    0,    0,    0,    0,    0,    0,
+       63,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   48,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   64,    0,    0,    0,    0,    0,    0,   59,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   24,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  123,  119,  130,   21,  130,    0,  131,    0,  124,
+      120,   49,    0,    0,   58,    0,    0,   34,    0,    0,
+        0,   37,    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,    0,   51,    0,   73,   78,   76,
+       77,   75,   74,    0,   79,   83,    0,  104,    0,    0,
+
+        0,    0,    0,   68,   66,  100,    0,    0,    0,   67,
+       65,    0,    0,   50,    0,    0,    0,    0,    0,    0,
+        0,   81,   72,   70,    0,   71,   69,    0,   82,   80,
+        0,    0,    0,    0,    0,    0,    0,    0,   60,    0,
+        0,  122,  130,    0,    0,    0,  130,    0,    0,    0,
+      102,    0,    0,   84,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   62,   54,    0,
+        0,    0,    0,  112,   57,    0,    0,    0,   61,    0,
+        0,    0,    0,    0,    0,    0,    0,  113,  101,    0,
+        0,   23,    0,    0,  127,   53,    0,    0,   87,    0,
+
+        0,    0,   56,   89,    0,    0,   25,    0,    0,    4,
+        0,   46,   52,    0,    0,    0,    0,   55,    0,   42,
+        0,   12,    0,    0,   86,  130,   31,    0,    0,    2,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    5,    0,   43,   91,    0,    0,    0,    0,
+        0,    0,    0,   88,    0,    0,    0,    0,   45,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  114,
+        0,    0,    0,   85,    0,   22,    0,    0,    0,    0,
+        0,    0,    0,  111,    0,    0,   39,    0,    0,    0,
+        7,    0,    0,    0,   44,    0,    0,   38,   95,   94,
+
+        0,    0,    8,   16,    0,    0,    0,    0,  107,    0,
+      110,   33,   47,    0,    0,   99,    0,    0,   93,  106,
+       26,   27,   92,    0,  108,  103,    0,    0,    0,    0,
+        0,   98,    0,    0,    6,   28,    0,    0,    0,    0,
+        0,   90,    0,    0,    0,    0,    0,    0,    0,   32,
+        0,    0,    0,    0,    0,    0,    0,    0,    9,    0,
+        0,    0,    0,   18,    0,    0,    0,    0,   10,   96,
+       11,   97,    0,    0,    0,   30,    0,    0,    0,   13,
+        0,   15,   14,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   29,    0,    0,    0,    0,    0,
+
+        0,   35,    0,    0,    0,    0,   17,    0,    0,    0,
+        0,    0,  109,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  115,    0,  117,  118,    0,
+       40,    0,  116,   19,   41,    0,   20,    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,
@@ -412,14 +460,14 @@
         1,    2,    1,    4,    1,    5,    6,    1,    1,    1,
         1,    1,    7,    1,    8,    9,    1,   10,   11,   11,
        11,   11,   11,   12,   11,   13,   11,   14,   15,    1,
-        1,    1,    1,    1,   16,   16,   16,   16,   17,   16,
+        1,    1,    1,   16,   17,   17,   17,   17,   18,   17,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        1,    1,    1,    1,   18,    1,   19,   20,   21,   22,
+        1,    1,    1,    1,   19,    1,   20,   21,   22,   23,
 
-       23,   24,   25,   26,   27,    5,   28,   29,   30,   31,
-       32,   33,   34,   35,   36,   37,   38,   39,   40,   41,
-       42,   43,    1,    1,    1,    1,    1,    1,    1,    1,
+       24,   25,   26,   27,   28,    5,   29,   30,   31,   32,
+       33,   34,   35,   36,   37,   38,   39,   40,   41,   42,
+       43,   44,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -436,431 +484,445 @@
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[44] =
+static yyconst flex_int32_t yy_meta[45] =
     {   0,
-        1,    1,    2,    1,    3,    1,    1,    3,    3,    3,
-        3,    3,    3,    4,    1,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3
+        1,    1,    2,    3,    4,    1,    1,    4,    4,    4,
+        4,    4,    4,    5,    1,    1,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[541] =
+static yyconst flex_int16_t yy_base[547] =
     {   0,
-        0,    0, 1164, 1165, 1165, 1165, 1159, 1148,   36,   40,
-       44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
-      108,   91,   77,  134,   92,  119,   93,  152,   72,  109,
-      178,  121,  209,  120,  135,  146,  147, 1157, 1165, 1146,
-     1165,    0,  161,  183,  199,  215,   70,  235,  250,  255,
-        0,   68,  140,  128,  165,  154,  101,   46, 1145,   96,
-      168,  206,  162,  177,  259,  188,   49,  208, 1144,  219,
-      267,  176,  172,  207,  268,  227,  256,  270,  229,  264,
-      274,  273,  272,  287,   31,  296,  228,  283,  276,  285,
-     1143,  299,  286,  302,  303,  304,  305,  307,  308,  309,
-
-      316,  317,  318,  320,  319,  322,  332,  329,  324,  323,
-      343,  345,  348, 1142,  350,  334,  351,  336,  357,  354,
-      359,  367,  362,  239,  379,  360,  372,  378,  381, 1141,
-        0,  399,  407, 1140,  421,  438,    0, 1139,  373,  383,
-     1138,  391,  386, 1137,  409,  426,  412, 1136,  415,  389,
-      439,  440,  413,  429,  441,  444,  443, 1135,  446,  425,
-      450,  451,  452,  454,  387,  458,  462,  460,  466,  474,
-      461,  468,  475,  481,  485,  486,  487,  488,  489,  491,
-      492, 1134,  493, 1133, 1132, 1131, 1130, 1129, 1128,  494,
-     1127, 1126,  497, 1125,  525,  500,  513,  498,  515, 1124,
-
-     1123, 1122,  499,  502,  519, 1121, 1120,  526,  518, 1119,
-      517,  529,  541,  543,  546,  545,  547, 1118, 1117, 1116,
-      548, 1115, 1114,  549, 1113, 1112,  550,  551,  553,  556,
-      557,  568,  560,  567, 1111,  570,  575, 1165,  580,  588,
-      594,  603,  608,  580,  505,  594, 1110,  595,  609, 1109,
-      610,  596,  613,  615,  616,  618,  620,  622,  623,  625,
-      624,  626,  628,  627, 1108, 1107,  629,  632,  638,  641,
-     1106, 1105,  642,  643,  644, 1104,  647,  646,  650,  651,
-      654,  658,  659, 1103, 1102,  661,  663, 1101,  664,  666,
-        0, 1100,  670,  674, 1099,  672,  676,  680, 1098,  686,
-
-      687, 1097,  689,  691, 1096,  692, 1095, 1094,  693,  697,
-      696,  700, 1093,  702, 1092,  704, 1091,  708,  709, 1090,
-      714, 1089,  714,  716, 1088,  715,  721,  720,  726,  729,
-      731,  732,  736,  735,  738,  739,  743,  740, 1087,  744,
-     1086, 1085,  745,  746,  749,  753,  750,  755,  761,  756,
-      763,  764,  767, 1084,  768,  771,  773,  775,  774,  770,
-      769,  781,  789,  786, 1083,  790,  791,  794, 1082,  793,
-     1081,  797,  798,  800,  795,  810,  801,  809, 1080,  807,
-      813, 1079,  816,  818,  817,  819, 1078,  821,  822,  823,
-     1077,  827,  829, 1076, 1075, 1074,  830,  834, 1073, 1072,
-
-      835,  838,  846,  839, 1071,  842, 1070, 1069, 1068,  848,
-      853, 1067,  854,  856, 1066, 1065, 1064, 1063, 1062,  855,
-     1061, 1060,  857,  858,  860,  861,  859, 1059,  864, 1058,
-      871, 1057, 1056,  869,  873,  122,  877,  875, 1055,  879,
-      878,  881,  882,  883,  891,  885, 1054,  886,  893,  898,
-      901,  899,  905,  906,  907, 1051,  909,  913,  914,  915,
-     1042,  916,  917,  919,  921, 1041, 1040, 1039, 1038,  923,
-      920,  935, 1036,  938,  939,  940, 1035,  925, 1033, 1032,
-      946,  943,  926,  950,  947,  954,  956,  957,  959,  958,
-      960, 1031,  962,  966,  967,  968,  969,  970, 1027,  971,
-
-      974,  975,  977, 1025,  985,  981,  983,  984,  987, 1024,
-      988,  995,  997,  998,  999, 1000, 1006, 1007, 1009, 1012,
-     1008, 1011, 1023, 1013,  928,  705, 1014,  675, 1017,  465,
-      464,  463, 1022,  390, 1165, 1057, 1059,  286, 1063,  252
+        0,    0, 1173, 1174, 1174, 1174, 1168, 1157,   35,   39,
+       43,   49,   55,   61,    0,   72,   64,   67,   66,   86,
+       76,  106,   91,   65,  133,  121,  117,   78,  152,   95,
+       90,  179,  137,  211,  139,   99,  148,  110, 1166, 1174,
+     1155, 1174,    0,   49,  185,  217,   98,  238,  254,  259,
+        0, 1164,    0,  200,  116,  149,  146,  118,  160,   63,
+      154, 1153,  153,  186,  208,  161,  264,  171,  205,  200,
+     1152,  219,  260,  222,  176,  228,  261,  124,  273,  274,
+      231,  269,  278,  279,  280,  281,  282,  290,  232,  202,
+      289,  291, 1151,  292,  294,  301,  309,  310,  312,  305,
+
+      313,  316,  317,  321,  322,  323,  324,  328,  326,  330,
+      332,  337,  345,  329,  346, 1150,  347,  355,  357,  358,
+      359,  362,  363,  380,  364,  241,  377,  370,  113,  366,
+      378, 1149,    0,  399, 1148,  414,  432,    0, 1157, 1174,
+        0, 1146,  382,  365, 1145,  405,  401, 1144,  367,  408,
+      404, 1143,  427,  417,  433,  419,  434,  421,  441,  385,
+     1142,  442,  422,  438,  443,  444,  447,  446,  449,  450,
+      456,  454,  469,  457,  459,  472,  473,  476,  465,  479,
+      480,  481,  485,  487,  488, 1141,  492, 1140, 1139, 1138,
+     1137, 1136, 1135,  491, 1134, 1133,  493, 1132,  522,  496,
+
+      499,  494,  510, 1131, 1130, 1129,  498,  501,  497, 1128,
+     1127,  524,  505, 1126,  514,  535,  537,  536,  540,  542,
+      539, 1125, 1124, 1123,  543, 1122, 1121,  544, 1120, 1119,
+      545,  546,  547,  553,  506,  557,  561,  566, 1118,  567,
+      568, 1174,  581,  576,  585,  597,  602,  587,  603,  588,
+     1117,  589,  604, 1116,  608,  590,  609,  612,  613,  615,
+      617,  619,  621,  620,  622,  623,  624, 1115, 1114,  626,
+      627,  630,  634, 1113, 1112,  638,  635,  639, 1111,  646,
+      640,  643,  644,  648,  647,  657,  658, 1110, 1109,  660,
+      664, 1108,  661,  663,    0, 1107,  669,  668, 1106,  670,
+
+      674,  678, 1105, 1104,  675,  687, 1103,  688,  690, 1102,
+      691, 1101, 1100,  692,  693,  694,  696, 1099,  697, 1098,
+      701, 1097,  705,  707, 1096,  712, 1095,  712,  713, 1094,
+      715,  723,  720,  724,  717,  727,  729,  732,  733,  734,
+      740,  735, 1093,  741, 1092, 1091,  742,  745,  746,  747,
+      750,  751,  748, 1090,  754,  755,  760,  761, 1089,  763,
+      762,  767,  772,  774,  768,  775,  776,  779,  783, 1088,
+      784,  785,  786, 1087,  791, 1086,  793,  789,  794,  800,
+      802,  795,  804, 1085,  807,  805, 1084,  810,  812,  813,
+     1083,  815,  816,  817, 1082,  820,  818, 1081, 1080, 1079,
+
+      824,  827, 1078, 1077,  830,  833,  831,  834, 1076,  839,
+     1075, 1074, 1073,  845,  846, 1072,  849,  850, 1071, 1070,
+     1069, 1068, 1067,  852, 1066, 1065,  851,  848,  853,  854,
+      855, 1064,  856,  857, 1063, 1062,  860,  866,  869,  870,
+      874, 1061,  875,  872,  877,  878,  879,  881,  883, 1060,
+      887,  889,  892,  895,  897,  900,  902,  903, 1059,  904,
+      906,  909,  910, 1058,  911,  914,  912,  918, 1057, 1056,
+     1055, 1054,  924,  917,  916, 1053,  931,  935,  937, 1042,
+      919, 1032, 1031,  938,  940,  922,  942,  945,  947,  949,
+      952,  953,  954,  957, 1030,  956,  958,  960,  961,  964,
+
+      965, 1028,  966,  967,  972,  977, 1027,  969,  978,  981,
+      982,  984, 1025,  990,  986,  987,  991,  992,  996,  997,
+      998,  999, 1004,  672, 1005, 1024, 1008, 1022, 1019, 1010,
+     1017, 1013, 1016,  671,  502, 1011,  458, 1174, 1047, 1049,
+      254, 1054, 1057,  220, 1061,  167
     } ;
 
-static yyconst short int yy_def[541] =
+static yyconst flex_int16_t yy_def[547] =
     {   0,
-      535,    1,  535,  535,  535,  535,  536,  537,  538,  535,
-      537,  537,  537,  537,  539,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  536,  535,  537,
-      535,  540,  540,  535,  535,  537,  537,  537,  537,  537,
-      539,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,   24,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  535,
-      540,  540,  535,  537,  537,  537,   50,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,   50,  537,  537,  537,  537,  537,
-
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  535,  535,  535,
-      535,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      195,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      535,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,    0,  535,  535,  535,  535,  535
+      538,    1,  538,  538,  538,  538,  539,  540,  541,  538,
+      540,  540,  540,  540,  542,  543,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  539,  538,
+      540,  538,  544,  538,  538,  540,  540,  540,  540,  540,
+      542,  545,  546,  538,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,   25,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  538,  544,  538,  540,  540,  540,   50,  545,  538,
+      546,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,   50,  540,
+
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  538,  538,  538,  538,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  199,  540,  540,  540,  540,  540,
+
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  538,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,    0,  538,  538,
+      538,  538,  538,  538,  538,  538
     } ;
 
-static yyconst short int yy_nxt[1209] =
+static yyconst flex_int16_t yy_nxt[1219] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-       14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
-       18,   19,   20,   21,   22,   23,   24,    8,   25,   26,
-       27,   28,   29,    8,   30,   31,   32,   33,   34,   35,
-       36,    8,   37,   43,   41,   44,   44,   44,   44,   45,
-       45,   45,   45,   46,   46,   46,   46,   41,   47,   41,
-       41,  177,   41,   41,   48,   49,   49,   49,   49,   41,
-       48,   49,   49,   49,   49,   41,   41,   68,  134,   41,
-       69,   41,  146,   41,   52,   41,  157,   70,   57,  138,
-       41,   53,   58,   54,   41,   55,   50,   99,   56,   60,
-
-       59,   61,   41,   79,   41,   41,   41,   64,  100,   41,
-       84,   65,   62,   77,   41,   91,   63,   66,   85,   78,
-       67,   41,   41,   86,  147,  145,   71,   87,   72,   73,
-       92,  101,   41,   41,   41,   41,   74,   88,  124,  113,
-       75,   41,   76,   80,   80,   80,   80,   41,   41,  141,
-       89,  125,  114,   41,   81,  115,   90,  126,  127,   41,
-       41,  460,  116,   82,   83,   41,  139,   41,  140,  129,
-      132,  132,  132,  132,   93,   41,   94,  128,   41,  143,
-       95,   41,   96,  144,   97,   41,   98,  102,  148,   41,
-       41,   41,   44,   44,   44,   44,  151,  142,  163,  103,
-
-      104,   41,  105,  106,  107,  162,  108,  133,   45,   45,
-       45,   45,  109,  152,  110,  111,  156,  112,  102,   41,
-       41,   41,   41,   48,   46,   46,   46,   46,   41,  158,
-      117,  118,   41,  119,  149,  120,  150,  121,  164,  122,
-       41,   41,   41,  123,  135,  135,  135,  135,   41,  167,
-      170,  136,   41,  179,  131,  159,  230,  136,   48,   49,
-       49,   49,   49,   41,  137,  137,  137,  137,   41,   41,
-      137,  137,   41,  137,  137,  137,  137,  137,  137,  153,
-       41,   41,  154,   41,   40,   41,   41,   41,   42,   41,
-      165,  155,  168,   40,   40,  160,   41,  181,   41,   41,
-
-       41,  169,  161,  171,  166,  172,  176,  173,  174,   41,
-      175,  180,   41,  182,  178,   41,   41,   41,   41,  184,
-       41,   41,   41,  190,  185,  187,  189,  183,  191,   41,
-       41,   41,   41,   41,  192,   41,   41,   41,  186,  188,
-      197,  200,   41,  193,  196,   41,  208,   41,  198,   41,
-      202,  206,  194,  204,  209,  201,   41,  195,   41,  203,
-      199,   41,  210,   41,   41,  207,  216,   41,  205,  218,
-       41,  211,   41,   41,  212,   41,  214,  217,  233,  219,
-       41,  222,  213,  234,  229,   41,   41,  215,  224,  225,
-      221,   41,   41,  220,   41,  223,   41,  244,  226,   41,
-
-       41,  227,   41,   41,   41,  231,  228,  232,  132,  132,
-      132,  132,  235,  246,  245,  236,  239,  239,  239,  239,
-      247,  237,   41,  240,  252,   41,   41,  268,   41,  240,
-      135,  135,  135,  135,   41,  248,  251,  136,   41,   41,
-      250,  255,   41,  136,  241,  242,  249,  243,  243,  243,
-      243,   41,   41,   41,   41,  256,   41,   41,  254,   41,
-      263,  253,  260,   41,   41,   41,  258,   41,  261,  257,
-      259,   41,  267,   41,   41,   41,   41,   41,   41,   41,
-      262,   41,  273,  265,  271,  274,  264,   41,   41,  269,
-      266,  272,  270,  276,   41,  275,  277,  278,   41,   41,
-
-       41,   41,   41,  279,   41,   41,   41,   41,  282,  284,
-       41,   41,   41,   41,  283,   41,  281,  280,   41,  286,
-      294,  288,  296,  285,  297,  323,   41,  289,   41,  287,
-       41,   41,   41,  290,  291,  291,  291,  291,  292,   41,
-      291,  291,   41,  291,  291,  291,  291,  291,  291,  293,
-      298,  295,  300,  301,   41,  299,   41,  302,   41,   41,
-       41,   41,   41,   41,   41,  303,   41,  307,  305,   41,
-       41,  310,  311,   41,  314,  304,  306,  312,  315,  309,
-       41,   41,  313,   41,  318,  308,  316,  317,   41,  239,
-      239,  239,  239,   41,  241,  241,  240,  321,  321,  321,
-
-      321,  319,  240,  321,  321,  321,  321,   41,   41,   41,
-      322,  320,  243,  243,  243,  243,   41,  243,  243,  243,
-      243,   41,   41,   41,  324,  325,   41,  326,   41,   41,
-      327,   41,  328,   41,  331,   41,   41,   41,   41,   41,
-       41,   41,   41,  330,  338,   41,  333,  340,  332,  329,
-      339,   41,  335,  336,   41,   41,   41,   41,  337,   41,
-       41,  347,  334,   41,   41,  341,  348,   41,  342,  349,
-      346,   41,   41,  343,   41,  344,   41,   41,  345,   41,
-      350,  353,  352,   41,  351,   41,  354,   41,   41,   41,
-      355,  357,  356,   41,  361,  362,  360,  359,  363,   41,
-
-       41,  358,   41,  364,   41,   41,   41,  366,  365,   41,
-       41,  367,  369,   41,  372,   41,  370,   41,   41,  368,
-      371,   41,   41,  321,  321,  321,  321,   41,   41,   41,
-      373,  376,  379,   41,   41,  378,  374,  380,  383,   41,
-      375,  382,   41,  377,   41,   41,  384,  385,   41,   41,
-      381,   41,   41,   41,  387,  388,   41,   41,   41,   41,
-      393,  391,   41,   41,  394,  386,   41,  389,   41,   41,
-      390,  395,  396,  392,   41,  398,   41,   41,  399,  397,
-       41,   41,   41,   41,   41,  400,   41,   41,   41,  405,
-      401,  407,  402,  403,   41,  408,  404,  409,  406,   41,
-
-      410,  411,   41,   41,   41,  412,   41,   41,   41,  413,
-       41,   41,  414,   41,   41,  416,  418,  420,  415,  421,
-       41,  423,   41,   41,  422,  419,   41,  417,  424,   41,
-       41,   41,   41,  427,   41,   41,   41,  425,  430,  426,
-       41,  432,   41,   41,  436,  437,  429,   41,   41,  428,
-      439,   41,   41,  434,  435,   41,  433,  441,  431,   41,
-      442,   41,  445,  440,  443,  438,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,  444,  448,   41,  446,  449,
-      450,  453,   41,  447,   41,  451,   41,  454,   41,  455,
-       41,   41,   41,  452,   41,   41,   41,  462,   41,   41,
-
-      456,  463,  457,  458,   41,  461,   41,  459,  464,  465,
-      466,   41,   41,  468,   41,  471,  472,  467,   41,   41,
-       41,  469,   41,  473,  470,  475,   41,   41,   41,   41,
-       41,  477,   41,   41,   41,  474,   41,  481,   41,   41,
-      487,   41,  476,  485,  482,  486,  478,  483,   41,  479,
-      480,   41,   41,   41,  488,  484,   41,  490,  489,   41,
-       41,  492,  495,   41,  493,  494,  491,   41,  496,   41,
-       41,   41,   41,   41,  498,   41,  497,  501,  503,   41,
-       41,   41,   41,   41,   41,  500,  502,   41,   41,  504,
-       41,  508,  499,  510,   41,  505,   41,   41,   41,  506,
-
-       41,   41,  511,  512,  507,  513,  509,  514,   41,  516,
-       41,   41,   41,   41,  517,  520,  519,  515,  518,   41,
-       41,   41,   41,  521,   41,   41,   41,   41,  522,  527,
-       41,  524,  528,  523,  532,   41,   41,   41,   41,  533,
-       41,  526,  525,  531,   41,   41,   41,  530,   41,   41,
-      529,   41,   41,   41,   41,   41,  534,   38,   38,   38,
-       38,   40,   40,   51,   41,   51,   51,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,  238,   41,   41,   41,   41,   41,
-      130,   41,   39,  535,    3,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
+       14,   14,   14,    4,   15,   16,    8,    8,    8,   17,
+       18,   19,   20,   21,   22,   23,   24,   25,    8,   26,
+       27,   28,   29,   30,    8,   31,   32,   33,   34,   35,
+       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,  149,   42,
+       60,   42,   81,   56,   61,   57,   50,   58,   65,   42,
+
+       59,   93,   62,   42,   42,   66,  135,   70,   42,   67,
+       71,   42,   42,  103,   79,   68,   94,   72,   69,   42,
+       80,  101,  128,   42,  238,   73,   42,   74,   75,   42,
+       42,   42,  102,  131,   42,   76,   90,   42,  142,   77,
+       86,   78,   82,   82,   82,   82,   42,  170,   87,   91,
+       42,  146,   42,   88,   83,   92,  115,   89,  126,   42,
+      129,   42,   42,   84,   85,   42,   42,   42,  145,  116,
+      141,  127,  117,   42,   42,   95,  143,   96,  144,  118,
+      130,   97,  151,   98,   42,   99,  147,  100,  104,   42,
+      148,  150,   42,  134,   45,   45,   45,   45,  155,   42,
+
+      159,  105,  106,  166,  107,  108,  109,  152,  110,   54,
+       54,   54,   54,   42,  111,   42,  112,  113,   42,  114,
+      104,   42,  161,  133,   42,   48,   46,   46,   46,   46,
+       42,  184,   42,  119,  120,   42,  121,  153,  122,  154,
+      123,   42,  124,  160,   42,   42,  125,  136,  136,  136,
+      136,   42,  165,  173,   42,  137,  162,   43,  183,  234,
+      167,  137,   48,   49,   49,   49,   49,   42,  138,  138,
+      138,  138,   42,   42,   42,  138,  138,   42,  138,  138,
+      138,  138,  138,  138,  168,  156,   42,   42,  157,  163,
+       41,   42,   42,   42,   42,   42,  164,  158,  169,   41,
+
+       41,  180,   42,   42,   42,   42,  172,   42,  174,  182,
+      171,  185,  175,  181,   42,  176,  177,  178,   42,  179,
+      186,  187,   42,   42,  189,   42,   42,  195,  188,   42,
+       42,  194,  191,  193,   42,   42,   42,   42,  190,   42,
+      196,   42,   42,   42,  201,   42,  192,  204,  208,  200,
+       42,  197,  202,  210,  198,  212,  215,  206,   42,   42,
+       42,  205,  199,  209,  203,  214,  207,  211,   42,  213,
+       42,   42,   42,  216,  218,   42,   42,   42,   42,   42,
+       42,  217,  223,   42,  221,  219,  226,  233,  220,  237,
+       42,   42,  222,   42,  252,   42,  224,  249,   42,  225,
+
+      227,  239,  228,  229,  235,  263,  236,  248,  243,  243,
+      243,  243,  230,  240,   42,  231,  244,   42,   42,  241,
+      232,   42,  244,  136,  136,  136,  136,   42,  250,  253,
+       42,  137,   42,  254,   42,   42,  251,  137,  245,  246,
+       42,  247,  247,  247,  247,   42,   42,   42,  258,  255,
+      260,   42,  257,  256,   42,   42,   42,   42,  266,   42,
+       42,  259,   42,   42,  261,  264,  270,   42,  262,   42,
+       42,   42,   42,  274,  277,  267,  268,  265,   42,  276,
+      275,  272,   42,  269,  273,   42,   42,  271,  280,   42,
+      279,  278,   42,   42,   42,  281,  282,  285,   42,  283,
+
+       42,   42,  286,  288,   42,   42,   42,   42,  287,   42,
+       42,   42,   42,  284,   42,   42,  290,  298,   42,   42,
+      289,  292,  300,   42,  301,  293,  291,   42,  320,  302,
+      294,  295,  295,  295,  295,  296,  297,   42,  295,  295,
+      305,  295,  295,  295,  295,  295,  295,  299,   42,   42,
+       42,  306,   42,   42,  303,   42,   42,   42,   42,   42,
+       42,  304,  308,  310,  307,  312,   42,  315,  316,  309,
+       42,  311,  319,  317,   42,  314,  321,  318,  313,   42,
+       42,   42,  245,  245,  323,  326,  326,  326,  326,  322,
+      243,  243,  243,  243,  326,  326,  326,  326,  244,  324,
+
+       42,   42,   42,   42,  244,  325,  247,  247,  247,  247,
+       42,  247,  247,  247,  247,   42,   42,   42,  327,  329,
+      330,   42,   42,  331,  328,   42,   42,  333,   42,  332,
+       42,  335,   42,   42,   42,   42,   42,   42,  334,   42,
+       42,  342,  337,   42,  336,  344,  343,   42,   42,  339,
+      340,   42,   42,   42,  351,  341,   42,   42,  338,   42,
+       42,   42,  352,  345,  346,  354,  347,  350,  348,  353,
+       42,   42,  349,   42,   42,  358,   42,   42,  355,  356,
+      357,   42,   42,   42,   42,   42,  359,   42,   42,  366,
+      360,   42,  361,  362,  367,  364,  365,  368,  370,  363,
+
+       42,   42,  369,   42,   42,   42,   42,   42,  371,   42,
+       42,  372,  374,  377,   42,  532,  375,  376,   42,  373,
+       42,  326,  326,  326,  326,   42,   42,  378,   42,  381,
+       42,  384,  379,   42,  383,  385,   42,   42,  380,  388,
+       42,  382,   42,  389,  387,   42,   42,   42,   42,  392,
+      391,  386,  390,   42,   42,   42,  397,  395,   42,   42,
+       42,   42,  398,   42,   42,  393,  394,   42,   42,  399,
+      402,  396,  400,   42,   42,   42,   42,  401,  405,  403,
+       42,   42,  404,  411,  409,   42,  407,   42,   42,   42,
+      412,  406,   42,  408,  410,  413,   42,   42,   42,   42,
+
+      415,  414,   42,  418,   42,  417,   42,   42,   42,  422,
+      420,  425,  416,   42,  424,   42,  419,   42,   42,  426,
+       42,  428,  421,   42,  423,   42,   42,  427,   42,   42,
+       42,   42,  429,   42,  431,  430,  435,   42,  439,  440,
+       42,  433,  432,   42,   42,  442,   42,   42,  437,  438,
+      446,  436,   42,  444,  434,  441,  445,  443,   42,   42,
+      448,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,  447,  451,   42,  452,  456,  449,  450,  453,   42,
+      454,  457,   42,   42,  455,   42,  458,   42,   42,  460,
+       42,   42,   42,  459,   42,  461,   42,  465,  466,  464,
+
+       42,  462,   42,  467,  471,   42,  468,  469,   42,  463,
+       42,  475,  474,   42,  470,   42,   42,   42,  476,   42,
+      472,  478,   42,   42,   42,   42,  473,   42,  480,   42,
+       42,   42,   42,  484,  477,   42,  491,   42,  490,  479,
+      485,  488,  481,  482,   42,  486,  483,  489,   42,  487,
+       42,   42,  492,   42,  493,   42,  495,  496,   42,  498,
+       42,  499,   42,  497,  494,   42,   42,   42,  501,   42,
+       42,   42,  504,   42,   42,  500,  506,   42,   42,   42,
+       42,  503,   42,  505,  507,   42,  502,  511,  508,  513,
+       42,   42,  517,  509,   42,   42,  514,   42,  510,   42,
+
+       42,  515,  512,   42,   42,   42,  516,  523,  519,   42,
+       42,   42,   42,  520,  524,  518,  521,   42,   42,  522,
+      530,   42,  525,   42,   42,  531,   42,  526,  527,   42,
+       42,  535,   42,  529,  528,   42,  536,   42,   42,  534,
+       42,   42,  533,   42,   42,   42,  537,   39,   39,   39,
+       39,   39,   41,   41,   51,   42,   51,   51,   51,   53,
+       53,  139,  139,  139,  139,  139,   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,   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,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+      140,   42,  242,   42,   42,   42,   42,  140,   42,  132,
+       42,   40,  538,    3,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
 
-      535,  535,  535,  535,  535,  535,  535,  535
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538
     } ;
 
-static yyconst short int yy_chk[1209] =
+static yyconst flex_int16_t yy_chk[1219] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    9,   85,    9,    9,    9,    9,   10,
-       10,   10,   10,   11,   11,   11,   11,   11,   12,   58,
-       20,   85,   67,   12,   13,   13,   13,   13,   13,   13,
-       14,   14,   14,   14,   14,   14,   16,   20,   47,   17,
-       20,   52,   58,   47,   16,   29,   67,   20,   17,   52,
-       23,   16,   17,   16,   18,   16,   13,   29,   16,   18,
-
-       17,   18,   19,   23,   22,   25,   27,   19,   29,   60,
-       25,   19,   18,   22,   57,   27,   18,   19,   25,   22,
-       19,   21,   30,   25,   60,   57,   21,   25,   21,   21,
-       27,   30,   26,   34,   32,  436,   21,   26,   34,   32,
-       21,   54,   21,   24,   24,   24,   24,   24,   35,   54,
-       26,   34,   32,   53,   24,   32,   26,   35,   36,   36,
-       37,  436,   32,   24,   24,   28,   53,   56,   53,   37,
-       43,   43,   43,   43,   28,   63,   28,   36,   55,   56,
-       28,   61,   28,   56,   28,   73,   28,   31,   61,   72,
-       64,   31,   44,   44,   44,   44,   63,   55,   73,   31,
-
-       31,   66,   31,   31,   31,   72,   31,   45,   45,   45,
-       45,   45,   31,   64,   31,   31,   66,   31,   33,   62,
-       74,   68,   33,   46,   46,   46,   46,   46,   46,   68,
-       33,   33,   70,   33,   62,   33,   62,   33,   74,   33,
-       76,   87,   79,   33,   48,   48,   48,   48,   48,   76,
-       79,   48,  124,   87,  540,   70,  124,   48,   49,   49,
-       49,   49,   49,   49,   50,   50,   50,   50,   50,   77,
-       50,   50,   65,   50,   50,   50,   50,   50,   50,   65,
-       71,   75,   65,   78,   80,   83,   82,   81,  538,   89,
-       75,   65,   77,   80,   80,   71,   88,   89,   90,   93,
-
-       84,   78,   71,   81,   75,   82,   84,   83,   83,   86,
-       83,   88,   92,   90,   86,   94,   95,   96,   97,   93,
-       98,   99,  100,   97,   94,   95,   96,   92,   98,  101,
-      102,  103,  105,  104,   99,  106,  110,  109,   94,   95,
-      104,  105,  108,  100,  103,  107,  109,  116,  104,  118,
-      106,  108,  101,  107,  110,  105,  111,  102,  112,  106,
-      104,  113,  111,  115,  117,  108,  116,  120,  107,  118,
-      119,  112,  121,  126,  113,  123,  115,  117,  126,  119,
-      122,  121,  113,  127,  123,  127,  139,  115,  122,  122,
-      120,  128,  125,  119,  129,  121,  140,  139,  122,  143,
-
-      165,  122,  150,  534,  142,  125,  122,  125,  132,  132,
-      132,  132,  128,  142,  140,  129,  133,  133,  133,  133,
-      143,  129,  145,  133,  150,  147,  153,  165,  149,  133,
-      135,  135,  135,  135,  135,  145,  149,  135,  160,  146,
-      147,  153,  154,  135,  136,  136,  146,  136,  136,  136,
-      136,  136,  151,  152,  155,  154,  157,  156,  152,  159,
-      160,  151,  157,  161,  162,  163,  156,  164,  159,  155,
-      156,  166,  164,  168,  171,  167,  532,  531,  530,  169,
-      159,  172,  168,  162,  167,  169,  161,  170,  173,  166,
-      163,  167,  166,  171,  174,  170,  172,  173,  175,  176,
-
-      177,  178,  179,  174,  180,  181,  183,  190,  176,  178,
-      193,  198,  203,  196,  177,  204,  175,  174,  245,  180,
-      198,  183,  203,  179,  204,  245,  197,  190,  199,  181,
-      211,  209,  205,  193,  195,  195,  195,  195,  196,  208,
-      195,  195,  212,  195,  195,  195,  195,  195,  195,  197,
-      205,  199,  209,  211,  213,  208,  214,  212,  216,  215,
-      217,  221,  224,  227,  228,  213,  229,  216,  215,  230,
-      231,  224,  227,  233,  230,  214,  215,  228,  231,  221,
-      234,  232,  229,  236,  234,  217,  232,  233,  237,  239,
-      239,  239,  239,  244,  240,  240,  239,  240,  240,  240,
-
-      240,  236,  239,  241,  241,  241,  241,  246,  248,  252,
-      244,  237,  242,  242,  242,  242,  242,  243,  243,  243,
-      243,  243,  249,  251,  246,  248,  253,  249,  254,  255,
-      251,  256,  252,  257,  255,  258,  259,  261,  260,  262,
-      264,  263,  267,  254,  262,  268,  257,  264,  256,  253,
-      263,  269,  259,  260,  270,  273,  274,  275,  261,  278,
-      277,  274,  258,  279,  280,  267,  275,  281,  268,  277,
-      273,  282,  283,  269,  286,  269,  287,  289,  270,  290,
-      278,  281,  280,  293,  279,  296,  282,  294,  528,  297,
-      283,  287,  286,  298,  294,  296,  293,  290,  297,  300,
-
-      301,  289,  303,  298,  304,  306,  309,  301,  300,  311,
-      310,  303,  306,  312,  311,  314,  309,  316,  526,  304,
-      310,  318,  319,  321,  321,  321,  321,  323,  326,  324,
-      312,  318,  323,  328,  327,  319,  314,  324,  328,  329,
-      316,  327,  330,  318,  331,  332,  329,  330,  334,  333,
-      326,  335,  336,  338,  332,  333,  337,  340,  343,  344,
-      338,  336,  345,  347,  340,  331,  346,  334,  348,  350,
-      335,  343,  344,  337,  349,  346,  351,  352,  347,  345,
-      353,  355,  361,  360,  356,  348,  357,  359,  358,  353,
-      349,  356,  350,  351,  362,  357,  352,  358,  355,  364,
-
-      359,  360,  363,  366,  367,  361,  370,  368,  375,  362,
-      372,  373,  363,  374,  377,  366,  368,  372,  364,  373,
-      380,  375,  378,  376,  374,  370,  381,  367,  376,  383,
-      385,  384,  386,  380,  388,  389,  390,  377,  384,  378,
-      392,  386,  393,  397,  392,  392,  383,  398,  401,  381,
-      397,  402,  404,  389,  390,  406,  388,  401,  385,  403,
-      402,  410,  406,  398,  403,  393,  411,  413,  420,  414,
-      423,  424,  427,  425,  426,  404,  413,  429,  410,  414,
-      420,  425,  434,  411,  431,  423,  435,  426,  438,  427,
-      437,  441,  440,  424,  442,  443,  444,  438,  446,  448,
-
-      429,  440,  431,  434,  445,  437,  449,  435,  441,  442,
-      443,  450,  452,  445,  451,  449,  450,  444,  453,  454,
-      455,  446,  457,  451,  448,  453,  458,  459,  460,  462,
-      463,  455,  464,  471,  465,  452,  470,  460,  478,  483,
-      471,  525,  454,  465,  462,  470,  457,  463,  472,  458,
-      459,  474,  475,  476,  472,  464,  482,  475,  474,  481,
-      485,  478,  483,  484,  481,  482,  476,  486,  484,  487,
-      488,  490,  489,  491,  486,  493,  485,  489,  491,  494,
-      495,  496,  497,  498,  500,  488,  490,  501,  502,  493,
-      503,  497,  487,  500,  506,  494,  507,  508,  505,  495,
-
-      509,  511,  501,  502,  496,  503,  498,  505,  512,  507,
-      513,  514,  515,  516,  508,  512,  511,  506,  509,  517,
-      518,  521,  519,  513,  522,  520,  524,  527,  514,  519,
-      529,  516,  520,  515,  527,  533,  523,  510,  504,  529,
-      499,  518,  517,  524,  492,  480,  479,  522,  477,  473,
-      521,  469,  468,  467,  466,  461,  533,  536,  536,  536,
-      536,  537,  537,  539,  456,  539,  539,  447,  439,  433,
-      432,  430,  428,  422,  421,  419,  418,  417,  416,  415,
-      412,  409,  408,  407,  405,  400,  399,  396,  395,  394,
-      391,  387,  382,  379,  371,  369,  365,  354,  342,  341,
-
-      339,  325,  322,  320,  317,  315,  313,  308,  307,  305,
-      302,  299,  295,  292,  288,  285,  284,  276,  272,  271,
-      266,  265,  250,  247,  235,  226,  225,  223,  222,  220,
-      219,  218,  210,  207,  206,  202,  201,  200,  194,  192,
-      191,  189,  188,  187,  186,  185,  184,  182,  158,  148,
-      144,  141,  138,  134,  130,  114,   91,   69,   59,   40,
-       38,    8,    7,    3,  535,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
+        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,
+       18,   28,   24,   17,   18,   17,   13,   17,   19,   20,
+
+       17,   28,   18,   31,   23,   20,   47,   21,   30,   20,
+       21,   47,   36,   31,   23,   20,   28,   21,   20,   22,
+       23,   30,   36,   38,  129,   22,  129,   22,   22,   55,
+       27,   58,   30,   38,   26,   22,   27,   78,   55,   22,
+       26,   22,   25,   25,   25,   25,   25,   78,   26,   27,
+       33,   58,   35,   26,   25,   27,   33,   26,   35,   57,
+       37,   37,   56,   25,   25,   29,   63,   61,   57,   33,
+      546,   35,   33,   59,   66,   29,   56,   29,   56,   33,
+       37,   29,   63,   29,   68,   29,   59,   29,   32,   75,
+       59,   61,   32,   45,   45,   45,   45,   45,   66,   64,
+
+       68,   32,   32,   75,   32,   32,   32,   64,   32,   54,
+       54,   54,   54,   70,   32,   90,   32,   32,   69,   32,
+       34,   65,   70,  544,   34,   46,   46,   46,   46,   46,
+       46,   90,   72,   34,   34,   74,   34,   65,   34,   65,
+       34,   76,   34,   69,   81,   89,   34,   48,   48,   48,
+       48,   48,   74,   81,  126,   48,   72,  541,   89,  126,
+       76,   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,   80,   67,   73,
+       82,   83,   84,   85,   86,   87,   73,   67,   77,   82,
+
+       82,   86,   91,   88,   92,   94,   80,   95,   83,   88,
+       79,   91,   84,   87,   96,   85,   85,   85,  100,   85,
+       92,   94,   97,   98,   96,   99,  101,  100,   95,  102,
+      103,   99,   97,   98,  104,  105,  106,  107,   96,  109,
+      101,  108,  114,  110,  106,  111,   97,  107,  109,  105,
+      112,  102,  106,  110,  103,  111,  114,  108,  113,  115,
+      117,  107,  104,  109,  106,  113,  108,  110,  118,  112,
+      119,  120,  121,  115,  117,  122,  123,  125,  144,  130,
+      149,  115,  121,  128,  119,  117,  123,  125,  118,  128,
+      127,  131,  120,  124,  149,  143,  121,  144,  160,  122,
+
+      123,  130,  124,  124,  127,  160,  127,  143,  134,  134,
+      134,  134,  124,  131,  147,  124,  134,  151,  146,  131,
+      124,  150,  134,  136,  136,  136,  136,  136,  146,  150,
+      154,  136,  156,  151,  158,  163,  147,  136,  137,  137,
+      153,  137,  137,  137,  137,  137,  155,  157,  156,  153,
+      158,  164,  155,  154,  159,  162,  165,  166,  163,  168,
+      167,  157,  169,  170,  159,  162,  167,  172,  159,  171,
+      174,  537,  175,  170,  172,  164,  165,  162,  179,  171,
+      170,  169,  173,  166,  169,  176,  177,  168,  175,  178,
+      174,  173,  180,  181,  182,  176,  177,  179,  183,  178,
+
+      184,  185,  180,  182,  194,  187,  197,  202,  181,  200,
+      209,  207,  201,  178,  208,  535,  184,  202,  213,  235,
+      183,  187,  207,  203,  208,  194,  185,  215,  235,  209,
+      197,  199,  199,  199,  199,  200,  201,  212,  199,  199,
+      213,  199,  199,  199,  199,  199,  199,  203,  216,  218,
+      217,  215,  221,  219,  212,  220,  225,  228,  231,  232,
+      233,  212,  217,  219,  216,  220,  234,  228,  231,  218,
+      236,  219,  234,  232,  237,  225,  236,  233,  221,  238,
+      240,  241,  244,  244,  238,  244,  244,  244,  244,  237,
+      243,  243,  243,  243,  245,  245,  245,  245,  243,  240,
+
+      248,  250,  252,  256,  243,  241,  246,  246,  246,  246,
+      246,  247,  247,  247,  247,  247,  249,  253,  248,  250,
+      252,  255,  257,  253,  249,  258,  259,  256,  260,  255,
+      261,  258,  262,  264,  263,  265,  266,  267,  257,  270,
+      271,  265,  260,  272,  259,  267,  266,  273,  277,  262,
+      263,  276,  278,  281,  277,  264,  282,  283,  261,  280,
+      285,  284,  278,  270,  271,  281,  272,  276,  272,  280,
+      286,  287,  273,  290,  293,  285,  294,  291,  282,  283,
+      284,  298,  297,  300,  534,  524,  286,  301,  305,  298,
+      287,  302,  290,  291,  300,  294,  297,  301,  305,  293,
+
+      306,  308,  302,  309,  311,  314,  315,  316,  306,  317,
+      319,  308,  311,  316,  321,  524,  314,  315,  323,  309,
+      324,  326,  326,  326,  326,  328,  329,  317,  331,  323,
+      335,  328,  319,  333,  324,  329,  332,  334,  321,  333,
+      336,  323,  337,  334,  332,  338,  339,  340,  342,  337,
+      336,  331,  335,  341,  344,  347,  342,  340,  348,  349,
+      350,  353,  344,  351,  352,  338,  339,  355,  356,  347,
+      350,  341,  348,  357,  358,  361,  360,  349,  353,  351,
+      362,  365,  352,  361,  358,  363,  356,  364,  366,  367,
+      362,  355,  368,  357,  360,  363,  369,  371,  372,  373,
+
+      365,  364,  378,  368,  375,  367,  377,  379,  382,  373,
+      371,  378,  366,  380,  377,  381,  369,  383,  386,  379,
+      385,  381,  372,  388,  375,  389,  390,  380,  392,  393,
+      394,  397,  382,  396,  385,  383,  390,  401,  396,  396,
+      402,  388,  386,  405,  407,  401,  406,  408,  393,  394,
+      407,  392,  410,  405,  389,  397,  406,  402,  414,  415,
+      410,  428,  417,  418,  427,  424,  429,  430,  431,  433,
+      434,  408,  417,  437,  418,  429,  414,  415,  424,  438,
+      427,  430,  439,  440,  428,  444,  431,  441,  443,  434,
+      445,  446,  447,  433,  448,  437,  449,  441,  443,  440,
+
+      451,  438,  452,  444,  448,  453,  445,  446,  454,  439,
+      455,  453,  452,  456,  447,  457,  458,  460,  454,  461,
+      449,  456,  462,  463,  465,  467,  451,  466,  458,  475,
+      474,  468,  481,  463,  455,  486,  475,  473,  474,  457,
+      465,  468,  460,  461,  477,  466,  462,  473,  478,  467,
+      479,  484,  477,  485,  478,  487,  481,  484,  488,  486,
+      489,  487,  490,  485,  479,  491,  492,  493,  489,  496,
+      494,  497,  492,  498,  499,  488,  494,  500,  501,  503,
+      504,  491,  508,  493,  496,  505,  490,  500,  497,  503,
+      506,  509,  508,  498,  510,  511,  504,  512,  499,  515,
+
+      516,  505,  501,  514,  517,  518,  506,  515,  510,  519,
+      520,  521,  522,  511,  516,  509,  512,  523,  525,  514,
+      522,  527,  517,  530,  536,  523,  532,  518,  519,  533,
+      531,  530,  529,  521,  520,  528,  532,  526,  513,  527,
+      507,  502,  525,  495,  483,  482,  536,  539,  539,  539,
+      539,  539,  540,  540,  542,  480,  542,  542,  542,  543,
+      543,  545,  545,  545,  545,  545,  476,  472,  471,  470,
+      469,  464,  459,  450,  442,  436,  435,  432,  426,  425,
+      423,  422,  421,  420,  419,  416,  413,  412,  411,  409,
+      404,  403,  400,  399,  398,  395,  391,  387,  384,  376,
+
+      374,  370,  359,  354,  346,  345,  343,  330,  327,  325,
+      322,  320,  318,  313,  312,  310,  307,  304,  303,  299,
+      296,  292,  289,  288,  279,  275,  274,  269,  268,  254,
+      251,  239,  230,  229,  227,  226,  224,  223,  222,  214,
+      211,  210,  206,  205,  204,  198,  196,  195,  193,  192,
+      191,  190,  189,  188,  186,  161,  152,  148,  145,  142,
+      139,  135,  132,  116,   93,   71,   62,   52,   41,   39,
+        8,    7,    3,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
 
-      535,  535,  535,  535,  535,  535,  535,  535
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538
     } ;
 
-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[135] =
+    {   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 "/Users/resistor/llvm/src/llvm/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
@@ -873,8 +935,7 @@
 //  This file implements the flex scanner for LLVM assembly languages files.
 //
 //===----------------------------------------------------------------------===*/
-#define YY_NEVER_INTERACTIVE 1
-#line 28 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 28 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -883,10 +944,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
@@ -992,13 +1053,13 @@
 
 #define YY_NEVER_INTERACTIVE 1
 /* Comments start with a ; and go till end of line */
-/* Variable(Value) identifiers start with a % sign */
+/* Local Values and Type identifiers start with a % sign */
+/* Global Value identifiers start with an @ sign */
 /* Label identifiers end with a colon */
 /* Quoted names can contain any character except " and \ */
-/* [PN]Integer: match positive and negative literal integer values that
- * are preceeded by a '%' character.  These represent unnamed variable slots.
- */
-/* E[PN]Integer: match positive and negative literal integer values */
+/* LocalVarID/GlobalVarID: match an unnamed local variable slot ID. */
+/* Integer types are specified with i and a bitwidth */
+/* E[PN]Integer: match positive and negative literal integer values. */
 /* FPConstant - A Floating point constant.
  */
 /* HexFPConstant - Floating point constant represented in IEEE format as a
@@ -1007,7 +1068,23 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1007 "Lexer.cpp"
+#line 1072 "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.
@@ -1015,65 +1092,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. */
@@ -1082,12 +1124,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,
@@ -1095,21 +1136,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();" -
@@ -1130,14 +1185,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
+
+extern int llvmAsmlex (void);
+
+#define YY_DECL int llvmAsmlex (void)
+#endif /* !YY_DECL */
 
-/* Code executed at the beginning of each rule, after yytext and yyleng
+/* Code executed at the beginning of each rule, after llvmAsmtext and llvmAsmleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -1152,350 +1213,345 @@
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
+/** The main scanner function which does all the work.
+ */
 YY_DECL
-	{
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-
-#line 188 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+    
+#line 189 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 
 
-#line 1161 "Lexer.cpp"
+#line 1228 "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 >= 536 )
+				if ( yy_current_state >= 539 )
 					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 != 535 );
+		while ( yy_current_state != 538 );
+		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 190 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 191 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 192 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 193 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 193 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 194 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 194 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 195 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 195 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 196 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 196 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 197 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 197 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 198 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DEFINE; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 198 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 199 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 199 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 200 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 200 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 201 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 201 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 202 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 202 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 203 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 203 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 204 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 204 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 205 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 205 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 206 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 206 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 207 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return HIDDEN; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 207 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 208 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 208 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 209 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 209 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 210 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return IMPLEMENTATION; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 210 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 211 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 211 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 212 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 212 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 213 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 213 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 214 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 214 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 215 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 215 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 216 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 216 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 217 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 217 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 218 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 218 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 219 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 219 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 220 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DATALAYOUT; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 220 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 221 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 221 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 222 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 222 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 223 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SECTION; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 223 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 224 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return MODULE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 224 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 225 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ASM_TOK; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 225 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 226 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SIDEEFFECT; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 227 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 228 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return CC_TOK; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 228 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 229 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return CCC_TOK; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 229 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return CSRETCC_TOK; }
-	YY_BREAK
-case 39:
-YY_RULE_SETUP
-#line 230 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 230 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return FASTCC_TOK; }
 	YY_BREAK
-case 40:
+case 39:
 YY_RULE_SETUP
-#line 231 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 231 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return COLDCC_TOK; }
 	YY_BREAK
-case 41:
+case 40:
 YY_RULE_SETUP
-#line 232 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 232 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return X86_STDCALLCC_TOK; }
 	YY_BREAK
-case 42:
+case 41:
 YY_RULE_SETUP
-#line 233 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 233 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return X86_FASTCALLCC_TOK; }
 	YY_BREAK
-case 43:
+case 42:
 YY_RULE_SETUP
-#line 235 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 235 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TY(Type::VoidTy,  VOID);  }
 	YY_BREAK
-case 44:
+case 43:
 YY_RULE_SETUP
-#line 236 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 236 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TY(Type::FloatTy, FLOAT); }
 	YY_BREAK
-case 45:
+case 44:
 YY_RULE_SETUP
-#line 237 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 237 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TY(Type::DoubleTy,DOUBLE);}
 	YY_BREAK
-case 46:
+case 45:
 YY_RULE_SETUP
-#line 238 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 238 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TY(Type::LabelTy, LABEL); }
 	YY_BREAK
-case 47:
+case 46:
 YY_RULE_SETUP
-#line 239 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 239 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TYPE;   }
 	YY_BREAK
-case 48:
+case 47:
 YY_RULE_SETUP
-#line 240 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 240 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return OPAQUE; }
 	YY_BREAK
-case 49:
+case 48:
 YY_RULE_SETUP
-#line 241 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ uint64_t NumBits = atoull(yytext+1);
+#line 241 "/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!");
@@ -1503,398 +1559,429 @@
                   RET_TY(Ty, INTTYPE);
                 }
 	YY_BREAK
-case 50:
+case 49:
 YY_RULE_SETUP
-#line 249 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 249 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
-case 51:
+case 50:
 YY_RULE_SETUP
-#line 250 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 250 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
-case 52:
+case 51:
 YY_RULE_SETUP
-#line 251 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 251 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
-case 53:
+case 52:
 YY_RULE_SETUP
-#line 252 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 252 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
-case 54:
+case 53:
 YY_RULE_SETUP
-#line 253 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 253 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
-case 55:
+case 54:
 YY_RULE_SETUP
-#line 254 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 254 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
-case 56:
+case 55:
 YY_RULE_SETUP
-#line 255 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 255 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
-case 57:
+case 56:
 YY_RULE_SETUP
-#line 256 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 256 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
-case 58:
+case 57:
 YY_RULE_SETUP
-#line 257 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 257 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
-case 59:
+case 58:
 YY_RULE_SETUP
-#line 258 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 258 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
-case 60:
+case 59:
 YY_RULE_SETUP
-#line 259 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 259 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
-case 61:
+case 60:
 YY_RULE_SETUP
-#line 260 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 260 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
-case 62:
+case 61:
 YY_RULE_SETUP
-#line 261 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 261 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal,  ICmp,  ICMP); }
 	YY_BREAK
-case 63:
+case 62:
 YY_RULE_SETUP
-#line 262 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 262 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal,  FCmp,  FCMP); }
 	YY_BREAK
-case 64:
+case 63:
 YY_RULE_SETUP
-#line 263 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 263 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return EQ;  }
 	YY_BREAK
-case 65:
+case 64:
 YY_RULE_SETUP
-#line 264 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 264 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return NE;  }
 	YY_BREAK
-case 66:
+case 65:
 YY_RULE_SETUP
-#line 265 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 265 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SLT; }
 	YY_BREAK
-case 67:
+case 66:
 YY_RULE_SETUP
-#line 266 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 266 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SGT; }
 	YY_BREAK
-case 68:
+case 67:
 YY_RULE_SETUP
-#line 267 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 267 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SLE; }
 	YY_BREAK
-case 69:
+case 68:
 YY_RULE_SETUP
-#line 268 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 268 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SGE; }
 	YY_BREAK
-case 70:
+case 69:
 YY_RULE_SETUP
-#line 269 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 269 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ULT; }
 	YY_BREAK
-case 71:
+case 70:
 YY_RULE_SETUP
-#line 270 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 270 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UGT; }
 	YY_BREAK
-case 72:
+case 71:
 YY_RULE_SETUP
-#line 271 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 271 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ULE; }
 	YY_BREAK
-case 73:
+case 72:
 YY_RULE_SETUP
-#line 272 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 272 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UGE; }
 	YY_BREAK
-case 74:
+case 73:
 YY_RULE_SETUP
-#line 273 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 273 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return OEQ; }
 	YY_BREAK
-case 75:
+case 74:
 YY_RULE_SETUP
-#line 274 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 274 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ONE; }
 	YY_BREAK
-case 76:
+case 75:
 YY_RULE_SETUP
-#line 275 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 275 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return OLT; }
 	YY_BREAK
-case 77:
+case 76:
 YY_RULE_SETUP
-#line 276 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 276 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return OGT; }
 	YY_BREAK
-case 78:
+case 77:
 YY_RULE_SETUP
-#line 277 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 277 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return OLE; }
 	YY_BREAK
-case 79:
+case 78:
 YY_RULE_SETUP
-#line 278 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 278 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return OGE; }
 	YY_BREAK
-case 80:
+case 79:
 YY_RULE_SETUP
-#line 279 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 279 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ORD; }
 	YY_BREAK
-case 81:
+case 80:
 YY_RULE_SETUP
-#line 280 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 280 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UNO; }
 	YY_BREAK
-case 82:
+case 81:
 YY_RULE_SETUP
-#line 281 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 281 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UEQ; }
 	YY_BREAK
-case 83:
+case 82:
 YY_RULE_SETUP
-#line 282 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 282 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UNE; }
 	YY_BREAK
-case 84:
+case 83:
 YY_RULE_SETUP
-#line 284 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 284 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
-case 85:
+case 84:
 YY_RULE_SETUP
-#line 285 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 285 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
-case 86:
+case 85:
 YY_RULE_SETUP
-#line 286 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 286 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, Trunc, TRUNC); }
 	YY_BREAK
-case 87:
+case 86:
 YY_RULE_SETUP
-#line 287 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 287 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, ZExt, ZEXT); }
 	YY_BREAK
-case 88:
+case 87:
 YY_RULE_SETUP
-#line 288 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 288 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, SExt, SEXT); }
 	YY_BREAK
+case 88:
+YY_RULE_SETUP
+#line 289 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return INREG; }
+	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 289 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
+#line 290 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SRET;  }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 290 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPExt, FPEXT); }
+#line 291 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 291 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
+#line 292 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPExt, FPEXT); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 292 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
+#line 293 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 293 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
+#line 294 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 294 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
+#line 295 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 295 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
+#line 296 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 296 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
+#line 297 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 297 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, BitCast, BITCAST); }
+#line 298 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 298 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Select, SELECT); }
+#line 299 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, BitCast, BITCAST); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 299 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shl, SHL); }
+#line 300 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 300 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, LShr, LSHR); }
+#line 301 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Shl, SHL); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 301 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, AShr, ASHR); }
+#line 302 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, LShr, LSHR); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 302 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, VAArg , VAARG); }
+#line 303 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, AShr, ASHR); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 303 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Ret, RET); }
+#line 304 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 304 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Br, BR); }
+#line 305 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 305 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Switch, SWITCH); }
+#line 306 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 306 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Invoke, INVOKE); }
+#line 307 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 307 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unwind, UNWIND); }
+#line 308 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 308 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
+#line 309 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 310 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Malloc, MALLOC); }
+#line 310 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 311 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
+#line 312 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 312 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Free, FREE); }
+#line 313 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 313 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Load, LOAD); }
+#line 314 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 314 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Store, STORE); }
+#line 315 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 315 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
+#line 316 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 317 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
+#line 317 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 318 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+#line 319 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 319 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+#line 320 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 322 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 321 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+	YY_BREAK
+case 119:
+YY_RULE_SETUP
+#line 324 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  UnEscapeLexed(yytext+1);
-                  llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
-                  return VAR_ID;
+                  UnEscapeLexed(llvmAsmtext+1);
+                  llvmAsmlval.StrVal = strdup(llvmAsmtext+1);             // Skip %
+                  return LOCALVAR;
                 }
 	YY_BREAK
-case 119:
+case 120:
+YY_RULE_SETUP
+#line 329 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{
+                  UnEscapeLexed(llvmAsmtext+1);
+                  llvmAsmlval.StrVal = strdup(llvmAsmtext+1);             // Skip @
+                  return GLOBALVAR;
+                }
+	YY_BREAK
+case 121:
 YY_RULE_SETUP
-#line 327 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 334 "/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 120:
+case 122:
+/* rule 122 can match eol */
 YY_RULE_SETUP
-#line 333 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 340 "/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 121:
+case 123:
+/* rule 123 can match eol */
 YY_RULE_SETUP
-#line 340 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 347 "/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 122:
+case 124:
+/* rule 124 can match eol */
 YY_RULE_SETUP
-#line 351 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.UInt64Val = atoull(yytext); return EUINT64VAL; }
+#line 356 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{
+                     llvmAsmtext[strlen(llvmAsmtext)-1] = 0;           // nuke end quote
+                     llvmAsmlval.StrVal = strdup(llvmAsmtext+2);  // Nuke @, quote
+                     return ATSTRINGCONSTANT;
+                   }
 	YY_BREAK
-case 123:
+case 125:
+YY_RULE_SETUP
+#line 364 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.UInt64Val = atoull(llvmAsmtext); return EUINT64VAL; }
+	YY_BREAK
+case 126:
 YY_RULE_SETUP
-#line 352 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 365 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  uint64_t Val = atoull(yytext+1);
+                  uint64_t Val = atoull(llvmAsmtext+1);
                   // +1:  we have bigger negative range
                   if (Val > (uint64_t)INT64_MAX+1)
                     GenerateError("Constant too large for signed 64 bits!");
@@ -1902,97 +1989,97 @@
                   return ESINT64VAL;
                 }
 	YY_BREAK
-case 124:
+case 127:
 YY_RULE_SETUP
-#line 360 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 373 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                   llvmAsmlval.UInt64Val = HexIntToVal(yytext+3);
-                   return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
+                   llvmAsmlval.UInt64Val = HexIntToVal(llvmAsmtext+3);
+                   return llvmAsmtext[0] == 's' ? ESINT64VAL : EUINT64VAL;
                  }
 	YY_BREAK
-case 125:
+case 128:
 YY_RULE_SETUP
-#line 365 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 378 "/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 UINTVAL;
+                  return LOCALVAL_ID;
                 }
 	YY_BREAK
-case 126:
+case 129:
 YY_RULE_SETUP
-#line 372 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 385 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  uint64_t Val = atoull(yytext+2);
-                  // +1:  we have bigger negative range
-                  if (Val > (uint64_t)INT32_MAX+1)
-                    GenerateError("Constant too large for signed 32 bits!");
-                  llvmAsmlval.SIntVal = (int)-Val;
-                  return SINTVAL;
+                  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 127:
+case 130:
 YY_RULE_SETUP
-#line 381 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
+#line 393 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.FPVal = atof(llvmAsmtext); return FPVAL; }
 	YY_BREAK
-case 128:
+case 131:
 YY_RULE_SETUP
-#line 382 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
+#line 394 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.FPVal = HexToFP(llvmAsmtext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 384 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 396 "/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 129:
+case 132:
+/* rule 132 can match eol */
 YY_RULE_SETUP
-#line 392 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 404 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 130:
+case 133:
 YY_RULE_SETUP
-#line 393 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return yytext[0]; }
+#line 405 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return llvmAsmtext[0]; }
 	YY_BREAK
-case 131:
+case 134:
 YY_RULE_SETUP
-#line 395 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 407 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1968 "Lexer.cpp"
+#line 2059 "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
@@ -2002,13 +2089,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
@@ -2021,41 +2108,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;
@@ -2063,30 +2151,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;
@@ -2097,8 +2185,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
  *
@@ -2107,21 +2194,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.
@@ -2141,34 +2227,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 )
 				{
@@ -2181,8 +2263,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. */
@@ -2192,35 +2273,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;
 			}
 		}
@@ -2228,148 +2309,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 >= 536 )
+			if ( yy_current_state >= 539 )
 				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 >= 536 )
+		if ( yy_current_state >= 539 )
 			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 == 535);
-	if ( ! yy_is_jam )
-		*yy_state_ptr++ = yy_current_state;
+	yy_is_jam = (yy_current_state == 538);
 
 	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()
@@ -2383,16 +2457,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();
@@ -2402,174 +2476,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;
-	}
-
-
-#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  );
+}
 
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a llvmAsmrestart() or at EOF.
+ */
+    static void llvmAsm_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-	{
-	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;
@@ -2586,31 +2656,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;
@@ -2622,58 +2784,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.
@@ -2681,148 +2838,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
@@ -2831,24 +3039,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 407 "/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 395 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.58 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.59
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.58	Fri Jan 26 02:05:27 2007
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Sun Jan 28 07:37:39 2007
@@ -1,7 +1,9 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
+/* 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, 2003, 2004, 2005 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
@@ -18,13 +20,21 @@
    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.
+
+   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
@@ -37,7 +47,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.1"
+#define YYBISON_VERSION "2.3"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -116,82 +126,83 @@
      SIDEEFFECT = 307,
      CC_TOK = 308,
      CCC_TOK = 309,
-     CSRETCC_TOK = 310,
-     FASTCC_TOK = 311,
-     COLDCC_TOK = 312,
-     X86_STDCALLCC_TOK = 313,
-     X86_FASTCALLCC_TOK = 314,
-     DATALAYOUT = 315,
-     RET = 316,
-     BR = 317,
-     SWITCH = 318,
-     INVOKE = 319,
-     UNWIND = 320,
-     UNREACHABLE = 321,
-     ADD = 322,
-     SUB = 323,
-     MUL = 324,
-     UDIV = 325,
-     SDIV = 326,
-     FDIV = 327,
-     UREM = 328,
-     SREM = 329,
-     FREM = 330,
-     AND = 331,
-     OR = 332,
-     XOR = 333,
-     ICMP = 334,
-     FCMP = 335,
-     EQ = 336,
-     NE = 337,
-     SLT = 338,
-     SGT = 339,
-     SLE = 340,
-     SGE = 341,
-     ULT = 342,
-     UGT = 343,
-     ULE = 344,
-     UGE = 345,
-     OEQ = 346,
-     ONE = 347,
-     OLT = 348,
-     OGT = 349,
-     OLE = 350,
-     OGE = 351,
-     ORD = 352,
-     UNO = 353,
-     UEQ = 354,
-     UNE = 355,
-     MALLOC = 356,
-     ALLOCA = 357,
-     FREE = 358,
-     LOAD = 359,
-     STORE = 360,
-     GETELEMENTPTR = 361,
-     TRUNC = 362,
-     ZEXT = 363,
-     SEXT = 364,
-     FPTRUNC = 365,
-     FPEXT = 366,
-     BITCAST = 367,
-     UITOFP = 368,
-     SITOFP = 369,
-     FPTOUI = 370,
-     FPTOSI = 371,
-     INTTOPTR = 372,
-     PTRTOINT = 373,
-     PHI_TOK = 374,
-     SELECT = 375,
-     SHL = 376,
-     LSHR = 377,
-     ASHR = 378,
-     VAARG = 379,
-     EXTRACTELEMENT = 380,
-     INSERTELEMENT = 381,
-     SHUFFLEVECTOR = 382,
-     NORETURN = 383,
-     DEFAULT = 384,
-     HIDDEN = 385
+     FASTCC_TOK = 310,
+     COLDCC_TOK = 311,
+     X86_STDCALLCC_TOK = 312,
+     X86_FASTCALLCC_TOK = 313,
+     DATALAYOUT = 314,
+     RET = 315,
+     BR = 316,
+     SWITCH = 317,
+     INVOKE = 318,
+     UNWIND = 319,
+     UNREACHABLE = 320,
+     ADD = 321,
+     SUB = 322,
+     MUL = 323,
+     UDIV = 324,
+     SDIV = 325,
+     FDIV = 326,
+     UREM = 327,
+     SREM = 328,
+     FREM = 329,
+     AND = 330,
+     OR = 331,
+     XOR = 332,
+     ICMP = 333,
+     FCMP = 334,
+     EQ = 335,
+     NE = 336,
+     SLT = 337,
+     SGT = 338,
+     SLE = 339,
+     SGE = 340,
+     ULT = 341,
+     UGT = 342,
+     ULE = 343,
+     UGE = 344,
+     OEQ = 345,
+     ONE = 346,
+     OLT = 347,
+     OGT = 348,
+     OLE = 349,
+     OGE = 350,
+     ORD = 351,
+     UNO = 352,
+     UEQ = 353,
+     UNE = 354,
+     MALLOC = 355,
+     ALLOCA = 356,
+     FREE = 357,
+     LOAD = 358,
+     STORE = 359,
+     GETELEMENTPTR = 360,
+     TRUNC = 361,
+     ZEXT = 362,
+     SEXT = 363,
+     FPTRUNC = 364,
+     FPEXT = 365,
+     BITCAST = 366,
+     UITOFP = 367,
+     SITOFP = 368,
+     FPTOUI = 369,
+     FPTOSI = 370,
+     INTTOPTR = 371,
+     PTRTOINT = 372,
+     PHI_TOK = 373,
+     SELECT = 374,
+     SHL = 375,
+     LSHR = 376,
+     ASHR = 377,
+     VAARG = 378,
+     EXTRACTELEMENT = 379,
+     INSERTELEMENT = 380,
+     SHUFFLEVECTOR = 381,
+     NORETURN = 382,
+     INREG = 383,
+     SRET = 384,
+     DEFAULT = 385,
+     HIDDEN = 386
    };
 #endif
 /* Tokens.  */
@@ -247,88 +258,89 @@
 #define SIDEEFFECT 307
 #define CC_TOK 308
 #define CCC_TOK 309
-#define CSRETCC_TOK 310
-#define FASTCC_TOK 311
-#define COLDCC_TOK 312
-#define X86_STDCALLCC_TOK 313
-#define X86_FASTCALLCC_TOK 314
-#define DATALAYOUT 315
-#define RET 316
-#define BR 317
-#define SWITCH 318
-#define INVOKE 319
-#define UNWIND 320
-#define UNREACHABLE 321
-#define ADD 322
-#define SUB 323
-#define MUL 324
-#define UDIV 325
-#define SDIV 326
-#define FDIV 327
-#define UREM 328
-#define SREM 329
-#define FREM 330
-#define AND 331
-#define OR 332
-#define XOR 333
-#define ICMP 334
-#define FCMP 335
-#define EQ 336
-#define NE 337
-#define SLT 338
-#define SGT 339
-#define SLE 340
-#define SGE 341
-#define ULT 342
-#define UGT 343
-#define ULE 344
-#define UGE 345
-#define OEQ 346
-#define ONE 347
-#define OLT 348
-#define OGT 349
-#define OLE 350
-#define OGE 351
-#define ORD 352
-#define UNO 353
-#define UEQ 354
-#define UNE 355
-#define MALLOC 356
-#define ALLOCA 357
-#define FREE 358
-#define LOAD 359
-#define STORE 360
-#define GETELEMENTPTR 361
-#define TRUNC 362
-#define ZEXT 363
-#define SEXT 364
-#define FPTRUNC 365
-#define FPEXT 366
-#define BITCAST 367
-#define UITOFP 368
-#define SITOFP 369
-#define FPTOUI 370
-#define FPTOSI 371
-#define INTTOPTR 372
-#define PTRTOINT 373
-#define PHI_TOK 374
-#define SELECT 375
-#define SHL 376
-#define LSHR 377
-#define ASHR 378
-#define VAARG 379
-#define EXTRACTELEMENT 380
-#define INSERTELEMENT 381
-#define SHUFFLEVECTOR 382
-#define NORETURN 383
-#define DEFAULT 384
-#define HIDDEN 385
+#define FASTCC_TOK 310
+#define COLDCC_TOK 311
+#define X86_STDCALLCC_TOK 312
+#define X86_FASTCALLCC_TOK 313
+#define DATALAYOUT 314
+#define RET 315
+#define BR 316
+#define SWITCH 317
+#define INVOKE 318
+#define UNWIND 319
+#define UNREACHABLE 320
+#define ADD 321
+#define SUB 322
+#define MUL 323
+#define UDIV 324
+#define SDIV 325
+#define FDIV 326
+#define UREM 327
+#define SREM 328
+#define FREM 329
+#define AND 330
+#define OR 331
+#define XOR 332
+#define ICMP 333
+#define FCMP 334
+#define EQ 335
+#define NE 336
+#define SLT 337
+#define SGT 338
+#define SLE 339
+#define SGE 340
+#define ULT 341
+#define UGT 342
+#define ULE 343
+#define UGE 344
+#define OEQ 345
+#define ONE 346
+#define OLT 347
+#define OGT 348
+#define OLE 349
+#define OGE 350
+#define ORD 351
+#define UNO 352
+#define UEQ 353
+#define UNE 354
+#define MALLOC 355
+#define ALLOCA 356
+#define FREE 357
+#define LOAD 358
+#define STORE 359
+#define GETELEMENTPTR 360
+#define TRUNC 361
+#define ZEXT 362
+#define SEXT 363
+#define FPTRUNC 364
+#define FPEXT 365
+#define BITCAST 366
+#define UITOFP 367
+#define SITOFP 368
+#define FPTOUI 369
+#define FPTOSI 370
+#define INTTOPTR 371
+#define PTRTOINT 372
+#define PHI_TOK 373
+#define SELECT 374
+#define SHL 375
+#define LSHR 376
+#define ASHR 377
+#define VAARG 378
+#define EXTRACTELEMENT 379
+#define INSERTELEMENT 380
+#define SHUFFLEVECTOR 381
+#define NORETURN 382
+#define INREG 383
+#define SRET 384
+#define DEFAULT 385
+#define HIDDEN 386
 
 
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1218,9 +1230,10 @@
 # define YYTOKEN_TABLE 0
 #endif
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 885 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-typedef union YYSTYPE {
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 885 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -1264,9 +1277,10 @@
   llvm::Instruction::OtherOps       OtherOpVal;
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
-} YYSTYPE;
-/* Line 196 of yacc.c.  */
-#line 1270 "llvmAsmParser.tab.c"
+}
+/* Line 187 of yacc.c.  */
+#line 1283 "llvmAsmParser.tab.c"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1277,23 +1291,56 @@
 /* Copy the second part of user declarations.  */
 
 
-/* Line 219 of yacc.c.  */
-#line 1282 "llvmAsmParser.tab.c"
+/* Line 216 of yacc.c.  */
+#line 1296 "llvmAsmParser.tab.c"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
 #endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
 #endif
-#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
 #endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
 #endif
 
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
 #ifndef YY_
 # if YYENABLE_NLS
 #  if ENABLE_NLS
@@ -1306,7 +1353,32 @@
 # endif
 #endif
 
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+/* 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.  */
 
@@ -1314,64 +1386,76 @@
 #  if YYSTACK_USE_ALLOCA
 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if defined (__STDC__) || defined (__cplusplus)
+#    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 */
-#     define YYINCLUDED_STDLIB_H
+#     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 2005 */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
 #  endif
 # else
 #  define YYSTACK_ALLOC YYMALLOC
 #  define YYSTACK_FREE YYFREE
 #  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  ifdef __cplusplus
-extern "C" {
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
-	&& (defined (__STDC__) || defined (__cplusplus)))
+#   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 (YYINCLUDED_STDLIB_H) \
-	&& (defined (__STDC__) || defined (__cplusplus)))
+#   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
-#  ifdef __cplusplus
-}
-#  endif
 # endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_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 int yyss;
+  yytype_int16 yyss;
   YYSTYPE yyvs;
   };
 
@@ -1381,13 +1465,13 @@
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
+#  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
@@ -1398,7 +1482,7 @@
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
-      while (0)
+      while (YYID (0))
 #  endif
 # endif
 
@@ -1416,53 +1500,47 @@
 	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 int yysigned_char;
 #endif
 
-/* YYFINAL -- State number of the termination state. */
+/* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  40
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1476
+#define YYLAST   1466
 
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  145
-/* YYNNTS -- Number of nonterminals. */
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  146
+/* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  79
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  285
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  566
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  286
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  567
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   385
+#define YYMAXUTOK   386
 
 #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,
-     135,   136,   133,     2,   132,     2,     2,     2,     2,     2,
+     136,   137,   134,     2,   133,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     140,   131,   141,     2,     2,     2,     2,     2,     2,     2,
+     141,   132,   142,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   137,   134,   139,     2,     2,     2,     2,     2,   144,
+       2,   138,   135,   140,     2,     2,     2,     2,     2,   145,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     138,     2,     2,   142,     2,   143,     2,     2,     2,     2,
+     139,     2,     2,   143,     2,   144,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1488,13 +1566,13 @@
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130
+     125,   126,   127,   128,   129,   130,   131
 };
 
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned short int 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,
@@ -1505,163 +1583,163 @@
      119,   121,   122,   125,   126,   128,   130,   133,   134,   136,
      138,   140,   142,   144,   146,   148,   150,   151,   153,   154,
      156,   158,   159,   161,   163,   165,   167,   168,   170,   172,
-     174,   176,   178,   180,   183,   185,   187,   188,   191,   193,
-     195,   196,   199,   200,   203,   204,   208,   211,   212,   214,
-     215,   219,   221,   224,   226,   228,   230,   232,   234,   236,
-     239,   241,   244,   250,   256,   262,   268,   272,   275,   281,
-     286,   289,   291,   293,   295,   299,   301,   305,   307,   308,
-     310,   314,   319,   323,   327,   332,   337,   341,   348,   354,
-     357,   360,   363,   366,   369,   372,   375,   378,   381,   384,
-     391,   397,   406,   413,   420,   428,   436,   443,   450,   459,
-     468,   472,   474,   476,   478,   480,   481,   483,   486,   487,
-     491,   492,   496,   500,   502,   506,   510,   511,   518,   519,
-     527,   528,   536,   539,   543,   545,   549,   553,   557,   561,
-     563,   564,   570,   574,   576,   580,   582,   583,   593,   595,
-     597,   602,   604,   606,   609,   613,   614,   616,   618,   620,
-     622,   624,   626,   628,   630,   632,   636,   638,   644,   646,
-     648,   650,   652,   654,   656,   659,   662,   665,   669,   672,
-     673,   675,   678,   681,   685,   695,   705,   714,   729,   731,
-     733,   740,   746,   749,   756,   764,   768,   774,   775,   776,
-     780,   783,   785,   791,   797,   804,   811,   816,   821,   828,
-     833,   838,   845,   852,   855,   864,   866,   868,   869,   873,
-     880,   884,   891,   894,   899,   906
+     174,   176,   178,   181,   183,   185,   187,   189,   190,   193,
+     195,   197,   198,   201,   202,   205,   206,   210,   213,   214,
+     216,   217,   221,   223,   226,   228,   230,   232,   234,   236,
+     238,   241,   243,   246,   252,   258,   264,   270,   274,   277,
+     283,   288,   291,   293,   295,   297,   301,   303,   307,   309,
+     310,   312,   316,   321,   325,   329,   334,   339,   343,   350,
+     356,   359,   362,   365,   368,   371,   374,   377,   380,   383,
+     386,   393,   399,   408,   415,   422,   430,   438,   445,   452,
+     461,   470,   474,   476,   478,   480,   482,   483,   485,   488,
+     489,   493,   494,   498,   502,   504,   508,   512,   513,   520,
+     521,   529,   530,   538,   541,   545,   547,   551,   555,   559,
+     563,   565,   566,   572,   576,   578,   582,   584,   585,   595,
+     597,   599,   604,   606,   608,   611,   615,   616,   618,   620,
+     622,   624,   626,   628,   630,   632,   634,   638,   640,   646,
+     648,   650,   652,   654,   656,   658,   661,   664,   667,   671,
+     674,   675,   677,   680,   683,   687,   697,   707,   716,   731,
+     733,   735,   742,   748,   751,   758,   766,   770,   776,   777,
+     778,   782,   785,   787,   793,   799,   806,   813,   818,   823,
+     830,   835,   840,   847,   854,   857,   866,   868,   870,   871,
+     875,   882,   886,   893,   896,   901,   908
 };
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const short int yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
 {
-     186,     0,    -1,    67,    -1,    68,    -1,    69,    -1,    70,
-      -1,    71,    -1,    72,    -1,    73,    -1,    74,    -1,    75,
-      -1,    76,    -1,    77,    -1,    78,    -1,   107,    -1,   108,
-      -1,   109,    -1,   110,    -1,   111,    -1,   112,    -1,   113,
-      -1,   114,    -1,   115,    -1,   116,    -1,   117,    -1,   118,
-      -1,   121,    -1,   122,    -1,   123,    -1,    81,    -1,    82,
-      -1,    83,    -1,    84,    -1,    85,    -1,    86,    -1,    87,
-      -1,    88,    -1,    89,    -1,    90,    -1,    91,    -1,    92,
-      -1,    93,    -1,    94,    -1,    95,    -1,    96,    -1,    97,
-      -1,    98,    -1,    99,    -1,   100,    -1,    87,    -1,    88,
-      -1,    89,    -1,    90,    -1,    21,    -1,    22,    -1,     9,
-      -1,    10,    -1,    11,    -1,    14,    -1,    17,    -1,   154,
-      -1,    -1,   154,   131,    -1,    -1,    15,    -1,    18,    -1,
-     157,   131,    -1,    -1,    35,    -1,    37,    -1,    36,    -1,
+     187,     0,    -1,    66,    -1,    67,    -1,    68,    -1,    69,
+      -1,    70,    -1,    71,    -1,    72,    -1,    73,    -1,    74,
+      -1,    75,    -1,    76,    -1,    77,    -1,   106,    -1,   107,
+      -1,   108,    -1,   109,    -1,   110,    -1,   111,    -1,   112,
+      -1,   113,    -1,   114,    -1,   115,    -1,   116,    -1,   117,
+      -1,   120,    -1,   121,    -1,   122,    -1,    80,    -1,    81,
+      -1,    82,    -1,    83,    -1,    84,    -1,    85,    -1,    86,
+      -1,    87,    -1,    88,    -1,    89,    -1,    90,    -1,    91,
+      -1,    92,    -1,    93,    -1,    94,    -1,    95,    -1,    96,
+      -1,    97,    -1,    98,    -1,    99,    -1,    86,    -1,    87,
+      -1,    88,    -1,    89,    -1,    21,    -1,    22,    -1,     9,
+      -1,    10,    -1,    11,    -1,    14,    -1,    17,    -1,   155,
+      -1,    -1,   155,   132,    -1,    -1,    15,    -1,    18,    -1,
+     158,   132,    -1,    -1,    35,    -1,    37,    -1,    36,    -1,
       38,    -1,    40,    -1,    39,    -1,    41,    -1,    43,    -1,
-      -1,   130,    -1,    -1,    39,    -1,    41,    -1,    -1,    35,
+      -1,   131,    -1,    -1,    39,    -1,    41,    -1,    -1,    35,
       -1,    36,    -1,    37,    -1,    40,    -1,    -1,    54,    -1,
-      55,    -1,    56,    -1,    57,    -1,    58,    -1,    59,    -1,
-      53,     4,    -1,   108,    -1,   109,    -1,    -1,   166,   165,
-      -1,   128,    -1,   165,    -1,    -1,   168,   167,    -1,    -1,
-      46,     4,    -1,    -1,   132,    46,     4,    -1,    29,    17,
-      -1,    -1,   171,    -1,    -1,   132,   174,   173,    -1,   171,
-      -1,    46,     4,    -1,     9,    -1,    10,    -1,    11,    -1,
-      12,    -1,    42,    -1,   175,    -1,   176,   133,    -1,   208,
-      -1,   134,     4,    -1,   176,   135,   180,   136,   168,    -1,
-       8,   135,   180,   136,   168,    -1,   137,     4,   138,   176,
-     139,    -1,   140,     4,   138,   176,   141,    -1,   142,   181,
-     143,    -1,   142,   143,    -1,   140,   142,   181,   143,   141,
-      -1,   140,   142,   143,   141,    -1,   176,   166,    -1,   176,
-      -1,     8,    -1,   177,    -1,   179,   132,   177,    -1,   179,
-      -1,   179,   132,    32,    -1,    32,    -1,    -1,   176,    -1,
-     181,   132,   176,    -1,   176,   137,   184,   139,    -1,   176,
-     137,   139,    -1,   176,   144,    17,    -1,   176,   140,   184,
-     141,    -1,   176,   142,   184,   143,    -1,   176,   142,   143,
-      -1,   176,   140,   142,   184,   143,   141,    -1,   176,   140,
-     142,   143,   141,    -1,   176,    33,    -1,   176,    34,    -1,
-     176,   208,    -1,   176,   183,    -1,   176,    20,    -1,   152,
-       3,    -1,   152,     4,    -1,     9,    21,    -1,     9,    22,
-      -1,   153,     7,    -1,   148,   135,   182,    31,   176,   136,
-      -1,   106,   135,   182,   219,   136,    -1,   120,   135,   182,
-     132,   182,   132,   182,   136,    -1,   146,   135,   182,   132,
-     182,   136,    -1,   147,   135,   182,   132,   182,   136,    -1,
-      79,   150,   135,   182,   132,   182,   136,    -1,    80,   151,
-     135,   182,   132,   182,   136,    -1,   149,   135,   182,   132,
-     182,   136,    -1,   125,   135,   182,   132,   182,   136,    -1,
-     126,   135,   182,   132,   182,   132,   182,   136,    -1,   127,
-     135,   182,   132,   182,   132,   182,   136,    -1,   184,   132,
-     182,    -1,   182,    -1,    27,    -1,    28,    -1,   187,    -1,
-      -1,   188,    -1,   187,   188,    -1,    -1,    26,   189,   204,
-      -1,    -1,    25,   190,   205,    -1,    51,    50,   194,    -1,
-      19,    -1,   156,    13,   176,    -1,   156,    13,     8,    -1,
-      -1,   158,   161,   185,   182,   191,   173,    -1,    -1,   158,
-     159,   161,   185,   182,   192,   173,    -1,    -1,   158,   160,
-     161,   185,   176,   193,   173,    -1,    44,   195,    -1,    47,
-     131,   196,    -1,    17,    -1,    45,   131,    17,    -1,    60,
-     131,    17,    -1,   137,   197,   139,    -1,   197,   132,    17,
-      -1,    17,    -1,    -1,   198,   132,   176,   166,   155,    -1,
-     176,   166,   155,    -1,   198,    -1,   198,   132,    32,    -1,
-      32,    -1,    -1,   164,   178,   157,   135,   199,   136,   168,
-     172,   169,    -1,    23,    -1,   142,    -1,   163,   161,   200,
-     201,    -1,    24,    -1,   143,    -1,   211,   203,    -1,   162,
-     161,   200,    -1,    -1,    52,    -1,     3,    -1,     4,    -1,
-       7,    -1,    21,    -1,    22,    -1,    33,    -1,    34,    -1,
-      20,    -1,   140,   184,   141,    -1,   183,    -1,    50,   206,
-      17,   132,    17,    -1,     5,    -1,     6,    -1,   154,    -1,
-     157,    -1,   208,    -1,   207,    -1,   176,   209,    -1,   211,
-     212,    -1,   202,   212,    -1,   213,   156,   214,    -1,   213,
-     216,    -1,    -1,    16,    -1,    61,   210,    -1,    61,     8,
-      -1,    62,    12,   209,    -1,    62,     9,   209,   132,    12,
-     209,   132,    12,   209,    -1,    63,   152,   209,   132,    12,
-     209,   137,   215,   139,    -1,    63,   152,   209,   132,    12,
-     209,   137,   139,    -1,    64,   164,   178,   209,   135,   218,
-     136,   168,    31,    12,   209,    65,    12,   209,    -1,    65,
-      -1,    66,    -1,   215,   152,   207,   132,    12,   209,    -1,
-     152,   207,   132,    12,   209,    -1,   156,   221,    -1,   176,
-     137,   209,   132,   209,   139,    -1,   217,   132,   137,   209,
-     132,   209,   139,    -1,   176,   209,   166,    -1,   218,   132,
-     176,   209,   166,    -1,    -1,    -1,   219,   132,   210,    -1,
-      49,    48,    -1,    48,    -1,   146,   176,   209,   132,   209,
-      -1,   147,   176,   209,   132,   209,    -1,    79,   150,   176,
-     209,   132,   209,    -1,    80,   151,   176,   209,   132,   209,
-      -1,   149,   210,   132,   210,    -1,   148,   210,    31,   176,
-      -1,   120,   210,   132,   210,   132,   210,    -1,   124,   210,
-     132,   176,    -1,   125,   210,   132,   210,    -1,   126,   210,
-     132,   210,   132,   210,    -1,   127,   210,   132,   210,   132,
-     210,    -1,   119,   217,    -1,   220,   164,   178,   209,   135,
-     218,   136,   168,    -1,   223,    -1,    30,    -1,    -1,   101,
-     176,   170,    -1,   101,   176,   132,     9,   209,   170,    -1,
-     102,   176,   170,    -1,   102,   176,   132,     9,   209,   170,
-      -1,   103,   210,    -1,   222,   104,   176,   209,    -1,   222,
-     105,   210,   132,   176,   209,    -1,   106,   176,   209,   219,
-      -1
+      55,    -1,    56,    -1,    57,    -1,    58,    -1,    53,     4,
+      -1,   107,    -1,   108,    -1,   128,    -1,   129,    -1,    -1,
+     167,   166,    -1,   127,    -1,   166,    -1,    -1,   169,   168,
+      -1,    -1,    46,     4,    -1,    -1,   133,    46,     4,    -1,
+      29,    17,    -1,    -1,   172,    -1,    -1,   133,   175,   174,
+      -1,   172,    -1,    46,     4,    -1,     9,    -1,    10,    -1,
+      11,    -1,    12,    -1,    42,    -1,   176,    -1,   177,   134,
+      -1,   209,    -1,   135,     4,    -1,   177,   136,   181,   137,
+     169,    -1,     8,   136,   181,   137,   169,    -1,   138,     4,
+     139,   177,   140,    -1,   141,     4,   139,   177,   142,    -1,
+     143,   182,   144,    -1,   143,   144,    -1,   141,   143,   182,
+     144,   142,    -1,   141,   143,   144,   142,    -1,   177,   167,
+      -1,   177,    -1,     8,    -1,   178,    -1,   180,   133,   178,
+      -1,   180,    -1,   180,   133,    32,    -1,    32,    -1,    -1,
+     177,    -1,   182,   133,   177,    -1,   177,   138,   185,   140,
+      -1,   177,   138,   140,    -1,   177,   145,    17,    -1,   177,
+     141,   185,   142,    -1,   177,   143,   185,   144,    -1,   177,
+     143,   144,    -1,   177,   141,   143,   185,   144,   142,    -1,
+     177,   141,   143,   144,   142,    -1,   177,    33,    -1,   177,
+      34,    -1,   177,   209,    -1,   177,   184,    -1,   177,    20,
+      -1,   153,     3,    -1,   153,     4,    -1,     9,    21,    -1,
+       9,    22,    -1,   154,     7,    -1,   149,   136,   183,    31,
+     177,   137,    -1,   105,   136,   183,   220,   137,    -1,   119,
+     136,   183,   133,   183,   133,   183,   137,    -1,   147,   136,
+     183,   133,   183,   137,    -1,   148,   136,   183,   133,   183,
+     137,    -1,    78,   151,   136,   183,   133,   183,   137,    -1,
+      79,   152,   136,   183,   133,   183,   137,    -1,   150,   136,
+     183,   133,   183,   137,    -1,   124,   136,   183,   133,   183,
+     137,    -1,   125,   136,   183,   133,   183,   133,   183,   137,
+      -1,   126,   136,   183,   133,   183,   133,   183,   137,    -1,
+     185,   133,   183,    -1,   183,    -1,    27,    -1,    28,    -1,
+     188,    -1,    -1,   189,    -1,   188,   189,    -1,    -1,    26,
+     190,   205,    -1,    -1,    25,   191,   206,    -1,    51,    50,
+     195,    -1,    19,    -1,   157,    13,   177,    -1,   157,    13,
+       8,    -1,    -1,   159,   162,   186,   183,   192,   174,    -1,
+      -1,   159,   160,   162,   186,   183,   193,   174,    -1,    -1,
+     159,   161,   162,   186,   177,   194,   174,    -1,    44,   196,
+      -1,    47,   132,   197,    -1,    17,    -1,    45,   132,    17,
+      -1,    59,   132,    17,    -1,   138,   198,   140,    -1,   198,
+     133,    17,    -1,    17,    -1,    -1,   199,   133,   177,   167,
+     156,    -1,   177,   167,   156,    -1,   199,    -1,   199,   133,
+      32,    -1,    32,    -1,    -1,   165,   179,   158,   136,   200,
+     137,   169,   173,   170,    -1,    23,    -1,   143,    -1,   164,
+     162,   201,   202,    -1,    24,    -1,   144,    -1,   212,   204,
+      -1,   163,   162,   201,    -1,    -1,    52,    -1,     3,    -1,
+       4,    -1,     7,    -1,    21,    -1,    22,    -1,    33,    -1,
+      34,    -1,    20,    -1,   141,   185,   142,    -1,   184,    -1,
+      50,   207,    17,   133,    17,    -1,     5,    -1,     6,    -1,
+     155,    -1,   158,    -1,   209,    -1,   208,    -1,   177,   210,
+      -1,   212,   213,    -1,   203,   213,    -1,   214,   157,   215,
+      -1,   214,   217,    -1,    -1,    16,    -1,    60,   211,    -1,
+      60,     8,    -1,    61,    12,   210,    -1,    61,     9,   210,
+     133,    12,   210,   133,    12,   210,    -1,    62,   153,   210,
+     133,    12,   210,   138,   216,   140,    -1,    62,   153,   210,
+     133,    12,   210,   138,   140,    -1,    63,   165,   179,   210,
+     136,   219,   137,   169,    31,    12,   210,    64,    12,   210,
+      -1,    64,    -1,    65,    -1,   216,   153,   208,   133,    12,
+     210,    -1,   153,   208,   133,    12,   210,    -1,   157,   222,
+      -1,   177,   138,   210,   133,   210,   140,    -1,   218,   133,
+     138,   210,   133,   210,   140,    -1,   177,   210,   167,    -1,
+     219,   133,   177,   210,   167,    -1,    -1,    -1,   220,   133,
+     211,    -1,    49,    48,    -1,    48,    -1,   147,   177,   210,
+     133,   210,    -1,   148,   177,   210,   133,   210,    -1,    78,
+     151,   177,   210,   133,   210,    -1,    79,   152,   177,   210,
+     133,   210,    -1,   150,   211,   133,   211,    -1,   149,   211,
+      31,   177,    -1,   119,   211,   133,   211,   133,   211,    -1,
+     123,   211,   133,   177,    -1,   124,   211,   133,   211,    -1,
+     125,   211,   133,   211,   133,   211,    -1,   126,   211,   133,
+     211,   133,   211,    -1,   118,   218,    -1,   221,   165,   179,
+     210,   136,   219,   137,   169,    -1,   224,    -1,    30,    -1,
+      -1,   100,   177,   171,    -1,   100,   177,   133,     9,   210,
+     171,    -1,   101,   177,   171,    -1,   101,   177,   133,     9,
+     210,   171,    -1,   102,   211,    -1,   223,   103,   177,   210,
+      -1,   223,   104,   211,   133,   177,   210,    -1,   105,   177,
+     210,   220,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const yytype_uint16 yyrline[] =
 {
-       0,  1032,  1032,  1032,  1032,  1032,  1032,  1032,  1032,  1032,
-    1032,  1033,  1033,  1033,  1034,  1034,  1034,  1034,  1034,  1034,
-    1035,  1035,  1035,  1035,  1035,  1035,  1036,  1036,  1036,  1038,
-    1038,  1039,  1039,  1040,  1040,  1041,  1041,  1042,  1042,  1046,
-    1046,  1047,  1047,  1048,  1048,  1049,  1049,  1050,  1050,  1051,
-    1051,  1052,  1052,  1053,  1054,  1059,  1060,  1060,  1062,  1062,
-    1063,  1063,  1067,  1071,  1076,  1076,  1078,  1082,  1088,  1089,
-    1090,  1091,  1092,  1096,  1097,  1098,  1102,  1103,  1107,  1108,
-    1109,  1113,  1114,  1115,  1116,  1117,  1120,  1121,  1122,  1123,
-    1124,  1125,  1126,  1127,  1134,  1135,  1138,  1139,  1144,  1145,
-    1148,  1149,  1156,  1157,  1163,  1164,  1172,  1180,  1181,  1186,
-    1187,  1188,  1193,  1206,  1206,  1206,  1206,  1209,  1213,  1217,
-    1224,  1229,  1237,  1255,  1273,  1278,  1290,  1300,  1304,  1314,
-    1321,  1328,  1335,  1340,  1345,  1352,  1353,  1360,  1367,  1375,
-    1380,  1391,  1419,  1435,  1464,  1492,  1517,  1536,  1561,  1580,
-    1592,  1599,  1665,  1675,  1685,  1691,  1697,  1702,  1707,  1715,
-    1727,  1748,  1756,  1762,  1773,  1778,  1783,  1792,  1798,  1804,
-    1813,  1817,  1825,  1825,  1836,  1841,  1849,  1850,  1854,  1854,
-    1858,  1858,  1861,  1864,  1876,  1900,  1911,  1911,  1921,  1921,
-    1929,  1929,  1939,  1942,  1948,  1961,  1965,  1970,  1972,  1977,
-    1982,  1991,  2001,  2012,  2016,  2025,  2034,  2039,  2145,  2145,
-    2147,  2156,  2156,  2158,  2163,  2175,  2179,  2184,  2188,  2192,
-    2196,  2200,  2204,  2208,  2212,  2216,  2241,  2245,  2259,  2263,
-    2267,  2271,  2277,  2277,  2283,  2292,  2296,  2305,  2316,  2325,
-    2337,  2350,  2354,  2358,  2363,  2373,  2392,  2401,  2468,  2472,
-    2479,  2490,  2503,  2512,  2523,  2533,  2541,  2549,  2552,  2553,
-    2560,  2564,  2569,  2590,  2607,  2620,  2633,  2642,  2654,  2662,
-    2669,  2675,  2681,  2687,  2702,  2766,  2771,  2775,  2782,  2789,
-    2797,  2804,  2812,  2820,  2834,  2851
+       0,  1031,  1031,  1031,  1031,  1031,  1031,  1031,  1031,  1031,
+    1031,  1032,  1032,  1032,  1033,  1033,  1033,  1033,  1033,  1033,
+    1034,  1034,  1034,  1034,  1034,  1034,  1035,  1035,  1035,  1037,
+    1037,  1038,  1038,  1039,  1039,  1040,  1040,  1041,  1041,  1045,
+    1045,  1046,  1046,  1047,  1047,  1048,  1048,  1049,  1049,  1050,
+    1050,  1051,  1051,  1052,  1053,  1058,  1059,  1059,  1061,  1061,
+    1062,  1062,  1066,  1070,  1075,  1075,  1077,  1081,  1087,  1088,
+    1089,  1090,  1091,  1095,  1096,  1097,  1101,  1102,  1106,  1107,
+    1108,  1112,  1113,  1114,  1115,  1116,  1119,  1120,  1121,  1122,
+    1123,  1124,  1125,  1132,  1133,  1134,  1135,  1138,  1139,  1144,
+    1145,  1148,  1149,  1156,  1157,  1163,  1164,  1172,  1180,  1181,
+    1186,  1187,  1188,  1193,  1206,  1206,  1206,  1206,  1209,  1213,
+    1217,  1224,  1229,  1237,  1255,  1273,  1278,  1290,  1300,  1304,
+    1314,  1321,  1328,  1335,  1340,  1345,  1352,  1353,  1360,  1367,
+    1375,  1380,  1391,  1419,  1435,  1464,  1492,  1517,  1536,  1561,
+    1580,  1592,  1599,  1665,  1675,  1685,  1691,  1697,  1702,  1707,
+    1715,  1727,  1748,  1756,  1762,  1773,  1778,  1783,  1792,  1798,
+    1804,  1813,  1817,  1825,  1825,  1836,  1841,  1849,  1850,  1854,
+    1854,  1858,  1858,  1861,  1864,  1876,  1900,  1911,  1911,  1921,
+    1921,  1929,  1929,  1939,  1942,  1948,  1961,  1965,  1970,  1972,
+    1977,  1982,  1991,  2001,  2012,  2016,  2025,  2034,  2039,  2145,
+    2145,  2147,  2156,  2156,  2158,  2163,  2175,  2179,  2184,  2188,
+    2192,  2196,  2200,  2204,  2208,  2212,  2216,  2241,  2245,  2259,
+    2263,  2267,  2271,  2277,  2277,  2283,  2292,  2296,  2305,  2316,
+    2325,  2337,  2350,  2354,  2358,  2363,  2373,  2392,  2401,  2468,
+    2472,  2479,  2490,  2503,  2512,  2523,  2533,  2541,  2549,  2552,
+    2553,  2560,  2564,  2569,  2590,  2607,  2620,  2633,  2642,  2654,
+    2662,  2669,  2675,  2681,  2687,  2702,  2766,  2771,  2775,  2782,
+    2789,  2797,  2804,  2812,  2820,  2834,  2851
 };
 #endif
 
 #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "ESINT64VAL", "EUINT64VAL",
@@ -1673,22 +1751,22 @@
   "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", "CSRETCC_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", "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", "SHL", "LSHR", "ASHR", "VAARG",
-  "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR", "NORETURN",
-  "DEFAULT", "HIDDEN", "'='", "','", "'*'", "'\\\\'", "'('", "')'", "'['",
-  "'x'", "']'", "'<'", "'>'", "'{'", "'}'", "'c'", "$accept",
-  "ArithmeticOps", "LogicalOps", "CastOps", "ShiftOps", "IPredicates",
-  "FPredicates", "IntType", "FPType", "LocalName", "OptLocalName",
-  "OptLocalAssign", "GlobalName", "OptGlobalAssign", "GVInternalLinkage",
+  "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", "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", "SHL", "LSHR", "ASHR", "VAARG", "EXTRACTELEMENT",
+  "INSERTELEMENT", "SHUFFLEVECTOR", "NORETURN", "INREG", "SRET", "DEFAULT",
+  "HIDDEN", "'='", "','", "'*'", "'\\\\'", "'('", "')'", "'['", "'x'",
+  "']'", "'<'", "'>'", "'{'", "'}'", "'c'", "$accept", "ArithmeticOps",
+  "LogicalOps", "CastOps", "ShiftOps", "IPredicates", "FPredicates",
+  "IntType", "FPType", "LocalName", "OptLocalName", "OptLocalAssign",
+  "GlobalName", "OptGlobalAssign", "GVInternalLinkage",
   "GVExternalLinkage", "GVVisibilityStyle", "FunctionDeclareLinkage",
   "FunctionDefineLinkage", "OptCallingConv", "ParamAttr", "OptParamAttrs",
   "FuncAttr", "OptFuncAttrs", "OptAlign", "OptCAlign", "SectionString",
@@ -1709,7 +1787,7 @@
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short int 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,
@@ -1724,47 +1802,47 @@
      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,    61,    44,    42,    92,    40,    41,    91,   120,    93,
-      60,    62,   123,   125,    99
+     385,   386,    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,   145,   146,   146,   146,   146,   146,   146,   146,   146,
-     146,   147,   147,   147,   148,   148,   148,   148,   148,   148,
-     148,   148,   148,   148,   148,   148,   149,   149,   149,   150,
-     150,   150,   150,   150,   150,   150,   150,   150,   150,   151,
-     151,   151,   151,   151,   151,   151,   151,   151,   151,   151,
-     151,   151,   151,   151,   151,   152,   153,   153,   154,   154,
-     155,   155,   156,   156,   157,   157,   158,   158,   159,   159,
-     159,   159,   159,   160,   160,   160,   161,   161,   162,   162,
-     162,   163,   163,   163,   163,   163,   164,   164,   164,   164,
-     164,   164,   164,   164,   165,   165,   166,   166,   167,   167,
-     168,   168,   169,   169,   170,   170,   171,   172,   172,   173,
-     173,   174,   174,   175,   175,   175,   175,   176,   176,   176,
-     176,   176,   176,   176,   176,   176,   176,   176,   176,   176,
-     177,   178,   178,   179,   179,   180,   180,   180,   180,   181,
-     181,   182,   182,   182,   182,   182,   182,   182,   182,   182,
-     182,   182,   182,   182,   182,   182,   182,   182,   182,   183,
+       0,   146,   147,   147,   147,   147,   147,   147,   147,   147,
+     147,   148,   148,   148,   149,   149,   149,   149,   149,   149,
+     149,   149,   149,   149,   149,   149,   150,   150,   150,   151,
+     151,   151,   151,   151,   151,   151,   151,   151,   151,   152,
+     152,   152,   152,   152,   152,   152,   152,   152,   152,   152,
+     152,   152,   152,   152,   152,   153,   154,   154,   155,   155,
+     156,   156,   157,   157,   158,   158,   159,   159,   160,   160,
+     160,   160,   160,   161,   161,   161,   162,   162,   163,   163,
+     163,   164,   164,   164,   164,   164,   165,   165,   165,   165,
+     165,   165,   165,   166,   166,   166,   166,   167,   167,   168,
+     168,   169,   169,   170,   170,   171,   171,   172,   173,   173,
+     174,   174,   175,   175,   176,   176,   176,   176,   177,   177,
+     177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   178,   179,   179,   180,   180,   181,   181,   181,   181,
+     182,   182,   183,   183,   183,   183,   183,   183,   183,   183,
      183,   183,   183,   183,   183,   183,   183,   183,   183,   183,
-     184,   184,   185,   185,   186,   186,   187,   187,   189,   188,
-     190,   188,   188,   188,   188,   188,   191,   188,   192,   188,
-     193,   188,   188,   188,   194,   195,   195,   196,   197,   197,
-     197,   198,   198,   199,   199,   199,   199,   200,   201,   201,
-     202,   203,   203,   204,   205,   206,   206,   207,   207,   207,
-     207,   207,   207,   207,   207,   207,   207,   207,   208,   208,
-     208,   208,   209,   209,   210,   211,   211,   212,   213,   213,
-     213,   214,   214,   214,   214,   214,   214,   214,   214,   214,
-     215,   215,   216,   217,   217,   218,   218,   218,   219,   219,
-     220,   220,   221,   221,   221,   221,   221,   221,   221,   221,
-     221,   221,   221,   221,   221,   221,   222,   222,   223,   223,
-     223,   223,   223,   223,   223,   223
+     184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
+     184,   185,   185,   186,   186,   187,   187,   188,   188,   190,
+     189,   191,   189,   189,   189,   189,   189,   192,   189,   193,
+     189,   194,   189,   189,   189,   195,   196,   196,   197,   198,
+     198,   198,   199,   199,   200,   200,   200,   200,   201,   202,
+     202,   203,   204,   204,   205,   206,   207,   207,   208,   208,
+     208,   208,   208,   208,   208,   208,   208,   208,   208,   209,
+     209,   209,   209,   210,   210,   211,   212,   212,   213,   214,
+     214,   214,   215,   215,   215,   215,   215,   215,   215,   215,
+     215,   216,   216,   217,   218,   218,   219,   219,   219,   220,
+     220,   221,   221,   222,   222,   222,   222,   222,   222,   222,
+     222,   222,   222,   222,   222,   222,   222,   223,   223,   224,
+     224,   224,   224,   224,   224,   224,   224
 };
 
 /* 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,
@@ -1775,552 +1853,550 @@
        1,     0,     2,     0,     1,     1,     2,     0,     1,     1,
        1,     1,     1,     1,     1,     1,     0,     1,     0,     1,
        1,     0,     1,     1,     1,     1,     0,     1,     1,     1,
-       1,     1,     1,     2,     1,     1,     0,     2,     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,     6,
-       5,     8,     6,     6,     7,     7,     6,     6,     8,     8,
-       3,     1,     1,     1,     1,     0,     1,     2,     0,     3,
-       0,     3,     3,     1,     3,     3,     0,     6,     0,     7,
-       0,     7,     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,     4,     6,     4,
-       4,     6,     6,     2,     8,     1,     1,     0,     3,     6,
-       3,     6,     2,     4,     6,     4
+       1,     1,     2,     1,     1,     1,     1,     0,     2,     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,
+       6,     5,     8,     6,     6,     7,     7,     6,     6,     8,
+       8,     3,     1,     1,     1,     1,     0,     1,     2,     0,
+       3,     0,     3,     3,     1,     3,     3,     0,     6,     0,
+       7,     0,     7,     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,     4,     6,
+       4,     4,     6,     6,     2,     8,     1,     1,     0,     3,
+       6,     3,     6,     2,     4,     6,     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 int yydefact[] =
+static const yytype_uint16 yydefact[] =
 {
-      67,    58,    64,    59,    65,   183,   180,   178,     0,     0,
-       0,     0,     0,     0,    76,     0,    67,   176,    78,    81,
-       0,     0,   192,     0,     0,    62,     0,    66,    68,    70,
+      67,    58,    64,    59,    65,   184,   181,   179,     0,     0,
+       0,     0,     0,     0,    76,     0,    67,   177,    78,    81,
+       0,     0,   193,     0,     0,    62,     0,    66,    68,    70,
       69,    71,    73,    72,    74,    75,    77,    76,    76,     0,
-       1,   177,    79,    80,    76,   181,    82,    83,    84,    85,
-      76,   239,   179,   239,     0,     0,   200,   193,   194,   182,
-     228,   229,   185,   113,   114,   115,   116,   117,     0,     0,
-       0,     0,   230,   231,   118,   184,   120,     0,     0,   172,
-     173,     0,    86,    86,   240,   236,    63,   211,   212,   213,
-     235,   195,   196,   199,     0,   138,   121,     0,     0,     0,
-       0,   127,   139,     0,   119,   138,     0,     0,   113,   114,
-     115,     0,     0,     0,   186,     0,    87,    88,    89,    90,
-      91,    92,     0,   214,     0,   277,   238,     0,   197,   137,
-      96,   133,   135,     0,     0,     0,     0,     0,     0,   126,
-       0,   188,   190,   156,   157,   154,   155,   158,   153,   149,
-     150,     2,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,     0,     0,     0,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,     0,    26,
-      27,    28,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   152,   151,   109,    93,   132,   131,     0,
-     208,   209,   210,   276,   261,     0,     0,     0,     0,    86,
-     248,   249,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   237,    86,
-     252,     0,   275,   198,   130,     0,   100,     0,     0,   129,
-       0,   140,   100,   109,   109,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,     0,    53,    54,    49,    50,
-      51,    52,    39,    40,    41,    42,    43,    44,    45,    46,
-      47,    48,     0,     0,     0,     0,     0,     0,   142,   171,
-       0,     0,     0,   146,     0,   143,     0,     0,     0,     0,
-       0,   187,     0,   260,   242,     0,   241,     0,     0,    55,
-       0,     0,     0,     0,   104,   104,   282,     0,     0,   273,
+       1,   178,    79,    80,    76,   182,    82,    83,    84,    85,
+      76,   240,   180,   240,     0,     0,   201,   194,   195,   183,
+     229,   230,   186,   114,   115,   116,   117,   118,     0,     0,
+       0,     0,   231,   232,   119,   185,   121,     0,     0,   173,
+     174,     0,    86,    86,   241,   237,    63,   212,   213,   214,
+     236,   196,   197,   200,     0,   139,   122,     0,     0,     0,
+       0,   128,   140,     0,   120,   139,     0,     0,   114,   115,
+     116,     0,     0,     0,   187,     0,    87,    88,    89,    90,
+      91,     0,   215,     0,   278,   239,     0,   198,   138,    97,
+     134,   136,     0,     0,     0,     0,     0,     0,   127,     0,
+     189,   191,   157,   158,   155,   156,   159,   154,   150,   151,
+       2,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,     0,     0,     0,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,     0,    26,    27,
+      28,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   153,   152,   110,    92,   133,   132,     0,   209,
+     210,   211,   277,   262,     0,     0,     0,     0,    86,   249,
+     250,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   238,    86,   253,
+       0,   276,   199,   131,     0,   101,     0,     0,   130,     0,
+     141,   101,   110,   110,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,     0,    53,    54,    49,    50,    51,
+      52,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,     0,     0,     0,     0,     0,     0,   143,   172,     0,
+       0,     0,   147,     0,   144,     0,     0,     0,     0,     0,
+     188,     0,   261,   243,     0,   242,     0,     0,    55,     0,
+       0,     0,     0,   105,   105,   283,     0,     0,   274,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    94,    95,    97,   136,   134,   123,   124,   125,
-     128,   122,   189,   191,     0,     0,   258,     0,     0,     0,
-       0,     0,   141,   127,   139,     0,   144,   145,     0,     0,
-       0,     0,     0,     0,   111,   109,   206,   217,   218,   219,
-     224,   220,   221,   222,   223,   215,     0,   226,   233,   232,
-     234,     0,   243,     0,     0,     0,     0,     0,   278,     0,
-     280,   258,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    98,    99,   101,     0,
-       0,     0,     0,     0,     0,     0,   170,   148,     0,     0,
-       0,     0,     0,   106,   112,   110,   205,    96,   203,     0,
-     216,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   285,     0,     0,     0,   269,   270,     0,     0,     0,
-       0,   267,   266,     0,   283,     0,     0,     0,     0,   160,
-       0,     0,     0,     0,   147,     0,     0,     0,     0,    61,
-       0,   100,     0,   225,     0,     0,   257,     0,     0,   104,
-     105,   104,     0,     0,     0,     0,     0,   262,   263,   257,
-       0,     0,     0,   259,     0,   167,     0,     0,   162,   163,
-     159,   166,    60,   202,   204,    96,   107,     0,     0,     0,
-       0,     0,   264,   265,     0,   279,   281,     0,     0,   268,
-     271,   272,     0,   284,   164,   165,     0,     0,     0,    61,
-     108,   102,   227,     0,     0,    96,     0,   100,   253,     0,
-     100,   161,   168,   169,   201,     0,   207,     0,   246,     0,
-       0,   255,     0,     0,   254,   274,   103,   244,     0,   245,
-       0,    96,     0,     0,     0,   256,     0,     0,     0,     0,
-     251,     0,     0,   250,     0,   247
+       0,    93,    94,    95,    96,    98,   137,   135,   124,   125,
+     126,   129,   123,   190,   192,     0,     0,   259,     0,     0,
+       0,     0,     0,   142,   128,   140,     0,   145,   146,     0,
+       0,     0,     0,     0,     0,   112,   110,   207,   218,   219,
+     220,   225,   221,   222,   223,   224,   216,     0,   227,   234,
+     233,   235,     0,   244,     0,     0,     0,     0,     0,   279,
+       0,   281,   259,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    99,   100,   102,
+       0,     0,     0,     0,     0,     0,     0,   171,   149,     0,
+       0,     0,     0,     0,   107,   113,   111,   206,    97,   204,
+       0,   217,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   286,     0,     0,     0,   270,   271,     0,     0,
+       0,     0,   268,   267,     0,   284,     0,     0,     0,     0,
+     161,     0,     0,     0,     0,   148,     0,     0,     0,     0,
+      61,     0,   101,     0,   226,     0,     0,   258,     0,     0,
+     105,   106,   105,     0,     0,     0,     0,     0,   263,   264,
+     258,     0,     0,     0,   260,     0,   168,     0,     0,   163,
+     164,   160,   167,    60,   203,   205,    97,   108,     0,     0,
+       0,     0,     0,   265,   266,     0,   280,   282,     0,     0,
+     269,   272,   273,     0,   285,   165,   166,     0,     0,     0,
+      61,   109,   103,   228,     0,     0,    97,     0,   101,   254,
+       0,   101,   162,   169,   170,   202,     0,   208,     0,   247,
+       0,     0,   256,     0,     0,   255,   275,   104,   245,     0,
+     246,     0,    97,     0,     0,     0,   257,     0,     0,     0,
+       0,   252,     0,     0,   251,     0,   248
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
-static const short int yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
 {
-      -1,   189,   190,   191,   192,   255,   272,   111,   112,    72,
-     493,    12,    73,    14,    37,    38,    39,    44,    50,   122,
-     324,   234,   398,   327,   536,   378,   354,   521,   291,   355,
-      74,   113,   131,   199,   132,   133,   103,   279,   367,   280,
-      81,    15,    16,    17,    19,    18,   195,   243,   244,    59,
-      22,    57,    94,   418,   419,   123,   202,    51,    89,    52,
-      45,   421,   368,    76,   370,   296,    53,    85,    86,   228,
-     540,   126,   309,   501,   401,   229,   230,   231,   232
+      -1,   188,   189,   190,   191,   254,   271,   111,   112,    72,
+     494,    12,    73,    14,    37,    38,    39,    44,    50,   121,
+     325,   233,   399,   328,   537,   379,   355,   522,   290,   356,
+      74,   113,   130,   198,   131,   132,   103,   278,   368,   279,
+      81,    15,    16,    17,    19,    18,   194,   242,   243,    59,
+      22,    57,    94,   419,   420,   122,   201,    51,    89,    52,
+      45,   422,   369,    76,   371,   295,    53,    85,    86,   227,
+     541,   125,   308,   502,   402,   228,   229,   230,   231
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -440
-static const short int yypact[] =
+#define YYPACT_NINF -386
+static const yytype_int16 yypact[] =
 {
-     298,  -440,  -440,  -440,  -440,  -440,  -440,  -440,     7,   -91,
-      83,    26,   134,    37,    52,   152,   776,  -440,   178,   108,
-      49,    56,  -440,   107,   233,  -440,   945,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,  -440,  -440,   123,   123,    76,
-    -440,  -440,  -440,  -440,   123,  -440,  -440,  -440,  -440,  -440,
-     123,   238,  -440,    27,   240,   241,   242,  -440,  -440,  -440,
-    -440,  -440,   125,  -440,  -440,  -440,  -440,  -440,   257,   258,
-       4,    24,  -440,  -440,  -440,   103,  -440,    76,    76,  -440,
-    -440,  1189,   175,   175,  -440,  -440,   171,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,   -34,   851,  -440,   126,   130,   109,
-     125,  -440,   103,   -78,  -440,   851,  1189,  1205,    55,   256,
-     262,   200,   263,   622,  -440,   267,  -440,  -440,  -440,  -440,
-    -440,  -440,  1224,  -440,    -8,  1349,  -440,   255,  -440,  -440,
-     103,  -440,   141,   138,  1205,  1205,   140,   -64,  1205,  -440,
-     143,  -440,   103,  -440,  -440,  -440,  -440,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,
-    -440,  -440,  -440,   450,   481,   145,  -440,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,   147,  -440,
-    -440,  -440,   148,   149,   154,   807,  1253,   387,   273,   157,
-     162,   164,   165,  -440,  -440,   169,  -440,   125,   103,   198,
-    -440,  -440,  -440,  -440,  -440,   227,  1267,   228,   293,   175,
-    -440,  -440,   450,   481,  1205,  1205,  1205,  1205,  1205,  1205,
-    1205,  1205,  1205,  1205,  1205,  1205,  1205,  1205,  -440,   175,
-    -440,   120,  -440,  -440,   133,  1114,  -440,    21,   -72,  -440,
-     166,   103,  -440,   169,   169,  -440,  -440,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,   168,  -440,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,
-    -440,  -440,   173,  1189,  1189,  1189,  1189,  1189,  -440,  -440,
-     -31,   473,   -68,  -440,   -49,  -440,  1189,  1189,  1189,  1189,
-      16,  -440,   174,  -440,   125,   764,  -440,   902,   902,  -440,
-     902,  1224,  1205,  1205,     3,    30,  -440,   764,    36,   182,
-     187,   188,   189,   190,   193,   764,   764,   275,   194,  1224,
-    1205,  1205,  -440,  -440,  -440,  -440,  -440,   -53,  -440,  -440,
-    -440,   -53,  -440,  -440,  1189,  1189,  -440,   195,   196,   197,
-     201,  1189,  -440,   191,   622,   -36,  -440,  -440,   203,   204,
-     279,   205,   313,   334,  -440,   169,  1154,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,   288,  1189,  -440,  -440,  -440,
-    -440,   211,  -440,   214,   902,   764,   764,    35,  -440,    39,
-    -440,  -440,   902,   210,  1205,  1205,  1205,  1205,  1205,   216,
-     220,  1205,  1205,   902,   764,   221,  -440,  -440,  -440,   222,
-     223,   -30,  1189,  1189,  1189,  1189,  -440,  -440,   215,  1189,
-    1189,  1205,  1189,  -440,  -440,  -440,  -440,   103,   225,   229,
-    -440,   341,   -16,   352,   356,   234,   239,   245,   902,   366,
-     902,   248,   249,   902,   250,   103,  -440,   252,   253,   902,
-     902,   103,  -440,   237,  -440,  1205,  1189,  1189,  1205,  -440,
-     268,   251,   271,   274,  -440,   254,   272,    79,   281,    33,
-    1170,  -440,   277,  -440,   902,   902,  1205,   902,   902,   278,
-    -440,   278,   902,   286,  1205,  1205,  1205,  -440,  -440,  1205,
-     764,   294,   296,  -440,  1189,  -440,  1189,  1189,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,   103,    31,   357,   301,   236,
-     764,    -4,  -440,  -440,   342,  -440,  -440,   295,   902,  -440,
-    -440,  -440,    40,  -440,  -440,  -440,   300,   302,   306,    33,
-    -440,   343,  -440,   382,    10,  -440,  1205,  -440,  -440,   304,
-    -440,  -440,  -440,  -440,  -440,   403,  -440,   902,  -440,  1027,
-      14,   133,   764,    22,  -440,   -53,  -440,  -440,   305,  -440,
-    1027,  -440,   432,   433,   314,   133,   902,   902,   435,   390,
-    -440,   902,   440,  -440,   902,  -440
+     357,  -386,  -386,  -386,  -386,  -386,  -386,  -386,    28,  -112,
+      61,   -51,   136,    27,   288,   172,   594,  -386,   209,    93,
+      49,    75,  -386,    48,   230,  -386,   841,  -386,  -386,  -386,
+    -386,  -386,  -386,  -386,  -386,  -386,  -386,   129,   129,   229,
+    -386,  -386,  -386,  -386,   129,  -386,  -386,  -386,  -386,  -386,
+     129,   252,  -386,    18,   257,   274,   279,  -386,  -386,  -386,
+    -386,  -386,   161,  -386,  -386,  -386,  -386,  -386,   294,   295,
+       4,    13,  -386,  -386,  -386,   137,  -386,   229,   229,  -386,
+    -386,  1052,   228,   228,  -386,  -386,   110,  -386,  -386,  -386,
+    -386,  -386,  -386,  -386,   -65,   126,  -386,   164,   165,   108,
+     161,  -386,   137,   -49,  -386,   126,  1052,  1192,    68,   298,
+     299,    44,   300,   617,  -386,   305,  -386,  -386,  -386,  -386,
+    -386,  1206,  -386,     9,  1340,  -386,   293,  -386,  -386,   137,
+    -386,   178,   175,  1192,  1192,   171,   -45,  1192,  -386,   177,
+    -386,   137,  -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,
+    -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,
+    -386,  -386,   264,   475,   179,  -386,  -386,  -386,  -386,  -386,
+    -386,  -386,  -386,  -386,  -386,  -386,  -386,   186,  -386,  -386,
+    -386,   194,   202,   203,   803,  1241,   461,   325,   219,   222,
+     237,   243,  -386,  -386,   236,  -386,   161,   137,   226,  -386,
+    -386,  -386,  -386,  -386,   332,  1256,   233,   372,   228,  -386,
+    -386,   264,   475,  1192,  1192,  1192,  1192,  1192,  1192,  1192,
+    1192,  1192,  1192,  1192,  1192,  1192,  1192,  -386,   228,  -386,
+     159,  -386,  -386,   -64,  1095,  -386,   -33,    78,  -386,   242,
+     137,  -386,   236,   236,  -386,  -386,  -386,  -386,  -386,  -386,
+    -386,  -386,  -386,  -386,   249,  -386,  -386,  -386,  -386,  -386,
+    -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,
+    -386,   250,  1052,  1052,  1052,  1052,  1052,  -386,  -386,   -57,
+     518,   -92,  -386,   -39,  -386,  1052,  1052,  1052,  1052,    23,
+    -386,   253,  -386,   161,   760,  -386,   885,   885,  -386,   885,
+    1206,  1192,  1192,    43,    77,  -386,   760,    31,   255,   259,
+     262,   263,   266,   267,   760,   760,   366,   269,  1206,  1192,
+    1192,  -386,  -386,  -386,  -386,  -386,  -386,  -386,   -50,  -386,
+    -386,  -386,   -50,  -386,  -386,  1052,  1052,  -386,   270,   272,
+     276,   277,  1052,  -386,   265,   617,   -23,  -386,  -386,   278,
+     287,   381,   289,   408,   423,  -386,   236,  1134,  -386,  -386,
+    -386,  -386,  -386,  -386,  -386,  -386,   376,  1052,  -386,  -386,
+    -386,  -386,   296,  -386,   297,   885,   760,   760,     3,  -386,
+       5,  -386,  -386,   885,   301,  1192,  1192,  1192,  1192,  1192,
+     302,   304,  1192,  1192,   885,   760,   307,  -386,  -386,  -386,
+     308,   310,   -40,  1052,  1052,  1052,  1052,  -386,  -386,   291,
+    1052,  1052,  1192,  1052,  -386,  -386,  -386,  -386,   137,   311,
+     309,  -386,   421,   -88,   433,   435,   312,   316,   320,   885,
+     450,   885,   323,   324,   885,   326,   137,  -386,   328,   329,
+     885,   885,   137,  -386,   322,  -386,  1192,  1052,  1052,  1192,
+    -386,   331,   337,   344,   347,  -386,   348,   349,   101,   351,
+     125,  1150,  -386,   356,  -386,   885,   885,  1192,   885,   885,
+     358,  -386,   358,   885,   362,  1192,  1192,  1192,  -386,  -386,
+    1192,   760,   361,   364,  -386,  1052,  -386,  1052,  1052,  -386,
+    -386,  -386,  -386,  -386,  -386,  -386,   137,    56,   448,   371,
+     343,   760,   -31,  -386,  -386,   438,  -386,  -386,   359,   885,
+    -386,  -386,  -386,    37,  -386,  -386,  -386,   368,   369,   370,
+     125,  -386,   462,  -386,   497,     6,  -386,  1192,  -386,  -386,
+     373,  -386,  -386,  -386,  -386,  -386,   506,  -386,   885,  -386,
+    1009,    20,   -64,   760,   151,  -386,   -50,  -386,  -386,   382,
+    -386,  1009,  -386,   502,   504,   384,   -64,   885,   885,   507,
+     454,  -386,   885,   509,  -386,   885,  -386
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const short int yypgoto[] =
+static const yytype_int16 yypgoto[] =
 {
-    -440,   331,   332,   333,   335,   259,   264,  -206,  -440,     0,
-     -58,   376,     6,  -440,  -440,  -440,    34,  -440,  -440,  -172,
-    -322,  -396,  -440,  -239,  -440,  -285,   -33,  -440,  -218,  -440,
-    -440,   -25,   230,  -270,  -440,   359,   367,   139,  -109,  -159,
-     170,  -440,  -440,   453,  -440,  -440,  -440,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,   393,  -440,  -440,  -440,  -440,
-    -440,  -440,  -439,   -89,   124,  -209,  -440,   417,  -440,  -440,
-    -440,  -440,  -440,    13,   105,  -440,  -440,  -440,  -440
+    -386,   398,   401,   407,   410,   327,   330,  -204,  -386,     0,
+      17,   453,    10,  -386,  -386,  -386,    54,  -386,  -386,  -175,
+    -319,  -381,  -386,  -239,  -386,  -297,    46,  -386,  -203,  -386,
+    -386,   -25,   306,  -283,  -386,   436,   445,   -70,  -109,  -180,
+     210,  -386,  -386,   529,  -386,  -386,  -386,  -386,  -386,  -386,
+    -386,  -386,  -386,  -386,  -386,   464,  -386,  -386,  -386,  -386,
+    -386,  -386,  -385,   -75,   117,  -159,  -386,   496,  -386,  -386,
+    -386,  -386,  -386,    70,   170,  -386,  -386,  -386,  -386
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -176
-static const short int yytable[] =
+#define YYTABLE_NINF -177
+static const yytype_int16 yytable[] =
 {
-      11,    75,   300,   331,   193,   397,    13,   306,    98,   397,
-     310,   311,   312,   313,   314,   200,    11,   317,   318,   299,
-     380,   459,    13,   299,   194,   332,   333,   282,   284,    60,
-      61,   374,   100,    63,    64,    65,    66,   301,     1,     2,
-      23,     3,     4,    84,   428,   352,   102,     1,   430,   393,
-       3,    87,    20,   552,   138,   322,   323,   319,   -55,   -55,
-     352,   104,   353,   105,   341,   139,    67,    21,   138,   329,
-     130,    77,    78,   346,   102,   396,   143,   144,    82,   240,
-     130,   429,   142,   341,    83,   429,    11,    28,    29,    30,
-      31,    32,    33,    34,   347,    35,   341,   198,   127,   519,
-     548,   341,   448,    79,    80,   128,   449,   408,   342,   237,
-     238,   554,   395,   241,    60,    61,   341,   100,    63,    64,
-      65,    66,   345,     1,     2,   463,     3,     4,   526,   541,
-     322,   323,   527,    24,   201,   377,   104,   415,   105,   322,
-     323,   322,   323,    46,    47,    48,    99,    26,    49,   538,
-     396,    67,    40,   549,   104,   555,   105,    25,    68,   396,
-     328,    69,   379,   104,    70,   105,    71,   101,    27,   104,
-      88,   105,   526,   382,   397,   434,   530,   436,   437,   438,
-      54,   295,    36,   442,   505,     1,   506,    55,     3,   304,
-     305,   295,   307,   308,   295,   295,   295,   295,   295,   315,
-     316,   295,   295,   145,   146,   292,   369,   422,   369,   369,
-     130,   369,   104,     2,   105,   490,     4,    42,   369,    43,
-     114,   397,   496,   397,   320,   321,   369,   369,   115,   116,
-     117,   118,   119,   120,   121,   193,   104,   297,   105,   483,
-     298,   322,   323,    68,    56,   141,    69,   106,   107,    70,
-      58,    71,   136,    36,    84,   194,   344,    91,    92,    93,
-      95,    96,    97,   -56,   134,   509,   510,   511,   135,   -57,
-     147,   196,   233,   235,   236,   293,   198,   375,   376,   242,
-     273,   239,   274,   275,   276,   369,   369,   369,   543,   277,
-     285,   545,   286,   369,   198,   394,   295,   287,  -175,   288,
-     289,   290,   299,   334,   369,   369,   391,   330,   335,   356,
-     411,   -63,     1,     2,   383,     3,     4,     5,   539,   384,
-     385,   386,   387,     6,     7,   388,   392,   402,   403,   404,
-     413,   417,   407,   405,   550,   409,   410,   412,   414,   369,
-     420,   369,     8,   423,   369,     9,   424,   433,   439,    10,
-     369,   369,   440,   445,   446,   447,   454,   460,   462,   295,
-     435,   295,   295,   295,   464,   461,   441,   295,   465,   466,
-     470,   467,   479,   524,   522,   369,   369,   468,   369,   369,
-     448,   472,   474,   369,   475,   476,   457,   485,   429,   535,
-     488,   369,    60,    61,   537,   100,   108,   109,   110,    66,
-     484,     1,     2,   486,     3,     4,   487,   546,   489,   497,
-     504,   369,   336,   337,   338,   339,   340,   491,   508,   369,
-     480,   371,   372,   295,   373,   348,   349,   350,   351,    67,
-     514,   381,   515,   523,   528,   495,   531,   553,   532,   389,
-     390,   500,   533,   544,   556,   557,   558,   561,   369,   295,
-     295,   295,   564,   369,   500,   562,   224,   225,   226,   492,
-     227,   534,   125,   520,   140,   326,   137,   369,   369,    41,
-      90,   302,   369,   399,   400,   369,   124,   303,    60,    61,
-     406,   100,   108,   109,   110,    66,   431,     1,     2,     0,
-       3,     4,   512,     0,     0,     0,     0,     0,   425,   426,
-     427,   542,   256,   257,     0,     0,   432,     0,     0,     0,
-       0,     0,     0,     0,     0,    67,     0,   443,   444,   492,
-       0,    68,     0,     0,    69,     0,     0,    70,     0,    71,
-     283,   245,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   450,   451,   452,   453,     0,     0,     0,   455,   456,
-       0,   458,   469,     0,   471,     0,     0,   473,     0,     0,
-       0,     0,     0,   477,   478,     0,     0,     0,   258,   259,
-     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
-     270,   271,     0,     0,     0,   481,   482,     0,   498,   499,
-       0,   502,   503,     0,     0,     0,   507,     0,     0,     0,
-       0,     0,     0,     0,   513,     0,     0,    68,     0,     0,
-      69,     0,     0,    70,     0,    71,   343,     0,     0,     0,
-       0,     0,     0,   516,   525,   517,   518,    60,    61,     0,
-       0,     0,   529,     0,     0,     0,     1,     2,     0,     3,
-       4,     0,   148,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   149,   150,     0,     0,     0,
-       0,   547,     0,     0,     0,     0,   551,     0,     0,     0,
+      11,    75,   332,   299,   192,   281,   283,   381,    98,   398,
+      13,   114,   429,   398,   431,   298,    11,   375,    60,    61,
+      23,   100,    63,    64,    65,    66,    13,     1,     2,   298,
+       3,     4,   199,   300,    84,   394,   140,   460,   193,   333,
+     334,   342,    87,   321,   322,   342,   102,   144,   145,   430,
+     347,   430,   353,   318,   464,    67,   305,   321,   322,   309,
+     310,   311,   312,   313,   323,   324,   316,   317,   126,   354,
+     129,   -55,   -55,    20,   102,   127,   342,   397,   323,   324,
+     129,    25,   141,   343,   137,   353,    11,    21,   137,   142,
+     143,    77,    78,   449,   342,   138,   197,   450,    82,   239,
+     346,   104,   527,   105,    83,   348,   528,   329,   236,   237,
+     342,    24,   240,    60,    61,   520,   100,    63,    64,    65,
+      66,   409,     1,     2,     1,     3,     4,     3,    46,    47,
+      48,    60,    61,    49,   100,    63,    64,    65,    66,     1,
+       1,     2,     3,     3,     4,   542,   539,    99,    68,    26,
+      67,    69,   200,   416,    70,   549,    71,   101,   128,    27,
+     550,   396,    88,   321,   322,   104,   555,   105,    67,   383,
+     527,   556,    40,   506,   531,   507,   378,   104,   398,   105,
+     294,    54,   553,   397,   323,   324,    56,   423,   303,   304,
+     294,   306,   307,   294,   294,   294,   294,   294,   314,   315,
+     294,   294,   337,   338,   339,   340,   341,    55,   291,   129,
+     380,   104,   104,   105,   105,   349,   350,   351,   352,   370,
+     330,   370,   370,   497,   370,   398,   435,   398,   437,   438,
+     439,   370,   321,   322,   443,   104,   192,   105,   491,   370,
+     370,     2,   296,    68,     4,   297,    69,    58,    42,    70,
+      43,    71,   135,   323,   324,   345,    79,    80,   321,   322,
+      36,    68,   319,   320,    69,   400,   401,    70,    84,    71,
+     193,   104,   407,   105,    91,   197,   376,   377,   397,   323,
+     324,   115,   116,   117,   118,   119,   120,   106,   107,   544,
+     484,    92,   546,   197,   395,   294,    93,    95,    96,    97,
+     370,   370,   370,   133,   134,   -56,   -57,   146,   370,   195,
+     232,   234,   235,   238,   241,   272,   510,   511,   512,   370,
+     370,   540,   273,    28,    29,    30,    31,    32,    33,    34,
+     274,    35,   418,   451,   452,   453,   454,   551,   275,   276,
+     456,   457,   284,   459,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   370,   285,   370,  -176,   286,   370,
+     294,   436,   294,   294,   294,   370,   370,   442,   294,   289,
+     -63,     1,     2,   287,     3,     4,     5,   482,   483,   288,
+     292,   298,     6,     7,   331,   335,   336,   458,   384,   357,
+     370,   370,   385,   370,   370,   386,   387,   392,   370,   388,
+     389,     8,   393,   403,     9,   404,   370,   408,    10,   405,
+     406,   410,   412,   372,   373,   517,   374,   518,   519,    36,
+     411,   481,   413,   382,   294,   414,   370,   415,   421,   424,
+     425,   390,   391,   455,   370,   440,   496,   441,   463,   434,
+     446,   447,   501,   448,   461,   465,   462,   466,   467,   468,
+     294,   294,   294,   469,   471,   501,   449,   473,   480,   475,
+     493,   476,   477,   370,   485,   523,    60,    61,   370,   100,
+     108,   109,   110,    66,   486,     1,     2,   487,     3,     4,
+     488,   525,   370,   370,   430,   489,   490,   370,   492,   498,
+     370,   505,   426,   427,   428,   509,   255,   256,   515,   529,
+     433,   516,   543,    67,   524,   532,   533,   534,   536,   538,
+     547,   444,   445,   545,   557,   554,   558,   559,   563,   562,
+     493,   565,   223,    60,    61,   224,   100,   108,   109,   110,
+      66,   225,     1,     2,   226,     3,     4,   535,   301,   124,
+     327,   139,   302,   521,   136,    41,   470,   123,   472,    90,
+     513,   474,   432,     0,     0,     0,     0,   478,   479,     0,
+      67,   257,   258,   259,   260,   261,   262,   263,   264,   265,
+     266,   267,   268,   269,   270,     0,     0,     0,     0,     0,
+       0,     0,   499,   500,     0,   503,   504,     0,     0,     0,
+     508,     0,     0,     0,  -175,     0,    68,     0,   514,    69,
+       0,     0,    70,     0,    71,   282,     0,   -63,     1,     2,
+       0,     3,     4,     5,     0,     0,     0,     0,   526,     6,
+       7,     0,    60,    61,     0,     0,   530,     0,     0,     0,
+       0,     1,     2,     0,     3,     4,     0,   147,     8,     0,
+       0,     9,     0,     0,     0,    10,     0,     0,     0,     0,
+     148,   149,     0,    68,     0,   548,    69,     0,     0,    70,
+     552,    71,   344,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   560,   561,     0,     0,     0,   564,
+       0,     0,   566,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,   162,   163,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     559,   560,     0,     0,     0,   563,     0,     0,   565,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,   164,     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,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,     0,   178,   179,   180,   181,     0,   182,   183,   184,
-       0,     0,     0,     0,     0,   104,     0,   105,     0,   185,
-       0,     0,   186,     0,   187,     0,   188,   357,   358,    60,
-      61,   359,     0,     0,     0,     0,  -174,     0,     1,     2,
-       0,     3,     4,     0,   360,   361,   362,     0,     0,   -63,
-       1,     2,     0,     3,     4,     5,     0,   363,   364,     0,
-       0,     6,     7,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    60,    61,   365,   100,   108,   109,   110,    66,
-       8,     1,     2,     9,     3,     4,     0,    10,     0,     0,
-       0,   151,   152,   153,   154,   155,   156,   157,   158,   159,
-     160,   161,   162,   163,   164,     0,     0,     0,     0,    67,
-       0,     0,     0,     0,     0,     0,    60,    61,     0,   100,
+       0,     0,   164,   165,   166,   167,   168,   169,   170,   171,
+     172,   173,   174,   175,   176,     0,   177,   178,   179,   180,
+       0,   181,   182,   183,     0,     0,     0,     0,     0,     0,
+       0,   104,     0,   105,     0,   184,     0,     0,   185,     0,
+     186,     0,   187,   358,   359,    60,    61,   360,     0,     0,
+       0,     0,     0,     0,     1,     2,     0,     3,     4,     0,
+     361,   362,   363,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   364,   365,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    60,    61,
+     366,   100,   108,   109,   110,    66,     0,     1,     2,     0,
+       3,     4,     0,     0,     0,     0,   150,   151,   152,   153,
+     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
+       0,     0,     0,     0,     0,    67,    60,    61,     0,    62,
       63,    64,    65,    66,     0,     1,     2,     0,     3,     4,
-     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   129,   178,   179,   180,   181,     0,   182,
-     183,   184,     0,    67,     0,     0,     0,   104,     0,   105,
-       0,     0,     0,     0,   366,   357,   358,    60,    61,   359,
-       0,     0,     0,     0,     0,     0,     1,     2,     0,     3,
-       4,     0,   360,   361,   362,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   363,   364,     0,     0,     0,
-       0,    68,     0,     0,    69,     0,   278,    70,     0,    71,
-      60,    61,   365,    62,    63,    64,    65,    66,     0,     1,
-       2,     0,     3,     4,     0,     0,     0,     0,     0,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,   164,     0,     0,    68,     0,    67,    69,     0,
-       0,    70,     0,    71,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,     0,   178,   179,   180,   181,     0,   182,   183,   184,
-     357,   358,     0,     0,   359,     0,     0,     0,     0,     0,
-       0,     0,   366,     0,     0,     0,     0,   360,   361,   362,
+       0,     0,     0,     0,     0,   164,   165,   166,   167,   168,
+     169,   170,   171,   172,   173,   174,   175,   176,     0,   177,
+     178,   179,   180,    67,   181,   182,   183,     0,   358,   359,
+      60,    61,   360,     0,   104,     0,   105,     0,     0,     1,
+       2,   367,     3,     4,     0,   361,   362,   363,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   364,   365,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     363,   364,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   365,     0,    68,
-       0,     0,    69,     0,     0,    70,     0,    71,     0,     0,
-       0,     0,     0,     0,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    60,
+       0,     0,     0,     0,     0,   366,     0,     0,    68,     0,
+       0,    69,     0,   277,    70,     0,    71,     0,     0,     0,
+       0,   150,   151,   152,   153,   154,   155,   156,   157,   158,
+     159,   160,   161,   162,   163,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    68,     0,     0,    69,
+       0,     0,    70,     0,    71,     0,     0,     0,     0,     0,
+     164,   165,   166,   167,   168,   169,   170,   171,   172,   173,
+     174,   175,   176,     0,   177,   178,   179,   180,     0,   181,
+     182,   183,   358,   359,     0,     0,   360,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   367,     0,     0,   361,
+     362,   363,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   364,   365,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    60,    61,   366,
+     100,   108,   109,   110,    66,     0,     1,     2,     0,     3,
+       4,     0,     0,     0,     0,   150,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,     0,
+       0,     0,     0,     0,    67,     0,     0,     0,     0,     0,
+      60,    61,     0,   100,    63,    64,    65,    66,     0,     1,
+       2,     0,     3,     4,   164,   165,   166,   167,   168,   169,
+     170,   171,   172,   173,   174,   175,   176,   326,   177,   178,
+     179,   180,     0,   181,   182,   183,     0,    67,     0,    60,
       61,     0,   100,    63,    64,    65,    66,     0,     1,     2,
-       0,     3,     4,   165,   166,   167,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   325,   178,   179,   180,
-     181,     0,   182,   183,   184,     0,    67,     0,     0,    60,
-      61,     0,   100,    63,    64,    65,    66,   366,     1,     2,
-       0,     3,     4,     0,     0,    60,    61,     0,   100,    63,
-      64,    65,    66,     0,     1,     2,   416,     3,     4,     0,
-       0,     0,     0,     0,    60,    61,    67,   100,   108,   109,
-     110,    66,   494,     1,     2,     0,     3,     4,     0,     0,
-      60,    61,    67,   100,    63,    64,    65,    66,     0,     1,
-       2,     0,     3,     4,     0,     0,     0,     0,     0,    60,
-      61,    67,   197,    63,    64,    65,    66,     0,     1,     2,
-       0,     3,     4,     0,     0,     0,     0,    67,    68,     0,
-       0,    69,     0,     0,    70,     0,    71,     0,    60,    61,
-       0,   100,   108,   109,   110,    66,    67,     1,     2,     0,
-       3,     4,    60,    61,     0,   294,    63,    64,    65,    66,
-       0,     1,     2,     0,     3,     4,     0,     0,    68,     0,
-       0,    69,     0,     0,    70,    67,    71,     0,     0,     0,
-       0,     0,     0,     0,    68,     0,     0,    69,     0,    67,
-      70,     0,    71,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    68,     0,     0,    69,     0,     0,    70,
-       0,    71,     0,     0,     0,     0,     0,     0,     0,    68,
-       0,     0,    69,     0,     0,    70,     0,    71,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    68,     0,
-       0,    69,     0,     0,    70,     0,    71,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   203,
+     367,     3,     4,     0,     0,    60,    61,     0,   100,    63,
+      64,    65,    66,     0,     1,     2,   417,     3,     4,     0,
+       0,     0,     0,     0,     0,     0,    67,     0,     0,     0,
+       0,     0,   495,     0,     0,     0,     0,    68,     0,     0,
+      69,     0,    67,    70,     0,    71,     0,    60,    61,     0,
+     100,    63,    64,    65,    66,     0,     1,     2,     0,     3,
+       4,    60,    61,     0,   196,    63,    64,    65,    66,     0,
+       1,     2,     0,     3,     4,     0,     0,     0,     0,     0,
+      68,     0,     0,    69,    67,     0,    70,     0,    71,     0,
+       0,     0,     0,     0,     0,     0,    60,    61,    67,   100,
+     108,   109,   110,    66,     0,     1,     2,     0,     3,     4,
+       0,    60,    61,     0,   293,    63,    64,    65,    66,    68,
+       1,     2,    69,     3,     4,    70,     0,    71,     0,     0,
+       0,     0,     0,    67,     0,    68,     0,     0,    69,     0,
+       0,    70,     0,    71,     0,     0,     0,     0,    67,     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,    68,     0,     0,
-      69,     0,     0,    70,     0,   281,     0,   204,   205,     0,
+      69,     0,     0,    70,     0,    71,     0,     0,     0,     0,
+       0,    68,     0,     0,    69,     0,     0,    70,     0,    71,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     202,     0,     0,     0,     0,     0,    68,     0,     0,    69,
+       0,     0,    70,     0,   280,     0,     0,     0,   203,   204,
        0,    68,     0,     0,    69,     0,     0,    70,     0,    71,
-     206,   207,   208,   209,   210,   211,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   212,   213,
+     205,   206,   207,   208,   209,   210,   150,   151,   152,   153,
+     154,   155,   156,   157,   158,   159,   160,   161,   211,   212,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     214,   215,   216,     0,     0,   217,   166,   167,   168,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   218,   219,
-     179,   180,   181,   220,   221,   222,   223
+     213,   214,   215,     0,     0,   216,   165,   166,   167,   168,
+     169,   170,   171,   172,   173,   174,   175,   176,   217,   218,
+     178,   179,   180,   219,   220,   221,   222
 };
 
-static const short int yycheck[] =
+static const yytype_int16 yycheck[] =
 {
-       0,    26,   208,   242,   113,   327,     0,   216,     4,   331,
-     219,   220,   221,   222,   223,    23,    16,   226,   227,     9,
-     305,   417,    16,     9,   113,   243,   244,   186,   187,     5,
-       6,   301,     8,     9,    10,    11,    12,   209,    14,    15,
-     131,    17,    18,    16,     9,    29,    71,    14,     9,   319,
-      17,    24,    45,    31,   132,   108,   109,   229,     3,     4,
-      29,   133,    46,   135,   132,   143,    42,    60,   132,   141,
-      95,    37,    38,   141,    99,   128,    21,    22,    44,   143,
-     105,    46,   107,   132,    50,    46,    86,    35,    36,    37,
-      38,    39,    40,    41,   143,    43,   132,   122,   132,   495,
-     539,   132,   132,    27,    28,   139,   136,   143,   139,   134,
-     135,   550,   321,   138,     5,     6,   132,     8,     9,    10,
-      11,    12,   281,    14,    15,   141,    17,    18,   132,   525,
-     108,   109,   136,    50,   142,   132,   133,   355,   135,   108,
-     109,   108,   109,    35,    36,    37,   142,    13,    40,   139,
-     128,    42,     0,   139,   133,   551,   135,   131,   134,   128,
-     139,   137,   132,   133,   140,   135,   142,   143,   131,   133,
-     143,   135,   132,   137,   496,   384,   136,   386,   387,   388,
-     131,   206,   130,   392,   469,    14,   471,   131,    17,   214,
+       0,    26,   241,   207,   113,   185,   186,   304,     4,   328,
+       0,    81,     9,   332,     9,     9,    16,   300,     5,     6,
+     132,     8,     9,    10,    11,    12,    16,    14,    15,     9,
+      17,    18,    23,   208,    16,   318,   106,   418,   113,   242,
+     243,   133,    24,   107,   108,   133,    71,     3,     4,    46,
+     142,    46,    29,   228,   142,    42,   215,   107,   108,   218,
+     219,   220,   221,   222,   128,   129,   225,   226,   133,    46,
+      95,     3,     4,    45,    99,   140,   133,   127,   128,   129,
+     105,   132,   107,   140,   133,    29,    86,    59,   133,    21,
+      22,    37,    38,   133,   133,   144,   121,   137,    44,   144,
+     280,   134,   133,   136,    50,   144,   137,   140,   133,   134,
+     133,    50,   137,     5,     6,   496,     8,     9,    10,    11,
+      12,   144,    14,    15,    14,    17,    18,    17,    35,    36,
+      37,     5,     6,    40,     8,     9,    10,    11,    12,    14,
+      14,    15,    17,    17,    18,   526,   140,   143,   135,    13,
+      42,   138,   143,   356,   141,   540,   143,   144,    32,   132,
+     140,   320,   144,   107,   108,   134,   551,   136,    42,   138,
+     133,   552,     0,   470,   137,   472,   133,   134,   497,   136,
+     205,   132,    31,   127,   128,   129,   138,   367,   213,   214,
      215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,     3,     4,   199,   295,   366,   297,   298,
-     235,   300,   133,    15,   135,   136,    18,    39,   307,    41,
-      81,   543,   461,   545,   104,   105,   315,   316,    53,    54,
-      55,    56,    57,    58,    59,   344,   133,     9,   135,   448,
-      12,   108,   109,   134,   137,   106,   137,    77,    78,   140,
-      17,   142,   143,   130,    16,   344,   281,    17,    17,    17,
-     135,     4,     4,     7,   138,   474,   475,   476,   138,     7,
-       7,     4,    17,   132,   136,    48,   301,   302,   303,   136,
-     135,   141,   135,   135,   135,   374,   375,   376,   527,   135,
-      17,   530,   135,   382,   319,   320,   321,   135,     0,   135,
-     135,   132,     9,   135,   393,   394,    31,   141,   135,   135,
-      31,    13,    14,    15,   132,    17,    18,    19,   524,   132,
-     132,   132,   132,    25,    26,   132,   132,   132,   132,   132,
-      17,   356,   141,   132,   540,   132,   132,   132,     4,   428,
-      52,   430,    44,   132,   433,    47,   132,   137,   132,    51,
-     439,   440,   132,   132,   132,   132,   141,   132,    17,   384,
-     385,   386,   387,   388,    12,   136,   391,   392,    12,   135,
-       4,   132,   135,   137,    17,   464,   465,   132,   467,   468,
-     132,   132,   132,   472,   132,   132,   411,   136,    46,    46,
-     136,   480,     5,     6,    12,     8,     9,    10,    11,    12,
-     132,    14,    15,   132,    17,    18,   132,     4,   136,   132,
-     132,   500,   273,   274,   275,   276,   277,   136,   132,   508,
-     445,   297,   298,   448,   300,   286,   287,   288,   289,    42,
-     136,   307,   136,   132,   139,   460,   136,   132,   136,   315,
-     316,   466,   136,   139,    12,    12,   132,    12,   537,   474,
-     475,   476,    12,   542,   479,    65,   125,   125,   125,   459,
-     125,   519,    86,   496,   105,   235,    99,   556,   557,    16,
-      53,   212,   561,   334,   335,   564,    83,   213,     5,     6,
-     341,     8,     9,    10,    11,    12,   381,    14,    15,    -1,
-      17,    18,   479,    -1,    -1,    -1,    -1,    -1,   374,   375,
-     376,   526,    21,    22,    -1,    -1,   382,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    42,    -1,   393,   394,   519,
-      -1,   134,    -1,    -1,   137,    -1,    -1,   140,    -1,   142,
-     143,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,   402,   403,   404,   405,    -1,    -1,    -1,   409,   410,
-      -1,   412,   428,    -1,   430,    -1,    -1,   433,    -1,    -1,
-      -1,    -1,    -1,   439,   440,    -1,    -1,    -1,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,    -1,    -1,    -1,   446,   447,    -1,   464,   465,
-      -1,   467,   468,    -1,    -1,    -1,   472,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   480,    -1,    -1,   134,    -1,    -1,
-     137,    -1,    -1,   140,    -1,   142,   143,    -1,    -1,    -1,
-      -1,    -1,    -1,   484,   500,   486,   487,     5,     6,    -1,
-      -1,    -1,   508,    -1,    -1,    -1,    14,    15,    -1,    17,
-      18,    -1,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    33,    34,    -1,    -1,    -1,
-      -1,   537,    -1,    -1,    -1,    -1,   542,    -1,    -1,    -1,
+     225,   226,   272,   273,   274,   275,   276,   132,   198,   234,
+     133,   134,   134,   136,   136,   285,   286,   287,   288,   294,
+     142,   296,   297,   462,   299,   544,   385,   546,   387,   388,
+     389,   306,   107,   108,   393,   134,   345,   136,   137,   314,
+     315,    15,     9,   135,    18,    12,   138,    17,    39,   141,
+      41,   143,   144,   128,   129,   280,    27,    28,   107,   108,
+     131,   135,   103,   104,   138,   335,   336,   141,    16,   143,
+     345,   134,   342,   136,    17,   300,   301,   302,   127,   128,
+     129,    53,    54,    55,    56,    57,    58,    77,    78,   528,
+     449,    17,   531,   318,   319,   320,    17,   136,     4,     4,
+     375,   376,   377,   139,   139,     7,     7,     7,   383,     4,
+      17,   133,   137,   142,   137,   136,   475,   476,   477,   394,
+     395,   525,   136,    35,    36,    37,    38,    39,    40,    41,
+     136,    43,   357,   403,   404,   405,   406,   541,   136,   136,
+     410,   411,    17,   413,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,   429,   136,   431,     0,   136,   434,
+     385,   386,   387,   388,   389,   440,   441,   392,   393,   133,
+      13,    14,    15,   136,    17,    18,    19,   447,   448,   136,
+      48,     9,    25,    26,   142,   136,   136,   412,   133,   136,
+     465,   466,   133,   468,   469,   133,   133,    31,   473,   133,
+     133,    44,   133,   133,    47,   133,   481,   142,    51,   133,
+     133,   133,    31,   296,   297,   485,   299,   487,   488,   131,
+     133,   446,   133,   306,   449,    17,   501,     4,    52,   133,
+     133,   314,   315,   142,   509,   133,   461,   133,    17,   138,
+     133,   133,   467,   133,   133,    12,   137,    12,   136,   133,
+     475,   476,   477,   133,     4,   480,   133,   133,   136,   133,
+     460,   133,   133,   538,   133,    17,     5,     6,   543,     8,
+       9,    10,    11,    12,   137,    14,    15,   133,    17,    18,
+     133,   138,   557,   558,    46,   137,   137,   562,   137,   133,
+     565,   133,   375,   376,   377,   133,    21,    22,   137,   140,
+     383,   137,   527,    42,   133,   137,   137,   137,    46,    12,
+       4,   394,   395,   140,    12,   133,    12,   133,    64,    12,
+     520,    12,   124,     5,     6,   124,     8,     9,    10,    11,
+      12,   124,    14,    15,   124,    17,    18,   520,   211,    86,
+     234,   105,   212,   497,    99,    16,   429,    83,   431,    53,
+     480,   434,   382,    -1,    -1,    -1,    -1,   440,   441,    -1,
+      42,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   465,   466,    -1,   468,   469,    -1,    -1,    -1,
+     473,    -1,    -1,    -1,     0,    -1,   135,    -1,   481,   138,
+      -1,    -1,   141,    -1,   143,   144,    -1,    13,    14,    15,
+      -1,    17,    18,    19,    -1,    -1,    -1,    -1,   501,    25,
+      26,    -1,     5,     6,    -1,    -1,   509,    -1,    -1,    -1,
+      -1,    14,    15,    -1,    17,    18,    -1,    20,    44,    -1,
+      -1,    47,    -1,    -1,    -1,    51,    -1,    -1,    -1,    -1,
+      33,    34,    -1,   135,    -1,   538,   138,    -1,    -1,   141,
+     543,   143,   144,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   557,   558,    -1,    -1,    -1,   562,
+      -1,    -1,   565,    66,    67,    68,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     556,   557,    -1,    -1,    -1,   561,    -1,    -1,   564,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,    -1,   120,   121,   122,   123,    -1,   125,   126,   127,
-      -1,    -1,    -1,    -1,    -1,   133,    -1,   135,    -1,   137,
-      -1,    -1,   140,    -1,   142,    -1,   144,     3,     4,     5,
-       6,     7,    -1,    -1,    -1,    -1,     0,    -1,    14,    15,
-      -1,    17,    18,    -1,    20,    21,    22,    -1,    -1,    13,
-      14,    15,    -1,    17,    18,    19,    -1,    33,    34,    -1,
-      -1,    25,    26,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     5,     6,    50,     8,     9,    10,    11,    12,
-      44,    14,    15,    47,    17,    18,    -1,    51,    -1,    -1,
-      -1,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    -1,    -1,    -1,    -1,    42,
-      -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    -1,     8,
+      -1,    -1,   105,   106,   107,   108,   109,   110,   111,   112,
+     113,   114,   115,   116,   117,    -1,   119,   120,   121,   122,
+      -1,   124,   125,   126,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   134,    -1,   136,    -1,   138,    -1,    -1,   141,    -1,
+     143,    -1,   145,     3,     4,     5,     6,     7,    -1,    -1,
+      -1,    -1,    -1,    -1,    14,    15,    -1,    17,    18,    -1,
+      20,    21,    22,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    33,    34,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
+      50,     8,     9,    10,    11,    12,    -1,    14,    15,    -1,
+      17,    18,    -1,    -1,    -1,    -1,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      -1,    -1,    -1,    -1,    -1,    42,     5,     6,    -1,     8,
        9,    10,    11,    12,    -1,    14,    15,    -1,    17,    18,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,    32,   120,   121,   122,   123,    -1,   125,
-     126,   127,    -1,    42,    -1,    -1,    -1,   133,    -1,   135,
-      -1,    -1,    -1,    -1,   140,     3,     4,     5,     6,     7,
-      -1,    -1,    -1,    -1,    -1,    -1,    14,    15,    -1,    17,
-      18,    -1,    20,    21,    22,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    33,    34,    -1,    -1,    -1,
-      -1,   134,    -1,    -1,   137,    -1,   139,   140,    -1,   142,
-       5,     6,    50,     8,     9,    10,    11,    12,    -1,    14,
-      15,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    -1,    -1,   134,    -1,    42,   137,    -1,
-      -1,   140,    -1,   142,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,    -1,   120,   121,   122,   123,    -1,   125,   126,   127,
-       3,     4,    -1,    -1,     7,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   140,    -1,    -1,    -1,    -1,    20,    21,    22,
+      -1,    -1,    -1,    -1,    -1,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,    -1,   119,
+     120,   121,   122,    42,   124,   125,   126,    -1,     3,     4,
+       5,     6,     7,    -1,   134,    -1,   136,    -1,    -1,    14,
+      15,   141,    17,    18,    -1,    20,    21,    22,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    33,    34,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      33,    34,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,   134,
-      -1,    -1,   137,    -1,    -1,   140,    -1,   142,    -1,    -1,
-      -1,    -1,    -1,    -1,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,
+      -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,   135,    -1,
+      -1,   138,    -1,   140,   141,    -1,   143,    -1,    -1,    -1,
+      -1,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   135,    -1,    -1,   138,
+      -1,    -1,   141,    -1,   143,    -1,    -1,    -1,    -1,    -1,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,    -1,   119,   120,   121,   122,    -1,   124,
+     125,   126,     3,     4,    -1,    -1,     7,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   141,    -1,    -1,    20,
+      21,    22,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    33,    34,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    50,
+       8,     9,    10,    11,    12,    -1,    14,    15,    -1,    17,
+      18,    -1,    -1,    -1,    -1,    66,    67,    68,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    -1,
+      -1,    -1,    -1,    -1,    42,    -1,    -1,    -1,    -1,    -1,
+       5,     6,    -1,     8,     9,    10,    11,    12,    -1,    14,
+      15,    -1,    17,    18,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,    32,   119,   120,
+     121,   122,    -1,   124,   125,   126,    -1,    42,    -1,     5,
        6,    -1,     8,     9,    10,    11,    12,    -1,    14,    15,
-      -1,    17,    18,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,    32,   120,   121,   122,
-     123,    -1,   125,   126,   127,    -1,    42,    -1,    -1,     5,
-       6,    -1,     8,     9,    10,    11,    12,   140,    14,    15,
-      -1,    17,    18,    -1,    -1,     5,     6,    -1,     8,     9,
+     141,    17,    18,    -1,    -1,     5,     6,    -1,     8,     9,
       10,    11,    12,    -1,    14,    15,    32,    17,    18,    -1,
-      -1,    -1,    -1,    -1,     5,     6,    42,     8,     9,    10,
-      11,    12,    32,    14,    15,    -1,    17,    18,    -1,    -1,
-       5,     6,    42,     8,     9,    10,    11,    12,    -1,    14,
-      15,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,     5,
-       6,    42,     8,     9,    10,    11,    12,    -1,    14,    15,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    42,   134,    -1,
-      -1,   137,    -1,    -1,   140,    -1,   142,    -1,     5,     6,
-      -1,     8,     9,    10,    11,    12,    42,    14,    15,    -1,
-      17,    18,     5,     6,    -1,     8,     9,    10,    11,    12,
-      -1,    14,    15,    -1,    17,    18,    -1,    -1,   134,    -1,
-      -1,   137,    -1,    -1,   140,    42,   142,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   134,    -1,    -1,   137,    -1,    42,
-     140,    -1,   142,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   134,    -1,    -1,   137,    -1,    -1,   140,
-      -1,   142,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   134,
-      -1,    -1,   137,    -1,    -1,   140,    -1,   142,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   134,    -1,
-      -1,   137,    -1,    -1,   140,    -1,   142,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   134,    -1,    -1,
-     137,    -1,    -1,   140,    -1,   142,    -1,    48,    49,    -1,
-      -1,   134,    -1,    -1,   137,    -1,    -1,   140,    -1,   142,
-      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      -1,    -1,    -1,    -1,    -1,    -1,    42,    -1,    -1,    -1,
+      -1,    -1,    32,    -1,    -1,    -1,    -1,   135,    -1,    -1,
+     138,    -1,    42,   141,    -1,   143,    -1,     5,     6,    -1,
+       8,     9,    10,    11,    12,    -1,    14,    15,    -1,    17,
+      18,     5,     6,    -1,     8,     9,    10,    11,    12,    -1,
+      14,    15,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,
+     135,    -1,    -1,   138,    42,    -1,   141,    -1,   143,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    42,     8,
+       9,    10,    11,    12,    -1,    14,    15,    -1,    17,    18,
+      -1,     5,     6,    -1,     8,     9,    10,    11,    12,   135,
+      14,    15,   138,    17,    18,   141,    -1,   143,    -1,    -1,
+      -1,    -1,    -1,    42,    -1,   135,    -1,    -1,   138,    -1,
+      -1,   141,    -1,   143,    -1,    -1,    -1,    -1,    42,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   135,    -1,    -1,
+     138,    -1,    -1,   141,    -1,   143,    -1,    -1,    -1,    -1,
+      -1,   135,    -1,    -1,   138,    -1,    -1,   141,    -1,   143,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      30,    -1,    -1,    -1,    -1,    -1,   135,    -1,    -1,   138,
+      -1,    -1,   141,    -1,   143,    -1,    -1,    -1,    48,    49,
+      -1,   135,    -1,    -1,   138,    -1,    -1,   141,    -1,   143,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     101,   102,   103,    -1,    -1,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127
+     100,   101,   102,    -1,    -1,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,   124,   125,   126
 };
 
 /* 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,    14,    15,    17,    18,    19,    25,    26,    44,    47,
-      51,   154,   156,   157,   158,   186,   187,   188,   190,   189,
-      45,    60,   195,   131,    50,   131,    13,   131,    35,    36,
-      37,    38,    39,    40,    41,    43,   130,   159,   160,   161,
-       0,   188,    39,    41,   162,   205,    35,    36,    37,    40,
-     163,   202,   204,   211,   131,   131,   137,   196,    17,   194,
-       5,     6,     8,     9,    10,    11,    12,    42,   134,   137,
-     140,   142,   154,   157,   175,   176,   208,   161,   161,    27,
-      28,   185,   161,   161,    16,   212,   213,    24,   143,   203,
-     212,    17,    17,    17,   197,   135,     4,     4,     4,   142,
-       8,   143,   176,   181,   133,   135,   185,   185,     9,    10,
-      11,   152,   153,   176,   182,    53,    54,    55,    56,    57,
-      58,    59,   164,   200,   200,   156,   216,   132,   139,    32,
-     176,   177,   179,   180,   138,   138,   143,   181,   132,   143,
-     180,   182,   176,    21,    22,     3,     4,     7,    20,    33,
-      34,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   120,   121,
-     122,   123,   125,   126,   127,   137,   140,   142,   144,   146,
-     147,   148,   149,   183,   208,   191,     4,     8,   176,   178,
-      23,   142,   201,    30,    48,    49,    61,    62,    63,    64,
-      65,    66,    79,    80,   101,   102,   103,   106,   119,   120,
-     124,   125,   126,   127,   146,   147,   148,   149,   214,   220,
-     221,   222,   223,    17,   166,   132,   136,   176,   176,   141,
-     143,   176,   136,   192,   193,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,   150,    21,    22,    87,    88,
+      51,   155,   157,   158,   159,   187,   188,   189,   191,   190,
+      45,    59,   196,   132,    50,   132,    13,   132,    35,    36,
+      37,    38,    39,    40,    41,    43,   131,   160,   161,   162,
+       0,   189,    39,    41,   163,   206,    35,    36,    37,    40,
+     164,   203,   205,   212,   132,   132,   138,   197,    17,   195,
+       5,     6,     8,     9,    10,    11,    12,    42,   135,   138,
+     141,   143,   155,   158,   176,   177,   209,   162,   162,    27,
+      28,   186,   162,   162,    16,   213,   214,    24,   144,   204,
+     213,    17,    17,    17,   198,   136,     4,     4,     4,   143,
+       8,   144,   177,   182,   134,   136,   186,   186,     9,    10,
+      11,   153,   154,   177,   183,    53,    54,    55,    56,    57,
+      58,   165,   201,   201,   157,   217,   133,   140,    32,   177,
+     178,   180,   181,   139,   139,   144,   182,   133,   144,   181,
+     183,   177,    21,    22,     3,     4,     7,    20,    33,    34,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,   119,   120,   121,
+     122,   124,   125,   126,   138,   141,   143,   145,   147,   148,
+     149,   150,   184,   209,   192,     4,     8,   177,   179,    23,
+     143,   202,    30,    48,    49,    60,    61,    62,    63,    64,
+      65,    78,    79,   100,   101,   102,   105,   118,   119,   123,
+     124,   125,   126,   147,   148,   149,   150,   215,   221,   222,
+     223,   224,    17,   167,   133,   137,   177,   177,   142,   144,
+     177,   137,   193,   194,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,   151,    21,    22,    86,    87,    88,
       89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   151,   135,   135,   135,   135,   135,   139,   182,
-     184,   142,   184,   143,   184,    17,   135,   135,   135,   135,
-     132,   173,   157,    48,     8,   176,   210,     9,    12,     9,
-     152,   164,   150,   151,   176,   176,   210,   176,   176,   217,
-     210,   210,   210,   210,   210,   176,   176,   210,   210,   164,
-     104,   105,   108,   109,   165,    32,   177,   168,   139,   141,
-     141,   168,   173,   173,   135,   135,   182,   182,   182,   182,
-     182,   132,   139,   143,   176,   184,   141,   143,   182,   182,
-     182,   182,    29,    46,   171,   174,   135,     3,     4,     7,
-      20,    21,    22,    33,    34,    50,   140,   183,   207,   208,
-     209,   209,   209,   209,   178,   176,   176,   132,   170,   132,
-     170,   209,   137,   132,   132,   132,   132,   132,   132,   209,
-     209,    31,   132,   178,   176,   210,   128,   165,   167,   182,
-     182,   219,   132,   132,   132,   132,   182,   141,   143,   132,
-     132,    31,   132,    17,     4,   173,    32,   176,   198,   199,
-      52,   206,   184,   132,   132,   209,   209,   209,     9,    46,
-       9,   219,   209,   137,   210,   176,   210,   210,   210,   132,
-     132,   176,   210,   209,   209,   132,   132,   132,   132,   136,
-     182,   182,   182,   182,   141,   182,   182,   176,   182,   166,
-     132,   136,    17,   141,    12,    12,   135,   132,   132,   209,
-       4,   209,   132,   209,   132,   132,   132,   209,   209,   135,
-     176,   182,   182,   210,   132,   136,   132,   132,   136,   136,
-     136,   136,   154,   155,    32,   176,   168,   132,   209,   209,
-     176,   218,   209,   209,   132,   170,   170,   209,   132,   210,
-     210,   210,   218,   209,   136,   136,   182,   182,   182,   166,
-     171,   172,    17,   132,   137,   209,   132,   136,   139,   209,
-     136,   136,   136,   136,   155,    46,   169,    12,   139,   152,
-     215,   166,   176,   168,   139,   168,     4,   209,   207,   139,
-     152,   209,    31,   132,   207,   166,    12,    12,   132,   209,
-     209,    12,    65,   209,    12,   209
+      99,   152,   136,   136,   136,   136,   136,   140,   183,   185,
+     143,   185,   144,   185,    17,   136,   136,   136,   136,   133,
+     174,   158,    48,     8,   177,   211,     9,    12,     9,   153,
+     165,   151,   152,   177,   177,   211,   177,   177,   218,   211,
+     211,   211,   211,   211,   177,   177,   211,   211,   165,   103,
+     104,   107,   108,   128,   129,   166,    32,   178,   169,   140,
+     142,   142,   169,   174,   174,   136,   136,   183,   183,   183,
+     183,   183,   133,   140,   144,   177,   185,   142,   144,   183,
+     183,   183,   183,    29,    46,   172,   175,   136,     3,     4,
+       7,    20,    21,    22,    33,    34,    50,   141,   184,   208,
+     209,   210,   210,   210,   210,   179,   177,   177,   133,   171,
+     133,   171,   210,   138,   133,   133,   133,   133,   133,   133,
+     210,   210,    31,   133,   179,   177,   211,   127,   166,   168,
+     183,   183,   220,   133,   133,   133,   133,   183,   142,   144,
+     133,   133,    31,   133,    17,     4,   174,    32,   177,   199,
+     200,    52,   207,   185,   133,   133,   210,   210,   210,     9,
+      46,     9,   220,   210,   138,   211,   177,   211,   211,   211,
+     133,   133,   177,   211,   210,   210,   133,   133,   133,   133,
+     137,   183,   183,   183,   183,   142,   183,   183,   177,   183,
+     167,   133,   137,    17,   142,    12,    12,   136,   133,   133,
+     210,     4,   210,   133,   210,   133,   133,   133,   210,   210,
+     136,   177,   183,   183,   211,   133,   137,   133,   133,   137,
+     137,   137,   137,   155,   156,    32,   177,   169,   133,   210,
+     210,   177,   219,   210,   210,   133,   171,   171,   210,   133,
+     211,   211,   211,   219,   210,   137,   137,   183,   183,   183,
+     167,   172,   173,    17,   133,   138,   210,   133,   137,   140,
+     210,   137,   137,   137,   137,   156,    46,   170,    12,   140,
+     153,   216,   167,   177,   169,   140,   169,     4,   210,   208,
+     140,   153,   210,    31,   133,   208,   167,    12,    12,   133,
+     210,   210,    12,    64,   210,    12,   210
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2348,7 +2424,7 @@
       yychar = (Token);						\
       yylval = (Value);						\
       yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
+      YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
@@ -2356,7 +2432,7 @@
       yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
-while (0)
+while (YYID (0))
 
 
 #define YYTERROR	1
@@ -2371,7 +2447,7 @@
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N)				\
     do									\
-      if (N)								\
+      if (YYID (N))                                                    \
 	{								\
 	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
 	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
@@ -2385,7 +2461,7 @@
 	  (Current).first_column = (Current).last_column =		\
 	    YYRHSLOC (Rhs, 0).last_column;				\
 	}								\
-    while (0)
+    while (YYID (0))
 #endif
 
 
@@ -2397,8 +2473,8 @@
 # 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)
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
 # else
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 # endif
@@ -2425,36 +2501,96 @@
 do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
-} while (0)
+} while (YYID (0))
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr,					\
-                  Type, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (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 (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (short int *bottom, short int *top)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
+  for (; bottom <= top; ++bottom)
     YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
@@ -2463,37 +2599,45 @@
 do {								\
   if (yydebug)							\
     yy_stack_print ((Bottom), (Top));				\
-} while (0)
+} while (YYID (0))
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
 #else
 static void
-yy_reduce_print (yyrule)
+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), ",
-             yyrule - 1, yylno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
+  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 (Rule);		\
-} while (0)
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -2527,42 +2671,44 @@
 #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
 {
-  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
 {
   char *yyd = yydest;
   const char *yys = yysrc;
@@ -2588,7 +2734,7 @@
 {
   if (*yystr == '"')
     {
-      size_t yyn = 0;
+      YYSIZE_T yyn = 0;
       char const *yyp = yystr;
 
       for (;;)
@@ -2623,53 +2769,123 @@
 }
 # endif
 
-#endif /* YYERROR_VERBOSE */
+/* 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)
+{
+  int yyn = yypact[yystate];
 
-
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
 
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
 
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
-{
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+      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;
+	  }
 
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
 
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
 
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-  switch (yytype)
-    {
-      default:
-        break;
+      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 (yyoutput, ")");
 }
+#endif /* YYERROR_VERBOSE */
+
 
-#endif /* ! YYDEBUG */
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
@@ -2680,8 +2896,7 @@
     YYSTYPE *yyvaluep;
 #endif
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  YYUSE (yyvaluep);
 
   if (!yymsg)
     yymsg = "Deleting";
@@ -2691,7 +2906,7 @@
     {
 
       default:
-        break;
+	break;
     }
 }
 
@@ -2699,13 +2914,13 @@
 /* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
-# else
+#else
 int yyparse ();
-# endif
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void);
 #else
 int yyparse ();
@@ -2730,14 +2945,18 @@
 `----------*/
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
+#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 (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
 #else
@@ -2755,6 +2974,12 @@
   int yyerrstatus;
   /* Look-ahead token as an internal (translated) token number.  */
   int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -2765,9 +2990,9 @@
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  short int *yyssp;
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
@@ -2776,7 +3001,7 @@
 
 
 
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
@@ -2785,9 +3010,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"));
 
@@ -2811,8 +3036,7 @@
 `------------------------------------------------------------*/
  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:
@@ -2825,11 +3049,11 @@
 
 #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 int *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
@@ -2857,7 +3081,7 @@
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
@@ -2892,12 +3116,10 @@
 `-----------*/
 yybackup:
 
-/* Do appropriate processing given the current state.  */
-/* Read a look-ahead token if we need one and don't already have one.  */
-/* yyresume: */
+  /* 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;
@@ -2939,22 +3161,21 @@
   if (yyn == YYFINAL)
     YYACCEPT;
 
+  /* 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;
 
 
@@ -2990,150 +3211,150 @@
   switch (yyn)
     {
         case 29:
-#line 1038 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1037 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 30:
-#line 1038 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1037 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 31:
-#line 1039 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1038 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 32:
-#line 1039 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1038 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 33:
-#line 1040 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1039 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 34:
-#line 1040 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1039 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 35:
-#line 1041 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1040 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 36:
-#line 1041 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1040 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 37:
-#line 1042 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1041 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 38:
-#line 1042 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1041 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 39:
-#line 1046 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1045 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 40:
-#line 1046 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1045 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 41:
-#line 1047 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1046 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 42:
-#line 1047 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1046 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 43:
-#line 1048 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1047 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 44:
-#line 1048 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1047 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 45:
-#line 1049 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1048 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 46:
-#line 1049 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1048 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 47:
-#line 1050 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1049 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 48:
-#line 1050 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1049 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 49:
-#line 1051 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1050 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 50:
-#line 1051 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1050 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 51:
-#line 1052 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1051 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 52:
-#line 1052 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1051 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 53:
-#line 1053 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1052 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 54:
-#line 1054 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1053 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 61:
-#line 1063 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1062 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 62:
-#line 1067 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1066 "/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 1071 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1070 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3141,15 +3362,15 @@
     break;
 
   case 66:
-#line 1078 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1077 "/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 67:
-#line 1082 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1081 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3157,314 +3378,319 @@
     break;
 
   case 68:
-#line 1088 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1087 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 69:
-#line 1089 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1088 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 70:
-#line 1090 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1089 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 71:
-#line 1091 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1090 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 72:
-#line 1092 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1091 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 73:
-#line 1096 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1095 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 74:
-#line 1097 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1096 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 75:
-#line 1098 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1097 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 76:
-#line 1102 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1101 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;}
     break;
 
   case 77:
-#line 1103 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1102 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::HiddenVisibility;  ;}
     break;
 
   case 78:
-#line 1107 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1106 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 79:
-#line 1108 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1107 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 80:
-#line 1109 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1108 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 81:
-#line 1113 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1112 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 82:
-#line 1114 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1113 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 83:
-#line 1115 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1114 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 84:
-#line 1116 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1115 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 85:
-#line 1117 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1116 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 86:
-#line 1120 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1119 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 87:
-#line 1121 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1120 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 88:
-#line 1122 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.UIntVal) = CallingConv::CSRet; ;}
-    break;
-
-  case 89:
-#line 1123 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1121 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
-  case 90:
-#line 1124 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 89:
+#line 1122 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
-  case 91:
-#line 1125 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 90:
+#line 1123 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
-  case 92:
-#line 1126 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 91:
+#line 1124 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
-  case 93:
-#line 1127 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 92:
+#line 1125 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-                   if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
+                   if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
                      GEN_ERROR("Calling conv too large!");
-                   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
+                   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
                   CHECK_FOR_ERROR
                  ;}
     break;
 
+  case 93:
+#line 1132 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = FunctionType::ZExtAttribute;      ;}
+    break;
+
   case 94:
-#line 1134 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = FunctionType::ZExtAttribute; ;}
+#line 1133 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = FunctionType::SExtAttribute;      ;}
     break;
 
   case 95:
-#line 1135 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = FunctionType::SExtAttribute; ;}
+#line 1134 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = FunctionType::InRegAttribute;     ;}
     break;
 
   case 96:
-#line 1138 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;}
+#line 1135 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = FunctionType::StructRetAttribute; ;}
     break;
 
   case 97:
-#line 1139 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1138 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;}
+    break;
+
+  case 98:
+#line 1139 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-                (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs));
+                (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs));
               ;}
     break;
 
-  case 98:
-#line 1144 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 99:
+#line 1144 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::NoReturnAttribute; ;}
     break;
 
-  case 100:
-#line 1148 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 101:
+#line 1148 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;}
     break;
 
-  case 101:
-#line 1149 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 102:
+#line 1149 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-                (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs));
+                (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs));
               ;}
     break;
 
-  case 102:
-#line 1156 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 103:
+#line 1156 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 103:
-#line 1157 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 104:
+#line 1157 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-  (yyval.UIntVal) = (yyvsp[0].UInt64Val);
+  (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 104:
-#line 1163 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 105:
+#line 1163 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 105:
-#line 1164 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 106:
+#line 1164 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-  (yyval.UIntVal) = (yyvsp[0].UInt64Val);
+  (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 106:
-#line 1172 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 107:
+#line 1172 "/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 107:
-#line 1180 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = 0; ;}
-    break;
-
   case 108:
-#line 1181 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
+#line 1180 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = 0; ;}
     break;
 
   case 109:
-#line 1186 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    {;}
+#line 1181 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
   case 110:
-#line 1187 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1186 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 111:
-#line 1188 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1187 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+    {;}
+    break;
+
+  case 112:
+#line 1188 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    CurGV->setSection((yyvsp[0].StrVal));
-    free((yyvsp[0].StrVal));
+    CurGV->setSection((yyvsp[(1) - (1)].StrVal));
+    free((yyvsp[(1) - (1)].StrVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 112:
-#line 1193 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 113:
+#line 1193 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
+    if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two!");
-    CurGV->setAlignment((yyvsp[0].UInt64Val));
+    CurGV->setAlignment((yyvsp[(2) - (2)].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 117:
-#line 1209 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 118:
+#line 1209 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 118:
-#line 1213 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 119:
+#line 1213 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
+    (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 119:
-#line 1217 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 120:
+#line 1217 "/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 120:
-#line 1224 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 121:
+#line 1224 "/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);
   ;}
     break;
 
-  case 121:
-#line 1229 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 122:
+#line 1229 "/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...
+    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 122:
-#line 1237 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 123:
+#line 1237 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     std::vector<FunctionType::ParameterAttributes> Attrs;
-    Attrs.push_back((yyvsp[0].ParamAttrs));
-    for (TypeWithAttrsList::iterator I=(yyvsp[-2].TypeWithAttrsList)->begin(), E=(yyvsp[-2].TypeWithAttrsList)->end(); I != E; ++I) {
+    Attrs.push_back((yyvsp[(5) - (5)].ParamAttrs));
+    for (TypeWithAttrsList::iterator I=(yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E=(yyvsp[(3) - (5)].TypeWithAttrsList)->end(); I != E; ++I) {
       Params.push_back(I->Ty->get());
       if (I->Ty->get() != Type::VoidTy)
         Attrs.push_back(I->Attrs);
@@ -3472,21 +3698,21 @@
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
     if (isVarArg) Params.pop_back();
 
-    FunctionType *FT = FunctionType::get(*(yyvsp[-4].TypeVal), Params, isVarArg, Attrs);
-    delete (yyvsp[-2].TypeWithAttrsList);   // Delete the argument list
-    delete (yyvsp[-4].TypeVal);   // Delete the return type handle
+    FunctionType *FT = FunctionType::get(*(yyvsp[(1) - (5)].TypeVal), Params, isVarArg, Attrs);
+    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 123:
-#line 1255 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 124:
+#line 1255 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     std::vector<FunctionType::ParameterAttributes> Attrs;
-    Attrs.push_back((yyvsp[0].ParamAttrs));
-    for (TypeWithAttrsList::iterator I=(yyvsp[-2].TypeWithAttrsList)->begin(), E=(yyvsp[-2].TypeWithAttrsList)->end(); I != E; ++I) {
+    Attrs.push_back((yyvsp[(5) - (5)].ParamAttrs));
+    for (TypeWithAttrsList::iterator I=(yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E=(yyvsp[(3) - (5)].TypeWithAttrsList)->end(); I != E; ++I) {
       Params.push_back(I->Ty->get());
       if (I->Ty->get() != Type::VoidTy)
         Attrs.push_back(I->Attrs);
@@ -3494,129 +3720,129 @@
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
     if (isVarArg) Params.pop_back();
 
-    FunctionType *FT = FunctionType::get((yyvsp[-4].PrimType), Params, isVarArg, Attrs);
-    delete (yyvsp[-2].TypeWithAttrsList);      // Delete the argument list
+    FunctionType *FT = FunctionType::get((yyvsp[(1) - (5)].PrimType), Params, isVarArg, Attrs);
+    delete (yyvsp[(3) - (5)].TypeWithAttrsList);      // Delete the argument list
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 124:
-#line 1273 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 125:
+#line 1273 "/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 125:
-#line 1278 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 126:
+#line 1278 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {          // Packed array 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 PackedType 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(PackedType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
-     delete (yyvsp[-1].TypeVal);
+     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(PackedType::get(*(yyvsp[(4) - (5)].TypeVal), (unsigned)(yyvsp[(2) - (5)].UInt64Val))));
+     delete (yyvsp[(4) - (5)].TypeVal);
      CHECK_FOR_ERROR
   ;}
     break;
 
-  case 126:
-#line 1290 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 127:
+#line 1290 "/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);
+    delete (yyvsp[(2) - (3)].TypeList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 127:
-#line 1300 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 128:
+#line 1300 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 128:
-#line 1304 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 129:
+#line 1304 "/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);
+    delete (yyvsp[(3) - (5)].TypeList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 129:
-#line 1314 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 130:
+#line 1314 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 130:
-#line 1321 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 131:
+#line 1321 "/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 131:
-#line 1328 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 132:
+#line 1328 "/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);
+    (yyval.TypeVal) = (yyvsp[(1) - (1)].TypeVal);
   ;}
     break;
 
-  case 132:
-#line 1335 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 133:
+#line 1335 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
-  case 133:
-#line 1340 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 134:
+#line 1340 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
-    (yyval.TypeWithAttrsList)->push_back((yyvsp[0].TypeWithAttrs));
+    (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 134:
-#line 1345 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 135:
+#line 1345 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    ((yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList))->push_back((yyvsp[0].TypeWithAttrs));
+    ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 136:
-#line 1353 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 137:
+#line 1353 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList);
+    (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
     (yyval.TypeWithAttrsList)->push_back(TWA);
@@ -3624,8 +3850,8 @@
   ;}
     break;
 
-  case 137:
-#line 1360 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 138:
+#line 1360 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
@@ -3635,162 +3861,162 @@
   ;}
     break;
 
-  case 138:
-#line 1367 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 139:
+#line 1367 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 139:
-#line 1375 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 140:
+#line 1375 "/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.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal)); delete (yyvsp[(1) - (1)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 140:
-#line 1380 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 141:
+#line 1380 "/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)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal)); delete (yyvsp[(3) - (3)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 141:
-#line 1391 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 142:
+#line 1391 "/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 142:
-#line 1419 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 143:
+#line 1419 "/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);
+    delete (yyvsp[(1) - (3)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 143:
-#line 1435 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 144:
+#line 1435 "/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));
+    free((yyvsp[(3) - (3)].StrVal));
     (yyval.ConstVal) = ConstantArray::get(ATy, Vals);
-    delete (yyvsp[-2].TypeVal);
+    delete (yyvsp[(1) - (3)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 144:
-#line 1464 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 145:
+#line 1464 "/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 PackedType *PTy = dyn_cast<PackedType>((yyvsp[-3].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
+    const PackedType *PTy = dyn_cast<PackedType>((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) = ConstantPacked::get(PTy, *(yyvsp[-1].ConstVector));
-    delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector);
+    (yyval.ConstVal) = ConstantPacked::get(PTy, *(yyvsp[(3) - (4)].ConstVector));
+    delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 145:
-#line 1492 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 146:
+#line 1492 "/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) +
@@ -3800,21 +4026,21 @@
     if (STy->isPacked())
       GEN_ERROR("Unpacked Initializer to packed 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 146:
-#line 1517 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 147:
+#line 1517 "/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!");
@@ -3824,25 +4050,25 @@
       GEN_ERROR("Unpacked Initializer to packed type '" + STy->getDescription() + "'");
 
     (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
-    delete (yyvsp[-2].TypeVal);
+    delete (yyvsp[(1) - (3)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 147:
-#line 1536 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 148:
+#line 1536 "/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) +
@@ -3852,21 +4078,21 @@
     if (!STy->isPacked())
       GEN_ERROR("Packed Initializer to unpacked 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 148:
-#line 1561 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 149:
+#line 1561 "/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!");
@@ -3876,44 +4102,44 @@
       GEN_ERROR("Packed Initializer to unpacked type '" + STy->getDescription() + "'");
 
     (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
-    delete (yyvsp[-4].TypeVal);
+    delete (yyvsp[(1) - (5)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 149:
-#line 1580 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 150:
+#line 1580 "/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);
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 150:
-#line 1592 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 151:
+#line 1592 "/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 151:
-#line 1599 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 152:
+#line 1599 "/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!");
 
@@ -3927,7 +4153,7 @@
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
 
-    Value *V = getValNonImprovising(Ty, (yyvsp[0].ValIDVal));
+    Value *V = getValNonImprovising(Ty, (yyvsp[(2) - (2)].ValIDVal));
     CHECK_FOR_ERROR
 
     CurFun.CurrentFunction = SavedCurFn;
@@ -3942,16 +4168,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.
@@ -3967,261 +4193,261 @@
         }
 
         // 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
+    delete (yyvsp[(1) - (2)].TypeVal);            // Free the type handle
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 152:
-#line 1665 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 153:
+#line 1665 "/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 153:
-#line 1675 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 154:
+#line 1675 "/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);
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 154:
-#line 1685 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 155:
+#line 1685 "/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));
+    (yyval.ConstVal) = ConstantInt::get((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 155:
-#line 1691 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 156:
+#line 1691 "/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));
+    (yyval.ConstVal) = ConstantInt::get((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 156:
-#line 1697 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 157:
+#line 1697 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
-    assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
+    assert(cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getTrue();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 157:
-#line 1702 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 158:
+#line 1702 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
-    assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
+    assert(cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getFalse();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 158:
-#line 1707 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 159:
+#line 1707 "/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 159:
-#line 1715 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 160:
+#line 1715 "/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 160:
-#line 1727 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 161:
+#line 1727 "/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), true);
+      GetElementPtrInst::getIndexedType((yyvsp[(3) - (5)].ConstVal)->getType(), *(yyvsp[(4) - (5)].ValueList), true);
     if (!IdxTy)
       GEN_ERROR("Index list invalid for constant getelementptr!");
 
     std::vector<Constant*> 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);
+    (yyval.ConstVal) = ConstantExpr::getGetElementPtr((yyvsp[(3) - (5)].ConstVal), IdxVec);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 161:
-#line 1748 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 162:
+#line 1748 "/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 162:
-#line 1756 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 163:
+#line 1756 "/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 163:
-#line 1762 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 164:
+#line 1762 "/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 (!isa<PackedType>((yyvsp[-3].ConstVal)->getType()) || 
-          !cast<PackedType>((yyvsp[-3].ConstVal)->getType())->getElementType()->isInteger())
+    if (!(yyvsp[(3) - (6)].ConstVal)->getType()->isInteger()) {
+      if (!isa<PackedType>((yyvsp[(3) - (6)].ConstVal)->getType()) || 
+          !cast<PackedType>((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 164:
-#line 1773 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 165:
+#line 1773 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
+    if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match!");
-    (yyval.ConstVal) = ConstantExpr::getICmp((yyvsp[-5].IPredicate), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    (yyval.ConstVal) = ConstantExpr::getICmp((yyvsp[(2) - (7)].IPredicate), (yyvsp[(4) - (7)].ConstVal), (yyvsp[(6) - (7)].ConstVal));
   ;}
     break;
 
-  case 165:
-#line 1778 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 166:
+#line 1778 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
+    if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match!");
-    (yyval.ConstVal) = ConstantExpr::getFCmp((yyvsp[-5].FPredicate), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    (yyval.ConstVal) = ConstantExpr::getFCmp((yyvsp[(2) - (7)].FPredicate), (yyvsp[(4) - (7)].ConstVal), (yyvsp[(6) - (7)].ConstVal));
   ;}
     break;
 
-  case 166:
-#line 1783 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 167:
+#line 1783 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if ((yyvsp[-1].ConstVal)->getType() != Type::Int8Ty)
+    if ((yyvsp[(5) - (6)].ConstVal)->getType() != Type::Int8Ty)
       GEN_ERROR("Shift count for shift constant must be i8 type!");
-    if (!(yyvsp[-3].ConstVal)->getType()->isInteger())
+    if (!(yyvsp[(3) - (6)].ConstVal)->getType()->isInteger())
       GEN_ERROR("Shift constant expression requires integer operand!");
     CHECK_FOR_ERROR;
-    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].OtherOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    (yyval.ConstVal) = ConstantExpr::get((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 167:
-#line 1792 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 168:
+#line 1792 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!ExtractElementInst::isValidOperands((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].ConstVal), (yyvsp[-1].ConstVal));
+    (yyval.ConstVal) = ConstantExpr::getExtractElement((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 168:
-#line 1798 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 169:
+#line 1798 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!InsertElementInst::isValidOperands((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[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    (yyval.ConstVal) = ConstantExpr::getInsertElement((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 169:
-#line 1804 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 170:
+#line 1804 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].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[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    (yyval.ConstVal) = ConstantExpr::getShuffleVector((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 170:
-#line 1813 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 171:
+#line 1813 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
+    ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 171:
-#line 1817 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 172:
+#line 1817 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
-    (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
+    (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 172:
-#line 1825 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 173:
+#line 1825 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 173:
-#line 1825 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 174:
+#line 1825 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 174:
-#line 1836 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 175:
+#line 1836 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4229,8 +4455,8 @@
   ;}
     break;
 
-  case 175:
-#line 1841 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 176:
+#line 1841 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4238,40 +4464,40 @@
   ;}
     break;
 
-  case 178:
-#line 1854 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 179:
+#line 1854 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
-  case 179:
-#line 1854 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 180:
+#line 1854 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 180:
-#line 1858 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 181:
+#line 1858 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
-  case 181:
-#line 1858 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 182:
+#line 1858 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 182:
-#line 1861 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 183:
+#line 1861 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 183:
-#line 1864 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 184:
+#line 1864 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     // Emit an error if there are any unresolved types left.
     if (!CurModule.LateResolveTypes.empty()) {
@@ -4286,11 +4512,11 @@
   ;}
     break;
 
-  case 184:
-#line 1876 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 185:
+#line 1876 "/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:
     //
@@ -4300,111 +4526,111 @@
     // 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 185:
-#line 1900 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 186:
+#line 1900 "/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 186:
-#line 1911 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 187:
+#line 1911 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { 
     /* "Externally Visible" Linkage */
-    if ((yyvsp[0].ConstVal) == 0) 
+    if ((yyvsp[(4) - (4)].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant!");
-    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage,
-                                (yyvsp[-2].Visibility), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal));
+    CurGV = ParseGlobalVariable((yyvsp[(1) - (4)].StrVal), GlobalValue::ExternalLinkage,
+                                (yyvsp[(2) - (4)].Visibility), (yyvsp[(3) - (4)].BoolVal), (yyvsp[(4) - (4)].ConstVal)->getType(), (yyvsp[(4) - (4)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 187:
-#line 1918 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 188:
+#line 1918 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 188:
-#line 1921 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 189:
+#line 1921 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    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), (yyvsp[-3].Linkage), (yyvsp[-2].Visibility), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal));
+    CurGV = ParseGlobalVariable((yyvsp[(1) - (5)].StrVal), (yyvsp[(2) - (5)].Linkage), (yyvsp[(3) - (5)].Visibility), (yyvsp[(4) - (5)].BoolVal), (yyvsp[(5) - (5)].ConstVal)->getType(), (yyvsp[(5) - (5)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 189:
-#line 1926 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 190:
+#line 1926 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 190:
-#line 1929 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 191:
+#line 1929 "/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[-4].StrVal), (yyvsp[-3].Linkage), (yyvsp[-2].Visibility), (yyvsp[-1].BoolVal), *(yyvsp[0].TypeVal), 0);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (5)].TypeVal))->getDescription());
+    CurGV = ParseGlobalVariable((yyvsp[(1) - (5)].StrVal), (yyvsp[(2) - (5)].Linkage), (yyvsp[(3) - (5)].Visibility), (yyvsp[(4) - (5)].BoolVal), *(yyvsp[(5) - (5)].TypeVal), 0);
     CHECK_FOR_ERROR
-    delete (yyvsp[0].TypeVal);
+    delete (yyvsp[(5) - (5)].TypeVal);
   ;}
     break;
 
-  case 191:
-#line 1935 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 192:
+#line 1935 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 192:
-#line 1939 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 193:
+#line 1939 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 193:
-#line 1942 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 194:
+#line 1942 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 194:
-#line 1948 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 195:
+#line 1948 "/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);
@@ -4414,87 +4640,87 @@
 ;}
     break;
 
-  case 195:
-#line 1961 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 196:
+#line 1961 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
-    free((yyvsp[0].StrVal));
+    CurModule.CurrentModule->setTargetTriple((yyvsp[(3) - (3)].StrVal));
+    free((yyvsp[(3) - (3)].StrVal));
   ;}
     break;
 
-  case 196:
-#line 1965 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 197:
+#line 1965 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
-    free((yyvsp[0].StrVal));
+    CurModule.CurrentModule->setDataLayout((yyvsp[(3) - (3)].StrVal));
+    free((yyvsp[(3) - (3)].StrVal));
   ;}
     break;
 
-  case 198:
-#line 1972 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 199:
+#line 1972 "/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 199:
-#line 1977 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 200:
+#line 1977 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-          CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
-          free((yyvsp[0].StrVal));
+          CurModule.CurrentModule->addLibrary((yyvsp[(1) - (1)].StrVal));
+          free((yyvsp[(1) - (1)].StrVal));
           CHECK_FOR_ERROR
         ;}
     break;
 
-  case 200:
-#line 1982 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 201:
+#line 1982 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
-  case 201:
-#line 1991 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 202:
+#line 1991 "/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) = (yyvsp[-4].ArgList);
-    (yyvsp[-4].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 202:
-#line 2001 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 203:
+#line 2001 "/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[(1) - (3)].TypeVal))->getDescription());
+    if (*(yyvsp[(1) - (3)].TypeVal) == Type::VoidTy)
       GEN_ERROR("void typed arguments are invalid!");
-    ArgListEntry E; E.Attrs = (yyvsp[-1].ParamAttrs); E.Ty = (yyvsp[-2].TypeVal); E.Name = (yyvsp[0].StrVal);
+    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 203:
-#line 2012 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 204:
+#line 2012 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ArgList) = (yyvsp[0].ArgList);
+    (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 204:
-#line 2016 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 205:
+#line 2016 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ArgList) = (yyvsp[-2].ArgList);
+    (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
     E.Ty = new PATypeHolder(Type::VoidTy);
     E.Name = 0;
@@ -4504,8 +4730,8 @@
   ;}
     break;
 
-  case 205:
-#line 2025 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 206:
+#line 2025 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -4517,31 +4743,31 @@
   ;}
     break;
 
-  case 206:
-#line 2034 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 207:
+#line 2034 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 207:
-#line 2040 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 208:
+#line 2040 "/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;
   std::vector<FunctionType::ParameterAttributes> ParamAttrs;
-  ParamAttrs.push_back((yyvsp[-2].ParamAttrs));
-  if ((yyvsp[-4].ArgList)) {   // If there are arguments...
-    for (ArgListType::iterator I = (yyvsp[-4].ArgList)->begin(); I != (yyvsp[-4].ArgList)->end(); ++I) {
+  ParamAttrs.push_back((yyvsp[(7) - (9)].ParamAttrs));
+  if ((yyvsp[(5) - (9)].ArgList)) {   // If there are arguments...
+    for (ArgListType::iterator I = (yyvsp[(5) - (9)].ArgList)->begin(); I != (yyvsp[(5) - (9)].ArgList)->end(); ++I) {
       const Type* Ty = I->Ty->get();
       if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(I->Ty))
         GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
@@ -4554,10 +4780,10 @@
   bool isVarArg = ParamTypeList.size() && ParamTypeList.back() == Type::VoidTy;
   if (isVarArg) ParamTypeList.pop_back();
 
-  FunctionType *FT = FunctionType::get(*(yyvsp[-7].TypeVal), ParamTypeList, isVarArg,
+  FunctionType *FT = FunctionType::get(*(yyvsp[(2) - (9)].TypeVal), ParamTypeList, isVarArg,
                                        ParamAttrs);
   const PointerType *PFT = PointerType::get(FT);
-  delete (yyvsp[-7].TypeVal);
+  delete (yyvsp[(2) - (9)].TypeVal);
 
   ValID ID;
   if (!FunctionName.empty()) {
@@ -4602,24 +4828,24 @@
     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();
     unsigned Idx = 1;
-    for (ArgListType::iterator I = (yyvsp[-4].ArgList)->begin(); I != (yyvsp[-4].ArgList)->end(); ++I, ++ArgIt) {
+    for (ArgListType::iterator I = (yyvsp[(5) - (9)].ArgList)->begin(); I != (yyvsp[(5) - (9)].ArgList)->end(); ++I, ++ArgIt) {
       delete I->Ty;                          // Delete the typeholder...
       setValueName(ArgIt, I->Name);           // Insert arg into symtab...
       CHECK_FOR_ERROR
@@ -4627,128 +4853,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 210:
-#line 2147 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 211:
+#line 2147 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
   // Make sure that we keep track of the linkage type even if there was a
   // previous "declare".
-  (yyval.FunctionVal)->setLinkage((yyvsp[-3].Linkage));
-  (yyval.FunctionVal)->setVisibility((yyvsp[-2].Visibility));
+  (yyval.FunctionVal)->setLinkage((yyvsp[(1) - (4)].Linkage));
+  (yyval.FunctionVal)->setVisibility((yyvsp[(2) - (4)].Visibility));
 ;}
     break;
 
-  case 213:
-#line 2158 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 214:
+#line 2158 "/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 214:
-#line 2163 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 215:
+#line 2163 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    CurFun.CurrentFunction->setLinkage((yyvsp[-2].Linkage));
-    CurFun.CurrentFunction->setVisibility((yyvsp[-1].Visibility));
+    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 215:
-#line 2175 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 216:
+#line 2175 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 216:
-#line 2179 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 217:
+#line 2179 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 217:
-#line 2184 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 218:
+#line 2184 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 218:
-#line 2188 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 219:
+#line 2188 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 219:
-#line 2192 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 220:
+#line 2192 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 220:
-#line 2196 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 221:
+#line 2196 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 221:
-#line 2200 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 222:
+#line 2200 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 222:
-#line 2204 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 223:
+#line 2204 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 223:
-#line 2208 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 224:
+#line 2208 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 224:
-#line 2212 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 225:
+#line 2212 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 225:
-#line 2216 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 226:
+#line 2216 "/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(); 
     
     PackedType* pt = PackedType::get(ETy, NumElements);
     PATypeHolder* PTy = new PATypeHolder(
@@ -4760,129 +4986,129 @@
                                          );
     
     // 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(ConstantPacked::get(pt, *(yyvsp[-1].ConstVector)));
-    delete PTy; delete (yyvsp[-1].ConstVector);
+    (yyval.ValIDVal) = ValID::create(ConstantPacked::get(pt, *(yyvsp[(2) - (3)].ConstVector)));
+    delete PTy; delete (yyvsp[(2) - (3)].ConstVector);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 226:
-#line 2241 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 227:
+#line 2241 "/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 227:
-#line 2245 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 228:
+#line 2245 "/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 228:
-#line 2259 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 229:
+#line 2259 "/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 229:
-#line 2263 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 230:
+#line 2263 "/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 230:
-#line 2267 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 231:
+#line 2267 "/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 231:
-#line 2271 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 232:
+#line 2271 "/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 234:
-#line 2283 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 235:
+#line 2283 "/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 235:
-#line 2292 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 236:
+#line 2292 "/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 236:
-#line 2296 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 237:
+#line 2296 "/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 237:
-#line 2305 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 238:
+#line 2305 "/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));
+    InsertValue((yyvsp[(3) - (3)].TermInstVal));
 
-    (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp[0].TermInstVal));
-    InsertValue((yyvsp[-2].BasicBlockVal));
-    (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal);
+    (yyvsp[(1) - (3)].BasicBlockVal)->getInstList().push_back((yyvsp[(3) - (3)].TermInstVal));
+    InsertValue((yyvsp[(1) - (3)].BasicBlockVal));
+    (yyval.BasicBlockVal) = (yyvsp[(1) - (3)].BasicBlockVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 238:
-#line 2316 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 239:
+#line 2316 "/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 239:
-#line 2325 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 240:
+#line 2325 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BasicBlockVal) = getBBVal(ValID::createLocalID(CurFun.NextBBNum++), true);
     CHECK_FOR_ERROR
@@ -4897,10 +5123,10 @@
   ;}
     break;
 
-  case 240:
-#line 2337 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 241:
+#line 2337 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.BasicBlockVal) = getBBVal(ValID::createLocalName((yyvsp[0].StrVal)), true);
+    (yyval.BasicBlockVal) = getBBVal(ValID::createLocalName((yyvsp[(1) - (1)].StrVal)), true);
     CHECK_FOR_ERROR
 
     // Make sure to move the basic block to the correct location in the
@@ -4913,74 +5139,74 @@
   ;}
     break;
 
-  case 241:
-#line 2350 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 242:
+#line 2350 "/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 242:
-#line 2354 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 243:
+#line 2354 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {                                       // Return with no result...
     (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 243:
-#line 2358 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 244:
+#line 2358 "/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);
   ;}
     break;
 
-  case 244:
-#line 2363 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 245:
+#line 2363 "/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);
   ;}
     break;
 
-  case 245:
-#line 2373 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 246:
+#line 2373 "/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());
+    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 246:
-#line 2392 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 247:
+#line 2392 "/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;
@@ -4988,20 +5214,20 @@
   ;}
     break;
 
-  case 247:
-#line 2402 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 248:
+#line 2402 "/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;
       FunctionType::ParamAttrsList ParamAttrs;
-      ParamAttrs.push_back((yyvsp[-6].ParamAttrs));
-      for (ValueRefList::iterator I = (yyvsp[-8].ValueRefList)->begin(), E = (yyvsp[-8].ValueRefList)->end(); I != E; ++I) {
+      ParamAttrs.push_back((yyvsp[(8) - (14)].ParamAttrs));
+      for (ValueRefList::iterator I = (yyvsp[(6) - (14)].ValueRefList)->begin(), E = (yyvsp[(6) - (14)].ValueRefList)->end(); I != E; ++I) {
         const Type *Ty = I->Val->getType();
         if (Ty == Type::VoidTy)
           GEN_ERROR("Short call syntax cannot be used with varargs");
@@ -5009,20 +5235,20 @@
         ParamAttrs.push_back(I->Attrs);
       }
 
-      Ty = FunctionType::get((yyvsp[-11].TypeVal)->get(), ParamTypes, false, ParamAttrs);
+      Ty = FunctionType::get((yyvsp[(3) - (14)].TypeVal)->get(), ParamTypes, false, ParamAttrs);
       PFTy = PointerType::get(Ty);
     }
 
-    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 "
@@ -5032,7 +5258,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)
@@ -5051,353 +5277,353 @@
 
     // Create the InvokeInst
     InvokeInst *II = new InvokeInst(V, Normal, Except, Args);
-    II->setCallingConv((yyvsp[-12].UIntVal));
+    II->setCallingConv((yyvsp[(2) - (14)].UIntVal));
     (yyval.TermInstVal) = II;
-    delete (yyvsp[-8].ValueRefList);
+    delete (yyvsp[(6) - (14)].ValueRefList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 248:
-#line 2468 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 249:
+#line 2468 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 249:
-#line 2472 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 250:
+#line 2472 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 250:
-#line 2479 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 251:
+#line 2479 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.JumpTable) = (yyvsp[-5].JumpTable);
-    Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
+    (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
+    Constant *V = cast<Constant>(getValNonImprovising((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
     CHECK_FOR_ERROR
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value!");
 
-    BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (6)].ValIDVal));
     CHECK_FOR_ERROR
     (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
   ;}
     break;
 
-  case 251:
-#line 2490 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 252:
+#line 2490 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
-    Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
+    Constant *V = cast<Constant>(getValNonImprovising((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
     CHECK_FOR_ERROR
 
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value!");
 
-    BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+    BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (5)].ValIDVal));
     CHECK_FOR_ERROR
     (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); 
   ;}
     break;
 
-  case 252:
-#line 2503 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 253:
+#line 2503 "/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 253:
-#line 2512 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 254:
+#line 2512 "/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());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
     (yyval.PHIList) = new std::list<std::pair<Value*, BasicBlock*> >();
-    Value* tmpVal = getVal(*(yyvsp[-5].TypeVal), (yyvsp[-3].ValIDVal));
+    Value* tmpVal = getVal(*(yyvsp[(1) - (6)].TypeVal), (yyvsp[(3) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
+    BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (6)].ValIDVal));
     CHECK_FOR_ERROR
     (yyval.PHIList)->push_back(std::make_pair(tmpVal, tmpBB));
-    delete (yyvsp[-5].TypeVal);
+    delete (yyvsp[(1) - (6)].TypeVal);
   ;}
     break;
 
-  case 254:
-#line 2523 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 255:
+#line 2523 "/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 255:
-#line 2533 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 256:
+#line 2533 "/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));
+    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);
   ;}
     break;
 
-  case 256:
-#line 2541 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 257:
+#line 2541 "/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));
+      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);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 257:
-#line 2549 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 258:
+#line 2549 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueRefList) = new ValueRefList(); ;}
     break;
 
-  case 258:
-#line 2552 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 259:
+#line 2552 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
-  case 259:
-#line 2553 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 260:
+#line 2553 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ValueList) = (yyvsp[-2].ValueList);
-    (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
+    (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
+    (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 260:
-#line 2560 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 261:
+#line 2560 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 261:
-#line 2564 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 262:
+#line 2564 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 262:
-#line 2569 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 263:
+#line 2569 "/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<PackedType>((*(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<PackedType>((*(yyvsp[(2) - (5)].TypeVal)).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands!");
-    if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()) && 
-        ((yyvsp[-4].BinaryOpVal) == Instruction::URem || 
-         (yyvsp[-4].BinaryOpVal) == Instruction::SRem ||
-         (yyvsp[-4].BinaryOpVal) == Instruction::FRem))
+    if (isa<PackedType>((*(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("U/S/FRem not supported on packed 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);
+    (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 263:
-#line 2590 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 264:
+#line 2590 "/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 (!isa<PackedType>((yyvsp[-3].TypeVal)->get()) ||
-          !cast<PackedType>((yyvsp[-3].TypeVal)->get())->getElementType()->isInteger())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
+    if (!(*(yyvsp[(2) - (5)].TypeVal))->isInteger()) {
+      if (!isa<PackedType>((yyvsp[(2) - (5)].TypeVal)->get()) ||
+          !cast<PackedType>((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);
+    (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 264:
-#line 2607 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 265:
+#line 2607 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
+    if (isa<PackedType>((*(yyvsp[(3) - (6)].TypeVal)).get()))
       GEN_ERROR("Packed 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);
+    (yyval.InstVal) = CmpInst::create((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(2) - (6)].IPredicate), tmpVal1, tmpVal2);
     if ((yyval.InstVal) == 0)
       GEN_ERROR("icmp operator returned null!");
   ;}
     break;
 
-  case 265:
-#line 2620 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 266:
+#line 2620 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    if (isa<PackedType>((*(yyvsp[-3].TypeVal)).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
+    if (isa<PackedType>((*(yyvsp[(3) - (6)].TypeVal)).get()))
       GEN_ERROR("Packed 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);
+    (yyval.InstVal) = CmpInst::create((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(2) - (6)].FPredicate), tmpVal1, tmpVal2);
     if ((yyval.InstVal) == 0)
       GEN_ERROR("fcmp operator returned null!");
   ;}
     break;
 
-  case 266:
-#line 2633 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 267:
+#line 2633 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if ((yyvsp[0].ValueVal)->getType() != Type::Int8Ty)
+    if ((yyvsp[(4) - (4)].ValueVal)->getType() != Type::Int8Ty)
       GEN_ERROR("Shift amount must be i8 type!");
-    if (!(yyvsp[-2].ValueVal)->getType()->isInteger())
+    if (!(yyvsp[(2) - (4)].ValueVal)->getType()->isInteger())
       GEN_ERROR("Shift constant expression requires integer operand!");
     CHECK_FOR_ERROR;
-    (yyval.InstVal) = new ShiftInst((yyvsp[-3].OtherOpVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal));
+    (yyval.InstVal) = new ShiftInst((yyvsp[(1) - (4)].OtherOpVal), (yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 267:
-#line 2642 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 268:
+#line 2642 "/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 268:
-#line 2654 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 269:
+#line 2654 "/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 269:
-#line 2662 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 270:
+#line 2662 "/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 270:
-#line 2669 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 271:
+#line 2669 "/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 271:
-#line 2675 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 272:
+#line 2675 "/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 272:
-#line 2681 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 273:
+#line 2681 "/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 273:
-#line 2687 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 274:
+#line 2687 "/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) 
+    ((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 274:
-#line 2703 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 275:
+#line 2703 "/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;
       FunctionType::ParamAttrsList ParamAttrs;
-      ParamAttrs.push_back((yyvsp[0].ParamAttrs));
-      for (ValueRefList::iterator I = (yyvsp[-2].ValueRefList)->begin(), E = (yyvsp[-2].ValueRefList)->end(); I != E; ++I) {
+      ParamAttrs.push_back((yyvsp[(8) - (8)].ParamAttrs));
+      for (ValueRefList::iterator I = (yyvsp[(6) - (8)].ValueRefList)->begin(), E = (yyvsp[(6) - (8)].ValueRefList)->end(); I != E; ++I) {
         const Type *Ty = I->Val->getType();
         if (Ty == Type::VoidTy)
           GEN_ERROR("Short call syntax cannot be used with varargs");
@@ -5405,16 +5631,16 @@
         ParamAttrs.push_back(I->Attrs);
       }
 
-      Ty = FunctionType::get((yyvsp[-5].TypeVal)->get(), ParamTypes, false, ParamAttrs);
+      Ty = FunctionType::get((yyvsp[(3) - (8)].TypeVal)->get(), ParamTypes, false, ParamAttrs);
       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 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 "
@@ -5425,7 +5651,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)
@@ -5442,165 +5668,163 @@
     }
     // Create the call node
     CallInst *CI = new CallInst(V, Args);
-    CI->setTailCall((yyvsp[-7].BoolVal));
-    CI->setCallingConv((yyvsp[-6].UIntVal));
+    CI->setTailCall((yyvsp[(1) - (8)].BoolVal));
+    CI->setCallingConv((yyvsp[(2) - (8)].UIntVal));
     (yyval.InstVal) = CI;
-    delete (yyvsp[-2].ValueRefList);
-    delete (yyvsp[-5].TypeVal);
+    delete (yyvsp[(6) - (8)].ValueRefList);
+    delete (yyvsp[(3) - (8)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 275:
-#line 2766 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 276:
+#line 2766 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.InstVal) = (yyvsp[0].InstVal);
+    (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 276:
-#line 2771 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 277:
+#line 2771 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 277:
-#line 2775 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 278:
+#line 2775 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 278:
-#line 2782 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 279:
+#line 2782 "/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);
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
+    (yyval.InstVal) = new MallocInst(*(yyvsp[(2) - (3)].TypeVal), 0, (yyvsp[(3) - (3)].UIntVal));
+    delete (yyvsp[(2) - (3)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 279:
-#line 2789 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 280:
+#line 2789 "/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) - (6)].TypeVal))->getDescription());
+    Value* tmpVal = getVal((yyvsp[(4) - (6)].PrimType), (yyvsp[(5) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new MallocInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal));
-    delete (yyvsp[-4].TypeVal);
+    (yyval.InstVal) = new MallocInst(*(yyvsp[(2) - (6)].TypeVal), tmpVal, (yyvsp[(6) - (6)].UIntVal));
+    delete (yyvsp[(2) - (6)].TypeVal);
   ;}
     break;
 
-  case 280:
-#line 2797 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 281:
+#line 2797 "/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) - (3)].TypeVal))->getDescription());
+    (yyval.InstVal) = new AllocaInst(*(yyvsp[(2) - (3)].TypeVal), 0, (yyvsp[(3) - (3)].UIntVal));
+    delete (yyvsp[(2) - (3)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 281:
-#line 2804 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 282:
+#line 2804 "/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) - (6)].TypeVal))->getDescription());
+    Value* tmpVal = getVal((yyvsp[(4) - (6)].PrimType), (yyvsp[(5) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new AllocaInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal));
-    delete (yyvsp[-4].TypeVal);
+    (yyval.InstVal) = new AllocaInst(*(yyvsp[(2) - (6)].TypeVal), tmpVal, (yyvsp[(6) - (6)].UIntVal));
+    delete (yyvsp[(2) - (6)].TypeVal);
   ;}
     break;
 
-  case 282:
-#line 2812 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 283:
+#line 2812 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!isa<PointerType>((yyvsp[0].ValueVal)->getType()))
+    if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
-                     (yyvsp[0].ValueVal)->getType()->getDescription() + "!");
-    (yyval.InstVal) = new FreeInst((yyvsp[0].ValueVal));
+                     (yyvsp[(2) - (2)].ValueVal)->getType()->getDescription() + "!");
+    (yyval.InstVal) = new FreeInst((yyvsp[(2) - (2)].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 283:
-#line 2820 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 284:
+#line 2820 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    if (!isa<PointerType>((yyvsp[-1].TypeVal)->get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (4)].TypeVal))->getDescription());
+    if (!isa<PointerType>((yyvsp[(3) - (4)].TypeVal)->get()))
       GEN_ERROR("Can't load from nonpointer type: " +
-                     (*(yyvsp[-1].TypeVal))->getDescription());
-    if (!cast<PointerType>((yyvsp[-1].TypeVal)->get())->getElementType()->isFirstClassType())
+                     (*(yyvsp[(3) - (4)].TypeVal))->getDescription());
+    if (!cast<PointerType>((yyvsp[(3) - (4)].TypeVal)->get())->getElementType()->isFirstClassType())
       GEN_ERROR("Can't load from pointer of non-first-class type: " +
-                     (*(yyvsp[-1].TypeVal))->getDescription());
-    Value* tmpVal = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal));
+                     (*(yyvsp[(3) - (4)].TypeVal))->getDescription());
+    Value* tmpVal = getVal(*(yyvsp[(3) - (4)].TypeVal), (yyvsp[(4) - (4)].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new LoadInst(tmpVal, "", (yyvsp[-3].BoolVal));
-    delete (yyvsp[-1].TypeVal);
+    (yyval.InstVal) = new LoadInst(tmpVal, "", (yyvsp[(1) - (4)].BoolVal));
+    delete (yyvsp[(3) - (4)].TypeVal);
   ;}
     break;
 
-  case 284:
-#line 2834 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 285:
+#line 2834 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    const PointerType *PT = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
+    const PointerType *PT = dyn_cast<PointerType>((yyvsp[(5) - (6)].TypeVal)->get());
     if (!PT)
       GEN_ERROR("Can't store to a nonpointer type: " +
-                     (*(yyvsp[-1].TypeVal))->getDescription());
+                     (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
     const Type *ElTy = PT->getElementType();
-    if (ElTy != (yyvsp[-3].ValueVal)->getType())
-      GEN_ERROR("Can't store '" + (yyvsp[-3].ValueVal)->getType()->getDescription() +
+    if (ElTy != (yyvsp[(3) - (6)].ValueVal)->getType())
+      GEN_ERROR("Can't store '" + (yyvsp[(3) - (6)].ValueVal)->getType()->getDescription() +
                      "' into space of type '" + ElTy->getDescription() + "'!");
 
-    Value* tmpVal = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal));
+    Value* tmpVal = getVal(*(yyvsp[(5) - (6)].TypeVal), (yyvsp[(6) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new StoreInst((yyvsp[-3].ValueVal), tmpVal, (yyvsp[-5].BoolVal));
-    delete (yyvsp[-1].TypeVal);
+    (yyval.InstVal) = new StoreInst((yyvsp[(3) - (6)].ValueVal), tmpVal, (yyvsp[(1) - (6)].BoolVal));
+    delete (yyvsp[(5) - (6)].TypeVal);
   ;}
     break;
 
-  case 285:
-#line 2851 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 286:
+#line 2851 "/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), true))
+    if (!GetElementPtrInst::getIndexedType(*(yyvsp[(2) - (4)].TypeVal), *(yyvsp[(4) - (4)].ValueList), 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));
-    delete (yyvsp[-2].TypeVal); 
-    delete (yyvsp[0].ValueList);
+    (yyval.InstVal) = new GetElementPtrInst(tmpVal, *(yyvsp[(4) - (4)].ValueList));
+    delete (yyvsp[(2) - (4)].TypeVal); 
+    delete (yyvsp[(4) - (4)].ValueList);
   ;}
     break;
 
 
+/* Line 1267 of yacc.c.  */
+#line 5822 "llvmAsmParser.tab.c"
       default: break;
     }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
-/* Line 1126 of yacc.c.  */
-#line 5599 "llvmAsmParser.tab.c"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-
-
+  YYPOPSTACK (yylen);
+  yylen = 0;
   YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
@@ -5629,110 +5853,41 @@
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-	{
-	  int yytype = YYTRANSLATE (yychar);
-	  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-	  YYSIZE_T yysize = yysize0;
-	  YYSIZE_T yysize1;
-	  int yysize_overflow = 0;
-	  char *yymsg = 0;
-#	  define YYERROR_VERBOSE_ARGS_MAXIMUM 5
-	  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-	  int yyx;
-
-#if 0
-	  /* This is so xgettext sees the translatable formats that are
-	     constructed on the fly.  */
-	  YY_("syntax error, unexpected %s");
-	  YY_("syntax error, unexpected %s, expecting %s");
-	  YY_("syntax error, unexpected %s, expecting %s or %s");
-	  YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-	  YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-#endif
-	  char *yyfmt;
-	  char const *yyf;
-	  static char const yyunexpected[] = "syntax error, unexpected %s";
-	  static char const yyexpecting[] = ", expecting %s";
-	  static char const yyor[] = " or %s";
-	  char yyformat[sizeof yyunexpected
-			+ sizeof yyexpecting - 1
-			+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-			   * (sizeof yyor - 1))];
-	  char const *yyprefix = yyexpecting;
-
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  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 ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
 	      {
-		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;
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
 	      }
+	  }
 
-	  yyf = YY_(yyformat);
-	  yysize1 = yysize + yystrlen (yyf);
-	  yysize_overflow |= yysize1 < yysize;
-	  yysize = yysize1;
-
-	  if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
-	    yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg)
-	    {
-	      /* 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 = yymsg;
-	      int yyi = 0;
-	      while ((*yyp = *yyf))
-		{
-		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		    {
-		      yyp += yytnamerr (yyp, yyarg[yyi++]);
-		      yyf += 2;
-		    }
-		  else
-		    {
-		      yyp++;
-		      yyf++;
-		    }
-		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    {
-	      yyerror (YY_("syntax error"));
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
 	      goto yyexhaustedlab;
-	    }
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror (YY_("syntax error"));
+	  }
+      }
+#endif
     }
 
 
@@ -5743,14 +5898,15 @@
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
-        {
+	{
 	  /* Return failure if at end of input.  */
 	  if (yychar == YYEOF)
 	    YYABORT;
-        }
+	}
       else
 	{
-	  yydestruct ("Error: discarding", yytoken, &yylval);
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
 	  yychar = YYEMPTY;
 	}
     }
@@ -5768,11 +5924,14 @@
   /* Pacify compilers like GCC when the user code never invokes
      YYERROR and the label yyerrorlab therefore never appears in user
      code.  */
-  if (0)
+  if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-yyvsp -= yylen;
-  yyssp -= yylen;
+  /* 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;
 
@@ -5802,8 +5961,9 @@
 	YYABORT;
 
 
-      yydestruct ("Error: popping", yystos[yystate], yyvsp);
-      YYPOPSTACK;
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
@@ -5814,7 +5974,7 @@
   *++yyvsp = yylval;
 
 
-  /* Shift the error token. */
+  /* Shift the error token.  */
   YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
@@ -5849,21 +6009,30 @@
   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;
+      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 2868 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2868 "/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.46 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.47
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.46	Fri Jan 26 02:05:27 2007
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Sun Jan 28 07:37:39 2007
@@ -1,7 +1,9 @@
-/* A Bison parser, made by GNU Bison 2.1.  */
+/* 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, 2003, 2004, 2005 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
@@ -18,10 +20,18 @@
    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.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -81,82 +91,83 @@
      SIDEEFFECT = 307,
      CC_TOK = 308,
      CCC_TOK = 309,
-     CSRETCC_TOK = 310,
-     FASTCC_TOK = 311,
-     COLDCC_TOK = 312,
-     X86_STDCALLCC_TOK = 313,
-     X86_FASTCALLCC_TOK = 314,
-     DATALAYOUT = 315,
-     RET = 316,
-     BR = 317,
-     SWITCH = 318,
-     INVOKE = 319,
-     UNWIND = 320,
-     UNREACHABLE = 321,
-     ADD = 322,
-     SUB = 323,
-     MUL = 324,
-     UDIV = 325,
-     SDIV = 326,
-     FDIV = 327,
-     UREM = 328,
-     SREM = 329,
-     FREM = 330,
-     AND = 331,
-     OR = 332,
-     XOR = 333,
-     ICMP = 334,
-     FCMP = 335,
-     EQ = 336,
-     NE = 337,
-     SLT = 338,
-     SGT = 339,
-     SLE = 340,
-     SGE = 341,
-     ULT = 342,
-     UGT = 343,
-     ULE = 344,
-     UGE = 345,
-     OEQ = 346,
-     ONE = 347,
-     OLT = 348,
-     OGT = 349,
-     OLE = 350,
-     OGE = 351,
-     ORD = 352,
-     UNO = 353,
-     UEQ = 354,
-     UNE = 355,
-     MALLOC = 356,
-     ALLOCA = 357,
-     FREE = 358,
-     LOAD = 359,
-     STORE = 360,
-     GETELEMENTPTR = 361,
-     TRUNC = 362,
-     ZEXT = 363,
-     SEXT = 364,
-     FPTRUNC = 365,
-     FPEXT = 366,
-     BITCAST = 367,
-     UITOFP = 368,
-     SITOFP = 369,
-     FPTOUI = 370,
-     FPTOSI = 371,
-     INTTOPTR = 372,
-     PTRTOINT = 373,
-     PHI_TOK = 374,
-     SELECT = 375,
-     SHL = 376,
-     LSHR = 377,
-     ASHR = 378,
-     VAARG = 379,
-     EXTRACTELEMENT = 380,
-     INSERTELEMENT = 381,
-     SHUFFLEVECTOR = 382,
-     NORETURN = 383,
-     DEFAULT = 384,
-     HIDDEN = 385
+     FASTCC_TOK = 310,
+     COLDCC_TOK = 311,
+     X86_STDCALLCC_TOK = 312,
+     X86_FASTCALLCC_TOK = 313,
+     DATALAYOUT = 314,
+     RET = 315,
+     BR = 316,
+     SWITCH = 317,
+     INVOKE = 318,
+     UNWIND = 319,
+     UNREACHABLE = 320,
+     ADD = 321,
+     SUB = 322,
+     MUL = 323,
+     UDIV = 324,
+     SDIV = 325,
+     FDIV = 326,
+     UREM = 327,
+     SREM = 328,
+     FREM = 329,
+     AND = 330,
+     OR = 331,
+     XOR = 332,
+     ICMP = 333,
+     FCMP = 334,
+     EQ = 335,
+     NE = 336,
+     SLT = 337,
+     SGT = 338,
+     SLE = 339,
+     SGE = 340,
+     ULT = 341,
+     UGT = 342,
+     ULE = 343,
+     UGE = 344,
+     OEQ = 345,
+     ONE = 346,
+     OLT = 347,
+     OGT = 348,
+     OLE = 349,
+     OGE = 350,
+     ORD = 351,
+     UNO = 352,
+     UEQ = 353,
+     UNE = 354,
+     MALLOC = 355,
+     ALLOCA = 356,
+     FREE = 357,
+     LOAD = 358,
+     STORE = 359,
+     GETELEMENTPTR = 360,
+     TRUNC = 361,
+     ZEXT = 362,
+     SEXT = 363,
+     FPTRUNC = 364,
+     FPEXT = 365,
+     BITCAST = 366,
+     UITOFP = 367,
+     SITOFP = 368,
+     FPTOUI = 369,
+     FPTOSI = 370,
+     INTTOPTR = 371,
+     PTRTOINT = 372,
+     PHI_TOK = 373,
+     SELECT = 374,
+     SHL = 375,
+     LSHR = 376,
+     ASHR = 377,
+     VAARG = 378,
+     EXTRACTELEMENT = 379,
+     INSERTELEMENT = 380,
+     SHUFFLEVECTOR = 381,
+     NORETURN = 382,
+     INREG = 383,
+     SRET = 384,
+     DEFAULT = 385,
+     HIDDEN = 386
    };
 #endif
 /* Tokens.  */
@@ -212,89 +223,91 @@
 #define SIDEEFFECT 307
 #define CC_TOK 308
 #define CCC_TOK 309
-#define CSRETCC_TOK 310
-#define FASTCC_TOK 311
-#define COLDCC_TOK 312
-#define X86_STDCALLCC_TOK 313
-#define X86_FASTCALLCC_TOK 314
-#define DATALAYOUT 315
-#define RET 316
-#define BR 317
-#define SWITCH 318
-#define INVOKE 319
-#define UNWIND 320
-#define UNREACHABLE 321
-#define ADD 322
-#define SUB 323
-#define MUL 324
-#define UDIV 325
-#define SDIV 326
-#define FDIV 327
-#define UREM 328
-#define SREM 329
-#define FREM 330
-#define AND 331
-#define OR 332
-#define XOR 333
-#define ICMP 334
-#define FCMP 335
-#define EQ 336
-#define NE 337
-#define SLT 338
-#define SGT 339
-#define SLE 340
-#define SGE 341
-#define ULT 342
-#define UGT 343
-#define ULE 344
-#define UGE 345
-#define OEQ 346
-#define ONE 347
-#define OLT 348
-#define OGT 349
-#define OLE 350
-#define OGE 351
-#define ORD 352
-#define UNO 353
-#define UEQ 354
-#define UNE 355
-#define MALLOC 356
-#define ALLOCA 357
-#define FREE 358
-#define LOAD 359
-#define STORE 360
-#define GETELEMENTPTR 361
-#define TRUNC 362
-#define ZEXT 363
-#define SEXT 364
-#define FPTRUNC 365
-#define FPEXT 366
-#define BITCAST 367
-#define UITOFP 368
-#define SITOFP 369
-#define FPTOUI 370
-#define FPTOSI 371
-#define INTTOPTR 372
-#define PTRTOINT 373
-#define PHI_TOK 374
-#define SELECT 375
-#define SHL 376
-#define LSHR 377
-#define ASHR 378
-#define VAARG 379
-#define EXTRACTELEMENT 380
-#define INSERTELEMENT 381
-#define SHUFFLEVECTOR 382
-#define NORETURN 383
-#define DEFAULT 384
-#define HIDDEN 385
-
-
-
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 885 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-typedef union YYSTYPE {
+#define FASTCC_TOK 310
+#define COLDCC_TOK 311
+#define X86_STDCALLCC_TOK 312
+#define X86_FASTCALLCC_TOK 313
+#define DATALAYOUT 314
+#define RET 315
+#define BR 316
+#define SWITCH 317
+#define INVOKE 318
+#define UNWIND 319
+#define UNREACHABLE 320
+#define ADD 321
+#define SUB 322
+#define MUL 323
+#define UDIV 324
+#define SDIV 325
+#define FDIV 326
+#define UREM 327
+#define SREM 328
+#define FREM 329
+#define AND 330
+#define OR 331
+#define XOR 332
+#define ICMP 333
+#define FCMP 334
+#define EQ 335
+#define NE 336
+#define SLT 337
+#define SGT 338
+#define SLE 339
+#define SGE 340
+#define ULT 341
+#define UGT 342
+#define ULE 343
+#define UGE 344
+#define OEQ 345
+#define ONE 346
+#define OLT 347
+#define OGT 348
+#define OLE 349
+#define OGE 350
+#define ORD 351
+#define UNO 352
+#define UEQ 353
+#define UNE 354
+#define MALLOC 355
+#define ALLOCA 356
+#define FREE 357
+#define LOAD 358
+#define STORE 359
+#define GETELEMENTPTR 360
+#define TRUNC 361
+#define ZEXT 362
+#define SEXT 363
+#define FPTRUNC 364
+#define FPEXT 365
+#define BITCAST 366
+#define UITOFP 367
+#define SITOFP 368
+#define FPTOUI 369
+#define FPTOSI 370
+#define INTTOPTR 371
+#define PTRTOINT 372
+#define PHI_TOK 373
+#define SELECT 374
+#define SHL 375
+#define LSHR 376
+#define ASHR 377
+#define VAARG 378
+#define EXTRACTELEMENT 379
+#define INSERTELEMENT 380
+#define SHUFFLEVECTOR 381
+#define NORETURN 382
+#define INREG 383
+#define SRET 384
+#define DEFAULT 385
+#define HIDDEN 386
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 885 "/home/asl/proj/llvm/src/lib/AsmParser/llvmAsmParser.y"
+{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -338,9 +351,10 @@
   llvm::Instruction::OtherOps       OtherOpVal;
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
-} YYSTYPE;
-/* Line 1447 of yacc.c.  */
-#line 344 "llvmAsmParser.tab.h"
+}
+/* Line 1489 of yacc.c.  */
+#line 357 "llvmAsmParser.tab.h"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -348,5 +362,3 @@
 
 extern YYSTYPE llvmAsmlval;
 
-
-






More information about the llvm-commits mailing list