Regenerate


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33599 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AsmParser/Lexer.cpp.cvs b/lib/AsmParser/Lexer.cpp.cvs
index d102617..991f469 100644
--- a/lib/AsmParser/Lexer.cpp.cvs
+++ b/lib/AsmParser/Lexer.cpp.cvs
@@ -1,55 +1,94 @@
-#define yy_create_buffer llvmAsm_create_buffer
-#define yy_delete_buffer llvmAsm_delete_buffer
-#define yy_scan_buffer llvmAsm_scan_buffer
-#define yy_scan_string llvmAsm_scan_string
-#define yy_scan_bytes llvmAsm_scan_bytes
-#define yy_flex_debug llvmAsm_flex_debug
-#define yy_init_buffer llvmAsm_init_buffer
-#define yy_flush_buffer llvmAsm_flush_buffer
-#define yy_load_buffer_state llvmAsm_load_buffer_state
-#define yy_switch_to_buffer llvmAsm_switch_to_buffer
-#define yyin llvmAsmin
-#define yyleng llvmAsmleng
-#define yylex llvmAsmlex
-#define yyout llvmAsmout
-#define yyrestart llvmAsmrestart
-#define yytext llvmAsmtext
-#define yylineno llvmAsmlineno
+#line 2 "Lexer.cpp"
 
-#line 20 "Lexer.cpp"
+#line 4 "Lexer.cpp"
+
+#define  YY_INT_ALIGNED short int
+
 /* A lexical scanner generated by flex */
 
-/* Scanner skeleton version:
-<<<<<<< Lexer.cpp.cvs
- * $Header$
-=======
- * $Header$
->>>>>>> 1.27
- */
-
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 33
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
 
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
 #include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+/* end standard C headers. */
 
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
 #endif
 
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#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
 
@@ -57,34 +96,17 @@
 
 #if __STDC__
 
-#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -99,71 +121,88 @@
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN (yy_start) = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE llvmAsmrestart(llvmAsmin  )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE (16384*64)
+#endif
 
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
 
-extern int yyleng;
-extern FILE *yyin, *yyout;
+extern int llvmAsmleng;
+
+extern FILE *llvmAsmin, *llvmAsmout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE llvmAsmlex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-llvmAsmlineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < llvmAsmleng; ++yyl )\
+                    if ( llvmAsmtext[yyl] == '\n' )\
+                        --llvmAsmlineno;\
+            }while(0)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
+		/* Undo effects of setting up llvmAsmtext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up llvmAsmtext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, yytext_ptr )
+#define unput(c) yyunput( c, (yytext_ptr)  )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
 typedef unsigned int yy_size_t;
+#endif
 
-
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -200,12 +239,16 @@
 	 */
 	int yy_at_bol;
 
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
+
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -215,196 +258,201 @@
 	 * possible backing-up.
 	 *
 	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
+	 * (via llvmAsmrestart()), so that the user can continue scanning by
+	 * just pointing llvmAsmin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
-	};
 
-static YY_BUFFER_STATE yy_current_buffer = 0;
+	};
+#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. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER yy_current_buffer
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
 
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when yytext is formed. */
+/* yy_hold_char holds the character lost when llvmAsmtext is formed. */
 static char yy_hold_char;
-
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
+int llvmAsmleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
+static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
+/* Flag which is used to allow llvmAsmwrap()'s to do buffer switches
+ * instead of setting up a fresh llvmAsmin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void llvmAsmrestart (FILE *input_file  );
+void llvmAsm_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE llvmAsm_create_buffer (FILE *file,int size  );
+void llvmAsm_delete_buffer (YY_BUFFER_STATE b  );
+void llvmAsm_flush_buffer (YY_BUFFER_STATE b  );
+void llvmAsmpush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void llvmAsmpop_buffer_state (void );
 
-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 )
+static void llvmAsmensure_buffer_stack (void );
+static void llvmAsm_load_buffer_state (void );
+static void llvmAsm_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
-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 ));
+#define YY_FLUSH_BUFFER llvmAsm_flush_buffer(YY_CURRENT_BUFFER )
 
-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 * ));
+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  );
 
-#define yy_new_buffer yy_create_buffer
+void *llvmAsmalloc (yy_size_t  );
+void *llvmAsmrealloc (void *,yy_size_t  );
+void llvmAsmfree (void *  );
+
+#define yy_new_buffer llvmAsm_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        llvmAsmensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
+	if ( ! YY_CURRENT_BUFFER ){\
+        llvmAsmensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
+/* Begin user sect3 */
 
-#define YY_USES_REJECT
-
-#define yywrap() 1
+#define llvmAsmwrap(n) 1
 #define YY_SKIP_YYWRAP
-typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-typedef int yy_state_type;
-extern int yylineno;
-int yylineno = 1;
-extern char *yytext;
-#define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
+typedef unsigned char YY_CHAR;
+
+FILE *llvmAsmin = (FILE *) 0, *llvmAsmout = (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[]  );
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
+ * corresponding action - sets up llvmAsmtext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
+	(yytext_ptr) = yy_bp; \
+	llvmAsmleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
+	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 131
-#define YY_END_OF_BUFFER 132
-static yyconst short int yy_acclist[211] =
+#define YY_NUM_RULES 134
+#define YY_END_OF_BUFFER 135
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[539] =
     {   0,
-      132,  130,  131,  129,  130,  131,  129,  131,  130,  131,
-      130,  131,  130,  131,  130,  131,  130,  131,  130,  131,
-      122,  130,  131,  122,  130,  131,    1,  130,  131,  130,
-      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
-      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
-      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
-      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
-      131,  130,  131,  121,  119,  118,  118,  125,  123,  127,
-      122,    1,  104,   36,   64,   49,   65,   60,   24,  121,
-      118,  118,  126,  127,   21,  127,  128,   50,   59,   34,
+        0,    0,  135,  133,  132,  132,  133,  133,  133,  133,
+      133,  133,  125,  125,    1,  133,  133,  133,  133,  133,
+      133,  133,  133,  133,  133,  133,  133,  133,  133,  133,
+      133,  133,  133,  133,  133,  133,  133,  133,    0,  123,
+        0,  121,  119,  128,    0,  126,    0,  130,  125,    0,
+        1,    0,  120,  129,    0,    0,    0,    0,    0,    0,
+        0,  105,    0,   36,    0,    0,    0,    0,    0,    0,
+       63,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   48,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   64,    0,    0,    0,    0,    0,    0,   59,
 
-       37,    3,   52,   74,   79,   77,   78,   76,   75,   80,
-       84,  103,   69,   67,   99,   68,   66,   51,   82,   73,
-       71,   72,   70,   83,   81,   61,  120,  127,  127,  101,
-       85,   63,   55,  111,   58,   62,  112,  100,   23,  124,
-       54,   88,   57,   25,    4,   47,   53,   56,   43,   12,
-       87,  127,   31,    2,    5,   44,   90,   46,  113,   86,
-       22,  110,   40,    7,   45,   39,   94,   93,    8,   16,
-      106,  109,   33,   48,   98,   92,  105,   26,   27,   91,
-      107,  102,   97,   38,    6,   28,   89,   32,    9,   18,
-       10,   95,   11,   96,   30,   13,   15,   14,   29,   35,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   24,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  123,  119,  130,   21,  130,    0,  131,    0,  124,
+      120,   49,    0,    0,   58,    0,    0,   34,    0,    0,
+        0,   37,    0,    0,    0,    0,    0,    0,    0,    0,
+        3,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   51,    0,   73,   78,   76,
+       77,   75,   74,    0,   79,   83,    0,  104,    0,    0,
 
-       17,  108,  114,  116,  117,   41,  115,   19,   42,   20
+        0,    0,    0,   68,   66,  100,    0,    0,    0,   67,
+       65,    0,    0,   50,    0,    0,    0,    0,    0,    0,
+        0,   81,   72,   70,    0,   71,   69,    0,   82,   80,
+        0,    0,    0,    0,    0,    0,    0,    0,   60,    0,
+        0,  122,  130,    0,    0,    0,  130,    0,    0,    0,
+      102,    0,    0,   84,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   62,   54,    0,
+        0,    0,    0,  112,   57,    0,    0,    0,   61,    0,
+        0,    0,    0,    0,    0,    0,    0,  113,  101,    0,
+        0,   23,    0,    0,  127,   53,    0,    0,   87,    0,
+
+        0,    0,   56,   89,    0,    0,   25,    0,    0,    4,
+        0,   46,   52,    0,    0,    0,    0,   55,    0,   42,
+        0,   12,    0,    0,   86,  130,   31,    0,    0,    2,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    5,    0,   43,   91,    0,    0,    0,    0,
+        0,    0,    0,   88,    0,    0,    0,    0,   45,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  114,
+        0,    0,    0,   85,    0,   22,    0,    0,    0,    0,
+        0,    0,    0,  111,    0,    0,   39,    0,    0,    0,
+        7,    0,    0,    0,   44,    0,    0,   38,   95,   94,
+
+        0,    0,    8,   16,    0,    0,    0,    0,  107,    0,
+      110,   33,   47,    0,    0,   99,    0,    0,   93,  106,
+       26,   27,   92,    0,  108,  103,    0,    0,    0,    0,
+        0,   98,    0,    0,    6,   28,    0,    0,    0,    0,
+        0,   90,    0,    0,    0,    0,    0,    0,    0,   32,
+        0,    0,    0,    0,    0,    0,    0,    0,    9,    0,
+        0,    0,    0,   18,    0,    0,    0,    0,   10,   96,
+       11,   97,    0,    0,    0,   30,    0,    0,    0,   13,
+        0,   15,   14,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   29,    0,    0,    0,    0,    0,
+
+        0,   35,    0,    0,    0,    0,   17,    0,    0,    0,
+        0,    0,  109,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  115,    0,  117,  118,    0,
+       40,    0,  116,   19,   41,    0,   20,    0
     } ;
 
