[svn:parrot] r38679 - in trunk: compilers/imcc src/call t/compilers/imcc/syn

chromatic at svn.parrot.org chromatic at svn.parrot.org
Sun May 10 21:53:50 UTC 2009


Author: chromatic
Date: Sun May 10 21:53:48 2009
New Revision: 38679
URL: https://trac.parrot.org/parrot/changeset/38679

Log:
[IMCC] Allowed Unicode identifiers in named parameters, arguments, and return
values, as TT #654 requests.

The resulting IMCC code could use some refactoring: create a new token which
represents a constant SymReg that is already a properly constructed STRING or
Unicode STRING.  As well, this new code needs memory profiling, as the expected lifespan of this memory isn't always clear.  Still, it fixes the immediate bug.

Modified:
   trunk/compilers/imcc/imc.h
   trunk/compilers/imcc/imcc.y
   trunk/compilers/imcc/imcparser.c
   trunk/compilers/imcc/imcparser.h
   trunk/src/call/pcc.c
   trunk/t/compilers/imcc/syn/regressions.t

Modified: trunk/compilers/imcc/imc.h
==============================================================================
--- trunk/compilers/imcc/imc.h	Sun May 10 12:23:50 2009	(r38678)
+++ trunk/compilers/imcc/imc.h	Sun May 10 21:53:48 2009	(r38679)
@@ -27,20 +27,18 @@
 
 /* For people without unistd.h to compile Flex lexer
  * unistd.h probably isn't required on most if any
- * platforms anyway.
- */
+ * platforms anyway.  */
 #ifndef PARROT_HAS_HEADER_UNISTD
 #  define YY_NO_UNISTD_H 1
 #endif
 
 #define IMCC_MAX_FIX_REGS PARROT_MAX_ARGS
 #if IMCC_MAX_FIX_REGS > 16
- #  error: flags wont fit
+#  error: flags wont fit
 #endif
 
-/* IMCC reserves this character for internally generated labels
- * and identifiers that won't collide with high level compiler generated names.
- */
+/* IMCC reserves this character for internally generated labels and identifiers
+ * that won't collide with high level compiler generated names.  */
 #define IMCC_INTERNAL_CHAR '@'
 
 typedef struct _IMC_Unit IMC_Unit;
@@ -594,7 +592,7 @@
     /* some values that were global... */
     SymReg               *cur_call;
     SymReg               *cur_obj;
-    const char           *adv_named_id;
+    SymReg               *adv_named_id;
 
     /* Lex globals */
     char                 *heredoc_end;

Modified: trunk/compilers/imcc/imcc.y
==============================================================================
--- trunk/compilers/imcc/imcc.y	Sun May 10 12:23:50 2009	(r38678)
+++ trunk/compilers/imcc/imcc.y	Sun May 10 21:53:48 2009	(r38679)
@@ -44,8 +44,8 @@
 
 static void add_pcc_named_arg(PARROT_INTERP,
     ARGMOD(SymReg *cur_call),
-    ARGIN(const char *name),
-    ARGIN(SymReg *value))
+    ARGIN(SymReg  *name),
+    ARGIN(SymReg  *value))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
@@ -54,8 +54,8 @@
 
 static void add_pcc_named_arg_var(PARROT_INTERP,
     ARGMOD(SymReg *cur_call),
-    ARGIN(SymReg *name),
-    ARGIN(SymReg *value))
+    ARGIN(SymReg  *name),
+    ARGIN(SymReg  *value))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
@@ -64,8 +64,8 @@
 
 static void add_pcc_named_param(PARROT_INTERP,
     ARGMOD(SymReg *cur_call),
-    ARGIN(const char *name),
-    ARGIN(SymReg *value))
+    ARGIN(SymReg  *name),
+    ARGIN(SymReg  *value))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
@@ -74,8 +74,8 @@
 
 static void add_pcc_named_result(PARROT_INTERP,
     ARGMOD(SymReg *cur_call),
-    ARGIN(const char *name),
-    ARGIN(SymReg *value))
+    ARGIN(SymReg  *name),
+    ARGIN(SymReg  *value))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
@@ -84,15 +84,19 @@
 
 static void add_pcc_named_return(PARROT_INTERP,
     ARGMOD(SymReg *cur_call),
-    ARGIN(const char *name),
-    ARGIN(SymReg *value))
+    ARGIN(SymReg  *name),
+    ARGIN(SymReg  *value))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
         __attribute__nonnull__(4)
         FUNC_MODIFIES(*cur_call);
 
-static void adv_named_set(PARROT_INTERP, ARGIN(char *name))
+static void adv_named_set(PARROT_INTERP, ARGIN(const char *name))
+        __attribute__nonnull__(1)
+        __attribute__nonnull__(2);
+
+static void adv_named_set_u(PARROT_INTERP, ARGIN(const char *name))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
@@ -262,6 +266,9 @@
 #define ASSERT_ARGS_adv_named_set __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(name)
+#define ASSERT_ARGS_adv_named_set_u __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+       PARROT_ASSERT_ARG(interp) \
+    || PARROT_ASSERT_ARG(name)
 #define ASSERT_ARGS_begin_return_or_yield __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_clear_state __attribute__unused__ int _ASSERT_ARGS_CHECK = \
@@ -871,15 +878,14 @@
 */
 
 static void
-add_pcc_named_arg(PARROT_INTERP, ARGMOD(SymReg *cur_call), ARGIN(const char *name),
+add_pcc_named_arg(PARROT_INTERP, ARGMOD(SymReg *cur_call),
+        ARGIN(SymReg *name),
         ARGIN(SymReg *value))
 {
     ASSERT_ARGS(add_pcc_named_arg)
-    SymReg * const r = mk_const(interp, name, 'S');
+    name->type  |= VT_NAMED;
 
-    r->type  |= VT_NAMED;
-
-    add_pcc_arg(cur_call, r);
+    add_pcc_arg(cur_call, name);
     add_pcc_arg(cur_call, value);
 }
 
@@ -912,35 +918,35 @@
 */
 
 static void
-add_pcc_named_result(PARROT_INTERP, ARGMOD(SymReg *cur_call), ARGIN(const char *name),
+add_pcc_named_result(PARROT_INTERP, ARGMOD(SymReg *cur_call),
+        ARGIN(SymReg *name),
         ARGIN(SymReg *value))
 {
     ASSERT_ARGS(add_pcc_named_result)
-    SymReg * const r = mk_const(interp, name, 'S');
-    r->type         |= VT_NAMED;
+    name->type         |= VT_NAMED;
 
-    add_pcc_result(cur_call, r);
+    add_pcc_result(cur_call, name);
     add_pcc_result(cur_call, value);
 }
 
 /*
 
-=item C<static void add_pcc_named_param(PARROT_INTERP, SymReg *cur_call, const
-char *name, SymReg *value)>
+=item C<static void add_pcc_named_param(PARROT_INTERP, SymReg *cur_call, SymReg 
+*name, SymReg *value)>
 
 =cut
 
 */
 
 static void
-add_pcc_named_param(PARROT_INTERP, ARGMOD(SymReg *cur_call), ARGIN(const char *name),
+add_pcc_named_param(PARROT_INTERP, ARGMOD(SymReg *cur_call),
+        ARGIN(SymReg *name),
         ARGIN(SymReg *value))
 {
     ASSERT_ARGS(add_pcc_named_param)
-    SymReg * const r = mk_const(interp, name, 'S');
-    r->type         |= VT_NAMED;
+    name->type         |= VT_NAMED;
 
-    add_pcc_arg(cur_call, r);
+    add_pcc_arg(cur_call, name);
     add_pcc_arg(cur_call, value);
 }
 
@@ -954,14 +960,14 @@
 */
 
 static void
-add_pcc_named_return(PARROT_INTERP, ARGMOD(SymReg *cur_call), ARGIN(const char *name),
+add_pcc_named_return(PARROT_INTERP, ARGMOD(SymReg *cur_call),
+        ARGIN(SymReg *name),
         ARGIN(SymReg *value))
 {
     ASSERT_ARGS(add_pcc_named_return)
-    SymReg * const r = mk_const(interp, name, 'S');
-    r->type         |= VT_NAMED;
+    name->type         |= VT_NAMED;
 
-    add_pcc_result(cur_call, r);
+    add_pcc_result(cur_call, name);
     add_pcc_result(cur_call, value);
 }
 
@@ -969,20 +975,34 @@
 
 =item C<static void adv_named_set(PARROT_INTERP, char *name)>
 
+Sets the name of the current named argument.
+
+C<adv_named_set_u> is the Unicode version of this function.
+
 =cut
 
 */
 
-/* XXX Can name be consted? */
 static void
-adv_named_set(PARROT_INTERP, ARGIN(char *name))
+adv_named_set(PARROT_INTERP, ARGIN(const char *name))
 {
     ASSERT_ARGS(adv_named_set)
-    if (IMCC_INFO(interp)->adv_named_id) {
+    if (IMCC_INFO(interp)->adv_named_id)
         IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
                     "Named parameter with more than one name.\n");
-    }
-    IMCC_INFO(interp)->adv_named_id = name;
+
+    IMCC_INFO(interp)->adv_named_id = mk_const(interp, name, 'S');
+}
+
+static void
+adv_named_set_u(PARROT_INTERP, ARGIN(const char *name))
+{
+    ASSERT_ARGS(adv_named_set_u)
+    if (IMCC_INFO(interp)->adv_named_id)
+        IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
+                    "Named parameter with more than one name.\n");
+
+    IMCC_INFO(interp)->adv_named_id = mk_const(interp, name, 'U');
 }
 
 /*
@@ -1644,12 +1664,13 @@
    ;
 
 paramtype:
-     ADV_SLURPY                { $$ = VT_FLAT;   }
-   | ADV_OPTIONAL              { $$ = VT_OPTIONAL; }
-   | ADV_OPT_FLAG              { $$ = VT_OPT_FLAG; }
-   | ADV_NAMED                 { $$ = VT_NAMED; }
-   | ADV_NAMED '(' STRINGC ')' { adv_named_set(interp, $3); $$ = 0; }
-   | UNIQUE_REG                { $$ = VT_UNIQUE_REG; }
+     ADV_SLURPY                 { $$ = VT_FLAT;   }
+   | ADV_OPTIONAL               { $$ = VT_OPTIONAL; }
+   | ADV_OPT_FLAG               { $$ = VT_OPT_FLAG; }
+   | ADV_NAMED                  { $$ = VT_NAMED; }
+   | ADV_NAMED '(' STRINGC ')'  { adv_named_set(interp, $3);   $$ = 0; }
+   | ADV_NAMED '(' USTRINGC ')' { adv_named_set_u(interp, $3); $$ = 0; }
+   | UNIQUE_REG                 { $$ = VT_UNIQUE_REG; }
    ;
 
 
@@ -1738,7 +1759,8 @@
          }
    | STRINGC ADV_ARROW var
          {
-           add_pcc_named_return(interp, IMCC_INFO(interp)->sr_return, $1, $3);
+            SymReg *name = mk_const(interp, $1, 'S');
+            add_pcc_named_return(interp, IMCC_INFO(interp)->sr_return, name, $3);
          }
    | var_returns COMMA arg
          {
@@ -1752,7 +1774,8 @@
          }
    | var_returns COMMA STRINGC ADV_ARROW var
          {
-           add_pcc_named_return(interp, IMCC_INFO(interp)->sr_return, $3, $5);
+           SymReg *name = mk_const(interp, $3, 'S');
+           add_pcc_named_return(interp, IMCC_INFO(interp)->sr_return, name, $5);
          }
    ;
 
@@ -2130,7 +2153,8 @@
    | arglist COMMA STRINGC ADV_ARROW var
          {
            $$ = 0;
-           add_pcc_named_arg(interp, IMCC_INFO(interp)->cur_call, $3, $5);
+           add_pcc_named_arg(interp, IMCC_INFO(interp)->cur_call,
+                mk_const(interp, $3, 'S'), $5);
            mem_sys_free($3);
          }
    | var ADV_ARROW var
@@ -2141,7 +2165,8 @@
    | STRINGC ADV_ARROW var
          {
            $$ = 0;
-           add_pcc_named_arg(interp, IMCC_INFO(interp)->cur_call, $1, $3);
+           add_pcc_named_arg(interp, IMCC_INFO(interp)->cur_call,
+                mk_const(interp, $1, 'S'), $3);
            mem_sys_free($1);
          }
    ;
@@ -2160,7 +2185,8 @@
    | ADV_NAMED                 { $$ = VT_NAMED; }
 
    /* don't free $3 here; adv_named_set uses the pointer directly */
-   | ADV_NAMED '(' STRINGC ')' { adv_named_set(interp, $3); $$ = 0; }
+   | ADV_NAMED '(' USTRINGC ')' { adv_named_set_u(interp, $3); $$ = 0; }
+   | ADV_NAMED '(' STRINGC  ')' { adv_named_set(interp, $3);   $$ = 0; }
    ;
 
 result:
@@ -2180,8 +2206,9 @@
          }
    | targetlist COMMA STRINGC ADV_ARROW target
          {
-           add_pcc_named_result(interp, IMCC_INFO(interp)->cur_call, $3, $5);
-           mem_sys_free($3);
+            add_pcc_named_result(interp, IMCC_INFO(interp)->cur_call,
+            mk_const(interp, $3, 'S'), $5);
+            mem_sys_free($3);
          }
    | result
          {
@@ -2195,7 +2222,7 @@
          }
    | STRINGC ADV_ARROW target
          {
-           add_pcc_named_result(interp, IMCC_INFO(interp)->cur_call, $1, $3);
+           add_pcc_named_result(interp, IMCC_INFO(interp)->cur_call, mk_const(interp, $1, 'S'), $3);
            mem_sys_free($1);
          }
    | /* empty */                { $$ = 0; }

Modified: trunk/compilers/imcc/imcparser.c
==============================================================================
--- trunk/compilers/imcc/imcparser.c	Sun May 10 12:23:50 2009	(r38678)
+++ trunk/compilers/imcc/imcparser.c	Sun May 10 21:53:48 2009	(r38679)
@@ -368,8 +368,8 @@
 
 static void add_pcc_named_arg(PARROT_INTERP,
     ARGMOD(SymReg *cur_call),
-    ARGIN(const char *name),
-    ARGIN(SymReg *value))
+    ARGIN(SymReg  *name),
+    ARGIN(SymReg  *value))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
@@ -378,8 +378,8 @@
 
 static void add_pcc_named_arg_var(PARROT_INTERP,
     ARGMOD(SymReg *cur_call),
-    ARGIN(SymReg *name),
-    ARGIN(SymReg *value))
+    ARGIN(SymReg  *name),
+    ARGIN(SymReg  *value))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
@@ -388,8 +388,8 @@
 
 static void add_pcc_named_param(PARROT_INTERP,
     ARGMOD(SymReg *cur_call),
-    ARGIN(const char *name),
-    ARGIN(SymReg *value))
+    ARGIN(SymReg  *name),
+    ARGIN(SymReg  *value))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
@@ -398,8 +398,8 @@
 
 static void add_pcc_named_result(PARROT_INTERP,
     ARGMOD(SymReg *cur_call),
-    ARGIN(const char *name),
-    ARGIN(SymReg *value))
+    ARGIN(SymReg  *name),
+    ARGIN(SymReg  *value))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
@@ -408,15 +408,19 @@
 
 static void add_pcc_named_return(PARROT_INTERP,
     ARGMOD(SymReg *cur_call),
-    ARGIN(const char *name),
-    ARGIN(SymReg *value))
+    ARGIN(SymReg  *name),
+    ARGIN(SymReg  *value))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2)
         __attribute__nonnull__(3)
         __attribute__nonnull__(4)
         FUNC_MODIFIES(*cur_call);
 
-static void adv_named_set(PARROT_INTERP, ARGIN(char *name))
+static void adv_named_set(PARROT_INTERP, ARGIN(const char *name))
+        __attribute__nonnull__(1)
+        __attribute__nonnull__(2);
+
+static void adv_named_set_u(PARROT_INTERP, ARGIN(const char *name))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
@@ -586,6 +590,9 @@
 #define ASSERT_ARGS_adv_named_set __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp) \
     || PARROT_ASSERT_ARG(name)
+#define ASSERT_ARGS_adv_named_set_u __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+       PARROT_ASSERT_ARG(interp) \
+    || PARROT_ASSERT_ARG(name)
 #define ASSERT_ARGS_begin_return_or_yield __attribute__unused__ int _ASSERT_ARGS_CHECK = \
        PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_clear_state __attribute__unused__ int _ASSERT_ARGS_CHECK = \
@@ -1195,15 +1202,14 @@
 */
 
 static void
