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

Lauro Ramos Venancio lauro.venancio at gmail.com
Thu Apr 12 11:33:33 PDT 2007



Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.38 -> 1.39
Lexer.l updated: 1.104 -> 1.105
Lexer.l.cvs updated: 1.31 -> 1.32
llvmAsmParser.cpp.cvs updated: 1.83 -> 1.84
llvmAsmParser.h.cvs updated: 1.64 -> 1.65
llvmAsmParser.y updated: 1.338 -> 1.339
llvmAsmParser.y.cvs updated: 1.84 -> 1.85
---
Log message:

Implement the "thread_local" keyword.


---
Diffs of the changes:  (+4001 -3636)

 Lexer.cpp.cvs         | 2990 +++++++++++++++++++-----------------
 Lexer.l               |    1 
 Lexer.l.cvs           |    1 
 llvmAsmParser.cpp.cvs | 4125 +++++++++++++++++++++++++-------------------------
 llvmAsmParser.h.cvs   |  458 ++---
 llvmAsmParser.y       |   31 
 llvmAsmParser.y.cvs   |   31 
 7 files changed, 4001 insertions(+), 3636 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.38 llvm/lib/AsmParser/Lexer.cpp.cvs:1.39
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.38	Mon Apr  9 01:13:29 2007
+++ llvm/lib/AsmParser/Lexer.cpp.cvs	Thu Apr 12 13:32:50 2007
@@ -1,50 +1,93 @@
-#define yy_create_buffer llvmAsm_create_buffer
-#define yy_delete_buffer llvmAsm_delete_buffer
-#define yy_scan_buffer llvmAsm_scan_buffer
-#define yy_scan_string llvmAsm_scan_string
-#define yy_scan_bytes llvmAsm_scan_bytes
-#define yy_flex_debug llvmAsm_flex_debug
-#define yy_init_buffer llvmAsm_init_buffer
-#define yy_flush_buffer llvmAsm_flush_buffer
-#define yy_load_buffer_state llvmAsm_load_buffer_state
-#define yy_switch_to_buffer llvmAsm_switch_to_buffer
-#define yyin llvmAsmin
-#define yyleng llvmAsmleng
-#define yylex llvmAsmlex
-#define yyout llvmAsmout
-#define yyrestart llvmAsmrestart
-#define yytext llvmAsmtext
-#define yylineno llvmAsmlineno
+#line 2 "Lexer.cpp"
 
-#line 20 "Lexer.cpp"
-/* A lexical scanner generated by flex*/
+#line 4 "Lexer.cpp"
 
-/* Scanner skeleton version:
- * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.38 2007/04/09 06:13:29 reid Exp $
- */
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 33
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
 
+/* begin standard C headers. */
 #include <stdio.h>
-#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+/* end standard C headers. */
 
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
 #endif
 
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
-#ifdef __cplusplus
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
 
-#include <stdlib.h>
+#endif /* ! FLEXINT_H */
 
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
+#ifdef __cplusplus
 
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
@@ -53,34 +96,17 @@
 
 #if __STDC__
 
-#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -95,80 +121,88 @@
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN (yy_start) = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE llvmAsmrestart(llvmAsmin  )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE (16384*64)
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
 
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+extern int llvmAsmleng;
 
-extern int yyleng;
-extern FILE *yyin, *yyout;
+extern FILE *llvmAsmin, *llvmAsmout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE llvmAsmlex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-llvmAsmlineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < llvmAsmleng; ++yyl )\
+                    if ( llvmAsmtext[yyl] == '\n' )\
+                        --llvmAsmlineno;\
+            }while(0)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
+		/* Undo effects of setting up llvmAsmtext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up llvmAsmtext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* Some routines like yy_flex_realloc() are emitted as static but are
-   not called by all lexers. This generates warnings in some compilers,
-   notably GCC. Arrange to suppress these. */
-#ifdef __GNUC__
-#define YY_MAY_BE_UNUSED __attribute__((unused))
-#else
-#define YY_MAY_BE_UNUSED
-#endif
+#define unput(c) yyunput( c, (yytext_ptr)  )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-typedef unsigned int yy_size_t;
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
 
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -205,12 +239,16 @@
 	 */
 	int yy_at_bol;
 
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
+
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -220,197 +258,202 @@
 	 * possible backing-up.
 	 *
 	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
+	 * (via llvmAsmrestart()), so that the user can continue scanning by
+	 * just pointing llvmAsmin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
+
 	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-static YY_BUFFER_STATE yy_current_buffer = 0;
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER yy_current_buffer
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
 
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when yytext is formed. */
+/* yy_hold_char holds the character lost when llvmAsmtext is formed. */
 static char yy_hold_char;
-
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
+int llvmAsmleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
+static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
+/* Flag which is used to allow llvmAsmwrap()'s to do buffer switches
+ * instead of setting up a fresh llvmAsmin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void llvmAsmrestart (FILE *input_file  );
+void llvmAsm_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE llvmAsm_create_buffer (FILE *file,int size  );
+void llvmAsm_delete_buffer (YY_BUFFER_STATE b  );
+void llvmAsm_flush_buffer (YY_BUFFER_STATE b  );
+void llvmAsmpush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void llvmAsmpop_buffer_state (void );
+
+static void llvmAsmensure_buffer_stack (void );
+static void llvmAsm_load_buffer_state (void );
+static void llvmAsm_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER llvmAsm_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE llvmAsm_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE llvmAsm_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE llvmAsm_scan_bytes (yyconst char *bytes,int len  );
+
+void *llvmAsmalloc (yy_size_t  );
+void *llvmAsmrealloc (void *,yy_size_t  );
+void llvmAsmfree (void *  );
 
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
-
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
+#define yy_new_buffer llvmAsm_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        llvmAsmensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
+	if ( ! YY_CURRENT_BUFFER ){\
+        llvmAsmensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
-#define YY_USES_REJECT
+/* Begin user sect3 */
 
-#define yywrap() 1
+#define llvmAsmwrap() 1
 #define YY_SKIP_YYWRAP
+
 typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
+FILE *llvmAsmin = (FILE *) 0, *llvmAsmout = (FILE *) 0;
+
 typedef int yy_state_type;
-extern int yylineno;
-int yylineno = 1;
-extern char *yytext;
-#define yytext_ptr yytext
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
+
+extern int llvmAsmlineno;
+
+int llvmAsmlineno = 1;
+
+extern char *llvmAsmtext;
+#define yytext_ptr llvmAsmtext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
+ * corresponding action - sets up llvmAsmtext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
+	(yytext_ptr) = yy_bp; \
+	llvmAsmleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 135
-#define YY_END_OF_BUFFER 136
-static yyconst short int yy_acclist[216] =
-    {   0,
-      136,  134,  135,  133,  134,  135,  133,  135,  134,  135,
-      134,  135,  134,  135,  134,  135,  134,  135,  134,  135,
-      126,  134,  135,  126,  134,  135,    1,  134,  135,  134,
-      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
-      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
-      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
-      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
-      135,  134,  135,  134,  135,  124,  122,  120,  129,  127,
-      131,  126,    1,  121,  130,  106,   35,   69,   51,   70,
-       65,   23,  124,  120,  131,   20,  131,  132,  125,  121,
-
-       52,   64,   33,   36,    3,   54,   79,   84,   82,   83,
-       81,   80,   85,   89,  105,   74,   72,   61,   73,   71,
-       53,   87,   78,   76,   77,   75,   88,   86,   66,  123,
-      131,  131,   63,   90,   68,   57,  113,   60,   67,  114,
-       62,   22,  128,   56,   93,   59,   42,   24,    4,   49,
-       55,   58,   45,   12,   92,  131,   30,    2,    5,   46,
-       95,   41,   48,  115,   91,   21,  112,   38,    7,   47,
-       37,   99,   98,    8,   16,  108,  111,   32,   50,  103,
-       97,  107,   25,   26,   96,  109,  104,  102,    6,   27,
-       94,   31,    9,   18,   10,  100,   11,   44,   43,  101,
-
-       29,   13,   15,   14,   28,   34,   17,  110,  116,  118,
-      119,   39,  117,   40,   19
-    } ;
+	(yy_c_buf_p) = yy_cp;
 
-static yyconst short int yy_accept[540] =
+#define YY_NUM_RULES 136
+#define YY_END_OF_BUFFER 137
+/* 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[550] =
     {   0,
-        1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
-       17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
-       40,   42,   44,   46,   48,   50,   52,   54,   56,   58,
-       60,   62,   64,   66,   68,   70,   72,   74,   76,   76,
-       77,   77,   78,   79,   80,   80,   81,   81,   82,   83,
-       83,   84,   84,   85,   86,   86,   86,   86,   86,   86,
-       86,   86,   87,   87,   88,   88,   88,   88,   88,   88,
-       88,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   91,   91,   91,   91,   91,   91,   91,   91,
-
-       92,   92,   92,   92,   92,   92,   92,   92,   92,   92,
-       92,   92,   92,   92,   92,   92,   93,   93,   93,   93,
-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-       93,   93,   94,   95,   96,   97,   98,   98,   99,   99,
-      100,  101,  102,  102,  102,  103,  103,  103,  104,  104,
-      104,  104,  105,  105,  105,  105,  105,  105,  105,  105,
-      105,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  107,  107,  107,  107,  108,
-      109,  110,  111,  112,  113,  113,  114,  115,  115,  116,
-
-      116,  116,  116,  116,  116,  117,  118,  119,  119,  119,
-      119,  120,  121,  121,  121,  122,  122,  122,  122,  122,
-      122,  122,  122,  123,  124,  125,  125,  126,  127,  127,
-      128,  129,  129,  129,  129,  129,  129,  129,  129,  129,
-      130,  130,  130,  131,  132,  132,  132,  132,  133,  133,
-      133,  133,  134,  134,  134,  135,  135,  135,  135,  135,
-      135,  135,  135,  135,  135,  135,  135,  135,  135,  136,
-      137,  137,  137,  137,  137,  138,  139,  139,  139,  139,
-      140,  140,  140,  140,  140,  140,  140,  140,  141,  142,
-      142,  142,  142,  142,  143,  143,  143,  144,  145,  145,
-
-      145,  146,  146,  146,  146,  147,  148,  148,  148,  149,
-      149,  149,  150,  150,  151,  152,  152,  152,  152,  152,
-      153,  153,  154,  154,  155,  155,  155,  156,  157,  158,
-      158,  158,  159,  159,  159,  159,  159,  159,  159,  159,
-      159,  159,  159,  159,  159,  160,  160,  161,  162,  162,
-      162,  162,  162,  162,  162,  163,  163,  163,  163,  163,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  165,  165,  165,  165,  166,  166,  167,
-      167,  167,  167,  167,  167,  167,  167,  168,  168,  168,
-      169,  169,  169,  169,  170,  170,  170,  170,  171,  171,
-
-      171,  172,  173,  174,  174,  174,  175,  176,  176,  176,
-      176,  177,  177,  178,  179,  179,  179,  180,  180,  180,
-      181,  181,  181,  182,  183,  184,  185,  186,  186,  187,
-      188,  188,  188,  188,  188,  188,  189,  189,  189,  190,
-      191,  191,  191,  191,  191,  191,  192,  192,  192,  192,
-      192,  192,  192,  192,  192,  193,  193,  193,  193,  193,
-      193,  193,  193,  193,  194,  194,  194,  194,  194,  195,
-      195,  195,  195,  196,  197,  198,  199,  200,  201,  201,
-      201,  201,  202,  202,  202,  202,  203,  203,  204,  205,
-      205,  205,  205,  205,  205,  205,  205,  205,  205,  205,
-
-      206,  206,  206,  206,  206,  206,  207,  207,  207,  207,
-      207,  208,  208,  208,  208,  208,  209,  209,  209,  209,
-      209,  209,  209,  209,  209,  209,  209,  209,  210,  211,
-      212,  212,  213,  213,  214,  215,  215,  216,  216
+        0,    0,  137,  135,  134,  134,  135,  135,  135,  135,
+      135,  135,  127,  127,    1,  135,  135,  135,  135,  135,
+      135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
+      135,  135,  135,  135,  135,  135,  135,  135,    0,  125,
+        0,  123,  121,  130,    0,  128,    0,  132,  127,    0,
+        1,    0,  122,  131,    0,    0,    0,    0,    0,    0,
+        0,  107,    0,   36,    0,    0,    0,    0,    0,    0,
+       70,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   52,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   71,    0,    0,    0,    0,    0,    0,    0,   66,
+
+        0,    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,  125,  121,  132,   21,  132,    0,  133,    0,
+      126,  122,   53,    0,    0,   65,    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,   55,    0,    0,    0,   80,
+       85,   83,   84,   82,   81,    0,   86,   90,    0,  106,
+
+        0,    0,    0,    0,    0,   75,   73,   62,    0,    0,
+        0,   74,   72,    0,    0,   54,    0,    0,    0,    0,
+        0,    0,    0,    0,   88,   79,   77,    0,   78,   76,
+        0,   89,   87,    0,    0,    0,    0,    0,    0,    0,
+        0,   67,    0,    0,  124,  132,    0,    0,    0,  132,
+        0,    0,    0,   64,    0,    0,   91,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       69,   58,    0,    0,    0,    0,  114,   61,    0,    0,
+        0,   68,    0,    0,    0,    0,    0,    0,    0,  115,
+       63,    0,    0,    0,    0,   23,    0,    0,  129,   57,
+
+        0,    0,   94,    0,    0,    0,   60,   43,    0,    0,
+       25,    0,    0,    0,    4,    0,   50,   56,    0,    0,
+        0,    0,   59,    0,   46,    0,   12,    0,    0,   93,
+      132,   31,    0,    0,    2,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    5,    0,   47,
+       96,    0,    0,    0,    0,    0,    0,   42,    0,    0,
+        0,    0,   49,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  116,    0,    0,    0,    0,
+       92,    0,   22,    0,    0,    0,    0,    0,    0,    0,
+      113,    0,    0,   39,    0,    0,    0,    7,    0,    0,
+
+        0,   48,    0,    0,   38,  100,   99,    0,    0,    8,
+       16,    0,    0,    0,  109,    0,  112,   33,    0,    0,
+       51,    0,    0,  104,    0,    0,   98,  108,   26,    0,
+       27,   97,    0,  110,  105,    0,    0,    0,    0,    0,
+      103,    0,    0,    6,   28,    0,    0,    0,    0,    0,
+       95,    0,    0,    0,    0,    0,    0,    0,    0,   32,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    9,
+        0,    0,    0,    0,   18,    0,    0,    0,   10,  101,
+       11,   45,   44,  102,    0,    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,   35,    0,    0,    0,    0,    0,   17,
+        0,    0,    0,    0,    0,  111,    0,    0,    0,    0,
+        0,    0,    0,   19,    0,    0,    0,    0,  117,  119,
+      120,    0,   40,    0,  118,   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,
@@ -442,7 +485,7 @@
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[45] =
+static yyconst flex_int32_t yy_meta[45] =
     {   0,
         1,    1,    2,    3,    4,    1,    1,    4,    4,    4,
         4,    4,    4,    5,    1,    1,    4,    4,    4,    4,
@@ -451,135 +494,137 @@
         4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[547] =
+static yyconst flex_int16_t yy_base[558] =
     {   0,
-        0,    0, 1175, 1176, 1176, 1176, 1170, 1159,   35,   39,
+        0,    0, 1197, 1198, 1198, 1198, 1192, 1181,   35,   39,
        43,   49,   55,   61,    0,   72,   64,   67,   66,   86,
        76,  106,   91,   65,  133,  121,  117,   99,  152,   95,
-       78,  179,  137,  211,  139,   90,  148,   93, 1168, 1176,
-     1157, 1176,    0,   49,  185,  217,  116,  238,  254,  259,
-        0, 1166,    0,  200,  125,  149,  146,  153,  177,   63,
-      154, 1155,  160,  161,  208,  185,  264,  171,  113,  210,
-     1154,  222,  260,  228,  186,  261,  271,  110,  273,  274,
-      230,  289,  277,  278,  150,  290,  241,  205,  282,  231,
-      291, 1153,  292,  296,  299,  303,  305,  306,  318,  310,
-
-      309,  311,  321,  322,  325,  326,  328,  330,  332,  337,
-      343,  340,  344,  335,  348, 1152,  357,  358,  360,  363,
-      365,  364,  366,  377,  369,  331,  367,  385,  394,  373,
-      380, 1151,    0,  413, 1150,  428,  446,    0, 1159, 1176,
-        0, 1148,  232,  397, 1147,  393,  398, 1146,  400,  405,
-      406, 1145,  421,  418,  401,  415,  419,  434,  437,  429,
-     1144,  448,  449,  435,  453,  452,  454,  455,  457,  464,
-      456,  461,  462,  465,  467,  480,  482,  469,  484,  486,
-      487,  475,  489,  491, 1143,  493,  495,  498, 1142, 1141,
-     1140, 1139, 1138, 1137,  499, 1136, 1135,  500, 1134,  529,
-
-      504,  507,  502,  510, 1133, 1132, 1131,  508,  511,  522,
-     1130, 1129,  529,  523, 1128,  518,  543,  544,  547,  548,
-      550,  549, 1127, 1126, 1125,  551, 1124, 1123,  552, 1122,
-     1121,  554,  555,  557,  509,  563,  565,  561,  568, 1120,
-      577,  578, 1176,  583,  592,  601,  607,  612,  583,  584,
-      595, 1119,  614,  615, 1118,  616,  594,  617,  619,  620,
-      622,  623,  626,  628,  627,  629,  630,  631, 1117, 1116,
-      634,  637,  641,  642, 1115, 1114,  646,  647,  645, 1113,
-      648,  650,  652,  654,  656,  659,  657, 1112, 1111,  663,
-      665,  668,  669, 1110,  670,  678,    0, 1109,  677,  679,
-
-     1108,  683,  680,  688, 1107, 1106,  693,  698, 1105,  700,
-      685, 1104,  704, 1103, 1102,  702,  705,  708,  689, 1101,
-      709, 1100,  711, 1099,  715,  718, 1098,  723, 1097,  717,
-      724, 1096,  725,  728,  734,  737,  727,  729,  744,  730,
-      741,  742,  745,  746, 1095,  747, 1094, 1093,  753,  756,
-      757,  758,  760,  759, 1092,  762,  764,  765,  769, 1091,
-      766,  772,  771,  773,  774,  783,  778,  787,  789,  791,
-      790,  794, 1090,  795,  796,  799, 1089,  797, 1088,  802,
-      803,  804,  805,  815,  800,  811, 1087,  818,  822, 1086,
-      823,  825,  826, 1085,  827,  828,  830, 1084,  833,  831,
-
-     1083, 1082, 1081,  834,  835, 1080, 1079,  843,  845,  837,
-     1078,  840, 1077, 1076,  844,  856, 1075,  857,  858, 1074,
-      859,  860, 1073, 1072, 1071, 1070, 1069,  864, 1068, 1067,
-      862,  863,  870,  867,  865, 1066,  868,  872, 1065, 1064,
-      873,  880,  882,  884,  887, 1063,  888,  885,  889,  890,
-      893,  896,  899,  894, 1062,  904,  906,  907,  910,  911,
-      915,  917,  919, 1061,  921,  924,  925,  922, 1050,  926,
-      927,  928, 1039, 1037, 1036, 1035, 1034, 1033,  929,  936,
-      933, 1032,  943,  947,  950, 1031,  934, 1030, 1029,  954,
-      952,  937,  955,  957,  956,  959,  963,  966,  967, 1024,
-
-      968,  970,  971,  974,  976, 1022,  978,  977,  979,  981,
-     1021,  986,  985,  989,  992, 1018,  990,  994,  998,  999,
-     1001, 1003, 1004, 1005, 1008, 1010, 1014,  686,  684,  517,
-     1020,  463, 1015,  372,  368, 1019,  279, 1176, 1055, 1057,
-      253, 1062, 1065,  212, 1069,  108
+       78,  179,  137,  211,  139,   90,  148,   93, 1190, 1198,
+     1179, 1198,    0,   49,  185,  217,  116,  238,  254,  259,
+        0, 1188,    0,  200,  125,  149,  146,  153,  177,   63,
+      154, 1177,  160,  161,  208,  185,  264,  171,  113,  210,
+     1176,  222,  260,  228,  186,  261,  271,  110,  273,  274,
+      230,  289,  277,  278,  240,  290,  292,  205,  291,  232,
+      296, 1175,  299,  303,  305,  306,  310,  313,  309,  318,
+
+      311,  314,  317,  322,  328,  329,  338,  331,  335,  339,
+      333,  332,  346,  340,  352,  355, 1174,  358,  360,  361,
+      364,  368,  365,  369,  381,  376,  382,  388,  367,  396,
+      384,  395, 1173,    0,  414, 1172,  429,  447,    0, 1181,
+     1198,    0, 1170,  231,  397, 1169,  399,  398, 1168,  401,
+      414,  405, 1167,  442,  407,  431,  419,  434,  436,  449,
+      450, 1166,  454,  432,  438,  453,  456,  460,  458,  461,
+      467,  465,  471,  470,  468,  481,  485,  487,  474,  489,
+      490,  492,  472,  496,  498, 1165,  500,  502,  503, 1164,
+     1163, 1162, 1161, 1160, 1159,  504, 1158, 1157,  506, 1156,
+
+      535,  509,  513,  507,  516, 1155, 1154, 1153,  515,  508,
+      528, 1152, 1151,  536,  527, 1150,  524,  550,  551,  552,
+      554,  555,  557,  556, 1149, 1148, 1147,  558, 1146, 1145,
+      559, 1144, 1143,  561,  564,  568,  570,  572,  580,  514,
+      579, 1142,  575,  583, 1198,  591,  606,  612,  616,  621,
+      606,  622,  623, 1141,  625,  591, 1140,  626,  627,  628,
+      592,  629,  631,  632,  633,  636,  635,  640,  638,  653,
+     1139, 1138,  639,  642,  649,  637, 1137, 1136,  654,  658,
+      655, 1135,  656,  659,  667,  669,  671,  675,  673, 1134,
+     1133,  676,  677,  678,  679, 1132,  680,  682,    0, 1131,
+
+      683,  690, 1130,  685,  684,  699, 1129, 1128,  703,  700,
+     1127,  704,  709,  707, 1126,  711, 1125, 1124,  716,  717,
+      712,  720, 1123,  721, 1122,  722, 1121,  724,  725, 1120,
+      733, 1119,  734,  733, 1118,  726,  736,  745,  748,  737,
+      750,  755,  741,  752,  753,  756,  757, 1117,  758, 1116,
+     1115,  764,  767,  768,  769,  771,  770, 1114,  773,  775,
+      776,  780, 1113,  777,  783,  782,  784,  785,  794,  789,
+      798,  800,  802,  801,  805, 1112,  806,  807,  811,  813,
+     1111,  808, 1110,  814,  821,  815,  826,  810,  829,  832,
+     1109,  833,  834, 1108,  836,  835,  838, 1107,  837,  842,
+
+      843, 1106,  839,  841, 1105, 1104, 1103,  849,  846, 1102,
+     1101,  856,  867,  851, 1100,  868, 1099, 1098,  852,  859,
+     1097,  869,  870, 1096,  871,  872, 1095, 1094, 1093,  879,
+     1092, 1091,  878, 1090, 1089,  880,  882,  885,  886,  889,
+     1088,  890,  892, 1087, 1076,  893,  895,  897,  902,  898,
+     1066,  899,  903,  904,  901,  906,  910,  912,  913, 1065,
+      922,  925,  926,  927,  929,  930,  932,  931,  934, 1064,
+      936,  938,  941,  943, 1061,  944,  945,  947, 1060, 1059,
+     1058, 1057, 1056, 1055,  949,  950,  951,  964, 1054,  966,
+      967,  968, 1048,  952, 1047, 1046,  969,  977,  956,  972,
+
+      978,  979,  983,  981,  984,  985,  988,  855,  992,  993,
+      995,  996,  998,  687,  999, 1002, 1000, 1004, 1008,  596,
+     1009, 1011, 1013, 1014, 1018,  593, 1021, 1017, 1026, 1023,
+     1027, 1028, 1029,  522, 1030, 1036, 1032, 1039,  521,  469,
+      371, 1042,  370, 1043,  282,  279, 1045,  244, 1198, 1081,
+     1083,  212, 1088, 1091,  167, 1095,  108
     } ;
 
-static yyconst short int yy_def[547] =
+static yyconst flex_int16_t yy_def[558] =
     {   0,
-      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,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-
-      540,  540,  540,  540,  540,  540,  540,  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,  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,  540,  200,  540,  540,  540,
-
-      540,  540,  540,  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,    0,  538,  538,
-      538,  538,  538,  538,  538,  538
+      549,    1,  549,  549,  549,  549,  550,  551,  552,  549,
+      551,  551,  551,  551,  553,  554,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  550,  549,
+      551,  549,  555,  549,  549,  551,  551,  551,  551,  551,
+      553,  556,  557,  549,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  549,  555,  549,  551,  551,  551,   50,  556,
+      549,  557,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+
+       50,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  549,  549,  549,  549,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  201,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      549,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,    0,  549,
+      549,  549,  549,  549,  549,  549,  549
     } ;
 
-static yyconst short int yy_nxt[1221] =
+static yyconst flex_int16_t yy_nxt[1243] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,   16,    8,    8,    8,   17,
@@ -589,135 +634,138 @@
        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,
+       42,   54,   54,   54,   54,   63,   55,   64,  150,   42,
        60,   42,   81,   56,   61,   57,   50,   58,   65,   42,
 
        59,  103,   62,   42,   42,   66,   42,   70,   42,   67,
-       71,  141,   42,  128,   79,   68,  131,   72,   69,   42,
-       80,  101,   92,   42,  135,   73,   42,   74,   75,   42,
-       42,   93,  102,  170,   42,   76,   89,   94,   42,   77,
-       85,   78,   82,   82,   82,   82,   42,  142,   86,   90,
-       42,  160,   42,   87,   83,   91,  115,   88,  126,   42,
-      129,   42,   42,   42,   84,   42,   42,   42,  145,  116,
-      179,  127,  117,   42,   42,   95,  143,   96,  144,  118,
-      130,   97,  152,   98,   42,   99,  146,  100,  104,  151,
-       42,  150,   42,  134,   45,   45,   45,   45,   42,   42,
-
-      159,  105,  106,  147,  107,  108,  109,  148,  110,   54,
-       54,   54,   54,  166,  111,  133,  112,  113,   42,  114,
-      104,   42,  155,   42,   42,   48,   46,   46,   46,   46,
-       42,  182,  161,  119,  120,   42,  121,  153,  122,  154,
-      123,   42,  124,   42,   42,   42,  125,  136,  136,  136,
-      136,   42,  173,  184,   42,  137,   43,  249,  165,  162,
-      181,  137,   48,   49,   49,   49,   49,   42,  138,  138,
-      138,  138,   42,   42,   42,  138,  138,   42,  138,  138,
-      138,  138,  138,  138,   42,  156,   42,   42,  157,  163,
-       42,   42,   42,  167,  168,   42,  164,  158,   82,   82,
-
-       82,   82,   42,   42,   42,   42,  172,  174,  169,   42,
-      171,  183,   42,  175,  176,  177,   42,  178,   42,   42,
-      185,  180,   42,   42,   42,  188,  190,  186,  192,  194,
-      187,   42,  196,  189,   42,   42,  197,  195,   42,   42,
-      191,   42,  193,   42,   42,   42,  198,  202,   42,  235,
-       42,  205,  201,   42,  209,  203,   42,   42,  199,  207,
-      211,   42,  216,  200,  215,  206,  213,  204,  208,  210,
-       42,   42,  214,   42,  212,  217,   42,   42,   42,   42,
-       42,   42,   42,  218,  219,   42,   42,  222,  224,  227,
-       42,  221,  234,   42,  236,  220,  237,  223,   42,  229,
-
-      230,  226,  225,  228,  238,  239,   42,   42,  240,  231,
-       42,   42,  232,   42,   42,  241,  251,  233,   42,   42,
-      258,  242,  244,  244,  244,  244,  254,  253,   42,  250,
-      245,   42,   42,  252,   42,  255,  245,  136,  136,  136,
-      136,   42,   42,  256,  259,  137,  260,   42,   42,  264,
-       42,  137,  246,  247,  257,  248,  248,  248,  248,   42,
-      262,   42,   42,  261,  263,   42,   42,   42,   42,   42,
-       42,  265,  268,  271,   42,   42,   42,   42,   42,  277,
-       42,  278,   42,  266,  279,  267,  269,  275,   42,  273,
-      281,  270,  274,   42,  276,   42,  272,   42,  280,   42,
-
-       42,  285,   42,  282,   42,  283,   42,  286,   42,  288,
-      289,   42,   42,   42,  287,   42,  292,   42,  290,  284,
-       42,   42,   42,   42,   42,  300,  293,  294,  321,  291,
-       42,   42,  302,  295,  303,   42,   42,  296,  297,  297,
-      297,  297,   42,  298,  299,  297,  297,  301,  297,  297,
-      297,  297,  297,  297,  304,  308,   42,   42,  307,  305,
-       42,   42,   42,   42,   42,   42,  306,   42,   42,  310,
-       42,  312,  309,  314,   42,  317,   42,  318,   42,  313,
-      311,   42,  319,  316,  323,  322,  325,  320,  315,  324,
-       42,   42,  244,  244,  244,  244,   42,   42,  246,  246,
-
-      245,  328,  328,  328,  328,  330,  245,   42,   42,  326,
-      328,  328,  328,  328,  329,  327,  248,  248,  248,  248,
-       42,  248,  248,  248,  248,   42,  331,   42,   42,   42,
-       42,  335,   42,   42,  333,   42,   42,  334,  337,   42,
-       42,   42,   42,   42,   42,  332,  336,   42,  344,  339,
-       42,  338,  346,  345,   42,   42,  341,  342,   42,   42,
-       42,   42,  343,   42,  340,   42,  353,   42,  354,   42,
-       42,  347,   42,  355,  348,  352,   42,  349,   42,  350,
-      351,   42,   42,   42,  359,  356,  358,  357,  360,  361,
-       42,   42,   42,   42,  363,  362,   42,   42,   42,   42,
-
-      369,   42,   42,  371,  368,  364,   42,  370,  366,  365,
-      367,   42,  372,   42,  376,   42,  373,   42,   42,  374,
-      381,   42,   42,  375,   42,  377,  378,  380,   42,  379,
-       42,   42,  328,  328,  328,  328,  387,   42,   42,  384,
-       42,   42,   42,   42,  382,  386,  388,   42,  383,  390,
-       42,  385,  394,  391,   42,   42,  392,   42,   42,   42,
-       42,  389,  393,  396,  395,  398,   42,  400,  401,   42,
-       42,   42,   42,   42,  397,   42,  399,   42,   42,   42,
-      402,  405,   42,  403,   42,   42,   42,   42,  404,  406,
-      407,   42,  411,  413,  414,  409,   42,  412,  410,  408,
-
-       42,  416,   42,   42,   42,  418,  417,   42,   42,   42,
-       42,  415,   42,   42,  422,   42,   42,   42,   42,  419,
-      421,  424,  426,  428,   42,  429,  420,  423,   42,  430,
-      427,   42,  431,  425,  432,   42,   42,  433,   42,   42,
-       42,   42,  434,   42,   42,  435,   42,   42,   42,  439,
-       42,  443,  444,   42,  437,  446,   42,   42,   42,  436,
-      441,  451,  442,  440,  449,  447,  448,  438,  445,   42,
-       42,   42,   42,   42,  450,   42,   42,   42,   42,  452,
-       42,   42,  456,   42,  457,   42,   42,  453,  454,  455,
-      458,  459,  461,   42,  462,   42,  463,   42,   42,  460,
-
-       42,   42,   42,   42,  465,  464,   42,   42,  466,   42,
-      470,  471,   42,  469,  472,  467,  475,   42,  473,   42,
-       42,  477,  468,   42,   42,  474,  481,  476,   42,  480,
-       42,  478,   42,  482,   42,   42,  484,   42,   42,   42,
-       42,   42,   42,  479,  486,  490,   42,   42,  483,   42,
-       42,  493,  494,  496,  485,  491,   42,  495,  492,  487,
-       42,  488,  489,   42,  497,   42,  498,   42,   42,   42,
-       42,  500,   42,  501,  503,  502,   42,  499,  505,   42,
-       42,   42,  508,   42,   42,  504,  510,   42,  507,   42,
-       42,   42,   42,  506,   42,  509,  511,  514,   42,   42,
-
-      512,  516,   42,   42,  513,   42,  517,   42,  518,  520,
-      519,   42,   42,  515,   42,  525,   42,   42,   42,  524,
-      522,   42,  521,   42,  523,  526,  531,   42,   42,  532,
-      527,   42,   42,   42,   42,   42,  528,   42,  536,  530,
-      529,  535,   42,   42,   42,   42,   42,   42,   42,   42,
-       42,  534,   42,  533,  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,
+       71,  142,   42,  129,   79,   68,  132,   72,   69,   42,
+       80,  101,   92,   42,  136,   73,   42,   74,   75,   42,
+       42,   93,  102,  171,   42,   76,   89,   94,   42,   77,
+       85,   78,   82,   82,   82,   82,   42,  143,   86,   90,
+       42,  161,   42,   87,   83,   91,  115,   88,  127,   42,
+      130,   42,   42,  116,   84,   42,   42,   42,  146,  117,
+      134,  128,  118,   42,   42,   95,  144,   96,  145,  119,
+      131,   97,  153,   98,   42,   99,  147,  100,  104,  152,
+       42,  151,   42,  135,   45,   45,   45,   45,   42,   42,
+
+      160,  105,  106,  148,  107,  108,  109,  149,  110,   54,
+       54,   54,   54,  167,  111,   43,  112,  113,   42,  114,
+      104,   42,  156,   42,   42,   48,   46,   46,   46,   46,
+       42,  183,  162,  120,  121,   42,  122,  154,  123,  155,
+      124,   42,  125,   42,   42,   42,  126,  137,  137,  137,
+      137,   42,  174,   42,  185,  138,  251,   42,  166,  163,
+      180,  138,   48,   49,   49,   49,   49,   42,  139,  139,
+      139,  139,   42,   42,   42,  139,  139,   42,  139,  139,
+      139,  139,  139,  139,   42,  157,   42,   42,  158,  164,
+       42,   42,   42,  168,  169,   42,  165,  159,   82,   82,
+
+       82,   82,   42,   42,   42,   42,  173,  175,  170,   42,
+      172,  182,   42,  176,  177,  178,   42,  179,   42,   42,
+      184,  181,   42,   42,   42,  186,   42,   42,  196,  191,
+       42,   42,  189,  193,  187,   42,  195,  188,  198,  190,
+      197,   42,   42,  192,   42,   42,   42,  194,   42,  199,
+      203,   42,   42,   42,  200,  202,  214,  210,  204,   42,
+      208,  206,  212,  201,  215,   42,  216,  217,   42,  209,
+      205,   42,  211,   42,   42,  207,  213,   42,   42,  218,
+       42,   42,   42,   42,   42,  221,  240,  219,  224,   42,
+      220,  226,  229,  223,   42,   42,  222,   42,  225,  236,
+
+      237,   42,  228,  231,  232,  227,  230,  241,   42,   42,
+       42,   42,   42,  233,   42,  238,  234,  239,   42,  242,
+       42,  235,  253,  246,  246,  246,  246,   42,  255,  252,
+      243,  247,   42,  254,  257,  256,  244,  247,  137,  137,
+      137,  137,   42,  259,   42,   42,  138,   42,  261,   42,
+      260,   42,  138,  248,  249,   42,  250,  250,  250,  250,
+       42,  262,   42,   42,  258,  263,   42,   42,  269,   42,
+      266,   42,  264,   42,   42,  270,  265,  267,   42,  273,
+       42,   42,   42,   42,   42,   42,  271,   42,  279,  268,
+      277,  280,  281,  275,   42,  272,  276,  278,   42,  274,
+
+       42,  282,   42,   42,  283,   42,  287,  291,  284,   42,
+      285,   42,  288,   42,  290,   42,   42,   42,  289,   42,
+       42,   42,   42,  294,  286,  292,   42,   42,   42,   42,
+      302,  305,  296,  295,   42,   42,  293,   42,  297,  304,
+       42,   42,  327,  298,  299,  299,  299,  299,  300,   42,
+      301,  299,  299,  303,  299,  299,  299,  299,  299,  299,
+      306,  310,  309,   42,   42,   42,  307,   42,   42,   42,
+       42,   42,   42,  308,   42,  313,  312,   42,  315,  311,
+      317,   42,  320,   42,  321,   42,  316,  314,   42,  324,
+      319,  322,   42,   42,  325,  318,   42,  328,  323,  326,
+
+      246,  246,  246,  246,   42,   42,   42,  329,  247,   42,
+      336,  340,  248,  248,  247,  331,  331,  331,  331,   42,
+      330,  331,  331,  331,  331,  250,  250,  250,  250,   42,
+      250,  250,  250,  250,   42,   42,   42,  332,   42,   42,
+       42,   42,   42,  333,   42,   42,   42,  337,   42,   42,
+       42,   42,   42,   42,  334,   42,  335,  339,  342,  347,
+      341,  348,   42,  344,  338,  345,   42,   42,   42,   42,
+      346,   42,   42,  343,  349,  354,  350,  356,  357,  351,
+       42,  358,   42,  355,   42,  352,   42,  353,   42,   42,
+       42,   42,   42,   42,  359,   42,   42,   42,   42,  362,
+
+       42,  361,  360,   42,  363,  364,  366,  374,  365,  373,
+      371,  372,   42,   42,  370,  367,   42,   42,  369,  368,
+       42,  377,   42,  375,   42,   42,  376,  378,  379,   42,
+       42,  384,  381,   42,   42,   42,  380,   42,   42,   42,
+      382,  383,  331,  331,  331,  331,   42,   42,  388,   42,
+       42,  385,  390,  391,   42,  392,  386,  394,   42,  387,
+      389,   42,  393,   42,  395,   42,   42,  396,   42,   42,
+       42,   42,  397,  398,  400,  399,  402,   42,  404,  405,
+       42,   42,   42,   42,   42,  401,   42,  403,   42,   42,
+       42,  406,  409,   42,  407,   42,   42,   42,   42,  408,
+
+      410,  411,   42,  415,  417,  418,  413,   42,  416,  414,
+      412,   42,  420,   42,   42,   42,  422,  421,   42,   42,
+       42,   42,  419,   42,   42,  426,   42,   42,   42,  437,
+      423,  425,  428,  430,   42,  433,  431,  424,  427,   42,
+      435,  432,   42,  434,  429,   42,   42,   42,   42,   42,
+       42,   42,   42,  436,   42,   42,   42,  448,  449,   42,
+      440,  444,   42,  439,   42,   42,  438,  442,   42,   42,
+      451,  441,   42,  445,  446,  447,  452,  443,  450,  453,
+       42,   42,   42,   42,   42,   42,  454,  457,  455,  456,
+      458,   42,   42,   42,  461,   42,  462,  463,   42,   42,
+
+      459,  460,   42,   42,  464,   42,   42,  467,   42,  465,
+       42,   42,   42,  468,   42,   42,   42,   42,  466,   42,
+      469,  476,  477,   42,  471,   42,   42,  470,  472,  481,
+      473,  475,  478,  479,  483,   42,  480,  474,   42,   42,
+       42,  482,   42,   42,   42,   42,  488,   42,  486,   42,
+      484,   42,  489,  491,   42,  487,   42,   42,   42,  493,
+       42,  485,   42,   42,   42,   42,  497,  490,  492,   42,
+      500,  502,  501,  498,  494,  495,  499,   42,  496,   42,
+       42,   42,   42,  503,  504,   42,  506,  505,  509,  508,
+       42,   42,   42,  511,   42,  507,   42,   42,   42,  513,
+
+      510,   42,  512,  517,  515,   42,   42,  519,   42,   42,
+      516,   42,   42,   42,  518,   42,  514,   42,  525,  523,
+      520,   42,   42,  521,   42,  526,   42,   42,  522,  527,
+       42,   42,  530,  528,   42,  524,   42,  529,  536,   42,
+       42,   42,   42,   42,  532,   42,  533,  534,  531,   42,
+      535,  542,   42,  537,  538,   42,   42,  543,   42,   42,
+       42,   42,  539,  546,  541,  540,  547,   42,   42,   42,
+       42,   42,   42,   42,   42,  544,  545,   42,   42,   42,
+      548,   39,   39,   39,   39,   39,   41,   41,   51,   42,
+       51,   51,   51,   53,   53,  140,  140,  140,  140,  140,
+
        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,  243,   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,
+       42,   42,   42,   42,  141,   42,  245,   42,   42,   42,
+       42,  141,   42,  133,   42,   40,  549,    3,  549,  549,
 
-      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
-      538,  538,  538,  538,  538,  538,  538,  538,  538,  538
+      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
+      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
+      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
+      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
+      549,  549
     } ;
 
-static yyconst short int yy_chk[1221] =
+static yyconst flex_int16_t yy_chk[1243] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -731,146 +779,159 @@
        18,   31,   24,   17,   18,   17,   13,   17,   19,   20,
 
        17,   31,   18,   36,   23,   20,   38,   21,   30,   20,
-       21,  546,   28,   36,   23,   20,   38,   21,   20,   22,
+       21,  557,   28,   36,   23,   20,   38,   21,   20,   22,
        23,   30,   28,   78,   47,   22,   69,   22,   22,   47,
        27,   28,   30,   78,   26,   22,   27,   28,   55,   22,
        26,   22,   25,   25,   25,   25,   25,   55,   26,   27,
        33,   69,   35,   26,   25,   27,   33,   26,   35,   57,
-       37,   37,   56,   85,   25,   29,   58,   61,   57,   33,
-       85,   35,   33,   63,   64,   29,   56,   29,   56,   33,
+       37,   37,   56,   33,   25,   29,   58,   61,   57,   33,
+      555,   35,   33,   63,   64,   29,   56,   29,   56,   33,
        37,   29,   64,   29,   68,   29,   58,   29,   32,   63,
        59,   61,   32,   45,   45,   45,   45,   45,   66,   75,
 
        68,   32,   32,   59,   32,   32,   32,   59,   32,   54,
-       54,   54,   54,   75,   32,  544,   32,   32,   88,   32,
+       54,   54,   54,   75,   32,  552,   32,   32,   88,   32,
        34,   65,   66,   70,   34,   46,   46,   46,   46,   46,
        46,   88,   70,   34,   34,   72,   34,   65,   34,   65,
-       34,   74,   34,   81,   90,  143,   34,   48,   48,   48,
-       48,   48,   81,   90,   87,   48,  541,  143,   74,   72,
-       87,   48,   49,   49,   49,   49,   49,   49,   50,   50,
+       34,   74,   34,   81,  144,   90,   34,   48,   48,   48,
+       48,   48,   81,   85,   90,   48,  144,  548,   74,   72,
+       85,   48,   49,   49,   49,   49,   49,   49,   50,   50,
        50,   50,   50,   73,   76,   50,   50,   67,   50,   50,
        50,   50,   50,   50,   77,   67,   79,   80,   67,   73,
-       83,   84,  537,   76,   77,   89,   73,   67,   82,   82,
-
-       82,   82,   82,   86,   91,   93,   80,   83,   77,   94,
-       79,   89,   95,   84,   84,   84,   96,   84,   97,   98,
-       91,   86,  101,  100,  102,   94,   96,   93,   97,   98,
-       93,   99,  100,   95,  103,  104,  101,   99,  105,  106,
-       96,  107,   97,  108,  126,  109,  102,  106,  114,  126,
-      110,  107,  105,  112,  109,  106,  111,  113,  103,  108,
-      110,  115,  114,  104,  113,  107,  111,  106,  108,  109,
-      117,  118,  112,  119,  110,  115,  120,  122,  121,  123,
-      127,  535,  125,  115,  117,  534,  130,  119,  121,  123,
-      124,  118,  125,  131,  127,  117,  127,  120,  128,  124,
-
-      124,  122,  121,  123,  128,  129,  146,  129,  130,  124,
-      144,  147,  124,  149,  155,  131,  146,  124,  150,  151,
-      155,  131,  134,  134,  134,  134,  150,  149,  156,  144,
-      134,  154,  157,  147,  153,  151,  134,  136,  136,  136,
-      136,  136,  160,  153,  156,  136,  157,  158,  164,  160,
-      159,  136,  137,  137,  154,  137,  137,  137,  137,  137,
-      159,  162,  163,  158,  159,  166,  165,  167,  168,  171,
-      169,  162,  164,  167,  172,  173,  532,  170,  174,  171,
-      175,  172,  178,  162,  173,  163,  165,  170,  182,  169,
-      175,  166,  169,  176,  170,  177,  168,  179,  174,  180,
-
-      181,  178,  183,  176,  184,  177,  186,  179,  187,  181,
-      182,  188,  195,  198,  180,  203,  186,  201,  183,  177,
-      202,  208,  235,  204,  209,  203,  187,  188,  235,  184,
-      530,  216,  208,  195,  209,  210,  214,  198,  200,  200,
-      200,  200,  213,  201,  202,  200,  200,  204,  200,  200,
-      200,  200,  200,  200,  210,  216,  217,  218,  214,  213,
-      219,  220,  222,  221,  226,  229,  213,  232,  233,  218,
-      234,  220,  217,  221,  238,  229,  236,  232,  237,  220,
-      219,  239,  233,  226,  237,  236,  239,  234,  222,  238,
-      241,  242,  244,  244,  244,  244,  249,  250,  245,  245,
-
-      244,  245,  245,  245,  245,  250,  244,  257,  251,  241,
-      246,  246,  246,  246,  249,  242,  247,  247,  247,  247,
-      247,  248,  248,  248,  248,  248,  251,  253,  254,  256,
-      258,  257,  259,  260,  254,  261,  262,  256,  259,  263,
-      265,  264,  266,  267,  268,  253,  258,  271,  266,  261,
-      272,  260,  268,  267,  273,  274,  263,  264,  279,  277,
-      278,  281,  265,  282,  262,  283,  278,  284,  279,  285,
-      287,  271,  286,  281,  272,  277,  290,  273,  291,  273,
-      274,  292,  293,  295,  285,  282,  284,  283,  286,  287,
-      299,  296,  300,  303,  291,  290,  302,  529,  311,  528,
-
-      300,  304,  319,  303,  299,  292,  307,  302,  295,  293,
-      296,  308,  304,  310,  311,  316,  307,  313,  317,  308,
-      319,  318,  321,  310,  323,  313,  316,  318,  325,  317,
-      330,  326,  328,  328,  328,  328,  330,  331,  333,  325,
-      337,  334,  338,  340,  321,  326,  331,  335,  323,  334,
-      336,  325,  338,  335,  341,  342,  336,  339,  343,  344,
-      346,  333,  337,  340,  339,  342,  349,  344,  346,  350,
-      351,  352,  354,  353,  341,  356,  343,  357,  358,  361,
-      349,  352,  359,  350,  363,  362,  364,  365,  351,  353,
-      354,  367,  359,  362,  363,  357,  366,  361,  358,  356,
-
-      368,  365,  369,  371,  370,  367,  366,  372,  374,  375,
-      378,  364,  376,  385,  371,  380,  381,  382,  383,  368,
-      370,  374,  376,  380,  386,  381,  369,  372,  384,  382,
-      378,  388,  383,  375,  384,  389,  391,  385,  392,  393,
-      395,  396,  386,  397,  400,  388,  399,  404,  405,  393,
-      410,  399,  399,  412,  391,  404,  408,  415,  409,  389,
-      396,  412,  397,  395,  409,  405,  408,  392,  400,  416,
-      418,  419,  421,  422,  410,  431,  432,  428,  435,  415,
-      434,  437,  421,  433,  422,  438,  441,  416,  418,  419,
-      428,  431,  433,  442,  434,  443,  435,  444,  448,  432,
-
-      445,  447,  449,  450,  438,  437,  451,  454,  441,  452,
-      445,  447,  453,  444,  448,  442,  451,  456,  449,  457,
-      458,  453,  443,  459,  460,  450,  458,  452,  461,  457,
-      462,  454,  463,  459,  465,  468,  461,  466,  467,  470,
-      471,  472,  479,  456,  463,  468,  481,  487,  460,  480,
-      492,  472,  479,  481,  462,  470,  483,  480,  471,  465,
-      484,  466,  467,  485,  483,  491,  484,  490,  493,  495,
-      494,  487,  496,  490,  492,  491,  497,  485,  494,  498,
-      499,  501,  497,  502,  503,  493,  499,  504,  496,  505,
-      508,  507,  509,  495,  510,  498,  501,  504,  513,  512,
-
-      502,  507,  514,  517,  503,  515,  508,  518,  509,  512,
-      510,  519,  520,  505,  521,  518,  522,  523,  524,  517,
-      514,  525,  513,  526,  515,  519,  524,  527,  533,  525,
-      520,  516,  536,  531,  511,  506,  521,  500,  533,  523,
-      522,  531,  489,  488,  486,  482,  478,  477,  476,  475,
-      474,  527,  473,  526,  536,  539,  539,  539,  539,  539,
-      540,  540,  542,  469,  542,  542,  542,  543,  543,  545,
-      545,  545,  545,  545,  464,  455,  446,  440,  439,  436,
-      430,  429,  427,  426,  425,  424,  423,  420,  417,  414,
-      413,  411,  407,  406,  403,  402,  401,  398,  394,  390,
-
-      387,  379,  377,  373,  360,  355,  348,  347,  345,  332,
-      329,  327,  324,  322,  320,  315,  314,  312,  309,  306,
-      305,  301,  298,  294,  289,  288,  280,  276,  275,  270,
-      269,  255,  252,  240,  231,  230,  228,  227,  225,  224,
-      223,  215,  212,  211,  207,  206,  205,  199,  197,  196,
-      194,  193,  192,  191,  190,  189,  185,  161,  152,  148,
-      145,  142,  139,  135,  132,  116,   92,   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,
+       83,   84,  546,   76,   77,  545,   73,   67,   82,   82,
 
-      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
-      538,  538,  538,  538,  538,  538,  538,  538,  538,  538
+       82,   82,   82,   86,   89,   87,   80,   83,   77,   91,
+       79,   87,   93,   84,   84,   84,   94,   84,   95,   96,
+       89,   86,   99,   97,  101,   91,   98,  102,   99,   96,
+      103,  100,   94,   97,   93,  104,   98,   93,  101,   95,
+      100,  105,  106,   96,  108,  112,  111,   97,  109,  102,
+      106,  107,  110,  114,  103,  105,  111,  109,  106,  113,
+      108,  107,  110,  104,  112,  115,  113,  114,  116,  108,
+      106,  118,  109,  119,  120,  107,  110,  121,  123,  115,
+      129,  122,  124,  543,  541,  118,  129,  115,  120,  126,
+      116,  122,  124,  119,  125,  127,  118,  131,  121,  126,
+
+      127,  128,  123,  125,  125,  122,  124,  130,  132,  130,
+      145,  148,  147,  125,  150,  128,  125,  128,  152,  131,
+      155,  125,  147,  135,  135,  135,  135,  151,  150,  145,
+      132,  135,  157,  148,  152,  151,  132,  135,  137,  137,
+      137,  137,  137,  155,  156,  164,  137,  158,  157,  159,
+      156,  165,  137,  138,  138,  154,  138,  138,  138,  138,
+      138,  158,  160,  161,  154,  159,  166,  163,  164,  167,
+      161,  169,  160,  168,  170,  165,  160,  163,  172,  168,
+      171,  175,  540,  174,  173,  183,  166,  179,  172,  163,
+      171,  173,  174,  170,  176,  167,  170,  171,  177,  169,
+
+      178,  175,  180,  181,  176,  182,  179,  183,  177,  184,
+      178,  185,  180,  187,  182,  188,  189,  196,  181,  199,
+      204,  210,  202,  187,  178,  184,  203,  240,  209,  205,
+      204,  210,  189,  188,  539,  534,  185,  217,  196,  209,
+      215,  211,  240,  199,  201,  201,  201,  201,  202,  214,
+      203,  201,  201,  205,  201,  201,  201,  201,  201,  201,
+      211,  217,  215,  218,  219,  220,  214,  221,  222,  224,
+      223,  228,  231,  214,  234,  220,  219,  235,  222,  218,
+      223,  236,  231,  237,  234,  238,  222,  221,  243,  237,
+      228,  235,  241,  239,  238,  224,  244,  241,  236,  239,
+
+      246,  246,  246,  246,  256,  261,  526,  243,  246,  520,
+      256,  261,  247,  247,  246,  247,  247,  247,  247,  251,
+      244,  248,  248,  248,  248,  249,  249,  249,  249,  249,
+      250,  250,  250,  250,  250,  252,  253,  251,  255,  258,
+      259,  260,  262,  252,  263,  264,  265,  258,  267,  266,
+      276,  269,  273,  268,  253,  274,  255,  260,  263,  268,
+      262,  269,  275,  265,  259,  266,  270,  279,  281,  283,
+      267,  280,  284,  264,  270,  276,  273,  280,  281,  274,
+      285,  283,  286,  279,  287,  275,  289,  275,  288,  292,
+      293,  294,  295,  297,  284,  298,  301,  305,  304,  287,
+
+      514,  286,  285,  302,  288,  289,  293,  305,  292,  304,
+      301,  302,  306,  310,  298,  294,  309,  312,  297,  295,
+      314,  310,  313,  306,  316,  321,  309,  312,  313,  319,
+      320,  321,  316,  322,  324,  326,  314,  328,  329,  336,
+      319,  320,  331,  331,  331,  331,  334,  333,  328,  337,
+      340,  322,  329,  333,  343,  334,  324,  337,  338,  326,
+      328,  339,  336,  341,  338,  344,  345,  339,  342,  346,
+      347,  349,  340,  341,  343,  342,  345,  352,  347,  349,
+      353,  354,  355,  357,  356,  344,  359,  346,  360,  361,
+      364,  352,  355,  362,  353,  366,  365,  367,  368,  354,
+
+      356,  357,  370,  362,  365,  366,  360,  369,  364,  361,
+      359,  371,  368,  372,  374,  373,  370,  369,  375,  377,
+      378,  382,  367,  388,  379,  374,  380,  384,  386,  388,
+      371,  373,  377,  379,  385,  384,  380,  372,  375,  387,
+      386,  382,  389,  385,  378,  390,  392,  393,  396,  395,
+      399,  397,  403,  387,  404,  400,  401,  403,  403,  409,
+      392,  397,  408,  390,  414,  419,  389,  395,  508,  412,
+      408,  393,  420,  399,  400,  401,  409,  396,  404,  412,
+      413,  416,  422,  423,  425,  426,  413,  419,  414,  416,
+      420,  433,  430,  436,  425,  437,  426,  430,  438,  439,
+
+      422,  423,  440,  442,  433,  443,  446,  438,  447,  436,
+      448,  450,  452,  439,  455,  449,  453,  454,  437,  456,
+      440,  450,  452,  457,  443,  458,  459,  442,  446,  456,
+      447,  449,  453,  454,  458,  461,  455,  448,  462,  463,
+      464,  457,  465,  466,  468,  467,  464,  469,  462,  471,
+      459,  472,  465,  467,  473,  463,  474,  476,  477,  469,
+      478,  461,  485,  486,  487,  494,  474,  466,  468,  499,
+      478,  486,  485,  476,  471,  472,  477,  488,  473,  490,
+      491,  492,  497,  487,  488,  500,  491,  490,  497,  494,
+      498,  501,  502,  499,  504,  492,  503,  505,  506,  501,
+
+      498,  507,  500,  505,  503,  509,  510,  507,  511,  512,
+      504,  513,  515,  517,  506,  516,  502,  518,  515,  512,
+      509,  519,  521,  510,  522,  516,  523,  524,  511,  517,
+      528,  525,  521,  518,  527,  513,  530,  519,  528,  529,
+      531,  532,  533,  535,  523,  537,  524,  525,  522,  536,
+      527,  535,  538,  529,  530,  542,  544,  536,  547,  496,
+      495,  493,  531,  542,  533,  532,  544,  489,  484,  483,
+      482,  481,  480,  479,  475,  537,  538,  470,  460,  451,
+      547,  550,  550,  550,  550,  550,  551,  551,  553,  445,
+      553,  553,  553,  554,  554,  556,  556,  556,  556,  556,
+
+      444,  441,  435,  434,  432,  431,  429,  428,  427,  424,
+      421,  418,  417,  415,  411,  410,  407,  406,  405,  402,
+      398,  394,  391,  383,  381,  376,  363,  358,  351,  350,
+      348,  335,  332,  330,  327,  325,  323,  318,  317,  315,
+      311,  308,  307,  303,  300,  296,  291,  290,  282,  278,
+      277,  272,  271,  257,  254,  242,  233,  232,  230,  229,
+      227,  226,  225,  216,  213,  212,  208,  207,  206,  200,
+      198,  197,  195,  194,  193,  192,  191,  190,  186,  162,
+      153,  149,  146,  143,  140,  136,  133,  117,   92,   71,
+       62,   52,   41,   39,    8,    7,    3,  549,  549,  549,
+
+      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
+      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
+      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
+      549,  549,  549,  549,  549,  549,  549,  549,  549,  549,
+      549,  549
     } ;
 
-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[137] =
+    {   0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,     };
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int llvmAsm_flex_debug;
+int llvmAsm_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-#define INITIAL 0
+char *llvmAsmtext;
+#line 1 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
 //                     The LLVM Compiler Infrastructure
@@ -883,8 +944,7 @@
 //  This file implements the flex scanner for LLVM assembly languages files.
 //
 //===----------------------------------------------------------------------===*/