-static yyconst short int yy_accept[537] =
-    {   0,
-        1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
-       17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
-       40,   42,   44,   46,   48,   50,   52,   54,   56,   58,
-       60,   62,   64,   66,   68,   70,   72,   74,   74,   75,
-       75,   76,   77,   78,   79,   79,   80,   80,   81,   82,
-       82,   83,   83,   83,   83,   83,   83,   83,   83,   84,
-       84,   85,   85,   85,   85,   85,   85,   85,   85,   86,
-       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-       87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-       87,   88,   88,   88,   88,   88,   88,   88,   89,   89,
-
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       91,   92,   94,   95,   96,   97,   97,   98,   99,   99,
-       99,  100,  100,  100,  101,  101,  101,  101,  102,  102,
-      102,  102,  102,  102,  102,  102,  102,  102,  103,  103,
-      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
-      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
-      103,  103,  104,  104,  105,  106,  107,  108,  109,  110,
-      110,  111,  112,  112,  113,  113,  113,  113,  113,  113,
-
-      114,  115,  116,  116,  116,  116,  117,  118,  118,  118,
-      119,  119,  119,  119,  119,  119,  119,  119,  120,  121,
-      122,  122,  123,  124,  124,  125,  126,  126,  126,  126,
-      126,  126,  126,  126,  126,  127,  127,  127,  128,  129,
-      129,  129,  129,  130,  130,  130,  130,  131,  131,  131,
-      132,  132,  132,  132,  132,  132,  132,  132,  132,  132,
-      132,  132,  132,  132,  132,  133,  134,  134,  134,  134,
-      134,  135,  136,  136,  136,  136,  137,  137,  137,  137,
-      137,  137,  137,  137,  138,  139,  139,  139,  140,  140,
-      140,  141,  142,  142,  142,  143,  143,  143,  143,  144,
-
-      144,  144,  145,  145,  145,  146,  146,  147,  148,  148,
-      148,  148,  148,  149,  149,  150,  150,  151,  151,  151,
-      152,  153,  154,  154,  154,  155,  155,  155,  155,  155,
-      155,  155,  155,  155,  155,  155,  155,  155,  155,  156,
-      156,  157,  158,  158,  158,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,  159,  159,  159,  159,  159,  159,
-      159,  159,  159,  159,  159,  160,  160,  160,  160,  161,
-      161,  162,  162,  162,  162,  162,  162,  162,  162,  163,
-      163,  163,  164,  164,  164,  164,  164,  165,  165,  165,
-      165,  166,  166,  166,  167,  168,  169,  169,  169,  170,
-
-      171,  171,  171,  171,  171,  172,  172,  173,  174,  175,
-      175,  175,  176,  176,  176,  177,  178,  179,  180,  181,
-      181,  182,  183,  183,  183,  183,  183,  183,  184,  184,
-      185,  185,  186,  187,  187,  187,  187,  187,  187,  188,
-      188,  188,  188,  188,  188,  188,  188,  189,  189,  189,
-      189,  189,  189,  189,  189,  189,  190,  190,  190,  190,
-      190,  191,  191,  191,  191,  191,  192,  193,  194,  195,
-      195,  195,  195,  196,  196,  196,  196,  197,  197,  198,
-      199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
-      199,  199,  200,  200,  200,  200,  200,  200,  200,  201,
-
-      201,  201,  201,  201,  202,  202,  202,  202,  202,  202,
-      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
-      203,  203,  203,  204,  204,  205,  206,  206,  207,  207,
-      208,  209,  210,  210,  211,  211
-    } ;
-
-static yyconst int yy_ec[256] =
+static yyconst flex_int32_t yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
@@ -412,14 +460,14 @@
         1,    2,    1,    4,    1,    5,    6,    1,    1,    1,
         1,    1,    7,    1,    8,    9,    1,   10,   11,   11,
        11,   11,   11,   12,   11,   13,   11,   14,   15,    1,
-        1,    1,    1,    1,   16,   16,   16,   16,   17,   16,
+        1,    1,    1,   16,   17,   17,   17,   17,   18,   17,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        1,    1,    1,    1,   18,    1,   19,   20,   21,   22,
+        1,    1,    1,    1,   19,    1,   20,   21,   22,   23,
 
