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

Owen Anderson resistor at mac.com
Tue Oct 17 19:22:02 PDT 2006



Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.9 -> 1.10
Lexer.l.cvs updated: 1.7 -> 1.8
llvmAsmParser.cpp.cvs updated: 1.17 -> 1.18
llvmAsmParser.h.cvs updated: 1.12 -> 1.13
llvmAsmParser.y.cvs updated: 1.17 -> 1.18
---
Log message:

Add support for the new "target data" information in .ll files.  This provides 
a better encoding of the targets data layout, rather than trying to guess it
from the endianness and pointersize like before.

Update the generated files.


---
Diffs of the changes:  (+2224 -2372)

 Lexer.cpp.cvs         | 2804 +++++++++++++++++++++++---------------------------
 Lexer.l.cvs           |    1 
 llvmAsmParser.cpp.cvs | 1684 +++++++++++++++---------------
 llvmAsmParser.h.cvs   |   75 -
 llvmAsmParser.y.cvs   |    6 
 5 files changed, 2223 insertions(+), 2347 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.9 llvm/lib/AsmParser/Lexer.cpp.cvs:1.10
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.9	Sun Sep 17 15:25:45 2006
+++ llvm/lib/AsmParser/Lexer.cpp.cvs	Tue Oct 17 21:21:48 2006
@@ -1,94 +1,51 @@
-#line 2 "Lexer.cpp"
-
-#line 4 "Lexer.cpp"
-
-#define  YY_INT_ALIGNED short int
+#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 20 "Lexer.cpp"
 /* A lexical scanner generated by flex */
 
+/* Scanner skeleton version:
+ * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.10 2006/10/18 02:21:48 resistor Exp $
+ */
+
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
 
-/* begin standard C headers. */
 #include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
 
-/* 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 */
 
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
 #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
 
-#endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
 
+#include <stdlib.h>
+#include <unistd.h>
+
+/* Use prototypes in function declarations. */
+#define YY_USE_PROTOS
+
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
@@ -96,17 +53,34 @@
 
 #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
 
@@ -121,88 +95,71 @@
  * 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 llvmAsmrestart(llvmAsmin  )
+#define YY_NEW_FILE yyrestart( yyin )
 
 #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 FILE *llvmAsmin, *llvmAsmout;
+extern int yyleng;
+extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-    /* 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. */
+/* 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. */
+
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up llvmAsmtext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
+		/* Undo effects of setting up yytext. */ \
+		*yy_cp = yy_hold_char; \
 		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up llvmAsmtext again */ \
+		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, (yytext_ptr)  )
+#define unput(c) yyunput( c, yytext_ptr )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-
-#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;
@@ -239,16 +196,12 @@
 	 */
 	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
@@ -258,197 +211,192 @@
 	 * possible backing-up.
 	 *
 	 * When we actually see the EOF, we change the status to "new"
-	 * (via llvmAsmrestart()), so that the user can continue scanning by
-	 * just pointing llvmAsmin at a new input file.
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
-
 	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-/* 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. */
+static YY_BUFFER_STATE yy_current_buffer = 0;
 
 /* 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_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
+#define YY_CURRENT_BUFFER yy_current_buffer
 
-/* 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 llvmAsmtext is formed. */
+/* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
+
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int llvmAsmleng;
+
+
+int yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0;		/* whether we need to initialize */
+static int yy_init = 1;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow llvmAsmwrap()'s to do buffer switches
- * instead of setting up a fresh llvmAsmin.  A bit of a hack ...
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-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 yyrestart YY_PROTO(( FILE *input_file ));
+
+void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
+void yy_load_buffer_state YY_PROTO(( void ));
+YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
+void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
+void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
+#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
+
+YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
+YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
+YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+
+static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
+static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
+static void yy_flex_free YY_PROTO(( void * ));
 
-#define yy_new_buffer llvmAsm_create_buffer
+#define yy_new_buffer yy_create_buffer
 
 #define yy_set_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; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_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; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
 
-/* Begin user sect3 */
 
-#define llvmAsmwrap(n) 1
-#define YY_SKIP_YYWRAP
+#define YY_USES_REJECT
 
+#define yywrap() 1
+#define YY_SKIP_YYWRAP
 typedef unsigned char YY_CHAR;
-
-FILE *llvmAsmin = (FILE *) 0, *llvmAsmout = (FILE *) 0;
-
+FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
 typedef int yy_state_type;