-add_pcc_named_arg(PARROT_INTERP, ARGMOD(SymReg *cur_call), ARGIN(const char *name),
+add_pcc_named_arg(PARROT_INTERP, ARGMOD(SymReg *cur_call),
+        ARGIN(SymReg *name),
         ARGIN(SymReg *value))
 {
     ASSERT_ARGS(add_pcc_named_arg)
-    SymReg * const r = mk_const(interp, name, 'S');
-
-    r->type  |= VT_NAMED;
+    name->type  |= VT_NAMED;
 
-    add_pcc_arg(cur_call, r);
+    add_pcc_arg(cur_call, name);
     add_pcc_arg(cur_call, value);
 }
 
@@ -1236,35 +1242,35 @@
 */
 
 static void
-add_pcc_named_result(PARROT_INTERP, ARGMOD(SymReg *cur_call), ARGIN(const char *name),
+add_pcc_named_result(PARROT_INTERP, ARGMOD(SymReg *cur_call),
+        ARGIN(SymReg *name),
         ARGIN(SymReg *value))
 {
     ASSERT_ARGS(add_pcc_named_result)
-    SymReg * const r = mk_const(interp, name, 'S');
-    r->type         |= VT_NAMED;
+    name->type         |= VT_NAMED;
 
-    add_pcc_result(cur_call, r);
+    add_pcc_result(cur_call, name);
     add_pcc_result(cur_call, value);
 }
 
 /*
 
-=item C<static void add_pcc_named_param(PARROT_INTERP, SymReg *cur_call, const
-char *name, SymReg *value)>
+=item C<static void add_pcc_named_param(PARROT_INTERP, SymReg *cur_call, SymReg 
+*name, SymReg *value)>
 
 =cut
 
 */
 
 static void
-add_pcc_named_param(PARROT_INTERP, ARGMOD(SymReg *cur_call), ARGIN(const char *name),
+add_pcc_named_param(PARROT_INTERP, ARGMOD(SymReg *cur_call),
+        ARGIN(SymReg *name),
         ARGIN(SymReg *value))
 {
     ASSERT_ARGS(add_pcc_named_param)
-    SymReg * const r = mk_const(interp, name, 'S');
-    r->type         |= VT_NAMED;
+    name->type         |= VT_NAMED;
 
-    add_pcc_arg(cur_call, r);
+    add_pcc_arg(cur_call, name);
     add_pcc_arg(cur_call, value);
 }
 
@@ -1278,14 +1284,14 @@
 */
 
 static void
-add_pcc_named_return(PARROT_INTERP, ARGMOD(SymReg *cur_call), ARGIN(const char *name),
+add_pcc_named_return(PARROT_INTERP, ARGMOD(SymReg *cur_call),
+        ARGIN(SymReg *name),
         ARGIN(SymReg *value))
 {
     ASSERT_ARGS(add_pcc_named_return)
-    SymReg * const r = mk_const(interp, name, 'S');
-    r->type         |= VT_NAMED;
+    name->type         |= VT_NAMED;
 
-    add_pcc_result(cur_call, r);
+    add_pcc_result(cur_call, name);
     add_pcc_result(cur_call, value);
 }
 
@@ -1293,20 +1299,34 @@
 
 =item C<static void adv_named_set(PARROT_INTERP, char *name)>
 
+Sets the name of the current named argument.
+
+C<adv_named_set_u> is the Unicode version of this function.
+
 =cut
 
 */
 
-/* XXX Can name be consted? */
 static void
-adv_named_set(PARROT_INTERP, ARGIN(char *name))
+adv_named_set(PARROT_INTERP, ARGIN(const char *name))
 {
     ASSERT_ARGS(adv_named_set)
-    if (IMCC_INFO(interp)->adv_named_id) {
+    if (IMCC_INFO(interp)->adv_named_id)
         IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
                     "Named parameter with more than one name.\n");
-    }
-    IMCC_INFO(interp)->adv_named_id = name;
+
+    IMCC_INFO(interp)->adv_named_id = mk_const(interp, name, 'S');
+}
+
+static void
+adv_named_set_u(PARROT_INTERP, ARGIN(const char *name))
+{
+    ASSERT_ARGS(adv_named_set_u)
+    if (IMCC_INFO(interp)->adv_named_id)
+        IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
+                    "Named parameter with more than one name.\n");
+
+    IMCC_INFO(interp)->adv_named_id = mk_const(interp, name, 'U');
 }
 
 /*
@@ -1351,7 +1371,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 1010 "compilers/imcc/imcc.y"
+#line 1030 "compilers/imcc/imcc.y"
 {
     IdList * idlist;
     int t;
@@ -1360,7 +1380,7 @@
     Instruction *i;
 }
 /* Line 187 of yacc.c.  */
-#line 1353 "compilers/imcc/imcparser.c"
+#line 1373 "compilers/imcc/imcparser.c"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -1373,7 +1393,7 @@
 
 
 /* Line 216 of yacc.c.  */
-#line 1366 "compilers/imcc/imcparser.c"
+#line 1386 "compilers/imcc/imcparser.c"
 
 #ifdef short
 # undef short
@@ -1588,16 +1608,16 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  31
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   673
+#define YYLAST   676
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  138
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  126
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  334
+#define YYNRULES  336
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  538
+#define YYNSTATES  542
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -1667,27 +1687,27 @@
      286,   288,   290,   292,   294,   296,   298,   300,   302,   304,
      310,   314,   318,   322,   326,   332,   338,   339,   343,   346,
      347,   351,   355,   356,   361,   362,   365,   367,   369,   371,
-     373,   378,   380,   381,   387,   389,   390,   396,   397,   400,
-     404,   405,   408,   412,   416,   420,   421,   427,   429,   431,
-     432,   434,   438,   442,   448,   450,   453,   454,   457,   460,
-     462,   464,   466,   468,   469,   471,   474,   476,   478,   482,
-     485,   487,   491,   494,   495,   497,   499,   501,   502,   507,
-     512,   517,   518,   525,   527,   528,   535,   538,   541,   544,
-     547,   549,   551,   553,   555,   556,   558,   560,   562,   564,
-     566,   570,   575,   581,   588,   595,   603,   607,   608,   618,
-     620,   622,   624,   628,   630,   632,   634,   636,   638,   640,
-     642,   644,   646,   648,   650,   652,   654,   656,   658,   660,
-     662,   664,   666,   668,   670,   672,   674,   676,   678,   680,
-     681,   687,   691,   693,   695,   697,   699,   701,   703,   705,
-     707,   709,   711,   713,   715,   717,   722,   724,   726,   728,
-     730,   734,   738,   742,   743,   749,   750,   754,   756,   762,
-     766,   770,   773,   774,   777,   779,   781,   786,   789,   793,
-     799,   801,   805,   806,   808,   810,   817,   823,   828,   833,
-     840,   846,   848,   850,   852,   854,   856,   858,   860,   862,
-     864,   866,   867,   869,   873,   875,   877,   882,   886,   888,
-     890,   892,   894,   896,   898,   900,   902,   904,   906,   908,
-     909,   912,   913,   916,   918,   922,   924,   926,   928,   930,
-     932,   934,   936,   938,   940
+     373,   378,   383,   385,   386,   392,   394,   395,   401,   402,
+     405,   409,   410,   413,   417,   421,   425,   426,   432,   434,
+     436,   437,   439,   443,   447,   453,   455,   458,   459,   462,
+     465,   467,   469,   471,   473,   474,   476,   479,   481,   483,
+     487,   490,   492,   496,   499,   500,   502,   504,   506,   507,
+     512,   517,   522,   523,   530,   532,   533,   540,   543,   546,
+     549,   552,   554,   556,   558,   560,   561,   563,   565,   567,
+     569,   571,   575,   580,   586,   593,   600,   608,   612,   613,
+     623,   625,   627,   629,   633,   635,   637,   639,   641,   643,
+     645,   647,   649,   651,   653,   655,   657,   659,   661,   663,
+     665,   667,   669,   671,   673,   675,   677,   679,   681,   683,
+     685,   686,   692,   696,   698,   700,   702,   704,   706,   708,
+     710,   712,   714,   716,   718,   720,   722,   727,   729,   731,
+     733,   735,   739,   743,   747,   748,   754,   755,   759,   761,
+     767,   771,   775,   778,   779,   782,   784,   786,   791,   796,
+     799,   803,   809,   811,   815,   816,   818,   820,   827,   833,
+     838,   843,   850,   856,   858,   860,   862,   864,   866,   868,
+     870,   872,   874,   876,   877,   879,   883,   885,   887,   892,
+     896,   898,   900,   902,   904,   906,   908,   910,   912,   914,
+     916,   918,   919,   922,   923,   926,   928,   932,   934,   936,
+     938,   940,   942,   944,   946,   948,   950
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
@@ -1730,47 +1750,48 @@
      190,     4,    -1,    10,   237,    -1,    -1,   191,   192,     4,
       -1,    62,   247,   194,    -1,    -1,    28,   193,   222,   216,
       -1,    -1,   194,   195,    -1,    17,    -1,    18,    -1,    19,
-      -1,    20,    -1,    20,   125,   112,   126,    -1,   100,    -1,
-      -1,    78,     4,   197,   200,    79,    -1,   204,    -1,    -1,
-      80,     4,   199,   201,    81,    -1,    -1,   200,     4,    -1,
-     200,   202,     4,    -1,    -1,   201,     4,    -1,   201,   203,
-       4,    -1,    14,   255,   238,    -1,    15,   255,   238,    -1,
-      -1,   206,   125,   205,   207,   126,    -1,    63,    -1,    65,
-      -1,    -1,   237,    -1,   112,    21,   255,    -1,   207,    71,
-     237,    -1,   207,    71,   112,    21,   255,    -1,   210,    -1,
-     208,   210,    -1,    -1,   209,   214,    -1,   110,     4,    -1,
-     119,    -1,   118,    -1,   143,    -1,   144,    -1,    -1,   212,
-      -1,   212,   213,    -1,   213,    -1,   101,    -1,   211,   218,
-       4,    -1,     1,     4,    -1,   216,    -1,   215,    71,   216,
-      -1,   108,   217,    -1,    -1,   100,    -1,   224,    -1,   242,
-      -1,    -1,    28,   219,   222,   215,    -1,    29,   112,    71,
-     247,    -1,    29,   115,    71,   247,    -1,    -1,    30,   220,
-     222,   108,   122,   263,    -1,   148,    -1,    -1,    34,   221,
-     222,   108,   122,   263,    -1,    64,   234,    -1,     9,   253,
-      -1,   116,   248,    -1,    13,   255,    -1,   234,    -1,   181,
-      -1,   196,    -1,   198,    -1,    -1,    51,    -1,    52,    -1,
-      53,    -1,    54,    -1,   108,    -1,   247,   122,   255,    -1,
-     247,   122,   226,   255,    -1,   247,   122,   255,   227,   255,
-      -1,   247,   122,   255,   123,   256,   124,    -1,   247,   123,
-     256,   124,   122,   255,    -1,   247,   122,   127,   223,   123,
-     256,   124,    -1,   247,   122,   234,    -1,    -1,   125,   225,
-     241,   126,   122,   233,   125,   236,   126,    -1,   228,    -1,
-     230,    -1,   232,    -1,   247,   122,    13,    -1,   128,    -1,
-     129,    -1,   130,    -1,   130,    -1,   131,    -1,   132,    -1,
-     133,    -1,   134,    -1,    43,    -1,    67,    -1,   121,    -1,
-      56,    -1,    57,    -1,    58,    -1,    59,    -1,    60,    -1,
-      61,    -1,    49,    -1,    50,    -1,    68,    -1,    69,    -1,
-      70,    -1,    55,    -1,   135,    -1,   136,    -1,   129,    -1,
-      -1,    66,   229,   125,   241,   126,    -1,   247,   231,   255,
-      -1,    35,    -1,    36,    -1,    37,    -1,    38,    -1,    45,
-      -1,    44,    -1,    39,    -1,    40,    -1,    41,    -1,    42,
-      -1,    46,    -1,    47,    -1,    48,    -1,   247,   122,   116,
-     157,    -1,   108,    -1,   112,    -1,   115,    -1,   247,    -1,
-     247,   120,   252,    -1,   247,   120,   112,    -1,   247,   120,
-     247,    -1,    -1,   233,   235,   125,   236,   126,    -1,    -1,
-     236,    71,   237,    -1,   237,    -1,   236,    71,   112,    21,
-     255,    -1,   255,    21,   255,    -1,   112,    21,   255,    -1,
-     255,   238,    -1,    -1,   238,   239,    -1,    16,    -1,    20,
+      -1,    20,    -1,    20,   125,   112,   126,    -1,    20,   125,
+     115,   126,    -1,   100,    -1,    -1,    78,     4,   197,   200,
+      79,    -1,   204,    -1,    -1,    80,     4,   199,   201,    81,
+      -1,    -1,   200,     4,    -1,   200,   202,     4,    -1,    -1,
+     201,     4,    -1,   201,   203,     4,    -1,    14,   255,   238,
+      -1,    15,   255,   238,    -1,    -1,   206,   125,   205,   207,
+     126,    -1,    63,    -1,    65,    -1,    -1,   237,    -1,   112,
+      21,   255,    -1,   207,    71,   237,    -1,   207,    71,   112,
+      21,   255,    -1,   210,    -1,   208,   210,    -1,    -1,   209,
+     214,    -1,   110,     4,    -1,   119,    -1,   118,    -1,   143,
+      -1,   144,    -1,    -1,   212,    -1,   212,   213,    -1,   213,
+      -1,   101,    -1,   211,   218,     4,    -1,     1,     4,    -1,
+     216,    -1,   215,    71,   216,    -1,   108,   217,    -1,    -1,
+     100,    -1,   224,    -1,   242,    -1,    -1,    28,   219,   222,
+     215,    -1,    29,   112,    71,   247,    -1,    29,   115,    71,
+     247,    -1,    -1,    30,   220,   222,   108,   122,   263,    -1,
+     148,    -1,    -1,    34,   221,   222,   108,   122,   263,    -1,
+      64,   234,    -1,     9,   253,    -1,   116,   248,    -1,    13,
+     255,    -1,   234,    -1,   181,    -1,   196,    -1,   198,    -1,
+      -1,    51,    -1,    52,    -1,    53,    -1,    54,    -1,   108,
+      -1,   247,   122,   255,    -1,   247,   122,   226,   255,    -1,
+     247,   122,   255,   227,   255,    -1,   247,   122,   255,   123,
+     256,   124,    -1,   247,   123,   256,   124,   122,   255,    -1,
+     247,   122,   127,   223,   123,   256,   124,    -1,   247,   122,
+     234,    -1,    -1,   125,   225,   241,   126,   122,   233,   125,
+     236,   126,    -1,   228,    -1,   230,    -1,   232,    -1,   247,
+     122,    13,    -1,   128,    -1,   129,    -1,   130,    -1,   130,
+      -1,   131,    -1,   132,    -1,   133,    -1,   134,    -1,    43,
+      -1,    67,    -1,   121,    -1,    56,    -1,    57,    -1,    58,
+      -1,    59,    -1,    60,    -1,    61,    -1,    49,    -1,    50,
+      -1,    68,    -1,    69,    -1,    70,    -1,    55,    -1,   135,
+      -1,   136,    -1,   129,    -1,    -1,    66,   229,   125,   241,
+     126,    -1,   247,   231,   255,    -1,    35,    -1,    36,    -1,
+      37,    -1,    38,    -1,    45,    -1,    44,    -1,    39,    -1,
+      40,    -1,    41,    -1,    42,    -1,    46,    -1,    47,    -1,
+      48,    -1,   247,   122,   116,   157,    -1,   108,    -1,   112,
+      -1,   115,    -1,   247,    -1,   247,   120,   252,    -1,   247,
+     120,   112,    -1,   247,   120,   247,    -1,    -1,   233,   235,
+     125,   236,   126,    -1,    -1,   236,    71,   237,    -1,   237,
+      -1,   236,    71,   112,    21,   255,    -1,   255,    21,   255,
+      -1,   112,    21,   255,    -1,   255,   238,    -1,    -1,   238,
+     239,    -1,    16,    -1,    20,    -1,    20,   125,   115,   126,
       -1,    20,   125,   112,   126,    -1,   247,   194,    -1,   241,
       71,   240,    -1,   241,    71,   112,    21,   247,    -1,   240,
       -1,   112,    21,   247,    -1,    -1,   244,    -1,   243,    -1,
@@ -1793,40 +1814,40 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,  1105,  1105,  1109,  1110,  1114,  1115,  1116,  1122,  1128,
-    1129,  1130,  1131,  1135,  1136,  1145,  1150,  1157,  1169,  1181,
-    1181,  1190,  1190,  1196,  1196,  1203,  1204,  1208,  1209,  1213,
-    1214,  1215,  1216,  1217,  1218,  1219,  1222,  1222,  1231,  1230,
-    1242,  1246,  1255,  1259,  1263,  1263,  1275,  1277,  1281,  1296,
-    1304,  1309,  1313,  1317,  1308,  1329,  1330,  1331,  1344,  1344,
-    1348,  1362,  1366,  1372,  1381,  1387,  1396,  1402,  1411,  1417,
-    1426,  1434,  1439,  1450,  1453,  1458,  1466,  1467,  1468,  1469,
-    1470,  1481,  1492,  1495,  1497,  1502,  1501,  1534,  1535,  1539,
-    1540,  1544,  1545,  1549,  1550,  1554,  1555,  1556,  1557,  1558,
-    1559,  1560,  1561,  1562,  1563,  1564,  1565,  1566,  1567,  1571,
-    1576,  1580,  1585,  1589,  1593,  1598,  1607,  1608,  1612,  1617,
-    1618,  1626,  1627,  1627,  1642,  1643,  1647,  1648,  1649,  1650,
-    1651,  1652,  1657,  1657,  1660,  1668,  1668,  1674,  1675,  1680,
-    1688,  1689,  1694,  1702,  1706,  1711,  1710,  1723,  1724,  1728,
-    1729,  1739,  1743,  1753,  1761,  1762,  1774,  1778,  1780,  1781,
-    1782,  1783,  1784,  1788,  1789,  1793,  1794,  1798,  1807,  1808,
-    1819,  1826,  1835,  1845,  1846,  1851,  1852,  1853,  1853,  1869,
-    1874,  1879,  1879,  1886,  1887,  1887,  1893,  1899,  1903,  1915,
-    1916,  1917,  1918,  1919,  1920,  1924,  1925,  1926,  1927,  1931,
-    1944,  1946,  1948,  1950,  1952,  1957,  1960,  1967,  1966,  1975,
-    1976,  1977,  1978,  1986,  1987,  1988,  1992,  1993,  1994,  1995,
-    1996,  1997,  1998,  1999,  2000,  2001,  2002,  2003,  2004,  2005,
-    2006,  2007,  2008,  2009,  2010,  2011,  2012,  2013,  2014,  2020,
-    2019,  2031,  2038,  2039,  2040,  2041,  2042,  2043,  2044,  2045,
-    2046,  2047,  2048,  2049,  2050,  2055,  2066,  2067,  2068,  2069,
-    2075,  2089,  2095,  2101,  2100,  2109,  2110,  2120,  2130,  2136,
-    2141,  2150,  2154,  2155,  2159,  2160,  2163,  2167,  2171,  2181,
-    2186,  2196,  2201,  2205,  2206,  2210,  2214,  2218,  2225,  2229,
-    2233,  2240,  2241,  2245,  2246,  2247,  2248,  2249,  2250,  2254,
-    2255,  2259,  2260,  2264,  2265,  2269,  2270,  2277,  2284,  2285,
-    2286,  2290,  2291,  2295,  2296,  2300,  2301,  2305,  2306,  2310,
-    2310,  2323,  2323,  2336,  2337,  2345,  2354,  2355,  2356,  2357,
-    2358,  2362,  2363,  2364,  2365
+       0,  1125,  1125,  1129,  1130,  1134,  1135,  1136,  1142,  1148,
+    1149,  1150,  1151,  1155,  1156,  1165,  1170,  1177,  1189,  1201,
+    1201,  1210,  1210,  1216,  1216,  1223,  1224,  1228,  1229,  1233,
+    1234,  1235,  1236,  1237,  1238,  1239,  1242,  1242,  1251,  1250,
+    1262,  1266,  1275,  1279,  1283,  1283,  1295,  1297,  1301,  1316,
+    1324,  1329,  1333,  1337,  1328,  1349,  1350,  1351,  1364,  1364,
+    1368,  1382,  1386,  1392,  1401,  1407,  1416,  1422,  1431,  1437,
+    1446,  1454,  1459,  1470,  1473,  1478,  1486,  1487,  1488,  1489,
+    1490,  1501,  1512,  1515,  1517,  1522,  1521,  1554,  1555,  1559,
+    1560,  1564,  1565,  1569,  1570,  1574,  1575,  1576,  1577,  1578,
+    1579,  1580,  1581,  1582,  1583,  1584,  1585,  1586,  1587,  1591,
+    1596,  1600,  1605,  1609,  1613,  1618,  1627,  1628,  1632,  1637,
+    1638,  1646,  1647,  1647,  1662,  1663,  1667,  1668,  1669,  1670,
+    1671,  1672,  1673,  1678,  1678,  1681,  1689,  1689,  1695,  1696,
+    1701,  1709,  1710,  1715,  1723,  1727,  1732,  1731,  1744,  1745,
+    1749,  1750,  1760,  1765,  1775,  1784,  1785,  1797,  1801,  1803,
+    1804,  1805,  1806,  1807,  1811,  1812,  1816,  1817,  1821,  1830,
+    1831,  1842,  1849,  1858,  1868,  1869,  1874,  1875,  1876,  1876,
+    1892,  1897,  1902,  1902,  1909,  1910,  1910,  1916,  1922,  1926,
+    1938,  1939,  1940,  1941,  1942,  1943,  1947,  1948,  1949,  1950,
+    1954,  1967,  1969,  1971,  1973,  1975,  1980,  1983,  1990,  1989,
+    1998,  1999,  2000,  2001,  2009,  2010,  2011,  2015,  2016,  2017,
+    2018,  2019,  2020,  2021,  2022,  2023,  2024,  2025,  2026,  2027,
+    2028,  2029,  2030,  2031,  2032,  2033,  2034,  2035,  2036,  2037,
+    2043,  2042,  2054,  2061,  2062,  2063,  2064,  2065,  2066,  2067,
+    2068,  2069,  2070,  2071,  2072,  2073,  2078,  2089,  2090,  2091,
+    2092,  2098,  2112,  2118,  2124,  2123,  2132,  2133,  2143,  2153,
+    2160,  2165,  2175,  2179,  2180,  2184,  2185,  2188,  2189,  2193,
+    2197,  2207,  2213,  2223,  2228,  2232,  2233,  2237,  2241,  2245,
+    2252,  2256,  2260,  2267,  2268,  2272,  2273,  2274,  2275,  2276,
+    2277,  2281,  2282,  2286,  2287,  2291,  2292,  2296,  2297,  2304,
+    2311,  2312,  2313,  2317,  2318,  2322,  2323,  2327,  2328,  2332,
+    2333,  2337,  2337,  2350,  2350,  2363,  2364,  2372,  2381,  2382,
+    2383,  2384,  2385,  2389,  2390,  2391,  2392
 };
 #endif
 
@@ -1921,27 +1942,27 @@
      187,   187,   187,   187,   187,   187,   187,   187,   187,   188,
      188,   188,   188,   188,   188,   188,   189,   189,   190,   191,
      191,   192,   193,   192,   194,   194,   195,   195,   195,   195,
-     195,   195,   197,   196,   196,   199,   198,   200,   200,   200,
-     201,   201,   201,   202,   203,   205,   204,   206,   206,   207,
-     207,   207,   207,   207,   208,   208,   209,   210,   210,   210,
-     210,   210,   210,   211,   211,   212,   212,   213,   214,   214,
-     215,   215,   216,   217,   217,   218,   218,   219,   218,   218,
-     218,   220,   218,   218,   221,   218,   218,   218,   218,   218,
-     218,   218,   218,   218,   218,   222,   222,   222,   222,   223,
-     224,   224,   224,   224,   224,   224,   224,   225,   224,   224,
-     224,   224,   224,   226,   226,   226,   227,   227,   227,   227,
+     195,   195,   195,   197,   196,   196,   199,   198,   200,   200,
+     200,   201,   201,   201,   202,   203,   205,   204,   206,   206,
+     207,   207,   207,   207,   207,   208,   208,   209,   210,   210,
+     210,   210,   210,   210,   211,   211,   212,   212,   213,   214,
+     214,   215,   215,   216,   217,   217,   218,   218,   219,   218,
+     218,   218,   220,   218,   218,   221,   218,   218,   218,   218,
+     218,   218,   218,   218,   218,   218,   222,   222,   222,   222,
+     223,   224,   224,   224,   224,   224,   224,   224,   225,   224,
+     224,   224,   224,   224,   226,   226,   226,   227,   227,   227,
+     227,   227,   227,   227,   227,   227,   227,   227,   227,   227,
      227,   227,   227,   227,   227,   227,   227,   227,   227,   227,
-     227,   227,   227,   227,   227,   227,   227,   227,   227,   229,
-     228,   230,   231,   231,   231,   231,   231,   231,   231,   231,
-     231,   231,   231,   231,   231,   232,   233,   233,   233,   233,
-     233,   233,   233,   235,   234,   236,   236,   236,   236,   236,
-     236,   237,   238,   238,   239,   239,   239,   240,   241,   241,
-     241,   241,   241,   242,   242,   243,   243,   243,   244,   244,
-     244,   245,   245,   246,   246,   246,   246,   246,   246,   247,
-     247,   248,   248,   249,   249,   250,   250,   250,   251,   251,
-     251,   252,   252,   253,   253,   254,   254,   255,   255,   257,
-     256,   259,   258,   260,   260,   261,   262,   262,   262,   262,
-     262,   263,   263,   263,   263
+     229,   228,   230,   231,   231,   231,   231,   231,   231,   231,
+     231,   231,   231,   231,   231,   231,   232,   233,   233,   233,
+     233,   233,   233,   233,   235,   234,   236,   236,   236,   236,
+     236,   236,   237,   238,   238,   239,   239,   239,   239,   240,
+     241,   241,   241,   241,   241,   242,   242,   243,   243,   243,
+     244,   244,   244,   245,   245,   246,   246,   246,   246,   246,
+     246,   247,   247,   248,   248,   249,   249,   250,   250,   250,
+     251,   251,   251,   252,   252,   253,   253,   254,   254,   255,
+     255,   257,   256,   259,   258,   260,   260,   261,   262,   262,
+     262,   262,   262,   263,   263,   263,   263
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1960,27 +1981,27 @@
        1,     1,     1,     1,     1,     1,     1,     1,     1,     5,
        3,     3,     3,     3,     5,     5,     0,     3,     2,     0,
        3,     3,     0,     4,     0,     2,     1,     1,     1,     1,
-       4,     1,     0,     5,     1,     0,     5,     0,     2,     3,
-       0,     2,     3,     3,     3,     0,     5,     1,     1,     0,
-       1,     3,     3,     5,     1,     2,     0,     2,     2,     1,
-       1,     1,     1,     0,     1,     2,     1,     1,     3,     2,
-       1,     3,     2,     0,     1,     1,     1,     0,     4,     4,
-       4,     0,     6,     1,     0,     6,     2,     2,     2,     2,
-       1,     1,     1,     1,     0,     1,     1,     1,     1,     1,
-       3,     4,     5,     6,     6,     7,     3,     0,     9,     1,
-       1,     1,     3,     1,     1,     1,     1,     1,     1,     1,
+       4,     4,     1,     0,     5,     1,     0,     5,     0,     2,
+       3,     0,     2,     3,     3,     3,     0,     5,     1,     1,
+       0,     1,     3,     3,     5,     1,     2,     0,     2,     2,
+       1,     1,     1,     1,     0,     1,     2,     1,     1,     3,
+       2,     1,     3,     2,     0,     1,     1,     1,     0,     4,
+       4,     4,     0,     6,     1,     0,     6,     2,     2,     2,
+       2,     1,     1,     1,     1,     0,     1,     1,     1,     1,
+       1,     3,     4,     5,     6,     6,     7,     3,     0,     9,
+       1,     1,     1,     3,     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,
+       0,     5,     3,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     4,     1,     1,     1,
+       1,     3,     3,     3,     0,     5,     0,     3,     1,     5,
+       3,     3,     2,     0,     2,     1,     1,     4,     4,     2,
+       3,     5,     1,     3,     0,     1,     1,     6,     5,     4,
+       4,     6,     5,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     0,     1,     3,     1,     1,     4,     3,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
-       5,     3,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     4,     1,     1,     1,     1,
-       3,     3,     3,     0,     5,     0,     3,     1,     5,     3,
-       3,     2,     0,     2,     1,     1,     4,     2,     3,     5,
-       1,     3,     0,     1,     1,     6,     5,     4,     4,     6,
-       5,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     0,     1,     3,     1,     1,     4,     3,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
-       2,     0,     2,     1,     3,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1
+       1,     0,     2,     0,     2,     1,     3,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1990,58 +2011,59 @@
 {
        0,    12,     0,     0,     0,     0,    51,    19,     0,    44,
        0,     0,     2,     3,    10,    11,     0,     6,     8,     5,
-       7,    18,     0,     0,   319,     0,     0,     0,     0,   163,
+       7,    18,     0,     0,   321,     0,     0,     0,     0,   164,
        9,     1,     4,    13,     0,    16,    50,     0,     0,    48,
-     311,   309,   310,   312,    52,   308,   195,   196,   197,   198,
-       0,    14,    21,   167,     0,    32,    31,    35,    34,   163,
-      27,     0,    33,    36,   164,   166,     0,    49,   326,   327,
-     328,   329,   330,   333,   331,   332,   334,   299,   317,   325,
-     320,   323,   300,   318,    91,     0,     0,     0,    30,    28,
-      45,     0,     0,    38,     0,     0,   165,    15,     0,    97,
+     313,   311,   312,   314,    52,   310,   196,   197,   198,   199,
+       0,    14,    21,   168,     0,    32,    31,    35,    34,   164,
+      27,     0,    33,    36,   165,   167,     0,    49,   328,   329,
+     330,   331,   332,   335,   333,   334,   336,   301,   319,   327,
+     322,   325,   302,   320,    91,     0,     0,     0,    30,    28,
+      45,     0,     0,    38,     0,     0,   166,    15,     0,    97,
       95,    96,    98,    99,    66,   100,     0,   101,     0,    64,
        0,    71,    68,   102,   103,   104,   105,   106,   107,   108,
        0,    92,    93,     0,     0,     0,    40,     0,    91,    29,
-     301,   324,     0,     0,    73,     0,     0,     0,     0,    53,
-      94,    20,   313,   314,   315,     0,   316,     0,     0,     0,
-     321,    37,   317,    43,   302,   304,   305,    25,    26,     0,
-       0,     0,    76,    77,    79,    78,    80,    81,   319,     0,
+     303,   326,     0,     0,    73,     0,     0,     0,     0,    53,
+      94,    20,   315,   316,   317,     0,   318,     0,     0,     0,
+     323,    37,   319,    43,   304,   306,   307,    25,    26,     0,
+       0,     0,    76,    77,    79,    78,    80,    81,   321,     0,
       75,     0,     0,     0,     0,    55,     0,     0,    41,    39,
-       0,     0,   319,     0,    67,    63,    62,     0,     0,    61,
-      65,    70,    72,    69,    56,   156,    22,    24,   307,   322,
-       0,   303,    82,    74,    58,     0,     0,   160,   159,   161,
-     162,     0,     0,   156,     0,   154,   306,     0,     0,   158,
-      57,    54,   155,     0,   194,   157,    59,     0,     0,   169,
-       0,     0,     0,     0,   177,     0,   181,   184,   147,     0,
-     148,   239,     0,     0,     0,   256,   257,   258,   301,   207,
-     183,   191,   192,   193,   134,     0,     0,   175,   209,   210,
-     211,   263,   190,   176,   284,   283,   259,   124,    17,   187,
-       0,     0,     0,     0,   189,     0,     0,     0,     0,     0,
-     186,   259,     0,    85,   132,   135,   188,   282,   145,   168,
-       0,   242,   243,   244,   245,   248,   249,   250,   251,   247,
-     246,   252,   253,   254,     0,     0,   319,     0,    60,     0,
-     292,   293,   294,   295,   296,   297,   298,   291,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   282,   116,
-     137,   140,     0,   280,     0,   124,   149,   265,   261,   262,
-     260,   212,   333,   334,   301,     0,   213,   214,   215,     0,
-     206,   317,   200,     0,   241,   126,   127,   128,   129,   131,
-     125,     0,   288,     0,     0,   287,     0,   173,   178,   170,
-     179,   180,     0,     0,     0,    89,     0,     0,     0,     0,
-       0,   277,   333,     0,   150,   272,   333,     0,   267,   272,
-     255,   199,     0,   201,   221,   230,   231,   235,   224,   225,
-     226,   227,   228,   229,   222,   232,   233,   234,   223,   319,
-     238,   216,   217,   218,   219,   220,   236,   237,     0,     0,
-       0,   290,     0,   286,     0,   174,   172,     0,     0,     0,
-     240,     0,     0,     0,     0,   138,     0,   133,     0,   141,
-       0,   136,     0,   281,     0,   278,     0,     0,     0,   146,
-     271,     0,     0,   264,     0,   319,     0,   202,     0,     0,
-     289,   285,   171,   182,   185,   118,     0,     0,     0,     0,
-      87,   117,   272,   139,   272,   142,     0,     0,   151,   333,
-     152,   274,   275,   273,   270,   333,   266,   269,     0,   203,
-     204,   130,    90,     0,     0,     0,     0,   119,     0,   143,
-     144,   279,   265,     0,     0,     0,   205,   110,     0,   111,
-     113,     0,   112,     0,     0,    88,     0,   153,     0,   268,
-       0,     0,     0,   122,     0,    86,     0,   208,   276,   109,
-     115,   114,     0,   124,   120,     0,   121,   123
+       0,     0,   321,     0,    67,    63,    62,     0,     0,    61,
+      65,    70,    72,    69,    56,   157,    22,    24,   309,   324,
+       0,   305,    82,    74,    58,     0,     0,   161,   160,   162,
+     163,     0,     0,   157,     0,   155,   308,     0,     0,   159,
+      57,    54,   156,     0,   195,   158,    59,     0,     0,   170,
+       0,     0,     0,     0,   178,     0,   182,   185,   148,     0,
+     149,   240,     0,     0,     0,   257,   258,   259,   303,   208,
+     184,   192,   193,   194,   135,     0,     0,   176,   210,   211,
+     212,   264,   191,   177,   286,   285,   260,   124,    17,   188,
+       0,     0,     0,     0,   190,     0,     0,     0,     0,     0,
+     187,   260,     0,    85,   133,   136,   189,   284,   146,   169,
+       0,   243,   244,   245,   246,   249,   250,   251,   252,   248,
+     247,   253,   254,   255,     0,     0,   321,     0,    60,     0,
+     294,   295,   296,   297,   298,   299,   300,   293,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   284,   116,
+     138,   141,     0,   282,     0,   124,   150,   266,   262,   263,
+     261,   213,   335,   336,   303,     0,   214,   215,   216,     0,
+     207,   319,   201,     0,   242,   126,   127,   128,   129,   132,
+     125,     0,   290,     0,     0,   289,     0,   174,   179,   171,
+     180,   181,     0,     0,     0,    89,     0,     0,     0,     0,
+       0,   279,   335,     0,   151,   273,   335,     0,   268,   273,
+     256,   200,     0,   202,   222,   231,   232,   236,   225,   226,
+     227,   228,   229,   230,   223,   233,   234,   235,   224,   321,
+     239,   217,   218,   219,   220,   221,   237,   238,     0,     0,
+       0,   292,     0,   288,     0,   175,   173,     0,     0,     0,
+     241,     0,     0,     0,     0,   139,     0,   134,     0,   142,
+       0,   137,     0,   283,     0,   280,     0,     0,     0,   147,
+     272,     0,     0,   265,     0,   321,     0,   203,     0,     0,
+       0,   291,   287,   172,   183,   186,   118,     0,     0,     0,
+       0,    87,   117,   273,   140,   273,   143,     0,     0,   152,
+     335,   153,   275,   276,   274,   271,   335,   267,   270,     0,
+     204,   205,   130,   131,    90,     0,     0,     0,     0,   119,
+       0,   144,   145,   281,   266,     0,     0,     0,   206,   110,
+       0,   111,   113,     0,   112,     0,     0,    88,     0,   154,
+       0,     0,   269,     0,     0,     0,   122,     0,    86,     0,
+     209,   278,   277,   109,   115,   114,     0,   124,   120,     0,
+     121,   123
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
@@ -2051,243 +2073,244 @@
       58,    86,    87,   159,    59,    60,    94,    95,   128,   151,
       18,    29,    61,    19,    25,    20,    26,    84,   175,   195,
      211,   217,   226,   113,   114,   115,   116,   117,   118,   119,
-     169,   170,   212,   251,   329,   497,   433,   120,   121,   122,
-     470,   375,   434,   514,   526,   532,   308,   360,   252,   330,
+     169,   170,   212,   251,   329,   499,   433,   120,   121,   122,
+     471,   375,   434,   516,   529,   536,   308,   360,   252,   330,
      253,   331,   376,   377,   438,   442,   254,   336,   255,   383,
      213,   214,   215,    63,    64,    65,   225,   368,   369,   426,
      256,   275,   278,   279,    50,   392,   257,   287,   349,   418,
      258,   282,   259,   307,   260,   261,   262,   290,   387,   388,
-     450,   483,   333,   334,   263,   264,   265,   318,   319,    78,
+     450,   484,   333,   334,   263,   264,   265,   318,   319,    78,
      153,   154,   155,    44,    45,   144,   156,   146,    37,    38,
      180,   181,    80,    81,    82,    83
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -414
+#define YYPACT_NINF -422
 static const yytype_int16 yypact[] =
 {
-     264,  -414,   -85,   -71,   -58,   -53,  -414,  -414,   -26,  -414,
-      74,   101,   264,  -414,  -414,  -414,   109,  -414,  -414,  -414,
-    -414,  -414,    55,   128,    36,   169,   -64,    97,   170,     9,
-    -414,  -414,  -414,  -414,    66,  -414,  -414,    58,   486,  -414,
-    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
-      76,  -414,    79,  -414,   182,  -414,  -414,  -414,  -414,    44,
-    -414,    89,  -414,    17,   104,  -414,   194,  -414,  -414,  -414,
-    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
-      65,  -414,  -414,  -414,   454,    85,    95,   103,  -414,  -414,
-    -414,   486,   106,  -414,   215,   117,  -414,  -414,   486,  -414,
-    -414,  -414,  -414,  -414,   112,  -414,   113,  -414,   114,   115,
-     116,   121,   124,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
-     238,   454,  -414,    43,   472,   472,  -414,   187,   454,  -414,
-     345,  -414,    52,    -5,   136,   154,   161,    52,    52,  -414,
-    -414,  -414,  -414,  -414,  -414,   152,  -414,   157,   171,   181,
-    -414,  -414,   162,  -414,   218,  -414,  -414,  -414,  -414,   160,
-     174,   175,  -414,  -414,  -414,  -414,  -414,  -414,  -414,   -43,
-    -414,   186,   188,   190,   191,   283,    52,    52,  -414,  -414,
-     172,   486,  -414,   345,  -414,  -414,  -414,   200,   136,  -414,
-    -414,  -414,  -414,  -414,  -414,     5,  -414,  -414,  -414,    65,
-     202,  -414,  -414,  -414,  -414,   183,   293,  -414,  -414,  -414,
-    -414,   323,   260,   173,   105,  -414,  -414,    97,   269,  -414,
-    -414,  -414,  -414,   342,   413,  -414,  -414,   241,    43,  -414,
-     -45,   216,   230,   486,  -414,    60,    40,  -414,  -414,   198,
-    -414,  -414,   346,   347,   363,  -414,  -414,  -414,   345,  -414,
-    -414,  -414,  -414,  -414,  -414,   243,   365,  -414,  -414,  -414,
-    -414,  -414,  -414,  -414,  -414,  -414,   317,  -414,  -414,  -414,
-     486,   329,   486,   329,  -414,    97,   305,   306,    97,    97,
-    -414,   259,   256,  -414,  -414,  -414,  -414,   -48,  -414,  -414,
-     257,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
-    -414,  -414,  -414,  -414,   119,   148,  -414,   486,    -1,   375,
-    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,   -45,   486,
-     382,   -45,   486,   284,   327,   327,   287,   289,   -48,  -414,
-    -414,  -414,   378,  -414,   -42,  -414,   500,   514,  -414,  -414,
-    -414,  -414,   276,   278,   345,   296,  -414,  -414,  -414,   486,
-    -414,   -44,   439,   281,  -414,  -414,  -414,  -414,   286,  -414,
-    -414,   -45,  -414,   397,   -45,  -414,   399,   312,   344,  -414,
-    -414,  -414,   295,   297,   -39,    -2,    21,     7,   327,   266,
-     299,    -1,   402,   -37,  -414,  -414,   406,   -34,  -414,   407,
-    -414,  -414,   315,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
-    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
-    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,   486,   313,
-     333,  -414,   -45,  -414,   -45,  -414,  -414,   284,    43,    43,
-    -414,   486,   486,    54,   414,  -414,   486,  -414,   442,  -414,
-     486,  -414,   444,  -414,   434,  -414,   198,   486,   528,  -414,
-     126,   486,   542,  -414,   486,  -414,   332,  -414,   486,   337,
-    -414,  -414,  -414,  -414,  -414,  -414,   462,   486,   486,   556,
-     104,  -414,  -414,  -414,  -414,  -414,   327,   349,  -414,   448,
-    -414,  -414,   355,  -414,  -414,   450,  -414,  -414,   348,  -414,
-    -414,  -414,  -414,    19,   477,    20,    22,  -414,   479,   126,
-     126,  -414,   514,   486,   372,   486,  -414,  -414,   486,  -414,
-    -414,   486,  -414,   486,    10,  -414,   -24,  -414,   359,  -414,
-     482,   488,   497,  -414,   327,  -414,   498,  -414,  -414,  -414,
-    -414,  -414,    97,  -414,  -414,   284,    -1,  -414
+       4,  -422,   -77,   -34,   -46,   -31,  -422,  -422,    -4,  -422,
+     106,   139,     4,  -422,  -422,  -422,   186,  -422,  -422,  -422,
+    -422,  -422,   104,   187,    68,   194,   221,   127,   199,    53,
+    -422,  -422,  -422,  -422,    92,  -422,  -422,    84,   489,  -422,
+    -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,
+     107,  -422,   101,  -422,   217,  -422,  -422,  -422,  -422,    64,
+    -422,   122,  -422,    14,   125,  -422,   223,  -422,  -422,  -422,
+    -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,
+      98,  -422,  -422,  -422,   493,   118,   129,   131,  -422,  -422,
+    -422,   489,   132,  -422,   241,   130,  -422,  -422,   489,  -422,
+    -422,  -422,  -422,  -422,   123,  -422,   134,  -422,   135,   136,
+     138,   141,   146,  -422,  -422,  -422,  -422,  -422,  -422,  -422,
+     245,   493,  -422,    74,   239,   239,  -422,   181,   493,  -422,
+     437,  -422,    40,    56,    -7,   152,   170,    40,    40,  -422,
+    -422,  -422,  -422,  -422,  -422,   163,  -422,   165,   183,   193,
+    -422,  -422,   173,  -422,   226,  -422,  -422,  -422,  -422,   180,
+     188,   189,  -422,  -422,  -422,  -422,  -422,  -422,  -422,   -50,
+    -422,   190,   191,   195,   202,   303,    40,    40,  -422,  -422,
+     206,   489,  -422,   437,  -422,  -422,  -422,   207,    -7,  -422,
+    -422,  -422,  -422,  -422,  -422,    32,  -422,  -422,  -422,    98,
+     208,  -422,  -422,  -422,  -422,   211,   315,  -422,  -422,  -422,
+    -422,   316,   262,    43,   261,  -422,  -422,   127,   267,  -422,
+    -422,  -422,  -422,   336,   415,  -422,  -422,   242,    74,  -422,
+     -36,   105,   124,   489,  -422,    54,    16,  -422,  -422,   171,
+    -422,  -422,   353,   360,   368,  -422,  -422,  -422,   437,  -422,
+    -422,  -422,  -422,  -422,  -422,   249,   371,  -422,  -422,  -422,
+    -422,  -422,  -422,  -422,  -422,  -422,   416,  -422,  -422,  -422,
+     489,   197,   489,   197,  -422,   127,   308,   310,   127,   127,
+    -422,   268,   264,  -422,  -422,  -422,  -422,   278,  -422,  -422,
+     266,  -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,
+    -422,  -422,  -422,  -422,   196,    18,  -422,   489,    -3,   383,
+    -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,   -36,   489,
+     387,   -36,   489,   289,   254,   254,   292,   293,   278,  -422,
+    -422,  -422,   382,  -422,   -42,  -422,   503,   517,  -422,  -422,
+    -422,  -422,   279,   280,   437,   298,  -422,  -422,  -422,   489,
+    -422,   -47,   441,   283,  -422,  -422,  -422,  -422,   286,  -422,
+    -422,   -36,  -422,   403,   -36,  -422,   406,   317,   347,  -422,
+    -422,  -422,   297,   299,   -23,     3,    28,    21,   254,   329,
+     300,    -3,   402,   -14,  -422,  -422,   404,   -13,  -422,   408,
+    -422,  -422,   309,  -422,  -422,  -422,  -422,  -422,  -422,  -422,
+    -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,
+    -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,   489,   318,
+      58,  -422,   -36,  -422,   -36,  -422,  -422,   289,    74,    74,
+    -422,   489,   489,    -1,   433,  -422,   489,  -422,   435,  -422,
+     489,  -422,   438,  -422,   426,  -422,   171,   489,   531,  -422,
+      69,   489,   545,  -422,   489,  -422,   324,  -422,   489,   333,
+     339,  -422,  -422,  -422,  -422,  -422,  -422,   446,   489,   489,
+     559,   125,  -422,  -422,  -422,  -422,  -422,   254,   343,  -422,
+     449,  -422,  -422,   346,  -422,  -422,   452,  -422,  -422,   350,
+    -422,  -422,  -422,  -422,  -422,    15,   472,    19,    22,  -422,
+     478,    69,    69,  -422,   517,   489,    90,   489,  -422,  -422,
+     489,  -422,  -422,   489,  -422,   489,    -6,  -422,    -9,  -422,
+     357,   359,  -422,   482,   483,   484,  -422,   254,  -422,   488,
+    -422,  -422,  -422,  -422,  -422,  -422,   127,  -422,  -422,   289,
+      -3,  -422
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -414,  -414,  -414,   478,    14,  -146,  -414,  -414,  -414,  -414,
-     279,  -414,  -414,   -97,  -414,   445,  -414,  -414,  -414,   166,
-    -414,  -414,  -414,    16,  -414,  -414,  -414,  -414,  -414,  -414,
-    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
-    -414,   324,  -414,  -414,  -414,  -414,  -414,   377,  -414,   390,
-    -414,  -414,  -414,  -414,  -414,  -414,  -330,  -414,  -414,  -414,
-    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
-    -414,  -414,   300,   301,  -414,   -63,  -414,  -414,  -413,  -414,
-    -414,  -414,  -414,  -414,  -213,  -414,  -414,  -414,  -414,  -414,
-    -414,  -414,  -414,  -414,  -414,    68,  -208,  -414,    24,  -327,
-    -343,  -414,   137,   195,  -414,  -414,  -414,   251,   254,  -128,
-     285,  -414,   351,  -414,   227,  -223,    41,   -38,  -162,  -414,
-    -414,  -414,   354,   438,  -414,  -120
+    -422,  -422,  -422,   491,     9,  -146,  -422,  -422,  -422,  -422,
+     270,  -422,  -422,    47,  -422,   445,  -422,  -422,  -422,   161,
+    -422,  -422,  -422,    12,  -422,  -422,  -422,  -422,  -422,  -422,
+    -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,
+    -422,   319,  -422,  -422,  -422,  -422,  -422,   378,  -422,   391,
+    -422,  -422,  -422,  -422,  -422,  -422,  -330,  -422,  -422,  -422,
+    -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,  -422,
+    -422,  -422,   301,   302,  -422,   -63,  -422,  -422,  -418,  -422,
+    -422,  -422,  -422,  -422,  -214,  -422,  -422,  -422,  -422,  -422,
+    -422,  -422,  -422,  -422,  -422,    67,  -206,  -422,    11,  -312,
+    -421,  -422,   147,   200,  -422,  -422,  -422,   244,   252,  -128,
+     281,  -422,   335,  -422,   229,  -223,    33,   -38,  -162,  -422,
+    -422,  -422,   354,   436,  -422,  -119
 };
 
 /* 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 -260
+#define YYTABLE_NINF -261
 static const yytype_int16 yytable[] =
 {
-      79,    96,   152,   141,   227,   381,   187,   269,   431,   384,
-     204,   439,     3,     4,   462,     2,   355,   356,   357,   358,
-     200,   -42,   440,   507,   510,   435,   512,    21,   188,   379,
-      91,   280,   379,     5,   448,   436,   205,   452,   523,    52,
-     173,   174,    22,    57,    40,    62,    92,   452,    41,   209,
-       2,    42,    43,   126,    23,   152,    68,    69,    70,    71,
-      79,    72,   323,   142,   332,   326,   327,   209,     5,    77,
-      24,   143,   524,    57,    52,    62,   304,   -83,    30,   196,
-     197,  -259,   432,   189,   380,   525,    28,   430,   441,   449,
-     508,   511,   453,   513,    93,   362,   266,   350,   365,   359,
-     437,    31,   527,   160,   465,     8,   223,   161,   268,  -163,
-      53,   281,   -46,    33,  -163,   206,  -163,  -163,  -163,    54,
-     152,   480,   537,   207,   208,   486,    34,    55,    56,   499,
-     467,   500,    35,  -163,  -163,  -163,   468,   469,   421,  -163,
-       8,   423,   481,    79,   353,    53,   482,   -47,    46,    47,
-      48,    49,   -23,   -21,    54,    73,    74,    75,    76,   335,
-      36,   341,    55,    56,   157,   145,   147,   158,  -163,  -163,
-    -163,  -163,   276,    39,    51,   277,   339,   351,    66,  -163,
-       3,     4,    67,  -163,    85,  -163,    88,   162,   163,   164,
-     165,   -23,    90,   271,   273,   274,   370,   371,    97,   460,
-     335,   461,    98,   536,   205,    53,    53,   123,   124,  -163,
-    -163,  -163,  -163,  -163,  -163,   125,   152,  -163,   127,   129,
-    -163,  -163,  -163,    68,    69,    70,    71,    40,    72,   270,
-    -163,   338,   309,   130,   320,    43,    77,   132,   133,   134,
-     135,   136,   139,   272,   166,   -84,   137,   456,   167,   138,
-     443,   335,    68,    69,    70,    71,   245,    72,   148,   168,
-     342,    74,    75,   343,   344,    77,   171,   352,     1,   354,
-       2,     3,     4,   172,   176,   345,   346,   347,   348,   177,
-     178,   363,   179,   206,   366,   182,   184,   194,     5,   183,
-       6,   207,   208,   488,     7,   218,   198,   219,   385,   389,
-     185,   186,    68,    69,    70,    71,   245,    72,   463,   464,
-     246,   393,   190,   247,   191,    77,   192,   193,   281,   535,
-      68,    69,    70,    71,   202,    72,   216,   220,    73,    74,
-      75,    76,   221,    77,    68,    69,    70,    71,   310,    72,
-     228,   496,    73,    74,    75,    76,   229,    77,   501,   267,
-     283,   284,   291,   292,   293,   294,   295,   296,   297,   298,
-       8,   299,   300,   301,   302,   303,     9,   285,   288,   289,
-      68,    69,    70,    71,    10,    72,   324,   325,   444,   304,
-     457,   328,   337,    77,   361,   311,   312,   313,   314,   315,
-     316,   364,   367,   385,   466,   372,   533,   373,   472,   378,
-     317,  -257,   474,  -258,   391,   419,   422,   498,   424,   478,
-     385,   420,   425,   484,   385,   427,   487,   428,   471,   429,
-     490,   446,   230,   447,   231,   232,   233,   451,   454,   493,
-     494,    68,    69,    70,    71,   458,    72,   304,   455,   305,
-     306,   234,   235,   236,    77,   459,   473,   237,   475,    68,
-      69,    70,    71,   142,    72,   476,   489,    73,    74,    75,
-      76,   143,    77,   491,   389,   517,   492,   519,   150,   503,
-     520,   505,   506,   521,   502,   522,   238,   239,   240,   241,
-     504,   509,   394,   515,   518,   528,   529,   242,   395,   396,
-      32,   243,   530,   244,   397,   398,   399,   400,   401,   402,
-     403,   531,   534,   250,    89,   149,   404,   405,   406,   407,
-     390,   140,   203,   222,   477,   224,   445,    68,    69,    70,
-      71,   245,    72,   374,   321,   246,   516,   322,   247,   248,
-      77,   340,     0,   286,   201,   199,   131,     0,   249,    99,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-       0,   110,   111,   112,     0,     0,     0,     0,     0,     0,
-     408,     0,   409,     0,     0,     0,     0,     0,   410,   411,
-     412,   413,   414,   415,   416,   417,    68,    69,    70,    71,
-     142,    72,     0,     0,    73,    74,    75,    76,   143,    77,
-      68,    69,    70,    71,     0,    72,     0,     0,    73,    74,
-      75,    76,     0,    77,    68,    69,    70,    71,     0,    72,
-       0,     0,   382,    74,    75,    76,     0,    77,    68,    69,
-      70,    71,     0,    72,     0,     0,   386,    74,    75,    76,
-       0,    77,    68,    69,    70,    71,     0,    72,     0,     0,
-     479,    74,    75,    76,     0,    77,    68,    69,    70,    71,
-       0,    72,     0,     0,   485,    74,    75,    76,     0,    77,
-      68,    69,    70,    71,     0,    72,     0,     0,   495,     0,
-       0,     0,     0,    77
+      79,    96,   152,   227,   141,   381,   187,   269,     1,   463,
+       2,     3,     4,   431,   355,   356,   357,   358,   -42,   509,
+     200,   188,   526,   512,   384,   439,   514,    91,     5,   379,
+       6,   341,   435,   280,     7,    21,   440,   204,    57,     3,
+       4,    62,   436,    92,   162,   163,   164,   165,   379,   209,
+       3,     4,   501,   126,   502,   152,   527,   448,   452,     2,
+      79,   323,   452,   205,   326,   327,    23,   209,    57,   528,
+       2,    62,   142,   304,   205,   468,   189,     5,  -260,    22,
+     143,   469,   470,    52,   380,   482,   510,   432,     5,   483,
+     513,    93,    24,   515,    52,   362,   266,   359,   365,   350,
+       8,   166,   441,   430,   -83,   167,     9,   437,    28,   268,
+      30,   281,   449,   453,    10,   -84,   168,   530,   270,   466,
+     152,   541,    68,    69,    70,    71,   245,    72,   -23,   -21,
+     342,    74,    75,   343,   344,    77,   481,   272,   421,    31,
+     487,   423,   206,    79,   353,   345,   346,   347,   348,     8,
+     207,   208,   157,   206,    53,   158,   -46,   145,   147,   335,
+       8,   207,   208,    54,   160,    53,   276,   -47,   161,   277,
+     459,    55,    56,   460,    54,    34,   339,   351,    46,    47,
+      48,    49,    55,    56,   173,   174,    73,    74,    75,    76,
+      33,    35,    36,   271,   273,   274,   370,   371,    39,   461,
+     335,   462,   520,    51,    66,   521,   310,   540,    67,    68,
+      69,    70,    71,   -23,    72,    85,   152,    73,    74,    75,
+      76,    88,    77,   196,   197,    90,    53,    97,    68,    69,
+      70,    71,   309,    72,   320,    98,    73,    74,    75,    76,
+     123,    77,   124,   125,   127,   129,   130,   456,   132,   139,
+     443,   335,   148,   311,   312,   313,   314,   315,   316,   133,
+     134,   135,   223,   136,   171,  -164,   137,   352,   317,   354,
+    -164,   138,  -164,  -164,  -164,    68,    69,    70,    71,   245,
+      72,   363,   172,   246,   366,   176,   247,   177,    77,  -164,
+    -164,  -164,   178,   489,   179,  -164,   182,   183,   385,   389,
+      68,    69,    70,    71,    40,    72,   184,   194,   338,   464,
+     465,   393,    43,    77,   185,   186,   190,   191,   281,   219,
+     220,   192,   539,   218,  -164,  -164,  -164,  -164,   193,    40,
+     198,   202,   216,    41,   221,  -164,    42,    43,   228,  -164,
+     229,  -164,   498,    68,    69,    70,    71,   142,    72,   503,
+     267,    73,    74,    75,    76,   143,    77,   283,    68,    69,
+      70,    71,    53,    72,   284,  -164,  -164,  -164,  -164,  -164,
+    -164,    77,   285,  -164,   288,   289,  -164,  -164,  -164,   324,
+     457,   325,    68,    69,    70,    71,  -164,    72,   304,   328,
+     332,   337,   361,   385,   467,    77,   364,   367,   473,   537,
+     372,   373,   475,   378,  -258,  -259,   391,   419,   500,   479,
+     385,   420,   422,   485,   385,   424,   488,   425,   427,   428,
+     491,   429,   446,   447,   230,   451,   231,   232,   233,   454,
+     495,   496,   455,    68,    69,    70,    71,   472,    72,   474,
+     458,   444,   476,   234,   235,   236,    77,   477,   490,   237,
+     494,   291,   292,   293,   294,   295,   296,   297,   298,   492,
+     299,   300,   301,   302,   303,   493,   389,   519,   504,   522,
+     505,   506,   523,   507,   508,   524,   511,   525,   238,   239,
+     240,   241,   517,   531,   394,   532,   533,   534,   535,   242,
+     395,   396,   538,   243,   250,   244,   397,   398,   399,   400,
+     401,   402,   403,    32,    89,   390,   149,   203,   404,   405,
+     406,   407,   140,   478,   222,   518,   224,   321,   201,    68,
+      69,    70,    71,   245,    72,   322,   445,   246,   374,   286,
+     247,   248,    77,   340,   131,   199,   304,     0,   305,   306,
+     249,    68,    69,    70,    71,   142,    72,     0,     0,    73,
+      74,    75,    76,   143,    77,     0,     0,     0,     0,     0,
+     150,     0,   408,     0,   409,     0,     0,     0,     0,     0,
+     410,   411,   412,   413,   414,   415,   416,   417,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,   109,     0,
+     110,   111,   112,    68,    69,    70,    71,     0,    72,     0,
+       0,    73,    74,    75,    76,     0,    77,    68,    69,    70,
+      71,     0,    72,     0,     0,   382,    74,    75,    76,     0,
+      77,    68,    69,    70,    71,     0,    72,     0,     0,   386,
+      74,    75,    76,     0,    77,    68,    69,    70,    71,     0,
+      72,     0,     0,   480,    74,    75,    76,     0,    77,    68,
+      69,    70,    71,     0,    72,     0,     0,   486,    74,    75,
+      76,     0,    77,    68,    69,    70,    71,     0,    72,     0,
+       0,   497,     0,     0,     0,     0,    77
 };
 
 static const yytype_int16 yycheck[] =
 {
-      38,    64,   130,   123,   217,   335,   168,   230,    10,   336,
-       5,     4,     7,     8,   427,     6,    17,    18,    19,    20,
-     182,     4,    15,     4,     4,     4,     4,   112,    71,    71,
-      13,   239,    71,    24,    71,    14,    31,    71,    28,    30,
-     137,   138,   113,    29,   108,    29,    29,    71,   112,   195,
-       6,   115,   116,    91,   112,   183,   104,   105,   106,   107,
-      98,   109,   275,   108,   112,   278,   279,   213,    24,   117,
-     123,   116,    62,    59,    30,    59,   120,    72,     4,   176,
-     177,   125,    84,   126,   126,    75,   112,   126,    81,   126,
-      71,    71,   126,    71,    77,   318,   224,   305,   321,   100,
-      79,     0,   126,   108,   431,    96,     1,   112,   228,     4,
-     101,   239,   103,     4,     9,   110,    11,    12,    13,   110,
-     248,   448,   535,   118,   119,   452,    71,   118,   119,   472,
-      76,   474,     4,    28,    29,    30,    82,    83,   361,    34,
-      96,   364,    16,   181,   306,   101,    20,   103,    51,    52,
-      53,    54,   112,   113,   110,   112,   113,   114,   115,   287,
-     124,    13,   118,   119,   112,   124,   125,   115,    63,    64,
-      65,    66,   112,     4,     4,   115,   304,   305,   112,    74,
-       7,     8,   124,    78,   108,    80,     4,    51,    52,    53,
-      54,   112,   103,   231,   232,   233,   324,   325,     4,   422,
-     328,   424,   137,   533,    31,   101,   101,   122,   113,   104,
-     105,   106,   107,   108,   109,   112,   344,   112,   112,     4,
-     115,   116,   117,   104,   105,   106,   107,   108,   109,    13,
-     125,   112,   270,   116,   272,   116,   117,   125,   125,   125,
-     125,   125,     4,    13,   108,    72,   125,   409,   112,   125,
-     378,   379,   104,   105,   106,   107,   108,   109,    71,   123,
-     112,   113,   114,   115,   116,   117,   112,   305,     4,   307,
-       6,     7,     8,   112,   122,   127,   128,   129,   130,   122,
-     109,   319,   101,   110,   322,   123,   126,     4,    24,    71,
-      26,   118,   119,   455,    30,   112,   124,     4,   336,   337,
-     126,   126,   104,   105,   106,   107,   108,   109,   428,   429,
-     112,   349,   126,   115,   126,   117,   126,   126,   446,   532,
-     104,   105,   106,   107,   124,   109,   124,     4,   112,   113,
-     114,   115,    72,   117,   104,   105,   106,   107,     9,   109,
-      71,   469,   112,   113,   114,   115,     4,   117,   476,   108,
-       4,     4,    35,    36,    37,    38,    39,    40,    41,    42,
-      96,    44,    45,    46,    47,    48,   102,     4,   125,     4,
-     104,   105,   106,   107,   110,   109,    71,    71,   112,   120,
-     418,   125,   125,   117,     9,    56,    57,    58,    59,    60,
-      61,     9,   108,   431,   432,   108,   524,   108,   436,    21,
-      71,   125,   440,   125,   108,   124,     9,   470,     9,   447,
-     448,   125,   100,   451,   452,    71,   454,   122,     4,   122,
-     458,   122,     9,    21,    11,    12,    13,    21,    21,   467,
-     468,   104,   105,   106,   107,   122,   109,   120,   123,   122,
-     123,    28,    29,    30,   117,   112,     4,    34,     4,   104,
-     105,   106,   107,   108,   109,    21,   124,   112,   113,   114,
-     115,   116,   117,   126,   502,   503,     4,   505,   123,    21,
-     508,    21,   124,   511,   125,   513,    63,    64,    65,    66,
-     125,     4,    43,     4,   112,   126,     4,    74,    49,    50,
-      12,    78,     4,    80,    55,    56,    57,    58,    59,    60,
-      61,     4,     4,   224,    59,   128,    67,    68,    69,    70,
-     344,   121,   188,   213,   446,   214,   379,   104,   105,   106,
-     107,   108,   109,   328,   273,   112,   502,   273,   115,   116,
-     117,   304,    -1,   248,   183,   181,    98,    -1,   125,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      -1,    97,    98,    99,    -1,    -1,    -1,    -1,    -1,    -1,
-     121,    -1,   123,    -1,    -1,    -1,    -1,    -1,   129,   130,
-     131,   132,   133,   134,   135,   136,   104,   105,   106,   107,
-     108,   109,    -1,    -1,   112,   113,   114,   115,   116,   117,
-     104,   105,   106,   107,    -1,   109,    -1,    -1,   112,   113,
-     114,   115,    -1,   117,   104,   105,   106,   107,    -1,   109,
-      -1,    -1,   112,   113,   114,   115,    -1,   117,   104,   105,
-     106,   107,    -1,   109,    -1,    -1,   112,   113,   114,   115,
-      -1,   117,   104,   105,   106,   107,    -1,   109,    -1,    -1,
-     112,   113,   114,   115,    -1,   117,   104,   105,   106,   107,
-      -1,   109,    -1,    -1,   112,   113,   114,   115,    -1,   117,
-     104,   105,   106,   107,    -1,   109,    -1,    -1,   112,    -1,
-      -1,    -1,    -1,   117
+      38,    64,   130,   217,   123,   335,   168,   230,     4,   427,
+       6,     7,     8,    10,    17,    18,    19,    20,     4,     4,
+     182,    71,    28,     4,   336,     4,     4,    13,    24,    71,
+      26,    13,     4,   239,    30,   112,    15,     5,    29,     7,
+       8,    29,    14,    29,    51,    52,    53,    54,    71,   195,
+       7,     8,   473,    91,   475,   183,    62,    71,    71,     6,
+      98,   275,    71,    31,   278,   279,   112,   213,    59,    75,
+       6,    59,   108,   120,    31,    76,   126,    24,   125,   113,
+     116,    82,    83,    30,   126,    16,    71,    84,    24,    20,
+      71,    77,   123,    71,    30,   318,   224,   100,   321,   305,
+      96,   108,    81,   126,    72,   112,   102,    79,   112,   228,
+       4,   239,   126,   126,   110,    72,   123,   126,    13,   431,
+     248,   539,   104,   105,   106,   107,   108,   109,   112,   113,
+     112,   113,   114,   115,   116,   117,   448,    13,   361,     0,
+     452,   364,   110,   181,   306,   127,   128,   129,   130,    96,
+     118,   119,   112,   110,   101,   115,   103,   124,   125,   287,
+      96,   118,   119,   110,   108,   101,   112,   103,   112,   115,
+     112,   118,   119,   115,   110,    71,   304,   305,    51,    52,
+      53,    54,   118,   119,   137,   138,   112,   113,   114,   115,
+       4,     4,   124,   231,   232,   233,   324,   325,     4,   422,
+     328,   424,   112,     4,   112,   115,     9,   537,   124,   104,
+     105,   106,   107,   112,   109,   108,   344,   112,   113,   114,
+     115,     4,   117,   176,   177,   103,   101,     4,   104,   105,
+     106,   107,   270,   109,   272,   137,   112,   113,   114,   115,
+     122,   117,   113,   112,   112,     4,   116,   409,   125,     4,
+     378,   379,    71,    56,    57,    58,    59,    60,    61,   125,
+     125,   125,     1,   125,   112,     4,   125,   305,    71,   307,
+       9,   125,    11,    12,    13,   104,   105,   106,   107,   108,
+     109,   319,   112,   112,   322,   122,   115,   122,   117,    28,
+      29,    30,   109,   455,   101,    34,   123,    71,   336,   337,
+     104,   105,   106,   107,   108,   109,   126,     4,   112,   428,
+     429,   349,   116,   117,   126,   126,   126,   126,   446,     4,
+       4,   126,   536,   112,    63,    64,    65,    66,   126,   108,
+     124,   124,   124,   112,    72,    74,   115,   116,    71,    78,
+       4,    80,   470,   104,   105,   106,   107,   108,   109,   477,
+     108,   112,   113,   114,   115,   116,   117,     4,   104,   105,
+     106,   107,   101,   109,     4,   104,   105,   106,   107,   108,
+     109,   117,     4,   112,   125,     4,   115,   116,   117,    71,
+     418,    71,   104,   105,   106,   107,   125,   109,   120,   125,
+     112,   125,     9,   431,   432,   117,     9,   108,   436,   527,
+     108,   108,   440,    21,   125,   125,   108,   124,   471,   447,
+     448,   125,     9,   451,   452,     9,   454,   100,    71,   122,
+     458,   122,   122,    21,     9,    21,    11,    12,    13,    21,
+     468,   469,   123,   104,   105,   106,   107,     4,   109,     4,
+     122,   112,     4,    28,    29,    30,   117,    21,   124,    34,
+       4,    35,    36,    37,    38,    39,    40,    41,    42,   126,
+      44,    45,    46,    47,    48,   126,   504,   505,   125,   507,
+      21,   125,   510,    21,   124,   513,     4,   515,    63,    64,
+      65,    66,     4,   126,    43,   126,     4,     4,     4,    74,
+      49,    50,     4,    78,   224,    80,    55,    56,    57,    58,
+      59,    60,    61,    12,    59,   344,   128,   188,    67,    68,
+      69,    70,   121,   446,   213,   504,   214,   273,   183,   104,
+     105,   106,   107,   108,   109,   273,   379,   112,   328,   248,
+     115,   116,   117,   304,    98,   181,   120,    -1,   122,   123,
+     125,   104,   105,   106,   107,   108,   109,    -1,    -1,   112,
+     113,   114,   115,   116,   117,    -1,    -1,    -1,    -1,    -1,
+     123,    -1,   121,    -1,   123,    -1,    -1,    -1,    -1,    -1,
+     129,   130,   131,   132,   133,   134,   135,   136,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    -1,
+      97,    98,    99,   104,   105,   106,   107,    -1,   109,    -1,
+      -1,   112,   113,   114,   115,    -1,   117,   104,   105,   106,
+     107,    -1,   109,    -1,    -1,   112,   113,   114,   115,    -1,
+     117,   104,   105,   106,   107,    -1,   109,    -1,    -1,   112,
+     113,   114,   115,    -1,   117,   104,   105,   106,   107,    -1,
+     109,    -1,    -1,   112,   113,   114,   115,    -1,   117,   104,
+     105,   106,   107,    -1,   109,    -1,    -1,   112,   113,   114,
+     115,    -1,   117,   104,   105,   106,   107,    -1,   109,    -1,
+      -1,   112,    -1,    -1,    -1,    -1,   117
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2340,14 +2363,15 @@
      126,    10,    84,   184,   190,     4,    14,    79,   202,     4,
       15,    81,   203,   247,   112,   240,   122,    21,    71,   126,
      238,    21,    71,   126,    21,   123,   256,   255,   122,   112,
-     253,   253,   216,   263,   263,   237,   255,    76,    82,    83,
-     188,     4,   255,     4,   255,     4,    21,   233,   255,   112,
-     237,    16,    20,   239,   255,   112,   237,   255,   256,   124,
-     255,   126,     4,   255,   255,   112,   247,   183,   213,   238,
-     238,   247,   125,    21,   125,    21,   124,     4,    71,     4,
-       4,    71,     4,    71,   191,     4,   236,   255,   112,   255,
-     255,   255,   255,    28,    62,    75,   192,   126,   126,     4,
-       4,     4,   193,   247,     4,   222,   194,   216
+     115,   253,   253,   216,   263,   263,   237,   255,    76,    82,
+      83,   188,     4,   255,     4,   255,     4,    21,   233,   255,
+     112,   237,    16,    20,   239,   255,   112,   237,   255,   256,
+     124,   255,   126,   126,     4,   255,   255,   112,   247,   183,
+     213,   238,   238,   247,   125,    21,   125,    21,   124,     4,
+      71,     4,     4,    71,     4,    71,   191,     4,   236,   255,
+     112,   115,   255,   255,   255,   255,    28,    62,    75,   192,
+     126,   126,   126,     4,     4,     4,   193,   247,     4,   222,
+     194,   216
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -3175,22 +3199,22 @@
   switch (yyn)
     {
         case 2:
-#line 1105 "compilers/imcc/imcc.y"
+#line 1125 "compilers/imcc/imcc.y"
     { if (yynerrs) YYABORT; (yyval.i) = 0; }
     break;
 
   case 5:
-#line 1114 "compilers/imcc/imcc.y"
+#line 1134 "compilers/imcc/imcc.y"
     { (yyval.i) = (yyvsp[(1) - (1)].i); }
     break;
 
   case 6:
-#line 1115 "compilers/imcc/imcc.y"
+#line 1135 "compilers/imcc/imcc.y"
     { (yyval.i) = (yyvsp[(1) - (1)].i); }
     break;
 
   case 7:
-#line 1117 "compilers/imcc/imcc.y"
+#line 1137 "compilers/imcc/imcc.y"
     {
            (yyval.i) = (yyvsp[(1) - (1)].i);
            imc_close_unit(interp, IMCC_INFO(interp)->cur_unit);
@@ -3199,7 +3223,7 @@
     break;
 
   case 8:
-#line 1123 "compilers/imcc/imcc.y"
+#line 1143 "compilers/imcc/imcc.y"
     {
            (yyval.i) = (yyvsp[(1) - (1)].i);
            imc_close_unit(interp, IMCC_INFO(interp)->cur_unit);
@@ -3208,32 +3232,32 @@
     break;
 
   case 9:
-#line 1128 "compilers/imcc/imcc.y"
+#line 1148 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; }
     break;
 
   case 10:
-#line 1129 "compilers/imcc/imcc.y"
+#line 1149 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; }
     break;
 
   case 11:
-#line 1130 "compilers/imcc/imcc.y"
+#line 1150 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; }
     break;
 
   case 12:
-#line 1131 "compilers/imcc/imcc.y"
+#line 1151 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; }
     break;
 
   case 13:
-#line 1135 "compilers/imcc/imcc.y"
+#line 1155 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; }
     break;
 
   case 14:
-#line 1137 "compilers/imcc/imcc.y"
+#line 1157 "compilers/imcc/imcc.y"
     {
            (yyval.i) = 0;
            do_loadlib(interp, (yyvsp[(2) - (3)].s));
@@ -3242,7 +3266,7 @@
     break;
 
   case 15:
-#line 1146 "compilers/imcc/imcc.y"
+#line 1166 "compilers/imcc/imcc.y"
     {
            IMCC_INFO(interp)->line = atoi((yyvsp[(2) - (5)].s));
            set_filename(interp, (yyvsp[(4) - (5)].s));
@@ -3250,14 +3274,14 @@
     break;
 
   case 16:
-#line 1151 "compilers/imcc/imcc.y"
+#line 1171 "compilers/imcc/imcc.y"
     {
            set_filename(interp, (yyvsp[(2) - (3)].s));
          }
     break;
 
   case 17:
-#line 1158 "compilers/imcc/imcc.y"
+#line 1178 "compilers/imcc/imcc.y"
     {
           /* We'll want to store an entry while emitting instructions, so just
            * store annotation like it's an instruction. */
@@ -3268,7 +3292,7 @@
     break;
 
   case 18:
-#line 1170 "compilers/imcc/imcc.y"
+#line 1190 "compilers/imcc/imcc.y"
     {
             STRING * const hll_name = Parrot_str_unescape(interp, (yyvsp[(2) - (2)].s) + 1, '"', NULL);
             CONTEXT(interp)->current_HLL =
@@ -3280,12 +3304,12 @@
     break;
 
   case 19:
-#line 1181 "compilers/imcc/imcc.y"
+#line 1201 "compilers/imcc/imcc.y"
     { pesky_global__is_def = 1; }
     break;
 
   case 20:
-#line 1182 "compilers/imcc/imcc.y"
+#line 1202 "compilers/imcc/imcc.y"
     {
              mk_const_ident(interp, (yyvsp[(4) - (6)].s), (yyvsp[(3) - (6)].t), (yyvsp[(6) - (6)].sr), 1);
              mem_sys_free((yyvsp[(4) - (6)].s));
@@ -3294,12 +3318,12 @@
     break;
 
   case 21:
-#line 1190 "compilers/imcc/imcc.y"
+#line 1210 "compilers/imcc/imcc.y"
     { pesky_global__is_def=1; }
     break;
 
   case 22:
-#line 1191 "compilers/imcc/imcc.y"
+#line 1211 "compilers/imcc/imcc.y"
     {
            (yyval.i) = mk_pmc_const(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(3) - (6)].s), (yyvsp[(4) - (6)].sr), (yyvsp[(6) - (6)].s));
            pesky_global__is_def = 0;
@@ -3307,12 +3331,12 @@
     break;
 
   case 23:
-#line 1196 "compilers/imcc/imcc.y"
+#line 1216 "compilers/imcc/imcc.y"
     { pesky_global__is_def=1; }
     break;
 
   case 24:
-#line 1197 "compilers/imcc/imcc.y"
+#line 1217 "compilers/imcc/imcc.y"
     {
            (yyval.i) = mk_pmc_const_named(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(3) - (6)].s), (yyvsp[(4) - (6)].sr), (yyvsp[(6) - (6)].s));
            pesky_global__is_def = 0;
@@ -3320,37 +3344,37 @@
     break;
 
   case 29:
-#line 1213 "compilers/imcc/imcc.y"
+#line 1233 "compilers/imcc/imcc.y"
     { (yyval.i) = 0;  }
     break;
 
   case 30:
-#line 1214 "compilers/imcc/imcc.y"
+#line 1234 "compilers/imcc/imcc.y"
     { (yyval.i) = 0;  }
     break;
 
   case 31:
-#line 1215 "compilers/imcc/imcc.y"
+#line 1235 "compilers/imcc/imcc.y"
     { (yyval.i) = 0;  }
     break;
 
   case 32:
-#line 1216 "compilers/imcc/imcc.y"
+#line 1236 "compilers/imcc/imcc.y"
     { (yyval.i) = 0;  }
     break;
 
   case 33:
-#line 1217 "compilers/imcc/imcc.y"
+#line 1237 "compilers/imcc/imcc.y"
     { (yyval.i) = (yyvsp[(1) - (1)].i); }
     break;
 
   case 36:
-#line 1222 "compilers/imcc/imcc.y"
+#line 1242 "compilers/imcc/imcc.y"
     { clear_state(interp); }
     break;
 
   case 37:
-#line 1224 "compilers/imcc/imcc.y"
+#line 1244 "compilers/imcc/imcc.y"
     {
            (yyval.i) = INS(interp, IMCC_INFO(interp)->cur_unit,
                     (yyvsp[(2) - (3)].s), 0, IMCC_INFO(interp)->regs,
@@ -3360,7 +3384,7 @@
     break;
 
   case 38:
-#line 1231 "compilers/imcc/imcc.y"
+#line 1251 "compilers/imcc/imcc.y"
     {
            imc_close_unit(interp, IMCC_INFO(interp)->cur_unit);
            IMCC_INFO(interp)->cur_unit = imc_open_unit(interp, IMC_PASM);
@@ -3368,7 +3392,7 @@
     break;
 
   case 39:
-#line 1236 "compilers/imcc/imcc.y"
+#line 1256 "compilers/imcc/imcc.y"
     {
            (yyval.i) = iSUBROUTINE(interp,
                     IMCC_INFO(interp)->cur_unit,
@@ -3378,14 +3402,14 @@
     break;
 
   case 40:
-#line 1243 "compilers/imcc/imcc.y"
+#line 1263 "compilers/imcc/imcc.y"
     {
            (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "null", 1, (yyvsp[(2) - (2)].sr));
          }
     break;
 
   case 41:
-#line 1247 "compilers/imcc/imcc.y"
+#line 1267 "compilers/imcc/imcc.y"
     {
            SymReg *r = mk_pasm_reg(interp, (yyvsp[(4) - (4)].s));
            SymReg *n = mk_const(interp, (yyvsp[(2) - (4)].s), 'S');
@@ -3397,17 +3421,17 @@
     break;
 
   case 42:
-#line 1255 "compilers/imcc/imcc.y"
+#line 1275 "compilers/imcc/imcc.y"
     { (yyval.i) = 0;}
     break;
 
   case 44:
-#line 1263 "compilers/imcc/imcc.y"
+#line 1283 "compilers/imcc/imcc.y"
     { IMCC_INFO(interp)->cur_unit = imc_open_unit(interp, IMC_PASM); }
     break;
 
   case 45:
-#line 1266 "compilers/imcc/imcc.y"
+#line 1286 "compilers/imcc/imcc.y"
     {
            /* if (optimizer_level & OPT_PASM)
                          imc_compile_unit(interp, IMCC_INFO(interp)->cur_unit);
@@ -3418,7 +3442,7 @@
     break;
 
   case 48:
-#line 1282 "compilers/imcc/imcc.y"
+#line 1302 "compilers/imcc/imcc.y"
     {
            int re_open = 0;
            (yyval.i) = 0;
@@ -3433,7 +3457,7 @@
     break;
 
   case 49:
-#line 1297 "compilers/imcc/imcc.y"
+#line 1317 "compilers/imcc/imcc.y"
     {
             if (IMCC_INFO(interp)->in_slice)
                 IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
@@ -3444,26 +3468,26 @@
     break;
 
   case 50:
-#line 1304 "compilers/imcc/imcc.y"
+#line 1324 "compilers/imcc/imcc.y"
     { (yyval.sr) = NULL; }
     break;
 
   case 51:
-#line 1309 "compilers/imcc/imcc.y"
+#line 1329 "compilers/imcc/imcc.y"
     {
            IMCC_INFO(interp)->cur_unit = imc_open_unit(interp, IMC_PCCSUB);
          }
     break;
 
   case 52:
-#line 1313 "compilers/imcc/imcc.y"
+#line 1333 "compilers/imcc/imcc.y"
     {
            iSUBROUTINE(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(3) - (3)].sr));
          }
     break;
 
   case 53:
-#line 1317 "compilers/imcc/imcc.y"
+#line 1337 "compilers/imcc/imcc.y"
     {
           IMCC_INFO(interp)->cur_call->pcc_sub->pragma = (yyvsp[(5) - (6)].t);
           if (!IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid) {
@@ -3474,22 +3498,22 @@
     break;
 
   case 54:
-#line 1325 "compilers/imcc/imcc.y"
+#line 1345 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; IMCC_INFO(interp)->cur_call = NULL; }
     break;
 
   case 55:
-#line 1329 "compilers/imcc/imcc.y"
+#line 1349 "compilers/imcc/imcc.y"
     { (yyval.sr) = 0; }
     break;
 
   case 56:
-#line 1330 "compilers/imcc/imcc.y"
+#line 1350 "compilers/imcc/imcc.y"
     { (yyval.sr) = 0; }
     break;
 
   case 57:
-#line 1332 "compilers/imcc/imcc.y"
+#line 1352 "compilers/imcc/imcc.y"
     {
            if (IMCC_INFO(interp)->adv_named_id) {
                  add_pcc_named_param(interp, IMCC_INFO(interp)->cur_call,
@@ -3502,17 +3526,17 @@
     break;
 
   case 58:
-#line 1344 "compilers/imcc/imcc.y"
+#line 1364 "compilers/imcc/imcc.y"
     { pesky_global__is_def=1; }
     break;
 
   case 59:
-#line 1344 "compilers/imcc/imcc.y"
+#line 1364 "compilers/imcc/imcc.y"
     { (yyval.sr) = (yyvsp[(3) - (3)].sr); pesky_global__is_def=0; }
     break;
 
   case 60:
-#line 1349 "compilers/imcc/imcc.y"
+#line 1369 "compilers/imcc/imcc.y"
     {
            if ((yyvsp[(3) - (3)].t) & VT_UNIQUE_REG)
                (yyval.sr) = mk_ident_ur(interp, (yyvsp[(2) - (3)].s), (yyvsp[(1) - (3)].t));
@@ -3524,12 +3548,12 @@
     break;
 
   case 61:
-#line 1362 "compilers/imcc/imcc.y"
+#line 1382 "compilers/imcc/imcc.y"
     { (yyval.t) = 0; }
     break;
 
   case 62:
-#line 1367 "compilers/imcc/imcc.y"
+#line 1387 "compilers/imcc/imcc.y"
     {
            (yyval.t) = 0;
            IMCC_INFO(interp)->cur_unit->outer = mk_sub_address_fromc(interp, (yyvsp[(3) - (4)].s));
@@ -3538,7 +3562,7 @@
     break;
 
   case 63:
-#line 1373 "compilers/imcc/imcc.y"
+#line 1393 "compilers/imcc/imcc.y"
     {
            (yyval.t) = 0;
            IMCC_INFO(interp)->cur_unit->outer = mk_const(interp, (yyvsp[(3) - (4)].s), 'S');
@@ -3547,7 +3571,7 @@
     break;
 
   case 64:
-#line 1382 "compilers/imcc/imcc.y"
+#line 1402 "compilers/imcc/imcc.y"
     {
            (yyval.t) = P_VTABLE;
            IMCC_INFO(interp)->cur_unit->vtable_name = NULL;
@@ -3556,7 +3580,7 @@
     break;
 
   case 65:
-#line 1388 "compilers/imcc/imcc.y"
+#line 1408 "compilers/imcc/imcc.y"
     {
            (yyval.t) = P_VTABLE;
            IMCC_INFO(interp)->cur_unit->vtable_name = (yyvsp[(3) - (4)].s);
@@ -3565,7 +3589,7 @@
     break;
 
   case 66:
-#line 1397 "compilers/imcc/imcc.y"
+#line 1417 "compilers/imcc/imcc.y"
     {
            (yyval.t) = P_METHOD;
            IMCC_INFO(interp)->cur_unit->method_name = NULL;
@@ -3574,7 +3598,7 @@
     break;
 
   case 67:
-#line 1403 "compilers/imcc/imcc.y"
+#line 1423 "compilers/imcc/imcc.y"
     {
            (yyval.t) = P_METHOD;
            IMCC_INFO(interp)->cur_unit->method_name = (yyvsp[(3) - (4)].s);
@@ -3583,7 +3607,7 @@
     break;
 
   case 68:
-#line 1412 "compilers/imcc/imcc.y"
+#line 1432 "compilers/imcc/imcc.y"
     {
            (yyval.t) = 0;
            IMCC_INFO(interp)->cur_unit->ns_entry_name = NULL;
@@ -3592,7 +3616,7 @@
     break;
 
   case 69:
-#line 1418 "compilers/imcc/imcc.y"
+#line 1438 "compilers/imcc/imcc.y"
     {
            (yyval.t) = 0;
            IMCC_INFO(interp)->cur_unit->ns_entry_name = (yyvsp[(3) - (4)].s);
@@ -3601,7 +3625,7 @@
     break;
 
   case 70:
-#line 1427 "compilers/imcc/imcc.y"
+#line 1447 "compilers/imcc/imcc.y"
     {
            (yyval.t) = 0;
            IMCC_INFO(interp)->cur_unit->instance_of = (yyvsp[(3) - (4)].s);
@@ -3609,7 +3633,7 @@
     break;
 
   case 71:
-#line 1435 "compilers/imcc/imcc.y"
+#line 1455 "compilers/imcc/imcc.y"
     {
            (yyval.t) = 0;
            IMCC_INFO(interp)->cur_unit->subid = NULL;
@@ -3617,7 +3641,7 @@
     break;
 
   case 72:
-#line 1440 "compilers/imcc/imcc.y"
+#line 1460 "compilers/imcc/imcc.y"
     {
            (yyval.t) = 0;
            IMCC_INFO(interp)->cur_unit->subid = mk_const(interp, (yyvsp[(3) - (4)].s), 'S');
@@ -3627,14 +3651,14 @@
     break;
 
   case 73:
-#line 1450 "compilers/imcc/imcc.y"
+#line 1470 "compilers/imcc/imcc.y"
     {
            add_pcc_multi(IMCC_INFO(interp)->cur_call, NULL);
          }
     break;
 
   case 74:
-#line 1454 "compilers/imcc/imcc.y"
+#line 1474 "compilers/imcc/imcc.y"
     {
            (yyval.t) = 0;
            add_pcc_multi(IMCC_INFO(interp)->cur_call, (yyvsp[(3) - (3)].sr));
@@ -3642,7 +3666,7 @@
     break;
 
   case 75:
-#line 1459 "compilers/imcc/imcc.y"
+#line 1479 "compilers/imcc/imcc.y"
     {
            (yyval.t) = 0;
            add_pcc_multi(IMCC_INFO(interp)->cur_call, (yyvsp[(1) - (1)].sr));
@@ -3650,27 +3674,27 @@
     break;
 
   case 76:
-#line 1466 "compilers/imcc/imcc.y"
+#line 1486 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_const(interp, "INTVAL",   'S'); }
     break;
 
   case 77:
-#line 1467 "compilers/imcc/imcc.y"
+#line 1487 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_const(interp, "FLOATVAL", 'S'); }
     break;
 
   case 78:
-#line 1468 "compilers/imcc/imcc.y"
+#line 1488 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_const(interp, "PMC",      'S'); }
     break;
 
   case 79:
-#line 1469 "compilers/imcc/imcc.y"
+#line 1489 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_const(interp, "STRING",   'S'); }
     break;
 
   case 80:
-#line 1471 "compilers/imcc/imcc.y"
+#line 1491 "compilers/imcc/imcc.y"
     {
            SymReg *r;
            if (strcmp((yyvsp[(1) - (1)].s), "_") != 0)
@@ -3684,7 +3708,7 @@
     break;
 
   case 81:
-#line 1482 "compilers/imcc/imcc.y"
+#line 1502 "compilers/imcc/imcc.y"
     {
            SymReg *r;
            if (strcmp((yyvsp[(1) - (1)].s), "_") != 0)
@@ -3698,12 +3722,12 @@
     break;
 
   case 82:
-#line 1492 "compilers/imcc/imcc.y"
+#line 1512 "compilers/imcc/imcc.y"
     { (yyval.sr) = (yyvsp[(2) - (3)].sr); }
     break;
 
   case 85:
-#line 1502 "compilers/imcc/imcc.y"
+#line 1522 "compilers/imcc/imcc.y"
     {
            char name[128];
            SymReg *r, *r1;
@@ -3730,82 +3754,82 @@
     break;
 
   case 86:
-#line 1530 "compilers/imcc/imcc.y"
+#line 1550 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; IMCC_INFO(interp)->cur_call = NULL; }
     break;
 
   case 87:
-#line 1534 "compilers/imcc/imcc.y"
+#line 1554 "compilers/imcc/imcc.y"
     { (yyval.i) = NULL; IMCC_INFO(interp)->cur_call->pcc_sub->label = 0; }
     break;
 
   case 88:
-#line 1535 "compilers/imcc/imcc.y"
+#line 1555 "compilers/imcc/imcc.y"
     { (yyval.i) = NULL; IMCC_INFO(interp)->cur_call->pcc_sub->label = 1; }
     break;
 
   case 89:
-#line 1539 "compilers/imcc/imcc.y"
+#line 1559 "compilers/imcc/imcc.y"
     { (yyval.i) = NULL; }
     break;
 
   case 90:
-#line 1540 "compilers/imcc/imcc.y"
+#line 1560 "compilers/imcc/imcc.y"
     { (yyval.i) = NULL;  IMCC_INFO(interp)->cur_call->pcc_sub->object = (yyvsp[(2) - (3)].sr); }
     break;
 
   case 91:
-#line 1544 "compilers/imcc/imcc.y"
+#line 1564 "compilers/imcc/imcc.y"
     { (yyval.t) = 0; }
     break;
 
   case 93:
-#line 1549 "compilers/imcc/imcc.y"
+#line 1569 "compilers/imcc/imcc.y"
     { (yyval.t) = (yyvsp[(1) - (1)].t); }
     break;
 
   case 94:
-#line 1550 "compilers/imcc/imcc.y"
+#line 1570 "compilers/imcc/imcc.y"
     { (yyval.t) = (yyvsp[(1) - (2)].t) | (yyvsp[(2) - (2)].t); }
     break;
 
   case 95:
-#line 1554 "compilers/imcc/imcc.y"
+#line 1574 "compilers/imcc/imcc.y"
     { (yyval.t) = P_LOAD; }
     break;
 
   case 96:
-#line 1555 "compilers/imcc/imcc.y"
+#line 1575 "compilers/imcc/imcc.y"
     { (yyval.t) = P_INIT; }
     break;
 
   case 97:
-#line 1556 "compilers/imcc/imcc.y"
+#line 1576 "compilers/imcc/imcc.y"
     { (yyval.t) = P_MAIN; }
     break;
 
   case 98:
-#line 1557 "compilers/imcc/imcc.y"
+#line 1577 "compilers/imcc/imcc.y"
     { (yyval.t) = P_IMMEDIATE; }
     break;
 
   case 99:
-#line 1558 "compilers/imcc/imcc.y"
+#line 1578 "compilers/imcc/imcc.y"
     { (yyval.t) = P_POSTCOMP; }
     break;
 
   case 100:
-#line 1559 "compilers/imcc/imcc.y"
+#line 1579 "compilers/imcc/imcc.y"
     { (yyval.t) = P_ANON; }
     break;
 
   case 101:
-#line 1560 "compilers/imcc/imcc.y"
+#line 1580 "compilers/imcc/imcc.y"
     { (yyval.t) = P_NEED_LEX; }
     break;
 
   case 109:
-#line 1572 "compilers/imcc/imcc.y"
+#line 1592 "compilers/imcc/imcc.y"
     {
            add_pcc_sub(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (5)].sr));
            add_pcc_cc(IMCC_INFO(interp)->cur_call, (yyvsp[(4) - (5)].sr));
@@ -3813,14 +3837,14 @@
     break;
 
   case 110:
-#line 1577 "compilers/imcc/imcc.y"
+#line 1597 "compilers/imcc/imcc.y"
     {
            add_pcc_sub(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (3)].sr));
          }
     break;
 
   case 111:
-#line 1581 "compilers/imcc/imcc.y"
+#line 1601 "compilers/imcc/imcc.y"
     {
            add_pcc_sub(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (3)].sr));
            IMCC_INFO(interp)->cur_call->pcc_sub->flags |= isNCI;
@@ -3828,21 +3852,21 @@
     break;
 
   case 112:
-#line 1586 "compilers/imcc/imcc.y"
+#line 1606 "compilers/imcc/imcc.y"
     {
            add_pcc_sub(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (3)].sr));
          }
     break;
 
   case 113:
-#line 1590 "compilers/imcc/imcc.y"
+#line 1610 "compilers/imcc/imcc.y"
     {
            add_pcc_sub(IMCC_INFO(interp)->cur_call, mk_const(interp, (yyvsp[(2) - (3)].s), 'S'));
          }
     break;
 
   case 114:
-#line 1594 "compilers/imcc/imcc.y"
+#line 1614 "compilers/imcc/imcc.y"
     {
            add_pcc_sub(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (5)].sr));
            add_pcc_cc(IMCC_INFO(interp)->cur_call, (yyvsp[(4) - (5)].sr));
@@ -3850,7 +3874,7 @@
     break;
 
   case 115:
-#line 1599 "compilers/imcc/imcc.y"
+#line 1619 "compilers/imcc/imcc.y"
     {
            add_pcc_sub(IMCC_INFO(interp)->cur_call, mk_const(interp, (yyvsp[(2) - (5)].s), 'S'));
            add_pcc_cc(IMCC_INFO(interp)->cur_call, (yyvsp[(4) - (5)].sr));
@@ -3858,27 +3882,27 @@
     break;
 
   case 116:
-#line 1607 "compilers/imcc/imcc.y"
+#line 1627 "compilers/imcc/imcc.y"
     { (yyval.sr) = 0; }
     break;
 
   case 117:
-#line 1608 "compilers/imcc/imcc.y"
+#line 1628 "compilers/imcc/imcc.y"
     { add_pcc_arg(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (3)].sr)); }
     break;
 
   case 118:
-#line 1612 "compilers/imcc/imcc.y"
+#line 1632 "compilers/imcc/imcc.y"
     { (yyval.sr) = (yyvsp[(2) - (2)].sr); }
     break;
 
   case 119:
-#line 1617 "compilers/imcc/imcc.y"
+#line 1637 "compilers/imcc/imcc.y"
     { (yyval.sr) = 0; }
     break;
 
   case 120:
-#line 1619 "compilers/imcc/imcc.y"
+#line 1639 "compilers/imcc/imcc.y"
     {
            if ((yyvsp[(2) - (3)].sr))
                add_pcc_result(IMCC_INFO(interp)->cur_call, (yyvsp[(2) - (3)].sr));
@@ -3886,17 +3910,17 @@
     break;
 
   case 121:
-#line 1626 "compilers/imcc/imcc.y"
+#line 1646 "compilers/imcc/imcc.y"
     { (yyval.sr) = (yyvsp[(2) - (3)].sr); (yyval.sr)->type |= (yyvsp[(3) - (3)].t); }
     break;
 
   case 122:
-#line 1627 "compilers/imcc/imcc.y"
+#line 1647 "compilers/imcc/imcc.y"
     { pesky_global__is_def=1; }
     break;
 
   case 123:
-#line 1628 "compilers/imcc/imcc.y"
+#line 1648 "compilers/imcc/imcc.y"
     {
            IdList *l = (yyvsp[(4) - (4)].idlist);
            SymReg *ignored;
@@ -3911,158 +3935,163 @@
     break;
 
   case 124:
-#line 1642 "compilers/imcc/imcc.y"
+#line 1662 "compilers/imcc/imcc.y"
     { (yyval.t) = 0; }
     break;
 
   case 125:
-#line 1643 "compilers/imcc/imcc.y"
+#line 1663 "compilers/imcc/imcc.y"
     { (yyval.t) = (yyvsp[(1) - (2)].t) | (yyvsp[(2) - (2)].t); }
     break;
 
   case 126:
-#line 1647 "compilers/imcc/imcc.y"
+#line 1667 "compilers/imcc/imcc.y"
     { (yyval.t) = VT_FLAT;   }
     break;
 
   case 127:
-#line 1648 "compilers/imcc/imcc.y"
+#line 1668 "compilers/imcc/imcc.y"
     { (yyval.t) = VT_OPTIONAL; }
     break;
 
   case 128:
-#line 1649 "compilers/imcc/imcc.y"
+#line 1669 "compilers/imcc/imcc.y"
     { (yyval.t) = VT_OPT_FLAG; }
     break;
 
   case 129:
-#line 1650 "compilers/imcc/imcc.y"
+#line 1670 "compilers/imcc/imcc.y"
     { (yyval.t) = VT_NAMED; }
     break;
 
   case 130:
-#line 1651 "compilers/imcc/imcc.y"
-    { adv_named_set(interp, (yyvsp[(3) - (4)].s)); (yyval.t) = 0; }
+#line 1671 "compilers/imcc/imcc.y"
+    { adv_named_set(interp, (yyvsp[(3) - (4)].s));   (yyval.t) = 0; }
     break;
 
   case 131:
-#line 1652 "compilers/imcc/imcc.y"
-    { (yyval.t) = VT_UNIQUE_REG; }
+#line 1672 "compilers/imcc/imcc.y"
+    { adv_named_set_u(interp, (yyvsp[(3) - (4)].s)); (yyval.t) = 0; }
     break;
 
   case 132:
-#line 1657 "compilers/imcc/imcc.y"
-    { begin_return_or_yield(interp, 0); }
+#line 1673 "compilers/imcc/imcc.y"
+    { (yyval.t) = VT_UNIQUE_REG; }
     break;
 
   case 133:
-#line 1659 "compilers/imcc/imcc.y"
-    { (yyval.i) = 0; IMCC_INFO(interp)->asm_state = AsmDefault; }
+#line 1678 "compilers/imcc/imcc.y"
+    { begin_return_or_yield(interp, 0); }
     break;
 
   case 134:
-#line 1661 "compilers/imcc/imcc.y"
+#line 1680 "compilers/imcc/imcc.y"
+    { (yyval.i) = 0; IMCC_INFO(interp)->asm_state = AsmDefault; }
+    break;
+
+  case 135:
+#line 1682 "compilers/imcc/imcc.y"
     {
            IMCC_INFO(interp)->asm_state = AsmDefault;
            (yyval.i) = 0;
          }
     break;
 
-  case 135:
-#line 1668 "compilers/imcc/imcc.y"
+  case 136:
+#line 1689 "compilers/imcc/imcc.y"
     { begin_return_or_yield(interp, 1); }
     break;
 
-  case 136:
-#line 1670 "compilers/imcc/imcc.y"
+  case 137:
+#line 1691 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; IMCC_INFO(interp)->asm_state = AsmDefault; }
     break;
 
-  case 137:
-#line 1674 "compilers/imcc/imcc.y"
+  case 138:
+#line 1695 "compilers/imcc/imcc.y"
     { (yyval.sr) = 0; }
     break;
 
-  case 138:
-#line 1676 "compilers/imcc/imcc.y"
+  case 139:
+#line 1697 "compilers/imcc/imcc.y"
     {
            if ((yyvsp[(1) - (2)].sr))
                add_pcc_result(IMCC_INFO(interp)->sr_return, (yyvsp[(1) - (2)].sr));
          }
     break;
 
-  case 139:
-#line 1681 "compilers/imcc/imcc.y"
+  case 140:
+#line 1702 "compilers/imcc/imcc.y"
     {
            if ((yyvsp[(2) - (3)].sr))
                add_pcc_result(IMCC_INFO(interp)->sr_return, (yyvsp[(2) - (3)].sr));
          }
     break;
 
-  case 140:
-#line 1688 "compilers/imcc/imcc.y"
+  case 141:
+#line 1709 "compilers/imcc/imcc.y"
     { (yyval.sr) = 0; }
     break;
 
-  case 141:
-#line 1690 "compilers/imcc/imcc.y"
+  case 142:
+#line 1711 "compilers/imcc/imcc.y"
     {
            if ((yyvsp[(1) - (2)].sr))
                add_pcc_result(IMCC_INFO(interp)->sr_return, (yyvsp[(1) - (2)].sr));
          }
     break;
 
-  case 142:
-#line 1695 "compilers/imcc/imcc.y"
+  case 143:
+#line 1716 "compilers/imcc/imcc.y"
     {
            if ((yyvsp[(2) - (3)].sr))
                add_pcc_result(IMCC_INFO(interp)->sr_return, (yyvsp[(2) - (3)].sr));
          }
     break;
 
-  case 143:
-#line 1702 "compilers/imcc/imcc.y"
+  case 144:
+#line 1723 "compilers/imcc/imcc.y"
     { (yyval.sr) = (yyvsp[(2) - (3)].sr); (yyval.sr)->type |= (yyvsp[(3) - (3)].t); }
     break;
 
-  case 144:
-#line 1706 "compilers/imcc/imcc.y"
+  case 145:
+#line 1727 "compilers/imcc/imcc.y"
     { (yyval.sr) = (yyvsp[(2) - (3)].sr); (yyval.sr)->type |= (yyvsp[(3) - (3)].t); }
     break;
 
-  case 145:
-#line 1711 "compilers/imcc/imcc.y"
+  case 146:
+#line 1732 "compilers/imcc/imcc.y"
     {
           if (IMCC_INFO(interp)->asm_state == AsmDefault)
               begin_return_or_yield(interp, (yyvsp[(1) - (2)].t));
         }
     break;
 
-  case 146:
-#line 1716 "compilers/imcc/imcc.y"
+  case 147:
+#line 1737 "compilers/imcc/imcc.y"
     {
           IMCC_INFO(interp)->asm_state = AsmDefault;
           (yyval.t) = 0;
         }
     break;
 
-  case 147:
-#line 1723 "compilers/imcc/imcc.y"
+  case 148:
+#line 1744 "compilers/imcc/imcc.y"
     { (yyval.t) = 0; }
     break;
 
-  case 148:
-#line 1724 "compilers/imcc/imcc.y"
+  case 149:
+#line 1745 "compilers/imcc/imcc.y"
     { (yyval.t) = 1; }
     break;
 
-  case 149:
-#line 1728 "compilers/imcc/imcc.y"
+  case 150:
+#line 1749 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; }
     break;
 
-  case 150:
-#line 1730 "compilers/imcc/imcc.y"
+  case 151:
+#line 1751 "compilers/imcc/imcc.y"
     {
            if (IMCC_INFO(interp)->adv_named_id) {
                add_pcc_named_return(interp, IMCC_INFO(interp)->sr_return,
@@ -4074,15 +4103,16 @@
          }
     break;
 
-  case 151:
-#line 1740 "compilers/imcc/imcc.y"
+  case 152:
+#line 1761 "compilers/imcc/imcc.y"
     {
-           add_pcc_named_return(interp, IMCC_INFO(interp)->sr_return, (yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].sr));
+            SymReg *name = mk_const(interp, (yyvsp[(1) - (3)].s), 'S');
+            add_pcc_named_return(interp, IMCC_INFO(interp)->sr_return, name, (yyvsp[(3) - (3)].sr));
          }
     break;
 
-  case 152:
-#line 1744 "compilers/imcc/imcc.y"
+  case 153:
+#line 1766 "compilers/imcc/imcc.y"
     {
            if (IMCC_INFO(interp)->adv_named_id) {
                add_pcc_named_return(interp, IMCC_INFO(interp)->sr_return,
@@ -4094,67 +4124,68 @@
          }
     break;
 
-  case 153:
-#line 1754 "compilers/imcc/imcc.y"
+  case 154:
+#line 1776 "compilers/imcc/imcc.y"
     {
-           add_pcc_named_return(interp, IMCC_INFO(interp)->sr_return, (yyvsp[(3) - (5)].s), (yyvsp[(5) - (5)].sr));
+           SymReg *name = mk_const(interp, (yyvsp[(3) - (5)].s), 'S');
+           add_pcc_named_return(interp, IMCC_INFO(interp)->sr_return, name, (yyvsp[(5) - (5)].sr));
          }
     break;
 
-  case 156:
-#line 1774 "compilers/imcc/imcc.y"
-    { clear_state(interp); }
-    break;
-
   case 157:
-#line 1779 "compilers/imcc/imcc.y"
-    { (yyval.i) = (yyvsp[(2) - (2)].i); }
+#line 1797 "compilers/imcc/imcc.y"
+    { clear_state(interp); }
     break;
 
   case 158:
-#line 1780 "compilers/imcc/imcc.y"
-    { (yyval.i) = 0; }
+#line 1802 "compilers/imcc/imcc.y"
+    { (yyval.i) = (yyvsp[(2) - (2)].i); }
     break;
 
   case 159:
-#line 1781 "compilers/imcc/imcc.y"
+#line 1803 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; }
     break;
 
   case 160:
-#line 1782 "compilers/imcc/imcc.y"
+#line 1804 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; }
     break;
 
   case 161:
-#line 1783 "compilers/imcc/imcc.y"
+#line 1805 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; }
     break;
 
   case 162:
-#line 1784 "compilers/imcc/imcc.y"
-    { (yyval.i) = (yyvsp[(1) - (1)].i); }
+#line 1806 "compilers/imcc/imcc.y"
+    { (yyval.i) = 0; }
     break;
 
   case 163:
-#line 1788 "compilers/imcc/imcc.y"
+#line 1807 "compilers/imcc/imcc.y"
+    { (yyval.i) = (yyvsp[(1) - (1)].i); }
+    break;
+
+  case 164:
+#line 1811 "compilers/imcc/imcc.y"
     { (yyval.i) = NULL; }
     break;
 
-  case 167:
-#line 1799 "compilers/imcc/imcc.y"
+  case 168:
+#line 1822 "compilers/imcc/imcc.y"
     {
            (yyval.i) = iLABEL(interp, IMCC_INFO(interp)->cur_unit, mk_local_label(interp, (yyvsp[(1) - (1)].s)));
          }
     break;
 
-  case 168:
-#line 1807 "compilers/imcc/imcc.y"
+  case 169:
+#line 1830 "compilers/imcc/imcc.y"
     { (yyval.i) = (yyvsp[(2) - (3)].i); }
     break;
 
-  case 169:
-#line 1809 "compilers/imcc/imcc.y"
+  case 170:
+#line 1832 "compilers/imcc/imcc.y"
     {
            if (yynerrs >= PARROT_MAX_RECOVER_ERRORS) {
                IMCC_warning(interp, "Too many errors. Correct some first.\n");
@@ -4164,8 +4195,8 @@
          }
     break;
 
-  case 170:
-#line 1820 "compilers/imcc/imcc.y"
+  case 171:
+#line 1843 "compilers/imcc/imcc.y"
     {
            IdList* l = (yyvsp[(1) - (1)].idlist);
            l->next = NULL;
@@ -4173,8 +4204,8 @@
          }
     break;
 
-  case 171:
-#line 1827 "compilers/imcc/imcc.y"
+  case 172:
+#line 1850 "compilers/imcc/imcc.y"
     {
            IdList* l = (yyvsp[(3) - (3)].idlist);
            l->next = (yyvsp[(1) - (3)].idlist);
@@ -4182,8 +4213,8 @@
          }
     break;
 
-  case 172:
-#line 1836 "compilers/imcc/imcc.y"
+  case 173:
+#line 1859 "compilers/imcc/imcc.y"
     {
            IdList* const l = mem_allocate_n_zeroed_typed(1, IdList);
            l->id           = (yyvsp[(1) - (2)].s);
@@ -4192,23 +4223,23 @@
          }
     break;
 
-  case 173:
-#line 1845 "compilers/imcc/imcc.y"
+  case 174:
+#line 1868 "compilers/imcc/imcc.y"
     { (yyval.t) = 0; }
     break;
 
-  case 174:
-#line 1846 "compilers/imcc/imcc.y"
+  case 175:
+#line 1869 "compilers/imcc/imcc.y"
     { (yyval.t) = 1; }
     break;
 
-  case 177:
-#line 1853 "compilers/imcc/imcc.y"
+  case 178:
+#line 1876 "compilers/imcc/imcc.y"
     { pesky_global__is_def=1; }
     break;
 
-  case 178:
-#line 1854 "compilers/imcc/imcc.y"
+  case 179:
+#line 1877 "compilers/imcc/imcc.y"
     {
            IdList *l = (yyvsp[(4) - (4)].idlist);
            while (l) {
@@ -4226,29 +4257,29 @@
          }
     break;
 
-  case 179:
-#line 1870 "compilers/imcc/imcc.y"
+  case 180:
+#line 1893 "compilers/imcc/imcc.y"
     {
            SymReg *n = mk_const(interp, (yyvsp[(2) - (4)].s), 'S');
            set_lexical(interp, (yyvsp[(4) - (4)].sr), n); (yyval.i) = 0;
          }
     break;
 
-  case 180:
-#line 1875 "compilers/imcc/imcc.y"
+  case 181:
+#line 1898 "compilers/imcc/imcc.y"
     {
            SymReg *n = mk_const(interp, (yyvsp[(2) - (4)].s), 'U');
            set_lexical(interp, (yyvsp[(4) - (4)].sr), n); (yyval.i) = 0;
          }
     break;
 
-  case 181:
-#line 1879 "compilers/imcc/imcc.y"
+  case 182:
+#line 1902 "compilers/imcc/imcc.y"
     { pesky_global__is_def=1; }
     break;
 
-  case 182:
-#line 1880 "compilers/imcc/imcc.y"
+  case 183:
+#line 1903 "compilers/imcc/imcc.y"
     {
            mk_const_ident(interp, (yyvsp[(4) - (6)].s), (yyvsp[(3) - (6)].t), (yyvsp[(6) - (6)].sr), 0);
            pesky_global__is_def=0;
@@ -4256,13 +4287,13 @@
          }
     break;
 
-  case 184:
-#line 1887 "compilers/imcc/imcc.y"
+  case 185:
+#line 1910 "compilers/imcc/imcc.y"
     { pesky_global__is_def=1; }
     break;
 
-  case 185:
-#line 1888 "compilers/imcc/imcc.y"
+  case 186:
+#line 1911 "compilers/imcc/imcc.y"
     {
            mk_const_ident(interp, (yyvsp[(4) - (6)].s), (yyvsp[(3) - (6)].t), (yyvsp[(6) - (6)].sr), 1);
            pesky_global__is_def=0;
@@ -4270,8 +4301,8 @@
          }
     break;
 
-  case 186:
-#line 1894 "compilers/imcc/imcc.y"
+  case 187:
+#line 1917 "compilers/imcc/imcc.y"
     {
            (yyval.i) = NULL;
            IMCC_INFO(interp)->cur_call->pcc_sub->flags |= isTAIL_CALL;
@@ -4279,15 +4310,15 @@
          }
     break;
 
-  case 187:
-#line 1900 "compilers/imcc/imcc.y"
+  case 188:
+#line 1923 "compilers/imcc/imcc.y"
     {
             (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "branch", 1, (yyvsp[(2) - (2)].sr));
          }
     break;
 
-  case 188:
-#line 1904 "compilers/imcc/imcc.y"
+  case 189:
+#line 1927 "compilers/imcc/imcc.y"
     {
            (yyval.i) = INS(interp,
                     IMCC_INFO(interp)->cur_unit,
@@ -4301,48 +4332,48 @@
          }
     break;
 
-  case 189:
-#line 1915 "compilers/imcc/imcc.y"
+  case 190:
+#line 1938 "compilers/imcc/imcc.y"
     { (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "null", 1, (yyvsp[(2) - (2)].sr)); }
     break;
 
-  case 190:
-#line 1916 "compilers/imcc/imcc.y"
+  case 191:
+#line 1939 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; IMCC_INFO(interp)->cur_call = NULL; }
     break;
 
-  case 191:
-#line 1917 "compilers/imcc/imcc.y"
+  case 192:
+#line 1940 "compilers/imcc/imcc.y"
     { (yyval.i) = 0; }
     break;
 
-  case 194:
-#line 1920 "compilers/imcc/imcc.y"
+  case 195:
+#line 1943 "compilers/imcc/imcc.y"
     { (yyval.i) = 0;}
     break;
 
-  case 195:
-#line 1924 "compilers/imcc/imcc.y"
+  case 196:
+#line 1947 "compilers/imcc/imcc.y"
     { (yyval.t) = 'I'; }
     break;
 
-  case 196:
-#line 1925 "compilers/imcc/imcc.y"
+  case 197:
+#line 1948 "compilers/imcc/imcc.y"
     { (yyval.t) = 'N'; }
     break;
 
-  case 197:
-#line 1926 "compilers/imcc/imcc.y"
+  case 198:
+#line 1949 "compilers/imcc/imcc.y"
     { (yyval.t) = 'S'; }
     break;
 
-  case 198:
-#line 1927 "compilers/imcc/imcc.y"
+  case 199:
+#line 1950 "compilers/imcc/imcc.y"
     { (yyval.t) = 'P'; }
     break;
 
-  case 199:
-#line 1932 "compilers/imcc/imcc.y"
+  case 200:
+#line 1955 "compilers/imcc/imcc.y"
     {
            /* there'd normally be a str_dup() here, but the lexer already
             * copied the string, so it's safe to use directly */
@@ -4354,38 +4385,38 @@
          }
     break;
 
-  case 200:
-#line 1945 "compilers/imcc/imcc.y"
+  case 201:
+#line 1968 "compilers/imcc/imcc.y"
     { (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "set", 2, (yyvsp[(1) - (3)].sr), (yyvsp[(3) - (3)].sr));  }
     break;
 
-  case 201:
-#line 1947 "compilers/imcc/imcc.y"
+  case 202:
+#line 1970 "compilers/imcc/imcc.y"
     { (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(3) - (4)].s), 2, (yyvsp[(1) - (4)].sr), (yyvsp[(4) - (4)].sr));  }
     break;
 
-  case 202:
-#line 1949 "compilers/imcc/imcc.y"
+  case 203:
+#line 1972 "compilers/imcc/imcc.y"
     { (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(4) - (5)].s), 3, (yyvsp[(1) - (5)].sr), (yyvsp[(3) - (5)].sr), (yyvsp[(5) - (5)].sr));  }
     break;
 
-  case 203:
-#line 1951 "compilers/imcc/imcc.y"
+  case 204:
+#line 1974 "compilers/imcc/imcc.y"
     { (yyval.i) = iINDEXFETCH(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(1) - (6)].sr), (yyvsp[(3) - (6)].sr), (yyvsp[(5) - (6)].sr)); }
     break;
 
-  case 204:
-#line 1953 "compilers/imcc/imcc.y"
+  case 205:
+#line 1976 "compilers/imcc/imcc.y"
     { (yyval.i) = iINDEXSET(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(1) - (6)].sr), (yyvsp[(3) - (6)].sr), (yyvsp[(6) - (6)].sr)); }
     break;
 
