Regenerate

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

1 files changed, 1621 insertions, 1421 deletions

diff --git a/lib/AsmParser/Lexer.cpp.cvs b/lib/AsmParser/Lexer.cpp.cvs
index d102617041..991f4690dd 100644
--- a/lib/AsmParser/Lexer.cpp.cvs
+++ b/lib/AsmParser/Lexer.cpp.cvs
@@ -1,54 +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:
-<<<<<<< Lexer.cpp.cvs
- * $Header$
-=======
- * $Header$
->>>>>>> 1.27
- */
+#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
@@ -57,34 +96,17 @@
 
 #if __STDC__
 
-#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -99,71 +121,88 @@
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN (yy_start) = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE llvmAsmrestart(llvmAsmin  )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE (16384*64)
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
 
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+extern int 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;
@@ -200,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
@@ -215,196 +258,201 @@ 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 ));
-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;
-
-#define YY_NUM_RULES 131
-#define YY_END_OF_BUFFER 132
-static yyconst short int yy_acclist[211] =
-    {   0,
-      132,  130,  131,  129,  130,  131,  129,  131,  130,  131,
-      130,  131,  130,  131,  130,  131,  130,  131,  130,  131,
-      122,  130,  131,  122,  130,  131,    1,  130,  131,  130,
-      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
-      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
-      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
-      131,  130,  131,  130,  131,  130,  131,  130,  131,  130,
-      131,  130,  131,  121,  119,  118,  118,  125,  123,  127,
-      122,    1,  104,   36,   64,   49,   65,   60,   24,  121,
-      118,  118,  126,  127,   21,  127,  128,   50,   59,   34,
-
-       37,    3,   52,   74,   79,   77,   78,   76,   75,   80,
-       84,  103,   69,   67,   99,   68,   66,   51,   82,   73,
-       71,   72,   70,   83,   81,   61,  120,  127,  127,  101,
-       85,   63,   55,  111,   58,   62,  112,  100,   23,  124,
-       54,   88,   57,   25,    4,   47,   53,   56,   43,   12,
-       87,  127,   31,    2,    5,   44,   90,   46,  113,   86,
-       22,  110,   40,    7,   45,   39,   94,   93,    8,   16,
-      106,  109,   33,   48,   98,   92,  105,   26,   27,   91,
-      107,  102,   97,   38,    6,   28,   89,   32,    9,   18,
-       10,   95,   11,   96,   30,   13,   15,   14,   29,   35,
-
-       17,  108,  114,  116,  117,   41,  115,   19,   42,   20
-    } ;
+	(yy_c_buf_p) = yy_cp;
 