-
-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[]  );
+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[] ));
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up llvmAsmtext.
+ * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	llvmAsmleng = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
+	yytext_ptr = yy_bp; \
+	yyleng = (int) (yy_cp - yy_bp); \
+	yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
+	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 113
-#define YY_END_OF_BUFFER 114
-/* 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[501] =
+#define YY_NUM_RULES 114
+#define YY_END_OF_BUFFER 115
+static yyconst short int yy_acclist[192] =
+    {   0,
+      115,  113,  114,  112,  113,  114,  112,  114,  113,  114,
+      113,  114,  113,  114,  113,  114,  113,  114,  113,  114,
+      105,  113,  114,  105,  113,  114,    1,  113,  114,  113,
+      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
+      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
+      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
+      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
+      114,  104,  102,  101,  101,  108,  106,  110,  105,    1,
+       87,   41,   69,   23,  104,  101,  101,  109,  110,   20,
+      110,  111,   63,   68,   39,   34,   42,   66,    3,   54,
+
+       65,   25,   77,   67,   86,   81,   82,   64,   70,  103,
+      110,  110,   49,   78,   79,   32,   94,   95,   56,   22,
+      107,   26,    4,   61,   55,   48,   11,  110,   36,    2,
+        5,   58,   60,   50,   72,   76,   74,   75,   73,   71,
+       52,   96,   51,   57,   21,   84,   93,   45,   59,   30,
+       24,   44,    7,   89,   33,   92,   38,   62,   80,   88,
+       27,   28,   90,   53,   85,   83,   43,    6,   29,   37,
+        8,   17,    9,   10,   35,   12,   14,   13,   40,   15,
+       31,   91,   97,   99,  100,   16,   46,   98,   18,   47,
+       19
+
+    } ;
+
+static yyconst short int yy_accept[505] =
     {   0,
-        0,    0,  114,  112,  111,  111,  112,  112,  112,  112,
-      112,  112,  104,  104,    1,  112,  112,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,    0,  103,    0,  101,
-      100,  100,  107,    0,  105,    0,  109,  104,    0,    1,
-        0,    0,    0,    0,    0,    0,    0,    0,   86,    0,
-       40,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   68,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   23,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  103,  100,  100,  109,   20,  109,    0,  110,
-       62,    0,    0,   67,    0,   38,    0,   33,    0,    0,
-        0,   41,    0,    0,    0,    0,    0,   65,    0,    0,
-        3,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   53,    0,    0,    0,    0,    0,    0,    0,    0,
-       64,   25,    0,    0,   76,    0,   66,   85,    0,    0,
-        0,    0,    0,   80,    0,   81,    0,    0,    0,   63,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,   69,    0,  102,  109,    0,    0,    0,  109,    0,
-        0,    0,    0,   48,   77,   78,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   93,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   94,   55,    0,    0,   22,    0,    0,  106,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   26,    0,    0,    4,   60,    0,   54,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   47,    0,   11,
-        0,    0,  109,   35,    0,    0,    2,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    5,
-
-        0,   57,    0,    0,    0,    0,    0,    0,   59,    0,
-        0,    0,    0,    0,    0,   49,    0,    0,   71,   75,
-       73,   74,   72,   70,   51,    0,    0,   95,    0,    0,
-        0,   50,   56,   21,    0,    0,    0,    0,    0,   83,
-        0,    0,    0,    0,    0,   92,    0,   44,    0,    0,
-        0,    0,    0,    0,   58,   30,   24,    0,    0,   43,
-        0,    7,    0,    0,    0,   88,    0,   32,   91,   37,
-       61,    0,    0,   79,    0,    0,   87,   27,   28,    0,
-        0,   89,   52,   84,   82,    0,    0,    0,    0,    0,
-        0,   42,    6,   29,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,   36,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    8,    0,    0,    0,   17,
-        0,    0,    0,    0,    9,   10,    0,    0,    0,    0,
-        0,   34,    0,    0,    0,   12,   14,   13,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   39,    0,
-        0,    0,    0,    0,   15,    0,    0,    0,    0,   31,
-        0,    0,   90,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   96,    0,   98,   99,
-       16,    0,   45,    0,   97,   18,   46,    0,   19,    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,   72,   73,   73,
+       74,   75,   76,   77,   77,   78,   78,   79,   80,   80,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   82,
+       82,   83,   83,   83,   83,   83,   83,   83,   83,   83,
+       83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
+       83,   83,   83,   83,   83,   83,   83,   84,   84,   84,
+       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
+
+       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   86,   87,   89,   90,   91,   92,
+       92,   93,   94,   94,   94,   95,   95,   96,   96,   97,
+       97,   97,   97,   98,   98,   98,   98,   98,   98,   98,
+       99,   99,   99,  100,  100,  100,  100,  100,  100,  100,
+      100,  100,  100,  100,  101,  101,  101,  101,  101,  101,
+      101,  101,  101,  102,  103,  103,  103,  104,  104,  105,
+      106,  106,  106,  106,  106,  106,  107,  107,  108,  108,
+      108,  108,  109,  109,  109,  109,  109,  109,  109,  109,
+      109,  109,  109,  109,  109,  109,  109,  109,  109,  109,
+
+      109,  109,  109,  109,  110,  110,  111,  112,  112,  112,
+      112,  113,  113,  113,  113,  113,  114,  115,  116,  116,
+      116,  116,  117,  117,  117,  117,  117,  117,  117,  117,
+      117,  117,  117,  117,  117,  118,  118,  118,  118,  118,
+      118,  118,  118,  118,  118,  119,  120,  120,  120,  121,
+      121,  121,  122,  122,  122,  122,  122,  122,  122,  122,
+      122,  122,  122,  122,  122,  123,  123,  123,  124,  125,
+      125,  126,  126,  126,  126,  126,  126,  126,  126,  126,
+      126,  127,  127,  128,  128,  128,  129,  130,  130,  130,
+      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+
+      131,  131,  131,  132,  132,  133,  133,  133,  133,  133,
+      133,  133,  134,  134,  134,  134,  134,  134,  134,  135,
+      135,  135,  136,  137,  138,  139,  140,  141,  142,  142,
+      142,  143,  143,  143,  143,  144,  145,  146,  146,  146,
+      146,  146,  146,  147,  147,  147,  147,  147,  147,  148,
+      148,  149,  149,  149,  149,  149,  149,  149,  150,  151,
+      152,  152,  152,  153,  153,  154,  154,  154,  154,  155,
+      155,  156,  157,  158,  159,  159,  159,  160,  160,  160,
+      161,  162,  163,  163,  163,  164,  165,  166,  167,  167,
+      167,  167,  167,  167,  167,  168,  169,  170,  170,  170,
+
+      170,  170,  170,  170,  170,  170,  170,  170,  170,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  172,
+      172,  172,  172,  173,  173,  173,  173,  173,  174,  175,
+      175,  175,  175,  175,  175,  176,  176,  176,  176,  177,
+      178,  179,  179,  179,  179,  179,  179,  179,  179,  179,
+      179,  179,  179,  179,  179,  179,  179,  179,  179,  179,
+      179,  179,  180,  180,  180,  180,  180,  180,  181,  181,
+      181,  181,  181,  182,  182,  182,  183,  183,  183,  183,
+      183,  183,  183,  183,  183,  183,  183,  183,  183,  183,
+      184,  184,  185,  186,  187,  187,  188,  188,  189,  190,
 
+      191,  191,  192,  192
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
@@ -480,7 +428,7 @@
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[44] =
+static yyconst int yy_meta[44] =
     {   0,
         1,    1,    2,    1,    3,    1,    1,    3,    3,    3,
         3,    3,    3,    4,    1,    3,    3,    3,    3,    3,
@@ -489,256 +437,256 @@
         3,    3,    3
     } ;
 
-static yyconst flex_int16_t yy_base[506] =
+static yyconst short int yy_base[509] =
     {   0,
-        0,    0, 1090, 1091, 1091, 1091, 1085, 1074,   36,   40,
+        0,    0, 1096, 1097, 1097, 1097, 1091, 1080,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
        90,   91,   76,   96,  108,   49,   97,  110,   68,  137,
-      120,  168,  112,  115,  135,  127, 1083, 1091, 1072, 1091,
+      120,  168,  112,  115,  135,  127, 1089, 1097, 1078, 1097,
         0,  158,  173,  180,  196,   70,  201,  216,  221,    0,
-      121,  152,  123,  139,  166,  140,  162,  184, 1071,  222,
-      180,   31,  186,  232,   69,  144,  209,  234,  236,  225,
-      188,  241,  119,  235,  189,  238,  246,  245,  249,  255,
-      248,  257,  258,  264,  269, 1070,  265,  267,  271,  273,
-      275,  276,  277,  282,  284,  304,  293,  296, 1069,  305,
-
-      288,  285,  297,  308,  311,  315,  316,  323,  325,  147,
-      322,  328, 1068,    0,  343,  348, 1067,  362,  379,    0,
-     1066,  352,  335, 1065,  355, 1064,  354, 1063,  366,  368,
-      289, 1062,  348,  369,  380,  370,  382, 1061,  386,  384,
-      374,  392,  393,  388,  394,  398,  396,  400,  406,  404,
-      407,  411,  408,  413,  415,  418,  423,  421,  424,  425,
-     1060, 1059,  427,  428, 1058,  430, 1057, 1056,  454,  435,
-      443,  436,  465, 1055,  433, 1054,  434,  437,  467, 1053,
-      455,  468,  470,  331,  475,  477,  469,  471,  472,  487,
-      473,  491,  485,  479,  499,  493,  501,  495,  502,  505,
-
-      508, 1052,  506, 1091,  519,  533,  537,  541,  546,  547,
-      513,  548,  549, 1051, 1050, 1049,  550,  551,  552,  553,
-      554,  555,  509,  556,  563,  559,  560,  572,  561,  562,
-      573, 1048,  576,  579,  580,  583,  585,  586,  587,  590,
-      588, 1047, 1046,  592,  594, 1045,  593,  595,    0,  598,
-      599,  613,  601,  605,  615,  616,  611,  511,  622,  623,
-      619, 1044,  627,  629, 1043, 1042,  630, 1041,  635,  633,
-      637,  640,  641,  642,  647,  648,  649, 1040,  651, 1039,
-      655,  653,  673, 1038,  652,  654, 1037,  660,  656,  673,
-      664,  675,  678,  679,  682,  683,  684,  686,  687, 1036,
-
-      688, 1035,  690,  689,  692,  693,  696,  701, 1034,  702,
-      705,  711,  706,  712,  717, 1033,  709,  720, 1032, 1031,
-     1030, 1029, 1028, 1027, 1026,  722,  723, 1025,  724,  725,
-      729, 1024, 1023, 1022,  728,  732,  734,  730,  735, 1021,
-      731,  744,  740,  741,  749, 1020,  747, 1019,  750,  752,
-      756,  755,  758,  761, 1018, 1017, 1016,  768,  762, 1015,
-      770, 1014,  769,  771,  782, 1013,  774, 1012, 1011, 1010,
-     1009,  763,  775, 1008,  788,  783, 1007, 1006, 1005,  789,
-      791, 1004, 1003, 1002, 1001,  790,  794,  796,  795,  798,
-      799, 1000,  999,  998,  800,  806,  807,  809,  801,  811,
-
-      812,  813,  817,  814,  818,  995,  819,  825,  826,  830,
-      836,  837,  839,  838,  841,  986,  842,  843,  847,  984,
-      848,  850,  849,  853,  983,  982,  851,  859,  869,  855,
-      871,  981,  873,  874,  875,  979,  978,  977,  878,  881,
-      882,  884,  885,  857,  887,  891,  893,  892,  895,  896,
-      897,  898,  899,  903,  904,  908,  909,  910,  975,  913,
-      916,  919,  920,  921,  971,  923,  924,  926,  928,  969,
-      930,  929,  968,  931,  937,  940,  941,  943,  949,  950,
-      951,  952,  954,  955,  956,  957,  858,  959,  854,  597,
-      523,  963,  440,  965,  438,  334,  286,  966,  205, 1091,
+      121,  152,  123,  139,  166,  140,  162,  184, 1077,  222,
+      180,   31,  186,  119,  232,  208,  144,  225,  234,  236,
+      235,  188,  238,  240,  246,  241,  245,  203,  248,  256,
+      254,  258,  262,  252,  272,  274, 1076,  276,  278,  280,
+      255,  253,  283,  284,  285,  286,  288,  297,  300, 1075,
+
+      301,  292,  295,  307,  309,  318,  316,  315,  322,  312,
+      147,  329,  330, 1074,    0,  344,  349, 1073,  363,  380,
+        0, 1072,  338,  336, 1071,  355, 1070,  356, 1069,  353,
+      367,  334, 1068,  375,  365,  381,  384,  370,  371, 1067,
+      388,  392,  391,  393,  394,  395,  396,  400,  399,  407,
+      406,  409,  411,  413,  410,  414,  418,  421,  425,  426,
+      427,  429, 1066, 1065,  430,  431, 1064,  435, 1063, 1062,
+      458,  436,  439,  434,  469, 1061,  449, 1060,  438,  441,
+      458, 1059,  471,  472,  474,  473,  481,  482,  475,  476,
+      483,  488,  489,  493,  495,  496,  504,  501,  503,  505,
+
+      510,  507,  516, 1058,  511, 1097,  527,  541,  545,  549,
+      554,  555,  440,  556,  557, 1057, 1056, 1055,  558,  559,
+      560, 1054,  527,  518,  561,  189,  562,  528,  566,  563,
+      564,  567,  568,  570, 1053,  571,  587,  580,  578,  579,
+      581,  590,  591,  596, 1052, 1051,  594,  598, 1050,  597,
+      601,    0,  606,  603,  607,  602,  608,  610,  618,  620,
+      625,  623,  628,  629, 1049,  630,  626, 1048, 1047,  638,
+     1046,  634,  640,  642,  644,  646,  648,  651,  653,  652,
+     1045,  654, 1044,  656,  657,  662, 1043,  662,  665, 1042,
+      668,  671,  674,  680,  682,  683,  684,  685,  687,  686,
+
+      689,  690, 1041,  691, 1040,  696,  692,  695,  693,  700,
+      699, 1039,  710,  712,  713,  714,  715,  719, 1038,  718,
+      722, 1037, 1036, 1035, 1034, 1033, 1032, 1031,  725,  729,
+     1030,  726,  730,  732, 1029, 1028, 1027,  731,  735,  743,
+      733,  737, 1026,  734,  746,  744,  747,  750, 1025,  752,
+     1024,  755,  761,  760,  758,  763,  764, 1023, 1022, 1021,
+      771,  762, 1020,  773, 1019,  774,  777,  779, 1018,  787,
+     1017, 1016, 1015, 1014,  778,  788, 1013,  791,  792, 1012,
+     1011, 1010,  790,  795, 1009, 1008, 1007, 1006,  793,  796,
+      798,  797,  804,  801, 1005, 1004, 1003,  809,  811,  812,
+
+      813,  814,  816,  817,  820,  822,  827,  819, 1002,  815,
+      833,  826,  839,  843,  845,  846,  847,  848,  999,  849,
+      850,  851,  990,  854,  857,  855,  856,  989,  987,  858,
+      866,  876,  862,  861,  986,  879,  880,  881,  984,  983,
+      982,  882,  884,  888,  890,  889,  863,  891,  896,  897,
+      899,  901,  900,  902,  903,  904,  908,  909,  912,  913,
+      916,  980,  918,  924,  923,  925,  926,  977,  928,  929,
+      930,  931,  975,  935,  936,  973,  934,  944,  942,  946,
+      950,  954,  956,  957,  958,  960,  961,  959,  962,  864,
+      964,  829,  766,  604,  969,  519,  965,  517,  477,  446,
 
-     1001, 1003,  214, 1007,   83
+      970,  333, 1097, 1005, 1007,   83, 1011,   80
     } ;
 
-static yyconst flex_int16_t yy_def[506] =
+static yyconst short int yy_def[509] =
     {   0,
-      500,    1,  500,  500,  500,  500,  501,  502,  503,  500,
-      502,  502,  502,  502,  504,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  501,  500,  502,  500,
-      505,  505,  500,  500,  502,  502,  502,  502,  502,  504,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  500,  505,  505,  500,  502,  502,  502,   49,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,   49,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-
-      502,  502,  502,  500,  500,  500,  500,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  169,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  500,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,    0,
+      503,    1,  503,  503,  503,  503,  504,  505,  506,  503,
+      505,  505,  505,  505,  507,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  504,  503,  505,  503,
+      508,  508,  503,  503,  505,  505,  505,  505,  505,  507,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  503,  508,  508,  503,  505,  505,  505,
+       49,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+       49,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+
+      505,  505,  505,  505,  505,  503,  503,  503,  503,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  171,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  503,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
 
-      500,  500,  500,  500,  500
+      505,  505,    0,  503,  503,  503,  503,  503
     } ;
 
-static yyconst flex_int16_t yy_nxt[1135] =
+static yyconst short int yy_nxt[1141] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
        18,   19,   20,   21,   22,    8,   23,    8,   24,   25,
        26,   27,   28,    8,   29,   30,   31,   32,   33,   34,
        35,    8,   36,   42,   40,   43,   43,   43,   43,   44,
-       44,   44,   44,   45,   45,   45,   45,   40,   46,  133,
-       40,  134,   40,   40,   47,   48,   48,   48,   48,   40,
-       47,   48,   48,   48,   48,   40,   40,   68,  117,   40,
-       83,   40,   40,   40,   51,  114,   84,   69,   56,   40,
-       89,   52,   57,   53,   40,   54,   49,   58,   55,   60,
-
-       59,   61,   40,   40,   40,   75,   76,  138,   70,   40,
-       40,   64,   62,   73,   77,   65,   63,   66,   71,   74,
-       67,   40,   78,   40,   72,   40,   80,   79,   40,   85,
-      107,   86,   40,   40,   40,   87,   40,  109,   98,   81,
-       40,   88,  121,  108,  124,   82,   90,  110,   40,  112,
-       40,   99,   40,   40,  100,  148,   91,   40,  201,   92,
-       40,  101,   93,   94,  127,   40,  111,  115,  115,  115,
-      115,  125,  139,   95,   96,   40,   97,   90,  122,   40,
-      123,   40,   43,   43,   43,   43,  128,  102,  116,   44,
-       44,   44,   44,   40,  103,  126,  104,   40,  105,   40,
-
-      132,   40,   40,  106,   47,   45,   45,   45,   45,   40,
-      118,  118,  118,  118,   40,  129,   41,  119,   40,  146,
-      135,  150,   40,  119,   47,   48,   48,   48,   48,   40,
-      120,  120,  120,  120,   40,   40,  120,  120,   40,  120,
-      120,  120,  120,  120,  120,   40,  140,   40,   40,   40,
-      130,   40,  136,  144,   40,  141,  142,  131,   40,   40,
-      145,   40,   40,  147,  137,  154,  149,  157,   40,  160,
-       40,   40,  143,  151,  152,  155,  153,   40,   40,  158,
-       40,  156,   40,  159,   40,  161,   40,  164,   40,   40,
-       40,  165,  163,  166,  162,   40,  171,   40,   40,   40,
-
-      167,   40,   40,  178,  172,  174,   40,  168,  175,   40,
-       40,  176,  173,  169,  177,  179,  170,   40,   40,  181,
-      186,   40,  182,  180,   40,  216,  187,  188,   40,   40,
-      183,  184,  190,  195,  196,   40,   40,  191,   40,  189,
-      194,   40,  185,  200,   40,  192,  197,   40,   40,  198,
-      193,  199,  115,  115,  115,  115,  202,  205,  205,  205,
-      205,   40,  203,  264,  206,   40,  211,   40,   40,  217,
-      206,  118,  118,  118,  118,   40,  210,  212,  119,   40,
-      213,   40,   40,   40,  119,  207,  208,   40,  209,  209,
-      209,  209,   40,   40,  214,   40,  215,   40,  220,   40,
-
-      225,   40,  219,  224,  218,   40,   40,   40,  222,   40,
-      221,   40,  223,   40,  226,  227,  231,   40,  232,   40,
-       40,   40,  233,  229,   40,  234,   40,  228,   40,  236,
-      230,   40,  235,  237,   40,  239,   40,   40,   40,  238,
-       40,   40,  240,   40,  242,  243,   40,   40,   40,   40,
-       40,   40,  244,   40,  241,  246,   40,  258,  252,  259,
-      248,  247,  245,  249,  249,  249,  249,  257,   40,  249,
-      249,  250,  249,  249,  249,  249,  249,  249,   40,  251,
-       40,   40,   40,   40,   40,   40,   40,  253,   40,  254,
-       40,  261,   40,  255,  263,  256,  262,  265,   40,  266,
-
-       40,  260,  269,  271,   40,  267,   40,  268,   40,  270,
-      274,  273,   40,  272,   40,   40,  278,  275,   40,   40,
-      279,   40,   40,  277,   40,  281,   40,  276,  205,  205,
-      205,  205,  280,  285,  326,  206,   40,  282,  294,  207,
-      207,  206,  283,  283,  283,  283,  283,  283,  283,  283,
-      209,  209,  209,  209,   40,  209,  209,  209,  209,   40,
-       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-      288,  291,   40,   40,   40,   40,   40,  284,  286,  287,
-      292,  296,  301,  300,  295,   40,   40,  289,  290,   40,
-      299,  297,   40,   40,  298,  293,   40,  304,   40,   40,
-
-       40,   40,  305,   40,  303,   40,   40,   40,   40,  302,
-       40,   40,   40,  308,   40,  309,  311,  306,   40,  307,
-      316,  310,  313,  312,   40,  317,   40,  320,   40,   40,
-      314,  315,   40,  318,  319,   40,   40,  322,  324,  329,
-       40,  321,   40,   40,  327,  328,   40,  325,   40,  330,
-       40,  323,  332,   40,   40,   40,  334,  331,  336,  333,
-       40,   40,   40,  335,   40,   40,   40,   40,   40,   40,
-      346,  337,  340,   40,  349,  347,  338,   40,  343,  345,
-      348,  339,  283,  283,  283,  283,   40,  342,   40,  341,
-      344,   40,   40,  350,  352,   40,   40,   40,  351,   40,
-
-       40,   40,   40,   40,  355,   40,   40,  359,  360,   40,
-      353,  354,  361,  356,   40,   40,  358,  362,   40,   40,
-      357,  363,   40,  366,   40,   40,  365,  368,  370,  364,
-       40,  369,  367,   40,  371,   40,   40,   40,   40,  372,
-      373,   40,   40,   40,   40,   40,  376,   40,   40,  377,
-      375,  379,  381,   40,   40,  382,  374,   40,  387,  384,
-       40,  378,   40,   40,  380,   40,  383,  385,   40,   40,
-      386,   40,  392,  390,   40,   40,   40,  388,  393,  389,
-      391,   40,   40,   40,   40,  397,  398,   40,   40,  395,
-      394,  401,  396,  402,  404,   40,   40,  405,  399,  400,
-
-      403,   40,   40,   40,   40,  406,  408,   40,   40,   40,
-      407,   40,   40,   40,   40,  409,  410,  413,  411,   40,
-       40,  414,   40,  421,   40,   40,   40,   40,  415,  412,
-       40,   40,   40,  422,  417,  416,  426,  420,   40,   40,
-      418,  424,  423,   40,  430,  425,  419,  429,  431,   40,
-       40,   40,   40,  427,   40,   40,   40,  428,  432,  434,
-       40,   40,   40,   40,   40,  436,   40,   40,   40,  439,
-       40,   40,   40,  433,  435,  443,  440,  444,  437,  438,
-      441,  445,   40,  447,   40,  442,   40,   40,   40,  446,
-      448,   40,  450,  449,   40,   40,  452,   40,   40,  457,
-
-       40,  451,  455,  453,   40,   40,   40,  458,   40,   40,
-       40,   40,   40,  462,  456,  464,   40,   40,  454,  460,
-      461,   40,   40,   40,  463,  465,   40,  459,  466,   40,
-      469,  470,   40,   40,   40,  467,   40,   40,  473,   40,
-      468,   40,   40,   40,   40,  477,  471,  474,  475,  476,
-       40,  482,  479,   40,   40,  472,   40,  484,  480,  483,
-      478,  481,   40,   40,   40,   40,  485,   40,   40,   40,
-       40,  486,   40,  491,  492,  493,   40,  487,   40,   40,
-      488,   40,   40,  497,   40,  490,  489,  498,   40,  496,
-       40,   40,   40,  495,   40,   40,   40,   40,  494,   40,
+       44,   44,   44,   45,   45,   45,   45,   40,   46,  134,
+       40,  135,   40,   40,   47,   48,   48,   48,   48,   40,
+       47,   48,   48,   48,   48,   40,   40,   69,  118,   40,
+       84,   40,  115,   40,   51,   41,   85,   70,   56,   40,
+       90,   52,   57,   53,   40,   54,   49,   58,   55,   60,
+
+       59,   61,   40,   40,   40,   76,   77,   64,   71,   40,
+       40,   65,   62,   74,   78,   66,   63,   67,   72,   75,
+       68,   40,   79,   40,   73,   40,   81,   80,   40,   86,
+      108,   87,   40,   40,   40,   88,   40,  110,   99,   82,
+       40,   89,  122,  109,  125,   83,   91,  111,   40,  113,
+       40,  100,   40,   40,  101,  137,   92,   40,  203,   93,
+       40,  102,   94,   95,  128,   40,  112,  116,  116,  116,
+      116,  126,  141,   96,   97,   40,   98,   91,  123,   40,
+      124,   40,   43,   43,   43,   43,  129,  103,  117,   44,
+       44,   44,   44,   40,  104,  127,  105,   40,  106,   40,
+
+      133,   40,   40,  107,   47,   45,   45,   45,   45,   40,
+      119,  119,  119,  119,   40,  130,   40,  120,  297,  148,
+      136,   40,  156,  120,   47,   48,   48,   48,   48,   40,
+      121,  121,  121,  121,   40,   40,  121,  121,   40,  121,
+      121,  121,  121,  121,  121,   40,  140,   40,   40,   40,
+      131,   40,  138,   40,   40,  143,  144,  132,   40,   40,
+      149,   40,  142,  146,  139,   40,   40,   40,   40,   40,
+      147,   40,  145,  152,  159,   40,  150,  151,  157,  162,
+      153,  154,  161,  155,  158,   40,  160,   40,  164,   40,
+      163,   40,  166,   40,  172,  171,   40,   40,   40,   40,
+
+      165,   40,  167,  173,  168,   40,  180,  182,   40,  169,
+       40,  174,  176,   40,   40,  177,  170,  181,  178,  175,
+       40,  179,   40,  183,  188,   40,  184,  186,   40,   40,
+      202,   40,  197,  198,  185,   40,  189,  190,  187,  192,
+      191,  196,   40,   40,  193,  199,   40,   40,  200,   40,
+      201,   40,  194,  116,  116,  116,  116,  195,  207,  207,
+      207,  207,  212,  204,  205,  208,   40,  213,   40,   40,
+      218,  208,  119,  119,  119,  119,   40,  214,   40,  120,
+       40,  216,  215,   40,   40,  120,  209,  210,   40,  211,
+      211,  211,  211,   40,   40,  217,  219,   40,  223,  224,
+
+      220,   40,  222,  221,   40,   40,   40,   40,   40,   40,
+      225,  227,   40,   40,  226,  229,  230,  228,  234,   40,
+       40,  235,   40,   40,   40,  237,   40,   40,  231,  236,
+      232,   40,  233,  239,   40,  240,  242,  238,   40,   40,
+       40,  241,   40,   40,   40,  243,  245,   40,   40,   40,
+      246,   40,   40,   40,   40,  247,  255,  244,  249,   40,
+      288,  261,   40,  262,  250,  251,  248,  252,  252,  252,
+      252,   40,  253,  252,  252,  254,  252,  252,  252,  252,
+      252,  252,   40,  260,   40,   40,   40,   40,   40,   40,
+       40,  256,  263,  257,   40,   40,   40,  258,  266,  259,
+
+      265,   40,   40,  268,  269,  267,   40,  264,   40,   40,
+      273,  270,  271,  272,   40,  275,   40,   40,   40,  274,
+       40,  276,  278,   40,   40,  280,  281,  277,  282,   40,
+       40,   40,   40,  284,  283,  279,  207,  207,  207,  207,
+       40,   40,  285,  208,  295,  294,  299,  209,  209,  208,
+      286,  286,  286,  286,  286,  286,  286,  286,  211,  211,
+      211,  211,   40,  211,  211,  211,  211,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,  291,   40,
+       40,   40,  302,   40,   40,  287,  289,  290,  304,  303,
+      298,   40,   40,   40,   40,  292,  293,  301,  300,  306,
+
+       40,  296,  308,   40,   40,  307,  305,   40,  311,   40,
+       40,   40,  309,  310,   40,   40,   40,   40,  312,   40,
+       40,   40,  313,   40,  314,  315,  316,  321,  319,  320,
+      323,   40,  325,   40,  317,  322,   40,  318,   40,   40,
+      327,   40,   40,   40,  324,  330,  326,   40,  329,  332,
+      331,   40,  333,   40,  334,   40,  328,   40,  336,   40,
+      335,   40,  339,  337,   40,   40,   40,   40,  338,   40,
+       40,  286,  286,  286,  286,   40,  340,  343,   40,  346,
+      349,   40,  341,  348,   40,  342,  350,   40,  351,  352,
+      345,  347,  344,   40,  353,   40,   40,   40,   40,   40,
+
+       40,  355,   40,   40,   40,   40,   40,  358,   40,   40,
+      362,  363,   40,   40,  354,  356,  357,  359,  364,  361,
+      365,  369,  360,   40,  366,   40,   40,   40,   40,  367,
+      368,   40,   40,  372,  371,   40,  373,  374,   40,   40,
+      370,  375,   40,   40,   40,   40,   40,   40,   40,  376,
+       40,  380,  379,  378,  382,  384,   40,   40,  377,   40,
+       40,  387,  390,   40,  385,   40,  381,  383,   40,  386,
+      388,   40,  389,   40,   40,   40,   40,   40,  393,   40,
+      392,  395,  396,  391,   40,  394,   40,   40,  400,  401,
+       40,   40,   40,  397,  398,  399,  404,  406,  402,  405,
+
+       40,   40,  403,   40,   40,   40,   40,  407,   40,   40,
+       40,   40,  408,  410,   40,  411,  412,   40,  409,  416,
+      413,  414,   40,  417,   40,   40,   40,   40,   40,   40,
+       40,  415,   40,   40,  418,   40,  424,  419,  425,   40,
+       40,  423,   40,  420,  433,  421,   40,  426,  427,  429,
+      428,  422,   40,  431,  430,  432,   40,  434,   40,   40,
+       40,   40,   40,   40,   40,  435,  437,   40,   40,   40,
+       40,   40,  439,  442,   40,   40,   40,   40,  446,   40,
+      451,  436,  443,  438,  447,  440,  441,  444,  448,   40,
+      450,  445,   40,   40,   40,   40,  449,   40,  453,  452,
+
+      455,   40,   40,   40,   40,  460,  456,  454,  458,   40,
+       40,  461,   40,   40,   40,   40,   40,   40,  459,  465,
+      467,   40,   40,  463,  457,   40,   40,  464,  466,   40,
+      468,   40,  462,  469,  472,  473,   40,   40,   40,   40,
+      470,   40,   40,   40,   40,  471,  476,   40,   40,   40,
+      480,  477,  474,  478,  479,   40,  482,   40,  485,   40,
+      475,  483,  486,   40,  487,  481,  484,   40,  488,   40,
+       40,   40,   40,   40,   40,   40,  489,   40,   40,  494,
+      495,  496,   40,   40,  490,  491,   40,  501,   40,  500,
+       40,  493,  492,   40,  499,   40,   40,   40,  498,   40,
 
-      499,   37,   37,   37,   37,   39,   39,   50,   40,   50,
-       50,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,  497,   40,   40,  502,   37,   37,   37,   37,   39,
+       39,   50,   40,   50,   50,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
        40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-       40,  204,   40,   40,   40,   40,  113,   40,   38,  500,
-        3,  500,  500,  500,  500,  500,  500,  500,  500,  500,
+       40,   40,   40,   40,   40,   40,   40,  206,   40,   40,
+       40,   40,  114,   40,   38,  503,    3,  503,  503,  503,
 
-      500,  500,  500,  500,  500,  500,  500,  500,  500,  500,
-      500,  500,  500,  500,  500,  500,  500,  500,  500,  500,
-      500,  500,  500,  500,  500,  500,  500,  500,  500,  500,
-      500,  500,  500,  500
+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503
     } ;
 
-static yyconst flex_int16_t yy_chk[1135] =
+static yyconst short int yy_chk[1141] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -748,150 +696,141 @@
        10,   10,   10,   11,   11,   11,   11,   11,   12,   62,
        20,   62,   26,   12,   13,   13,   13,   13,   13,   13,
        14,   14,   14,   14,   14,   14,   16,   20,   46,   17,
-       26,   29,   65,   46,   16,  505,   26,   20,   17,   23,
+       26,   29,  508,   46,   16,  506,   26,   20,   17,   23,
        29,   16,   17,   16,   18,   16,   13,   17,   16,   18,
 
-       17,   18,   19,   21,   22,   23,   23,   65,   21,   24,
+       17,   18,   19,   21,   22,   23,   23,   19,   21,   24,
        27,   19,   18,   22,   24,   19,   18,   19,   21,   22,
        19,   25,   24,   28,   21,   33,   25,   24,   34,   27,
-       33,   27,   73,   31,   51,   28,   53,   34,   31,   25,
+       33,   27,   64,   31,   51,   28,   53,   34,   31,   25,
        36,   28,   51,   33,   53,   25,   30,   35,   35,   36,
-       30,   31,   54,   56,   31,   73,   30,   66,  110,   30,
-      110,   31,   30,   30,   56,   52,   35,   42,   42,   42,
-       42,   54,   66,   30,   30,   57,   30,   32,   52,   55,
+       30,   31,   54,   56,   31,   64,   30,   67,  111,   30,
+      111,   31,   30,   30,   56,   52,   35,   42,   42,   42,
+       42,   54,   67,   30,   30,   57,   30,   32,   52,   55,
        52,   32,   43,   43,   43,   43,   57,   32,   44,   44,
        44,   44,   44,   61,   32,   55,   32,   58,   32,   63,
 
-       61,   71,   75,   32,   45,   45,   45,   45,   45,   45,
-       47,   47,   47,   47,   47,   58,  503,   47,  499,   71,
-       63,   75,   67,   47,   48,   48,   48,   48,   48,   48,
-       49,   49,   49,   49,   49,   60,   49,   49,   70,   49,
-       49,   49,   49,   49,   49,   64,   67,   68,   74,   69,
-       60,   76,   64,   70,   72,   68,   69,   60,   78,   77,
-       70,   81,   79,   72,   64,   77,   74,   79,   80,   81,
-       82,   83,   69,   76,   76,   78,   76,   84,   87,   79,
-       88,   78,   85,   80,   89,   82,   90,   85,   91,   92,
-       93,   87,   84,   88,   83,   94,   92,   95,  102,  497,
-
-       89,  101,  131,   94,   92,   93,   97,   89,   93,   98,
-      103,   93,   92,   90,   93,   95,   91,   96,  100,   97,
-      101,  104,   98,   96,  105,  131,  102,  103,  106,  107,
-       98,  100,  105,  107,  107,  111,  108,  105,  109,  104,
-      106,  112,  100,  109,  184,  105,  107,  496,  123,  108,
-      105,  108,  115,  115,  115,  115,  111,  116,  116,  116,
-      116,  133,  112,  184,  116,  122,  123,  127,  125,  133,
-      116,  118,  118,  118,  118,  118,  122,  125,  118,  129,
-      127,  130,  134,  136,  118,  119,  119,  141,  119,  119,
-      119,  119,  119,  135,  129,  137,  130,  140,  136,  139,
-
-      141,  144,  135,  140,  134,  142,  143,  145,  139,  147,
-      137,  146,  139,  148,  142,  143,  146,  150,  147,  149,
-      151,  153,  148,  144,  152,  149,  154,  143,  155,  151,
-      145,  156,  150,  152,  158,  154,  157,  159,  160,  153,
-      163,  164,  155,  166,  157,  158,  175,  177,  170,  172,
-      178,  495,  159,  493,  156,  163,  171,  177,  172,  178,
-      166,  164,  160,  169,  169,  169,  169,  175,  181,  169,
-      169,  170,  169,  169,  169,  169,  169,  169,  173,  171,
-      179,  182,  187,  183,  188,  189,  191,  173,  185,  173,
-      186,  181,  194,  173,  183,  173,  182,  185,  193,  186,
-
-      190,  179,  189,  191,  192,  187,  196,  188,  198,  190,
-      194,  193,  195,  192,  197,  199,  198,  195,  200,  203,
-      199,  201,  223,  197,  258,  201,  211,  196,  205,  205,
-      205,  205,  200,  211,  258,  205,  491,  203,  223,  206,
-      206,  205,  206,  206,  206,  206,  207,  207,  207,  207,
-      208,  208,  208,  208,  208,  209,  209,  209,  209,  209,
-      210,  212,  213,  217,  218,  219,  220,  221,  222,  224,
-      217,  220,  226,  227,  229,  230,  225,  210,  212,  213,
-      221,  225,  230,  229,  224,  228,  231,  218,  219,  233,
-      228,  226,  234,  235,  227,  222,  236,  234,  237,  238,
-
-      239,  241,  235,  240,  233,  244,  247,  245,  248,  231,
-      490,  250,  251,  238,  253,  239,  241,  236,  254,  237,
-      250,  240,  245,  244,  257,  251,  252,  254,  255,  256,
-      247,  248,  261,  252,  253,  259,  260,  255,  256,  261,
-      263,  254,  264,  267,  259,  260,  270,  257,  269,  263,
-      271,  255,  267,  272,  273,  274,  270,  264,  272,  269,
-      275,  276,  277,  271,  279,  285,  282,  286,  281,  289,
-      285,  273,  276,  288,  289,  286,  274,  291,  281,  282,
-      288,  275,  283,  283,  283,  283,  290,  279,  292,  277,
-      281,  293,  294,  290,  292,  295,  296,  297,  291,  298,
-
-      299,  301,  304,  303,  295,  305,  306,  299,  301,  307,
-      293,  294,  303,  296,  308,  310,  298,  304,  311,  313,
-      297,  305,  317,  308,  312,  314,  307,  311,  313,  306,
-      315,  312,  310,  318,  314,  326,  327,  329,  330,  315,
-      317,  335,  331,  338,  341,  336,  327,  337,  339,  329,
-      326,  331,  336,  343,  344,  337,  318,  342,  343,  339,
-      347,  330,  345,  349,  335,  350,  338,  341,  352,  351,
-      342,  353,  350,  347,  354,  359,  372,  344,  351,  345,
-      349,  358,  363,  361,  364,  358,  358,  367,  373,  353,
-      352,  363,  354,  364,  367,  365,  376,  372,  359,  361,
-
-      365,  375,  380,  386,  381,  373,  376,  387,  389,  388,
-      375,  390,  391,  395,  399,  380,  381,  388,  386,  396,
-      397,  389,  398,  399,  400,  401,  402,  404,  390,  387,
-      403,  405,  407,  400,  395,  391,  404,  398,  408,  409,
-      396,  402,  401,  410,  409,  403,  397,  408,  410,  411,
-      412,  414,  413,  405,  415,  417,  418,  407,  411,  413,
-      419,  421,  423,  422,  427,  415,  424,  489,  430,  419,
-      444,  487,  428,  412,  414,  424,  421,  427,  417,  418,
-      422,  428,  429,  430,  431,  423,  433,  434,  435,  429,
-      431,  439,  434,  433,  440,  441,  439,  442,  443,  444,
-
-      445,  435,  442,  440,  446,  448,  447,  445,  449,  450,
-      451,  452,  453,  449,  443,  451,  454,  455,  441,  447,
-      448,  456,  457,  458,  450,  452,  460,  446,  453,  461,
-      456,  457,  462,  463,  464,  454,  466,  467,  461,  468,
-      455,  469,  472,  471,  474,  466,  458,  462,  463,  464,
-      475,  472,  468,  476,  477,  460,  478,  475,  469,  474,
-      467,  471,  479,  480,  481,  482,  476,  483,  484,  485,
-      486,  477,  488,  482,  483,  484,  492,  478,  494,  498,
-      479,  473,  470,  492,  465,  481,  480,  494,  459,  488,
-      438,  437,  436,  486,  432,  426,  425,  420,  485,  416,
-
-      498,  501,  501,  501,  501,  502,  502,  504,  406,  504,
-      504,  394,  393,  392,  385,  384,  383,  382,  379,  378,
-      377,  374,  371,  370,  369,  368,  366,  362,  360,  357,
-      356,  355,  348,  346,  340,  334,  333,  332,  328,  325,
-      324,  323,  322,  321,  320,  319,  316,  309,  302,  300,
-      287,  284,  280,  278,  268,  266,  265,  262,  246,  243,
-      242,  232,  216,  215,  214,  202,  180,  176,  174,  168,
-      167,  165,  162,  161,  138,  132,  128,  126,  124,  121,
-      117,  113,   99,   86,   59,   39,   37,    8,    7,    3,
-      500,  500,  500,  500,  500,  500,  500,  500,  500,  500,
-
-      500,  500,  500,  500,  500,  500,  500,  500,  500,  500,
-      500,  500,  500,  500,  500,  500,  500,  500,  500,  500,
-      500,  500,  500,  500,  500,  500,  500,  500,  500,  500,
-      500,  500,  500,  500
+       61,   72,  226,   32,   45,   45,   45,   45,   45,   45,
+       47,   47,   47,   47,   47,   58,   78,   47,  226,   72,
+       63,   66,   78,   47,   48,   48,   48,   48,   48,   48,
+       49,   49,   49,   49,   49,   60,   49,   49,   68,   49,
+       49,   49,   49,   49,   49,   65,   66,   69,   71,   70,
+       60,   73,   65,   74,   76,   69,   70,   60,   77,   75,
+       73,   79,   68,   71,   65,   84,   92,   81,   91,   80,
+       71,   82,   70,   76,   80,   83,   74,   75,   79,   82,
+       77,   77,   81,   77,   79,   85,   80,   86,   84,   88,
+       83,   89,   86,   90,   92,   91,   93,   94,   95,   96,
+
+       85,   97,   88,   93,   89,  102,   95,   97,  103,   90,
+       98,   93,   94,   99,  101,   94,   90,   96,   94,   93,
+      104,   94,  105,   98,  102,  110,   99,  101,  108,  107,
+      110,  106,  108,  108,   99,  109,  103,  104,  101,  106,
+      105,  107,  112,  113,  106,  108,  502,  132,  109,  124,
+      109,  123,  106,  116,  116,  116,  116,  106,  117,  117,
+      117,  117,  123,  112,  113,  117,  130,  124,  126,  128,
+      132,  117,  119,  119,  119,  119,  119,  126,  135,  119,
+      131,  130,  128,  138,  139,  119,  120,  120,  134,  120,
+      120,  120,  120,  120,  136,  131,  134,  137,  138,  139,
+
+      135,  141,  137,  136,  143,  142,  144,  145,  146,  147,
+      141,  142,  149,  148,  141,  144,  145,  143,  148,  151,
+      150,  149,  152,  155,  153,  151,  154,  156,  145,  150,
+      146,  157,  147,  153,  158,  154,  156,  152,  159,  160,
+      161,  155,  162,  165,  166,  157,  159,  174,  168,  172,
+      160,  179,  173,  213,  180,  161,  174,  158,  165,  500,
+      213,  179,  177,  180,  166,  168,  162,  171,  171,  171,
+      171,  181,  172,  171,  171,  173,  171,  171,  171,  171,
+      171,  171,  175,  177,  183,  184,  186,  185,  189,  190,
+      499,  175,  181,  175,  187,  188,  191,  175,  185,  175,
+
+      184,  192,  193,  187,  188,  186,  194,  183,  195,  196,
+      192,  189,  190,  191,  198,  194,  199,  197,  200,  193,
+      202,  195,  197,  201,  205,  199,  200,  196,  201,  203,
+      498,  224,  496,  203,  202,  198,  207,  207,  207,  207,
+      223,  228,  205,  207,  224,  223,  228,  208,  208,  207,
+      208,  208,  208,  208,  209,  209,  209,  209,  210,  210,
+      210,  210,  210,  211,  211,  211,  211,  211,  212,  214,
+      215,  219,  220,  221,  225,  227,  230,  231,  219,  229,
+      232,  233,  231,  234,  236,  212,  214,  215,  233,  232,
+      227,  239,  240,  238,  241,  220,  221,  230,  229,  236,
+
+      237,  225,  238,  242,  243,  237,  234,  247,  241,  244,
+      250,  248,  239,  240,  251,  256,  254,  494,  242,  253,
+      255,  257,  243,  258,  244,  247,  248,  255,  253,  254,
+      257,  259,  258,  260,  250,  256,  262,  251,  261,  267,
+      259,  263,  264,  266,  257,  262,  258,  272,  261,  264,
+      263,  270,  266,  273,  267,  274,  260,  275,  272,  276,
+      270,  277,  275,  273,  278,  280,  279,  282,  274,  284,
+      285,  286,  286,  286,  286,  288,  276,  279,  289,  284,
+      288,  291,  277,  285,  292,  278,  289,  293,  291,  292,
+      282,  284,  280,  294,  293,  295,  296,  297,  298,  300,
+
+      299,  295,  301,  302,  304,  307,  309,  298,  308,  306,
+      302,  304,  311,  310,  294,  296,  297,  299,  306,  301,
+      307,  311,  300,  313,  308,  314,  315,  316,  317,  309,
+      310,  320,  318,  315,  314,  321,  316,  317,  329,  332,
+      313,  318,  330,  333,  338,  334,  341,  344,  339,  320,
+      342,  332,  330,  329,  334,  339,  340,  346,  321,  345,
+      347,  342,  346,  348,  340,  350,  333,  338,  352,  341,
+      344,  355,  345,  354,  353,  362,  356,  357,  350,  493,
+      348,  353,  354,  347,  361,  352,  364,  366,  361,  361,
+      367,  375,  368,  355,  356,  357,  366,  368,  362,  367,
+
+      370,  376,  364,  383,  378,  379,  389,  370,  384,  390,
+      392,  391,  375,  378,  394,  379,  383,  393,  376,  391,
+      384,  389,  398,  392,  399,  400,  401,  402,  410,  403,
+      404,  390,  408,  405,  393,  406,  402,  394,  403,  412,
+      407,  401,  492,  398,  412,  399,  411,  404,  405,  407,
+      406,  400,  413,  410,  408,  411,  414,  413,  415,  416,
+      417,  418,  420,  421,  422,  414,  416,  424,  426,  427,
+      425,  430,  418,  422,  434,  433,  447,  490,  427,  431,
+      434,  415,  424,  417,  430,  420,  421,  425,  431,  432,
+      433,  426,  436,  437,  438,  442,  432,  443,  437,  436,
+
+      442,  444,  446,  445,  448,  447,  443,  438,  445,  449,
+      450,  448,  451,  453,  452,  454,  455,  456,  446,  452,
+      454,  457,  458,  450,  444,  459,  460,  451,  453,  461,
+      455,  463,  449,  456,  459,  460,  465,  464,  466,  467,
+      457,  469,  470,  471,  472,  458,  464,  477,  474,  475,
+      469,  465,  461,  466,  467,  479,  471,  478,  475,  480,
+      463,  472,  477,  481,  478,  470,  474,  482,  479,  483,
+      484,  485,  488,  486,  487,  489,  480,  491,  497,  485,
+      486,  487,  495,  501,  481,  482,  476,  497,  473,  495,
+      468,  484,  483,  462,  491,  441,  440,  439,  489,  435,
+
+      429,  488,  428,  423,  501,  504,  504,  504,  504,  505,
+      505,  507,  419,  507,  507,  409,  397,  396,  395,  388,
+      387,  386,  385,  382,  381,  380,  377,  374,  373,  372,
+      371,  369,  365,  363,  360,  359,  358,  351,  349,  343,
+      337,  336,  335,  331,  328,  327,  326,  325,  324,  323,
+      322,  319,  312,  305,  303,  290,  287,  283,  281,  271,
+      269,  268,  265,  249,  246,  245,  235,  222,  218,  217,
+      216,  204,  182,  178,  176,  170,  169,  167,  164,  163,
+      140,  133,  129,  127,  125,  122,  118,  114,  100,   87,
+       59,   39,   37,    8,    7,    3,  503,  503,  503,  503,
+
+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503,
+      503,  503,  503,  503,  503,  503,  503,  503,  503,  503
     } ;
 
-/* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[114] =
-    {   0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,     };
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-extern int 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
+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; \
+}
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-char *llvmAsmtext;
-#line 1 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+char *yytext;
+#line 1 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#define INITIAL 0
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
 //                     The LLVM Compiler Infrastructure
@@ -904,7 +843,8 @@
 //  This file implements the flex scanner for LLVM assembly languages files.
 //
 //===----------------------------------------------------------------------===*/
