Regenerate

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

1 files changed, 1677 insertions, 1490 deletions

diff --git a/lib/AsmParser/Lexer.cpp.cvs b/lib/AsmParser/Lexer.cpp.cvs
index 536d569648..4522aa84c3 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 */
+#line 2 "Lexer.cpp"
 
-/* Scanner skeleton version:
- * $Header: /cvs/root/flex/flex/skel.c,v 1.2 2004/05/07 00:28:17 jkh Exp $
- */
+#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 <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 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 llvmAsmleng;
 
-extern int yyleng;
-extern FILE *yyin, *yyout;
+extern FILE *llvmAsmin, *llvmAsmout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE llvmAsmlex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-llvmAsmlineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < llvmAsmleng; ++yyl )\
+                    if ( llvmAsmtext[yyl] == '\n' )\
+                        --llvmAsmlineno;\
+            }while(0)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
+		/* Undo effects of setting up llvmAsmtext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up llvmAsmtext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, yytext_ptr )
+#define unput(c) yyunput( c, (yytext_ptr)  )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-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,207 +258,209 @@ 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 );
 
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
+static void llvmAsmensure_buffer_stack (void );
+static void llvmAsm_load_buffer_state (void );
+static void llvmAsm_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+#define YY_FLUSH_BUFFER llvmAsm_flush_buffer(YY_CURRENT_BUFFER )
 
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static inline void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
+YY_BUFFER_STATE llvmAsm_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE llvmAsm_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE llvmAsm_scan_bytes (yyconst char *bytes,int len  );
 
-#define yy_new_buffer yy_create_buffer
+void *llvmAsmalloc (yy_size_t  );
+void *llvmAsmrealloc (void *,yy_size_t  );
+void llvmAsmfree (void *  );
+
+#define yy_new_buffer llvmAsm_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        llvmAsmensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
+	if ( ! YY_CURRENT_BUFFER ){\
+        llvmAsmensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
-#define YY_USES_REJECT
+/* Begin user sect3 */
 