-       23,   24,   25,   26,   27,    5,   28,   29,   30,   31,
-       32,   33,   34,   35,   36,   37,   38,   39,   40,   41,
-       42,   43,    1,    1,    1,    1,    1,    1,    1,    1,
+       24,   25,   26,   27,   28,    5,   29,   30,   31,   32,
+       33,   34,   35,   36,   37,   38,   39,   40,   41,   42,
+       43,   44,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -436,431 +484,445 @@
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[44] =
+static yyconst flex_int32_t yy_meta[45] =
     {   0,
-        1,    1,    2,    1,    3,    1,    1,    3,    3,    3,
-        3,    3,    3,    4,    1,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3
+        1,    1,    2,    3,    4,    1,    1,    4,    4,    4,
+        4,    4,    4,    5,    1,    1,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[541] =
+static yyconst flex_int16_t yy_base[547] =
     {   0,
-        0,    0, 1164, 1165, 1165, 1165, 1159, 1148,   36,   40,
-       44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
-      108,   91,   77,  134,   92,  119,   93,  152,   72,  109,
-      178,  121,  209,  120,  135,  146,  147, 1157, 1165, 1146,
-     1165,    0,  161,  183,  199,  215,   70,  235,  250,  255,
-        0,   68,  140,  128,  165,  154,  101,   46, 1145,   96,
-      168,  206,  162,  177,  259,  188,   49,  208, 1144,  219,
-      267,  176,  172,  207,  268,  227,  256,  270,  229,  264,
-      274,  273,  272,  287,   31,  296,  228,  283,  276,  285,
-     1143,  299,  286,  302,  303,  304,  305,  307,  308,  309,
+        0,    0, 1173, 1174, 1174, 1174, 1168, 1157,   35,   39,
+       43,   49,   55,   61,    0,   72,   64,   67,   66,   86,
+       76,  106,   91,   65,  133,  121,  117,   78,  152,   95,
+       90,  179,  137,  211,  139,   99,  148,  110, 1166, 1174,
+     1155, 1174,    0,   49,  185,  217,   98,  238,  254,  259,
+        0, 1164,    0,  200,  116,  149,  146,  118,  160,   63,
+      154, 1153,  153,  186,  208,  161,  264,  171,  205,  200,
+     1152,  219,  260,  222,  176,  228,  261,  124,  273,  274,
+      231,  269,  278,  279,  280,  281,  282,  290,  232,  202,
+      289,  291, 1151,  292,  294,  301,  309,  310,  312,  305,
 
-      316,  317,  318,  320,  319,  322,  332,  329,  324,  323,
-      343,  345,  348, 1142,  350,  334,  351,  336,  357,  354,
-      359,  367,  362,  239,  379,  360,  372,  378,  381, 1141,
-        0,  399,  407, 1140,  421,  438,    0, 1139,  373,  383,
-     1138,  391,  386, 1137,  409,  426,  412, 1136,  415,  389,
-      439,  440,  413,  429,  441,  444,  443, 1135,  446,  425,
-      450,  451,  452,  454,  387,  458,  462,  460,  466,  474,
-      461,  468,  475,  481,  485,  486,  487,  488,  489,  491,
-      492, 1134,  493, 1133, 1132, 1131, 1130, 1129, 1128,  494,
-     1127, 1126,  497, 1125,  525,  500,  513,  498,  515, 1124,
+      313,  316,  317,  321,  322,  323,  324,  328,  326,  330,
+      332,  337,  345,  329,  346, 1150,  347,  355,  357,  358,
+      359,  362,  363,  380,  364,  241,  377,  370,  113,  366,
+      378, 1149,    0,  399, 1148,  414,  432,    0, 1157, 1174,
+        0, 1146,  382,  365, 1145,  405,  401, 1144,  367,  408,
+      404, 1143,  427,  417,  433,  419,  434,  421,  441,  385,
+     1142,  442,  422,  438,  443,  444,  447,  446,  449,  450,
+      456,  454,  469,  457,  459,  472,  473,  476,  465,  479,
+      480,  481,  485,  487,  488, 1141,  492, 1140, 1139, 1138,
+     1137, 1136, 1135,  491, 1134, 1133,  493, 1132,  522,  496,
 
-     1123, 1122,  499,  502,  519, 1121, 1120,  526,  518, 1119,
-      517,  529,  541,  543,  546,  545,  547, 1118, 1117, 1116,
-      548, 1115, 1114,  549, 1113, 1112,  550,  551,  553,  556,
-      557,  568,  560,  567, 1111,  570,  575, 1165,  580,  588,
-      594,  603,  608,  580,  505,  594, 1110,  595,  609, 1109,
-      610,  596,  613,  615,  616,  618,  620,  622,  623,  625,
-      624,  626,  628,  627, 1108, 1107,  629,  632,  638,  641,
-     1106, 1105,  642,  643,  644, 1104,  647,  646,  650,  651,
-      654,  658,  659, 1103, 1102,  661,  663, 1101,  664,  666,
-        0, 1100,  670,  674, 1099,  672,  676,  680, 1098,  686,
+      499,  494,  510, 1131, 1130, 1129,  498,  501,  497, 1128,
+     1127,  524,  505, 1126,  514,  535,  537,  536,  540,  542,
+      539, 1125, 1124, 1123,  543, 1122, 1121,  544, 1120, 1119,
+      545,  546,  547,  553,  506,  557,  561,  566, 1118,  567,
+      568, 1174,  581,  576,  585,  597,  602,  587,  603,  588,
+     1117,  589,  604, 1116,  608,  590,  609,  612,  613,  615,
+      617,  619,  621,  620,  622,  623,  624, 1115, 1114,  626,
+      627,  630,  634, 1113, 1112,  638,  635,  639, 1111,  646,
+      640,  643,  644,  648,  647,  657,  658, 1110, 1109,  660,
+      664, 1108,  661,  663,    0, 1107,  669,  668, 1106,  670,
 
-      687, 1097,  689,  691, 1096,  692, 1095, 1094,  693,  697,
-      696,  700, 1093,  702, 1092,  704, 1091,  708,  709, 1090,
-      714, 1089,  714,  716, 1088,  715,  721,  720,  726,  729,
-      731,  732,  736,  735,  738,  739,  743,  740, 1087,  744,
-     1086, 1085,  745,  746,  749,  753,  750,  755,  761,  756,
-      763,  764,  767, 1084,  768,  771,  773,  775,  774,  770,
-      769,  781,  789,  786, 1083,  790,  791,  794, 1082,  793,
-     1081,  797,  798,  800,  795,  810,  801,  809, 1080,  807,
-      813, 1079,  816,  818,  817,  819, 1078,  821,  822,  823,
-     1077,  827,  829, 1076, 1075, 1074,  830,  834, 1073, 1072,
+      674,  678, 1105, 1104,  675,  687, 1103,  688,  690, 1102,
+      691, 1101, 1100,  692,  693,  694,  696, 1099,  697, 1098,
+      701, 1097,  705,  707, 1096,  712, 1095,  712,  713, 1094,
+      715,  723,  720,  724,  717,  727,  729,  732,  733,  734,
+      740,  735, 1093,  741, 1092, 1091,  742,  745,  746,  747,
+      750,  751,  748, 1090,  754,  755,  760,  761, 1089,  763,
+      762,  767,  772,  774,  768,  775,  776,  779,  783, 1088,
+      784,  785,  786, 1087,  791, 1086,  793,  789,  794,  800,
+      802,  795,  804, 1085,  807,  805, 1084,  810,  812,  813,
+     1083,  815,  816,  817, 1082,  820,  818, 1081, 1080, 1079,
 
-      835,  838,  846,  839, 1071,  842, 1070, 1069, 1068,  848,
-      853, 1067,  854,  856, 1066, 1065, 1064, 1063, 1062,  855,
-     1061, 1060,  857,  858,  860,  861,  859, 1059,  864, 1058,
-      871, 1057, 1056,  869,  873,  122,  877,  875, 1055,  879,
-      878,  881,  882,  883,  891,  885, 1054,  886,  893,  898,
-      901,  899,  905,  906,  907, 1051,  909,  913,  914,  915,
-     1042,  916,  917,  919,  921, 1041, 1040, 1039, 1038,  923,
-      920,  935, 1036,  938,  939,  940, 1035,  925, 1033, 1032,
-      946,  943,  926,  950,  947,  954,  956,  957,  959,  958,
-      960, 1031,  962,  966,  967,  968,  969,  970, 1027,  971,
+      824,  827, 1078, 1077,  830,  833,  831,  834, 1076,  839,
+     1075, 1074, 1073,  845,  846, 1072,  849,  850, 1071, 1070,
+     1069, 1068, 1067,  852, 1066, 1065,  851,  848,  853,  854,
+      855, 1064,  856,  857, 1063, 1062,  860,  866,  869,  870,
+      874, 1061,  875,  872,  877,  878,  879,  881,  883, 1060,
+      887,  889,  892,  895,  897,  900,  902,  903, 1059,  904,
+      906,  909,  910, 1058,  911,  914,  912,  918, 1057, 1056,
+     1055, 1054,  924,  917,  916, 1053,  931,  935,  937, 1042,
+      919, 1032, 1031,  938,  940,  922,  942,  945,  947,  949,
+      952,  953,  954,  957, 1030,  956,  958,  960,  961,  964,
 
-      974,  975,  977, 1025,  985,  981,  983,  984,  987, 1024,
-      988,  995,  997,  998,  999, 1000, 1006, 1007, 1009, 1012,
-     1008, 1011, 1023, 1013,  928,  705, 1014,  675, 1017,  465,
-      464,  463, 1022,  390, 1165, 1057, 1059,  286, 1063,  252
+      965, 1028,  966,  967,  972,  977, 1027,  969,  978,  981,
+      982,  984, 1025,  990,  986,  987,  991,  992,  996,  997,
+      998,  999, 1004,  672, 1005, 1024, 1008, 1022, 1019, 1010,
+     1017, 1013, 1016,  671,  502, 1011,  458, 1174, 1047, 1049,
+      254, 1054, 1057,  220, 1061,  167
     } ;
 
-static yyconst short int yy_def[541] =
+static yyconst flex_int16_t yy_def[547] =
     {   0,
-      535,    1,  535,  535,  535,  535,  536,  537,  538,  535,
-      537,  537,  537,  537,  539,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  536,  535,  537,
-      535,  540,  540,  535,  535,  537,  537,  537,  537,  537,
-      539,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,   24,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      538,    1,  538,  538,  538,  538,  539,  540,  541,  538,
+      540,  540,  540,  540,  542,  543,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  539,  538,
+      540,  538,  544,  538,  538,  540,  540,  540,  540,  540,
+      542,  545,  546,  538,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,   25,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
 
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  535,
-      540,  540,  535,  537,  537,  537,   50,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,   50,  537,  537,  537,  537,  537,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  538,  544,  538,  540,  540,  540,   50,  545,  538,
+      546,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,   50,  540,
 
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  535,  535,  535,
-      535,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      195,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  538,  538,  538,  538,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  199,  540,  540,  540,  540,  540,
 
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      535,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  538,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
 
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
 
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,    0,  535,  535,  535,  535,  535
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,    0,  538,  538,
+      538,  538,  538,  538,  538,  538
     } ;
 
-static yyconst short int yy_nxt[1209] =
+static yyconst flex_int16_t yy_nxt[1219] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-       14,   14,   14,    4,   15,    8,    8,    8,   16,   17,
-       18,   19,   20,   21,   22,   23,   24,    8,   25,   26,
-       27,   28,   29,    8,   30,   31,   32,   33,   34,   35,
-       36,    8,   37,   43,   41,   44,   44,   44,   44,   45,
-       45,   45,   45,   46,   46,   46,   46,   41,   47,   41,
-       41,  177,   41,   41,   48,   49,   49,   49,   49,   41,
-       48,   49,   49,   49,   49,   41,   41,   68,  134,   41,
-       69,   41,  146,   41,   52,   41,  157,   70,   57,  138,
-       41,   53,   58,   54,   41,   55,   50,   99,   56,   60,
+       14,   14,   14,    4,   15,   16,    8,    8,    8,   17,
+       18,   19,   20,   21,   22,   23,   24,   25,    8,   26,
+       27,   28,   29,   30,    8,   31,   32,   33,   34,   35,
+       36,   37,    8,   38,   44,   44,   44,   44,   45,   45,
+       45,   45,   46,   46,   46,   46,   42,   47,   44,   44,
+       44,   44,   42,   48,   49,   49,   49,   49,   42,   48,
+       49,   49,   49,   49,   42,   52,   42,   42,   42,   42,
+       42,   54,   54,   54,   54,   63,   55,   64,  149,   42,
+       60,   42,   81,   56,   61,   57,   50,   58,   65,   42,
 
-       59,   61,   41,   79,   41,   41,   41,   64,  100,   41,
-       84,   65,   62,   77,   41,   91,   63,   66,   85,   78,
-       67,   41,   41,   86,  147,  145,   71,   87,   72,   73,
-       92,  101,   41,   41,   41,   41,   74,   88,  124,  113,
-       75,   41,   76,   80,   80,   80,   80,   41,   41,  141,
-       89,  125,  114,   41,   81,  115,   90,  126,  127,   41,
-       41,  460,  116,   82,   83,   41,  139,   41,  140,  129,
-      132,  132,  132,  132,   93,   41,   94,  128,   41,  143,
-       95,   41,   96,  144,   97,   41,   98,  102,  148,   41,
-       41,   41,   44,   44,   44,   44,  151,  142,  163,  103,
+       59,   93,   62,   42,   42,   66,  135,   70,   42,   67,
+       71,   42,   42,  103,   79,   68,   94,   72,   69,   42,
+       80,  101,  128,   42,  238,   73,   42,   74,   75,   42,
+       42,   42,  102,  131,   42,   76,   90,   42,  142,   77,
+       86,   78,   82,   82,   82,   82,   42,  170,   87,   91,
+       42,  146,   42,   88,   83,   92,  115,   89,  126,   42,
+      129,   42,   42,   84,   85,   42,   42,   42,  145,  116,
+      141,  127,  117,   42,   42,   95,  143,   96,  144,  118,
+      130,   97,  151,   98,   42,   99,  147,  100,  104,   42,
+      148,  150,   42,  134,   45,   45,   45,   45,  155,   42,
 
-      104,   41,  105,  106,  107,  162,  108,  133,   45,   45,
-       45,   45,  109,  152,  110,  111,  156,  112,  102,   41,
-       41,   41,   41,   48,   46,   46,   46,   46,   41,  158,
-      117,  118,   41,  119,  149,  120,  150,  121,  164,  122,
-       41,   41,   41,  123,  135,  135,  135,  135,   41,  167,
-      170,  136,   41,  179,  131,  159,  230,  136,   48,   49,
-       49,   49,   49,   41,  137,  137,  137,  137,   41,   41,
-      137,  137,   41,  137,  137,  137,  137,  137,  137,  153,
-       41,   41,  154,   41,   40,   41,   41,   41,   42,   41,
-      165,  155,  168,   40,   40,  160,   41,  181,   41,   41,
+      159,  105,  106,  166,  107,  108,  109,  152,  110,   54,
+       54,   54,   54,   42,  111,   42,  112,  113,   42,  114,
+      104,   42,  161,  133,   42,   48,   46,   46,   46,   46,
+       42,  184,   42,  119,  120,   42,  121,  153,  122,  154,
+      123,   42,  124,  160,   42,   42,  125,  136,  136,  136,
+      136,   42,  165,  173,   42,  137,  162,   43,  183,  234,
+      167,  137,   48,   49,   49,   49,   49,   42,  138,  138,
+      138,  138,   42,   42,   42,  138,  138,   42,  138,  138,
+      138,  138,  138,  138,  168,  156,   42,   42,  157,  163,
+       41,   42,   42,   42,   42,   42,  164,  158,  169,   41,
 
-       41,  169,  161,  171,  166,  172,  176,  173,  174,   41,
-      175,  180,   41,  182,  178,   41,   41,   41,   41,  184,
-       41,   41,   41,  190,  185,  187,  189,  183,  191,   41,
-       41,   41,   41,   41,  192,   41,   41,   41,  186,  188,
-      197,  200,   41,  193,  196,   41,  208,   41,  198,   41,
-      202,  206,  194,  204,  209,  201,   41,  195,   41,  203,
-      199,   41,  210,   41,   41,  207,  216,   41,  205,  218,
-       41,  211,   41,   41,  212,   41,  214,  217,  233,  219,
-       41,  222,  213,  234,  229,   41,   41,  215,  224,  225,
-      221,   41,   41,  220,   41,  223,   41,  244,  226,   41,
+       41,  180,   42,   42,   42,   42,  172,   42,  174,  182,
+      171,  185,  175,  181,   42,  176,  177,  178,   42,  179,
+      186,  187,   42,   42,  189,   42,   42,  195,  188,   42,
+       42,  194,  191,  193,   42,   42,   42,   42,  190,   42,
+      196,   42,   42,   42,  201,   42,  192,  204,  208,  200,
+       42,  197,  202,  210,  198,  212,  215,  206,   42,   42,
+       42,  205,  199,  209,  203,  214,  207,  211,   42,  213,
+       42,   42,   42,  216,  218,   42,   42,   42,   42,   42,
+       42,  217,  223,   42,  221,  219,  226,  233,  220,  237,
+       42,   42,  222,   42,  252,   42,  224,  249,   42,  225,
 
-       41,  227,   41,   41,   41,  231,  228,  232,  132,  132,
-      132,  132,  235,  246,  245,  236,  239,  239,  239,  239,
-      247,  237,   41,  240,  252,   41,   41,  268,   41,  240,
-      135,  135,  135,  135,   41,  248,  251,  136,   41,   41,
-      250,  255,   41,  136,  241,  242,  249,  243,  243,  243,
-      243,   41,   41,   41,   41,  256,   41,   41,  254,   41,
-      263,  253,  260,   41,   41,   41,  258,   41,  261,  257,
-      259,   41,  267,   41,   41,   41,   41,   41,   41,   41,
-      262,   41,  273,  265,  271,  274,  264,   41,   41,  269,
-      266,  272,  270,  276,   41,  275,  277,  278,   41,   41,
+      227,  239,  228,  229,  235,  263,  236,  248,  243,  243,
+      243,  243,  230,  240,   42,  231,  244,   42,   42,  241,
+      232,   42,  244,  136,  136,  136,  136,   42,  250,  253,
+       42,  137,   42,  254,   42,   42,  251,  137,  245,  246,
+       42,  247,  247,  247,  247,   42,   42,   42,  258,  255,
+      260,   42,  257,  256,   42,   42,   42,   42,  266,   42,
+       42,  259,   42,   42,  261,  264,  270,   42,  262,   42,
+       42,   42,   42,  274,  277,  267,  268,  265,   42,  276,
+      275,  272,   42,  269,  273,   42,   42,  271,  280,   42,
+      279,  278,   42,   42,   42,  281,  282,  285,   42,  283,
 
-       41,   41,   41,  279,   41,   41,   41,   41,  282,  284,
-       41,   41,   41,   41,  283,   41,  281,  280,   41,  286,
-      294,  288,  296,  285,  297,  323,   41,  289,   41,  287,
-       41,   41,   41,  290,  291,  291,  291,  291,  292,   41,
-      291,  291,   41,  291,  291,  291,  291,  291,  291,  293,
-      298,  295,  300,  301,   41,  299,   41,  302,   41,   41,
-       41,   41,   41,   41,   41,  303,   41,  307,  305,   41,
-       41,  310,  311,   41,  314,  304,  306,  312,  315,  309,
-       41,   41,  313,   41,  318,  308,  316,  317,   41,  239,
-      239,  239,  239,   41,  241,  241,  240,  321,  321,  321,
+       42,   42,  286,  288,   42,   42,   42,   42,  287,   42,
+       42,   42,   42,  284,   42,   42,  290,  298,   42,   42,
+      289,  292,  300,   42,  301,  293,  291,   42,  320,  302,
+      294,  295,  295,  295,  295,  296,  297,   42,  295,  295,
+      305,  295,  295,  295,  295,  295,  295,  299,   42,   42,
+       42,  306,   42,   42,  303,   42,   42,   42,   42,   42,
+       42,  304,  308,  310,  307,  312,   42,  315,  316,  309,
+       42,  311,  319,  317,   42,  314,  321,  318,  313,   42,
+       42,   42,  245,  245,  323,  326,  326,  326,  326,  322,
+      243,  243,  243,  243,  326,  326,  326,  326,  244,  324,
 
-      321,  319,  240,  321,  321,  321,  321,   41,   41,   41,
-      322,  320,  243,  243,  243,  243,   41,  243,  243,  243,
-      243,   41,   41,   41,  324,  325,   41,  326,   41,   41,
-      327,   41,  328,   41,  331,   41,   41,   41,   41,   41,
-       41,   41,   41,  330,  338,   41,  333,  340,  332,  329,
-      339,   41,  335,  336,   41,   41,   41,   41,  337,   41,
-       41,  347,  334,   41,   41,  341,  348,   41,  342,  349,
-      346,   41,   41,  343,   41,  344,   41,   41,  345,   41,
-      350,  353,  352,   41,  351,   41,  354,   41,   41,   41,
-      355,  357,  356,   41,  361,  362,  360,  359,  363,   41,
+       42,   42,   42,   42,  244,  325,  247,  247,  247,  247,
+       42,  247,  247,  247,  247,   42,   42,   42,  327,  329,
+      330,   42,   42,  331,  328,   42,   42,  333,   42,  332,
+       42,  335,   42,   42,   42,   42,   42,   42,  334,   42,
+       42,  342,  337,   42,  336,  344,  343,   42,   42,  339,
+      340,   42,   42,   42,  351,  341,   42,   42,  338,   42,
+       42,   42,  352,  345,  346,  354,  347,  350,  348,  353,
+       42,   42,  349,   42,   42,  358,   42,   42,  355,  356,
+      357,   42,   42,   42,   42,   42,  359,   42,   42,  366,
+      360,   42,  361,  362,  367,  364,  365,  368,  370,  363,
 
-       41,  358,   41,  364,   41,   41,   41,  366,  365,   41,
-       41,  367,  369,   41,  372,   41,  370,   41,   41,  368,
-      371,   41,   41,  321,  321,  321,  321,   41,   41,   41,
-      373,  376,  379,   41,   41,  378,  374,  380,  383,   41,
-      375,  382,   41,  377,   41,   41,  384,  385,   41,   41,
-      381,   41,   41,   41,  387,  388,   41,   41,   41,   41,
-      393,  391,   41,   41,  394,  386,   41,  389,   41,   41,
-      390,  395,  396,  392,   41,  398,   41,   41,  399,  397,
-       41,   41,   41,   41,   41,  400,   41,   41,   41,  405,
-      401,  407,  402,  403,   41,  408,  404,  409,  406,   41,
+       42,   42,  369,   42,   42,   42,   42,   42,  371,   42,
+       42,  372,  374,  377,   42,  532,  375,  376,   42,  373,
+       42,  326,  326,  326,  326,   42,   42,  378,   42,  381,
+       42,  384,  379,   42,  383,  385,   42,   42,  380,  388,
+       42,  382,   42,  389,  387,   42,   42,   42,   42,  392,
+      391,  386,  390,   42,   42,   42,  397,  395,   42,   42,
+       42,   42,  398,   42,   42,  393,  394,   42,   42,  399,
+      402,  396,  400,   42,   42,   42,   42,  401,  405,  403,
+       42,   42,  404,  411,  409,   42,  407,   42,   42,   42,
+      412,  406,   42,  408,  410,  413,   42,   42,   42,   42,
 
-      410,  411,   41,   41,   41,  412,   41,   41,   41,  413,
-       41,   41,  414,   41,   41,  416,  418,  420,  415,  421,
-       41,  423,   41,   41,  422,  419,   41,  417,  424,   41,
-       41,   41,   41,  427,   41,   41,   41,  425,  430,  426,
-       41,  432,   41,   41,  436,  437,  429,   41,   41,  428,
-      439,   41,   41,  434,  435,   41,  433,  441,  431,   41,
-      442,   41,  445,  440,  443,  438,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,  444,  448,   41,  446,  449,
-      450,  453,   41,  447,   41,  451,   41,  454,   41,  455,
-       41,   41,   41,  452,   41,   41,   41,  462,   41,   41,
+      415,  414,   42,  418,   42,  417,   42,   42,   42,  422,
+      420,  425,  416,   42,  424,   42,  419,   42,   42,  426,
+       42,  428,  421,   42,  423,   42,   42,  427,   42,   42,
+       42,   42,  429,   42,  431,  430,  435,   42,  439,  440,
+       42,  433,  432,   42,   42,  442,   42,   42,  437,  438,
+      446,  436,   42,  444,  434,  441,  445,  443,   42,   42,
+      448,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,  447,  451,   42,  452,  456,  449,  450,  453,   42,
+      454,  457,   42,   42,  455,   42,  458,   42,   42,  460,
+       42,   42,   42,  459,   42,  461,   42,  465,  466,  464,
 
-      456,  463,  457,  458,   41,  461,   41,  459,  464,  465,
-      466,   41,   41,  468,   41,  471,  472,  467,   41,   41,
-       41,  469,   41,  473,  470,  475,   41,   41,   41,   41,
-       41,  477,   41,   41,   41,  474,   41,  481,   41,   41,
-      487,   41,  476,  485,  482,  486,  478,  483,   41,  479,
-      480,   41,   41,   41,  488,  484,   41,  490,  489,   41,
-       41,  492,  495,   41,  493,  494,  491,   41,  496,   41,
-       41,   41,   41,   41,  498,   41,  497,  501,  503,   41,
-       41,   41,   41,   41,   41,  500,  502,   41,   41,  504,
-       41,  508,  499,  510,   41,  505,   41,   41,   41,  506,
+       42,  462,   42,  467,  471,   42,  468,  469,   42,  463,
+       42,  475,  474,   42,  470,   42,   42,   42,  476,   42,
+      472,  478,   42,   42,   42,   42,  473,   42,  480,   42,
+       42,   42,   42,  484,  477,   42,  491,   42,  490,  479,
+      485,  488,  481,  482,   42,  486,  483,  489,   42,  487,
+       42,   42,  492,   42,  493,   42,  495,  496,   42,  498,
+       42,  499,   42,  497,  494,   42,   42,   42,  501,   42,
+       42,   42,  504,   42,   42,  500,  506,   42,   42,   42,
+       42,  503,   42,  505,  507,   42,  502,  511,  508,  513,
+       42,   42,  517,  509,   42,   42,  514,   42,  510,   42,
 
-       41,   41,  511,  512,  507,  513,  509,  514,   41,  516,
-       41,   41,   41,   41,  517,  520,  519,  515,  518,   41,
-       41,   41,   41,  521,   41,   41,   41,   41,  522,  527,
-       41,  524,  528,  523,  532,   41,   41,   41,   41,  533,
-       41,  526,  525,  531,   41,   41,   41,  530,   41,   41,
-      529,   41,   41,   41,   41,   41,  534,   38,   38,   38,
-       38,   40,   40,   51,   41,   51,   51,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
+       42,  515,  512,   42,   42,   42,  516,  523,  519,   42,
+       42,   42,   42,  520,  524,  518,  521,   42,   42,  522,
+      530,   42,  525,   42,   42,  531,   42,  526,  527,   42,
+       42,  535,   42,  529,  528,   42,  536,   42,   42,  534,
+       42,   42,  533,   42,   42,   42,  537,   39,   39,   39,
+       39,   39,   41,   41,   51,   42,   51,   51,   51,   53,
+       53,  139,  139,  139,  139,  139,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
 
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-       41,   41,   41,   41,  238,   41,   41,   41,   41,   41,
-      130,   41,   39,  535,    3,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+      140,   42,  242,   42,   42,   42,   42,  140,   42,  132,
+       42,   40,  538,    3,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
 
-      535,  535,  535,  535,  535,  535,  535,  535
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538
     } ;
 
