Regenerate.

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

1 files changed, 1391 insertions, 1569 deletions

diff --git a/lib/AsmParser/Lexer.cpp.cvs b/lib/AsmParser/Lexer.cpp.cvs
index 6eedd2b77f..51f989eaf9 100644
--- a/lib/AsmParser/Lexer.cpp.cvs
+++ b/lib/AsmParser/Lexer.cpp.cvs
@@ -1,94 +1,51 @@
-#line 2 "Lexer.cpp"
-
-#line 4 "Lexer.cpp"
-
-#define  YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
+#define yy_create_buffer llvmAsm_create_buffer
+#define yy_delete_buffer llvmAsm_delete_buffer
+#define yy_scan_buffer llvmAsm_scan_buffer
+#define yy_scan_string llvmAsm_scan_string
+#define yy_scan_bytes llvmAsm_scan_bytes
+#define yy_flex_debug llvmAsm_flex_debug
+#define yy_init_buffer llvmAsm_init_buffer
+#define yy_flush_buffer llvmAsm_flush_buffer
+#define yy_load_buffer_state llvmAsm_load_buffer_state
+#define yy_switch_to_buffer llvmAsm_switch_to_buffer
+#define yyin llvmAsmin
+#define yyleng llvmAsmleng
+#define yylex llvmAsmlex
+#define yyout llvmAsmout
+#define yyrestart llvmAsmrestart
+#define yytext llvmAsmtext
+#define yylineno llvmAsmlineno
+
+#line 20 "Lexer.cpp"
+/* A lexical scanner generated by flex*/
+
+/* Scanner skeleton version:
+ * $Header$
+ */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
 
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
 #include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
+#include <unistd.h>
 
-#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)
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
 #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>
+
+/* Use prototypes in function declarations. */
+#define YY_USE_PROTOS
+
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
@@ -96,17 +53,34 @@ typedef unsigned int flex_uint32_t;
 
 #if __STDC__
 
+#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
+#ifdef __TURBOC__
+ #pragma warn -rch
+ #pragma warn -use
+#include <io.h>
+#include <stdlib.h>
+#define YY_USE_CONST
+#define YY_USE_PROTOS
+#endif
+
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
+
+#ifdef YY_USE_PROTOS
+#define YY_PROTO(proto) proto
+#else
+#define YY_PROTO(proto) ()
+#endif
+
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -121,88 +95,80 @@ typedef unsigned int flex_uint32_t;
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN (yy_start) = 1 + 2 *
+#define BEGIN yy_start = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START (((yy_start) - 1) / 2)
+#define YY_START ((yy_start - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE llvmAsmrestart(llvmAsmin  )
+#define YY_NEW_FILE yyrestart( yyin )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE (16384*64)
-#endif
 
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-extern int llvmAsmleng;
 
-extern FILE *llvmAsmin, *llvmAsmout;
+extern int yyleng;
+extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
-     *       access to the local variable yy_act. Since yyless() is a macro, it would break
-     *       existing scanners that call yyless() from OUTSIDE llvmAsmlex. 
-     *       One obvious solution it to make yy_act a global. I tried that, and saw
-     *       a 5% performance hit in a non-llvmAsmlineno scanner, because yy_act is
-     *       normally declared as a register variable-- so it is not worth it.
-     */
-    #define  YY_LESS_LINENO(n) \
-            do { \
-                int yyl;\
-                for ( yyl = n; yyl < llvmAsmleng; ++yyl )\
-                    if ( llvmAsmtext[yyl] == '\n' )\
-                        --llvmAsmlineno;\
-            }while(0)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
+/* The funky do-while in the following #define is used to turn the definition
+ * int a single C statement (which needs a semi-colon terminator).  This
+ * avoids problems with code like:
+ *
+ * 	if ( condition_holds )
+ *		yyless( 5 );
+ *	else
+ *		do_something_else();
+ *
+ * Prior to using the do-while the compiler would get upset at the
+ * "else" because it interpreted the "if" statement as being all
+ * done when it reached the ';' after the yyless() call.
+ */
+
+/* Return all but the first 'n' matched characters back to the input stream. */
+
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up llvmAsmtext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
+		/* Undo effects of setting up yytext. */ \
+		*yy_cp = yy_hold_char; \
 		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up llvmAsmtext again */ \
