develooper Front page | perl.cvs.parrot | Postings from December 2008

[svn:parrot] r34444 - trunk/compilers/pirc/new

From:
kjs
Date:
December 27, 2008 12:53
Subject:
[svn:parrot] r34444 - trunk/compilers/pirc/new
Message ID:
20081227205140.1461DCBA12@x12.develooper.com
Author: kjs
Date: Sat Dec 27 12:51:36 2008
New Revision: 34444

Modified:
   trunk/compilers/pirc/new/pir.l
   trunk/compilers/pirc/new/pir.y
   trunk/compilers/pirc/new/pircompunit.c
   trunk/compilers/pirc/new/pircompunit.h
   trunk/compilers/pirc/new/piremit.c
   trunk/compilers/pirc/new/piremit.h
   trunk/compilers/pirc/new/pirlexer.c
   trunk/compilers/pirc/new/pirlexer.h
   trunk/compilers/pirc/new/pirparser.c
   trunk/compilers/pirc/new/pirparser.h
   trunk/compilers/pirc/new/pirsymbol.c
   trunk/compilers/pirc/new/pirsymbol.h

Log:
[pirc] implement emission of .const items. 
I'm not entirely happy with the lexer having to distinguish between .const identifiers and all other identifiers: now .const identifiers hide ops and all other identifiers, such as .locals. For now, this works. 

Modified: trunk/compilers/pirc/new/pir.l
==============================================================================
--- trunk/compilers/pirc/new/pir.l	(original)
+++ trunk/compilers/pirc/new/pir.l	Sat Dec 27 12:51:36 2008
@@ -402,8 +402,18 @@
                   }
 
 {IDENT}           { /* identifier; can be a global (sub or const), local or parrot op */
-                    yylval->sval = dupstr(yyget_extra(yyscanner), yytext);
-                    return TK_IDENT;
+                    lexer_state * const lexer = yyget_extra(yyscanner);
+                    constant *c = find_global_constant(lexer, yytext);
+
+                    /* XXX bleh. this is expensive; an const lookup for each identifier */
+                    if (c) {
+                        yylval->cval = c;
+                        return TK_CONST_VALUE;
+                    }
+                    else {
+                        yylval->sval = dupstr(yyget_extra(yyscanner), yytext);
+                        return TK_IDENT;
+                    }
                   }
 
 {FLOATNUM}        { yylval->dval = atof(yytext); return TK_NUMC; }

Modified: trunk/compilers/pirc/new/pir.y
==============================================================================
--- trunk/compilers/pirc/new/pir.y	(original)
+++ trunk/compilers/pirc/new/pir.y	Sat Dec 27 12:51:36 2008
@@ -301,6 +301,7 @@
        <ival> TK_NREG       "number register"
        <ival> TK_SREG       "string register"
        <ival> TK_IREG       "integer register"
+       <cval> TK_CONST_VALUE "constant-value"
 
 %token TK_ARROW             "=>"
        TK_NE                "!="
@@ -1170,7 +1171,8 @@
                                   get_opinfo(yyscanner);
                               }
                               else
-                                  yypirerror(yyscanner, lexer, "indexed object '%s' not declared", $3);
+                                  yypirerror(yyscanner, lexer,
+                                             "indexed object '%s' not declared", $3);
 
                               /* create a symbol node anyway, so we can continue with instr. gen. */
                               sym = new_symbol(lexer, $3, PMC_TYPE);
@@ -1977,6 +1979,7 @@
 constant    : TK_STRINGC     { $$ = new_const(lexer, STRING_TYPE, $1); }
             | TK_INTC        { $$ = new_const(lexer, INT_TYPE, $1); }
             | TK_NUMC        { $$ = new_const(lexer, NUM_TYPE, $1); }
+            | TK_CONST_VALUE { $$ = $1; }
             ;
 
 rel_op      : "!="           { $$ = OP_NE; }
@@ -2003,10 +2006,9 @@
 
 symbol      : reg
             | identifier { /* a symbol must have been declared; check that at this point. */
-                           symbol *sym = find_symbol(lexer, $1);
+                           symbol * sym = find_symbol(lexer, $1);
                            if (sym == NULL) {
                                undeclared_symbol(yyscanner, lexer, $1);
-
                                /* make sure sym is not NULL */
                                sym = new_symbol(lexer, $1, UNKNOWN_TYPE);
                            }

Modified: trunk/compilers/pirc/new/pircompunit.c
==============================================================================
--- trunk/compilers/pirc/new/pircompunit.c	(original)
+++ trunk/compilers/pirc/new/pircompunit.c	Sat Dec 27 12:51:36 2008
@@ -1357,12 +1357,11 @@
 PARROT_CANNOT_RETURN_NULL
 target *
 new_reg(lexer_state * const lexer, pir_type type, int regno) {
-    target *t       = new_target(lexer);
+    target  *t = new_target(lexer);
     pir_reg *reg;
 
     color_reg(lexer, type, regno);
-    reg = find_register(lexer, type, regno);
-    /* XXX t->s.reg = reg; */
+    reg     = find_register(lexer, type, regno);
     t->info = &reg->info;
 
     /* set a flag on this target node saying it's a register */

Modified: trunk/compilers/pirc/new/pircompunit.h
==============================================================================
--- trunk/compilers/pirc/new/pircompunit.h	(original)
+++ trunk/compilers/pirc/new/pircompunit.h	Sat Dec 27 12:51:36 2008
@@ -144,6 +144,7 @@
     char const      *name;     /* name of the constant, if declared as a constant */
     pir_type         type;     /* type of the constant */
     value            val;      /* value of the constant */
+    int              const_table_index;
     struct constant *next;
 
 } constant;

Modified: trunk/compilers/pirc/new/piremit.c
==============================================================================
--- trunk/compilers/pirc/new/piremit.c	(original)
+++ trunk/compilers/pirc/new/piremit.c	Sat Dec 27 12:51:36 2008
@@ -412,6 +412,24 @@
     }
 }
 
+int
+emit_pbc_const(lexer_state * const lexer, constant * const pirconst) {
+    switch (pirconst->type) {
+        case INT_TYPE:
+            /* XXX ? */
+            break;
+        case NUM_TYPE:
+            return add_num_const(lexer->bc, pirconst->val.nval);
+
+        case STRING_TYPE:
+            return add_string_const(lexer->bc, pirconst->val.sval);
+
+        case PMC_TYPE:
+            /* XXX ? */
+            break;
+    }
+}
+
 /*
 
 =item C<static void

Modified: trunk/compilers/pirc/new/piremit.h
==============================================================================
--- trunk/compilers/pirc/new/piremit.h	(original)
+++ trunk/compilers/pirc/new/piremit.h	Sat Dec 27 12:51:36 2008
@@ -6,12 +6,16 @@
 #ifndef PARROT_PIR_PIREMIT_H_GUARD
 #define PARROT_PIR_PIREMIT_H_GUARD
 
-struct lexer_state; /* forward declaration */
+/* forward declaration */
+struct lexer_state;
+struct constant;
 
 void print_subs(struct lexer_state * const lexer);
 void emit_pir_subs(struct lexer_state * const lexer);
 void emit_pbc(struct lexer_state * const lexer);
 
+int emit_pbc_const(struct lexer_state * const lexer, struct constant * const pirconst);
+
 #endif /* PARROT_PIR_PIREMIT_H_GUARD */
 
 /*

Modified: trunk/compilers/pirc/new/pirlexer.c
==============================================================================
--- trunk/compilers/pirc/new/pirlexer.c	(original)
+++ trunk/compilers/pirc/new/pirlexer.c	Sat Dec 27 12:51:36 2008
@@ -44,18 +44,10 @@
 
 /* A lexical scanner generated by flex */
 
-/* %not-for-header */
-
-/* %if-c-only */
-/* %if-not-reentrant */
-/* %endif */
-/* %endif */
-/* %ok-for-header */
-
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_SUBMINOR_VERSION 33
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -64,7 +56,7 @@
 /* %endif */
 
 /* %if-c-only */
-    
+
 /* %endif */
 
 /* %if-c-only */
@@ -93,10 +85,10 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#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. 
+ * if you want the limit (max/min) macros for int types.
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -113,7 +105,7 @@
 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 char flex_uint8_t;
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 #endif /* ! C99 */
@@ -159,15 +151,14 @@
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
-#else	/* ! __cplusplus */
+#else   /* ! __cplusplus */
 
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
+#if __STDC__
 
 #define YY_USE_CONST
 
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
+#endif  /* __STDC__ */
+#endif  /* ! __cplusplus */
 
 #ifdef YY_USE_CONST
 #define yyconst const
@@ -210,6 +201,7 @@
 #define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
 #define yy_flex_debug yyg->yy_flex_debug_r
 
+int yypirlex_init (yyscan_t* scanner);
 /* %endif */
 
 /* %if-not-reentrant */
@@ -264,7 +256,7 @@
 
     /* 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 yypirlex. 
+     *       existing scanners that call yyless() from OUTSIDE yypirlex.
      *       One obvious solution it to make yy_act a global. I tried that, and saw
      *       a 5% performance hit in a non-yylineno scanner, because yy_act is
      *       normally declared as a register variable-- so it is not worth it.
@@ -276,96 +268,101 @@
                     if ( yytext[yyl] == '\n' )\
                         --yylineno;\
             }while(0)
-    
+
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
+    do \
+        { \
+        /* Undo effects of setting up yytext. */ \
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = yyg->yy_hold_char; \
-		YY_RESTORE_YY_MORE_OFFSET \
-		yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
+        *yy_cp = yyg->yy_hold_char; \
+        YY_RESTORE_YY_MORE_OFFSET \
+        yyg->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, yyg->yytext_ptr , yyscanner )
 
+/* 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 size_t 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
-	{
+    {
 /* %if-c-only */
-	FILE *yy_input_file;
+    FILE *yy_input_file;
 /* %endif */
 
 /* %if-c++-only */
 /* %endif */
 
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
+    char *yy_ch_buf;        /* input buffer */
+    char *yy_buf_pos;       /* current position in input buffer */
+
+    /* Size of input buffer in bytes, not including room for EOB
+     * characters.
+     */
+    yy_size_t yy_buf_size;
+
+    /* Number of characters read into yy_ch_buf, not including EOB
+     * characters.
+     */
+    int yy_n_chars;
 
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
+    /* Whether we "own" the buffer - i.e., we know we created it,
+     * and can realloc() it to grow it, and should free() it to
+     * delete it.
+     */
+    int yy_is_our_buffer;
+
+    /* Whether this is an "interactive" input source; if so, and
+     * if we're using stdio for input, then we want to use getc()
+     * instead of fread(), to make sure we stop fetching input after
+     * each newline.
+     */
+    int yy_is_interactive;
+
+    /* Whether we're considered to be at the beginning of a line.
+     * If so, '^' rules will be active on the next match, otherwise
+     * not.
+     */
+    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;
+    /* 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
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yypirrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
+    /* When an EOF's been seen but there's still some text to process
+     * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+     * shouldn't try reading from the input source any more.  We might
+     * still have a bunch of tokens to match, though, because of
+     * possible backing-up.
+     *
+     * When we actually see the EOF, we change the status to "new"
+     * (via yypirrestart()), 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 */
 
 /* %if-c-only Standard (non-C++) definition */
@@ -428,24 +425,24 @@
 #define yy_new_buffer yypir_create_buffer
 
 #define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
+    { \
+    if ( ! YY_CURRENT_BUFFER ){ \
         yypirensure_buffer_stack (yyscanner); \
-		YY_CURRENT_BUFFER_LVALUE =    \
+        YY_CURRENT_BUFFER_LVALUE =    \
             yypir_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-	}
+    } \
+    YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+    }
 
 #define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
+    { \
+    if ( ! YY_CURRENT_BUFFER ){\
         yypirensure_buffer_stack (yyscanner); \
-		YY_CURRENT_BUFFER_LVALUE =    \
+        YY_CURRENT_BUFFER_LVALUE =    \
             yypir_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-	}
+    } \
+    YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+    }
 
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
@@ -476,13 +473,13 @@
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yyg->yytext_ptr = yy_bp; \
+    yyg->yytext_ptr = yy_bp; \
 /* %% [2.0] code to fiddle yytext and yyleng for yymore() goes here \ */\
-	yyleng = (size_t) (yy_cp - yy_bp); \
-	yyg->yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
+    yyleng = (size_t) (yy_cp - yy_bp); \
+    yyg->yy_hold_char = *yy_cp; \
+    *yy_cp = '\0'; \
 /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\
-	yyg->yy_c_buf_p = yy_cp;
+    yyg->yy_c_buf_p = yy_cp;
 
 /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */
 #define YY_NUM_RULES 204
@@ -490,10 +487,10 @@
 /* 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;
-	};
+    {
+    flex_int32_t yy_verify;
+    flex_int32_t yy_nxt;
+    };
 static yyconst flex_int16_t yy_accept[803] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -1314,16 +1311,16 @@
 /* Table of booleans, true if rule could match eol. */
 static yyconst flex_int32_t yy_rule_can_match_eol[205] =
     {   0,
-1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 1, 0, 0,     };
 
 static yyconst flex_int16_t yy_rule_linenum[204] =
@@ -1340,17 +1337,17 @@
       356,  357,  358,  359,  360,  361,  362,  363,  364,  365,
 
       366,  368,  369,  370,  371,  372,  373,  374,  377,  382,
-      383,  384,  385,  387,  392,  404,  409,  410,  411,  412,
-      413,  415,  467,  480,  502,  507,  512,  519,  520,  535,
-      540,  541,  546,  547,  548,  550,  566,  620,  648,  653,
-      658,  659,  660,  661,  666,  677,  678,  680,  682,  693,
-      707,  712,  713,  714,  715,  717,  732,  746,  775,  800,
-      802,  807,  817,  822,  840,  846,  853,  886,  888,  893,
-      929,  930,  931,  933,  934,  935,  936,  937,  938,  940,
-      941,  942,  944,  949,  954,  955,  958,  992,  997, 1000,
-     1001, 1002, 1003, 1005, 1010, 1011, 1012, 1013, 1014, 1016,
+      383,  384,  385,  387,  392,  404,  419,  420,  421,  422,
+      423,  425,  477,  490,  512,  517,  522,  529,  530,  545,
+      550,  551,  556,  557,  558,  560,  576,  630,  658,  663,
+      668,  669,  670,  671,  676,  687,  688,  690,  692,  703,
+      717,  722,  723,  724,  725,  727,  742,  756,  785,  810,
+      812,  817,  827,  832,  850,  856,  863,  896,  898,  903,
+      939,  940,  941,  943,  944,  945,  946,  947,  948,  950,
+      951,  952,  954,  959,  964,  965,  968, 1002, 1007, 1010,
+     1011, 1012, 1013, 1015, 1020, 1021, 1022, 1023, 1024, 1026,
 
-     1021, 1023, 1025
+     1031, 1033, 1035
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -1468,7 +1465,7 @@
 
 /* The PASM state is an exclusive state, recognizing ONLY PASM tokens. */
 
-#line 1472 "pirlexer.c"
+#line 1469 "pirlexer.c"
 
 #define INITIAL 0
 #define MACROHEAD 1
@@ -1549,15 +1546,9 @@
     /* This must go here because YYSTYPE and YYLTYPE are included
      * from bison output in section 1.*/
     #    define yylval yyg->yylval_r
-    
-int yypirlex_init (yyscan_t* scanner);
-
-int yypirlex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
 
 /* %endif */
 
-/* %endif End reentrant structures and macros. */
-
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
@@ -1594,6 +1585,7 @@
 void yypirset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
 
 /* %endif */
+/* %endif End reentrant structures and macros. */
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1638,11 +1630,11 @@
 /* %if-c-only */
 
     static void yy_push_state (int new_state ,yyscan_t yyscanner);
-    
+
     static void yy_pop_state (yyscan_t yyscanner );
-    
+
     static int yy_top_state (yyscan_t yyscanner );
-    
+
 /* %endif */
 
 /* Amount of stuff to slurp up with each read. */
@@ -1656,7 +1648,7 @@
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
+#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
 /* %endif */
 /* %if-c++-only C++ definition */
 /* %endif */
@@ -1668,33 +1660,33 @@
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
 /* %% [5.0] fread()/read() definition of YY_INPUT goes here unless we're doing C++ \ */\
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		int n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	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); \
-			} \
-		}\
+    if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+        { \
+        int c = '*'; \
+        size_t n; \
+        for ( n = 0; n < max_size && \
+                 (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+            buf[n] = (char) c; \
+        if ( c == '\n' ) \
+            buf[n++] = (char) c; \
+        if ( c == EOF && ferror( yyin ) ) \
+            YY_FATAL_ERROR( "input in flex scanner failed" ); \
+        result = n; \
+        } \
+    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); \
+            } \
+        }\
 \
 /* %if-c++-only C++ definition \ */\
 /* %endif */
@@ -1743,11 +1735,9 @@
 #define YY_DECL_IS_OURS 1
 /* %if-c-only Standard (non-C++) definition */
 
-extern int yypirlex \
-               (YYSTYPE * yylval_param ,yyscan_t yyscanner);
+extern int yypirlex (YYSTYPE * yylval_param ,yyscan_t yyscanner);
 
-#define YY_DECL int yypirlex \
-               (YYSTYPE * yylval_param , yyscan_t yyscanner)
+#define YY_DECL int yypirlex (YYSTYPE * yylval_param , yyscan_t yyscanner)
 /* %endif */
 /* %if-c++-only C++ definition */
 /* %endif */
@@ -1767,7 +1757,7 @@
 
 /* %% [6.0] YY_RULE_SETUP definition goes here */
 #define YY_RULE_SETUP \
-	YY_USER_ACTION
+    YY_USER_ACTION
 
 /* %not-for-header */
 
@@ -1775,9 +1765,9 @@
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+    register yy_state_type yy_current_state;
+    register char *yy_cp, *yy_bp;
+    register int yy_act;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 /* %% [7.0] user's declarations go here */
@@ -1785,129 +1775,129 @@
 
 
 
-#line 1789 "pirlexer.c"
+#line 1779 "pirlexer.c"
 
     yylval = yylval_param;
 
-	if ( !yyg->yy_init )
-		{
-		yyg->yy_init = 1;
+    if ( !yyg->yy_init )
+        {
+        yyg->yy_init = 1;
 
 #ifdef YY_USER_INIT
-		YY_USER_INIT;
+        YY_USER_INIT;
 #endif
 
-		if ( ! yyg->yy_start )
-			yyg->yy_start = 1;	/* first start state */
+        if ( ! yyg->yy_start )
+            yyg->yy_start = 1;  /* first start state */
 
-		if ( ! yyin )
+        if ( ! yyin )
 /* %if-c-only */
-			yyin = stdin;
+            yyin = stdin;
 /* %endif */
 /* %if-c++-only */
 /* %endif */
 
-		if ( ! yyout )
+        if ( ! yyout )
 /* %if-c-only */
-			yyout = stdout;
+            yyout = stdout;
 /* %endif */
 /* %if-c++-only */
 /* %endif */
 
-		if ( ! YY_CURRENT_BUFFER ) {
-			yypirensure_buffer_stack (yyscanner);
-			YY_CURRENT_BUFFER_LVALUE =
-				yypir_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
-		}
+        if ( ! YY_CURRENT_BUFFER ) {
+            yypirensure_buffer_stack (yyscanner);
+            YY_CURRENT_BUFFER_LVALUE =
+                yypir_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
+        }
 
-		yypir_load_buffer_state(yyscanner );
-		}
+        yypir_load_buffer_state(yyscanner );
+        }
 
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
+    while ( 1 )     /* loops until end-of-file is reached */
+        {
 /* %% [8.0] yymore()-related code goes here */
-		yy_cp = yyg->yy_c_buf_p;
+        yy_cp = yyg->yy_c_buf_p;
 
-		/* Support of yytext. */
-		*yy_cp = yyg->yy_hold_char;
+        /* Support of yytext. */
+        *yy_cp = yyg->yy_hold_char;
 
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
+        /* yy_bp points to the position in yy_ch_buf of the start of
+         * the current run.
+         */
+        yy_bp = yy_cp;
 
 /* %% [9.0] code to set up and find next match goes here */
-		yy_current_state = yyg->yy_start;
+        yy_current_state = yyg->yy_start;
 yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				yyg->yy_last_accepting_state = yy_current_state;
-				yyg->yy_last_accepting_cpos = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 803 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_current_state != 802 );
-		yy_cp = yyg->yy_last_accepting_cpos;
-		yy_current_state = yyg->yy_last_accepting_state;
+        do
+            {
+            register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+            if ( yy_accept[yy_current_state] )
+                {
+                yyg->yy_last_accepting_state = yy_current_state;
+                yyg->yy_last_accepting_cpos = yy_cp;
+                }
+            while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+                {
+                yy_current_state = (int) yy_def[yy_current_state];
+                if ( yy_current_state >= 803 )
+                    yy_c = yy_meta[(unsigned int) yy_c];
+                }
+            yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+            ++yy_cp;
+            }
+        while ( yy_current_state != 802 );
+        yy_cp = yyg->yy_last_accepting_cpos;
+        yy_current_state = yyg->yy_last_accepting_state;
 
 yy_find_action:
 /* %% [10.0] code to find the action number goes here */
-		yy_act = yy_accept[yy_current_state];
+        yy_act = yy_accept[yy_current_state];
 
-		YY_DO_BEFORE_ACTION;
+        YY_DO_BEFORE_ACTION;
 
 /* %% [11.0] code for yylineno update goes here */
 
-		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
-			{
-			int yyl;
-			for ( yyl = 0; yyl < yyleng; ++yyl )
-				if ( yytext[yyl] == '\n' )
-					   
+        if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
+            {
+            int yyl;
+            for ( yyl = 0; yyl < yyleng; ++yyl )
+                if ( yytext[yyl] == '\n' )
+
     do{ yylineno++;
         yycolumn=0;
     }while(0)
 ;
-			}
+            }
 
-do_action:	/* This label is used only to access EOF actions. */
+do_action:  /* This label is used only to access EOF actions. */
 
 /* %% [12.0] debug code goes here */
-		if ( yy_flex_debug )
-			{
-			if ( yy_act == 0 )
-				fprintf( stderr, "--scanner backing up\n" );
-			else if ( yy_act < 204 )
-				fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n",
-				         (long)yy_rule_linenum[yy_act], yytext );
-			else if ( yy_act == 204 )
-				fprintf( stderr, "--accepting default rule (\"%s\")\n",
-				         yytext );
-			else if ( yy_act == 205 )
-				fprintf( stderr, "--(end of buffer or a NUL)\n" );
-			else
-				fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
-			}
+        if ( yy_flex_debug )
+            {
+            if ( yy_act == 0 )
+                fprintf( stderr, "--scanner backing up\n" );
+            else if ( yy_act < 204 )
+                fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n",
+                         (long)yy_rule_linenum[yy_act], yytext );
+            else if ( yy_act == 204 )
+                fprintf( stderr, "--accepting default rule (\"%s\")\n",
+                         yytext );
+            else if ( yy_act == 205 )
+                fprintf( stderr, "--(end of buffer or a NUL)\n" );
+            else
+                fprintf( stderr, "--EOF (start condition %d)\n", YY_START );
+            }
 
-		switch ( yy_act )
-	{ /* beginning of action switch */
+        switch ( yy_act )
+    { /* beginning of action switch */
 /* %% [13.0] actions go here */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yyg->yy_hold_char;
-			yy_cp = yyg->yy_last_accepting_cpos;
-			yy_current_state = yyg->yy_last_accepting_state;
-			goto yy_find_action;
+            case 0: /* must back up */
+            /* undo the effects of YY_DO_BEFORE_ACTION */
+            *yy_cp = yyg->yy_hold_char;
+            yy_cp = yyg->yy_last_accepting_cpos;
+            yy_current_state = yyg->yy_last_accepting_state;
+            goto yy_find_action;
 
 case 1:
 /* rule 1 can match eol */
@@ -1934,18 +1924,18 @@
                         }
 
                       }
-	YY_BREAK
+    YY_BREAK
 case 2:
 YY_RULE_SETUP
 #line 240 "pir.l"
 { /* ignore whitespace */ }
-	YY_BREAK
+    YY_BREAK
 case 3:
 /* rule 3 can match eol */
 YY_RULE_SETUP
 #line 242 "pir.l"
 { /* ignore line comments */ }
-	YY_BREAK
+    YY_BREAK
 case 4:
 /* rule 4 can match eol */
 YY_RULE_SETUP
@@ -1954,419 +1944,419 @@
                     yylval->sval = "\n";
                     return TK_NL;
                   }
-	YY_BREAK
+    YY_BREAK
 case 5:
 YY_RULE_SETUP
 #line 249 "pir.l"
 { return TK_ASSIGN_USHIFT; }
-	YY_BREAK
+    YY_BREAK
 case 6:
 YY_RULE_SETUP
 #line 250 "pir.l"
 { return TK_USHIFT; }
-	YY_BREAK
+    YY_BREAK
 case 7:
 YY_RULE_SETUP
 #line 251 "pir.l"
 { return TK_ASSIGN_RSHIFT; }
-	YY_BREAK
+    YY_BREAK
 case 8:
 YY_RULE_SETUP
 #line 252 "pir.l"
 { return TK_RSHIFT; }
-	YY_BREAK
+    YY_BREAK
 case 9:
 YY_RULE_SETUP
 #line 253 "pir.l"
 { return TK_LSHIFT; }
-	YY_BREAK
+    YY_BREAK
 case 10:
 YY_RULE_SETUP
 #line 254 "pir.l"
 { return TK_ARROW; }
-	YY_BREAK
+    YY_BREAK
 case 11:
 YY_RULE_SETUP
 #line 255 "pir.l"
 { return TK_EQ; }
-	YY_BREAK
+    YY_BREAK
 case 12:
 YY_RULE_SETUP
 #line 256 "pir.l"
 { return TK_NE; }
-	YY_BREAK
+    YY_BREAK
 case 13:
 YY_RULE_SETUP
 #line 257 "pir.l"
 { return TK_LE; }
-	YY_BREAK
+    YY_BREAK
 case 14:
 YY_RULE_SETUP
 #line 258 "pir.l"
 { return TK_GE; }
-	YY_BREAK
+    YY_BREAK
 case 15:
 YY_RULE_SETUP
 #line 259 "pir.l"
 { return TK_LT; }
-	YY_BREAK
+    YY_BREAK
 case 16:
 YY_RULE_SETUP
 #line 260 "pir.l"
 { return TK_GT; }
-	YY_BREAK
+    YY_BREAK
 case 17:
 YY_RULE_SETUP
 #line 262 "pir.l"
 { return TK_FDIV; }
-	YY_BREAK
+    YY_BREAK
 case 18:
 YY_RULE_SETUP
 #line 263 "pir.l"
 { return TK_AND; }
-	YY_BREAK
+    YY_BREAK
 case 19:
 YY_RULE_SETUP
 #line 264 "pir.l"
 { return TK_OR; }
-	YY_BREAK
+    YY_BREAK
 case 20:
 YY_RULE_SETUP
 #line 265 "pir.l"
 { return TK_XOR; }
-	YY_BREAK
+    YY_BREAK
 case 21:
 YY_RULE_SETUP
 #line 267 "pir.l"
 { return '+'; }
-	YY_BREAK
+    YY_BREAK
 case 22:
 YY_RULE_SETUP
 #line 268 "pir.l"
 { return '%'; }
-	YY_BREAK
+    YY_BREAK
 case 23:
 YY_RULE_SETUP
 #line 269 "pir.l"
 { return '*'; }
-	YY_BREAK
+    YY_BREAK
 case 24:
 YY_RULE_SETUP
 #line 270 "pir.l"
 { return '/'; }
-	YY_BREAK
+    YY_BREAK
 case 25:
 YY_RULE_SETUP
 #line 271 "pir.l"
 { return '!'; }
-	YY_BREAK
+    YY_BREAK
 case 26:
 YY_RULE_SETUP
 #line 272 "pir.l"
 { return '~'; }
-	YY_BREAK
+    YY_BREAK
 case 27:
 YY_RULE_SETUP
 #line 273 "pir.l"
 { return '-'; }
-	YY_BREAK
+    YY_BREAK
 case 28:
 YY_RULE_SETUP
 #line 274 "pir.l"
 { return '('; }
-	YY_BREAK
+    YY_BREAK
 case 29:
 YY_RULE_SETUP
 #line 275 "pir.l"
 { return ')'; }
-	YY_BREAK
+    YY_BREAK
 case 30:
 YY_RULE_SETUP
 #line 276 "pir.l"
 { return ','; }
-	YY_BREAK
+    YY_BREAK
 case 31:
 YY_RULE_SETUP
 #line 277 "pir.l"
 { return '['; }
-	YY_BREAK
+    YY_BREAK
 case 32:
 YY_RULE_SETUP
 #line 278 "pir.l"
 { return ']'; }
-	YY_BREAK
+    YY_BREAK
 case 33:
 YY_RULE_SETUP
 #line 280 "pir.l"
 { /* if the dot is surrounded by whitespace, it's a concatenation operator */
                     return TK_CONC;
                   }
-	YY_BREAK
+    YY_BREAK
 case 34:
 YY_RULE_SETUP
 #line 285 "pir.l"
 { return '='; }
-	YY_BREAK
+    YY_BREAK
 case 35:
 YY_RULE_SETUP
 #line 286 "pir.l"
 { return ';'; }
-	YY_BREAK
+    YY_BREAK
 case 36:
 YY_RULE_SETUP
 #line 288 "pir.l"
 { return TK_ASSIGN_INC; }
-	YY_BREAK
+    YY_BREAK
 case 37:
 YY_RULE_SETUP
 #line 289 "pir.l"
 { return TK_ASSIGN_DEC; }
-	YY_BREAK
+    YY_BREAK
 case 38:
 YY_RULE_SETUP
 #line 290 "pir.l"
 { return TK_ASSIGN_DIV; }
-	YY_BREAK
+    YY_BREAK
 case 39:
 YY_RULE_SETUP
 #line 291 "pir.l"
 { return TK_ASSIGN_MUL; }
-	YY_BREAK
+    YY_BREAK
 case 40:
 YY_RULE_SETUP
 #line 292 "pir.l"
 { return TK_ASSIGN_MOD; }
-	YY_BREAK
+    YY_BREAK
 case 41:
 YY_RULE_SETUP
 #line 293 "pir.l"
 { return TK_ASSIGN_POW; }
-	YY_BREAK
+    YY_BREAK
 case 42:
 YY_RULE_SETUP
 #line 294 "pir.l"
 { return TK_ASSIGN_BOR; }
-	YY_BREAK
+    YY_BREAK
 case 43:
 YY_RULE_SETUP
 #line 295 "pir.l"
 { return TK_ASSIGN_BAND; }
-	YY_BREAK
+    YY_BREAK
 case 44:
 YY_RULE_SETUP
 #line 296 "pir.l"
 { return TK_ASSIGN_FDIV; }
-	YY_BREAK
+    YY_BREAK
 case 45:
 YY_RULE_SETUP
 #line 297 "pir.l"
 { return TK_ASSIGN_BNOT; }
-	YY_BREAK
+    YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 298 "pir.l"
 { return TK_ASSIGN_CONC; }
-	YY_BREAK
+    YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 300 "pir.l"
 { return TK_IF; }
-	YY_BREAK
+    YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 301 "pir.l"
 { return TK_GOTO; }
-	YY_BREAK
+    YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 302 "pir.l"
 { return TK_UNLESS; }
-	YY_BREAK
+    YY_BREAK
 case 50:
 YY_RULE_SETUP
 #line 303 "pir.l"
 { return TK_NULL; }
-	YY_BREAK
+    YY_BREAK
 case 51:
 YY_RULE_SETUP
 #line 305 "pir.l"
 { return TK_INT; }
-	YY_BREAK
+    YY_BREAK
 case 52:
 YY_RULE_SETUP
 #line 306 "pir.l"
 { return TK_NUM; }
-	YY_BREAK
+    YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 307 "pir.l"
 { return TK_PMC; }
-	YY_BREAK
+    YY_BREAK
 case 54:
 YY_RULE_SETUP
 #line 308 "pir.l"
 { return TK_STRING; }
-	YY_BREAK
+    YY_BREAK
 case 55:
 YY_RULE_SETUP
 #line 310 "pir.l"
 { return TK_ANNOTATE; }
-	YY_BREAK
+    YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 311 "pir.l"
 { return TK_SET_ARG; }
-	YY_BREAK
+    YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 312 "pir.l"
 { return TK_CONST; }
-	YY_BREAK
+    YY_BREAK
 case 58:
 YY_RULE_SETUP
 #line 313 "pir.l"
 { return TK_END; }
-	YY_BREAK
+    YY_BREAK
 case 59:
 YY_RULE_SETUP
 #line 314 "pir.l"
 { return TK_FILE; }
-	YY_BREAK
+    YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 316 "pir.l"
 { return TK_GET_RESULTS; }
-	YY_BREAK
+    YY_BREAK
 case 61:
 YY_RULE_SETUP
 #line 317 "pir.l"
 { return TK_GLOBALCONST; }
-	YY_BREAK
+    YY_BREAK
 case 62:
 YY_RULE_SETUP
 #line 318 "pir.l"
 { return TK_HLL; }
-	YY_BREAK
+    YY_BREAK
 case 63:
 YY_RULE_SETUP
 #line 319 "pir.l"
 { return TK_HLL_MAP; }
-	YY_BREAK
+    YY_BREAK
 case 64:
 YY_RULE_SETUP
 #line 320 "pir.l"
 { return TK_INVOCANT; }
-	YY_BREAK
+    YY_BREAK
 case 65:
 YY_RULE_SETUP
 #line 321 "pir.l"
 { return TK_LEX; }
-	YY_BREAK
+    YY_BREAK
 case 66:
 YY_RULE_SETUP
 #line 322 "pir.l"
 { return TK_LINE; }
-	YY_BREAK
+    YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 323 "pir.l"
 { return TK_LOADLIB; }
-	YY_BREAK
+    YY_BREAK
 case 68:
 YY_RULE_SETUP
 #line 324 "pir.l"
 { return TK_LOCAL; }
-	YY_BREAK
+    YY_BREAK
 case 69:
 YY_RULE_SETUP
 #line 326 "pir.l"
 { return TK_METH_CALL; }
-	YY_BREAK
+    YY_BREAK
 case 70:
 YY_RULE_SETUP
 #line 327 "pir.l"
 { return TK_NAMESPACE; }
-	YY_BREAK
+    YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 328 "pir.l"
 { return TK_NCI_CALL; }
-	YY_BREAK
+    YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 329 "pir.l"
 { return TK_PARAM; }
-	YY_BREAK
+    YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 330 "pir.l"
 { return TK_BEGIN_CALL; }
-	YY_BREAK
+    YY_BREAK
 case 74:
 YY_RULE_SETUP
 #line 331 "pir.l"
 { return TK_BEGIN_RETURN; }
-	YY_BREAK
+    YY_BREAK
 case 75:
 YY_RULE_SETUP
 #line 332 "pir.l"
 { return TK_BEGIN_YIELD; }
-	YY_BREAK
+    YY_BREAK
 case 76:
 YY_RULE_SETUP
 #line 333 "pir.l"
 { return TK_CALL; }
-	YY_BREAK
+    YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 334 "pir.l"
 { return TK_END_CALL; }
-	YY_BREAK
+    YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 335 "pir.l"
 { return TK_END_RETURN; }
-	YY_BREAK
+    YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 336 "pir.l"
 { return TK_END_YIELD; }
-	YY_BREAK
+    YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 337 "pir.l"
 { return TK_GET_RESULT; }
-	YY_BREAK
+    YY_BREAK
 case 81:
 YY_RULE_SETUP
 #line 338 "pir.l"
 { return TK_RETURN; }
-	YY_BREAK
+    YY_BREAK
 case 82:
 YY_RULE_SETUP
 #line 339 "pir.l"
 { return TK_SUB; }
-	YY_BREAK
+    YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 340 "pir.l"
 { return TK_YIELD; }
-	YY_BREAK
+    YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 341 "pir.l"
 { return TK_SET_RETURN; }
-	YY_BREAK
+    YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 342 "pir.l"
 { return TK_SET_YIELD; }
-	YY_BREAK
+    YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 343 "pir.l"
 { return TK_TAILCALL; }
-	YY_BREAK
+    YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 346 "pir.l"
@@ -2374,112 +2364,112 @@
                     yypirerror(yyscanner, yypirget_extra(yyscanner),
                                "cannot use '%s' outside of macro definitions", yytext);
                   }
-	YY_BREAK
+    YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 353 "pir.l"
 { return TK_FLAG_ANON; }
-	YY_BREAK
+    YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 354 "pir.l"
 { return TK_FLAG_INIT; }
-	YY_BREAK
+    YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 355 "pir.l"
 { return TK_FLAG_LOAD; }
-	YY_BREAK
+    YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 356 "pir.l"
 { return TK_FLAG_POSTCOMP; }