-static yyconst short int yy_chk[1209] =
+static yyconst flex_int16_t yy_chk[1219] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    9,   85,    9,    9,    9,    9,   10,
-       10,   10,   10,   11,   11,   11,   11,   11,   12,   58,
-       20,   85,   67,   12,   13,   13,   13,   13,   13,   13,
-       14,   14,   14,   14,   14,   14,   16,   20,   47,   17,
-       20,   52,   58,   47,   16,   29,   67,   20,   17,   52,
-       23,   16,   17,   16,   18,   16,   13,   29,   16,   18,
+        1,    1,    1,    1,    9,    9,    9,    9,   10,   10,
+       10,   10,   11,   11,   11,   11,   11,   12,   44,   44,
+       44,   44,   12,   13,   13,   13,   13,   13,   13,   14,
+       14,   14,   14,   14,   14,   16,   60,   17,   24,   19,
+       18,   16,   16,   16,   16,   19,   17,   19,   60,   21,
+       18,   28,   24,   17,   18,   17,   13,   17,   19,   20,
 
-       17,   18,   19,   23,   22,   25,   27,   19,   29,   60,
-       25,   19,   18,   22,   57,   27,   18,   19,   25,   22,
-       19,   21,   30,   25,   60,   57,   21,   25,   21,   21,
-       27,   30,   26,   34,   32,  436,   21,   26,   34,   32,
-       21,   54,   21,   24,   24,   24,   24,   24,   35,   54,
-       26,   34,   32,   53,   24,   32,   26,   35,   36,   36,
-       37,  436,   32,   24,   24,   28,   53,   56,   53,   37,
-       43,   43,   43,   43,   28,   63,   28,   36,   55,   56,
-       28,   61,   28,   56,   28,   73,   28,   31,   61,   72,
-       64,   31,   44,   44,   44,   44,   63,   55,   73,   31,
+       17,   28,   18,   31,   23,   20,   47,   21,   30,   20,
+       21,   47,   36,   31,   23,   20,   28,   21,   20,   22,
+       23,   30,   36,   38,  129,   22,  129,   22,   22,   55,
+       27,   58,   30,   38,   26,   22,   27,   78,   55,   22,
+       26,   22,   25,   25,   25,   25,   25,   78,   26,   27,
+       33,   58,   35,   26,   25,   27,   33,   26,   35,   57,
+       37,   37,   56,   25,   25,   29,   63,   61,   57,   33,
+      546,   35,   33,   59,   66,   29,   56,   29,   56,   33,
+       37,   29,   63,   29,   68,   29,   59,   29,   32,   75,
+       59,   61,   32,   45,   45,   45,   45,   45,   66,   64,
 
-       31,   66,   31,   31,   31,   72,   31,   45,   45,   45,
-       45,   45,   31,   64,   31,   31,   66,   31,   33,   62,
-       74,   68,   33,   46,   46,   46,   46,   46,   46,   68,
-       33,   33,   70,   33,   62,   33,   62,   33,   74,   33,
-       76,   87,   79,   33,   48,   48,   48,   48,   48,   76,
-       79,   48,  124,   87,  540,   70,  124,   48,   49,   49,
-       49,   49,   49,   49,   50,   50,   50,   50,   50,   77,
-       50,   50,   65,   50,   50,   50,   50,   50,   50,   65,
-       71,   75,   65,   78,   80,   83,   82,   81,  538,   89,
-       75,   65,   77,   80,   80,   71,   88,   89,   90,   93,
+       68,   32,   32,   75,   32,   32,   32,   64,   32,   54,
+       54,   54,   54,   70,   32,   90,   32,   32,   69,   32,
+       34,   65,   70,  544,   34,   46,   46,   46,   46,   46,
+       46,   90,   72,   34,   34,   74,   34,   65,   34,   65,
+       34,   76,   34,   69,   81,   89,   34,   48,   48,   48,
+       48,   48,   74,   81,  126,   48,   72,  541,   89,  126,
+       76,   48,   49,   49,   49,   49,   49,   49,   50,   50,
+       50,   50,   50,   73,   77,   50,   50,   67,   50,   50,
+       50,   50,   50,   50,   77,   67,   79,   80,   67,   73,
+       82,   83,   84,   85,   86,   87,   73,   67,   77,   82,
 