-static yyconst short int yy_accept[537] =
+#define YY_NUM_RULES 134
+#define YY_END_OF_BUFFER 135
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[539] =
     {   0,
-        1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
-       17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
-       40,   42,   44,   46,   48,   50,   52,   54,   56,   58,
-       60,   62,   64,   66,   68,   70,   72,   74,   74,   75,
-       75,   76,   77,   78,   79,   79,   80,   80,   81,   82,
-       82,   83,   83,   83,   83,   83,   83,   83,   83,   84,
-       84,   85,   85,   85,   85,   85,   85,   85,   85,   86,
-       86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-       87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-       87,   88,   88,   88,   88,   88,   88,   88,   89,   89,
-
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   90,   90,   90,   90,   90,   90,
-       90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-       91,   92,   94,   95,   96,   97,   97,   98,   99,   99,
-       99,  100,  100,  100,  101,  101,  101,  101,  102,  102,
-      102,  102,  102,  102,  102,  102,  102,  102,  103,  103,
-      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
-      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
-      103,  103,  104,  104,  105,  106,  107,  108,  109,  110,
-      110,  111,  112,  112,  113,  113,  113,  113,  113,  113,
-
-      114,  115,  116,  116,  116,  116,  117,  118,  118,  118,
-      119,  119,  119,  119,  119,  119,  119,  119,  120,  121,
-      122,  122,  123,  124,  124,  125,  126,  126,  126,  126,
-      126,  126,  126,  126,  126,  127,  127,  127,  128,  129,
-      129,  129,  129,  130,  130,  130,  130,  131,  131,  131,
-      132,  132,  132,  132,  132,  132,  132,  132,  132,  132,
-      132,  132,  132,  132,  132,  133,  134,  134,  134,  134,
-      134,  135,  136,  136,  136,  136,  137,  137,  137,  137,
-      137,  137,  137,  137,  138,  139,  139,  139,  140,  140,
-      140,  141,  142,  142,  142,  143,  143,  143,  143,  144,
-
-      144,  144,  145,  145,  145,  146,  146,  147,  148,  148,
-      148,  148,  148,  149,  149,  150,  150,  151,  151,  151,
-      152,  153,  154,  154,  154,  155,  155,  155,  155,  155,
-      155,  155,  155,  155,  155,  155,  155,  155,  155,  156,
-      156,  157,  158,  158,  158,  158,  158,  158,  158,  158,
-      158,  158,  158,  158,  159,  159,  159,  159,  159,  159,
-      159,  159,  159,  159,  159,  160,  160,  160,  160,  161,
-      161,  162,  162,  162,  162,  162,  162,  162,  162,  163,
-      163,  163,  164,  164,  164,  164,  164,  165,  165,  165,
-      165,  166,  166,  166,  167,  168,  169,  169,  169,  170,
-
-      171,  171,  171,  171,  171,  172,  172,  173,  174,  175,
-      175,  175,  176,  176,  176,  177,  178,  179,  180,  181,
-      181,  182,  183,  183,  183,  183,  183,  183,  184,  184,
-      185,  185,  186,  187,  187,  187,  187,  187,  187,  188,
-      188,  188,  188,  188,  188,  188,  188,  189,  189,  189,
-      189,  189,  189,  189,  189,  189,  190,  190,  190,  190,
-      190,  191,  191,  191,  191,  191,  192,  193,  194,  195,
-      195,  195,  195,  196,  196,  196,  196,  197,  197,  198,
-      199,  199,  199,  199,  199,  199,  199,  199,  199,  199,
-      199,  199,  200,  200,  200,  200,  200,  200,  200,  201,
-
-      201,  201,  201,  201,  202,  202,  202,  202,  202,  202,
-      203,  203,  203,  203,  203,  203,  203,  203,  203,  203,
-      203,  203,  203,  204,  204,  205,  206,  206,  207,  207,
-      208,  209,  210,  210,  211,  211
+        0,    0,  135,  133,  132,  132,  133,  133,  133,  133,
+      133,  133,  125,  125,    1,  133,  133,  133,  133,  133,
+      133,  133,  133,  133,  133,  133,  133,  133,  133,  133,
+      133,  133,  133,  133,  133,  133,  133,  133,    0,  123,
+        0,  121,  119,  128,    0,  126,    0,  130,  125,    0,
+        1,    0,  120,  129,    0,    0,    0,    0,    0,    0,
+        0,  105,    0,   36,    0,    0,    0,    0,    0,    0,
+       63,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,   48,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,   64,    0,    0,    0,    0,    0,    0,   59,
+
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   24,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  123,  119,  130,   21,  130,    0,  131,    0,  124,
+      120,   49,    0,    0,   58,    0,    0,   34,    0,    0,
+        0,   37,    0,    0,    0,    0,    0,    0,    0,    0,
+        3,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   51,    0,   73,   78,   76,
+       77,   75,   74,    0,   79,   83,    0,  104,    0,    0,
+
+        0,    0,    0,   68,   66,  100,    0,    0,    0,   67,
+       65,    0,    0,   50,    0,    0,    0,    0,    0,    0,
+        0,   81,   72,   70,    0,   71,   69,    0,   82,   80,
+        0,    0,    0,    0,    0,    0,    0,    0,   60,    0,
+        0,  122,  130,    0,    0,    0,  130,    0,    0,    0,
+      102,    0,    0,   84,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   62,   54,    0,
+        0,    0,    0,  112,   57,    0,    0,    0,   61,    0,
+        0,    0,    0,    0,    0,    0,    0,  113,  101,    0,
+        0,   23,    0,    0,  127,   53,    0,    0,   87,    0,
+
+        0,    0,   56,   89,    0,    0,   25,    0,    0,    4,
+        0,   46,   52,    0,    0,    0,    0,   55,    0,   42,
+        0,   12,    0,    0,   86,  130,   31,    0,    0,    2,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    5,    0,   43,   91,    0,    0,    0,    0,
+        0,    0,    0,   88,    0,    0,    0,    0,   45,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  114,
+        0,    0,    0,   85,    0,   22,    0,    0,    0,    0,
+        0,    0,    0,  111,    0,    0,   39,    0,    0,    0,
+        7,    0,    0,    0,   44,    0,    0,   38,   95,   94,
+
+        0,    0,    8,   16,    0,    0,    0,    0,  107,    0,
+      110,   33,   47,    0,    0,   99,    0,    0,   93,  106,
+       26,   27,   92,    0,  108,  103,    0,    0,    0,    0,
+        0,   98,    0,    0,    6,   28,    0,    0,    0,    0,
+        0,   90,    0,    0,    0,    0,    0,    0,    0,   32,
+        0,    0,    0,    0,    0,    0,    0,    0,    9,    0,
+        0,    0,    0,   18,    0,    0,    0,    0,   10,   96,
+       11,   97,    0,    0,    0,   30,    0,    0,    0,   13,
+        0,   15,   14,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,   29,    0,    0,    0,    0,    0,
+
+        0,   35,    0,    0,    0,    0,   17,    0,    0,    0,
+        0,    0,  109,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  115,    0,  117,  118,    0,
+       40,    0,  116,   19,   41,    0,   20,    0
     } ;
 