-	YY_BREAK
+    YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 357 "pir.l"
 { return TK_FLAG_IMMEDIATE; }
-	YY_BREAK
+    YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 358 "pir.l"
 { return TK_FLAG_MAIN; }
-	YY_BREAK
+    YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 359 "pir.l"
 { return TK_FLAG_METHOD; }
-	YY_BREAK
+    YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 360 "pir.l"
 { return TK_FLAG_LEX; }
-	YY_BREAK
+    YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 361 "pir.l"
 { return TK_FLAG_OUTER; }
-	YY_BREAK
+    YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 362 "pir.l"
 { return TK_FLAG_VTABLE; }
-	YY_BREAK
+    YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 363 "pir.l"
 { return TK_FLAG_MULTI; }
-	YY_BREAK
+    YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 364 "pir.l"
 { return TK_FLAG_SUBID; }
-	YY_BREAK
+    YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 365 "pir.l"
 { return TK_FLAG_INSTANCEOF; }
-	YY_BREAK
+    YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 366 "pir.l"
 { return TK_FLAG_NSENTRY; }
-	YY_BREAK
+    YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 368 "pir.l"
 { return TK_FLAG_UNIQUE_REG; }
-	YY_BREAK
+    YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 369 "pir.l"
 { return TK_FLAG_OPTIONAL; }
-	YY_BREAK
+    YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 370 "pir.l"
 { return TK_FLAG_OPT_FLAG; }
-	YY_BREAK
+    YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 371 "pir.l"
 { return TK_FLAG_SLURPY; }
-	YY_BREAK
+    YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 372 "pir.l"
 { return TK_FLAG_NAMED; }
-	YY_BREAK
+    YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 373 "pir.l"
 { return TK_FLAG_FLAT; }
-	YY_BREAK
+    YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 374 "pir.l"
 { return TK_FLAG_INVOCANT; }
-	YY_BREAK
+    YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 377 "pir.l"
@@ -2487,27 +2477,27 @@
                     yylval->sval = dupstrn(yypirget_extra(yyscanner), yytext + 1, yyleng - 2);
                     return TK_STRINGC;
                   }
-	YY_BREAK
+    YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 382 "pir.l"
 { yylval->ival = atoi(yytext + 2); return TK_PREG; }
-	YY_BREAK
+    YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 383 "pir.l"
 { yylval->ival = atoi(yytext + 2); return TK_SREG; }
-	YY_BREAK
+    YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 384 "pir.l"
 { yylval->ival = atoi(yytext + 2); return TK_NREG; }
-	YY_BREAK
+    YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 385 "pir.l"
 { yylval->ival = atoi(yytext + 2); return TK_IREG; }
-	YY_BREAK
+    YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 387 "pir.l"
@@ -2515,7 +2505,7 @@
                     yylval->sval = dupstrn(yypirget_extra(yyscanner), yytext, yyleng - 1);
                     return TK_LABEL;
                   }
-	YY_BREAK
+    YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 392 "pir.l"
@@ -2530,49 +2520,59 @@
                     yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                     return TK_IDENT;
                   }
-	YY_BREAK
+    YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 404 "pir.l"
 { /* identifier; can be a global (sub or const), local or parrot op */
-                    yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
-                    return TK_IDENT;
+                    lexer_state * const lexer = yypirget_extra(yyscanner);
+                    constant *c = find_global_constant(lexer, yytext);
+
+                    /* XXX bleh. this is expensive; an const lookup for each identifier */
+                    if (c) {
+                        yylval->cval = c;
+                        return TK_CONST_VALUE;
+                    }
+                    else {
+                        yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
+                        return TK_IDENT;
+                    }
                   }
-	YY_BREAK
+    YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 409 "pir.l"
+#line 419 "pir.l"
 { yylval->dval = atof(yytext); return TK_NUMC; }
-	YY_BREAK
+    YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 410 "pir.l"
+#line 420 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
-	YY_BREAK
+    YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 411 "pir.l"
+#line 421 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
-	YY_BREAK
+    YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 412 "pir.l"
+#line 422 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
-	YY_BREAK
+    YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 413 "pir.l"
+#line 423 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
-	YY_BREAK
+    YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 415 "pir.l"
+#line 425 "pir.l"
 { /* XXX some work to be done to disallow $P0 . foo()
                      * spaces should not be allowed.
                      */
                      return '.';
                   }
-	YY_BREAK
+    YY_BREAK
 
 
 /* SCANSTR<<EOF>> and SCANMACRO<<EOF>> must be defined before <INTIAL><<EOF>>,
@@ -2589,15 +2589,15 @@
 
 
 case YY_STATE_EOF(SCANSTR):
-#line 438 "pir.l"
+#line 448 "pir.l"
 { /* switch back from .macro_const buffer to file. */
                      lexer_state * const lexer = yypirget_extra(yyscanner);
                      yy_pop_state(yyscanner);
                      yypir_switch_to_buffer(lexer->buffer,yyscanner);
                    }
-	YY_BREAK
+    YY_BREAK
 case YY_STATE_EOF(SCANMACRO):
-#line 444 "pir.l"
+#line 454 "pir.l"
 { /* override the default <<EOF>> action; go back to normal state and
                       * switch back to the saved file.
                       */
@@ -2620,10 +2620,10 @@
                      delete_macro_table(table);
 
                    }
-	YY_BREAK
+    YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 467 "pir.l"
+#line 477 "pir.l"
 { /* when scanning a macro body, the @ marker indicates the {IDENT} must
                           * be munged.
                           */
@@ -2632,21 +2632,21 @@
                             yylval->sval              = munge_id(id, lexer);
                             return TK_IDENT;
                        }
-	YY_BREAK
+    YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 476 "pir.l"
+#line 486 "pir.l"
 { /* end of file, stop scanning. */
                     yyterminate();
                   }
-	YY_BREAK
+    YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 480 "pir.l"
+#line 490 "pir.l"
 { /* any character not covered in the rules above is an error. */
                     yypirerror(yyscanner, yypirget_extra(yyscanner),
                                "unexpected character: '%c'", yytext[0]);
                   }
-	YY_BREAK
+    YY_BREAK
 
 
 /*****************************************************************************
@@ -2662,50 +2662,50 @@
 
 case 125:
 YY_RULE_SETUP
-#line 502 "pir.l"
+#line 512 "pir.l"
 {
                                yy_push_state(MACROCONST, yyscanner);
                                return TK_MACRO_CONST;
                              }
-	YY_BREAK
+    YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 507 "pir.l"
+#line 517 "pir.l"
 {
                                yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                                return TK_IDENT;
                              }
-	YY_BREAK
+    YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 512 "pir.l"
+#line 522 "pir.l"
 {
                                /* only these tokens can be macro constant values */
                                yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                                yy_pop_state(yyscanner);
                                return TK_MACRO_CONST_VAL;
                              }
-	YY_BREAK
+    YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 519 "pir.l"
+#line 529 "pir.l"
 { /* ignore whitespace */ }
-	YY_BREAK
+    YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 520 "pir.l"
+#line 530 "pir.l"
 {
                                yypirerror(yyscanner, yypirget_extra(yyscanner),
                                           "unknown character: '%c'", yytext[0]);
                              }
-	YY_BREAK
+    YY_BREAK
 case YY_STATE_EOF(MACROCONST):
-#line 524 "pir.l"
+#line 534 "pir.l"
 {
                                yypirerror(yyscanner, yypirget_extra(yyscanner),
                                           "read end of file during .macro_const definition");
                              }
-	YY_BREAK
+    YY_BREAK
 
 
 /**************** macro header (.macro <ident> <parameters> ) ***************/
@@ -2713,50 +2713,50 @@
 
 case 130:
 YY_RULE_SETUP
-#line 535 "pir.l"
+#line 545 "pir.l"
 { /* start a macro definition */
                                yy_push_state(MACROHEAD, yyscanner);
                                return TK_MACRO;
                              }
-	YY_BREAK
+    YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 540 "pir.l"
+#line 550 "pir.l"
 { /* ignore whitespace */ }
-	YY_BREAK
+    YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 541 "pir.l"
+#line 551 "pir.l"
 {
                                yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                                return TK_IDENT;
                              }
-	YY_BREAK
+    YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 546 "pir.l"
+#line 556 "pir.l"
 { return '('; }
-	YY_BREAK
+    YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 547 "pir.l"
+#line 557 "pir.l"
 { return ')'; }
-	YY_BREAK
+    YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 548 "pir.l"
+#line 558 "pir.l"
 { return ','; }
-	YY_BREAK
+    YY_BREAK
 case 136:
 /* rule 136 can match eol */
 YY_RULE_SETUP
-#line 550 "pir.l"
+#line 560 "pir.l"
 { /* a set of continuous newlines yields a single newline token. */
                                yy_pop_state(yyscanner); /* remove MACROHEAD state */
                                yy_push_state(MACROBODY, yyscanner); /* enter MACROBODY state */
                                return TK_NL;
                              }
-	YY_BREAK
+    YY_BREAK
 
 
 /******************************* macro expansion ***************************/
@@ -2768,7 +2768,7 @@
 
 case 137:
 YY_RULE_SETUP
-#line 566 "pir.l"
+#line 576 "pir.l"
 { /* .foo; it can be a macro, macro_local, or just $P0.foo(),
                                 * but we need to check that.
                                 */
@@ -2822,10 +2822,10 @@
                                    }
                                }
                              }
-	YY_BREAK
+    YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 620 "pir.l"
+#line 630 "pir.l"
 { /* expand a .macro_const or parameter in argument list */
                                lexer_state * const lexer = yypirget_extra(yyscanner);
                                macro_def   * const macro = find_macro(lexer->macros, yytext + 1);
@@ -2853,85 +2853,85 @@
                                else
                                    yypirerror(yyscanner, lexer, "'%s' is not a macro", yytext + 1);
                              }
-	YY_BREAK
+    YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 648 "pir.l"
+#line 658 "pir.l"
 {
                                yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                                return TK_MACRO_ARG_IDENT;
                              }
-	YY_BREAK
+    YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 653 "pir.l"
+#line 663 "pir.l"
 {
                                yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                                return TK_MACRO_ARG_OTHER;
                              }
-	YY_BREAK
+    YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 658 "pir.l"
+#line 668 "pir.l"
 { /* ignore whitespace */ }
-	YY_BREAK
+    YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 659 "pir.l"
+#line 669 "pir.l"
 { return ','; }
-	YY_BREAK
+    YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 660 "pir.l"
+#line 670 "pir.l"
 { return '('; }
-	YY_BREAK
+    YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 661 "pir.l"
+#line 671 "pir.l"
 {
                                yy_pop_state(yyscanner); /* leave MACROEXPAND state */
                                return ')';
                              }
-	YY_BREAK
+    YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 666 "pir.l"
+#line 676 "pir.l"
 {
                                yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                                return TK_MACRO_ARG_OTHER;
                              }
-	YY_BREAK
+    YY_BREAK
 case YY_STATE_EOF(STRINGEXPAND):
-#line 671 "pir.l"
+#line 681 "pir.l"
 {
                                lexer_state * const lexer = yypirget_extra(yyscanner);
                                yy_pop_state(yyscanner);
                                yypir_switch_to_buffer(lexer->buffer,yyscanner);
                              }
-	YY_BREAK
+    YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 677 "pir.l"
+#line 687 "pir.l"
 { return '{'; }
-	YY_BREAK
+    YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 678 "pir.l"
+#line 688 "pir.l"
 { return '}'; }
-	YY_BREAK
+    YY_BREAK
 case 148:
 /* rule 148 can match eol */
 YY_RULE_SETUP
-#line 680 "pir.l"
+#line 690 "pir.l"
 { yylval->sval = "\n"; return TK_NL; }
-	YY_BREAK
+    YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 682 "pir.l"
+#line 692 "pir.l"
 { yypirerror(yyscanner, yypirget_extra(yyscanner),
                                           "unknown character in macro expansion: %c", yytext[0]);
                              }
-	YY_BREAK
+    YY_BREAK
 
 
 /******************************** .macro_local *****************************/
@@ -2939,7 +2939,7 @@
 
 case 150:
 YY_RULE_SETUP
-#line 693 "pir.l"
+#line 703 "pir.l"
 { /* give a warning if the right flag is set */
                               /*
                               lexer_state * const lexer = yypirget_extra(yyscanner);
@@ -2952,38 +2952,38 @@
                               Doesn't make sense to use it.
                               */
                             }
-	YY_BREAK
+    YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 707 "pir.l"
+#line 717 "pir.l"
 {
                               yy_push_state(MACROLOCAL, yyscanner);
                               return TK_MACRO_LOCAL;
                             }
-	YY_BREAK
+    YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 712 "pir.l"
+#line 722 "pir.l"
 { return TK_INT; }
-	YY_BREAK
+    YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 713 "pir.l"
+#line 723 "pir.l"
 { return TK_PMC; }
-	YY_BREAK
+    YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 714 "pir.l"
+#line 724 "pir.l"
 { return TK_NUM; }
-	YY_BREAK
+    YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 715 "pir.l"
+#line 725 "pir.l"
 { return TK_STRING; }
-	YY_BREAK
+    YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 717 "pir.l"
+#line 727 "pir.l"
 { /* normal .macro_local */
                               lexer_state * const lexer = yypirget_extra(yyscanner);
                               /* reserve space for {IDENT}, the @ marker and the NULL char. */
@@ -2998,10 +2998,10 @@
                               declare_macro_local(CURRENT_MACRO(lexer), dupstr(lexer, yytext));
                               return TK_MACRO_LOCAL_ID;
                             }
-	YY_BREAK
+    YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 732 "pir.l"
+#line 742 "pir.l"
 { /* declare a .macro_local based on a parameter */
                               lexer_state * const lexer = yypirget_extra(yyscanner);
 
@@ -3015,10 +3015,10 @@
                               return TK_MACRO_LOCAL_ID;
 
                             }
-	YY_BREAK
+    YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 746 "pir.l"
+#line 756 "pir.l"
 { /* .$foo */
                               lexer_state * const lexer = yypirget_extra(yyscanner);
                               macro_table * const table = peek_macro_table(lexer);
@@ -3047,10 +3047,10 @@
                               }
 
                             }
-	YY_BREAK
+    YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 775 "pir.l"
+#line 785 "pir.l"
 { /* expanding a .macro_local using a macro parameter value */
                              lexer_state * const lexer     = yypirget_extra(yyscanner);
                              char  const * const paramname = dupstrn(lexer, yytext + 1, yyleng - 2);
@@ -3075,29 +3075,29 @@
 
                              return TK_IDENT;
                            }
-	YY_BREAK
+    YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 800 "pir.l"
+#line 810 "pir.l"
 { /* ignore whitespace */ }
-	YY_BREAK
+    YY_BREAK
 case 161:
 /* rule 161 can match eol */
 YY_RULE_SETUP
-#line 802 "pir.l"
+#line 812 "pir.l"
 { /* newline after .macro_local <type> <ident> line */
                               yy_pop_state(yyscanner);
                               return TK_NL;
                             }
-	YY_BREAK
+    YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 807 "pir.l"
+#line 817 "pir.l"
 { /* this state is only used for declaring .macro_locals */
                               yypirerror(yyscanner, yypirget_extra(yyscanner),
                                  "unknown character '%c' when declaring .macro_local", yytext[0]);
                             }
-	YY_BREAK
+    YY_BREAK
 
 
 /****************************** .macro_label ********************************/
@@ -3105,15 +3105,15 @@
 
 case 163:
 YY_RULE_SETUP
-#line 817 "pir.l"
+#line 827 "pir.l"
 {
                               yy_push_state(MACROLABEL, yyscanner);
                               return TK_MACRO_LABEL;
                             }
-	YY_BREAK
+    YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 822 "pir.l"
+#line 832 "pir.l"
 { /* if the "$" is there, it's a macro label using a macro
                                * parameter's value; otherwise it's a normal macro label
                                */
@@ -3130,29 +3130,29 @@
                               declare_macro_local(CURRENT_MACRO(lexer), dupstr(lexer, yytext));
                               return TK_MACRO_LABEL_ID;
                             }
-	YY_BREAK
+    YY_BREAK
 case 165:
 /* rule 165 can match eol */
 YY_RULE_SETUP
-#line 840 "pir.l"
+#line 850 "pir.l"
 { /* the newline character after a ".macro_label $foo:" declaration */
                               yy_pop_state(yyscanner); /* leave MACROLABEL state */
                               return TK_NL;
                             }
-	YY_BREAK
+    YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 846 "pir.l"
+#line 856 "pir.l"
 { /* scan a label when expanding a buffer; declared as .macro_label */
                               lexer_state * const lexer = yypirget_extra(yyscanner);
                               char const  * const label = dupstrn(lexer, yytext, yyleng - 2);
                               yylval->sval = munge_id(label, lexer);
                               return TK_LABEL;
                             }
-	YY_BREAK
+    YY_BREAK
 case 167:
 YY_RULE_SETUP
-#line 853 "pir.l"
+#line 863 "pir.l"
 { /* scan a label when expanding macro; was a macro parameter */
                              lexer_state * const lexer     = yypirget_extra(yyscanner);
                              char const  * const paramname = dupstrn(lexer, yytext + 1, yyleng - 3);
@@ -3178,7 +3178,7 @@
                              }
                              return TK_LABEL;
                            }
-	YY_BREAK
+    YY_BREAK
 
 
 /*************************** macro body scanning (storing) ****************************/
@@ -3187,31 +3187,31 @@
 case 168:
 /* rule 168 can match eol */
 YY_RULE_SETUP
-#line 886 "pir.l"
+#line 896 "pir.l"
 { store_macro_char(CURRENT_MACRO(yypirget_extra(yyscanner)), '\n'); }
-	YY_BREAK
+    YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 888 "pir.l"
+#line 898 "pir.l"
 {
                                yy_pop_state(yyscanner); /* leave MACROBODY state */
                                return TK_ENDM;
                              }
-	YY_BREAK
+    YY_BREAK
 case 170:
 YY_RULE_SETUP
-#line 893 "pir.l"
+#line 903 "pir.l"
 { /* store everything else */
                                store_macro_char(CURRENT_MACRO(yypirget_extra(yyscanner)), yytext[0]);
                              }
-	YY_BREAK
+    YY_BREAK
 case YY_STATE_EOF(MACROBODY):
-#line 897 "pir.l"
+#line 907 "pir.l"
 { /* catch run-away macro bodys */
                                yypirerror(yyscanner, yypirget_extra(yyscanner),
                                           "read end of file while reading macro body");
                              }
-	YY_BREAK
+    YY_BREAK
  /*
 {WS}"."           {
                     yypirerror(yyscanner, yypirget_extra(yyscanner),
@@ -3238,93 +3238,93 @@
 
 case 171:
 YY_RULE_SETUP
-#line 929 "pir.l"
+#line 939 "pir.l"
 { return ','; }
-	YY_BREAK
+    YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 930 "pir.l"
+#line 940 "pir.l"
 { return '['; }
-	YY_BREAK
+    YY_BREAK
 case 173:
 YY_RULE_SETUP
-#line 931 "pir.l"
+#line 941 "pir.l"
 { return ']'; }
-	YY_BREAK
+    YY_BREAK
 case 174:
 YY_RULE_SETUP
-#line 933 "pir.l"
+#line 943 "pir.l"
 { return TK_FLAG_MAIN; }
-	YY_BREAK
+    YY_BREAK
 case 175:
 YY_RULE_SETUP
-#line 934 "pir.l"
+#line 944 "pir.l"
 { return TK_FLAG_LOAD; }
-	YY_BREAK
+    YY_BREAK
 case 176:
 YY_RULE_SETUP
-#line 935 "pir.l"
+#line 945 "pir.l"
 { return TK_FLAG_INIT; }
-	YY_BREAK
+    YY_BREAK
 case 177:
 YY_RULE_SETUP
-#line 936 "pir.l"
+#line 946 "pir.l"
 { return TK_FLAG_ANON; }
-	YY_BREAK
+    YY_BREAK
 case 178:
 YY_RULE_SETUP
-#line 937 "pir.l"
+#line 947 "pir.l"
 { return TK_FLAG_POSTCOMP; }
-	YY_BREAK
+    YY_BREAK
 case 179:
 YY_RULE_SETUP
-#line 938 "pir.l"
+#line 948 "pir.l"
 { return TK_FLAG_IMMEDIATE; }
-	YY_BREAK
+    YY_BREAK
 case 180:
 YY_RULE_SETUP
-#line 940 "pir.l"
+#line 950 "pir.l"
 { return TK_PCC_SUB; }
-	YY_BREAK
+    YY_BREAK
 case 181:
 YY_RULE_SETUP
-#line 941 "pir.l"
+#line 951 "pir.l"
 { return TK_LEX; }
-	YY_BREAK
+    YY_BREAK
 case 182:
 YY_RULE_SETUP
-#line 942 "pir.l"
+#line 952 "pir.l"
 { return TK_NAMESPACE; }
-	YY_BREAK
+    YY_BREAK
 case 183:
 YY_RULE_SETUP
-#line 944 "pir.l"
+#line 954 "pir.l"
 {
                           yy_push_state(MACROHEAD, yyscanner);
                           return TK_MACRO;
                         }
-	YY_BREAK
+    YY_BREAK
 case 184:
 YY_RULE_SETUP
-#line 949 "pir.l"
+#line 959 "pir.l"
 {
                           yy_push_state(MACROCONST, yyscanner);
                           return TK_MACRO_CONST;
                         }
-	YY_BREAK
+    YY_BREAK
 case 185:
 YY_RULE_SETUP
-#line 954 "pir.l"
+#line 964 "pir.l"
 { return TK_LINE; }
-	YY_BREAK
+    YY_BREAK
 case 186:
 YY_RULE_SETUP
-#line 955 "pir.l"
+#line 965 "pir.l"
 { return TK_FILE; }
-	YY_BREAK
+    YY_BREAK
 case 187:
 YY_RULE_SETUP
-#line 958 "pir.l"
+#line 968 "pir.l"
 { /* macro expansion in PASM mode. */
                           lexer_state * const lexer = yypirget_extra(yyscanner);
                           macro_def   * const macro = find_macro(lexer->macros, yytext + 1);
@@ -3358,247 +3358,247 @@
                               }
                           }
                         }
-	YY_BREAK
+    YY_BREAK
 case 188:
 YY_RULE_SETUP
-#line 992 "pir.l"
+#line 1002 "pir.l"
 { /* a label in PASM */
                           yylval->sval = dupstrn(yypirget_extra(yyscanner), yytext, yyleng - 1);
                           return TK_LABEL;
                         }
-	YY_BREAK
+    YY_BREAK
 case 189:
 YY_RULE_SETUP
-#line 997 "pir.l"
+#line 1007 "pir.l"
 { yypirerror(yyscanner, yypirget_extra(yyscanner),
                                      "symbolic registers are not allowed in PASM mode");
                         }
-	YY_BREAK
+    YY_BREAK
 case 190:
 YY_RULE_SETUP
-#line 1000 "pir.l"
+#line 1010 "pir.l"
 { yylval->ival = atoi(yytext + 1); return TK_PREG; }
-	YY_BREAK
+    YY_BREAK
 case 191:
 YY_RULE_SETUP
-#line 1001 "pir.l"
+#line 1011 "pir.l"
 { yylval->ival = atoi(yytext + 1); return TK_NREG; }
-	YY_BREAK
+    YY_BREAK
 case 192:
 YY_RULE_SETUP
-#line 1002 "pir.l"
+#line 1012 "pir.l"
 { yylval->ival = atoi(yytext + 1); return TK_IREG; }
-	YY_BREAK
+    YY_BREAK
 case 193:
 YY_RULE_SETUP
-#line 1003 "pir.l"
+#line 1013 "pir.l"
 { yylval->ival = atoi(yytext + 1); return TK_SREG; }
-	YY_BREAK
+    YY_BREAK
 case 194:
 YY_RULE_SETUP
-#line 1005 "pir.l"
+#line 1015 "pir.l"
 { /* can be a parrot op or a label; the check is done in the parser. */
                           yylval->sval = dupstr(yypirget_extra(yyscanner), yytext);
                           return TK_IDENT;
                         }
-	YY_BREAK
+    YY_BREAK
 case 195:
 YY_RULE_SETUP
-#line 1010 "pir.l"
+#line 1020 "pir.l"
 { yylval->dval = atof(yytext); return TK_NUMC; }
-	YY_BREAK
+    YY_BREAK
 case 196:
 YY_RULE_SETUP
-#line 1011 "pir.l"
+#line 1021 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
-	YY_BREAK
+    YY_BREAK
 case 197:
 YY_RULE_SETUP
-#line 1012 "pir.l"
+#line 1022 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
-	YY_BREAK
+    YY_BREAK
 case 198:
 YY_RULE_SETUP
-#line 1013 "pir.l"
+#line 1023 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
-	YY_BREAK
+    YY_BREAK
 case 199:
 YY_RULE_SETUP
-#line 1014 "pir.l"
+#line 1024 "pir.l"
 { yylval->ival = atoi(yytext); return TK_INTC; }
-	YY_BREAK
+    YY_BREAK
 case 200:
 YY_RULE_SETUP
-#line 1016 "pir.l"
+#line 1026 "pir.l"
 { /* copy the string, remove the quotes. */
                           yylval->sval = dupstrn(yypirget_extra(yyscanner), yytext + 1, yyleng - 2);
                           return TK_STRINGC;
                         }
-	YY_BREAK
+    YY_BREAK
 case 201:
 YY_RULE_SETUP
-#line 1021 "pir.l"
+#line 1031 "pir.l"
 { /* ignore whitespace */ }
-	YY_BREAK
+    YY_BREAK
 case 202:
 /* rule 202 can match eol */
 YY_RULE_SETUP
-#line 1023 "pir.l"
+#line 1033 "pir.l"
 { return TK_NL; }
-	YY_BREAK
+    YY_BREAK
 case 203:
 YY_RULE_SETUP
-#line 1025 "pir.l"
+#line 1035 "pir.l"
 { yypirerror(yyscanner, yypirget_extra(yyscanner),
                                      "unrecognized character: %c", yytext[0]);
                         }
-	YY_BREAK
+    YY_BREAK
 case YY_STATE_EOF(PASM):
-#line 1028 "pir.l"
+#line 1038 "pir.l"
 { yyterminate(); }
-	YY_BREAK
+    YY_BREAK
 case 204:
 YY_RULE_SETUP
-#line 1030 "pir.l"
+#line 1040 "pir.l"
 ECHO;
-	YY_BREAK
+    YY_BREAK
 #line 3466 "pirlexer.c"
 case YY_STATE_EOF(MACROHEAD):
 case YY_STATE_EOF(MACROLOCAL):
 case YY_STATE_EOF(MACROLABEL):
 case YY_STATE_EOF(MACROEXPAND):
 case YY_STATE_EOF(SPECIALSTART):
-	yyterminate();
+    yyterminate();
 
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yyg->yy_hold_char;
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yypirlex().  If so, then we have to assure
-			 * 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.
-			 */
-			yyg->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;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state( yyscanner );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
-
-			yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yyg->yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
+    case YY_END_OF_BUFFER:
+        {
+        /* Amount of text matched not including the EOB char. */
+        int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
+
+        /* Undo the effects of YY_DO_BEFORE_ACTION. */
+        *yy_cp = yyg->yy_hold_char;
+        YY_RESTORE_YY_MORE_OFFSET
+
+        if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+            {
+            /* We're scanning a new file or input source.  It's
+             * possible that this happened because the user
+             * just pointed yyin at a new source and called
+             * yypirlex().  If so, then we have to assure
+             * 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.
+             */
+            yyg->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;
+            }
+
+        /* Note that here we test for yy_c_buf_p "<=" to the position
+         * of the first EOB in the buffer, since yy_c_buf_p will
+         * already have been incremented past the NUL character
+         * (since all states make transitions on EOB to the
+         * end-of-buffer state).  Contrast this with the test
+         * in input().
+         */
+        if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
+            { /* This was really a NUL. */
+            yy_state_type yy_next_state;
+
+            yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
+
+            yy_current_state = yy_get_previous_state( yyscanner );
+
+            /* Okay, we're now positioned to make the NUL
+             * transition.  We couldn't have
+             * yy_get_previous_state() go ahead and do it
+             * for us because it doesn't know how to deal
+             * with the possibility of jamming (and we don't
+             * want to build jamming into it because then it
+             * will run more slowly).
+             */
+
+            yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
+
+            yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+
+            if ( yy_next_state )
+                {
+                /* Consume the NUL. */
+                yy_cp = ++yyg->yy_c_buf_p;
+                yy_current_state = yy_next_state;
+                goto yy_match;
+                }
 
-			else
-				{
+            else
+                {
 /* %% [14.0] code to do back-up for compressed tables and set up yy_cp goes here */
-				yy_cp = yyg->yy_last_accepting_cpos;
-				yy_current_state = yyg->yy_last_accepting_state;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer( yyscanner ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yyg->yy_did_buffer_switch_on_eof = 0;
-
-				if ( yypirwrap(yyscanner ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yyg->yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yyg->yy_c_buf_p =
-					yyg->yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state( yyscanner );
-
-				yy_cp = yyg->yy_c_buf_p;
-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yyg->yy_c_buf_p =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
-
-				yy_current_state = yy_get_previous_state( yyscanner );
-
-				yy_cp = yyg->yy_c_buf_p;
-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
+                yy_cp = yyg->yy_last_accepting_cpos;
+                yy_current_state = yyg->yy_last_accepting_state;
+                goto yy_find_action;
+                }
+            }
+
+        else switch ( yy_get_next_buffer( yyscanner ) )
+            {
+            case EOB_ACT_END_OF_FILE:
+                {
+                yyg->yy_did_buffer_switch_on_eof = 0;
+
+                if ( yypirwrap(yyscanner ) )
+                    {
+                    /* Note: because we've taken care in
+                     * yy_get_next_buffer() to have set up
+                     * yytext, we can now set up
+                     * yy_c_buf_p so that if some total
+                     * hoser (like flex itself) wants to
+                     * call the scanner after we return the
+                     * YY_NULL, it'll still work - another
+                     * YY_NULL will get returned.
+                     */
+                    yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
+
+                    yy_act = YY_STATE_EOF(YY_START);
+                    goto do_action;
+                    }
+
+                else
+                    {
+                    if ( ! yyg->yy_did_buffer_switch_on_eof )
+                        YY_NEW_FILE;
+                    }
+                break;
+                }
+
+            case EOB_ACT_CONTINUE_SCAN:
+                yyg->yy_c_buf_p =
+                    yyg->yytext_ptr + yy_amount_of_matched_text;
+
+                yy_current_state = yy_get_previous_state( yyscanner );
+
+                yy_cp = yyg->yy_c_buf_p;
+                yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+                goto yy_match;
+
+            case EOB_ACT_LAST_MATCH:
+                yyg->yy_c_buf_p =
+                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
+
+                yy_current_state = yy_get_previous_state( yyscanner );
+
+                yy_cp = yyg->yy_c_buf_p;
+                yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
+                goto yy_find_action;
+            }
+        break;
+        }
+
+    default:
+        YY_FATAL_ERROR(
+            "fatal flex scanner internal error--no action found" );
+    } /* end of action switch */
+        } /* end of scanning one token */
 } /* end of yypirlex */
 /* %ok-for-header */
 
@@ -3612,9 +3612,9 @@
 /* yy_get_next_buffer - try to read in a new buffer
  *
  * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
+ *  EOB_ACT_LAST_MATCH -
+ *  EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *  EOB_ACT_END_OF_FILE - end of file
  */
 /* %if-c-only */
 static int yy_get_next_buffer (yyscan_t yyscanner)
@@ -3623,134 +3623,126 @@
 /* %endif */
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = yyg->yytext_ptr;
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	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_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
-
-	else
-		{
-			int 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. */
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-
-			int yy_c_buf_p_offset =
-				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yypirrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yyg->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;
-
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			yyg->yy_n_chars, (size_t) num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-		}
-
-	if ( yyg->yy_n_chars == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yypirrestart(yyin  ,yyscanner);
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yypirrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-	}
-
-	yyg->yy_n_chars += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+    register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+    register char *source = yyg->yytext_ptr;
+    register int number_to_move, i;
+    int ret_val;
+
+    if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
+        YY_FATAL_ERROR(
+        "fatal flex scanner internal error--end of buffer missed" );
+
+    if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+        { /* Don't try to fill the buffer, so this is an EOF. */
+        if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
+            {
+            /* We matched a single character, the EOB, so
+             * treat this as a final EOF.
+             */
+            return EOB_ACT_END_OF_FILE;
+            }
+
+        else
+            {
+            /* We matched some text prior to the EOB, first
+             * process it.
+             */
+            return EOB_ACT_LAST_MATCH;
+            }
+        }
+
+    /* Try to read more data. */
+
+    /* First move last chars to start of buffer. */
+    number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
+
+    for ( i = 0; i < number_to_move; ++i )
+        *(dest++) = *(source++);
+
+    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_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
 
-	yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+    else
+        {
+            int 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. */
+
+            /* just a shorter name for the current buffer */
+            YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+            int yy_c_buf_p_offset =
+                (int) (yyg->yy_c_buf_p - b->yy_ch_buf);
+
+            if ( b->yy_is_our_buffer )
+                {
+                int new_size = b->yy_buf_size * 2;
+
+                if ( new_size <= 0 )
+                    b->yy_buf_size += b->yy_buf_size / 8;
+                else
+                    b->yy_buf_size *= 2;
+
+                b->yy_ch_buf = (char *)
+                    /* Include room in for 2 EOB chars. */
+                    yypirrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );
+                }
+            else
+                /* Can't grow it, we don't own it. */
+                b->yy_ch_buf = 0;
+
+            if ( ! b->yy_ch_buf )
+                YY_FATAL_ERROR(
+                "fatal error - scanner input buffer overflow" );
+
+            yyg->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;
+
+            }
+
+        if ( num_to_read > YY_READ_BUF_SIZE )
+            num_to_read = YY_READ_BUF_SIZE;
+
+        /* Read in more data. */
+        YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+            yyg->yy_n_chars, num_to_read );
+
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+        }
+
+    if ( yyg->yy_n_chars == 0 )
+        {
+        if ( number_to_move == YY_MORE_ADJ )
+            {
+            ret_val = EOB_ACT_END_OF_FILE;
+            yypirrestart(yyin  ,yyscanner);
+            }
+
+        else
+            {
+            ret_val = EOB_ACT_LAST_MATCH;
+            YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+                YY_BUFFER_EOF_PENDING;
+            }
+        }
+
+    else
+        ret_val = EOB_ACT_CONTINUE_SCAN;
+
+    yyg->yy_n_chars += number_to_move;
+    YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
+    YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
 
-	return ret_val;
+    yyg->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 */
@@ -3763,38 +3755,38 @@
 /* %if-c++-only */
 /* %endif */
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+    register yy_state_type yy_current_state;
+    register char *yy_cp;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 /* %% [15.0] code to get the start state into yy_current_state goes here */
-	yy_current_state = yyg->yy_start;
+    yy_current_state = yyg->yy_start;
 
-	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
-		{
+    for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
+        {
 /* %% [16.0] code to find the next state goes here */
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			yyg->yy_last_accepting_state = yy_current_state;
-			yyg->yy_last_accepting_cpos = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 803 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
+        register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+        if ( yy_accept[yy_current_state] )
+            {
+            yyg->yy_last_accepting_state = yy_current_state;
+            yyg->yy_last_accepting_cpos = yy_cp;
+            }
+        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+            {
+            yy_current_state = (int) yy_def[yy_current_state];
+            if ( yy_current_state >= 803 )
+                yy_c = yy_meta[(unsigned int) yy_c];
+            }
+        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+        }
 
-	return yy_current_state;
+    return yy_current_state;
 }
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
+ *  next_state = yy_try_NUL_trans( current_state );
  */
 /* %if-c-only */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
@@ -3802,27 +3794,27 @@
 /* %if-c++-only */
 /* %endif */
 {
-	register int yy_is_jam;
+    register int yy_is_jam;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
 /* %% [17.0] code to find the next state, and perhaps do backing up, goes here */
-	register char *yy_cp = yyg->yy_c_buf_p;
+    register char *yy_cp = yyg->yy_c_buf_p;
 
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		yyg->yy_last_accepting_state = yy_current_state;
-		yyg->yy_last_accepting_cpos = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 803 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 802);
+    register YY_CHAR yy_c = 1;
+    if ( yy_accept[yy_current_state] )
+        {
+        yyg->yy_last_accepting_state = yy_current_state;
+        yyg->yy_last_accepting_cpos = yy_cp;
+        }
+    while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+        {
+        yy_current_state = (int) yy_def[yy_current_state];
+        if ( yy_current_state >= 803 )
+            yy_c = yy_meta[(unsigned int) yy_c];
+        }
+    yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+    yy_is_jam = (yy_current_state == 802);
 