-#line 28 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#define YY_NEVER_INTERACTIVE 1
+#line 28 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -913,10 +853,10 @@
 #include <cstdlib>
 
 void set_scan_file(FILE * F){
-  llvmAsm_switch_to_buffer(llvmAsm_create_buffer(F,YY_BUF_SIZE ) );
+  yy_switch_to_buffer(yy_create_buffer( F, YY_BUF_SIZE ) );
 }
 void set_scan_string (const char * str) {
-  llvmAsm_scan_string (str);
+  yy_scan_string (str);
 }
 
 #define RET_TOK(type, Enum, sym) \
@@ -1030,23 +970,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1034 "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 );
+#line 974 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1054,30 +978,65 @@
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int llvmAsmwrap (void );
+extern "C" int yywrap YY_PROTO(( void ));
 #else
-extern int llvmAsmwrap (void );
+extern int yywrap YY_PROTO(( 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 (char *,yyconst char *,int );
+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen YY_PROTO(( yyconst char * ));
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+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
+
 #else
-static int input (void );
+#define YY_NO_PUSH_STATE 1
+#define YY_NO_POP_STATE 1
+#define YY_NO_TOP_STATE 1
 #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. */
@@ -1086,11 +1045,12 @@
 #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( llvmAsmtext, llvmAsmleng, 1, llvmAsmout )
+#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1098,35 +1058,21 @@
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+	if ( yy_current_buffer->yy_is_interactive ) \
 		{ \
-		int c = '*'; \
-		size_t n; \
+		int c = '*', n; \
 		for ( n = 0; n < max_size && \
-			     (c = getc( llvmAsmin )) != EOF && c != '\n'; ++n ) \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( llvmAsmin ) ) \
+		if ( c == EOF && ferror( yyin ) ) \
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	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); \
-			} \
-		}\
-\
-
+	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
+		  && ferror( yyin ) ) \
+		YY_FATAL_ERROR( "input in flex scanner failed" );
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -1147,20 +1093,14 @@
 #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_IS_OURS 1
-
-extern int llvmAsmlex (void);
-
-#define YY_DECL int llvmAsmlex (void)
-#endif /* !YY_DECL */
+#define YY_DECL int yylex YY_PROTO(( void ))
+#endif
 
-/* Code executed at the beginning of each rule, after llvmAsmtext and llvmAsmleng
+/* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -1175,655 +1115,658 @@
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
-/** The main scanner function which does all the work.
- */
 YY_DECL
-{
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-    
-#line 179 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+
+#line 179 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 
 
-#line 1190 "Lexer.cpp"
+#line 1128 "Lexer.cpp"
 
-	if ( !(yy_init) )
+	if ( yy_init )
 		{
-		(yy_init) = 1;
+		yy_init = 0;
 
 #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 ( ! llvmAsmin )
-			llvmAsmin = stdin;
+		if ( ! yyin )
+			yyin = stdin;
 
-		if ( ! llvmAsmout )
-			llvmAsmout = stdout;
+		if ( ! yyout )
+			yyout = stdout;
 
-		if ( ! YY_CURRENT_BUFFER ) {
-			llvmAsmensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE );
-		}
+		if ( ! yy_current_buffer )
+			yy_current_buffer =
+				yy_create_buffer( yyin, YY_BUF_SIZE );
 
-		llvmAsm_load_buffer_state( );
+		yy_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 llvmAsmtext. */
-		*yy_cp = (yy_hold_char);
+		/* Support of yytext. */
+		*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_current_state = yy_start;
+		yy_state_ptr = yy_state_buf;
+		*yy_state_ptr++ = yy_current_state;
 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 >= 501 )
+				if ( yy_current_state >= 504 )
 					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 != 500 );
-		yy_cp = (yy_last_accepting_cpos);
-		yy_current_state = (yy_last_accepting_state);
+		while ( yy_current_state != 503 );
 
 yy_find_action:
-		yy_act = yy_accept[yy_current_state];
+		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_DO_BEFORE_ACTION;
 
-		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
+		if ( yy_act != YY_END_OF_BUFFER )
 			{
 			int yyl;
-			for ( yyl = 0; yyl < llvmAsmleng; ++yyl )
-				if ( llvmAsmtext[yyl] == '\n' )
-					   
-    llvmAsmlineno++;
-;
+			for ( yyl = 0; yyl < yyleng; ++yyl )
+				if ( yytext[yyl] == '\n' )
+					++yylineno;
 			}
 
 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 181 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 181 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 183 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 183 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 184 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 184 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 185 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 185 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 186 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 186 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 187 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 187 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 188 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 188 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 189 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 189 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 190 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 190 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 191 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 191 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 192 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 192 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 193 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 193 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 194 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 194 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 195 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 195 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 196 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 196 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 197 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 197 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }    /* Deprecated, turn into external */
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 198 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 198 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 199 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 199 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return IMPLEMENTATION; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 200 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 200 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 201 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 201 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 202 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 202 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 203 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 203 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 204 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 204 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 205 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 205 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 206 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 206 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return NOT; }  /* Deprecated, turned into XOR */
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 207 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 207 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 208 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 208 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 209 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 209 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 210 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 210 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 211 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 211 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return ENDIAN; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 212 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 212 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { return POINTERSIZE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 213 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return LITTLE; }
+#line 213 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return DATA; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 214 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return BIG; }
+#line 214 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return LITTLE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 215 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return VOLATILE; }
+#line 215 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return BIG; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 216 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return ALIGN;  }
+#line 216 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return VOLATILE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 217 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return SECTION; }
+#line 217 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return ALIGN;  }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 218 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return MODULE; }
+#line 218 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return SECTION; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 219 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return ASM_TOK; }
+#line 219 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return MODULE; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 220 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return SIDEEFFECT; }
+#line 220 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return ASM_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 222 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return CC_TOK; }
+#line 221 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return SIDEEFFECT; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 223 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return CCC_TOK; }
+#line 223 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return CC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 224 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return CSRETCC_TOK; }
+#line 224 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return CCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 225 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return FASTCC_TOK; }
+#line 225 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return CSRETCC_TOK; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 226 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return COLDCC_TOK; }
+#line 226 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return FASTCC_TOK; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 227 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return X86_STDCALLCC_TOK; }
+#line 227 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return COLDCC_TOK; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 228 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return X86_FASTCALLCC_TOK; }
+#line 228 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 230 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::VoidTy  ; return VOID;   }
+#line 229 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 231 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::BoolTy  ; return BOOL;   }
+#line 231 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::VoidTy  ; return VOID;   }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 232 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::SByteTy ; return SBYTE;  }
+#line 232 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::BoolTy  ; return BOOL;   }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 233 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::UByteTy ; return UBYTE;  }
+#line 233 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::SByteTy ; return SBYTE;  }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 234 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::ShortTy ; return SHORT;  }
+#line 234 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::UByteTy ; return UBYTE;  }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 235 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::UShortTy; return USHORT; }
+#line 235 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::ShortTy ; return SHORT;  }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 236 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::IntTy   ; return INT;    }
+#line 236 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::UShortTy; return USHORT; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 237 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::UIntTy  ; return UINT;   }
+#line 237 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::IntTy   ; return INT;    }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 238 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::LongTy  ; return LONG;   }
+#line 238 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::UIntTy  ; return UINT;   }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 239 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::ULongTy ; return ULONG;  }
+#line 239 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::LongTy  ; return LONG;   }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 240 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::FloatTy ; return FLOAT;  }
+#line 240 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::ULongTy ; return ULONG;  }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 241 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::DoubleTy; return DOUBLE; }
+#line 241 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::FloatTy ; return FLOAT;  }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 242 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.PrimType = Type::LabelTy ; return LABEL;  }
+#line 242 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::DoubleTy; return DOUBLE; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 243 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return TYPE;   }
+#line 243 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.PrimType = Type::LabelTy ; return LABEL;  }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 244 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return OPAQUE; }
+#line 244 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return TYPE;   }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 246 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Add, ADD); }
+#line 245 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return OPAQUE; }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 247 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Sub, SUB); }
+#line 247 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 248 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Mul, MUL); }
+#line 248 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 249 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Div, DIV); }
+#line 249 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 250 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Rem, REM); }
+#line 250 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Div, DIV); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 251 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, And, AND); }
+#line 251 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Rem, REM); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 252 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Or , OR ); }
+#line 252 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 253 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Xor, XOR); }
+#line 253 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 254 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetNE, SETNE); }
+#line 254 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 255 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
+#line 255 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetNE, SETNE); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 256 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetLT, SETLT); }
+#line 256 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 257 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetGT, SETGT); }
+#line 257 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetLT, SETLT); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 258 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetLE, SETLE); }
+#line 258 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetGT, SETGT); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 259 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SetGE, SETGE); }
+#line 259 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetLE, SETLE); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 261 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
+#line 260 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SetGE, SETGE); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 262 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Call, CALL); }
+#line 262 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 263 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Cast, CAST); }
+#line 263 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 264 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Select, SELECT); }
+#line 264 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Cast, CAST); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 265 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shl, SHL); }
+#line 265 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 266 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shr, SHR); }
+#line 266 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Shl, SHL); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 267 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return VANEXT_old; }
+#line 267 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Shr, SHR); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 268 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return VAARG_old; }
+#line 268 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return VANEXT_old; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 269 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, VAArg , VAARG); }
+#line 269 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return VAARG_old; }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 270 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Ret, RET); }
+#line 270 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 271 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Br, BR); }
+#line 271 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 272 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Switch, SWITCH); }
+#line 272 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 273 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Invoke, INVOKE); }
+#line 273 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 274 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unwind, UNWIND); }
+#line 274 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 275 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
+#line 275 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 277 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Malloc, MALLOC); }
+#line 276 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 278 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
+#line 278 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 279 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Free, FREE); }
+#line 279 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 280 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Load, LOAD); }
+#line 280 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 281 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Store, STORE); }
+#line 281 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 282 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
+#line 282 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 284 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
+#line 283 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 285 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+#line 285 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 286 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+#line 286 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 289 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 287 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+	YY_BREAK
+case 101:
+YY_RULE_SETUP
+#line 290 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
-                  UnEscapeLexed(llvmAsmtext+1);
-                  llvmAsmlval.StrVal = strdup(llvmAsmtext+1);             // Skip %
+                  UnEscapeLexed(yytext+1);
+                  llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
                   return VAR_ID;
                 }
 	YY_BREAK
-case 101:
+case 102:
 YY_RULE_SETUP
-#line 294 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 295 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
-                  llvmAsmtext[strlen(llvmAsmtext)-1] = 0;  // nuke colon
-                  UnEscapeLexed(llvmAsmtext);
-                  llvmAsmlval.StrVal = strdup(llvmAsmtext);
+                  yytext[strlen(yytext)-1] = 0;  // nuke colon
+                  UnEscapeLexed(yytext);
+                  llvmAsmlval.StrVal = strdup(yytext);
                   return LABELSTR;
                 }
 	YY_BREAK
-case 102:
-/* rule 102 can match eol */
+case 103:
 YY_RULE_SETUP
-#line 300 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 301 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
-                  llvmAsmtext[strlen(llvmAsmtext)-2] = 0;  // nuke colon, end quote
-                  UnEscapeLexed(llvmAsmtext+1);
-                  llvmAsmlval.StrVal = strdup(llvmAsmtext+1);
+                  yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
+                  UnEscapeLexed(yytext+1);
+                  llvmAsmlval.StrVal = strdup(yytext+1);
                   return LABELSTR;
                 }
 	YY_BREAK
-case 103:
-/* rule 103 can match eol */
+case 104:
 YY_RULE_SETUP
-#line 307 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 308 "/Users/resistor/llvm/src/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.
                    //
-                   llvmAsmtext[strlen(llvmAsmtext)-1] = 0;           // nuke end quote
-                   llvmAsmlval.StrVal = strdup(llvmAsmtext+1);  // Nuke start quote
+                   yytext[strlen(yytext)-1] = 0;           // nuke end quote
+                   llvmAsmlval.StrVal = strdup(yytext+1);  // Nuke start quote
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 104:
+case 105:
 YY_RULE_SETUP
-#line 318 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.UInt64Val = atoull(llvmAsmtext); return EUINT64VAL; }
+#line 319 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.UInt64Val = atoull(yytext); return EUINT64VAL; }
 	YY_BREAK
-case 105:
+case 106:
 YY_RULE_SETUP
-#line 319 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 320 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
-                  uint64_t Val = atoull(llvmAsmtext+1);
+                  uint64_t Val = atoull(yytext+1);
                   // +1:  we have bigger negative range
                   if (Val > (uint64_t)INT64_MAX+1)
                     GenerateError("Constant too large for signed 64 bits!");
@@ -1831,30 +1774,30 @@
                   return ESINT64VAL;
                 }
 	YY_BREAK
-case 106:
+case 107:
 YY_RULE_SETUP
-#line 327 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 328 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
-                   llvmAsmlval.UInt64Val = HexIntToVal(llvmAsmtext+3);
-                   return llvmAsmtext[0] == 's' ? ESINT64VAL : EUINT64VAL;
+                   llvmAsmlval.UInt64Val = HexIntToVal(yytext+3);
+                   return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
                  }
 	YY_BREAK
-case 107:
+case 108:
 YY_RULE_SETUP
-#line 332 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 333 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
-                  uint64_t Val = atoull(llvmAsmtext+1);
+                  uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
                     GenerateError("Invalid value number (too large)!");
                   llvmAsmlval.UIntVal = unsigned(Val);
                   return UINTVAL;
                 }
 	YY_BREAK
-case 108:
+case 109:
 YY_RULE_SETUP
-#line 339 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 340 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
-                  uint64_t Val = atoull(llvmAsmtext+2);
+                  uint64_t Val = atoull(yytext+2);
                   // +1:  we have bigger negative range
                   if (Val > (uint64_t)INT32_MAX+1)
                     GenerateError("Constant too large for signed 32 bits!");
@@ -1862,67 +1805,66 @@
                   return SINTVAL;
                 }
 	YY_BREAK
-case 109:
+case 110:
 YY_RULE_SETUP
-#line 348 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.FPVal = atof(llvmAsmtext); return FPVAL; }
+#line 349 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
-case 110:
+case 111:
 YY_RULE_SETUP
-#line 349 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.FPVal = HexToFP(llvmAsmtext); return FPVAL; }
+#line 350 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 351 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 352 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
                    */
-                  llvmAsm_delete_buffer(YY_CURRENT_BUFFER);
+                  yy_delete_buffer(YY_CURRENT_BUFFER);
                   return EOF;
                 }
 	YY_BREAK
-case 111:
-/* rule 111 can match eol */
+case 112:
 YY_RULE_SETUP
-#line 359 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 360 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 112:
+case 113:
 YY_RULE_SETUP
-#line 360 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
-{ return llvmAsmtext[0]; }
+#line 361 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+{ return yytext[0]; }
 	YY_BREAK
-case 113:
+case 114:
 YY_RULE_SETUP
-#line 362 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+#line 363 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1902 "Lexer.cpp"
+#line 1844 "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_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+		if ( yy_current_buffer->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 llvmAsmin at a new source and called
-			 * llvmAsmlex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
+			 * just pointed yyin at a new source and called
+			 * yylex().  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_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = llvmAsmin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			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;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -1932,13 +1874,13 @@
 		 * end-of-buffer state).  Contrast this with the test
 		 * in input().
 		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p <= &yy_current_buffer->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
@@ -1951,42 +1893,41 @@
 
 			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_last_accepting_cpos);
-				yy_current_state = (yy_last_accepting_state);
+				yy_cp = yy_c_buf_p;
 				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 ( llvmAsmwrap( ) )
+				if ( yywrap() )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
-					 * llvmAsmtext, we can now set up
+					 * yytext, 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;
@@ -1994,30 +1935,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_LVALUE->yy_ch_buf[(yy_n_chars)];
+				yy_c_buf_p =
+				&yy_current_buffer->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;
@@ -2028,7 +1969,8 @@
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-} /* end of llvmAsmlex */
+	} /* end of yylex */
+
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -2037,20 +1979,21 @@
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-static int yy_get_next_buffer (void)
-{
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
+
+static int yy_get_next_buffer()
+	{
+	register char *dest = yy_current_buffer->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_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+	if ( yy_current_buffer->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.
@@ -2070,30 +2013,34 @@
 	/* 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_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( yy_current_buffer->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_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
 
 	else
 		{
-			int num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+		int num_to_read =
+			yy_current_buffer->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 )
 				{
@@ -2106,7 +2053,8 @@
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					llvmAsmrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					yy_flex_realloc( (void *) b->yy_ch_buf,
+							 b->yy_buf_size + 2 );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -2116,35 +2064,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_LVALUE->yy_buf_size -
+			num_to_read = yy_current_buffer->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_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
+			yy_n_chars, num_to_read );
 
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		yy_current_buffer->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;
-			llvmAsmrestart(llvmAsmin  );
+			yyrestart( yyin );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+			yy_current_buffer->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -2152,141 +2100,148 @@
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	(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;
+	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;
 
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+	yytext_ptr = &yy_current_buffer->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 (void)
-{
+static yy_state_type yy_get_previous_state()
+	{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
-    
-	yy_current_state = (yy_start);
 
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+	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 )
 		{
 		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 >= 501 )
+			if ( yy_current_state >= 504 )
 				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 );
  */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_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
+	{
 	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 >= 501 )
+		if ( yy_current_state >= 504 )
 			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 == 500);
+	yy_is_jam = (yy_current_state == 503);
+	if ( ! yy_is_jam )
+		*yy_state_ptr++ = yy_current_state;
 
 	return yy_is_jam ? 0 : yy_current_state;
-}
+	}
 
-    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 llvmAsmtext */
-	*yy_cp = (yy_hold_char);
+#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;
+
+	/* undo effects of setting up yytext */
+	*yy_cp = yy_hold_char;
 
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+	if ( yy_cp < yy_current_buffer->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_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		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 char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+				&yy_current_buffer->yy_ch_buf[number_to_move];
 
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+		while ( source > yy_current_buffer->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+		yy_current_buffer->yy_n_chars =
+			yy_n_chars = yy_current_buffer->yy_buf_size;
 
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
 	*--yy_cp = (char) c;
 
-    if ( c == '\n' ){
-        --llvmAsmlineno;
-    }
+	if ( c == '\n' )
+		--yylineno;
+
+	yytext_ptr = yy_bp;
+	yy_hold_char = *yy_cp;
+	yy_c_buf_p = yy_cp;
+	}
+#endif	/* ifndef YY_NO_UNPUT */
 
-	(yytext_ptr) = yy_bp;
-	(yy_hold_char) = *yy_cp;
-	(yy_c_buf_p) = yy_cp;
-}
 
-#ifndef YY_NO_INPUT
 #ifdef __cplusplus
-    static int yyinput (void)
+static int yyinput()
 #else
-    static int input  (void)
+static int input()
 #endif
-
-{
+	{
 	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+	*yy_c_buf_p = yy_hold_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_LVALUE->yy_ch_buf[(yy_n_chars)] )
+		if ( yy_c_buf_p < &yy_current_buffer->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()
@@ -2300,16 +2255,16 @@
 					 */
 
 					/* Reset buffer status. */
-					llvmAsmrestart(llvmAsmin );
+					yyrestart( yyin );
 
-					/*FALLTHROUGH*/
+					/* fall through */
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( llvmAsmwrap( ) )
+					if ( yywrap() )
 						return EOF;
 
-					if ( ! (yy_did_buffer_switch_on_eof) )
+					if ( ! yy_did_buffer_switch_on_eof )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -2319,170 +2274,174 @@
 					}
 
 				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 llvmAsmtext */
-	(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 yytext */
+	yy_hold_char = *++yy_c_buf_p;
 
 	if ( c == '\n' )
-		   
-    llvmAsmlineno++;
-;
+		++yylineno;
 
 	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
+	}
 
-/** 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 );
+
+#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 );
+
+	yy_init_buffer( yy_current_buffer, input_file );
+	yy_load_buffer_state();
 	}
 
-	llvmAsm_init_buffer(YY_CURRENT_BUFFER,input_file );
-	llvmAsm_load_buffer_state( );
-}
 
-/** 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 )
+#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 )
 		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_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		*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_CURRENT_BUFFER_LVALUE = new_buffer;
-	llvmAsm_load_buffer_state( );
+	yy_current_buffer = new_buffer;
+	yy_load_buffer_state();
 
 	/* We don't actually know whether we did this switch during
-	 * EOF (llvmAsmwrap()) processing, but the only time this flag
-	 * is looked at is after llvmAsmwrap() is called, so it's safe
+	 * EOF (yywrap()) processing, but the only time this flag
+	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	(yy_did_buffer_switch_on_eof) = 1;
-}
+	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);
-}
 
-/** 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 )
-{
+#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;
+	}
+
+
+#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
+	{
 	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) llvmAsmalloc(sizeof( struct yy_buffer_state )  );
+
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in llvmAsm_create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_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 *) llvmAsmalloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
 	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in llvmAsm_create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	llvmAsm_init_buffer(b,file );
+	yy_init_buffer( b, file );
 
 	return b;
-}
+	}
 
-/** Destroy the buffer.
- * @param b a buffer created with llvmAsm_create_buffer()
- * 
- */
-    void llvmAsm_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
+
+#ifdef YY_USE_PROTOS
+void yy_delete_buffer( YY_BUFFER_STATE b )
+#else
+void yy_delete_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+	{
 	if ( ! b )
 		return;
 
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+	if ( b == yy_current_buffer )
+		yy_current_buffer = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		llvmAsmfree((void *) b->yy_ch_buf  );
+		yy_flex_free( (void *) b->yy_ch_buf );
 
-	llvmAsmfree((void *) b  );
-}
+	yy_flex_free( (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 )
 
-{
-	int oerrno = errno;
-    
-	llvmAsm_flush_buffer(b );
+#ifndef YY_ALWAYS_INTERACTIVE
+#ifndef YY_NEVER_INTERACTIVE
+extern int isatty YY_PROTO(( int ));
+#endif
+#endif
+
+#ifdef YY_USE_PROTOS
+void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
+#else
+void yy_init_buffer( b, file )
+YY_BUFFER_STATE b;
+FILE *file;
+#endif
+
+
+	{
+	yy_flush_buffer( b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* 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;
-    }
+#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
+	}
 
-        b->yy_is_interactive = 0;
-    
-	errno = oerrno;
-}
 
-/** 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 )
+#ifdef YY_USE_PROTOS
+void yy_flush_buffer( YY_BUFFER_STATE b )
+#else
+void yy_flush_buffer( b )
+YY_BUFFER_STATE b;
+#endif
+
+	{
+	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -2499,123 +2458,31 @@
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	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;
+	if ( b == yy_current_buffer )
+		yy_load_buffer_state();
 	}
 
-	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 )
-{
+#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 ( 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) llvmAsmalloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in llvmAsm_scan_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
 	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
@@ -2627,53 +2494,58 @@
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	llvmAsm_switch_to_buffer(b  );
+	yy_switch_to_buffer( b );
 
 	return b;
-}
+	}
+#endif
 
-/** Setup the input buffer state to scan a string. The next call to llvmAsmlex() will
- * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       llvmAsm_scan_bytes() instead.
- */
-YY_BUFFER_STATE llvmAsm_scan_string (yyconst char * yystr )
-{
-    
-	return llvmAsm_scan_bytes(yystr,strlen(yystr) );
-}
 
-/** 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 )
-{
+#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
+
+
+#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
+	{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
 	int i;
-    
+
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) llvmAsmalloc(n  );
+	n = len + 2;
+	buf = (char *) yy_flex_alloc( n );
 	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in llvmAsm_scan_bytes()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
-	for ( i = 0; i < _yybytes_len; ++i )
-		buf[i] = yybytes[i];
+	for ( i = 0; i < len; ++i )
+		buf[i] = bytes[i];
 
-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = llvmAsm_scan_buffer(buf,n );
+	b = yy_scan_buffer( buf, n );
 	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in llvmAsm_scan_bytes()" );
+		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
 	/* It's okay to grow etc. this buffer, and we should throw it
 	 * away when we're done.
@@ -2681,199 +2553,148 @@
 	b->yy_is_our_buffer = 1;
 
 	return b;
-}
+	}
+#endif
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
+
+#ifndef YY_NO_PUSH_STATE
+#ifdef YY_USE_PROTOS
+static void yy_push_state( int new_state )
+#else
+static void yy_push_state( new_state )
+int new_state;
 #endif
+	{
+	if ( yy_start_stack_ptr >= yy_start_stack_depth )
+		{
+		yy_size_t new_size;
 
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
+		yy_start_stack_depth += YY_START_STACK_INCR;
+		new_size = yy_start_stack_depth * sizeof( int );
 
-/* Redefine yyless() so it works in section 3 code. */
+		if ( ! yy_start_stack )
+			yy_start_stack = (int *) yy_flex_alloc( 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 )
+		else
+			yy_start_stack = (int *) yy_flex_realloc(
+					(void *) yy_start_stack, new_size );
 
-/* Accessor  methods (get/set functions) to struct members. */
+		if ( ! yy_start_stack )
+			YY_FATAL_ERROR(
+			"out of memory expanding start-condition stack" );
+		}
 
-/** Get the current line number.
- * 
- */
-int llvmAsmget_lineno  (void)
-{
-        
-    return llvmAsmlineno;
-}
+	yy_start_stack[yy_start_stack_ptr++] = YY_START;
 
-/** Get the input stream.
- * 
- */
-FILE *llvmAsmget_in  (void)
-{
-        return llvmAsmin;
-}
+	BEGIN(new_state);
+	}
+#endif
 