-       84,   78,   71,   81,   75,   82,   84,   83,   83,   86,
-       83,   88,   92,   90,   86,   94,   95,   96,   97,   93,
-       98,   99,  100,   97,   94,   95,   96,   92,   98,  101,
-      102,  103,  105,  104,   99,  106,  110,  109,   94,   95,
-      104,  105,  108,  100,  103,  107,  109,  116,  104,  118,
-      106,  108,  101,  107,  110,  105,  111,  102,  112,  106,
-      104,  113,  111,  115,  117,  108,  116,  120,  107,  118,
-      119,  112,  121,  126,  113,  123,  115,  117,  126,  119,
-      122,  121,  113,  127,  123,  127,  139,  115,  122,  122,
-      120,  128,  125,  119,  129,  121,  140,  139,  122,  143,
+       82,   86,   91,   88,   92,   94,   80,   95,   83,   88,
+       79,   91,   84,   87,   96,   85,   85,   85,  100,   85,
+       92,   94,   97,   98,   96,   99,  101,  100,   95,  102,
+      103,   99,   97,   98,  104,  105,  106,  107,   96,  109,
+      101,  108,  114,  110,  106,  111,   97,  107,  109,  105,
+      112,  102,  106,  110,  103,  111,  114,  108,  113,  115,
+      117,  107,  104,  109,  106,  113,  108,  110,  118,  112,
+      119,  120,  121,  115,  117,  122,  123,  125,  144,  130,
+      149,  115,  121,  128,  119,  117,  123,  125,  118,  128,
+      127,  131,  120,  124,  149,  143,  121,  144,  160,  122,
 
-      165,  122,  150,  534,  142,  125,  122,  125,  132,  132,
-      132,  132,  128,  142,  140,  129,  133,  133,  133,  133,
-      143,  129,  145,  133,  150,  147,  153,  165,  149,  133,
-      135,  135,  135,  135,  135,  145,  149,  135,  160,  146,
-      147,  153,  154,  135,  136,  136,  146,  136,  136,  136,
-      136,  136,  151,  152,  155,  154,  157,  156,  152,  159,
-      160,  151,  157,  161,  162,  163,  156,  164,  159,  155,
-      156,  166,  164,  168,  171,  167,  532,  531,  530,  169,
-      159,  172,  168,  162,  167,  169,  161,  170,  173,  166,
-      163,  167,  166,  171,  174,  170,  172,  173,  175,  176,
+      123,  130,  124,  124,  127,  160,  127,  143,  134,  134,
+      134,  134,  124,  131,  147,  124,  134,  151,  146,  131,
+      124,  150,  134,  136,  136,  136,  136,  136,  146,  150,
+      154,  136,  156,  151,  158,  163,  147,  136,  137,  137,
+      153,  137,  137,  137,  137,  137,  155,  157,  156,  153,
+      158,  164,  155,  154,  159,  162,  165,  166,  163,  168,
+      167,  157,  169,  170,  159,  162,  167,  172,  159,  171,
+      174,  537,  175,  170,  172,  164,  165,  162,  179,  171,
+      170,  169,  173,  166,  169,  176,  177,  168,  175,  178,
+      174,  173,  180,  181,  182,  176,  177,  179,  183,  178,
 
-      177,  178,  179,  174,  180,  181,  183,  190,  176,  178,
-      193,  198,  203,  196,  177,  204,  175,  174,  245,  180,
-      198,  183,  203,  179,  204,  245,  197,  190,  199,  181,
-      211,  209,  205,  193,  195,  195,  195,  195,  196,  208,
-      195,  195,  212,  195,  195,  195,  195,  195,  195,  197,
-      205,  199,  209,  211,  213,  208,  214,  212,  216,  215,
-      217,  221,  224,  227,  228,  213,  229,  216,  215,  230,
-      231,  224,  227,  233,  230,  214,  215,  228,  231,  221,
-      234,  232,  229,  236,  234,  217,  232,  233,  237,  239,
-      239,  239,  239,  244,  240,  240,  239,  240,  240,  240,
+      184,  185,  180,  182,  194,  187,  197,  202,  181,  200,
+      209,  207,  201,  178,  208,  535,  184,  202,  213,  235,
+      183,  187,  207,  203,  208,  194,  185,  215,  235,  209,
+      197,  199,  199,  199,  199,  200,  201,  212,  199,  199,
+      213,  199,  199,  199,  199,  199,  199,  203,  216,  218,
+      217,  215,  221,  219,  212,  220,  225,  228,  231,  232,
+      233,  212,  217,  219,  216,  220,  234,  228,  231,  218,
+      236,  219,  234,  232,  237,  225,  236,  233,  221,  238,
+      240,  241,  244,  244,  238,  244,  244,  244,  244,  237,
+      243,  243,  243,  243,  245,  245,  245,  245,  243,  240,
 
-      240,  236,  239,  241,  241,  241,  241,  246,  248,  252,
-      244,  237,  242,  242,  242,  242,  242,  243,  243,  243,
-      243,  243,  249,  251,  246,  248,  253,  249,  254,  255,
-      251,  256,  252,  257,  255,  258,  259,  261,  260,  262,
-      264,  263,  267,  254,  262,  268,  257,  264,  256,  253,
-      263,  269,  259,  260,  270,  273,  274,  275,  261,  278,
-      277,  274,  258,  279,  280,  267,  275,  281,  268,  277,
-      273,  282,  283,  269,  286,  269,  287,  289,  270,  290,
-      278,  281,  280,  293,  279,  296,  282,  294,  528,  297,
-      283,  287,  286,  298,  294,  296,  293,  290,  297,  300,
+      248,  250,  252,  256,  243,  241,  246,  246,  246,  246,
+      246,  247,  247,  247,  247,  247,  249,  253,  248,  250,
+      252,  255,  257,  253,  249,  258,  259,  256,  260,  255,
+      261,  258,  262,  264,  263,  265,  266,  267,  257,  270,
+      271,  265,  260,  272,  259,  267,  266,  273,  277,  262,
+      263,  276,  278,  281,  277,  264,  282,  283,  261,  280,
+      285,  284,  278,  270,  271,  281,  272,  276,  272,  280,
+      286,  287,  273,  290,  293,  285,  294,  291,  282,  283,
+      284,  298,  297,  300,  534,  524,  286,  301,  305,  298,
+      287,  302,  290,  291,  300,  294,  297,  301,  305,  293,
 
-      301,  289,  303,  298,  304,  306,  309,  301,  300,  311,
-      310,  303,  306,  312,  311,  314,  309,  316,  526,  304,
-      310,  318,  319,  321,  321,  321,  321,  323,  326,  324,
-      312,  318,  323,  328,  327,  319,  314,  324,  328,  329,
-      316,  327,  330,  318,  331,  332,  329,  330,  334,  333,
-      326,  335,  336,  338,  332,  333,  337,  340,  343,  344,
-      338,  336,  345,  347,  340,  331,  346,  334,  348,  350,
-      335,  343,  344,  337,  349,  346,  351,  352,  347,  345,
-      353,  355,  361,  360,  356,  348,  357,  359,  358,  353,
-      349,  356,  350,  351,  362,  357,  352,  358,  355,  364,
+      306,  308,  302,  309,  311,  314,  315,  316,  306,  317,
+      319,  308,  311,  316,  321,  524,  314,  315,  323,  309,
+      324,  326,  326,  326,  326,  328,  329,  317,  331,  323,
+      335,  328,  319,  333,  324,  329,  332,  334,  321,  333,
+      336,  323,  337,  334,  332,  338,  339,  340,  342,  337,
+      336,  331,  335,  341,  344,  347,  342,  340,  348,  349,
+      350,  353,  344,  351,  352,  338,  339,  355,  356,  347,
+      350,  341,  348,  357,  358,  361,  360,  349,  353,  351,
+      362,  365,  352,  361,  358,  363,  356,  364,  366,  367,
+      362,  355,  368,  357,  360,  363,  369,  371,  372,  373,
 
-      359,  360,  363,  366,  367,  361,  370,  368,  375,  362,
-      372,  373,  363,  374,  377,  366,  368,  372,  364,  373,
-      380,  375,  378,  376,  374,  370,  381,  367,  376,  383,
-      385,  384,  386,  380,  388,  389,  390,  377,  384,  378,
-      392,  386,  393,  397,  392,  392,  383,  398,  401,  381,
-      397,  402,  404,  389,  390,  406,  388,  401,  385,  403,
-      402,  410,  406,  398,  403,  393,  411,  413,  420,  414,
-      423,  424,  427,  425,  426,  404,  413,  429,  410,  414,
-      420,  425,  434,  411,  431,  423,  435,  426,  438,  427,
-      437,  441,  440,  424,  442,  443,  444,  438,  446,  448,
+      365,  364,  378,  368,  375,  367,  377,  379,  382,  373,
+      371,  378,  366,  380,  377,  381,  369,  383,  386,  379,
+      385,  381,  372,  388,  375,  389,  390,  380,  392,  393,
+      394,  397,  382,  396,  385,  383,  390,  401,  396,  396,
+      402,  388,  386,  405,  407,  401,  406,  408,  393,  394,
+      407,  392,  410,  405,  389,  397,  406,  402,  414,  415,
+      410,  428,  417,  418,  427,  424,  429,  430,  431,  433,
+      434,  408,  417,  437,  418,  429,  414,  415,  424,  438,
+      427,  430,  439,  440,  428,  444,  431,  441,  443,  434,
+      445,  446,  447,  433,  448,  437,  449,  441,  443,  440,
 
-      429,  440,  431,  434,  445,  437,  449,  435,  441,  442,
-      443,  450,  452,  445,  451,  449,  450,  444,  453,  454,
-      455,  446,  457,  451,  448,  453,  458,  459,  460,  462,
-      463,  455,  464,  471,  465,  452,  470,  460,  478,  483,
-      471,  525,  454,  465,  462,  470,  457,  463,  472,  458,
-      459,  474,  475,  476,  472,  464,  482,  475,  474,  481,
-      485,  478,  483,  484,  481,  482,  476,  486,  484,  487,
-      488,  490,  489,  491,  486,  493,  485,  489,  491,  494,
-      495,  496,  497,  498,  500,  488,  490,  501,  502,  493,
-      503,  497,  487,  500,  506,  494,  507,  508,  505,  495,
+      451,  438,  452,  444,  448,  453,  445,  446,  454,  439,
+      455,  453,  452,  456,  447,  457,  458,  460,  454,  461,
+      449,  456,  462,  463,  465,  467,  451,  466,  458,  475,
+      474,  468,  481,  463,  455,  486,  475,  473,  474,  457,
+      465,  468,  460,  461,  477,  466,  462,  473,  478,  467,
+      479,  484,  477,  485,  478,  487,  481,  484,  488,  486,
+      489,  487,  490,  485,  479,  491,  492,  493,  489,  496,
+      494,  497,  492,  498,  499,  488,  494,  500,  501,  503,
+      504,  491,  508,  493,  496,  505,  490,  500,  497,  503,
+      506,  509,  508,  498,  510,  511,  504,  512,  499,  515,
 