-	return yy_is_jam ? 0 : yy_current_state;
+    return yy_is_jam ? 0 : yy_current_state;
 }
 
 /* %if-c-only */
@@ -3841,81 +3833,81 @@
 /* %if-c++-only */
 /* %endif */
 {
-	int c;
+    int c;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	*yyg->yy_c_buf_p = yyg->yy_hold_char;
+    *yyg->yy_c_buf_p = yyg->yy_hold_char;
+
+    if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+        {
+        /* yy_c_buf_p now points to the character we want to return.
+         * If this occurs *before* the EOB characters, then it's a
+         * valid NUL; if not, then we've hit the end of the buffer.
+         */
+        if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
+            /* This was really a NUL. */
+            *yyg->yy_c_buf_p = '\0';
+
+        else
+            { /* need more input */
+            int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
+            ++yyg->yy_c_buf_p;
+
+            switch ( yy_get_next_buffer( yyscanner ) )
+                {
+                case EOB_ACT_LAST_MATCH:
+                    /* This happens because yy_g_n_b()
+                     * sees that we've accumulated a
+                     * token and flags that we need to
+                     * try matching the token before
+                     * proceeding.  But for input(),
+                     * there's no matching to consider.
+                     * So convert the EOB_ACT_LAST_MATCH
+                     * to EOB_ACT_END_OF_FILE.
+                     */
+
+                    /* Reset buffer status. */
+                    yypirrestart(yyin ,yyscanner);
 
-	if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
-			/* This was really a NUL. */
-			*yyg->yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
-			++yyg->yy_c_buf_p;
-
-			switch ( yy_get_next_buffer( yyscanner ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yypirrestart(yyin ,yyscanner);
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yypirwrap(yyscanner ) )
-						return EOF;
+                    /*FALLTHROUGH*/
 
-					if ( ! yyg->yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
+                case EOB_ACT_END_OF_FILE:
+                    {
+                    if ( yypirwrap(yyscanner ) )
+                        return EOF;
+
+                    if ( ! yyg->yy_did_buffer_switch_on_eof )
+                        YY_NEW_FILE;
 #ifdef __cplusplus
-					return yyinput(yyscanner);
+                    return yyinput(yyscanner);
 #else
-					return input(yyscanner);
+                    return input(yyscanner);
 #endif
-					}
+                    }
 
-				case EOB_ACT_CONTINUE_SCAN:
-					yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) yyg->yy_c_buf_p;	/* cast for 8-bit char's */
-	*yyg->yy_c_buf_p = '\0';	/* preserve yytext */
-	yyg->yy_hold_char = *++yyg->yy_c_buf_p;
+                case EOB_ACT_CONTINUE_SCAN:
+                    yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
+                    break;
+                }
+            }
+        }
+
+    c = *(unsigned char *) yyg->yy_c_buf_p; /* cast for 8-bit char's */
+    *yyg->yy_c_buf_p = '\0';    /* preserve yytext */
+    yyg->yy_hold_char = *++yyg->yy_c_buf_p;
 
 /* %% [19.0] update BOL and yylineno */
-	if ( c == '\n' )
-		   
+    if ( c == '\n' )
+
     do{ yylineno++;
         yycolumn=0;
     }while(0)
 ;
 
-	return c;
+    return c;
 }
 /* %if-c-only */
-#endif	/* ifndef YY_NO_INPUT */
+#endif  /* ifndef YY_NO_INPUT */
 /* %endif */
 
 /** Immediately switch to a different input stream.
@@ -3931,14 +3923,14 @@
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	if ( ! YY_CURRENT_BUFFER ){
+    if ( ! YY_CURRENT_BUFFER ){
         yypirensure_buffer_stack (yyscanner);
-		YY_CURRENT_BUFFER_LVALUE =
+        YY_CURRENT_BUFFER_LVALUE =
             yypir_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
-	}
+    }
 
-	yypir_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);
-	yypir_load_buffer_state(yyscanner );
+    yypir_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);
+    yypir_load_buffer_state(yyscanner );
 }
 
 /** Switch to a different input buffer.
@@ -3953,32 +3945,32 @@
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		yypirpop_buffer_state();
-	 *		yypirpush_buffer_state(new_buffer);
+    /* TODO. We should be able to replace this entire function body
+     * with
+     *      yypirpop_buffer_state();
+     *      yypirpush_buffer_state(new_buffer);
+     */
+    yypirensure_buffer_stack (yyscanner);
+    if ( YY_CURRENT_BUFFER == new_buffer )
+        return;
+
+    if ( YY_CURRENT_BUFFER )
+        {
+        /* Flush out information for old buffer. */
+        *yyg->yy_c_buf_p = yyg->yy_hold_char;
+        YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+        }
+
+    YY_CURRENT_BUFFER_LVALUE = new_buffer;
+    yypir_load_buffer_state(yyscanner );
+
+    /* We don't actually know whether we did this switch during
+     * EOF (yypirwrap()) processing, but the only time this flag
+     * is looked at is after yypirwrap() is called, so it's safe
+     * to go ahead and always set it.
      */
-	yypirensure_buffer_stack (yyscanner);
-	if ( YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*yyg->yy_c_buf_p = yyg->yy_hold_char;
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-		}
-
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yypir_load_buffer_state(yyscanner );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yypirwrap()) processing, but the only time this flag
-	 * is looked at is after yypirwrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yyg->yy_did_buffer_switch_on_eof = 1;
+    yyg->yy_did_buffer_switch_on_eof = 1;
 }
 
 /* %if-c-only */
@@ -3988,10 +3980,10 @@
 /* %endif */
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	yyg->yy_hold_char = *yyg->yy_c_buf_p;
+    yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+    yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+    yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+    yyg->yy_hold_char = *yyg->yy_c_buf_p;
 }
 
 /** Allocate and initialize an input buffer state.
@@ -4006,26 +3998,26 @@
 /* %if-c++-only */
 /* %endif */
 {
-	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yypiralloc(sizeof( struct yy_buffer_state ) ,yyscanner );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yypir_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yypiralloc(b->yy_buf_size + 2 ,yyscanner );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yypir_create_buffer()" );
+    YY_BUFFER_STATE b;
 
-	b->yy_is_our_buffer = 1;
+    b = (YY_BUFFER_STATE) yypiralloc(sizeof( struct yy_buffer_state ) ,yyscanner );
+    if ( ! b )
+        YY_FATAL_ERROR( "out of dynamic memory in yypir_create_buffer()" );
 
-	yypir_init_buffer(b,file ,yyscanner);
+    b->yy_buf_size = size;
+
+    /* yy_ch_buf has to be 2 characters longer than the size given because
+     * we need to put in 2 end-of-buffer characters.
+     */
+    b->yy_ch_buf = (char *) yypiralloc(b->yy_buf_size + 2 ,yyscanner );
+    if ( ! b->yy_ch_buf )
+        YY_FATAL_ERROR( "out of dynamic memory in yypir_create_buffer()" );
 
-	return b;
+    b->yy_is_our_buffer = 1;
+
+    yypir_init_buffer(b,file ,yyscanner);
+
+    return b;
 }
 
 /** Destroy the buffer.
@@ -4040,16 +4032,16 @@
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	if ( ! b )
-		return;
+    if ( ! b )
+        return;
 
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (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 )
-		yypirfree((void *) b->yy_ch_buf ,yyscanner );
+    if ( b->yy_is_our_buffer )
+        yypirfree((void *) b->yy_ch_buf ,yyscanner );
 
-	yypirfree((void *) b ,yyscanner );
+    yypirfree((void *) b ,yyscanner );
 }
 
 /* %if-c-only */
@@ -4070,13 +4062,13 @@
 /* %endif */
 
 {
-	int oerrno = errno;
+    int oerrno = errno;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	yypir_flush_buffer(b ,yyscanner);
+    yypir_flush_buffer(b ,yyscanner);
 
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
+    b->yy_input_file = file;
+    b->yy_fill_buffer = 1;
 
     /* If b is the current buffer, then yypir_init_buffer was _probably_
      * called from yypirrestart() or through yy_get_next_buffer.
@@ -4090,11 +4082,11 @@
 /* %if-c-only */
 
         b->yy_is_interactive = 0;
-    
+
 /* %endif */
 /* %if-c++-only */
 /* %endif */
-	errno = oerrno;
+    errno = oerrno;
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
@@ -4108,25 +4100,25 @@
 /* %endif */
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if ( ! b )
-		return;
+    if ( ! b )
+        return;
 
-	b->yy_n_chars = 0;
+    b->yy_n_chars = 0;
 
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+    /* We always need two end-of-buffer characters.  The first causes
+     * a transition to the end-of-buffer state.  The second causes
+     * a jam in that state.
+     */
+    b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+    b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
 
-	b->yy_buf_pos = &b->yy_ch_buf[0];
+    b->yy_buf_pos = &b->yy_ch_buf[0];
 
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
+    b->yy_at_bol = 1;
+    b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == YY_CURRENT_BUFFER )
-		yypir_load_buffer_state(yyscanner );
+    if ( b == YY_CURRENT_BUFFER )
+        yypir_load_buffer_state(yyscanner );
 }
 
 /* %if-c-or-c++ */
@@ -4143,28 +4135,28 @@
 /* %endif */
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if (new_buffer == NULL)
-		return;
+    if (new_buffer == NULL)
+        return;
 
-	yypirensure_buffer_stack(yyscanner);
+    yypirensure_buffer_stack(yyscanner);
 
-	/* This block is copied from yypir_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*yyg->yy_c_buf_p = yyg->yy_hold_char;
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		yyg->yy_buffer_stack_top++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from yypir_switch_to_buffer. */
-	yypir_load_buffer_state(yyscanner );
-	yyg->yy_did_buffer_switch_on_eof = 1;
+    /* This block is copied from yypir_switch_to_buffer. */
+    if ( YY_CURRENT_BUFFER )
+        {
+        /* Flush out information for old buffer. */
+        *yyg->yy_c_buf_p = yyg->yy_hold_char;
+        YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
+        }
+
+    /* Only push if top exists. Otherwise, replace top. */
+    if (YY_CURRENT_BUFFER)
+        yyg->yy_buffer_stack_top++;
+    YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+    /* copied from yypir_switch_to_buffer. */
+    yypir_load_buffer_state(yyscanner );
+    yyg->yy_did_buffer_switch_on_eof = 1;
 }
 /* %endif */
 
@@ -4180,18 +4172,18 @@
 /* %endif */
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if (!YY_CURRENT_BUFFER)
-		return;
+    if (!YY_CURRENT_BUFFER)
+        return;
 
-	yypir_delete_buffer(YY_CURRENT_BUFFER ,yyscanner);
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if (yyg->yy_buffer_stack_top > 0)
-		--yyg->yy_buffer_stack_top;
-
-	if (YY_CURRENT_BUFFER) {
-		yypir_load_buffer_state(yyscanner );
-		yyg->yy_did_buffer_switch_on_eof = 1;
-	}
+    yypir_delete_buffer(YY_CURRENT_BUFFER ,yyscanner);
+    YY_CURRENT_BUFFER_LVALUE = NULL;
+    if (yyg->yy_buffer_stack_top > 0)
+        --yyg->yy_buffer_stack_top;
+
+    if (YY_CURRENT_BUFFER) {
+        yypir_load_buffer_state(yyscanner );
+        yyg->yy_did_buffer_switch_on_eof = 1;
+    }
 }
 /* %endif */
 
@@ -4205,46 +4197,42 @@
 /* %if-c++-only */
 /* %endif */
 {
-	int num_to_alloc;
+    int num_to_alloc;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-	if (!yyg->yy_buffer_stack) {
+    if (!yyg->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.
+        /* 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;
-		yyg->yy_buffer_stack = (struct yy_buffer_state**)yypiralloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								, yyscanner);
-		if ( ! yyg->yy_buffer_stack )
-			YY_FATAL_ERROR( "out of dynamic memory in yypirensure_buffer_stack()" );
-								  
-		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		yyg->yy_buffer_stack_max = num_to_alloc;
-		yyg->yy_buffer_stack_top = 0;
-		return;
-	}
-
-	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
-		yyg->yy_buffer_stack = (struct yy_buffer_state**)yypirrealloc
-								(yyg->yy_buffer_stack,
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								, yyscanner);
-		if ( ! yyg->yy_buffer_stack )
-			YY_FATAL_ERROR( "out of dynamic memory in yypirensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
-		yyg->yy_buffer_stack_max = num_to_alloc;
-	}
+        num_to_alloc = 1;
+        yyg->yy_buffer_stack = (struct yy_buffer_state**)yypiralloc
+                                (num_to_alloc * sizeof(struct yy_buffer_state*)
+                                , yyscanner);
+
+        memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+
+        yyg->yy_buffer_stack_max = num_to_alloc;
+        yyg->yy_buffer_stack_top = 0;
+        return;
+    }
+
+    if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
+
+        /* Increase the buffer to prepare for a possible push. */
+        int grow_size = 8 /* arbitrary grow size */;
+
+        num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
+        yyg->yy_buffer_stack = (struct yy_buffer_state**)yypirrealloc
+                                (yyg->yy_buffer_stack,
+                                num_to_alloc * sizeof(struct yy_buffer_state*)
+                                , yyscanner);
+
+        /* zero only the new slots.*/
+        memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
+        yyg->yy_buffer_stack_max = num_to_alloc;
+    }
 }
 /* %endif */
 
@@ -4253,42 +4241,42 @@
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
  * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object. 
+ * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE yypir_scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
 {
-	YY_BUFFER_STATE b;
-    
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yypiralloc(sizeof( struct yy_buffer_state ) ,yyscanner );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yypir_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
+    YY_BUFFER_STATE b;
 
-	yypir_switch_to_buffer(b ,yyscanner );
+    if ( size < 2 ||
+         base[size-2] != YY_END_OF_BUFFER_CHAR ||
+         base[size-1] != YY_END_OF_BUFFER_CHAR )
+        /* They forgot to leave room for the EOB's. */
+        return 0;
+
+    b = (YY_BUFFER_STATE) yypiralloc(sizeof( struct yy_buffer_state ) ,yyscanner );
+    if ( ! b )
+        YY_FATAL_ERROR( "out of dynamic memory in yypir_scan_buffer()" );
+
+    b->yy_buf_size = size - 2;  /* "- 2" to take care of EOB's */
+    b->yy_buf_pos = b->yy_ch_buf = base;
+    b->yy_is_our_buffer = 0;
+    b->yy_input_file = 0;
+    b->yy_n_chars = b->yy_buf_size;
+    b->yy_is_interactive = 0;
+    b->yy_at_bol = 1;
+    b->yy_fill_buffer = 0;
+    b->yy_buffer_status = YY_BUFFER_NEW;
 
-	return b;
+    yypir_switch_to_buffer(b ,yyscanner );
+
+    return b;
 }
 /* %endif */
 
 /* %if-c-only */
 /** Setup the input buffer state to scan a string. The next call to yypirlex() will
  * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
+ * @param str a NUL-terminated string to scan
  * @param yyscanner The scanner object.
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
@@ -4296,8 +4284,8 @@
  */
 YY_BUFFER_STATE yypir_scan_string (yyconst char * yystr , yyscan_t yyscanner)
 {
-    
-	return yypir_scan_bytes(yystr,strlen(yystr) ,yyscanner);
+
+    return yypir_scan_bytes(yystr,strlen(yystr) ,yyscanner);
 }
 /* %endif */
 
@@ -4311,32 +4299,32 @@
  */
 YY_BUFFER_STATE yypir_scan_bytes  (yyconst char * yybytes, int  _yybytes_len , yyscan_t yyscanner)
 {
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-    
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) yypiralloc(n ,yyscanner );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yypir_scan_bytes()" );
-
-	for ( i = 0; i < _yybytes_len; ++i )
-		buf[i] = yybytes[i];
-
-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yypir_scan_buffer(buf,n ,yyscanner);
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yypir_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
+    YY_BUFFER_STATE b;
+    char *buf;
+    yy_size_t n;
+    int i;
+
+    /* Get memory for full buffer, including space for trailing EOB's. */
+    n = _yybytes_len + 2;
+    buf = (char *) yypiralloc(n ,yyscanner );
+    if ( ! buf )
+        YY_FATAL_ERROR( "out of dynamic memory in yypir_scan_bytes()" );
+
+    for ( i = 0; i < _yybytes_len; ++i )
+        buf[i] = yybytes[i];
+
+    buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+    b = yypir_scan_buffer(buf,n ,yyscanner);
+    if ( ! b )
+        YY_FATAL_ERROR( "bad buffer in yypir_scan_bytes()" );
 
-	return b;
+    /* It's okay to grow etc. this buffer, and we should throw it
+     * away when we're done.
+     */
+    b->yy_is_our_buffer = 1;
+
+    return b;
 }
 /* %endif */
 
@@ -4347,26 +4335,27 @@
 /* %endif */
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if ( yyg->yy_start_stack_ptr >= yyg->yy_start_stack_depth )
-		{
-		yy_size_t new_size;
+    if ( yyg->yy_start_stack_ptr >= yyg->yy_start_stack_depth )
+        {
+        yy_size_t new_size;
 
-		yyg->yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yyg->yy_start_stack_depth * sizeof( int );
+        yyg->yy_start_stack_depth += YY_START_STACK_INCR;
+        new_size = yyg->yy_start_stack_depth * sizeof( int );
 
-		if ( ! yyg->yy_start_stack )
-			yyg->yy_start_stack = (int *) yypiralloc(new_size ,yyscanner );
+        if ( ! yyg->yy_start_stack )
+            yyg->yy_start_stack = (int *) yypiralloc(new_size ,yyscanner );
 
-		else
-			yyg->yy_start_stack = (int *) yypirrealloc((void *) yyg->yy_start_stack,new_size ,yyscanner );
+        else
+            yyg->yy_start_stack = (int *) yypirrealloc((void *) yyg->yy_start_stack,new_size ,yyscanner );
 
-		if ( ! yyg->yy_start_stack )
-			YY_FATAL_ERROR( "out of memory expanding start-condition stack" );
-		}
+        if ( ! yyg->yy_start_stack )
+            YY_FATAL_ERROR(
+            "out of memory expanding start-condition stack" );
+        }
 
-	yyg->yy_start_stack[yyg->yy_start_stack_ptr++] = YY_START;
+    yyg->yy_start_stack[yyg->yy_start_stack_ptr++] = YY_START;
 
-	BEGIN(new_state);
+    BEGIN(new_state);
 }
 
 /* %if-c-only */
@@ -4376,10 +4365,10 @@
 /* %endif */
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if ( --yyg->yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
+    if ( --yyg->yy_start_stack_ptr < 0 )
+        YY_FATAL_ERROR( "start-condition stack underflow" );
 
-	BEGIN(yyg->yy_start_stack[yyg->yy_start_stack_ptr]);
+    BEGIN(yyg->yy_start_stack[yyg->yy_start_stack_ptr]);
 }
 
 /* %if-c-only */
@@ -4389,7 +4378,7 @@
 /* %endif */
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	return yyg->yy_start_stack[yyg->yy_start_stack_ptr - 1];
+    return yyg->yy_start_stack[yyg->yy_start_stack_ptr - 1];
 }
 
 #ifndef YY_EXIT_FAILURE
@@ -4399,8 +4388,8 @@
 /* %if-c-only */
 static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
 {
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
+        (void) fprintf( stderr, "%s\n", msg );
+    exit( YY_EXIT_FAILURE );
 }
 /* %endif */
 /* %if-c++-only */
@@ -4410,18 +4399,18 @@
 
 #undef yyless
 #define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
+    do \
+        { \
+        /* Undo effects of setting up yytext. */ \
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
-		yytext[yyleng] = yyg->yy_hold_char; \
-		yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
-		yyg->yy_hold_char = *yyg->yy_c_buf_p; \
-		*yyg->yy_c_buf_p = '\0'; \
-		yyleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
+        yytext[yyleng] = yyg->yy_hold_char; \
+        yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
+        yyg->yy_hold_char = *yyg->yy_c_buf_p; \
+        *yyg->yy_c_buf_p = '\0'; \
+        yyleng = yyless_macro_arg; \
+        } \
+    while ( 0 )
 
 /* Accessor  methods (get/set functions) to struct members. */
 
@@ -4445,10 +4434,10 @@
 int yypirget_lineno  (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
+
         if (! YY_CURRENT_BUFFER)
             return 0;
-    
+
     return yylineno;
 }
 
@@ -4458,10 +4447,10 @@
 int yypirget_column  (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
+
         if (! YY_CURRENT_BUFFER)
             return 0;
-    
+
     return yycolumn;
 }
 
@@ -4526,8 +4515,8 @@
 
         /* lineno is only valid if an input buffer exists. */
         if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "yypirset_lineno called with no buffer" , yyscanner); 
-    
+           yy_fatal_error( "yypirset_lineno called with no buffer" , yyscanner);
+
     yylineno = line_number;
 }
 
@@ -4541,8 +4530,8 @@
 
         /* column is only valid if an input buffer exists. */
         if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "yypirset_column called with no buffer" , yyscanner); 
-    
+           yy_fatal_error( "yypirset_column called with no buffer" , yyscanner);
+
     yycolumn = column_no;
 }
 
@@ -4625,43 +4614,7 @@
     return yy_init_globals ( *ptr_yy_globals );
 }
 
-/* yypirlex_init_extra has the same functionality as yypirlex_init, but follows the
- * convention of taking the scanner as the last argument. Note however, that
- * this is a *pointer* to a scanner, as it will be allocated by this call (and
- * is the reason, too, why this function also must handle its own declaration).
- * The user defined value in the first argument will be available to yypiralloc in
- * the yyextra field.
- */
-
-int yypirlex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
-
-{
-    struct yyguts_t dummy_yyguts;
-
-    yypirset_extra (yy_user_defined, &dummy_yyguts);
-
-    if (ptr_yy_globals == NULL){
-        errno = EINVAL;
-        return 1;
-    }
-	
-    *ptr_yy_globals = (yyscan_t) yypiralloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
-	
-    if (*ptr_yy_globals == NULL){
-        errno = ENOMEM;
-        return 1;
-    }
-    
-    /* By setting to 0xAA, we expose bugs in
-    yy_init_globals. Leave at 0x00 for releases. */
-    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-    
-    yypirset_extra (yy_user_defined, *ptr_yy_globals);
-    
-    return yy_init_globals ( *ptr_yy_globals );
-}
-
-/* %endif if-c-only */
+/* %endif */
 
 /* %if-c-only */
 static int yy_init_globals (yyscan_t yyscanner)
@@ -4705,15 +4658,15 @@
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
     /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		yypir_delete_buffer(YY_CURRENT_BUFFER ,yyscanner );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		yypirpop_buffer_state(yyscanner);
-	}
-
-	/* Destroy the stack itself. */
-	yypirfree(yyg->yy_buffer_stack ,yyscanner);
-	yyg->yy_buffer_stack = NULL;
+    while(YY_CURRENT_BUFFER){
+        yypir_delete_buffer(YY_CURRENT_BUFFER ,yyscanner );
+        YY_CURRENT_BUFFER_LVALUE = NULL;
+        yypirpop_buffer_state(yyscanner);
+    }
+
+    /* Destroy the stack itself. */
+    yypirfree(yyg->yy_buffer_stack ,yyscanner);
+    yyg->yy_buffer_stack = NULL;
 
     /* Destroy the start condition stack. */
         yypirfree(yyg->yy_start_stack ,yyscanner );
@@ -4739,20 +4692,20 @@
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
 {
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
+    register int i;
+    for ( i = 0; i < n; ++i )
+        s1[i] = s2[i];
 }
 #endif
 
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
 {
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
+    register int n;
+    for ( n = 0; s[n]; ++n )
+        ;
 
-	return n;
+    return n;
 }
 #endif
 
@@ -4763,7 +4716,7 @@
 
 /* %ok-for-header */
 
-#line 1030 "pir.l"
+#line 1040 "pir.l"
 
 
 

Modified: trunk/compilers/pirc/new/pirlexer.h
==============================================================================
--- trunk/compilers/pirc/new/pirlexer.h	(original)
+++ trunk/compilers/pirc/new/pirlexer.h	Sat Dec 27 12:51:36 2008
@@ -48,12 +48,10 @@
 
 /* A lexical scanner generated by flex */
 
-/* %not-for-header */
-
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_SUBMINOR_VERSION 33
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -62,7 +60,7 @@
 /* %endif */
 
 /* %if-c-only */
-    
+
 /* %endif */
 
 /* %if-c-only */
@@ -91,10 +89,10 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#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. 
+ * if you want the limit (max/min) macros for int types.
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
@@ -111,7 +109,7 @@
 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 char flex_uint8_t;
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 #endif /* ! C99 */
@@ -157,15 +155,14 @@
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
-#else	/* ! __cplusplus */
+#else   /* ! __cplusplus */
 
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
+#if __STDC__
 
 #define YY_USE_CONST
 
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
+#endif  /* __STDC__ */
+#endif  /* ! __cplusplus */
 
 #ifdef YY_USE_CONST
 #define yyconst const
@@ -196,16 +193,12 @@
 #define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
 #define yy_flex_debug yyg->yy_flex_debug_r
 
+int yypirlex_init (yyscan_t* scanner);
 /* %endif */
 
 /* %if-not-reentrant */
 /* %endif */
 
-/* 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;
@@ -219,65 +212,70 @@
 /* %endif */
 /* %endif */
 
+/* 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 size_t 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
-	{
+    {
 /* %if-c-only */
-	FILE *yy_input_file;
+    FILE *yy_input_file;
 /* %endif */
 
 /* %if-c++-only */
 /* %endif */
 
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
+    char *yy_ch_buf;        /* input buffer */
+    char *yy_buf_pos;       /* current position in input buffer */
 
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
+    /* Size of input buffer in bytes, not including room for EOB
+     * characters.
+     */
+    yy_size_t yy_buf_size;
+
+    /* Number of characters read into yy_ch_buf, not including EOB
+     * characters.
+     */
+    int yy_n_chars;
+
+    /* Whether we "own" the buffer - i.e., we know we created it,
+     * and can realloc() it to grow it, and should free() it to
+     * delete it.
+     */
+    int yy_is_our_buffer;
+
+    /* Whether this is an "interactive" input source; if so, and
+     * if we're using stdio for input, then we want to use getc()
+     * instead of fread(), to make sure we stop fetching input after
+     * each newline.
+     */
+    int yy_is_interactive;
+
+    /* Whether we're considered to be at the beginning of a line.
+     * If so, '^' rules will be active on the next match, otherwise
+     * not.
+     */
+    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;
+    /* Whether to try to fill the input buffer when we reach the
+     * end of it.
+     */
+    int yy_fill_buffer;
 
-	};
+    int yy_buffer_status;
+
+    };
 #endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
 /* %if-c-only Standard (non-C++) definition */
@@ -365,14 +363,8 @@
 
 /* %if-reentrant */
 
-int yypirlex_init (yyscan_t* scanner);
-
-int yypirlex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
-
 /* %endif */
 
-/* %endif End reentrant structures and macros. */
-
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
@@ -409,6 +401,7 @@
 void yypirset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
 
 /* %endif */
+/* %endif End reentrant structures and macros. */
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -467,11 +460,9 @@
 #define YY_DECL_IS_OURS 1
 /* %if-c-only Standard (non-C++) definition */
 
-extern int yypirlex \
-               (YYSTYPE * yylval_param ,yyscan_t yyscanner);
+extern int yypirlex (YYSTYPE * yylval_param ,yyscan_t yyscanner);
 
-#define YY_DECL int yypirlex \
-               (YYSTYPE * yylval_param , yyscan_t yyscanner)
+#define YY_DECL int yypirlex (YYSTYPE * yylval_param , yyscan_t yyscanner)
 /* %endif */
 /* %if-c++-only C++ definition */
 /* %endif */
@@ -501,9 +492,9 @@
 #undef YY_DECL
 #endif
 
-#line 1030 "pir.l"
+#line 1040 "pir.l"
 
 
-#line 508 "pirlexer.h"
+#line 499 "pirlexer.h"
 #undef yypirIN_HEADER
 #endif /* yypirHEADER_H */

Modified: trunk/compilers/pirc/new/pirparser.c
==============================================================================
--- trunk/compilers/pirc/new/pirparser.c	(original)
+++ trunk/compilers/pirc/new/pirparser.c	Sat Dec 27 12:51:36 2008
@@ -124,71 +124,72 @@
      TK_NREG = 305,
      TK_SREG = 306,
      TK_IREG = 307,
-     TK_ARROW = 308,
-     TK_NE = 309,
-     TK_EQ = 310,
-     TK_LT = 311,
-     TK_LE = 312,
-     TK_GT = 313,
-     TK_GE = 314,
-     TK_USHIFT = 315,
-     TK_RSHIFT = 316,
-     TK_LSHIFT = 317,
-     TK_FDIV = 318,
-     TK_OR = 319,
-     TK_AND = 320,
-     TK_XOR = 321,
-     TK_CONC = 322,
-     TK_ASSIGN_USHIFT = 323,
-     TK_ASSIGN_RSHIFT = 324,
-     TK_ASSIGN_LSHIFT = 325,
-     TK_ASSIGN_INC = 326,
-     TK_ASSIGN_DEC = 327,
-     TK_ASSIGN_MUL = 328,
-     TK_ASSIGN_MOD = 329,
-     TK_ASSIGN_POW = 330,
-     TK_ASSIGN_DIV = 331,
-     TK_ASSIGN_BOR = 332,
-     TK_ASSIGN_BAND = 333,
-     TK_ASSIGN_FDIV = 334,
-     TK_ASSIGN_BNOT = 335,
-     TK_ASSIGN_CONC = 336,
-     TK_FLAG_INIT = 337,
-     TK_FLAG_LOAD = 338,
-     TK_FLAG_MAIN = 339,
-     TK_FLAG_ANON = 340,
-     TK_FLAG_METHOD = 341,
-     TK_FLAG_OUTER = 342,
-     TK_FLAG_VTABLE = 343,
-     TK_FLAG_LEX = 344,
-     TK_FLAG_MULTI = 345,
-     TK_FLAG_POSTCOMP = 346,
-     TK_FLAG_IMMEDIATE = 347,
-     TK_FLAG_SUBID = 348,
-     TK_FLAG_INSTANCEOF = 349,
-     TK_FLAG_NSENTRY = 350,
-     TK_FLAG_UNIQUE_REG = 351,
-     TK_FLAG_NAMED = 352,
-     TK_FLAG_SLURPY = 353,
-     TK_FLAG_FLAT = 354,
-     TK_FLAG_OPTIONAL = 355,
-     TK_FLAG_OPT_FLAG = 356,
-     TK_FLAG_INVOCANT = 357,
-     TK_MACRO = 358,
-     TK_ENDM = 359,
-     TK_MACRO_LOCAL = 360,
-     TK_MACRO_LABEL = 361,
-     TK_MACRO_CONST = 362,
-     TK_MACRO_LABEL_ID = 363,
-     TK_MACRO_LOCAL_ID = 364,
-     TK_MACRO_IDENT = 365,
-     TK_MACRO_ARG_IDENT = 366,
-     TK_MACRO_ARG_OTHER = 367,
-     TK_MACRO_CONST_VAL = 368,
-     TK_PASM_MARKER_START = 369,
-     TK_PIR_MARKER_START = 370,
-     TK_PCC_SUB = 371,
-     TK_PARROT_OP = 372
+     TK_CONST_VALUE = 308,
+     TK_ARROW = 309,
+     TK_NE = 310,
+     TK_EQ = 311,
+     TK_LT = 312,
+     TK_LE = 313,
+     TK_GT = 314,
+     TK_GE = 315,
+     TK_USHIFT = 316,
+     TK_RSHIFT = 317,
+     TK_LSHIFT = 318,
+     TK_FDIV = 319,
+     TK_OR = 320,
+     TK_AND = 321,
+     TK_XOR = 322,
+     TK_CONC = 323,
+     TK_ASSIGN_USHIFT = 324,
+     TK_ASSIGN_RSHIFT = 325,
+     TK_ASSIGN_LSHIFT = 326,
+     TK_ASSIGN_INC = 327,
+     TK_ASSIGN_DEC = 328,
+     TK_ASSIGN_MUL = 329,
+     TK_ASSIGN_MOD = 330,
+     TK_ASSIGN_POW = 331,
+     TK_ASSIGN_DIV = 332,
+     TK_ASSIGN_BOR = 333,
+     TK_ASSIGN_BAND = 334,
+     TK_ASSIGN_FDIV = 335,
+     TK_ASSIGN_BNOT = 336,
+     TK_ASSIGN_CONC = 337,
+     TK_FLAG_INIT = 338,
+     TK_FLAG_LOAD = 339,
+     TK_FLAG_MAIN = 340,
+     TK_FLAG_ANON = 341,
+     TK_FLAG_METHOD = 342,
+     TK_FLAG_OUTER = 343,
+     TK_FLAG_VTABLE = 344,
+     TK_FLAG_LEX = 345,
+     TK_FLAG_MULTI = 346,
+     TK_FLAG_POSTCOMP = 347,
+     TK_FLAG_IMMEDIATE = 348,
+     TK_FLAG_SUBID = 349,
+     TK_FLAG_INSTANCEOF = 350,
+     TK_FLAG_NSENTRY = 351,
+     TK_FLAG_UNIQUE_REG = 352,
+     TK_FLAG_NAMED = 353,
+     TK_FLAG_SLURPY = 354,
+     TK_FLAG_FLAT = 355,
+     TK_FLAG_OPTIONAL = 356,
+     TK_FLAG_OPT_FLAG = 357,
+     TK_FLAG_INVOCANT = 358,
+     TK_MACRO = 359,
+     TK_ENDM = 360,
+     TK_MACRO_LOCAL = 361,
+     TK_MACRO_LABEL = 362,
+     TK_MACRO_CONST = 363,
+     TK_MACRO_LABEL_ID = 364,
+     TK_MACRO_LOCAL_ID = 365,
+     TK_MACRO_IDENT = 366,
+     TK_MACRO_ARG_IDENT = 367,
+     TK_MACRO_ARG_OTHER = 368,
+     TK_MACRO_CONST_VAL = 369,
+     TK_PASM_MARKER_START = 370,
+     TK_PIR_MARKER_START = 371,
+     TK_PCC_SUB = 372,
+     TK_PARROT_OP = 373
    };
 #endif
 /* Tokens.  */
@@ -242,71 +243,72 @@
 #define TK_NREG 305
 #define TK_SREG 306
 #define TK_IREG 307