-  case 205:
-#line 1958 "compilers/imcc/imcc.y"
+  case 206:
+#line 1981 "compilers/imcc/imcc.y"
     { (yyval.i) = iNEW(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(1) - (7)].sr), (yyvsp[(4) - (7)].s), (yyvsp[(6) - (7)].sr), 1); }
     break;
 
-  case 206:
-#line 1961 "compilers/imcc/imcc.y"
+  case 207:
+#line 1984 "compilers/imcc/imcc.y"
     {
            add_pcc_result((yyvsp[(3) - (3)].i)->symregs[0], (yyvsp[(1) - (3)].sr));
            IMCC_INFO(interp)->cur_call = NULL;
@@ -4393,160 +4424,160 @@
          }
     break;
 
-  case 207:
-#line 1967 "compilers/imcc/imcc.y"
+  case 208:
+#line 1990 "compilers/imcc/imcc.y"
     {
            (yyval.i) = IMCC_create_itcall_label(interp);
          }
     break;
 
-  case 208:
-#line 1971 "compilers/imcc/imcc.y"
+  case 209:
+#line 1994 "compilers/imcc/imcc.y"
     {
            IMCC_itcall_sub(interp, (yyvsp[(6) - (9)].sr));
            IMCC_INFO(interp)->cur_call = NULL;
          }
     break;
 
