Changeset 609 for branches/GNU/src/binutils/binutils/rclex.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/binutils/rclex.c (modified) (84 diffs, 1 prop)

branches/GNU/src/binutils/binutils/rclex.c

@@ +1 @@
+
+#line 3 "lex.yy.c"
+
+#define  YY_INT_ALIGNED short int
+
 /* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header: /cvs/src/src/binutils/Attic/rclex.c,v 1.1.4.2 2001/06/10 15:37:28 pb Exp $
- */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-
+#define YY_FLEX_SUBMINOR_VERSION 31
+#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>
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
+#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 defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#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. */
@@ -35 +88 @@
 #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
@@ -56 +99 @@
 #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
@@ -77 +113 @@
  * 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
@@ -83 +119 @@
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
@@ -90 +126 @@
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#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
-
+#endif
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
 
 extern int yyleng;
+
 extern FILE *yyin, *yyout;
 
@@ -106 +148 @@
 #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. */
-
+    #define YY_LESS_LINENO(n)
+    
+/* 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; \
+        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_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - 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
@@ -139 +170 @@
  * 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
         {
@@ -178 +214 @@
         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.
@@ -184 +223 @@
 
         int yy_buffer_status;
+
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
@@ -197 +237 @@
          */
 #define YY_BUFFER_EOF_PENDING 2
+
         };
-
-static YY_BUFFER_STATE yy_current_buffer = 0;
+#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. */
 
 /* 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".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#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. */
 static char yy_hold_char;
-
 static int yy_n_chars;          /* number of characters read into yy_ch_buf */
-
-
 int yyleng;
 
@@ -226 +276 @@
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_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 )
-
-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 ));
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
+
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
+
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
 
 #define yy_new_buffer yy_create_buffer
@@ -248 +302 @@
 #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 ){ \
+        yyensure_buffer_stack (); \
+                YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,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 ){\
+        yyensure_buffer_stack (); \
+                YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,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 */
 
 typedef unsigned char YY_CHAR;
+
 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
 
-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[] ));
+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
@@ -277 +346 @@
  */
 #define YY_DO_BEFORE_ACTION \