-#define TK_ARROW 308
-#define TK_NE 309
-#define TK_EQ 310
-#define TK_LT 311
-#define TK_LE 312
-#define TK_GT 313
-#define TK_GE 314
-#define TK_USHIFT 315
-#define TK_RSHIFT 316
-#define TK_LSHIFT 317
-#define TK_FDIV 318
-#define TK_OR 319
-#define TK_AND 320
-#define TK_XOR 321
-#define TK_CONC 322
-#define TK_ASSIGN_USHIFT 323
-#define TK_ASSIGN_RSHIFT 324
-#define TK_ASSIGN_LSHIFT 325
-#define TK_ASSIGN_INC 326
-#define TK_ASSIGN_DEC 327
-#define TK_ASSIGN_MUL 328
-#define TK_ASSIGN_MOD 329
-#define TK_ASSIGN_POW 330
-#define TK_ASSIGN_DIV 331
-#define TK_ASSIGN_BOR 332
-#define TK_ASSIGN_BAND 333
-#define TK_ASSIGN_FDIV 334
-#define TK_ASSIGN_BNOT 335
-#define TK_ASSIGN_CONC 336
-#define TK_FLAG_INIT 337
-#define TK_FLAG_LOAD 338
-#define TK_FLAG_MAIN 339
-#define TK_FLAG_ANON 340
-#define TK_FLAG_METHOD 341
-#define TK_FLAG_OUTER 342
-#define TK_FLAG_VTABLE 343
-#define TK_FLAG_LEX 344
-#define TK_FLAG_MULTI 345
-#define TK_FLAG_POSTCOMP 346
-#define TK_FLAG_IMMEDIATE 347
-#define TK_FLAG_SUBID 348
-#define TK_FLAG_INSTANCEOF 349
-#define TK_FLAG_NSENTRY 350
-#define TK_FLAG_UNIQUE_REG 351
-#define TK_FLAG_NAMED 352
-#define TK_FLAG_SLURPY 353
-#define TK_FLAG_FLAT 354
-#define TK_FLAG_OPTIONAL 355
-#define TK_FLAG_OPT_FLAG 356
-#define TK_FLAG_INVOCANT 357
-#define TK_MACRO 358
-#define TK_ENDM 359
-#define TK_MACRO_LOCAL 360
-#define TK_MACRO_LABEL 361
-#define TK_MACRO_CONST 362
-#define TK_MACRO_LABEL_ID 363
-#define TK_MACRO_LOCAL_ID 364
-#define TK_MACRO_IDENT 365
-#define TK_MACRO_ARG_IDENT 366
-#define TK_MACRO_ARG_OTHER 367
-#define TK_MACRO_CONST_VAL 368
-#define TK_PASM_MARKER_START 369
-#define TK_PIR_MARKER_START 370
-#define TK_PCC_SUB 371
-#define TK_PARROT_OP 372
+#define TK_CONST_VALUE 308
+#define TK_ARROW 309
+#define TK_NE 310
+#define TK_EQ 311
+#define TK_LT 312
+#define TK_LE 313
+#define TK_GT 314
+#define TK_GE 315
+#define TK_USHIFT 316
+#define TK_RSHIFT 317
+#define TK_LSHIFT 318
+#define TK_FDIV 319
+#define TK_OR 320
+#define TK_AND 321
+#define TK_XOR 322
+#define TK_CONC 323
+#define TK_ASSIGN_USHIFT 324
+#define TK_ASSIGN_RSHIFT 325
+#define TK_ASSIGN_LSHIFT 326
+#define TK_ASSIGN_INC 327
+#define TK_ASSIGN_DEC 328
+#define TK_ASSIGN_MUL 329
+#define TK_ASSIGN_MOD 330
+#define TK_ASSIGN_POW 331
+#define TK_ASSIGN_DIV 332
+#define TK_ASSIGN_BOR 333
+#define TK_ASSIGN_BAND 334
+#define TK_ASSIGN_FDIV 335
+#define TK_ASSIGN_BNOT 336
+#define TK_ASSIGN_CONC 337
+#define TK_FLAG_INIT 338
+#define TK_FLAG_LOAD 339
+#define TK_FLAG_MAIN 340
+#define TK_FLAG_ANON 341
+#define TK_FLAG_METHOD 342
+#define TK_FLAG_OUTER 343
+#define TK_FLAG_VTABLE 344
+#define TK_FLAG_LEX 345
+#define TK_FLAG_MULTI 346
+#define TK_FLAG_POSTCOMP 347
+#define TK_FLAG_IMMEDIATE 348
+#define TK_FLAG_SUBID 349
+#define TK_FLAG_INSTANCEOF 350
+#define TK_FLAG_NSENTRY 351
+#define TK_FLAG_UNIQUE_REG 352
+#define TK_FLAG_NAMED 353
+#define TK_FLAG_SLURPY 354
+#define TK_FLAG_FLAT 355
+#define TK_FLAG_OPTIONAL 356
+#define TK_FLAG_OPT_FLAG 357
+#define TK_FLAG_INVOCANT 358
+#define TK_MACRO 359
+#define TK_ENDM 360
+#define TK_MACRO_LOCAL 361
+#define TK_MACRO_LABEL 362
+#define TK_MACRO_CONST 363
+#define TK_MACRO_LABEL_ID 364
+#define TK_MACRO_LOCAL_ID 365
+#define TK_MACRO_IDENT 366
+#define TK_MACRO_ARG_IDENT 367
+#define TK_MACRO_ARG_OTHER 368
+#define TK_MACRO_CONST_VAL 369
+#define TK_PASM_MARKER_START 370
+#define TK_PIR_MARKER_START 371
+#define TK_PCC_SUB 372
+#define TK_PARROT_OP 373
 
 
 
@@ -578,7 +580,7 @@
     struct macro_param *pval;
 }
 /* Line 187 of yacc.c.  */
-#line 582 "pirparser.c"
+#line 584 "pirparser.c"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -591,7 +593,7 @@
 
 
 /* Line 216 of yacc.c.  */
-#line 595 "pirparser.c"
+#line 597 "pirparser.c"
 
 #ifdef short
 # undef short
@@ -806,20 +808,20 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  10
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1014
+#define YYLAST   1009
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  138
+#define YYNTOKENS  139
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  163
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  415
+#define YYNRULES  416
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  646
+#define YYNSTATES  647
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   373
+#define YYMAXUTOK   374
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -830,16 +832,16 @@
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   129,     2,     2,     2,   134,   136,     2,
-     118,   119,   133,   131,   120,   128,   127,   132,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,   124,
-       2,   121,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,   130,     2,     2,     2,   135,   137,     2,
+     119,   120,   134,   132,   121,   129,   128,   133,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,   125,
+       2,   122,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   122,     2,   123,     2,     2,     2,     2,     2,     2,
+       2,   123,     2,   124,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   125,   135,   126,   130,     2,     2,     2,
+       2,     2,     2,   126,   136,   127,   131,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -864,7 +866,7 @@
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   137
+     115,   116,   117,   118,   138
 };
 
 #if YYDEBUG
@@ -911,180 +913,181 @@
     1067,  1069,  1071,  1073,  1075,  1077,  1079,  1081,  1083,  1085,
     1087,  1089,  1091,  1093,  1095,  1097,  1099,  1101,  1103,  1105,
     1107,  1109,  1111,  1113,  1115,  1117,  1119,  1121,  1123,  1125,
-    1127,  1129,  1131,  1133,  1135,  1137,  1139,  1141,  1143,  1146,
-    1148,  1150,  1153,  1155,  1158,  1160,  1163,  1166,  1168,  1171,
-    1174,  1176,  1178,  1180,  1184,  1186
+    1127,  1129,  1131,  1133,  1135,  1137,  1139,  1141,  1143,  1145,
+    1148,  1150,  1152,  1155,  1157,  1160,  1162,  1165,  1168,  1170,
+    1173,  1176,  1178,  1180,  1182,  1186,  1188
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     139,     0,    -1,   115,   140,    -1,   114,   292,    -1,   141,
-     142,   141,    -1,    -1,    35,    -1,   143,    -1,   142,    35,
-     143,    -1,   166,    -1,   277,    -1,   162,    -1,   160,    -1,
-     161,    -1,   157,    -1,   158,    -1,   159,    -1,   144,    -1,
-     145,    -1,   146,    -1,   107,    37,   113,    -1,   147,   118,
-     148,   119,    35,   151,   104,    -1,   103,   287,    -1,    -1,
-     149,    -1,   150,    -1,   149,   120,   150,    -1,   287,    -1,
-      -1,   152,    -1,   153,    -1,   152,   153,    -1,   154,    35,
-      -1,   155,    -1,   156,    -1,   106,   108,    -1,   105,   283,
-     109,    -1,     5,    46,    -1,    10,    47,    -1,    11,    46,
-      -1,    34,    46,   120,    46,    -1,     3,    46,    -1,     4,
-      46,   121,    46,    -1,    13,   122,   163,   123,    -1,    -1,
-     164,    -1,   165,    -1,   164,   124,   165,    -1,    46,    -1,
-     168,   170,    35,   173,   181,   167,    -1,     7,    -1,     6,
-     169,    -1,   287,    -1,    46,    -1,    -1,   170,   171,    -1,
-      85,    -1,    82,    -1,    83,    -1,    84,    -1,    89,    -1,
-      91,    -1,    92,    -1,    90,    -1,    87,   118,   169,   119,
-      -1,    86,   273,    -1,    88,   273,    -1,    93,   274,    -1,
-      94,   274,    -1,    95,   274,    -1,   287,    -1,    46,    -1,
-     208,    -1,   174,    -1,    -1,   174,   175,    -1,     8,   176,
-     177,    35,    -1,   283,   287,    -1,    -1,   177,   178,    -1,
-     251,    -1,   179,    -1,   180,    -1,   102,   118,   172,   119,
-      -1,    96,    -1,    -1,   181,   182,    -1,    36,   183,    -1,
-     183,    -1,   198,    -1,   215,    -1,   221,    -1,   222,    -1,
-     226,    -1,   275,    -1,   252,    -1,   227,    -1,   211,    -1,
-     197,    -1,   196,    -1,   193,    -1,   194,    -1,   184,    -1,
-     195,    -1,   185,    -1,   110,   186,    35,    -1,    -1,   118,
-     187,   119,    -1,    -1,   188,    -1,   189,    -1,   188,   120,
-     189,    -1,   111,    -1,   112,    -1,   110,   186,    -1,   190,
-      -1,   125,   191,   126,    -1,    -1,   191,   192,    -1,    35,
-      -1,   112,    -1,   111,    -1,   110,   186,    -1,    35,    -1,
-     158,    35,    -1,     1,    35,    -1,    44,   284,    35,    -1,
-      28,   246,    35,    -1,   199,    35,    -1,   200,   201,    -1,
-     210,    -1,    37,    -1,   202,    -1,   204,    -1,    -1,   203,
-      -1,   205,    -1,   203,   120,   205,    -1,   208,   121,   280,
-      -1,   206,    -1,   208,    -1,   281,    -1,   287,    -1,   286,
-      -1,   207,    -1,   245,   208,    -1,   122,   209,   123,    -1,
-     280,    -1,   209,   124,   280,    -1,   284,   121,   200,   206,
-     120,   203,    -1,   284,   121,   200,   206,    -1,   284,   121,
-     200,   208,   120,   203,    -1,   213,    35,    -1,    37,    -1,
-     288,    -1,   284,   121,    47,    -1,   284,   121,    48,    -1,
-     284,   121,    46,    -1,   284,   121,   286,    -1,   284,   121,
-     212,    -1,   284,   121,   214,    -1,   284,   121,   200,   208,
-      -1,   284,   121,   288,   208,    -1,   284,   121,    49,   208,
-      -1,   284,   291,   280,    -1,   284,    71,    47,    -1,   284,
-      71,    48,    -1,   284,    72,    47,    -1,   284,    72,    48,
-      -1,   284,    71,   284,    -1,   284,    72,   284,    -1,   284,
-     121,   289,   280,    -1,   284,   121,   284,   290,   280,    -1,
-     288,   208,   121,   280,    -1,    49,   208,   121,   280,    -1,
-      47,   290,   284,    -1,    48,   290,   284,    -1,    46,   290,
-     284,    -1,    46,   290,    46,    -1,    47,   290,    47,    -1,
-      48,   290,    48,    -1,    47,   290,    48,    -1,    48,   290,
-      47,    -1,   216,    35,    -1,   219,    44,    37,    45,   287,
-      -1,   219,    44,    38,    45,   287,    -1,   219,    44,    39,
-      45,   287,    -1,   219,    44,    40,    45,   287,    -1,   219,
-      44,    41,    45,   287,    -1,   219,    44,    42,    45,   287,
-      -1,   219,    44,    43,    45,   287,    -1,   219,    44,    45,
-      45,   287,    -1,   219,    44,    44,    45,   287,    -1,   219,
-     281,   220,   287,    -1,   219,    44,    49,   220,   287,    -1,
-     219,    37,   220,   287,    -1,   219,   286,   220,   287,    -1,
-     219,    38,   220,   287,    -1,   219,    39,   220,   287,    -1,
-     219,    40,   220,   287,    -1,   219,    41,   220,   287,    -1,
-     219,    42,   220,   287,    -1,   219,    43,   220,   287,    -1,
-     219,    45,    45,   287,    -1,   219,    45,   120,   287,    -1,
-     219,    44,    45,   287,    -1,   219,    44,   120,   287,    -1,
-     219,   217,    45,   287,    -1,   284,   282,   280,    -1,    47,
-     282,   284,    -1,    48,   282,   284,    -1,    46,   282,   284,
-      -1,    47,   282,    47,    -1,    47,   282,    48,    -1,    48,
-     282,    47,    -1,    48,   282,    48,    -1,    46,   282,    46,
-      -1,    46,   282,   218,    -1,    47,   282,    46,    -1,    48,
-     282,    46,    -1,    47,    -1,    48,    -1,    42,    -1,    43,
-      -1,    45,    -1,   120,    -1,    45,   287,    35,    -1,    12,
-     283,   223,    35,    -1,   224,    -1,   223,   120,   224,    -1,
-     287,   225,    -1,    -1,    96,    -1,     9,    46,   120,   245,
-      35,    -1,   228,    -1,   229,    -1,   238,    -1,    26,    35,
-     230,   233,    35,   235,    27,    35,    -1,    -1,   231,    -1,
-     232,    -1,   231,   232,    -1,    30,   261,    35,    -1,    29,
-     245,   234,    -1,    32,   245,    -1,    14,   245,    35,    15,
-     244,    -1,    -1,   120,   245,    -1,    -1,   236,    -1,   237,
-      -1,   236,   237,    -1,    31,   249,    35,    -1,   222,    -1,
-     239,    35,    -1,   246,   121,   240,    -1,   284,   121,   240,
-      -1,   240,    -1,   242,    -1,   241,    -1,   245,   127,   244,
-     256,    -1,   243,   256,    -1,   245,    -1,    46,    -1,   287,
-      -1,    49,    -1,    51,    -1,    46,    -1,   287,    -1,    49,
-      -1,   118,   247,   119,    -1,    -1,   248,    -1,   249,    -1,
-     248,   120,   249,    -1,   284,   250,    -1,    -1,   250,   251,
-      -1,   100,    -1,   101,    -1,    98,    -1,    97,   273,    -1,
-     253,    -1,   254,    -1,   263,    -1,   255,    -1,   264,    -1,
-      18,   256,    35,    -1,    33,   240,    35,    -1,    19,   256,
-      35,    -1,   118,   257,   119,    -1,    -1,   258,    -1,   259,
-      -1,   258,   120,   259,    -1,   261,    -1,   260,    -1,    46,
-      53,   262,    -1,   262,   271,    -1,   280,    -1,    24,    35,
-     268,    25,    35,    -1,    22,    35,   265,    23,    35,    -1,
-      -1,   266,    -1,   267,    -1,   266,   267,    -1,    20,   261,
-      35,    -1,    -1,   269,    -1,   270,    -1,   269,   270,    -1,
-      21,   261,    35,    -1,    -1,   271,   272,    -1,    99,    -1,
-      97,   273,    -1,    -1,   274,    -1,   118,    46,   119,    -1,
-     276,    35,    -1,   277,    -1,   278,    -1,    17,   279,    -1,
-      16,   279,    -1,    38,   287,   121,    47,    -1,    39,   287,
-     121,    48,    -1,    41,   287,   121,    46,    -1,    46,   287,
-     121,   281,    -1,   284,    -1,   281,    -1,    46,    -1,    47,
-      -1,    48,    -1,    54,    -1,    55,    -1,    56,    -1,    57,
-      -1,    59,    -1,    58,    -1,    38,    -1,    39,    -1,    40,
-      -1,    41,    -1,   285,    -1,   286,    -1,   287,    -1,    49,
-      -1,    50,    -1,    52,    -1,    51,    -1,    37,    -1,   288,
-      -1,    42,    -1,    43,    -1,    45,    -1,    38,    -1,    39,
-      -1,    41,    -1,    40,    -1,    44,    -1,   128,    -1,   129,
-      -1,   130,    -1,   131,    -1,   128,    -1,   132,    -1,   133,
-      -1,   134,    -1,   135,    -1,   136,    -1,   130,    -1,   137,
-      -1,    67,    -1,    60,    -1,    61,    -1,    62,    -1,    64,
-      -1,    65,    -1,    63,    -1,    66,    -1,    55,    -1,    57,
-      -1,    56,    -1,    59,    -1,    58,    -1,    54,    -1,    73,
-      -1,    74,    -1,    75,    -1,    76,    -1,    79,    -1,    77,
-      -1,    78,    -1,    80,    -1,    81,    -1,    69,    -1,    70,
-      -1,    68,    -1,   293,   294,    -1,   141,    -1,   295,    -1,
-     294,   295,    -1,   296,    -1,   162,    35,    -1,   226,    -1,
-     158,    35,    -1,   144,    35,    -1,   185,    -1,    36,   297,
-      -1,   298,   297,    -1,   300,    -1,   193,    -1,   300,    -1,
-     299,   170,    36,    -1,   116,    -1,   200,   202,    35,    -1
+     140,     0,    -1,   116,   141,    -1,   115,   293,    -1,   142,
+     143,   142,    -1,    -1,    35,    -1,   144,    -1,   143,    35,
+     144,    -1,   167,    -1,   278,    -1,   163,    -1,   161,    -1,
+     162,    -1,   158,    -1,   159,    -1,   160,    -1,   145,    -1,
+     146,    -1,   147,    -1,   108,    37,   114,    -1,   148,   119,
+     149,   120,    35,   152,   105,    -1,   104,   288,    -1,    -1,
+     150,    -1,   151,    -1,   150,   121,   151,    -1,   288,    -1,
+      -1,   153,    -1,   154,    -1,   153,   154,    -1,   155,    35,
+      -1,   156,    -1,   157,    -1,   107,   109,    -1,   106,   284,
+     110,    -1,     5,    46,    -1,    10,    47,    -1,    11,    46,
+      -1,    34,    46,   121,    46,    -1,     3,    46,    -1,     4,
+      46,   122,    46,    -1,    13,   123,   164,   124,    -1,    -1,
+     165,    -1,   166,    -1,   165,   125,   166,    -1,    46,    -1,
+     169,   171,    35,   174,   182,   168,    -1,     7,    -1,     6,
+     170,    -1,   288,    -1,    46,    -1,    -1,   171,   172,    -1,
+      86,    -1,    83,    -1,    84,    -1,    85,    -1,    90,    -1,
+      92,    -1,    93,    -1,    91,    -1,    88,   119,   170,   120,
+      -1,    87,   274,    -1,    89,   274,    -1,    94,   275,    -1,
+      95,   275,    -1,    96,   275,    -1,   288,    -1,    46,    -1,
+     209,    -1,   175,    -1,    -1,   175,   176,    -1,     8,   177,
+     178,    35,    -1,   284,   288,    -1,    -1,   178,   179,    -1,
+     252,    -1,   180,    -1,   181,    -1,   103,   119,   173,   120,
+      -1,    97,    -1,    -1,   182,   183,    -1,    36,   184,    -1,
+     184,    -1,   199,    -1,   216,    -1,   222,    -1,   223,    -1,
+     227,    -1,   276,    -1,   253,    -1,   228,    -1,   212,    -1,
+     198,    -1,   197,    -1,   194,    -1,   195,    -1,   185,    -1,
+     196,    -1,   186,    -1,   111,   187,    35,    -1,    -1,   119,
+     188,   120,    -1,    -1,   189,    -1,   190,    -1,   189,   121,
+     190,    -1,   112,    -1,   113,    -1,   111,   187,    -1,   191,
+      -1,   126,   192,   127,    -1,    -1,   192,   193,    -1,    35,
+      -1,   113,    -1,   112,    -1,   111,   187,    -1,    35,    -1,
+     159,    35,    -1,     1,    35,    -1,    44,   285,    35,    -1,
+      28,   247,    35,    -1,   200,    35,    -1,   201,   202,    -1,
+     211,    -1,    37,    -1,   203,    -1,   205,    -1,    -1,   204,
+      -1,   206,    -1,   204,   121,   206,    -1,   209,   122,   281,
+      -1,   207,    -1,   209,    -1,   282,    -1,   288,    -1,   287,
+      -1,   208,    -1,   246,   209,    -1,   123,   210,   124,    -1,
+     281,    -1,   210,   125,   281,    -1,   285,   122,   201,   207,
+     121,   204,    -1,   285,   122,   201,   207,    -1,   285,   122,
+     201,   209,   121,   204,    -1,   214,    35,    -1,    37,    -1,
+     289,    -1,   285,   122,    47,    -1,   285,   122,    48,    -1,
+     285,   122,    46,    -1,   285,   122,   287,    -1,   285,   122,
+     213,    -1,   285,   122,   215,    -1,   285,   122,   201,   209,
+      -1,   285,   122,   289,   209,    -1,   285,   122,    49,   209,
+      -1,   285,   292,   281,    -1,   285,    72,    47,    -1,   285,
+      72,    48,    -1,   285,    73,    47,    -1,   285,    73,    48,
+      -1,   285,    72,   285,    -1,   285,    73,   285,    -1,   285,
+     122,   290,   281,    -1,   285,   122,   285,   291,   281,    -1,
+     289,   209,   122,   281,    -1,    49,   209,   122,   281,    -1,
+      47,   291,   285,    -1,    48,   291,   285,    -1,    46,   291,
+     285,    -1,    46,   291,    46,    -1,    47,   291,    47,    -1,
+      48,   291,    48,    -1,    47,   291,    48,    -1,    48,   291,
+      47,    -1,   217,    35,    -1,   220,    44,    37,    45,   288,
+      -1,   220,    44,    38,    45,   288,    -1,   220,    44,    39,
+      45,   288,    -1,   220,    44,    40,    45,   288,    -1,   220,
+      44,    41,    45,   288,    -1,   220,    44,    42,    45,   288,
+      -1,   220,    44,    43,    45,   288,    -1,   220,    44,    45,
+      45,   288,    -1,   220,    44,    44,    45,   288,    -1,   220,
+     282,   221,   288,    -1,   220,    44,    49,   221,   288,    -1,
+     220,    37,   221,   288,    -1,   220,   287,   221,   288,    -1,
+     220,    38,   221,   288,    -1,   220,    39,   221,   288,    -1,
+     220,    40,   221,   288,    -1,   220,    41,   221,   288,    -1,
+     220,    42,   221,   288,    -1,   220,    43,   221,   288,    -1,
+     220,    45,    45,   288,    -1,   220,    45,   121,   288,    -1,
+     220,    44,    45,   288,    -1,   220,    44,   121,   288,    -1,
+     220,   218,    45,   288,    -1,   285,   283,   281,    -1,    47,
+     283,   285,    -1,    48,   283,   285,    -1,    46,   283,   285,
+      -1,    47,   283,    47,    -1,    47,   283,    48,    -1,    48,
+     283,    47,    -1,    48,   283,    48,    -1,    46,   283,    46,
+      -1,    46,   283,   219,    -1,    47,   283,    46,    -1,    48,
+     283,    46,    -1,    47,    -1,    48,    -1,    42,    -1,    43,
+      -1,    45,    -1,   121,    -1,    45,   288,    35,    -1,    12,
+     284,   224,    35,    -1,   225,    -1,   224,   121,   225,    -1,
+     288,   226,    -1,    -1,    97,    -1,     9,    46,   121,   246,
+      35,    -1,   229,    -1,   230,    -1,   239,    -1,    26,    35,
+     231,   234,    35,   236,    27,    35,    -1,    -1,   232,    -1,
+     233,    -1,   232,   233,    -1,    30,   262,    35,    -1,    29,
+     246,   235,    -1,    32,   246,    -1,    14,   246,    35,    15,
+     245,    -1,    -1,   121,   246,    -1,    -1,   237,    -1,   238,
+      -1,   237,   238,    -1,    31,   250,    35,    -1,   223,    -1,
+     240,    35,    -1,   247,   122,   241,    -1,   285,   122,   241,
+      -1,   241,    -1,   243,    -1,   242,    -1,   246,   128,   245,
+     257,    -1,   244,   257,    -1,   246,    -1,    46,    -1,   288,
+      -1,    49,    -1,    51,    -1,    46,    -1,   288,    -1,    49,
+      -1,   119,   248,   120,    -1,    -1,   249,    -1,   250,    -1,
+     249,   121,   250,    -1,   285,   251,    -1,    -1,   251,   252,
+      -1,   101,    -1,   102,    -1,    99,    -1,    98,   274,    -1,
+     254,    -1,   255,    -1,   264,    -1,   256,    -1,   265,    -1,
+      18,   257,    35,    -1,    33,   241,    35,    -1,    19,   257,
+      35,    -1,   119,   258,   120,    -1,    -1,   259,    -1,   260,
+      -1,   259,   121,   260,    -1,   262,    -1,   261,    -1,    46,
+      54,   263,    -1,   263,   272,    -1,   281,    -1,    24,    35,
+     269,    25,    35,    -1,    22,    35,   266,    23,    35,    -1,
+      -1,   267,    -1,   268,    -1,   267,   268,    -1,    20,   262,
+      35,    -1,    -1,   270,    -1,   271,    -1,   270,   271,    -1,
+      21,   262,    35,    -1,    -1,   272,   273,    -1,   100,    -1,
+      98,   274,    -1,    -1,   275,    -1,   119,    46,   120,    -1,
+     277,    35,    -1,   278,    -1,   279,    -1,    17,   280,    -1,
+      16,   280,    -1,    38,   288,   122,    47,    -1,    39,   288,
+     122,    48,    -1,    41,   288,   122,    46,    -1,    46,   288,
+     122,   282,    -1,   285,    -1,   282,    -1,    46,    -1,    47,
+      -1,    48,    -1,    53,    -1,    55,    -1,    56,    -1,    57,
+      -1,    58,    -1,    60,    -1,    59,    -1,    38,    -1,    39,
+      -1,    40,    -1,    41,    -1,   286,    -1,   287,    -1,   288,
+      -1,    49,    -1,    50,    -1,    52,    -1,    51,    -1,    37,
+      -1,   289,    -1,    42,    -1,    43,    -1,    45,    -1,    38,
+      -1,    39,    -1,    41,    -1,    40,    -1,    44,    -1,   129,
+      -1,   130,    -1,   131,    -1,   132,    -1,   129,    -1,   133,
+      -1,   134,    -1,   135,    -1,   136,    -1,   137,    -1,   131,
+      -1,   138,    -1,    68,    -1,    61,    -1,    62,    -1,    63,
+      -1,    65,    -1,    66,    -1,    64,    -1,    67,    -1,    56,
+      -1,    58,    -1,    57,    -1,    60,    -1,    59,    -1,    55,
+      -1,    74,    -1,    75,    -1,    76,    -1,    77,    -1,    80,
+      -1,    78,    -1,    79,    -1,    81,    -1,    82,    -1,    70,
+      -1,    71,    -1,    69,    -1,   294,   295,    -1,   142,    -1,
+     296,    -1,   295,   296,    -1,   297,    -1,   163,    35,    -1,
+     227,    -1,   159,    35,    -1,   145,    35,    -1,   186,    -1,
+      36,   298,    -1,   299,   298,    -1,   301,    -1,   194,    -1,
+     301,    -1,   300,   171,    36,    -1,   117,    -1,   201,   203,
+      35,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   539,   539,   540,   545,   551,   552,   555,   556,   559,
-     560,   561,   562,   563,   564,   565,   566,   567,   574,   575,
-     578,   582,   588,   595,   596,   599,   600,   603,   607,   608,
-     611,   612,   615,   618,   619,   622,   626,   637,   641,   643,
-     647,   652,   656,   660,   665,   666,   670,   672,   676,   680,
-     686,   690,   694,   695,   698,   699,   702,   704,   706,   708,
-     710,   712,   714,   716,   718,   720,   722,   724,   726,   728,
-     732,   733,   734,   737,   755,   756,   760,   764,   769,   770,
-     774,   775,   776,   779,   786,   792,   793,   803,   805,   808,
-     809,   810,   811,   812,   813,   814,   815,   816,   817,   818,
-     819,   820,   821,   822,   828,   831,   836,   837,   842,   843,
-     846,   848,   856,   864,   865,   867,   870,   876,   877,   886,
-     887,   888,   889,   897,   901,   905,   914,   921,   928,   931,
-     932,   935,   944,   951,   954,   955,   958,   959,   962,   998,
-    1000,  1007,  1009,  1014,  1016,  1020,  1043,  1047,  1049,  1058,
-    1069,  1081,  1091,  1094,  1095,  1098,  1107,  1116,  1121,  1126,
-    1147,  1152,  1192,  1210,  1217,  1222,  1233,  1244,  1255,  1266,
-    1271,  1276,  1281,  1291,  1310,  1344,  1346,  1348,  1350,  1352,
-    1354,  1356,  1358,  1363,  1372,  1374,  1376,  1378,  1380,  1382,
-    1384,  1386,  1388,  1390,  1402,  1407,  1409,  1411,  1413,  1415,
-    1417,  1419,  1421,  1423,  1425,  1427,  1429,  1431,  1462,  1488,
-    1496,  1505,  1514,  1516,  1518,  1520,  1522,  1526,  1531,  1533,
-    1538,  1539,  1542,  1543,  1546,  1547,  1550,  1558,  1562,  1564,
-    1568,  1572,  1573,  1576,  1591,  1595,  1596,  1599,  1611,  1612,
-    1616,  1618,  1622,  1626,  1628,  1630,  1636,  1637,  1642,  1643,
-    1647,  1649,  1658,  1660,  1664,  1668,  1670,  1672,  1676,  1677,
-    1680,  1700,  1707,  1709,  1719,  1736,  1738,  1740,  1744,  1753,
-    1758,  1763,  1764,  1768,  1770,  1774,  1779,  1780,  1784,  1786,
-    1788,  1790,  1800,  1804,  1805,  1806,  1807,  1810,  1815,  1826,
-    1833,  1838,  1839,  1843,  1845,  1849,  1850,  1853,  1857,  1861,
-    1865,  1874,  1884,  1885,  1890,  1892,  1897,  1902,  1903,  1907,
-    1909,  1913,  1919,  1920,  1924,  1926,  1934,  1935,  1939,  1943,
-    1946,  1947,  1950,  1954,  1958,  1960,  1962,  1964,  1972,  1973,
-    1977,  1978,  1979,  1982,  1983,  1984,  1985,  1986,  1987,  1990,
-    1991,  1992,  1993,  2001,  2004,  2005,  2017,  2018,  2019,  2020,
-    2024,  2025,  2028,  2029,  2030,  2031,  2032,  2033,  2034,  2035,
-    2038,  2039,  2040,  2043,  2044,  2045,  2046,  2047,  2048,  2049,
-    2050,  2051,  2052,  2053,  2054,  2055,  2056,  2057,  2058,  2059,
-    2060,  2061,  2062,  2063,  2064,  2065,  2071,  2072,  2073,  2074,
-    2075,  2076,  2077,  2078,  2079,  2080,  2081,  2082,  2094,  2102,
-    2106,  2107,  2110,  2111,  2112,  2113,  2114,  2115,  2118,  2120,
-    2121,  2124,  2125,  2128,  2132,  2137
+       0,   540,   540,   541,   546,   552,   553,   556,   557,   560,
+     561,   562,   563,   564,   565,   566,   567,   568,   575,   576,
+     579,   583,   589,   596,   597,   600,   601,   604,   608,   609,
+     612,   613,   616,   619,   620,   623,   627,   638,   642,   644,
+     648,   653,   657,   661,   666,   667,   671,   673,   677,   681,
+     687,   691,   695,   696,   699,   700,   703,   705,   707,   709,
+     711,   713,   715,   717,   719,   721,   723,   725,   727,   729,
+     733,   734,   735,   738,   756,   757,   761,   765,   770,   771,
+     775,   776,   777,   780,   787,   793,   794,   804,   806,   809,
+     810,   811,   812,   813,   814,   815,   816,   817,   818,   819,
+     820,   821,   822,   823,   829,   832,   837,   838,   843,   844,
+     847,   849,   857,   865,   866,   868,   871,   877,   878,   887,
+     888,   889,   890,   898,   902,   906,   915,   922,   929,   932,
+     933,   936,   945,   952,   955,   956,   959,   960,   963,   999,
+    1001,  1008,  1010,  1015,  1017,  1021,  1044,  1048,  1050,  1059,
+    1070,  1082,  1092,  1095,  1096,  1099,  1108,  1117,  1122,  1127,
+    1148,  1153,  1194,  1212,  1219,  1224,  1235,  1246,  1257,  1268,
+    1273,  1278,  1283,  1293,  1312,  1346,  1348,  1350,  1352,  1354,
+    1356,  1358,  1360,  1365,  1374,  1376,  1378,  1380,  1382,  1384,
+    1386,  1388,  1390,  1392,  1404,  1409,  1411,  1413,  1415,  1417,
+    1419,  1421,  1423,  1425,  1427,  1429,  1431,  1433,  1464,  1490,
+    1498,  1507,  1516,  1518,  1520,  1522,  1524,  1528,  1533,  1535,
+    1540,  1541,  1544,  1545,  1548,  1549,  1552,  1560,  1564,  1566,
+    1570,  1574,  1575,  1578,  1593,  1597,  1598,  1601,  1613,  1614,
+    1618,  1620,  1624,  1628,  1630,  1632,  1638,  1639,  1644,  1645,
+    1649,  1651,  1660,  1662,  1666,  1670,  1672,  1674,  1678,  1679,
+    1682,  1702,  1709,  1711,  1721,  1738,  1740,  1742,  1746,  1755,
+    1760,  1765,  1766,  1770,  1772,  1776,  1781,  1782,  1786,  1788,
+    1790,  1792,  1802,  1806,  1807,  1808,  1809,  1812,  1817,  1828,
+    1835,  1840,  1841,  1845,  1847,  1851,  1852,  1855,  1859,  1863,
+    1867,  1876,  1886,  1887,  1892,  1894,  1899,  1904,  1905,  1909,
+    1911,  1915,  1921,  1922,  1926,  1928,  1936,  1937,  1941,  1945,
+    1948,  1949,  1952,  1956,  1960,  1962,  1964,  1966,  1974,  1975,
+    1979,  1980,  1981,  1982,  1985,  1986,  1987,  1988,  1989,  1990,
+    1993,  1994,  1995,  1996,  2004,  2007,  2008,  2019,  2020,  2021,
+    2022,  2026,  2027,  2030,  2031,  2032,  2033,  2034,  2035,  2036,
+    2037,  2040,  2041,  2042,  2045,  2046,  2047,  2048,  2049,  2050,
+    2051,  2052,  2053,  2054,  2055,  2056,  2057,  2058,  2059,  2060,
+    2061,  2062,  2063,  2064,  2065,  2066,  2067,  2073,  2074,  2075,
+    2076,  2077,  2078,  2079,  2080,  2081,  2082,  2083,  2084,  2096,
+    2104,  2108,  2109,  2112,  2113,  2114,  2115,  2116,  2117,  2120,
+    2122,  2123,  2126,  2127,  2130,  2134,  2139
 };
 #endif
 
@@ -1106,43 +1109,43 @@
   "\"string\"", "\"if\"", "\"unless\"", "\"null\"", "\"goto\"",
   "\"string constant\"", "\"integer constant\"", "\"number constant\"",
   "\"PMC register\"", "\"number register\"", "\"string register\"",