-/** Get the output stream.
- * 
- */
-FILE *llvmAsmget_out  (void)
-{
-        return llvmAsmout;
-}
 
-/** Get the length of the current token.
- * 
- */
-int llvmAsmget_leng  (void)
-{
-        return llvmAsmleng;
-}
+#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 current token.
- * 
- */
+	BEGIN(yy_start_stack[yy_start_stack_ptr]);
+	}
+#endif
 
-char *llvmAsmget_text  (void)
-{
-        return llvmAsmtext;
-}
 
-/** Set the current line number.
- * @param line_number
- * 
- */
-void llvmAsmset_lineno (int  line_number )
-{
-    
-    llvmAsmlineno = line_number;
-}
+#ifndef YY_NO_TOP_STATE
+static int yy_top_state()
+	{
+	return yy_start_stack[yy_start_stack_ptr - 1];
+	}
+#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 ;
-}
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
 
-void llvmAsmset_out (FILE *  out_str )
-{
-        llvmAsmout = out_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 );
+	}
 
-int llvmAsmget_debug  (void)
-{
-        return llvmAsm_flex_debug;
-}
 
-void llvmAsmset_debug (int  bdebug )
-{
-        llvmAsm_flex_debug = bdebug ;
-}
 
-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;
-}
+/* Redefine yyless() so it works in section 3 code. */
 
-/* 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( );
+#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 )
 
-    return 0;
-}
 
-/*
- * Internal utility routines.
- */
+/* Internal utility routines. */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
+#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
+	{
 	register int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-}
+	}
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
+#ifdef YY_USE_PROTOS
+static int yy_flex_strlen( yyconst char *s )
+#else
+static int yy_flex_strlen( s )
+yyconst char *s;
+#endif
+	{
 	register int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-}
+	}
 #endif
 
-void *llvmAsmalloc (yy_size_t  size )
-{
+
+#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
+	{
 	return (void *) malloc( size );
-}
+	}
 
-void *llvmAsmrealloc  (void * ptr, yy_size_t  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
+	{
 	/* 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
@@ -2882,16 +2703,24 @@
 	 * 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 362 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+	}
 
+#ifdef YY_USE_PROTOS
+static void yy_flex_free( void *ptr )
+#else
+static void yy_flex_free( ptr )
+void *ptr;
+#endif
+	{
+	free( ptr );
+	}
 
+#if YY_MAIN
+int main()
+	{
+	yylex();
+	return 0;
+	}
+#endif
+#line 363 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
 


Index: llvm/lib/AsmParser/Lexer.l.cvs
diff -u llvm/lib/AsmParser/Lexer.l.cvs:1.7 llvm/lib/AsmParser/Lexer.l.cvs:1.8
--- llvm/lib/AsmParser/Lexer.l.cvs:1.7	Sun Sep 17 15:25:45 2006
+++ llvm/lib/AsmParser/Lexer.l.cvs	Tue Oct 17 21:21:48 2006
@@ -210,6 +210,7 @@
 deplibs         { return DEPLIBS; }
 endian          { return ENDIAN; }
 pointersize     { return POINTERSIZE; }
+data          { return DATA; }
 little          { return LITTLE; }
 big             { return BIG; }
 volatile        { return VOLATILE; }


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.17 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.18
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.17	Sun Oct 15 18:27:25 2006
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Tue Oct 17 21:21:48 2006
@@ -1,5 +1,5 @@
 
-/*  A Bison parser, made from /Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y
+/*  A Bison parser, made from /Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y
     by GNU Bison version 1.28  */
 
 #define YYBISON 1  /* Identify Bison output.  */
@@ -79,45 +79,46 @@
 #define	COLDCC_TOK	322
 #define	X86_STDCALLCC_TOK	323
 #define	X86_FASTCALLCC_TOK	324
-#define	RET	325
-#define	BR	326
-#define	SWITCH	327
-#define	INVOKE	328
-#define	UNWIND	329
-#define	UNREACHABLE	330
-#define	ADD	331
-#define	SUB	332
-#define	MUL	333
-#define	DIV	334
-#define	REM	335
-#define	AND	336
-#define	OR	337
-#define	XOR	338
-#define	SETLE	339
-#define	SETGE	340
-#define	SETLT	341
-#define	SETGT	342
-#define	SETEQ	343
-#define	SETNE	344
-#define	MALLOC	345
-#define	ALLOCA	346
-#define	FREE	347
-#define	LOAD	348
-#define	STORE	349
-#define	GETELEMENTPTR	350
-#define	PHI_TOK	351
-#define	CAST	352
-#define	SELECT	353
-#define	SHL	354
-#define	SHR	355
-#define	VAARG	356
-#define	EXTRACTELEMENT	357
-#define	INSERTELEMENT	358
-#define	SHUFFLEVECTOR	359
-#define	VAARG_old	360
-#define	VANEXT_old	361
+#define	DATA	325
+#define	RET	326
+#define	BR	327
+#define	SWITCH	328
+#define	INVOKE	329
+#define	UNWIND	330
+#define	UNREACHABLE	331
+#define	ADD	332
+#define	SUB	333
+#define	MUL	334
+#define	DIV	335
+#define	REM	336
+#define	AND	337
+#define	OR	338
+#define	XOR	339
+#define	SETLE	340
+#define	SETGE	341
+#define	SETLT	342
+#define	SETGT	343
+#define	SETEQ	344
+#define	SETNE	345
+#define	MALLOC	346
+#define	ALLOCA	347
+#define	FREE	348
+#define	LOAD	349
+#define	STORE	350
+#define	GETELEMENTPTR	351
+#define	PHI_TOK	352
+#define	CAST	353
+#define	SELECT	354
+#define	SHL	355
+#define	SHR	356
+#define	VAARG	357
+#define	EXTRACTELEMENT	358
+#define	INSERTELEMENT	359
+#define	SHUFFLEVECTOR	360
+#define	VAARG_old	361
+#define	VANEXT_old	362
 
-#line 14 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 14 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 
 #include "ParserInternals.h"
 #include "llvm/CallingConv.h"
@@ -1077,7 +1078,7 @@
 }
 
 
-#line 974 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 974 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 typedef union {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1127,26 +1128,26 @@
 
 
 
-#define	YYFINAL		514
+#define	YYFINAL		517
 #define	YYFLAG		-32768
-#define	YYNTBASE	122
+#define	YYNTBASE	123
 
-#define YYTRANSLATE(x) ((unsigned)(x) <= 361 ? yytranslate[x] : 196)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 362 ? yytranslate[x] : 197)
 
 static const char 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,   111,
-   112,   120,     2,   109,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,   116,
-   108,   117,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,   112,
+   113,   121,     2,   110,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,   117,
+   109,   118,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-   113,   110,   115,     2,     2,     2,     2,     2,   121,     2,
+   114,   111,   116,     2,     2,     2,     2,     2,   122,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,   114,
-     2,     2,   118,     2,   119,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,   115,
+     2,     2,   119,     2,   120,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
      2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1170,7 +1171,7 @@
     77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
     87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
     97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-   107
+   107,   108
 };
 
 #if YYDEBUG != 0
@@ -1190,132 +1191,134 @@
    334,   343,   347,   349,   351,   353,   355,   358,   361,   366,
    369,   371,   376,   379,   384,   385,   393,   394,   402,   403,
    411,   412,   420,   424,   429,   430,   432,   434,   436,   440,
-   444,   448,   452,   456,   458,   459,   461,   463,   465,   466,
-   469,   473,   475,   477,   481,   483,   484,   493,   495,   497,
-   501,   503,   505,   508,   509,   511,   513,   514,   519,   520,
-   522,   524,   526,   528,   530,   532,   534,   536,   538,   542,
-   544,   550,   552,   554,   556,   558,   561,   564,   567,   571,
-   574,   575,   577,   580,   583,   587,   597,   607,   616,   630,
-   632,   634,   641,   647,   650,   657,   665,   667,   671,   673,
-   674,   677,   679,   685,   691,   697,   700,   705,   710,   717,
-   722,   727,   732,   737,   744,   751,   754,   762,   764,   767,
-   768,   770,   771,   775,   782,   786,   793,   796,   801,   808
+   444,   448,   452,   456,   460,   462,   463,   465,   467,   469,
+   470,   473,   477,   479,   481,   485,   487,   488,   497,   499,
+   501,   505,   507,   509,   512,   513,   515,   517,   518,   523,
+   524,   526,   528,   530,   532,   534,   536,   538,   540,   542,
+   546,   548,   554,   556,   558,   560,   562,   565,   568,   571,
+   575,   578,   579,   581,   584,   587,   591,   601,   611,   620,
+   634,   636,   638,   645,   651,   654,   661,   669,   671,   675,
+   677,   678,   681,   683,   689,   695,   701,   704,   709,   714,
+   721,   726,   731,   736,   741,   748,   755,   758,   766,   768,
+   771,   772,   774,   775,   779,   786,   790,   797,   800,   805,
+   812
 };
 
 static const short yyrhs[] = {     5,
-     0,     6,     0,     3,     0,     4,     0,    77,     0,    78,
-     0,    79,     0,    80,     0,    81,     0,    82,     0,    83,
-     0,    84,     0,    85,     0,    86,     0,    87,     0,    88,
-     0,    89,     0,    90,     0,   100,     0,   101,     0,    16,
+     0,     6,     0,     3,     0,     4,     0,    78,     0,    79,
+     0,    80,     0,    81,     0,    82,     0,    83,     0,    84,
+     0,    85,     0,    86,     0,    87,     0,    88,     0,    89,
+     0,    90,     0,    91,     0,   101,     0,   102,     0,    16,
      0,    14,     0,    12,     0,    10,     0,    17,     0,    15,
-     0,    13,     0,    11,     0,   128,     0,   129,     0,    18,
-     0,    19,     0,   164,   108,     0,     0,    41,     0,    42,
+     0,    13,     0,    11,     0,   129,     0,   130,     0,    18,
+     0,    19,     0,   165,   109,     0,     0,    41,     0,    42,
      0,    43,     0,    44,     0,    45,     0,    46,     0,    47,
      0,     0,     0,    65,     0,    66,     0,    67,     0,    68,
      0,    69,     0,    70,     0,    64,     4,     0,     0,    57,
-     4,     0,     0,   109,    57,     4,     0,    34,    24,     0,
-     0,   137,     0,     0,   109,   140,   139,     0,   137,     0,
-    57,     4,     0,   143,     0,     8,     0,   145,     0,     8,
-     0,   145,     0,     9,     0,    10,     0,    11,     0,    12,
+     4,     0,     0,   110,    57,     4,     0,    34,    24,     0,
+     0,   138,     0,     0,   110,   141,   140,     0,   138,     0,
+    57,     4,     0,   144,     0,     8,     0,   146,     0,     8,
+     0,   146,     0,     9,     0,    10,     0,    11,     0,    12,
      0,    13,     0,    14,     0,    15,     0,    16,     0,    17,
      0,    18,     0,    19,     0,    20,     0,    21,     0,    48,
-     0,   144,     0,   179,     0,   110,     4,     0,   142,   111,
-   147,   112,     0,   113,     4,   114,   145,   115,     0,   116,
-     4,   114,   145,   117,     0,   118,   146,   119,     0,   118,
-   119,     0,   145,   120,     0,   145,     0,   146,   109,   145,
-     0,   146,     0,   146,   109,    37,     0,    37,     0,     0,
-   143,   113,   150,   115,     0,   143,   113,   115,     0,   143,
-   121,    24,     0,   143,   116,   150,   117,     0,   143,   118,
-   150,   119,     0,   143,   118,   119,     0,   143,    38,     0,
-   143,    39,     0,   143,   179,     0,   143,   149,     0,   143,
-    26,     0,   128,   123,     0,   129,     4,     0,     9,    27,
-     0,     9,    28,     0,   131,     7,     0,    98,   111,   148,
-    36,   143,   112,     0,    96,   111,   148,   193,   112,     0,
-    99,   111,   148,   109,   148,   109,   148,   112,     0,   124,
-   111,   148,   109,   148,   112,     0,   125,   111,   148,   109,
-   148,   112,     0,   126,   111,   148,   109,   148,   112,     0,
-   127,   111,   148,   109,   148,   112,     0,   103,   111,   148,
-   109,   148,   112,     0,   104,   111,   148,   109,   148,   109,
-   148,   112,     0,   105,   111,   148,   109,   148,   109,   148,
-   112,     0,   150,   109,   148,     0,   148,     0,    32,     0,
-    33,     0,   153,     0,   153,   173,     0,   153,   175,     0,
-   153,    62,    61,   159,     0,   153,    25,     0,   154,     0,
-   154,   132,    20,   141,     0,   154,   175,     0,   154,    62,
-    61,   159,     0,     0,   154,   132,   133,   151,   148,   155,
-   139,     0,     0,   154,   132,    50,   151,   143,   156,   139,
-     0,     0,   154,   132,    45,   151,   143,   157,   139,     0,
-     0,   154,   132,    47,   151,   143,   158,   139,     0,   154,
-    51,   161,     0,   154,    58,   108,   162,     0,     0,    24,
-     0,    56,     0,    55,     0,    53,   108,   160,     0,    54,
-   108,     4,     0,    52,   108,    24,     0,   113,   163,   115,
-     0,   163,   109,    24,     0,    24,     0,     0,    22,     0,
-    24,     0,   164,     0,     0,   143,   165,     0,   167,   109,
-   166,     0,   166,     0,   167,     0,   167,   109,    37,     0,
-    37,     0,     0,   134,   141,   164,   111,   168,   112,   138,
-   135,     0,    29,     0,   118,     0,   133,   169,   170,     0,
-    30,     0,   119,     0,   182,   172,     0,     0,    45,     0,
-    47,     0,     0,    31,   176,   174,   169,     0,     0,    63,
-     0,     3,     0,     4,     0,     7,     0,    27,     0,    28,
-     0,    38,     0,    39,     0,    26,     0,   116,   150,   117,
-     0,   149,     0,    61,   177,    24,   109,    24,     0,   122,
-     0,   164,     0,   179,     0,   178,     0,   143,   180,     0,
-   182,   183,     0,   171,   183,     0,   184,   132,   185,     0,
-   184,   187,     0,     0,    23,     0,    71,   181,     0,    71,
-     8,     0,    72,    21,   180,     0,    72,     9,   180,   109,
-    21,   180,   109,    21,   180,     0,    73,   130,   180,   109,
-    21,   180,   113,   186,   115,     0,    73,   130,   180,   109,
-    21,   180,   113,   115,     0,    74,   134,   141,   180,   111,
-   190,   112,    36,    21,   180,    75,    21,   180,     0,    75,
-     0,    76,     0,   186,   130,   178,   109,    21,   180,     0,
-   130,   178,   109,    21,   180,     0,   132,   192,     0,   143,
-   113,   180,   109,   180,   115,     0,   188,   109,   113,   180,
-   109,   180,   115,     0,   181,     0,   189,   109,   181,     0,
-   189,     0,     0,    60,    59,     0,    59,     0,   124,   143,
-   180,   109,   180,     0,   125,   143,   180,   109,   180,     0,
-   126,   143,   180,   109,   180,     0,    49,   181,     0,   127,
-   181,   109,   181,     0,    98,   181,    36,   143,     0,    99,
-   181,   109,   181,   109,   181,     0,   102,   181,   109,   143,
-     0,   106,   181,   109,   143,     0,   107,   181,   109,   143,
-     0,   103,   181,   109,   181,     0,   104,   181,   109,   181,
-   109,   181,     0,   105,   181,   109,   181,   109,   181,     0,
-    97,   188,     0,   191,   134,   141,   180,   111,   190,   112,
-     0,   195,     0,   109,   189,     0,     0,    35,     0,     0,
-    91,   143,   136,     0,    91,   143,   109,    15,   180,   136,
-     0,    92,   143,   136,     0,    92,   143,   109,    15,   180,
-   136,     0,    93,   181,     0,   194,    94,   143,   180,     0,
-   194,    95,   181,   109,   143,   180,     0,    96,   143,   180,
-   193,     0
+     0,   145,     0,   180,     0,   111,     4,     0,   143,   112,
+   148,   113,     0,   114,     4,   115,   146,   116,     0,   117,
+     4,   115,   146,   118,     0,   119,   147,   120,     0,   119,
+   120,     0,   146,   121,     0,   146,     0,   147,   110,   146,
+     0,   147,     0,   147,   110,    37,     0,    37,     0,     0,
+   144,   114,   151,   116,     0,   144,   114,   116,     0,   144,
+   122,    24,     0,   144,   117,   151,   118,     0,   144,   119,
+   151,   120,     0,   144,   119,   120,     0,   144,    38,     0,
+   144,    39,     0,   144,   180,     0,   144,   150,     0,   144,
+    26,     0,   129,   124,     0,   130,     4,     0,     9,    27,
+     0,     9,    28,     0,   132,     7,     0,    99,   112,   149,
+    36,   144,   113,     0,    97,   112,   149,   194,   113,     0,
+   100,   112,   149,   110,   149,   110,   149,   113,     0,   125,
+   112,   149,   110,   149,   113,     0,   126,   112,   149,   110,
+   149,   113,     0,   127,   112,   149,   110,   149,   113,     0,
+   128,   112,   149,   110,   149,   113,     0,   104,   112,   149,
+   110,   149,   113,     0,   105,   112,   149,   110,   149,   110,
+   149,   113,     0,   106,   112,   149,   110,   149,   110,   149,
+   113,     0,   151,   110,   149,     0,   149,     0,    32,     0,
+    33,     0,   154,     0,   154,   174,     0,   154,   176,     0,
+   154,    62,    61,   160,     0,   154,    25,     0,   155,     0,
+   155,   133,    20,   142,     0,   155,   176,     0,   155,    62,
+    61,   160,     0,     0,   155,   133,   134,   152,   149,   156,
+   140,     0,     0,   155,   133,    50,   152,   144,   157,   140,
+     0,     0,   155,   133,    45,   152,   144,   158,   140,     0,
+     0,   155,   133,    47,   152,   144,   159,   140,     0,   155,
+    51,   162,     0,   155,    58,   109,   163,     0,     0,    24,
+     0,    56,     0,    55,     0,    53,   109,   161,     0,    54,
+   109,     4,     0,    52,   109,    24,     0,    71,   109,    24,
+     0,   114,   164,   116,     0,   164,   110,    24,     0,    24,
+     0,     0,    22,     0,    24,     0,   165,     0,     0,   144,
+   166,     0,   168,   110,   167,     0,   167,     0,   168,     0,
+   168,   110,    37,     0,    37,     0,     0,   135,   142,   165,
+   112,   169,   113,   139,   136,     0,    29,     0,   119,     0,
+   134,   170,   171,     0,    30,     0,   120,     0,   183,   173,
+     0,     0,    45,     0,    47,     0,     0,    31,   177,   175,
+   170,     0,     0,    63,     0,     3,     0,     4,     0,     7,
+     0,    27,     0,    28,     0,    38,     0,    39,     0,    26,
+     0,   117,   151,   118,     0,   150,     0,    61,   178,    24,
+   110,    24,     0,   123,     0,   165,     0,   180,     0,   179,
+     0,   144,   181,     0,   183,   184,     0,   172,   184,     0,
+   185,   133,   186,     0,   185,   188,     0,     0,    23,     0,
+    72,   182,     0,    72,     8,     0,    73,    21,   181,     0,
+    73,     9,   181,   110,    21,   181,   110,    21,   181,     0,
+    74,   131,   181,   110,    21,   181,   114,   187,   116,     0,
+    74,   131,   181,   110,    21,   181,   114,   116,     0,    75,
+   135,   142,   181,   112,   191,   113,    36,    21,   181,    76,
+    21,   181,     0,    76,     0,    77,     0,   187,   131,   179,
+   110,    21,   181,     0,   131,   179,   110,    21,   181,     0,
+   133,   193,     0,   144,   114,   181,   110,   181,   116,     0,
+   189,   110,   114,   181,   110,   181,   116,     0,   182,     0,
+   190,   110,   182,     0,   190,     0,     0,    60,    59,     0,
+    59,     0,   125,   144,   181,   110,   181,     0,   126,   144,
+   181,   110,   181,     0,   127,   144,   181,   110,   181,     0,
+    49,   182,     0,   128,   182,   110,   182,     0,    99,   182,
+    36,   144,     0,   100,   182,   110,   182,   110,   182,     0,
+   103,   182,   110,   144,     0,   107,   182,   110,   144,     0,
+   108,   182,   110,   144,     0,   104,   182,   110,   182,     0,
+   105,   182,   110,   182,   110,   182,     0,   106,   182,   110,
+   182,   110,   182,     0,    98,   189,     0,   192,   135,   142,
+   181,   112,   191,   113,     0,   196,     0,   110,   190,     0,
+     0,    35,     0,     0,    92,   144,   137,     0,    92,   144,
+   110,    15,   181,   137,     0,    93,   144,   137,     0,    93,
+   144,   110,    15,   181,   137,     0,    94,   182,     0,   195,
+    95,   144,   181,     0,   195,    96,   182,   110,   144,   181,
+     0,    97,   144,   181,   194,     0
 };
 
 #endif
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-  1096,  1097,  1105,  1106,  1116,  1116,  1116,  1116,  1116,  1117,
-  1117,  1117,  1118,  1118,  1118,  1118,  1118,  1118,  1120,  1120,
-  1124,  1124,  1124,  1124,  1125,  1125,  1125,  1125,  1126,  1126,
-  1127,  1127,  1130,  1134,  1139,  1139,  1140,  1141,  1142,  1143,
-  1144,  1145,  1148,  1148,  1149,  1150,  1151,  1152,  1153,  1154,
-  1164,  1164,  1171,  1171,  1180,  1188,  1188,  1194,  1194,  1196,
-  1201,  1215,  1215,  1216,  1216,  1218,  1228,  1228,  1228,  1228,
-  1228,  1228,  1228,  1229,  1229,  1229,  1229,  1229,  1229,  1230,
-  1234,  1238,  1246,  1254,  1267,  1272,  1284,  1294,  1298,  1309,
-  1314,  1320,  1321,  1325,  1329,  1340,  1366,  1380,  1410,  1436,
-  1457,  1470,  1480,  1485,  1546,  1553,  1562,  1568,  1574,  1578,
-  1582,  1590,  1601,  1633,  1641,  1663,  1674,  1680,  1688,  1694,
-  1700,  1709,  1713,  1721,  1721,  1731,  1739,  1744,  1748,  1752,
-  1756,  1771,  1793,  1796,  1799,  1804,  1807,  1811,  1815,  1819,
-  1823,  1828,  1832,  1835,  1838,  1842,  1855,  1856,  1858,  1862,
-  1871,  1877,  1879,  1884,  1889,  1898,  1898,  1899,  1899,  1901,
-  1908,  1914,  1921,  1925,  1931,  1936,  1941,  2036,  2036,  2038,
-  2046,  2046,  2048,  2053,  2053,  2054,  2057,  2057,  2067,  2071,
-  2076,  2080,  2084,  2088,  2092,  2096,  2100,  2104,  2108,  2133,
-  2137,  2151,  2155,  2161,  2161,  2167,  2172,  2176,  2185,  2196,
-  2201,  2213,  2226,  2230,  2234,  2239,  2248,  2267,  2276,  2332,
-  2336,  2343,  2354,  2367,  2376,  2385,  2395,  2399,  2406,  2406,
-  2408,  2412,  2417,  2433,  2448,  2462,  2475,  2483,  2491,  2499,
-  2505,  2525,  2548,  2554,  2560,  2566,  2581,  2640,  2647,  2650,
-  2655,  2659,  2666,  2671,  2677,  2682,  2688,  2696,  2708,  2723
+  1097,  1098,  1106,  1107,  1117,  1117,  1117,  1117,  1117,  1118,
+  1118,  1118,  1119,  1119,  1119,  1119,  1119,  1119,  1121,  1121,
+  1125,  1125,  1125,  1125,  1126,  1126,  1126,  1126,  1127,  1127,
+  1128,  1128,  1131,  1135,  1140,  1140,  1141,  1142,  1143,  1144,
+  1145,  1146,  1149,  1149,  1150,  1151,  1152,  1153,  1154,  1155,
+  1165,  1165,  1172,  1172,  1181,  1189,  1189,  1195,  1195,  1197,
+  1202,  1216,  1216,  1217,  1217,  1219,  1229,  1229,  1229,  1229,
+  1229,  1229,  1229,  1230,  1230,  1230,  1230,  1230,  1230,  1231,
+  1235,  1239,  1247,  1255,  1268,  1273,  1285,  1295,  1299,  1310,
+  1315,  1321,  1322,  1326,  1330,  1341,  1367,  1381,  1411,  1437,
+  1458,  1471,  1481,  1486,  1547,  1554,  1563,  1569,  1575,  1579,
+  1583,  1591,  1602,  1634,  1642,  1664,  1675,  1681,  1689,  1695,
+  1701,  1710,  1714,  1722,  1722,  1732,  1740,  1745,  1749,  1753,
+  1757,  1772,  1794,  1797,  1800,  1805,  1808,  1812,  1816,  1820,
+  1824,  1829,  1833,  1836,  1839,  1843,  1856,  1857,  1859,  1863,
+  1872,  1877,  1883,  1885,  1890,  1895,  1904,  1904,  1905,  1905,
+  1907,  1914,  1920,  1927,  1931,  1937,  1942,  1947,  2042,  2042,
+  2044,  2052,  2052,  2054,  2059,  2059,  2060,  2063,  2063,  2073,
+  2077,  2082,  2086,  2090,  2094,  2098,  2102,  2106,  2110,  2114,
+  2139,  2143,  2157,  2161,  2167,  2167,  2173,  2178,  2182,  2191,
+  2202,  2207,  2219,  2232,  2236,  2240,  2245,  2254,  2273,  2282,
+  2338,  2342,  2349,  2360,  2373,  2382,  2391,  2401,  2405,  2412,
+  2412,  2414,  2418,  2423,  2439,  2454,  2468,  2481,  2489,  2497,
+  2505,  2511,  2531,  2554,  2560,  2566,  2572,  2587,  2646,  2653,
+  2656,  2661,  2665,  2672,  2677,  2683,  2688,  2694,  2702,  2714,
+  2729
 };
 #endif
 
