Add support for the new "target data" information in .ll files. This provides

a better encoding of the targets data layout, rather than trying to guess it
from the endianness and pointersize like before.

Update the generated files.


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

1 files changed, 1314 insertions, 1485 deletions

diff --git a/lib/AsmParser/Lexer.cpp.cvs b/lib/AsmParser/Lexer.cpp.cvs
index 43b8d1098e..f6306aff9d 100644
--- a/lib/AsmParser/Lexer.cpp.cvs
+++ b/lib/AsmParser/Lexer.cpp.cvs
@@ -1,94 +1,51 @@
-#line 2 "Lexer.cpp"
-
-#line 4 "Lexer.cpp"
-
-#define  YY_INT_ALIGNED short int
-
+#define yy_create_buffer llvmAsm_create_buffer
+#define yy_delete_buffer llvmAsm_delete_buffer
+#define yy_scan_buffer llvmAsm_scan_buffer
+#define yy_scan_string llvmAsm_scan_string
+#define yy_scan_bytes llvmAsm_scan_bytes
+#define yy_flex_debug llvmAsm_flex_debug
+#define yy_init_buffer llvmAsm_init_buffer
+#define yy_flush_buffer llvmAsm_flush_buffer
+#define yy_load_buffer_state llvmAsm_load_buffer_state
+#define yy_switch_to_buffer llvmAsm_switch_to_buffer
+#define yyin llvmAsmin
+#define yyleng llvmAsmleng
+#define yylex llvmAsmlex
+#define yyout llvmAsmout
+#define yyrestart llvmAsmrestart
+#define yytext llvmAsmtext
+#define yylineno llvmAsmlineno
+
+#line 20 "Lexer.cpp"
 /* A lexical scanner generated by flex */
 
+/* Scanner skeleton version:
+ * $Header$
+ */
+
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
 
-/* begin standard C headers. */
 #include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
 
-/* flex integer type definitions */
 
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+#ifdef c_plusplus
+#ifndef __cplusplus
+#define __cplusplus
 #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
 
-#endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
 
+#include <stdlib.h>
+#include <unistd.h>
+
+/* Use prototypes in function declarations. */
+#define YY_USE_PROTOS
+
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
@@ -96,17 +53,34 @@ typedef unsigned int flex_uint32_t;
 
 #if __STDC__
 
+#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
+#ifdef __TURBOC__
+ #pragma warn -rch
+ #pragma warn -use
+#include <io.h>
+#include <stdlib.h>
+#define YY_USE_CONST
+#define YY_USE_PROTOS
+#endif
+
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
+
+#ifdef YY_USE_PROTOS
+#define YY_PROTO(proto) proto
+#else
+#define YY_PROTO(proto) ()
+#endif
+
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -121,88 +95,71 @@ typedef unsigned int flex_uint32_t;
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN (yy_start) = 1 + 2 *
+#define BEGIN yy_start = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START (((yy_start) - 1) / 2)
+#define YY_START ((yy_start - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE llvmAsmrestart(llvmAsmin  )
+#define YY_NEW_FILE yyrestart( yyin )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE (16384*64)
-#endif
-
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
 
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-extern int llvmAsmleng;
 
-extern FILE *llvmAsmin, *llvmAsmout;
+extern int yyleng;
+extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
-     *       access to the local variable yy_act. Since yyless() is a macro, it would break
-     *       existing scanners that call yyless() from OUTSIDE llvmAsmlex. 
-     *       One obvious solution it to make yy_act a global. I tried that, and saw
-     *       a 5% performance hit in a non-llvmAsmlineno scanner, because yy_act is
-     *       normally declared as a register variable-- so it is not worth it.
-     */
-    #define  YY_LESS_LINENO(n) \
-            do { \
-                int yyl;\
-                for ( yyl = n; yyl < llvmAsmleng; ++yyl )\
-                    if ( llvmAsmtext[yyl] == '\n' )\
-                        --llvmAsmlineno;\
-            }while(0)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
+/* The funky do-while in the following #define is used to turn the definition
+ * int a single C statement (which needs a semi-colon terminator).  This
+ * avoids problems with code like:
+ *
+ * 	if ( condition_holds )
+ *		yyless( 5 );
+ *	else
+ *		do_something_else();
+ *
+ * Prior to using the do-while the compiler would get upset at the
+ * "else" because it interpreted the "if" statement as being all
+ * done when it reached the ';' after the yyless() call.
+ */
+
+/* Return all but the first 'n' matched characters back to the input stream. */
+
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up llvmAsmtext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
+		/* Undo effects of setting up yytext. */ \
+		*yy_cp = yy_hold_char; \
 		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up llvmAsmtext again */ \