-  case 212:
-#line 1979 "compilers/imcc/imcc.y"
+  case 213:
+#line 2002 "compilers/imcc/imcc.y"
     {
            (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "null", 1, (yyvsp[(1) - (3)].sr));
          }
     break;
 
-  case 213:
-#line 1986 "compilers/imcc/imcc.y"
+  case 214:
+#line 2009 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"not"; }
     break;
 
-  case 214:
-#line 1987 "compilers/imcc/imcc.y"
+  case 215:
+#line 2010 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"bnot"; }
     break;
 
-  case 215:
-#line 1988 "compilers/imcc/imcc.y"
+  case 216:
+#line 2011 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"neg"; }
     break;
 
-  case 216:
-#line 1992 "compilers/imcc/imcc.y"
+  case 217:
+#line 2015 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"sub"; }
     break;
 
-  case 217:
-#line 1993 "compilers/imcc/imcc.y"
+  case 218:
+#line 2016 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"add"; }
     break;
 
-  case 218:
-#line 1994 "compilers/imcc/imcc.y"
+  case 219:
+#line 2017 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"mul"; }
     break;
 
-  case 219:
-#line 1995 "compilers/imcc/imcc.y"
+  case 220:
+#line 2018 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"div"; }
     break;
 
-  case 220:
-#line 1996 "compilers/imcc/imcc.y"
+  case 221:
+#line 2019 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"mod"; }
     break;
 