-#define YY_NEVER_INTERACTIVE 1
-#line 28 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 28 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -893,10 +953,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
@@ -1017,7 +1077,23 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1021 "Lexer.cpp"
+#line 1081 "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.
@@ -1025,65 +1101,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 ));
+extern int llvmAsmwrap (void );
 #endif
 #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. */
@@ -1092,12 +1133,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,
@@ -1105,21 +1145,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();" -
@@ -1140,14 +1194,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);
 
-/* Code executed at the beginning of each rule, after yytext and yyleng
+#define YY_DECL int llvmAsmlex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after llvmAsmtext and llvmAsmleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -1162,360 +1222,365 @@
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
+/** The main scanner function which does all the work.
+ */
 YY_DECL
-	{
+{
 	register yy_state_type yy_current_state;
-	register char *yy_cp = NULL, *yy_bp = NULL;
+	register char *yy_cp, *yy_bp;
 	register int yy_act;
+    
+#line 190 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 
-#line 190 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 
+#line 1237 "Lexer.cpp"
 
-#line 1175 "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 >= 539 )
+				if ( yy_current_state >= 550 )
 					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 != 538 );
+		while ( yy_current_state != 549 );
+		yy_cp = (yy_last_accepting_cpos);
+		yy_current_state = (yy_last_accepting_state);
 
 yy_find_action:
-		yy_current_state = *--yy_state_ptr;
-		yy_lp = yy_accept[yy_current_state];
-find_rule: /* we branch to this label when backing up */
-		for ( ; ; ) /* until we find what rule we matched */
-			{
-			if ( yy_lp && yy_lp < yy_accept[yy_current_state + 1] )
-				{
-				yy_act = yy_acclist[yy_lp];
-					{
-					yy_full_match = yy_cp;
-					break;
-					}
-				}
-			--yy_cp;
-			yy_current_state = *--yy_state_ptr;
-			yy_lp = yy_accept[yy_current_state];
-			}
+		yy_act = yy_accept[yy_current_state];
 
 		YY_DO_BEFORE_ACTION;
 
-		if ( yy_act != YY_END_OF_BUFFER )
+		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
 			{
 			int yyl;
-			for ( yyl = 0; yyl < yyleng; ++yyl )
-				if ( yytext[yyl] == '\n' )
-					++yylineno;
+			for ( yyl = 0; yyl < llvmAsmleng; ++yyl )
+				if ( llvmAsmtext[yyl] == '\n' )
+					   
+    llvmAsmlineno++;
+;
 			}
 
 do_action:	/* This label is used only to access EOF actions. */
 
-
 		switch ( yy_act )
 	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
 case 1:
 YY_RULE_SETUP
-#line 192 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 192 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 194 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 195 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 196 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 197 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 198 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 199 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return DEFINE; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 200 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 201 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 202 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 203 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 204 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 205 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 206 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 207 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 207 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 208 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return HIDDEN; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 209 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 210 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ZEROINITIALIZER; }
+#line 211 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return THREAD_LOCAL; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return DOTDOTDOT; }
+#line 212 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return ZEROINITIALIZER; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return UNDEF; }
+#line 213 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return DOTDOTDOT; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return NULL_TOK; }
+#line 214 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return UNDEF; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return TO; }
+#line 215 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return NULL_TOK; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return TAIL; }
+#line 216 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return TO; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return TARGET; }
+#line 217 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return TAIL; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return TRIPLE; }
+#line 218 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return TARGET; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return DEPLIBS; }
+#line 219 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return TRIPLE; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return DATALAYOUT; }
+#line 220 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return DEPLIBS; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return VOLATILE; }
+#line 221 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return DATALAYOUT; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 222 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ALIGN;  }
+#line 222 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return VOLATILE; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SECTION; }
+#line 223 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return ALIGN;  }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return MODULE; }
+#line 224 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return SECTION; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ASM_TOK; }
+#line 225 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return MODULE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 226 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SIDEEFFECT; }
+#line 226 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return ASM_TOK; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return CC_TOK; }
+#line 227 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return SIDEEFFECT; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return CCC_TOK; }
+#line 229 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return CC_TOK; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 230 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return FASTCC_TOK; }
+#line 230 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return CCC_TOK; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return COLDCC_TOK; }
+#line 231 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return FASTCC_TOK; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 232 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return X86_STDCALLCC_TOK; }
+#line 232 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return COLDCC_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return X86_FASTCALLCC_TOK; }
+#line 233 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return INREG; }
+#line 234 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 236 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SRET;  }
+#line 236 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return INREG; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 237 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return NOUNWIND; }
+#line 237 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return SRET;  }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 238 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return NORETURN; }
+#line 238 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return NOUNWIND; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 240 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::VoidTy,  VOID);  }
+#line 239 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return NORETURN; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 241 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::FloatTy, FLOAT); }
+#line 241 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::VoidTy,  VOID);  }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 242 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::DoubleTy,DOUBLE);}
+#line 242 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::FloatTy, FLOAT); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 243 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::LabelTy, LABEL); }
+#line 243 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::DoubleTy,DOUBLE);}
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 244 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return TYPE;   }
+#line 244 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::LabelTy, LABEL); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 245 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OPAQUE; }
+#line 245 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return TYPE;   }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 246 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ uint64_t NumBits = atoull(yytext+1);
+#line 246 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return OPAQUE; }
+	YY_BREAK
+case 52:
+YY_RULE_SETUP
+#line 247 "/home/laurov/llvm/llvm/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!");
@@ -1523,412 +1588,415 @@
                   RET_TY(Ty, INTTYPE);
                 }
 	YY_BREAK
-case 52:
+case 53:
 YY_RULE_SETUP
-#line 254 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 255 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
-case 53:
+case 54:
 YY_RULE_SETUP
-#line 255 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 256 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
-case 54:
+case 55:
 YY_RULE_SETUP
-#line 256 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 257 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
-case 55:
+case 56:
 YY_RULE_SETUP
-#line 257 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 258 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
-case 56:
+case 57:
 YY_RULE_SETUP
-#line 258 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 259 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
-case 57:
+case 58:
 YY_RULE_SETUP
-#line 259 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 260 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
-case 58:
+case 59:
 YY_RULE_SETUP
-#line 260 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 261 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
-case 59:
+case 60:
 YY_RULE_SETUP
-#line 261 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 262 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
-case 60:
+case 61:
 YY_RULE_SETUP
-#line 262 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 263 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
-case 61:
+case 62:
 YY_RULE_SETUP
-#line 263 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 264 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Shl, SHL); }
 	YY_BREAK
-case 62:
+case 63:
 YY_RULE_SETUP
-#line 264 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 265 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, LShr, LSHR); }
 	YY_BREAK
-case 63:
+case 64:
 YY_RULE_SETUP
-#line 265 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 266 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, AShr, ASHR); }
 	YY_BREAK
-case 64:
+case 65:
 YY_RULE_SETUP
-#line 266 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 267 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
-case 65:
+case 66:
 YY_RULE_SETUP
-#line 267 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 268 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
-case 66:
+case 67:
 YY_RULE_SETUP
-#line 268 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 269 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
-case 67:
+case 68:
 YY_RULE_SETUP
-#line 269 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 270 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal,  ICmp,  ICMP); }
 	YY_BREAK
-case 68:
+case 69:
 YY_RULE_SETUP
-#line 270 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 271 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal,  FCmp,  FCMP); }
 	YY_BREAK
-case 69:
+case 70:
 YY_RULE_SETUP
-#line 272 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 273 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return EQ;  }
 	YY_BREAK
-case 70:
+case 71:
 YY_RULE_SETUP
-#line 273 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 274 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return NE;  }
 	YY_BREAK
-case 71:
+case 72:
 YY_RULE_SETUP
-#line 274 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 275 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return SLT; }
 	YY_BREAK
-case 72:
+case 73:
 YY_RULE_SETUP
-#line 275 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 276 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return SGT; }
 	YY_BREAK
-case 73:
+case 74:
 YY_RULE_SETUP
-#line 276 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 277 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return SLE; }
 	YY_BREAK
-case 74:
+case 75:
 YY_RULE_SETUP
-#line 277 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 278 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return SGE; }
 	YY_BREAK
-case 75:
+case 76:
 YY_RULE_SETUP
-#line 278 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 279 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return ULT; }
 	YY_BREAK
-case 76:
+case 77:
 YY_RULE_SETUP
-#line 279 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 280 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return UGT; }
 	YY_BREAK
-case 77:
+case 78:
 YY_RULE_SETUP
-#line 280 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 281 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return ULE; }
 	YY_BREAK
-case 78:
+case 79:
 YY_RULE_SETUP
-#line 281 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 282 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return UGE; }
 	YY_BREAK
-case 79:
+case 80:
 YY_RULE_SETUP
-#line 282 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 283 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return OEQ; }
 	YY_BREAK
-case 80:
+case 81:
 YY_RULE_SETUP
-#line 283 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 284 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return ONE; }
 	YY_BREAK
-case 81:
+case 82:
 YY_RULE_SETUP
-#line 284 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 285 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return OLT; }
 	YY_BREAK
-case 82:
+case 83:
 YY_RULE_SETUP
-#line 285 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 286 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return OGT; }
 	YY_BREAK
-case 83:
+case 84:
 YY_RULE_SETUP
-#line 286 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 287 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return OLE; }
 	YY_BREAK
-case 84:
+case 85:
 YY_RULE_SETUP
-#line 287 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 288 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return OGE; }
 	YY_BREAK
-case 85:
+case 86:
 YY_RULE_SETUP
-#line 288 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 289 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return ORD; }
 	YY_BREAK
-case 86:
+case 87:
 YY_RULE_SETUP
-#line 289 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 290 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return UNO; }
 	YY_BREAK
-case 87:
+case 88:
 YY_RULE_SETUP
-#line 290 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 291 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return UEQ; }
 	YY_BREAK
-case 88:
+case 89:
 YY_RULE_SETUP
-#line 291 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 292 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { return UNE; }
 	YY_BREAK
-case 89:
+case 90:
 YY_RULE_SETUP
-#line 293 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 294 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
-case 90:
+case 91:
 YY_RULE_SETUP
-#line 294 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 295 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
-case 91:
+case 92:
 YY_RULE_SETUP
-#line 295 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 296 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, Trunc, TRUNC); }
 	YY_BREAK
-case 92:
+case 93:
 YY_RULE_SETUP
-#line 296 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 297 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, ZExt, ZEXT); }
 	YY_BREAK
-case 93:
+case 94:
 YY_RULE_SETUP
-#line 297 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 298 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, SExt, SEXT); }
 	YY_BREAK
-case 94:
+case 95:
 YY_RULE_SETUP
-#line 298 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 299 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
 	YY_BREAK
-case 95:
+case 96:
 YY_RULE_SETUP
-#line 299 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 300 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPExt, FPEXT); }
 	YY_BREAK
-case 96:
+case 97:
 YY_RULE_SETUP
-#line 300 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 301 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, UIToFP, UITOFP); }
 	YY_BREAK
-case 97:
+case 98:
 YY_RULE_SETUP
-#line 301 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 302 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, SIToFP, SITOFP); }
 	YY_BREAK
-case 98:
+case 99:
 YY_RULE_SETUP