-#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 152
-#define YY_END_OF_BUFFER 153
-static yyconst short int yy_acclist[233] =
-    {   0,
-      153,  151,  152,  150,  151,  152,  150,  152,  151,  152,
-      151,  152,  151,  152,  151,  152,  151,  152,  151,  152,
-      140,  151,  152,  140,  151,  152,    1,  151,  152,  151,
-      152,  151,  152,  151,  152,  151,  152,  151,  152,  151,
-      152,  151,  152,  151,  152,  151,  152,  151,  152,  151,
-      152,  151,  152,  151,  152,  151,  152,  151,  152,  151,
-      152,  151,  152,  151,  152,  151,  152,  151,  152,  151,
-      152,  151,  152,  151,  152,  137,  135,  133,  143,  141,
-      145,  140,    1,  134,  144,  119,   38,   82,   64,   83,
-       78,   25,  137,  139,  133,  145,   22,  145,  146,  138,
-
-      134,   65,   77,   36,   39,    3,   67,   92,   97,   95,
-       96,   94,   93,   98,  102,  118,   87,   85,   74,   86,
-       84,   66,  100,   91,   89,   90,   88,  101,   99,   79,
-      136,  145,  145,  147,  148,  149,   76,  103,   81,   70,
-      126,   73,   80,  127,   75,   52,   24,  142,   69,  106,
-       72,   47,   26,    4,   62,   68,   71,   55,   12,  105,
-      145,   34,   32,    2,   51,    5,   56,   59,  108,   46,
-       61,   53,  128,  104,   23,   54,  125,   41,    7,   57,
-       40,  112,  111,    8,   16,  121,  124,   35,   63,  116,
-      110,  120,   27,   28,  109,  122,  117,  115,    6,   29,
-
-      107,   50,   33,   44,   45,    9,   19,   10,  113,   11,
-       49,   48,  114,   31,   58,   13,   15,   14,   60,   17,
-       30,   37,   18,  123,   20,  129,  131,  132,   42,  130,
-       43,   21
-    } ;
-
-static yyconst short int yy_accept[607] =
+#define YY_NUM_RULES 154
+#define YY_END_OF_BUFFER 155
+/* 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[609] =
     {   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,   78,   79,   80,   80,   81,   81,   82,
-       83,   83,   84,   84,   85,   86,   86,   86,   86,   86,
-       86,   86,   86,   87,   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,   92,
-       92,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-       93,   93,   93,   93,   93,   93,   93,   94,   94,   95,
-       96,   97,   98,   99,   99,  100,  100,  100,  100,  100,
-      101,  102,  103,  103,  103,  104,  104,  104,  105,  105,
-      105,  105,  105,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  107,  107,  107,  107,  107,  107,  107,  107,
-      107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-      107,  107,  107,  107,  107,  107,  107,  108,  108,  108,
-
-      108,  108,  108,  109,  110,  111,  112,  113,  114,  114,
-      115,  116,  116,  116,  116,  117,  117,  117,  117,  117,
-      117,  118,  119,  120,  120,  120,  120,  120,  121,  122,
-      122,  122,  123,  123,  123,  123,  123,  123,  123,  123,
-      123,  124,  125,  126,  126,  127,  128,  128,  129,  130,
-      130,  130,  130,  130,  130,  130,  130,  130,  131,  131,
-      131,  132,  133,  133,  133,  133,  134,  135,  136,  137,
-      137,  137,  137,  137,  138,  138,  138,  138,  139,  139,
-      139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-      139,  139,  140,  141,  141,  141,  141,  141,  141,  142,
-
-      143,  143,  143,  143,  144,  144,  144,  144,  144,  144,
-      144,  144,  145,  146,  146,  146,  147,  147,  147,  147,
-      148,  148,  148,  148,  148,  149,  150,  150,  150,  151,
-      151,  151,  151,  151,  152,  153,  153,  153,  154,  154,
-      154,  154,  155,  155,  156,  157,  157,  157,  157,  157,
-      158,  158,  159,  159,  160,  160,  160,  161,  162,  163,
-      164,  164,  164,  165,  165,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  167,  167,  168,
-      169,  170,  170,  170,  170,  170,  170,  170,  171,  171,
-      171,  171,  171,  172,  172,  172,  172,  172,  172,  172,
-
-      172,  172,  172,  172,  172,  172,  172,  173,  173,  173,
-      173,  173,  174,  174,  174,  174,  174,  175,  175,  176,
-      176,  176,  176,  176,  176,  176,  176,  176,  176,  177,
-      178,  178,  178,  179,  179,  179,  179,  180,  180,  180,
-      180,  181,  181,  181,  182,  183,  184,  184,  184,  185,
-      186,  186,  186,  186,  187,  187,  188,  189,  189,  189,
-      189,  190,  190,  190,  190,  190,  191,  191,  191,  191,
-      192,  193,  194,  194,  195,  196,  196,  197,  198,  198,
-      198,  198,  198,  198,  198,  198,  199,  199,  199,  200,
-      201,  201,  201,  201,  201,  201,  202,  202,  202,  202,
-
-      202,  202,  203,  203,  203,  203,  203,  203,  204,  204,
-      204,  205,  205,  205,  205,  205,  205,  205,  206,  206,
-      206,  207,  207,  207,  207,  207,  208,  208,  208,  208,
-      209,  210,  211,  212,  213,  213,  213,  214,  214,  214,
-      214,  214,  215,  215,  216,  216,  216,  217,  217,  218,
-      219,  219,  219,  219,  219,  220,  221,  221,  221,  221,
-      221,  221,  221,  221,  222,  222,  222,  222,  222,  222,
-      223,  223,  223,  223,  223,  223,  224,  224,  224,  224,
-      224,  224,  225,  225,  225,  225,  225,  225,  225,  225,
-      226,  226,  226,  226,  226,  227,  228,  229,  229,  230,
-
-      230,  231,  232,  232,  233,  233
+        0,    0,  155,  153,  152,  152,  153,  153,  153,  153,
+      153,  153,  142,  142,    1,  153,  153,  153,  153,  153,
+      153,  153,  153,  153,  153,  153,  153,  153,  153,  153,
+      153,  153,  153,  153,  153,  153,  153,  153,    0,  139,
+        0,  137,    0,  135,  145,    0,  143,    0,  147,  142,
+        0,    1,    0,  136,  146,    0,    0,    0,    0,    0,
+        0,    0,  121,    0,    0,   38,    0,    0,    0,    0,
+        0,    0,   84,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,   66,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,   85,    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,    0,
+        0,   25,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  139,    0,  141,
+      135,  147,   22,  147,    0,  148,    0,    0,    0,    0,
+      140,  136,   67,    0,    0,   79,    0,    0,   36,    0,
+        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,    0,   69,    0,    0,
+
+        0,    0,    0,   94,   99,   97,   98,   96,   95,    0,
+      100,  104,    0,    0,    0,    0,  120,    0,    0,    0,
+        0,    0,   89,   87,   76,    0,    0,    0,    0,   88,
+       86,    0,    0,   68,    0,    0,    0,    0,    0,    0,
+        0,    0,  102,   93,   91,    0,   92,   90,    0,  103,
+      101,    0,    0,    0,    0,    0,    0,    0,    0,   81,
+        0,    0,  138,  147,    0,    0,    0,  147,  149,  150,
+      151,    0,    0,    0,    0,   78,    0,    0,    0,  105,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,   83,   72,    0,    0,    0,    0,    0,
+
+      128,   75,    0,    0,    0,   82,    0,    0,    0,    0,
+        0,    0,    0,  129,   77,    0,    0,   52,    0,    0,
+        0,   24,    0,    0,    0,    0,   53,  144,   71,    0,
+        0,  108,    0,    0,    0,    0,   74,   47,    0,    0,
+       26,    0,    0,    0,    4,    0,   64,   70,    0,    0,
+        0,    0,   73,    0,   57,    0,   12,    0,    0,  107,
+      147,   34,   32,    0,    0,    2,    0,   51,    0,   54,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    5,
+        0,   58,   61,  110,    0,    0,    0,    0,    0,    0,
+       46,    0,    0,    0,    0,   63,    0,    0,    0,    0,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   55,
+        0,    0,    0,    0,  130,    0,    0,    0,    0,  106,
+        0,   23,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   56,  127,    0,    0,   41,    0,    0,    0,    7,
+        0,    0,    0,   59,    0,    0,   40,  114,  113,    0,
+        0,    8,   16,    0,    0,    0,  123,    0,  126,   35,
+        0,    0,    0,   65,    0,    0,    0,    0,  118,    0,
+        0,    0,  112,  122,   27,    0,   28,  111,    0,  124,
+      119,    0,    0,    0,    0,    0,    0,    0,  117,    0,
+        0,    6,   29,    0,    0,    0,    0,    0,  109,    0,
+
+        0,    0,    0,    0,   50,    0,    0,    0,    0,    0,
+       33,    0,    0,   44,    0,    0,    0,    0,    0,    0,
+       45,    0,    0,    9,    0,    0,    0,    0,   19,    0,
+        0,    0,   10,  115,   11,   49,   48,    0,    0,  116,
+        0,    0,    0,    0,   31,    0,   60,    0,    0,   13,
+        0,   15,   14,    0,    0,    0,    0,   62,   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,  125,    0,    0,    0,    0,    0,
+        0,    0,   20,    0,    0,    0,    0,  131,  133,  134,
+
+        0,   42,    0,  132,   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,
@@ -443,7 +492,7 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[50] =
+static yyconst flex_int32_t yy_meta[50] =
     {   0,
         1,    1,    2,    3,    4,    1,    5,    6,    4,    7,
         7,    7,    7,    7,    7,    8,    1,    1,    4,    9,
@@ -452,294 +501,294 @@ static yyconst int yy_meta[50] =
         4,    4,    4,    4,    4,    4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[617] =
+static yyconst flex_int16_t yy_base[620] =
     {   0,
-        0,    0, 1381, 1382, 1382, 1382, 1376, 1363,   46,   52,
-       58,   66,   74, 1331,    0,   87,   76,   79,   78,   94,
+        0,    0, 1387, 1388, 1388, 1388, 1382, 1369,   46,   52,
+       58,   66,   74, 1337,    0,   87,   76,   79,   78,   94,
        77,  106,  109,   63,  138,  130,  141,  140,  151,  155,
-      110,  189,  175,  226,  145,  114,   38,  144, 1373, 1382,
-     1360, 1382, 1371,    0,  233,  259,  265,  119,  303, 1327,
-      323,    0, 1369,    0,  271,  146,  160,  161,   39,  165,
-      188,   64, 1356,   36,  124,  187,  190,   93,  199,  193,
-      195,  221, 1355,  121,  218,  215,  225,  224,  277,  236,
-      248,  271,  273,  175,  274,  283,  240,  284,  278,  126,
-      276,  279,  292,   35,  314,  306,  289,  331,  338,  340,
-
-      315,  343,  345,  341,  346,  347,  348,  349,  350,  359,
-      356,  354,  364,  361,  371,  363,  377,  381,  386,  389,
-     1354,  392,  393,  395,  394,  397,  396,  400,  417,  402,
-      280,  419,  357,  194,  401,  406, 1353, 1364, 1382,    0,
-      395, 1351,    0,  457,  427,  464,  485,  506, 1362, 1382,
-        0, 1349,  435,  421, 1348,  428,  440, 1347,  405,  511,
-      512,  445, 1346,  513,  446,  514,  466,  469,  471,  524,
-      526, 1345,  527,  506,  507,  470,  528,  529,  286,  508,
-      531,  530,  533,  535,  542,  544,  547,  548,  549,  551,
-      555,  407,  558,  559,  563,  564, 1344,  566,  569,  565,
-
-      574,  571, 1343, 1342, 1341, 1340, 1339, 1338,  572, 1337,
-     1336,  575,  577,  579, 1335,  613,  585,  586,  581,  591,
-     1334, 1333, 1332,  587,  589,  598,  599, 1331, 1330,  615,
-      580, 1329,  603,  620,  628,  631,  629,  632,  633,  634,
-     1328, 1327, 1326,  636, 1325, 1324,  637, 1323, 1322,  638,
-      640,  641,  647,  648,  655,  649,  654, 1321,  659,  665,
-     1382,  662,  500,  674,  685,  687,    0,    0,    0,  674,
-      680,  682,  683, 1320,  684,  685,  687, 1319,  686,  688,
-      689,  690,  691,  696,  695,  698,  702,  703,  707,  709,
-      714, 1318, 1317,  710,  720,  711,  717,  723, 1316, 1315,
-
-      727,  724,  729, 1314,  732,  730,  731,  735,  734,  739,
-      740, 1313, 1312,  741,  748, 1311,  736,  744,  749, 1310,
-      750,  754,  759,  760,    0, 1309,  764,  765,  783,  761,
-      773,  774,  766, 1308, 1307,  777,  784, 1306,  785,  788,
-      789, 1305,  791, 1304, 1303,  792,  793,  794,  796, 1302,
-      799, 1301,  800, 1300,  804,  809,  825,  837, 1299, 1298,
-      801,  816, 1297,  813, 1296,  829,  805,  837,  819,  838,
-      842,  820,  841,  845,  847,  848, 1295,  849, 1294, 1293,
-     1292,  850,  853,  854,  856,  855,  857, 1291,  861,  862,
-      863,  866, 1290,  871,  865,  872,  873,  877,  880,  881,
-
-      884,  887,  889,  890,  891,  909, 1382,  900,  899,  893,
-      902, 1289,  901,  903,  904,  908, 1288,  909, 1287,  911,
-      914,  920,  910,  928,  915,  923,  929,  947, 1382, 1286,
-      931,  936, 1285,  938,  939,  940, 1284,  941,  943,  944,
-     1283,  947,  945, 1282, 1281, 1280,  946,  949, 1279, 1278,
-      960,  952,  958, 1277,  964, 1276, 1275,  962,  968,  970,
-     1274,  979,  976,  977,  978, 1273,  981,  982,  980, 1272,
-     1271, 1270,  815, 1269, 1268,  984, 1263, 1260,  983,  986,
-      990,  992,  987, 1001,  995, 1257,  997, 1005, 1245, 1242,
-     1006, 1008, 1009, 1010, 1013, 1230, 1015, 1011, 1017, 1019,
-
-     1021, 1227, 1020, 1023, 1042, 1032, 1022, 1217, 1025, 1037,
-     1214, 1040, 1043, 1047, 1046, 1057, 1053, 1211, 1048, 1055,
-     1204, 1056, 1058, 1061, 1063, 1192, 1062, 1065, 1066, 1191,
-     1190, 1189, 1188, 1187, 1068, 1071, 1186, 1069, 1078, 1072,
-     1077, 1184, 1080, 1182, 1090, 1092, 1181, 1074, 1180, 1179,
-     1093, 1095, 1096, 1097, 1177, 1174, 1100, 1098, 1103, 1105,
-     1104, 1107, 1106, 1173, 1110, 1112, 1116, 1118, 1119, 1170,
-     1120, 1121, 1122, 1130, 1133, 1169, 1127, 1135, 1136, 1137,
-     1142,  821, 1144, 1143, 1138, 1145, 1147, 1148, 1151,  600,
-     1153, 1156, 1150, 1158,  597,  487,  404, 1160,  360, 1165,
-
-      281,  234, 1168,   90, 1382, 1209, 1215, 1222, 1231, 1238,
-     1247, 1253, 1262, 1268, 1271, 1276
+      110,  190,  179,  227,  145,  114,   38,  144, 1379, 1388,
+     1366, 1388, 1377,    0,  234,  260,  266,  119,  304, 1333,
+      324,    0, 1375,    0,  272,  146,  175,  148,   39,  161,
+      185,   64, 1362,   36,  124,  186,  189,   93,  212,  219,
+      165,  187, 1361,  198,  224,  196,  234,  191,  278,  236,
+      214,  272,  274,  226,  275,  284,  277,  121,  276,  280,
+      288,  281,  306,   35,  315,  326,  290,  339,  341,  279,
+
+      342,  332,  346,  347,  348,  349,  350,  289,  353,  355,
+      360,  356,  357,  365,  373,  381,  367,  378,  382,  387,
+      390, 1360,  393,  222,  396,  395,  398,  397,  401,  405,
+      403,  423,  420,  429,  361,  407,  409, 1359, 1370, 1388,
+        0,  429, 1357,    0,  452,  448,  462,  483,  504, 1368,
+     1388,    0, 1355,  510,  441, 1354,  470,  464, 1353,  445,
+      509,  512,  469, 1352,  511,  504,  522,  505,  467,  526,
+      527,  426, 1351,  528,  506,  529,  468,  283,  533,  406,
+      534,  535,  538,  536,  537,  543,  539,  546,  548,  550,
+      552,  554,  564,  566,  568,  569,  570, 1350,  572,  571,
+
+      573,  575,  576, 1349, 1348, 1347, 1346, 1345, 1344,  579,
+     1343, 1342,  581,  580,  583,  584, 1341,  617,  594,  591,
+      587,  592, 1340, 1339, 1338,  408,  604,  585,  602, 1337,
+     1336,  605,  608, 1335,  609,  622,  634,  635,  637,  638,
+      639,  640, 1334, 1333, 1332,  642, 1331, 1330,  643, 1329,
+     1328,  644,  645,  646,  654,  653,  658,  650,  647, 1327,
+      661,  670, 1388,  667,  681,  680,  690,  693,    0,    0,
+        0,  686,  687,  688,  689, 1326,  690,  691,  694, 1325,
+      692,  693,  695,  696,  698,  701,  702,  704,  706,  707,
+      717,  709,  716, 1324, 1323,  715,  729,  721,  723,  730,
+
+     1322, 1321,  731,  734,  739, 1320,  738,  735,  736,  737,
+      744,  745,  741, 1319, 1318,  746,  747, 1317,  740,  754,
+      755, 1316,  756,  765,  767,  769, 1315,    0, 1314,  770,
+      771,  786,  774,  776,  777,  778, 1313, 1312,  783,  793,
+     1311,  794,  797,  795, 1310,  798, 1309, 1308,  799,  801,
+      802,  800, 1307,  803, 1306,  805, 1305,  808,  810,  830,
+      841, 1304, 1303,  820,  812, 1302,  818, 1301,  831,  841,
+      843,  826,  833,  845,  825,  847,  849,  853,  854, 1300,
+      856, 1299, 1298, 1297,  858,  859,  857,  860,  861,  863,
+     1296,  864,  866,  869,  868, 1295,  872,  871,  877,  879,
+
+      883,  885,  886,  889,  894,  896,  895,  897,  914, 1388,
+      903,  904,  898,  907, 1294,  909,  906,  908,  910, 1293,
+      914, 1292,  915,  916,  919,  921,  927,  931,  932,  935,
+      953, 1388, 1291,  942,  941, 1290,  943,  944,  947, 1289,
+      945,  948,  951, 1288,  946,  952, 1287, 1286, 1285,  961,
+      949, 1284, 1283,  953,  965,  957, 1282,  967, 1281, 1280,
+      962,  975,  977, 1279,  490,  980,  981,  982, 1278,  983,
+      985,  986, 1273, 1270, 1267,  987, 1255, 1252,  989, 1240,
+     1237,  990,  991,  993,  994,  997, 1001, 1004, 1227, 1008,
+     1010, 1224, 1221, 1011, 1012, 1014, 1015, 1016, 1214, 1020,
+
+     1019, 1021, 1022, 1026, 1202, 1027, 1030, 1045, 1043, 1023,
+     1201, 1028, 1046, 1200, 1049, 1051, 1052, 1031, 1061, 1053,
+     1199, 1054, 1062, 1198, 1063, 1066, 1067, 1069, 1197, 1070,
+     1071, 1072, 1196, 1195, 1194, 1193, 1192, 1074, 1075, 1190,
+     1083, 1079, 1076, 1078, 1189, 1084, 1187, 1097, 1086, 1185,
+     1080, 1184, 1183, 1099, 1100, 1101, 1102, 1181, 1180, 1104,
+     1105, 1109, 1110, 1112, 1111, 1114, 1179, 1116, 1117, 1118,
+     1125, 1119, 1163, 1124, 1126, 1131, 1135, 1136, 1161, 1127,
+     1142, 1143, 1144, 1148,  819, 1149, 1145, 1153, 1151, 1152,
+     1147, 1157,  775, 1160, 1162, 1158, 1159,  601,  364,  362,
+
+     1165,  282, 1175,  173,  126, 1178,   90, 1388, 1219, 1225,
+     1232, 1241, 1248, 1257, 1263, 1272, 1278, 1281, 1286
     } ;
 
-static yyconst short int yy_def[617] =
+static yyconst flex_int16_t yy_def[620] =
     {   0,
-      605,    1,  605,  605,  605,  605,  606,  607,  608,  605,
-      607,  607,  607,   13,  609,  610,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  606,  605,
-      607,  605,  611,  612,  605,  605,   13,  607,  607,   13,
-       49,  609,  613,  614,  605,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,   25,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  605,  611,  605,  612,
-      615,  607,   49,  607,   51,   49,   49,   49,  613,  605,
-      614,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,   49,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      605,  615,  616,  605,  144,  144,  146,  147,  148,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  216,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  605,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-
-      607,  607,  607,  607,  607,  605,  605,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  605,  605,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-      607,  607,  607,  607,  607,  607,  607,  607,  607,  607,
-
-      607,  607,  607,  607,    0,  605,  605,  605,  605,  605,
-      605,  605,  605,  605,  605,  605
+      608,    1,  608,  608,  608,  608,  609,  610,  611,  608,
+      610,  610,  610,   13,  612,  613,  610,  610,  610,  610,
+      610,  610,  610,  610,  610,  610,  610,  610,  610,  610,
+      610,  610,  610,  610,  610,  610,  610,  610,  609,  608,
+      610,  608,  614,  615,  608,  608,   13,  610,  610,   13,
+       49,  612,  616,  617,  608,  610,  610,  610,  610,  610,
+      610,  610,  610,  610,  610,  610,  610,  610,  610,  610,
+      610,  610,  610,  610,  610,  610,  610,  610,  610,  610,
+      610,  610,  610,   25,  610,  610,  610,  610,  610,  610,
+      610,  610,  610,  610,  610,  610,  610,  610,  610,  610,
+
+      610,  610,  610,  610,  610,  610,  610,  610,  610,  610,
+      610,  610,  610,  610,  610,  610,  610,  610,  610,  610,
+      610,  610,  610,  610,  610,  610,  610,