-  case 221:
-#line 1997 "compilers/imcc/imcc.y"
+  case 222:
+#line 2020 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"fdiv"; }
     break;
 
-  case 222:
-#line 1998 "compilers/imcc/imcc.y"
+  case 223:
+#line 2021 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"pow"; }
     break;
 
-  case 223:
-#line 1999 "compilers/imcc/imcc.y"
+  case 224:
+#line 2022 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"concat"; }
     break;
 
-  case 224:
-#line 2000 "compilers/imcc/imcc.y"
+  case 225:
+#line 2023 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"iseq"; }
     break;
 
-  case 225:
-#line 2001 "compilers/imcc/imcc.y"
+  case 226:
+#line 2024 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"isne"; }
     break;
 
-  case 226:
-#line 2002 "compilers/imcc/imcc.y"
+  case 227:
+#line 2025 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"isgt"; }
     break;
 
-  case 227:
-#line 2003 "compilers/imcc/imcc.y"
+  case 228:
+#line 2026 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"isge"; }
     break;
 
-  case 228:
-#line 2004 "compilers/imcc/imcc.y"
+  case 229:
+#line 2027 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"islt"; }
     break;
 
-  case 229:
-#line 2005 "compilers/imcc/imcc.y"
+  case 230:
+#line 2028 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"isle"; }
     break;
 