-#line 302 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 303 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPToUI, FPTOUI); }
 	YY_BREAK
-case 99:
+case 100:
 YY_RULE_SETUP
-#line 303 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 304 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, FPToSI, FPTOSI); }
 	YY_BREAK
-case 100:
+case 101:
 YY_RULE_SETUP
-#line 304 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 305 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
 	YY_BREAK
-case 101:
+case 102:
 YY_RULE_SETUP
-#line 305 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 306 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
 	YY_BREAK
-case 102:
+case 103:
 YY_RULE_SETUP
-#line 306 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 307 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(CastOpVal, BitCast, BITCAST); }
 	YY_BREAK
-case 103:
+case 104:
 YY_RULE_SETUP
-#line 307 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 308 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
-case 104:
+case 105:
 YY_RULE_SETUP
-#line 308 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 309 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
-case 105:
+case 106:
 YY_RULE_SETUP
-#line 309 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 310 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
-case 106:
+case 107:
 YY_RULE_SETUP
-#line 310 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 311 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
-case 107:
+case 108:
 YY_RULE_SETUP
-#line 311 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 312 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
-case 108:
+case 109:
 YY_RULE_SETUP
-#line 312 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 313 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
-case 109:
+case 110:
 YY_RULE_SETUP
-#line 313 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 314 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
-case 110:
+case 111:
 YY_RULE_SETUP
-#line 314 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 315 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
-case 111:
+case 112:
 YY_RULE_SETUP
-#line 316 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 317 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
-case 112:
+case 113:
 YY_RULE_SETUP
-#line 317 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 318 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
-case 113:
+case 114:
 YY_RULE_SETUP
-#line 318 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 319 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
-case 114:
+case 115:
 YY_RULE_SETUP
-#line 319 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 320 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
-case 115:
+case 116:
 YY_RULE_SETUP
-#line 320 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 321 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
-case 116:
+case 117:
 YY_RULE_SETUP
-#line 321 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 322 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
-case 117:
+case 118:
 YY_RULE_SETUP
-#line 323 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 324 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
-case 118:
+case 119:
 YY_RULE_SETUP
-#line 324 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 325 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
-case 119:
+case 120:
 YY_RULE_SETUP
-#line 325 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 326 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
 	YY_BREAK
-case 120:
+case 121:
 YY_RULE_SETUP
-#line 328 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 329 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 {
-                  UnEscapeLexed(yytext+1);
-                  llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
+                  UnEscapeLexed(llvmAsmtext+1);
+                  llvmAsmlval.StrVal = strdup(llvmAsmtext+1);             // Skip %
                   return LOCALVAR;
                 }
 	YY_BREAK
-case 121:
+case 122:
 YY_RULE_SETUP
-#line 333 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 334 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 {
-                  UnEscapeLexed(yytext+1);
-                  llvmAsmlval.StrVal = strdup(yytext+1);             // Skip @
+                  UnEscapeLexed(llvmAsmtext+1);
+                  llvmAsmlval.StrVal = strdup(llvmAsmtext+1);             // Skip @
                   return GLOBALVAR;
                 }
 	YY_BREAK
-case 122:
+case 123:
 YY_RULE_SETUP
-#line 338 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 339 "/home/laurov/llvm/llvm/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 123:
+case 124:
+/* rule 124 can match eol */
 YY_RULE_SETUP
-#line 344 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 345 "/home/laurov/llvm/llvm/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 124:
+case 125:
+/* rule 125 can match eol */
 YY_RULE_SETUP
-#line 351 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 352 "/home/laurov/llvm/llvm/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 125:
+case 126:
+/* rule 126 can match eol */
 YY_RULE_SETUP
-#line 360 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 361 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 {
-                     yytext[strlen(yytext)-1] = 0;           // nuke end quote
-                     llvmAsmlval.StrVal = strdup(yytext+2);  // Nuke @, quote
+                     llvmAsmtext[strlen(llvmAsmtext)-1] = 0;           // nuke end quote
+                     llvmAsmlval.StrVal = strdup(llvmAsmtext+2);  // Nuke @, quote
                      return ATSTRINGCONSTANT;
                    }
 	YY_BREAK
-case 126:
+case 127:
 YY_RULE_SETUP
-#line 366 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ int len = strlen(yytext); 
+#line 367 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ int len = strlen(llvmAsmtext); 
                   uint32_t numBits = ((len * 64) / 19) + 1;
-                  APInt Tmp(numBits, yytext, len, 10);
+                  APInt Tmp(numBits, llvmAsmtext, len, 10);
                   uint32_t activeBits = Tmp.getActiveBits();
                   if (activeBits > 0 && activeBits < numBits)
                     Tmp.trunc(activeBits);
@@ -1941,12 +2009,12 @@
                   }
                 }
 	YY_BREAK
-case 127:
+case 128:
 YY_RULE_SETUP
-#line 380 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ int len = strlen(yytext); 
+#line 381 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ int len = strlen(llvmAsmtext); 
                   uint32_t numBits = (((len-1) * 64) / 19) + 2;
-                  APInt Tmp(numBits, yytext, len, 10);
+                  APInt Tmp(numBits, llvmAsmtext, len, 10);
                   uint32_t minBits = Tmp.getMinSignedBits();
                   if (minBits > 0 && minBits < numBits)
                     Tmp.trunc(minBits);
@@ -1959,19 +2027,19 @@
                   }
                 }
 	YY_BREAK
-case 128:
+case 129:
 YY_RULE_SETUP
-#line 395 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ int len = strlen(yytext+3) - 3;
+#line 396 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ int len = strlen(llvmAsmtext+3) - 3;
                    uint32_t bits = len * 4;
-                   APInt Tmp(bits, yytext+3, len, 16);
+                   APInt Tmp(bits, llvmAsmtext+3, len, 16);
                    uint32_t activeBits = Tmp.getActiveBits();
                    if (activeBits > 0 && activeBits < bits)
                      Tmp.trunc(activeBits);
                    if (Tmp.getBitWidth() > 64) {
                      llvmAsmlval.APIntVal = new APInt(Tmp);
-                     return yytext[0] == 's' ? ESAPINTVAL : EUAPINTVAL;
-                   } else if (yytext[0] == 's') {
+                     return llvmAsmtext[0] == 's' ? ESAPINTVAL : EUAPINTVAL;
+                   } else if (llvmAsmtext[0] == 's') {
                      llvmAsmlval.SInt64Val = Tmp.getSExtValue();
                      return ESINT64VAL;
                    } else {
@@ -1980,88 +2048,89 @@
                    }
                  }
 	YY_BREAK
-case 129:
+case 130:
 YY_RULE_SETUP
-#line 413 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 414 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 {
-                  uint64_t Val = atoull(yytext+1);
+                  uint64_t Val = atoull(llvmAsmtext+1);
                   if ((unsigned)Val != Val)
                     GenerateError("Invalid value number (too large)!");
                   llvmAsmlval.UIntVal = unsigned(Val);
                   return LOCALVAL_ID;
                 }
 	YY_BREAK
-case 130:
+case 131:
 YY_RULE_SETUP
-#line 420 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 421 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 {
-                  uint64_t Val = atoull(yytext+1);
+                  uint64_t Val = atoull(llvmAsmtext+1);
                   if ((unsigned)Val != Val)
                     GenerateError("Invalid value number (too large)!");
                   llvmAsmlval.UIntVal = unsigned(Val);
                   return GLOBALVAL_ID;
                 }
 	YY_BREAK
-case 131:
+case 132:
 YY_RULE_SETUP
-#line 428 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
+#line 429 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.FPVal = atof(llvmAsmtext); return FPVAL; }
 	YY_BREAK
-case 132:
+case 133:
 YY_RULE_SETUP
-#line 429 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
+#line 430 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.FPVal = HexToFP(llvmAsmtext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 431 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 432 "/home/laurov/llvm/llvm/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 133:
+case 134:
+/* rule 134 can match eol */
 YY_RULE_SETUP
-#line 439 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 440 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 134:
+case 135:
 YY_RULE_SETUP
-#line 440 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return yytext[0]; }
+#line 441 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
+{ return llvmAsmtext[0]; }
 	YY_BREAK
-case 135:
+case 136:
 YY_RULE_SETUP
-#line 442 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 443 "/home/laurov/llvm/llvm/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2041 "Lexer.cpp"
+#line 2110 "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
@@ -2071,13 +2140,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
@@ -2090,41 +2159,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;
@@ -2132,30 +2202,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;
@@ -2166,8 +2236,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
  *
@@ -2176,21 +2245,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.
@@ -2210,34 +2278,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 )
 				{
@@ -2250,8 +2314,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. */
@@ -2261,35 +2324,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;
 			}
 		}
@@ -2297,149 +2360,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 >= 539 )
+			if ( yy_current_state >= 550 )
 				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 >= 539 )
+		if ( yy_current_state >= 550 )
 			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 == 538);
-	if ( ! yy_is_jam )
-		*yy_state_ptr++ = yy_current_state;
+	yy_is_jam = (yy_current_state == 549);
 
 	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()
@@ -2453,16 +2508,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();
@@ -2472,169 +2527,170 @@
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
+					(yy_c_buf_p) = (yytext_ptr) + offset;
 					break;
 				}
 			}
 		}
 
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve llvmAsmtext */
+	(yy_hold_char) = *++(yy_c_buf_p);
 
 	if ( c == '\n' )
-		++yylineno;
+		   
+    llvmAsmlineno++;
+;
 
 	return c;
-	}
-#endif /* YY_NO_INPUT */
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+}
+#endif	/* ifndef YY_NO_INPUT */
 
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void llvmAsmrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        llvmAsmensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE );
 	}
 
+	llvmAsm_init_buffer(YY_CURRENT_BUFFER,input_file );
+	llvmAsm_load_buffer_state( );
+}
 
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void llvmAsm_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		llvmAsmpop_buffer_state();
+	 *		llvmAsmpush_buffer_state(new_buffer);
+     */
+	llvmAsmensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
-	if ( yy_current_buffer )
+	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	llvmAsm_load_buffer_state( );
 
 	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
+	 * EOF (llvmAsmwrap()) processing, but the only time this flag
+	 * is looked at is after llvmAsmwrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
+	(yy_did_buffer_switch_on_eof) = 1;
+}
 
+static void llvmAsm_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	llvmAsmin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
 
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE llvmAsm_create_buffer  (FILE * file, int  size )
+{
 	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+    
+	b = (YY_BUFFER_STATE) llvmAsmalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in llvmAsm_create_buffer()" );
 
 	b->yy_buf_size = size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
+	b->yy_ch_buf = (char *) llvmAsmalloc(b->yy_buf_size + 2  );
 	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in llvmAsm_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer( b, file );
+	llvmAsm_init_buffer(b,file );
 
 	return b;
-	}
-
+}
 
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
+/** Destroy the buffer.
+ * @param b a buffer created with llvmAsm_create_buffer()
+ * 
+ */
+    void llvmAsm_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
 	if ( ! b )
 		return;
 
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
+		llvmAsmfree((void *) b->yy_ch_buf  );
 
+	llvmAsmfree((void *) b  );
+}
 
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a llvmAsmrestart() or at EOF.
+ */
+    static void llvmAsm_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
-	{
-	yy_flush_buffer( b );
+{
+	int oerrno = errno;
+    
+	llvmAsm_flush_buffer(b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
+    /* If b is the current buffer, then llvmAsm_init_buffer was _probably_
+     * called from llvmAsmrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
 
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
+        b->yy_is_interactive = 0;
+    
+	errno = oerrno;
+}
 
-	{
-	if ( ! b )
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void llvmAsm_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -2651,31 +2707,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;
@@ -2687,58 +2835,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 yystr 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.
@@ -2746,148 +2889,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
@@ -2896,24 +3090,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 443 "/home/laurov/llvm/llvm/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 442 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 


Index: llvm/lib/AsmParser/Lexer.l
diff -u llvm/lib/AsmParser/Lexer.l:1.104 llvm/lib/AsmParser/Lexer.l:1.105
--- llvm/lib/AsmParser/Lexer.l:1.104	Sun Apr  8 20:55:42 2007
+++ llvm/lib/AsmParser/Lexer.l	Thu Apr 12 13:32:50 2007
@@ -208,6 +208,7 @@
 hidden          { return HIDDEN; }
 extern_weak     { return EXTERN_WEAK; }
 external        { return EXTERNAL; }
+thread_local    { return THREAD_LOCAL; }
 zeroinitializer { return ZEROINITIALIZER; }
 \.\.\.          { return DOTDOTDOT; }
 undef           { return UNDEF; }


Index: llvm/lib/AsmParser/Lexer.l.cvs
diff -u llvm/lib/AsmParser/Lexer.l.cvs:1.31 llvm/lib/AsmParser/Lexer.l.cvs:1.32
--- llvm/lib/AsmParser/Lexer.l.cvs:1.31	Sun Apr  8 20:56:05 2007
+++ llvm/lib/AsmParser/Lexer.l.cvs	Thu Apr 12 13:32:50 2007
@@ -208,6 +208,7 @@
 hidden          { return HIDDEN; }
 extern_weak     { return EXTERN_WEAK; }
 external        { return EXTERNAL; }
+thread_local    { return THREAD_LOCAL; }
 zeroinitializer { return ZEROINITIALIZER; }
 \.\.\.          { return DOTDOTDOT; }
 undef           { return UNDEF; }


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.83 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.84
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.83	Tue Apr 10 21:44:19 2007
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Thu Apr 12 13:32:50 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"
@@ -93,108 +103,109 @@
      CONSTANT = 284,
      SECTION = 285,
      VOLATILE = 286,
-     TO = 287,
-     DOTDOTDOT = 288,
-     NULL_TOK = 289,
-     UNDEF = 290,
-     INTERNAL = 291,
-     LINKONCE = 292,
-     WEAK = 293,
-     APPENDING = 294,
-     DLLIMPORT = 295,
-     DLLEXPORT = 296,
-     EXTERN_WEAK = 297,
-     OPAQUE = 298,
-     EXTERNAL = 299,
-     TARGET = 300,
-     TRIPLE = 301,
-     ALIGN = 302,
-     DEPLIBS = 303,
-     CALL = 304,
-     TAIL = 305,
-     ASM_TOK = 306,
-     MODULE = 307,
-     SIDEEFFECT = 308,
-     CC_TOK = 309,
-     CCC_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,
-     SHL = 334,
-     LSHR = 335,
-     ASHR = 336,
-     ICMP = 337,
-     FCMP = 338,
-     EQ = 339,
-     NE = 340,
-     SLT = 341,
-     SGT = 342,
-     SLE = 343,
-     SGE = 344,
-     ULT = 345,
-     UGT = 346,
-     ULE = 347,
-     UGE = 348,
-     OEQ = 349,
-     ONE = 350,
-     OLT = 351,
-     OGT = 352,
-     OLE = 353,
-     OGE = 354,
-     ORD = 355,
-     UNO = 356,
-     UEQ = 357,
-     UNE = 358,
-     MALLOC = 359,
-     ALLOCA = 360,
-     FREE = 361,
-     LOAD = 362,
-     STORE = 363,
-     GETELEMENTPTR = 364,
-     TRUNC = 365,
-     ZEXT = 366,
-     SEXT = 367,
-     FPTRUNC = 368,
-     FPEXT = 369,
-     BITCAST = 370,
-     UITOFP = 371,
-     SITOFP = 372,
-     FPTOUI = 373,
-     FPTOSI = 374,
-     INTTOPTR = 375,
-     PTRTOINT = 376,
-     PHI_TOK = 377,
-     SELECT = 378,
-     VAARG = 379,
-     EXTRACTELEMENT = 380,
-     INSERTELEMENT = 381,
-     SHUFFLEVECTOR = 382,
-     NORETURN = 383,
-     INREG = 384,
-     SRET = 385,
-     NOUNWIND = 386,
-     DEFAULT = 387,
-     HIDDEN = 388
+     THREAD_LOCAL = 287,
+     TO = 288,
+     DOTDOTDOT = 289,
+     NULL_TOK = 290,
+     UNDEF = 291,
+     INTERNAL = 292,
+     LINKONCE = 293,
+     WEAK = 294,
+     APPENDING = 295,
+     DLLIMPORT = 296,
+     DLLEXPORT = 297,
+     EXTERN_WEAK = 298,
+     OPAQUE = 299,
+     EXTERNAL = 300,
+     TARGET = 301,
+     TRIPLE = 302,
+     ALIGN = 303,
+     DEPLIBS = 304,
+     CALL = 305,
+     TAIL = 306,
+     ASM_TOK = 307,
+     MODULE = 308,
+     SIDEEFFECT = 309,
+     CC_TOK = 310,
+     CCC_TOK = 311,
+     FASTCC_TOK = 312,
+     COLDCC_TOK = 313,
+     X86_STDCALLCC_TOK = 314,
+     X86_FASTCALLCC_TOK = 315,
+     DATALAYOUT = 316,
+     RET = 317,
+     BR = 318,
+     SWITCH = 319,
+     INVOKE = 320,
+     UNWIND = 321,
+     UNREACHABLE = 322,
+     ADD = 323,
+     SUB = 324,
+     MUL = 325,
+     UDIV = 326,
+     SDIV = 327,
+     FDIV = 328,
+     UREM = 329,
+     SREM = 330,
+     FREM = 331,
+     AND = 332,
+     OR = 333,
+     XOR = 334,
+     SHL = 335,
+     LSHR = 336,
+     ASHR = 337,
+     ICMP = 338,
+     FCMP = 339,
+     EQ = 340,
+     NE = 341,
+     SLT = 342,
+     SGT = 343,
+     SLE = 344,
+     SGE = 345,
+     ULT = 346,
+     UGT = 347,
+     ULE = 348,
+     UGE = 349,
+     OEQ = 350,
+     ONE = 351,
+     OLT = 352,
+     OGT = 353,
+     OLE = 354,
+     OGE = 355,
+     ORD = 356,
+     UNO = 357,
+     UEQ = 358,
+     UNE = 359,
+     MALLOC = 360,
+     ALLOCA = 361,
+     FREE = 362,
+     LOAD = 363,
+     STORE = 364,
+     GETELEMENTPTR = 365,
+     TRUNC = 366,
+     ZEXT = 367,
+     SEXT = 368,
+     FPTRUNC = 369,
+     FPEXT = 370,
+     BITCAST = 371,
+     UITOFP = 372,
+     SITOFP = 373,
+     FPTOUI = 374,
+     FPTOSI = 375,
+     INTTOPTR = 376,
+     PTRTOINT = 377,
+     PHI_TOK = 378,
+     SELECT = 379,
+     VAARG = 380,
+     EXTRACTELEMENT = 381,
+     INSERTELEMENT = 382,
+     SHUFFLEVECTOR = 383,
+     NORETURN = 384,
+     INREG = 385,
+     SRET = 386,
+     NOUNWIND = 387,
+     DEFAULT = 388,
+     HIDDEN = 389
    };
 #endif
 /* Tokens.  */
@@ -227,114 +238,115 @@
 #define CONSTANT 284
 #define SECTION 285
 #define VOLATILE 286
-#define TO 287
-#define DOTDOTDOT 288
-#define NULL_TOK 289
-#define UNDEF 290
-#define INTERNAL 291
-#define LINKONCE 292
-#define WEAK 293
-#define APPENDING 294
-#define DLLIMPORT 295
-#define DLLEXPORT 296
-#define EXTERN_WEAK 297
-#define OPAQUE 298
-#define EXTERNAL 299
-#define TARGET 300
-#define TRIPLE 301
-#define ALIGN 302
-#define DEPLIBS 303
-#define CALL 304
-#define TAIL 305
-#define ASM_TOK 306
-#define MODULE 307
-#define SIDEEFFECT 308
-#define CC_TOK 309
-#define CCC_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 SHL 334
-#define LSHR 335
-#define ASHR 336
-#define ICMP 337
-#define FCMP 338
-#define EQ 339
-#define NE 340
-#define SLT 341
-#define SGT 342
-#define SLE 343
-#define SGE 344
-#define ULT 345
-#define UGT 346
-#define ULE 347
-#define UGE 348
-#define OEQ 349
-#define ONE 350
-#define OLT 351
-#define OGT 352
-#define OLE 353
-#define OGE 354
-#define ORD 355
-#define UNO 356
-#define UEQ 357
-#define UNE 358
-#define MALLOC 359
-#define ALLOCA 360
-#define FREE 361
-#define LOAD 362
-#define STORE 363
-#define GETELEMENTPTR 364
-#define TRUNC 365
-#define ZEXT 366
-#define SEXT 367
-#define FPTRUNC 368
-#define FPEXT 369
-#define BITCAST 370
-#define UITOFP 371
-#define SITOFP 372
-#define FPTOUI 373
-#define FPTOSI 374
-#define INTTOPTR 375
-#define PTRTOINT 376
-#define PHI_TOK 377
-#define SELECT 378
-#define VAARG 379
-#define EXTRACTELEMENT 380
-#define INSERTELEMENT 381
-#define SHUFFLEVECTOR 382
-#define NORETURN 383
-#define INREG 384
-#define SRET 385
-#define NOUNWIND 386
-#define DEFAULT 387
-#define HIDDEN 388
+#define THREAD_LOCAL 287
+#define TO 288
+#define DOTDOTDOT 289
+#define NULL_TOK 290
+#define UNDEF 291
+#define INTERNAL 292
+#define LINKONCE 293
+#define WEAK 294
+#define APPENDING 295
+#define DLLIMPORT 296
+#define DLLEXPORT 297
+#define EXTERN_WEAK 298
+#define OPAQUE 299
+#define EXTERNAL 300
+#define TARGET 301
+#define TRIPLE 302
+#define ALIGN 303
+#define DEPLIBS 304
+#define CALL 305
+#define TAIL 306
+#define ASM_TOK 307
+#define MODULE 308
+#define SIDEEFFECT 309
+#define CC_TOK 310
+#define CCC_TOK 311
+#define FASTCC_TOK 312
+#define COLDCC_TOK 313
+#define X86_STDCALLCC_TOK 314
+#define X86_FASTCALLCC_TOK 315
+#define DATALAYOUT 316
+#define RET 317
+#define BR 318
+#define SWITCH 319
+#define INVOKE 320
+#define UNWIND 321
+#define UNREACHABLE 322
+#define ADD 323
+#define SUB 324
+#define MUL 325
+#define UDIV 326
+#define SDIV 327
+#define FDIV 328
+#define UREM 329
+#define SREM 330
+#define FREM 331
+#define AND 332
+#define OR 333
+#define XOR 334
+#define SHL 335
+#define LSHR 336
+#define ASHR 337
+#define ICMP 338
+#define FCMP 339
+#define EQ 340
+#define NE 341
+#define SLT 342
+#define SGT 343
+#define SLE 344
+#define SGE 345
+#define ULT 346
+#define UGT 347
+#define ULE 348
+#define UGE 349
+#define OEQ 350
+#define ONE 351
+#define OLT 352
+#define OGT 353
+#define OLE 354
+#define OGE 355
+#define ORD 356
+#define UNO 357
+#define UEQ 358
+#define UNE 359
+#define MALLOC 360
+#define ALLOCA 361
+#define FREE 362
+#define LOAD 363
+#define STORE 364
+#define GETELEMENTPTR 365
+#define TRUNC 366
+#define ZEXT 367
+#define SEXT 368
+#define FPTRUNC 369
+#define FPEXT 370
+#define BITCAST 371
+#define UITOFP 372
+#define SITOFP 373
+#define FPTOUI 374
+#define FPTOSI 375
+#define INTTOPTR 376
+#define PTRTOINT 377
+#define PHI_TOK 378
+#define SELECT 379
+#define VAARG 380
+#define EXTRACTELEMENT 381
+#define INSERTELEMENT 382
+#define SHUFFLEVECTOR 383
+#define NORETURN 384
+#define INREG 385
+#define SRET 386
+#define NOUNWIND 387
+#define DEFAULT 388
+#define HIDDEN 389
 
 
 
 
 /* Copy the first part of user declarations.  */
-#line 14 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1028,7 +1040,7 @@
                     GlobalValue::LinkageTypes Linkage,
                     GlobalValue::VisibilityTypes Visibility,
                     bool isConstantGlobal, const Type *Ty,
-                    Constant *Initializer) {
+                    Constant *Initializer, bool IsThreadLocal) {
   if (isa<FunctionType>(Ty)) {
     GenerateError("Cannot declare global vars of function type");
     return 0;
@@ -1061,6 +1073,7 @@
     GV->setLinkage(Linkage);
     GV->setVisibility(Visibility);
     GV->setConstant(isConstantGlobal);
+    GV->setThreadLocal(IsThreadLocal);
     InsertValue(GV, CurModule.Values);
     return GV;
   }
@@ -1085,7 +1098,7 @@
   // Otherwise there is no existing GV to use, create one now.
   GlobalVariable *GV =
     new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name,
-                       CurModule.CurrentModule);
+                       CurModule.CurrentModule, IsThreadLocal);
   GV->setVisibility(Visibility);
   InsertValue(GV, CurModule.Values);
   return GV;
@@ -1276,9 +1289,10 @@
 # define YYTOKEN_TABLE 0
 #endif
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 937 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-typedef union YYSTYPE {
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 938 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -1323,9 +1337,10 @@
   llvm::Instruction::OtherOps       OtherOpVal;
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
-} YYSTYPE;
-/* Line 196 of yacc.c.  */
-#line 1329 "llvmAsmParser.tab.c"
+}
+/* Line 193 of yacc.c.  */
+#line 1343 "llvmAsmParser.tab.c"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1336,23 +1351,56 @@
 /* Copy the second part of user declarations.  */
 
 
-/* Line 219 of yacc.c.  */
-#line 1341 "llvmAsmParser.tab.c"
+/* Line 216 of yacc.c.  */
+#line 1356 "llvmAsmParser.tab.c"
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
+#ifdef short
+# undef short
 #endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
 #endif
-#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
-# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-# define YYSIZE_T size_t
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
 #endif
-#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
@@ -1365,7 +1413,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.  */
 
@@ -1373,64 +1446,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;
   };
 
@@ -1440,13 +1525,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
@@ -1457,7 +1542,7 @@
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
-      while (0)
+      while (YYID (0))
 #  endif
 # endif
 
@@ -1475,53 +1560,47 @@
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (0)
+    while (YYID (0))
 
 #endif
 
-#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  39
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1441
+#define YYLAST   1317
 
-/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  148
-/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  78
-/* YYNRULES -- Number of rules. */
-#define YYNRULES  286
-/* YYNRULES -- Number of states. */
-#define YYNSTATES  559
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  149
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  79
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  288
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  563
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   388
+#define YYMAXUTOK   389
 
 #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,
-     138,   139,   136,     2,   135,     2,     2,     2,     2,     2,
+     139,   140,   137,     2,   136,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     143,   134,   144,     2,     2,     2,     2,     2,     2,     2,
+     144,   135,   145,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   140,   137,   142,     2,     2,     2,     2,     2,   147,
+       2,   141,   138,   143,     2,     2,     2,     2,     2,   148,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     141,     2,     2,   145,     2,   146,     2,     2,     2,     2,
+     142,     2,     2,   146,     2,   147,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1547,13 +1626,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,   131,   132,   133
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134
 };
 
 #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,
@@ -1573,153 +1652,154 @@
      352,   358,   361,   364,   367,   370,   373,   376,   379,   382,
      385,   388,   391,   394,   401,   407,   416,   423,   430,   438,
      446,   453,   462,   471,   475,   477,   479,   481,   483,   484,