-      509,  511,  501,  502,  496,  503,  498,  505,  512,  507,
-      513,  514,  515,  516,  508,  512,  511,  506,  509,  517,
-      518,  521,  519,  513,  522,  520,  524,  527,  514,  519,
-      529,  516,  520,  515,  527,  533,  523,  510,  504,  529,
-      499,  518,  517,  524,  492,  480,  479,  522,  477,  473,
-      521,  469,  468,  467,  466,  461,  533,  536,  536,  536,
-      536,  537,  537,  539,  456,  539,  539,  447,  439,  433,
-      432,  430,  428,  422,  421,  419,  418,  417,  416,  415,
-      412,  409,  408,  407,  405,  400,  399,  396,  395,  394,
-      391,  387,  382,  379,  371,  369,  365,  354,  342,  341,
+      516,  505,  501,  514,  517,  518,  506,  515,  510,  519,
+      520,  521,  522,  511,  516,  509,  512,  523,  525,  514,
+      522,  527,  517,  530,  536,  523,  532,  518,  519,  533,
+      531,  530,  529,  521,  520,  528,  532,  526,  513,  527,
+      507,  502,  525,  495,  483,  482,  536,  539,  539,  539,
+      539,  539,  540,  540,  542,  480,  542,  542,  542,  543,
+      543,  545,  545,  545,  545,  545,  476,  472,  471,  470,
+      469,  464,  459,  450,  442,  436,  435,  432,  426,  425,
+      423,  422,  421,  420,  419,  416,  413,  412,  411,  409,
+      404,  403,  400,  399,  398,  395,  391,  387,  384,  376,
 
-      339,  325,  322,  320,  317,  315,  313,  308,  307,  305,
-      302,  299,  295,  292,  288,  285,  284,  276,  272,  271,
-      266,  265,  250,  247,  235,  226,  225,  223,  222,  220,
-      219,  218,  210,  207,  206,  202,  201,  200,  194,  192,
-      191,  189,  188,  187,  186,  185,  184,  182,  158,  148,
-      144,  141,  138,  134,  130,  114,   91,   69,   59,   40,
-       38,    8,    7,    3,  535,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
-      535,  535,  535,  535,  535,  535,  535,  535,  535,  535,
+      374,  370,  359,  354,  346,  345,  343,  330,  327,  325,
+      322,  320,  318,  313,  312,  310,  307,  304,  303,  299,
+      296,  292,  289,  288,  279,  275,  274,  269,  268,  254,
+      251,  239,  230,  229,  227,  226,  224,  223,  222,  214,
+      211,  210,  206,  205,  204,  198,  196,  195,  193,  192,
+      191,  190,  189,  188,  186,  161,  152,  148,  145,  142,
+      139,  135,  132,  116,   93,   71,   62,   52,   41,   39,
+        8,    7,    3,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
 
-      535,  535,  535,  535,  535,  535,  535,  535
+      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+      538,  538,  538,  538,  538,  538,  538,  538
     } ;
 
-static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
-static char *yy_full_match;
-static int yy_lp;
-#define REJECT \
-{ \
-*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ \
-yy_cp = yy_full_match; /* restore poss. backed-over text */ \
-++yy_lp; \
-goto find_rule; \
-}
+/* Table of booleans, true if rule could match eol. */
+static yyconst flex_int32_t yy_rule_can_match_eol[135] =
+    {   0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,     };
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int llvmAsm_flex_debug;
+int llvmAsm_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-#define INITIAL 0
+char *llvmAsmtext;
+#line 1 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 /*===-- Lexer.l - Scanner for llvm assembly files --------------*- C++ -*--===//
 //
 //                     The LLVM Compiler Infrastructure
@@ -873,8 +935,7 @@
 //  This file implements the flex scanner for LLVM assembly languages files.
 //
 //===----------------------------------------------------------------------===*/
-#define YY_NEVER_INTERACTIVE 1
-#line 28 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 28 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 #include "ParserInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -883,10 +944,10 @@
 #include <cstdlib>
 
 void set_scan_file(FILE * F){
-  yy_switch_to_buffer(yy_create_buffer( F, YY_BUF_SIZE ) );
+  llvmAsm_switch_to_buffer(llvmAsm_create_buffer(F,YY_BUF_SIZE ) );
 }
 void set_scan_string (const char * str) {
-  yy_scan_string (str);
+  llvmAsm_scan_string (str);
 }
 
 // Construct a token value for a non-obsolete token
@@ -992,13 +1053,13 @@
 
 #define YY_NEVER_INTERACTIVE 1
 /* Comments start with a ; and go till end of line */
-/* Variable(Value) identifiers start with a % sign */
+/* Local Values and Type identifiers start with a % sign */
+/* Global Value identifiers start with an @ sign */
 /* Label identifiers end with a colon */
 /* Quoted names can contain any character except " and \ */
-/* [PN]Integer: match positive and negative literal integer values that
- * are preceeded by a '%' character.  These represent unnamed variable slots.
- */
-/* E[PN]Integer: match positive and negative literal integer values */
+/* LocalVarID/GlobalVarID: match an unnamed local variable slot ID. */
+/* Integer types are specified with i and a bitwidth */
+/* E[PN]Integer: match positive and negative literal integer values. */
 /* FPConstant - A Floating point constant.
  */
 /* HexFPConstant - Floating point constant represented in IEEE format as a
@@ -1007,7 +1068,23 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1007 "Lexer.cpp"
+#line 1072 "Lexer.cpp"
+
+#define INITIAL 0
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1015,65 +1092,30 @@
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
+extern "C" int llvmAsmwrap (void );
 #else
-extern int yywrap YY_PROTO(( void ));
+extern int llvmAsmwrap (void );
 #endif
 #endif
 
-#ifndef YY_NO_UNPUT
-static inline void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
+    static inline void yyunput (int c,char *buf_ptr  );
+    
 #ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
+static int yy_flex_strlen (yyconst char * );
 #endif
 
 #ifndef YY_NO_INPUT
+
 #ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
+static int yyinput (void );
 #else
-static int input YY_PROTO(( void ));
-#endif
+static int input (void );
 #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
-#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. */
@@ -1082,12 +1124,11 @@
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
-
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#define ECHO (void) fwrite( llvmAsmtext, llvmAsmleng, 1, llvmAsmout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1095,21 +1136,35 @@
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
-		int c = '*', n; \
+		int c = '*'; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+			     (c = getc( llvmAsmin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
+		if ( c == EOF && ferror( llvmAsmin ) ) \
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, llvmAsmin))==0 && ferror(llvmAsmin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(llvmAsmin); \
+			} \
+		}\
+\
+
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -1130,14 +1185,20 @@
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
 #endif
 
+/* end tables serialization structures and prototypes */
+
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
+#define YY_DECL_IS_OURS 1
 
-/* Code executed at the beginning of each rule, after yytext and yyleng
+extern int llvmAsmlex (void);
+
+#define YY_DECL int llvmAsmlex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after llvmAsmtext and llvmAsmleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -1152,350 +1213,345 @@
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
+/** The main scanner function which does all the work.
+ */
 YY_DECL
-	{
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-
-#line 188 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+    
+#line 189 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 
 
-#line 1161 "Lexer.cpp"
+#line 1228 "Lexer.cpp"
 
-	if ( yy_init )
+	if ( !(yy_init) )
 		{
-		yy_init = 0;
+		(yy_init) = 1;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
 #endif
 
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
 
-		if ( ! yyin )
-			yyin = stdin;
+		if ( ! llvmAsmin )
+			llvmAsmin = stdin;
 
-		if ( ! yyout )
-			yyout = stdout;
+		if ( ! llvmAsmout )
+			llvmAsmout = stdout;
 
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
+		if ( ! YY_CURRENT_BUFFER ) {
+			llvmAsmensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE );
+		}
 
-		yy_load_buffer_state();
+		llvmAsm_load_buffer_state( );
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_cp = yy_c_buf_p;
+		yy_cp = (yy_c_buf_p);
 
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
+		/* Support of llvmAsmtext. */
+		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
 		 * the current run.
 		 */
 		yy_bp = yy_cp;
 
-		yy_current_state = yy_start;
-		yy_state_ptr = yy_state_buf;
-		*yy_state_ptr++ = yy_current_state;
+		yy_current_state = (yy_start);
 yy_match:
 		do
 			{
 			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 536 )
+				if ( yy_current_state >= 539 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			*yy_state_ptr++ = yy_current_state;
 			++yy_cp;
 			}
-		while ( yy_current_state != 535 );
+		while ( yy_current_state != 538 );
+		yy_cp = (yy_last_accepting_cpos);
+		yy_current_state = (yy_last_accepting_state);
 
 yy_find_action:
-		yy_current_state = *--yy_state_ptr;
-		yy_lp = yy_accept[yy_current_state];
-find_rule: /* we branch to this label when backing up */
-		for ( ; ; ) /* until we find what rule we matched */
-			{
-			if ( yy_lp && yy_lp < yy_accept[yy_current_state + 1] )
-				{
-				yy_act = yy_acclist[yy_lp];
-					{
-					yy_full_match = yy_cp;
-					break;
-					}
-				}
-			--yy_cp;
-			yy_current_state = *--yy_state_ptr;
-			yy_lp = yy_accept[yy_current_state];
-			}
+		yy_act = yy_accept[yy_current_state];
 
 		YY_DO_BEFORE_ACTION;
 
-		if ( yy_act != YY_END_OF_BUFFER )
+		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
 			{
 			int yyl;
-			for ( yyl = 0; yyl < yyleng; ++yyl )
-				if ( yytext[yyl] == '\n' )
-					++yylineno;
+			for ( yyl = 0; yyl < llvmAsmleng; ++yyl )
+				if ( llvmAsmtext[yyl] == '\n' )
+					   
+    llvmAsmlineno++;
+;
 			}
 
 do_action:	/* This label is used only to access EOF actions. */
 
-
 		switch ( yy_act )
 	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
 case 1:
 YY_RULE_SETUP
-#line 190 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 191 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 192 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 193 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 193 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 194 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 194 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 195 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 195 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 196 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 196 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 197 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 197 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 198 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DEFINE; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 198 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 199 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 199 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 200 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 200 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 201 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 201 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 202 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 202 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 203 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return WEAK; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 203 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 204 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 204 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 205 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 205 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 206 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 206 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 207 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return HIDDEN; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 207 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 208 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 208 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 209 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 209 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 210 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return IMPLEMENTATION; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 210 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 211 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 211 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 212 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 212 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 213 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 213 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 214 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 214 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 215 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TO; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 215 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 216 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TAIL; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 216 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 217 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TARGET; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 217 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 218 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 218 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 219 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 219 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 220 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return DATALAYOUT; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 220 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 221 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 221 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 222 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 222 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 223 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SECTION; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 223 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 224 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return MODULE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 224 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 225 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return ASM_TOK; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 225 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 226 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return SIDEEFFECT; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 227 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 228 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return CC_TOK; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 228 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 229 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { return CCC_TOK; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 229 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return CSRETCC_TOK; }
+#line 230 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return FASTCC_TOK; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 230 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return FASTCC_TOK; }
+#line 231 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return COLDCC_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 231 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return COLDCC_TOK; }
+#line 232 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 232 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return X86_STDCALLCC_TOK; }
+#line 233 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 233 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return X86_FASTCALLCC_TOK; }
+#line 235 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::VoidTy,  VOID);  }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 235 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::VoidTy,  VOID);  }
+#line 236 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::FloatTy, FLOAT); }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 236 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::FloatTy, FLOAT); }
+#line 237 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::DoubleTy,DOUBLE);}
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 237 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::DoubleTy,DOUBLE);}
+#line 238 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TY(Type::LabelTy, LABEL); }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 238 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::LabelTy, LABEL); }
+#line 239 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return TYPE;   }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 239 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return TYPE;   }
+#line 240 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OPAQUE; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 240 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return OPAQUE; }
-	YY_BREAK
-case 49:
-YY_RULE_SETUP
-#line 241 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ uint64_t NumBits = atoull(yytext+1);
+#line 241 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ uint64_t NumBits = atoull(llvmAsmtext+1);
                   if (NumBits < IntegerType::MIN_INT_BITS || 
                       NumBits > IntegerType::MAX_INT_BITS)
                     GenerateError("Bitwidth for integer type out of range!");