-  case 230:
-#line 2006 "compilers/imcc/imcc.y"
+  case 231:
+#line 2029 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"shl"; }
     break;
 
-  case 231:
-#line 2007 "compilers/imcc/imcc.y"
+  case 232:
+#line 2030 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"shr"; }
     break;
 
-  case 232:
-#line 2008 "compilers/imcc/imcc.y"
+  case 233:
+#line 2031 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"lsr"; }
     break;
 
-  case 233:
-#line 2009 "compilers/imcc/imcc.y"
+  case 234:
+#line 2032 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"and"; }
     break;
 
-  case 234:
-#line 2010 "compilers/imcc/imcc.y"
+  case 235:
+#line 2033 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"or"; }
     break;
 
-  case 235:
-#line 2011 "compilers/imcc/imcc.y"
+  case 236:
+#line 2034 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"xor"; }
     break;
 
-  case 236:
-#line 2012 "compilers/imcc/imcc.y"
+  case 237:
+#line 2035 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"band"; }
     break;
 
-  case 237:
-#line 2013 "compilers/imcc/imcc.y"
+  case 238:
+#line 2036 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"bor"; }
     break;
 
-  case 238:
-#line 2014 "compilers/imcc/imcc.y"
+  case 239:
+#line 2037 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"bxor"; }
     break;
 