-  "\"integer register\"", "\"=>\"", "\"!=\"", "\"==\"", "\"<\"", "\"<=\"",
-  "\">\"", "\">=\"", "\">>>\"", "\">>\"", "\"<<\"", "\"//\"", "\"||\"",
-  "\"&&\"", "\"~~\"", "\".\"", "\">>>=\"", "\">>=\"", "\"<<=\"", "\"+=\"",
-  "\"-=\"", "\"*=\"", "\"%=\"", "\"**=\"", "\"/=\"", "\"|=\"", "\"&=\"",
-  "\"//=\"", "\"~=\"", "\".=\"", "\":init\"", "\":load\"", "\":main\"",
-  "\":anon\"", "\":method\"", "\":outer\"", "\":vtable\"", "\":lex\"",
-  "\":multi\"", "\":postcomp\"", "\":immediate\"", "\":subid\"",
-  "\":instanceof\"", "\":nsentry\"", "\":unique_reg\"", "\":named\"",
-  "\":slurpy\"", "\":flat\"", "\":optional\"", "\":opt_flag\"",
-  "\":invocant\"", "\".macro\"", "\".endm\"", "\".macro_local\"",
-  "\".macro_label\"", "\".macro_const\"", "\"macro-label\"",
-  "\"macro-local\"", "\"macro-identifier\"", "\"macro-id-argument\"",
-  "\"macro-argument\"", "\"macro-constant\"", "\"<pasm-input>\"",
-  "\"<pir-input>\"", "\".pcc_sub\"", "\"parrot-op\"", "'('", "')'", "','",
-  "'='", "'['", "']'", "';'", "'{'", "'}'", "'.'", "'-'", "'!'", "'~'",
-  "'+'", "'/'", "'*'", "'%'", "'|'", "'&'", "\"**\"", "$accept", "TOP",
-  "pir_contents", "opt_nl", "pir_chunks", "pir_chunk", "macro_definition",
-  "macro_const", "macro", "macro_header", "macro_parameters",
-  "macro_params", "macro_param", "macro_body", "macro_statements",
-  "macro_statement", "macro_instr", "macro_label_decl", "macro_local_decl",
-  "loadlib", "location_directive", "annotation", "hll_specifier",
-  "hll_mapping", "namespace_decl", "opt_namespace", "namespace",
-  "namespace_slice", "sub_def", "sub_end", "sub_head", "sub_id",
-  "sub_flags", "sub_flag", "multi_type", "parameter_list", "parameters",
-  "parameter", "param", "param_flags", "param_flag", "invocant_param",
-  "unique_reg_flag", "instructions", "instruction", "statement",
-  "expansion_stat", "macro_expansion", "opt_macro_args", "macro_args",
-  "macro_arg_list", "macro_arg", "braced_arg", "braced_contents",
-  "braced_item", "empty_stat", "location_stat", "error_stat", "null_stat",
-  "getresults_stat", "parrot_stat", "parrot_instruction", "parrot_op",
-  "opt_op_args", "op_args", "parrot_op_args", "keylist_assignment",
-  "op_arg", "op_arg_expr", "keyaccess", "keylist", "keys",
-  "parrot_op_assign", "assignment_stat", "rhs_ident", "assignment",
-  "binary_expr", "conditional_stat", "conditional_instr", "condition",
-  "int_or_num", "if_unless", "then", "goto_stat", "local_decl",
-  "local_id_list", "local_id", "has_unique_reg", "lex_decl",
-  "invocation_stat", "invocation", "long_invocation_stat",
+  "\"integer register\"", "\"constant-value\"", "\"=>\"", "\"!=\"",
+  "\"==\"", "\"<\"", "\"<=\"", "\">\"", "\">=\"", "\">>>\"", "\">>\"",
+  "\"<<\"", "\"//\"", "\"||\"", "\"&&\"", "\"~~\"", "\".\"", "\">>>=\"",
+  "\">>=\"", "\"<<=\"", "\"+=\"", "\"-=\"", "\"*=\"", "\"%=\"", "\"**=\"",
+  "\"/=\"", "\"|=\"", "\"&=\"", "\"//=\"", "\"~=\"", "\".=\"", "\":init\"",
+  "\":load\"", "\":main\"", "\":anon\"", "\":method\"", "\":outer\"",
+  "\":vtable\"", "\":lex\"", "\":multi\"", "\":postcomp\"",
+  "\":immediate\"", "\":subid\"", "\":instanceof\"", "\":nsentry\"",
+  "\":unique_reg\"", "\":named\"", "\":slurpy\"", "\":flat\"",
+  "\":optional\"", "\":opt_flag\"", "\":invocant\"", "\".macro\"",
+  "\".endm\"", "\".macro_local\"", "\".macro_label\"", "\".macro_const\"",
+  "\"macro-label\"", "\"macro-local\"", "\"macro-identifier\"",
+  "\"macro-id-argument\"", "\"macro-argument\"", "\"macro-constant\"",
+  "\"<pasm-input>\"", "\"<pir-input>\"", "\".pcc_sub\"", "\"parrot-op\"",
+  "'('", "')'", "','", "'='", "'['", "']'", "';'", "'{'", "'}'", "'.'",
+  "'-'", "'!'", "'~'", "'+'", "'/'", "'*'", "'%'", "'|'", "'&'", "\"**\"",
+  "$accept", "TOP", "pir_contents", "opt_nl", "pir_chunks", "pir_chunk",
+  "macro_definition", "macro_const", "macro", "macro_header",
+  "macro_parameters", "macro_params", "macro_param", "macro_body",
+  "macro_statements", "macro_statement", "macro_instr", "macro_label_decl",
+  "macro_local_decl", "loadlib", "location_directive", "annotation",
+  "hll_specifier", "hll_mapping", "namespace_decl", "opt_namespace",
+  "namespace", "namespace_slice", "sub_def", "sub_end", "sub_head",
+  "sub_id", "sub_flags", "sub_flag", "multi_type", "parameter_list",
+  "parameters", "parameter", "param", "param_flags", "param_flag",
+  "invocant_param", "unique_reg_flag", "instructions", "instruction",
+  "statement", "expansion_stat", "macro_expansion", "opt_macro_args",
+  "macro_args", "macro_arg_list", "macro_arg", "braced_arg",
+  "braced_contents", "braced_item", "empty_stat", "location_stat",
+  "error_stat", "null_stat", "getresults_stat", "parrot_stat",
+  "parrot_instruction", "parrot_op", "opt_op_args", "op_args",
+  "parrot_op_args", "keylist_assignment", "op_arg", "op_arg_expr",
+  "keyaccess", "keylist", "keys", "parrot_op_assign", "assignment_stat",
+  "rhs_ident", "assignment", "binary_expr", "conditional_stat",
+  "conditional_instr", "condition", "int_or_num", "if_unless", "then",
+  "goto_stat", "local_decl", "local_id_list", "local_id", "has_unique_reg",
+  "lex_decl", "invocation_stat", "invocation", "long_invocation_stat",
   "opt_long_arguments", "long_arguments", "long_argument",
   "long_invocation", "opt_ret_cont", "opt_long_results", "long_results",
   "long_result", "short_invocation_stat", "short_invocation",
@@ -1180,57 +1183,57 @@
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,   372,    40,    41,
-      44,    61,    91,    93,    59,   123,   125,    46,    45,    33,
-     126,    43,    47,    42,    37,   124,    38,   373
+     365,   366,   367,   368,   369,   370,   371,   372,   373,    40,
+      41,    44,    61,    91,    93,    59,   123,   125,    46,    45,
+      33,   126,    43,    47,    42,    37,   124,    38,   374
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   138,   139,   139,   140,   141,   141,   142,   142,   143,
-     143,   143,   143,   143,   143,   143,   143,   143,   144,   144,
-     145,   146,   147,   148,   148,   149,   149,   150,   151,   151,
-     152,   152,   153,   154,   154,   155,   156,   157,   158,   158,
-     159,   160,   161,   162,   163,   163,   164,   164,   165,   166,
-     167,   168,   169,   169,   170,   170,   171,   171,   171,   171,
-     171,   171,   171,   171,   171,   171,   171,   171,   171,   171,
-     172,   172,   172,   173,   174,   174,   175,   176,   177,   177,
-     178,   178,   178,   179,   180,   181,   181,   182,   182,   183,
-     183,   183,   183,   183,   183,   183,   183,   183,   183,   183,
-     183,   183,   183,   183,   184,   185,   186,   186,   187,   187,
-     188,   188,   189,   189,   189,   189,   190,   191,   191,   192,
-     192,   192,   192,   193,   194,   195,   196,   197,   198,   199,
-     199,   200,   201,   201,   202,   202,   203,   203,   204,   205,
-     205,   206,   206,   206,   206,   207,   208,   209,   209,   210,
-     210,   210,   211,   212,   212,   213,   213,   213,   213,   213,
-     213,   213,   213,   213,   213,   213,   213,   213,   213,   213,
-     213,   213,   213,   213,   213,   214,   214,   214,   214,   214,
-     214,   214,   214,   215,   216,   216,   216,   216,   216,   216,
-     216,   216,   216,   216,   216,   216,   216,   216,   216,   216,
-     216,   216,   216,   216,   216,   216,   216,   216,   217,   217,
+       0,   139,   140,   140,   141,   142,   142,   143,   143,   144,
+     144,   144,   144,   144,   144,   144,   144,   144,   145,   145,
+     146,   147,   148,   149,   149,   150,   150,   151,   152,   152,
+     153,   153,   154,   155,   155,   156,   157,   158,   159,   159,
+     160,   161,   162,   163,   164,   164,   165,   165,   166,   167,
+     168,   169,   170,   170,   171,   171,   172,   172,   172,   172,
+     172,   172,   172,   172,   172,   172,   172,   172,   172,   172,
+     173,   173,   173,   174,   175,   175,   176,   177,   178,   178,
+     179,   179,   179,   180,   181,   182,   182,   183,   183,   184,
+     184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
+     184,   184,   184,   184,   185,   186,   187,   187,   188,   188,
+     189,   189,   190,   190,   190,   190,   191,   192,   192,   193,
+     193,   193,   193,   194,   195,   196,   197,   198,   199,   200,
+     200,   201,   202,   202,   203,   203,   204,   204,   205,   206,
+     206,   207,   207,   207,   207,   208,   209,   210,   210,   211,
+     211,   211,   212,   213,   213,   214,   214,   214,   214,   214,
+     214,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+     214,   214,   214,   214,   214,   215,   215,   215,   215,   215,
+     215,   215,   215,   216,   217,   217,   217,   217,   217,   217,
      217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
-     218,   218,   219,   219,   220,   220,   221,   222,   223,   223,
-     224,   225,   225,   226,   227,   228,   228,   229,   230,   230,
-     231,   231,   232,   233,   233,   233,   234,   234,   235,   235,
-     236,   236,   237,   237,   238,   239,   239,   239,   240,   240,
-     241,   242,   243,   243,   244,   244,   244,   244,   245,   245,
-     246,   247,   247,   248,   248,   249,   250,   250,   251,   251,
-     251,   251,   252,   253,   253,   253,   253,   254,   254,   255,
-     256,   257,   257,   258,   258,   259,   259,   260,   261,   262,
-     263,   264,   265,   265,   266,   266,   267,   268,   268,   269,
-     269,   270,   271,   271,   272,   272,   273,   273,   274,   275,
-     276,   276,   277,   278,   279,   279,   279,   279,   280,   280,
-     281,   281,   281,   282,   282,   282,   282,   282,   282,   283,
-     283,   283,   283,   284,   285,   285,   286,   286,   286,   286,
-     287,   287,   288,   288,   288,   288,   288,   288,   288,   288,
-     289,   289,   289,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   290,   290,   290,   290,
-     290,   290,   290,   290,   290,   290,   291,   291,   291,   291,
-     291,   291,   291,   291,   291,   291,   291,   291,   292,   293,
-     294,   294,   295,   295,   295,   295,   295,   295,   296,   296,
-     296,   297,   297,   298,   299,   300
+     217,   217,   217,   217,   217,   217,   217,   217,   218,   218,
+     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
+     219,   219,   220,   220,   221,   221,   222,   223,   224,   224,
+     225,   226,   226,   227,   228,   229,   229,   230,   231,   231,
+     232,   232,   233,   234,   234,   234,   235,   235,   236,   236,
+     237,   237,   238,   238,   239,   240,   240,   240,   241,   241,
+     242,   243,   244,   244,   245,   245,   245,   245,   246,   246,
+     247,   248,   248,   249,   249,   250,   251,   251,   252,   252,
+     252,   252,   253,   254,   254,   254,   254,   255,   255,   256,
+     257,   258,   258,   259,   259,   260,   260,   261,   262,   263,
+     264,   265,   266,   266,   267,   267,   268,   269,   269,   270,
+     270,   271,   272,   272,   273,   273,   274,   274,   275,   276,
+     277,   277,   278,   279,   280,   280,   280,   280,   281,   281,
+     282,   282,   282,   282,   283,   283,   283,   283,   283,   283,
+     284,   284,   284,   284,   285,   286,   286,   287,   287,   287,
+     287,   288,   288,   289,   289,   289,   289,   289,   289,   289,
+     289,   290,   290,   290,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   291,   291,   291,
+     291,   291,   291,   291,   291,   291,   291,   292,   292,   292,
+     292,   292,   292,   292,   292,   292,   292,   292,   292,   293,
+     294,   295,   295,   296,   296,   296,   296,   296,   296,   297,
+     297,   297,   298,   298,   299,   300,   301
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1275,9 +1278,9 @@
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     2,     1,
-       1,     2,     1,     2,     1,     2,     2,     1,     2,     2,
-       1,     1,     1,     3,     1,     3
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
+       1,     1,     2,     1,     2,     1,     2,     2,     1,     2,
+       2,     1,     1,     1,     3,     1,     3
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1285,475 +1288,473 @@
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-       0,     5,     5,     0,     6,   399,     3,     0,     2,     0,
+       0,     5,     5,     0,     6,   400,     3,     0,     2,     0,
        1,     0,     0,     0,     0,     0,   131,     0,     0,   106,
-     414,     0,    18,    19,     0,     0,     0,   407,   134,   404,
-     398,   400,   402,     0,    54,   410,     0,     0,     0,     0,
+     415,     0,    18,    19,     0,     0,     0,   408,   134,   405,
+     399,   401,   403,     0,    54,   411,     0,     0,     0,     0,
        0,     0,     5,     7,    17,    14,    15,    16,    12,    13,
-      11,     9,    54,    10,     0,    38,    39,    44,   123,   411,
-     408,   412,   350,   355,   356,   358,   357,   352,   353,   359,
-     354,    22,   351,     0,   108,     0,   406,    23,   405,   403,
-     330,   331,   332,   346,   347,   349,   348,     0,     0,   135,
-     136,   139,   144,   140,     0,   141,   143,   142,   401,   409,
-       0,    41,     0,    37,    53,    51,    52,     0,     0,     0,
-       0,   322,     0,     6,     4,     0,     0,    48,     0,    45,
-      46,    20,   106,   112,   113,   117,     0,   109,   110,   115,
-     105,     0,    24,    25,    27,   346,     0,   147,   329,   328,
-     343,   344,   345,   415,     0,   145,   413,    57,    58,    59,
-      56,   316,     0,   316,    60,    63,    61,    62,     0,     0,
-       0,    55,     0,     0,     0,     0,     0,     0,     8,    74,
-     269,     0,   268,    43,     0,   114,     0,   107,     0,     0,
-       0,   146,     0,   137,     0,    65,   317,     0,    66,    67,
-      68,    69,    42,     0,     0,     0,     0,    40,    85,    73,
-     233,    47,   119,   106,   121,   120,   116,   118,   111,    28,
-      26,   148,     0,     0,   324,   325,   326,   327,     0,     0,
-      75,   122,     0,     0,     0,    29,    30,     0,    33,    34,
-     318,    64,     0,    50,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   131,   352,   353,   359,   354,   263,
-     346,   271,     0,    49,    86,    88,   102,   104,   100,   101,
-     103,    99,    98,    89,     0,   134,   130,    97,     0,    90,
-       0,     0,    91,    92,    93,    96,   234,   235,   236,     0,
-     257,   259,   258,     0,   262,     0,    95,   282,   283,   285,
-     284,   286,    94,     0,   320,   321,     0,   345,   351,   339,
-     340,   341,   342,    78,     0,     0,    35,    21,    31,    32,
-     125,     0,   323,   291,     0,     0,   302,   307,   238,     0,
-       0,    87,     0,     0,     0,     0,   272,   273,   276,   124,
-     128,   129,   132,   133,   140,   152,   183,   350,   355,   356,
-     358,   357,   352,   353,   359,   354,   330,   331,   332,     0,
-       0,     0,   344,   254,   261,     0,     0,   319,   397,   395,
-     396,     0,     0,   386,   387,   388,   389,   391,   392,   390,
-     393,   394,     0,     0,     0,     0,    77,    36,     0,   228,
-     231,   330,     0,   292,   293,   296,   295,   312,   299,   287,
-     289,     0,     0,   303,   304,     0,     0,   308,   309,     0,
-       0,   239,   240,   127,   288,   126,   226,     0,   270,     0,
-     275,     0,   224,   225,     0,     0,     0,     0,     0,     0,
+      11,     9,    54,    10,     0,    38,    39,    44,   123,   412,
+     409,   413,   351,   356,   357,   359,   358,   353,   354,   360,
+     355,    22,   352,     0,   108,     0,   407,    23,   406,   404,
+     330,   331,   332,   347,   348,   350,   349,   333,     0,     0,
+     135,   136,   139,   144,   140,     0,   141,   143,   142,   402,
+     410,     0,    41,     0,    37,    53,    51,    52,     0,     0,
+       0,     0,   322,     0,     6,     4,     0,     0,    48,     0,
+      45,    46,    20,   106,   112,   113,   117,     0,   109,   110,
+     115,   105,     0,    24,    25,    27,   347,     0,   147,   329,
+     328,   344,   345,   346,   416,     0,   145,   414,    57,    58,
+      59,    56,   316,     0,   316,    60,    63,    61,    62,     0,
+       0,     0,    55,     0,     0,     0,     0,     0,     0,     8,
+      74,   269,     0,   268,    43,     0,   114,     0,   107,     0,
+       0,     0,   146,     0,   137,     0,    65,   317,     0,    66,
+      67,    68,    69,    42,     0,     0,     0,     0,    40,    85,
+      73,   233,    47,   119,   106,   121,   120,   116,   118,   111,
+      28,    26,   148,     0,     0,   324,   325,   326,   327,     0,
+       0,    75,   122,     0,     0,     0,    29,    30,     0,    33,
+      34,   318,    64,     0,    50,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   131,   353,   354,   360,   355,
+     263,   347,   271,     0,    49,    86,    88,   102,   104,   100,
+     101,   103,    99,    98,    89,     0,   134,   130,    97,     0,
+      90,     0,     0,    91,    92,    93,    96,   234,   235,   236,
+       0,   257,   259,   258,     0,   262,     0,    95,   282,   283,
+     285,   284,   286,    94,     0,   320,   321,     0,   346,   352,
+     340,   341,   342,   343,    78,     0,     0,    35,    21,    31,
+      32,   125,     0,   323,   291,     0,     0,   302,   307,   238,
+       0,     0,    87,     0,     0,     0,     0,   272,   273,   276,
+     124,   128,   129,   132,   133,   140,   152,   183,   351,   356,
+     357,   359,   358,   353,   354,   360,   355,   330,   331,   332,
+       0,     0,     0,   345,   254,   261,     0,     0,   319,   398,
+     396,   397,     0,     0,   387,   388,   389,   390,   392,   393,
+     391,   394,   395,     0,     0,     0,     0,    77,    36,     0,
+     228,   231,   330,     0,   292,   293,   296,   295,   312,   299,
+     287,   289,     0,     0,   303,   304,     0,     0,   308,   309,
+       0,     0,   239,   240,   127,   288,   126,   226,     0,   270,
+       0,   275,     0,   224,   225,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   333,   334,   335,   336,   338,   337,
-       0,     0,     0,     0,     0,     0,     0,   267,   265,   266,
-       0,   264,   255,   165,   166,   169,   167,   168,   170,   350,
-     157,   155,   156,   346,   360,   361,   362,     0,   159,   160,
-     256,     0,   344,   351,     0,   164,     0,    76,    84,   316,
-     280,   278,   279,     0,    79,    81,    82,    80,   227,     0,
-     232,   230,     0,   290,     0,   298,     0,     0,   305,     0,
-       0,   310,     0,     0,     0,     0,     0,   241,   174,   274,
-     277,   138,   195,   197,   198,   199,   200,   201,   202,     0,
-       0,     0,     0,     0,     0,     0,     0,   354,   205,     0,
-     206,   203,   204,   216,   220,   221,   217,   211,   218,   212,
-     213,   209,   219,   214,   215,   210,   207,   193,   208,   196,
-     260,   385,   380,   382,   381,   384,   383,   373,   374,   375,
-     378,   376,   377,   379,   372,   364,   370,   363,   365,   366,
-     367,   368,   369,   371,     0,     0,     0,   163,   150,   161,
-       0,   162,   171,   173,   281,     0,   229,   297,   294,   316,
-     314,   313,   306,   301,   311,   300,   242,     0,   246,   244,
-     248,   184,   185,   186,   187,   188,   189,   190,   192,   191,
-     194,   178,   177,   179,   181,   175,   182,   180,   176,     0,
-       0,   172,    71,     0,    72,    70,   315,     0,     0,   243,
-       0,   253,     0,   249,   250,   149,   151,    83,     0,   247,
-       0,     0,   251,   245,   252,   237
+       0,     0,     0,     0,     0,   334,   335,   336,   337,   339,
+     338,     0,     0,     0,     0,     0,     0,     0,   267,   265,
+     266,     0,   264,   255,   165,   166,   169,   167,   168,   170,
+     351,   157,   155,   156,   347,   361,   362,   363,     0,   159,
+     160,   256,     0,   345,   352,     0,   164,     0,    76,    84,
+     316,   280,   278,   279,     0,    79,    81,    82,    80,   227,
+       0,   232,   230,     0,   290,     0,   298,     0,     0,   305,
+       0,     0,   310,     0,     0,     0,     0,     0,   241,   174,
+     274,   277,   138,   195,   197,   198,   199,   200,   201,   202,
+       0,     0,     0,     0,     0,     0,     0,     0,   355,   205,
+       0,   206,   203,   204,   216,   220,   221,   217,   211,   218,
+     212,   213,   209,   219,   214,   215,   210,   207,   193,   208,
+     196,   260,   386,   381,   383,   382,   385,   384,   374,   375,
+     376,   379,   377,   378,   380,   373,   365,   371,   364,   366,
+     367,   368,   369,   370,   372,     0,     0,     0,   163,   150,
+     161,     0,   162,   171,   173,   281,     0,   229,   297,   294,
+     316,   314,   313,   306,   301,   311,   300,   242,     0,   246,
+     244,   248,   184,   185,   186,   187,   188,   189,   190,   192,
+     191,   194,   178,   177,   179,   181,   175,   182,   180,   176,
+       0,     0,   172,    71,     0,    72,    70,   315,     0,     0,
+     243,     0,   253,     0,   249,   250,   149,   151,    83,     0,
+     247,     0,     0,   251,   245,   252,   237
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
       -1,     3,     8,     5,    42,    43,    21,    22,    23,    24,
