regenerate

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45424 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 1132 insertions, 956 deletions

diff --git a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
index 764e468efa..8161bee559 100644
--- a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
+++ b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
@@ -1,50 +1,93 @@
-#define yy_create_buffer Upgrade_create_buffer
-#define yy_delete_buffer Upgrade_delete_buffer
-#define yy_scan_buffer Upgrade_scan_buffer
-#define yy_scan_string Upgrade_scan_string
-#define yy_scan_bytes Upgrade_scan_bytes
-#define yy_flex_debug Upgrade_flex_debug
-#define yy_init_buffer Upgrade_init_buffer
-#define yy_flush_buffer Upgrade_flush_buffer
-#define yy_load_buffer_state Upgrade_load_buffer_state
-#define yy_switch_to_buffer Upgrade_switch_to_buffer
-#define yyin Upgradein
-#define yyleng Upgradeleng
-#define yylex Upgradelex
-#define yyout Upgradeout
-#define yyrestart Upgraderestart
-#define yytext Upgradetext
-#define yylineno Upgradelineno
-
-#line 20 "UpgradeLexer.cpp"
-/* A lexical scanner generated by flex */
+#line 2 "UpgradeLexer.cpp"
 
-/* Scanner skeleton version:
- * $Header: /cvs/root/flex/flex/skel.c,v 1.2 2004/05/07 00:28:17 jkh Exp $
- */
+#line 4 "UpgradeLexer.cpp"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 33
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
 
+/* begin standard C headers. */
 #include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+/* end standard C headers. */
 
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
 #endif
 
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
-#ifdef __cplusplus
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
 
-#include <stdlib.h>
-#include <unistd.h>
+#endif /* ! FLEXINT_H */
 
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
+#ifdef __cplusplus
 
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
@@ -53,34 +96,17 @@
 
 #if __STDC__
 
-#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -95,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 Upgraderestart(Upgradein  )
 
 #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 Upgradeleng;
 
-extern int yyleng;
-extern FILE *yyin, *yyout;
+extern FILE *Upgradein, *Upgradeout;
 
 #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 Upgradelex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-Upgradelineno 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 < Upgradeleng; ++yyl )\
+                    if ( Upgradetext[yyl] == '\n' )\
+                        --Upgradelineno;\
+            }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 Upgradetext. */ \
+        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 Upgradetext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, yytext_ptr )
+#define unput(c) yyunput( c, (yytext_ptr)  )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-typedef unsigned int yy_size_t;
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
 
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -196,12 +239,16 @@ struct yy_buffer_state
 	 */
 	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
@@ -211,208 +258,210 @@ struct yy_buffer_state
 	 * 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 Upgraderestart()), so that the user can continue scanning by
+	 * just pointing Upgradein at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
+
 	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-static YY_BUFFER_STATE yy_current_buffer = 0;
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER yy_current_buffer
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
 
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when yytext is formed. */
+/* yy_hold_char holds the character lost when Upgradetext is formed. */
 static char yy_hold_char;
-
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
+int Upgradeleng;
 
 /* 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 Upgradewrap()'s to do buffer switches
+ * instead of setting up a fresh Upgradein.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void Upgraderestart (FILE *input_file  );
+void Upgrade_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE Upgrade_create_buffer (FILE *file,int size  );
+void Upgrade_delete_buffer (YY_BUFFER_STATE b  );
+void Upgrade_flush_buffer (YY_BUFFER_STATE b  );
+void Upgradepush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void Upgradepop_buffer_state (void );
+
+static void Upgradeensure_buffer_stack (void );
+static void Upgrade_load_buffer_state (void );
+static void Upgrade_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
+#define YY_FLUSH_BUFFER Upgrade_flush_buffer(YY_CURRENT_BUFFER )
 
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+YY_BUFFER_STATE Upgrade_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE Upgrade_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE Upgrade_scan_bytes (yyconst char *bytes,int len  );
 
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
+void *Upgradealloc (yy_size_t  );
+void *Upgraderealloc (void *,yy_size_t  );
+void Upgradefree (void *  );
 
-#define yy_new_buffer yy_create_buffer
+#define yy_new_buffer Upgrade_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 ){ \
+        Upgradeensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            Upgrade_create_buffer(Upgradein,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 ){\
+        Upgradeensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            Upgrade_create_buffer(Upgradein,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
-#define YY_USES_REJECT
+/* Begin user sect3 */
 