-  case 239:
-#line 2020 "compilers/imcc/imcc.y"
+  case 240:
+#line 2043 "compilers/imcc/imcc.y"
     {
            (yyval.i) = IMCC_create_itcall_label(interp);
            (yyval.i)->type &= ~ITCALL;
@@ -4554,85 +4585,85 @@
          }
     break;
 
-  case 240:
-#line 2025 "compilers/imcc/imcc.y"
+  case 241:
+#line 2048 "compilers/imcc/imcc.y"
     {  (yyval.i) = 0; }
     break;
 
-  case 241:
-#line 2032 "compilers/imcc/imcc.y"
+  case 242:
+#line 2055 "compilers/imcc/imcc.y"
     {
            (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(2) - (3)].s), 2, (yyvsp[(1) - (3)].sr), (yyvsp[(3) - (3)].sr));
          }
     break;
 
-  case 242:
-#line 2038 "compilers/imcc/imcc.y"
+  case 243:
+#line 2061 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"add"; }
     break;
 
-  case 243:
-#line 2039 "compilers/imcc/imcc.y"
+  case 244:
+#line 2062 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"sub"; }
     break;
 
-  case 244:
-#line 2040 "compilers/imcc/imcc.y"
+  case 245:
+#line 2063 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"mul"; }
     break;
 
-  case 245:
-#line 2041 "compilers/imcc/imcc.y"
+  case 246:
+#line 2064 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"div"; }
     break;
 
-  case 246:
-#line 2042 "compilers/imcc/imcc.y"
+  case 247:
+#line 2065 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"mod"; }
     break;
 
-  case 247:
-#line 2043 "compilers/imcc/imcc.y"
+  case 248:
+#line 2066 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"fdiv"; }
     break;
 
-  case 248:
-#line 2044 "compilers/imcc/imcc.y"
+  case 249:
+#line 2067 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"concat"; }
     break;
 
-  case 249:
-#line 2045 "compilers/imcc/imcc.y"
+  case 250:
+#line 2068 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"band"; }
     break;
 
-  case 250:
-#line 2046 "compilers/imcc/imcc.y"
+  case 251:
+#line 2069 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"bor"; }
     break;
 
-  case 251:
-#line 2047 "compilers/imcc/imcc.y"
+  case 252:
+#line 2070 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"bxor"; }
     break;
 
-  case 252:
-#line 2048 "compilers/imcc/imcc.y"
+  case 253:
+#line 2071 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"shr"; }
     break;
 
-  case 253:
-#line 2049 "compilers/imcc/imcc.y"
+  case 254:
+#line 2072 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"shl"; }
     break;
 
-  case 254:
-#line 2050 "compilers/imcc/imcc.y"
+  case 255:
+#line 2073 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"lsr"; }
     break;
 
-  case 255:
-#line 2056 "compilers/imcc/imcc.y"
+  case 256:
+#line 2079 "compilers/imcc/imcc.y"
     {
         (yyval.i) = func_ins(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(1) - (4)].sr), (yyvsp[(3) - (4)].s),
                       IMCC_INFO(interp) -> regs,
@@ -4642,23 +4673,23 @@
        }
     break;
 
-  case 256:
-#line 2066 "compilers/imcc/imcc.y"
+  case 257:
+#line 2089 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_sub_address(interp, (yyvsp[(1) - (1)].s));  mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 257:
-#line 2067 "compilers/imcc/imcc.y"
+  case 258:
+#line 2090 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_sub_address_fromc(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 258:
-#line 2068 "compilers/imcc/imcc.y"
+  case 259:
+#line 2091 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_sub_address_u(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 259:
-#line 2070 "compilers/imcc/imcc.y"
+  case 260:
+#line 2093 "compilers/imcc/imcc.y"
     {
            (yyval.sr) = (yyvsp[(1) - (1)].sr);
            if ((yyvsp[(1) - (1)].sr)->set != 'P')
@@ -4666,8 +4697,8 @@
          }
     break;
 
-  case 260:
-#line 2076 "compilers/imcc/imcc.y"
+  case 261:
+#line 2099 "compilers/imcc/imcc.y"
     {
             /* disallow bareword method names; SREG name constants are fine */
             char *name = (yyvsp[(3) - (3)].sr)->name;
@@ -4683,8 +4714,8 @@
         }
     break;
 
-  case 261:
-#line 2090 "compilers/imcc/imcc.y"
+  case 262:
+#line 2113 "compilers/imcc/imcc.y"
     {
             IMCC_INFO(interp)->cur_obj = (yyvsp[(1) - (3)].sr);
             (yyval.sr)                         = mk_const(interp, (yyvsp[(3) - (3)].s), 'S');
@@ -4692,31 +4723,31 @@
          }
     break;
 