+		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, (yytext_ptr)  )
+#define unput(c) yyunput( c, yytext_ptr )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
 typedef unsigned int yy_size_t;
-#endif
 
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
+
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -239,16 +196,12 @@ struct yy_buffer_state
 	 */
 	int yy_at_bol;
 
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
-
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -258,197 +211,192 @@ struct yy_buffer_state
 	 * possible backing-up.
 	 *
 	 * When we actually see the EOF, we change the status to "new"
-	 * (via llvmAsmrestart()), so that the user can continue scanning by
-	 * just pointing llvmAsmin at a new input file.
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
-
 	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE yy_current_buffer = 0;
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
- *
- * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
+#define YY_CURRENT_BUFFER yy_current_buffer
 
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when llvmAsmtext is formed. */
+/* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
+
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int llvmAsmleng;
+
+
+int yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0;		/* whether we need to initialize */
+static int yy_init = 1;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow llvmAsmwrap()'s to do buffer switches
- * instead of setting up a fresh llvmAsmin.  A bit of a hack ...
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void llvmAsmrestart (FILE *input_file  );
-void llvmAsm_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE llvmAsm_create_buffer (FILE *file,int size  );
-void llvmAsm_delete_buffer (YY_BUFFER_STATE b  );
-void llvmAsm_flush_buffer (YY_BUFFER_STATE b  );
-void llvmAsmpush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void llvmAsmpop_buffer_state (void );
-
-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 yyrestart YY_PROTO(( FILE *input_file ));
 
-#define YY_FLUSH_BUFFER llvmAsm_flush_buffer(YY_CURRENT_BUFFER )
+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 )
 
-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  );
+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 ));
 
-void *llvmAsmalloc (yy_size_t  );
-void *llvmAsmrealloc (void *,yy_size_t  );
-void llvmAsmfree (void *  );
+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 * ));
 
-#define yy_new_buffer llvmAsm_create_buffer
+#define yy_new_buffer yy_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        llvmAsmensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        llvmAsmensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            llvmAsm_create_buffer(llvmAsmin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	if ( ! yy_current_buffer ) \
+		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	yy_current_buffer->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
 
-/* Begin user sect3 */
 
-#define llvmAsmwrap(n) 1
-#define YY_SKIP_YYWRAP
+#define YY_USES_REJECT
 
+#define yywrap() 1
+#define YY_SKIP_YYWRAP
 typedef unsigned char YY_CHAR;
-
-FILE *llvmAsmin = (FILE *) 0, *llvmAsmout = (FILE *) 0;
-
+FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
 typedef int yy_state_type;
+extern int yylineno;
+int yylineno = 1;
+extern char *yytext;
+#define yytext_ptr yytext
 
