Regenerate

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

3 files changed, 4382 insertions, 3809 deletions

diff --git a/lib/AsmParser/Lexer.cpp.cvs b/lib/AsmParser/Lexer.cpp.cvs
index 0111c0095f..7a29accb12 100644
--- a/lib/AsmParser/Lexer.cpp.cvs
+++ b/lib/AsmParser/Lexer.cpp.cvs
@@ -1,50 +1,93 @@
-#define yy_create_buffer llvmAsm_create_buffer
-#define yy_delete_buffer llvmAsm_delete_buffer
-#define yy_scan_buffer llvmAsm_scan_buffer
-#define yy_scan_string llvmAsm_scan_string
-#define yy_scan_bytes llvmAsm_scan_bytes
-#define yy_flex_debug llvmAsm_flex_debug
-#define yy_init_buffer llvmAsm_init_buffer
-#define yy_flush_buffer llvmAsm_flush_buffer
-#define yy_load_buffer_state llvmAsm_load_buffer_state
-#define yy_switch_to_buffer llvmAsm_switch_to_buffer
-#define yyin llvmAsmin
-#define yyleng llvmAsmleng
-#define yylex llvmAsmlex
-#define yyout llvmAsmout
-#define yyrestart llvmAsmrestart
-#define yytext llvmAsmtext
-#define yylineno llvmAsmlineno
-
-#line 20 "Lexer.cpp"
-/* A lexical scanner generated by flex*/
-
-/* Scanner skeleton version:
- * $Header$
- */
+#line 2 "Lexer.cpp"
+
+#line 4 "Lexer.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 <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+/* end standard C headers. */
 
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
 #endif
 
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
-#ifdef __cplusplus
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
 
-#include <stdlib.h>
+#endif /* ! FLEXINT_H */
 
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
+#ifdef __cplusplus
 
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
@@ -53,34 +96,17 @@
 
 #if __STDC__
 
-#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -95,80 +121,88 @@
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN (yy_start) = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE llvmAsmrestart(llvmAsmin  )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE (16384*64)
+#endif
 
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
 
-extern int 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 )
-
-/* Some routines like yy_flex_realloc() are emitted as static but are
-   not called by all lexers. This generates warnings in some compilers,
-   notably GCC. Arrange to suppress these. */
-#ifdef __GNUC__
-#define YY_MAY_BE_UNUSED __attribute__((unused))
-#else
-#define YY_MAY_BE_UNUSED
-#endif
+#define unput(c) yyunput( c, (yytext_ptr)  )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-typedef unsigned int yy_size_t;
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
 
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -205,12 +239,16 @@ 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
@@ -220,199 +258,203 @@ 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 llvmAsmrestart()), so that the user can continue scanning by
+	 * just pointing llvmAsmin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
+
 	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-static YY_BUFFER_STATE yy_current_buffer = 0;
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER yy_current_buffer
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
 
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when yytext is formed. */
+/* yy_hold_char holds the character lost when llvmAsmtext is formed. */
 static char yy_hold_char;