-     131,   132,   133,   224,   225,   226,   227,   228,   229,    45,
-      25,    47,    48,    49,    26,   118,   119,   120,    51,   253,
-      52,   105,   100,   161,   623,   198,   199,   220,   303,   375,
-     484,   485,   486,   218,   254,   255,   256,    27,    75,   126,
-     127,   128,   129,   176,   207,    59,   259,   260,   261,   262,
-     263,   264,    28,   331,    88,    89,   333,    90,    91,    92,
-      93,   136,   266,   267,   468,   268,   469,   269,   270,   349,
-     536,   271,   414,   272,   273,   378,   379,   491,    29,   275,
-     276,   277,   400,   401,   402,   506,   629,   632,   633,   634,
-     278,   279,   280,   281,   282,   283,   450,    94,   285,   325,
-     326,   327,   410,   487,   286,   287,   288,   289,   314,   382,
-     383,   384,   385,   386,   387,   290,   291,   392,   393,   394,
-     396,   397,   398,   495,   591,   185,   186,   292,   293,    53,
-     295,   111,   388,   138,   440,   304,   139,   140,   141,   142,
-      72,   474,   574,   373,     6,     7,    30,    31,    32,    60,
+     132,   133,   134,   225,   226,   227,   228,   229,   230,    45,
+      25,    47,    48,    49,    26,   119,   120,   121,    51,   254,
+      52,   106,   101,   162,   624,   199,   200,   221,   304,   376,
+     485,   486,   487,   219,   255,   256,   257,    27,    75,   127,
+     128,   129,   130,   177,   208,    59,   260,   261,   262,   263,
+     264,   265,    28,   332,    89,    90,   334,    91,    92,    93,
+      94,   137,   267,   268,   469,   269,   470,   270,   271,   350,
+     537,   272,   415,   273,   274,   379,   380,   492,    29,   276,
+     277,   278,   401,   402,   403,   507,   630,   633,   634,   635,
+     279,   280,   281,   282,   283,   284,   451,    95,   286,   326,
+     327,   328,   411,   488,   287,   288,   289,   290,   315,   383,
+     384,   385,   386,   387,   388,   291,   292,   393,   394,   395,
+     397,   398,   399,   496,   592,   186,   187,   293,   294,    53,
+     296,   112,   389,   139,   441,   305,   140,   141,   142,   143,
+      72,   475,   575,   374,     6,     7,    30,    31,    32,    60,
       33,    34,    35
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -572
+#define YYPACT_NINF -582
 static const yytype_int16 yypact[] =
 {
-     -31,    12,    12,    50,  -572,  -572,  -572,    15,  -572,    69,
-    -572,    17,    29,    42,   -20,     5,  -572,   172,    68,    -6,
-    -572,    85,  -572,  -572,    33,   119,   130,  -572,   532,  -572,
-      15,  -572,  -572,     5,  -572,  -572,   122,   125,   127,   606,
-     106,   128,   145,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
-    -572,  -572,  -572,  -572,    80,  -572,  -572,   156,  -572,  -572,
-    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
-    -572,  -572,  -572,   109,   -44,   189,  -572,   172,  -572,  -572,
-    -572,  -572,  -572,   107,  -572,  -572,  -572,   750,   195,    87,
-    -572,  -572,  -572,  -572,   110,  -572,  -572,   111,  -572,  -572,
-     658,  -572,   116,  -572,  -572,  -572,  -572,   172,   172,   172,
-     172,  -572,   121,    69,  -572,   587,   965,  -572,   124,   115,
-    -572,  -572,    -6,  -572,  -572,  -572,   126,   139,  -572,  -572,
-    -572,   141,   142,  -572,  -572,  -572,    -9,  -572,  -572,  -572,
-    -572,  -572,  -572,  -572,   532,  -572,  -572,  -572,  -572,  -572,
-    -572,   146,   148,   146,  -572,  -572,  -572,  -572,   146,   146,
-     146,  -572,   219,   149,   161,   162,   164,   221,  -572,  -572,
-    -572,   233,  -572,  -572,   156,  -572,   -15,  -572,   -44,   254,
-     172,  -572,   750,  -572,   246,  -572,  -572,   606,  -572,  -572,
-    -572,  -572,  -572,   249,   245,   263,    23,  -572,  -572,   302,
-    -572,  -572,  -572,    -6,  -572,  -572,  -572,  -572,  -572,     4,
-    -572,  -572,   207,   209,  -572,  -572,  -572,  -572,   262,    94,
-    -572,  -572,    94,   222,   227,     4,  -572,   299,  -572,  -572,
-    -572,  -572,   300,  -572,    94,   106,   218,   218,   311,   313,
-     314,   232,   278,   510,   645,   766,   790,   440,   172,  -572,
-     -33,   440,   316,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
-    -572,  -572,  -572,  -572,   317,   532,  -572,  -572,   318,  -572,
-     319,   806,  -572,  -572,  -572,  -572,  -572,  -572,  -572,   321,
-    -572,  -572,  -572,   218,   210,   236,  -572,  -572,  -572,  -572,
-    -572,  -572,  -572,   323,  -572,  -572,   705,   -74,   110,  -572,
-    -572,  -572,  -572,  -572,   172,   250,  -572,  -572,  -572,  -572,
-    -572,   172,  -572,   822,   325,   326,   342,   343,   335,   331,
-     332,  -572,   336,   339,   255,   256,   258,  -572,  -572,  -572,
-    -572,  -572,  -572,  -572,   260,  -572,  -572,   -22,   -22,   -22,
-     -22,   -22,   -22,   -22,   212,   -13,   286,   286,   286,   334,
-     -22,   286,   -22,  -572,  -572,   950,   278,  -572,  -572,  -572,
-    -572,   886,   902,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
-    -572,  -572,   147,   750,   261,    81,  -572,  -572,   -14,  -572,
-     288,   333,   266,   267,  -572,  -572,  -572,  -572,  -572,  -572,
-    -572,   750,   365,   342,  -572,   750,   368,   343,  -572,   750,
-      32,   335,  -572,  -572,  -572,  -572,  -572,   750,  -572,   440,
-      61,   750,  -572,  -572,   172,   172,   172,   172,   172,   172,
-     172,   350,   351,   359,   360,   361,   362,   363,   364,   717,
-     -22,   172,   172,   172,  -572,  -572,  -572,  -572,  -572,  -572,
-     838,   854,   870,   172,   172,   750,   172,  -572,  -572,  -572,
-     218,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,   417,
-     575,   601,   601,   -33,  -572,  -572,  -572,   532,  -572,  -572,
-    -572,   601,   375,   -21,   750,  -572,   750,  -572,  -572,   146,
-    -572,  -572,  -572,   293,  -572,  -572,  -572,  -572,  -572,   172,
-    -572,  -572,   750,  -572,   822,    27,   378,   382,  -572,   383,
-     384,  -572,   385,   965,   965,   965,   386,  -572,  -572,  -572,
-    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,   172,
-     172,   172,   172,   172,   172,   172,   172,   172,  -572,   172,
-    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
-    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
-    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
-    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
-    -572,  -572,  -572,  -572,   646,   918,   934,  -572,   303,   305,
-     750,  -572,  -572,  -572,  -572,   393,  -572,  -572,  -572,   146,
-    -572,  -572,  -572,  -572,  -572,  -572,  -572,   387,   308,  -572,
-      18,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
-    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,   532,
-     532,  -572,  -572,   322,  -572,  -572,  -572,   429,   965,  -572,
-     440,  -572,   418,    18,  -572,    87,    87,  -572,   950,  -572,
-     411,   412,  -572,  -572,  -572,  -572
+      83,    12,    12,    50,  -582,  -582,  -582,    15,  -582,    53,
+    -582,    23,    42,    52,   -18,    47,  -582,   345,    64,    -6,
+    -582,    82,  -582,  -582,     6,    92,   100,  -582,   533,  -582,
+      15,  -582,  -582,    47,  -582,  -582,   114,   116,   119,   718,
+      95,   123,   137,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+    -582,  -582,  -582,  -582,    56,  -582,  -582,   135,  -582,  -582,
+    -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+    -582,  -582,  -582,    87,     3,   170,  -582,   345,  -582,  -582,
+    -582,  -582,  -582,    84,  -582,  -582,  -582,  -582,   754,   183,
+     104,  -582,  -582,  -582,  -582,    98,  -582,  -582,   110,  -582,
+    -582,   658,  -582,   126,  -582,  -582,  -582,  -582,   345,   345,
+     345,   345,  -582,   129,    53,  -582,   588,   576,  -582,   157,
+     136,  -582,  -582,    -6,  -582,  -582,  -582,   149,   161,  -582,
+    -582,  -582,   164,   165,  -582,  -582,  -582,    99,  -582,  -582,
+    -582,  -582,  -582,  -582,  -582,   533,  -582,  -582,  -582,  -582,
+    -582,  -582,   171,   172,   171,  -582,  -582,  -582,  -582,   171,
+     171,   171,  -582,   246,   186,   187,   202,   203,   283,  -582,
+    -582,  -582,   295,  -582,  -582,   135,  -582,   -16,  -582,     3,
+     298,   345,  -582,   754,  -582,   288,  -582,  -582,   718,  -582,
+    -582,  -582,  -582,  -582,   289,   290,   291,   106,  -582,  -582,
+     333,  -582,  -582,  -582,    -6,  -582,  -582,  -582,  -582,  -582,
+     124,  -582,  -582,   222,   223,  -582,  -582,  -582,  -582,   261,
+     226,  -582,  -582,   226,   235,   240,   124,  -582,   311,  -582,
+    -582,  -582,  -582,   312,  -582,   226,    95,   230,   230,   315,
+     316,   317,   234,   437,   513,   648,   771,   794,   395,   345,
+    -582,   -88,   395,   319,  -582,  -582,  -582,  -582,  -582,  -582,
+    -582,  -582,  -582,  -582,  -582,   320,   533,  -582,  -582,   322,
+    -582,   323,   811,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+     324,  -582,  -582,  -582,   230,   232,   239,  -582,  -582,  -582,
+    -582,  -582,  -582,  -582,   327,  -582,  -582,   708,   -38,    98,
+    -582,  -582,  -582,  -582,  -582,   345,   253,  -582,  -582,  -582,
+    -582,  -582,   345,  -582,   828,   329,   331,   347,   352,   344,
+     341,   342,  -582,   343,   360,   257,   285,   276,  -582,  -582,
+    -582,  -582,  -582,  -582,  -582,   284,  -582,  -582,   -13,   -13,
+     -13,   -13,   -13,   -13,   -13,   214,   -12,   154,   154,   154,
+     362,   -13,   154,   -13,  -582,  -582,   277,   437,  -582,  -582,
+    -582,  -582,   893,   909,  -582,  -582,  -582,  -582,  -582,  -582,
+    -582,  -582,  -582,   145,   754,   286,    77,  -582,  -582,   -14,
+    -582,   313,   355,   292,   293,  -582,  -582,  -582,  -582,  -582,
+    -582,  -582,   754,   388,   347,  -582,   754,   393,   352,  -582,
+     754,    48,   344,  -582,  -582,  -582,  -582,  -582,   754,  -582,
+     395,   118,   754,  -582,  -582,   345,   345,   345,   345,   345,
+     345,   345,   374,   375,   376,   377,   378,   380,   381,   384,
+     610,   -13,   345,   345,   345,  -582,  -582,  -582,  -582,  -582,
+    -582,   845,   861,   877,   345,   345,   754,   345,  -582,  -582,
+    -582,   230,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+     415,   578,   602,   602,   -88,  -582,  -582,  -582,   533,  -582,
+    -582,  -582,   602,   396,   -20,   754,  -582,   754,  -582,  -582,
+     171,  -582,  -582,  -582,   330,  -582,  -582,  -582,  -582,  -582,
+     345,  -582,  -582,   754,  -582,   828,   -56,   413,   434,  -582,
+     435,   436,  -582,   449,   576,   576,   576,   450,  -582,  -582,
+    -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+     345,   345,   345,   345,   345,   345,   345,   345,   345,  -582,
+     345,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+    -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+    -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+    -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+    -582,  -582,  -582,  -582,  -582,   957,   925,   941,  -582,   351,
+     369,   754,  -582,  -582,  -582,  -582,   105,  -582,  -582,  -582,
+     171,  -582,  -582,  -582,  -582,  -582,  -582,  -582,   456,   371,
+    -582,    18,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+    -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+     533,   533,  -582,  -582,   379,  -582,  -582,  -582,   479,   576,
+    -582,   395,  -582,   468,    18,  -582,   104,   104,  -582,   277,
+    -582,   461,   462,  -582,  -582,  -582,  -582
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -572,  -572,  -572,    13,  -572,   338,     8,  -572,  -572,  -572,
-    -572,  -572,   268,  -572,  -572,   224,  -572,  -572,  -572,  -572,
-       0,  -572,  -572,  -572,    10,  -572,  -572,   279,  -572,  -572,
-    -572,   283,   419,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
-    -572,  -572,  -572,  -572,  -572,   230,  -572,  -200,   -95,  -572,
-    -572,   296,  -572,  -572,  -572,  -187,  -572,  -572,  -572,  -572,
-    -572,  -572,  -208,  -572,   211,  -477,  -572,   349,    30,  -572,
-     -90,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
-    -572,  -572,  -202,  -572,  -571,  -572,     7,  -572,  -185,  -572,
-    -572,  -572,  -572,  -572,    74,  -572,  -572,  -572,  -572,  -139,
-    -572,  -572,  -226,  -572,  -572,  -572,  -138,  -114,   272,  -572,
-    -572,  -403,  -572,    89,  -572,  -572,  -572,  -572,  -229,  -572,
-    -572,    22,  -572,  -242,     9,  -572,  -572,  -572,  -572,   131,
-    -572,  -572,   120,  -572,  -572,  -146,    46,  -572,  -572,  -184,
-    -572,   290,   -82,   -27,  -128,  -186,  -206,  -572,   -25,   -17,
-    -205,  -572,  -384,  -572,  -572,  -572,  -572,   488,  -572,   490,
-    -572,  -572,    24
+    -582,  -582,  -582,    25,  -582,   387,     7,  -582,  -582,  -582,
+    -582,  -582,   321,  -582,  -582,   272,  -582,  -582,  -582,  -582,
+      -4,  -582,  -582,  -582,     8,  -582,  -582,   337,  -582,  -582,
+    -582,   332,   463,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+    -582,  -582,  -582,  -582,  -582,   273,  -582,  -196,  -105,  -582,
+    -582,   339,  -582,  -582,  -582,  -190,  -582,  -582,  -582,  -582,
+    -582,  -582,  -206,  -582,   255,  -383,  -582,   382,    51,  -582,
+     -93,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,  -582,
+    -582,  -582,  -268,  -582,  -581,  -582,    36,  -582,  -183,  -582,
+    -582,  -582,  -582,  -582,   131,  -582,  -582,  -582,  -582,  -100,
+    -582,  -582,  -233,  -582,  -582,  -582,  -111,  -113,   294,  -582,
+    -582,  -402,  -582,   132,  -582,  -582,  -582,  -582,  -229,  -582,
+    -582,    45,  -582,  -192,    49,  -582,  -582,  -582,  -582,   150,
+    -582,  -582,   147,  -582,  -582,  -148,   -22,  -582,  -582,  -176,
+    -582,   325,   -81,   -27,  -106,  -189,  -207,  -582,   -25,   -17,
+    -205,  -582,  -384,  -582,  -582,  -582,  -582,   517,  -582,   516,
+    -582,  -582,    71
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -351
+#define YYTABLE_NINF -352
 static const yytype_int16 yytable[] =
 {
-      71,    95,   171,    96,   145,   137,   509,   188,   315,    46,
-     265,    97,   296,   298,  -154,     9,   320,    44,   257,    50,
-     202,   488,   106,   412,    11,    12,    13,   175,    14,   631,
-     234,   258,   432,   274,   294,   265,   305,   296,   298,    61,
-      58,   322,    16,   257,  -268,   328,   503,     4,   311,   630,
-      10,    15,    16,  -268,   354,   114,   258,    61,   274,   294,
-     134,   504,   631,    54,   505,   351,   122,   123,   124,    80,
-      81,    82,    36,    37,    38,    39,    55,   575,   576,    12,
-      13,   125,    14,     1,     2,  -269,    40,   580,    56,    87,
-     163,   164,   165,   166,  -269,   203,   204,   205,   413,   172,
-     211,    87,    57,    41,   284,    73,   489,   433,   221,   222,
-     223,   206,    74,    46,   181,   182,   477,    95,    17,    96,
-      76,    44,    18,    50,   589,    19,   590,    97,   284,   284,
-     452,    20,   299,   300,   301,   302,   415,   416,   417,   418,
-     419,   420,   635,   636,   107,   108,   470,   109,   444,   496,
-     446,    77,   110,   499,    78,   455,   458,   502,   479,   480,
-     324,   481,   482,   134,   467,    79,   471,   473,   101,   217,
-     106,   102,    17,   103,   112,   334,    18,   478,   479,   480,
-     113,   481,   482,   483,   459,    63,    64,    65,    66,    67,
-      68,    69,    70,   460,   461,   462,   463,    84,    85,    86,
-     116,   297,   117,   328,   189,   190,   191,   144,   374,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,   252,   441,
-     442,   550,   121,   445,   130,   172,   297,   640,   529,  -269,
-     143,   323,    87,  -268,   537,   541,   545,   162,    95,   174,
-      96,   167,   284,   252,   350,   177,   352,   173,    97,   421,
-     422,   423,   424,   425,   426,   427,   428,   429,   284,   178,
-     179,   430,   180,   232,   184,   192,   187,   197,   200,   233,
-     193,    11,    12,    13,   234,   464,   465,   466,   235,    40,
-     236,   237,   194,   195,   238,   196,   239,   376,   240,   209,
-     241,   475,   212,   215,   380,   242,   214,    58,   243,   244,
-      63,    64,    65,    66,   245,   246,   247,   248,   249,   216,
-     219,   250,    84,    85,    86,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,   249,   508,   230,   170,   231,   511,
-     306,   307,   431,   584,   309,   310,   313,   355,   451,   172,
-     434,   435,   436,   437,   438,   439,   316,   472,   317,   318,
-     251,   329,   330,   335,   336,   297,   353,   356,   357,   377,
-     389,   390,   391,   548,   395,   399,   403,   404,   612,   615,
-     618,   405,    19,   577,   406,   408,   407,   579,   409,   443,
-     251,   411,   476,   581,   490,   493,   492,   494,   497,   597,
-     598,   599,   582,   500,   583,   519,   520,   512,   513,   514,
-     515,   516,   517,   518,   521,   522,   523,   524,   525,   526,
-    -158,   585,   528,   592,   530,   531,   532,   593,   594,   595,
-     596,   600,   627,   619,   328,   620,   546,   547,   628,   549,
-      62,    63,    64,    65,    66,    67,    68,    69,    70,   622,
-      95,   637,    96,   626,   638,   641,   644,   645,   210,   308,
-      97,   168,  -153,   201,  -131,  -131,  -131,  -131,  -131,  -131,
-    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
-     213,   115,   380,   321,   208,   507,   332,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,   172,   172,   172,   135,
-      84,    85,    86,   183,   642,   624,   586,   578,   621,   510,
-     643,   587,   601,   602,   603,   604,   605,   606,   607,   608,
-     609,   232,   610,   319,   639,    87,   588,   501,    98,    11,
-      12,    13,   234,    99,   498,   312,   235,    40,   236,   237,
-       0,     0,   238,     0,   239,     0,   240,     0,   241,  -131,
-       0,     0,     0,   242,     0,    58,     0,   244,    63,    64,
-      65,    66,   245,   246,   247,   248,   249,     0,     0,   250,
-      84,    85,    86,     0,     0,     0,     0,     0,   625,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    80,    81,
-      82,    83,    84,    85,    86,     0,     0,     0,     0,     0,
-       0,     0,    95,    95,    96,    96,     0,     0,     0,     0,
-       0,     0,    97,    97,     0,     0,     0,     0,     0,     0,
-       0,   172,     0,     0,     0,     0,     0,     0,     0,     0,
-      19,   451,   169,     0,     0,     0,     0,     0,   251,   551,
-     552,   553,   554,   555,   556,   557,   558,   559,   560,   561,
-     562,   563,   564,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,   104,     0,    87,   551,   552,   553,   554,   555,
-     556,   557,   558,   559,   560,   561,   562,   563,   564,   147,
-     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
-     158,   159,   160,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,   611,  -263,   146,   135,    84,    85,    86,     0,
-       0,     0,     0,   565,     0,   566,   567,   568,   569,   570,
-     571,   572,   573,  -350,  -350,  -350,  -350,  -350,  -350,  -350,
-    -350,  -350,  -350,  -350,  -350,  -350,  -350,     0,     0,   565,
-       0,   566,   567,   568,   569,   570,   571,   572,   573,     0,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,    62,    63,    64,    65,    66,    67,
-      68,    69,   527,  -350,     0,     0,  -350,     0,     0,     0,
-       0,     0,  -350,   358,   359,   360,   361,   362,   363,   364,
-     365,   366,   367,   368,   369,   370,   371,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    80,    81,    82,   135,
-      84,    85,    86,  -222,  -222,  -222,  -222,  -222,  -222,  -222,
-    -222,  -222,  -222,  -222,  -222,  -222,  -222,  -222,  -222,     0,
-       0,     0,     0,     0,     0,     0,   372,  -223,  -223,  -223,
-    -223,  -223,  -223,  -223,  -223,  -223,  -223,  -223,  -223,  -223,
-    -223,  -223,  -223,   337,   338,   339,   340,   341,   342,   343,
-     344,   345,   346,   347,   348,   135,    84,    85,    86,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,   381,    81,
-      82,   135,    84,    85,    86,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,   533,   534,   535,   135,    84,    85,
-      86,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-     538,   539,   540,   135,    84,    85,    86,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,   542,   543,   544,   135,
-      84,    85,    86,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,     0,   453,   454,   135,    84,    85,    86,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,     0,   456,
-     457,   135,    84,    85,    86,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,     0,   613,   614,   135,    84,    85,
-      86,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-       0,   616,   617,   135,    84,    85,    86,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,   447,     0,     0,   448,
-       0,   449,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,     0,     0,     0,   170
+      71,    96,   146,    97,   172,    46,   189,   138,   510,   316,
+     321,    98,   297,   266,   299,  -154,    44,    50,   176,   203,
+     632,   489,   107,   258,    11,    12,    13,     9,    14,   259,
+     235,  -269,   413,   433,   306,    88,   275,   297,   266,   299,
+    -269,   323,   590,   295,   591,   329,   312,     4,   258,   631,
+      10,    15,    16,   632,   259,   355,    36,    37,    38,    39,
+     135,   275,   504,    12,    13,   352,    14,   115,   295,    54,
+      40,   416,   417,   418,   419,   420,   421,   505,   576,   577,
+     506,  -268,    58,   445,    16,   447,    61,    41,   581,    55,
+    -268,   164,   165,   166,   167,   204,   205,   206,    56,   222,
+     173,    73,   212,    88,    61,    57,   285,   490,   414,   434,
+      46,   207,   478,    74,   123,   124,   125,    76,    96,    17,
+      97,    44,    50,    18,   453,    77,    19,    78,    98,   126,
+     285,   285,    20,   108,   109,    79,   110,   190,   191,   192,
+     471,   111,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,   623,    80,    81,    82,   456,   459,    17,   325,    87,
+     102,    18,   103,   530,   135,   104,   472,   468,   474,   113,
+     218,   107,   114,   335,   479,   480,   481,   117,   482,   483,
+     484,   118,   460,    63,    64,    65,    66,    67,    68,    69,
+      70,   461,   462,   463,   464,    84,    85,    86,     1,     2,
+     497,   122,   298,   329,   500,   131,   375,  -269,   503,   435,
+     436,   437,   438,   439,   440,   253,   480,   481,   144,   482,
+     483,    88,   551,   182,   183,   145,   173,   298,    88,   641,
+     223,   224,   324,  -268,   538,   542,   546,   636,   637,    96,
+     253,    97,   442,   443,   285,   351,   446,   353,   163,    98,
+     168,   422,   423,   424,   425,   426,   427,   428,   429,   430,
+     285,   175,   233,   431,   300,   301,   302,   303,   234,   178,
+      11,    12,    13,   235,   465,   466,   467,   236,    40,   237,
+     238,   174,   179,   239,   180,   240,   181,   241,   377,   242,
+     185,   188,   193,   476,   243,   381,    58,   244,   245,    63,
+      64,    65,    66,   246,   247,   248,   249,   250,   194,   195,
+     251,    84,    85,    86,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,   448,   196,   197,   449,   509,   450,   198,
+     201,   512,   585,   210,   213,   432,   215,   217,   216,   452,
+     173,   220,   231,   232,   307,   308,   310,   311,   473,   314,
+     317,   318,   319,   252,   330,   331,   298,   336,   337,   354,
+     356,   357,   358,   378,   390,   549,   391,   392,   613,   616,
+     619,   578,    19,   396,   400,   580,   404,   405,   406,   408,
+     252,   582,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,   598,   599,   600,   583,   407,   584,   410,   513,   514,
+     515,   516,   517,   518,   519,   409,   412,   444,   477,   493,
+     491,   498,   494,   529,   495,   531,   532,   533,   501,   520,
+     521,   522,   523,   524,   329,   525,   526,   547,   548,   527,
+     550,  -158,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    96,   627,    97,   136,    84,    85,    86,   593,   586,
+    -153,    98,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
+    -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,   594,
+     595,   596,   620,   381,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,   250,   597,   601,   171,   173,   173,   173,
+     621,   628,   629,   625,   639,   642,   645,   646,   309,   638,
+     622,   169,   211,   602,   603,   604,   605,   606,   607,   608,
+     609,   610,   202,   611,   233,   116,   640,   322,   209,   579,
+     214,   333,    11,    12,    13,   235,   587,   184,   644,   236,
+      40,   237,   238,   508,   643,   239,   320,   240,  -131,   241,
+     589,   242,   588,   511,   499,   502,   243,    99,    58,   100,
+     245,    63,    64,    65,    66,   246,   247,   248,   249,   250,
+       0,   313,   251,    84,    85,    86,     0,     0,     0,   626,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    80,
+      81,    82,    83,    84,    85,    86,    87,     0,     0,     0,
+       0,     0,     0,    96,    96,    97,    97,     0,     0,     0,
+       0,     0,     0,    98,    98,     0,     0,     0,     0,     0,
+       0,     0,   173,    62,    63,    64,    65,    66,    67,    68,
+      69,    70,   452,   170,    19,   171,     0,     0,     0,     0,
+       0,     0,   252,   552,   553,   554,   555,   556,   557,   558,
+     559,   560,   561,   562,   563,   564,   565,    62,    63,    64,
+      65,    66,    67,    68,    69,   528,    88,   552,   553,   554,
+     555,   556,   557,   558,   559,   560,   561,   562,   563,   564,
+     565,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   147,     0,     0,  -263,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   566,     0,   567,
+     568,   569,   570,   571,   572,   573,   574,  -351,  -351,  -351,
+    -351,  -351,  -351,  -351,  -351,  -351,  -351,  -351,  -351,  -351,
+    -351,   566,     0,   567,   568,   569,   570,   571,   572,   573,
+     574,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157,   158,   159,   160,   161,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,   105,     0,     0,  -351,     0,     0,
+    -351,     0,     0,     0,     0,     0,  -351,   359,   360,   361,
+     362,   363,   364,   365,   366,   367,   368,   369,   370,   371,
+     372,    62,    63,    64,    65,    66,    67,    68,    69,    70,
+      80,    81,    82,   136,    84,    85,    86,    87,  -222,  -222,
+    -222,  -222,  -222,  -222,  -222,  -222,  -222,  -222,  -222,  -222,
+    -222,  -222,  -222,  -222,  -222,     0,     0,     0,     0,     0,
+     373,  -223,  -223,  -223,  -223,  -223,  -223,  -223,  -223,  -223,
+    -223,  -223,  -223,  -223,  -223,  -223,  -223,  -223,   338,   339,
+     340,   341,   342,   343,   344,   345,   346,   347,   348,   349,
+     136,    84,    85,    86,    87,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,   382,    81,    82,   136,    84,    85,
+      86,    87,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,   534,   535,   536,   136,    84,    85,    86,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,   539,   540,   541,
+     136,    84,    85,    86,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,   543,   544,   545,   136,    84,    85,    86,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,     0,
+     454,   455,   136,    84,    85,    86,    62,    63,    64,    65,
+      66,    67,    68,    69,    70,     0,   457,   458,   136,    84,
+      85,    86,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,     0,   614,   615,   136,    84,    85,    86,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,     0,   617,   618,
+     136,    84,    85,    86,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,   612,     0,     0,   136,    84,    85,    86
 };
 
 static const yytype_int16 yycheck[] =
 {
-      17,    28,   116,    28,    94,    87,   409,   153,   237,     9,
-     218,    28,   218,   218,    35,     2,   242,     9,   218,     9,
-      35,    35,    39,    45,     9,    10,    11,   122,    13,   600,
-      12,   218,    45,   218,   218,   243,   222,   243,   243,    15,
-      35,   247,    37,   243,   118,   251,    14,    35,   234,    31,
-       0,    36,    37,   127,   283,    42,   243,    33,   243,   243,
-      77,    29,   633,    46,    32,   271,   110,   111,   112,    46,
-      47,    48,     3,     4,     5,     6,    47,   461,   462,    10,
-      11,   125,    13,   114,   115,   118,    17,   471,    46,   122,
-     107,   108,   109,   110,   127,   110,   111,   112,   120,   116,
-     182,   122,   122,    34,   218,    37,   120,   120,   203,   105,
-     106,   126,   118,   113,   123,   124,    35,   144,   103,   144,
-      35,   113,   107,   113,    97,   110,    99,   144,   242,   243,
-     356,   116,    38,    39,    40,    41,   338,   339,   340,   341,
-     342,   343,   619,   620,    38,    39,   372,    41,   350,   391,
-     352,   118,    46,   395,    35,   361,   362,   399,    97,    98,
-     250,   100,   101,   180,   372,    35,   372,   372,    46,   196,
-     187,    46,   103,    46,    46,   265,   107,    96,    97,    98,
-      35,   100,   101,   102,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-     120,   218,    46,   409,   158,   159,   160,   120,   298,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,   218,   347,
-     348,   450,   113,   351,    35,   242,   243,   630,   430,   122,
-      35,   248,   122,   122,   440,   441,   442,   121,   265,   124,
-     265,   120,   356,   243,   271,   119,   271,   123,   265,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,   372,   120,
-     119,    49,   120,     1,   118,    46,   118,    46,    35,     7,
-     121,     9,    10,    11,    12,   128,   129,   130,    16,    17,
-      18,    19,   121,   121,    22,   121,    24,   304,    26,    35,
-      28,   373,    46,    48,   311,    33,    47,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    46,
-       8,    49,    50,    51,    52,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,   407,   119,    49,   119,   411,
-     108,   104,   120,   479,    35,    35,   118,   127,   355,   356,
-      54,    55,    56,    57,    58,    59,    35,   372,    35,    35,
-     118,    35,    35,    35,    35,   372,    35,   121,    35,   109,
-      35,    35,    20,   445,    21,    30,    35,    35,   574,   575,
-     576,    35,   110,   463,    35,   119,   121,   467,   120,    45,
-     118,   121,   121,   473,    96,   119,    53,   120,    23,   503,
-     504,   505,   474,    25,   476,    45,    45,   414,   415,   416,
-     417,   418,   419,   420,    45,    45,    45,    45,    45,    45,
-      35,   118,   429,    35,   431,   432,   433,    35,    35,    35,
-      35,    35,    35,   120,   630,   120,   443,   444,   120,   446,
+      17,    28,    95,    28,   117,     9,   154,    88,   410,   238,
+     243,    28,   219,   219,   219,    35,     9,     9,   123,    35,
+     601,    35,    39,   219,     9,    10,    11,     2,    13,   219,
+      12,   119,    45,    45,   223,   123,   219,   244,   244,   244,
+     128,   248,    98,   219,   100,   252,   235,    35,   244,    31,
+       0,    36,    37,   634,   244,   284,     3,     4,     5,     6,
+      77,   244,    14,    10,    11,   272,    13,    42,   244,    46,
+      17,   339,   340,   341,   342,   343,   344,    29,   462,   463,
+      32,   119,    35,   351,    37,   353,    15,    34,   472,    47,
+     128,   108,   109,   110,   111,   111,   112,   113,    46,   204,
+     117,    37,   183,   123,    33,   123,   219,   121,   121,   121,
+     114,   127,    35,   119,   111,   112,   113,    35,   145,   104,
+     145,   114,   114,   108,   357,   119,   111,    35,   145,   126,
+     243,   244,   117,    38,    39,    35,    41,   159,   160,   161,
+     373,    46,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    46,    47,    48,   362,   363,   104,   251,    53,
+      46,   108,    46,   431,   181,    46,   373,   373,   373,    46,
+     197,   188,    35,   266,    97,    98,    99,   121,   101,   102,
+     103,    46,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,   115,   116,
+     392,   114,   219,   410,   396,    35,   299,   123,   400,    55,
+      56,    57,    58,    59,    60,   219,    98,    99,    35,   101,
+     102,   123,   451,   124,   125,   121,   243,   244,   123,   631,
+     106,   107,   249,   123,   441,   442,   443,   620,   621,   266,
+     244,   266,   348,   349,   357,   272,   352,   272,   122,   266,
+     121,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+     373,   125,     1,    49,    38,    39,    40,    41,     7,   120,
+       9,    10,    11,    12,   129,   130,   131,    16,    17,    18,
+      19,   124,   121,    22,   120,    24,   121,    26,   305,    28,
+     119,   119,    46,   374,    33,   312,    35,    36,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    46,   122,   122,
+      49,    50,    51,    52,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,   122,   122,    49,   408,    51,    46,
+      35,   412,   480,    35,    46,   121,    47,    46,    48,   356,
+     357,     8,   120,   120,   109,   105,    35,    35,   373,   119,
+      35,    35,    35,   119,    35,    35,   373,    35,    35,    35,
+     128,   122,    35,   110,    35,   446,    35,    20,   575,   576,
+     577,   464,   111,    21,    30,   468,    35,    35,    35,   122,
+     119,   474,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,   504,   505,   506,   475,    35,   477,   121,   415,   416,
+     417,   418,   419,   420,   421,   120,   122,    45,   122,    54,
+      97,    23,   120,   430,   121,   432,   433,   434,    25,    45,
+      45,    45,    45,    45,   631,    45,    45,   444,   445,    45,
+     447,    35,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,   468,   590,   468,    49,    50,    51,    52,    35,   119,
+      35,   468,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    35,
+      35,    35,   121,   490,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    35,    35,    49,   504,   505,   506,
+     121,    35,   121,   586,    15,    27,    35,    35,   226,   120,
+     581,   114,   181,   520,   521,   522,   523,   524,   525,   526,
+     527,   528,   175,   530,     1,    52,   629,   244,   179,   468,
+     188,   266,     9,    10,    11,    12,   490,   145,   639,    16,
+      17,    18,    19,   402,   634,    22,   242,    24,   123,    26,
+     495,    28,   493,   411,   394,   398,    33,    30,    35,    33,
       37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
-     467,   119,   467,   589,    15,    27,    35,    35,   180,   225,
-     467,   113,    35,   174,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-     187,    52,   489,   243,   178,   401,   265,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,   503,   504,   505,    49,
-      50,    51,    52,   144,   633,   585,   489,   467,   580,   410,
-     638,   492,   519,   520,   521,   522,   523,   524,   525,   526,
-     527,     1,   529,   241,   628,   122,   494,   397,    30,     9,
-      10,    11,    12,    33,   393,   235,    16,    17,    18,    19,
-      -1,    -1,    22,    -1,    24,    -1,    26,    -1,    28,   122,
-      -1,    -1,    -1,    33,    -1,    35,    -1,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    -1,    -1,    49,
-      50,    51,    52,    -1,    -1,    -1,    -1,    -1,   585,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   619,   620,   619,   620,    -1,    -1,    -1,    -1,
-      -1,    -1,   619,   620,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   628,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     110,   638,    35,    -1,    -1,    -1,    -1,    -1,   118,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,    -1,   122,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,   118,    36,    49,    50,    51,    52,    -1,
-      -1,    -1,    -1,   128,    -1,   130,   131,   132,   133,   134,
-     135,   136,   137,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    -1,    -1,   128,
-      -1,   130,   131,   132,   133,   134,   135,   136,   137,    -1,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    95,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,   118,    -1,    -1,   121,    -1,    -1,    -1,
-      -1,    -1,   127,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    50,    51,    52,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   121,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    46,    47,    48,    49,    50,    51,    52,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    37,    38,    39,    40,    41,
+      -1,   236,    49,    50,    51,    52,    -1,    -1,    -1,   586,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    -1,    -1,    -1,
+      -1,    -1,    -1,   620,   621,   620,   621,    -1,    -1,    -1,
+      -1,    -1,    -1,   620,   621,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   629,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,   639,    35,   111,    49,    -1,    -1,    -1,    -1,
+      -1,    -1,   119,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,   123,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+      68,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    36,    -1,    -1,   119,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   129,    -1,   131,
+     132,   133,   134,   135,   136,   137,   138,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,   129,    -1,   131,   132,   133,   134,   135,   136,   137,
+     138,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    -1,    -1,   119,    -1,    -1,
+     122,    -1,    -1,    -1,    -1,    -1,   128,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,    53,    -1,    -1,    -1,    -1,    -1,
+     122,    37,    38,    39,    40,    41,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,    53,    37,    38,    39,    40,    41,
       42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
-      52,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    -1,    47,    48,    49,    50,    51,    52,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    -1,    47,
-      48,    49,    50,    51,    52,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    -1,    47,    48,    49,    50,    51,
-      52,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      -1,    47,    48,    49,    50,    51,    52,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    -1,    -1,    49,
-      -1,    51,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    -1,    -1,    -1,    49
+      52,    53,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    -1,
+      47,    48,    49,    50,    51,    52,    37,    38,    39,    40,
+      41,    42,    43,    44,    45,    -1,    47,    48,    49,    50,
+      51,    52,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    -1,    47,    48,    49,    50,    51,    52,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    -1,    47,    48,
+      49,    50,    51,    52,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    -1,    -1,    49,    50,    51,    52
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
-       0,   114,   115,   139,    35,   141,   292,   293,   140,   141,
-       0,     9,    10,    11,    13,    36,    37,   103,   107,   110,
-     116,   144,   145,   146,   147,   158,   162,   185,   200,   226,
-     294,   295,   296,   298,   299,   300,     3,     4,     5,     6,
-      17,    34,   142,   143,   144,   157,   158,   159,   160,   161,
-     162,   166,   168,   277,    46,    47,    46,   122,    35,   193,
-     297,   300,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,   287,   288,    37,   118,   186,    35,   118,    35,    35,
-      46,    47,    48,    49,    50,    51,    52,   122,   202,   203,
-     205,   206,   207,   208,   245,   281,   286,   287,   295,   297,
-     170,    46,    46,    46,    46,   169,   287,    38,    39,    41,
-      46,   279,    46,    35,   141,   170,   120,    46,   163,   164,
-     165,   113,   110,   111,   112,   125,   187,   188,   189,   190,
-      35,   148,   149,   150,   287,    49,   209,   280,   281,   284,
-     285,   286,   287,    35,   120,   208,    36,    82,    83,    84,
+       0,   115,   116,   140,    35,   142,   293,   294,   141,   142,
+       0,     9,    10,    11,    13,    36,    37,   104,   108,   111,
+     117,   145,   146,   147,   148,   159,   163,   186,   201,   227,
+     295,   296,   297,   299,   300,   301,     3,     4,     5,     6,
+      17,    34,   143,   144,   145,   158,   159,   160,   161,   162,
+     163,   167,   169,   278,    46,    47,    46,   123,    35,   194,
+     298,   301,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,   288,   289,    37,   119,   187,    35,   119,    35,    35,
+      46,    47,    48,    49,    50,    51,    52,    53,   123,   203,
+     204,   206,   207,   208,   209,   246,   282,   287,   288,   296,
+     298,   171,    46,    46,    46,    46,   170,   288,    38,    39,
+      41,    46,   280,    46,    35,   142,   171,   121,    46,   164,
+     165,   166,   114,   111,   112,   113,   126,   188,   189,   190,
+     191,    35,   149,   150,   151,   288,    49,   210,   281,   282,
+     285,   286,   287,   288,    35,   121,   209,    36,    83,    84,
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,   171,   121,   287,   287,   287,   287,   120,   143,    35,
-      49,   245,   287,   123,   124,   186,   191,   119,   120,   119,
-     120,   123,   124,   205,   118,   273,   274,   118,   273,   274,
-     274,   274,    46,   121,   121,   121,   121,    46,   173,   174,
-      35,   165,    35,   110,   111,   112,   126,   192,   189,    35,
-     150,   280,    46,   169,    47,    48,    46,   281,   181,     8,
-     175,   186,   105,   106,   151,   152,   153,   154,   155,   156,
-     119,   119,     1,     7,    12,    16,    18,    19,    22,    24,
-      26,    28,    33,    36,    37,    42,    43,    44,    45,    46,
-      49,   118,   158,   167,   182,   183,   184,   185,   193,   194,
-     195,   196,   197,   198,   199,   200,   210,   211,   213,   215,
-     216,   219,   221,   222,   226,   227,   228,   229,   238,   239,
-     240,   241,   242,   243,   245,   246,   252,   253,   254,   255,
-     263,   264,   275,   276,   277,   278,   284,   287,   288,    38,
-      39,    40,    41,   176,   283,   283,   108,   104,   153,    35,
-      35,   283,   279,   118,   256,   256,    35,    35,    35,   246,
-     240,   183,   284,   287,   208,   247,   248,   249,   284,    35,
-      35,   201,   202,   204,   208,    35,    35,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,   217,
-     281,   284,   286,    35,   256,   127,   121,    35,    68,    69,
+      95,    96,   172,   122,   288,   288,   288,   288,   121,   144,
+      35,    49,   246,   288,   124,   125,   187,   192,   120,   121,
+     120,   121,   124,   125,   206,   119,   274,   275,   119,   274,
+     275,   275,   275,    46,   122,   122,   122,   122,    46,   174,
+     175,    35,   166,    35,   111,   112,   113,   127,   193,   190,
+      35,   151,   281,    46,   170,    47,    48,    46,   282,   182,
+       8,   176,   187,   106,   107,   152,   153,   154,   155,   156,
+     157,   120,   120,     1,     7,    12,    16,    18,    19,    22,
+      24,    26,    28,    33,    36,    37,    42,    43,    44,    45,
+      46,    49,   119,   159,   168,   183,   184,   185,   186,   194,
+     195,   196,   197,   198,   199,   200,   201,   211,   212,   214,
+     216,   217,   220,   222,   223,   227,   228,   229,   230,   239,
+     240,   241,   242,   243,   244,   246,   247,   253,   254,   255,
+     256,   264,   265,   276,   277,   278,   279,   285,   288,   289,
+      38,    39,    40,    41,   177,   284,   284,   109,   105,   154,
+      35,    35,   284,   280,   119,   257,   257,    35,    35,    35,
+     247,   241,   184,   285,   288,   209,   248,   249,   250,   285,
+      35,    35,   202,   203,   205,   209,    35,    35,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    46,    47,    48,
+     218,   282,   285,   287,    35,   257,   128,   122,    35,    69,
       70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,   121,   291,   208,   177,   287,   109,   223,   224,
-     287,    46,   257,   258,   259,   260,   261,   262,   280,    35,
-      35,    20,   265,   266,   267,    21,   268,   269,   270,    30,
-     230,   231,   232,    35,    35,    35,    35,   121,   119,   120,
-     250,   121,    45,   120,   220,   220,   220,   220,   220,   220,
-     220,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      49,   120,    45,   120,    54,    55,    56,    57,    58,    59,
-     282,   282,   282,    45,   220,   282,   220,    46,    49,    51,
-     244,   287,   240,    47,    48,   284,    47,    48,   284,    37,
-      46,    47,    48,    49,   128,   129,   130,   200,   212,   214,
-     240,   284,   286,   288,   289,   280,   121,    35,    96,    97,
-      98,   100,   101,   102,   178,   179,   180,   251,    35,   120,
-      96,   225,    53,   119,   120,   271,   261,    23,   267,   261,
-      25,   270,   261,    14,    29,    32,   233,   232,   280,   249,
-     251,   280,   287,   287,   287,   287,   287,   287,   287,    45,
-      45,    45,    45,    45,    45,    45,    45,    45,   287,   220,
-     287,   287,   287,    46,    47,    48,   218,   284,    46,    47,
-      48,   284,    46,    47,    48,   284,   287,   287,   280,   287,
-     256,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,   128,   130,   131,   132,   133,
-     134,   135,   136,   137,   290,   290,   290,   208,   206,   208,
-     290,   208,   280,   280,   273,   118,   224,   262,   259,    97,
-      99,   272,    35,    35,    35,    35,    35,   245,   245,   245,
-      35,   287,   287,   287,   287,   287,   287,   287,   287,   287,
-     287,    46,   284,    47,    48,   284,    47,    48,   284,   120,
-     120,   280,    46,   172,   208,   287,   273,    35,   120,   234,
-      31,   222,   235,   236,   237,   203,   203,   119,    15,   245,
-     249,    27,   237,   244,    35,    35
+      80,    81,    82,   122,   292,   209,   178,   288,   110,   224,
+     225,   288,    46,   258,   259,   260,   261,   262,   263,   281,
+      35,    35,    20,   266,   267,   268,    21,   269,   270,   271,
+      30,   231,   232,   233,    35,    35,    35,    35,   122,   120,
+     121,   251,   122,    45,   121,   221,   221,   221,   221,   221,
+     221,   221,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    49,   121,    45,   121,    55,    56,    57,    58,    59,
+      60,   283,   283,   283,    45,   221,   283,   221,    46,    49,
+      51,   245,   288,   241,    47,    48,   285,    47,    48,   285,
+      37,    46,    47,    48,    49,   129,   130,   131,   201,   213,
+     215,   241,   285,   287,   289,   290,   281,   122,    35,    97,
+      98,    99,   101,   102,   103,   179,   180,   181,   252,    35,
+     121,    97,   226,    54,   120,   121,   272,   262,    23,   268,
+     262,    25,   271,   262,    14,    29,    32,   234,   233,   281,
+     250,   252,   281,   288,   288,   288,   288,   288,   288,   288,
+      45,    45,    45,    45,    45,    45,    45,    45,    45,   288,
+     221,   288,   288,   288,    46,    47,    48,   219,   285,    46,
+      47,    48,   285,    46,    47,    48,   285,   288,   288,   281,
+     288,   257,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,   129,   131,   132,   133,
+     134,   135,   136,   137,   138,   291,   291,   291,   209,   207,
+     209,   291,   209,   281,   281,   274,   119,   225,   263,   260,
+      98,   100,   273,    35,    35,    35,    35,    35,   246,   246,
+     246,    35,   288,   288,   288,   288,   288,   288,   288,   288,
+     288,   288,    46,   285,    47,    48,   285,    47,    48,   285,
+     121,   121,   281,    46,   173,   209,   288,   274,    35,   121,
+     235,    31,   223,   236,   237,   238,   204,   204,   120,    15,
+     246,   250,    27,   238,   245,    35,    35
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2581,22 +2582,22 @@
   switch (yyn)
     {
         case 4:
-#line 548 "pir.y"
+#line 549 "pir.y"
     { fixup_global_labels(lexer); ;}
     break;
 
   case 20:
-#line 579 "pir.y"
+#line 580 "pir.y"
     { new_macro_const(lexer->macros, (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval), yypirget_lineno(yyscanner)); ;}
     break;
 
   case 21:
-#line 585 "pir.y"
+#line 586 "pir.y"
     { /* fprintf(stderr, "macro body: [%s]\n", CURRENT_MACRO(lexer)->body);*/ ;}
     break;
 
   case 22:
-#line 589 "pir.y"
+#line 590 "pir.y"
     {
                           new_macro(lexer->macros, (yyvsp[(2) - (2)].sval), yypirget_lineno(yyscanner), TRUE,
                                     lexer->macro_size);
@@ -2604,17 +2605,17 @@
     break;
 
   case 27:
-#line 604 "pir.y"
+#line 605 "pir.y"
     { add_macro_param(CURRENT_MACRO(lexer), (yyvsp[(1) - (1)].sval)); ;}
     break;
 
   case 35:
-#line 623 "pir.y"
+#line 624 "pir.y"
     { store_macro_string(CURRENT_MACRO(lexer), "%s\n", (yyvsp[(2) - (2)].sval)); ;}
     break;
 
   case 36:
-#line 627 "pir.y"
+#line 628 "pir.y"
     {
                           store_macro_string(CURRENT_MACRO(lexer), ".local %s %s\n",
                                              pir_type_names[(yyvsp[(2) - (3)].ival)], (yyvsp[(3) - (3)].sval));
@@ -2622,142 +2623,142 @@
     break;
 
   case 37:
-#line 638 "pir.y"
+#line 639 "pir.y"
     { load_library(lexer, (yyvsp[(2) - (2)].sval)); ;}
     break;
 
   case 38:
-#line 642 "pir.y"
+#line 643 "pir.y"
     { yypirset_lineno ((yyvsp[(2) - (2)].ival), yyscanner); ;}
     break;
 
   case 39:
-#line 644 "pir.y"
+#line 645 "pir.y"
     { lexer->filename = (yyvsp[(2) - (2)].sval); ;}
     break;
 
   case 41:
-#line 653 "pir.y"
+#line 654 "pir.y"
     { set_hll(lexer, (yyvsp[(2) - (2)].sval)); ;}
     break;
 
   case 42:
-#line 657 "pir.y"
+#line 658 "pir.y"
     { set_hll_map(lexer, (yyvsp[(2) - (4)].sval), (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 43:
-#line 661 "pir.y"
+#line 662 "pir.y"
     { set_namespace(lexer, (yyvsp[(3) - (4)].key)); ;}
     break;
 
   case 44:
-#line 665 "pir.y"
+#line 666 "pir.y"
     { (yyval.key) = NULL; ;}
     break;
 
   case 45:
-#line 667 "pir.y"
+#line 668 "pir.y"
     { (yyval.key) = (yyvsp[(1) - (1)].key); ;}
     break;
 
   case 46:
-#line 671 "pir.y"
+#line 672 "pir.y"
     { (yyval.key) = new_key(lexer, (yyvsp[(1) - (1)].expr)); ;}
     break;
 
   case 47:
-#line 673 "pir.y"
+#line 674 "pir.y"
     { (yyval.key) = add_key(lexer, (yyvsp[(1) - (3)].key), (yyvsp[(3) - (3)].expr)); ;}
     break;
 
   case 48:
-#line 677 "pir.y"
+#line 678 "pir.y"
     { (yyval.expr) = expr_from_const(lexer, new_const(lexer, STRING_TYPE, (yyvsp[(1) - (1)].sval))); ;}
     break;
 
   case 50:
-#line 687 "pir.y"
+#line 688 "pir.y"
     { close_sub(lexer); ;}
     break;
 
   case 51:
-#line 691 "pir.y"
+#line 692 "pir.y"
     { new_subr(lexer, (yyvsp[(2) - (2)].sval)); ;}
     break;
 
   case 56:
-#line 703 "pir.y"
+#line 704 "pir.y"
     { set_sub_flag(lexer, SUB_FLAG_ANON);;}
     break;
 
   case 57:
-#line 705 "pir.y"
+#line 706 "pir.y"
     { set_sub_flag(lexer, SUB_FLAG_INIT); ;}
     break;
 
   case 58:
-#line 707 "pir.y"
+#line 708 "pir.y"
     { set_sub_flag(lexer, SUB_FLAG_LOAD); ;}
     break;
 
   case 59:
-#line 709 "pir.y"
+#line 710 "pir.y"
     { set_sub_flag(lexer, SUB_FLAG_MAIN); ;}
     break;
 
   case 60:
-#line 711 "pir.y"
+#line 712 "pir.y"
     { set_sub_flag(lexer, SUB_FLAG_LEX); ;}
     break;
 
   case 61:
-#line 713 "pir.y"
+#line 714 "pir.y"
     { set_sub_flag(lexer, SUB_FLAG_POSTCOMP); ;}
     break;
 
   case 62:
-#line 715 "pir.y"
+#line 716 "pir.y"
     { set_sub_flag(lexer, SUB_FLAG_IMMEDIATE); ;}
     break;
 
   case 63:
-#line 717 "pir.y"
+#line 718 "pir.y"
     { set_sub_flag(lexer, SUB_FLAG_MULTI); ;}
     break;
 
   case 64:
-#line 719 "pir.y"
+#line 720 "pir.y"
     { set_sub_outer(lexer, (yyvsp[(3) - (4)].sval)); ;}
     break;
 
   case 65:
-#line 721 "pir.y"
+#line 722 "pir.y"
     { set_sub_methodname(lexer, (yyvsp[(2) - (2)].sval)); ;}
     break;
 
   case 66:
-#line 723 "pir.y"
+#line 724 "pir.y"
     { set_sub_vtable(lexer, (yyvsp[(2) - (2)].sval)); ;}
     break;
 
   case 67:
-#line 725 "pir.y"
+#line 726 "pir.y"
     { set_sub_subid(lexer, (yyvsp[(2) - (2)].sval)); ;}
     break;
 
   case 68:
-#line 727 "pir.y"
+#line 728 "pir.y"
     { set_sub_instanceof(lexer, (yyvsp[(2) - (2)].sval)); ;}
     break;
 
   case 69:
-#line 729 "pir.y"
+#line 730 "pir.y"
     { set_sub_nsentry(lexer, (yyvsp[(2) - (2)].sval)); ;}
     break;
 
   case 73:
-#line 738 "pir.y"
+#line 739 "pir.y"
     {
                            /* if there are parameters, then emit a get_params instruction. */
                            if ((yyvsp[(1) - (1)].ival) > 0) {
@@ -2775,37 +2776,37 @@
     break;
 
   case 74:
-#line 755 "pir.y"
+#line 756 "pir.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 75:
-#line 757 "pir.y"
+#line 758 "pir.y"
     { ++(yyval.ival); /* count number of parameters */ ;}
     break;
 
   case 76:
-#line 761 "pir.y"
+#line 762 "pir.y"
     { set_param_flag(lexer, (yyvsp[(2) - (4)].targ), (yyvsp[(3) - (4)].ival)); ;}
     break;
 
   case 77:
-#line 765 "pir.y"
+#line 766 "pir.y"
     { (yyval.targ) = add_param(lexer, (yyvsp[(1) - (2)].ival), (yyvsp[(2) - (2)].sval)); ;}
     break;
 
   case 78:
-#line 769 "pir.y"
+#line 770 "pir.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 79:
-#line 771 "pir.y"
+#line 772 "pir.y"
     { SET_FLAG((yyval.ival), (yyvsp[(2) - (2)].ival)); ;}
     break;
 
   case 83:
-#line 780 "pir.y"
+#line 781 "pir.y"
     { (yyval.ival) = TARGET_FLAG_INVOCANT;
                            /* XXX handle multi_type */
 
@@ -2813,12 +2814,12 @@
     break;
 
   case 84:
-#line 787 "pir.y"
+#line 788 "pir.y"
     { (yyval.ival) = TARGET_FLAG_UNIQUE_REG; ;}
     break;
 
   case 86:
-#line 794 "pir.y"
+#line 795 "pir.y"
     {
                          ++lexer->stmt_counter;
                          /* increment the logical statement counter; a statement can be
@@ -2829,37 +2830,37 @@
     break;
 
   case 87:
-#line 804 "pir.y"
+#line 805 "pir.y"
     { set_label(lexer, (yyvsp[(1) - (2)].sval)); ;}
     break;
 
   case 105:
-#line 832 "pir.y"
+#line 833 "pir.y"
     { (yyval.sval) = expand_macro(yyscanner, (yyvsp[(1) - (3)].mval), (yyvsp[(2) - (3)].pval)); ;}
     break;
 
   case 106:
-#line 836 "pir.y"
+#line 837 "pir.y"
     { (yyval.pval) = NULL; ;}
     break;
 
   case 107:
-#line 838 "pir.y"
+#line 839 "pir.y"
     { (yyval.pval) = (yyvsp[(2) - (3)].pval); ;}
     break;
 
   case 108:
-#line 842 "pir.y"
+#line 843 "pir.y"
     { (yyval.pval) = NULL; ;}
     break;
 
   case 110:
-#line 847 "pir.y"
+#line 848 "pir.y"
     { (yyval.pval) = new_macro_param((yyvsp[(1) - (1)].sval)); ;}
     break;
 
   case 111:
-#line 849 "pir.y"
+#line 850 "pir.y"
     {
                           macro_param *param = new_macro_param((yyvsp[(3) - (3)].sval));
                           param->next = (yyvsp[(1) - (3)].pval);
@@ -2868,7 +2869,7 @@
     break;
 
   case 112:
-#line 857 "pir.y"
+#line 858 "pir.y"
     {
                           symbol *sym = find_symbol(lexer, (yyvsp[(1) - (1)].sval));
                           if (sym == NULL) {
@@ -2879,22 +2880,22 @@
     break;
 
   case 114:
-#line 866 "pir.y"
+#line 867 "pir.y"
     { (yyval.sval) = expand_macro(yyscanner, (yyvsp[(1) - (2)].mval), (yyvsp[(2) - (2)].pval)); ;}
     break;
 
   case 116:
-#line 871 "pir.y"
+#line 872 "pir.y"
     { (yyval.sval) = (yyvsp[(2) - (3)].sval); ;}
     break;
 
   case 117:
-#line 876 "pir.y"
+#line 877 "pir.y"
     { (yyval.sval) = ""; ;}
     break;
 
   case 118:
-#line 878 "pir.y"
+#line 879 "pir.y"
     { /* XXX cleanup memory stuff */
                           char *newbuff = (char *)mem_sys_allocate((strlen((yyvsp[(1) - (2)].sval)) + strlen((yyvsp[(2) - (2)].sval)) + 2)
                                                                    * sizeof (char));
@@ -2904,17 +2905,17 @@
     break;
 
   case 122:
-#line 890 "pir.y"
+#line 891 "pir.y"
     { (yyval.sval) = expand_macro(yyscanner, (yyvsp[(1) - (2)].mval), (yyvsp[(2) - (2)].pval)); ;}
     break;
 
   case 123:
-#line 898 "pir.y"
+#line 899 "pir.y"
     { set_instr(lexer, NULL); ;}
     break;
 
   case 125:
-#line 906 "pir.y"
+#line 907 "pir.y"
     {
                            if (lexer->parse_errors > MAX_NUM_ERRORS)
                                panic(lexer, "Too many errors. Compilation aborted.\n");
@@ -2924,7 +2925,7 @@
     break;
 
   case 126:
-#line 915 "pir.y"
+#line 916 "pir.y"
     {
                            set_instrf(lexer, "null", "%T", (yyvsp[(2) - (3)].targ));
                            get_opinfo(yyscanner);
@@ -2932,7 +2933,7 @@
     break;
 
   case 127:
-#line 922 "pir.y"
+#line 923 "pir.y"
     {
                            set_instrf(lexer, "get_results", "%T", (yyvsp[(2) - (3)].targ));
                            get_opinfo(yyscanner);
@@ -2940,7 +2941,7 @@
     break;
 
   case 131:
-#line 936 "pir.y"
+#line 937 "pir.y"
     { /* at this point, TK_IDENT may in fact be a symbol identifier,
                             * not an op, so don't do any checks like is_parrot_op() just yet.
                             */
@@ -2950,7 +2951,7 @@
     break;
 
   case 132:
-#line 945 "pir.y"
+#line 946 "pir.y"
     { /* when this rule is activated, the initial identifier must
                            * be a parrot op.
                            */
@@ -2960,7 +2961,7 @@
     break;
 
   case 138:
-#line 963 "pir.y"
+#line 964 "pir.y"
     {
                          /* the "instruction" that was set now appears to be
                           * an identifier; get the name, and check its type.
@@ -2997,22 +2998,22 @@
     break;
 
   case 139:
-#line 999 "pir.y"
+#line 1000 "pir.y"
     { push_operand(lexer, (yyvsp[(1) - (1)].expr)); ;}
     break;
 
   case 140:
-#line 1004 "pir.y"
+#line 1005 "pir.y"
     { push_operand(lexer, expr_from_key(lexer, (yyvsp[(1) - (1)].key))); ;}
     break;
 
   case 141:
-#line 1008 "pir.y"
+#line 1009 "pir.y"
     { (yyval.expr) = expr_from_const(lexer, (yyvsp[(1) - (1)].cval)); ;}
     break;
 
   case 142:
-#line 1010 "pir.y"
+#line 1011 "pir.y"
     { /* this is either a LABEL or a symbol; in the latter case, the type
                             * will be filled in later. */
                            (yyval.expr) = expr_from_ident(lexer, (yyvsp[(1) - (1)].sval));
@@ -3020,17 +3021,17 @@
     break;
 
   case 143:
-#line 1015 "pir.y"
+#line 1016 "pir.y"
     { (yyval.expr) = expr_from_target(lexer, (yyvsp[(1) - (1)].targ)); ;}
     break;
 
   case 144:
-#line 1017 "pir.y"
+#line 1018 "pir.y"
     { (yyval.expr) = expr_from_target(lexer, (yyvsp[(1) - (1)].targ)); ;}
     break;
 
   case 145:
-#line 1021 "pir.y"
+#line 1022 "pir.y"
     {
                            /* if $1 is a register, just return that */
                            if (TEST_FLAG((yyvsp[(1) - (2)].targ)->flags, TARGET_FLAG_IS_REG))
@@ -3054,22 +3055,22 @@
     break;
 
   case 146:
-#line 1044 "pir.y"
+#line 1045 "pir.y"
     { (yyval.key) = (yyvsp[(2) - (3)].key); ;}
     break;
 
   case 147:
-#line 1048 "pir.y"
+#line 1049 "pir.y"
     { (yyval.key) = new_key(lexer, (yyvsp[(1) - (1)].expr)); ;}
     break;
 
   case 148:
-#line 1050 "pir.y"
+#line 1051 "pir.y"
     { (yyval.key) = add_key(lexer, (yyvsp[(1) - (3)].key), (yyvsp[(3) - (3)].expr)); ;}
     break;
 
   case 149:
-#line 1059 "pir.y"
+#line 1060 "pir.y"
     {
                           /* the instruction is already set in parrot_op rule */
                           unshift_operand(lexer, (yyvsp[(4) - (6)].expr));
@@ -3083,7 +3084,7 @@
     break;
 
   case 150:
-#line 1070 "pir.y"
+#line 1071 "pir.y"
     {
                           /* the instruction is already set in parrot_op rule */
                           unshift_operand(lexer, (yyvsp[(4) - (4)].expr));
@@ -3098,7 +3099,7 @@
     break;
 
   case 151:
-#line 1082 "pir.y"
+#line 1083 "pir.y"
     { /* XXX create a PMC const for $4 */
                           unshift_operand(lexer, expr_from_key(lexer, (yyvsp[(4) - (6)].key)));
                           unshift_operand(lexer, expr_from_target(lexer, (yyvsp[(1) - (6)].targ)));
@@ -3109,7 +3110,7 @@
     break;
 
   case 155:
-#line 1099 "pir.y"
+#line 1100 "pir.y"
     {
                           if ((yyvsp[(3) - (3)].ival) == 0)
                               set_instrf(lexer, "null", "%T", (yyvsp[(1) - (3)].targ));
@@ -3121,7 +3122,7 @@
     break;
 
   case 156:
-#line 1108 "pir.y"
+#line 1109 "pir.y"
     {
                           if ((yyvsp[(3) - (3)].dval) == 0.0)
                               set_instrf(lexer, "null", "%T", (yyvsp[(1) - (3)].targ));
@@ -3133,7 +3134,7 @@
     break;
 
   case 157:
-#line 1117 "pir.y"
+#line 1118 "pir.y"
     {
                           set_instrf(lexer, "set", "%T%s", (yyvsp[(1) - (3)].targ), (yyvsp[(3) - (3)].sval));
                           get_opinfo(yyscanner);
@@ -3141,7 +3142,7 @@
     break;
 
   case 158:
-#line 1122 "pir.y"
+#line 1123 "pir.y"
     {
                           set_instrf(lexer, "set", "%T%T", (yyvsp[(1) - (3)].targ), (yyvsp[(3) - (3)].targ));
                           get_opinfo(yyscanner);
@@ -3149,7 +3150,7 @@
     break;
 
   case 159:
-#line 1127 "pir.y"
+#line 1128 "pir.y"
     {
                           symbol *sym = find_symbol(lexer, (yyvsp[(3) - (3)].sval));
                           if (sym) {
@@ -3173,7 +3174,7 @@
     break;
 
   case 160:
-#line 1148 "pir.y"
+#line 1149 "pir.y"
     {
                           unshift_operand(lexer, expr_from_target(lexer, (yyvsp[(1) - (3)].targ)));
                           get_opinfo(yyscanner);
@@ -3181,7 +3182,7 @@
     break;
 
   case 161:
-#line 1153 "pir.y"
+#line 1154 "pir.y"
     {
                           /*   $P0 = foo ["bar"]
                            *
@@ -3202,7 +3203,8 @@
                                   get_opinfo(yyscanner);
                               }
                               else
-                                  yypirerror(yyscanner, lexer, "indexed object '%s' not declared", (yyvsp[(3) - (4)].sval));
+                                  yypirerror(yyscanner, lexer,
+                                             "indexed object '%s' not declared", (yyvsp[(3) - (4)].sval));
 
                               /* create a symbol node anyway, so we can continue with instr. gen. */
                               sym = new_symbol(lexer, (yyvsp[(3) - (4)].sval), PMC_TYPE);
@@ -3224,7 +3226,7 @@
     break;
 
   case 162:
-#line 1193 "pir.y"
+#line 1195 "pir.y"
     {
                           symbol *sym = find_symbol(lexer, (yyvsp[(3) - (4)].sval));
                           target *t;
@@ -3245,7 +3247,7 @@
     break;
 
   case 163:
-#line 1211 "pir.y"
+#line 1213 "pir.y"
     {
                           target *preg = new_reg(lexer, PMC_TYPE, (yyvsp[(3) - (4)].ival));
                           set_target_key(preg, (yyvsp[(4) - (4)].key));
@@ -3255,7 +3257,7 @@
     break;
 
   case 164:
-#line 1218 "pir.y"
+#line 1220 "pir.y"
     {
                           set_instrf(lexer, opnames[(yyvsp[(2) - (3)].ival)], "%T%E", (yyvsp[(1) - (3)].targ), (yyvsp[(3) - (3)].expr));
                           get_opinfo(yyscanner);
@@ -3263,7 +3265,7 @@
     break;
 
   case 165:
-#line 1223 "pir.y"
+#line 1225 "pir.y"
     {
                           if ((yyvsp[(3) - (3)].ival) == 1)
                               set_instrf(lexer, "inc", "%T", (yyvsp[(1) - (3)].targ));
@@ -3277,7 +3279,7 @@
     break;
 
   case 166:
-#line 1234 "pir.y"
+#line 1236 "pir.y"
     {
                           if ((yyvsp[(3) - (3)].dval) == 1.0)
                               set_instrf(lexer, "inc", "%T", (yyvsp[(1) - (3)].targ));
@@ -3291,7 +3293,7 @@
     break;
 
   case 167:
-#line 1245 "pir.y"
+#line 1247 "pir.y"
     {
                           if ((yyvsp[(3) - (3)].ival) == 1)
                               set_instrf(lexer, "dec", "%T", (yyvsp[(1) - (3)].targ));
@@ -3305,7 +3307,7 @@
     break;
 
   case 168:
-#line 1256 "pir.y"
+#line 1258 "pir.y"
     {
                           if ((yyvsp[(3) - (3)].dval) == 1.0)
                               set_instrf(lexer, "dec", "%T", (yyvsp[(1) - (3)].targ));
@@ -3319,7 +3321,7 @@
     break;
 
   case 169:
-#line 1267 "pir.y"
+#line 1269 "pir.y"
     {
                           set_instrf(lexer, "add", "%T%T", (yyvsp[(1) - (3)].targ), (yyvsp[(3) - (3)].targ));
                           get_opinfo(yyscanner);
@@ -3327,7 +3329,7 @@
     break;
 
   case 170:
-#line 1272 "pir.y"
+#line 1274 "pir.y"
     {
                           set_instrf(lexer, "sub", "%T%T", (yyvsp[(1) - (3)].targ), (yyvsp[(3) - (3)].targ));
                           get_opinfo(yyscanner);
@@ -3335,7 +3337,7 @@
     break;
 
   case 171:
-#line 1277 "pir.y"
+#line 1279 "pir.y"
     {
                           set_instrf(lexer, (yyvsp[(3) - (4)].sval), "%T%E", (yyvsp[(1) - (4)].targ), (yyvsp[(4) - (4)].expr));
                           get_opinfo(yyscanner);
@@ -3343,7 +3345,7 @@
     break;
 
   case 172:
-#line 1282 "pir.y"
+#line 1284 "pir.y"
     {
                           if (targets_equal((yyvsp[(1) - (5)].targ), (yyvsp[(3) - (5)].targ))) /* $P0 = $P0 + $P1 ==> $P0 += $P1 */
                               set_instrf(lexer, opnames[(yyvsp[(4) - (5)].ival)], "%T%E", (yyvsp[(1) - (5)].targ), (yyvsp[(5) - (5)].expr));
@@ -3356,7 +3358,7 @@
     break;
 
   case 173:
-#line 1292 "pir.y"
+#line 1294 "pir.y"
     {
                           symbol *sym = find_symbol(lexer, (yyvsp[(1) - (4)].sval));
                           target *t;
@@ -3378,7 +3380,7 @@
     break;
 
   case 174:
-#line 1311 "pir.y"
+#line 1313 "pir.y"
     {
                           target *preg = new_reg(lexer, PMC_TYPE, (yyvsp[(1) - (4)].ival));
                           set_target_key(preg, (yyvsp[(2) - (4)].key));
@@ -3388,97 +3390,97 @@
     break;
 
   case 175:
-#line 1345 "pir.y"
+#line 1347 "pir.y"
     { set_instrf(lexer, opnames[(yyvsp[(2) - (3)].ival)], "%i%T", (yyvsp[(1) - (3)].ival), (yyvsp[(3) - (3)].targ)); ;}
     break;
 
   case 176:
-#line 1347 "pir.y"
+#line 1349 "pir.y"
     { set_instrf(lexer, opnames[(yyvsp[(2) - (3)].ival)], "%n%T", (yyvsp[(1) - (3)].dval), (yyvsp[(3) - (3)].targ)); ;}
     break;
 
   case 177:
-#line 1349 "pir.y"
+#line 1351 "pir.y"
     { set_instrf(lexer, opnames[(yyvsp[(2) - (3)].ival)], "%s%T", (yyvsp[(1) - (3)].sval), (yyvsp[(3) - (3)].targ)); ;}
     break;
 
   case 178:
-#line 1351 "pir.y"
+#line 1353 "pir.y"
     { set_instrf(lexer, "set", "%C", fold_s_s(yyscanner, (yyvsp[(1) - (3)].sval), (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].sval))); ;}
     break;
 
   case 179:
-#line 1353 "pir.y"
+#line 1355 "pir.y"
     { set_instrf(lexer, "set", "%C", fold_i_i(yyscanner, (yyvsp[(1) - (3)].ival), (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival))); ;}
     break;
 
   case 180:
-#line 1355 "pir.y"
+#line 1357 "pir.y"
     { set_instrf(lexer, "set", "%C", fold_n_n(yyscanner, (yyvsp[(1) - (3)].dval), (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval))); ;}
     break;
 
   case 181:
-#line 1357 "pir.y"
+#line 1359 "pir.y"
     { set_instrf(lexer, "set", "%C", fold_i_n(yyscanner, (yyvsp[(1) - (3)].ival), (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval))); ;}
     break;
 
   case 182:
-#line 1359 "pir.y"
+#line 1361 "pir.y"
     { set_instrf(lexer, "set", "%C", fold_n_i(yyscanner, (yyvsp[(1) - (3)].dval), (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival))); ;}
     break;
 
   case 183:
-#line 1364 "pir.y"
+#line 1366 "pir.y"
     { get_opinfo(yyscanner); ;}
     break;
 
   case 184:
-#line 1373 "pir.y"
+#line 1375 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (5)].ival), 1, (yyvsp[(3) - (5)].sval), (yyvsp[(5) - (5)].sval)); ;}
     break;
 
   case 185:
-#line 1375 "pir.y"
+#line 1377 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (5)].ival), 1, "int", (yyvsp[(5) - (5)].sval)); ;}
     break;
 
   case 186:
-#line 1377 "pir.y"
+#line 1379 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (5)].ival), 1, "num", (yyvsp[(5) - (5)].sval)); ;}
     break;
 
   case 187:
-#line 1379 "pir.y"
+#line 1381 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (5)].ival), 1, "pmc", (yyvsp[(5) - (5)].sval)); ;}
     break;
 
   case 188:
-#line 1381 "pir.y"
+#line 1383 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (5)].ival), 1, "string", (yyvsp[(5) - (5)].sval)); ;}
     break;
 
   case 189:
-#line 1383 "pir.y"
+#line 1385 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (5)].ival), 1, "if", (yyvsp[(5) - (5)].sval)); ;}
     break;
 
   case 190:
-#line 1385 "pir.y"
+#line 1387 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (5)].ival), 1, "unless", (yyvsp[(5) - (5)].sval)); ;}
     break;
 
   case 191:
-#line 1387 "pir.y"
+#line 1389 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (5)].ival), 1, "goto", (yyvsp[(5) - (5)].sval)); ;}
     break;
 
   case 192:
-#line 1389 "pir.y"
+#line 1391 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (5)].ival), 1, "null", (yyvsp[(5) - (5)].sval)); ;}
     break;
 
   case 193:
-#line 1391 "pir.y"
+#line 1393 "pir.y"
     {
                           int istrue = evaluate_c(lexer, (yyvsp[(2) - (4)].cval));
                           /* if "unless", invert the true-ness */
@@ -3493,7 +3495,7 @@
     break;
 
   case 194:
-#line 1403 "pir.y"
+#line 1405 "pir.y"
     {
                           set_instrf(lexer, (yyvsp[(1) - (5)].ival) ? "unless_null" : "if_null", "%T%I",
                                      new_reg(lexer, PMC_TYPE, (yyvsp[(3) - (5)].ival)), (yyvsp[(5) - (5)].sval));
@@ -3501,67 +3503,67 @@
     break;
 
   case 195:
-#line 1408 "pir.y"
+#line 1410 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (4)].ival), 0, (yyvsp[(2) - (4)].sval), (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 196:
-#line 1410 "pir.y"
+#line 1412 "pir.y"
     { set_instrf(lexer, (yyvsp[(1) - (4)].ival) ? "unless" : "if", "%T%I", (yyvsp[(2) - (4)].targ), (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 197:
-#line 1412 "pir.y"
+#line 1414 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (4)].ival), 0, "int", (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 198:
-#line 1414 "pir.y"
+#line 1416 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (4)].ival), 0, "num", (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 199:
-#line 1416 "pir.y"
+#line 1418 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (4)].ival), 0, "pmc", (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 200:
-#line 1418 "pir.y"
+#line 1420 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (4)].ival), 0, "string", (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 201:
-#line 1420 "pir.y"
+#line 1422 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (4)].ival), 0, "if", (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 202:
-#line 1422 "pir.y"
+#line 1424 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (4)].ival), 0, "unless", (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 203:
-#line 1424 "pir.y"
+#line 1426 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (4)].ival), 0, "goto", (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 204:
-#line 1426 "pir.y"
+#line 1428 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (4)].ival), 0, "goto", (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 205:
-#line 1428 "pir.y"
+#line 1430 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (4)].ival), 0, "null", (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 206:
-#line 1430 "pir.y"
+#line 1432 "pir.y"
     { create_if_instr(yyscanner, lexer, (yyvsp[(1) - (4)].ival), 0, "null", (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 207:
-#line 1432 "pir.y"
+#line 1434 "pir.y"
     {
                           if ((yyvsp[(2) - (4)].ival) == COMPUTE_DURING_RUNTIME) {
                              if ((yyvsp[(1) - (4)].ival) == NEED_INVERT_OPNAME) /* "unless" */
@@ -3589,7 +3591,7 @@
     break;
 
   case 208:
-#line 1463 "pir.y"
+#line 1465 "pir.y"
     {
                           /* the instructions "gt" and "ge" are converted to "lt" and "le".
                            * if so, then the arguments must be reversed as well. "lt" and
@@ -3618,7 +3620,7 @@
     break;
 
   case 209:
-#line 1489 "pir.y"
+#line 1491 "pir.y"
     {
                           if (((yyvsp[(0) - (3)].ival) != NEED_INVERT_OPNAME) && ((yyvsp[(2) - (3)].ival) == OP_GE || (yyvsp[(2) - (3)].ival) == OP_GT))
                               set_instrf(lexer, opnames[(yyvsp[(2) - (3)].ival) + 1], "%T%i", (yyvsp[(3) - (3)].targ), (yyvsp[(1) - (3)].ival));
@@ -3629,7 +3631,7 @@
     break;
 
   case 210:
-#line 1497 "pir.y"
+#line 1499 "pir.y"
     {
                           if (((yyvsp[(0) - (3)].ival) != NEED_INVERT_OPNAME) && ((yyvsp[(2) - (3)].ival) == OP_GE || (yyvsp[(2) - (3)].ival) == OP_GT))
                               set_instrf(lexer, opnames[(yyvsp[(2) - (3)].ival) + 1], "%T%n", (yyvsp[(3) - (3)].targ), (yyvsp[(1) - (3)].dval));
@@ -3641,7 +3643,7 @@
     break;
 
   case 211:
-#line 1506 "pir.y"
+#line 1508 "pir.y"
     {
                           if (((yyvsp[(0) - (3)].ival) != NEED_INVERT_OPNAME) && ((yyvsp[(2) - (3)].ival) == OP_GE || (yyvsp[(2) - (3)].ival) == OP_GT))
                               set_instrf(lexer, opnames[(yyvsp[(2) - (3)].ival)], "%T%s", (yyvsp[(3) - (3)].targ), (yyvsp[(1) - (3)].sval));
@@ -3653,32 +3655,32 @@
     break;
 
   case 212:
-#line 1515 "pir.y"
+#line 1517 "pir.y"
     { (yyval.ival) = evaluate_i_i((yyvsp[(1) - (3)].ival), (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival)); ;}
     break;
 
   case 213:
-#line 1517 "pir.y"
+#line 1519 "pir.y"
     { (yyval.ival) = evaluate_i_n((yyvsp[(1) - (3)].ival), (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval)); ;}
     break;
 
   case 214:
-#line 1519 "pir.y"
+#line 1521 "pir.y"
     { (yyval.ival) = evaluate_n_i((yyvsp[(1) - (3)].dval), (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival)); ;}
     break;
 
   case 215:
-#line 1521 "pir.y"
+#line 1523 "pir.y"
     { (yyval.ival) = evaluate_n_n((yyvsp[(1) - (3)].dval), (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval)); ;}
     break;
 
   case 216:
-#line 1523 "pir.y"
+#line 1525 "pir.y"
     { (yyval.ival) = evaluate_s_s((yyvsp[(1) - (3)].sval), (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].sval)); ;}
     break;
 
   case 217:
-#line 1527 "pir.y"
+#line 1529 "pir.y"
     {
                           yypirerror(yyscanner, lexer, "cannot compare string to %s",
                                      (yyvsp[(3) - (3)].ival) == INT_TYPE ? "integer" : "number");
@@ -3686,37 +3688,37 @@
     break;
 
   case 218:
-#line 1532 "pir.y"
+#line 1534 "pir.y"
     { yypirerror(yyscanner, lexer, "cannot compare integer to string"); ;}
     break;
 
   case 219:
-#line 1534 "pir.y"
+#line 1536 "pir.y"
     { yypirerror(yyscanner, lexer, "cannot compare number to string"); ;}
     break;
 
   case 220:
-#line 1538 "pir.y"
+#line 1540 "pir.y"
     { (yyval.ival) = INT_TYPE; ;}
     break;
 
   case 221:
-#line 1539 "pir.y"
+#line 1541 "pir.y"
     { (yyval.ival) = NUM_TYPE; ;}
     break;
 
   case 222:
-#line 1542 "pir.y"
+#line 1544 "pir.y"
     { (yyval.ival) = DONT_INVERT_OPNAME; /* no need to invert */ ;}
     break;
 
   case 223:
-#line 1543 "pir.y"
+#line 1545 "pir.y"
     { (yyval.ival) = NEED_INVERT_OPNAME; /* yes, invert opname */ ;}
     break;
 
   case 226:
-#line 1551 "pir.y"
+#line 1553 "pir.y"
     {
                           set_instrf(lexer, "branch", "%I", (yyvsp[(2) - (3)].sval));
                           set_op_labelflag(lexer, BIT(0)); /* bit 0 means: "1 << 0" */
@@ -3725,37 +3727,37 @@
     break;
 
   case 227:
-#line 1559 "pir.y"
+#line 1561 "pir.y"
     { declare_local(lexer, (yyvsp[(2) - (4)].ival), (yyvsp[(3) - (4)].symb)); ;}
     break;
 
   case 228:
-#line 1563 "pir.y"
+#line 1565 "pir.y"
     { (yyval.symb) = (yyvsp[(1) - (1)].symb); ;}
     break;
 
   case 229:
-#line 1565 "pir.y"
+#line 1567 "pir.y"
     { (yyval.symb) = add_local((yyvsp[(1) - (3)].symb), (yyvsp[(3) - (3)].symb)); ;}
     break;
 
   case 230:
-#line 1569 "pir.y"
+#line 1571 "pir.y"
     { (yyval.symb) = new_local(lexer, (yyvsp[(1) - (2)].sval), (yyvsp[(2) - (2)].ival)); ;}
     break;
 
   case 231:
-#line 1572 "pir.y"
+#line 1574 "pir.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 232:
-#line 1573 "pir.y"
+#line 1575 "pir.y"
     { (yyval.ival) = 1; ;}
     break;
 
   case 233:
-#line 1577 "pir.y"
+#line 1579 "pir.y"
     { /* if $4 is not a register, it must be a declared symbol */
                           if (!TEST_FLAG((yyvsp[(4) - (5)].targ)->flags, TARGET_FLAG_IS_REG)) {
 
@@ -3768,12 +3770,12 @@
     break;
 
   case 234:
-#line 1592 "pir.y"
+#line 1594 "pir.y"
     { convert_inv_to_instr(lexer, (yyvsp[(1) - (1)].invo)); ;}
     break;
 
   case 237:
-#line 1604 "pir.y"
+#line 1606 "pir.y"
     { /* $4 contains an invocation object */
                               set_invocation_args((yyvsp[(4) - (8)].invo), (yyvsp[(3) - (8)].argm));
                               (yyval.invo) = set_invocation_results((yyvsp[(4) - (8)].invo), (yyvsp[(6) - (8)].targ));
@@ -3781,72 +3783,72 @@
     break;
 
   case 238:
-#line 1611 "pir.y"
+#line 1613 "pir.y"
     { (yyval.argm) = NULL; ;}
     break;
 
   case 239:
-#line 1613 "pir.y"
+#line 1615 "pir.y"
     { (yyval.argm) = (yyvsp[(1) - (1)].argm); ;}
     break;
 
   case 240:
-#line 1617 "pir.y"
+#line 1619 "pir.y"
     { (yyval.argm) = (yyvsp[(1) - (1)].argm); ;}
     break;
 
   case 241:
-#line 1619 "pir.y"
+#line 1621 "pir.y"
     { (yyval.argm) = add_arg((yyvsp[(1) - (2)].argm), (yyvsp[(2) - (2)].argm)); ;}
     break;
 
   case 242:
-#line 1623 "pir.y"
+#line 1625 "pir.y"
     { (yyval.argm) = (yyvsp[(2) - (3)].argm); ;}
     break;
 
   case 243:
-#line 1627 "pir.y"
+#line 1629 "pir.y"
     { (yyval.invo) = invoke(lexer, CALL_PCC, (yyvsp[(2) - (3)].targ), (yyvsp[(3) - (3)].targ)); ;}
     break;
 
   case 244:
-#line 1629 "pir.y"
+#line 1631 "pir.y"
     { (yyval.invo) = invoke(lexer, CALL_NCI, (yyvsp[(2) - (2)].targ)); ;}
     break;
 
   case 245:
-#line 1632 "pir.y"
+#line 1634 "pir.y"
     { (yyval.invo) = invoke(lexer, CALL_METHOD, (yyvsp[(2) - (5)].targ), (yyvsp[(5) - (5)].expr)); ;}
     break;
 
   case 246:
-#line 1636 "pir.y"
+#line 1638 "pir.y"
     { (yyval.targ) = NULL; ;}
     break;
 
   case 247:
-#line 1638 "pir.y"
+#line 1640 "pir.y"
     { (yyval.targ) = (yyvsp[(2) - (2)].targ); ;}
     break;
 
   case 248:
-#line 1642 "pir.y"
+#line 1644 "pir.y"
     { (yyval.targ) = NULL; ;}
     break;
 
   case 249:
-#line 1644 "pir.y"
+#line 1646 "pir.y"
     { (yyval.targ) = (yyvsp[(1) - (1)].targ); ;}
     break;
 
   case 250:
-#line 1648 "pir.y"
+#line 1650 "pir.y"
     { (yyval.targ) = (yyvsp[(1) - (1)].targ); ;}
     break;
 
   case 251:
-#line 1650 "pir.y"
+#line 1652 "pir.y"
     {
                              if ((yyvsp[(2) - (2)].targ))
                                  (yyval.targ) = add_target(lexer, (yyvsp[(1) - (2)].targ), (yyvsp[(2) - (2)].targ));
@@ -3856,32 +3858,32 @@
     break;
 
   case 252:
-#line 1659 "pir.y"
+#line 1661 "pir.y"
     { (yyval.targ) = (yyvsp[(2) - (3)].targ); ;}
     break;
 
   case 253:
-#line 1661 "pir.y"
+#line 1663 "pir.y"
     { (yyval.targ) = NULL; ;}
     break;
 
   case 255:
-#line 1669 "pir.y"
+#line 1671 "pir.y"
     { (yyval.invo) = set_invocation_results((yyvsp[(3) - (3)].invo), (yyvsp[(1) - (3)].targ)); ;}
     break;
 
   case 256:
-#line 1671 "pir.y"
+#line 1673 "pir.y"
     { (yyval.invo) = set_invocation_results((yyvsp[(3) - (3)].invo), (yyvsp[(1) - (3)].targ)); ;}
     break;
 
   case 257:
-#line 1673 "pir.y"
+#line 1675 "pir.y"
     {  (yyval.invo) = set_invocation_results((yyvsp[(1) - (1)].invo), NULL); ;}
     break;
 
   case 260:
-#line 1681 "pir.y"
+#line 1683 "pir.y"
     {
                              /* if $1 is not a register, check whether the symbol was declared */
                              if (!TEST_FLAG((yyvsp[(1) - (4)].targ)->flags, TARGET_FLAG_IS_REG)) {
@@ -3902,7 +3904,7 @@
     break;
 
   case 261:
-#line 1701 "pir.y"
+#line 1703 "pir.y"
     {
                              (yyval.invo) = invoke(lexer, CALL_PCC, (yyvsp[(1) - (2)].targ), NULL);
                              set_invocation_args((yyval.invo), (yyvsp[(2) - (2)].argm));
@@ -3910,12 +3912,12 @@
     break;
 
   case 262:
-#line 1708 "pir.y"
+#line 1710 "pir.y"
     { (yyval.targ) = (yyvsp[(1) - (1)].targ); ;}
     break;
 
   case 263:
-#line 1710 "pir.y"
+#line 1712 "pir.y"
     {
                              symbol *sym = find_symbol(lexer, (yyvsp[(1) - (1)].sval));
                              if (sym == NULL)
@@ -3926,7 +3928,7 @@
     break;
 
   case 264:
-#line 1720 "pir.y"
+#line 1722 "pir.y"
     { /* check that this identifier was declared */
                              symbol *sym = find_symbol(lexer, (yyvsp[(1) - (1)].sval));
 
@@ -3946,22 +3948,22 @@
     break;
 
   case 265:
-#line 1737 "pir.y"
+#line 1739 "pir.y"
     { (yyval.expr) = expr_from_target(lexer, new_reg(lexer, PMC_TYPE, (yyvsp[(1) - (1)].ival))); ;}
     break;
 
   case 266:
-#line 1739 "pir.y"
+#line 1741 "pir.y"
     { (yyval.expr) = expr_from_target(lexer, new_reg(lexer, STRING_TYPE, (yyvsp[(1) - (1)].ival))); ;}
     break;
 
   case 267:
-#line 1741 "pir.y"
+#line 1743 "pir.y"
     { (yyval.expr) = expr_from_const(lexer, new_const(lexer, STRING_TYPE, (yyvsp[(1) - (1)].sval))); ;}
     break;
 
   case 268:
-#line 1745 "pir.y"
+#line 1747 "pir.y"
     {
                              symbol *sym = find_symbol(lexer, (yyvsp[(1) - (1)].sval));
                              if (sym == NULL)
@@ -3973,67 +3975,67 @@
     break;
 
   case 269:
-#line 1754 "pir.y"
+#line 1756 "pir.y"
     { (yyval.targ) = new_reg(lexer, PMC_TYPE, (yyvsp[(1) - (1)].ival)); ;}
     break;
 
   case 270:
-#line 1759 "pir.y"
+#line 1761 "pir.y"
     { (yyval.targ) = (yyvsp[(2) - (3)].targ); ;}
     break;
 
   case 271:
-#line 1763 "pir.y"
+#line 1765 "pir.y"
     { (yyval.targ) = NULL; ;}
     break;
 
   case 272:
-#line 1765 "pir.y"
+#line 1767 "pir.y"
     { (yyval.targ) = (yyvsp[(1) - (1)].targ); ;}
     break;
 
   case 273:
-#line 1769 "pir.y"
+#line 1771 "pir.y"
     { (yyval.targ) = (yyvsp[(1) - (1)].targ); ;}
     break;
 
   case 274:
-#line 1771 "pir.y"
+#line 1773 "pir.y"
     { (yyval.targ) = add_target(lexer, (yyvsp[(1) - (3)].targ), (yyvsp[(3) - (3)].targ)); ;}
     break;
 
   case 275:
-#line 1775 "pir.y"
+#line 1777 "pir.y"
     { (yyval.targ) = set_param_flag(lexer, (yyvsp[(1) - (2)].targ), (yyvsp[(2) - (2)].ival)); ;}
     break;
 
   case 276:
-#line 1779 "pir.y"
+#line 1781 "pir.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 277:
-#line 1781 "pir.y"
+#line 1783 "pir.y"
     { SET_FLAG((yyval.ival), (yyvsp[(2) - (2)].ival)); ;}
     break;
 
   case 278:
-#line 1785 "pir.y"
+#line 1787 "pir.y"
     { (yyval.ival) = TARGET_FLAG_OPTIONAL; ;}
     break;
 
   case 279:
-#line 1787 "pir.y"
+#line 1789 "pir.y"
     { (yyval.ival) = TARGET_FLAG_OPT_FLAG; ;}
     break;
 
   case 280:
-#line 1789 "pir.y"
+#line 1791 "pir.y"
     { (yyval.ival) = TARGET_FLAG_SLURPY; ;}
     break;
 
   case 281:
-#line 1791 "pir.y"
+#line 1793 "pir.y"
     {
                              (yyval.ival) = TARGET_FLAG_NAMED;
                              set_param_alias(lexer, (yyvsp[(2) - (2)].sval));
@@ -4041,12 +4043,12 @@
     break;
 
   case 282:
-#line 1801 "pir.y"
+#line 1803 "pir.y"
     { convert_inv_to_instr(lexer, (yyvsp[(1) - (1)].invo)); ;}
     break;
 
   case 287:
-#line 1811 "pir.y"
+#line 1813 "pir.y"
     {
                               (yyval.invo) = invoke(lexer, CALL_RETURN);
                               set_invocation_args((yyval.invo), (yyvsp[(2) - (3)].argm));
@@ -4054,7 +4056,7 @@
     break;
 
   case 288:
-#line 1816 "pir.y"
+#line 1818 "pir.y"
     { /* was the invocation a method call? then it becomes a method tail
                                * call, otherwise it's just a normal (sub) tail call.
                                */
@@ -4066,7 +4068,7 @@
     break;
 
   case 289:
-#line 1827 "pir.y"
+#line 1829 "pir.y"
     {
                               (yyval.invo) = invoke(lexer, CALL_YIELD);
                               set_invocation_args((yyval.invo), (yyvsp[(2) - (3)].argm));
@@ -4074,47 +4076,47 @@
     break;
 
   case 290:
-#line 1834 "pir.y"
+#line 1836 "pir.y"
     { (yyval.argm) = (yyvsp[(2) - (3)].argm); ;}
     break;
 
   case 291:
-#line 1838 "pir.y"
+#line 1840 "pir.y"
     { (yyval.argm) = NULL; ;}
     break;
 
   case 292:
-#line 1840 "pir.y"
+#line 1842 "pir.y"
     { (yyval.argm) = (yyvsp[(1) - (1)].argm); ;}
     break;
 
   case 293:
-#line 1844 "pir.y"
+#line 1846 "pir.y"
     { (yyval.argm) = (yyvsp[(1) - (1)].argm); ;}
     break;
 
   case 294:
-#line 1846 "pir.y"
+#line 1848 "pir.y"
     { (yyval.argm) = add_arg((yyvsp[(1) - (3)].argm), (yyvsp[(3) - (3)].argm)); ;}
     break;
 
   case 297:
-#line 1854 "pir.y"
+#line 1856 "pir.y"
     { (yyval.argm) = set_arg_alias(lexer, (yyvsp[(1) - (3)].sval)); ;}
     break;
 
   case 298:
-#line 1858 "pir.y"
+#line 1860 "pir.y"
     { (yyval.argm) = set_arg_flag((yyval.argm), (yyvsp[(2) - (2)].ival)); ;}
     break;
 
   case 299:
-#line 1862 "pir.y"
+#line 1864 "pir.y"
     { (yyval.argm) = set_curarg(lexer, new_argument(lexer, (yyvsp[(1) - (1)].expr)));  ;}
     break;
 
   case 300:
-#line 1868 "pir.y"
+#line 1870 "pir.y"
     {
                               (yyval.invo) = invoke(lexer, CALL_RETURN);
                               set_invocation_args((yyval.invo), (yyvsp[(3) - (5)].argm));
@@ -4122,7 +4124,7 @@
     break;
 
   case 301:
-#line 1877 "pir.y"
+#line 1879 "pir.y"
     {
                               (yyval.invo) = invoke(lexer, CALL_YIELD);
                               set_invocation_args((yyval.invo), (yyvsp[(3) - (5)].argm));
@@ -4130,72 +4132,72 @@
     break;
 
   case 302:
-#line 1884 "pir.y"
+#line 1886 "pir.y"
     { (yyval.argm) = NULL; ;}
     break;
 
   case 303:
-#line 1886 "pir.y"
+#line 1888 "pir.y"
     { (yyval.argm) = (yyvsp[(1) - (1)].argm); ;}
     break;
 
   case 304:
-#line 1891 "pir.y"
+#line 1893 "pir.y"
     { (yyval.argm) = (yyvsp[(1) - (1)].argm); ;}
     break;
 
   case 305:
-#line 1893 "pir.y"
+#line 1895 "pir.y"
     { (yyval.argm) = add_arg((yyvsp[(1) - (2)].argm), (yyvsp[(2) - (2)].argm)); ;}
     break;
 
   case 306:
-#line 1898 "pir.y"
+#line 1900 "pir.y"
     { (yyval.argm) = (yyvsp[(2) - (3)].argm); ;}
     break;
 
   case 307:
-#line 1902 "pir.y"
+#line 1904 "pir.y"
     { (yyval.argm) = NULL; ;}
     break;
 
   case 308:
-#line 1904 "pir.y"
+#line 1906 "pir.y"
     { (yyval.argm) = (yyvsp[(1) - (1)].argm); ;}
     break;
 
   case 309:
-#line 1908 "pir.y"
+#line 1910 "pir.y"
     { (yyval.argm) = (yyvsp[(1) - (1)].argm); ;}
     break;
 
   case 310:
-#line 1910 "pir.y"
+#line 1912 "pir.y"
     { (yyval.argm) = add_arg((yyvsp[(1) - (2)].argm), (yyvsp[(2) - (2)].argm)); ;}
     break;
 
   case 311:
-#line 1914 "pir.y"
+#line 1916 "pir.y"
     { (yyval.argm) = (yyvsp[(2) - (3)].argm); ;}
     break;
 
   case 312:
-#line 1919 "pir.y"
+#line 1921 "pir.y"
     { (yyval.ival) = 0; ;}
     break;
 
   case 313:
-#line 1921 "pir.y"
+#line 1923 "pir.y"
     { SET_FLAG((yyval.ival), (yyvsp[(2) - (2)].ival)); ;}
     break;
 
   case 314:
-#line 1925 "pir.y"
+#line 1927 "pir.y"
     { (yyval.ival) = ARG_FLAG_FLAT; ;}
     break;
 
   case 315:
-#line 1927 "pir.y"
+#line 1929 "pir.y"
     {
                                (yyval.ival) = ARG_FLAG_NAMED;
                                set_arg_alias(lexer, (yyvsp[(2) - (2)].sval));
@@ -4203,137 +4205,141 @@
     break;
 
   case 316:
-#line 1934 "pir.y"
+#line 1936 "pir.y"
     { (yyval.sval) = NULL; ;}
     break;
 
   case 317:
-#line 1936 "pir.y"
+#line 1938 "pir.y"
     { (yyval.sval) = (yyvsp[(1) - (1)].sval); ;}
     break;
 
   case 318:
-#line 1940 "pir.y"
+#line 1942 "pir.y"
     { (yyval.sval) = (yyvsp[(2) - (3)].sval); ;}
     break;
 
   case 322:
-#line 1951 "pir.y"
+#line 1953 "pir.y"
     { store_global_constant(lexer, (yyvsp[(2) - (2)].cval)); ;}
     break;
 
   case 323:
-#line 1955 "pir.y"
+#line 1957 "pir.y"
     { /* XXX is .globalconst to be kept? */ ;}
     break;
 
   case 324:
-#line 1959 "pir.y"
+#line 1961 "pir.y"
     { (yyval.cval) = new_named_const(lexer, INT_TYPE, (yyvsp[(2) - (4)].sval), (yyvsp[(4) - (4)].ival)); ;}
     break;
 
   case 325:
-#line 1961 "pir.y"
+#line 1963 "pir.y"
     { (yyval.cval) = new_named_const(lexer, NUM_TYPE, (yyvsp[(2) - (4)].sval), (yyvsp[(4) - (4)].dval)); ;}
     break;
 
   case 326:
-#line 1963 "pir.y"
+#line 1965 "pir.y"
     { (yyval.cval) = new_named_const(lexer, STRING_TYPE, (yyvsp[(2) - (4)].sval), (yyvsp[(4) - (4)].sval)); ;}
     break;
 
   case 327:
-#line 1965 "pir.y"
+#line 1967 "pir.y"
     { (yyval.cval) = new_pmc_const((yyvsp[(1) - (4)].sval), (yyvsp[(2) - (4)].sval), (yyvsp[(4) - (4)].cval)); ;}
     break;
 
   case 328:
-#line 1972 "pir.y"
+#line 1974 "pir.y"
     { (yyval.expr) = expr_from_target(lexer, (yyvsp[(1) - (1)].targ)); ;}
     break;
 
   case 329:
-#line 1973 "pir.y"
+#line 1975 "pir.y"
     { (yyval.expr) = expr_from_const(lexer, (yyvsp[(1) - (1)].cval)); ;}
     break;
 
   case 330:
-#line 1977 "pir.y"
+#line 1979 "pir.y"
     { (yyval.cval) = new_const(lexer, STRING_TYPE, (yyvsp[(1) - (1)].sval)); ;}
     break;
 
   case 331:
-#line 1978 "pir.y"
+#line 1980 "pir.y"
     { (yyval.cval) = new_const(lexer, INT_TYPE, (yyvsp[(1) - (1)].ival)); ;}
     break;
 
   case 332:
-#line 1979 "pir.y"
+#line 1981 "pir.y"
     { (yyval.cval) = new_const(lexer, NUM_TYPE, (yyvsp[(1) - (1)].dval)); ;}
     break;
 
   case 333:
 #line 1982 "pir.y"
-    { (yyval.ival) = OP_NE; ;}
+    { (yyval.cval) = (yyvsp[(1) - (1)].cval); ;}
     break;
 
   case 334:
-#line 1983 "pir.y"
-    { (yyval.ival) = OP_EQ; ;}
+#line 1985 "pir.y"
+    { (yyval.ival) = OP_NE; ;}
     break;
 
   case 335:
-#line 1984 "pir.y"
-    { (yyval.ival) = OP_LT; ;}
+#line 1986 "pir.y"
+    { (yyval.ival) = OP_EQ; ;}
     break;
 
   case 336:
-#line 1985 "pir.y"
-    { (yyval.ival) = OP_LE; ;}
+#line 1987 "pir.y"
+    { (yyval.ival) = OP_LT; ;}
     break;
 
   case 337:
-#line 1986 "pir.y"
-    { (yyval.ival) = OP_GE; ;}
+#line 1988 "pir.y"
+    { (yyval.ival) = OP_LE; ;}
     break;
 
   case 338:
-#line 1987 "pir.y"
-    { (yyval.ival) = OP_GT; ;}
+#line 1989 "pir.y"
+    { (yyval.ival) = OP_GE; ;}
     break;
 
   case 339:
 #line 1990 "pir.y"
-    { (yyval.ival) = INT_TYPE; ;}
+    { (yyval.ival) = OP_GT; ;}
     break;
 
   case 340:
-#line 1991 "pir.y"
-    { (yyval.ival) = NUM_TYPE; ;}
+#line 1993 "pir.y"
+    { (yyval.ival) = INT_TYPE; ;}
     break;
 
   case 341:
-#line 1992 "pir.y"
-    { (yyval.ival) = PMC_TYPE; ;}
+#line 1994 "pir.y"
+    { (yyval.ival) = NUM_TYPE; ;}
     break;
 
   case 342:
-#line 1993 "pir.y"
-    { (yyval.ival) = STRING_TYPE; ;}
+#line 1995 "pir.y"
+    { (yyval.ival) = PMC_TYPE; ;}
     break;
 
   case 343:
-#line 2001 "pir.y"
+#line 1996 "pir.y"
+    { (yyval.ival) = STRING_TYPE; ;}
+    break;
+
+  case 344:
+#line 2004 "pir.y"
     { set_curtarget(lexer, (yyvsp[(1) - (1)].targ));  ;}
     break;
 
-  case 345:
-#line 2005 "pir.y"
+  case 346:
+#line 2008 "pir.y"
     { /* a symbol must have been declared; check that at this point. */
-                           symbol *sym = find_symbol(lexer, (yyvsp[(1) - (1)].sval));
+                           symbol * sym = find_symbol(lexer, (yyvsp[(1) - (1)].sval));
                            if (sym == NULL) {
                                undeclared_symbol(yyscanner, lexer, (yyvsp[(1) - (1)].sval));
-
                                /* make sure sym is not NULL */
                                sym = new_symbol(lexer, (yyvsp[(1) - (1)].sval), UNKNOWN_TYPE);
                            }
@@ -4341,278 +4347,278 @@
                          ;}
     break;
 
-  case 346:
-#line 2017 "pir.y"
+  case 347:
+#line 2019 "pir.y"
     { (yyval.targ) = new_reg(lexer, PMC_TYPE, (yyvsp[(1) - (1)].ival));    ;}
     break;
 
-  case 347:
-#line 2018 "pir.y"
+  case 348:
+#line 2020 "pir.y"
     { (yyval.targ) = new_reg(lexer, NUM_TYPE, (yyvsp[(1) - (1)].ival));    ;}
     break;
 
-  case 348:
-#line 2019 "pir.y"
+  case 349:
+#line 2021 "pir.y"
     { (yyval.targ) = new_reg(lexer, INT_TYPE, (yyvsp[(1) - (1)].ival));    ;}
     break;
 
-  case 349:
-#line 2020 "pir.y"
+  case 350:
+#line 2022 "pir.y"
     { (yyval.targ) = new_reg(lexer, STRING_TYPE, (yyvsp[(1) - (1)].ival)); ;}
     break;
 
-  case 352:
-#line 2028 "pir.y"
+  case 353:
+#line 2030 "pir.y"
     { (yyval.sval) = "if"; ;}
     break;
 
-  case 353:
-#line 2029 "pir.y"
+  case 354:
+#line 2031 "pir.y"
     { (yyval.sval) = "unless"; ;}
     break;
 
-  case 354:
-#line 2030 "pir.y"
+  case 355:
+#line 2032 "pir.y"
     { (yyval.sval) = "goto"; ;}
     break;
 
-  case 355:
-#line 2031 "pir.y"
+  case 356:
+#line 2033 "pir.y"
     { (yyval.sval) = "int"; ;}
     break;
 
-  case 356:
-#line 2032 "pir.y"
+  case 357:
+#line 2034 "pir.y"
     { (yyval.sval) = "num"; ;}
     break;
 
-  case 357:
-#line 2033 "pir.y"
+  case 358:
+#line 2035 "pir.y"
     { (yyval.sval) = "string"; ;}
     break;
 
-  case 358:
-#line 2034 "pir.y"
+  case 359:
+#line 2036 "pir.y"
     { (yyval.sval) = "pmc"; ;}
     break;
 
-  case 359:
-#line 2035 "pir.y"
+  case 360:
+#line 2037 "pir.y"
     { (yyval.sval) = "null"; ;}
     break;
 
-  case 360:
-#line 2038 "pir.y"
+  case 361:
+#line 2040 "pir.y"
     { (yyval.sval) = "neg"; ;}
     break;
 
-  case 361:
-#line 2039 "pir.y"
+  case 362:
+#line 2041 "pir.y"
     { (yyval.sval) = "not"; ;}
     break;
 
-  case 362:
-#line 2040 "pir.y"
+  case 363:
+#line 2042 "pir.y"
     { (yyval.sval) = "bnot"; ;}
     break;
 
-  case 363:
-#line 2043 "pir.y"
+  case 364:
+#line 2045 "pir.y"
     { (yyval.ival) = OP_ADD; ;}
     break;
 
-  case 364:
-#line 2044 "pir.y"
+  case 365:
+#line 2046 "pir.y"
     { (yyval.ival) = OP_SUB; ;}
     break;
 
-  case 365:
-#line 2045 "pir.y"
+  case 366:
+#line 2047 "pir.y"
     { (yyval.ival) = OP_DIV; ;}
     break;
 
-  case 366:
-#line 2046 "pir.y"
+  case 367:
+#line 2048 "pir.y"
     { (yyval.ival) = OP_MUL; ;}
     break;
 
-  case 367:
-#line 2047 "pir.y"
+  case 368:
+#line 2049 "pir.y"
     { (yyval.ival) = OP_MOD; ;}
     break;
 
-  case 368:
-#line 2048 "pir.y"
+  case 369:
+#line 2050 "pir.y"
     { (yyval.ival) = OP_BOR; ;}
     break;
 
-  case 369:
-#line 2049 "pir.y"
+  case 370:
+#line 2051 "pir.y"
     { (yyval.ival) = OP_BAND; ;}
     break;
 
-  case 370:
-#line 2050 "pir.y"
+  case 371:
+#line 2052 "pir.y"
     { (yyval.ival) = OP_BXOR; ;}
     break;
 
-  case 371:
-#line 2051 "pir.y"
+  case 372:
+#line 2053 "pir.y"
     { (yyval.ival) = OP_POW; ;}
     break;
 
-  case 372:
-#line 2052 "pir.y"
+  case 373:
+#line 2054 "pir.y"
     { (yyval.ival) = OP_CONCAT; ;}
     break;
 
-  case 373:
-#line 2053 "pir.y"
+  case 374:
+#line 2055 "pir.y"
     { (yyval.ival) = OP_LSR; ;}
     break;
 
-  case 374:
-#line 2054 "pir.y"
+  case 375:
+#line 2056 "pir.y"
     { (yyval.ival) = OP_SHR; ;}
     break;
 
-  case 375:
-#line 2055 "pir.y"
+  case 376:
+#line 2057 "pir.y"
     { (yyval.ival) = OP_SHL; ;}
     break;
 
-  case 376:
-#line 2056 "pir.y"
+  case 377:
+#line 2058 "pir.y"
     { (yyval.ival) = OP_OR; ;}
     break;
 
-  case 377:
-#line 2057 "pir.y"
+  case 378:
+#line 2059 "pir.y"
     { (yyval.ival) = OP_AND; ;}
     break;
 
-  case 378:
-#line 2058 "pir.y"
+  case 379:
+#line 2060 "pir.y"
     { (yyval.ival) = OP_FDIV; ;}
     break;
 
-  case 379:
-#line 2059 "pir.y"
+  case 380:
+#line 2061 "pir.y"
     { (yyval.ival) = OP_XOR; ;}
     break;
 
-  case 380:
-#line 2060 "pir.y"
+  case 381:
+#line 2062 "pir.y"
     { (yyval.ival) = OP_ISEQ; ;}
     break;
 
-  case 381:
-#line 2061 "pir.y"
+  case 382:
+#line 2063 "pir.y"
     { (yyval.ival) = OP_ISLE; ;}
     break;
 
-  case 382:
-#line 2062 "pir.y"
+  case 383:
+#line 2064 "pir.y"
     { (yyval.ival) = OP_ISLT; ;}
     break;
 
-  case 383:
-#line 2063 "pir.y"
+  case 384:
+#line 2065 "pir.y"
     { (yyval.ival) = OP_ISGE; ;}
     break;
 
-  case 384:
-#line 2064 "pir.y"
+  case 385:
+#line 2066 "pir.y"
     { (yyval.ival) = OP_ISGT; ;}
     break;
 
-  case 385:
-#line 2065 "pir.y"
+  case 386:
+#line 2067 "pir.y"
     { (yyval.ival) = OP_ISNE; ;}
     break;
 
-  case 386:
-#line 2071 "pir.y"
+  case 387:
+#line 2073 "pir.y"
     { (yyval.ival) = OP_MUL; ;}
     break;
 
-  case 387:
-#line 2072 "pir.y"
+  case 388:
+#line 2074 "pir.y"
     { (yyval.ival) = OP_MOD; ;}
     break;
 
-  case 388:
-#line 2073 "pir.y"
+  case 389:
+#line 2075 "pir.y"
     { (yyval.ival) = OP_POW; ;}
     break;
 
-  case 389:
-#line 2074 "pir.y"
+  case 390:
+#line 2076 "pir.y"
     { (yyval.ival) = OP_DIV; ;}
     break;
 
-  case 390:
-#line 2075 "pir.y"
+  case 391:
+#line 2077 "pir.y"
     { (yyval.ival) = OP_FDIV; ;}
     break;
 
-  case 391:
-#line 2076 "pir.y"
+  case 392:
+#line 2078 "pir.y"
     { (yyval.ival) = OP_BOR; ;}
     break;
 
-  case 392:
-#line 2077 "pir.y"
+  case 393:
+#line 2079 "pir.y"
     { (yyval.ival) = OP_BAND; ;}
     break;
 
-  case 393:
-#line 2078 "pir.y"
+  case 394:
+#line 2080 "pir.y"
     { (yyval.ival) = OP_BXOR; ;}
     break;
 
-  case 394:
-#line 2079 "pir.y"
+  case 395:
+#line 2081 "pir.y"
     { (yyval.ival) = OP_CONCAT; ;}
     break;
 
-  case 395:
-#line 2080 "pir.y"
+  case 396:
+#line 2082 "pir.y"
     { (yyval.ival) = OP_SHR; ;}
     break;
 
-  case 396:
-#line 2081 "pir.y"
+  case 397:
+#line 2083 "pir.y"
     { (yyval.ival) = OP_SHL; ;}
     break;
 
-  case 397:
-#line 2082 "pir.y"
+  case 398:
+#line 2084 "pir.y"
     { (yyval.ival) = OP_LSR; ;}
     break;
 
-  case 399:
-#line 2103 "pir.y"
+  case 400:
+#line 2105 "pir.y"
     { new_subr(lexer, "@start"); ;}
     break;
 
-  case 408:
-#line 2119 "pir.y"
+  case 409:
+#line 2121 "pir.y"
     { set_label(lexer, (yyvsp[(1) - (2)].sval)); ;}
     break;
 
-  case 413:
-#line 2129 "pir.y"
+  case 414:
+#line 2131 "pir.y"
     { set_sub_name(lexer, (yyvsp[(3) - (3)].sval)); ;}
     break;
 
-  case 414:
-#line 2133 "pir.y"
+  case 415:
+#line 2135 "pir.y"
     { new_subr(lexer, NULL); ;}
     break;
 
-  case 415:
-#line 2138 "pir.y"
+  case 416:
+#line 2140 "pir.y"
     {
                                   if (is_parrot_op(lexer, (yyvsp[(1) - (3)].sval)))
                                       get_opinfo(yyscanner);
@@ -4624,7 +4630,7 @@
 
 
 /* Line 1267 of yacc.c.  */
-#line 4628 "pirparser.c"
+#line 4634 "pirparser.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -4838,7 +4844,7 @@
 }
 
 
-#line 2149 "pir.y"
+#line 2151 "pir.y"
 
 
 

Modified: trunk/compilers/pirc/new/pirparser.h
==============================================================================
--- trunk/compilers/pirc/new/pirparser.h	(original)
+++ trunk/compilers/pirc/new/pirparser.h	Sat Dec 27 12:51:36 2008
@@ -89,71 +89,72 @@
      TK_NREG = 305,
      TK_SREG = 306,
      TK_IREG = 307,
-     TK_ARROW = 308,
-     TK_NE = 309,
-     TK_EQ = 310,
-     TK_LT = 311,
-     TK_LE = 312,
-     TK_GT = 313,
-     TK_GE = 314,
-     TK_USHIFT = 315,
-     TK_RSHIFT = 316,
-     TK_LSHIFT = 317,
-     TK_FDIV = 318,
-     TK_OR = 319,
-     TK_AND = 320,
-     TK_XOR = 321,
-     TK_CONC = 322,
-     TK_ASSIGN_USHIFT = 323,
-     TK_ASSIGN_RSHIFT = 324,
-     TK_ASSIGN_LSHIFT = 325,
-     TK_ASSIGN_INC = 326,
-     TK_ASSIGN_DEC = 327,
-     TK_ASSIGN_MUL = 328,
-     TK_ASSIGN_MOD = 329,
-     TK_ASSIGN_POW = 330,
-     TK_ASSIGN_DIV = 331,
-     TK_ASSIGN_BOR = 332,
-     TK_ASSIGN_BAND = 333,
-     TK_ASSIGN_FDIV = 334,
-     TK_ASSIGN_BNOT = 335,
-     TK_ASSIGN_CONC = 336,
-     TK_FLAG_INIT = 337,
-     TK_FLAG_LOAD = 338,
-     TK_FLAG_MAIN = 339,
-     TK_FLAG_ANON = 340,
-     TK_FLAG_METHOD = 341,
-     TK_FLAG_OUTER = 342,
-     TK_FLAG_VTABLE = 343,
-     TK_FLAG_LEX = 344,
-     TK_FLAG_MULTI = 345,
-     TK_FLAG_POSTCOMP = 346,
-     TK_FLAG_IMMEDIATE = 347,
-     TK_FLAG_SUBID = 348,
-     TK_FLAG_INSTANCEOF = 349,
-     TK_FLAG_NSENTRY = 350,
-     TK_FLAG_UNIQUE_REG = 351,
-     TK_FLAG_NAMED = 352,
-     TK_FLAG_SLURPY = 353,
-     TK_FLAG_FLAT = 354,
-     TK_FLAG_OPTIONAL = 355,
-     TK_FLAG_OPT_FLAG = 356,
-     TK_FLAG_INVOCANT = 357,
-     TK_MACRO = 358,
-     TK_ENDM = 359,
-     TK_MACRO_LOCAL = 360,
-     TK_MACRO_LABEL = 361,
-     TK_MACRO_CONST = 362,
-     TK_MACRO_LABEL_ID = 363,
-     TK_MACRO_LOCAL_ID = 364,
-     TK_MACRO_IDENT = 365,
-     TK_MACRO_ARG_IDENT = 366,
-     TK_MACRO_ARG_OTHER = 367,
-     TK_MACRO_CONST_VAL = 368,
-     TK_PASM_MARKER_START = 369,
-     TK_PIR_MARKER_START = 370,
-     TK_PCC_SUB = 371,
-     TK_PARROT_OP = 372
+     TK_CONST_VALUE = 308,
+     TK_ARROW = 309,
+     TK_NE = 310,
+     TK_EQ = 311,
+     TK_LT = 312,
+     TK_LE = 313,
+     TK_GT = 314,
+     TK_GE = 315,
+     TK_USHIFT = 316,
+     TK_RSHIFT = 317,
+     TK_LSHIFT = 318,
+     TK_FDIV = 319,
+     TK_OR = 320,
+     TK_AND = 321,
+     TK_XOR = 322,
+     TK_CONC = 323,
+     TK_ASSIGN_USHIFT = 324,
+     TK_ASSIGN_RSHIFT = 325,
+     TK_ASSIGN_LSHIFT = 326,
+     TK_ASSIGN_INC = 327,
+     TK_ASSIGN_DEC = 328,
+     TK_ASSIGN_MUL = 329,
+     TK_ASSIGN_MOD = 330,
+     TK_ASSIGN_POW = 331,
+     TK_ASSIGN_DIV = 332,
+     TK_ASSIGN_BOR = 333,
+     TK_ASSIGN_BAND = 334,
+     TK_ASSIGN_FDIV = 335,
+     TK_ASSIGN_BNOT = 336,
+     TK_ASSIGN_CONC = 337,
+     TK_FLAG_INIT = 338,
+     TK_FLAG_LOAD = 339,
+     TK_FLAG_MAIN = 340,
+     TK_FLAG_ANON = 341,
+     TK_FLAG_METHOD = 342,
+     TK_FLAG_OUTER = 343,
+     TK_FLAG_VTABLE = 344,
+     TK_FLAG_LEX = 345,
+     TK_FLAG_MULTI = 346,
+     TK_FLAG_POSTCOMP = 347,
+     TK_FLAG_IMMEDIATE = 348,
+     TK_FLAG_SUBID = 349,
+     TK_FLAG_INSTANCEOF = 350,
+     TK_FLAG_NSENTRY = 351,
+     TK_FLAG_UNIQUE_REG = 352,
+     TK_FLAG_NAMED = 353,
+     TK_FLAG_SLURPY = 354,
+     TK_FLAG_FLAT = 355,
+     TK_FLAG_OPTIONAL = 356,
+     TK_FLAG_OPT_FLAG = 357,
+     TK_FLAG_INVOCANT = 358,
+     TK_MACRO = 359,
+     TK_ENDM = 360,
+     TK_MACRO_LOCAL = 361,
+     TK_MACRO_LABEL = 362,
+     TK_MACRO_CONST = 363,
+     TK_MACRO_LABEL_ID = 364,
+     TK_MACRO_LOCAL_ID = 365,
+     TK_MACRO_IDENT = 366,
+     TK_MACRO_ARG_IDENT = 367,
+     TK_MACRO_ARG_OTHER = 368,
+     TK_MACRO_CONST_VAL = 369,
+     TK_PASM_MARKER_START = 370,
+     TK_PIR_MARKER_START = 371,
+     TK_PCC_SUB = 372,
+     TK_PARROT_OP = 373
    };
 #endif
 /* Tokens.  */
@@ -207,71 +208,72 @@
 #define TK_NREG 305
 #define TK_SREG 306
 #define TK_IREG 307
-#define TK_ARROW 308
-#define TK_NE 309
-#define TK_EQ 310
-#define TK_LT 311
-#define TK_LE 312
-#define TK_GT 313
-#define TK_GE 314
-#define TK_USHIFT 315
-#define TK_RSHIFT 316
-#define TK_LSHIFT 317
-#define TK_FDIV 318
-#define TK_OR 319
-#define TK_AND 320
-#define TK_XOR 321
-#define TK_CONC 322
-#define TK_ASSIGN_USHIFT 323
-#define TK_ASSIGN_RSHIFT 324
-#define TK_ASSIGN_LSHIFT 325
-#define TK_ASSIGN_INC 326
-#define TK_ASSIGN_DEC 327
-#define TK_ASSIGN_MUL 328
-#define TK_ASSIGN_MOD 329
-#define TK_ASSIGN_POW 330
-#define TK_ASSIGN_DIV 331
-#define TK_ASSIGN_BOR 332
-#define TK_ASSIGN_BAND 333
-#define TK_ASSIGN_FDIV 334
-#define TK_ASSIGN_BNOT 335
-#define TK_ASSIGN_CONC 336
-#define TK_FLAG_INIT 337
-#define TK_FLAG_LOAD 338
-#define TK_FLAG_MAIN 339
-#define TK_FLAG_ANON 340
-#define TK_FLAG_METHOD 341
-#define TK_FLAG_OUTER 342
-#define TK_FLAG_VTABLE 343
-#define TK_FLAG_LEX 344
-#define TK_FLAG_MULTI 345
-#define TK_FLAG_POSTCOMP 346
-#define TK_FLAG_IMMEDIATE 347
-#define TK_FLAG_SUBID 348
-#define TK_FLAG_INSTANCEOF 349
-#define TK_FLAG_NSENTRY 350
-#define TK_FLAG_UNIQUE_REG 351
-#define TK_FLAG_NAMED 352
-#define TK_FLAG_SLURPY 353
-#define TK_FLAG_FLAT 354
-#define TK_FLAG_OPTIONAL 355
-#define TK_FLAG_OPT_FLAG 356
-#define TK_FLAG_INVOCANT 357
-#define TK_MACRO 358
-#define TK_ENDM 359
-#define TK_MACRO_LOCAL 360
-#define TK_MACRO_LABEL 361
-#define TK_MACRO_CONST 362
-#define TK_MACRO_LABEL_ID 363
-#define TK_MACRO_LOCAL_ID 364
-#define TK_MACRO_IDENT 365
-#define TK_MACRO_ARG_IDENT 366
-#define TK_MACRO_ARG_OTHER 367
-#define TK_MACRO_CONST_VAL 368
-#define TK_PASM_MARKER_START 369
-#define TK_PIR_MARKER_START 370
-#define TK_PCC_SUB 371
-#define TK_PARROT_OP 372
+#define TK_CONST_VALUE 308
+#define TK_ARROW 309
+#define TK_NE 310
+#define TK_EQ 311
+#define TK_LT 312
+#define TK_LE 313
+#define TK_GT 314
+#define TK_GE 315
+#define TK_USHIFT 316
+#define TK_RSHIFT 317
+#define TK_LSHIFT 318
+#define TK_FDIV 319
+#define TK_OR 320
+#define TK_AND 321
+#define TK_XOR 322
+#define TK_CONC 323
+#define TK_ASSIGN_USHIFT 324
+#define TK_ASSIGN_RSHIFT 325
+#define TK_ASSIGN_LSHIFT 326
+#define TK_ASSIGN_INC 327
+#define TK_ASSIGN_DEC 328
+#define TK_ASSIGN_MUL 329
+#define TK_ASSIGN_MOD 330
+#define TK_ASSIGN_POW 331
+#define TK_ASSIGN_DIV 332
+#define TK_ASSIGN_BOR 333
+#define TK_ASSIGN_BAND 334
+#define TK_ASSIGN_FDIV 335
+#define TK_ASSIGN_BNOT 336
+#define TK_ASSIGN_CONC 337
+#define TK_FLAG_INIT 338
+#define TK_FLAG_LOAD 339
+#define TK_FLAG_MAIN 340
+#define TK_FLAG_ANON 341
+#define TK_FLAG_METHOD 342
+#define TK_FLAG_OUTER 343
+#define TK_FLAG_VTABLE 344
+#define TK_FLAG_LEX 345
+#define TK_FLAG_MULTI 346
+#define TK_FLAG_POSTCOMP 347
+#define TK_FLAG_IMMEDIATE 348
+#define TK_FLAG_SUBID 349
+#define TK_FLAG_INSTANCEOF 350
+#define TK_FLAG_NSENTRY 351
+#define TK_FLAG_UNIQUE_REG 352
+#define TK_FLAG_NAMED 353
+#define TK_FLAG_SLURPY 354
+#define TK_FLAG_FLAT 355
+#define TK_FLAG_OPTIONAL 356
+#define TK_FLAG_OPT_FLAG 357
+#define TK_FLAG_INVOCANT 358
+#define TK_MACRO 359
+#define TK_ENDM 360
+#define TK_MACRO_LOCAL 361
+#define TK_MACRO_LABEL 362
+#define TK_MACRO_CONST 363
+#define TK_MACRO_LABEL_ID 364
+#define TK_MACRO_LOCAL_ID 365
+#define TK_MACRO_IDENT 366
+#define TK_MACRO_ARG_IDENT 367
+#define TK_MACRO_ARG_OTHER 368
+#define TK_MACRO_CONST_VAL 369
+#define TK_PASM_MARKER_START 370
+#define TK_PIR_MARKER_START 371
+#define TK_PCC_SUB 372
+#define TK_PARROT_OP 373
 
 
 
@@ -295,7 +297,7 @@
     struct macro_param *pval;
 }
 /* Line 1489 of yacc.c.  */
-#line 299 "pirparser.h"
+#line 301 "pirparser.h"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

Modified: trunk/compilers/pirc/new/pirsymbol.c
==============================================================================
--- trunk/compilers/pirc/new/pirsymbol.c	(original)
+++ trunk/compilers/pirc/new/pirsymbol.c	Sat Dec 27 12:51:36 2008
@@ -575,11 +575,14 @@
 */
 void
 store_global_constant(NOTNULL(lexer_state * const lexer), NOTNULL(constant * const c)) {
-    hashtable    *table = &lexer->constants;
-    unsigned long hash  = get_hashcode(c->name, table->size);
-    bucket *b           = new_bucket(lexer);
-    bucket_constant(b)  = c;
+    hashtable    *table  = &lexer->constants;
+    unsigned long hash   = get_hashcode(c->name, table->size);
+    bucket *b            = new_bucket(lexer);
+    bucket_constant(b)   = c;
     store_bucket(table, b, hash);
+
+    /* add it as a constant in the PBC constant table */
+    c->const_table_index = emit_pbc_const(lexer, c);
 }
 
 /*

Modified: trunk/compilers/pirc/new/pirsymbol.h
==============================================================================
--- trunk/compilers/pirc/new/pirsymbol.h	(original)
+++ trunk/compilers/pirc/new/pirsymbol.h	Sat Dec 27 12:51:36 2008
@@ -57,15 +57,15 @@
 
 /* structure to represent a global label */
 typedef struct global_label {
-    char const          *name;
-    int                  const_table_index;
+    char const * name;              /* name of the global label a.k.a. sub */
+    int          const_table_index; /* index in PBC const table where this sub PMC is stored */
 
 } global_label;
 
 /* structure to represent a local label */
 typedef struct local_label {
-    char const         *name;
-    unsigned            offset;
+    char const * name;      /* name of the local label */
+    unsigned     offset;    /* offset in bytecode where this label points to. */
 
 } local_label;
 



nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About