@@ -1331,14 +1334,14 @@
 "DLLIMPORT","DLLEXPORT","EXTERN_WEAK","OPAQUE","NOT","EXTERNAL","TARGET","TRIPLE",
 "ENDIAN","POINTERSIZE","LITTLE","BIG","ALIGN","DEPLIBS","CALL","TAIL","ASM_TOK",
 "MODULE","SIDEEFFECT","CC_TOK","CCC_TOK","CSRETCC_TOK","FASTCC_TOK","COLDCC_TOK",
-"X86_STDCALLCC_TOK","X86_FASTCALLCC_TOK","RET","BR","SWITCH","INVOKE","UNWIND",
-"UNREACHABLE","ADD","SUB","MUL","DIV","REM","AND","OR","XOR","SETLE","SETGE",
-"SETLT","SETGT","SETEQ","SETNE","MALLOC","ALLOCA","FREE","LOAD","STORE","GETELEMENTPTR",
-"PHI_TOK","CAST","SELECT","SHL","SHR","VAARG","EXTRACTELEMENT","INSERTELEMENT",
-"SHUFFLEVECTOR","VAARG_old","VANEXT_old","'='","','","'\\\\'","'('","')'","'['",
-"'x'","']'","'<'","'>'","'{'","'}'","'*'","'c'","INTVAL","EINT64VAL","ArithmeticOps",
-"LogicalOps","SetCondOps","ShiftOps","SIntType","UIntType","IntType","FPType",
-"OptAssign","OptLinkage","OptCallingConv","OptAlign","OptCAlign","SectionString",
+"X86_STDCALLCC_TOK","X86_FASTCALLCC_TOK","DATA","RET","BR","SWITCH","INVOKE",
+"UNWIND","UNREACHABLE","ADD","SUB","MUL","DIV","REM","AND","OR","XOR","SETLE",
+"SETGE","SETLT","SETGT","SETEQ","SETNE","MALLOC","ALLOCA","FREE","LOAD","STORE",
+"GETELEMENTPTR","PHI_TOK","CAST","SELECT","SHL","SHR","VAARG","EXTRACTELEMENT",
+"INSERTELEMENT","SHUFFLEVECTOR","VAARG_old","VANEXT_old","'='","','","'\\\\'",
+"'('","')'","'['","'x'","']'","'<'","'>'","'{'","'}'","'*'","'c'","INTVAL","EINT64VAL",
+"ArithmeticOps","LogicalOps","SetCondOps","ShiftOps","SIntType","UIntType","IntType",
+"FPType","OptAssign","OptLinkage","OptCallingConv","OptAlign","OptCAlign","SectionString",
 "OptSection","GlobalVarAttributes","GlobalVarAttribute","TypesV","UpRTypesV",
 "Types","PrimType","UpRTypes","TypeListI","ArgTypeListI","ConstVal","ConstExpr",
 "ConstVector","GlobalType","Module","FunctionList","ConstPool","@1","@2","@3",
@@ -1352,31 +1355,32 @@
 #endif
 
 static const short yyr1[] = {     0,
-   122,   122,   123,   123,   124,   124,   124,   124,   124,   125,
-   125,   125,   126,   126,   126,   126,   126,   126,   127,   127,
-   128,   128,   128,   128,   129,   129,   129,   129,   130,   130,
-   131,   131,   132,   132,   133,   133,   133,   133,   133,   133,
-   133,   133,   134,   134,   134,   134,   134,   134,   134,   134,
-   135,   135,   136,   136,   137,   138,   138,   139,   139,   140,
-   140,   141,   141,   142,   142,   143,   144,   144,   144,   144,
-   144,   144,   144,   144,   144,   144,   144,   144,   144,   145,
+   123,   123,   124,   124,   125,   125,   125,   125,   125,   126,
+   126,   126,   127,   127,   127,   127,   127,   127,   128,   128,
+   129,   129,   129,   129,   130,   130,   130,   130,   131,   131,
+   132,   132,   133,   133,   134,   134,   134,   134,   134,   134,
+   134,   134,   135,   135,   135,   135,   135,   135,   135,   135,
+   136,   136,   137,   137,   138,   139,   139,   140,   140,   141,
+   141,   142,   142,   143,   143,   144,   145,   145,   145,   145,
    145,   145,   145,   145,   145,   145,   145,   145,   145,   146,
-   146,   147,   147,   147,   147,   148,   148,   148,   148,   148,
-   148,   148,   148,   148,   148,   148,   148,   148,   148,   148,
-   148,   149,   149,   149,   149,   149,   149,   149,   149,   149,
-   149,   150,   150,   151,   151,   152,   153,   153,   153,   153,
-   153,   154,   154,   154,   155,   154,   156,   154,   157,   154,
-   158,   154,   154,   154,   154,   159,   160,   160,   161,   161,
-   161,   162,   163,   163,   163,   164,   164,   165,   165,   166,
-   167,   167,   168,   168,   168,   168,   169,   170,   170,   171,
-   172,   172,   173,   174,   174,   174,   176,   175,   177,   177,
-   178,   178,   178,   178,   178,   178,   178,   178,   178,   178,
-   178,   179,   179,   180,   180,   181,   182,   182,   183,   184,
-   184,   184,   185,   185,   185,   185,   185,   185,   185,   185,
-   185,   186,   186,   187,   188,   188,   189,   189,   190,   190,
-   191,   191,   192,   192,   192,   192,   192,   192,   192,   192,
-   192,   192,   192,   192,   192,   192,   192,   192,   193,   193,
-   194,   194,   195,   195,   195,   195,   195,   195,   195,   195
+   146,   146,   146,   146,   146,   146,   146,   146,   146,   147,
+   147,   148,   148,   148,   148,   149,   149,   149,   149,   149,
+   149,   149,   149,   149,   149,   149,   149,   149,   149,   149,
+   149,   150,   150,   150,   150,   150,   150,   150,   150,   150,
+   150,   151,   151,   152,   152,   153,   154,   154,   154,   154,
+   154,   155,   155,   155,   156,   155,   157,   155,   158,   155,
+   159,   155,   155,   155,   155,   160,   161,   161,   162,   162,
+   162,   162,   163,   164,   164,   164,   165,   165,   166,   166,
+   167,   168,   168,   169,   169,   169,   169,   170,   171,   171,
+   172,   173,   173,   174,   175,   175,   175,   177,   176,   178,
+   178,   179,   179,   179,   179,   179,   179,   179,   179,   179,
+   179,   179,   180,   180,   181,   181,   182,   183,   183,   184,
+   185,   185,   185,   186,   186,   186,   186,   186,   186,   186,
+   186,   186,   187,   187,   188,   189,   189,   190,   190,   191,
+   191,   192,   192,   193,   193,   193,   193,   193,   193,   193,
+   193,   193,   193,   193,   193,   193,   193,   193,   193,   194,
+   194,   195,   195,   196,   196,   196,   196,   196,   196,   196,
+   196
 };
 
 static const short yyr2[] = {     0,
@@ -1395,424 +1399,427 @@
      8,     3,     1,     1,     1,     1,     2,     2,     4,     2,
      1,     4,     2,     4,     0,     7,     0,     7,     0,     7,
      0,     7,     3,     4,     0,     1,     1,     1,     3,     3,
-     3,     3,     3,     1,     0,     1,     1,     1,     0,     2,
-     3,     1,     1,     3,     1,     0,     8,     1,     1,     3,
-     1,     1,     2,     0,     1,     1,     0,     4,     0,     1,
-     1,     1,     1,     1,     1,     1,     1,     1,     3,     1,
-     5,     1,     1,     1,     1,     2,     2,     2,     3,     2,
-     0,     1,     2,     2,     3,     9,     9,     8,    13,     1,
-     1,     6,     5,     2,     6,     7,     1,     3,     1,     0,
-     2,     1,     5,     5,     5,     2,     4,     4,     6,     4,
-     4,     4,     4,     6,     6,     2,     7,     1,     2,     0,
-     1,     0,     3,     6,     3,     6,     2,     4,     6,     4
+     3,     3,     3,     3,     1,     0,     1,     1,     1,     0,
+     2,     3,     1,     1,     3,     1,     0,     8,     1,     1,
+     3,     1,     1,     2,     0,     1,     1,     0,     4,     0,
+     1,     1,     1,     1,     1,     1,     1,     1,     1,     3,
+     1,     5,     1,     1,     1,     1,     2,     2,     2,     3,
+     2,     0,     1,     2,     2,     3,     9,     9,     8,    13,
+     1,     1,     6,     5,     2,     6,     7,     1,     3,     1,
+     0,     2,     1,     5,     5,     5,     2,     4,     4,     6,
+     4,     4,     4,     4,     6,     6,     2,     7,     1,     2,
+     0,     1,     0,     3,     6,     3,     6,     2,     4,     6,
+     4
 };
 
 static const short yydefact[] = {   145,
-    42,   131,   130,   177,    35,    36,    37,    38,    39,    40,
-    41,     0,    43,   201,   127,   128,   201,   156,   157,     0,
-     0,     0,    42,     0,   133,   174,     0,     0,    44,    45,
-    46,    47,    48,    49,     0,     0,   202,   198,    34,   171,
-   172,   173,   197,     0,     0,     0,   143,     0,     0,     0,
-     0,     0,     0,     0,    33,   175,   176,    43,   146,   129,
-    50,     1,     2,    63,    67,    68,    69,    70,    71,    72,
-    73,    74,    75,    76,    77,    78,    79,    80,     0,     0,
-     0,     0,   192,     0,     0,    62,    81,    66,   193,    82,
-   168,   169,   170,   242,   200,     0,     0,     0,   155,   144,
-   134,   132,   124,   125,     0,     0,     0,     0,   178,    83,
-     0,     0,    65,    88,    90,     0,     0,    95,    89,   241,
-     0,   222,     0,     0,     0,     0,    43,   210,   211,     5,
-     6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,     0,     0,     0,     0,     0,     0,     0,
-    19,    20,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,   199,    43,   214,     0,   238,   151,   148,   147,
-   149,   150,   154,     0,   139,   141,   137,    67,    68,    69,
-    70,    71,    72,    73,    74,    75,    76,    77,     0,     0,
-     0,     0,   135,     0,     0,     0,    87,   166,    94,    92,
-     0,     0,   226,   221,   204,   203,     0,     0,    24,    28,
-    23,    27,    22,    26,    21,    25,    29,    30,     0,     0,
-    53,    53,   247,     0,     0,   236,     0,     0,     0,     0,
+    42,   131,   130,   178,    35,    36,    37,    38,    39,    40,
+    41,     0,    43,   202,   127,   128,   202,   157,   158,     0,
+     0,     0,    42,     0,   133,   175,     0,     0,    44,    45,
+    46,    47,    48,    49,     0,     0,   203,   199,    34,   172,
+   173,   174,   198,     0,     0,     0,     0,   143,     0,     0,
+     0,     0,     0,     0,     0,    33,   176,   177,    43,   146,
+   129,    50,     1,     2,    63,    67,    68,    69,    70,    71,
+    72,    73,    74,    75,    76,    77,    78,    79,    80,     0,
+     0,     0,     0,   193,     0,     0,    62,    81,    66,   194,
+    82,   169,   170,   171,   243,   201,     0,     0,     0,     0,
+   156,   144,   134,   132,   124,   125,     0,     0,     0,     0,
+   179,    83,     0,     0,    65,    88,    90,     0,     0,    95,
+    89,   242,     0,   223,     0,     0,     0,     0,    43,   211,
+   212,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+    14,    15,    16,    17,    18,     0,     0,     0,     0,     0,
+     0,     0,    19,    20,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,   200,    43,   215,     0,   239,   151,
+   148,   147,   149,   150,   152,   155,     0,   139,   141,   137,
+    67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+    77,     0,     0,     0,     0,   135,     0,     0,     0,    87,
+   167,    94,    92,     0,     0,   227,   222,   205,   204,     0,
+     0,    24,    28,    23,    27,    22,    26,    21,    25,    29,
+    30,     0,     0,    53,    53,   248,     0,     0,   237,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,   152,    58,    58,    58,   109,   110,     3,     4,
-   107,   108,   111,   106,   102,   103,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,   153,    58,    58,    58,   109,
+   110,     3,     4,   107,   108,   111,   106,   102,   103,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   105,   104,    58,    64,    64,    91,   165,   159,   162,   163,
-     0,     0,    84,   181,   182,   183,   188,   184,   185,   186,
-   187,   179,     0,   190,   195,   194,   196,     0,   205,     0,
-     0,     0,   243,     0,   245,   240,     0,     0,     0,     0,
+     0,     0,     0,   105,   104,    58,    64,    64,    91,   166,
+   160,   163,   164,     0,     0,    84,   182,   183,   184,   189,
+   185,   186,   187,   188,   180,     0,   191,   196,   195,   197,
+     0,   206,     0,     0,     0,   244,     0,   246,   241,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   153,     0,   140,   142,   138,     0,     0,
-     0,     0,     0,     0,    97,   123,     0,     0,   101,     0,
-    98,     0,     0,     0,     0,   136,    85,    86,   158,   160,
-     0,    56,    93,   180,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   250,     0,     0,   228,     0,   230,   233,
-     0,     0,   231,   232,     0,     0,     0,   227,     0,   248,
-     0,     0,     0,    60,    58,   240,     0,     0,     0,     0,
-     0,     0,    96,    99,   100,     0,     0,     0,     0,   164,
-   161,    57,    51,     0,   189,     0,     0,   220,    53,    54,
-    53,   217,   239,     0,     0,     0,     0,     0,   223,   224,
-   225,   220,     0,    55,    61,    59,     0,     0,     0,     0,
-     0,     0,   122,     0,     0,     0,     0,     0,   167,     0,
-     0,     0,   219,     0,     0,   244,   246,     0,     0,     0,
-   229,   234,   235,     0,   249,   113,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,    52,   191,     0,     0,     0,
-   218,   215,     0,   237,   112,     0,   119,     0,     0,   115,
-   116,   117,   118,     0,   208,     0,     0,     0,   216,     0,
-     0,     0,   206,     0,   207,     0,     0,   114,   120,   121,
-     0,     0,     0,     0,     0,     0,   213,     0,     0,   212,
-   209,     0,     0,     0
+     0,     0,     0,     0,     0,     0,   154,     0,   140,   142,
+   138,     0,     0,     0,     0,     0,     0,    97,   123,     0,
+     0,   101,     0,    98,     0,     0,     0,     0,   136,    85,
+    86,   159,   161,     0,    56,    93,   181,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,   251,     0,     0,   229,
+     0,   231,   234,     0,     0,   232,   233,     0,     0,     0,
+   228,     0,   249,     0,     0,     0,    60,    58,   241,     0,
+     0,     0,     0,     0,     0,    96,    99,   100,     0,     0,
+     0,     0,   165,   162,    57,    51,     0,   190,     0,     0,
+   221,    53,    54,    53,   218,   240,     0,     0,     0,     0,
+     0,   224,   225,   226,   221,     0,    55,    61,    59,     0,
+     0,     0,     0,     0,     0,   122,     0,     0,     0,     0,
+     0,   168,     0,     0,     0,   220,     0,     0,   245,   247,
+     0,     0,     0,   230,   235,   236,     0,   250,   113,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,    52,   192,
+     0,     0,     0,   219,   216,     0,   238,   112,     0,   119,
+     0,     0,   115,   116,   117,   118,     0,   209,     0,     0,
+     0,   217,     0,     0,     0,   207,     0,   208,     0,     0,
+   114,   120,   121,     0,     0,     0,     0,     0,     0,   214,
+     0,     0,   213,   210,     0,     0,     0
 };
 