-  case 262:
-#line 2095 "compilers/imcc/imcc.y"
+  case 263:
+#line 2118 "compilers/imcc/imcc.y"
     { IMCC_INFO(interp)->cur_obj = (yyvsp[(1) - (3)].sr); (yyval.sr) = (yyvsp[(3) - (3)].sr); }
     break;
 
-  case 263:
-#line 2101 "compilers/imcc/imcc.y"
+  case 264:
+#line 2124 "compilers/imcc/imcc.y"
     {
            (yyval.i) = IMCC_create_itcall_label(interp);
            IMCC_itcall_sub(interp, (yyvsp[(1) - (1)].sr));
          }
     break;
 
-  case 264:
-#line 2105 "compilers/imcc/imcc.y"
+  case 265:
+#line 2128 "compilers/imcc/imcc.y"
     { (yyval.i) = (yyvsp[(2) - (5)].i); }
     break;
 
-  case 265:
-#line 2109 "compilers/imcc/imcc.y"
+  case 266:
+#line 2132 "compilers/imcc/imcc.y"
     { (yyval.sr) = 0; }
     break;
 
-  case 266:
-#line 2111 "compilers/imcc/imcc.y"
+  case 267:
+#line 2134 "compilers/imcc/imcc.y"
     {
            (yyval.sr) = 0;
            if (IMCC_INFO(interp)->adv_named_id) {
@@ -4728,8 +4759,8 @@
          }
     break;
 
-  case 267:
-#line 2121 "compilers/imcc/imcc.y"
+  case 268:
+#line 2144 "compilers/imcc/imcc.y"
     {
            (yyval.sr) = 0;
            if (IMCC_INFO(interp)->adv_named_id) {
@@ -4741,69 +4772,76 @@
          }
     break;
 
-  case 268:
-#line 2131 "compilers/imcc/imcc.y"
+  case 269:
+#line 2154 "compilers/imcc/imcc.y"
     {
            (yyval.sr) = 0;
-           add_pcc_named_arg(interp, IMCC_INFO(interp)->cur_call, (yyvsp[(3) - (5)].s), (yyvsp[(5) - (5)].sr));
+           add_pcc_named_arg(interp, IMCC_INFO(interp)->cur_call,
+                mk_const(interp, (yyvsp[(3) - (5)].s), 'S'), (yyvsp[(5) - (5)].sr));
            mem_sys_free((yyvsp[(3) - (5)].s));
          }
     break;
 
-  case 269:
-#line 2137 "compilers/imcc/imcc.y"
+  case 270:
+#line 2161 "compilers/imcc/imcc.y"
     {
            (yyval.sr) = 0;
            add_pcc_named_arg_var(interp, IMCC_INFO(interp)->cur_call, (yyvsp[(1) - (3)].sr), (yyvsp[(3) - (3)].sr));
          }
     break;
 
-  case 270:
-#line 2142 "compilers/imcc/imcc.y"
+  case 271:
+#line 2166 "compilers/imcc/imcc.y"
     {
            (yyval.sr) = 0;
-           add_pcc_named_arg(interp, IMCC_INFO(interp)->cur_call, (yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].sr));
+           add_pcc_named_arg(interp, IMCC_INFO(interp)->cur_call,
+                mk_const(interp, (yyvsp[(1) - (3)].s), 'S'), (yyvsp[(3) - (3)].sr));
            mem_sys_free((yyvsp[(1) - (3)].s));
          }
     break;
 
-  case 271:
-#line 2150 "compilers/imcc/imcc.y"
+  case 272:
+#line 2175 "compilers/imcc/imcc.y"
     { (yyval.sr) = (yyvsp[(1) - (2)].sr); (yyval.sr)->type |= (yyvsp[(2) - (2)].t); }
     break;
 
-  case 272:
-#line 2154 "compilers/imcc/imcc.y"
+  case 273:
+#line 2179 "compilers/imcc/imcc.y"
     { (yyval.t) = 0; }
     break;
 
-  case 273:
-#line 2155 "compilers/imcc/imcc.y"
+  case 274:
+#line 2180 "compilers/imcc/imcc.y"
     { (yyval.t) = (yyvsp[(1) - (2)].t) | (yyvsp[(2) - (2)].t); }
     break;
 
-  case 274:
-#line 2159 "compilers/imcc/imcc.y"
+  case 275:
+#line 2184 "compilers/imcc/imcc.y"
     { (yyval.t) = VT_FLAT; }
     break;
 
-  case 275:
-#line 2160 "compilers/imcc/imcc.y"
+  case 276:
+#line 2185 "compilers/imcc/imcc.y"
     { (yyval.t) = VT_NAMED; }
     break;
 
-  case 276:
-#line 2163 "compilers/imcc/imcc.y"
-    { adv_named_set(interp, (yyvsp[(3) - (4)].s)); (yyval.t) = 0; }
+  case 277:
+#line 2188 "compilers/imcc/imcc.y"
+    { adv_named_set_u(interp, (yyvsp[(3) - (4)].s)); (yyval.t) = 0; }
     break;
 
-  case 277:
-#line 2167 "compilers/imcc/imcc.y"
+  case 278:
+#line 2189 "compilers/imcc/imcc.y"
+    { adv_named_set(interp, (yyvsp[(3) - (4)].s));   (yyval.t) = 0; }
+    break;
+
+  case 279:
+#line 2193 "compilers/imcc/imcc.y"
     { (yyval.sr) = (yyvsp[(1) - (2)].sr); (yyval.sr)->type |= (yyvsp[(2) - (2)].t); }
     break;
 
-  case 278:
-#line 2172 "compilers/imcc/imcc.y"
+  case 280:
+#line 2198 "compilers/imcc/imcc.y"
     {
            (yyval.sr) = 0;
            if (IMCC_INFO(interp)->adv_named_id) {
@@ -4815,16 +4853,17 @@
          }
     break;
 
-  case 279:
-#line 2182 "compilers/imcc/imcc.y"
+  case 281:
+#line 2208 "compilers/imcc/imcc.y"
     {
-           add_pcc_named_result(interp, IMCC_INFO(interp)->cur_call, (yyvsp[(3) - (5)].s), (yyvsp[(5) - (5)].sr));
-           mem_sys_free((yyvsp[(3) - (5)].s));
+            add_pcc_named_result(interp, IMCC_INFO(interp)->cur_call,
+            mk_const(interp, (yyvsp[(3) - (5)].s), 'S'), (yyvsp[(5) - (5)].sr));
+            mem_sys_free((yyvsp[(3) - (5)].s));
          }
     break;
 
-  case 280:
-#line 2187 "compilers/imcc/imcc.y"
+  case 282:
+#line 2214 "compilers/imcc/imcc.y"
     {
            (yyval.sr) = 0;
            if (IMCC_INFO(interp)->adv_named_id) {
@@ -4836,133 +4875,133 @@
          }
     break;
 
-  case 281:
-#line 2197 "compilers/imcc/imcc.y"
+  case 283:
+#line 2224 "compilers/imcc/imcc.y"
     {
-           add_pcc_named_result(interp, IMCC_INFO(interp)->cur_call, (yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].sr));
+           add_pcc_named_result(interp, IMCC_INFO(interp)->cur_call, mk_const(interp, (yyvsp[(1) - (3)].s), 'S'), (yyvsp[(3) - (3)].sr));
            mem_sys_free((yyvsp[(1) - (3)].s));
          }
     break;
 
-  case 282:
-#line 2201 "compilers/imcc/imcc.y"
+  case 284:
+#line 2228 "compilers/imcc/imcc.y"
     { (yyval.sr) = 0; }
     break;
 
-  case 283:
-#line 2205 "compilers/imcc/imcc.y"
+  case 285:
+#line 2232 "compilers/imcc/imcc.y"
     { (yyval.i) = (yyvsp[(1) - (1)].i); }
     break;
 
-  case 284:
-#line 2206 "compilers/imcc/imcc.y"
+  case 286:
+#line 2233 "compilers/imcc/imcc.y"
     { (yyval.i) = (yyvsp[(1) - (1)].i); }
     break;
 
-  case 285:
-#line 2211 "compilers/imcc/imcc.y"
+  case 287:
+#line 2238 "compilers/imcc/imcc.y"
     {
            (yyval.i) =MK_I(interp, IMCC_INFO(interp)->cur_unit, inv_op((yyvsp[(3) - (6)].s)), 3, (yyvsp[(2) - (6)].sr), (yyvsp[(4) - (6)].sr), (yyvsp[(6) - (6)].sr));
          }
     break;
 
-  case 286:
-#line 2215 "compilers/imcc/imcc.y"
+  case 288:
+#line 2242 "compilers/imcc/imcc.y"
     {
            (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "unless_null", 2, (yyvsp[(3) - (5)].sr), (yyvsp[(5) - (5)].sr));
          }
     break;
 
-  case 287:
-#line 2219 "compilers/imcc/imcc.y"
+  case 289:
+#line 2246 "compilers/imcc/imcc.y"
     {
            (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "unless", 2, (yyvsp[(2) - (4)].sr), (yyvsp[(4) - (4)].sr));
          }
     break;
 
-  case 288:
-#line 2226 "compilers/imcc/imcc.y"
+  case 290:
+#line 2253 "compilers/imcc/imcc.y"
     {
            (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "if", 2, (yyvsp[(2) - (4)].sr), (yyvsp[(4) - (4)].sr));
          }
     break;
 
-  case 289:
-#line 2230 "compilers/imcc/imcc.y"
+  case 291:
+#line 2257 "compilers/imcc/imcc.y"
     {
            (yyval.i) =MK_I(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(3) - (6)].s), 3, (yyvsp[(2) - (6)].sr), (yyvsp[(4) - (6)].sr), (yyvsp[(6) - (6)].sr));
          }
     break;
 
-  case 290:
-#line 2234 "compilers/imcc/imcc.y"
+  case 292:
+#line 2261 "compilers/imcc/imcc.y"
     {
            (yyval.i) = MK_I(interp, IMCC_INFO(interp)->cur_unit, "if_null", 2, (yyvsp[(3) - (5)].sr), (yyvsp[(5) - (5)].sr));
          }
     break;
 
-  case 291:
-#line 2240 "compilers/imcc/imcc.y"
+  case 293:
+#line 2267 "compilers/imcc/imcc.y"
     { (yyval.t) = 0; }
     break;
 
-  case 292:
-#line 2241 "compilers/imcc/imcc.y"
+  case 294:
+#line 2268 "compilers/imcc/imcc.y"
     { (yyval.t) = 0; }
     break;
 
-  case 293:
-#line 2245 "compilers/imcc/imcc.y"
+  case 295:
+#line 2272 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"eq"; }
     break;
 
-  case 294:
-#line 2246 "compilers/imcc/imcc.y"
+  case 296:
+#line 2273 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"ne"; }
     break;
 
-  case 295:
-#line 2247 "compilers/imcc/imcc.y"
+  case 297:
+#line 2274 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"gt"; }
     break;
 
-  case 296:
-#line 2248 "compilers/imcc/imcc.y"
+  case 298:
+#line 2275 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"ge"; }
     break;
 
-  case 297:
-#line 2249 "compilers/imcc/imcc.y"
+  case 299:
+#line 2276 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"lt"; }
     break;
 
-  case 298:
-#line 2250 "compilers/imcc/imcc.y"
+  case 300:
+#line 2277 "compilers/imcc/imcc.y"
     { (yyval.s) = (char *)"le"; }
     break;
 
-  case 301:
-#line 2259 "compilers/imcc/imcc.y"
+  case 303:
+#line 2286 "compilers/imcc/imcc.y"
     { (yyval.sr) = NULL; }
     break;
 
-  case 302:
-#line 2260 "compilers/imcc/imcc.y"
+  case 304:
+#line 2287 "compilers/imcc/imcc.y"
     { (yyval.sr) = (yyvsp[(1) - (1)].sr); }
     break;
 
-  case 303:
-#line 2264 "compilers/imcc/imcc.y"
+  case 305:
+#line 2291 "compilers/imcc/imcc.y"
     { (yyval.sr) = IMCC_INFO(interp)->regs[0]; }
     break;
 
-  case 305:
-#line 2269 "compilers/imcc/imcc.y"
+  case 307:
+#line 2296 "compilers/imcc/imcc.y"
     { IMCC_INFO(interp)->regs[IMCC_INFO(interp)->nargs++] = (yyvsp[(1) - (1)].sr); }
     break;
 
-  case 306:
-#line 2271 "compilers/imcc/imcc.y"
+  case 308:
+#line 2298 "compilers/imcc/imcc.y"
     {
            IMCC_INFO(interp) -> regs[IMCC_INFO(interp)->nargs++] = (yyvsp[(1) - (4)].sr);
            IMCC_INFO(interp) -> keyvec |= KEY_BIT(IMCC_INFO(interp)->nargs);
@@ -4971,54 +5010,54 @@
          }
     break;
 
-  case 307:
-#line 2278 "compilers/imcc/imcc.y"
+  case 309:
+#line 2305 "compilers/imcc/imcc.y"
     {
            IMCC_INFO(interp) -> regs[IMCC_INFO(interp)->nargs++] = (yyvsp[(2) - (3)].sr);
            (yyval.sr) = (yyvsp[(2) - (3)].sr);
          }
     break;
 
-  case 309:
-#line 2285 "compilers/imcc/imcc.y"
+  case 311:
+#line 2312 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_sub_address_fromc(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 310:
-#line 2286 "compilers/imcc/imcc.y"
+  case 312:
+#line 2313 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_sub_address_u(interp, (yyvsp[(1) - (1)].s));  mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 311:
-#line 2290 "compilers/imcc/imcc.y"
+  case 313:
+#line 2317 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_sub_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 312:
-#line 2291 "compilers/imcc/imcc.y"
+  case 314:
+#line 2318 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_sub_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 313:
-#line 2295 "compilers/imcc/imcc.y"
+  case 315:
+#line 2322 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_label_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 314:
-#line 2296 "compilers/imcc/imcc.y"
+  case 316:
+#line 2323 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_label_address(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 319:
-#line 2310 "compilers/imcc/imcc.y"
+  case 321:
+#line 2337 "compilers/imcc/imcc.y"
     {
            IMCC_INFO(interp)->nkeys    = 0;
            IMCC_INFO(interp)->in_slice = 0;
          }
     break;
 
-  case 320:
-#line 2315 "compilers/imcc/imcc.y"
+  case 322:
+#line 2342 "compilers/imcc/imcc.y"
     {
            (yyval.sr) = link_keys(interp,
                           IMCC_INFO(interp)->nkeys,
@@ -5026,16 +5065,16 @@
          }
     break;
 
-  case 321:
-#line 2323 "compilers/imcc/imcc.y"
+  case 323:
+#line 2350 "compilers/imcc/imcc.y"
     {
            IMCC_INFO(interp)->nkeys = 0;
            IMCC_INFO(interp)->in_slice = 0;
          }
     break;
 
-  case 322:
-#line 2328 "compilers/imcc/imcc.y"
+  case 324:
+#line 2355 "compilers/imcc/imcc.y"
     {
            (yyval.sr) = link_keys(interp,
                           IMCC_INFO(interp)->nkeys,
@@ -5043,21 +5082,21 @@
          }
     break;
 
-  case 323:
-#line 2336 "compilers/imcc/imcc.y"
+  case 325:
+#line 2363 "compilers/imcc/imcc.y"
     { IMCC_INFO(interp)->keys[IMCC_INFO(interp)->nkeys++] = (yyvsp[(1) - (1)].sr); }
     break;
 
-  case 324:
-#line 2338 "compilers/imcc/imcc.y"
+  case 326:
+#line 2365 "compilers/imcc/imcc.y"
     {
            IMCC_INFO(interp)->keys[IMCC_INFO(interp)->nkeys++] = (yyvsp[(3) - (3)].sr);
            (yyval.sr) = IMCC_INFO(interp)->keys[0];
          }
     break;
 
-  case 325:
-#line 2346 "compilers/imcc/imcc.y"
+  case 327:
+#line 2373 "compilers/imcc/imcc.y"
     {
            if (IMCC_INFO(interp)->in_slice)
                (yyvsp[(1) - (1)].sr)->type |= VT_START_SLICE | VT_END_SLICE;
@@ -5065,54 +5104,54 @@
          }
     break;
 
-  case 326:
-#line 2354 "compilers/imcc/imcc.y"
+  case 328:
+#line 2381 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_symreg(interp, (yyvsp[(1) - (1)].s), 'I'); }
     break;
 
-  case 327:
-#line 2355 "compilers/imcc/imcc.y"
+  case 329:
+#line 2382 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_symreg(interp, (yyvsp[(1) - (1)].s), 'N'); }
     break;
 
-  case 328:
-#line 2356 "compilers/imcc/imcc.y"
+  case 330:
+#line 2383 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_symreg(interp, (yyvsp[(1) - (1)].s), 'S'); }
     break;
 
-  case 329:
-#line 2357 "compilers/imcc/imcc.y"
+  case 331:
+#line 2384 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_symreg(interp, (yyvsp[(1) - (1)].s), 'P'); }
     break;
 
-  case 330:
-#line 2358 "compilers/imcc/imcc.y"
+  case 332:
+#line 2385 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_pasm_reg(interp, (yyvsp[(1) - (1)].s)); mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 331:
-#line 2362 "compilers/imcc/imcc.y"
+  case 333:
+#line 2389 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_const(interp, (yyvsp[(1) - (1)].s), 'I'); mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 332:
-#line 2363 "compilers/imcc/imcc.y"
+  case 334:
+#line 2390 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_const(interp, (yyvsp[(1) - (1)].s), 'N'); mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 333:
-#line 2364 "compilers/imcc/imcc.y"
+  case 335:
+#line 2391 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_const(interp, (yyvsp[(1) - (1)].s), 'S'); mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
-  case 334:
-#line 2365 "compilers/imcc/imcc.y"
+  case 336:
+#line 2392 "compilers/imcc/imcc.y"
     { (yyval.sr) = mk_const(interp, (yyvsp[(1) - (1)].s), 'U'); mem_sys_free((yyvsp[(1) - (1)].s)); }
     break;
 
 
 /* Line 1267 of yacc.c.  */
-#line 5105 "compilers/imcc/imcparser.c"
+#line 5144 "compilers/imcc/imcparser.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -5326,7 +5365,7 @@
 }
 
 
-#line 2371 "compilers/imcc/imcc.y"
+#line 2398 "compilers/imcc/imcc.y"
 
 
 /* I need this prototype somewhere... */

Modified: trunk/compilers/imcc/imcparser.h
==============================================================================
--- trunk/compilers/imcc/imcparser.h	Sun May 10 12:23:50 2009	(r38678)
+++ trunk/compilers/imcc/imcparser.h	Sun May 10 21:53:48 2009	(r38679)
@@ -295,7 +295,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 1010 "compilers/imcc/imcc.y"
+#line 1030 "compilers/imcc/imcc.y"
 {
     IdList * idlist;
     int t;

Modified: trunk/src/call/pcc.c
==============================================================================
--- trunk/src/call/pcc.c	Sun May 10 12:23:50 2009	(r38678)
+++ trunk/src/call/pcc.c	Sun May 10 21:53:48 2009	(r38679)
@@ -1666,8 +1666,7 @@
              * RT #54860 and others
              * Save current value while setting the optional
              */
-            UnionVal old_value;
-            old_value = st->val;
+            UnionVal old_value = st->val;
 
             while (dest->sig & PARROT_ARG_OPTIONAL) {
                 null_val(st->dest.sig, st);

Modified: trunk/t/compilers/imcc/syn/regressions.t
==============================================================================
--- trunk/t/compilers/imcc/syn/regressions.t	Sun May 10 12:23:50 2009	(r38678)
+++ trunk/t/compilers/imcc/syn/regressions.t	Sun May 10 21:53:48 2009	(r38679)
@@ -138,8 +138,6 @@
 hello world
 OUT
 
-TODO: {
-  local $TODO = 'TT #654';
 pir_output_is( <<'CODE', <<'OUT', 'unicode named identifiers (TT #654)');
  .sub 'main' :main
     'foo'(1 :named(unicode:"\x{e4}"))
@@ -152,9 +150,8 @@
     say x
  .end
 CODE
-1
+ok 1
 OUT
-}
 
 # Local Variables:
 #   mode: cperl


More information about the parrot-commits mailing list