-static yyconst int yy_ec[256] =
+static yyconst flex_int32_t yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
@@ -412,14 +460,14 @@ static yyconst int yy_ec[256] =
         1,    2,    1,    4,    1,    5,    6,    1,    1,    1,
         1,    1,    7,    1,    8,    9,    1,   10,   11,   11,
        11,   11,   11,   12,   11,   13,   11,   14,   15,    1,
-        1,    1,    1,    1,   16,   16,   16,   16,   17,   16,
+        1,    1,    1,   16,   17,   17,   17,   17,   18,   17,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        1,    1,    1,    1,   18,    1,   19,   20,   21,   22,
+        1,    1,    1,    1,   19,    1,   20,   21,   22,   23,
 
-       23,   24,   25,   26,   27,    5,   28,   29,   30,   31,
-       32,   33,   34,   35,   36,   37,   38,   39,   40,   41,
-       42,   43,    1,    1,    1,    1,    1,    1,    1,    1,
+       24,   25,   26,   27,   28,    5,   29,   30,   31,   32,
+       33,   34,   35,   36,   37,   38,   39,   40,   41,   42,
+       43,   44,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -436,431 +484,445 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[44] =
+static yyconst flex_int32_t yy_meta[45] =
     {   0,
-        1,    1,    2,    1,    3,    1,    1,    3,    3,    3,
-        3,    3,    3,    4,    1,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3
+        1,    1,    2,    3,    4,    1,    1,    4,    4,    4,
+        4,    4,    4,    5,    1,    1,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[541] =
+static yyconst flex_int16_t yy_base[547] =
     {   0,
-        0,    0, 1164, 1165, 1165, 1165, 1159, 1148,   36,   40,
-       44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
-      108,   91,   77,  134,   92,  119,   93,  152,   72,  109,
-      178,  121,  209,  120,  135,  146,  147, 1157, 1165, 1146,
-     1165,    0,  161,  183,  199,  215,   70,  235,  250,  255,
-        0,   68,  140,  128,  165,  154,  101,   46, 1145,   96,
-      168,  206,  162,  177,  259,  188,   49,  208, 1144,  219,
-      267,  176,  172,  207,  268,  227,  256,  270,  229,  264,
-      274,  273,  272,  287,   31,  296,  228,  283,  276,  285,
-     1143,  299,  286,  302,  303,  304,  305,  307,  308,  309,
-
-      316,  317,  318,  320,  319,  322,  332,  329,  324,  323,
-      343,  345,  348, 1142,  350,  334,  351,  336,  357,  354,
-      359,  367,  362,  239,  379,  360,  372,  378,  381, 1141,
-        0,  399,  407, 1140,  421,  438,    0, 1139,  373,  383,
-     1138,  391,  386, 1137,  409,  426,  412, 1136,  415,  389,
-      439,  440,  413,  429,  441,  444,  443, 1135,  446,  425,
-      450,  451,  452,  454,  387,  458,  462,  460,  466,  474,
-      461,  468,  475,  481,  485,  486,  487,  488,  489,  491,
-      492, 1134,  493, 1133, 1132, 1131, 1130, 1129, 1128,  494,
-     1127, 1126,  497, 1125,  525,  500,  513,  498,  515, 1124,
-
-     1123, 1122,  499,  502,  519, 1121, 1120,  526,  518, 1119,
-      517,  529,  541,  543,  546,  545,  547, 1118, 1117, 1116,
-      548, 1115, 1114,  549, 1113, 1112,  550,  551,  553,  556,
-      557,  568,  560,  567, 1111,  570,  575, 1165,  580,  588,
-      594,  603,  608,  580,  505,  594, 1110,  595,  609, 1109,
-      610,  596,  613,  615,  616,  618,  620,  622,  623,  625,
-      624,  626,  628,  627, 1108, 1107,  629,  632,  638,  641,
-     1106, 1105,  642,  643,  644, 1104,  647,  646,  650,  651,
-      654,  658,  659, 1103, 1102,  661,  663, 1101,  664,  666,
-        0, 1100,  670,  674, 1099,  672,  676,  680, 1098,  686,
-
-      687, 1097,  689,  691, 1096,  692, 1095, 1094,  693,  697,
-      696,  700, 1093,  702, 1092,  704, 1091,  708,  709, 1090,
-      714, 1089,  714,  716, 1088,  715,  721,  720,  726,  729,
-      731,  732,  736,  735,  738,  739,  743,  740, 1087,  744,
-     1086, 1085,  745,  746,  749,  753,  750,  755,  761,  756,
-      763,  764,  767, 1084,  768,  771,  773,  775,  774,  770,
-      769,  781,  789,  786, 1083,  790,  791,  794, 1082,  793,
-     1081,  797,  798,  800,  795,  810,  801,  809, 1080,  807,
-      813, 1079,  816,  818,  817,  819, 1078,  821,  822,  823,
-     1077,  827,  829, 1076, 1075, 1074,  830,  834, 1073, 1072,
-
-      835,  838,  846,  839, 1071,  842, 1070, 1069, 1068,  848,
-      853, 1067,  854,  856, 1066, 1065, 1064, 1063, 1062,  855,
-     1061, 1060,  857,  858,  860,  861,  859, 1059,  864, 1058,
-      871, 1057, 1056,  869,  873,  122,  877,  875, 1055,  879,
-      878,  881,  882,  883,  891,  885, 1054,  886,  893,  898,
-      901,  899,  905,  906,  907, 1051,  909,  913,  914,  915,
-     1042,  916,  917,  919,  921, 1041, 1040, 1039, 1038,  923,
-      920,  935, 1036,  938,  939,  940, 1035,  925, 1033, 1032,
-      946,  943,  926,  950,  947,  954,  956,  957,  959,  958,
-      960, 1031,  962,  966,  967,  968,  969,  970, 1027,  971,
-
-      974,  975,  977, 1025,  985,  981,  983,  984,  987, 1024,
-      988,  995,  997,  998,  999, 1000, 1006, 1007, 1009, 1012,
-     1008, 1011, 1023, 1013,  928,  705, 1014,  675, 1017,  465,
-      464,  463, 1022,  390, 1165, 1057, 1059,  286, 1063,  252
+        0,    0, 1173, 1174, 1174, 1174, 1168, 1157,   35,   39,
+       43,   49,   55,   61,    0,   72,   64,   67,   66,   86,
+       76,  106,   91,   65,  133,  121,  117,   78,  152,   95,
+       90,  179,  137,  211,  139,   99,  148,  110, 1166, 1174,
+     1155, 1174,    0,   49,  185,  217,   98,  238,  254,  259,
+        0, 1164,    0,  200,  116,  149,  146,  118,  160,   63,
+      154, 1153,  153,  186,  208,  161,  264,  171,  205,  200,
+     1152,  219,  260,  222,  176,  228,  261,  124,  273,  274,
+      231,  269,  278,  279,  280,  281,  282,  290,  232,  202,
+      289,  291, 1151,  292,  294,  301,  309,  310,  312,  305,
+
+      313,  316,  317,  321,  322,  323,  324,  328,  326,  330,
+      332,  337,  345,  329,  346, 1150,  347,  355,  357,  358,
+      359,  362,  363,  380,  364,  241,  377,  370,  113,  366,
+      378, 1149,    0,  399, 1148,  414,  432,    0, 1157, 1174,
+        0, 1146,  382,  365, 1145,  405,  401, 1144,  367,  408,
+      404, 1143,  427,  417,  433,  419,  434,  421,  441,  385,
+     1142,  442,  422,  438,  443,  444,  447,  446,  449,  450,
+      456,  454,  469,  457,  459,  472,  473,  476,  465,  479,
+      480,  481,  485,  487,  488, 1141,  492, 1140, 1139, 1138,
+     1137, 1136, 1135,  491, 1134, 1133,  493, 1132,  522,  496,
+
+      499,  494,  510, 1131, 1130, 1129,  498,  501,  497, 1128,
+     1127,  524,  505, 1126,  514,  535,  537,  536,  540,  542,
+      539, 1125, 1124, 1123,  543, 1122, 1121,  544, 1120, 1119,
+      545,  546,  547,  553,  506,  557,  561,  566, 1118,  567,
+      568, 1174,  581,  576,  585,  597,  602,  587,  603,  588,
+     1117,  589,  604, 1116,  608,  590,  609,  612,  613,  615,
+      617,  619,  621,  620,  622,  623,  624, 1115, 1114,  626,
+      627,  630,  634, 1113, 1112,  638,  635,  639, 1111,  646,
+      640,  643,  644,  648,  647,  657,  658, 1110, 1109,  660,
+      664, 1108,  661,  663,    0, 1107,  669,  668, 1106,  670,
+
+      674,  678, 1105, 1104,  675,  687, 1103,  688,  690, 1102,
+      691, 1101, 1100,  692,  693,  694,  696, 1099,  697, 1098,
+      701, 1097,  705,  707, 1096,  712, 1095,  712,  713, 1094,
+      715,  723,  720,  724,  717,  727,  729,  732,  733,  734,
+      740,  735, 1093,  741, 1092, 1091,  742,  745,  746,  747,
+      750,  751,  748, 1090,  754,  755,  760,  761, 1089,  763,
+      762,  767,  772,  774,  768,  775,  776,  779,  783, 1088,
+      784,  785,  786, 1087,  791, 1086,  793,  789,  794,  800,
+      802,  795,  804, 1085,  807,  805, 1084,  810,  812,  813,
+     1083,  815,  816,  817, 1082,  820,  818, 1081, 1080, 1079,
+
+      824,  827, 1078, 1077,  830,  833,  831,  834, 1076,  839,
+     1075, 1074, 1073,  845,  846, 1072,  849,  850, 1071, 1070,
+     1069, 1068, 1067,  852, 1066, 1065,  851,  848,  853,  854,
+      855, 1064,  856,  857, 1063, 1062,  860,  866,  869,  870,
+      874, 1061,  875,  872,  877,  878,  879,  881,  883, 1060,
+      887,  889,  892,  895,  897,  900,  902,  903, 1059,  904,
+      906,  909,  910, 1058,  911,  914,  912,  918, 1057, 1056,
+     1055, 1054,  924,  917,  916, 1053,  931,  935,  937, 1042,
+      919, 1032, 1031,  938,  940,  922,  942,  945,  947,  949,
+      952,  953,  954,  957, 1030,  956,  958,  960,  961,  964,
+
+      965, 1028,  966,  967,  972,  977, 1027,  969,  978,  981,
+      982,  984, 1025,  990,  986,  987,  991,  992,  996,  997,
+      998,  999, 1004,  672, 1005, 1024, 1008, 1022, 1019, 1010,
+     1017, 1013, 1016,  671,  502, 1011,  458, 1174, 1047, 1049,
+      254, 1054, 1057,  220, 1061,  167
     } ;
 
-static yyconst short int yy_def[541] =
+static yyconst flex_int16_t yy_def[547] =
     {   0,
-      535,    1,  535,  535,  535,  535,  536,  537,  538,  535,
-      537,  537,  537,  537,  539,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  536,  535,  537,
-      535,  540,  540,  535,  535,  537,  537,  537,  537,  537,
-      539,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,   24,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  535,
-      540,  540,  535,  537,  537,  537,   50,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,   50,  537,  537,  537,  537,  537,
-
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  535,  535,  535,
-      535,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      195,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      535,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,  537,  537,  537,  537,  537,  537,
-      537,  537,  537,  537,    0,  535,  535,  535,  535,  535
+      538,    1,  538,  538,  538,  538,  539,  540,  541,  538,
+      540,  540,  540,  540,  542,  543,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  539,  538,
+      540,  538,  544,  538,  538,  540,  540,  540,  540,  540,
+      542,  545,  546,  538,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
+