+		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, (yytext_ptr)  )
+#define unput(c) yyunput( c, yytext_ptr )
+
+/* Some routines like yy_flex_realloc() are emitted as static but are
+   not called by all lexers. This generates warnings in some compilers,
+   notably GCC. Arrange to suppress these. */
+#ifdef __GNUC__
+#define YY_MAY_BE_UNUSED __attribute__((unused))
+#else
+#define YY_MAY_BE_UNUSED
+#endif
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
 typedef unsigned int yy_size_t;
-#endif
 
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
+
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -239,16 +205,12 @@ 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
@@ -258,203 +220,199 @@ struct yy_buffer_state
 	 * possible backing-up.
 	 *
 	 * When we actually see the EOF, we change the status to "new"
-	 * (via llvmAsmrestart()), so that the user can continue scanning by
-	 * just pointing llvmAsmin at a new input file.
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
-
 	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE yy_current_buffer = 0;
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
- *
- * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
+#define YY_CURRENT_BUFFER yy_current_buffer
 
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when llvmAsmtext is formed. */
+/* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
+
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int llvmAsmleng;
+
+
+int yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0;		/* whether we need to initialize */
+static int yy_init = 1;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow llvmAsmwrap()'s to do buffer switches
- * instead of setting up a fresh llvmAsmin.  A bit of a hack ...
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void llvmAsmrestart (FILE *input_file  );
-void llvmAsm_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE llvmAsm_create_buffer (FILE *file,int size  );
-void llvmAsm_delete_buffer (YY_BUFFER_STATE b  );
-void llvmAsm_flush_buffer (YY_BUFFER_STATE b  );
-void llvmAsmpush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void llvmAsmpop_buffer_state (void );
+void yyrestart YY_PROTO(( FILE *input_file ));
 
-static void llvmAsmensure_buffer_stack (void );
-static void llvmAsm_load_buffer_state (void );
-static void llvmAsm_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 llvmAsm_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 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  );
+static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
+static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;
+static void yy_flex_free YY_PROTO(( void * ));
 
-void *llvmAsmalloc (yy_size_t  );
-void *llvmAsmrealloc (void *,yy_size_t  );
-void llvmAsmfree (void *  );
-
-#define yy_new_buffer llvmAsm_create_buffer
+#define yy_new_buffer yy_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        llvmAsmensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        llvmAsmensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
 
-/* Begin user sect3 */
 
-#define llvmAsmwrap(n) 1
-#define YY_SKIP_YYWRAP
+#define YY_USES_REJECT
 
+#define yywrap() 1
+#define YY_SKIP_YYWRAP
 typedef unsigned char YY_CHAR;
-
-FILE *llvmAsmin = (FILE *) 0, *llvmAsmout = (FILE *) 0;
-
+FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
 typedef int yy_state_type;
+extern int yylineno;
+int yylineno = 1;
+extern char *yytext;
+#define yytext_ptr yytext
 