-#define yywrap() 1
+#define Upgradewrap(n) 1
 #define YY_SKIP_YYWRAP
+
 typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
+FILE *Upgradein = (FILE *) 0, *Upgradeout = (FILE *) 0;
+
 typedef int yy_state_type;
-extern int yylineno;
-int yylineno = 1;
-extern char *yytext;
-#define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
+extern int Upgradelineno;
+
+int Upgradelineno = 1;
+
+extern char *Upgradetext;
+#define yytext_ptr Upgradetext
+
+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 Upgradetext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
+	(yytext_ptr) = yy_bp; \
+	Upgradeleng = (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 161
 #define YY_END_OF_BUFFER 162
-static yyconst short int yy_acclist[241] =
-    {   0,
-      162,  160,  161,  159,  160,  161,  159,  161,  160,  161,
-      160,  161,  160,  161,  160,  161,  160,  161,  160,  161,
-      152,  160,  161,  152,  160,  161,    1,  160,  161,  160,
-      161,  160,  161,  160,  161,  160,  161,  160,  161,  160,
-      161,  160,  161,  160,  161,  160,  161,  160,  161,  160,
-      161,  160,  161,  160,  161,  160,  161,  160,  161,  160,
-      161,  160,  161,  160,  161,  160,  161,  160,  161,  160,
-      161,  160,  161,  151,  149,  148,  148,  155,  153,  157,
-      152,    1,  134,   41,   94,   62,   50,   95,   80,   23,
-      151,  148,  148,  156,  157,   20,  157,  158,   68,   79,
-
-       39,   34,   42,   71,    3,   53,   56,   59,   54,   70,
-       25,  104,  109,  107,  108,  106,  105,  110,  114,   75,
-      133,   99,   97,   88,   89,   98,   96,   69,  112,  103,
-      101,  102,  100,  113,  111,   81,  150,  157,  157,   91,
-       61,  115,  116,   93,   74,  141,   78,   92,  142,   57,
-       90,   22,  154,   73,  119,   77,   26,    4,   66,   72,
-       55,   76,   60,   11,  118,  157,   36,    2,    5,   63,
-      121,   65,   48,   83,   87,   85,   86,   84,   82,   51,
-      143,  117,   49,   58,   21,  131,  140,   45,   64,   30,
-       24,   44,  123,  122,    7,  136,   33,  139,   38,   67,
-
-      129,  125,  135,   27,   28,  124,  137,   52,  132,  130,
-      128,   43,    6,   29,  120,   37,    8,   17,    9,  127,
-       10,  126,   35,   12,   14,   13,   32,   40,   15,   31,
-      138,  144,  146,  147,   16,   46,  145,   18,   47,   19
-    } ;
-
-static yyconst short int yy_accept[621] =
+/* 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[620] =
     {   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,   83,
-       83,   84,   84,   85,   85,   85,   85,   85,   85,   85,
-       85,   85,   86,   86,   86,   86,   86,   86,   86,   86,
-       86,   86,   87,   87,   87,   88,   88,   88,   88,   88,
-       88,   88,   88,   88,   88,   88,   89,   89,   89,   89,
-
-       89,   89,   89,   89,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   91,   91,   91,   91,   91,   91,   91,   91,
-       91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
-       92,   93,   95,   96,   97,   98,   98,   99,   99,  100,
-      100,  100,  101,  101,  101,  102,  102,  103,  103,  103,
-      103,  103,  104,  104,  104,  104,  104,  104,  104,  105,
-      105,  105,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  107,  108,  109,  109,  109,
-      109,  110,  110,  110,  110,  110,  110,  110,  110,  110,
-
-      110,  111,  112,  112,  113,  114,  115,  116,  117,  118,
-      118,  119,  120,  120,  120,  121,  122,  122,  122,  122,
-      122,  122,  122,  122,  123,  124,  125,  125,  126,  126,
-      126,  126,  127,  128,  128,  128,  129,  129,  129,  129,
-      129,  129,  129,  129,  129,  130,  131,  132,  132,  132,
-      133,  133,  134,  134,  135,  135,  136,  136,  136,  136,
-      136,  136,  136,  136,  136,  136,  136,  136,  137,  137,
-      137,  138,  139,  139,  139,  139,  140,  140,  140,  140,
-      141,  141,  141,  142,  143,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-
-      144,  145,  146,  146,  146,  146,  146,  147,  148,  148,
-      148,  149,  149,  149,  149,  149,  149,  149,  149,  149,
-      150,  151,  152,  152,  152,  153,  153,  153,  153,  154,
-      154,  155,  155,  155,  155,  155,  155,  155,  156,  156,
-      156,  156,  156,  157,  157,  157,  158,  158,  158,  159,
-      159,  160,  160,  161,  162,  162,  162,  162,  162,  162,
-      162,  163,  163,  163,  163,  163,  164,  164,  165,  165,
-      165,  166,  167,  168,  168,  168,  169,  169,  169,  169,
-      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
-      169,  170,  170,  171,  172,  172,  172,  172,  172,  172,
-
-      172,  172,  172,  172,  172,  173,  173,  173,  173,  173,
-      173,  173,  173,  174,  174,  174,  175,  176,  177,  178,
-      179,  180,  181,  181,  181,  181,  182,  182,  182,  182,
-      183,  184,  184,  185,  186,  186,  186,  186,  186,  186,
-      187,  187,  187,  187,  187,  187,  188,  188,  188,  189,
-      189,  189,  189,  189,  189,  189,  189,  190,  191,  192,
-      192,  192,  193,  194,  195,  195,  195,  196,  196,  196,
-      196,  196,  197,  197,  198,  199,  200,  201,  201,  201,
-      201,  202,  202,  202,  203,  204,  205,  206,  207,  207,
-      207,  208,  209,  210,  211,  211,  211,  211,  211,  211,
-
-      212,  212,  213,  213,  214,  215,  215,  215,  215,  215,
-      215,  216,  216,  216,  216,  216,  216,  216,  216,  216,
-      217,  217,  217,  217,  217,  217,  217,  217,  217,  217,
-      218,  218,  218,  218,  218,  219,  219,  219,  219,  219,
-      220,  221,  222,  222,  223,  223,  223,  223,  223,  224,
-      224,  224,  224,  225,  225,  226,  227,  227,  227,  227,
-      227,  227,  227,  227,  227,  227,  227,  227,  227,  227,
-      228,  228,  228,  228,  228,  228,  228,  228,  229,  229,
-      229,  229,  229,  229,  230,  230,  230,  230,  230,  231,
-      231,  231,  232,  232,  232,  232,  232,  232,  232,  232,
-
-      232,  232,  232,  232,  232,  232,  233,  233,  234,  235,
-      236,  236,  237,  237,  238,  239,  240,  240,  241,  241
+        0,    0,  162,  160,  159,  159,  160,  160,  160,  160,
+      160,  160,  152,  152,    1,  160,  160,  160,  160,  160,
+      160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
+      160,  160,  160,  160,  160,  160,  160,    0,  151,    0,
+      149,  148,  148,  155,    0,  153,    0,  157,  152,    0,
+        1,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      134,    0,   41,    0,    0,    0,    0,    0,    0,    0,
+        0,   94,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   62,    0,    0,   50,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   95,    0,    0,    0,    0,
+
+        0,    0,    0,   80,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   23,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  151,
+      148,  148,  157,   20,  157,    0,  158,    0,   68,    0,
+        0,   79,    0,    0,   39,    0,   34,    0,    0,    0,
+        0,   42,    0,    0,    0,    0,    0,    0,   71,    0,
+        0,    3,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   53,   56,   59,    0,    0,    0,
+       54,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+       70,   25,    0,  104,  109,  107,  108,  106,  105,    0,
+      110,  114,    0,    0,   75,  133,    0,    0,    0,    0,
+        0,    0,    0,   99,   97,   88,    0,   89,    0,    0,
+        0,   98,   96,    0,    0,   69,    0,    0,    0,    0,
+        0,    0,    0,    0,  112,  103,  101,    0,    0,  102,
+        0,  100,    0,  113,    0,  111,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   81,    0,    0,
+      150,  157,    0,    0,    0,  157,    0,    0,    0,   91,
+        0,    0,   61,  115,  116,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+       93,   74,    0,    0,    0,    0,  141,   78,    0,    0,
+       92,    0,    0,    0,    0,    0,    0,    0,    0,  142,
+       57,   90,    0,    0,   22,    0,    0,    0,  154,    0,
+       73,    0,    0,    0,    0,    0,    0,  119,    0,    0,
+        0,    0,   77,    0,    0,   26,    0,    0,    4,    0,
+       66,    0,   72,   55,    0,    0,    0,    0,    0,    0,
+       76,    0,    0,    0,    0,   60,    0,   11,    0,    0,
+      118,  157,   36,    0,    0,    2,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        5,    0,   63,  121,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,   65,    0,    0,    0,    0,    0,
+        0,    0,   48,    0,    0,   83,   87,   85,   86,   84,
+       82,   51,    0,    0,    0,  143,    0,    0,    0,  117,
+       49,    0,   58,   21,    0,    0,    0,    0,    0,  131,
+        0,    0,    0,    0,    0,  140,    0,    0,   45,    0,
+        0,    0,    0,    0,    0,    0,   64,   30,   24,    0,
+        0,   44,  123,  122,    0,    0,    7,    0,    0,    0,
+        0,  136,    0,   33,  139,   38,   67,    0,    0,    0,
+      129,    0,    0,  125,  135,   27,   28,  124,    0,    0,
+      137,   52,  132,  130,    0,    0,    0,    0,    0,  128,
+
+        0,   43,    0,    6,   29,    0,    0,    0,    0,    0,
+      120,    0,    0,    0,    0,    0,    0,    0,    0,   37,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    8,
+        0,    0,    0,    0,   17,    0,    0,    0,    0,    9,
+      127,   10,    0,  126,    0,    0,    0,    0,   35,    0,
+        0,    0,   12,    0,   14,   13,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   32,
+        0,    0,    0,    0,    0,    0,    0,   40,    0,    0,
+        0,    0,    0,   15,    0,    0,    0,    0,   31,    0,
+        0,  138,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,  144,    0,  146,  147,   16,
+        0,   46,    0,  145,   18,   47,    0,   19,    0
     } ;
 
-static yyconst int yy_ec[256] =
+static yyconst flex_int32_t yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
@@ -444,7 +493,7 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[49] =
+static yyconst flex_int32_t yy_meta[49] =
     {   0,
         1,    1,    2,    1,    3,    1,    4,    5,    3,    6,
         6,    6,    6,    6,    6,    6,    6,    7,    1,    1,
@@ -453,7 +502,7 @@ static yyconst int yy_meta[49] =
         3,    3,    3,    3,    3,    3,    3,    3
     } ;
 
-static yyconst short int yy_base[630] =
+static yyconst flex_int16_t yy_base[630] =
     {   0,
         0,    0, 1336, 1337, 1337, 1337, 1331, 1316,   41,    0,
        49,   59,   69, 1287,    0,  112,   69,   72,   93,  113,
@@ -526,7 +575,7 @@ static yyconst short int yy_base[630] =
      1172, 1178,  192, 1186, 1192,   70, 1200, 1203, 1208
     } ;
 
-static yyconst short int yy_def[630] =
+static yyconst flex_int16_t yy_def[630] =
     {   0,
       619,    1,  619,  619,  619,  619,  620,  621,  622,  623,
       621,  621,   11,   13,  624,  622,  621,  621,  621,  621,
@@ -599,7 +648,7 @@ static yyconst short int yy_def[630] =
       619,  619,  619,  619,  619,  619,  619,  619,  619
     } ;
 
-static yyconst short int yy_nxt[1386] =
+static yyconst flex_int16_t yy_nxt[1386] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,   14,   14,   14,   14,    4,   15,   16,
@@ -755,7 +804,7 @@ static yyconst short int yy_nxt[1386] =
       619,  619,  619,  619,  619
     } ;
 
-static yyconst short int yy_chk[1386] =
+static yyconst flex_int16_t yy_chk[1386] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -911,28 +960,40 @@ static yyconst short int yy_chk[1386] =
       619,  619,  619,  619,  619
     } ;
 
-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[162] =
+    {   0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 
+    0, 0,     };
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int Upgrade_flex_debug;
+int Upgrade_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 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
-#define INITIAL 0
+char *Upgradetext;
+#line 1 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 /*===-- UpgradeLexer.l - Scanner for 1.9 assembly files --------*- C++ -*--===//
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the 
-// University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -940,8 +1001,7 @@ char *yytext;
 //  This doesn't handle long double constants, since LLVM 1.9 did not have them.
 //
 //===----------------------------------------------------------------------===*/
-#define YY_NEVER_INTERACTIVE 1
-#line 29 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+#line 29 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 #include "UpgradeInternals.h"
 #include "llvm/Module.h"
 #include <list>
@@ -1082,7 +1142,23 @@ using namespace llvm;
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1086 "UpgradeLexer.cpp"
+#line 1146 "UpgradeLexer.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.
@@ -1090,65 +1166,30 @@ using namespace llvm;
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
+extern "C" int Upgradewrap (void );
 #else
-extern int yywrap YY_PROTO(( void ));
-#endif
+extern int Upgradewrap (void );
 #endif
-
-#ifndef YY_NO_UNPUT
-static inline void yyunput YY_PROTO(( int c, char *buf_ptr ));
 #endif
 
+    static inline void yyunput (int c,char *buf_ptr  );
+    
 #ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
+static int yy_flex_strlen (yyconst char * );
 #endif
 
 #ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
 
+#ifdef __cplusplus
+static int yyinput (void );
 #else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
+static int input (void );
 #endif
 
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
 #endif
 
 /* Amount of stuff to slurp up with each read. */
@@ -1157,12 +1198,11 @@ YY_MALLOC_DECL
 #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( Upgradetext, Upgradeleng, 1, Upgradeout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1170,21 +1210,35 @@ YY_MALLOC_DECL
  */
 #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( Upgradein )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
+		if ( c == EOF && ferror( Upgradein ) ) \
 			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, Upgradein))==0 && ferror(Upgradein)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(Upgradein); \
+			} \
+		}\
+\
+
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -1205,14 +1259,20 @@ YY_MALLOC_DECL
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
 #endif
 
+/* end tables serialization structures and prototypes */
+
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
+#define YY_DECL_IS_OURS 1
+
+extern int Upgradelex (void);
 
-/* Code executed at the beginning of each rule, after yytext and yyleng
+#define YY_DECL int Upgradelex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after Upgradetext and Upgradeleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -1227,60 +1287,67 @@ YY_MALLOC_DECL
 #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 195 "/Volumes/MacOS9/gcc/llvm/tools/llvm-upgrade/UpgradeLexer.l"
+    
+#line 195 "/Users/sabre/llvm/tools/llvm-upgrade/UpgradeLexer.l"
 
 
-#line 1240 "UpgradeLexer.cpp"
+#line 1302 "UpgradeLexer.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 ( ! yy