-        yytext_ptr = yy_bp; \
-        yyleng = (int) (yy_cp - yy_bp); \
-        yy_hold_char = *yy_cp; \
+        (yytext_ptr) = yy_bp; \
+        yyleng = (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 86
 #define YY_END_OF_BUFFER 87
-static yyconst short int yy_accept[470] =
+/* 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[470] =
     {   0,
         0,    0,   87,   85,   84,   83,   85,   78,   80,   82,
@@ -340 +416 @@
     } ;
 
-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,
@@ -372 +448 @@
     } ;
 
-static yyconst int yy_meta[36] =
+static yyconst flex_int32_t yy_meta[36] =
     {   0,
         1,    2,    3,    2,    1,    4,    2,    5,    5,    5,
@@ -380 +456 @@
     } ;
 
-static yyconst short int yy_base[476] =
+static yyconst flex_int16_t yy_base[476] =
     {   0,
-        0,    0,  515,  516,   34,  516,  509,    0,  492,   25,
-       26,   45,   25,   28,   24,  486,  497,   49,    0,   40,
-       43,  486,   51,   66,   67,  482,   35,  516,  516,   81,
-      503,   84,    0,  486,  516,    0,  494,  477,  492,  475,
-       74,  474,  477,  475,   46,  489,   69,  484,  471,  481,
-       55,  477,  481,  466,   67,  469,   83,   83,  467,  477,
-      464,  478,  464,  459,  475,  470,   74,  453,   81,  457,
-       86,   76,  468,  467,  465,  452,  452,  458,   95,  461,
-      453,  447,  446,  106,  466,  456,    0,  451,  444,  449,
-      448,  443,  452,  435,  436,  449,  433,  448,  430,  426,
-
-      429,  430,  433,  441,  424,    0,  423,  436,  435,  420,
-      415,  417,  427,  419,  420,  424,  412,  428,  423,  410,
-      424,  405,  406,  407,  419,  409,    0,  402,  409,  416,
-      414,  410,  408,  415,  393,  399,  412,  406,  392,  401,
-      397,  391,  387,  388,  386,  392,  394,  103,  383,  387,
-      399,  388,  389,  396,  385,  377,  379,  376,  373,  376,
-      370,  374,  387,  368,  363,   98,  381,    0,  379,  367,
-      363,    0,    0,  362,  363,  360,  358,  375,  361,  356,
-      105,  373,  372,  351,  355,  355,  349,    0,  366,  352,
-      347,  346,  352,  346,  343,  356,  346,  354,  356,  352,
-
-      347,  344,  349,    0,  335,  344,  350,    0,    0,  334,
-      115,  334,  345,  119,    0,  345,  331,    0,  328,  326,
-      336,  325,  336,  328,  327,  320,  317,  313,  330,    0,
-      330,  331,    0,    0,  327,  322,  329,  314,  314,    0,
-      114,  305,  307,  318,  322,  318,    0,  321,  318,  107,
-      318,  318,    0,  306,  316,    0,  316,  308,    0,  294,
-        0,  298,  307,  294,  291,  304,  304,    0,  132,  137,
-      293,  287,  290,  300,  288,  290,    0,  293,  295,  295,
-      276,  292,  295,    0,  293,  278,  276,    0,  277,    0,
-      270,  283,  267,  285,  270,  281,    0,  280,  279,  271,
-
-      265,  277,  261,  257,  259,  257,    0,  274,  256,    0,
-      255,  254,  258,  248,  269,  268,  265,  258,  270,  143,
-      269,  149,    0,  259,  241,    0,  240,    0,  259,  238,
-      258,  239,    0,  250,  237,  250,  236,  231,  247,  246,
-        0,  249,  247,  247,  234,  227,  240,  225,    0,  222,
-        0,  223,  222,  239,  224,  237,  218,  227,    0,  216,
-      215,  222,  217,  235,  213,    0,    0,  209,    0,  226,
-        0,  209,  203,    0,  216,    0,    0,    0,  212,  206,
-      211,    0,  220,    0,    0,  215,  204,  199,  200,  199,
-      213,  199,  199,  197,  206,  208,  207,  199,  188,  194,
-
-      192,  188,  188,  190,  196,    0,  198,  182,  184,  182,
-        0,    0,  184,  181,  188,  176,    0,  177,  171,  172,
-      170,  183,  186,  181,  171,    0,  183,  171,  164,    0,
-      167,  175,    0,  164,  160,  155,  157,  156,  159,    0,
-      155,    0,    0,  160,  165,  156,    0,    0,    0,    0,
-        0,  141,  150,  141,  139,    0,    0,  128,  122,  126,
-        0,    0,  109,   91,   79,    0,    0,    0,  516,  156,
-      161,   65,  166,  171,  176
+        0,    0,  517,  518,   34,  518,  511,    0,  494,   25,
+       26,   45,   25,   28,   24,  488,  499,   49,    0,   40,
+       43,  488,   51,   66,   67,  484,   35,  518,  518,   81,
+      505,   84,    0,  488,  518,    0,  496,  479,  494,  477,
+       75,  476,  479,  477,   46,  491,   70,  486,  473,  483,
+       55,  479,  483,  468,   69,  471,   86,   84,  469,  479,
+      466,  480,  466,  461,  477,  472,   75,  455,   81,  459,
+       87,   77,  470,  469,  467,  454,  454,  460,   96,  463,
+      455,  449,  448,  110,  468,  458,    0,  453,  446,  451,
+      450,  445,  454,  437,  438,  451,  435,  450,  432,  428,
+
+      431,  432,  435,  443,  426,    0,  425,  438,  437,  422,
+      417,  419,  429,  421,  422,  426,  414,  430,  425,  412,
+      426,  407,  408,  409,  421,  411,    0,  404,  411,  418,
+      416,  412,  410,  417,  395,  401,  414,  408,  394,  403,
+      399,  393,  389,  390,  388,  394,  396,  105,  385,  389,
+      401,  390,  391,  398,  387,  379,  381,  378,  375,  378,
+      372,  376,  389,  370,  365,  105,  383,    0,  381,  369,
+      365,    0,    0,  364,  365,  362,  360,  377,  363,  358,
+      105,  375,  374,  353,  357,  357,  351,    0,  368,  354,
+      349,  348,  354,  348,  345,  358,  348,  356,  358,  354,
+
+      349,  346,  351,    0,  337,  346,  352,    0,    0,  336,
+      122,  336,  347,  107,    0,  347,  333,    0,  330,  328,
+      338,  327,  338,  330,  329,  322,  319,  315,  332,    0,
+      332,  333,    0,    0,  329,  324,  331,  316,  316,    0,
+      116,  307,  309,  320,  324,  320,    0,  323,  320,  110,
+      320,  320,    0,  308,  318,    0,  318,  310,    0,  296,
+        0,  300,  309,  296,  293,  306,  306,    0,  135,  139,
+      295,  289,  292,  302,  290,  292,    0,  295,  297,  297,
+      278,  294,  297,    0,  295,  280,  278,    0,  279,    0,
+      272,  285,  269,  287,  272,  283,    0,  282,  281,  273,
+
+      267,  279,  263,  259,  261,  259,    0,  276,  258,    0,
+      257,  256,  260,  250,  271,  270,  267,  260,  272,  145,
+      271,  151,    0,  261,  243,    0,  242,    0,  261,  240,
+      260,  241,    0,  252,  239,  252,  238,  233,  249,  248,
+        0,  251,  249,  249,  236,  229,  242,  227,    0,  224,
+        0,  225,  224,  241,  226,  239,  220,  229,    0,  218,
+      217,  224,  219,  237,  215,    0,    0,  211,    0,  228,
+        0,  211,  205,    0,  218,    0,    0,    0,  214,  208,
+      213,    0,  222,    0,    0,  217,  206,  201,  202,  201,
+      215,  201,  201,  199,  208,  210,  209,  201,  190,  196,
+
+      194,  190,  190,  192,  198,    0,  200,  184,  186,  184,
+        0,    0,  186,  183,  190,  178,    0,  179,  173,  174,
+      172,  185,  188,  183,  173,    0,  185,  173,  166,    0,
+      169,  177,    0,  166,  162,  157,  159,  158,  161,    0,
+      157,    0,    0,  162,  167,  158,    0,    0,    0,    0,
+        0,  143,  152,  143,  141,    0,    0,  130,  124,  124,
+        0,    0,  107,   85,   80,    0,    0,    0,  518,  158,
+      163,   65,  168,  173,  178
     } ;
 
-static yyconst short int yy_def[476] =
+static yyconst flex_int16_t yy_def[476] =
     {   0,
       469,    1,  469,  469,  469,  469,  470,  471,  472,  473,
@@ -492 +568 @@
     } ;
 
-static yyconst short int yy_nxt[552] =
+static yyconst flex_int16_t yy_nxt[554] =
     {   0,
         4,    5,    6,    5,    7,    8,    4,    9,    9,   10,
@@ -502 +578 @@
        59,   45,   60,   65,  103,   46,   68,   66,   47,   34,
        61,   62,   48,   49,   70,   73,   71,   74,   76,   72,
-       77,  104,   30,   78,   30,   84,   90,  108,   85,   91,
-       98,   99,  111,   75,   79,  113,  123,  109,  126,  129,
-
-      124,  131,  132,  114,  139,  468,  112,   84,  127,  130,
-       85,  205,  225,  467,  206,  241,  269,  269,  242,  270,
-      140,  226,  243,  295,  227,  228,  141,  229,  207,  273,
-      304,  466,  274,  269,  269,  305,  319,  465,  321,  296,
-      321,  322,   36,  321,  321,  464,  321,  322,   36,  321,
-      321,  463,  321,  322,   36,  321,   31,   31,  462,   31,
-       31,   33,   33,  461,   33,   33,   36,  460,  459,   36,
-       36,  320,  320,  458,  320,  320,  321,  321,  457,  456,
-      321,  455,  454,  453,  452,  451,  450,  449,  448,  447,
-      446,  445,  444,  443,  442,  441,  440,  439,  438,  437,
-
-      436,  435,  434,  433,  432,  431,  430,  429,  428,  427,
-      426,  425,  424,  423,  422,  421,  420,  419,  418,  417,
-      416,  415,  414,  413,  412,  411,  410,  409,  408,  407,
-      406,  405,  404,  403,  402,  401,  400,  399,  398,  364,
-      397,  396,  395,  394,  393,  392,  391,  390,  389,  388,
-      387,  386,  385,  384,  383,  382,  381,  380,  379,  378,
-      377,  376,  375,  374,  373,  372,  371,  370,  369,  368,
-      367,  366,  365,  364,  364,  363,  362,  361,  360,  359,
-      358,  357,  356,  355,  354,  353,  352,  351,  350,  349,
-      348,  347,  346,  345,  344,  343,  342,  341,  340,  339,
-
-      338,  337,  336,  335,  334,  333,  332,  331,  330,  329,
-      328,  327,  326,  325,  324,  323,  318,  317,  316,  315,
-      314,  313,  312,  311,  310,  309,  308,  307,  306,  303,
-      302,  301,  300,  299,  298,  297,  294,  293,  292,  291,
-      290,  289,  288,  287,  286,  285,  284,  283,  282,  281,
-      280,  279,  278,  277,  276,  275,  272,  271,  268,  267,
-      266,  265,  264,  263,  262,  261,  260,  259,  258,  257,
-      256,  255,  254,  253,  252,  251,  250,  249,  248,  247,
-      246,  245,  244,  240,  239,  238,  237,  236,  235,  234,
-      233,  232,  231,  230,  224,  223,  222,  221,  220,  219,
-
-      218,  217,  216,  215,  214,  213,  212,  211,  210,  209,
-      208,  204,  203,  202,  201,  200,  199,  198,  197,  196,
-      195,  194,  193,  192,  191,  190,  189,  188,  187,  186,
-      185,  184,  183,  182,  181,  180,  179,  178,  177,  176,
-      175,  174,  173,  172,  171,  170,  169,  168,  167,  166,
-      165,  164,  163,  162,  161,  160,  159,  158,  157,  156,
-      155,  154,  153,  152,  151,  150,  149,  148,  147,  146,
-       32,  145,  144,  143,  142,  138,  137,  136,  135,  134,
-      133,  128,  125,  122,  121,  120,  119,  118,  117,  116,
-      115,  110,  107,  106,  105,  102,  101,  100,   97,   94,
-
-       93,   92,   89,   88,   87,   86,   35,   32,   80,   69,
-       58,   57,   35,   32,  469,    3,  469,  469,  469,  469,
+       77,  104,   30,   78,   30,   84,   84,   90,   85,  108,
+       91,   98,   99,   75,   79,  111,  113,  123,  126,  109,
+
+      129,  124,  131,  132,  114,  139,  468,  467,  127,  112,
+      130,   84,   84,  205,   85,  241,  206,  273,  242,  225,
+      274,  140,  243,  269,  269,  295,  270,  141,  226,  466,
+      207,  227,  228,  304,  229,  465,  269,  269,  305,  319,
+      321,  296,  321,  322,   36,  321,  321,  464,  321,  322,
+       36,  321,  321,  463,  321,  322,   36,  321,   31,   31,
+      462,   31,   31,   33,   33,  461,   33,   33,   36,  460,
+      459,   36,   36,  320,  320,  458,  320,  320,  321,  321,
+      457,  456,  321,  455,  454,  453,  452,  451,  450,  449,
+      448,  447,  446,  445,  444,  443,  442,  441,  440,  439,
+
+      438,  437,  436,  435,  434,  433,  432,  431,  430,  429,
+      428,  427,  426,  425,  424,  423,  422,  421,  420,  419,
+      418,  417,  416,  415,  414,  413,  412,  411,  410,  409,
+      408,  407,  406,  405,  404,  403,  402,  401,  400,  399,
+      398,  364,  397,  396,  395,  394,  393,  392,  391,  390,
+      389,  388,  387,  386,  385,  384,  383,  382,  381,  380,
+      379,  378,  377,  376,  375,  374,  373,  372,  371,  370,
+      369,  368,  367,  366,  365,  364,  364,  363,  362,  361,
+      360,  359,  358,  357,  356,  355,  354,  353,  352,  351,
+      350,  349,  348,  347,  346,  345,  344,  343,  342,  341,
+
+      340,  339,  338,  337,  336,  335,  334,  333,  332,  331,
+      330,  329,  328,  327,  326,  325,  324,  323,  318,  317,
+      316,  315,  314,  313,  312,  311,  310,  309,  308,  307,
+      306,  303,  302,  301,  300,  299,  298,  297,  294,  293,
+      292,  291,  290,  289,  288,  287,  286,  285,  284,  283,
+      282,  281,  280,  279,  278,  277,  276,  275,  272,  271,
+      268,  267,  266,  265,  264,  263,  262,  261,  260,  259,
+      258,  257,  256,  255,  254,  253,  252,  251,  250,  249,
+      248,  247,  246,  245,  244,  240,  239,  238,  237,  236,
+      235,  234,  233,  232,  231,  230,  224,  223,  222,  221,
+
+      220,  219,  218,  217,  216,  215,  214,  213,  212,  211,
+      210,  209,  208,  204,  203,  202,  201,  200,  199,  198,
+      197,  196,  195,  194,  193,  192,  191,  190,  189,  188,
+      187,  186,  185,  184,  183,  182,  181,  180,  179,  178,
+      177,  176,  175,  174,  173,  172,  171,  170,  169,  168,
+      167,  166,  165,  164,  163,  162,  161,  160,  159,  158,
+      157,  156,  155,  154,  153,  152,  151,  150,  149,  148,
+      147,  146,   32,  145,  144,  143,  142,  138,  137,  136,
+      135,  134,  133,  128,  125,  122,  121,  120,  119,  118,
+      117,  116,  115,  110,  107,  106,  105,  102,  101,  100,
+
+       97,   94,   93,   92,   89,   88,   87,   86,   35,   32,
+       80,   69,   58,   57,   35,   32,  469,    3,  469,  469,
       469,  469,  469,  469,  469,  469,  469,  469,  469,  469,
       469,  469,  469,  469,  469,  469,  469,  469,  469,  469,
       469,  469,  469,  469,  469,  469,  469,  469,  469,  469,
-      469
+      469,  469,  469
     } ;
 
-static yyconst short int yy_chk[552] =
+static yyconst flex_int16_t yy_chk[554] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -567 +643 @@
        18,   12,   18,   20,   51,   12,   21,   20,   12,  472,
        18,   18,   12,   12,   23,   24,   23,   24,   25,   23,
-       25,   51,   30,   25,   30,   32,   41,   55,   32,   41,
-       47,   47,   57,   24,   25,   58,   67,   55,   69,   71,
-
-       67,   72,   72,   58,   79,  465,   57,   84,   69,   71,
-       84,  148,  166,  464,  148,  181,  211,  211,  181,  211,
-       79,  166,  181,  241,  166,  166,   79,  166,  148,  214,
-      250,  463,  214,  269,  269,  250,  269,  460,  270,  241,
-      270,  270,  270,  270,  320,  459,  320,  320,  320,  320,
-      322,  458,  322,  322,  322,  322,  470,  470,  455,  470,
-      470,  471,  471,  454,  471,  471,  473,  453,  452,  473,
-      473,  474,  474,  446,  474,  474,  475,  475,  445,  444,
-      475,  441,  439,  438,  437,  436,  435,  434,  432,  431,
-      429,  428,  427,  425,  424,  423,  422,  421,  420,  419,
-
-      418,  416,  415,  414,  413,  410,  409,  408,  407,  405,
-      404,  403,  402,  401,  400,  399,  398,  397,  396,  395,
-      394,  393,  392,  391,  390,  389,  388,  387,  386,  383,
-      381,  380,  379,  375,  373,  372,  370,  368,  365,  364,
-      363,  362,  361,  360,  358,  357,  356,  355,  354,  353,
-      352,  350,  348,  347,  346,  345,  344,  343,  342,  340,
-      339,  338,  337,  336,  335,  334,  332,  331,  330,  329,
-      327,  325,  324,  321,  319,  318,  317,  316,  315,  314,
-      313,  312,  311,  309,  308,  306,  305,  304,  303,  302,
-      301,  300,  299,  298,  296,  295,  294,  293,  292,  291,
-
-      289,  287,  286,  285,  283,  282,  281,  280,  279,  278,
-      276,  275,  274,  273,  272,  271,  267,  266,  265,  264,
-      263,  262,  260,  258,  257,  255,  254,  252,  251,  249,
-      248,  246,  245,  244,  243,  242,  239,  238,  237,  236,
-      235,  232,  231,  229,  228,  227,  226,  225,  224,  223,
-      222,  221,  220,  219,  217,  216,  213,  212,  210,  207,
-      206,  205,  203,  202,  201,  200,  199,  198,  197,  196,
-      195,  194,  193,  192,  191,  190,  189,  187,  186,  185,
-      184,  183,  182,  180,  179,  178,  177,  176,  175,  174,
-      171,  170,  169,  167,  165,  164,  163,  162,  161,  160,
-
-      159,  158,  157,  156,  155,  154,  153,  152,  151,  150,
-      149,  147,  146,  145,  144,  143,  142,  141,  140,  139,
-      138,  137,  136,  135,  134,  133,  132,  131,  130,  129,
-      128,  126,  125,  124,  123,  122,  121,  120,  119,  118,
-      117,  116,  115,  114,  113,  112,  111,  110,  109,  108,
-      107,  105,  104,  103,  102,  101,  100,   99,   98,   97,
-       96,   95,   94,   93,   92,   91,   90,   89,   88,   86,
-       85,   83,   82,   81,   80,   78,   77,   76,   75,   74,
-       73,   70,   68,   66,   65,   64,   63,   62,   61,   60,
-       59,   56,   54,   53,   52,   50,   49,   48,   46,   44,
-
-       43,   42,   40,   39,   38,   37,   34,   31,   26,   22,
-       17,   16,    9,    7,    3,  469,  469,  469,  469,  469,
+       25,   51,   30,   25,   30,   32,   32,   41,   32,   55,
+       41,   47,   47,   24,   25,   57,   58,   67,   69,   55,
+
+       71,   67,   72,   72,   58,   79,  465,  464,   69,   57,
+       71,   84,   84,  148,   84,  181,  148,  214,  181,  166,
+      214,   79,  181,  211,  211,  241,  211,   79,  166,  463,
+      148,  166,  166,  250,  166,  460,  269,  269,  250,  269,
+      270,  241,  270,  270,  270,  270,  320,  459,  320,  320,
+      320,  320,  322,  458,  322,  322,  322,  322,  470,  470,
+      455,  470,  470,  471,  471,  454,  471,  471,  473,  453,
+      452,  473,  473,  474,  474,  446,  474,  474,  475,  475,
+      445,  444,  475,  441,  439,  438,  437,  436,  435,  434,
+      432,  431,  429,  428,  427,  425,  424,  423,  422,  421,
+
+      420,  419,  418,  416,  415,  414,  413,  410,  409,  408,
+      407,  405,  404,  403,  402,  401,  400,  399,  398,  397,
+      396,  395,  394,  393,  392,  391,  390,  389,  388,  387,
+      386,  383,  381,  380,  379,  375,  373,  372,  370,  368,
+      365,  364,  363,  362,  361,  360,  358,  357,  356,  355,
+      354,  353,  352,  350,  348,  347,  346,  345,  344,  343,
+      342,  340,  339,  338,  337,  336,  335,  334,  332,  331,
+      330,  329,  327,  325,  324,  321,  319,  318,  317,  316,
+      315,  314,  313,  312,  311,  309,  308,  306,  305,  304,
+      303,  302,  301,  300,  299,  298,  296,  295,  294,  293,
+
+      292,  291,  289,  287,  286,  285,  283,  282,  281,  280,
+      279,  278,  276,  275,  274,  273,  272,  271,  267,  266,
+      265,  264,  263,  262,  260,  258,  257,  255,  254,  252,
+      251,  249,  248,  246,  245,  244,  243,  242,  239,  238,
+      237,  236,  235,  232,  231,  229,  228,  227,  226,  225,
+      224,  223,  222,  221,  220,  219,  217,  216,  213,  212,
+      210,  207,  206,  205,  203,  202,  201,  200,  199,  198,
+      197,  196,  195,  194,  193,  192,  191,  190,  189,  187,
+      186,  185,  184,  183,  182,  180,  179,  178,  177,  176,
+      175,  174,  171,  170,  169,  167,  165,  164,  163,  162,
+
+      161,  160,  159,  158,  157,  156,  155,  154,  153,  152,
+      151,  150,  149,  147,  146,  145,  144,  143,  142,  141,
+      140,  139,  138,  137,  136,  135,  134,  133,  132,  131,
+      130,  129,  128,  126,  125,  124,  123,  122,  121,  120,
+      119,  118,  117,  116,  115,  114,  113,  112,  111,  110,
+      109,  108,  107,  105,  104,  103,  102,  101,  100,   99,
+       98,   97,   96,   95,   94,   93,   92,   91,   90,   89,
+       88,   86,   85,   83,   82,   81,   80,   78,   77,   76,
+       75,   74,   73,   70,   68,   66,   65,   64,   63,   62,
+       61,   60,   59,   56,   54,   53,   52,   50,   49,   48,
+
+       46,   44,   43,   42,   40,   39,   38,   37,   34,   31,
+       26,   22,   17,   16,    9,    7,    3,  469,  469,  469,
       469,  469,  469,  469,  469,  469,  469,  469,  469,  469,
       469,  469,  469,  469,  469,  469,  469,  469,  469,  469,
       469,  469,  469,  469,  469,  469,  469,  469,  469,  469,
-      469
+      469,  469,  469
     } ;
 
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
+
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
 
 /* The intent behind this definition is that it'll catch
@@ -634 +713 @@
 char *yytext;
 #line 1 "rclex.l"
-#define INITIAL 0
 #line 2 "rclex.l"
-/* Copyright 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
 
@@ -663 +741 @@
 #include "bucomm.h"
 #include "libiberty.h"
+#include "safe-ctype.h"
 #include "windres.h"
 #include "rcparse.h"
 
-#include <ctype.h>
 #include <assert.h>
 
@@ -707 +785 @@
 static char *get_string PARAMS ((int));
 
-#line 710 "lex.yy.c"
+#line 788 "lex.yy.c"
+
+#define INITIAL 0
+
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
 
 /* Macros after this point can all be overridden by user definitions in
@@ -715 +805 @@
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
+extern "C" int yywrap (void );
 #else
-extern int yywrap YY_PROTO(( void ));
-#endif
-#endif
-
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
+extern int yywrap (void );
+#endif
+#endif
+
+    static void yyunput (int c,char *buf_ptr  );
+    
 #ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
+static int yy_flex_strlen (yyconst char * );
 #endif
 
 #ifndef YY_NO_INPUT
+
 #ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
+static int yyinput (void );
 #else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
+static int input (void );
+#endif
+
 #endif
 
@@ -782 +837 @@
 
 /* Copy whatever the last rule matched to the standard output. */
-
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
@@ -795 +849 @@
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-        if ( yy_current_buffer->yy_is_interactive ) \
+        if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
                 { \
-                int c = '*', n; \
+                int c = '*'; \
+                size_t n; \
                 for ( n = 0; n < max_size && \
                              (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
@@ -807 +862 @@
                 result = n; \
                 } \
-        else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-                  && ferror( yyin ) ) \
-                YY_FATAL_ERROR( "input in flex scanner failed" );
+        else \
+                { \
+                errno=0; \
+                while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+                        { \
+                        if( errno != EINTR) \
+                                { \
+                                YY_FATAL_ERROR( "input in flex scanner failed" ); \
+                                break; \
+                                } \
+                        errno=0; \
+                        clearerr(yyin); \
+                        } \
+                }\
+\
+
 #endif
 
@@ -830 +898 @@
 #endif
 
+/* end tables serialization structures and prototypes */
+
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (void);
+
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
@@ -852 +926 @@
         YY_USER_ACTION
 
+/** The main scanner function which does all the work.
+ */
 YY_DECL
-        {
+{
         register yy_state_type yy_current_state;
         register char *yy_cp, *yy_bp;
         register int yy_act;
-
+    
 #line 75 "rclex.l"
 
 
-#line 864 "lex.yy.c"
-
-        if ( yy_init )
+#line 940 "lex.yy.c"
+
+        if ( (yy_init) )
                 {
-                yy_init = 0;
+                (yy_init) = 0;
 
 #ifdef YY_USER_INIT
@@ -871 +947 @@
 #endif
 
-                if ( ! yy_start )
-                        yy_start = 1;   /* first start state */
+                if ( ! (yy_start) )
+                        (yy_start) = 1; /* first start state */
 
                 if ( ! yyin )
@@ -880 +956 @@
                         yyout = stdout;
 
-                if ( ! yy_current_buffer )
-                        yy_current_buffer =
-                                yy_create_buffer( yyin, YY_BUF_SIZE );
-
-                yy_load_buffer_state();
+                if ( ! YY_CURRENT_BUFFER ) {
+                        yyensure_buffer_stack ();
+                        YY_CURRENT_BUFFER_LVALUE =
+                                yy_create_buffer(yyin,YY_BUF_SIZE );
+                }
+
+                yy_load_buffer_state( );
                 }
 
         while ( 1 )             /* loops until end-of-file is reached */
                 {
-                yy_cp = yy_c_buf_p;
+                yy_cp = (yy_c_buf_p);
 
                 /* Support of yytext. */
-                *yy_cp = yy_hold_char;
+                *yy_cp = (yy_hold_char);
 
                 /* yy_bp points to the position in yy_ch_buf of the start of
@@ -899 +977 @@
                 yy_bp = yy_cp;
 
-                yy_current_state = yy_start;
+                yy_current_state = (yy_start);
 yy_match:
                 do
@@ -906 +984 @@
                         if ( yy_accept[yy_current_state] )
                                 {
-                                yy_last_accepting_state = yy_current_state;
-                                yy_last_accepting_cpos = yy_cp;
+                                (yy_last_accepting_state) = yy_current_state;
+                                (yy_last_accepting_cpos) = yy_cp;
                                 }
                         while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
@@ -918 +996 @@
                         ++yy_cp;
                         }
-                while ( yy_base[yy_current_state] != 516 );
+                while ( yy_base[yy_current_state] != 518 );
 
 yy_find_action:
@@ -924 +1002 @@
                 if ( yy_act == 0 )
                         { /* have to back up */
-                        yy_cp = yy_last_accepting_cpos;
-                        yy_current_state = yy_last_accepting_state;
+                        yy_cp = (yy_last_accepting_cpos);
+                        yy_current_state = (yy_last_accepting_state);
                         yy_act = yy_accept[yy_current_state];
                         }
@@ -931 +1009 @@
                 YY_DO_BEFORE_ACTION;
 
-
 do_action:      /* This label is used only to access EOF actions. */
-
 
                 switch ( yy_act )
@@ -939 +1015 @@
                         case 0: /* must back up */
                         /* undo the effects of YY_DO_BEFORE_ACTION */
-                        *yy_cp = yy_hold_char;
-                        yy_cp = yy_last_accepting_cpos;
-                        yy_current_state = yy_last_accepting_state;
+                        *yy_cp = (yy_hold_char);
+                        yy_cp = (yy_last_accepting_cpos);
+                        yy_current_state = (yy_last_accepting_state);
                         goto yy_find_action;
 
@@ -1325 +1401 @@
         YY_BREAK
 case 77:
+/* rule 77 can match eol */
 YY_RULE_SETUP
 #line 154 "rclex.l"
@@ -1382 +1459 @@
         YY_BREAK
 case 81:
+/* rule 81 can match eol */
 YY_RULE_SETUP
 #line 199 "rclex.l"
@@ -1421 +1499 @@
         YY_BREAK
 case 83:
+/* rule 83 can match eol */
 YY_RULE_SETUP
 #line 232 "rclex.l"
@@ -1440 +1519 @@
 ECHO;
         YY_BREAK
-#line 1443 "lex.yy.c"
+#line 1522 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
         yyterminate();
@@ -1447 +1526 @@
                 {
                 /* Amount of text matched not including the EOB char. */
-                int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
+                int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
 
                 /* Undo the effects of YY_DO_BEFORE_ACTION. */
-                *yy_cp = yy_hold_char;
+                *yy_cp = (yy_hold_char);
                 YY_RESTORE_YY_MORE_OFFSET
 
-                if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
+                if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
                         {
                         /* We're scanning a new file or input source.  It's
@@ -1459 +1538 @@
                          * just pointed yyin at a new source and called
                          * yylex().  If so, then we have to assure
-                         * consistency between yy_current_buffer and our
+                         * consistency between YY_CURRENT_BUFFER and our
                          * globals.  Here is the right place to do so, because
                          * this is the first action (other than possibly a
                          * back-up) that will match for the new input source.
                          */
-                        yy_n_chars = yy_current_buffer->yy_n_chars;
-                        yy_current_buffer->yy_input_file = yyin;
-                        yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
+                        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+                        YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
                         }
 
@@ -1476 +1555 @@
                  * in input().
                  */
-                if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+                if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
                         { /* This was really a NUL. */
                         yy_state_type yy_next_state;
 
-                        yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-                        yy_current_state = yy_get_previous_state();
+                        (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+                        yy_current_state = yy_get_previous_state(  );
 
                         /* Okay, we're now positioned to make the NUL
@@ -1495 +1574 @@
                         yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-                        yy_bp = yytext_ptr + YY_MORE_ADJ;
+                        yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 
                         if ( yy_next_state )
                                 {
                                 /* Consume the NUL. */
-                                yy_cp = ++yy_c_buf_p;
+                                yy_cp = ++(yy_c_buf_p);
                                 yy_current_state = yy_next_state;
                                 goto yy_match;
@@ -1507 +1586 @@
                         else
                                 {
-                                yy_cp = yy_c_buf_p;
+                                yy_cp = (yy_c_buf_p);
                                 goto yy_find_action;
                                 }
                         }
 
-                else switch ( yy_get_next_buffer() )
+                else switch ( yy_get_next_buffer(  ) )
                         {
                         case EOB_ACT_END_OF_FILE:
                                 {
-                                yy_did_buffer_switch_on_eof = 0;
-
-                                if ( yywrap() )
+                                (yy_did_buffer_switch_on_eof) = 0;
+
+                                if ( yywrap( ) )
                                         {
                                         /* Note: because we've taken care in
@@ -1529 +1608 @@
                                          * YY_NULL will get returned.
                                          */
-                                        yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+                                        (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
 
                                         yy_act = YY_STATE_EOF(YY_START);
@@ -1537 +1616 @@
                                 else
                                         {
-                                        if ( ! yy_did_buffer_switch_on_eof )
+                                        if ( ! (yy_did_buffer_switch_on_eof) )
                                                 YY_NEW_FILE;
                                         }
@@ -1544 +1623 @@
 
                         case EOB_ACT_CONTINUE_SCAN:
-                                yy_c_buf_p =
-                                        yytext_ptr + yy_amount_of_matched_text;
-
-                                yy_current_state = yy_get_previous_state();
-
-                                yy_cp = yy_c_buf_p;
-                                yy_bp = yytext_ptr + YY_MORE_ADJ;
+                                (yy_c_buf_p) =
+                                        (yytext_ptr) + yy_amount_of_matched_text;
+
+                                yy_current_state = yy_get_previous_state(  );
+
+                                yy_cp = (yy_c_buf_p);
+                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
                                 goto yy_match;
 
                         case EOB_ACT_LAST_MATCH:
-                                yy_c_buf_p =
-                                &yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-                                yy_current_state = yy_get_previous_state();
-
-                                yy_cp = yy_c_buf_p;
-                                yy_bp = yytext_ptr + YY_MORE_ADJ;
+                                (yy_c_buf_p) =
+                                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+                                yy_current_state = yy_get_previous_state(  );
+
+                                yy_cp = (yy_c_buf_p);
+                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
                                 goto yy_find_action;
                         }
@@ -1571 +1650 @@
         } /* end of action switch */
                 } /* end of scanning one token */
-        } /* end of yylex */
-
+} /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -1581 +1659 @@
  *      EOB_ACT_END_OF_FILE - end of file
  */
-
-static int yy_get_next_buffer()
-        {
-        register char *dest = yy_current_buffer->yy_ch_buf;
-        register char *source = yytext_ptr;
+static int yy_get_next_buffer (void)
+{
+        register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+        register char *source = (yytext_ptr);
         register int number_to_move, i;
         int ret_val;
 
-        if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+        if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
                 YY_FATAL_ERROR(
                 "fatal flex scanner internal error--end of buffer missed" );
 
-        if ( yy_current_buffer->yy_fill_buffer == 0 )
+        if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
                 { /* Don't try to fill the buffer, so this is an EOF. */
-                if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
+                if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
                         {
                         /* We matched a single character, the EOB, so
@@ -1615 +1692 @@
 
         /* First move last chars to start of buffer. */
-        number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
+        number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
         for ( i = 0; i < number_to_move; ++i )
                 *(dest++) = *(source++);
 
-        if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+        if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
                 /* don't do the read, it's not guaranteed to return an EOF,
                  * just force an EOF
                  */
-                yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
 
         else
                 {
-                int num_to_read =
-                        yy_current_buffer->yy_buf_size - number_to_move - 1;
+                        size_t num_to_read =
+                        YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
                 while ( num_to_read <= 0 )
                         { /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-                        YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
 
                         /* just a shorter name for the current buffer */
-                        YY_BUFFER_STATE b = yy_current_buffer;
+                        YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
 
                         int yy_c_buf_p_offset =
-                                (int) (yy_c_buf_p - b->yy_ch_buf);
+                                (int) ((yy_c_buf_p) - b->yy_ch_buf);
 
                         if ( b->yy_is_our_buffer )
@@ -1655 +1728 @@
                                 b->yy_ch_buf = (char *)
                                         /* Include room in for 2 EOB chars. */
-                                        yy_flex_realloc( (void *) b->yy_ch_buf,
-                                                         b->yy_buf_size + 2 );
+                                        yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
                                 }
                         else
@@ -1666 +1738 @@
                                 "fatal error - scanner input buffer overflow" );
 
-                        yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-                        num_to_read = yy_current_buffer->yy_buf_size -
+                        (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+                        num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
                                                 number_to_move - 1;
-#endif
+
                         }
 
@@ -1677 +1749 @@
 
                 /* Read in more data. */
-                YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-                        yy_n_chars, num_to_read );
-
-                yy_current_buffer->yy_n_chars = yy_n_chars;
+                YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+                        (yy_n_chars), num_to_read );
+
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
                 }
 
-        if ( yy_n_chars == 0 )
+        if ( (yy_n_chars) == 0 )
                 {
                 if ( number_to_move == YY_MORE_ADJ )
                         {
                         ret_val = EOB_ACT_END_OF_FILE;
-                        yyrestart( yyin );
+                        yyrestart(yyin  );
                         }
 
@@ -1694 +1766 @@
                         {
                         ret_val = EOB_ACT_LAST_MATCH;
-                        yy_current_buffer->yy_buffer_status =
+                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
                                 YY_BUFFER_EOF_PENDING;
                         }
@@ -1702 +1774 @@
                 ret_val = EOB_ACT_CONTINUE_SCAN;
 
-        yy_n_chars += number_to_move;
-        yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-        yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-        yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
+        (yy_n_chars) += number_to_move;
+        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+        (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
 
         return ret_val;
-        }
-
+}
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-static yy_state_type yy_get_previous_state()
-        {
+    static yy_state_type yy_get_previous_state (void)
+{
         register yy_state_type yy_current_state;
         register char *yy_cp;
-
-        yy_current_state = yy_start;
-
-        for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+    
+        yy_current_state = (yy_start);
+
+        for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
                 {
                 register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
                 if ( yy_accept[yy_current_state] )
                         {
-                        yy_last_accepting_state = yy_current_state;
-                        yy_last_accepting_cpos = yy_cp;
+                        (yy_last_accepting_state) = yy_current_state;
+                        (yy_last_accepting_cpos) = yy_cp;
                         }
                 while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
@@ -1739 +1810 @@
 
         return yy_current_state;
-        }
-
+}
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
@@ -1747 +1817 @@
  *      next_state = yy_try_NUL_trans( current_state );
  */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-        {
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
         register int yy_is_jam;
-        register char *yy_cp = yy_c_buf_p;
+        register char *yy_cp = (yy_c_buf_p);
 
         register YY_CHAR yy_c = 1;
         if ( yy_accept[yy_current_state] )
                 {
-                yy_last_accepting_state = yy_current_state;
-                yy_last_accepting_cpos = yy_cp;
+                (yy_last_accepting_state) = yy_current_state;
+                (yy_last_accepting_cpos) = yy_cp;
                 }
         while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
@@ -1774 +1838 @@
 
         return yy_is_jam ? 0 : yy_current_state;
-        }
-
-
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-        {
-        register char *yy_cp = yy_c_buf_p;
+}
+
+    static void yyunput (int c, register char * yy_bp )
+{
+        register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
 
         /* undo effects of setting up yytext */
-        *yy_cp = yy_hold_char;
-
-        if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+        *yy_cp = (yy_hold_char);
+
+        if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
                 { /* need to shift things up to make room */
                 /* +2 for EOB chars. */
-                register int number_to_move = yy_n_chars + 2;
-                register char *dest = &yy_current_buffer->yy_ch_buf[
-                                        yy_current_buffer->yy_buf_size + 2];
+                register int number_to_move = (yy_n_chars) + 2;
+                register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+                                        YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
                 register char *source =
-                                &yy_current_buffer->yy_ch_buf[number_to_move];
-
-                while ( source > yy_current_buffer->yy_ch_buf )
+                                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+                while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
                         *--dest = *--source;
 
                 yy_cp += (int) (dest - source);
                 yy_bp += (int) (dest - source);
-                yy_current_buffer->yy_n_chars =
-                        yy_n_chars = yy_current_buffer->yy_buf_size;
-
-                if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+                        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+                if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
                         YY_FATAL_ERROR( "flex scanner push-back overflow" );
                 }
@@ -1814 +1872 @@
         *--yy_cp = (char) c;
 
-
-        yytext_ptr = yy_bp;
-        yy_hold_char = *yy_cp;
-        yy_c_buf_p = yy_cp;
-        }
-#endif  /* ifndef YY_NO_UNPUT */
-
-
+        (yytext_ptr) = yy_bp;
+        (yy_hold_char) = *yy_cp;
+        (yy_c_buf_p) = yy_cp;
+}
+
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput()
+    static int yyinput (void)
 #else
-static int input()
-#endif
-        {
+    static int input  (void)
+#endif
+
+{
         int c;
-
-        *yy_c_buf_p = yy_hold_char;
-
-        if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+    
+        *(yy_c_buf_p) = (yy_hold_char);
+
+        if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
                 {
                 /* yy_c_buf_p now points to the character we want to return.
@@ -1838 +1895 @@
                  * valid NUL; if not, then we've hit the end of the buffer.
                  */
-                if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+                if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
                         /* This was really a NUL. */
-                        *yy_c_buf_p = '\0';
+                        *(yy_c_buf_p) = '\0';
 
                 else
                         { /* need more input */
-                        int offset = yy_c_buf_p - yytext_ptr;
-                        ++yy_c_buf_p;
-
-                        switch ( yy_get_next_buffer() )
+                        int offset = (yy_c_buf_p) - (yytext_ptr);
+                        ++(yy_c_buf_p);
+
+                        switch ( yy_get_next_buffer(  ) )
                                 {
                                 case EOB_ACT_LAST_MATCH:
@@ -1861 +1918 @@
 
                                         /* Reset buffer status. */
-                                        yyrestart( yyin );
-
-                                        /* fall through */
+                                        yyrestart(yyin );
+
+                                        /*FALLTHROUGH*/
 
                                 case EOB_ACT_END_OF_FILE:
                                         {
-                                        if ( yywrap() )
+                                        if ( yywrap( ) )
                                                 return EOF;
 
-                                        if ( ! yy_did_buffer_switch_on_eof )
+                                        if ( ! (yy_did_buffer_switch_on_eof) )
                                                 YY_NEW_FILE;
 #ifdef __cplusplus
@@ -1880 +1937 @@
 
                                 case EOB_ACT_CONTINUE_SCAN:
-                                        yy_c_buf_p = yytext_ptr + offset;
+                                        (yy_c_buf_p) = (yytext_ptr) + offset;
                                         break;
                                 }
@@ -1886 +1943 @@
                 }
 
-        c = *(unsigned char *) yy_c_buf_p;      /* cast for 8-bit char's */
-        *yy_c_buf_p = '\0';     /* preserve yytext */
-        yy_hold_char = *++yy_c_buf_p;
-
+        c = *(unsigned char *) (yy_c_buf_p);    /* cast for 8-bit char's */
+        *(yy_c_buf_p) = '\0';   /* preserve yytext */
+        (yy_hold_char) = *++(yy_c_buf_p);
 
         return c;
+}
+#endif  /* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    
+        if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+                YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE );
         }
 
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-        {
-        if ( ! yy_current_buffer )
-                yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-        yy_init_buffer( yy_current_buffer, input_file );
-        yy_load_buffer_state();
-        }
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-        {
-        if ( yy_current_buffer == new_buffer )
+        yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+        yy_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+        /* TODO. We should be able to replace this entire function body
+         * with
+         *              yypop_buffer_state();
+         *              yypush_buffer_state(new_buffer);
+     */
+        yyensure_buffer_stack ();
+        if ( YY_CURRENT_BUFFER == new_buffer )
                 return;
 
-        if ( yy_current_buffer )
+        if ( YY_CURRENT_BUFFER )
                 {
                 /* Flush out information for old buffer. */
-                *yy_c_buf_p = yy_hold_char;
-                yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-                yy_current_buffer->yy_n_chars = yy_n_chars;
+                *(yy_c_buf_p) = (yy_hold_char);
+                YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
                 }
 
-        yy_current_buffer = new_buffer;
-        yy_load_buffer_state();
+        YY_CURRENT_BUFFER_LVALUE = new_buffer;
+        yy_load_buffer_state( );
 
         /* We don't actually know whether we did this switch during
@@ -1936 +2001 @@
          * to go ahead and always set it.
          */
-        yy_did_buffer_switch_on_eof = 1;
-        }
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-        {
-        yy_n_chars = yy_current_buffer->yy_n_chars;
-        yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-        yyin = yy_current_buffer->yy_input_file;
-        yy_hold_char = *yy_c_buf_p;
-        }
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-        {
+        (yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void yy_load_buffer_state  (void)
+{
+        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+        (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+        yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+        (yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
         YY_BUFFER_STATE b;
-
-        b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+    
+        b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
         if ( ! b )
                 YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@@ -1972 +2031 @@
          * we need to put in 2 end-of-buffer characters.
          */
-        b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
+        b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
         if ( ! b->yy_ch_buf )
                 YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
@@ -1978 +2037 @@
         b->yy_is_our_buffer = 1;
 
-        yy_init_buffer( b, file );
+        yy_init_buffer(b,file );
 
         return b;
-        }
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-        {
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * 
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
         if ( ! b )
                 return;
 
-        if ( b == yy_current_buffer )
-                yy_current_buffer = (YY_BUFFER_STATE) 0;
+        if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+                YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
         if ( b->yy_is_our_buffer )
-                yy_flex_free( (void *) b->yy_ch_buf );
-
-        yy_flex_free( (void *) b );
-        }
-
-
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
-        {
-        yy_flush_buffer( b );
+                yyfree((void *) b->yy_ch_buf  );
+
+        yyfree((void *) b  );
+}
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+        int oerrno = errno;
+    
+        yy_flush_buffer(b );
 
         b->yy_input_file = file;
         b->yy_fill_buffer = 1;
 
-#if YY_ALWAYS_INTERACTIVE
-        b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-        b->yy_is_interactive = 0;
-#else
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-        }
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
-        {
-        if ( ! b )
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+        errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+        if ( ! b )
                 return;
 
@@ -2062 +2116 @@
         b->yy_buffer_status = YY_BUFFER_NEW;
 
-        if ( b == yy_current_buffer )
-                yy_load_buffer_state();
+        if ( b == YY_CURRENT_BUFFER )
+                yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+        if (new_buffer == NULL)
+                return;
+
+        yyensure_buffer_stack();
+
+        /* This block is copied from yy_switch_to_buffer. */
+        if ( YY_CURRENT_BUFFER )
+                {
+                /* Flush out information for old buffer. */
+                *(yy_c_buf_p) = (yy_hold_char);
+                YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+                }
+
+        /* Only push if top exists. Otherwise, replace top. */
+        if (YY_CURRENT_BUFFER)
+                (yy_buffer_stack_top)++;
+        YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+        /* copied from yy_switch_to_buffer. */
+        yy_load_buffer_state( );
+        (yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yypop_buffer_state (void)
+{
+        if (!YY_CURRENT_BUFFER)
+                return;
+
+        yy_delete_buffer(YY_CURRENT_BUFFER );
+        YY_CURRENT_BUFFER_LVALUE = NULL;
+        if ((yy_buffer_stack_top) > 0)
+                --(yy_buffer_stack_top);
+
+        if (YY_CURRENT_BUFFER) {
+                yy_load_buffer_state( );
+                (yy_did_buffer_switch_on_eof) = 1;
         }
-
-
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-        {
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+        int num_to_alloc;
+    
+        if (!(yy_buffer_stack)) {
+
+                /* First allocation is just for 2 elements, since we don't know if this
+                 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+                 * immediate realloc on the next call.
+         */
+                num_to_alloc = 1;
+                (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+                                                                (num_to_alloc * sizeof(struct yy_buffer_state*)
+                                                                );
+                
+                memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+                                
+                (yy_buffer_stack_max) = num_to_alloc;
+                (yy_buffer_stack_top) = 0;
+                return;
+        }
+
+        if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+                /* Increase the buffer to prepare for a possible push. */
+                int grow_size = 8 /* arbitrary grow size */;
+
+                num_to_alloc = (yy_buffer_stack_max) + grow_size;
+                (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+                                                                ((yy_buffer_stack),
+                                                                num_to_alloc * sizeof(struct yy_buffer_state*)
+                                                                );
+
+                /* zero only the new slots.*/
+                memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+                (yy_buffer_stack_max) = num_to_alloc;
+        }
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
         YY_BUFFER_STATE b;
-
+    
         if ( size < 2 ||
              base[size-2] != YY_END_OF_BUFFER_CHAR ||
@@ -2084 +2230 @@
                 return 0;
 
-        b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+        b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
         if ( ! b )
                 YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
@@ -2098 +2244 @@
         b->yy_buffer_status = YY_BUFFER_NEW;
 
-        yy_switch_to_buffer( b );
+        yy_switch_to_buffer(b  );
 
         return b;
-        }
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-        {
-        int len;
-        for ( len = 0; yy_str[len]; ++len )
-                ;
-
-        return yy_scan_bytes( yy_str, len );
-        }
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-        {
+}
+
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param str a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * str )
+{
+    
+        return yy_scan_bytes(str,strlen(str) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
+{
         YY_BUFFER_STATE b;
         char *buf;
         yy_size_t n;
         int i;
-
+    
         /* Get memory for full buffer, including space for trailing EOB's. */
         n = len + 2;
-        buf = (char *) yy_flex_alloc( n );
+        buf = (char *) yyalloc(n  );
         if ( ! buf )
                 YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
@@ -2147 +2288 @@
         buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
 
-        b = yy_scan_buffer( buf, n );
+        b = yy_scan_buffer(buf,n );
         if ( ! b )
                 YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
@@ -2157 +2298 @@
 
         return b;
-        }
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-        {
-        if ( yy_start_stack_ptr >= yy_start_stack_depth )
-                {
-                yy_size_t new_size;
-
-                yy_start_stack_depth += YY_START_STACK_INCR;
-                new_size = yy_start_stack_depth * sizeof( int );
-
-                if ( ! yy_start_stack )
-                        yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-                else
-                        yy_start_stack = (int *) yy_flex_realloc(
-                                        (void *) yy_start_stack, new_size );
-
-                if ( ! yy_start_stack )
-                        YY_FATAL_ERROR(
-                        "out of memory expanding start-condition stack" );
-                }
-
-        yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-        BEGIN(new_state);
-        }
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-        {
-        if ( --yy_start_stack_ptr < 0 )
-                YY_FATAL_ERROR( "start-condition stack underflow" );
-
-        BEGIN(yy_start_stack[yy_start_stack_ptr]);
-        }
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-        {
-        return yy_start_stack[yy_start_stack_ptr - 1];
-        }
-#endif
+}
 
 #ifndef YY_EXIT_FAILURE
@@ -2217 +2304 @@
 #endif
 
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-        {
-        (void) fprintf( stderr, "%s\n", msg );
+static void yy_fatal_error (yyconst char* msg )
+{
+        (void) fprintf( stderr, "%s\n", msg );
         exit( YY_EXIT_FAILURE );
-        }
-
-
+}
 
 /* Redefine yyless() so it works in section 3 code. */
@@ -2237 +2317 @@
                 { \
                 /* Undo effects of setting up yytext. */ \
-                yytext[yyleng] = yy_hold_char; \
-                yy_c_buf_p = yytext + n; \
-                yy_hold_char = *yy_c_buf_p; \
-                *yy_c_buf_p = '\0'; \
-                yyleng = n; \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+                yytext[yyleng] = (yy_hold_char); \
+                (yy_c_buf_p) = yytext + yyless_macro_arg; \
+                (yy_hold_char) = *(yy_c_buf_p); \
+                *(yy_c_buf_p) = '\0'; \
+                yyleng = yyless_macro_arg; \
                 } \
         while ( 0 )
 
-
-/* Internal utility routines. */
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int yyget_lineno  (void)
+{
+        
+    return yylineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+int yyget_leng  (void)
+{
+        return yyleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *yyget_text  (void)
+{
+        return yytext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void yyset_lineno (int  line_number )
+{
+    
+    yylineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  in_str )
+{
+        yyin = in_str ;
+}
+
+void yyset_out (FILE *  out_str )
+{
+        yyout = out_str ;
+}
+
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
+
+void yyset_debug (int  bdebug )
+{
+        yy_flex_debug = bdebug ;
+}
+
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+        while(YY_CURRENT_BUFFER){
+                yy_delete_buffer(YY_CURRENT_BUFFER  );
+                YY_CURRENT_BUFFER_LVALUE = NULL;
+                yypop_buffer_state();
+        }
+
+        /* Destroy the stack itself. */
+        yyfree((yy_buffer_stack) );
+        (yy_buffer_stack) = NULL;
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
 
 #ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-        {
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
         register int i;
-        for ( i = 0; i < n; ++i )
+        for ( i = 0; i < n; ++i )
                 s1[i] = s2[i];
-        }
+}
 #endif
 
 #ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-        {
+static int yy_flex_strlen (yyconst char * s )
+{
         register int n;
-        for ( n = 0; s[n]; ++n )
+        for ( n = 0; s[n]; ++n )
                 ;
 
         return n;
-        }
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-        {
+}
+#endif
+
+void *yyalloc (yy_size_t  size )
+{
         return (void *) malloc( size );
-        }
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-        {
+}
+
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
         /* The cast to (char *) in the following accommodates both
          * implementations that use char* generic pointers, and those
@@ -2307 +2464 @@
          */
         return (void *) realloc( (char *) ptr, size );
-        }
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-        {
-        free( ptr );
-        }
-
-#if YY_MAIN
-int main()
-        {
-        yylex();
-        return 0;
-        }
+}
+
+void yyfree (void * ptr )
+{
+        free( (char *) ptr );   /* see yyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#undef YY_NEW_FILE
+#undef YY_FLUSH_BUFFER
+#undef yy_set_bol
+#undef yy_new_buffer
+#undef yy_set_interactive
+#undef yytext_ptr
+#undef YY_DO_BEFORE_ACTION
+
+#ifdef YY_DECL_IS_OURS
+#undef YY_DECL_IS_OURS
+#undef YY_DECL
 #endif
 #line 236 "rclex.l"
+
 
 #ifndef yywrap
@@ -2346 +2506 @@
 
   ++s;
-  while (isspace ((unsigned char) *s))
+  while (ISSPACE (*s))
     ++s;
   
   line = strtol (s, &send, 0);
-  if (*send != '\0' && ! isspace ((unsigned char) *send))
+  if (*send != '\0' && ! ISSPACE (*send))
     return;
 
@@ -2357 +2517 @@
 
   s = send;
-  while (isspace ((unsigned char) *s))
+  while (ISSPACE (*s))
     ++s;
 
@@ -2378 +2538 @@
     {
       initial_fn = xmalloc (strlen (fn) + 1);
-      strcpy(initial_fn, fn);
+      strcpy (initial_fn, fn);
     }
 
   /* Allow the initial file, regardless of name.  Suppress all other
-     files if they end in ".h" (this allows included "*.rc") */
+     files if they end in ".h" (this allows included "*.rc").  */
   if (strcmp (initial_fn, fn) == 0
       || strcmp (fn + strlen (fn) - 2, ".h") != 0)
@@ -2425 +2585 @@
 
             case 'a':
-              *s++ = ESCAPE_A;
+              *s++ = ESCAPE_B; /* Strange, but true...  */
               ++t;
               break;
@@ -2488 +2648 @@
                     ch = (ch << 4) | (*t - '0');
                   else if (*t >= 'a' && *t <= 'f')
-                    ch = (ch << 4) | (*t - 'a');
+                    ch = (ch << 4) | (*t - 'a' + 10);
                   else if (*t >= 'A' && *t <= 'F')
-                    ch = (ch << 4) | (*t - 'A');
+                    ch = (ch << 4) | (*t - 'A' + 10);
                   else
                     break;
@@ -2517 +2677 @@
         {
           ++t;
-          assert (isspace ((unsigned char) *t));
-          while (isspace ((unsigned char) *t))
-            ++t;
+          assert (ISSPACE (*t));
+          while (ISSPACE (*t))
+            {
+              if ((*t) == '\n')
+                ++rc_lineno;
+              ++t;
+            }
           if (*t == '\0')
             break;
@@ -2546 +2710 @@
 
   as->next = strings;
-  strings = as->next;
+  strings = as;
 
   return as->s;
@@ -2588 +2752 @@
   rcdata_mode = 0;
 }
+