-     486,   489,   490,   494,   495,   499,   503,   507,   511,   512,
-     519,   520,   528,   529,   537,   540,   544,   546,   550,   554,
-     558,   562,   564,   565,   571,   575,   577,   581,   583,   584,
-     594,   596,   598,   603,   605,   607,   610,   614,   615,   617,
-     619,   621,   623,   625,   627,   629,   631,   633,   637,   639,
-     645,   647,   649,   651,   653,   655,   657,   660,   663,   666,
-     670,   673,   674,   676,   679,   682,   686,   696,   706,   715,
-     730,   732,   734,   741,   747,   750,   757,   765,   769,   775,
-     776,   777,   781,   784,   786,   792,   798,   805,   812,   817,
-     824,   829,   834,   841,   848,   851,   860,   862,   864,   865,
-     869,   876,   880,   887,   890,   895,   902
+     486,   487,   489,   492,   493,   497,   498,   502,   506,   510,
+     514,   515,   523,   524,   533,   534,   543,   546,   550,   552,
+     556,   560,   564,   568,   570,   571,   577,   581,   583,   587,
+     589,   590,   600,   602,   604,   609,   611,   613,   616,   620,
+     621,   623,   625,   627,   629,   631,   633,   635,   637,   639,
+     643,   645,   651,   653,   655,   657,   659,   661,   663,   666,
+     669,   672,   676,   679,   680,   682,   685,   688,   692,   702,
+     712,   721,   736,   738,   740,   747,   753,   756,   763,   771,
+     775,   781,   782,   783,   787,   790,   792,   798,   804,   811,
+     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[] =
 {
-     188,     0,    -1,    67,    -1,    68,    -1,    69,    -1,    70,
-      -1,    71,    -1,    72,    -1,    73,    -1,    74,    -1,    75,
-      -1,    79,    -1,    80,    -1,    81,    -1,    76,    -1,    77,
-      -1,    78,    -1,   110,    -1,   111,    -1,   112,    -1,   113,
-      -1,   114,    -1,   115,    -1,   116,    -1,   117,    -1,   118,
-      -1,   119,    -1,   120,    -1,   121,    -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,   101,    -1,   102,    -1,   103,    -1,    90,    -1,    91,
-      -1,    92,    -1,    93,    -1,    22,    -1,    23,    -1,    11,
-      -1,    12,    -1,    13,    -1,    16,    -1,    19,    -1,   156,
-      -1,    -1,   156,   134,    -1,    -1,    17,    -1,    20,    -1,
-     159,   134,    -1,    -1,    36,    -1,    38,    -1,    37,    -1,
-      39,    -1,    41,    -1,    40,    -1,    42,    -1,    44,    -1,
-      -1,   133,    -1,    -1,    40,    -1,    42,    -1,    -1,    36,
-      -1,    37,    -1,    38,    -1,    41,    -1,    -1,    55,    -1,
-      56,    -1,    57,    -1,    58,    -1,    59,    -1,    54,     4,
-      -1,   111,    -1,   112,    -1,   129,    -1,   130,    -1,    -1,
-     168,   167,    -1,   128,    -1,   131,    -1,   167,    -1,    -1,
-     170,   169,    -1,    -1,    47,     4,    -1,    -1,   135,    47,
-       4,    -1,    30,    19,    -1,    -1,   173,    -1,    -1,   135,
-     176,   175,    -1,   173,    -1,    47,     4,    -1,    11,    -1,
-      12,    -1,    13,    -1,    14,    -1,    43,    -1,   177,    -1,
-     178,   136,    -1,   210,    -1,   137,     4,    -1,   178,   138,
-     182,   139,   170,    -1,    10,   138,   182,   139,   170,    -1,
-     140,     4,   141,   178,   142,    -1,   143,     4,   141,   178,
-     144,    -1,   145,   183,   146,    -1,   145,   146,    -1,   143,
-     145,   183,   146,   144,    -1,   143,   145,   146,   144,    -1,
-     178,   168,    -1,   178,    -1,    10,    -1,   179,    -1,   181,
-     135,   179,    -1,   181,    -1,   181,   135,    33,    -1,    33,
-      -1,    -1,   178,    -1,   183,   135,   178,    -1,   178,   140,
-     186,   142,    -1,   178,   140,   142,    -1,   178,   147,    19,
-      -1,   178,   143,   186,   144,    -1,   178,   145,   186,   146,
-      -1,   178,   145,   146,    -1,   178,   143,   145,   186,   146,
-     144,    -1,   178,   143,   145,   146,   144,    -1,   178,    34,
-      -1,   178,    35,    -1,   178,   210,    -1,   178,   185,    -1,
-     178,    21,    -1,   154,     3,    -1,   154,     5,    -1,   154,
-       4,    -1,   154,     6,    -1,    11,    22,    -1,    11,    23,
-      -1,   155,     9,    -1,   151,   138,   184,    32,   178,   139,
-      -1,   109,   138,   184,   221,   139,    -1,   123,   138,   184,
-     135,   184,   135,   184,   139,    -1,   149,   138,   184,   135,
-     184,   139,    -1,   150,   138,   184,   135,   184,   139,    -1,
-      82,   152,   138,   184,   135,   184,   139,    -1,    83,   153,
-     138,   184,   135,   184,   139,    -1,   125,   138,   184,   135,
-     184,   139,    -1,   126,   138,   184,   135,   184,   135,   184,
-     139,    -1,   127,   138,   184,   135,   184,   135,   184,   139,
-      -1,   186,   135,   184,    -1,   184,    -1,    28,    -1,    29,
-      -1,   189,    -1,    -1,   190,    -1,   189,   190,    -1,    -1,
-      27,   191,   206,    -1,    -1,    26,   192,   207,    -1,    52,
-      51,   196,    -1,   158,    15,   178,    -1,   158,    15,    10,
-      -1,    -1,   160,   163,   187,   184,   193,   175,    -1,    -1,
-     160,   161,   163,   187,   184,   194,   175,    -1,    -1,   160,
-     162,   163,   187,   178,   195,   175,    -1,    45,   197,    -1,
-      48,   134,   198,    -1,    19,    -1,    46,   134,    19,    -1,
-      60,   134,    19,    -1,   140,   199,   142,    -1,   199,   135,
-      19,    -1,    19,    -1,    -1,   200,   135,   178,   168,   157,
-      -1,   178,   168,   157,    -1,   200,    -1,   200,   135,    33,
-      -1,    33,    -1,    -1,   166,   180,   159,   138,   201,   139,
-     170,   174,   171,    -1,    24,    -1,   145,    -1,   165,   163,
-     202,   203,    -1,    25,    -1,   146,    -1,   213,   205,    -1,
-     164,   163,   202,    -1,    -1,    53,    -1,     3,    -1,     4,
-      -1,     9,    -1,    22,    -1,    23,    -1,    34,    -1,    35,
-      -1,    21,    -1,   143,   186,   144,    -1,   185,    -1,    51,
-     208,    19,   135,    19,    -1,     7,    -1,     8,    -1,   156,
-      -1,   159,    -1,   210,    -1,   209,    -1,   178,   211,    -1,
-     213,   214,    -1,   204,   214,    -1,   215,   158,   216,    -1,
-     215,   218,    -1,    -1,    18,    -1,    61,   212,    -1,    61,
-      10,    -1,    62,    14,   211,    -1,    62,    11,   211,   135,
-      14,   211,   135,    14,   211,    -1,    63,   154,   211,   135,
-      14,   211,   140,   217,   142,    -1,    63,   154,   211,   135,
-      14,   211,   140,   142,    -1,    64,   166,   180,   211,   138,
-     220,   139,   170,    32,    14,   211,    65,    14,   211,    -1,
-      65,    -1,    66,    -1,   217,   154,   209,   135,    14,   211,
-      -1,   154,   209,   135,    14,   211,    -1,   158,   223,    -1,
-     178,   140,   211,   135,   211,   142,    -1,   219,   135,   140,
-     211,   135,   211,   142,    -1,   178,   211,   168,    -1,   220,
-     135,   178,   211,   168,    -1,    -1,    -1,   221,   135,   212,
-      -1,    50,    49,    -1,    49,    -1,   149,   178,   211,   135,
-     211,    -1,   150,   178,   211,   135,   211,    -1,    82,   152,
-     178,   211,   135,   211,    -1,    83,   153,   178,   211,   135,
-     211,    -1,   151,   212,    32,   178,    -1,   123,   212,   135,
-     212,   135,   212,    -1,   124,   212,   135,   178,    -1,   125,
-     212,   135,   212,    -1,   126,   212,   135,   212,   135,   212,
-      -1,   127,   212,   135,   212,   135,   212,    -1,   122,   219,
-      -1,   222,   166,   180,   211,   138,   220,   139,   170,    -1,
-     225,    -1,    31,    -1,    -1,   104,   178,   172,    -1,   104,
-     178,   135,    11,   211,   172,    -1,   105,   178,   172,    -1,
-     105,   178,   135,    11,   211,   172,    -1,   106,   212,    -1,
-     224,   107,   178,   211,    -1,   224,   108,   212,   135,   178,
-     211,    -1,   109,   178,   211,   221,    -1
+     190,     0,    -1,    68,    -1,    69,    -1,    70,    -1,    71,
+      -1,    72,    -1,    73,    -1,    74,    -1,    75,    -1,    76,
+      -1,    80,    -1,    81,    -1,    82,    -1,    77,    -1,    78,
+      -1,    79,    -1,   111,    -1,   112,    -1,   113,    -1,   114,
+      -1,   115,    -1,   116,    -1,   117,    -1,   118,    -1,   119,
+      -1,   120,    -1,   121,    -1,   122,    -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,   101,
+      -1,   102,    -1,   103,    -1,   104,    -1,    91,    -1,    92,
+      -1,    93,    -1,    94,    -1,    22,    -1,    23,    -1,    11,
+      -1,    12,    -1,    13,    -1,    16,    -1,    19,    -1,   157,
+      -1,    -1,   157,   135,    -1,    -1,    17,    -1,    20,    -1,
+     160,   135,    -1,    -1,    37,    -1,    39,    -1,    38,    -1,
+      40,    -1,    42,    -1,    41,    -1,    43,    -1,    45,    -1,
+      -1,   134,    -1,    -1,    41,    -1,    43,    -1,    -1,    37,
+      -1,    38,    -1,    39,    -1,    42,    -1,    -1,    56,    -1,
+      57,    -1,    58,    -1,    59,    -1,    60,    -1,    55,     4,
+      -1,   112,    -1,   113,    -1,   130,    -1,   131,    -1,    -1,
+     169,   168,    -1,   129,    -1,   132,    -1,   168,    -1,    -1,
+     171,   170,    -1,    -1,    48,     4,    -1,    -1,   136,    48,
+       4,    -1,    30,    19,    -1,    -1,   174,    -1,    -1,   136,
+     177,   176,    -1,   174,    -1,    48,     4,    -1,    11,    -1,
+      12,    -1,    13,    -1,    14,    -1,    44,    -1,   178,    -1,
+     179,   137,    -1,   212,    -1,   138,     4,    -1,   179,   139,
+     183,   140,   171,    -1,    10,   139,   183,   140,   171,    -1,
+     141,     4,   142,   179,   143,    -1,   144,     4,   142,   179,
+     145,    -1,   146,   184,   147,    -1,   146,   147,    -1,   144,
+     146,   184,   147,   145,    -1,   144,   146,   147,   145,    -1,
+     179,   169,    -1,   179,    -1,    10,    -1,   180,    -1,   182,
+     136,   180,    -1,   182,    -1,   182,   136,    34,    -1,    34,
+      -1,    -1,   179,    -1,   184,   136,   179,    -1,   179,   141,
+     187,   143,    -1,   179,   141,   143,    -1,   179,   148,    19,
+      -1,   179,   144,   187,   145,    -1,   179,   146,   187,   147,
+      -1,   179,   146,   147,    -1,   179,   144,   146,   187,   147,
+     145,    -1,   179,   144,   146,   147,   145,    -1,   179,    35,
+      -1,   179,    36,    -1,   179,   212,    -1,   179,   186,    -1,
+     179,    21,    -1,   155,     3,    -1,   155,     5,    -1,   155,
+       4,    -1,   155,     6,    -1,    11,    22,    -1,    11,    23,
+      -1,   156,     9,    -1,   152,   139,   185,    33,   179,   140,
+      -1,   110,   139,   185,   223,   140,    -1,   124,   139,   185,
+     136,   185,   136,   185,   140,    -1,   150,   139,   185,   136,
+     185,   140,    -1,   151,   139,   185,   136,   185,   140,    -1,
+      83,   153,   139,   185,   136,   185,   140,    -1,    84,   154,
+     139,   185,   136,   185,   140,    -1,   126,   139,   185,   136,
+     185,   140,    -1,   127,   139,   185,   136,   185,   136,   185,
+     140,    -1,   128,   139,   185,   136,   185,   136,   185,   140,
+      -1,   187,   136,   185,    -1,   185,    -1,    28,    -1,    29,
+      -1,    32,    -1,    -1,   191,    -1,    -1,   192,    -1,   191,
+     192,    -1,    -1,    27,   193,   208,    -1,    -1,    26,   194,
+     209,    -1,    53,    52,   198,    -1,   159,    15,   179,    -1,
+     159,    15,    10,    -1,    -1,   161,   164,   189,   188,   185,
+     195,   176,    -1,    -1,   161,   162,   164,   189,   188,   185,
+     196,   176,    -1,    -1,   161,   163,   164,   189,   188,   179,
+     197,   176,    -1,    46,   199,    -1,    49,   135,   200,    -1,
+      19,    -1,    47,   135,    19,    -1,    61,   135,    19,    -1,
+     141,   201,   143,    -1,   201,   136,    19,    -1,    19,    -1,
+      -1,   202,   136,   179,   169,   158,    -1,   179,   169,   158,
+      -1,   202,    -1,   202,   136,    34,    -1,    34,    -1,    -1,
+     167,   181,   160,   139,   203,   140,   171,   175,   172,    -1,
+      24,    -1,   146,    -1,   166,   164,   204,   205,    -1,    25,
+      -1,   147,    -1,   215,   207,    -1,   165,   164,   204,    -1,
+      -1,    54,    -1,     3,    -1,     4,    -1,     9,    -1,    22,
+      -1,    23,    -1,    35,    -1,    36,    -1,    21,    -1,   144,
+     187,   145,    -1,   186,    -1,    52,   210,    19,   136,    19,
+      -1,     7,    -1,     8,    -1,   157,    -1,   160,    -1,   212,
+      -1,   211,    -1,   179,   213,    -1,   215,   216,    -1,   206,
+     216,    -1,   217,   159,   218,    -1,   217,   220,    -1,    -1,
+      18,    -1,    62,   214,    -1,    62,    10,    -1,    63,    14,
+     213,    -1,    63,    11,   213,   136,    14,   213,   136,    14,
+     213,    -1,    64,   155,   213,   136,    14,   213,   141,   219,
+     143,    -1,    64,   155,   213,   136,    14,   213,   141,   143,
+      -1,    65,   167,   181,   213,   139,   222,   140,   171,    33,
+      14,   213,    66,    14,   213,    -1,    66,    -1,    67,    -1,
+     219,   155,   211,   136,    14,   213,    -1,   155,   211,   136,
+      14,   213,    -1,   159,   225,    -1,   179,   141,   213,   136,
+     213,   143,    -1,   221,   136,   141,   213,   136,   213,   143,
+      -1,   179,   213,   169,    -1,   222,   136,   179,   213,   169,
+      -1,    -1,    -1,   223,   136,   214,    -1,    51,    50,    -1,
+      50,    -1,   150,   179,   213,   136,   213,    -1,   151,   179,
+     213,   136,   213,    -1,    83,   153,   179,   213,   136,   213,
+      -1,    84,   154,   179,   213,   136,   213,    -1,   152,   214,
+      33,   179,    -1,   124,   214,   136,   214,   136,   214,    -1,
+     125,   214,   136,   179,    -1,   126,   214,   136,   214,    -1,
+     127,   214,   136,   214,   136,   214,    -1,   128,   214,   136,
+     214,   136,   214,    -1,   123,   221,    -1,   224,   167,   181,
+     213,   139,   222,   140,   171,    -1,   227,    -1,    31,    -1,
+      -1,   105,   179,   173,    -1,   105,   179,   136,    11,   213,
+     173,    -1,   106,   179,   173,    -1,   106,   179,   136,    11,
+     213,   173,    -1,   107,   214,    -1,   226,   108,   179,   213,
+      -1,   226,   109,   214,   136,   179,   213,    -1,   110,   179,
+     213,   223,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const yytype_uint16 yyrline[] =
 {
-       0,  1091,  1091,  1091,  1091,  1091,  1091,  1091,  1091,  1091,
-    1091,  1092,  1092,  1092,  1092,  1092,  1092,  1093,  1093,  1093,
-    1093,  1093,  1093,  1094,  1094,  1094,  1094,  1094,  1094,  1097,
-    1097,  1098,  1098,  1099,  1099,  1100,  1100,  1101,  1101,  1105,
-    1105,  1106,  1106,  1107,  1107,  1108,  1108,  1109,  1109,  1110,
-    1110,  1111,  1111,  1112,  1113,  1118,  1119,  1119,  1121,  1121,
-    1122,  1122,  1126,  1130,  1135,  1135,  1137,  1141,  1147,  1148,
-    1149,  1150,  1151,  1155,  1156,  1157,  1161,  1162,  1166,  1167,
-    1168,  1172,  1173,  1174,  1175,  1176,  1179,  1180,  1181,  1182,
-    1183,  1184,  1185,  1192,  1193,  1194,  1195,  1198,  1199,  1204,
-    1205,  1206,  1209,  1210,  1217,  1218,  1224,  1225,  1233,  1241,
-    1242,  1247,  1248,  1249,  1254,  1267,  1267,  1267,  1267,  1270,
-    1274,  1278,  1285,  1290,  1298,  1324,  1351,  1356,  1368,  1378,
-    1382,  1392,  1399,  1406,  1413,  1418,  1423,  1430,  1431,  1438,
-    1445,  1453,  1459,  1471,  1499,  1515,  1544,  1572,  1597,  1616,
-    1642,  1662,  1674,  1681,  1747,  1757,  1767,  1773,  1783,  1789,
-    1799,  1804,  1809,  1817,  1829,  1851,  1859,  1865,  1876,  1881,
-    1886,  1892,  1898,  1907,  1911,  1919,  1919,  1930,  1935,  1943,
-    1944,  1948,  1948,  1952,  1952,  1955,  1958,  1982,  1993,  1993,
-    2003,  2003,  2011,  2011,  2021,  2024,  2030,  2043,  2047,  2052,
-    2054,  2059,  2064,  2073,  2083,  2094,  2098,  2107,  2116,  2121,
-    2240,  2240,  2242,  2251,  2251,  2253,  2258,  2270,  2274,  2279,
-    2283,  2287,  2291,  2295,  2299,  2303,  2307,  2311,  2336,  2340,
-    2354,  2358,  2362,  2366,  2372,  2372,  2378,  2387,  2391,  2400,
-    2409,  2418,  2422,  2427,  2431,  2435,  2440,  2450,  2469,  2478,
-    2554,  2558,  2565,  2576,  2589,  2599,  2610,  2620,  2629,  2638,
-    2641,  2642,  2649,  2653,  2658,  2679,  2696,  2710,  2724,  2736,
-    2744,  2751,  2757,  2763,  2769,  2784,  2856,  2861,  2865,  2872,
-    2879,  2887,  2894,  2902,  2910,  2924,  2941
+       0,  1093,  1093,  1093,  1093,  1093,  1093,  1093,  1093,  1093,
+    1093,  1094,  1094,  1094,  1094,  1094,  1094,  1095,  1095,  1095,
+    1095,  1095,  1095,  1096,  1096,  1096,  1096,  1096,  1096,  1099,
+    1099,  1100,  1100,  1101,  1101,  1102,  1102,  1103,  1103,  1107,
+    1107,  1108,  1108,  1109,  1109,  1110,  1110,  1111,  1111,  1112,
+    1112,  1113,  1113,  1114,  1115,  1120,  1121,  1121,  1123,  1123,
+    1124,  1124,  1128,  1132,  1137,  1137,  1139,  1143,  1149,  1150,
+    1151,  1152,  1153,  1157,  1158,  1159,  1163,  1164,  1168,  1169,
+    1170,  1174,  1175,  1176,  1177,  1178,  1181,  1182,  1183,  1184,
+    1185,  1186,  1187,  1194,  1195,  1196,  1197,  1200,  1201,  1206,
+    1207,  1208,  1211,  1212,  1219,  1220,  1226,  1227,  1235,  1243,
+    1244,  1249,  1250,  1251,  1256,  1269,  1269,  1269,  1269,  1272,
+    1276,  1280,  1287,  1292,  1300,  1326,  1353,  1358,  1370,  1380,
+    1384,  1394,  1401,  1408,  1415,  1420,  1425,  1432,  1433,  1440,
+    1447,  1455,  1461,  1473,  1501,  1517,  1546,  1574,  1599,  1618,
+    1644,  1664,  1676,  1683,  1749,  1759,  1769,  1775,  1785,  1791,
+    1801,  1806,  1811,  1819,  1831,  1853,  1861,  1867,  1878,  1883,
+    1888,  1894,  1900,  1909,  1913,  1921,  1921,  1924,  1924,  1935,
+    1940,  1948,  1949,  1953,  1953,  1957,  1957,  1960,  1963,  1987,
+    1998,  1998,  2008,  2008,  2016,  2016,  2026,  2029,  2035,  2048,
+    2052,  2057,  2059,  2064,  2069,  2078,  2088,  2099,  2103,  2112,
+    2121,  2126,  2245,  2245,  2247,  2256,  2256,  2258,  2263,  2275,
+    2279,  2284,  2288,  2292,  2296,  2300,  2304,  2308,  2312,  2316,
+    2341,  2345,  2359,  2363,  2367,  2371,  2377,  2377,  2383,  2392,
+    2396,  2405,  2414,  2423,  2427,  2432,  2436,  2440,  2445,  2455,
+    2474,  2483,  2559,  2563,  2570,  2581,  2594,  2604,  2615,  2625,
+    2634,  2643,  2646,  2647,  2654,  2658,  2663,  2684,  2701,  2715,
+    2729,  2741,  2749,  2756,  2762,  2768,  2774,  2789,  2861,  2866,
+    2870,  2877,  2884,  2892,  2899,  2907,  2915,  2929,  2946
 };
 #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", "ESAPINTVAL",
@@ -1727,17 +1807,17 @@
   "FLOAT", "DOUBLE", "LABEL", "TYPE", "LOCALVAR", "GLOBALVAR", "LABELSTR",
   "STRINGCONSTANT", "ATSTRINGCONSTANT", "ZEROINITIALIZER", "TRUETOK",
   "FALSETOK", "BEGINTOK", "ENDTOK", "DECLARE", "DEFINE", "GLOBAL",
-  "CONSTANT", "SECTION", "VOLATILE", "TO", "DOTDOTDOT", "NULL_TOK",
-  "UNDEF", "INTERNAL", "LINKONCE", "WEAK", "APPENDING", "DLLIMPORT",
-  "DLLEXPORT", "EXTERN_WEAK", "OPAQUE", "EXTERNAL", "TARGET", "TRIPLE",
-  "ALIGN", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", "SIDEEFFECT",
-  "CC_TOK", "CCC_TOK", "FASTCC_TOK", "COLDCC_TOK", "X86_STDCALLCC_TOK",
-  "X86_FASTCALLCC_TOK", "DATALAYOUT", "RET", "BR", "SWITCH", "INVOKE",
-  "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL", "UDIV", "SDIV", "FDIV",
-  "UREM", "SREM", "FREM", "AND", "OR", "XOR", "SHL", "LSHR", "ASHR",
-  "ICMP", "FCMP", "EQ", "NE", "SLT", "SGT", "SLE", "SGE", "ULT", "UGT",
-  "ULE", "UGE", "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE", "ORD", "UNO",
-  "UEQ", "UNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE",
+  "CONSTANT", "SECTION", "VOLATILE", "THREAD_LOCAL", "TO", "DOTDOTDOT",
+  "NULL_TOK", "UNDEF", "INTERNAL", "LINKONCE", "WEAK", "APPENDING",
+  "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "OPAQUE", "EXTERNAL", "TARGET",
+  "TRIPLE", "ALIGN", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE",
+  "SIDEEFFECT", "CC_TOK", "CCC_TOK", "FASTCC_TOK", "COLDCC_TOK",
+  "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT", "RET", "BR",
+  "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL", "UDIV",
+  "SDIV", "FDIV", "UREM", "SREM", "FREM", "AND", "OR", "XOR", "SHL",
+  "LSHR", "ASHR", "ICMP", "FCMP", "EQ", "NE", "SLT", "SGT", "SLE", "SGE",
+  "ULT", "UGT", "ULE", "UGE", "OEQ", "ONE", "OLT", "OGT", "OLE", "OGE",
+  "ORD", "UNO", "UEQ", "UNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE",
   "GETELEMENTPTR", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", "BITCAST",
   "UITOFP", "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT",
   "PHI_TOK", "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT",
@@ -1752,11 +1832,11 @@
   "OptFuncAttrs", "OptAlign", "OptCAlign", "SectionString", "OptSection",
   "GlobalVarAttributes", "GlobalVarAttribute", "PrimType", "Types",
   "ArgType", "ResultTypes", "ArgTypeList", "ArgTypeListI", "TypeListI",
-  "ConstVal", "ConstExpr", "ConstVector", "GlobalType", "Module",
-  "DefinitionList", "Definition", "@1", "@2", "@3", "@4", "@5", "AsmBlock",
-  "TargetDefinition", "LibrariesDefinition", "LibList", "ArgListH",
-  "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader", "END",
-  "Function", "FunctionProto", "OptSideEffect", "ConstValueRef",
+  "ConstVal", "ConstExpr", "ConstVector", "GlobalType", "ThreadLocal",
+  "Module", "DefinitionList", "Definition", "@1", "@2", "@3", "@4", "@5",
+  "AsmBlock", "TargetDefinition", "LibrariesDefinition", "LibList",
+  "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader",
+  "END", "Function", "FunctionProto", "OptSideEffect", "ConstValueRef",
   "SymbolicValueRef", "ValueRef", "ResolvedVal", "BasicBlockList",
   "BasicBlock", "InstructionList", "BBTerminatorInst", "JumpTable", "Inst",
   "PHIList", "ValueRefList", "IndexList", "OptTailCall", "InstVal",
@@ -1767,7 +1847,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,
@@ -1782,47 +1862,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,   386,   387,   388,    61,    44,    42,    92,    40,    41,
-      91,   120,    93,    60,    62,   123,   125,    99
+     385,   386,   387,   388,   389,    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,   148,   149,   149,   149,   149,   149,   149,   149,   149,
-     149,   150,   150,   150,   150,   150,   150,   151,   151,   151,
-     151,   151,   151,   151,   151,   151,   151,   151,   151,   152,
+       0,   149,   150,   150,   150,   150,   150,   150,   150,   150,
+     150,   151,   151,   151,   151,   151,   151,   152,   152,   152,
      152,   152,   152,   152,   152,   152,   152,   152,   152,   153,
-     153,   153,   153,   153,   153,   153,   153,   153,   153,   153,
-     153,   153,   153,   153,   153,   154,   155,   155,   156,   156,
-     157,   157,   158,   158,   159,   159,   160,   160,   161,   161,
-     161,   161,   161,   162,   162,   162,   163,   163,   164,   164,
-     164,   165,   165,   165,   165,   165,   166,   166,   166,   166,
-     166,   166,   166,   167,   167,   167,   167,   168,   168,   169,
-     169,   169,   170,   170,   171,   171,   172,   172,   173,   174,
-     174,   175,   175,   176,   176,   177,   177,   177,   177,   178,
-     178,   178,   178,   178,   178,   178,   178,   178,   178,   178,
-     178,   178,   179,   180,   180,   181,   181,   182,   182,   182,
-     182,   183,   183,   184,   184,   184,   184,   184,   184,   184,
-     184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
-     184,   184,   184,   185,   185,   185,   185,   185,   185,   185,
-     185,   185,   185,   186,   186,   187,   187,   188,   188,   189,
-     189,   191,   190,   192,   190,   190,   190,   190,   193,   190,
-     194,   190,   195,   190,   190,   190,   196,   197,   197,   198,
-     199,   199,   199,   200,   200,   201,   201,   201,   201,   202,
-     203,   203,   204,   205,   205,   206,   207,   208,   208,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     210,   210,   210,   210,   211,   211,   212,   213,   213,   214,
-     215,   215,   215,   216,   216,   216,   216,   216,   216,   216,
-     216,   216,   217,   217,   218,   219,   219,   220,   220,   220,
-     221,   221,   222,   222,   223,   223,   223,   223,   223,   223,
-     223,   223,   223,   223,   223,   223,   223,   224,   224,   225,
-     225,   225,   225,   225,   225,   225,   225
+     153,   153,   153,   153,   153,   153,   153,   153,   153,   154,
+     154,   154,   154,   154,   154,   154,   154,   154,   154,   154,
+     154,   154,   154,   154,   154,   155,   156,   156,   157,   157,
+     158,   158,   159,   159,   160,   160,   161,   161,   162,   162,
+     162,   162,   162,   163,   163,   163,   164,   164,   165,   165,
+     165,   166,   166,   166,   166,   166,   167,   167,   167,   167,
+     167,   167,   167,   168,   168,   168,   168,   169,   169,   170,
+     170,   170,   171,   171,   172,   172,   173,   173,   174,   175,
+     175,   176,   176,   177,   177,   178,   178,   178,   178,   179,
+     179,   179,   179,   179,   179,   179,   179,   179,   179,   179,
+     179,   179,   180,   181,   181,   182,   182,   183,   183,   183,
+     183,   184,   184,   185,   185,   185,   185,   185,   185,   185,
+     185,   185,   185,   185,   185,   185,   185,   185,   185,   185,
+     185,   185,   185,   186,   186,   186,   186,   186,   186,   186,
+     186,   186,   186,   187,   187,   188,   188,   189,   189,   190,
+     190,   191,   191,   193,   192,   194,   192,   192,   192,   192,
+     195,   192,   196,   192,   197,   192,   192,   192,   198,   199,
+     199,   200,   201,   201,   201,   202,   202,   203,   203,   203,
+     203,   204,   205,   205,   206,   207,   207,   208,   209,   210,
+     210,   211,   211,   211,   211,   211,   211,   211,   211,   211,
+     211,   211,   212,   212,   212,   212,   213,   213,   214,   215,
+     215,   216,   217,   217,   217,   218,   218,   218,   218,   218,
+     218,   218,   218,   218,   219,   219,   220,   221,   221,   222,
+     222,   222,   223,   223,   224,   224,   225,   225,   225,   225,
+     225,   225,   225,   225,   225,   225,   225,   225,   225,   226,
+     226,   227,   227,   227,   227,   227,   227,   227,   227
 };
 
 /* 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,
@@ -1842,534 +1922,511 @@
        5,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     6,     5,     8,     6,     6,     7,     7,
        6,     8,     8,     3,     1,     1,     1,     1,     0,     1,
-       2,     0,     3,     0,     3,     3,     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,     6,
-       4,     4,     6,     6,     2,     8,     1,     1,     0,     3,
-       6,     3,     6,     2,     4,     6,     4
+       0,     1,     2,     0,     3,     0,     3,     3,     3,     3,
+       0,     7,     0,     8,     0,     8,     2,     3,     1,     3,
+       3,     3,     3,     1,     0,     5,     3,     1,     3,     1,
+       0,     9,     1,     1,     4,     1,     1,     2,     3,     0,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
+       1,     5,     1,     1,     1,     1,     1,     1,     2,     2,
+       2,     3,     2,     0,     1,     2,     2,     3,     9,     9,
+       8,    14,     1,     1,     6,     5,     2,     6,     7,     3,
+       5,     0,     0,     3,     2,     1,     5,     5,     6,     6,
+       4,     6,     4,     4,     6,     6,     2,     8,     1,     1,
+       0,     3,     6,     3,     6,     2,     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,   181,     0,     0,     0,
-       0,     0,     0,    76,     0,    67,   179,    78,    81,     0,
-       0,   194,     0,     0,    62,     0,    66,    68,    70,    69,
-      71,    73,    72,    74,    75,    77,    76,    76,     0,     1,
-     180,    79,    80,    76,   184,    82,    83,    84,    85,    76,
-     241,   182,   241,     0,     0,   202,   195,   196,   185,   230,
-     231,   187,   115,   116,   117,   118,   119,     0,     0,     0,
-       0,   232,   233,   120,   186,   122,     0,     0,   175,   176,
-       0,    86,    86,   242,   238,    63,   213,   214,   215,   237,
-     197,   198,   201,     0,   140,   123,     0,     0,     0,     0,
-     129,   141,     0,   121,   140,     0,     0,   115,   116,   117,
-       0,     0,     0,   188,     0,    87,    88,    89,    90,    91,
-       0,   216,     0,   278,   240,     0,   199,   139,    97,   135,
-     137,     0,     0,     0,     0,     0,     0,   128,     0,   190,
-     192,   160,   161,   156,   158,   157,   159,   162,   155,   151,
-     152,     2,     3,     4,     5,     6,     7,     8,     9,    10,
-      14,    15,    16,    11,    12,    13,     0,     0,     0,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   154,   153,   111,    92,   134,   133,     0,   210,
-     211,   212,   277,   263,     0,     0,     0,     0,    86,   250,
-     251,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   239,    86,   254,     0,
-     276,   200,   132,     0,   102,     0,     0,   131,     0,   142,
-     102,   111,   111,    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,   144,   174,     0,     0,
-       0,   148,     0,   145,     0,     0,     0,     0,   189,     0,
-     262,   244,     0,   243,     0,     0,    55,     0,     0,     0,
-       0,   106,   106,   283,     0,     0,   274,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    93,    94,
-      95,    96,    98,   138,   136,   125,   126,   127,   130,   124,
-     191,   193,     0,     0,   260,     0,     0,     0,     0,     0,
-     143,   129,   141,     0,   146,   147,     0,     0,     0,     0,
-       0,   113,   111,   208,   219,   220,   221,   226,   222,   223,
-     224,   225,   217,     0,   228,   235,   234,   236,     0,   245,
-       0,     0,     0,     0,     0,   279,     0,   281,   260,     0,
+      67,    58,    64,    59,    65,   185,   183,     0,     0,     0,
+       0,     0,     0,    76,     0,    67,   181,    78,    81,     0,
+       0,   196,     0,     0,    62,     0,    66,    68,    70,    69,
+      71,    73,    72,    74,    75,    77,    76,    76,   178,     1,
+     182,    79,    80,    76,   186,    82,    83,    84,    85,    76,
+     243,   184,   243,     0,     0,   204,   197,   198,   187,   232,
+     233,   189,   115,   116,   117,   118,   119,     0,     0,     0,
+       0,   234,   235,   120,   188,   122,   178,   178,   177,     0,
+      86,    86,   244,   240,    63,   215,   216,   217,   239,   199,
+     200,   203,     0,   140,   123,     0,     0,     0,     0,   129,
+     141,     0,   121,   140,     0,     0,   175,   176,     0,     0,
+      87,    88,    89,    90,    91,     0,   218,     0,   280,   242,
+       0,   201,   139,    97,   135,   137,     0,     0,     0,     0,
+       0,     0,   128,     0,     0,     0,   115,   116,   117,     0,
+       0,     0,   190,    92,   134,   133,     0,   212,   213,   214,
+     279,   265,     0,     0,     0,     0,    86,   252,   253,     2,
+       3,     4,     5,     6,     7,     8,     9,    10,    14,    15,
+      16,    11,    12,    13,     0,     0,     0,     0,     0,     0,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   241,    86,   256,     0,   278,   202,   132,     0,   102,
+       0,     0,   131,     0,   142,   102,   192,   194,   160,   161,
+     156,   158,   157,   159,   162,   155,   151,   152,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   154,   153,   111,     0,   264,   246,     0,   245,
+       0,     0,    55,     0,     0,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,     0,    53,    54,    49,    50,
+      51,    52,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,     0,   106,   106,   285,     0,     0,   276,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      93,    94,    95,    96,    98,   138,   136,   125,   126,   127,
+     130,   124,   111,   111,     0,     0,     0,     0,     0,     0,
+       0,   144,   174,     0,     0,     0,   148,     0,   145,     0,
+       0,     0,     0,   191,   210,   221,   222,   223,   228,   224,
+     225,   226,   227,   219,     0,   230,   237,   236,   238,     0,
+     247,     0,     0,     0,     0,     0,   281,     0,   283,   262,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    99,   100,   101,   103,     0,     0,     0,     0,
-       0,     0,     0,   173,   150,     0,     0,     0,     0,   108,
-     114,   112,   207,    97,   205,     0,   218,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   286,     0,     0,
-       0,   270,   271,     0,     0,     0,     0,   268,     0,   284,
-       0,     0,     0,     0,   164,     0,     0,     0,     0,   149,
-       0,     0,     0,    61,     0,   102,     0,   227,     0,     0,
-     259,     0,     0,   106,   107,   106,     0,     0,     0,     0,
-       0,   264,   265,   259,     0,     0,     0,   261,     0,   170,
-       0,     0,   166,   167,   163,    60,   204,   206,    97,   109,
-       0,     0,     0,     0,     0,   266,   267,     0,   280,   282,
-       0,     0,   269,   272,   273,     0,   285,   168,   169,     0,
-       0,     0,    61,   110,   104,   229,     0,     0,    97,     0,
-     102,   255,     0,   102,   165,   171,   172,   203,     0,   209,
-       0,   248,     0,     0,   257,     0,     0,   256,   275,   105,
-     246,     0,   247,     0,    97,     0,     0,     0,   258,     0,
-       0,     0,     0,   253,     0,     0,   252,     0,   249
+       0,     0,     0,    99,   100,   101,   103,   193,   195,     0,
+       0,   262,     0,     0,     0,     0,     0,   143,   129,   141,
+       0,   146,   147,     0,     0,     0,     0,     0,   113,   111,
+     209,    97,   207,     0,   220,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   288,     0,     0,     0,   272,
+     273,     0,     0,     0,     0,   270,     0,   286,     0,     0,
+       0,     0,     0,     0,     0,     0,   173,   150,     0,     0,
+       0,     0,   108,   114,   112,    61,     0,   102,     0,   229,
+       0,     0,   261,     0,     0,   106,   107,   106,     0,     0,
+       0,     0,     0,     0,   266,   267,   261,     0,     0,     0,
+     164,     0,     0,     0,     0,   149,     0,     0,     0,    60,
+     206,   208,    97,   109,     0,     0,     0,     0,     0,   268,
+     269,     0,   282,   284,   263,     0,     0,   271,   274,   275,
+       0,   287,     0,     0,     0,   170,     0,     0,   166,   167,
+     163,    61,   110,   104,   231,     0,     0,    97,     0,   102,
+     257,     0,   102,   168,   169,     0,     0,     0,   205,     0,
+     211,     0,   250,     0,     0,   259,     0,     0,   258,   277,
+     165,   171,   172,   105,   248,     0,   249,     0,    97,     0,
+       0,     0,   260,     0,     0,     0,     0,   255,     0,     0,
+     254,     0,   251
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
-static const short int yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
 {
-      -1,   189,   190,   191,   253,   270,   110,   111,    71,   486,
-      11,    72,    13,    36,    37,    38,    43,    49,   120,   322,
-     232,   395,   325,   529,   375,   351,   514,   288,   352,    73,
-     112,   129,   198,   130,   131,   102,   277,   364,   278,    80,
-      14,    15,    16,    18,    17,   194,   241,   242,    58,    21,
-      56,    93,   414,   415,   121,   201,    50,    88,    51,    44,
-     417,   365,    75,   367,   293,    52,    84,    85,   226,   533,
-     124,   306,   494,   398,   227,   228,   229,   230
+      -1,   239,   240,   241,   265,   282,   139,   140,    71,   480,
+      11,    72,    13,    36,    37,    38,    43,    49,   115,   304,
+     207,   376,   307,   530,   356,   398,   513,   333,   399,    73,
+     141,   124,   146,   125,   126,   101,   322,   345,   323,   108,
+      79,    14,    15,    16,    18,    17,   244,   312,   313,    58,
+      21,    56,    92,   402,   403,   116,   149,    50,    87,    51,
+      44,   405,   346,    75,   348,   249,    52,    83,    84,   201,
+     534,   119,   288,   488,   415,   202,   203,   204,   205
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -428
-static const short int yypact[] =
+#define YYPACT_NINF -476
+static const yytype_int16 yypact[] =
 {
-     262,  -428,  -428,  -428,  -428,  -428,  -428,   -26,   -85,    60,
-       5,    50,     9,   282,   135,   406,  -428,   203,   191,    32,
-      74,  -428,    73,   134,  -428,  1106,  -428,  -428,  -428,  -428,
-    -428,  -428,  -428,  -428,  -428,  -428,    87,    87,   150,  -428,
-    -428,  -428,  -428,    87,  -428,  -428,  -428,  -428,  -428,    87,
-     208,  -428,     1,   228,   234,   248,  -428,  -428,  -428,  -428,
-    -428,   130,  -428,  -428,  -428,  -428,  -428,   276,   280,     4,
-     111,  -428,  -428,  -428,   -57,  -428,   150,   150,  -428,  -428,
-    1143,   311,   311,  -428,  -428,   118,  -428,  -428,  -428,  -428,
-    -428,  -428,  -428,    -6,    40,  -428,   144,   146,   908,   130,
-    -428,   -57,   -68,  -428,    40,  1143,  1157,    39,   281,   285,
-     232,   286,   738,  -428,   292,  -428,  -428,  -428,  -428,  -428,
-    1191,  -428,    -7,  1314,  -428,   278,  -428,  -428,   -57,  -428,
-     166,   163,  1157,  1157,   159,   -36,  1157,  -428,   165,  -428,
-     -57,  -428,  -428,  -428,  -428,  -428,  -428,  -428,  -428,  -428,
-    -428,  -428,  -428,  -428,  -428,  -428,  -428,  -428,  -428,  -428,
-    -428,  -428,  -428,  -428,  -428,  -428,   255,   594,   167,  -428,
-    -428,  -428,  -428,  -428,  -428,  -428,  -428,  -428,  -428,  -428,
-    -428,   170,   171,   173,   175,   497,  1207,   945,   296,   187,
-     196,   197,  -428,  -428,   192,  -428,   130,   -57,   213,  -428,
-    -428,  -428,  -428,  -428,   287,  1228,   247,   338,   311,  -428,
-    -428,   255,   594,  1157,  1157,  1157,  1157,  1157,  1157,  1157,
-    1157,  1157,  1157,  1157,  1157,  1157,  -428,   311,  -428,   152,
-    -428,  -428,   -43,  1003,  -428,   -41,  -103,  -428,   206,   -57,
-    -428,   192,   192,  -428,  -428,  -428,  -428,  -428,  -428,  -428,
-    -428,  -428,  -428,   214,  -428,  -428,  -428,  -428,  -428,  -428,
-    -428,  -428,  -428,  -428,  -428,  -428,  -428,  -428,  -428,  -428,
-     216,  1143,  1143,  1143,  1143,  1143,  -428,  -428,    17,   987,
-     -18,  -428,   -33,  -428,  1143,  1143,  1143,     8,  -428,   217,
-    -428,   130,   592,  -428,   717,   717,  -428,   717,  1191,  1157,
-    1157,   106,   114,  -428,   592,    31,   236,   239,   240,   241,
-     242,   243,   592,   592,   347,  1191,  1157,  1157,  -428,  -428,
-    -428,  -428,  -428,  -428,  -428,   -40,  -428,  -428,  -428,   -40,
-    -428,  -428,  1143,  1143,  -428,   245,   246,   252,   256,  1143,
-    -428,   238,   738,   -31,  -428,  -428,   257,   259,   351,   371,
-     393,  -428,   192,  1050,  -428,  -428,  -428,  -428,  -428,  -428,
-    -428,  -428,   346,  1143,  -428,  -428,  -428,  -428,   265,  -428,
-     267,   717,   592,   592,    16,  -428,    19,  -428,  -428,   717,
-     263,  1157,  1157,  1157,  1157,  1157,   269,   272,  1157,   717,
-     592,   273,  -428,  -428,  -428,  -428,   275,   283,   -32,  1143,
-    1143,  1143,  1143,  -428,  -428,   290,  1143,  1143,  1157,  -428,
-    -428,  -428,  -428,   -57,   289,   288,  -428,   398,    13,   415,
-     417,   297,   302,   303,   717,   435,   717,   305,   306,   717,
-     307,   -57,  -428,   308,   312,   717,   717,   -57,   310,  -428,
-    1157,  1143,  1143,  1157,  -428,   315,   313,   320,   321,  -428,
-     322,   324,    22,    21,  1088,  -428,   325,  -428,   717,   717,
-    1157,   717,   717,   329,  -428,   329,   717,   330,  1157,  1157,
-    1157,  -428,  -428,  1157,   592,   327,   328,  -428,  1143,  -428,
-    1143,  1143,  -428,  -428,  -428,  -428,  -428,  -428,   -57,    34,
-     440,   333,   331,   592,    72,  -428,  -428,   422,  -428,  -428,
-     336,   717,  -428,  -428,  -428,    75,  -428,  -428,  -428,   340,
-     343,   344,    21,  -428,   423,  -428,   461,    -1,  -428,  1157,
-    -428,  -428,   345,  -428,  -428,  -428,  -428,  -428,   481,  -428,
-     717,  -428,   866,     2,   -43,   592,    44,  -428,   -40,  -428,
-    -428,   353,  -428,   866,  -428,   472,   475,   357,   -43,   717,
-     717,   479,   429,  -428,   717,   482,  -428,   717,  -428
+      28,  -476,  -476,  -476,  -476,  -476,  -476,   -10,   -55,     8,
+     -33,    97,     3,    55,   167,   394,  -476,   172,   210,    86,
+      98,  -476,   102,   219,  -476,  1017,  -476,  -476,  -476,  -476,
+    -476,  -476,  -476,  -476,  -476,  -476,   123,   123,   218,  -476,
+    -476,  -476,  -476,   123,  -476,  -476,  -476,  -476,  -476,   123,
+     241,  -476,     2,   242,   251,   253,  -476,  -476,  -476,  -476,
+    -476,   137,  -476,  -476,  -476,  -476,  -476,   274,   283,     1,
+     456,  -476,  -476,  -476,    83,  -476,   218,   218,  -476,   103,
+     291,   291,  -476,  -476,   121,  -476,  -476,  -476,  -476,  -476,
+    -476,  -476,   -26,   874,  -476,   148,   149,   470,   137,  -476,
+      83,   -97,  -476,   874,   103,   103,  -476,  -476,  1031,   288,
+    -476,  -476,  -476,  -476,  -476,  1073,  -476,    -7,  1172,  -476,
+     282,  -476,  -476,    83,  -476,   157,   162,  1087,  1087,   158,
+     -61,  1087,  -476,   165,  1031,  1087,    60,   297,   298,   201,
+     299,   656,  -476,  -476,   137,    83,   217,  -476,  -476,  -476,
+    -476,  -476,   262,  1129,   257,   302,   291,  -476,  -476,  -476,
+    -476,  -476,  -476,  -476,  -476,  -476,  -476,  -476,  -476,  -476,
+    -476,  -476,  -476,  -476,   461,   273,  1087,  1087,  1087,  1087,
+    -476,  -476,  -476,  -476,  -476,  -476,  -476,  -476,  -476,  -476,
+    -476,  -476,  1087,  1087,  1087,  1087,  1087,  1087,  1087,  1087,
+    1087,  -476,   291,  -476,    74,  -476,  -476,   -25,   914,  -476,
+      19,    41,  -476,   175,    83,  -476,  -476,    83,  -476,  -476,
+    -476,  -476,  -476,  -476,  -476,  -476,  -476,  -476,   461,   273,
+     178,   182,   183,   184,   186,   933,  1171,   552,   309,   190,
+     191,   194,  -476,  -476,   199,   197,  -476,   137,   509,  -476,
+     635,   635,  -476,   635,  1073,  -476,  -476,  -476,  -476,  -476,
+    -476,  -476,  -476,  -476,  -476,  1087,  -476,  -476,  -476,  -476,
+    -476,  -476,  -476,  -476,  -476,  -476,  -476,  -476,  -476,  -476,
+    -476,  -476,  1087,   -17,    92,  -476,   509,    75,   207,   208,
+     220,   221,   222,   223,   509,   509,   304,  1073,  1087,  1087,
+    -476,  -476,  -476,  -476,  -476,  -476,  -476,   154,  -476,  -476,
+    -476,   154,   199,   199,   214,   215,  1031,  1031,  1031,  1031,
+    1031,  -476,  -476,   -22,   828,   -75,  -476,   -58,  -476,  1031,
+    1031,  1031,     5,  -476,   972,  -476,  -476,  -476,  -476,  -476,
+    -476,  -476,  -476,   301,  1031,  -476,  -476,  -476,  -476,   224,
+    -476,   226,   635,   509,   509,    14,  -476,    23,  -476,  -476,
+     635,   237,  1087,  1087,  1087,  1087,  1087,   243,   244,  1087,
+     635,   509,   246,  -476,  -476,  -476,  -476,  -476,  -476,  1031,
+    1031,  -476,   247,   248,   254,   255,  1031,  -476,   250,   656,
+     -46,  -476,  -476,   256,   261,   360,   383,   399,  -476,   199,
+    -476,    83,   269,   266,  -476,   388,   -60,   398,   401,   277,
+     272,   289,   635,   420,   635,   293,   294,   635,   295,    83,
+    -476,   296,   300,   635,   635,    83,   305,  -476,  1087,   310,
+     314,   -98,  1031,  1031,  1031,  1031,  -476,  -476,   290,  1031,
+    1031,  1087,  -476,  -476,  -476,    33,   988,  -476,   315,  -476,
+     635,   635,  1087,   635,   635,   316,  -476,   316,  1087,   635,
+     317,  1087,  1087,  1087,  -476,  -476,  1087,   509,  1031,  1031,
+    -476,   318,   287,   320,   321,  -476,   319,   322,   116,  -476,
+    -476,  -476,    83,    79,   414,   324,   330,   509,    21,  -476,
+    -476,   393,  -476,  -476,  -476,   331,   635,  -476,  -476,  -476,
+      59,  -476,   325,   339,  1031,  -476,  1031,  1031,  -476,  -476,
+    -476,    33,  -476,   410,  -476,   447,    -2,  -476,  1087,  -476,
+    -476,   342,  -476,  -476,  -476,   348,   351,   352,  -476,   489,
+    -476,   635,  -476,   785,    -1,   -25,   509,   133,  -476,   154,
+    -476,  -476,  -476,  -476,  -476,   359,  -476,   785,  -476,   482,
+     483,   362,   -25,   635,   635,   485,   439,  -476,   635,   492,
+    -476,   635,  -476
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const short int yypgoto[] =
+static const yytype_int16 yypgoto[] =
 {
-    -428,   374,   375,   376,   291,   294,  -205,  -428,     0,   -12,
-     416,    14,  -428,  -428,  -428,    57,  -428,  -428,  -150,  -313,
-    -404,  -428,  -237,  -428,  -295,    26,  -428,  -210,  -428,  -428,
-     -24,   270,  -223,  -428,   414,   421,   -69,  -108,  -181,   189,
-    -428,  -428,   505,  -428,  -428,  -428,  -428,  -428,  -428,  -428,
-    -428,  -428,  -428,  -428,   439,  -428,  -428,  -428,  -428,  -428,
-    -428,  -427,   -73,   101,  -197,  -428,   470,  -428,  -428,  -428,
-    -428,  -428,    51,   145,  -428,  -428,  -428,  -428
+    -476,   389,   392,   397,   292,   306,  -153,  -476,     0,    10,
+     435,     4,  -476,  -476,  -476,    87,  -476,  -476,  -145,  -295,
+    -383,  -476,  -208,  -476,  -276,    39,  -476,  -291,  -476,  -476,
+     -24,   326,  -241,  -476,   421,   426,    69,  -138,  -196,    89,
+     204,  -476,  -476,   512,  -476,  -476,  -476,  -476,  -476,  -476,
+    -476,  -476,  -476,  -476,  -476,   452,  -476,  -476,  -476,  -476,
+    -476,  -476,  -475,  -135,  -227,  -164,  -476,   484,  -476,  -476,
+    -476,  -476,  -476,    73,   159,  -476,  -476,  -476,  -476
 };
 
 /* 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 -179
-static const short int yytable[] =
+#define YYTABLE_NINF -181
+static const yytype_int16 yytable[] =
 {
-      10,    74,   297,   329,   192,   280,   282,   377,    97,   453,
-     296,   113,   394,   296,    12,    10,   394,   199,   303,    83,
-      19,   307,   308,   309,   310,   311,    86,   424,   314,    12,
-     426,   330,   331,   103,    20,   104,   139,     1,   349,   193,
-       3,   327,   -55,   -55,   -55,   -55,   101,    59,    60,    22,
-      99,    62,    63,    64,    65,   350,     1,     2,   298,     3,
-       4,   141,   142,   425,   349,    25,   425,   136,   318,   319,
-     128,   318,   319,   127,   101,   371,   545,   315,   137,   103,
-     128,   104,   140,    66,   512,    10,   320,   321,   392,   320,
-     321,   393,   389,    76,    77,   103,   197,   104,   343,   136,
-      81,   326,   339,   443,   339,   541,    82,   444,   235,   236,
-     238,    23,   239,   345,   534,   405,   547,   339,    59,    60,
-     391,    99,    62,    63,    64,    65,   344,     1,     2,   125,
-       3,     4,   318,   319,     1,    39,   126,     3,   200,    24,
-     548,   531,   411,    26,   542,   318,   319,    87,   339,    98,
-     320,   321,   339,    57,    66,   318,   319,   457,   103,   340,
-     104,   484,   392,   320,   321,   393,    53,   103,   498,   104,
-     499,   379,   392,   320,   321,   393,   394,    67,    78,    79,
-      68,   292,   418,    69,   430,    70,   432,   433,   434,   301,
-     302,   292,   304,   305,   292,   292,   292,   292,   292,   312,
-     313,   292,   334,   335,   336,   337,   338,   519,    54,   128,
-     519,   520,   289,    55,   523,   346,   347,   348,   489,   366,
-      35,   366,   366,   394,   366,   394,    83,    45,    46,    47,
-       2,   366,    48,     4,   192,   143,   144,   145,   146,   366,
-     366,   374,   103,    41,   104,    42,   477,    90,    67,   376,
-     103,    68,   104,    91,    69,   342,    70,   100,   294,   316,
-     317,   295,  -178,   396,   397,   105,   106,    92,    94,   193,
-     403,   502,   503,   504,   197,   372,   373,   -63,     1,     2,
-      95,     3,     4,   536,    96,   132,   538,   133,     5,     6,
-     -56,   197,   390,   292,   -57,   147,   195,   231,   366,   366,
-     366,   233,   234,   237,   240,   271,   366,     7,   272,   273,
-       8,   274,   532,   275,     9,   283,   366,   366,    27,    28,
-      29,    30,    31,    32,    33,   284,    34,   287,   543,   413,
-     445,   446,   447,   448,   285,   286,   290,   450,   451,   243,
-     244,   245,   246,   247,   248,   249,   250,   251,   252,   296,
-     328,   366,   332,   366,   333,   353,   366,   292,   431,   292,
-     292,   292,   366,   366,   437,   114,   115,   116,   117,   118,
-     119,   380,   475,   476,   381,   382,   383,   384,   385,   388,
-     399,   400,   404,   408,   452,   366,   366,   401,   366,   366,
-     409,   402,   406,   366,   407,   368,   369,   410,   370,   416,
-     419,   366,   420,   429,   435,   378,  -177,   436,   440,   509,
-     441,   510,   511,   386,   387,    35,   474,   456,   442,   292,
-     366,   -63,     1,     2,   454,     3,     4,   455,   366,   458,
-     488,   459,     5,     6,   449,   460,   493,   461,   462,   464,
-     443,   466,   468,   469,   292,   292,   292,   470,   473,   493,
-     478,     7,   479,   485,     8,   480,   481,   366,     9,   515,
-     490,   482,   366,   483,   497,   501,   507,   508,   516,   425,
-     528,   517,   421,   422,   423,   530,   366,   366,   521,   524,
-     428,   366,   525,   526,   366,   539,   549,   537,   546,   550,
-     438,   439,   551,   554,   555,   535,   557,   223,   224,   225,
-     527,   123,   299,   324,    59,    60,   300,    99,   107,   108,
-     109,    65,   485,     1,     2,   513,     3,     4,   138,   135,
-      40,   122,    89,   427,   505,   463,     0,   465,     0,     0,
-     467,     0,     0,     0,     0,     0,   471,   472,     0,     0,
-      66,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   491,
-     492,     0,   495,   496,     0,     0,     0,   500,     0,     0,
-       0,     0,     0,     0,     0,   506,     0,     0,     0,     0,
+      10,    74,   253,   242,    12,    96,   243,   311,   358,   252,
+     252,   254,   375,   352,   285,    10,   375,   147,   445,    12,
+      82,   377,   378,   349,   350,   412,   351,    85,  -180,   289,
+     290,   291,   292,   293,   414,   396,   296,    19,   458,   131,
+     325,   327,   470,   -63,     1,     2,   100,     3,     4,     1,
+     132,    20,     3,   397,     5,     6,   370,   297,   545,   359,
+      23,   386,   413,   -55,   -55,   -55,   -55,   367,   368,   123,
+     391,   413,   551,   100,     7,   131,   386,     8,   386,   123,
+      22,     9,   218,   219,    10,   449,   213,   300,   301,   392,
+     386,   145,    27,    28,    29,    30,    31,    32,    33,   511,
+      34,   438,    24,   210,   211,   302,   303,   214,   444,   396,
+     120,   217,    25,   347,   386,   347,   347,   121,   347,   355,
+     102,   387,   103,    76,    77,   409,   410,   411,   390,   248,
+      80,   106,   107,   416,   535,   372,    81,     1,    26,   148,
+       3,   532,   546,   426,   427,   300,   301,    97,   406,    86,
+     245,   347,   283,   284,   248,   286,   102,   518,   103,   347,
+     347,   519,   308,   302,   303,   552,   549,    39,   287,   248,
+     248,   248,   248,   248,   294,   295,   248,   142,   102,   492,
+     103,   493,   298,   299,   123,   455,   309,   457,   375,    35,
+     460,   300,   301,   134,   135,   518,   464,   465,   418,   522,
+     420,   421,   422,   216,   220,   221,   222,   223,   373,   302,
+     303,   374,   102,    41,   103,    42,   360,   347,   347,   347,
+     102,    53,   103,   485,   486,   347,   489,   490,   357,   102,
+     145,   103,   495,    54,     2,   347,   347,     4,    57,   483,
+     501,   353,   375,    55,   375,   300,   301,    45,    46,    47,
+      78,   242,    48,   102,   243,   103,   510,    35,   354,    82,
+     517,    89,   373,   302,   303,   374,   300,   301,   250,   521,
+      90,   251,    91,   145,   371,   248,    93,   347,    94,   347,
+     104,   105,   347,   373,   302,   303,   374,    95,   347,   347,
+     127,   128,   143,   208,   494,   266,   267,   497,   498,   499,
+     389,   206,   209,   212,   544,   215,   -56,   -57,   224,   548,
+     401,   537,   246,   252,   539,   347,   347,   316,   347,   347,
+     310,   317,   318,   319,   347,   320,   556,   557,   328,   329,
+     330,   560,   347,   331,   562,   332,   334,   369,   248,   419,
+     248,   248,   248,   361,   362,   425,   109,   110,   111,   112,
+     113,   114,   347,   379,   380,   404,   363,   364,   365,   366,
+     407,   347,   408,   533,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,   417,   423,
+     424,   547,   428,   432,   433,   381,   382,   383,   384,   385,
+     434,   435,   439,   441,  -179,   437,   347,   440,   393,   394,
+     395,   347,   442,   443,   467,   446,   447,   448,   453,   -63,
+       1,     2,   450,     3,     4,   451,   452,   478,   347,   347,
+       5,     6,   482,   347,   456,   454,   347,   505,   487,   458,
+     459,   461,   462,   514,   248,   475,   463,   248,   248,   248,
+       7,   413,   487,     8,   466,   479,   468,     9,   429,   430,
+     469,   484,   491,   496,   504,   436,   506,   507,   529,   508,
+     515,   531,   509,    59,    60,   523,    98,    62,    63,    64,
+      65,   516,     1,     2,   520,     3,     4,    59,    60,   524,
+      98,    62,    63,    64,    65,   538,     1,     2,   540,     3,
+       4,   541,   542,   543,   536,   550,   553,   554,   555,   558,
+      66,   471,   472,   473,   474,   559,   561,   198,   476,   477,
+     199,   479,   335,   336,    66,   200,    59,    60,   337,   118,
+     314,   528,   512,   130,   133,     1,     2,    40,     3,     4,
+     338,   339,   340,   117,   306,   315,    88,   502,   503,   500,
+     431,     0,     0,     0,   341,   342,   255,   256,   257,   258,
+     259,   260,   261,   262,   263,   264,     0,     0,     0,    59,
+      60,   343,    98,   136,   137,   138,    65,     0,     1,     2,
+       0,     3,     4,   525,     0,   526,   527,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
+     172,   173,   228,   229,    67,     0,    66,    68,     0,     0,
+      69,     0,    70,    99,     0,     0,     0,     0,    67,     0,
+       0,    68,     0,     0,    69,     0,    70,   129,     0,   230,
+     180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
+     190,   191,     0,   231,     0,   232,   233,   234,   335,   336,
+       0,     0,    59,    60,   337,     0,   102,     0,   103,     0,
+       0,     1,     2,   344,     3,     4,   338,   339,   340,     0,
+       0,     0,     0,    59,    60,     0,     0,     0,     0,     0,
+     341,   342,     1,     2,     0,     3,     4,   225,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   343,     0,     0,
+      67,   226,   227,    68,     0,     0,    69,     0,    70,   326,
+       0,     0,     0,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   228,   229,
+       0,     0,     0,     0,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   228,
+     229,     0,     0,     0,     0,   230,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,     0,   231,
+       0,   232,   233,   234,     0,     0,   230,   180,   181,   182,
+     183,   184,   185,   186,   187,   188,   189,   190,   191,   344,
+     231,     0,   232,   233,   234,     0,     0,     0,   335,   336,
+       0,     0,     0,   102,   337,   103,     0,   235,     0,     0,
+     236,     0,   237,     0,   238,     0,   338,   339,   340,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   518,   354,   355,     0,     0,    59,
-      60,   356,   522,     0,     0,     0,     0,     0,     1,     2,
-       0,     3,     4,   357,   358,   359,   254,   255,     0,     0,
-       0,     0,     0,     0,     0,     0,   360,   361,     0,     0,
-       0,   540,     0,     0,    67,     0,   544,    68,     0,   276,
-      69,     0,    70,   362,     0,     0,     0,     0,     0,     0,
-     552,   553,     0,     0,     0,   556,     0,     0,   558,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,   164,   165,   166,   167,     0,     0,     0,     0,
-       0,     0,     0,     0,   256,   257,   258,   259,   260,   261,
-     262,   263,   264,   265,   266,   267,   268,   269,     0,     0,
-       0,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,     0,   181,     0,   182,   183,   184,
-     354,   355,     0,     0,    59,    60,   356,     0,   103,     0,
-     104,     0,     0,     1,     2,   363,     3,     4,   357,   358,
-     359,     0,     0,     0,     0,    59,    60,     0,     0,     0,
-       0,   360,   361,     0,     1,     2,     0,     3,     4,   148,
-       0,     0,     0,     0,     0,     0,     0,     0,   362,     0,
-       0,     0,   149,   150,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   164,   165,   166,
-     167,     0,     0,     0,     0,   151,   152,   153,   154,   155,
-     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
-     166,   167,     0,     0,     0,     0,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,     0,
-     181,     0,   182,   183,   184,     0,     0,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     363,   181,     0,   182,   183,   184,     0,     0,     0,   354,
-     355,     0,     0,     0,   103,   356,   104,     0,   185,     0,
-       0,   186,     0,   187,     0,   188,     0,   357,   358,   359,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     360,   361,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    59,    60,   362,    99,    62,
-      63,    64,    65,     0,     1,     2,     0,     3,     4,     0,
-       0,     0,     0,   151,   152,   153,   154,   155,   156,   157,
-     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
-       0,    66,    59,    60,     0,    99,   107,   108,   109,    65,
-       0,     1,     2,     0,     3,     4,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,    66,   181,
-       0,   182,   183,   184,    59,    60,     0,    99,   107,   108,
-     109,    65,     0,     1,     2,     0,     3,     4,     0,   363,
-      59,    60,     0,    99,    62,    63,    64,    65,     0,     1,
-       2,     0,     3,     4,     0,     0,     0,     0,     0,     0,
-      66,     0,     0,     0,     0,     0,   323,     0,     0,     0,
-       0,     0,     0,     0,     0,    67,    66,     0,    68,     0,
-       0,    69,     0,    70,   134,     0,     0,    59,    60,     0,
-      99,    62,    63,    64,    65,     0,     1,     2,     0,     3,
-       4,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    67,   412,     0,    68,     0,     0,    69,     0,
-      70,   281,     0,    66,     0,    59,    60,     0,    99,    62,
-      63,    64,    65,     0,     1,     2,     0,     3,     4,     0,
-       0,     0,     0,    59,    60,     0,    61,    62,    63,    64,
-      65,   487,     1,     2,    67,     3,     4,    68,     0,     0,
-      69,    66,    70,   341,     0,     0,     0,     0,     0,     0,
-      67,     0,     0,    68,     0,     0,    69,     0,    70,    66,
-      59,    60,     0,    99,   107,   108,   109,    65,     0,     1,
-       2,     0,     3,     4,    59,    60,     0,    99,    62,    63,
+     341,   342,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    59,    60,   343,    98,   136,
+     137,   138,    65,     0,     1,     2,     0,     3,     4,     0,
+       0,     0,     0,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   228,   229,
+       0,     0,    66,     0,     0,     0,     0,     0,     0,     0,
+       0,    59,    60,     0,    98,    62,    63,    64,    65,     0,
+       1,     2,     0,     3,     4,   230,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   122,   231,
+       0,   232,   233,   234,     0,     0,     0,     0,    66,     0,
+       0,    59,    60,     0,    98,    62,    63,    64,    65,   344,
+       1,     2,     0,     3,     4,     0,     0,     0,     0,     0,
+      59,    60,     0,    98,   136,   137,   138,    65,   305,     1,
+       2,     0,     3,     4,     0,     0,     0,     0,    66,     0,
+       0,     0,     0,     0,     0,     0,    67,     0,     0,    68,
+       0,     0,    69,     0,    70,   388,     0,    66,     0,    59,
+      60,     0,    98,    62,    63,    64,    65,     0,     1,     2,
+       0,     3,     4,     0,     0,    59,    60,     0,    98,    62,
+      63,    64,    65,     0,     1,     2,   400,     3,     4,     0,
+       0,     0,    67,     0,     0,    68,    66,     0,    69,     0,
+      70,     0,   481,     0,    59,    60,     0,    61,    62,    63,
+      64,    65,    66,     1,     2,     0,     3,     4,    59,    60,
+       0,    98,   136,   137,   138,    65,     0,     1,     2,     0,
+       3,     4,    67,     0,     0,    68,     0,     0,    69,     0,
+      70,    66,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    67,     0,     0,    68,    66,   321,    69,     0,    70,
+      59,    60,     0,   144,    62,    63,    64,    65,     0,     1,
+       2,     0,     3,     4,    59,    60,     0,    98,    62,    63,
       64,    65,     0,     1,     2,     0,     3,     4,     0,     0,
-       0,     0,     0,     0,     0,     0,    66,    67,     0,     0,
-      68,     0,     0,    69,     0,    70,     0,     0,    59,    60,
-      66,   196,    62,    63,    64,    65,     0,     1,     2,     0,
-       3,     4,     0,     0,    59,    60,     0,    99,   107,   108,
-     109,    65,     0,     1,     2,    67,     3,     4,    68,     0,
-       0,    69,     0,    70,    66,    59,    60,     0,   291,    62,
-      63,    64,    65,    67,     1,     2,    68,     3,     4,    69,
-      66,    70,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    66,     0,     0,     0,     0,     0,     0,     0,     0,
-      67,     0,     0,    68,     0,     0,    69,     0,    70,     0,
-       0,     0,     0,     0,    67,     0,     0,    68,     0,     0,
-      69,     0,    70,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    67,     0,
-       0,    68,     0,     0,    69,     0,    70,     0,     0,     0,
-       0,     0,     0,     0,    67,   202,     0,    68,     0,     0,
-      69,     0,   279,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   203,   204,    67,     0,     0,    68,     0,
-       0,    69,     0,    70,     0,   205,   206,   207,   208,   209,
-     210,   151,   152,   153,   154,   155,   156,   157,   158,   159,
-     160,   161,   162,   163,   164,   165,   211,   212,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   213,   214,
-     215,     0,     0,   216,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   217,   218,   219,   220,
-     221,   222
+      67,     0,     0,    68,     0,     0,    69,    66,    70,     0,
+       0,     0,     0,     0,     0,     0,    67,     0,     0,    68,
+       0,    66,    69,     0,    70,     0,    59,    60,     0,   247,
+      62,    63,    64,    65,     0,     1,     2,     0,     3,     4,
+       0,     0,     0,     0,     0,    67,     0,     0,    68,     0,
+       0,    69,     0,    70,     0,     0,     0,     0,     0,    67,
+       0,     0,    68,    66,     0,    69,     0,    70,    59,    60,
+       0,    98,   136,   137,   138,    65,     0,     1,     2,     0,
+       3,     4,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   150,     0,     0,     0,     0,     0,     0,
+       0,    67,     0,     0,    68,    66,     0,    69,     0,    70,
+       0,     0,   151,   152,     0,    67,     0,     0,    68,     0,
+       0,    69,     0,    70,   153,   154,   155,   156,   157,   158,
+     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
+     169,   170,   171,   172,   173,   174,   175,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    67,     0,     0,
+      68,     0,     0,    69,     0,    70,     0,   176,   177,   178,
+       0,     0,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
+     197,     0,     0,     0,     0,     0,     0,     0,     0,    67,
+       0,     0,    68,     0,     0,    69,     0,   324
 };
 
-static const short int yycheck[] =
+static const yytype_int16 yycheck[] =
 {
-       0,    25,   207,   240,   112,   186,   187,   302,     4,   413,
-      11,    80,   325,    11,     0,    15,   329,    24,   215,    18,
-      46,   218,   219,   220,   221,   222,    25,    11,   225,    15,
-      11,   241,   242,   136,    60,   138,   105,    16,    30,   112,
-      19,   144,     3,     4,     5,     6,    70,     7,     8,   134,
-      10,    11,    12,    13,    14,    47,    16,    17,   208,    19,
-      20,    22,    23,    47,    30,    15,    47,   135,   111,   112,
-      94,   111,   112,    33,    98,   298,    32,   227,   146,   136,
-     104,   138,   106,    43,   488,    85,   129,   130,   128,   129,
-     130,   131,   315,    36,    37,   136,   120,   138,   279,   135,
-      43,   142,   135,   135,   135,   532,    49,   139,   132,   133,
-     146,    51,   136,   146,   518,   146,   543,   135,     7,     8,
-     317,    10,    11,    12,    13,    14,   144,    16,    17,   135,
-      19,    20,   111,   112,    16,     0,   142,    19,   145,   134,
-     544,   142,   352,   134,   142,   111,   112,   146,   135,   145,
-     129,   130,   135,    19,    43,   111,   112,   144,   136,   142,
-     138,   139,   128,   129,   130,   131,   134,   136,   463,   138,
-     465,   140,   128,   129,   130,   131,   489,   137,    28,    29,
-     140,   205,   363,   143,   381,   145,   383,   384,   385,   213,
-     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
-     224,   225,   271,   272,   273,   274,   275,   135,   134,   233,
-     135,   139,   198,   140,   139,   284,   285,   286,   455,   292,
-     133,   294,   295,   536,   297,   538,    18,    36,    37,    38,
-      17,   304,    41,    20,   342,     3,     4,     5,     6,   312,
-     313,   135,   136,    40,   138,    42,   443,    19,   137,   135,
-     136,   140,   138,    19,   143,   279,   145,   146,    11,   107,
-     108,    14,     0,   332,   333,    76,    77,    19,   138,   342,
-     339,   468,   469,   470,   298,   299,   300,    15,    16,    17,
-       4,    19,    20,   520,     4,   141,   523,   141,    26,    27,
-       9,   315,   316,   317,     9,     9,     4,    19,   371,   372,
-     373,   135,   139,   144,   139,   138,   379,    45,   138,   138,
-      48,   138,   517,   138,    52,    19,   389,   390,    36,    37,
-      38,    39,    40,    41,    42,   138,    44,   135,   533,   353,
-     399,   400,   401,   402,   138,   138,    49,   406,   407,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    11,
-     144,   424,   138,   426,   138,   138,   429,   381,   382,   383,
-     384,   385,   435,   436,   388,    54,    55,    56,    57,    58,
-      59,   135,   441,   442,   135,   135,   135,   135,   135,    32,
-     135,   135,   144,    32,   408,   458,   459,   135,   461,   462,
-      19,   135,   135,   466,   135,   294,   295,     4,   297,    53,
-     135,   474,   135,   140,   135,   304,     0,   135,   135,   478,
-     135,   480,   481,   312,   313,   133,   440,    19,   135,   443,
-     493,    15,    16,    17,   135,    19,    20,   139,   501,    14,
-     454,    14,    26,    27,   144,   138,   460,   135,   135,     4,
-     135,   135,   135,   135,   468,   469,   470,   135,   138,   473,
-     135,    45,   139,   453,    48,   135,   135,   530,    52,    19,
-     135,   139,   535,   139,   135,   135,   139,   139,   135,    47,
-      47,   140,   371,   372,   373,    14,   549,   550,   142,   139,
-     379,   554,   139,   139,   557,     4,    14,   142,   135,    14,
-     389,   390,   135,    14,    65,   519,    14,   123,   123,   123,
-     512,    85,   211,   233,     7,     8,   212,    10,    11,    12,
-      13,    14,   512,    16,    17,   489,    19,    20,   104,    98,
-      15,    82,    52,   378,   473,   424,    -1,   426,    -1,    -1,
-     429,    -1,    -1,    -1,    -1,    -1,   435,   436,    -1,    -1,
-      43,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   458,
-     459,    -1,   461,   462,    -1,    -1,    -1,   466,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   474,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   493,     3,     4,    -1,    -1,     7,
-       8,     9,   501,    -1,    -1,    -1,    -1,    -1,    16,    17,
-      -1,    19,    20,    21,    22,    23,    22,    23,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    34,    35,    -1,    -1,
-      -1,   530,    -1,    -1,   137,    -1,   535,   140,    -1,   142,
-     143,    -1,   145,    51,    -1,    -1,    -1,    -1,    -1,    -1,
-     549,   550,    -1,    -1,    -1,   554,    -1,    -1,   557,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   121,    -1,   123,    -1,   125,   126,   127,
-       3,     4,    -1,    -1,     7,     8,     9,    -1,   136,    -1,
-     138,    -1,    -1,    16,    17,   143,    19,    20,    21,    22,
-      23,    -1,    -1,    -1,    -1,     7,     8,    -1,    -1,    -1,
-      -1,    34,    35,    -1,    16,    17,    -1,    19,    20,    21,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    51,    -1,
-      -1,    -1,    34,    35,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    -1,    -1,    -1,    -1,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    -1,    -1,    -1,    -1,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,    -1,
-     123,    -1,   125,   126,   127,    -1,    -1,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
-     143,   123,    -1,   125,   126,   127,    -1,    -1,    -1,     3,
-       4,    -1,    -1,    -1,   136,     9,   138,    -1,   140,    -1,
-      -1,   143,    -1,   145,    -1,   147,    -1,    21,    22,    23,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      34,    35,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     7,     8,    51,    10,    11,
-      12,    13,    14,    -1,    16,    17,    -1,    19,    20,    -1,
-      -1,    -1,    -1,    67,    68,    69,    70,    71,    72,    73,
+       0,    25,   155,   141,     0,     4,   141,   215,   284,    11,
+      11,   156,   307,   254,   178,    15,   311,    24,   401,    15,
+      18,   312,   313,   250,   251,    11,   253,    25,     0,   193,
+     194,   195,   196,   197,    11,    30,   200,    47,   136,   136,
+     236,   237,   140,    15,    16,    17,    70,    19,    20,    16,
+     147,    61,    19,    48,    26,    27,   297,   202,   533,   286,
+      52,   136,    48,     3,     4,     5,     6,   294,   295,    93,
+     145,    48,   547,    97,    46,   136,   136,    49,   136,   103,
+     135,    53,    22,    23,    84,   145,   147,   112,   113,   147,
+     136,   115,    37,    38,    39,    40,    41,    42,    43,   482,
+      45,   147,   135,   127,   128,   130,   131,   131,   399,    30,
+     136,   135,    15,   248,   136,   250,   251,   143,   253,   136,
+     137,   143,   139,    36,    37,   352,   353,   354,   324,   153,
+      43,    28,    29,   360,   517,   299,    49,    16,   135,   146,
+      19,   143,   143,   370,   371,   112,   113,   146,   344,   147,
+     146,   286,   176,   177,   178,   179,   137,   136,   139,   294,
+     295,   140,   143,   130,   131,   548,    33,     0,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   108,   137,   455,
+     139,   457,   108,   109,   208,   412,   145,   414,   483,   134,
+     417,   112,   113,   104,   105,   136,   423,   424,   362,   140,
+     364,   365,   366,   134,     3,     4,     5,     6,   129,   130,
+     131,   132,   137,    41,   139,    43,   141,   352,   353,   354,
+     137,   135,   139,   450,   451,   360,   453,   454,   136,   137,
+     254,   139,   459,   135,    17,   370,   371,    20,    19,   447,
+     467,   265,   537,   141,   539,   112,   113,    37,    38,    39,
+      32,   389,    42,   137,   389,   139,   140,   134,   282,    18,
+     487,    19,   129,   130,   131,   132,   112,   113,    11,   496,
+      19,    14,    19,   297,   298,   299,   139,   412,     4,   414,
+      76,    77,   417,   129,   130,   131,   132,     4,   423,   424,
+     142,   142,     4,   136,   458,    22,    23,   461,   462,   463,
+     324,    19,   140,   145,   531,   140,     9,     9,     9,   536,
+     334,   519,    50,    11,   522,   450,   451,   139,   453,   454,
+     145,   139,   139,   139,   459,   139,   553,   554,    19,   139,
+     139,   558,   467,   139,   561,   136,   139,    33,   362,   363,
+     364,   365,   366,   136,   136,   369,    55,    56,    57,    58,
+      59,    60,   487,   139,   139,    54,   136,   136,   136,   136,
+     136,   496,   136,   516,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   141,   136,
+     136,   534,   136,   136,   136,   316,   317,   318,   319,   320,
+     136,   136,   136,    33,     0,   145,   531,   136,   329,   330,
+     331,   536,    19,     4,   428,   136,   140,    19,   136,    15,
+      16,    17,    14,    19,    20,    14,   139,   441,   553,   554,
+      26,    27,   446,   558,     4,   136,   561,   140,   452,   136,
+     136,   136,   136,    19,   458,   145,   136,   461,   462,   463,
+      46,    48,   466,    49,   139,   445,   136,    53,   379,   380,
+     136,   136,   136,   136,   136,   386,   136,   136,    48,   140,
+     136,    14,   140,     7,     8,   140,    10,    11,    12,    13,
+      14,   141,    16,    17,   143,    19,    20,     7,     8,   140,
+      10,    11,    12,    13,    14,   143,    16,    17,   140,    19,
+      20,   140,   140,     4,   518,   136,    14,    14,   136,    14,
+      44,   432,   433,   434,   435,    66,    14,   118,   439,   440,
+     118,   511,     3,     4,    44,   118,     7,     8,     9,    84,
+     228,   511,   483,    97,   103,    16,    17,    15,    19,    20,
+      21,    22,    23,    81,   208,   229,    52,   468,   469,   466,
+     381,    -1,    -1,    -1,    35,    36,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    -1,    -1,    -1,     7,
+       8,    52,    10,    11,    12,    13,    14,    -1,    16,    17,
+      -1,    19,    20,   504,    -1,   506,   507,    68,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,   138,    -1,    44,   141,    -1,    -1,
+     144,    -1,   146,   147,    -1,    -1,    -1,    -1,   138,    -1,
+      -1,   141,    -1,    -1,   144,    -1,   146,   147,    -1,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+     121,   122,    -1,   124,    -1,   126,   127,   128,     3,     4,
+      -1,    -1,     7,     8,     9,    -1,   137,    -1,   139,    -1,
+      -1,    16,    17,   144,    19,    20,    21,    22,    23,    -1,
+      -1,    -1,    -1,     7,     8,    -1,    -1,    -1,    -1,    -1,
+      35,    36,    16,    17,    -1,    19,    20,    21,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,
+     138,    35,    36,   141,    -1,    -1,   144,    -1,   146,   147,
+      -1,    -1,    -1,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      -1,    -1,    -1,    -1,    68,    69,    70,    71,    72,    73,
       74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      -1,    43,     7,     8,    -1,    10,    11,    12,    13,    14,
-      -1,    16,    17,    -1,    19,    20,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,    43,   123,
-      -1,   125,   126,   127,     7,     8,    -1,    10,    11,    12,
-      13,    14,    -1,    16,    17,    -1,    19,    20,    -1,   143,
-       7,     8,    -1,    10,    11,    12,    13,    14,    -1,    16,
-      17,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,    -1,
-      43,    -1,    -1,    -1,    -1,    -1,    33,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   137,    43,    -1,   140,    -1,
-      -1,   143,    -1,   145,   146,    -1,    -1,     7,     8,    -1,
-      10,    11,    12,    13,    14,    -1,    16,    17,    -1,    19,
-      20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   137,    33,    -1,   140,    -1,    -1,   143,    -1,
-     145,   146,    -1,    43,    -1,     7,     8,    -1,    10,    11,
+      84,    -1,    -1,    -1,    -1,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,    -1,   124,
+      -1,   126,   127,   128,    -1,    -1,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   144,
+     124,    -1,   126,   127,   128,    -1,    -1,    -1,     3,     4,
+      -1,    -1,    -1,   137,     9,   139,    -1,   141,    -1,    -1,
+     144,    -1,   146,    -1,   148,    -1,    21,    22,    23,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      35,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     7,     8,    52,    10,    11,
       12,    13,    14,    -1,    16,    17,    -1,    19,    20,    -1,
-      -1,    -1,    -1,     7,     8,    -1,    10,    11,    12,    13,
-      14,    33,    16,    17,   137,    19,    20,   140,    -1,    -1,
-     143,    43,   145,   146,    -1,    -1,    -1,    -1,    -1,    -1,
-     137,    -1,    -1,   140,    -1,    -1,   143,    -1,   145,    43,
+      -1,    -1,    -1,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      -1,    -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,     7,     8,    -1,    10,    11,    12,    13,    14,    -1,
+      16,    17,    -1,    19,    20,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,    34,   124,
+      -1,   126,   127,   128,    -1,    -1,    -1,    -1,    44,    -1,
+      -1,     7,     8,    -1,    10,    11,    12,    13,    14,   144,
+      16,    17,    -1,    19,    20,    -1,    -1,    -1,    -1,    -1,
+       7,     8,    -1,    10,    11,    12,    13,    14,    34,    16,
+      17,    -1,    19,    20,    -1,    -1,    -1,    -1,    44,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   138,    -1,    -1,   141,
+      -1,    -1,   144,    -1,   146,   147,    -1,    44,    -1,     7,
+       8,    -1,    10,    11,    12,    13,    14,    -1,    16,    17,
+      -1,    19,    20,    -1,    -1,     7,     8,    -1,    10,    11,
+      12,    13,    14,    -1,    16,    17,    34,    19,    20,    -1,
+      -1,    -1,   138,    -1,    -1,   141,    44,    -1,   144,    -1,
+     146,    -1,    34,    -1,     7,     8,    -1,    10,    11,    12,
+      13,    14,    44,    16,    17,    -1,    19,    20,     7,     8,
+      -1,    10,    11,    12,    13,    14,    -1,    16,    17,    -1,
+      19,    20,   138,    -1,    -1,   141,    -1,    -1,   144,    -1,
+     146,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   138,    -1,    -1,   141,    44,   143,   144,    -1,   146,
        7,     8,    -1,    10,    11,    12,    13,    14,    -1,    16,
       17,    -1,    19,    20,     7,     8,    -1,    10,    11,    12,
       13,    14,    -1,    16,    17,    -1,    19,    20,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    43,   137,    -1,    -1,
-     140,    -1,    -1,   143,    -1,   145,    -1,    -1,     7,     8,
-      43,    10,    11,    12,    13,    14,    -1,    16,    17,    -1,
-      19,    20,    -1,    -1,     7,     8,    -1,    10,    11,    12,
-      13,    14,    -1,    16,    17,   137,    19,    20,   140,    -1,
-      -1,   143,    -1,   145,    43,     7,     8,    -1,    10,    11,
-      12,    13,    14,   137,    16,    17,   140,    19,    20,   143,
-      43,   145,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    43,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     137,    -1,    -1,   140,    -1,    -1,   143,    -1,   145,    -1,
-      -1,    -1,    -1,    -1,   137,    -1,    -1,   140,    -1,    -1,
-     143,    -1,   145,    -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,   137,    -1,
-      -1,   140,    -1,    -1,   143,    -1,   145,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   137,    31,    -1,   140,    -1,    -1,
-     143,    -1,   145,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    49,    50,   137,    -1,    -1,   140,    -1,
-      -1,   143,    -1,   145,    -1,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   104,   105,
-     106,    -1,    -1,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   127
+     138,    -1,    -1,   141,    -1,    -1,   144,    44,   146,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   138,    -1,    -1,   141,
+      -1,    44,   144,    -1,   146,    -1,     7,     8,    -1,    10,
+      11,    12,    13,    14,    -1,    16,    17,    -1,    19,    20,
+      -1,    -1,    -1,    -1,    -1,   138,    -1,    -1,   141,    -1,
+      -1,   144,    -1,   146,    -1,    -1,    -1,    -1,    -1,   138,
+      -1,    -1,   141,    44,    -1,   144,    -1,   146,     7,     8,
+      -1,    10,    11,    12,    13,    14,    -1,    16,    17,    -1,
+      19,    20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    31,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   138,    -1,    -1,   141,    44,    -1,   144,    -1,   146,
+      -1,    -1,    50,    51,    -1,   138,    -1,    -1,   141,    -1,
+      -1,   144,    -1,   146,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   138,    -1,    -1,
+     141,    -1,    -1,   144,    -1,   146,    -1,   105,   106,   107,
+      -1,    -1,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   138,
+      -1,    -1,   141,    -1,    -1,   144,    -1,   146
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
+static const yytype_uint8 yystos[] =
 {
-       0,    16,    17,    19,    20,    26,    27,    45,    48,    52,
-     156,   158,   159,   160,   188,   189,   190,   192,   191,    46,
-      60,   197,   134,    51,   134,    15,   134,    36,    37,    38,
-      39,    40,    41,    42,    44,   133,   161,   162,   163,     0,
-     190,    40,    42,   164,   207,    36,    37,    38,    41,   165,
-     204,   206,   213,   134,   134,   140,   198,    19,   196,     7,
-       8,    10,    11,    12,    13,    14,    43,   137,   140,   143,
-     145,   156,   159,   177,   178,   210,   163,   163,    28,    29,
-     187,   163,   163,    18,   214,   215,    25,   146,   205,   214,
-      19,    19,    19,   199,   138,     4,     4,     4,   145,    10,
-     146,   178,   183,   136,   138,   187,   187,    11,    12,    13,
-     154,   155,   178,   184,    54,    55,    56,    57,    58,    59,
-     166,   202,   202,   158,   218,   135,   142,    33,   178,   179,
-     181,   182,   141,   141,   146,   183,   135,   146,   182,   184,
-     178,    22,    23,     3,     4,     5,     6,     9,    21,    34,
-      35,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,   109,   110,
+       0,    16,    17,    19,    20,    26,    27,    46,    49,    53,
+     157,   159,   160,   161,   190,   191,   192,   194,   193,    47,
+      61,   199,   135,    52,   135,    15,   135,    37,    38,    39,
+      40,    41,    42,    43,    45,   134,   162,   163,   164,     0,
+     192,    41,    43,   165,   209,    37,    38,    39,    42,   166,
+     206,   208,   215,   135,   135,   141,   200,    19,   198,     7,
+       8,    10,    11,    12,    13,    14,    44,   138,   141,   144,
+     146,   157,   160,   178,   179,   212,   164,   164,    32,   189,
+     164,   164,    18,   216,   217,    25,   147,   207,   216,    19,
+      19,    19,   201,   139,     4,     4,     4,   146,    10,   147,
+     179,   184,   137,   139,   189,   189,    28,    29,   188,    55,
+      56,    57,    58,    59,    60,   167,   204,   204,   159,   220,
+     136,   143,    34,   179,   180,   182,   183,   142,   142,   147,
+     184,   136,   147,   183,   188,   188,    11,    12,    13,   155,
+     156,   179,   185,     4,    10,   179,   181,    24,   146,   205,
+      31,    50,    51,    62,    63,    64,    65,    66,    67,    68,
+      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,   105,   106,   107,   110,
      111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   123,   125,   126,   127,   140,   143,   145,   147,   149,
-     150,   151,   185,   210,   193,     4,    10,   178,   180,    24,
-     145,   203,    31,    49,    50,    61,    62,    63,    64,    65,
-      66,    82,    83,   104,   105,   106,   109,   122,   123,   124,
-     125,   126,   127,   149,   150,   151,   216,   222,   223,   224,
-     225,    19,   168,   135,   139,   178,   178,   144,   146,   178,
-     139,   194,   195,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,   152,    22,    23,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     153,   138,   138,   138,   138,   138,   142,   184,   186,   145,
-     186,   146,   186,    19,   138,   138,   138,   135,   175,   159,
-      49,    10,   178,   212,    11,    14,    11,   154,   166,   152,
-     153,   178,   178,   212,   178,   178,   219,   212,   212,   212,
-     212,   212,   178,   178,   212,   166,   107,   108,   111,   112,
-     129,   130,   167,    33,   179,   170,   142,   144,   144,   170,
-     175,   175,   138,   138,   184,   184,   184,   184,   184,   135,
-     142,   146,   178,   186,   144,   146,   184,   184,   184,    30,
-      47,   173,   176,   138,     3,     4,     9,    21,    22,    23,
-      34,    35,    51,   143,   185,   209,   210,   211,   211,   211,
-     211,   180,   178,   178,   135,   172,   135,   172,   211,   140,
-     135,   135,   135,   135,   135,   135,   211,   211,    32,   180,
-     178,   212,   128,   131,   167,   169,   184,   184,   221,   135,
-     135,   135,   135,   184,   144,   146,   135,   135,    32,    19,
-       4,   175,    33,   178,   200,   201,    53,   208,   186,   135,
-     135,   211,   211,   211,    11,    47,    11,   221,   211,   140,
-     212,   178,   212,   212,   212,   135,   135,   178,   211,   211,
-     135,   135,   135,   135,   139,   184,   184,   184,   184,   144,
-     184,   184,   178,   168,   135,   139,    19,   144,    14,    14,
-     138,   135,   135,   211,     4,   211,   135,   211,   135,   135,
-     135,   211,   211,   138,   178,   184,   184,   212,   135,   139,
-     135,   135,   139,   139,   139,   156,   157,    33,   178,   170,
-     135,   211,   211,   178,   220,   211,   211,   135,   172,   172,
-     211,   135,   212,   212,   212,   220,   211,   139,   139,   184,
-     184,   184,   168,   173,   174,    19,   135,   140,   211,   135,
-     139,   142,   211,   139,   139,   139,   139,   157,    47,   171,
-      14,   142,   154,   217,   168,   178,   170,   142,   170,     4,
-     211,   209,   142,   154,   211,    32,   135,   209,   168,    14,
-      14,   135,   211,   211,    14,    65,   211,    14,   211
+     121,   122,   123,   124,   125,   126,   127,   128,   150,   151,
+     152,   218,   224,   225,   226,   227,    19,   169,   136,   140,
+     179,   179,   145,   147,   179,   140,   185,   179,    22,    23,
+       3,     4,     5,     6,     9,    21,    35,    36,    83,    84,
+     110,   124,   126,   127,   128,   141,   144,   146,   148,   150,
+     151,   152,   186,   212,   195,   160,    50,    10,   179,   214,
+      11,    14,    11,   155,   167,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,   153,    22,    23,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,   104,   154,   179,   179,   214,   179,   179,   221,   214,
+     214,   214,   214,   214,   179,   179,   214,   167,   108,   109,
+     112,   113,   130,   131,   168,    34,   180,   171,   143,   145,
+     145,   171,   196,   197,   153,   154,   139,   139,   139,   139,
+     139,   143,   185,   187,   146,   187,   147,   187,    19,   139,
+     139,   139,   136,   176,   139,     3,     4,     9,    21,    22,
+      23,    35,    36,    52,   144,   186,   211,   212,   213,   213,
+     213,   213,   181,   179,   179,   136,   173,   136,   173,   213,
+     141,   136,   136,   136,   136,   136,   136,   213,   213,    33,
+     181,   179,   214,   129,   132,   168,   170,   176,   176,   139,
+     139,   185,   185,   185,   185,   185,   136,   143,   147,   179,
+     187,   145,   147,   185,   185,   185,    30,    48,   174,   177,
+      34,   179,   202,   203,    54,   210,   187,   136,   136,   213,
+     213,   213,    11,    48,    11,   223,   213,   141,   214,   179,
+     214,   214,   214,   136,   136,   179,   213,   213,   136,   185,
+     185,   223,   136,   136,   136,   136,   185,   145,   147,   136,
+     136,    33,    19,     4,   176,   169,   136,   140,    19,   145,
+      14,    14,   139,   136,   136,   213,     4,   213,   136,   136,
+     213,   136,   136,   136,   213,   213,   139,   179,   136,   136,
+     140,   185,   185,   185,   185,   145,   185,   185,   179,   157,
+     158,    34,   179,   171,   136,   213,   213,   179,   222,   213,
+     213,   136,   173,   173,   214,   213,   136,   214,   214,   214,
+     222,   213,   185,   185,   136,   140,   136,   136,   140,   140,
+     140,   169,   174,   175,    19,   136,   141,   213,   136,   140,
+     143,   213,   140,   140,   140,   185,   185,   185,   158,    48,
+     172,    14,   143,   155,   219,   169,   179,   171,   143,   171,
+     140,   140,   140,     4,   213,   211,   143,   155,   213,    33,
+     136,   211,   169,    14,    14,   136,   213,   213,    14,    66,
+     213,    14,   213
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2397,7 +2454,7 @@
       yychar = (Token);						\
       yylval = (Value);						\
       yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
+      YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
@@ -2405,7 +2462,7 @@
       yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
-while (0)
+while (YYID (0))
 
 
 #define YYTERROR	1
@@ -2420,7 +2477,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;	\
@@ -2434,7 +2491,7 @@
 	  (Current).first_column = (Current).last_column =		\
 	    YYRHSLOC (Rhs, 0).last_column;				\
 	}								\
-    while (0)
+    while (YYID (0))
 #endif
 
 
@@ -2446,8 +2503,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
@@ -2474,36 +2531,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");
 }
@@ -2512,37 +2629,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.  */
@@ -2576,42 +2701,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;
@@ -2637,7 +2764,7 @@
 {
   if (*yystr == '"')
     {
-      size_t yyn = 0;
+      YYSIZE_T yyn = 0;
       char const *yyp = yystr;
 
       for (;;)
@@ -2672,53 +2799,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
@@ -2729,8 +2926,7 @@
     YYSTYPE *yyvaluep;
 #endif
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  YYUSE (yyvaluep);
 
   if (!yymsg)
     yymsg = "Deleting";
@@ -2740,7 +2936,7 @@
     {
 
       default:
-        break;
+	break;
     }
 }
 
@@ -2748,13 +2944,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 ();
@@ -2779,14 +2975,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
@@ -2804,6 +3004,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,
@@ -2814,9 +3020,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];
@@ -2825,7 +3031,7 @@
 
 
 
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
@@ -2834,9 +3040,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"));
 