@@ -1503,398 +1559,429 @@
                   RET_TY(Ty, INTTYPE);
                 }
 	YY_BREAK
+case 49:
+YY_RULE_SETUP
+#line 249 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Add, ADD); }
+	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 249 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Add, ADD); }
+#line 250 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 250 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Sub, SUB); }
+#line 251 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 251 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Mul, MUL); }
+#line 252 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 252 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
+#line 253 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 253 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
+#line 254 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 254 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
+#line 255 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 255 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, URem, UREM); }
+#line 256 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 256 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SRem, SREM); }
+#line 257 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 257 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, FRem, FREM); }
+#line 258 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 258 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, And, AND); }
+#line 259 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 259 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Or , OR ); }
+#line 260 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 260 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Xor, XOR); }
+#line 261 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 261 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
+#line 262 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 262 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
+#line 263 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return EQ;  }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 263 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return EQ;  }
+#line 264 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return NE;  }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 264 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return NE;  }
+#line 265 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SLT; }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 265 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return SLT; }
+#line 266 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SGT; }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 266 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return SGT; }
+#line 267 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SLE; }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 267 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return SLE; }
+#line 268 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SGE; }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 268 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return SGE; }
+#line 269 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ULT; }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 269 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return ULT; }
+#line 270 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return UGT; }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 270 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return UGT; }
+#line 271 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ULE; }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 271 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return ULE; }
+#line 272 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return UGE; }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 272 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return UGE; }
+#line 273 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OEQ; }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 273 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return OEQ; }
+#line 274 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ONE; }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 274 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return ONE; }
+#line 275 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OLT; }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 275 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return OLT; }
+#line 276 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OGT; }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 276 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return OGT; }
+#line 277 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OLE; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 277 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return OLE; }
+#line 278 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return OGE; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 278 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return OGE; }
+#line 279 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return ORD; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 279 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return ORD; }
+#line 280 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return UNO; }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 280 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return UNO; }
+#line 281 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return UEQ; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 281 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return UEQ; }
+#line 282 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return UNE; }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 282 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return UNE; }
+#line 284 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 284 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
+#line 285 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 285 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Call, CALL); }
+#line 286 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, Trunc, TRUNC); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 286 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, Trunc, TRUNC); }
+#line 287 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, ZExt, ZEXT); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 287 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, ZExt, ZEXT); }
+#line 288 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SExt, SEXT); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 288 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SExt, SEXT); }
+#line 289 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return INREG; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 289 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
+#line 290 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return SRET;  }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 290 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPExt, FPEXT); }
+#line 291 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 291 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
+#line 292 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPExt, FPEXT); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 292 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
+#line 293 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 293 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
+#line 294 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 294 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
+#line 295 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 295 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
+#line 296 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 296 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
+#line 297 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 297 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, BitCast, BITCAST); }
+#line 298 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 298 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Select, SELECT); }
+#line 299 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(CastOpVal, BitCast, BITCAST); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 299 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Shl, SHL); }
+#line 300 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 300 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, LShr, LSHR); }
+#line 301 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, Shl, SHL); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 301 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, AShr, ASHR); }
+#line 302 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, LShr, LSHR); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 302 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, VAArg , VAARG); }
+#line 303 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, AShr, ASHR); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 303 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Ret, RET); }
+#line 304 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 304 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Br, BR); }
+#line 305 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 305 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Switch, SWITCH); }
+#line 306 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 306 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Invoke, INVOKE); }
+#line 307 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 307 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unwind, UNWIND); }
+#line 308 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 308 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
+#line 309 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 310 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Malloc, MALLOC); }
+#line 310 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 311 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
+#line 312 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 312 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Free, FREE); }
+#line 313 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 313 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Load, LOAD); }
+#line 314 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 314 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Store, STORE); }
+#line 315 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 315 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
+#line 316 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 317 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
+#line 317 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 318 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+#line 319 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 319 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+#line 320 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 322 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{
-                  UnEscapeLexed(yytext+1);
-                  llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
-                  return VAR_ID;
-                }
+#line 321 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 327 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 324 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  yytext[strlen(yytext)-1] = 0;  // nuke colon
-                  UnEscapeLexed(yytext);
-                  llvmAsmlval.StrVal = strdup(yytext);
-                  return LABELSTR;
+                  UnEscapeLexed(llvmAsmtext+1);
+                  llvmAsmlval.StrVal = strdup(llvmAsmtext+1);             // Skip %
+                  return LOCALVAR;
                 }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 333 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 329 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
-                  UnEscapeLexed(yytext+1);
-                  llvmAsmlval.StrVal = strdup(yytext+1);
-                  return LABELSTR;
+                  UnEscapeLexed(llvmAsmtext+1);
+                  llvmAsmlval.StrVal = strdup(llvmAsmtext+1);             // Skip @
+                  return GLOBALVAR;
                 }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 340 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 334 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{
+                  llvmAsmtext[strlen(llvmAsmtext)-1] = 0;  // nuke colon
+                  UnEscapeLexed(llvmAsmtext);
+                  llvmAsmlval.StrVal = strdup(llvmAsmtext);
+                  return LABELSTR;
+                }
+	YY_BREAK
+case 122:
+/* rule 122 can match eol */
+YY_RULE_SETUP
+#line 340 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{
+                  llvmAsmtext[strlen(llvmAsmtext)-2] = 0;  // nuke colon, end quote
+                  UnEscapeLexed(llvmAsmtext+1);
+                  llvmAsmlval.StrVal = strdup(llvmAsmtext+1);
+                  return LABELSTR;
+                }
+	YY_BREAK
+case 123:
+/* rule 123 can match eol */
+YY_RULE_SETUP
+#line 347 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 { // Note that we cannot unescape a string constant here!  The
                    // string constant might contain a \00 which would not be
                    // understood by the string stuff.  It is valid to make a
                    // [sbyte] c"Hello World\00" constant, for example.
                    //
-                   yytext[strlen(yytext)-1] = 0;           // nuke end quote
-                   llvmAsmlval.StrVal = strdup(yytext+1);  // Nuke start quote
+                   llvmAsmtext[strlen(llvmAsmtext)-1] = 0;           // nuke end quote
+                   llvmAsmlval.StrVal = strdup(llvmAsmtext+1);  // Nuke start quote
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 122:
+case 124:
+/* rule 124 can match eol */
 YY_RULE_SETUP
-#line 351 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.UInt64Val = atoull(yytext); return EUINT64VAL; }
-	YY_BREAK
-case 123:
-YY_RULE_SETUP
-#line 352 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 356 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  uint64_t Val = atoull(yytext+1);
+                     llvmAsmtext[strlen(llvmAsmtext)-1] = 0;           // nuke end quote
+                     llvmAsmlval.StrVal = strdup(llvmAsmtext+2);  // Nuke @, quote
+                     return ATSTRINGCONSTANT;
+                   }
+	YY_BREAK
+case 125:
+YY_RULE_SETUP
+#line 364 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.UInt64Val = atoull(llvmAsmtext); return EUINT64VAL; }
+	YY_BREAK
+case 126:
+YY_RULE_SETUP
+#line 365 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{
+                  uint64_t Val = atoull(llvmAsmtext+1);
                   // +1:  we have bigger negative range
                   if (Val > (uint64_t)INT64_MAX+1)
                     GenerateError("Constant too large for signed 64 bits!");
@@ -1902,97 +1989,97 @@
                   return ESINT64VAL;
                 }
 	YY_BREAK
-case 124:
-YY_RULE_SETUP
-#line 360 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{
-                   llvmAsmlval.UInt64Val = HexIntToVal(yytext+3);
-                   return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
-                 }
-	YY_BREAK
-case 125:
-YY_RULE_SETUP
-#line 365 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{
-                  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 126:
-YY_RULE_SETUP
-#line 372 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{
-                  uint64_t Val = atoull(yytext+2);
-                  // +1:  we have bigger negative range
-                  if (Val > (uint64_t)INT32_MAX+1)
-                    GenerateError("Constant too large for signed 32 bits!");
-                  llvmAsmlval.SIntVal = (int)-Val;
-                  return SINTVAL;
-                }
-	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 381 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
+#line 373 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{
+                   llvmAsmlval.UInt64Val = HexIntToVal(llvmAsmtext+3);
+                   return llvmAsmtext[0] == 's' ? ESINT64VAL : EUINT64VAL;
+                 }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 382 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
-	YY_BREAK
-case YY_STATE_EOF(INITIAL):
-#line 384 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 378 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 {
-                  /* Make sure to free the internal buffers for flex when we are
-                   * done reading our input!
-                   */
-                  yy_delete_buffer(YY_CURRENT_BUFFER);
-                  return EOF;
+                  uint64_t Val = atoull(llvmAsmtext+1);
+                  if ((unsigned)Val != Val)
+                    GenerateError("Invalid value number (too large)!");
+                  llvmAsmlval.UIntVal = unsigned(Val);
+                  return LOCALVAL_ID;
                 }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 392 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ /* Ignore whitespace */ }