-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[]  );
+static yy_state_type yy_get_previous_state YY_PROTO(( void ));
+static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
+static int yy_get_next_buffer YY_PROTO(( void ));
+static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up llvmAsmtext.
+ * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	llvmAsmleng = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
+	yytext_ptr = yy_bp; \
+	yyleng = (int) (yy_cp - yy_bp); \
+	yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
+	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 136
-#define YY_END_OF_BUFFER 137
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept[557] =
+#define YY_NUM_RULES 135
+#define YY_END_OF_BUFFER 136
+static yyconst short int yy_acclist[215] =
     {   0,
-        0,    0,  137,  135,  134,  134,  135,  135,  135,  135,
-      135,  135,  127,  127,    1,  135,  135,  135,  135,  135,
-      135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
-      135,  135,  135,  135,  135,  135,  135,    0,  126,    0,
-      124,  123,  123,  130,    0,  128,    0,  132,  127,    0,
-        1,    0,    0,    0,    0,    0,    0,    0,    0,  109,
-        0,   40,    0,    0,    0,    0,    0,    0,    0,   69,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       54,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   70,    0,    0,    0,    0,    0,    0,   65,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   24,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  126,  123,  123,  132,   21,  132,    0,  133,   55,
-        0,    0,   64,    0,    0,   38,    0,   33,    0,    0,
-        0,   41,    0,    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,   57,    0,   79,   84,
-       82,   83,   81,   80,    0,   85,   89,    0,    0,  108,
-
-        0,    0,    0,    0,    0,   74,   72,  104,    0,    0,
-        0,   73,   71,    0,    0,   56,    0,    0,    0,    0,
-        0,    0,    0,   87,   78,   76,    0,   77,   75,    0,
-       88,   86,    0,    0,    0,    0,    0,    0,    0,    0,
-       66,    0,    0,  125,  132,    0,    0,    0,  132,    0,
-        0,    0,  106,    0,    0,   48,   90,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,   68,   60,    0,    0,    0,    0,  116,   63,
-        0,    0,    0,   67,    0,    0,    0,    0,    0,    0,
-        0,    0,  117,  105,    0,    0,   23,    0,    0,    0,
-
-      129,   59,    0,    0,   93,    0,    0,    0,   62,    0,
-        0,   25,    0,    0,    4,    0,   52,   58,    0,    0,
-        0,    0,   61,    0,   47,    0,   12,    0,    0,   92,
-      132,   35,    0,    0,    2,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    5,
-        0,   49,   95,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   51,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  118,    0,    0,
-        0,   91,    0,   22,    0,    0,    0,    0,    0,    0,
-        0,  115,    0,    0,   44,    0,    0,    0,    0,    7,
-
-        0,    0,    0,   50,   29,    0,    0,   43,   99,   98,
-        0,    0,    8,   16,    0,    0,    0,    0,  111,    0,
-       32,  114,   37,   53,    0,    0,    0,  103,    0,    0,
-       97,  110,   26,   27,   96,    0,  112,  107,    0,    0,
-        0,    0,    0,  102,    0,   42,    0,    6,   28,    0,
-        0,    0,    0,    0,   94,    0,    0,    0,    0,    0,
-        0,    0,    0,   36,    0,    0,    0,    0,    0,    0,
-        0,    0,    9,    0,    0,    0,    0,   18,    0,    0,
-        0,    0,   10,  100,   11,    0,  101,    0,    0,    0,
-       34,    0,    0,    0,   13,    0,   15,   14,    0,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-       31,    0,    0,    0,    0,    0,    0,    0,   39,    0,
-        0,    0,    0,   17,    0,    0,    0,    0,   30,    0,
-      113,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  119,    0,  121,  122,    0,   45,    0,
-      120,   19,   46,    0,   20,    0
+      136,  134,  135,  133,  134,  135,  133,  135,  134,  135,
+      134,  135,  134,  135,  134,  135,  134,  135,  134,  135,
+      126,  134,  135,  126,  134,  135,    1,  134,  135,  134,
+      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
+      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
+      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
+      135,  134,  135,  134,  135,  134,  135,  134,  135,  134,
+      135,  134,  135,  125,  123,  122,  122,  129,  127,  131,
+      126,    1,  108,   40,   68,   53,   69,   64,   24,  125,
+      122,  122,  130,  131,   21,  131,  132,   54,   63,   38,
+
+       33,   41,    3,   56,   78,   83,   81,   82,   80,   79,
+       84,   88,  107,   73,   71,  103,   72,   70,   55,   86,
+       77,   75,   76,   74,   87,   85,   65,  124,  131,  131,
+      105,   89,   67,   59,  115,   62,   66,  116,  104,   23,
+      128,   58,   92,   61,   25,    4,   51,   57,   60,   47,
+       12,   91,  131,   35,    2,    5,   48,   94,   50,  117,
+       90,   22,  114,   44,    7,   49,   29,   43,   98,   97,
+        8,   16,  110,   32,  113,   37,   52,  102,   96,  109,
+       26,   27,   95,  111,  106,  101,   42,    6,   28,   93,
+       36,    9,   18,   10,   99,   11,  100,   34,   13,   15,
+
+       14,   31,   39,   17,   30,  112,  118,  120,  121,   45,
+      119,   19,   46,   20
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst short int yy_accept[555] =
+    {   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,   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,  102,  102,  102,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
+      104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
+      104,  104,  104,  104,  104,  105,  105,  106,  107,  108,
+      109,  110,  111,  111,  112,  113,  113,  113,  114,  114,
+
+      114,  114,  114,  114,  115,  116,  117,  117,  117,  117,
+      118,  119,  119,  119,  120,  120,  120,  120,  120,  120,
+      120,  120,  121,  122,  123,  123,  124,  125,  125,  126,
+      127,  127,  127,  127,  127,  127,  127,  127,  127,  128,
+      128,  128,  129,  130,  130,  130,  130,  131,  131,  131,
+      131,  132,  132,  132,  133,  133,  133,  133,  133,  133,
+      133,  133,  133,  133,  133,  133,  133,  133,  133,  133,
+      134,  135,  135,  135,  135,  135,  136,  137,  137,  137,
+      137,  138,  138,  138,  138,  138,  138,  138,  138,  138,
+      139,  140,  140,  140,  141,  141,  141,  141,  142,  143,
+
+      143,  143,  144,  144,  144,  144,  145,  145,  145,  146,
+      146,  146,  147,  147,  148,  149,  149,  149,  149,  149,
+      150,  150,  151,  151,  152,  152,  152,  153,  154,  155,
+      155,  155,  156,  156,  156,  156,  156,  156,  156,  156,
+      156,  156,  156,  156,  156,  156,  156,  157,  157,  158,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  160,  160,  160,  160,  160,  160,  160,  160,
+      160,  160,  160,  160,  160,  161,  161,  161,  161,  162,
+      162,  163,  163,  163,  163,  163,  163,  163,  163,  164,
+      164,  164,  165,  165,  165,  165,  165,  166,  166,  166,
+
+      166,  167,  168,  168,  168,  169,  170,  171,  171,  171,
+      172,  173,  173,  173,  173,  173,  174,  174,  175,  176,
+      177,  178,  178,  178,  178,  179,  179,  179,  180,  181,
+      182,  183,  184,  184,  185,  186,  186,  186,  186,  186,
+      186,  187,  187,  188,  188,  189,  190,  190,  190,  190,
+      190,  190,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      193,  193,  193,  193,  193,  194,  194,  194,  194,  194,
+      195,  196,  197,  197,  198,  198,  198,  198,  199,  199,
+      199,  199,  200,  200,  201,  202,  202,  202,  202,  202,
+
+      202,  202,  202,  202,  202,  202,  202,  202,  203,  203,
+      203,  203,  203,  203,  203,  203,  204,  204,  204,  204,
+      204,  205,  205,  205,  205,  205,  206,  206,  207,  207,
+      207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
+      207,  208,  208,  209,  210,  210,  211,  211,  212,  213,
+      214,  214,  215,  215
+    } ;
+
+static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
@@ -486,7 +444,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[44] =
+static yyconst int yy_meta[44] =
     {   0,
         1,    1,    2,    1,    3,    1,    1,    3,    3,    3,
         3,    3,    3,    4,    1,    3,    3,    3,    3,    3,
@@ -495,262 +453,261 @@ static yyconst flex_int32_t yy_meta[44] =
         3,    3,    3
     } ;
 
-static yyconst flex_int16_t yy_base[562] =
+static yyconst short int yy_base[559] =
     {   0,
-        0,    0, 1206, 1207, 1207, 1207, 1201, 1190,   36,   40,
+        0,    0, 1200, 1201, 1201, 1201, 1195, 1184,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
       108,   91,   77,  134,   92,  119,   93,  152,  126,  109,
-      178,  154,  209,  135,  111,  146,  112, 1199, 1207, 1188,
-     1207,    0,  159,  198,  215,  236,   70,  241,  256,  261,
-        0,   68,  147,  128,  165,  176,  166,  262,   31, 1187,
-      168,  200,  206,   48,   72,  265,  170,  101,  208, 1186,
-       73,  227,  203,  215,  180,  274,  139,  225,  229,  278,
-      272,  276,  277,  280,  281,  290,  293,  282,  291,  300,
-      295, 1185,  299,  122,  309,  311,  312,  317,  315,  316,
-
-      324,  304,  319,  301,  326,  331,  327,  330,  333,  340,
-      335,  343,  347,  351,  352, 1184,  355,  348,  357,  360,
-      362,  359,  366,  369,  372,  384,  383,  386,  181,  376,
-      392, 1183,    0,  403,  407, 1182,  424,  441,    0, 1181,
-      407,  393, 1180,  408,  394, 1179,  412, 1178,  429,  428,
-      430, 1177,  442,  409,  444,  446,  432,  448,  449,  454,
-      452,  455,  456,  457,  459,  462,  460,  466,  469,  470,
-      474,  475,  472,  486,  473,  480,  489,  493,  487,  497,
-      499,  500,  501,  503,  504,  507, 1176,  510, 1175, 1174,
-     1173, 1172, 1171, 1170,  508, 1169, 1168,  512,  511, 1167,
-
-      539,  514,  517,  518,  520, 1166, 1165, 1164,  522,  521,
-      515, 1163, 1162,  550,  551, 1161,  552,  553,  554,  555,
-      560,  558,  556, 1160, 1159, 1158,  561, 1157, 1156,  562,
-     1155, 1154,  564,  557,  576,  578,  580,  582,  584,  559,
-     1153,  585,  586, 1207,  597,  614,  618,  622,  627,  628,
-      590,  629, 1152,  630,  599, 1151, 1150,  631,  632,  633,
-      634,  635,  636,  589,  637,  641,  639,  643,  642,  660,
-      650,  644, 1149, 1148,  652,  658,  661,  662, 1147, 1146,
-      667,  666,  668, 1145,  669,  670,  672,  674,  591,  673,
-      676,  680, 1144, 1143,  679,  684, 1142,  687,  689,  690,
-
-        0, 1141,  696,  698, 1140,  700,  704,  706, 1139,  714,
-      715, 1138,  717,  703, 1137,  720, 1136, 1135,  719,  721,
-      702,  724, 1134,  725, 1133,  728, 1132,  730,  732, 1131,
-      737, 1130,  737,  739, 1129,  738,  743,  744,  748,  753,
-      754,  756,  757,  759,  761,  762,  764,  766,  767, 1128,
-      769, 1127, 1126,  772,  773,  770,  768,  779,  782,  784,
-      788,  789,  790,  792, 1125,  791,  793,  796,  795,  798,
-      805,  797,  812,  813,  816,  815,  818, 1124,  414,  817,
-      819, 1123,  820, 1122,  822,  824,  823,  833,  821,  827,
-      835, 1121,  838,  841, 1120,  842,  847,  843,  844, 1119,
-
-      845,  848,  855, 1118, 1117,  856,  849, 1116, 1115, 1114,
-      858,  862, 1113, 1112,  868,  870,  869,  857, 1111,  875,
-     1110, 1109, 1108, 1107,  863,  876,  881, 1106,  883,  885,
-     1105, 1104, 1103, 1102, 1101,  887, 1100, 1099,  886,  888,
-      889,  890,  891, 1098,  894, 1097,  896, 1096, 1095,  900,
-      902,  904,  905,  906, 1094,  907,  909,  912,  913,  911,
-      922,  918,  919, 1093,  924,  925,  933,  935,  929,  936,
-      937,  939, 1092,  941,  945,  946,  947, 1091,  948,  953,
-      951,  955, 1090, 1089, 1088,  954, 1085,  957,  971,  973,
-     1076,  975,  972,  976, 1073,  958, 1072, 1071,  980,  983,
-
-      961,  986,  987,  959,  990,  993,  994,  995,  996,  999,
-     1068,  998, 1001, 1002, 1005, 1006, 1010, 1007, 1067, 1013,
-     1008, 1014, 1018, 1064, 1025, 1020, 1024, 1027, 1063, 1031,
-     1060, 1026, 1032, 1035, 1036, 1038, 1040, 1042, 1045, 1047,
-     1050, 1046, 1051,  962, 1052,  701,  601, 1055,  526, 1061,
-      476,  374,  246, 1056,  245, 1207, 1091, 1093,  254, 1097,
-       57
+      178,  154,  209,  135,  111,  146,  112, 1193, 1201, 1182,
+     1201,    0,  159,  198,  215,  236,   70,  241,  256,  261,
+        0,   68,  147,  128,  165,  176,   73,  262, 1181,   31,
+      170,  166,   48,   49,  265,  185,  101,  198, 1180,  180,
+      227,  207,  208,  225,  274,  139,  276,  228,  278,  272,
+      229,  277,  280,  281,  290,  293,  282,  291,  292,  295,
+     1179,  301,  122,  308,  309,  311,  314,  304,  315,  321,
+
+      322,  323,  324,  325,  326,  327,  330,  329,  335,  339,
+      342,  349,  356,  357, 1178,  359,  347,  361,  362,  364,
+      340,  367,  371,  368,  215,  381,  386,  395,  384,  385,
+     1177,    0,  402,  411, 1176,  425,  442,    0, 1175,  168,
+      411, 1174,  404,  416, 1173,  375, 1172,  419,  402, 1171,
+      443,  427,  444,  445,  403,  433,  415,  447,  448,  452,
+      455,  457,  458,  459,  461,  462,  463,  466,  473,  468,
+      469,  472,  474,  470,  483,  488,  491,  494,  496,  495,
+      498,  499,  500,  501, 1170,  502, 1169, 1168, 1167, 1166,
+     1165, 1164,  504, 1163, 1162,  505,  507, 1161,  535,  514,
+
+      512,  519,  513, 1160, 1159, 1158,  516,  546,  529, 1157,
+     1156,  548,  549, 1155,  527,  508,  551,  552,  556,  554,
+      553, 1154, 1153, 1152,  557, 1151, 1150,  558, 1149, 1148,
+      559,  561,  560,  572,  579,  580,  569,  582, 1147,  566,
+      581, 1201,  592,  600,  609,  613,  618,  602,  620,  621,
+     1146,  622,  623, 1145,  624,  603,  625,  629,  630,  632,
+      633,  634,  636,  640,  637,  641,  645,  647,  651, 1144,
+     1143,  643,  653,  657,  654, 1142, 1141,  659,  660,  663,
+     1140,  664,  667,  668,  669,  670,  671,  675,  677, 1139,
+     1138,  680,  682, 1137,  683,  685,  691,    0, 1136,  690,
+
+      694, 1135,  695,  702,  696, 1134,  704,  710, 1133,  712,
+      699, 1132,  715, 1131, 1130,  716,  718,  719,  720, 1129,
+      723, 1128,  725, 1127,  729,  727, 1126,  734, 1125,  736,
+      592, 1124,  734,  735,  738,  745,  749,  746,  750,  747,
+      755,  757,  760,  758,  761,  763, 1123,  764, 1122, 1121,
+      766,  768,  765,  777,  772,  773,  780,  762,  783,  784,
+      788, 1120,  789,  792,  791,  793,  795,  799,  794,  805,
+      809,  810,  811,  812, 1119,  814,  813,  815, 1118,  816,
+     1117,  820,  822,  817,  829,  833,  818,  834, 1116,  837,
+      839, 1115,  840,  845,  819,  844, 1114,  843,  846,  848,
+
+     1113, 1112,  854,  849, 1111, 1110, 1109,  856,  855, 1108,
+     1107,  860,  861,  868,  867, 1106,  874, 1105, 1104, 1103,
+     1102,  875,  876,  877, 1101,  878,  879, 1100, 1099, 1098,
+     1097, 1096,  880, 1095, 1094,  882,  883,  891,  885,  884,
+     1093,  886, 1092,  888, 1091, 1090,  895,  900,  902,  903,
+      904, 1089,  908,  907,  910,  911,  912,  914,  915,  919,
+     1086,  920,  922,  927,  929,  930,  934,  935,  936, 1077,
+      939,  943,  944,  940, 1076,  946,  948,  950,  951, 1075,
+     1073, 1071,  955, 1070,  962,  952,  964, 1069,  969,  972,
+      974, 1068,  956, 1067, 1064,  975,  981,  978,  983,  982,
+
+      957,  984,  985,  989,  992,  994,  995, 1063,  993,  996,
+      999, 1002, 1005, 1006, 1003, 1062, 1010, 1013, 1016, 1017,
+     1058, 1011, 1021, 1022, 1023,  954, 1024,  700, 1030, 1027,
+     1033, 1036, 1029, 1037, 1038, 1039, 1041, 1047, 1043, 1051,
+      521, 1049,  471,  432, 1052,  431, 1056,  365,  248,  247,
+     1057,  216, 1201, 1092, 1094,  107, 1098,  106
     } ;
 
-static yyconst flex_int16_t yy_def[562] =
+static yyconst short int yy_def[559] =
     {   0,
-      556,    1,  556,  556,  556,  556,  557,  558,  559,  556,
-      558,  558,  558,  558,  560,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  557,  556,  558,
-      556,  561,  561,  556,  556,  558,  558,  558,  558,  558,
-      560,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-       24,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  556,  561,  561,  556,  558,  558,  558,   50,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-
-       50,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  556,  556,  556,  556,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-
-      201,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      556,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  558,  558,  558,    0,  556,  556,  556,  556,
-      556
+      553,    1,  553,  553,  553,  553,  554,  555,  556,  553,
+      555,  555,  555,  555,  557,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  554,  553,  555,
+      553,  558,  558,  553,  553,  555,  555,  555,  555,  555,
+      557,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,   24,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      553,  558,  558,  553,  555,  555,  555,   50,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  555,
+      555,  555,  555,  555,  555,  555