-extern int llvmAsmlineno;
-
-int llvmAsmlineno = 1;
-
-extern char *llvmAsmtext;
-#define yytext_ptr llvmAsmtext
-
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
+static yy_state_type yy_get_previous_state YY_PROTO(( void ));
+static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
+static int yy_get_next_buffer YY_PROTO(( void ));
+static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up llvmAsmtext.
+ * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	llvmAsmleng = (size_t) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
+	yytext_ptr = yy_bp; \
+	yyleng = (int) (yy_cp - yy_bp); \
+	yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
+	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 113
-#define YY_END_OF_BUFFER 114
-/* 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[501] =
+#define YY_NUM_RULES 114
+#define YY_END_OF_BUFFER 115
+static yyconst short int yy_acclist[192] =
     {   0,
-        0,    0,  114,  112,  111,  111,  112,  112,  112,  112,
-      112,  112,  104,  104,    1,  112,  112,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,  112,  112,  112,  112,
-      112,  112,  112,  112,  112,  112,    0,  103,    0,  101,
-      100,  100,  107,    0,  105,    0,  109,  104,    0,    1,
-        0,    0,    0,    0,    0,    0,    0,    0,   86,    0,
-       40,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   68,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   23,    0,
-
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  103,  100,  100,  109,   20,  109,    0,  110,
-       62,    0,    0,   67,    0,   38,    0,   33,    0,    0,
-        0,   41,    0,    0,    0,    0,    0,   65,    0,    0,
-        3,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   53,    0,    0,    0,    0,    0,    0,    0,    0,
-       64,   25,    0,    0,   76,    0,   66,   85,    0,    0,
-        0,    0,    0,   80,    0,   81,    0,    0,    0,   63,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,   69,    0,  102,  109,    0,    0,    0,  109,    0,
-        0,    0,    0,   48,   77,   78,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   93,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   94,   55,    0,    0,   22,    0,    0,  106,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   26,    0,    0,    4,   60,    0,   54,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   47,    0,   11,
-        0,    0,  109,   35,    0,    0,    2,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    5,
-
-        0,   57,    0,    0,    0,    0,    0,    0,   59,    0,
-        0,    0,    0,    0,    0,   49,    0,    0,   71,   75,
-       73,   74,   72,   70,   51,    0,    0,   95,    0,    0,
-        0,   50,   56,   21,    0,    0,    0,    0,    0,   83,
-        0,    0,    0,    0,    0,   92,    0,   44,    0,    0,
-        0,    0,    0,    0,   58,   30,   24,    0,    0,   43,
-        0,    7,    0,    0,    0,   88,    0,   32,   91,   37,
-       61,    0,    0,   79,    0,    0,   87,   27,   28,    0,
-        0,   89,   52,   84,   82,    0,    0,    0,    0,    0,
-        0,   42,    6,   29,    0,    0,    0,    0,    0,    0,
-
-        0,    0,    0,    0,    0,   36,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    8,    0,    0,    0,   17,
-        0,    0,    0,    0,    9,   10,    0,    0,    0,    0,
-        0,   34,    0,    0,    0,   12,   14,   13,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,   39,    0,
-        0,    0,    0,    0,   15,    0,    0,    0,    0,   31,
-        0,    0,   90,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   96,    0,   98,   99,
-       16,    0,   45,    0,   97,   18,   46,    0,   19,    0
+      115,  113,  114,  112,  113,  114,  112,  114,  113,  114,
+      113,  114,  113,  114,  113,  114,  113,  114,  113,  114,
+      105,  113,  114,  105,  113,  114,    1,  113,  114,  113,
+      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
+      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
+      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
+      114,  113,  114,  113,  114,  113,  114,  113,  114,  113,
+      114,  104,  102,  101,  101,  108,  106,  110,  105,    1,
+       87,   41,   69,   23,  104,  101,  101,  109,  110,   20,
+      110,  111,   63,   68,   39,   34,   42,   66,    3,   54,
+
+       65,   25,   77,   67,   86,   81,   82,   64,   70,  103,
+      110,  110,   49,   78,   79,   32,   94,   95,   56,   22,
+      107,   26,    4,   61,   55,   48,   11,  110,   36,    2,
+        5,   58,   60,   50,   72,   76,   74,   75,   73,   71,
+       52,   96,   51,   57,   21,   84,   93,   45,   59,   30,
+       24,   44,    7,   89,   33,   92,   38,   62,   80,   88,
+       27,   28,   90,   53,   85,   83,   43,    6,   29,   37,
+        8,   17,    9,   10,   35,   12,   14,   13,   40,   15,
+       31,   91,   97,   99,  100,   16,   46,   98,   18,   47,
+       19
 
     } ;
 
-static yyconst flex_int32_t yy_ec[256] =
+static yyconst short int yy_accept[505] =
+    {   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,   72,   73,   73,
+       74,   75,   76,   77,   77,   78,   78,   79,   80,   80,
+       81,   81,   81,   81,   81,   81,   81,   81,   81,   82,
+       82,   83,   83,   83,   83,   83,   83,   83,   83,   83,
+       83,   83,   83,   83,   83,   83,   83,   83,   83,   83,
+       83,   83,   83,   83,   83,   83,   83,   84,   84,   84,
+       84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
+
+       85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
+       85,   85,   85,   85,   86,   87,   89,   90,   91,   92,
+       92,   93,   94,   94,   94,   95,   95,   96,   96,   97,
+       97,   97,   97,   98,   98,   98,   98,   98,   98,   98,
+       99,   99,   99,  100,  100,  100,  100,  100,  100,  100,
+      100,  100,  100,  100,  101,  101,  101,  101,  101,  101,
+      101,  101,  101,  102,  103,  103,  103,  104,  104,  105,
+      106,  106,  106,  106,  106,  106,  107,  107,  108,  108,
+      108,  108,  109,  109,  109,  109,  109,  109,  109,  109,
+      109,  109,  109,  109,  109,  109,  109,  109,  109,  109,
+
+      109,  109,  109,  109,  110,  110,  111,  112,  112,  112,
+      112,  113,  113,  113,  113,  113,  114,  115,  116,  116,
+      116,  116,  117,  117,  117,  117,  117,  117,  117,  117,
+      117,  117,  117,  117,  117,  118,  118,  118,  118,  118,
+      118,  118,  118,  118,  118,  119,  120,  120,  120,  121,
+      121,  121,  122,  122,  122,  122,  122,  122,  122,  122,
+      122,  122,  122,  122,  122,  123,  123,  123,  124,  125,
+      125,  126,  126,  126,  126,  126,  126,  126,  126,  126,
+      126,  127,  127,  128,  128,  128,  129,  130,  130,  130,
+      131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+
+      131,  131,  131,  132,  132,  133,  133,  133,  133,  133,
+      133,  133,  134,  134,  134,  134,  134,  134,  134,  135,
+      135,  135,  136,  137,  138,  139,  140,  141,  142,  142,
+      142,  143,  143,  143,  143,  144,  145,  146,  146,  146,
+      146,  146,  146,  147,  147,  147,  147,  147,  147,  148,
+      148,  149,  149,  149,  149,  149,  149,  149,  150,  151,
+      152,  152,  152,  153,  153,  154,  154,  154,  154,  155,
+      155,  156,  157,  158,  159,  159,  159,  160,  160,  160,
+      161,  162,  163,  163,  163,  164,  165,  166,  167,  167,
+      167,  167,  167,  167,  167,  168,  169,  170,  170,  170,
+
+      170,  170,  170,  170,  170,  170,  170,  170,  170,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  172,
+      172,  172,  172,  173,  173,  173,  173,  173,  174,  175,
+      175,  175,  175,  175,  175,  176,  176,  176,  176,  177,
+      178,  179,  179,  179,  179,  179,  179,  179,  179,  179,
+      179,  179,  179,  179,  179,  179,  179,  179,  179,  179,
+      179,  179,  180,  180,  180,  180,  180,  180,  181,  181,
+      181,  181,  181,  182,  182,  182,  183,  183,  183,  183,
+      183,  183,  183,  183,  183,  183,  183,  183,  183,  183,
+      184,  184,  185,  186,  187,  187,  188,  188,  189,  190,
+
+      191,  191,  192,  192
+    } ;
+
+static yyconst int yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
@@ -480,7 +428,7 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[44] =
+static yyconst int yy_meta[44] =
     {   0,
         1,    1,    2,    1,    3,    1,    1,    3,    3,    3,
         3,    3,    3,    4,    1,    3,    3,    3,    3,    3,
@@ -489,256 +437,256 @@ static yyconst flex_int32_t yy_meta[44] =
         3,    3,    3
     } ;
 
-static yyconst flex_int16_t yy_base[506] =
+static yyconst short int yy_base[509] =
     {   0,
-        0,    0, 1090, 1091, 1091, 1091, 1085, 1074,   36,   40,
+        0,    0, 1096, 1097, 1097, 1097, 1091, 1080,   36,   40,
        44,   50,   56,   62,    0,   63,   66,   81,   89,   47,
        90,   91,   76,   96,  108,   49,   97,  110,   68,  137,
-      120,  168,  112,  115,  135,  127, 1083, 1091, 1072, 1091,
+      120,  168,  112,  115,  135,  127, 1089, 1097, 1078, 1097,
         0,  158,  173,  180,  196,   70,  201,  216,  221,    0,
-      121,  152,  123,  139,  166,  140,  162,  184, 1071,  222,
-      180,   31,  186,  232,   69,  144,  209,  234,  236,  225,
-      188,  241,  119,  235,  189,  238,  246,  245,  249,  255,
-      248,  257,  258,  264,  269, 1070,  265,  267,  271,  273,
-      275,  276,  277,  282,  284,  304,  293,  296, 1069,  305,
-
-      288,  285,  297,  308,  311,  315,  316,  323,  325,  147,
-      322,  328, 1068,    0,  343,  348, 1067,  362,  379,    0,
-     1066,  352,  335, 1065,  355, 1064,  354, 1063,  366,  368,
-      289, 1062,  348,  369,  380,  370,  382, 1061,  386,  384,
-      374,  392,  393,  388,  394,  398,  396,  400,  406,  404,
-      407,  411,  408,  413,  415,  418,  423,  421,  424,  425,
-     1060, 1059,  427,  428, 1058,  430, 1057, 1056,  454,  435,
-      443,  436,  465, 1055,  433, 1054,  434,  437,  467, 1053,
-      455,  468,  470,  331,  475,  477,  469,  471,  472,  487,
-      473,  491,  485,  479,  499,  493,  501,  495,  502,  505,
-
-      508, 1052,  506, 1091,  519,  533,  537,  541,  546,  547,
-      513,  548,  549, 1051, 1050, 1049,  550,  551,  552,  553,
-      554,  555,  509,  556,  563,  559,  560,  572,  561,  562,
-      573, 1048,  576,  579,  580,  583,  585,  586,  587,  590,
-      588, 1047, 1046,  592,  594, 1045,  593,  595,    0,  598,
-      599,  613,  601,  605,  615,  616,  611,  511,  622,  623,
-      619, 1044,  627,  629, 1043, 1042,  630, 1041,  635,  633,
-      637,  640,  641,  642,  647,  648,  649, 1040,  651, 1039,
-      655,  653,  673, 1038,  652,  654, 1037,  660,  656,  673,
-      664,  675,  678,  679,  682,  683,  684,  686,  687, 1036,
-
-      688, 1035,  690,  689,  692,  693,  696,  701, 1034,  702,
-      705,  711,  706,  712,  717, 1033,  709,  720, 1032, 1031,
-     1030, 1029, 1028, 1027, 1026,  722,  723, 1025,  724,  725,
-      729, 1024, 1023, 1022,  728,  732,  734,  730,  735, 1021,
-      731,  744,  740,  741,  749, 1020,  747, 1019,  750,  752,
-      756,  755,  758,  761, 1018, 1017, 1016,  768,  762, 1015,
-      770, 1014,  769,  771,  782, 1013,  774, 1012, 1011, 1010,
-     1009,  763,  775, 1008,  788,  783, 1007, 1006, 1005,  789,
-      791, 1004, 1003, 1002, 1001,  790,  794,  796,  795,  798,
-      799, 1000,  999,  998,  800,  806,  807,  809,  801,  811,
-
-      812,  813,  817,  814,  818,  995,  819,  825,  826,  830,
-      836,  837,  839,  838,  841,  986,  842,  843,  847,  984,
-      848,  850,  849,  853,  983,  982,  851,  859,  869,  855,
-      871,  981,  873,  874,  875,  979,  978,  977,  878,  881,
-      882,  884,  885,  857,  887,  891,  893,  892,  895,  896,
-      897,  898,  899,  903,  904,  908,  909,  910,  975,  913,
-      916,  919,  920,  921,  971,  923,  924,  926,  928,  969,
-      930,  929,  968,  931,  937,  940,  941,  943,  949,  950,
-      951,  952,  954,  955,  956,  957,  858,  959,  854,  597,
-      523,  963,  440,  965,  438,  334,  286,  966,  205, 1091,
-
-     1001, 1003,  214, 1007,   83
+      121,  152,  123,  139,  166,  140,  162,  184, 1077,  222,
+      180,   31,  186,  119,  232,  208,  144,  225,  234,  236,
+      235,  188,  238,  240,  246,  241,  245,  203,  248,  256,
+      254,  258,  262,  252,  272,  274, 1076,  276,  278,  280,
+      255,  253,  283,  284,  285,  286,  288,  297,  300, 1075,
+
+      301,  292,  295,  307,  309,  318,  316,  315,  322,  312,
+      147,  329,  330, 1074,    0,  344,  349, 1073,  363,  380,
+        0, 1072,  338,  336, 1071,  355, 1070,  356, 1069,  353,
+      367,  334, 1068,  375,  365,  381,  384,  370,  371, 1067,
+      388,  392,  391,  393,  394,  395,  396,  400,  399,  407,
+      406,  409,  411,  413,  410,  414,  418,  421,  425,  426,
+      427,  429, 1066, 1065,  430,  431, 1064,  435, 1063, 1062,
+      458,  436,  439,  434,  469, 1061,  449, 1060,  438,  441,
+      458, 1059,  471,  472,  474,  473,  481,  482,  475,  476,
+      483,  488,  489,  493,  495,  496,  504,  501,  503,  505,
+
+      510,  507,  516, 1058,  511, 1097,  527,  541,  545,  549,
+      554,  555,  440,  556,  557, 1057, 1056, 1055,  558,  559,
+      560, 1054,  527,  518,  561,  189,  562,  528,  566,  563,
+      564,  567,  568,  570, 1053,  571,  587,  580,  578,  579,
+      581,  590,  591,  596, 1052, 1051,  594,  598, 1050,  597,
+      601,    0,  606,  603,  607,  602,  608,  610,  618,  620,
+      625,  623,  628,  629, 1049,  630,  626, 1048, 1047,  638,
+     1046,  634,  640,  642,  644,  646,  648,  651,  653,  652,
+     1045,  654, 1044,  656,  657,  662, 1043,  662,  665, 1042,
+      668,  671,  674,  680,  682,  683,  684,  685,  687,  686,
+
+      689,  690, 1041,  691, 1040,  696,  692,  695,  693,  700,
+      699, 1039,  710,  712,  713,  714,  715,  719, 1038,  718,
+      722, 1037, 1036, 1035, 1034, 1033, 1032, 1031,  725,  729,
+     1030,  726,  730,  732, 1029, 1028, 1027,  731,  735,  743,
+      733,  737, 1026,  734,  746,  744,  747,  750, 1025,  752,
+     1024,  755,  761,  760,  758,  763,  764, 1023, 1022, 1021,
+      771,  762, 1020,  773, 1019,  774,  777,  779, 1018,  787,
+     1017, 1016, 1015, 1014,  778,  788, 1013,  791,  792, 1012,
+     1011, 1010,  790,  795, 1009, 1008, 1007, 1006,  793,  796,
+      798,  797,  804,  801, 1005, 1004, 1003,  809,  811,  812,
+
+      813,  814,  816,  817,  820,  822,  827,  819, 1002,  815,
+      833,  826,  839,  843,  845,  846,  847,  848,  999,  849,
+      850,  851,  990,  854,  857,  855,  856,  989,  987,  858,
+      866,  876,  862,  861,  986,  879,  880,  881,  984,  983,
+      982,  882,  884,  888,  890,  889,  863,  891,  896,  897,
+      899,  901,  900,  902,  903,  904,  908,  909,  912,  913,
+      916,  980,  918,  924,  923,  925,  926,  977,  928,  929,
+      930,  931,  975,  935,  936,  973,  934,  944,  942,  946,
+      950,  954,  956,  957,  958,  960,  961,  959,  962,  864,
+      964,  829,  766,  604,  969,  519,  965,  517,  477,  446,
+
+      970,  333, 1097, 1005, 1007,   83, 1011,   80
     } ;
 
-static yyconst flex_int16_t yy_def[506] =
+static yyconst short int yy_def[509] =
     {   0,
-      500,    1,  500,  500,  500,  500,  501,  502,  503,  500,
-      502,  502,  502,  502,  504,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  501,  500,  502,  500,
-      505,  505,  500,  500,  502,  502,  502,  502,  502,  504,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  500,  505,  505,  500,  502,  502,  502,   49,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,   49,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-
-      502,  502,  502,  500,  500,  500,  500,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  169,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  500,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,  502,
-      502,  502,  502,  502,  502,  502,  502,  502,  502,    0,
-
-      500,  500,  500,  500,  500
+      503,    1,  503,  503,  503,  503,  504,  505,  506,  503,
+      505,  505,  505,  505,  507,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  504,  503,  505,  503,
+      508,  508,  503,  503,  505,  505,  505,  505,  505,  507,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  503,  508,  508,  503,  505,  505,  505,
+       49,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+       49,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+
+      505,  505,  505,  505,  505,  503,  503,  503,  503,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  171,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  503,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+      505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
+
+      505,  505,    0,  503,  503,  503,  503,  503
     } ;
 
-static yyconst flex_int16_t yy_nxt[1135] =
+static yyconst short int yy_nxt[1141] =
     {   0,