-static const short yydefgoto[] = {    83,
-   251,   267,   268,   269,   270,   189,   190,   219,   191,    23,
-    13,    35,   439,   303,   384,   403,   326,   385,    84,    85,
-   192,    87,    88,   116,   201,   336,   294,   337,   105,   512,
-     1,     2,   273,   246,   244,   245,    60,   171,    47,   100,
-   174,    89,   350,   279,   280,   281,    36,    93,    14,    42,
-    15,    58,    16,    26,   355,   295,    90,   297,   412,    17,
-    38,    39,   163,   487,    95,   226,   443,   444,   164,   165,
-   364,   166,   167
+static const short yydefgoto[] = {    84,
+   254,   270,   271,   272,   273,   192,   193,   222,   194,    23,
+    13,    35,   442,   306,   387,   406,   329,   388,    85,    86,
+   195,    88,    89,   118,   204,   339,   297,   340,   107,   515,
+     1,     2,   276,   249,   247,   248,    61,   173,    48,   102,
+   177,    90,   353,   282,   283,   284,    36,    94,    14,    42,
+    15,    59,    16,    26,   358,   298,    91,   300,   415,    17,
+    38,    39,   165,   490,    96,   229,   446,   447,   166,   167,
+   367,   168,   169
 };
 
 static const short yypact[] = {-32768,
-   194,   602,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,   -20,    38,    59,-32768,-32768,   -18,-32768,-32768,    13,
-    -8,    75,   115,    58,-32768,    40,   124,   163,-32768,-32768,
--32768,-32768,-32768,-32768,  1052,   -22,-32768,-32768,    -3,-32768,
--32768,-32768,-32768,    60,    65,    67,-32768,    57,   124,  1052,
-    62,    62,    62,    62,-32768,-32768,-32768,    38,-32768,-32768,
--32768,-32768,-32768,    61,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   167,   172,
-   173,   569,-32768,    -3,    68,-32768,-32768,   -30,-32768,-32768,
--32768,-32768,-32768,  1223,-32768,   159,    42,   180,   162,-32768,
--32768,-32768,-32768,-32768,  1093,  1093,  1093,  1134,-32768,-32768,
-    73,    74,-32768,-32768,   -30,   -75,    78,   847,-32768,-32768,
-  1093,-32768,   132,  1175,    14,   185,    38,-32768,-32768,-32768,
+   118,   605,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,   -46,   131,    10,-32768,-32768,   -18,-32768,-32768,    29,
+   -69,    58,    51,   -19,-32768,   106,   114,   144,-32768,-32768,
+-32768,-32768,-32768,-32768,  1060,   -20,-32768,-32768,   130,-32768,
+-32768,-32768,-32768,    80,    81,    83,    94,-32768,    57,   114,
+  1060,    44,    44,    44,    44,-32768,-32768,-32768,   131,-32768,
+-32768,-32768,-32768,-32768,    90,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   200,
+   201,   202,   572,-32768,   130,    99,-32768,-32768,   -34,-32768,
+-32768,-32768,-32768,-32768,  1231,-32768,   191,    77,   212,   193,
+   194,-32768,-32768,-32768,-32768,-32768,  1101,  1101,  1101,  1142,
+-32768,-32768,   104,   107,-32768,-32768,   -34,   -74,   109,   852,
+-32768,-32768,  1101,-32768,   165,  1183,    30,    93,   131,-32768,
 -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,  1093,  1093,  1093,  1093,  1093,  1093,  1093,
--32768,-32768,  1093,  1093,  1093,  1093,  1093,  1093,  1093,  1093,
-  1093,  1093,-32768,    38,-32768,    22,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,   -47,-32768,-32768,-32768,   111,   137,   199,
-   140,   203,   142,   204,   147,   205,   210,   211,   151,   206,
-   213,   412,-32768,  1093,  1093,  1093,-32768,   888,-32768,   103,
-   110,   635,-32768,-32768,    61,-32768,   635,   635,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   635,  1052,
-   114,   117,-32768,   635,   134,   118,   188,   119,   139,   141,
-   144,   145,   146,   148,   635,   635,   635,   149,  1052,  1093,
-  1093,   225,-32768,   150,   150,   150,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,   152,   153,   154,   157,
-   158,   175,   929,  1134,   589,   227,   176,   178,   179,   182,
--32768,-32768,   150,   -51,   -72,   -30,-32768,    -3,-32768,   161,
-   183,   970,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,   197,  1134,-32768,-32768,-32768,-32768,   164,-32768,   187,
-   635,    -4,-32768,     3,-32768,   189,   635,   171,  1093,  1093,
-  1093,  1093,  1093,  1093,  1093,  1093,   193,   195,   200,  1093,
-   635,   635,   201,-32768,   -17,-32768,-32768,-32768,  1134,  1134,
-  1134,  1134,  1134,  1134,-32768,-32768,   -16,   -26,-32768,   -73,
--32768,  1134,  1134,  1134,  1134,-32768,-32768,-32768,-32768,-32768,
-  1011,   228,-32768,-32768,   237,   -25,   270,   273,   186,   635,
-   299,   635,  1093,-32768,   214,   635,-32768,   215,-32768,-32768,
-   216,   217,-32768,-32768,   635,   635,   635,-32768,   202,-32768,
-  1093,   282,   304,-32768,   150,   189,   276,   218,   224,   229,
-   230,  1134,-32768,-32768,-32768,   231,   232,   233,   234,-32768,
--32768,-32768,   257,   238,-32768,   635,   635,  1093,   239,-32768,
-   239,-32768,   241,   635,   244,  1093,  1093,  1093,-32768,-32768,
--32768,  1093,   635,-32768,-32768,-32768,   242,  1093,  1134,  1134,
-  1134,  1134,-32768,  1134,  1134,  1134,  1134,   311,-32768,   331,
-   247,   245,   241,   248,   300,-32768,-32768,  1093,   246,   635,
--32768,-32768,-32768,   252,-32768,-32768,   254,   258,   260,   261,
-   265,   263,   268,   272,   277,-32768,-32768,   348,    16,   341,
--32768,-32768,   275,-32768,-32768,  1134,-32768,  1134,  1134,-32768,
--32768,-32768,-32768,   635,-32768,   738,    63,   367,-32768,   279,
-   280,   284,-32768,   285,-32768,   738,   635,-32768,-32768,-32768,
-   376,   289,   324,   635,   379,   380,-32768,   635,   635,-32768,
--32768,   402,   403,-32768
+-32768,-32768,-32768,-32768,-32768,  1101,  1101,  1101,  1101,  1101,
+  1101,  1101,-32768,-32768,  1101,  1101,  1101,  1101,  1101,  1101,
+  1101,  1101,  1101,  1101,-32768,   131,-32768,    62,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,   -72,-32768,-32768,-32768,
+   142,   170,   221,   173,   222,   175,   223,   178,   224,   231,
+   232,   183,   225,   233,   425,-32768,  1101,  1101,  1101,-32768,
+   893,-32768,   120,   128,   638,-32768,-32768,    90,-32768,   638,
+   638,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,   638,  1060,   121,   132,-32768,   638,   129,   134,   214,
+   141,   143,   146,   147,   148,   149,   150,   638,   638,   638,
+   151,  1060,  1101,  1101,   228,-32768,   152,   152,   152,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   153,
+   154,   155,   156,   159,   160,   934,  1142,   592,   230,   161,
+   164,   177,   180,-32768,-32768,   152,   -37,   -99,   -34,-32768,
+   130,-32768,   184,   174,   978,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,   227,  1142,-32768,-32768,-32768,-32768,
+   186,-32768,   187,   638,     2,-32768,     3,-32768,   188,   638,
+   179,  1101,  1101,  1101,  1101,  1101,  1101,  1101,  1101,   189,
+   190,   195,  1101,   638,   638,   196,-32768,   -23,-32768,-32768,
+-32768,  1142,  1142,  1142,  1142,  1142,  1142,-32768,-32768,   -30,
+    21,-32768,   -73,-32768,  1142,  1142,  1142,  1142,-32768,-32768,
+-32768,-32768,-32768,  1019,   229,-32768,-32768,   240,    24,   280,
+   286,   197,   638,   307,   638,  1101,-32768,   203,   638,-32768,
+   205,-32768,-32768,   210,   211,-32768,-32768,   638,   638,   638,
+-32768,   215,-32768,  1101,   288,   318,-32768,   152,   188,   290,
+   218,   219,   220,   226,  1142,-32768,-32768,-32768,   234,   237,
+   241,   242,-32768,-32768,-32768,   284,   243,-32768,   638,   638,
+  1101,   246,-32768,   246,-32768,   247,   638,   248,  1101,  1101,
+  1101,-32768,-32768,-32768,  1101,   638,-32768,-32768,-32768,   252,
+  1101,  1142,  1142,  1142,  1142,-32768,  1142,  1142,  1142,  1142,
+   338,-32768,   319,   249,   236,   247,   253,   303,-32768,-32768,
+  1101,   245,   638,-32768,-32768,-32768,   254,-32768,-32768,   256,
+   260,   259,   263,   265,   264,   267,   270,   274,-32768,-32768,
+   357,    14,   355,-32768,-32768,   276,-32768,-32768,  1142,-32768,
+  1142,  1142,-32768,-32768,-32768,-32768,   638,-32768,   742,    52,
+   372,-32768,   281,   282,   287,-32768,   289,-32768,   742,   638,
+-32768,-32768,-32768,   376,   291,   326,   638,   382,   383,-32768,
+   638,   638,-32768,-32768,   405,   406,-32768
 };
 
 static const short yypgoto[] = {-32768,
--32768,   310,   312,   313,   314,  -125,  -124,  -449,-32768,   366,
-   386,  -103,-32768,  -219,    69,-32768,  -236,-32768,   -46,-32768,
-   -35,-32768,   -66,   292,-32768,  -100,   219,  -251,    80,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,   363,-32768,-32768,-32768,
--32768,     4,-32768,    71,-32768,-32768,   356,-32768,-32768,-32768,
--32768,-32768,   413,-32768,-32768,  -447,   -55,    64,   -99,-32768,
-   399,-32768,-32768,-32768,-32768,-32768,    56,    -2,-32768,-32768,
-    37,-32768,-32768
+-32768,   312,   313,   314,   315,  -127,  -126,  -458,-32768,   373,
+   388,  -116,-32768,  -221,    59,-32768,  -241,-32768,   -48,-32768,
+   -35,-32768,   -62,   293,-32768,  -100,   239,  -226,    91,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,   365,-32768,-32768,-32768,
+-32768,     4,-32768,    63,-32768,-32768,   359,-32768,-32768,-32768,
+-32768,-32768,   417,-32768,-32768,  -414,   -55,    64,  -103,-32768,
+   403,-32768,-32768,-32768,-32768,-32768,    55,    -3,-32768,-32768,
+    34,-32768,-32768
 };
 
 
-#define	YYLAST		1330
+#define	YYLAST		1339
 
 
-static const short yytable[] = {    86,
-   217,   218,   305,   102,    37,    24,    91,   193,   327,   328,
-   360,    40,   338,   340,    86,   115,   382,   362,    18,   486,
-    19,   203,   207,   220,   206,   209,   210,   211,   212,   213,
-   214,   215,   216,   196,   208,   392,   346,   496,   494,   383,
-    27,   356,    24,   197,   348,   395,   223,   119,   502,   227,
-   228,   115,   361,   229,   230,   231,   232,   233,   234,   361,
-   239,   242,   238,   347,    44,    45,    46,   243,   119,   175,
-   176,   177,   209,   210,   211,   212,   213,   214,   215,   216,
-   -64,    37,   392,   392,    56,   202,    57,   117,   202,   119,
-   394,   405,   392,   103,   104,    92,   169,   170,   393,    48,
-    41,    28,    29,    30,    31,    32,    33,    34,   221,   222,
-   202,   224,   225,   202,   202,   240,   241,   202,   202,   202,
-   202,   202,   202,   235,   236,   237,   202,   274,   275,   276,
-   485,   106,   107,   108,    50,    49,   272,   247,   248,   -24,
-   -24,   323,   -23,   -23,   -22,   -22,   296,    59,   426,   -21,
-   -21,   296,   296,   249,   250,     5,     6,     7,     8,    51,
-    10,    52,   278,   296,    53,    55,    61,    96,   296,    99,
-   110,   -65,    97,   301,    98,   111,   112,   495,   118,   296,
-   296,   296,   168,   172,    86,   173,   194,   195,   198,   446,
-   204,   447,   321,  -126,   209,   210,   211,   212,   213,   214,
-   215,   216,   -28,    86,   322,   202,   -27,   -26,   -25,   252,
-   368,   282,   370,   371,   372,   276,   -31,   -32,     3,   253,
-   378,   283,   302,   309,     4,   304,   308,   310,   386,   387,
-   388,   389,   390,   391,     5,     6,     7,     8,     9,    10,
-    11,   396,   397,   398,   399,   296,   307,   311,   324,   312,
-   341,   296,   313,   314,   315,    12,   316,   320,   325,   354,
-   404,   382,   329,   330,   331,   296,   296,   332,   333,   351,
-   298,   299,   357,   367,   202,   369,   202,   202,   202,   373,
-   374,   349,   300,   366,   202,   334,   342,   306,   343,   344,
-   406,   433,   345,   407,   352,   358,   408,   363,   317,   318,
-   319,   375,   410,   376,   296,   424,   296,   425,   377,   381,
-   296,   428,   422,   438,   466,   278,   451,   452,   453,   296,
-   296,   296,   414,   416,   417,   418,   429,   202,   458,   459,
-   460,   461,   430,   462,   463,   464,   465,   431,   432,   434,
-   435,   436,   437,   217,   218,   423,   440,   445,   471,   448,
-   296,   296,   450,   456,   467,   468,   361,   469,   296,   470,
-   472,   217,   218,   474,   359,   475,   476,   296,   484,   478,
-   365,   477,   202,   479,   480,   490,   488,   491,   492,   481,
-   202,   202,   202,   482,   379,   380,   202,   497,   483,   489,
-   498,   499,   457,   501,   296,   500,   504,   505,   506,   508,
-   509,   513,   514,   159,    94,   160,   161,   162,    54,   200,
-   271,   101,   202,   109,    25,    43,    62,    63,   413,   454,
-   402,   401,   427,   409,     0,   411,     0,     0,   296,   415,
-     0,     0,     0,    18,     0,    19,     0,   254,   419,   420,
-   421,   296,     0,     0,     0,     0,     0,     0,   296,   255,
-   256,     0,   296,   296,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,   441,
-   442,     0,     0,     0,     0,     0,     0,   449,     0,     0,
-     0,     0,     0,     0,     0,     0,   455,     0,   130,   131,
-   132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
-   142,   143,     0,     0,     0,     0,     0,   257,     0,   258,
-   259,   151,   152,   473,   260,   261,   262,     0,     0,     0,
-     0,     0,     0,     0,   263,     0,     0,   264,     0,   265,
-     0,     0,   266,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   493,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-   503,     0,     0,     0,     0,     0,     0,   507,     0,     0,
-     0,   510,   511,    62,    63,     0,   113,    65,    66,    67,
-    68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-    18,     0,    19,    62,    63,     0,   113,   178,   179,   180,
-   181,   182,   183,   184,   185,   186,   187,   188,    76,    77,
-    18,     0,    19,     0,     0,     0,    78,     0,     0,     0,
-     0,   -34,     0,    18,     0,    19,     0,     0,     0,     0,
-     0,     0,     4,   -34,   -34,     0,    78,   284,   285,    62,
-    63,   286,   -34,   -34,   -34,   -34,   -34,   -34,   -34,     0,
-     0,   -34,    20,     0,     0,     0,    18,     0,    19,    21,
-   287,   288,   289,    22,     0,     0,     0,     0,     0,     0,
-     0,     0,   290,   291,     0,     0,     0,     0,    79,     0,
-     0,    80,     0,     0,    81,     0,    82,   114,     0,     0,
-     0,     0,     0,     0,     0,   292,     0,     0,    79,     0,
-     0,    80,     0,     0,    81,     0,    82,   339,     0,     0,
-     0,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-   139,   140,   141,   142,   143,     0,     0,     0,     0,     0,
-   257,     0,   258,   259,   151,   152,     0,   260,   261,   262,
-   284,   285,     0,     0,   286,     0,     0,     0,     0,     0,
-   293,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   287,   288,   289,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   290,   291,     0,     0,     0,
+static const short yytable[] = {    87,
+   220,   221,   104,   308,    37,    24,   330,   331,    92,   196,
+   385,    40,   223,   489,    27,    87,   363,   365,   351,   206,
+   117,   121,   209,   212,   213,   214,   215,   216,   217,   218,
+   219,   499,    37,   386,   349,   199,   395,   245,   210,    49,
+   341,   343,    24,   246,   226,   200,   398,   230,   231,   242,
+   211,   232,   233,   234,   235,   236,   237,   117,   364,   364,
+   241,   212,   213,   214,   215,   216,   217,   218,   219,   359,
+    51,   178,   179,   180,   497,   105,   106,   -64,   350,   395,
+    44,    45,    46,   121,   505,   396,   121,   205,   119,    56,
+   205,     5,     6,     7,     8,    52,    10,    53,    93,    47,
+    54,    41,   212,   213,   214,   215,   216,   217,   218,   219,
+   224,   225,   205,   227,   228,   205,   205,  -126,    50,   205,
+   205,   205,   205,   205,   205,   238,   239,   240,   205,   488,
+   395,   171,   172,   395,   277,   278,   279,    60,   397,   275,
+   326,   408,     3,   108,   109,   110,   429,    62,     4,   299,
+    57,    18,    58,    19,   299,   299,   243,   244,     5,     6,
+     7,     8,     9,    10,    11,   281,   299,   498,   250,   251,
+   101,   299,   -24,   -24,   304,   -23,   -23,   -22,   -22,    12,
+   -21,   -21,   299,   299,   299,   252,   253,    87,    97,    98,
+   449,    99,   450,   324,    28,    29,    30,    31,    32,    33,
+    34,   -65,   100,   112,   113,   114,    87,   325,   205,   371,
+   120,   373,   374,   375,   170,   174,   175,   176,   197,   381,
+   201,   198,   279,   207,   -28,   -27,   -26,   -25,   255,   285,
+   305,   389,   390,   391,   392,   393,   394,   -31,   -32,   256,
+   286,   307,   310,   311,   399,   400,   401,   402,   299,   312,
+   313,   327,   314,   344,   299,   315,   316,   317,   318,   319,
+   323,   328,   385,   407,   332,   333,   334,   335,   299,   299,
+   336,   337,   345,   301,   302,   346,   370,   205,   372,   205,
+   205,   205,   376,   377,   352,   303,   355,   205,   347,   357,
+   309,   348,   369,   354,   436,   360,   361,   366,   378,   379,
+   409,   320,   321,   322,   380,   384,   410,   299,   411,   299,
+   413,   427,   417,   299,   419,   454,   455,   456,   281,   420,
+   421,   428,   299,   299,   299,   431,   425,   432,   433,   434,
+   205,   461,   462,   463,   464,   435,   465,   466,   467,   468,
+   441,   469,   470,   437,   220,   221,   438,   474,   426,   472,
+   439,   440,   443,   299,   299,   448,   451,   453,   471,   364,
+   475,   299,   220,   221,   459,   473,   477,   362,   478,   479,
+   299,   480,   481,   368,   482,   205,   483,   487,   493,   484,
+   494,   495,   485,   205,   205,   205,   486,   382,   383,   205,
+   491,   492,   500,   501,   502,   460,   507,   299,   504,   503,
+   508,   509,   511,   512,   516,   517,   161,   162,   163,   164,
+    55,    95,   203,   405,   103,   205,   404,   111,    25,    43,
+   416,   457,   430,     0,     0,     0,   412,     0,   414,    63,
+    64,   299,   418,   274,     0,     0,     0,     0,     0,     0,
+     0,   422,   423,   424,   299,     0,    18,     0,    19,     0,
+   257,   299,     0,     0,     0,   299,   299,     0,     0,     0,
+     0,     0,   258,   259,     0,     0,     0,     0,     0,     0,
+     0,     0,   444,   445,     0,     0,     0,     0,     0,     0,
+   452,     0,     0,     0,     0,     0,     0,     0,     0,   458,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,   292,     0,
+     0,     0,   132,   133,   134,   135,   136,   137,   138,   139,
+   140,   141,   142,   143,   144,   145,   476,     0,     0,     0,
+     0,   260,     0,   261,   262,   153,   154,     0,   263,   264,
+   265,     0,     0,     0,     0,     0,     0,     0,   266,     0,
+     0,   267,     0,   268,     0,     0,   269,     0,     0,     0,
+   496,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,   506,     0,     0,     0,     0,     0,     0,
+   510,     0,     0,     0,   513,   514,    63,    64,     0,   115,
+    66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+    76,    77,    78,    18,     0,    19,    63,    64,     0,   115,
+   181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
+   191,    77,    78,    18,     0,    19,     0,     0,     0,    79,
+     0,     0,     0,     0,   -34,     0,    18,     0,    19,     0,
+     0,     0,     0,     0,     0,     4,   -34,   -34,     0,    79,
+   287,   288,    63,    64,   289,   -34,   -34,   -34,   -34,   -34,
+   -34,   -34,     0,     0,   -34,    20,     0,     0,     0,    18,
+     0,    19,    21,   290,   291,   292,    22,     0,     0,     0,
+     0,     0,     0,     0,     0,   293,   294,     0,     0,     0,
+     0,     0,    80,     0,     0,    81,     0,     0,    82,     0,
+    83,   116,     0,     0,     0,     0,     0,     0,   295,     0,
+     0,     0,    80,     0,     0,    81,     0,     0,    82,     0,
+    83,   342,     0,     0,     0,   132,   133,   134,   135,   136,
+   137,   138,   139,   140,   141,   142,   143,   144,   145,     0,
+     0,     0,     0,     0,   260,     0,   261,   262,   153,   154,
+     0,   263,   264,   265,   287,   288,     0,     0,   289,     0,
+     0,     0,     0,     0,   296,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,   290,   291,   292,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   293,
+   294,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   130,   131,   132,   133,   134,   135,
-   136,   137,   138,   139,   140,   141,   142,   143,     0,     0,
-     0,     0,     0,   257,     0,   258,   259,   151,   152,     0,
-   260,   261,   262,     0,     0,     0,     0,     0,     0,     0,
-     0,    62,    63,   293,   113,    65,    66,    67,    68,    69,
-    70,    71,    72,    73,    74,    75,    76,    77,    18,     0,
-    19,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,   199,     0,     0,     0,     0,     0,     0,
-     0,     0,    62,    63,    78,   113,    65,    66,    67,    68,
-    69,    70,    71,    72,    73,    74,    75,    76,    77,    18,
-     0,    19,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,   277,     0,     0,     0,     0,     0,
-     0,     0,     0,    62,    63,    78,   113,   178,   179,   180,
-   181,   182,   183,   184,   185,   186,   187,   188,    76,    77,
-    18,     0,    19,     0,     0,     0,    79,     0,     0,    80,
-     0,     0,    81,     0,    82,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,    62,    63,    78,   113,    65,    66,
-    67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-    77,    18,     0,    19,     0,     0,     0,    79,     0,     0,
-    80,     0,     0,    81,     0,    82,   353,     0,     0,     0,
-     0,     0,     0,     0,     0,    62,    63,    78,   113,    65,
+     0,     0,   295,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   132,
+   133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
+   143,   144,   145,     0,     0,     0,     0,     0,   260,     0,
+   261,   262,   153,   154,     0,   263,   264,   265,     0,     0,
+     0,     0,     0,     0,     0,     0,    63,    64,   296,   115,
     66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-    76,    77,    18,     0,    19,     0,     0,     0,    79,     0,
-     0,    80,     0,   335,    81,     0,    82,   400,     0,     0,
-     0,     0,     0,     0,     0,     0,    62,    63,    78,    64,
-    65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-    75,    76,    77,    18,     0,    19,     0,     0,     0,    79,
-     0,     0,    80,     0,     0,    81,     0,    82,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,    62,    63,    78,
-   113,    65,    66,    67,    68,    69,    70,    71,    72,    73,
-    74,    75,    76,    77,    18,     0,    19,     0,     0,     0,
-    79,     0,     0,    80,     0,     0,    81,     0,    82,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,    62,    63,
-    78,   113,   178,   179,   180,   181,   182,   183,   184,   185,
-   186,   187,   188,    76,    77,    18,     0,    19,     0,     0,
-     0,    79,     0,     0,    80,     0,     0,    81,     0,    82,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,    62,
-    63,    78,   205,    65,    66,    67,    68,    69,    70,    71,
-    72,    73,    74,    75,    76,    77,    18,     0,    19,     0,
-     0,     0,    79,     0,     0,    80,     0,     0,    81,     0,
-    82,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,    78,     0,     0,     0,     0,     0,     0,     0,
+    76,    77,    78,    18,     0,    19,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,   202,     0,
+     0,     0,     0,     0,     0,     0,     0,    63,    64,    79,
+   115,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+    75,    76,    77,    78,    18,     0,    19,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   280,
+     0,     0,     0,     0,     0,     0,     0,     0,    63,    64,
+    79,   115,   181,   182,   183,   184,   185,   186,   187,   188,
+   189,   190,   191,    77,    78,    18,     0,    19,     0,     0,
+     0,     0,    80,     0,     0,    81,     0,     0,    82,     0,
+    83,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,    79,    63,    64,     0,   115,    66,    67,    68,    69,
+    70,    71,    72,    73,    74,    75,    76,    77,    78,    18,
+     0,    19,     0,    80,     0,     0,    81,     0,     0,    82,
+     0,    83,     0,     0,   356,     0,     0,     0,     0,     0,
+     0,     0,     0,    63,    64,    79,   115,    66,    67,    68,
+    69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
+    18,     0,    19,     0,    80,     0,     0,    81,     0,   338,
+    82,     0,    83,     0,     0,   403,     0,     0,     0,     0,
+     0,     0,     0,     0,    63,    64,    79,    65,    66,    67,
+    68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+    78,    18,     0,    19,     0,     0,     0,     0,    80,     0,
+     0,    81,     0,     0,    82,     0,    83,     0,     0,     0,
+     0,     0,     0,     0,     0,    63,    64,    79,   115,    66,
+    67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+    77,    78,    18,     0,    19,     0,     0,     0,     0,    80,
+     0,     0,    81,     0,     0,    82,     0,    83,     0,     0,
+     0,     0,     0,     0,     0,     0,    63,    64,    79,   115,
+   181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
+   191,    77,    78,    18,     0,    19,     0,     0,     0,     0,
+    80,     0,     0,    81,     0,     0,    82,     0,    83,     0,
+     0,     0,     0,     0,     0,     0,     0,    63,    64,    79,
+   208,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+    75,    76,    77,    78,    18,     0,    19,     0,     0,     0,
+     0,    80,     0,     0,    81,     0,     0,    82,     0,    83,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,    79,     0,     0,    80,     0,     0,    81,
-     0,    82,     0,     0,     0,     0,     0,   120,     0,     0,
+    79,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   121,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,   122,   123,     0,    79,     0,     0,    80,     0,     0,
-    81,     0,    82,   124,   125,   126,   127,   128,   129,   130,
-   131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-   141,   142,   143,   144,   145,   146,     0,     0,   147,   148,
-   149,   150,   151,   152,   153,   154,   155,   156,   157,   158
+     0,     0,    80,     0,     0,    81,     0,     0,    82,     0,
+    83,     0,     0,     0,     0,   122,     0,     0,     0,     0,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   123,
+     0,     0,     0,     0,     0,     0,     0,     0,     0,   124,
+   125,     0,     0,    80,     0,     0,    81,     0,     0,    82,
+     0,    83,   126,   127,   128,   129,   130,   131,   132,   133,
+   134,   135,   136,   137,   138,   139,   140,   141,   142,   143,
+   144,   145,   146,   147,   148,     0,     0,   149,   150,   151,
+   152,   153,   154,   155,   156,   157,   158,   159,   160
 };
 
 static const short yycheck[] = {    35,
-   126,   126,   222,    50,    23,     2,    29,   108,   245,   246,
-    15,    30,   264,   265,    50,    82,    34,    15,    22,   469,
-    24,   121,     9,   127,   124,    10,    11,    12,    13,    14,
-    15,    16,    17,   109,    21,   109,   273,   487,   486,    57,
-    61,   293,    39,   119,   117,   119,   146,   120,   496,   149,
-   150,   118,    57,   153,   154,   155,   156,   157,   158,    57,
-   164,   109,   162,   115,    52,    53,    54,   115,   120,   105,
-   106,   107,    10,    11,    12,    13,    14,    15,    16,    17,
-   111,    23,   109,   109,    45,   121,    47,    84,   124,   120,
-   117,   117,   109,    32,    33,   118,    55,    56,   115,   108,
-   119,    64,    65,    66,    67,    68,    69,    70,   144,   145,
-   146,   147,   148,   149,   150,    94,    95,   153,   154,   155,
-   156,   157,   158,   159,   160,   161,   162,   194,   195,   196,
-   115,    52,    53,    54,    20,    61,   192,    27,    28,     3,
-     4,   241,     3,     4,     3,     4,   202,    24,   385,     3,
-     4,   207,   208,     3,     4,    41,    42,    43,    44,    45,
-    46,    47,   198,   219,    50,   108,     4,   108,   224,   113,
-     4,   111,   108,   220,   108,     4,     4,   115,   111,   235,
-   236,   237,    24,     4,   220,    24,   114,   114,   111,   409,
-    59,   411,   239,     0,    10,    11,    12,    13,    14,    15,
-    16,    17,     4,   239,   240,   241,     4,     4,     4,     4,
-   310,   109,   312,   313,   314,   282,     7,     7,    25,     7,
-   320,   112,   109,    36,    31,   109,   109,   109,   329,   330,
-   331,   332,   333,   334,    41,    42,    43,    44,    45,    46,
-    47,   342,   343,   344,   345,   301,   113,   109,    24,   109,
-    24,   307,   109,   109,   109,    62,   109,   109,   109,    63,
-    24,    34,   111,   111,   111,   321,   322,   111,   111,   109,
-   207,   208,   109,   309,   310,   311,   312,   313,   314,   315,
-   316,   278,   219,   113,   320,   111,   111,   224,   111,   111,
-    21,   392,   111,    21,   112,   109,   111,   109,   235,   236,
-   237,   109,     4,   109,   360,    24,   362,     4,   109,   109,
-   366,    36,   111,    57,     4,   351,   416,   417,   418,   375,
-   376,   377,   109,   109,   109,   109,   109,   363,   429,   430,
-   431,   432,   109,   434,   435,   436,   437,   109,   109,   109,
-   109,   109,   109,   469,   469,   381,   109,   109,   448,   109,
-   406,   407,   109,   112,    24,   109,    57,   113,   414,   112,
-   115,   487,   487,   112,   301,   112,   109,   423,    21,   109,
-   307,   112,   408,   109,   112,   476,    36,   478,   479,   112,
-   416,   417,   418,   112,   321,   322,   422,    21,   112,   115,
-   112,   112,   428,   109,   450,   112,    21,   109,    75,    21,
-    21,     0,     0,    94,    39,    94,    94,    94,    23,   118,
-   192,    49,   448,    58,     2,    17,     5,     6,   363,   422,
-   352,   351,   386,   360,    -1,   362,    -1,    -1,   484,   366,
-    -1,    -1,    -1,    22,    -1,    24,    -1,    26,   375,   376,
-   377,   497,    -1,    -1,    -1,    -1,    -1,    -1,   504,    38,
-    39,    -1,   508,   509,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   406,
-   407,    -1,    -1,    -1,    -1,    -1,    -1,   414,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,   423,    -1,    77,    78,
-    79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-    89,    90,    -1,    -1,    -1,    -1,    -1,    96,    -1,    98,
-    99,   100,   101,   450,   103,   104,   105,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,   113,    -1,    -1,   116,    -1,   118,
-    -1,    -1,   121,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,   484,    -1,    -1,
+   128,   128,    51,   225,    23,     2,   248,   249,    29,   110,
+    34,    30,   129,   472,    61,    51,    15,    15,   118,   123,
+    83,   121,   126,    10,    11,    12,    13,    14,    15,    16,
+    17,   490,    23,    57,   276,   110,   110,   110,     9,   109,
+   267,   268,    39,   116,   148,   120,   120,   151,   152,   166,
+    21,   155,   156,   157,   158,   159,   160,   120,    57,    57,
+   164,    10,    11,    12,    13,    14,    15,    16,    17,   296,
+    20,   107,   108,   109,   489,    32,    33,   112,   116,   110,
+    52,    53,    54,   121,   499,   116,   121,   123,    85,   109,
+   126,    41,    42,    43,    44,    45,    46,    47,   119,    71,
+    50,   120,    10,    11,    12,    13,    14,    15,    16,    17,
+   146,   147,   148,   149,   150,   151,   152,     0,    61,   155,
+   156,   157,   158,   159,   160,   161,   162,   163,   164,   116,
+   110,    55,    56,   110,   197,   198,   199,    24,   118,   195,
+   244,   118,    25,    53,    54,    55,   388,     4,    31,   205,
+    45,    22,    47,    24,   210,   211,    95,    96,    41,    42,
+    43,    44,    45,    46,    47,   201,   222,   116,    27,    28,
+   114,   227,     3,     4,   223,     3,     4,     3,     4,    62,
+     3,     4,   238,   239,   240,     3,     4,   223,   109,   109,
+   412,   109,   414,   242,    64,    65,    66,    67,    68,    69,
+    70,   112,   109,     4,     4,     4,   242,   243,   244,   313,
+   112,   315,   316,   317,    24,     4,    24,    24,   115,   323,
+   112,   115,   285,    59,     4,     4,     4,     4,     4,   110,
+   110,   332,   333,   334,   335,   336,   337,     7,     7,     7,
+   113,   110,   114,   110,   345,   346,   347,   348,   304,    36,
+   110,    24,   110,    24,   310,   110,   110,   110,   110,   110,
+   110,   110,    34,    24,   112,   112,   112,   112,   324,   325,
+   112,   112,   112,   210,   211,   112,   312,   313,   314,   315,
+   316,   317,   318,   319,   281,   222,   113,   323,   112,    63,
+   227,   112,   114,   110,   395,   110,   110,   110,   110,   110,
+    21,   238,   239,   240,   110,   110,    21,   363,   112,   365,
+     4,    24,   110,   369,   110,   419,   420,   421,   354,   110,
+   110,     4,   378,   379,   380,    36,   112,   110,   110,   110,
+   366,   432,   433,   434,   435,   110,   437,   438,   439,   440,
+    57,     4,    24,   110,   472,   472,   110,   451,   384,   114,
+   110,   110,   110,   409,   410,   110,   110,   110,   110,    57,
+   116,   417,   490,   490,   113,   113,   113,   304,   113,   110,
+   426,   113,   110,   310,   110,   411,   113,    21,   479,   113,
+   481,   482,   113,   419,   420,   421,   113,   324,   325,   425,
+    36,   116,    21,   113,   113,   431,    21,   453,   110,   113,
+   110,    76,    21,    21,     0,     0,    95,    95,    95,    95,
+    23,    39,   120,   355,    50,   451,   354,    59,     2,    17,
+   366,   425,   389,    -1,    -1,    -1,   363,    -1,   365,     5,
+     6,   487,   369,   195,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,   378,   379,   380,   500,    -1,    22,    -1,    24,    -1,
+    26,   507,    -1,    -1,    -1,   511,   512,    -1,    -1,    -1,
+    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,   409,   410,    -1,    -1,    -1,    -1,    -1,    -1,
+   417,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   426,
     -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-   497,    -1,    -1,    -1,    -1,    -1,    -1,   504,    -1,    -1,
-    -1,   508,   509,     5,     6,    -1,     8,     9,    10,    11,
-    12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-    22,    -1,    24,     5,     6,    -1,     8,     9,    10,    11,
-    12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-    22,    -1,    24,    -1,    -1,    -1,    48,    -1,    -1,    -1,
-    -1,    20,    -1,    22,    -1,    24,    -1,    -1,    -1,    -1,
-    -1,    -1,    31,    32,    33,    -1,    48,     3,     4,     5,
-     6,     7,    41,    42,    43,    44,    45,    46,    47,    -1,
-    -1,    50,    51,    -1,    -1,    -1,    22,    -1,    24,    58,
-    26,    27,    28,    62,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,   110,    -1,
-    -1,   113,    -1,    -1,   116,    -1,   118,   119,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    61,    -1,    -1,   110,    -1,
-    -1,   113,    -1,    -1,   116,    -1,   118,   119,    -1,    -1,
-    -1,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-    86,    87,    88,    89,    90,    -1,    -1,    -1,    -1,    -1,
-    96,    -1,    98,    99,   100,   101,    -1,   103,   104,   105,
-     3,     4,    -1,    -1,     7,    -1,    -1,    -1,    -1,    -1,
-   116,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    26,    27,    28,    -1,    -1,    -1,    -1,
+    -1,    -1,    78,    79,    80,    81,    82,    83,    84,    85,
+    86,    87,    88,    89,    90,    91,   453,    -1,    -1,    -1,
+    -1,    97,    -1,    99,   100,   101,   102,    -1,   104,   105,
+   106,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   114,    -1,
+    -1,   117,    -1,   119,    -1,    -1,   122,    -1,    -1,    -1,
+   487,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,   500,    -1,    -1,    -1,    -1,    -1,    -1,
+   507,    -1,    -1,    -1,   511,   512,     5,     6,    -1,     8,
+     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,    20,    21,    22,    -1,    24,     5,     6,    -1,     8,
+     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,    48,
+    -1,    -1,    -1,    -1,    20,    -1,    22,    -1,    24,    -1,
+    -1,    -1,    -1,    -1,    -1,    31,    32,    33,    -1,    48,
+     3,     4,     5,     6,     7,    41,    42,    43,    44,    45,
+    46,    47,    -1,    -1,    50,    51,    -1,    -1,    -1,    22,
+    -1,    24,    58,    26,    27,    28,    62,    -1,    -1,    -1,
     -1,    -1,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,
+    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,
+   119,   120,    -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,
+    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,
+   119,   120,    -1,    -1,    -1,    78,    79,    80,    81,    82,
+    83,    84,    85,    86,    87,    88,    89,    90,    91,    -1,
+    -1,    -1,    -1,    -1,    97,    -1,    99,   100,   101,   102,
+    -1,   104,   105,   106,     3,     4,    -1,    -1,     7,    -1,
+    -1,    -1,    -1,    -1,   117,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    26,    27,    28,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,
+    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
     -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    77,    78,    79,    80,    81,    82,
-    83,    84,    85,    86,    87,    88,    89,    90,    -1,    -1,
-    -1,    -1,    -1,    96,    -1,    98,    99,   100,   101,    -1,
-   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,     5,     6,   116,     8,     9,    10,    11,    12,    13,
-    14,    15,    16,    17,    18,    19,    20,    21,    22,    -1,
-    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,     5,     6,    48,     8,     9,    10,    11,    12,
+    -1,    -1,    61,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,
+    79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+    89,    90,    91,    -1,    -1,    -1,    -1,    -1,    97,    -1,
+    99,   100,   101,   102,    -1,   104,   105,   106,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,   117,     8,
+     9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,
+     8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
+    48,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+    17,    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,
+    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,
+   119,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,    48,     5,     6,    -1,     8,     9,    10,    11,    12,
     13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,
+    -1,    24,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,
+    -1,   119,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,
     -1,    -1,    -1,     5,     6,    48,     8,     9,    10,    11,
     12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-    22,    -1,    24,    -1,    -1,    -1,   110,    -1,    -1,   113,
-    -1,    -1,   116,    -1,   118,    -1,    -1,    -1,    -1,    -1,
+    22,    -1,    24,    -1,   111,    -1,    -1,   114,    -1,   116,
+   117,    -1,   119,    -1,    -1,    37,    -1,    -1,    -1,    -1,
     -1,    -1,    -1,    -1,     5,     6,    48,     8,     9,    10,
     11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-    21,    22,    -1,    24,    -1,    -1,    -1,   110,    -1,    -1,
-   113,    -1,    -1,   116,    -1,   118,    37,    -1,    -1,    -1,
+    21,    22,    -1,    24,    -1,    -1,    -1,    -1,   111,    -1,
+    -1,   114,    -1,    -1,   117,    -1,   119,    -1,    -1,    -1,
     -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,     9,
     10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-    20,    21,    22,    -1,    24,    -1,    -1,    -1,   110,    -1,
-    -1,   113,    -1,   115,   116,    -1,   118,    37,    -1,    -1,
+    20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,   111,
+    -1,    -1,   114,    -1,    -1,   117,    -1,   119,    -1,    -1,
     -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,
      9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,   110,
-    -1,    -1,   113,    -1,    -1,   116,    -1,   118,    -1,    -1,
+    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
+   111,    -1,    -1,   114,    -1,    -1,   117,    -1,   119,    -1,
     -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,
      8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
     18,    19,    20,    21,    22,    -1,    24,    -1,    -1,    -1,
-   110,    -1,    -1,   113,    -1,    -1,   116,    -1,   118,    -1,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,     6,
-    48,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-    17,    18,    19,    20,    21,    22,    -1,    24,    -1,    -1,
-    -1,   110,    -1,    -1,   113,    -1,    -1,   116,    -1,   118,
-    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     5,
-     6,    48,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,    20,    21,    22,    -1,    24,    -1,
-    -1,    -1,   110,    -1,    -1,   113,    -1,    -1,   116,    -1,
-   118,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    48,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,   119,
     -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    -1,    -1,   110,    -1,    -1,   113,    -1,    -1,   116,
-    -1,   118,    -1,    -1,    -1,    -1,    -1,    35,    -1,    -1,
+    48,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
     -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    -1,    59,    60,    -1,   110,    -1,    -1,   113,    -1,    -1,
-   116,    -1,   118,    71,    72,    73,    74,    75,    76,    77,
-    78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-    88,    89,    90,    91,    92,    93,    -1,    -1,    96,    97,
-    98,    99,   100,   101,   102,   103,   104,   105,   106,   107
+    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,    -1,
+   119,    -1,    -1,    -1,    -1,    35,    -1,    -1,    -1,    -1,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    49,
+    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    59,
+    60,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,   117,
+    -1,   119,    72,    73,    74,    75,    76,    77,    78,    79,
+    80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+    90,    91,    92,    93,    94,    -1,    -1,    97,    98,    99,
+   100,   101,   102,   103,   104,   105,   106,   107,   108
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line 3 "/usr/share/bison.simple"
@@ -2358,7 +2365,7 @@
   switch (yyn) {
 
 case 2:
-#line 1097 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1098 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   if (yyvsp[0].UIntVal > (uint32_t)INT32_MAX)     // Outside of my range!
     GEN_ERROR("Value too large for type!");
@@ -2367,7 +2374,7 @@
 ;
     break;}
 case 4:
-#line 1106 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1107 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   if (yyvsp[0].UInt64Val > (uint64_t)INT64_MAX)     // Outside of my range!
     GEN_ERROR("Value too large for type!");
@@ -2376,81 +2383,81 @@
 ;
     break;}
 case 33:
-#line 1130 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1131 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.StrVal = yyvsp[-1].StrVal;
     CHECK_FOR_ERROR
   ;
     break;}
 case 34:
-#line 1134 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1135 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.StrVal = 0;
     CHECK_FOR_ERROR
   ;
     break;}
 case 35:
-#line 1139 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1140 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::InternalLinkage; ;
     break;}
 case 36:
-#line 1140 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1141 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::LinkOnceLinkage; ;
     break;}
 case 37:
-#line 1141 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1142 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::WeakLinkage; ;
     break;}
 case 38:
-#line 1142 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1143 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::AppendingLinkage; ;
     break;}
 case 39:
-#line 1143 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1144 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::DLLImportLinkage; ;
     break;}
 case 40:
-#line 1144 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1145 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::DLLExportLinkage; ;
     break;}
 case 41:
-#line 1145 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1146 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::ExternalWeakLinkage; ;
     break;}
 case 42:
-#line 1146 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1147 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Linkage = GlobalValue::ExternalLinkage; ;
     break;}
 case 43:
-#line 1148 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1149 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = CallingConv::C; ;
     break;}
 case 44:
-#line 1149 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = CallingConv::C; ;
     break;}
 case 45:
-#line 1150 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = CallingConv::CSRet; ;
     break;}
 case 46:
-#line 1151 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1152 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = CallingConv::Fast; ;
     break;}
 case 47:
-#line 1152 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1153 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = CallingConv::Cold; ;
     break;}
 case 48:
-#line 1153 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1154 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = CallingConv::X86_StdCall; ;
     break;}
 case 49:
-#line 1154 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1155 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = CallingConv::X86_FastCall; ;
     break;}
 case 50:
-#line 1155 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1156 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
                    if ((unsigned)yyvsp[0].UInt64Val != yyvsp[0].UInt64Val)
                      GEN_ERROR("Calling conv too large!");
@@ -2459,11 +2466,11 @@
                  ;
     break;}
 case 51:
-#line 1164 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1165 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = 0; ;
     break;}
 case 52:
-#line 1165 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1166 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.UIntVal = yyvsp[0].UInt64Val;
   if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
@@ -2472,11 +2479,11 @@
 ;
     break;}
 case 53:
-#line 1171 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1172 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.UIntVal = 0; ;
     break;}
 case 54:
-#line 1172 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1173 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.UIntVal = yyvsp[0].UInt64Val;
   if (yyval.UIntVal != 0 && !isPowerOf2_32(yyval.UIntVal))
@@ -2485,7 +2492,7 @@
 ;
     break;}
 case 55:
-#line 1180 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1181 "/Users/resistor/llvm/src/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] == '\\')
@@ -2495,23 +2502,23 @@
 ;
     break;}
 case 56:
-#line 1188 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1189 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.StrVal = 0; ;
     break;}
 case 57:
-#line 1189 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1190 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.StrVal = yyvsp[0].StrVal; ;
     break;}
 case 58:
-#line 1194 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1195 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {;
     break;}
 case 59:
-#line 1195 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1196 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {;
     break;}
 case 60:
-#line 1196 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1197 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV->setSection(yyvsp[0].StrVal);
     free(yyvsp[0].StrVal);
@@ -2519,7 +2526,7 @@
   ;
     break;}
 case 61:
-#line 1201 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1202 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[0].UInt64Val != 0 && !isPowerOf2_32(yyvsp[0].UInt64Val))
       GEN_ERROR("Alignment must be a power of two!");
@@ -2528,15 +2535,15 @@
   ;
     break;}
 case 63:
-#line 1215 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1216 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType); ;
     break;}
 case 65:
-#line 1216 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1217 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType); ;
     break;}
 case 66:
-#line 1218 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1219 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*yyvsp[0].TypeVal)->getDescription());
@@ -2545,21 +2552,21 @@
   ;
     break;}
 case 80:
-#line 1230 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1231 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TypeVal = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
   ;
     break;}
 case 81:
-#line 1234 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1235 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TypeVal = new PATypeHolder(yyvsp[0].PrimType);
     CHECK_FOR_ERROR
   ;
     break;}
 case 82:
-#line 1238 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1239 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {            // Named types are also simple types...
   const Type* tmp = getTypeVal(yyvsp[0].ValIDVal);
   CHECK_FOR_ERROR
@@ -2567,7 +2574,7 @@
 ;
     break;}
 case 83:
-#line 1246 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1247 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {                   // Type UpReference
     if (yyvsp[0].UInt64Val > (uint64_t)~0U) GEN_ERROR("Value out of range!");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -2578,7 +2585,7 @@
   ;
     break;}
 case 84:
-#line 1254 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1255 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {           // Function derived type?
     std::vector<const Type*> Params;
     for (std::list<llvm::PATypeHolder>::iterator I = yyvsp[-1].TypeList->begin(),
@@ -2594,7 +2601,7 @@
   ;
     break;}
 case 85:
-#line 1267 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1268 "/Users/resistor/llvm/src/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;
@@ -2602,7 +2609,7 @@
   ;
     break;}
 case 86:
-#line 1272 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1273 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {          // Packed array type?
      const llvm::Type* ElemTy = yyvsp[-1].TypeVal->get();
      if ((unsigned)yyvsp[-3].UInt64Val != yyvsp[-3].UInt64Val)
@@ -2617,7 +2624,7 @@
   ;
     break;}
 case 87:
-#line 1284 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1285 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = yyvsp[-1].TypeList->begin(),
@@ -2630,14 +2637,14 @@
   ;
     break;}
 case 88:
-#line 1294 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1295 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {                                  // Empty structure type?
     yyval.TypeVal = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
   ;
     break;}
 case 89:
-#line 1298 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1299 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {                             // Pointer type?
     if (*yyvsp[-1].TypeVal == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -2647,7 +2654,7 @@
   ;
     break;}
 case 90:
-#line 1309 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1310 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TypeList = new std::list<PATypeHolder>();
     yyval.TypeList->push_back(*yyvsp[0].TypeVal); delete yyvsp[0].TypeVal;
@@ -2655,35 +2662,35 @@
   ;
     break;}
 case 91:
-#line 1314 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1315 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     (yyval.TypeList=yyvsp[-2].TypeList)->push_back(*yyvsp[0].TypeVal); delete yyvsp[0].TypeVal;
     CHECK_FOR_ERROR
   ;
     break;}
 case 93:
-#line 1321 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1322 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     (yyval.TypeList=yyvsp[-2].TypeList)->push_back(Type::VoidTy);
     CHECK_FOR_ERROR
   ;
     break;}
 case 94:
-#line 1325 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1326 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     (yyval.TypeList = new std::list<PATypeHolder>())->push_back(Type::VoidTy);
     CHECK_FOR_ERROR
   ;
     break;}
 case 95:
-#line 1329 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1330 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TypeList = new std::list<PATypeHolder>();
     CHECK_FOR_ERROR
   ;
     break;}
 case 96:
-#line 1340 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1341 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { // Nonempty unsized arr
     const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-3].TypeVal->get());
     if (ATy == 0)
@@ -2712,7 +2719,7 @@
   ;
     break;}
 case 97:
-#line 1366 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1367 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
     if (ATy == 0)
@@ -2729,7 +2736,7 @@
   ;
     break;}
 case 98:
-#line 1380 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1381 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const ArrayType *ATy = dyn_cast<ArrayType>(yyvsp[-2].TypeVal->get());
     if (ATy == 0)
@@ -2762,7 +2769,7 @@
   ;
     break;}
 case 99:
-#line 1410 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1411 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { // Nonempty unsized arr
     const PackedType *PTy = dyn_cast<PackedType>(yyvsp[-3].TypeVal->get());
     if (PTy == 0)
@@ -2791,7 +2798,7 @@
   ;
     break;}
 case 100:
-#line 1436 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1437 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const StructType *STy = dyn_cast<StructType>(yyvsp[-3].TypeVal->get());
     if (STy == 0)
@@ -2815,7 +2822,7 @@
   ;
     break;}
 case 101:
-#line 1457 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1458 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const StructType *STy = dyn_cast<StructType>(yyvsp[-2].TypeVal->get());
     if (STy == 0)
@@ -2831,7 +2838,7 @@
   ;
     break;}
 case 102:
-#line 1470 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1471 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *PTy = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (PTy == 0)
@@ -2844,7 +2851,7 @@
   ;
     break;}
 case 103:
-#line 1480 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1481 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ConstVal = UndefValue::get(yyvsp[-1].TypeVal->get());
     delete yyvsp[-1].TypeVal;
@@ -2852,7 +2859,7 @@
   ;
     break;}
 case 104:
-#line 1485 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1486 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *Ty = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (Ty == 0)
@@ -2916,7 +2923,7 @@
   ;
     break;}
 case 105:
-#line 1546 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1547 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-1].TypeVal->get() != yyvsp[0].ConstVal->getType())
       GEN_ERROR("Mismatched types for constant expression!");
@@ -2926,7 +2933,7 @@
   ;
     break;}
 case 106:
-#line 1553 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1554 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const Type *Ty = yyvsp[-1].TypeVal->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
@@ -2937,7 +2944,7 @@
   ;
     break;}
 case 107:
-#line 1562 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1563 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {      // integral constants
     if (!ConstantSInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].SInt64Val))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -2946,7 +2953,7 @@
   ;
     break;}
 case 108:
-#line 1568 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1569 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {            // integral constants
     if (!ConstantUInt::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].UInt64Val))
       GEN_ERROR("Constant value doesn't fit in type!");
@@ -2955,21 +2962,21 @@
   ;
     break;}
 case 109:
-#line 1574 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1575 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {                      // Boolean constants
     yyval.ConstVal = ConstantBool::getTrue();
     CHECK_FOR_ERROR
   ;
     break;}
 case 110:
-#line 1578 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1579 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {                     // Boolean constants
     yyval.ConstVal = ConstantBool::getFalse();
     CHECK_FOR_ERROR
   ;
     break;}
 case 111:
-#line 1582 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1583 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType(yyvsp[-1].PrimType, yyvsp[0].FPVal))
       GEN_ERROR("Floating point constant invalid for type!!");
@@ -2978,7 +2985,7 @@
   ;
     break;}
 case 112:
-#line 1590 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1591 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!yyvsp[-3].ConstVal->getType()->isFirstClassType())
       GEN_ERROR("cast constant expression from a non-primitive type: '" +
@@ -2992,7 +2999,7 @@
   ;
     break;}
 case 113:
-#line 1601 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1602 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PointerType>(yyvsp[-2].ConstVal->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand!");
@@ -3027,7 +3034,7 @@
   ;
     break;}
 case 114:
-#line 1633 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1634 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-5].ConstVal->getType() != Type::BoolTy)
       GEN_ERROR("Select condition must be of boolean type!");
@@ -3038,7 +3045,7 @@
   ;
     break;}
 case 115:
-#line 1641 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1642 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       GEN_ERROR("Binary operator types must match!");
@@ -3063,7 +3070,7 @@
   ;
     break;}
 case 116:
-#line 1663 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1664 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       GEN_ERROR("Logical operator types must match!");
@@ -3077,7 +3084,7 @@
   ;
     break;}
 case 117:
-#line 1674 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1675 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-3].ConstVal->getType() != yyvsp[-1].ConstVal->getType())
       GEN_ERROR("setcc operand types must match!");
@@ -3086,7 +3093,7 @@
   ;
     break;}
 case 118:
-#line 1680 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1681 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-1].ConstVal->getType() != Type::UByteTy)
       GEN_ERROR("Shift count for shift constant must be unsigned byte!");
@@ -3097,7 +3104,7 @@
   ;
     break;}
 case 119:
-#line 1688 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1689 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!ExtractElementInst::isValidOperands(yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
       GEN_ERROR("Invalid extractelement operands!");
@@ -3106,7 +3113,7 @@
   ;
     break;}
 case 120:
-#line 1694 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1695 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!InsertElementInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
       GEN_ERROR("Invalid insertelement operands!");
@@ -3115,7 +3122,7 @@
   ;
     break;}
 case 121:
-#line 1700 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1701 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!ShuffleVectorInst::isValidOperands(yyvsp[-5].ConstVal, yyvsp[-3].ConstVal, yyvsp[-1].ConstVal))
       GEN_ERROR("Invalid shufflevector operands!");
@@ -3124,14 +3131,14 @@
   ;
     break;}
 case 122:
-#line 1709 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1710 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     (yyval.ConstVector = yyvsp[-2].ConstVector)->push_back(yyvsp[0].ConstVal);
     CHECK_FOR_ERROR
   ;
     break;}
 case 123:
-#line 1713 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1714 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ConstVector = new std::vector<Constant*>();
     yyval.ConstVector->push_back(yyvsp[0].ConstVal);
@@ -3139,15 +3146,15 @@
   ;
     break;}
 case 124:
-#line 1721 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1722 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.BoolVal = false; ;
     break;}
 case 125:
-#line 1721 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1722 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.BoolVal = true; ;
     break;}
 case 126:
-#line 1731 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1732 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.ModuleVal = ParserResult = yyvsp[0].ModuleVal;
   CurModule.ModuleDone();
@@ -3155,7 +3162,7 @@
 ;
     break;}
 case 127:
-#line 1739 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1740 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = yyvsp[-1].ModuleVal;
     CurFun.FunctionDone();
@@ -3163,28 +3170,28 @@
   ;
     break;}
 case 128:
-#line 1744 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1745 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = yyvsp[-1].ModuleVal;
     CHECK_FOR_ERROR
   ;
     break;}
 case 129:
-#line 1748 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1749 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = yyvsp[-3].ModuleVal;
     CHECK_FOR_ERROR
   ;
     break;}
 case 130:
-#line 1752 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1753 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = yyvsp[-1].ModuleVal;
     CHECK_FOR_ERROR
   ;
     break;}
 case 131:
-#line 1756 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1757 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ModuleVal = CurModule.CurrentModule;
     // Emit an error if there are any unresolved types left.
@@ -3200,7 +3207,7 @@
   ;
     break;}
 case 132:
-#line 1771 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1772 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     // Eagerly resolve types.  This is not an optimization, this is a
     // requirement that is due to the fact that we could have this:
@@ -3225,19 +3232,19 @@
   ;
     break;}
 case 133:
-#line 1793 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1794 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {       // Function prototypes can be in const pool
     CHECK_FOR_ERROR
   ;
     break;}
 case 134:
-#line 1796 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1797 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {  // Asm blocks can be in the const pool
     CHECK_FOR_ERROR
   ;
     break;}
 case 135:
-#line 1799 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1800 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[0].ConstVal == 0) 
       GEN_ERROR("Global value initializer is not a constant!");
@@ -3246,13 +3253,13 @@
   ;
     break;}
 case 136:
-#line 1804 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1805 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = 0;
   ;
     break;}
 case 137:
-#line 1807 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1808 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalLinkage, yyvsp[-1].BoolVal, *yyvsp[0].TypeVal, 0);
     CHECK_FOR_ERROR
@@ -3260,14 +3267,14 @@
   ;
     break;}
 case 138:
-#line 1811 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1812 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;
     break;}
 case 139:
-#line 1815 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1816 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::DLLImportLinkage, yyvsp[-1].BoolVal, *yyvsp[0].TypeVal, 0);
     CHECK_FOR_ERROR
@@ -3275,14 +3282,14 @@
   ;
     break;}
 case 140:
-#line 1819 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1820 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;
     break;}
 case 141:
-#line 1823 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1824 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = 
       ParseGlobalVariable(yyvsp[-3].StrVal, GlobalValue::ExternalWeakLinkage, yyvsp[-1].BoolVal, *yyvsp[0].TypeVal, 0);
@@ -3291,31 +3298,31 @@
   ;
     break;}
 case 142:
-#line 1828 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1829 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;
     break;}
 case 143:
-#line 1832 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1833 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { 
     CHECK_FOR_ERROR
   ;
     break;}
 case 144:
-#line 1835 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1836 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CHECK_FOR_ERROR
   ;
     break;}
 case 145:
-#line 1838 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1839 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { 
   ;
     break;}
 case 146:
-#line 1842 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1843 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   char *EndStr = UnEscapeLexed(yyvsp[0].StrVal, true);
@@ -3330,22 +3337,22 @@
 ;
     break;}
 case 147:
-#line 1855 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1856 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Endianness = Module::BigEndian; ;
     break;}
 case 148:
-#line 1856 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1857 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.Endianness = Module::LittleEndian; ;
     break;}
 case 149:
-#line 1858 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1859 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurModule.CurrentModule->setEndianness(yyvsp[0].Endianness);
     CHECK_FOR_ERROR
   ;
     break;}
 case 150:
-#line 1862 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1863 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[0].UInt64Val == 32)
       CurModule.CurrentModule->setPointerSize(Module::Pointer32);
@@ -3357,41 +3364,49 @@
   ;
     break;}
 case 151:
-#line 1871 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 1872 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     CurModule.CurrentModule->setTargetTriple(yyvsp[0].StrVal);
     free(yyvsp[0].StrVal);
     CHECK_FOR_ERROR
   ;
     break;}
-case 153:
-#line 1879 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 152:
+#line 1877 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
+{
+    CurModule.CurrentModule->setDataLayout(yyvsp[0].StrVal);
+    free(yyvsp[0].StrVal);
+    CHECK_FOR_ERROR
+  ;
+    break;}
+case 154:
+#line 1885 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
           CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
           free(yyvsp[0].StrVal);
           CHECK_FOR_ERROR
         ;
     break;}
-case 154:
-#line 1884 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 155:
+#line 1890 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
           CurModule.CurrentModule->addLibrary(yyvsp[0].StrVal);
           free(yyvsp[0].StrVal);
           CHECK_FOR_ERROR
         ;
     break;}
-case 155:
-#line 1889 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 156:
+#line 1895 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
           CHECK_FOR_ERROR
         ;
     break;}
-case 159:
-#line 1899 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 160:
+#line 1905 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.StrVal = 0; ;
     break;}
-case 160:
-#line 1901 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 161:
+#line 1907 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   if (*yyvsp[-1].TypeVal == Type::VoidTy)
     GEN_ERROR("void typed arguments are invalid!");
@@ -3399,8 +3414,8 @@
   CHECK_FOR_ERROR
 ;
     break;}
-case 161:
-#line 1908 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 162:
+#line 1914 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = yyvsp[-2].ArgList;
     yyvsp[-2].ArgList->push_back(*yyvsp[0].ArgVal);
@@ -3408,8 +3423,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 162:
-#line 1914 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 163:
+#line 1920 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = new std::vector<std::pair<PATypeHolder*,char*> >();
     yyval.ArgList->push_back(*yyvsp[0].ArgVal);
@@ -3417,15 +3432,15 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 163:
-#line 1921 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 164:
+#line 1927 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = yyvsp[0].ArgList;
     CHECK_FOR_ERROR
   ;
     break;}
-case 164:
-#line 1925 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 165:
+#line 1931 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = yyvsp[-2].ArgList;
     yyval.ArgList->push_back(std::pair<PATypeHolder*,
@@ -3433,23 +3448,23 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 165:
-#line 1931 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 166:
+#line 1937 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = new std::vector<std::pair<PATypeHolder*,char*> >();
     yyval.ArgList->push_back(std::make_pair(new PATypeHolder(Type::VoidTy), (char*)0));
     CHECK_FOR_ERROR
   ;
     break;}
-case 166:
-#line 1936 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 167:
+#line 1942 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ArgList = 0;
     CHECK_FOR_ERROR
   ;
     break;}
-case 167:
-#line 1942 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 168:
+#line 1948 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   UnEscapeLexed(yyvsp[-5].StrVal);
   std::string FunctionName(yyvsp[-5].StrVal);
@@ -3544,8 +3559,8 @@
   CHECK_FOR_ERROR
 ;
     break;}
-case 170:
-#line 2038 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 171:
+#line 2044 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.FunctionVal = CurFun.CurrentFunction;
 
@@ -3554,105 +3569,105 @@
   yyval.FunctionVal->setLinkage(yyvsp[-2].Linkage);
 ;
     break;}
-case 173:
-#line 2048 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 174:
+#line 2054 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   yyval.FunctionVal = yyvsp[-1].FunctionVal;
   CHECK_FOR_ERROR
 ;
     break;}
-case 175:
-#line 2054 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ CurFun.Linkage = GlobalValue::DLLImportLinkage ;
-    break;}
 case 176:
-#line 2055 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2060 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { CurFun.Linkage = GlobalValue::DLLImportLinkage ;
     break;}
 case 177:
-#line 2057 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
-{ CurFun.isDeclare = true; ;
+#line 2061 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
+{ CurFun.Linkage = GlobalValue::DLLImportLinkage ;
     break;}
 case 178:
-#line 2057 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2063 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
+{ CurFun.isDeclare = true; ;
+    break;}
+case 179:
+#line 2063 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.FunctionVal = CurFun.CurrentFunction;
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
   ;
     break;}
-case 179:
-#line 2067 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 180:
+#line 2073 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = false;
     CHECK_FOR_ERROR
   ;
     break;}
-case 180:
-#line 2071 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 181:
+#line 2077 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = true;
     CHECK_FOR_ERROR
   ;
     break;}
-case 181:
-#line 2076 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 182:
+#line 2082 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {    // A reference to a direct constant
     yyval.ValIDVal = ValID::create(yyvsp[0].SInt64Val);
     CHECK_FOR_ERROR
   ;
     break;}
-case 182:
-#line 2080 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 183:
+#line 2086 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::create(yyvsp[0].UInt64Val);
     CHECK_FOR_ERROR
   ;
     break;}
-case 183:
-#line 2084 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 184:
+#line 2090 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {                     // Perhaps it's an FP constant?
     yyval.ValIDVal = ValID::create(yyvsp[0].FPVal);
     CHECK_FOR_ERROR
   ;
     break;}
-case 184:
-#line 2088 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 185:
+#line 2094 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::create(ConstantBool::getTrue());
     CHECK_FOR_ERROR
   ;
     break;}
-case 185:
-#line 2092 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 186:
+#line 2098 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::create(ConstantBool::getFalse());
     CHECK_FOR_ERROR
   ;
     break;}
-case 186:
-#line 2096 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 187:
+#line 2102 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::createNull();
     CHECK_FOR_ERROR
   ;
     break;}
-case 187:
-#line 2100 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 188:
+#line 2106 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::createUndef();
     CHECK_FOR_ERROR
   ;
     break;}
-case 188:
-#line 2104 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 189:
+#line 2110 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {     // A vector zero constant.
     yyval.ValIDVal = ValID::createZeroInit();
     CHECK_FOR_ERROR
   ;
     break;}
-case 189:
-#line 2108 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 190:
+#line 2114 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { // Nonempty unsized packed vector
     const Type *ETy = (*yyvsp[-1].ConstVector)[0]->getType();
     int NumElements = yyvsp[-1].ConstVector->size(); 
@@ -3679,15 +3694,15 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 190:
-#line 2133 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 191:
+#line 2139 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValIDVal = ValID::create(yyvsp[0].ConstVal);
     CHECK_FOR_ERROR
   ;
     break;}
-case 191:
-#line 2137 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 192:
+#line 2143 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     char *End = UnEscapeLexed(yyvsp[-2].StrVal, true);
     std::string AsmStr = std::string(yyvsp[-2].StrVal, End);
@@ -3699,43 +3714,43 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 192:
-#line 2151 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 193:
+#line 2157 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {  // Is it an integer reference...?
     yyval.ValIDVal = ValID::create(yyvsp[0].SIntVal);
     CHECK_FOR_ERROR
   ;
     break;}
-case 193:
-#line 2155 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 194:
+#line 2161 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {                   // Is it a named reference...?
     yyval.ValIDVal = ValID::create(yyvsp[0].StrVal);
     CHECK_FOR_ERROR
   ;
     break;}
-case 196:
-#line 2167 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 197:
+#line 2173 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValueVal = getVal(*yyvsp[-1].TypeVal, yyvsp[0].ValIDVal); delete yyvsp[-1].TypeVal;
     CHECK_FOR_ERROR
   ;
     break;}
-case 197:
-#line 2172 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 198:
+#line 2178 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.FunctionVal = yyvsp[-1].FunctionVal;
     CHECK_FOR_ERROR
   ;
     break;}
-case 198:
-#line 2176 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 199:
+#line 2182 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { // Do not allow functions with 0 basic blocks   
     yyval.FunctionVal = yyvsp[-1].FunctionVal;
     CHECK_FOR_ERROR
   ;
     break;}
-case 199:
-#line 2185 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 200:
+#line 2191 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     setValueName(yyvsp[0].TermInstVal, yyvsp[-1].StrVal);
     CHECK_FOR_ERROR
@@ -3747,16 +3762,16 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 200:
-#line 2196 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 201:
+#line 2202 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyvsp[-1].BasicBlockVal->getInstList().push_back(yyvsp[0].InstVal);
     yyval.BasicBlockVal = yyvsp[-1].BasicBlockVal;
     CHECK_FOR_ERROR
   ;
     break;}
-case 201:
-#line 2201 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 202:
+#line 2207 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BasicBlockVal = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
     CHECK_FOR_ERROR
@@ -3770,8 +3785,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 202:
-#line 2213 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 203:
+#line 2219 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BasicBlockVal = CurBB = getBBVal(ValID::create(yyvsp[0].StrVal), true);
     CHECK_FOR_ERROR
@@ -3785,30 +3800,30 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 203:
-#line 2226 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 204:
+#line 2232 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {              // Return with a result...
     yyval.TermInstVal = new ReturnInst(yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
   ;
     break;}
-case 204:
-#line 2230 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 205:
+#line 2236 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {                                       // Return with no result...
     yyval.TermInstVal = new ReturnInst();
     CHECK_FOR_ERROR
   ;
     break;}
-case 205:
-#line 2234 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 206:
+#line 2240 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {                         // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal(yyvsp[0].ValIDVal);
     CHECK_FOR_ERROR
     yyval.TermInstVal = new BranchInst(tmpBB);
   ;
     break;}
-case 206:
-#line 2239 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 207:
+#line 2245 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {  
     BasicBlock* tmpBBA = getBBVal(yyvsp[-3].ValIDVal);
     CHECK_FOR_ERROR
@@ -3819,8 +3834,8 @@
     yyval.TermInstVal = new BranchInst(tmpBBA, tmpBBB, tmpVal);
   ;
     break;}
-case 207:
-#line 2248 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 208:
+#line 2254 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     Value* tmpVal = getVal(yyvsp[-7].PrimType, yyvsp[-6].ValIDVal);
     CHECK_FOR_ERROR
@@ -3841,8 +3856,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 208:
-#line 2267 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 209:
+#line 2273 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     Value* tmpVal = getVal(yyvsp[-6].PrimType, yyvsp[-5].ValIDVal);
     CHECK_FOR_ERROR
@@ -3853,8 +3868,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 209:
-#line 2277 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 210:
+#line 2283 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -3911,22 +3926,22 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 210:
-#line 2332 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 211:
+#line 2338 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TermInstVal = new UnwindInst();
     CHECK_FOR_ERROR
   ;
     break;}
-case 211:
-#line 2336 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 212:
+#line 2342 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.TermInstVal = new UnreachableInst();
     CHECK_FOR_ERROR
   ;
     break;}
-case 212:
-#line 2343 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 213:
+#line 2349 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.JumpTable = yyvsp[-5].JumpTable;
     Constant *V = cast<Constant>(getValNonImprovising(yyvsp[-4].PrimType, yyvsp[-3].ValIDVal));
@@ -3939,8 +3954,8 @@
     yyval.JumpTable->push_back(std::make_pair(V, tmpBB));
   ;
     break;}
-case 213:
-#line 2354 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 214:
+#line 2360 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.JumpTable = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getValNonImprovising(yyvsp[-4].PrimType, yyvsp[-3].ValIDVal));
@@ -3954,8 +3969,8 @@
     yyval.JumpTable->push_back(std::make_pair(V, tmpBB)); 
   ;
     break;}
-case 214:
-#line 2367 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 215:
+#line 2373 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
   // Is this definition named?? if so, assign the name...
   setValueName(yyvsp[0].InstVal, yyvsp[-1].StrVal);
@@ -3965,8 +3980,8 @@
   CHECK_FOR_ERROR
 ;
     break;}
-case 215:
-#line 2376 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 216:
+#line 2382 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {    // Used for PHI nodes
     yyval.PHIList = new std::list<std::pair<Value*, BasicBlock*> >();
     Value* tmpVal = getVal(*yyvsp[-5].TypeVal, yyvsp[-3].ValIDVal);
@@ -3977,8 +3992,8 @@
     delete yyvsp[-5].TypeVal;
   ;
     break;}
-case 216:
-#line 2385 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 217:
+#line 2391 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.PHIList = yyvsp[-6].PHIList;
     Value* tmpVal = getVal(yyvsp[-6].PHIList->front().first->getType(), yyvsp[-3].ValIDVal);
@@ -3988,41 +4003,41 @@
     yyvsp[-6].PHIList->push_back(std::make_pair(tmpVal, tmpBB));
   ;
     break;}
-case 217:
-#line 2395 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 218:
+#line 2401 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {    // Used for call statements, and memory insts...
     yyval.ValueList = new std::vector<Value*>();
     yyval.ValueList->push_back(yyvsp[0].ValueVal);
   ;
     break;}
-case 218:
-#line 2399 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 219:
+#line 2405 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.ValueList = yyvsp[-2].ValueList;
     yyvsp[-2].ValueList->push_back(yyvsp[0].ValueVal);
     CHECK_FOR_ERROR
   ;
     break;}
-case 220:
-#line 2406 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 221:
+#line 2412 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { yyval.ValueList = 0; ;
     break;}
-case 221:
-#line 2408 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 222:
+#line 2414 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = true;
     CHECK_FOR_ERROR
   ;
     break;}
-case 222:
-#line 2412 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 223:
+#line 2418 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = false;
     CHECK_FOR_ERROR
   ;
     break;}
-case 223:
-#line 2417 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 224:
+#line 2423 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!(*yyvsp[-3].TypeVal)->isInteger() && !(*yyvsp[-3].TypeVal)->isFloatingPoint() && 
         !isa<PackedType>((*yyvsp[-3].TypeVal).get()))
@@ -4040,8 +4055,8 @@
     delete yyvsp[-3].TypeVal;
   ;
     break;}
-case 224:
-#line 2433 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 225:
+#line 2439 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!(*yyvsp[-3].TypeVal)->isIntegral()) {
       if (!isa<PackedType>(yyvsp[-3].TypeVal->get()) ||
@@ -4058,8 +4073,8 @@
     delete yyvsp[-3].TypeVal;
   ;
     break;}
-case 225:
-#line 2448 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 226:
+#line 2454 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if(isa<PackedType>((*yyvsp[-3].TypeVal).get())) {
       GEN_ERROR(
@@ -4075,8 +4090,8 @@
     delete yyvsp[-3].TypeVal;
   ;
     break;}
-case 226:
-#line 2462 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 227:
+#line 2468 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     std::cerr << "WARNING: Use of eliminated 'not' instruction:"
               << " Replacing with 'xor'.\n";
@@ -4091,8 +4106,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 227:
-#line 2475 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 228:
+#line 2481 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[0].ValueVal->getType() != Type::UByteTy)
       GEN_ERROR("Shift amount must be ubyte!");
@@ -4102,8 +4117,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 228:
-#line 2483 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 229:
+#line 2489 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!yyvsp[0].TypeVal->get()->isFirstClassType())
       GEN_ERROR("cast instruction to a non-primitive type: '" +
@@ -4113,8 +4128,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 229:
-#line 2491 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 230:
+#line 2497 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (yyvsp[-4].ValueVal->getType() != Type::BoolTy)
       GEN_ERROR("select condition must be boolean!");
@@ -4124,8 +4139,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 230:
-#line 2499 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 231:
+#line 2505 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     NewVarArgs = true;
     yyval.InstVal = new VAArgInst(yyvsp[-2].ValueVal, *yyvsp[0].TypeVal);
@@ -4133,8 +4148,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 231:
-#line 2505 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 232:
+#line 2511 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     ObsoleteVarArgs = true;
     const Type* ArgTy = yyvsp[-2].ValueVal->getType();
@@ -4156,8 +4171,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 232:
-#line 2525 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 233:
+#line 2531 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     ObsoleteVarArgs = true;
     const Type* ArgTy = yyvsp[-2].ValueVal->getType();
@@ -4182,8 +4197,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 233:
-#line 2548 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 234:
+#line 2554 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!ExtractElementInst::isValidOperands(yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
       GEN_ERROR("Invalid extractelement operands!");
@@ -4191,8 +4206,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 234:
-#line 2554 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 235:
+#line 2560 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!InsertElementInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
       GEN_ERROR("Invalid insertelement operands!");
@@ -4200,8 +4215,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 235:
-#line 2560 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 236:
+#line 2566 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!ShuffleVectorInst::isValidOperands(yyvsp[-4].ValueVal, yyvsp[-2].ValueVal, yyvsp[0].ValueVal))
       GEN_ERROR("Invalid shufflevector operands!");
@@ -4209,8 +4224,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 236:
-#line 2566 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 237:
+#line 2572 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const Type *Ty = yyvsp[0].PHIList->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -4227,8 +4242,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 237:
-#line 2581 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 238:
+#line 2587 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -4289,51 +4304,51 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 238:
-#line 2640 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 239:
+#line 2646 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.InstVal = yyvsp[0].InstVal;
     CHECK_FOR_ERROR
   ;
     break;}
-case 239:
-#line 2647 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 240:
+#line 2653 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { 
     yyval.ValueList = yyvsp[0].ValueList; 
     CHECK_FOR_ERROR
   ;
     break;}
-case 240:
-#line 2650 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 241:
+#line 2656 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 { 
     yyval.ValueList = new std::vector<Value*>(); 
     CHECK_FOR_ERROR
   ;
     break;}
-case 241:
-#line 2655 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 242:
+#line 2661 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = true;
     CHECK_FOR_ERROR
   ;
     break;}
-case 242:
-#line 2659 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 243:
+#line 2665 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.BoolVal = false;
     CHECK_FOR_ERROR
   ;
     break;}
-case 243:
-#line 2666 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 244:
+#line 2672 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.InstVal = new MallocInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
     delete yyvsp[-1].TypeVal;
     CHECK_FOR_ERROR
   ;
     break;}
-case 244:
-#line 2671 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 245:
+#line 2677 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     Value* tmpVal = getVal(yyvsp[-2].PrimType, yyvsp[-1].ValIDVal);
     CHECK_FOR_ERROR
@@ -4341,16 +4356,16 @@
     delete yyvsp[-4].TypeVal;
   ;
     break;}
-case 245:
-#line 2677 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 246:
+#line 2683 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     yyval.InstVal = new AllocaInst(*yyvsp[-1].TypeVal, 0, yyvsp[0].UIntVal);
     delete yyvsp[-1].TypeVal;
     CHECK_FOR_ERROR
   ;
     break;}
-case 246:
-#line 2682 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 247:
+#line 2688 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     Value* tmpVal = getVal(yyvsp[-2].PrimType, yyvsp[-1].ValIDVal);
     CHECK_FOR_ERROR
@@ -4358,8 +4373,8 @@
     delete yyvsp[-4].TypeVal;
   ;
     break;}
-case 247:
-#line 2688 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 248:
+#line 2694 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PointerType>(yyvsp[0].ValueVal->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -4368,8 +4383,8 @@
     CHECK_FOR_ERROR
   ;
     break;}
-case 248:
-#line 2696 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 249:
+#line 2702 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PointerType>(yyvsp[-1].TypeVal->get()))
       GEN_ERROR("Can't load from nonpointer type: " +
@@ -4383,8 +4398,8 @@
     delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 249:
-#line 2708 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 250:
+#line 2714 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     const PointerType *PT = dyn_cast<PointerType>(yyvsp[-1].TypeVal->get());
     if (!PT)
@@ -4401,8 +4416,8 @@
     delete yyvsp[-1].TypeVal;
   ;
     break;}
-case 250:
-#line 2723 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+case 251:
+#line 2729 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 {
     if (!isa<PointerType>(yyvsp[-2].TypeVal->get()))
       GEN_ERROR("getelementptr insn requires pointer operand!");
@@ -4650,7 +4665,7 @@
     }
   return 1;
 }
-#line 2749 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y"
+#line 2755 "/Users/resistor/llvm/src/llvm/lib/AsmParser/llvmAsmParser.y"
 
 
 void llvm::GenerateError(const std::string &message, int LineNo) {


Index: llvm/lib/AsmParser/llvmAsmParser.h.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.12 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.13
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.12	Sun Oct 15 18:27:25 2006
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Tue Oct 17 21:21:48 2006
@@ -105,43 +105,44 @@
 #define	COLDCC_TOK	322
 #define	X86_STDCALLCC_TOK	323
 #define	X86_FASTCALLCC_TOK	324
-#define	RET	325
-#define	BR	326
-#define	SWITCH	327
-#define	INVOKE	328
-#define	UNWIND	329
-#define	UNREACHABLE	330
-#define	ADD	331
-#define	SUB	332
-#define	MUL	333
-#define	DIV	334
-#define	REM	335
-#define	AND	336
-#define	OR	337
-#define	XOR	338
-#define	SETLE	339
-#define	SETGE	340
-#define	SETLT	341
-#define	SETGT	342
-#define	SETEQ	343
-#define	SETNE	344
-#define	MALLOC	345
-#define	ALLOCA	346
-#define	FREE	347
-#define	LOAD	348
-#define	STORE	349
-#define	GETELEMENTPTR	350
-#define	PHI_TOK	351
-#define	CAST	352
-#define	SELECT	353
-#define	SHL	354
-#define	SHR	355
-#define	VAARG	356
-#define	EXTRACTELEMENT	357
-#define	INSERTELEMENT	358
-#define	SHUFFLEVECTOR	359
-#define	VAARG_old	360
-#define	VANEXT_old	361
+#define	DATA	325
+#define	RET	326
+#define	BR	327
+#define	SWITCH	328
+#define	INVOKE	329
+#define	UNWIND	330
+#define	UNREACHABLE	331
+#define	ADD	332
+#define	SUB	333
+#define	MUL	334
+#define	DIV	335
+#define	REM	336
+#define	AND	337
+#define	OR	338
+#define	XOR	339
+#define	SETLE	340
+#define	SETGE	341
+#define	SETLT	342
+#define	SETGT	343
+#define	SETEQ	344
+#define	SETNE	345
+#define	MALLOC	346
+#define	ALLOCA	347
+#define	FREE	348
+#define	LOAD	349
+#define	STORE	350
+#define	GETELEMENTPTR	351
+#define	PHI_TOK	352
+#define	CAST	353
+#define	SELECT	354
+#define	SHL	355
+#define	SHR	356
+#define	VAARG	357
+#define	EXTRACTELEMENT	358
+#define	INSERTELEMENT	359
+#define	SHUFFLEVECTOR	360
+#define	VAARG_old	361
+#define	VANEXT_old	362
 
 
 extern YYSTYPE llvmAsmlval;


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.17 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.18
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.17	Sun Oct 15 18:27:25 2006
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Tue Oct 17 21:21:48 2006
@@ -1068,6 +1068,7 @@
 %token DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT
 %token CC_TOK CCC_TOK CSRETCC_TOK FASTCC_TOK COLDCC_TOK
 %token X86_STDCALLCC_TOK X86_FASTCALLCC_TOK
+%token DATA
 %type <UIntVal> OptCallingConv
 
 // Basic Block Terminating Operators
@@ -1873,6 +1874,11 @@
     free($3);
     CHECK_FOR_ERROR
   };
+  | DATA '=' STRINGCONSTANT {
+    CurModule.CurrentModule->setDataLayout($3);
+    free($3);
+    CHECK_FOR_ERROR
+  };
 
 LibrariesDefinition : '[' LibList ']';
 






More information about the llvm-commits mailing list