+#line 385 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{
+                  uint64_t Val = atoull(llvmAsmtext+1);
+                  if ((unsigned)Val != Val)
+                    GenerateError("Invalid value number (too large)!");
+                  llvmAsmlval.UIntVal = unsigned(Val);
+                  return GLOBALVAL_ID;
+                }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 393 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
-{ return yytext[0]; }
+#line 393 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.FPVal = atof(llvmAsmtext); return FPVAL; }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 395 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#line 394 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ llvmAsmlval.FPVal = HexToFP(llvmAsmtext); return FPVAL; }
+	YY_BREAK
+case YY_STATE_EOF(INITIAL):
+#line 396 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{
+                  /* Make sure to free the internal buffers for flex when we are
+                   * done reading our input!
+                   */
+                  llvmAsm_delete_buffer(YY_CURRENT_BUFFER);
+                  return EOF;
+                }
+	YY_BREAK
+case 132:
+/* rule 132 can match eol */
+YY_RULE_SETUP
+#line 404 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ /* Ignore whitespace */ }
+	YY_BREAK
+case 133:
+YY_RULE_SETUP
+#line 405 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+{ return llvmAsmtext[0]; }
+	YY_BREAK
+case 134:
+YY_RULE_SETUP
+#line 407 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1968 "Lexer.cpp"
+#line 2059 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 		YY_RESTORE_YY_MORE_OFFSET
 
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
+			 * just pointed llvmAsmin at a new source and called
+			 * llvmAsmlex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = llvmAsmin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -2002,13 +2089,13 @@
 		 * end-of-buffer state).  Contrast this with the test
 		 * in input().
 		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			{ /* This was really a NUL. */
 			yy_state_type yy_next_state;
 
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
 
-			yy_current_state = yy_get_previous_state();
+			yy_current_state = yy_get_previous_state(  );
 
 			/* Okay, we're now positioned to make the NUL
 			 * transition.  We couldn't have
@@ -2021,41 +2108,42 @@
 
 			yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 
 			if ( yy_next_state )
 				{
 				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
+				yy_cp = ++(yy_c_buf_p);
 				yy_current_state = yy_next_state;
 				goto yy_match;
 				}
 
 			else
 				{
-				yy_cp = yy_c_buf_p;
+				yy_cp = (yy_last_accepting_cpos);
+				yy_current_state = (yy_last_accepting_state);
 				goto yy_find_action;
 				}
 			}
 
-		else switch ( yy_get_next_buffer() )
+		else switch ( yy_get_next_buffer(  ) )
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-				yy_did_buffer_switch_on_eof = 0;
+				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( yywrap() )
+				if ( llvmAsmwrap( ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
+					 * llvmAsmtext, we can now set up
 					 * yy_c_buf_p so that if some total
 					 * hoser (like flex itself) wants to
 					 * call the scanner after we return the
 					 * YY_NULL, it'll still work - another
 					 * YY_NULL will get returned.
 					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
 
 					yy_act = YY_STATE_EOF(YY_START);
 					goto do_action;
@@ -2063,30 +2151,30 @@
 
 				else
 					{
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 					}
 				break;
 				}
 
 			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_match;
 
 			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_find_action;
 			}
 		break;
@@ -2097,8 +2185,7 @@
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of yylex */
-
+} /* end of llvmAsmlex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -2107,21 +2194,20 @@
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
 	register int number_to_move, i;
 	int ret_val;
 
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
 		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
 			{
 			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
@@ -2141,34 +2227,30 @@
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
 
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
 
 	else
 		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
+			int num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
 
 			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
@@ -2181,8 +2263,7 @@
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
+					llvmAsmrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -2192,35 +2273,35 @@
 				YY_FATAL_ERROR(
 				"fatal error - scanner input buffer overflow" );
 
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
 
-			num_to_read = yy_current_buffer->yy_buf_size -
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
 						number_to_move - 1;
-#endif
+
 			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
 
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	if ( yy_n_chars == 0 )
+	if ( (yy_n_chars) == 0 )
 		{
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
+			llvmAsmrestart(llvmAsmin  );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -2228,148 +2309,141 @@
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
 
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
 
 	return ret_val;
-	}
-
+}
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-static yy_state_type yy_get_previous_state()
-	{
+    static yy_state_type yy_get_previous_state (void)
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
 
-	yy_current_state = yy_start;
-	yy_state_ptr = yy_state_buf;
-	*yy_state_ptr++ = yy_current_state;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 536 )
+			if ( yy_current_state >= 539 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		*yy_state_ptr++ = yy_current_state;
 		}
 
 	return yy_current_state;
-	}
-
+}
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
 	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
 
 	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 536 )
+		if ( yy_current_state >= 539 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 535);
-	if ( ! yy_is_jam )
-		*yy_state_ptr++ = yy_current_state;
+	yy_is_jam = (yy_current_state == 538);
 
 	return yy_is_jam ? 0 : yy_current_state;
-	}
+}
 
+    static inline void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
 
-#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 llvmAsmtext */
+	*yy_cp = (yy_hold_char);
 
-	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
-
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
+		register int number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
-		while ( source > yy_current_buffer->yy_ch_buf )
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
 	*--yy_cp = (char) c;
 
-	if ( c == '\n' )
-		--yylineno;
+    if ( c == '\n' ){
+        --llvmAsmlineno;
+    }
 
-	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()
+    static int yyinput (void)
 #else
-static int input()
+    static int input  (void)
 #endif
-	{
+
+{
 	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
 
-	*yy_c_buf_p = yy_hold_char;
-
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
 		{
 		/* yy_c_buf_p now points to the character we want to return.
 		 * If this occurs *before* the EOB characters, then it's a
 		 * valid NUL; if not, then we've hit the end of the buffer.
 		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
+			*(yy_c_buf_p) = '\0';
 
 		else
 			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
+			int offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
 
-			switch ( yy_get_next_buffer() )
+			switch ( yy_get_next_buffer(  ) )
 				{
 				case EOB_ACT_LAST_MATCH:
 					/* This happens because yy_g_n_b()
@@ -2383,16 +2457,16 @@
 					 */
 
 					/* Reset buffer status. */
-					yyrestart( yyin );
+					llvmAsmrestart(llvmAsmin );
 
-					/* fall through */
+					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap() )
+					if ( llvmAsmwrap( ) )
 						return EOF;
 
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -2402,174 +2476,170 @@
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
+					(yy_c_buf_p) = (yytext_ptr) + offset;
 					break;
 				}
 			}
 		}
 
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve llvmAsmtext */
+	(yy_hold_char) = *++(yy_c_buf_p);
 
 	if ( c == '\n' )
-		++yylineno;
+		   
+    llvmAsmlineno++;
+;
 
 	return c;
+}
+#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 );
 	}
 
+	llvmAsm_init_buffer(YY_CURRENT_BUFFER,input_file );
+	llvmAsm_load_buffer_state( );
+}
 
-#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();
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void llvmAsm_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		llvmAsmpop_buffer_state();
+	 *		llvmAsmpush_buffer_state(new_buffer);
+     */
+	llvmAsmensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
-	if ( yy_current_buffer )
+	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	llvmAsm_load_buffer_state( );
 
 	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
+	 * EOF (llvmAsmwrap()) processing, but the only time this flag
+	 * is looked at is after llvmAsmwrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
+	(yy_did_buffer_switch_on_eof) = 1;
+}
 
+static void llvmAsm_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	llvmAsmin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
 
-#ifdef YY_USE_PROTOS
-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
-	{
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE llvmAsm_create_buffer  (FILE * file, int  size )
+{
 	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+    
+	b = (YY_BUFFER_STATE) llvmAsmalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in llvmAsm_create_buffer()" );
 
 	b->yy_buf_size = size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
+	b->yy_ch_buf = (char *) llvmAsmalloc(b->yy_buf_size + 2  );
 	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in llvmAsm_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer( b, file );
+	llvmAsm_init_buffer(b,file );
 
 	return b;
-	}
+}
 
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
+/** Destroy the buffer.
+ * @param b a buffer created with llvmAsm_create_buffer()
+ * 
+ */
+    void llvmAsm_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
 	if ( ! b )
 		return;
 
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
+		llvmAsmfree((void *) b->yy_ch_buf  );
 
-	yy_flex_free( (void *) b );
-	}
+	llvmAsmfree((void *) b  );
+}
 
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a llvmAsmrestart() or at EOF.
+ */
+    static void llvmAsm_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-#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 );
+{
+	int oerrno = errno;
+    
+	llvmAsm_flush_buffer(b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
+    /* If b is the current buffer, then llvmAsm_init_buffer was _probably_
+     * called from llvmAsmrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
 
+        b->yy_is_interactive = 0;
+    
+	errno = oerrno;
+}
 
-#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 )
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void llvmAsm_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -2586,31 +2656,123 @@
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
+	if ( b == YY_CURRENT_BUFFER )
+		llvmAsm_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void llvmAsmpush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	llvmAsmensure_buffer_stack();
+
+	/* This block is copied from llvmAsm_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from llvmAsm_switch_to_buffer. */
+	llvmAsm_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void llvmAsmpop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	llvmAsm_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		llvmAsm_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void llvmAsmensure_buffer_stack (void)
+{
+	int num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)llvmAsmalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
 	}
 
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
-#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
-	{
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)llvmAsmrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE llvmAsm_scan_buffer  (char * base, yy_size_t  size )
+{
 	YY_BUFFER_STATE b;
-
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+	b = (YY_BUFFER_STATE) llvmAsmalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in llvmAsm_scan_buffer()" );
 
 	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
@@ -2622,58 +2784,53 @@
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer( b );
+	llvmAsm_switch_to_buffer(b  );
 
 	return b;
-	}
-#endif
+}
 
+/** Setup the input buffer state to scan a string. The next call to llvmAsmlex() will
+ * scan from a @e copy of @a str.
+ * @param str a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       llvmAsm_scan_bytes() instead.
+ */
+YY_BUFFER_STATE llvmAsm_scan_string (yyconst char * yystr )
+{
+    
+	return llvmAsm_scan_bytes(yystr,strlen(yystr) );
+}
 
-#ifndef YY_NO_SCAN_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
-	{
+/** Setup the input buffer state to scan the given bytes. The next call to llvmAsmlex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE llvmAsm_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
 	int i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
+	n = _yybytes_len + 2;
+	buf = (char *) llvmAsmalloc(n  );
 	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+		YY_FATAL_ERROR( "out of dynamic memory in llvmAsm_scan_bytes()" );
 
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
 
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer( buf, n );
+	b = llvmAsm_scan_buffer(buf,n );
 	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+		YY_FATAL_ERROR( "bad buffer in llvmAsm_scan_bytes()" );
 
 	/* It's okay to grow etc. this buffer, and we should throw it
 	 * away when we're done.
@@ -2681,78 +2838,17 @@
 	b->yy_is_our_buffer = 1;
 
 	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
-
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
-
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
-
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
-
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-	BEGIN(new_state);
-	}
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
+}
 
 #ifndef YY_EXIT_FAILURE
 #define YY_EXIT_FAILURE 2
 #endif
 
-#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 );
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
-	}
-
-
+}
 
 /* Redefine yyless() so it works in section 3 code. */
 
@@ -2760,69 +2856,181 @@
 #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; \
+		/* 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 )
 
+/* Accessor  methods (get/set functions) to struct members. */
 
-/* Internal utility routines. */
+/** Get the current line number.
+ * 
+ */
+int llvmAsmget_lineno  (void)
+{
+        
+    return llvmAsmlineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *llvmAsmget_in  (void)
+{
+        return llvmAsmin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *llvmAsmget_out  (void)
+{
+        return llvmAsmout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+int llvmAsmget_leng  (void)
+{
+        return llvmAsmleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *llvmAsmget_text  (void)
+{
+        return llvmAsmtext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void llvmAsmset_lineno (int  line_number )
+{
+    
+    llvmAsmlineno = line_number;
+}
+
+/** 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 ;
+}
+
+void llvmAsmset_out (FILE *  out_str )
+{
+        llvmAsmout = out_str ;
+}
+
+int llvmAsmget_debug  (void)
+{
+        return llvmAsm_flex_debug;
+}
+
+void llvmAsmset_debug (int  bdebug )
+{
+        llvmAsm_flex_debug = bdebug ;
+}
+
+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;
+}
+
+/* llvmAsmlex_destroy is for both reentrant and non-reentrant scanners. */
+int llvmAsmlex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		llvmAsm_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		llvmAsmpop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	llvmAsmfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * llvmAsmlex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
 
 #ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
 	register int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-	}
+}
 #endif
 
 #ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
+static int yy_flex_strlen (yyconst char * s )
+{
 	register int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-	}
+}
 #endif
 
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
+void *llvmAsmalloc (yy_size_t  size )
+{
 	return (void *) malloc( size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static inline void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static inline void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
+void *llvmAsmrealloc  (void * ptr, yy_size_t  size )
+{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -2831,24 +3039,16 @@
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
+void llvmAsmfree (void * ptr )
+{
+	free( (char *) ptr );	/* see llvmAsmrealloc() for (char *) cast */
+}
 
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
-#line 395 "/Users/resistor/llvm/src/llvm/lib/AsmParser/Lexer.l"
+#define YYTABLES_NAME "yytables"
+
+#line 407 "/home/asl/proj/llvm/src/lib/AsmParser/Lexer.l"
+
+