-
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
+int llvmAsmleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
+static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
+/* Flag which is used to allow llvmAsmwrap()'s to do buffer switches
+ * instead of setting up a fresh llvmAsmin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void llvmAsmrestart (FILE *input_file  );
+void llvmAsm_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE llvmAsm_create_buffer (FILE *file,int size  );
+void llvmAsm_delete_buffer (YY_BUFFER_STATE b  );
+void llvmAsm_flush_buffer (YY_BUFFER_STATE b  );
+void llvmAsmpush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void llvmAsmpop_buffer_state (void );
+
+static void llvmAsmensure_buffer_stack (void );
+static void llvmAsm_load_buffer_state (void );
+static void llvmAsm_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
-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 yy_create_buffer
+#define yy_new_buffer llvmAsm_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        llvmAsmensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
+	if ( ! YY_CURRENT_BUFFER ){\
+        llvmAsmensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
+/* 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;
+
+FILE *llvmAsmin = (FILE *) 0, *llvmAsmout = (FILE *) 0;
+
 typedef int yy_state_type;
-extern int yylineno;
-int yylineno = 1;
-extern char *yytext;
-#define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
+extern int llvmAsmlineno;
+
+int llvmAsmlineno = 1;
+
+extern char *llvmAsmtext;
+#define yytext_ptr llvmAsmtext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
+ * corresponding action - sets up llvmAsmtext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
+	(yytext_ptr) = yy_bp; \
+	llvmAsmleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
+	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 137
-#define YY_END_OF_BUFFER 138
-static yyconst short int yy_acclist[218] =
-    {   0,
-      138,  136,  137,  135,  136,  137,  135,  137,  136,  137,
-      136,  137,  136,  137,  136,  137,  136,  137,  136,  137,
-      128,  136,  137,  128,  136,  137,    1,  136,  137,  136,
-      137,  136,  137,  136,  137,  136,  137,  136,  137,  136,
-      137,  136,  137,  136,  137,  136,  137,  136,  137,  136,
-      137,  136,  137,  136,  137,  136,  137,  136,  137,  136,
-      137,  136,  137,  136,  137,  136,  137,  136,  137,  136,
-      137,  136,  137,  136,  137,  126,  124,  122,  131,  129,
-      133,  128,    1,  123,  132,  108,   37,   71,   53,   72,
-       67,   24,  126,  122,  133,   21,  133,  134,  127,  123,
-
-       54,   66,   35,   38,    3,   56,   81,   86,   84,   85,
-       83,   82,   87,   91,  107,   76,   74,   63,   75,   73,
-       55,   89,   80,   78,   79,   77,   90,   88,   68,  125,
-      133,  133,   65,   92,   70,   59,  115,   62,   69,  116,
-       64,   23,  130,   58,   95,   61,   44,   25,    4,   51,
-       57,   60,   47,   12,   94,  133,   33,   31,    2,    5,
-       48,   97,   43,   50,  117,   93,   22,  114,   40,    7,
-       49,   39,  101,  100,    8,   16,  110,  113,   34,   52,
-      105,   99,  109,   26,   27,   98,  111,  106,  104,    6,
-       28,   96,   32,    9,   18,   10,  102,   11,   46,   45,
-
-      103,   30,   13,   15,   14,   29,   36,   17,  112,   19,
-      118,  120,  121,   41,  119,   42,   20
-    } ;
-
-static yyconst short int yy_accept[553] =
+#define YY_NUM_RULES 138
+#define YY_END_OF_BUFFER 139
+/* 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[560] =
     {   0,
-        1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
-       17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
-       40,   42,   44,   46,   48,   50,   52,   54,   56,   58,
-       60,   62,   64,   66,   68,   70,   72,   74,   76,   76,
-       77,   77,   78,   79,   80,   80,   81,   81,   82,   83,
-       83,   84,   84,   85,   86,   86,   86,   86,   86,   86,
-       86,   86,   87,   87,   88,   88,   88,   88,   88,   88,
-       88,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   90,   90,   90,   90,   90,   90,   90,   90,
-       90,   90,   91,   91,   91,   91,   91,   91,   91,   91,
-
-       92,   92,   92,   92,   92,   92,   92,   92,   92,   92,
-       92,   92,   92,   92,   92,   92,   92,   93,   93,   93,
-       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-       93,   93,   93,   94,   95,   96,   97,   98,   98,   99,
-       99,  100,  101,  102,  102,  102,  103,  103,  103,  104,
-      104,  104,  104,  105,  105,  105,  105,  105,  105,  105,
-      105,  105,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  107,  107,  107,  107,
-      108,  109,  110,  111,  112,  113,  113,  114,  115,  115,
-
-      116,  116,  116,  116,  116,  116,  117,  118,  119,  119,
-      119,  119,  120,  121,  121,  121,  122,  122,  122,  122,
-      122,  122,  122,  122,  122,  123,  124,  125,  125,  126,
-      127,  127,  128,  129,  129,  129,  129,  129,  129,  129,
-      129,  129,  130,  130,  130,  131,  132,  132,  132,  132,
-      133,  133,  133,  133,  133,  134,  134,  134,  135,  135,
-      135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
-      135,  135,  136,  137,  137,  137,  137,  137,  138,  139,
-      139,  139,  139,  140,  140,  140,  140,  140,  140,  140,
-      140,  141,  142,  142,  142,  142,  142,  143,  143,  143,
-
-      144,  145,  145,  145,  146,  146,  146,  146,  147,  148,
-      148,  148,  149,  149,  149,  149,  150,  150,  151,  152,
-      152,  152,  152,  152,  153,  153,  154,  154,  155,  155,
-      155,  156,  157,  158,  159,  159,  159,  160,  160,  160,
-      160,  160,  160,  160,  160,  160,  160,  160,  160,  160,
-      161,  161,  162,  163,  163,  163,  163,  163,  163,  163,
-      164,  164,  164,  164,  164,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  166,  166,
-      166,  166,  166,  167,  167,  168,  168,  168,  168,  168,
-      168,  168,  168,  169,  169,  169,  170,  170,  170,  170,
-
-      171,  171,  171,  171,  172,  172,  172,  173,  174,  175,
-      175,  175,  176,  177,  177,  177,  177,  178,  178,  179,
-      180,  180,  180,  181,  181,  181,  182,  182,  182,  183,
-      184,  185,  185,  186,  187,  187,  188,  189,  189,  189,
-      189,  189,  189,  190,  190,  190,  191,  192,  192,  192,
-      192,  192,  192,  193,  193,  193,  193,  193,  193,  193,
-      193,  193,  194,  194,  194,  194,  194,  194,  194,  194,
-      194,  194,  195,  195,  195,  195,  195,  196,  196,  196,
-      196,  197,  198,  199,  200,  201,  202,  202,  202,  202,
-      202,  203,  203,  203,  203,  204,  204,  205,  206,  206,
-
-      206,  206,  206,  206,  206,  206,  206,  206,  206,  206,
-      207,  207,  207,  207,  207,  207,  208,  208,  208,  208,
-      208,  208,  209,  209,  209,  209,  209,  209,  210,  210,
-      210,  210,  210,  210,  210,  210,  211,  211,  211,  211,
-      211,  212,  213,  214,  214,  215,  215,  216,  217,  217,
-      218,  218
+        0,    0,  139,  137,  136,  136,  137,  137,  137,  137,
+      137,  137,  129,  129,    1,  137,  137,  137,  137,  137,
+      137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+      137,  137,  137,  137,  137,  137,  137,  137,    0,  127,
+        0,  125,  123,  132,    0,  130,    0,  134,  129,    0,
+        1,    0,  124,  133,    0,    0,    0,    0,    0,    0,
+        0,  109,    0,   38,    0,    0,    0,    0,    0,    0,
+       72,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   54,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   73,    0,    0,    0,    0,    0,    0,    0,   68,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   25,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  127,  123,  134,   22,  134,    0,  135,
+        0,  128,  124,   55,    0,    0,   67,    0,    0,   36,
+        0,    0,    0,   39,    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,   57,    0,    0,    0,
+       82,   87,   85,   86,   84,   83,    0,   88,   92,    0,
+
+        0,  108,    0,    0,    0,    0,    0,   77,   75,   64,
+        0,    0,    0,   76,   74,    0,    0,   56,    0,    0,
+        0,    0,    0,    0,    0,    0,   90,   81,   79,    0,
+       80,   78,    0,   91,   89,    0,    0,    0,    0,    0,
+        0,    0,    0,   69,    0,    0,  126,  134,    0,    0,
+        0,  134,    0,    0,    0,    0,   66,    0,    0,   93,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,   71,   60,    0,    0,    0,    0,  116,
+       63,    0,    0,    0,   70,    0,    0,    0,    0,    0,
+        0,    0,  117,   65,    0,    0,    0,    0,   24,    0,
+
+        0,    0,  131,   59,    0,    0,   96,    0,    0,    0,
+       62,   45,    0,    0,   26,    0,    0,    0,    4,    0,
+       52,   58,    0,    0,    0,    0,   61,    0,   48,    0,
+       12,    0,    0,   95,  134,   34,   32,    0,    0,    2,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    5,    0,   49,   98,    0,    0,    0,    0,
+        0,    0,   44,    0,    0,    0,    0,   51,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  118,    0,    0,    0,    0,   94,    0,   23,    0,
+        0,    0,    0,    0,    0,    0,  115,    0,    0,   41,
+
+        0,    0,    0,    7,    0,    0,    0,   50,    0,    0,
+       40,  102,  101,    0,    0,    8,   16,    0,    0,    0,
+      111,    0,  114,   35,    0,    0,   53,    0,    0,    0,
+      106,    0,    0,  100,  110,   27,    0,   28,   99,    0,
+      112,  107,    0,    0,    0,    0,    0,  105,    0,    0,
+        6,   29,    0,    0,    0,    0,    0,   97,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   33,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    9,    0,    0,
+        0,    0,   19,    0,    0,    0,   10,  103,   11,   47,
+       46,    0,  104,    0,    0,    0,    0,   31,    0,    0,
+
+        0,   13,    0,   15,   14,    0,    0,    0,    0,   17,
+        0,    0,    0,    0,    0,    0,    0,   30,    0,    0,
+        0,    0,    0,   37,    0,    0,    0,    0,    0,   18,
+        0,    0,    0,    0,    0,  113,    0,    0,    0,    0,
+        0,    0,    0,   20,    0,    0,    0,    0,  119,  121,
+      122,    0,   42,    0,  120,   43,    0,   21,    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 +486,7 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[45] =
+static yyconst flex_int32_t yy_meta[45] =
     {   0,
         1,    1,    2,    3,    4,    1,    1,    4,    4,    4,
         4,    4,    4,    5,    1,    1,    4,    4,    4,    4,
@@ -453,137 +495,139 @@ static yyconst int yy_meta[45] =
         4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[560] =
+static yyconst flex_int16_t yy_base[568] =
     {   0,
-        0,    0, 1201, 1202, 1202, 1202, 1196, 1185,   35,   39,
+        0,    0, 1217, 1218, 1218, 1218, 1212, 1201,   35,   39,
        43,   49,   55,   61,    0,   72,   64,   67,   66,   86,
-       76,  106,   91,   65,  133,  121,  117,   99,  152,   95,
-       78,  179,  137,  211,  139,   90,  148,   93, 1194, 1202,
-     1183, 1202,    0,   49,  185,  217,  116,  238,  254,  259,
-        0, 1192,    0,  200,  125,  149,  146,  153,  177,   63,
-      154, 1181,  160,  161,  208,  185,  264,  171,  113,  210,
-     1180,  222,  260,  228,  186,  261,  271,  110,  273,  274,
-      230,  289,  277,  278,  240,  290,  292,  205,  291,  232,
-      296, 1179,  299,  303,  305,  306,  310,  313,  309,  318,
-
-      311,  314,  317,  322,  328,  329,  338,  331,  335,  339,
-      333,  332,  346,  340,  352,  355, 1178,  358,  360,  361,
-      364,  368,  365,  369,  381,  376,  382,  388,  367,  396,
-      384,  395, 1177,    0,  414, 1176,  429,  447,    0, 1185,
-     1202,    0, 1174,  409,  397, 1173,  420,  414, 1172,  405,
-      399,  422, 1171,  442,  431,  449,  432,  450,  437,  452,
-      456, 1170,  457,  435,  459,  460,  461,  465,  370,  469,
-      468,  472,  470,  475,  473,  476,  489,  490,  492,  494,
-      481,  497,  495,  502,  498, 1169,  503,  501,  505, 1168,
-     1167, 1166, 1165, 1164, 1163,  507, 1162, 1161,  508, 1160,
-
-      537,  512,  515,  510,  525, 1159, 1158, 1157,  516,  542,
-      531, 1156, 1155,  537,  529, 1154,  553,  555,  231,  556,
-      558,  557,  559,  560, 1153, 1152, 1151,  562, 1150, 1149,
-      563, 1148, 1147,  564,  565,  509,  524,  576,  582,  568,
-      584, 1146,  572,  570, 1202,  599,  608,  614,  618,  623,
-      608,  624,  592,  625, 1145,  626,  587, 1144,  627,  628,
-      629,  630,  632,  633,  634,  637,  639,  638,  640,  580,
-      641, 1143, 1142,  648,  651,  653,  656, 1141, 1140,  657,
-      658,  659, 1139,  665,  661,  663,  667,  674,  666,  668,
-     1138, 1137,  671,  679,  670,  680, 1136,  684,  691,    0,
-
-     1135,  688,  692, 1134,  693,  696,  697, 1133, 1132,  701,
-      705, 1131,  712,  714,  699, 1130,  716, 1129, 1128,  717,
-      718,  719,  703, 1127,  723, 1126,  726, 1125,  730,  732,
-     1124,  737, 1123, 1122,  731,  738, 1121,  739,  740,  743,
-      751,  742,  744,  752,  755,  756,  758,  760,  761, 1120,
-      763, 1119, 1118,  765,  766,  767,  772,  770,  773, 1117,
-      774,  777,  781,  783, 1116,  784,  788,  787,  789,  790,
-      799,  792,  794,  800,  803,  805,  807, 1115,  808,  810,
-      811,  812, 1114,  815, 1113,  817,  823,  818,  826,  831,
-      828,  829, 1112,  836,  833, 1111,  838,  698,  839, 1110,
-
-      841,  842,  843, 1109,  848,  844, 1108, 1107, 1106,  851,
-      846, 1105, 1104,  845,  860,  858, 1103,  865, 1102, 1101,
-      867,  869, 1100,  870,  872, 1099,  871,  874, 1098, 1097,
-     1096,  875, 1095, 1094,  878, 1093, 1092,  876,  877,  884,
-      883,  886, 1091,  879,  894, 1090, 1089,  895,  896,  898,
-      899,  901, 1088,  902,  905,  906,  907,  909,  908,  914,
-      910, 1087,  916,  920,  924,  927,  928,  931,  935,  932,
-      936, 1086,  937,  939,  941,  944, 1085,  945,  946,  947,
-     1074, 1064, 1063, 1062, 1061, 1060,  949,  950,  951,  953,
-     1059,  966,  967,  968, 1058,  952, 1057, 1056,  969,  971,
-
-      972,  977,  978,  979,  980,  983,  984,  985,  987, 1055,
-      989,  991,  992,  995,  997, 1053, 1000, 1007,  998, 1002,
-     1009, 1049, 1010, 1011, 1013, 1015, 1016, 1046, 1022, 1019,
-     1023, 1024, 1026, 1028, 1029, 1045, 1033, 1036,  371, 1030,
-      599,  522,  474, 1039,  434, 1040,  282,  279, 1043,  244,
-     1202, 1079, 1081,  212, 1086, 1089,  167, 1093,  108
+       76,  106,   91,   65,  133,  121,  117,   99,  152,  125,
+       78,  179,  137,  211,  139,   90,  154,   93, 1210, 1218,
+     1199, 1218,    0,   49,  185,  217,  113,  238,  254,  259,
+        0, 1208,    0,  200,  110,  155,  111,   75,  148,  134,
+      163, 1197,  160,  177,  208,  178,  264,  194,  205,  200,
+     1196,  219,  260,  222,  218,  167,  261,  231,  273,  228,
+      277,  282,  274,  287,  288,   98,  240,  289,  290,  292,
+      296, 1195,  293,  298,  299,  307,  316,  294,  319,  321,
+
+      308,  305,  323,  303,  300,  329,  333,  332,  334,  338,
+      336,  344,  339,  348,  337,  352,  335, 1194,  353,  363,
+      365,  364,  370,  368,  371,  377,  372,  384,  391,  369,
+      390,  376,  393, 1193,    0,  404, 1192,  426,  444,    0,
+     1201, 1218,    0, 1190,  406,  397, 1189,  409,  410, 1188,
+      413,  420,  417, 1187,  439,  411,  429,  431,  445,  446,
+      450,  449, 1186,  451,  452,  453,  454,  455,  457,  458,
+      465,  466,  468,  472,  471,  469,  482,  485,  488,  490,
+      491,  493,  494,  496,  497,  499, 1185,  500,  502,  505,
+     1184, 1183, 1182, 1181, 1180, 1179,  504, 1178, 1177,  506,
+
+      507, 1176,  536,  511,  514,  516,  517, 1175, 1174, 1173,
+      548,  519,  536, 1172, 1171,  549,  528, 1170,  527,  552,
+      553,  554,  556,  557,  560,  558, 1169, 1168, 1167,  561,
+     1166, 1165,  562, 1164, 1163,  569,  563,  571,  581,  574,
+      585,  578,  589, 1162,  582,  586, 1218,  599,  618,  608,
+      622,  627,  590,  628,  515,  629, 1161,  630,  602, 1160,
+      592,  631,  633,  632,  634,  636,  635,  637,  640,  639,
+      645,  643,  657, 1159, 1158,  642,  644,  658,  659, 1157,
+     1156,  660,  664,  662, 1155,  667,  669,  671,  673,  674,
+      678,  677, 1154, 1153,  680,  682,  685,  675, 1152,  686,
+
+      687,  688,    0, 1151,  690,  695, 1150,  701,  700,  705,
+     1149, 1148,  708,  706, 1147,  713,  715,  717, 1146,  719,
+     1145, 1144,  720,  724,  722,  725, 1143,  726, 1142,  729,
+     1141,  734,  730, 1140,  740, 1139, 1138,  740,  732, 1137,
+      742,  747,  750,  752,  749,  751,  759,  754,  760,  762,
+      763,  767, 1136,  768, 1135, 1134,  764,  769,  770,  777,
+      773,  779, 1133,  782,  784,  785,  786, 1132,  790,  791,
+      793,  792,  795,  794,  807,  798,  800,  801,  810,  811,
+      813, 1131,  814,  816,  820,  818, 1130,  821, 1129,  823,
+      830,  824,  832,  837,  834,  835, 1128,  838,  842, 1127,
+
+      844,  845,  847, 1126,  848,  849,  850, 1125,  854,  851,
+     1124, 1123, 1122,  855,  856, 1121, 1120,  867,  864,  861,
+     1119,  872, 1118, 1117,  865,  876, 1116,  878,  879,  881,
+     1115,  882,  884, 1114, 1113, 1112,  883, 1111, 1110,  890,
+     1109, 1108,  889,  886,  891,  893,  896, 1107,  898,  901,
+     1106, 1105,  904,  906,  908,  911,  913, 1104,  915,  916,
+      917,  912,  919,  918,  921,  931,  924, 1103,  937,  939,
+      938,  940,  942,  943,  945,  944,  947, 1102,  950,  955,
+      956,  951, 1101,  957,  958,  960, 1090, 1079, 1078, 1077,
+     1076,  962, 1074,  964,  969,  965,  978, 1073,  981,  966,
+
+      982, 1072,  983, 1071, 1070,  986,  987,  988,  991, 1069,
+      990,  993,  994,  995,  999, 1000, 1003, 1064, 1004, 1001,
+     1006, 1010, 1013, 1062, 1015, 1014, 1022, 1023, 1025, 1061,
+     1030, 1027, 1028, 1029, 1031,  910, 1033, 1034, 1036, 1035,
+     1032, 1043, 1044,  641, 1052, 1055, 1045, 1056,  599,  522,
+      470, 1057,  467, 1058,  373,  245, 1059,  244, 1218, 1095,
+     1097,  200, 1102, 1105,  167, 1109,   73
     } ;
 
-static yyconst short int yy_def[560] =
+static yyconst flex_int16_t yy_def[568] =
     {   0,
-      551,    1,  551,  551,  551,  551,  552,  553,  554,  551,
-      553,  553,  553,  553,  555,  556,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  552,  551,
-      553,  551,  557,  551,  551,  553,  553,  553,  553,  553,
-      555,  558,  559,  551,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  551,  557,  551,  553,  553,  553,   50,  558,
-      551,  559,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-
-       50,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  551,  551,  551,  551,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  201,
-
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  551,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
-        0,  551,  551,  551,  551,  551,  551,  551,  551
+      559,    1,  559,  559,  559,  559,  560,  561,  562,  559,
+      561,  561,  561,  561,  563,  564,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  560,  559,
+      561,  559,  565,  559,  559,  561,  561,  561,  561,  561,
+      563,  566,  567,  559,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  559,  565,  559,  561,  561,  561,   50,
+      566,  559,  567,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+
+      561,  561,   50,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+      561,  561,  561,  561,  561,  561,  561,  561,  561,  561,
+