@@ -2860,8 +3066,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:
@@ -2874,11 +3079,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
@@ -2906,7 +3111,7 @@
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
@@ -2941,12 +3146,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;
@@ -2988,22 +3191,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;
 
 
@@ -3039,150 +3241,150 @@
   switch (yyn)
     {
         case 29:
-#line 1097 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1099 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 30:
-#line 1097 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1099 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 31:
-#line 1098 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1100 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 32:
-#line 1098 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1100 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 33:
-#line 1099 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1101 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 34:
-#line 1099 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1101 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 35:
-#line 1100 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1102 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 36:
-#line 1100 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1102 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 37:
-#line 1101 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1103 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 38:
-#line 1101 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1103 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 39:
-#line 1105 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1107 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 40:
-#line 1105 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1107 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 41:
-#line 1106 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1108 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 42:
-#line 1106 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1108 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 43:
-#line 1107 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1109 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 44:
-#line 1107 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1109 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 45:
-#line 1108 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1110 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 46:
-#line 1108 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1110 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 47:
-#line 1109 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1111 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 48:
-#line 1109 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1111 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 49:
-#line 1110 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1112 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 50:
-#line 1110 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1112 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 51:
-#line 1111 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1113 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 52:
-#line 1111 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1113 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 53:
-#line 1112 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1114 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 54:
-#line 1113 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1115 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 61:
-#line 1122 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1124 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 62:
-#line 1126 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1128 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.StrVal) = (yyvsp[-1].StrVal);
+    (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 63:
-#line 1130 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1132 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3190,15 +3392,15 @@
     break;
 
   case 66:
-#line 1137 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1139 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.StrVal) = (yyvsp[-1].StrVal);
+    (yyval.StrVal) = (yyvsp[(1) - (2)].StrVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 67:
-#line 1141 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1143 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3206,198 +3408,198 @@
     break;
 
   case 68:
-#line 1147 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1149 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 69:
-#line 1148 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 70:
-#line 1149 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 71:
-#line 1150 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1152 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 72:
-#line 1151 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1153 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 73:
-#line 1155 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1157 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 74:
-#line 1156 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1158 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 75:
-#line 1157 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1159 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 76:
-#line 1161 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1163 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;}
     break;
 
   case 77:
-#line 1162 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1164 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::HiddenVisibility;  ;}
     break;
 
   case 78:
-#line 1166 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1168 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 79:
-#line 1167 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1169 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 80:
-#line 1168 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1170 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 81:
-#line 1172 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1174 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 82:
-#line 1173 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1175 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 83:
-#line 1174 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1176 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 84:
-#line 1175 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1177 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 85:
-#line 1176 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1178 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 86:
-#line 1179 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1181 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 87:
-#line 1180 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1182 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 88:
-#line 1181 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1183 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 89:
-#line 1182 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1184 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 90:
-#line 1183 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1185 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 91:
-#line 1184 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1186 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 92:
-#line 1185 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1187 "/home/laurov/llvm/llvm/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 1192 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1194 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::ZExt;      ;}
     break;
 
   case 94:
-#line 1193 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1195 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::SExt;      ;}
     break;
 
   case 95:
-#line 1194 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1196 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::InReg;     ;}
     break;
 
   case 96:
-#line 1195 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1197 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::StructRet; ;}
     break;
 
   case 97:
-#line 1198 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1200 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 98:
-#line 1199 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1201 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-                (yyval.ParamAttrs) = (yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs);
+                (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 99:
-#line 1204 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1206 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoReturn; ;}
     break;
 
   case 100:
-#line 1205 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1207 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::NoUnwind; ;}
     break;
 
   case 102:
-#line 1209 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1211 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = ParamAttr::None; ;}
     break;
 
   case 103:
-#line 1210 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1212 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-                (yyval.ParamAttrs) = (yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs);
+                (yyval.ParamAttrs) = (yyvsp[(1) - (2)].ParamAttrs) | (yyvsp[(2) - (2)].ParamAttrs);
               ;}
     break;
 
   case 104:
-#line 1217 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1219 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 105:
-#line 1218 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1220 "/home/laurov/llvm/llvm/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
@@ -3405,14 +3607,14 @@
     break;
 
   case 106:
-#line 1224 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1226 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 107:
-#line 1225 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1227 "/home/laurov/llvm/llvm/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
@@ -3420,57 +3622,57 @@
     break;
 
   case 108:
-#line 1233 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1235 "/home/laurov/llvm/llvm/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 109:
-#line 1241 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1243 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 110:
-#line 1242 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
+#line 1244 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
   case 111:
-#line 1247 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1249 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 112:
-#line 1248 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1250 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 113:
-#line 1249 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1251 "/home/laurov/llvm/llvm/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 114:
-#line 1254 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1256 "/home/laurov/llvm/llvm/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 119:
-#line 1270 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1272 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -3478,39 +3680,39 @@
     break;
 
   case 120:
-#line 1274 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1276 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
+    (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 121:
-#line 1278 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1280 "/home/laurov/llvm/llvm/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 122:
-#line 1285 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1287 "/home/laurov/llvm/llvm/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 123:
-#line 1290 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1292 "/home/laurov/llvm/llvm/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
@@ -3518,14 +3720,14 @@
     break;
 
   case 124:
-#line 1298 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1300 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     ParamAttrsList Attrs;
-    if ((yyvsp[0].ParamAttrs) != ParamAttr::None)
-      Attrs.addAttributes(0, (yyvsp[0].ParamAttrs));
+    if ((yyvsp[(5) - (5)].ParamAttrs) != ParamAttr::None)
+      Attrs.addAttributes(0, (yyvsp[(5) - (5)].ParamAttrs));
     unsigned index = 1;
-    TypeWithAttrsList::iterator I = (yyvsp[-2].TypeWithAttrsList)->begin(), E = (yyvsp[-2].TypeWithAttrsList)->end();
+    TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end();
     for (; I != E; ++I, ++index) {
       const Type *Ty = I->Ty->get();
       Params.push_back(Ty);
@@ -3539,22 +3741,22 @@
     ParamAttrsList *ActualAttrs = 0;
     if (!Attrs.empty())
       ActualAttrs = new ParamAttrsList(Attrs);
-    FunctionType *FT = FunctionType::get(*(yyvsp[-4].TypeVal), Params, isVarArg, ActualAttrs);
-    delete (yyvsp[-2].TypeWithAttrsList);   // Delete the argument list
-    delete (yyvsp[-4].TypeVal);   // Delete the return type handle
+    FunctionType *FT = FunctionType::get(*(yyvsp[(1) - (5)].TypeVal), Params, isVarArg, ActualAttrs);
+    delete (yyvsp[(3) - (5)].TypeWithAttrsList);   // Delete the argument list
+    delete (yyvsp[(1) - (5)].TypeVal);   // Delete the return type handle
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); 
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 125:
-#line 1324 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1326 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     ParamAttrsList Attrs;
-    if ((yyvsp[0].ParamAttrs) != ParamAttr::None)
-      Attrs.addAttributes(0, (yyvsp[0].ParamAttrs));
-    TypeWithAttrsList::iterator I = (yyvsp[-2].TypeWithAttrsList)->begin(), E = (yyvsp[-2].TypeWithAttrsList)->end();
+    if ((yyvsp[(5) - (5)].ParamAttrs) != ParamAttr::None)
+      Attrs.addAttributes(0, (yyvsp[(5) - (5)].ParamAttrs));
+    TypeWithAttrsList::iterator I = (yyvsp[(3) - (5)].TypeWithAttrsList)->begin(), E = (yyvsp[(3) - (5)].TypeWithAttrsList)->end();
     unsigned index = 1;
     for ( ; I != E; ++I, ++index) {
       const Type* Ty = I->Ty->get();
@@ -3570,54 +3772,54 @@
     if (!Attrs.empty())
       ActualAttrs = new ParamAttrsList(Attrs);
 
-    FunctionType *FT = FunctionType::get((yyvsp[-4].PrimType), Params, isVarArg, ActualAttrs);
-    delete (yyvsp[-2].TypeWithAttrsList);      // Delete the argument list
+    FunctionType *FT = FunctionType::get((yyvsp[(1) - (5)].PrimType), Params, isVarArg, ActualAttrs);
+    delete (yyvsp[(3) - (5)].TypeWithAttrsList);      // Delete the argument list
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(FT)); 
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 126:
-#line 1351 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1353 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
-    (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
-    delete (yyvsp[-1].TypeVal);
+    (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 127:
-#line 1356 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1358 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Vector type?
-     const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get();
-     if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
+     const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal)->get();
+     if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val))
         GEN_ERROR("Unsigned result not equal to signed result");
      if (!ElemTy->isFloatingPoint() && !ElemTy->isInteger())
         GEN_ERROR("Element type of a VectorType must be primitive");
-     if (!isPowerOf2_32((yyvsp[-3].UInt64Val)))
+     if (!isPowerOf2_32((yyvsp[(2) - (5)].UInt64Val)))
        GEN_ERROR("Vector length should be a power of 2");
-     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(VectorType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
-     delete (yyvsp[-1].TypeVal);
+     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(VectorType::get(*(yyvsp[(4) - (5)].TypeVal), (unsigned)(yyvsp[(2) - (5)].UInt64Val))));
+     delete (yyvsp[(4) - (5)].TypeVal);
      CHECK_FOR_ERROR
   ;}
     break;
 
   case 128:
-#line 1368 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1370 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
-    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
-           E = (yyvsp[-1].TypeList)->end(); I != E; ++I)
+    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
+           E = (yyvsp[(2) - (3)].TypeList)->end(); I != E; ++I)
       Elements.push_back(*I);
 
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
-    delete (yyvsp[-1].TypeList);
+    delete (yyvsp[(2) - (3)].TypeList);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 129:
-#line 1378 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1380 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
@@ -3625,21 +3827,21 @@
     break;
 
   case 130:
-#line 1382 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1384 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
-    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-2].TypeList)->begin(),
-           E = (yyvsp[-2].TypeList)->end(); I != E; ++I)
+    for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
+           E = (yyvsp[(3) - (5)].TypeList)->end(); I != E; ++I)
       Elements.push_back(*I);
 
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
-    delete (yyvsp[-2].TypeList);
+    delete (yyvsp[(3) - (5)].TypeList);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 131:
-#line 1392 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1394 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
@@ -3647,52 +3849,52 @@
     break;
 
   case 132:
-#line 1399 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1401 "/home/laurov/llvm/llvm/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 133:
-#line 1406 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1408 "/home/laurov/llvm/llvm/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 134:
-#line 1413 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1415 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
   case 135:
-#line 1418 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1420 "/home/laurov/llvm/llvm/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 136:
-#line 1423 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1425 "/home/laurov/llvm/llvm/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 138:
-#line 1431 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1433 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList);
+    (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
     TWA.Ty = new PATypeHolder(Type::VoidTy);
     (yyval.TypeWithAttrsList)->push_back(TWA);
@@ -3701,7 +3903,7 @@
     break;
 
   case 139:
-#line 1438 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1440 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = ParamAttr::None;
@@ -3712,7 +3914,7 @@
     break;
 
   case 140:
-#line 1445 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1447 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
@@ -3720,155 +3922,155 @@
     break;
 
   case 141:
-#line 1453 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1455 "/home/laurov/llvm/llvm/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 142:
-#line 1459 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1461 "/home/laurov/llvm/llvm/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 143:
-#line 1471 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1473 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*(yyvsp[-3].TypeVal))->getDescription() + "'");
+                     (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'");
     const Type *ETy = ATy->getElementType();
     int NumElements = ATy->getNumElements();
 
     // Verify that we have the correct size...
-    if (NumElements != -1 && NumElements != (int)(yyvsp[-1].ConstVector)->size())
+    if (NumElements != -1 && NumElements != (int)(yyvsp[(3) - (4)].ConstVector)->size())
       GEN_ERROR("Type mismatch: constant sized array initialized with " +
-                     utostr((yyvsp[-1].ConstVector)->size()) +  " arguments, but has size of " + 
+                     utostr((yyvsp[(3) - (4)].ConstVector)->size()) +  " arguments, but has size of " + 
                      itostr(NumElements) + "");
 
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) {
-      if (ETy != (*(yyvsp[-1].ConstVector))[i]->getType())
+    for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) {
+      if (ETy != (*(yyvsp[(3) - (4)].ConstVector))[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
                        ETy->getDescription() +"' as required!\nIt is of type '"+
-                       (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'.");
+                       (*(yyvsp[(3) - (4)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
 
-    (yyval.ConstVal) = ConstantArray::get(ATy, *(yyvsp[-1].ConstVector));
-    delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector);
+    (yyval.ConstVal) = ConstantArray::get(ATy, *(yyvsp[(3) - (4)].ConstVector));
+    delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 144:
-#line 1499 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1501 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (3)].TypeVal)->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*(yyvsp[-2].TypeVal))->getDescription() + "'");
+                     (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'");
 
     int NumElements = ATy->getNumElements();
     if (NumElements != -1 && NumElements != 0) 
       GEN_ERROR("Type mismatch: constant sized array initialized with 0"
                      " arguments, but has size of " + itostr(NumElements) +"");
     (yyval.ConstVal) = ConstantArray::get(ATy, std::vector<Constant*>());
-    delete (yyvsp[-2].TypeVal);
+    delete (yyvsp[(1) - (3)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 145:
-#line 1515 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1517 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
+    const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[(1) - (3)].TypeVal)->get());
     if (ATy == 0)
       GEN_ERROR("Cannot make array constant with type: '" + 
-                     (*(yyvsp[-2].TypeVal))->getDescription() + "'");
+                     (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'");
 
     int NumElements = ATy->getNumElements();
     const Type *ETy = ATy->getElementType();
-    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 146:
-#line 1544 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1546 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    const VectorType *PTy = dyn_cast<VectorType>((yyvsp[-3].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
+    const VectorType *PTy = dyn_cast<VectorType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (PTy == 0)
       GEN_ERROR("Cannot make packed constant with type: '" + 
-                     (*(yyvsp[-3].TypeVal))->getDescription() + "'");
+                     (*(yyvsp[(1) - (4)].TypeVal))->getDescription() + "'");
     const Type *ETy = PTy->getElementType();
     int NumElements = PTy->getNumElements();
 
     // Verify that we have the correct size...
-    if (NumElements != -1 && NumElements != (int)(yyvsp[-1].ConstVector)->size())
+    if (NumElements != -1 && NumElements != (int)(yyvsp[(3) - (4)].ConstVector)->size())
       GEN_ERROR("Type mismatch: constant sized packed initialized with " +
-                     utostr((yyvsp[-1].ConstVector)->size()) +  " arguments, but has size of " + 
+                     utostr((yyvsp[(3) - (4)].ConstVector)->size()) +  " arguments, but has size of " + 
                      itostr(NumElements) + "");
 
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) {
-      if (ETy != (*(yyvsp[-1].ConstVector))[i]->getType())
+    for (unsigned i = 0; i < (yyvsp[(3) - (4)].ConstVector)->size(); i++) {
+      if (ETy != (*(yyvsp[(3) - (4)].ConstVector))[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
            ETy->getDescription() +"' as required!\nIt is of type '"+
-           (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'.");
+           (*(yyvsp[(3) - (4)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
 
-    (yyval.ConstVal) = ConstantVector::get(PTy, *(yyvsp[-1].ConstVector));
-    delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector);
+    (yyval.ConstVal) = ConstantVector::get(PTy, *(yyvsp[(3) - (4)].ConstVector));
+    delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 147:
-#line 1572 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1574 "/home/laurov/llvm/llvm/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) +
@@ -3878,21 +4080,21 @@
     if (STy->isPacked())
       GEN_ERROR("Unpacked Initializer to vector type '" + STy->getDescription() + "'");
 
-    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[-1].ConstVector));
-    delete (yyvsp[-3].TypeVal); delete (yyvsp[-1].ConstVector);
+    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[(3) - (4)].ConstVector));
+    delete (yyvsp[(1) - (4)].TypeVal); delete (yyvsp[(3) - (4)].ConstVector);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 148:
-#line 1597 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1599 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (3)].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*(yyvsp[-2].TypeVal))->getDescription() + "'");
+                     (*(yyvsp[(1) - (3)].TypeVal))->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
       GEN_ERROR("Illegal number of initializers for structure type");
@@ -3902,25 +4104,25 @@
       GEN_ERROR("Unpacked Initializer to vector 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 149:
-#line 1616 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1618 "/home/laurov/llvm/llvm/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) +
@@ -3931,21 +4133,21 @@
       GEN_ERROR("Vector initializer to non-vector type '" + 
                 STy->getDescription() + "'");
 
-    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[-2].ConstVector));
-    delete (yyvsp[-5].TypeVal); delete (yyvsp[-2].ConstVector);
+    (yyval.ConstVal) = ConstantStruct::get(STy, *(yyvsp[(4) - (6)].ConstVector));
+    delete (yyvsp[(1) - (6)].TypeVal); delete (yyvsp[(4) - (6)].ConstVector);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 150:
-#line 1642 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1644 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
-    const StructType *STy = dyn_cast<StructType>((yyvsp[-4].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
+    const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (5)].TypeVal)->get());
     if (STy == 0)
       GEN_ERROR("Cannot make struct constant with type: '" + 
-                     (*(yyvsp[-4].TypeVal))->getDescription() + "'");
+                     (*(yyvsp[(1) - (5)].TypeVal))->getDescription() + "'");
 
     if (STy->getNumContainedTypes() != 0)
       GEN_ERROR("Illegal number of initializers for structure type");
@@ -3956,44 +4158,44 @@
                 STy->getDescription() + "'");
 
     (yyval.ConstVal) = ConstantStruct::get(STy, std::vector<Constant*>());
-    delete (yyvsp[-4].TypeVal);
+    delete (yyvsp[(1) - (5)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 151:
-#line 1662 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1664 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    const PointerType *PTy = dyn_cast<PointerType>((yyvsp[(1) - (2)].TypeVal)->get());
     if (PTy == 0)
       GEN_ERROR("Cannot make null pointer constant with type: '" + 
-                     (*(yyvsp[-1].TypeVal))->getDescription() + "'");
+                     (*(yyvsp[(1) - (2)].TypeVal))->getDescription() + "'");
 
     (yyval.ConstVal) = ConstantPointerNull::get(PTy);
-    delete (yyvsp[-1].TypeVal);
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 152:
-#line 1674 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1676 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    (yyval.ConstVal) = UndefValue::get((yyvsp[-1].TypeVal)->get());
-    delete (yyvsp[-1].TypeVal);
+      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 153:
-#line 1681 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1683 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal)->get());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    const PointerType *Ty = dyn_cast<PointerType>((yyvsp[(1) - (2)].TypeVal)->get());
     if (Ty == 0)
       GEN_ERROR("Global const reference must be a pointer type");
 
@@ -4007,7 +4209,7 @@
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
 
-    Value *V = getExistingVal(Ty, (yyvsp[0].ValIDVal));
+    Value *V = getExistingVal(Ty, (yyvsp[(2) - (2)].ValIDVal));
     CHECK_FOR_ERROR
 
     CurFun.CurrentFunction = SavedCurFn;
@@ -4022,16 +4224,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.
@@ -4047,277 +4249,287 @@
         }
 
         // 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 154:
-#line 1747 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1749 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    if ((yyvsp[-1].TypeVal)->get() != (yyvsp[0].ConstVal)->getType())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    if ((yyvsp[(1) - (2)].TypeVal)->get() != (yyvsp[(2) - (2)].ConstVal)->getType())
       GEN_ERROR("Mismatched types for constant expression: " + 
-        (*(yyvsp[-1].TypeVal))->getDescription() + " and " + (yyvsp[0].ConstVal)->getType()->getDescription());
-    (yyval.ConstVal) = (yyvsp[0].ConstVal);
-    delete (yyvsp[-1].TypeVal);
+        (*(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 155:
-#line 1757 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1759 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    const Type *Ty = (yyvsp[-1].TypeVal)->get();
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
+    const Type *Ty = (yyvsp[(1) - (2)].TypeVal)->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
       GEN_ERROR("Cannot create a null initialized value of this type");
     (yyval.ConstVal) = Constant::getNullValue(Ty);
-    delete (yyvsp[-1].TypeVal);
+    delete (yyvsp[(1) - (2)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 156:
-#line 1767 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1769 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
-    if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
+    if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
-    (yyval.ConstVal) = ConstantInt::get((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val), true);
+    (yyval.ConstVal) = ConstantInt::get((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].SInt64Val), true);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 157:
-#line 1773 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1775 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
-    uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
-    if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) {
+    uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
+    if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
       GEN_ERROR("Constant value does not fit in type");
     }
-    (yyvsp[0].APIntVal)->sextOrTrunc(BitWidth);
-    (yyval.ConstVal) = ConstantInt::get(*(yyvsp[0].APIntVal));
-    delete (yyvsp[0].APIntVal);
+    (yyvsp[(2) - (2)].APIntVal)->sextOrTrunc(BitWidth);
+    (yyval.ConstVal) = ConstantInt::get(*(yyvsp[(2) - (2)].APIntVal));
+    delete (yyvsp[(2) - (2)].APIntVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 158:
-#line 1783 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1785 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
-    if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
+    if (!ConstantInt::isValueValidForType((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
-    (yyval.ConstVal) = ConstantInt::get((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val), false);
+    (yyval.ConstVal) = ConstantInt::get((yyvsp[(1) - (2)].PrimType), (yyvsp[(2) - (2)].UInt64Val), false);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 159:
-#line 1789 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1791 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
-    uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
-    if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) {
+    uint32_t BitWidth = cast<IntegerType>((yyvsp[(1) - (2)].PrimType))->getBitWidth();
+    if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > BitWidth) {
       GEN_ERROR("Constant value does not fit in type");
     } 
-    (yyvsp[0].APIntVal)->zextOrTrunc(BitWidth);
-    (yyval.ConstVal) = ConstantInt::get(*(yyvsp[0].APIntVal));
-    delete (yyvsp[0].APIntVal);
+    (yyvsp[(2) - (2)].APIntVal)->zextOrTrunc(BitWidth);
+    (yyval.ConstVal) = ConstantInt::get(*(yyvsp[(2) - (2)].APIntVal));
+    delete (yyvsp[(2) - (2)].APIntVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 160:
-#line 1799 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1801 "/home/laurov/llvm/llvm/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 161:
-#line 1804 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1806 "/home/laurov/llvm/llvm/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 162:
-#line 1809 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1811 "/home/laurov/llvm/llvm/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 163:
-#line 1817 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1819 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    Constant *Val = (yyvsp[-3].ConstVal);
-    const Type *DestTy = (yyvsp[-1].TypeVal)->get();
-    if (!CastInst::castIsValid((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal), DestTy))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
+    Constant *Val = (yyvsp[(3) - (6)].ConstVal);
+    const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
+    if (!CastInst::castIsValid((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'"); 
-    (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal), DestTy);
-    delete (yyvsp[-1].TypeVal);
+    (yyval.ConstVal) = ConstantExpr::getCast((yyvsp[(1) - (6)].CastOpVal), (yyvsp[(3) - (6)].ConstVal), DestTy);
+    delete (yyvsp[(5) - (6)].TypeVal);
   ;}
     break;
 
   case 164:
-#line 1829 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1831 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
+    if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
 
     const Type *IdxTy =
-      GetElementPtrInst::getIndexedType((yyvsp[-2].ConstVal)->getType(), &(*(yyvsp[-1].ValueList))[0], (yyvsp[-1].ValueList)->size(),
+      GetElementPtrInst::getIndexedType((yyvsp[(3) - (5)].ConstVal)->getType(), &(*(yyvsp[(4) - (5)].ValueList))[0], (yyvsp[(4) - (5)].ValueList)->size(),
                                         true);
     if (!IdxTy)
       GEN_ERROR("Index list invalid for constant getelementptr");
 
     SmallVector<Constant*, 8> IdxVec;
-    for (unsigned i = 0, e = (yyvsp[-1].ValueList)->size(); i != e; ++i)
-      if (Constant *C = dyn_cast<Constant>((*(yyvsp[-1].ValueList))[i]))
+    for (unsigned i = 0, e = (yyvsp[(4) - (5)].ValueList)->size(); i != e; ++i)
+      if (Constant *C = dyn_cast<Constant>((*(yyvsp[(4) - (5)].ValueList))[i]))
         IdxVec.push_back(C);
       else
         GEN_ERROR("Indices to constant getelementptr must be constants");
 
-    delete (yyvsp[-1].ValueList);
+    delete (yyvsp[(4) - (5)].ValueList);
 
-    (yyval.ConstVal) = ConstantExpr::getGetElementPtr((yyvsp[-2].ConstVal), &IdxVec[0], IdxVec.size());
+    (yyval.ConstVal) = ConstantExpr::getGetElementPtr((yyvsp[(3) - (5)].ConstVal), &IdxVec[0], IdxVec.size());
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 165:
-#line 1851 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1853 "/home/laurov/llvm/llvm/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 166:
-#line 1859 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1861 "/home/laurov/llvm/llvm/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 167:
-#line 1865 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1867 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
+    if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
-    if (!(yyvsp[-3].ConstVal)->getType()->isInteger()) {
-      if (Instruction::isShift((yyvsp[-5].BinaryOpVal)) || !isa<VectorType>((yyvsp[-3].ConstVal)->getType()) || 
-          !cast<VectorType>((yyvsp[-3].ConstVal)->getType())->getElementType()->isInteger())
+    if (!(yyvsp[(3) - (6)].ConstVal)->getType()->isInteger()) {
+      if (Instruction::isShift((yyvsp[(1) - (6)].BinaryOpVal)) || !isa<VectorType>((yyvsp[(3) - (6)].ConstVal)->getType()) || 
+          !cast<VectorType>((yyvsp[(3) - (6)].ConstVal)->getType())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands");
     }
-    (yyval.ConstVal) = ConstantExpr::get((yyvsp[-5].BinaryOpVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal));
+    (yyval.ConstVal) = ConstantExpr::get((yyvsp[(1) - (6)].BinaryOpVal), (yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 168:
-#line 1876 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1878 "/home/laurov/llvm/llvm/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 169:
-#line 1881 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1883 "/home/laurov/llvm/llvm/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 170:
-#line 1886 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1888 "/home/laurov/llvm/llvm/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 171:
-#line 1892 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1894 "/home/laurov/llvm/llvm/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 172:
-#line 1898 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1900 "/home/laurov/llvm/llvm/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 173:
-#line 1907 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1909 "/home/laurov/llvm/llvm/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 174:
-#line 1911 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1913 "/home/laurov/llvm/llvm/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 175:
-#line 1919 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1921 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 176:
-#line 1919 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1921 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 177:
-#line 1930 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1924 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = true; ;}
+    break;
+
+  case 178:
+#line 1924 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.BoolVal) = false; ;}
+    break;
+
+  case 179:
+#line 1935 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4325,8 +4537,8 @@
   ;}
     break;
 
-  case 178:
-#line 1935 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 180:
+#line 1940 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4334,43 +4546,43 @@
   ;}
     break;
 
-  case 181:
-#line 1948 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 183:
+#line 1953 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
-  case 182:
-#line 1948 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 184:
+#line 1953 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 183:
-#line 1952 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 185:
+#line 1957 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
-  case 184:
-#line 1952 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 186:
+#line 1957 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 185:
-#line 1955 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 187:
+#line 1960 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 186:
-#line 1958 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 188:
+#line 1963 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
     // Eagerly resolve types.  This is not an optimization, this is a
     // requirement that is due to the fact that we could have this:
     //
@@ -4380,111 +4592,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 187:
-#line 1982 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 189:
+#line 1987 "/home/laurov/llvm/llvm/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 188:
-#line 1993 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 190:
+#line 1998 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     /* "Externally Visible" Linkage */
-    if ((yyvsp[0].ConstVal) == 0) 
+    if ((yyvsp[(5) - (5)].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage,
-                                (yyvsp[-2].Visibility), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal));
+    CurGV = ParseGlobalVariable((yyvsp[(1) - (5)].StrVal), GlobalValue::ExternalLinkage,
+                                (yyvsp[(2) - (5)].Visibility), (yyvsp[(4) - (5)].BoolVal), (yyvsp[(5) - (5)].ConstVal)->getType(), (yyvsp[(5) - (5)].ConstVal), (yyvsp[(3) - (5)].BoolVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 189:
-#line 2000 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 191:
+#line 2005 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 190:
-#line 2003 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 192:
+#line 2008 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    if ((yyvsp[0].ConstVal) == 0) 
+    if ((yyvsp[(6) - (6)].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable((yyvsp[-4].StrVal), (yyvsp[-3].Linkage), (yyvsp[-2].Visibility), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal)->getType(), (yyvsp[0].ConstVal));
+    CurGV = ParseGlobalVariable((yyvsp[(1) - (6)].StrVal), (yyvsp[(2) - (6)].Linkage), (yyvsp[(3) - (6)].Visibility), (yyvsp[(5) - (6)].BoolVal), (yyvsp[(6) - (6)].ConstVal)->getType(), (yyvsp[(6) - (6)].ConstVal), (yyvsp[(4) - (6)].BoolVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 191:
-#line 2008 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 193:
+#line 2013 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 192:
-#line 2011 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 194:
+#line 2016 "/home/laurov/llvm/llvm/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[(6) - (6)].TypeVal))->getDescription());
+    CurGV = ParseGlobalVariable((yyvsp[(1) - (6)].StrVal), (yyvsp[(2) - (6)].Linkage), (yyvsp[(3) - (6)].Visibility), (yyvsp[(5) - (6)].BoolVal), *(yyvsp[(6) - (6)].TypeVal), 0, (yyvsp[(4) - (6)].BoolVal));
     CHECK_FOR_ERROR
-    delete (yyvsp[0].TypeVal);
+    delete (yyvsp[(6) - (6)].TypeVal);
   ;}
     break;
 
-  case 193:
-#line 2017 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 195:
+#line 2022 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 194:
-#line 2021 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 196:
+#line 2026 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 195:
-#line 2024 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 197:
+#line 2029 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 196:
-#line 2030 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 198:
+#line 2035 "/home/laurov/llvm/llvm/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);
@@ -4494,87 +4706,87 @@
 ;}
     break;
 
-  case 197:
-#line 2043 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 199:
+#line 2048 "/home/laurov/llvm/llvm/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 198:
-#line 2047 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 200:
+#line 2052 "/home/laurov/llvm/llvm/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 200:
-#line 2054 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 202:
+#line 2059 "/home/laurov/llvm/llvm/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 201:
-#line 2059 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 203:
+#line 2064 "/home/laurov/llvm/llvm/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 202:
-#line 2064 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 204:
+#line 2069 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
-  case 203:
-#line 2073 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 205:
+#line 2078 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    if (*(yyvsp[-2].TypeVal) == Type::VoidTy)
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
+    if (*(yyvsp[(3) - (5)].TypeVal) == Type::VoidTy)
       GEN_ERROR("void typed arguments are invalid");
-    ArgListEntry E; E.Attrs = (yyvsp[-1].ParamAttrs); E.Ty = (yyvsp[-2].TypeVal); E.Name = (yyvsp[0].StrVal);
-    (yyval.ArgList) = (yyvsp[-4].ArgList);
-    (yyvsp[-4].ArgList)->push_back(E);
+    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 204:
-#line 2083 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 206:
+#line 2088 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    if (*(yyvsp[-2].TypeVal) == Type::VoidTy)
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
+    if (*(yyvsp[(1) - (3)].TypeVal) == Type::VoidTy)
       GEN_ERROR("void typed arguments are invalid");
-    ArgListEntry E; E.Attrs = (yyvsp[-1].ParamAttrs); E.Ty = (yyvsp[-2].TypeVal); E.Name = (yyvsp[0].StrVal);
+    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 205:
-#line 2094 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 207:
+#line 2099 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ArgList) = (yyvsp[0].ArgList);
+    (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 206:
-#line 2098 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 208:
+#line 2103 "/home/laurov/llvm/llvm/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;
@@ -4584,8 +4796,8 @@
   ;}
     break;
 
-  case 207:
-#line 2107 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 209:
+#line 2112 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -4597,33 +4809,33 @@
   ;}
     break;
 
-  case 208:
-#line 2116 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 210:
+#line 2121 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 209:
-#line 2122 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 211:
+#line 2127 "/home/laurov/llvm/llvm/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;
   ParamAttrsList ParamAttrs;
-  if ((yyvsp[-2].ParamAttrs) != ParamAttr::None)
-    ParamAttrs.addAttributes(0, (yyvsp[-2].ParamAttrs));
-  if ((yyvsp[-4].ArgList)) {   // If there are arguments...
+  if ((yyvsp[(7) - (9)].ParamAttrs) != ParamAttr::None)
+    ParamAttrs.addAttributes(0, (yyvsp[(7) - (9)].ParamAttrs));
+  if ((yyvsp[(5) - (9)].ArgList)) {   // If there are arguments...
     unsigned index = 1;
-    for (ArgListType::iterator I = (yyvsp[-4].ArgList)->begin(); I != (yyvsp[-4].ArgList)->end(); ++I, ++index) {
+    for (ArgListType::iterator I = (yyvsp[(5) - (9)].ArgList)->begin(); I != (yyvsp[(5) - (9)].ArgList)->end(); ++I, ++index) {
       const Type* Ty = I->Ty->get();
       if (!CurFun.isDeclare && CurModule.TypeIsUnresolved(I->Ty))
         GEN_ERROR("Reference to abstract argument: " + Ty->getDescription());
@@ -4641,10 +4853,10 @@
   if (!ParamAttrs.empty())
     ActualAttrs = new ParamAttrsList(ParamAttrs);
 
-  FunctionType *FT = FunctionType::get(*(yyvsp[-7].TypeVal), ParamTypeList, isVarArg, 
+  FunctionType *FT = FunctionType::get(*(yyvsp[(2) - (9)].TypeVal), ParamTypeList, isVarArg, 
                                        ActualAttrs);
   const PointerType *PFT = PointerType::get(FT);
-  delete (yyvsp[-7].TypeVal);
+  delete (yyvsp[(2) - (9)].TypeVal);
 
   ValID ID;
   if (!FunctionName.empty()) {
@@ -4693,26 +4905,26 @@
     Fn->setLinkage(CurFun.Linkage);
     Fn->setVisibility(CurFun.Visibility);
   }
-  Fn->setCallingConv((yyvsp[-8].UIntVal));
-  Fn->setAlignment((yyvsp[0].UIntVal));
-  if ((yyvsp[-1].StrVal)) {
-    Fn->setSection((yyvsp[-1].StrVal));
-    free((yyvsp[-1].StrVal));
+  Fn->setCallingConv((yyvsp[(1) - (9)].UIntVal));
+  Fn->setAlignment((yyvsp[(9) - (9)].UIntVal));
+  if ((yyvsp[(8) - (9)].StrVal)) {
+    Fn->setSection((yyvsp[(8) - (9)].StrVal));
+    free((yyvsp[(8) - (9)].StrVal));
   }
 
   // Add all of the arguments we parsed to the function...
-  if ((yyvsp[-4].ArgList)) {                     // Is null if empty...
+  if ((yyvsp[(5) - (9)].ArgList)) {                     // Is null if empty...
     if (isVarArg) {  // Nuke the last entry
-      assert((yyvsp[-4].ArgList)->back().Ty->get() == Type::VoidTy && (yyvsp[-4].ArgList)->back().Name == 0 &&
+      assert((yyvsp[(5) - (9)].ArgList)->back().Ty->get() == Type::VoidTy && (yyvsp[(5) - (9)].ArgList)->back().Name == 0 &&
              "Not a varargs marker!");
-      delete (yyvsp[-4].ArgList)->back().Ty;
-      (yyvsp[-4].ArgList)->pop_back();  // Delete the last entry
+      delete (yyvsp[(5) - (9)].ArgList)->back().Ty;
+      (yyvsp[(5) - (9)].ArgList)->pop_back();  // Delete the last entry
     }
     Function::arg_iterator ArgIt = Fn->arg_begin();
     Function::arg_iterator ArgEnd = Fn->arg_end();
     unsigned Idx = 1;
-    for (ArgListType::iterator I = (yyvsp[-4].ArgList)->begin(); 
-         I != (yyvsp[-4].ArgList)->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
+    for (ArgListType::iterator I = (yyvsp[(5) - (9)].ArgList)->begin(); 
+         I != (yyvsp[(5) - (9)].ArgList)->end() && ArgIt != ArgEnd; ++I, ++ArgIt) {
       delete I->Ty;                          // Delete the typeholder...
       setValueName(ArgIt, I->Name);          // Insert arg into symtab...
       CHECK_FOR_ERROR
@@ -4720,128 +4932,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 212:
-#line 2242 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 214:
+#line 2247 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
   // Make sure that we keep track of the linkage type even if there was a
   // previous "declare".
-  (yyval.FunctionVal)->setLinkage((yyvsp[-3].Linkage));
-  (yyval.FunctionVal)->setVisibility((yyvsp[-2].Visibility));
+  (yyval.FunctionVal)->setLinkage((yyvsp[(1) - (4)].Linkage));
+  (yyval.FunctionVal)->setVisibility((yyvsp[(2) - (4)].Visibility));
 ;}
     break;
 
-  case 215:
-#line 2253 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 217:
+#line 2258 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-  (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
+  (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 216:
-#line 2258 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 218:
+#line 2263 "/home/laurov/llvm/llvm/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 217:
-#line 2270 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 219:
+#line 2275 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 218:
-#line 2274 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 220:
+#line 2279 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 219:
-#line 2279 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 221:
+#line 2284 "/home/laurov/llvm/llvm/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 220:
-#line 2283 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 222:
+#line 2288 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 221:
-#line 2287 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 223:
+#line 2292 "/home/laurov/llvm/llvm/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 222:
-#line 2291 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 224:
+#line 2296 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 223:
-#line 2295 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 225:
+#line 2300 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 224:
-#line 2299 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 226:
+#line 2304 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 225:
-#line 2303 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 227:
+#line 2308 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 226:
-#line 2307 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 228:
+#line 2312 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 227:
-#line 2311 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 229:
+#line 2316 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
-    const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
-    int NumElements = (yyvsp[-1].ConstVector)->size(); 
+    const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
+    int NumElements = (yyvsp[(2) - (3)].ConstVector)->size(); 
     
     VectorType* pt = VectorType::get(ETy, NumElements);
     PATypeHolder* PTy = new PATypeHolder(
@@ -4853,209 +5065,209 @@
                                          );
     
     // Verify all elements are correct type!
-    for (unsigned i = 0; i < (yyvsp[-1].ConstVector)->size(); i++) {
-      if (ETy != (*(yyvsp[-1].ConstVector))[i]->getType())
+    for (unsigned i = 0; i < (yyvsp[(2) - (3)].ConstVector)->size(); i++) {
+      if (ETy != (*(yyvsp[(2) - (3)].ConstVector))[i]->getType())
         GEN_ERROR("Element #" + utostr(i) + " is not of type '" + 
                      ETy->getDescription() +"' as required!\nIt is of type '" +
-                     (*(yyvsp[-1].ConstVector))[i]->getType()->getDescription() + "'.");
+                     (*(yyvsp[(2) - (3)].ConstVector))[i]->getType()->getDescription() + "'.");
     }
 
-    (yyval.ValIDVal) = ValID::create(ConstantVector::get(pt, *(yyvsp[-1].ConstVector)));
-    delete PTy; delete (yyvsp[-1].ConstVector);
+    (yyval.ValIDVal) = ValID::create(ConstantVector::get(pt, *(yyvsp[(2) - (3)].ConstVector)));
+    delete PTy; delete (yyvsp[(2) - (3)].ConstVector);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 228:
-#line 2336 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 230:
+#line 2341 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
+    (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 229:
-#line 2340 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 231:
+#line 2345 "/home/laurov/llvm/llvm/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 230:
-#line 2354 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 232:
+#line 2359 "/home/laurov/llvm/llvm/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 231:
-#line 2358 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 233:
+#line 2363 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[0].UIntVal));
+    (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 232:
-#line 2362 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 234:
+#line 2367 "/home/laurov/llvm/llvm/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 233:
-#line 2366 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 235:
+#line 2371 "/home/laurov/llvm/llvm/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 236:
-#line 2378 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 238:
+#line 2383 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    (yyval.ValueVal) = getVal(*(yyvsp[-1].TypeVal), (yyvsp[0].ValIDVal)); 
-    delete (yyvsp[-1].TypeVal);
+      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 237:
-#line 2387 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 239:
+#line 2392 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
+    (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 238:
-#line 2391 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 240:
+#line 2396 "/home/laurov/llvm/llvm/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 239:
-#line 2400 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 241:
+#line 2405 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
+    setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
     CHECK_FOR_ERROR
-    InsertValue((yyvsp[0].TermInstVal));
-    (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp[0].TermInstVal));
-    (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal);
+    InsertValue((yyvsp[(3) - (3)].TermInstVal));
+    (yyvsp[(1) - (3)].BasicBlockVal)->getInstList().push_back((yyvsp[(3) - (3)].TermInstVal));
+    (yyval.BasicBlockVal) = (yyvsp[(1) - (3)].BasicBlockVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 240:
-#line 2409 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 242:
+#line 2414 "/home/laurov/llvm/llvm/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 241:
-#line 2418 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 243:
+#line 2423 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 242:
-#line 2422 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 244:
+#line 2427 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
-    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName((yyvsp[0].StrVal)));
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName((yyvsp[(1) - (1)].StrVal)));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 243:
-#line 2427 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 245:
+#line 2432 "/home/laurov/llvm/llvm/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 244:
-#line 2431 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 246:
+#line 2436 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 245:
-#line 2435 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 247:
+#line 2440 "/home/laurov/llvm/llvm/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 246:
-#line 2440 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 248:
+#line 2445 "/home/laurov/llvm/llvm/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 247:
-#line 2450 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 249:
+#line 2455 "/home/laurov/llvm/llvm/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 248:
-#line 2469 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 250:
+#line 2474 "/home/laurov/llvm/llvm/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;
@@ -5063,21 +5275,21 @@
   ;}
     break;
 
-  case 249:
-#line 2479 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 251:
+#line 2484 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
     const PointerType *PFTy = 0;
     const FunctionType *Ty = 0;
-    if (!(PFTy = dyn_cast<PointerType>((yyvsp[-11].TypeVal)->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>((yyvsp[(3) - (14)].TypeVal)->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
       ParamAttrsList ParamAttrs;
-      if ((yyvsp[-6].ParamAttrs) != ParamAttr::None)
-        ParamAttrs.addAttributes(0, (yyvsp[-6].ParamAttrs));
-      ValueRefList::iterator I = (yyvsp[-8].ValueRefList)->begin(), E = (yyvsp[-8].ValueRefList)->end();
+      if ((yyvsp[(8) - (14)].ParamAttrs) != ParamAttr::None)
+        ParamAttrs.addAttributes(0, (yyvsp[(8) - (14)].ParamAttrs));
+      ValueRefList::iterator I = (yyvsp[(6) - (14)].ValueRefList)->begin(), E = (yyvsp[(6) - (14)].ValueRefList)->end();
       unsigned index = 1;
       for (; I != E; ++I, ++index) {
         const Type *Ty = I->Val->getType();
@@ -5091,22 +5303,22 @@
       ParamAttrsList *Attrs = 0;
       if (!ParamAttrs.empty())
         Attrs = new ParamAttrsList(ParamAttrs);
-      Ty = FunctionType::get((yyvsp[-11].TypeVal)->get(), ParamTypes, false, Attrs);
+      Ty = FunctionType::get((yyvsp[(3) - (14)].TypeVal)->get(), ParamTypes, false, Attrs);
       PFTy = PointerType::get(Ty);
     }
 
-    delete (yyvsp[-11].TypeVal);
+    delete (yyvsp[(3) - (14)].TypeVal);
 
-    Value *V = getVal(PFTy, (yyvsp[-10].ValIDVal));   // Get the function we're calling...
+    Value *V = getVal(PFTy, (yyvsp[(4) - (14)].ValIDVal));   // Get the function we're calling...
     CHECK_FOR_ERROR
-    BasicBlock *Normal = getBBVal((yyvsp[-3].ValIDVal));
+    BasicBlock *Normal = getBBVal((yyvsp[(11) - (14)].ValIDVal));
     CHECK_FOR_ERROR
-    BasicBlock *Except = getBBVal((yyvsp[0].ValIDVal));
+    BasicBlock *Except = getBBVal((yyvsp[(14) - (14)].ValIDVal));
     CHECK_FOR_ERROR
 
     // Check the arguments
     ValueList Args;
-    if ((yyvsp[-8].ValueRefList)->empty()) {                                   // Has no arguments?
+    if ((yyvsp[(6) - (14)].ValueRefList)->empty()) {                                   // Has no arguments?
       // Make sure no arguments is a good thing!
       if (Ty->getNumParams() != 0)
         GEN_ERROR("No arguments passed to a function that "
@@ -5116,7 +5328,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)
@@ -5135,346 +5347,346 @@
 
     // Create the InvokeInst
     InvokeInst *II = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
-    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 250:
-#line 2554 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 252:
+#line 2559 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 251:
-#line 2558 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 253:
+#line 2563 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 252:
-#line 2565 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 254:
+#line 2570 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.JumpTable) = (yyvsp[-5].JumpTable);
-    Constant *V = cast<Constant>(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
+    (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
+    Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
     CHECK_FOR_ERROR
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value");
 
-    BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+    BasicBlock* tmpBB = getBBVal((yyvsp[(6) - (6)].ValIDVal));
     CHECK_FOR_ERROR
     (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
   ;}
     break;
 
-  case 253:
-#line 2576 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 255:
+#line 2581 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
-    Constant *V = cast<Constant>(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
+    Constant *V = cast<Constant>(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
     CHECK_FOR_ERROR
 
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value");
 
-    BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
+    BasicBlock* tmpBB = getBBVal((yyvsp[(5) - (5)].ValIDVal));
     CHECK_FOR_ERROR
     (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); 
   ;}
     break;
 
-  case 254:
-#line 2589 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 256:
+#line 2594 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
-    setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
+    setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
     CHECK_FOR_ERROR
-    InsertValue((yyvsp[0].InstVal));
-    (yyval.InstVal) = (yyvsp[0].InstVal);
+    InsertValue((yyvsp[(2) - (2)].InstVal));
+    (yyval.InstVal) = (yyvsp[(2) - (2)].InstVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 255:
-#line 2599 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 257:
+#line 2604 "/home/laurov/llvm/llvm/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 256:
-#line 2610 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 258:
+#line 2615 "/home/laurov/llvm/llvm/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 257:
-#line 2620 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 259:
+#line 2625 "/home/laurov/llvm/llvm/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);
-    delete (yyvsp[-2].TypeVal);
+    delete (yyvsp[(1) - (3)].TypeVal);
   ;}
     break;
 
-  case 258:
-#line 2629 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 260:
+#line 2634 "/home/laurov/llvm/llvm/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);
-    delete (yyvsp[-2].TypeVal);
+    delete (yyvsp[(3) - (5)].TypeVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 259:
-#line 2638 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 261:
+#line 2643 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueRefList) = new ValueRefList(); ;}
     break;
 
-  case 260:
-#line 2641 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 262:
+#line 2646 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
-  case 261:
-#line 2642 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 263:
+#line 2647 "/home/laurov/llvm/llvm/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 262:
-#line 2649 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 264:
+#line 2654 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 263:
-#line 2653 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 265:
+#line 2658 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 264:
-#line 2658 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 266:
+#line 2663 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    if (!(*(yyvsp[-3].TypeVal))->isInteger() && !(*(yyvsp[-3].TypeVal))->isFloatingPoint() && 
-        !isa<VectorType>((*(yyvsp[-3].TypeVal)).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
+    if (!(*(yyvsp[(2) - (5)].TypeVal))->isInteger() && !(*(yyvsp[(2) - (5)].TypeVal))->isFloatingPoint() && 
+        !isa<VectorType>((*(yyvsp[(2) - (5)].TypeVal)).get()))
       GEN_ERROR(
         "Arithmetic operator requires integer, FP, or packed operands");
-    if (isa<VectorType>((*(yyvsp[-3].TypeVal)).get()) && 
-        ((yyvsp[-4].BinaryOpVal) == Instruction::URem || 
-         (yyvsp[-4].BinaryOpVal) == Instruction::SRem ||
-         (yyvsp[-4].BinaryOpVal) == Instruction::FRem))
+    if (isa<VectorType>((*(yyvsp[(2) - (5)].TypeVal)).get()) && 
+        ((yyvsp[(1) - (5)].BinaryOpVal) == Instruction::URem || 
+         (yyvsp[(1) - (5)].BinaryOpVal) == Instruction::SRem ||
+         (yyvsp[(1) - (5)].BinaryOpVal) == Instruction::FRem))
       GEN_ERROR("Remainder not supported on vector types");
-    Value* val1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal)); 
+    Value* val1 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(3) - (5)].ValIDVal)); 
     CHECK_FOR_ERROR
-    Value* val2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
+    Value* val2 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(5) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal), val1, val2);
+    (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 265:
-#line 2679 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 267:
+#line 2684 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    if (!(*(yyvsp[-3].TypeVal))->isInteger()) {
-      if (Instruction::isShift((yyvsp[-4].BinaryOpVal)) || !isa<VectorType>((yyvsp[-3].TypeVal)->get()) ||
-          !cast<VectorType>((yyvsp[-3].TypeVal)->get())->getElementType()->isInteger())
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
+    if (!(*(yyvsp[(2) - (5)].TypeVal))->isInteger()) {
+      if (Instruction::isShift((yyvsp[(1) - (5)].BinaryOpVal)) || !isa<VectorType>((yyvsp[(2) - (5)].TypeVal)->get()) ||
+          !cast<VectorType>((yyvsp[(2) - (5)].TypeVal)->get())->getElementType()->isInteger())
         GEN_ERROR("Logical operator requires integral operands");
     }
-    Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal));
+    Value* tmpVal1 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(3) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
+    Value* tmpVal2 = getVal(*(yyvsp[(2) - (5)].TypeVal), (yyvsp[(5) - (5)].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = BinaryOperator::create((yyvsp[-4].BinaryOpVal), tmpVal1, tmpVal2);
+    (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 266:
-#line 2696 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 268:
+#line 2701 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    if (isa<VectorType>((*(yyvsp[-3].TypeVal)).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
+    if (isa<VectorType>((*(yyvsp[(3) - (6)].TypeVal)).get()))
       GEN_ERROR("Vector types not supported by icmp instruction");
-    Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal));
+    Value* tmpVal1 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(4) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
+    Value* tmpVal2 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(6) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = CmpInst::create((yyvsp[-5].OtherOpVal), (yyvsp[-4].IPredicate), tmpVal1, tmpVal2);
+    (yyval.InstVal) = CmpInst::create((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(2) - (6)].IPredicate), tmpVal1, tmpVal2);
     if ((yyval.InstVal) == 0)
       GEN_ERROR("icmp operator returned null");
-    delete (yyvsp[-3].TypeVal);
+    delete (yyvsp[(3) - (6)].TypeVal);
   ;}
     break;
 
-  case 267:
-#line 2710 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 269:
+#line 2715 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
-    if (isa<VectorType>((*(yyvsp[-3].TypeVal)).get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
+    if (isa<VectorType>((*(yyvsp[(3) - (6)].TypeVal)).get()))
       GEN_ERROR("Vector types not supported by fcmp instruction");
-    Value* tmpVal1 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[-2].ValIDVal));
+    Value* tmpVal1 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(4) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    Value* tmpVal2 = getVal(*(yyvsp[-3].TypeVal), (yyvsp[0].ValIDVal));
+    Value* tmpVal2 = getVal(*(yyvsp[(3) - (6)].TypeVal), (yyvsp[(6) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = CmpInst::create((yyvsp[-5].OtherOpVal), (yyvsp[-4].FPredicate), tmpVal1, tmpVal2);
+    (yyval.InstVal) = CmpInst::create((yyvsp[(1) - (6)].OtherOpVal), (yyvsp[(2) - (6)].FPredicate), tmpVal1, tmpVal2);
     if ((yyval.InstVal) == 0)
       GEN_ERROR("fcmp operator returned null");
-    delete (yyvsp[-3].TypeVal);
+    delete (yyvsp[(3) - (6)].TypeVal);
   ;}
     break;
 
-  case 268:
-#line 2724 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 270:
+#line 2729 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
-    Value* Val = (yyvsp[-2].ValueVal);
-    const Type* DestTy = (yyvsp[0].TypeVal)->get();
-    if (!CastInst::castIsValid((yyvsp[-3].CastOpVal), Val, DestTy))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
+    Value* Val = (yyvsp[(2) - (4)].ValueVal);
+    const Type* DestTy = (yyvsp[(4) - (4)].TypeVal)->get();
+    if (!CastInst::castIsValid((yyvsp[(1) - (4)].CastOpVal), Val, DestTy))
       GEN_ERROR("invalid cast opcode for cast from '" +
                 Val->getType()->getDescription() + "' to '" +
                 DestTy->getDescription() + "'"); 
-    (yyval.InstVal) = CastInst::create((yyvsp[-3].CastOpVal), Val, DestTy);
-    delete (yyvsp[0].TypeVal);
+    (yyval.InstVal) = CastInst::create((yyvsp[(1) - (4)].CastOpVal), Val, DestTy);
+    delete (yyvsp[(4) - (4)].TypeVal);
   ;}
     break;
 
-  case 269:
-#line 2736 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 271:
+#line 2741 "/home/laurov/llvm/llvm/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 270:
-#line 2744 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 272:
+#line 2749 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
-    (yyval.InstVal) = new VAArgInst((yyvsp[-2].ValueVal), *(yyvsp[0].TypeVal));
-    delete (yyvsp[0].TypeVal);
+      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 271:
-#line 2751 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 273:
+#line 2756 "/home/laurov/llvm/llvm/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 272:
-#line 2757 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 274:
+#line 2762 "/home/laurov/llvm/llvm/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 273:
-#line 2763 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 275:
+#line 2768 "/home/laurov/llvm/llvm/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 274:
-#line 2769 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 276:
+#line 2774 "/home/laurov/llvm/llvm/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 275:
-#line 2785 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 277:
+#line 2790 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
     const PointerType *PFTy = 0;
     const FunctionType *Ty = 0;
-    if (!(PFTy = dyn_cast<PointerType>((yyvsp[-5].TypeVal)->get())) ||
+    if (!(PFTy = dyn_cast<PointerType>((yyvsp[(3) - (8)].TypeVal)->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
       ParamAttrsList ParamAttrs;
-      if ((yyvsp[0].ParamAttrs) != ParamAttr::None)
-        ParamAttrs.addAttributes(0, (yyvsp[0].ParamAttrs));
+      if ((yyvsp[(8) - (8)].ParamAttrs) != ParamAttr::None)
+        ParamAttrs.addAttributes(0, (yyvsp[(8) - (8)].ParamAttrs));
       unsigned index = 1;
-      ValueRefList::iterator I = (yyvsp[-2].ValueRefList)->begin(), E = (yyvsp[-2].ValueRefList)->end();
+      ValueRefList::iterator I = (yyvsp[(6) - (8)].ValueRefList)->begin(), E = (yyvsp[(6) - (8)].ValueRefList)->end();
       for (; I != E; ++I, ++index) {
         const Type *Ty = I->Val->getType();
         if (Ty == Type::VoidTy)
@@ -5488,16 +5700,16 @@
       if (!ParamAttrs.empty())
         Attrs = new ParamAttrsList(ParamAttrs);
 
-      Ty = FunctionType::get((yyvsp[-5].TypeVal)->get(), ParamTypes, false, Attrs);
+      Ty = FunctionType::get((yyvsp[(3) - (8)].TypeVal)->get(), ParamTypes, false, Attrs);
       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 "
@@ -5508,7 +5720,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)
@@ -5525,165 +5737,163 @@
     }
     // Create the call node
     CallInst *CI = new CallInst(V, &Args[0], Args.size());
-    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 276:
-#line 2856 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 278:
+#line 2861 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
-    (yyval.InstVal) = (yyvsp[0].InstVal);
+    (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 277:
-#line 2861 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 279:
+#line 2866 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 278:
-#line 2865 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 280:
+#line 2870 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 279:
-#line 2872 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 281:
+#line 2877 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    (yyval.InstVal) = new MallocInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
-    delete (yyvsp[-1].TypeVal);
+      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 280:
-#line 2879 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 282:
+#line 2884 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
-    Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
+    Value* tmpVal = getVal((yyvsp[(4) - (6)].PrimType), (yyvsp[(5) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new MallocInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal));
-    delete (yyvsp[-4].TypeVal);
+    (yyval.InstVal) = new MallocInst(*(yyvsp[(2) - (6)].TypeVal), tmpVal, (yyvsp[(6) - (6)].UIntVal));
+    delete (yyvsp[(2) - (6)].TypeVal);
   ;}
     break;
 
-  case 281:
-#line 2887 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 283:
+#line 2892 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
-    (yyval.InstVal) = new AllocaInst(*(yyvsp[-1].TypeVal), 0, (yyvsp[0].UIntVal));
-    delete (yyvsp[-1].TypeVal);
+      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 282:
-#line 2894 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 284:
+#line 2899 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
-    Value* tmpVal = getVal((yyvsp[-2].PrimType), (yyvsp[-1].ValIDVal));
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
+    Value* tmpVal = getVal((yyvsp[(4) - (6)].PrimType), (yyvsp[(5) - (6)].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new AllocaInst(*(yyvsp[-4].TypeVal), tmpVal, (yyvsp[0].UIntVal));
-    delete (yyvsp[-4].TypeVal);
+    (yyval.InstVal) = new AllocaInst(*(yyvsp[(2) - (6)].TypeVal), tmpVal, (yyvsp[(6) - (6)].UIntVal));
+    delete (yyvsp[(2) - (6)].TypeVal);
   ;}
     break;
 
-  case 283:
-#line 2902 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 285:
+#line 2907 "/home/laurov/llvm/llvm/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 284:
-#line 2910 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 286:
+#line 2915 "/home/laurov/llvm/llvm/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 285:
-#line 2924 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 287:
+#line 2929 "/home/laurov/llvm/llvm/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 286:
-#line 2941 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 288:
+#line 2946 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
-    if (!isa<PointerType>((yyvsp[-2].TypeVal)->get()))
+      GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
+    if (!isa<PointerType>((yyvsp[(2) - (4)].TypeVal)->get()))
       GEN_ERROR("getelementptr insn requires pointer operand");
 
-    if (!GetElementPtrInst::getIndexedType(*(yyvsp[-2].TypeVal), &(*(yyvsp[0].ValueList))[0], (yyvsp[0].ValueList)->size(), true))
+    if (!GetElementPtrInst::getIndexedType(*(yyvsp[(2) - (4)].TypeVal), &(*(yyvsp[(4) - (4)].ValueList))[0], (yyvsp[(4) - (4)].ValueList)->size(), true))
       GEN_ERROR("Invalid getelementptr indices for type '" +
-                     (*(yyvsp[-2].TypeVal))->getDescription()+ "'");
-    Value* tmpVal = getVal(*(yyvsp[-2].TypeVal), (yyvsp[-1].ValIDVal));
+                     (*(yyvsp[(2) - (4)].TypeVal))->getDescription()+ "'");
+    Value* tmpVal = getVal(*(yyvsp[(2) - (4)].TypeVal), (yyvsp[(3) - (4)].ValIDVal));
     CHECK_FOR_ERROR
-    (yyval.InstVal) = new GetElementPtrInst(tmpVal, &(*(yyvsp[0].ValueList))[0], (yyvsp[0].ValueList)->size());
-    delete (yyvsp[-2].TypeVal); 
-    delete (yyvsp[0].ValueList);
+    (yyval.InstVal) = new GetElementPtrInst(tmpVal, &(*(yyvsp[(4) - (4)].ValueList))[0], (yyvsp[(4) - (4)].ValueList)->size());
+    delete (yyvsp[(2) - (4)].TypeVal); 
+    delete (yyvsp[(4) - (4)].ValueList);
   ;}
     break;
 
 
+/* Line 1267 of yacc.c.  */
+#line 5891 "llvmAsmParser.tab.c"
       default: break;
     }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
-/* Line 1126 of yacc.c.  */
-#line 5682 "llvmAsmParser.tab.c"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-
-
+  YYPOPSTACK (yylen);
+  yylen = 0;
   YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
@@ -5712,110 +5922,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
     }
 
 
@@ -5826,14 +5967,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;
 	}
     }
@@ -5851,11 +5993,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;
 
@@ -5885,8 +6030,9 @@
 	YYABORT;
 
 
-      yydestruct ("Error: popping", yystos[yystate], yyvsp);
-      YYPOPSTACK;
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
@@ -5897,7 +6043,7 @@
   *++yyvsp = yylval;
 
 
-  /* Shift the error token. */
+  /* Shift the error token.  */
   YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
@@ -5932,21 +6078,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 2958 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2963 "/home/laurov/llvm/llvm/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.64 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.65
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.64	Mon Apr  9 01:13:29 2007
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Thu Apr 12 13:32:50 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
@@ -58,108 +68,109 @@
      CONSTANT = 284,
      SECTION = 285,
      VOLATILE = 286,
-     TO = 287,
-     DOTDOTDOT = 288,
-     NULL_TOK = 289,
-     UNDEF = 290,
-     INTERNAL = 291,
-     LINKONCE = 292,
-     WEAK = 293,
-     APPENDING = 294,
-     DLLIMPORT = 295,
-     DLLEXPORT = 296,
-     EXTERN_WEAK = 297,
-     OPAQUE = 298,
-     EXTERNAL = 299,
-     TARGET = 300,
-     TRIPLE = 301,
-     ALIGN = 302,
-     DEPLIBS = 303,
-     CALL = 304,
-     TAIL = 305,
-     ASM_TOK = 306,
-     MODULE = 307,
-     SIDEEFFECT = 308,
-     CC_TOK = 309,
-     CCC_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,
-     SHL = 334,
-     LSHR = 335,
-     ASHR = 336,
-     ICMP = 337,
-     FCMP = 338,
-     EQ = 339,
-     NE = 340,
-     SLT = 341,
-     SGT = 342,
-     SLE = 343,
-     SGE = 344,
-     ULT = 345,
-     UGT = 346,
-     ULE = 347,
-     UGE = 348,
-     OEQ = 349,
-     ONE = 350,
-     OLT = 351,
-     OGT = 352,
-     OLE = 353,
-     OGE = 354,
-     ORD = 355,
-     UNO = 356,
-     UEQ = 357,
-     UNE = 358,
-     MALLOC = 359,
-     ALLOCA = 360,
-     FREE = 361,
-     LOAD = 362,
-     STORE = 363,
-     GETELEMENTPTR = 364,
-     TRUNC = 365,
-     ZEXT = 366,
-     SEXT = 367,
-     FPTRUNC = 368,
-     FPEXT = 369,
-     BITCAST = 370,
-     UITOFP = 371,
-     SITOFP = 372,
-     FPTOUI = 373,
-     FPTOSI = 374,
-     INTTOPTR = 375,
-     PTRTOINT = 376,
-     PHI_TOK = 377,
-     SELECT = 378,
-     VAARG = 379,
-     EXTRACTELEMENT = 380,
-     INSERTELEMENT = 381,
-     SHUFFLEVECTOR = 382,
-     NORETURN = 383,
-     INREG = 384,
-     SRET = 385,
-     NOUNWIND = 386,
-     DEFAULT = 387,
-     HIDDEN = 388
+     THREAD_LOCAL = 287,
+     TO = 288,
+     DOTDOTDOT = 289,
+     NULL_TOK = 290,
+     UNDEF = 291,
+     INTERNAL = 292,
+     LINKONCE = 293,
+     WEAK = 294,
+     APPENDING = 295,
+     DLLIMPORT = 296,
+     DLLEXPORT = 297,
+     EXTERN_WEAK = 298,
+     OPAQUE = 299,
+     EXTERNAL = 300,
+     TARGET = 301,
+     TRIPLE = 302,
+     ALIGN = 303,
+     DEPLIBS = 304,
+     CALL = 305,
+     TAIL = 306,
+     ASM_TOK = 307,
+     MODULE = 308,
+     SIDEEFFECT = 309,
+     CC_TOK = 310,
+     CCC_TOK = 311,
+     FASTCC_TOK = 312,
+     COLDCC_TOK = 313,
+     X86_STDCALLCC_TOK = 314,
+     X86_FASTCALLCC_TOK = 315,
+     DATALAYOUT = 316,
+     RET = 317,
+     BR = 318,
+     SWITCH = 319,
+     INVOKE = 320,
+     UNWIND = 321,
+     UNREACHABLE = 322,
+     ADD = 323,
+     SUB = 324,
+     MUL = 325,
+     UDIV = 326,
+     SDIV = 327,
+     FDIV = 328,
+     UREM = 329,
+     SREM = 330,
+     FREM = 331,
+     AND = 332,
+     OR = 333,
+     XOR = 334,
+     SHL = 335,
+     LSHR = 336,
+     ASHR = 337,
+     ICMP = 338,
+     FCMP = 339,
+     EQ = 340,
+     NE = 341,
+     SLT = 342,
+     SGT = 343,
+     SLE = 344,
+     SGE = 345,
+     ULT = 346,
+     UGT = 347,
+     ULE = 348,
+     UGE = 349,
+     OEQ = 350,
+     ONE = 351,
+     OLT = 352,
+     OGT = 353,
+     OLE = 354,
+     OGE = 355,
+     ORD = 356,
+     UNO = 357,
+     UEQ = 358,
+     UNE = 359,
+     MALLOC = 360,
+     ALLOCA = 361,
+     FREE = 362,
+     LOAD = 363,
+     STORE = 364,
+     GETELEMENTPTR = 365,
+     TRUNC = 366,
+     ZEXT = 367,
+     SEXT = 368,
+     FPTRUNC = 369,
+     FPEXT = 370,
+     BITCAST = 371,
+     UITOFP = 372,
+     SITOFP = 373,
+     FPTOUI = 374,
+     FPTOSI = 375,
+     INTTOPTR = 376,
+     PTRTOINT = 377,
+     PHI_TOK = 378,
+     SELECT = 379,
+     VAARG = 380,
+     EXTRACTELEMENT = 381,
+     INSERTELEMENT = 382,
+     SHUFFLEVECTOR = 383,
+     NORETURN = 384,
+     INREG = 385,
+     SRET = 386,
+     NOUNWIND = 387,
+     DEFAULT = 388,
+     HIDDEN = 389
    };
 #endif
 /* Tokens.  */
@@ -192,115 +203,117 @@
 #define CONSTANT 284
 #define SECTION 285
 #define VOLATILE 286
-#define TO 287
-#define DOTDOTDOT 288
-#define NULL_TOK 289
-#define UNDEF 290
-#define INTERNAL 291
-#define LINKONCE 292
-#define WEAK 293
-#define APPENDING 294
-#define DLLIMPORT 295
-#define DLLEXPORT 296
-#define EXTERN_WEAK 297
-#define OPAQUE 298
-#define EXTERNAL 299
-#define TARGET 300
-#define TRIPLE 301
-#define ALIGN 302
-#define DEPLIBS 303
-#define CALL 304
-#define TAIL 305
-#define ASM_TOK 306
-#define MODULE 307
-#define SIDEEFFECT 308
-#define CC_TOK 309
-#define CCC_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 SHL 334
-#define LSHR 335
-#define ASHR 336
-#define ICMP 337
-#define FCMP 338
-#define EQ 339
-#define NE 340
-#define SLT 341
-#define SGT 342
-#define SLE 343
-#define SGE 344
-#define ULT 345
-#define UGT 346
-#define ULE 347
-#define UGE 348
-#define OEQ 349
-#define ONE 350
-#define OLT 351
-#define OGT 352
-#define OLE 353
-#define OGE 354
-#define ORD 355
-#define UNO 356
-#define UEQ 357
-#define UNE 358
-#define MALLOC 359
-#define ALLOCA 360
-#define FREE 361
-#define LOAD 362
-#define STORE 363
-#define GETELEMENTPTR 364
-#define TRUNC 365
-#define ZEXT 366
-#define SEXT 367
-#define FPTRUNC 368
-#define FPEXT 369
-#define BITCAST 370
-#define UITOFP 371
-#define SITOFP 372
-#define FPTOUI 373
-#define FPTOSI 374
-#define INTTOPTR 375
-#define PTRTOINT 376
-#define PHI_TOK 377
-#define SELECT 378
-#define VAARG 379
-#define EXTRACTELEMENT 380
-#define INSERTELEMENT 381
-#define SHUFFLEVECTOR 382
-#define NORETURN 383
-#define INREG 384
-#define SRET 385
-#define NOUNWIND 386
-#define DEFAULT 387
-#define HIDDEN 388
-
-
-
-
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 937 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-typedef union YYSTYPE {
+#define THREAD_LOCAL 287
+#define TO 288
+#define DOTDOTDOT 289
+#define NULL_TOK 290
+#define UNDEF 291
+#define INTERNAL 292
+#define LINKONCE 293
+#define WEAK 294
+#define APPENDING 295
+#define DLLIMPORT 296
+#define DLLEXPORT 297
+#define EXTERN_WEAK 298
+#define OPAQUE 299
+#define EXTERNAL 300
+#define TARGET 301
+#define TRIPLE 302
+#define ALIGN 303
+#define DEPLIBS 304
+#define CALL 305
+#define TAIL 306
+#define ASM_TOK 307
+#define MODULE 308
+#define SIDEEFFECT 309
+#define CC_TOK 310
+#define CCC_TOK 311
+#define FASTCC_TOK 312
+#define COLDCC_TOK 313
+#define X86_STDCALLCC_TOK 314
+#define X86_FASTCALLCC_TOK 315
+#define DATALAYOUT 316
+#define RET 317
+#define BR 318
+#define SWITCH 319
+#define INVOKE 320
+#define UNWIND 321
+#define UNREACHABLE 322
+#define ADD 323
+#define SUB 324
+#define MUL 325
+#define UDIV 326
+#define SDIV 327
+#define FDIV 328
+#define UREM 329
+#define SREM 330
+#define FREM 331
+#define AND 332
+#define OR 333
+#define XOR 334
+#define SHL 335
+#define LSHR 336
+#define ASHR 337
+#define ICMP 338
+#define FCMP 339
+#define EQ 340
+#define NE 341
+#define SLT 342
+#define SGT 343
+#define SLE 344
+#define SGE 345
+#define ULT 346
+#define UGT 347
+#define ULE 348
+#define UGE 349
+#define OEQ 350
+#define ONE 351
+#define OLT 352
+#define OGT 353
+#define OLE 354
+#define OGE 355
+#define ORD 356
+#define UNO 357
+#define UEQ 358
+#define UNE 359
+#define MALLOC 360
+#define ALLOCA 361
+#define FREE 362
+#define LOAD 363
+#define STORE 364
+#define GETELEMENTPTR 365
+#define TRUNC 366
+#define ZEXT 367
+#define SEXT 368
+#define FPTRUNC 369
+#define FPEXT 370
+#define BITCAST 371
+#define UITOFP 372
+#define SITOFP 373
+#define FPTOUI 374
+#define FPTOSI 375
+#define INTTOPTR 376
+#define PTRTOINT 377
+#define PHI_TOK 378
+#define SELECT 379
+#define VAARG 380
+#define EXTRACTELEMENT 381
+#define INSERTELEMENT 382
+#define SHUFFLEVECTOR 383
+#define NORETURN 384
+#define INREG 385
+#define SRET 386
+#define NOUNWIND 387
+#define DEFAULT 388
+#define HIDDEN 389
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 938 "/home/laurov/llvm/llvm/lib/AsmParser/llvmAsmParser.y"
+{
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   llvm::BasicBlock                       *BasicBlockVal;
@@ -345,9 +358,10 @@
   llvm::Instruction::OtherOps       OtherOpVal;
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
-} YYSTYPE;
-/* Line 1447 of yacc.c.  */
-#line 351 "llvmAsmParser.tab.h"
+}
+/* Line 1529 of yacc.c.  */
+#line 364 "llvmAsmParser.tab.h"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -355,5 +369,3 @@
 
 extern YYSTYPE llvmAsmlval;
 
-
-


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.338 llvm/lib/AsmParser/llvmAsmParser.y:1.339
--- llvm/lib/AsmParser/llvmAsmParser.y:1.338	Tue Apr 10 21:44:19 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y	Thu Apr 12 13:32:50 2007
@@ -704,7 +704,7 @@
                     GlobalValue::LinkageTypes Linkage,
                     GlobalValue::VisibilityTypes Visibility,
                     bool isConstantGlobal, const Type *Ty,
-                    Constant *Initializer) {
+                    Constant *Initializer, bool IsThreadLocal) {
   if (isa<FunctionType>(Ty)) {
     GenerateError("Cannot declare global vars of function type");
     return 0;
@@ -737,6 +737,7 @@
     GV->setLinkage(Linkage);
     GV->setVisibility(Visibility);
     GV->setConstant(isConstantGlobal);
+    GV->setThreadLocal(IsThreadLocal);
     InsertValue(GV, CurModule.Values);
     return GV;
   }
@@ -761,7 +762,7 @@
   // Otherwise there is no existing GV to use, create one now.
   GlobalVariable *GV =
     new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name,
-                       CurModule.CurrentModule);
+                       CurModule.CurrentModule, IsThreadLocal);
   GV->setVisibility(Visibility);
   InsertValue(GV, CurModule.Values);
   return GV;
@@ -997,6 +998,7 @@
 %type <TypeWithAttrs> ArgType
 %type <JumpTable>     JumpTable
 %type <BoolVal>       GlobalType                  // GLOBAL or CONSTANT?
+%type <BoolVal>       ThreadLocal                 // 'thread_local' or not
 %type <BoolVal>       OptVolatile                 // 'volatile' or not
 %type <BoolVal>       OptTailCall                 // TAIL CALL or plain CALL.
 %type <BoolVal>       OptSideEffect               // 'sideeffect' or not.
@@ -1038,7 +1040,7 @@
 %type <StrVal> OptSection SectionString
 
 %token ZEROINITIALIZER TRUETOK FALSETOK BEGINTOK ENDTOK
-%token DECLARE DEFINE GLOBAL CONSTANT SECTION VOLATILE
+%token DECLARE DEFINE GLOBAL CONSTANT SECTION VOLATILE THREAD_LOCAL
 %token TO DOTDOTDOT NULL_TOK UNDEF INTERNAL LINKONCE WEAK APPENDING
 %token DLLIMPORT DLLEXPORT EXTERN_WEAK
 %token OPAQUE EXTERNAL TARGET TRIPLE ALIGN
@@ -1918,6 +1920,9 @@
 // GlobalType - Match either GLOBAL or CONSTANT for global declarations...
 GlobalType : GLOBAL { $$ = false; } | CONSTANT { $$ = true; };
 
+// ThreadLocal 
+ThreadLocal : THREAD_LOCAL { $$ = true; } | { $$ = false; };
+
 
 //===----------------------------------------------------------------------===//
 //                             Rules to match Modules
@@ -1990,30 +1995,30 @@
     }
     CHECK_FOR_ERROR
   }
-  | OptGlobalAssign GVVisibilityStyle GlobalType ConstVal { 
+  | OptGlobalAssign GVVisibilityStyle ThreadLocal GlobalType ConstVal { 
     /* "Externally Visible" Linkage */
-    if ($4 == 0) 
+    if ($5 == 0) 
       GEN_ERROR("Global value initializer is not a constant");
     CurGV = ParseGlobalVariable($1, GlobalValue::ExternalLinkage,
-                                $2, $3, $4->getType(), $4);
+                                $2, $4, $5->getType(), $5, $3);
     CHECK_FOR_ERROR
   } GlobalVarAttributes {
     CurGV = 0;
   }
-  | OptGlobalAssign GVInternalLinkage GVVisibilityStyle GlobalType ConstVal {
-    if ($5 == 0) 
+  | OptGlobalAssign GVInternalLinkage GVVisibilityStyle ThreadLocal GlobalType ConstVal {
+    if ($6 == 0) 
       GEN_ERROR("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable($1, $2, $3, $4, $5->getType(), $5);
+    CurGV = ParseGlobalVariable($1, $2, $3, $5, $6->getType(), $6, $4);
     CHECK_FOR_ERROR
   } GlobalVarAttributes {
     CurGV = 0;
   }
-  | OptGlobalAssign GVExternalLinkage GVVisibilityStyle GlobalType Types {
+  | OptGlobalAssign GVExternalLinkage GVVisibilityStyle ThreadLocal GlobalType Types {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*$5)->getDescription());
-    CurGV = ParseGlobalVariable($1, $2, $3, $4, *$5, 0);
+      GEN_ERROR("Invalid upreference in type: " + (*$6)->getDescription());
+    CurGV = ParseGlobalVariable($1, $2, $3, $5, *$6, 0, $4);
     CHECK_FOR_ERROR
-    delete $5;
+    delete $6;
   } GlobalVarAttributes {
     CurGV = 0;
     CHECK_FOR_ERROR


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.84 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.85
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.84	Tue Apr 10 21:44:19 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Thu Apr 12 13:32:50 2007
@@ -704,7 +704,7 @@
                     GlobalValue::LinkageTypes Linkage,
                     GlobalValue::VisibilityTypes Visibility,
                     bool isConstantGlobal, const Type *Ty,
-                    Constant *Initializer) {
+                    Constant *Initializer, bool IsThreadLocal) {
   if (isa<FunctionType>(Ty)) {
     GenerateError("Cannot declare global vars of function type");
     return 0;
@@ -737,6 +737,7 @@
     GV->setLinkage(Linkage);
     GV->setVisibility(Visibility);
     GV->setConstant(isConstantGlobal);
+    GV->setThreadLocal(IsThreadLocal);
     InsertValue(GV, CurModule.Values);
     return GV;
   }
@@ -761,7 +762,7 @@
   // Otherwise there is no existing GV to use, create one now.
   GlobalVariable *GV =
     new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name,
-                       CurModule.CurrentModule);
+                       CurModule.CurrentModule, IsThreadLocal);
   GV->setVisibility(Visibility);
   InsertValue(GV, CurModule.Values);
   return GV;
@@ -997,6 +998,7 @@
 %type <TypeWithAttrs> ArgType
 %type <JumpTable>     JumpTable
 %type <BoolVal>       GlobalType                  // GLOBAL or CONSTANT?
+%type <BoolVal>       ThreadLocal                 // 'thread_local' or not
 %type <BoolVal>       OptVolatile                 // 'volatile' or not
 %type <BoolVal>       OptTailCall                 // TAIL CALL or plain CALL.
 %type <BoolVal>       OptSideEffect               // 'sideeffect' or not.
@@ -1038,7 +1040,7 @@
 %type <StrVal> OptSection SectionString
 
 %token ZEROINITIALIZER TRUETOK FALSETOK BEGINTOK ENDTOK
-%token DECLARE DEFINE GLOBAL CONSTANT SECTION VOLATILE
+%token DECLARE DEFINE GLOBAL CONSTANT SECTION VOLATILE THREAD_LOCAL
 %token TO DOTDOTDOT NULL_TOK UNDEF INTERNAL LINKONCE WEAK APPENDING
 %token DLLIMPORT DLLEXPORT EXTERN_WEAK
 %token OPAQUE EXTERNAL TARGET TRIPLE ALIGN
@@ -1918,6 +1920,9 @@
 // GlobalType - Match either GLOBAL or CONSTANT for global declarations...
 GlobalType : GLOBAL { $$ = false; } | CONSTANT { $$ = true; };
 
+// ThreadLocal 
+ThreadLocal : THREAD_LOCAL { $$ = true; } | { $$ = false; };
+
 
 //===----------------------------------------------------------------------===//
 //                             Rules to match Modules
@@ -1990,30 +1995,30 @@
     }
     CHECK_FOR_ERROR
   }
-  | OptGlobalAssign GVVisibilityStyle GlobalType ConstVal { 
+  | OptGlobalAssign GVVisibilityStyle ThreadLocal GlobalType ConstVal { 
     /* "Externally Visible" Linkage */
-    if ($4 == 0) 
+    if ($5 == 0) 
       GEN_ERROR("Global value initializer is not a constant");
     CurGV = ParseGlobalVariable($1, GlobalValue::ExternalLinkage,
-                                $2, $3, $4->getType(), $4);
+                                $2, $4, $5->getType(), $5, $3);
     CHECK_FOR_ERROR
   } GlobalVarAttributes {
     CurGV = 0;
   }
-  | OptGlobalAssign GVInternalLinkage GVVisibilityStyle GlobalType ConstVal {
-    if ($5 == 0) 
+  | OptGlobalAssign GVInternalLinkage GVVisibilityStyle ThreadLocal GlobalType ConstVal {
+    if ($6 == 0) 
       GEN_ERROR("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable($1, $2, $3, $4, $5->getType(), $5);
+    CurGV = ParseGlobalVariable($1, $2, $3, $5, $6->getType(), $6, $4);
     CHECK_FOR_ERROR
   } GlobalVarAttributes {
     CurGV = 0;
   }
-  | OptGlobalAssign GVExternalLinkage GVVisibilityStyle GlobalType Types {
+  | OptGlobalAssign GVExternalLinkage GVVisibilityStyle ThreadLocal GlobalType Types {
     if (!UpRefs.empty())
-      GEN_ERROR("Invalid upreference in type: " + (*$5)->getDescription());
-    CurGV = ParseGlobalVariable($1, $2, $3, $4, *$5, 0);
+      GEN_ERROR("Invalid upreference in type: " + (*$6)->getDescription());
+    CurGV = ParseGlobalVariable($1, $2, $3, $5, *$6, 0, $4);
     CHECK_FOR_ERROR
-    delete $5;
+    delete $6;
   } GlobalVarAttributes {
     CurGV = 0;
     CHECK_FOR_ERROR






More information about the llvm-commits mailing list