handle filesystems where lowercase(file)==file more gracefully

[swftools.git] / lib / as3 / parser.tab.c

diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c
index 2631457..04eaa3f 100644 (file)
--- a/lib/as3/parser.tab.c
+++ b/lib/as3/parser.tab.c
@@ -1,5 +1,5 @@
 
 

-/* A Bison parser, made by GNU Bison 2.4.  */
+/* A Bison parser, made by GNU Bison 2.4.1.  */

 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    
 
 /* Skeleton implementation for Bison's Yacc-like parsers in C
    

@@ -46,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
 #define YYBISON 1
 
 /* Bison version.  */

-#define YYBISON_VERSION "2.4"
+#define YYBISON_VERSION "2.4.1"

 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "./skeleton.m4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "./skeleton.m4"

@@ -84,18 +84,21 @@
 #include "abc.h"
 #include "pool.h"
 #include "files.h"
 #include "abc.h"
 #include "pool.h"
 #include "files.h"

+#include "common.h"

 #include "tokenizer.h"
 #include "registry.h"
 #include "code.h"
 #include "opcodes.h"
 #include "compiler.h"
 #include "tokenizer.h"
 #include "registry.h"
 #include "code.h"
 #include "opcodes.h"
 #include "compiler.h"

+#include "expr.h"
+#include "initcode.h"

 
 extern int a3_lex();
 
 
 
 /* Line 198 of skeleton.m4  */
 
 extern int a3_lex();
 
 
 
 /* Line 198 of skeleton.m4  */

-#line 99 "parser.tab.c"
+#line 102 "parser.tab.c"

 
 /* Enabling traces.  */
 #ifndef YYDEBUG
 
 /* Enabling traces.  */
 #ifndef YYDEBUG

@@ -129,26 +132,26 @@ extern int a3_lex();
      T_EMPTY = 262,
      T_INT = 263,
      T_UINT = 264,
      T_EMPTY = 262,
      T_INT = 263,
      T_UINT = 264,

-     T_BYTE = 265,
-     T_SHORT = 266,
-     T_FLOAT = 267,
-     T_FOR = 268,
-     T_WHILE = 269,
-     T_DO = 270,
-     T_SWITCH = 271,
-     KW_IMPLEMENTS = 272,
-     KW_NAMESPACE = 273,
-     KW_PACKAGE = 274,
-     KW_PROTECTED = 275,
-     KW_PUBLIC = 276,
-     KW_PRIVATE = 277,
-     KW_USE = 278,
-     KW_INTERNAL = 279,
-     KW_NEW = 280,
-     KW_NATIVE = 281,
-     KW_FUNCTION = 282,
-     KW_FINALLY = 283,
-     KW_UNDEFINED = 284,
+     T_FLOAT = 265,
+     T_FOR = 266,
+     T_WHILE = 267,
+     T_DO = 268,
+     T_SWITCH = 269,
+     KW_IMPLEMENTS = 270,
+     KW_NAMESPACE = 271,
+     KW_PACKAGE = 272,
+     KW_PROTECTED = 273,
+     KW_ARGUMENTS = 274,
+     KW_PUBLIC = 275,
+     KW_PRIVATE = 276,
+     KW_USE = 277,
+     KW_INTERNAL = 278,
+     KW_NEW = 279,
+     KW_NATIVE = 280,
+     KW_FUNCTION = 281,
+     KW_FINALLY = 282,
+     KW_UNDEFINED = 283,
+     KW_NAN = 284,

      KW_CONTINUE = 285,
      KW_CLASS = 286,
      KW_CONST = 287,
      KW_CONTINUE = 285,
      KW_CLASS = 286,
      KW_CONST = 287,

@@ -182,51 +185,54 @@ extern int a3_lex();
      KW_NUMBER = 315,
      KW_STRING = 316,
      KW_DEFAULT = 317,
      KW_NUMBER = 315,
      KW_STRING = 316,
      KW_DEFAULT = 317,

-     KW_DELETE = 318,
-     KW_IF = 319,
-     KW_ELSE = 320,
-     KW_BREAK = 321,
-     KW_IS = 322,
-     KW_IN = 323,
-     KW_AS = 324,
-     T_DICTSTART = 325,
-     T_EQEQ = 326,
-     T_EQEQEQ = 327,
-     T_NE = 328,
-     T_NEE = 329,
-     T_LE = 330,
-     T_GE = 331,
-     T_ORBY = 332,
-     T_DIVBY = 333,
-     T_MODBY = 334,
-     T_MULBY = 335,
-     T_PLUSBY = 336,
-     T_MINUSBY = 337,
-     T_XORBY = 338,
-     T_SHRBY = 339,
-     T_SHLBY = 340,
-     T_USHRBY = 341,
-     T_OROR = 342,
-     T_ANDAND = 343,
-     T_COLONCOLON = 344,
-     T_MINUSMINUS = 345,
-     T_PLUSPLUS = 346,
-     T_DOTDOT = 347,
-     T_DOTDOTDOT = 348,
-     T_SHL = 349,
-     T_USHR = 350,
-     T_SHR = 351,
-     prec_none = 352,
-     below_semicolon = 353,
-     below_assignment = 354,
-     below_minus = 356,
-     minusminus_prefix = 357,
-     plusplus_prefix = 358,
-     below_curly = 359,
-     new2 = 360,
-     above_identifier = 361,
-     below_else = 362,
-     above_function = 363
+     KW_DEFAULT_XML = 318,
+     KW_DELETE = 319,
+     KW_IF = 320,
+     KW_ELSE = 321,
+     KW_BREAK = 322,
+     KW_IS = 323,
+     KW_IN = 324,
+     KW_AS = 325,
+     T_DICTSTART = 326,
+     T_EQEQ = 327,
+     T_EQEQEQ = 328,
+     T_NE = 329,
+     T_NEE = 330,
+     T_LE = 331,
+     T_GE = 332,
+     T_ORBY = 333,
+     T_DIVBY = 334,
+     T_MODBY = 335,
+     T_MULBY = 336,
+     T_ANDBY = 337,
+     T_PLUSBY = 338,
+     T_MINUSBY = 339,
+     T_XORBY = 340,
+     T_SHRBY = 341,
+     T_SHLBY = 342,
+     T_USHRBY = 343,
+     T_OROR = 344,
+     T_ANDAND = 345,
+     T_COLONCOLON = 346,
+     T_MINUSMINUS = 347,
+     T_PLUSPLUS = 348,
+     T_DOTDOT = 349,
+     T_DOTDOTDOT = 350,
+     T_SHL = 351,
+     T_USHR = 352,
+     T_SHR = 353,
+     prec_none = 354,
+     below_semicolon = 355,
+     below_assignment = 356,
+     below_lt = 357,
+     below_minus = 358,
+     minusminus_prefix = 359,
+     plusplus_prefix = 360,
+     below_curly = 361,
+     new2 = 362,
+     above_identifier = 363,
+     below_else = 364,
+     above_function = 365

    };
 #endif
 
    };
 #endif
 

@@ -235,12 +241,12 @@ extern int a3_lex();
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union 
 /* Line 223 of skeleton.m4  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union 
 /* Line 223 of skeleton.m4  */

-#line 44 "parser.y"
+#line 47 "parser.y"

 tokenunion
 {
 
 /* Line 223 of skeleton.m4  */
 tokenunion
 {
 
 /* Line 223 of skeleton.m4  */

-#line 44 "parser.y"
+#line 47 "parser.y"

 
     enum yytokentype token;
 
 
     enum yytokentype token;
 

@@ -266,6 +272,7 @@ tokenunion
     regexp_t regexp;
     modifiers_t flags;
     namespace_decl_t* namespace_decl;
     regexp_t regexp;
     modifiers_t flags;
     namespace_decl_t* namespace_decl;

+    node_t*node;

     struct {
         abc_exception_list_t *l;
         code_t*finally;
     struct {
         abc_exception_list_t *l;
         code_t*finally;

@@ -274,7 +281,7 @@ tokenunion
 
 
 /* Line 223 of skeleton.m4  */
 
 
 /* Line 223 of skeleton.m4  */

-#line 278 "parser.tab.c"
+#line 285 "parser.tab.c"

 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

@@ -285,7 +292,7 @@ tokenunion
 /* Copy the second part of user declarations.  */
 
 /* Line 273 of skeleton.m4  */
 /* Copy the second part of user declarations.  */
 
 /* Line 273 of skeleton.m4  */

-#line 265 "parser.y"
+#line 276 "parser.y"

 
 
 static int a3_error(char*s)
 
 
 static int a3_error(char*s)

@@ -294,6 +301,13 @@ static int a3_error(char*s)
    return 0; //make gcc happy
 }
 
    return 0; //make gcc happy
 }
 

+static void parsererror(const char*file, int line, const char*f)
+{
+    syntaxerror("internal error in %s, %s:%d", f, file, line);
+}
+
+#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);}
+

 
 static char* concat2(const char* t1, const char* t2)
 {
 
 static char* concat2(const char* t1, const char* t2)
 {

@@ -321,7 +335,6 @@ static char* concat3(const char* t1, const char* t2, const char* t3)
 typedef struct _import {
     char*package;
 } import_t;
 typedef struct _import {
     char*package;
 } import_t;

-

 DECLARE_LIST(import);
 
 DECLARE(methodstate);
 DECLARE_LIST(import);
 
 DECLARE(methodstate);

@@ -331,11 +344,12 @@ typedef struct _classstate {
     /* class data */
     classinfo_t*info;
     abc_class_t*abc;
     /* class data */
     classinfo_t*info;
     abc_class_t*abc;

-   
+

     methodstate_t*init;
     methodstate_t*static_init;
     //code_t*init;
     //code_t*static_init;
     methodstate_t*init;
     methodstate_t*static_init;
     //code_t*init;
     //code_t*static_init;

+    parsedclass_t*dependencies;

 
     char has_constructor;
 } classstate_t;
 
     char has_constructor;
 } classstate_t;

@@ -343,18 +357,24 @@ typedef struct _classstate {
 struct _methodstate {
     /* method data */
     methodinfo_t*info;
 struct _methodstate {
     /* method data */
     methodinfo_t*info;

+    char has_exceptions;

     char late_binding;
     char is_constructor;
     char has_super;
     char is_global;
     char late_binding;
     char is_constructor;
     char has_super;
     char is_global;

+    char is_static;

     int variable_count;
 
     dict_t*unresolved_variables;
 
     char inner;
     char uses_parent_function;
     int variable_count;
 
     dict_t*unresolved_variables;
 
     char inner;
     char uses_parent_function;

+    char no_variable_scoping;

     int uses_slots;
     dict_t*slots;
     int uses_slots;
     dict_t*slots;

+    int activation_var;
+
+    int need_arguments;

 
     abc_method_t*abc;
     int var_index; // for inner methods
 
     abc_method_t*abc;
     int var_index; // for inner methods

@@ -362,11 +382,20 @@ struct _methodstate {
     char is_a_slot; // for inner methods
 
     code_t*header;
     char is_a_slot; // for inner methods
 
     code_t*header;

+
+    code_t*scope_code;

     abc_exception_list_t*exceptions;
     
     methodstate_list_t*innerfunctions;
 };
 
     abc_exception_list_t*exceptions;
     
     methodstate_list_t*innerfunctions;
 };
 

+void methodstate_destroy(methodstate_t*m) 
+{
+    dict_destroy(m->unresolved_variables);
+    m->unresolved_variables = 0;
+    list_free(m->innerfunctions);m->innerfunctions=0;
+}
+

 typedef struct _state {
     struct _state*old;
     int level;
 typedef struct _state {
     struct _state*old;
     int level;

@@ -375,22 +404,32 @@ typedef struct _state {
     import_list_t*wildcard_imports;
     dict_t*import_toplevel_packages;
     dict_t*imports;
     import_list_t*wildcard_imports;
     dict_t*import_toplevel_packages;
     dict_t*imports;

-    namespace_list_t*active_namespaces;
-    namespace_decl_list_t*new_namespaces;
+
+    namespace_list_t*active_namespace_urls;
+    

     char has_own_imports;
     char new_vars; // e.g. transition between two functions
     char has_own_imports;
     char new_vars; // e.g. transition between two functions

+    char xmlfilter; // are we inside a xmlobj..() filter?

   
     classstate_t*cls;   
     methodstate_t*method;
 
     char*exception_name;
   
     classstate_t*cls;   
     methodstate_t*method;
 
     char*exception_name;

+
+    int switch_var;

     
     dict_t*vars;
     
     dict_t*vars;

+    dict_t*allvars; // also contains variables from sublevels

 } state_t;
 
 typedef struct _global {
     abc_file_t*file;
 } state_t;
 
 typedef struct _global {
     abc_file_t*file;

-    abc_script_t*init;
+
+    parsedclass_list_t*classes;
+    abc_script_t*classinit;
+
+    abc_script_t*init; //package-level code
+

     dict_t*token2info;
     dict_t*file2token2info;
 } global_t;
     dict_t*token2info;
     dict_t*file2token2info;
 } global_t;

@@ -400,18 +439,19 @@ static state_t* state = 0;
 
 DECLARE_LIST(state);
 
 
 DECLARE_LIST(state);
 

-#define MULTINAME(m,x) \
-    multiname_t m;\
-    namespace_t m##_ns;\
-    (x)->package; \
-    registry_fill_multiname(&m, &m##_ns, (slotinfo_t*)(x));
-                    
+/* protected handling here is a big hack: we just assume the protectedns
+   is package:class. the correct approach would be to add the proper
+   namespace to all protected members in the registry, even though that
+   would slow down searching */

 #define MEMBER_MULTINAME(m,f,n) \
     multiname_t m;\
     namespace_t m##_ns;\
     if(f) { \
 #define MEMBER_MULTINAME(m,f,n) \
     multiname_t m;\
     namespace_t m##_ns;\
     if(f) { \

-        if((m##_ns.access = ((slotinfo_t*)(f))->access)==ACCESS_NAMESPACE) \
+        m##_ns.access = ((slotinfo_t*)(f))->access; \
+        if(m##_ns.access == ACCESS_NAMESPACE) \

             m##_ns.name = ((slotinfo_t*)(f))->package; \
             m##_ns.name = ((slotinfo_t*)(f))->package; \

+        else if(m##_ns.access == ACCESS_PROTECTED && (f)->parent) \
+            m##_ns.name = concat3((f)->parent->package,":",(f)->parent->name); \

         else \
             m##_ns.name = ""; \
         m.type = QNAME; \
         else \
             m##_ns.name = ""; \
         m.type = QNAME; \

@@ -438,13 +478,22 @@ DECLARE_LIST(state);
 static namespace_t ns1 = {ACCESS_PRIVATE, ""};
 static namespace_t ns2 = {ACCESS_PROTECTED, ""};
 static namespace_t ns3 = {ACCESS_PACKAGEINTERNAL, ""};
 static namespace_t ns1 = {ACCESS_PRIVATE, ""};
 static namespace_t ns2 = {ACCESS_PROTECTED, ""};
 static namespace_t ns3 = {ACCESS_PACKAGEINTERNAL, ""};

-static namespace_t ns4 = {ACCESS_PACKAGE, ""};
-static namespace_list_t nl4 = {&ns4,0};
+static namespace_t stdns = {ACCESS_PACKAGE, ""};
+static namespace_list_t nl4 = {&stdns,0};

 static namespace_list_t nl3 = {&ns3,&nl4};
 static namespace_list_t nl2 = {&ns2,&nl3};
 static namespace_list_t nl1 = {&ns1,&nl2};
 static namespace_set_t nopackage_namespace_set = {&nl1};
 
 static namespace_list_t nl3 = {&ns3,&nl4};
 static namespace_list_t nl2 = {&ns2,&nl3};
 static namespace_list_t nl1 = {&ns1,&nl2};
 static namespace_set_t nopackage_namespace_set = {&nl1};
 

+static dict_t*definitions=0;
+void as3_set_define(const char*c)
+{
+    if(!definitions) 
+        definitions = dict_new();
+    if(!dict_contains(definitions,c))
+        dict_put(definitions,c,0);
+}
+

 static void new_state()
 {
     NEW(state_t, s);
 static void new_state()
 {
     NEW(state_t, s);

@@ -460,28 +509,14 @@ static void new_state()
     state = s;
     state->level++;
     state->has_own_imports = 0;    
     state = s;
     state->level++;
     state->has_own_imports = 0;    

-    state->new_namespaces = 0;

     state->vars = dict_new(); 
     state->old = oldstate;
     state->new_vars = 0;
     state->vars = dict_new(); 
     state->old = oldstate;
     state->new_vars = 0;

-}
-static void state_has_imports()
-{
-    state->wildcard_imports = list_clone(state->wildcard_imports);
-    state->imports = dict_clone(state->imports);
-    state->has_own_imports = 1;
-}
-static void import_toplevel(const char*package)
-{
-    char* s = strdup(package);
-    while(1) {
-        dict_put(state->import_toplevel_packages, s, 0);
-        char*x = strrchr(s, '.');
-        if(!x)
-            break;
-        *x = 0;
-    }
-    free(s);
+
+    trie_remember(active_namespaces);
+   
+    if(oldstate)
+        state->active_namespace_urls = list_clone(oldstate->active_namespace_urls);

 }
 
 static void state_destroy(state_t*state)
 }
 
 static void state_destroy(state_t*state)

@@ -494,49 +529,46 @@ static void state_destroy(state_t*state)
         dict_destroy(state->imports);state->imports=0;
     }
     if(state->vars) {
         dict_destroy(state->imports);state->imports=0;
     }
     if(state->vars) {

-        int t;
-        for(t=0;t<state->vars->hashsize;t++) {
-            dictentry_t*e =state->vars->slots[t];
-            while(e) {
-                free(e->data);e->data=0;
-                e = e->next;
-            }
-        }

         dict_destroy(state->vars);state->vars=0;
     }
         dict_destroy(state->vars);state->vars=0;
     }

+    if(state->new_vars && state->allvars) {
+        parserassert(!state->old || state->old->allvars != state->allvars);
+        DICT_ITERATE_DATA(state->allvars, void*, data) {
+            free(data);
+        }
+        dict_destroy(state->allvars);
+    }
+    
+    list_free(state->active_namespace_urls)
+    state->active_namespace_urls = 0;

     
     free(state);
 }
 
 static void old_state()
 {
     
     free(state);
 }
 
 static void old_state()
 {

+    trie_rollback(active_namespaces);
+

     if(!state || !state->old)
         syntaxerror("invalid nesting");
     state_t*leaving = state;
     
     state = state->old;
 
     if(!state || !state->old)
         syntaxerror("invalid nesting");
     state_t*leaving = state;
     
     state = state->old;
 

-    namespace_decl_list_t*nl=leaving->new_namespaces;
-    while(nl) {
-        tokenizer_unregister_namespace(nl->namespace_decl->name);
-        nl = nl->next;
-    }
-    

     if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) {
     if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) {

-        free(leaving->method);
-        leaving->method=0;
+        methodstate_destroy(leaving->method);leaving->method=0;

     }
     if(as3_pass>1 && leaving->cls && leaving->cls != state->cls) {
         free(leaving->cls);
         leaving->cls=0;
     }
     }
     if(as3_pass>1 && leaving->cls && leaving->cls != state->cls) {
         free(leaving->cls);
         leaving->cls=0;
     }

-    
+

     state_destroy(leaving);
 }
 
 static code_t* method_header(methodstate_t*m);
 static code_t* wrap_function(code_t*c,code_t*header, code_t*body);
     state_destroy(leaving);
 }
 
 static code_t* method_header(methodstate_t*m);
 static code_t* wrap_function(code_t*c,code_t*header, code_t*body);

-static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0);
+static void function_initvars(methodstate_t*m, char has_params, params_t*params, int flags, char var0);

 
 
 static char* internal_filename_package = 0;
 
 
 static char* internal_filename_package = 0;

@@ -545,8 +577,12 @@ void initialize_file(char*filename)
     if(state) {
         syntaxerror("invalid call to initialize_file during parsing of another file");
     }
     if(state) {
         syntaxerror("invalid call to initialize_file during parsing of another file");
     }

+    
+    active_namespaces = trie_new();
+

     new_state();
     state->package = internal_filename_package = strdup(filename);
     new_state();
     state->package = internal_filename_package = strdup(filename);

+    state->allvars = dict_new();

     
     global->token2info = dict_lookup(global->file2token2info, 
                                      current_filename // use long version
     
     global->token2info = dict_lookup(global->file2token2info, 
                                      current_filename // use long version

@@ -559,11 +595,14 @@ void initialize_file(char*filename)
     if(as3_pass==1) {
         state->method = rfx_calloc(sizeof(methodstate_t));
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);
     if(as3_pass==1) {
         state->method = rfx_calloc(sizeof(methodstate_t));
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);

+        state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope

     } else {
         state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);
     } else {
         state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);

-        function_initvars(state->method, 0, 0, 1);
-        global->init = abc_initscript(global->file);
-        state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope
+        state->method->variable_count = 0;
+        if(!state->method)
+            syntaxerror("internal error: skewed tokencount");
+        function_initvars(state->method, 0, 0, 0, 1);
+        global->init = 0;

     }
 }
 
     }
 }
 

@@ -572,12 +611,16 @@ void finish_file()
     if(!state || state->level!=1) {
         syntaxerror("unexpected end of file in pass %d", as3_pass);
     }
     if(!state || state->level!=1) {
         syntaxerror("unexpected end of file in pass %d", as3_pass);
     }

-
+    

     if(as3_pass==2) {
     if(as3_pass==2) {

+        dict_del(global->file2token2info, current_filename);

         code_t*header = method_header(state->method);
         code_t*header = method_header(state->method);

-        code_t*c = wrap_function(header, 0, global->init->method->body->code);
-        global->init->method->body->code = c;
-        free(state->method);state->method=0;
+        //if(global->init->method->body->code || global->init->traits) {
+        if(global->init) {
+            code_t*c = wrap_function(header, 0, global->init->method->body->code);
+            global->init->method->body->code = abc_returnvoid(c);
+            free(state->method);state->method=0;
+        }

     }
 
     //free(state->package);state->package=0; // used in registry
     }
 
     //free(state->package);state->package=0; // used in registry

@@ -591,69 +634,48 @@ void initialize_parser()
     global->file->flags &= ~ABCFILE_LAZY;
     global->file2token2info = dict_new();
     global->token2info = 0;
     global->file->flags &= ~ABCFILE_LAZY;
     global->file2token2info = dict_new();
     global->token2info = 0;

+    global->classinit = abc_initscript(global->file);

 }
 
 void* finish_parser()
 {
     dict_free_all(global->file2token2info, 1, (void*)dict_destroy);
 }
 
 void* finish_parser()
 {
     dict_free_all(global->file2token2info, 1, (void*)dict_destroy);

-

     global->token2info=0;
     global->token2info=0;

-
-    return global->file;
-}
-
-
-static void xx_scopetest() 
-{
-    /* findpropstrict doesn't just return a scope object- it
-       also makes it "active" somehow. Push local_0 on the
-       scope stack and read it back with findpropstrict, it'll
-       contain properties like "trace". Trying to find the same
-       property on a "vanilla" local_0 yields only a "undefined" */
-    //c = abc_findpropstrict(c, "[package]::trace");

     
     

-    /*c = abc_getlocal_0(c);
-    c = abc_findpropstrict(c, "[package]::trace");
-    c = abc_coerce_a(c);
-    c = abc_setlocal_1(c);
+    initcode_add_classlist(global->classinit, global->classes);

 
 

-    c = abc_pushbyte(c, 0);
-    c = abc_setlocal_2(c);
-   
-    code_t*xx = c = abc_label(c);
-    c = abc_findpropstrict(c, "[package]::trace");
-    c = abc_pushstring(c, "prop:");
-    c = abc_hasnext2(c, 1, 2);
-    c = abc_dup(c);
-    c = abc_setlocal_3(c);
-    c = abc_callpropvoid(c, "[package]::trace", 2);
-    c = abc_getlocal_3(c);
-    c = abc_kill(c, 3);
-    c = abc_iftrue(c,xx);*/
+    return global->file;

 }
 
 typedef struct _variable {
     int index;
     classinfo_t*type;
     char init;
 }
 
 typedef struct _variable {
     int index;
     classinfo_t*type;
     char init;

+    char kill;
+    char is_parameter;

     methodstate_t*is_inner_method;
 } variable_t;
 
 static variable_t* find_variable(state_t*s, char*name)
 {
     methodstate_t*is_inner_method;
 } variable_t;
 
 static variable_t* find_variable(state_t*s, char*name)
 {

-    while(s) {
-        variable_t*v = 0;
-        v = dict_lookup(s->vars, name);
-        if(v) return v;
-        if(s->new_vars) break;
-        s = s->old;
+    if(s->method->no_variable_scoping) {
+        return dict_lookup(s->allvars, name);
+    } else {
+        state_t*top = s;
+        while(s) {
+            variable_t*v = 0;
+            v = dict_lookup(s->vars, name);
+            if(v) return v;
+            if(s->new_vars) break;
+            s = s->old;
+        }
+        return 0;

     }
     }

-    return 0;

 }
 }

-static variable_t* find_slot(state_t*s, const char*name)
+static variable_t* find_slot(methodstate_t*m, const char*name)

 {
 {

-    if(s->method && s->method->slots)
-        return dict_lookup(s->method->slots, name);
+    if(m && m->slots)
+        return dict_lookup(m->slots, name);

     return 0;
 }
 
     return 0;
 }
 

@@ -664,60 +686,109 @@ static variable_t* find_variable_safe(state_t*s, char*name)
         syntaxerror("undefined variable: %s", name);
     return v;
 }
         syntaxerror("undefined variable: %s", name);
     return v;
 }

+

 static char variable_exists(char*name) 
 {
     return dict_contains(state->vars, name);
 }
 static char variable_exists(char*name) 
 {
     return dict_contains(state->vars, name);
 }

-code_t*defaultvalue(code_t*c, classinfo_t*type);

 
 

-static variable_t* new_variable2(const char*name, classinfo_t*type, char init, char maybeslot)
+static code_t*defaultvalue(code_t*c, classinfo_t*type)
+{
+    if(TYPE_IS_INT(type)) {
+       c = abc_pushbyte(c, 0);
+    } else if(TYPE_IS_UINT(type)) {
+       c = abc_pushuint(c, 0);
+    } else if(TYPE_IS_FLOAT(type)) {
+       c = abc_pushnan(c);
+    } else if(TYPE_IS_BOOLEAN(type)) {
+       c = abc_pushfalse(c);
+    } else if(TYPE_IS_STRING(type)) {
+       c = abc_pushnull(c);
+       c = abc_coerce_s(c);
+    } else if(!type) {
+       //c = abc_pushundefined(c);
+        syntaxerror("internal error: can't generate default value for * type");
+    } else {
+       c = abc_pushnull(c);
+       MULTINAME(m, type);
+       c = abc_coerce2(c, &m);
+    }
+    return c;
+}
+
+static int alloc_local()
+{
+    return state->method->variable_count++;
+}
+
+static variable_t* new_variable2(methodstate_t*method, const char*name, classinfo_t*type, char init, char maybeslot)

 {
     if(maybeslot) {
 {
     if(maybeslot) {

-        variable_t*v = find_slot(state, name);
-        if(v)
+        variable_t*v = find_slot(method, name);
+        if(v) {
+            alloc_local(); 

             return v;
             return v;

+        }

     }
 
     NEW(variable_t, v);
     }
 
     NEW(variable_t, v);

-    v->index = state->method->variable_count++;
+    v->index = alloc_local();

     v->type = type;
     v->type = type;

-    v->init = init;
-    
-    dict_put(state->vars, name, v);
+    v->init = v->kill = init;
+ 
+    if(name) {
+        if(!method->no_variable_scoping) 
+        {
+            if(dict_contains(state->vars, name)) {
+                *(int*)0=0;
+                syntaxerror("variable %s already defined", name);
+            }
+            dict_put(state->vars, name, v);
+        }
+        if(method->no_variable_scoping && 
+           as3_pass==2 && 
+           dict_contains(state->allvars, name)) 
+        {
+            variable_t*v = dict_lookup(state->allvars, name);
+            if(v->type != type)
+                syntaxerror("variable %s already defined.", name);
+            return v;
+        }
+        dict_put(state->allvars, name, v);
+    }

 
     return v;
 }
 
     return v;
 }

-static int new_variable(const char*name, classinfo_t*type, char init, char maybeslot)
+static int new_variable(methodstate_t*method, const char*name, classinfo_t*type, char init, char maybeslot)

 {
 {

-    return new_variable2(name, type, init, maybeslot)->index;
+    return new_variable2(method, name, type, init, maybeslot)->index;

 }
 
 #define TEMPVARNAME "__as3_temp__"
 }
 
 #define TEMPVARNAME "__as3_temp__"

-static int gettempvar()
+int gettempvar()

 {
     variable_t*v = find_variable(state, TEMPVARNAME);
 {
     variable_t*v = find_variable(state, TEMPVARNAME);

+    int i;

     if(v) 
     if(v) 

-        return v->index;
-    return new_variable(TEMPVARNAME, 0, 0, 0);
+        i = v->index;
+    else
+        i = new_variable(state->method, TEMPVARNAME, 0, 0, 0);
+    parserassert(i);
+    return i;

 }
 
 }
 

-code_t* var_block(code_t*body) 
+static code_t* var_block(code_t*body, dict_t*vars) 

 {
     code_t*c = 0;
     code_t*k = 0;
     int t;
 {
     code_t*c = 0;
     code_t*k = 0;
     int t;

-    int num=0;
-    for(t=0;t<state->vars->hashsize;t++) {
-        dictentry_t*e = state->vars->slots[t];
-        while(e) {
-            variable_t*v = (variable_t*)e->data;
-            if(v->type && v->init) {
-                c = defaultvalue(c, v->type);
-                c = abc_setlocal(c, v->index);
-                k = abc_kill(k, v->index); 
-                num++;
-            }
-            e = e->next;
+    DICT_ITERATE_DATA(vars, variable_t*, v) {
+        if(v->type && v->init) {
+            c = defaultvalue(c, v->type);
+            c = abc_setlocal(c, v->index);
+        }
+        if(v->type && v->kill) {
+            k = abc_kill(k, v->index); 

         }
     }
 
         }
     }
 

@@ -745,7 +816,7 @@ code_t* var_block(code_t*body)
     return c;
 }
 
     return c;
 }
 

-void unknown_variable(char*name) 
+static void unknown_variable(char*name) 

 {
     if(!state->method->unresolved_variables)
         state->method->unresolved_variables = dict_new();
 {
     if(!state->method->unresolved_variables)
         state->method->unresolved_variables = dict_new();

@@ -753,25 +824,37 @@ void unknown_variable(char*name)
         dict_put(state->method->unresolved_variables, name, 0);
 }
 
         dict_put(state->method->unresolved_variables, name, 0);
 }
 

-#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);}
-
-static void parsererror(const char*file, int line, const char*f)
-{
-    syntaxerror("internal error in %s, %s:%d", f, file, line);
-}
-
-   
-static code_t* method_header(methodstate_t*m)
+static code_t* add_scope_code(code_t*c, methodstate_t*m, char init)

 {
 {

-    code_t*c = 0;
-    if(m->uses_slots || (m->late_binding && !m->inner)) {
+    if(m->uses_slots || m->innerfunctions || (m->late_binding && !m->inner)) {

         c = abc_getlocal_0(c);
         c = abc_pushscope(c);
     }
     if(m->uses_slots) {
         c = abc_getlocal_0(c);
         c = abc_pushscope(c);
     }
     if(m->uses_slots) {

-        c = abc_newactivation(c);
-        c = abc_pushscope(c);
+        /* FIXME: this alloc_local() causes variable indexes to be
+           different in pass2 than in pass1 */
+        if(!m->activation_var) {
+            m->activation_var = alloc_local();
+        }
+        if(init) {
+            c = abc_newactivation(c);
+            c = abc_dup(c);
+            c = abc_pushscope(c);
+            c = abc_setlocal(c, m->activation_var);
+        } else {
+            c = abc_getlocal(c, m->activation_var);
+            c = abc_pushscope(c);
+        }

     }
     }

+    return c;
+}
+
+static code_t* method_header(methodstate_t*m)
+{
+    code_t*c = 0;
+
+    c = add_scope_code(c, m, 1);
+

     methodstate_list_t*l = m->innerfunctions;
     while(l) {
         parserassert(l->methodstate->abc);
     methodstate_list_t*l = m->innerfunctions;
     while(l) {
         parserassert(l->methodstate->abc);

@@ -797,6 +880,19 @@ static code_t* method_header(methodstate_t*m)
         c = abc_getlocal_0(c);
         c = abc_constructsuper(c, 0);
     }
         c = abc_getlocal_0(c);
         c = abc_constructsuper(c, 0);
     }

+
+    if(m->slots) {
+        /* all parameters that are used by inner functions
+           need to be copied from local to slot */
+        parserassert(m->activation_var);
+        DICT_ITERATE_ITEMS(m->slots,char*,name,variable_t*,v) {
+            if(v->is_parameter) {
+                c = abc_getlocal(c, m->activation_var); 
+                c = abc_getlocal(c, v->index); 
+                c = abc_setslot(c, v->index); 
+            }
+        }
+    }

     list_free(m->innerfunctions);
     m->innerfunctions = 0;
     return c;
     list_free(m->innerfunctions);
     m->innerfunctions = 0;
     return c;

@@ -806,7 +902,7 @@ static code_t* method_header(methodstate_t*m)
 static code_t* wrap_function(code_t*c,code_t*header, code_t*body)
 {
     c = code_append(c, header);
 static code_t* wrap_function(code_t*c,code_t*header, code_t*body)
 {
     c = code_append(c, header);

-    c = code_append(c, var_block(body));
+    c = code_append(c, var_block(body, state->method->no_variable_scoping?state->allvars:state->vars));

     /* append return if necessary */
     if(!c || (c->opcode != OPCODE_RETURNVOID && 
               c->opcode != OPCODE_RETURNVALUE)) {
     /* append return if necessary */
     if(!c || (c->opcode != OPCODE_RETURNVOID && 
               c->opcode != OPCODE_RETURNVALUE)) {

@@ -815,20 +911,15 @@ static code_t* wrap_function(code_t*c,code_t*header, code_t*body)
     return c;
 }
 
     return c;
 }
 

-

 static void startpackage(char*name)
 {
     new_state();
 static void startpackage(char*name)
 {
     new_state();

-    /*printf("entering package \"%s\"\n", name);*/

     state->package = strdup(name);
 }
 static void endpackage()
 {
     state->package = strdup(name);
 }
 static void endpackage()
 {

-    /*printf("leaving package \"%s\"\n", state->package);*/
-

     //used e.g. in classinfo_register:
     //free(state->package);state->package=0;
     //used e.g. in classinfo_register:
     //free(state->package);state->package=0;

-

     old_state();
 }
 
     old_state();
 }
 

@@ -847,7 +938,15 @@ static namespace_t modifiers2access(modifiers_t*mod)
         if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) 
             syntaxerror("invalid combination of access levels and namespaces");
         ns.access = ACCESS_NAMESPACE;
         if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) 
             syntaxerror("invalid combination of access levels and namespaces");
         ns.access = ACCESS_NAMESPACE;

-        ns.name = mod->ns;
+        state_t*s = state;
+        const char*url = (const char*)trie_lookup(active_namespaces, mod->ns);
+        if(!url) {
+            /* shouldn't happen- the tokenizer only reports something as a namespace
+               if it was already registered */
+            trie_dump(active_namespaces);
+            syntaxerror("unknown namespace: %s", mod->ns);
+        }
+        ns.name = url;

     } else if(mod->flags&FLAG_PUBLIC)  {
         if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) 
             syntaxerror("invalid combination of access levels");
     } else if(mod->flags&FLAG_PUBLIC)  {
         if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) 
             syntaxerror("invalid combination of access levels");

@@ -867,54 +966,75 @@ static namespace_t modifiers2access(modifiers_t*mod)
 }
 static slotinfo_t* find_class(const char*name);
 
 }
 static slotinfo_t* find_class(const char*name);
 

-static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0)
+static memberinfo_t* findmember_nsset(classinfo_t*cls, const char*name, char recurse)
+{
+    return registry_findmember_nsset(cls, state->active_namespace_urls, name, recurse);
+}
+
+static void innerfunctions2vars(methodstate_t*m)
+{
+    methodstate_list_t*l = m->innerfunctions;
+    while(l) {
+        methodstate_t*m = l->methodstate;
+        
+        variable_t* v = new_variable2(state->method, m->info->name, TYPE_FUNCTION(m->info), 0, 0);
+        m->var_index = v->index;
+        if(m->is_a_slot)
+            m->slot_index = m->is_a_slot;
+        v->is_inner_method = m;
+        l = l->next;
+    }
+}
+
+static void function_initvars(methodstate_t*m, char has_params, params_t*params, int flags, char var0)

 {
     if(var0) {
         int index = -1;
         if(m->inner)
 {
     if(var0) {
         int index = -1;
         if(m->inner)

-            index = new_variable("this", 0, 0, 0);
+            index = new_variable(m, "this", 0, 0, 0);

         else if(!m->is_global)
         else if(!m->is_global)

-            index = new_variable((flags&FLAG_STATIC)?"class":"this", state->cls?state->cls->info:0, 0, 0);
+            index = new_variable(m, (flags&FLAG_STATIC)?"class":"this", state->cls?state->cls->info:0, 0, 0);

         else
         else

-            index = new_variable("globalscope", 0, 0, 0);
-        if(index)
-            *(int*)0=0;
-        parserassert(!index);
-    }
-    if(m->uses_slots) {
-        /* as variables and slots share the same number, make sure
-           that those variable indices are reserved. It's up to the
-           optimizer to later shuffle the variables down to lower
-           indices */
-        m->variable_count = m->uses_slots;
-        DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) {
-            if(v->type) {
-                if(v->type->package)
-                    v->type = (classinfo_t*)registry_find(v->type->package, v->type->name);
-                else
-                    v->type = (classinfo_t*)find_class(v->type->name);
-                if(!v->type || v->type->kind != INFOTYPE_CLASS) {
-                    syntaxerror("Couldn't find class %s", v->type->name);
-                }
+            index = new_variable(m, "globalscope", 0, 0, 0);
+        if(index) {
+            DICT_ITERATE_ITEMS(state->vars, char*, name, variable_t*, v) {
+                printf("%s %d\n", name, v->index);

             }
         }
             }
         }

+        parserassert(!index);

     }
 
     }
 

-    if(params) {
+    if(has_params) {

         param_list_t*p=0;
         for(p=params->list;p;p=p->next) {
         param_list_t*p=0;
         for(p=params->list;p;p=p->next) {

-            new_variable(p->param->name, p->param->type, 0, 1);
+            variable_t*v = new_variable2(m, p->param->name, p->param->type, 0, 1);
+            v->is_parameter = 1;
+        }
+        if(as3_pass==2 && m->need_arguments) {
+            /* arguments can never be used by an innerfunction (the inner functions
+               have their own arguments var), so it's ok to  not initialize this until
+               pass 2. (We don't know whether we need it before, anyway) */
+            variable_t*v = new_variable2(m, "arguments", TYPE_ARRAY, 0, 0);
+            m->need_arguments = v->index;

         }
     }
     
         }
     }
     

-    methodstate_list_t*l = m->innerfunctions;
-    while(l) {
-        methodstate_t*m = l->methodstate;
-        variable_t* v = new_variable2(m->info->name, TYPE_FUNCTION(m->info), 0, 1);
-        m->var_index = v->index;
-        m->slot_index = v->index;
-        v->is_inner_method = m;
-        l = l->next;
+    innerfunctions2vars(m);
+    
+    if(as3_pass==2) {
+        m->scope_code = add_scope_code(m->scope_code, m, 0);
+        if(m->slots) {
+            /* exchange unresolved identifiers with the actual objects */
+            DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) {
+                if(v->type && v->type->kind == INFOTYPE_UNRESOLVED) {
+                    classinfo_t*type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type);
+                    if(!type || type->kind != INFOTYPE_CLASS) {
+                        syntaxerror("Couldn't find class %s::%s (%s)", v->type->package, v->type->name, name);
+                    }
+                    v->type = type;
+                }
+            }
+        }

     }
 }
 
     }
 }
 

@@ -936,6 +1056,10 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl
     if((mod->flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL))
         syntaxerror("public and internal not supported at the same time.");
     
     if((mod->flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL))
         syntaxerror("public and internal not supported at the same time.");
     

+    if((mod->flags&(FLAG_PROTECTED|FLAG_STATIC)) == (FLAG_PROTECTED|FLAG_STATIC))
+        syntaxerror("protected and static not supported at the same time.");
+    
+    //if(!(mod->flags&FLAG_INTERFACE) && !extends) {

     if(!(mod->flags&FLAG_INTERFACE) && !extends) {
         // all classes extend object
         extends = registry_getobjectclass();
     if(!(mod->flags&FLAG_INTERFACE) && !extends) {
         // all classes extend object
         extends = registry_getobjectclass();

@@ -959,8 +1083,9 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl
         state->cls = rfx_calloc(sizeof(classstate_t));
         state->cls->init = rfx_calloc(sizeof(methodstate_t));
         state->cls->static_init = rfx_calloc(sizeof(methodstate_t));
         state->cls = rfx_calloc(sizeof(classstate_t));
         state->cls->init = rfx_calloc(sizeof(methodstate_t));
         state->cls->static_init = rfx_calloc(sizeof(methodstate_t));

+        state->cls->static_init->is_static=FLAG_STATIC;

         /* notice: we make no effort to initialize the top variable (local0) here,
         /* notice: we make no effort to initialize the top variable (local0) here,

-           even though it has special meaning. We just rely on the facat
+           even though it has special meaning. We just rely on the fact

            that pass 1 won't do anything with variables */
         
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->cls);
            that pass 1 won't do anything with variables */
         
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->cls);

@@ -976,100 +1101,62 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl
         int num_interfaces = (list_length(implements));
         state->cls->info = classinfo_register(access, package, classname, num_interfaces);
         state->cls->info->flags |= mod->flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL);
         int num_interfaces = (list_length(implements));
         state->cls->info = classinfo_register(access, package, classname, num_interfaces);
         state->cls->info->flags |= mod->flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL);

+        state->cls->info->superclass = extends;
+        
+        int pos = 0;
+        classinfo_list_t*l = implements;
+        for(l=implements;l;l=l->next) {
+            state->cls->info->interfaces[pos++] = l->classinfo;
+        }

     }
     
     if(as3_pass == 2) {
         state->cls = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);
     }
     
     if(as3_pass == 2) {
         state->cls = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);

-        
-        state->method = state->cls->init;
+    

         parserassert(state->cls && state->cls->info);
        
         parserassert(state->cls && state->cls->info);
        

-        function_initvars(state->cls->init, 0, 0, 1);
-        function_initvars(state->cls->static_init, 0, 0, 0);
+        state->method = state->cls->static_init;
+
+        function_initvars(state->cls->init, 0, 0, 0, 1);
+        state->cls->static_init->variable_count=1;
+        function_initvars(state->cls->static_init, 0, 0, 0, 0);

 
         if(extends && (extends->flags & FLAG_FINAL))
             syntaxerror("Can't extend final class '%s'", extends->name);
 
         if(extends && (extends->flags & FLAG_FINAL))
             syntaxerror("Can't extend final class '%s'", extends->name);

-
-        /* fill out interfaces and extends (we couldn't resolve those during the first pass) */
-        state->cls->info->superclass = extends;
+        

         int pos = 0;
         int pos = 0;

-        classinfo_list_t*l = implements;
-        for(l=implements;l;l=l->next) {
-            if(!(l->classinfo->flags & FLAG_INTERFACE))
-                syntaxerror("'%s' is not an interface", l->classinfo->name);
-            state->cls->info->interfaces[pos++] = l->classinfo;
+        while(state->cls->info->interfaces[pos]) {
+            if(!(state->cls->info->interfaces[pos]->flags & FLAG_INTERFACE))
+                syntaxerror("'%s' is not an interface", 
+                    state->cls->info->interfaces[pos]->name);
+            pos++;

         }
 
         /* generate the abc code for this class */
         MULTINAME(classname2,state->cls->info);
         multiname_t*extends2 = sig2mname(extends);
 
         }
 
         /* generate the abc code for this class */
         MULTINAME(classname2,state->cls->info);
         multiname_t*extends2 = sig2mname(extends);
 

-        state->cls->abc = abc_class_new(global->file, &classname2, extends2);
+        /* don't add the class to the class index just yet- that will be done later
+           by initscript */
+        state->cls->abc = abc_class_new(0, &classname2, extends2);
+        state->cls->abc->file = global->file;
+
+        multiname_destroy(extends2);

         if(state->cls->info->flags&FLAG_FINAL) abc_class_final(state->cls->abc);
         if(!(state->cls->info->flags&FLAG_DYNAMIC)) abc_class_sealed(state->cls->abc);
         if(state->cls->info->flags&FLAG_INTERFACE) {
             abc_class_interface(state->cls->abc);
         }
 
         if(state->cls->info->flags&FLAG_FINAL) abc_class_final(state->cls->abc);
         if(!(state->cls->info->flags&FLAG_DYNAMIC)) abc_class_sealed(state->cls->abc);
         if(state->cls->info->flags&FLAG_INTERFACE) {
             abc_class_interface(state->cls->abc);
         }
 

-        abc_class_protectedNS(state->cls->abc, classname);
-

         for(mlist=implements;mlist;mlist=mlist->next) {
             MULTINAME(m, mlist->classinfo);
             abc_class_add_interface(state->cls->abc, &m);
         }
 
         for(mlist=implements;mlist;mlist=mlist->next) {
             MULTINAME(m, mlist->classinfo);
             abc_class_add_interface(state->cls->abc, &m);
         }
 

-        /* write the construction code for this class to the global init
-           function */
-        int slotindex = abc_initscript_addClassTrait(global->init, &classname2, state->cls->abc);
-
-        abc_method_body_t*m = global->init->method->body;
-        __ getglobalscope(m);
-        classinfo_t*s = extends;
-
-        int count=0;
-        
-        while(s) {
-            //TODO: take a look at the current scope stack, maybe 
-            //      we can re-use something
-            s = s->superclass;
-            if(!s) 
-            break;
-           
-            multiname_t*s2 = sig2mname(s);
-            __ getlex2(m, s2);
-            multiname_destroy(s2);
-
-            __ pushscope(m); count++;
-            m->code = m->code->prev->prev; // invert
-        }
-        /* continue appending after last op end */
-        while(m->code && m->code->next) m->code = m->code->next; 
-
-        /* TODO: if this is one of *our* classes, we can also 
-                 do a getglobalscope/getslot <nr> (which references
-                 the init function's slots) */
-        if(extends2) {
-            __ getlex2(m, extends2);
-            __ dup(m);
-            /* notice: we get a Verify Error #1107 if the top elemnt on the scope
-               stack is not the superclass */
-            __ pushscope(m);count++;
-        } else {
-            __ pushnull(m);
-            /* notice: we get a verify error #1107 if the top element on the scope 
-               stack is not the global object */
-            __ getlocal_0(m);
-            __ pushscope(m);count++;
-        }
-        __ newclass(m,state->cls->abc);
-        while(count--) {
-            __ popscope(m);
-        }
-        __ setslot(m, slotindex);
-        multiname_destroy(extends2);
+        state->cls->dependencies = parsedclass_new(state->cls->info, state->cls->abc);
+        list_append(global->classes, state->cls->dependencies);

 
         /* flash.display.MovieClip handling */
 
         /* flash.display.MovieClip handling */

-

         if(!as3_globalclass && (mod->flags&FLAG_PUBLIC) && slotinfo_equals((slotinfo_t*)registry_getMovieClip(),(slotinfo_t*)extends)) {
             if(state->package && state->package[0]) {
                 as3_globalclass = concat3(state->package, ".", classname);
         if(!as3_globalclass && (mod->flags&FLAG_PUBLIC) && slotinfo_equals((slotinfo_t*)registry_getMovieClip(),(slotinfo_t*)extends)) {
             if(state->package && state->package[0]) {
                 as3_globalclass = concat3(state->package, ".", classname);

@@ -1080,23 +1167,6 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl
     }
 }
 
     }
 }
 

-static int slotstate_varconst = 0;
-static modifiers_t*slotstate_flags = 0;
-static void setslotstate(modifiers_t* flags, int varconst)
-{
-    slotstate_varconst = varconst;
-    slotstate_flags = flags;
-    if(state->cls) {
-        if(flags && flags->flags&FLAG_STATIC) {
-            state->method = state->cls->static_init;
-        } else {
-            state->method = state->cls->init;
-        }
-    } else {
-        parserassert(state->method);
-    }
-}
-

 static void endclass()
 {
     if(as3_pass == 2) {
 static void endclass()
 {
     if(as3_pass == 2) {

@@ -1122,6 +1192,21 @@ static void endclass()
             code_t*c = method_header(state->cls->static_init);
             m->body->code = wrap_function(c, 0, m->body->code);
         }
             code_t*c = method_header(state->cls->static_init);
             m->body->code = wrap_function(c, 0, m->body->code);
         }

+      
+        trait_list_t*trait = state->cls->abc->traits;
+        /* switch all protected members to the protected ns of this class */
+        while(trait) {
+            trait_t*t = trait->trait;
+            if(t->name->ns->access == ACCESS_PROTECTED) {
+                if(!state->cls->abc->protectedNS) {
+                    char*n = concat3(state->cls->info->package, ":", state->cls->info->name);
+                    state->cls->abc->protectedNS = namespace_new_protected(n);
+                    state->cls->abc->flags |= CLASS_PROTECTED_NS;
+                }
+                t->name->ns->name = strdup(state->cls->abc->protectedNS->name);
+            }
+            trait = trait->next;
+        }

     }
 
     old_state();
     }
 
     old_state();

@@ -1138,6 +1223,12 @@ void check_code_for_break(code_t*c)
             char*name = string_cstr(c->data[0]);
             syntaxerror("Unresolved \"continue %s\"", name);
         }
             char*name = string_cstr(c->data[0]);
             syntaxerror("Unresolved \"continue %s\"", name);
         }

+        if(c->opcode == OPCODE___RETHROW__) {
+            syntaxerror("Unresolved \"rethrow\"");
+        }
+        if(c->opcode == OPCODE___FALLTHROUGH__) {
+            syntaxerror("Unresolved \"fallthrough\"");
+        }

         if(c->opcode == OPCODE___PUSHPACKAGE__) {
             char*name = string_cstr(c->data[0]);
             syntaxerror("Can't reference a package (%s) as such", name);
         if(c->opcode == OPCODE___PUSHPACKAGE__) {
             char*name = string_cstr(c->data[0]);
             syntaxerror("Can't reference a package (%s) as such", name);

@@ -1146,7 +1237,6 @@ void check_code_for_break(code_t*c)
     }
 }
 
     }
 }
 

-

 static void check_constant_against_type(classinfo_t*t, constant_t*c)
 {
 #define xassert(b) if(!(b)) syntaxerror("Invalid default value %s for type '%s'", constant_tostring(c), t->name)
 static void check_constant_against_type(classinfo_t*t, constant_t*c)
 {
 #define xassert(b) if(!(b)) syntaxerror("Invalid default value %s for type '%s'", constant_tostring(c), t->name)

@@ -1202,18 +1292,15 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c
     if(!state->cls) {
         //package method
         minfo = methodinfo_register_global(ns.access, state->package, name);
     if(!state->cls) {
         //package method
         minfo = methodinfo_register_global(ns.access, state->package, name);

-        minfo->return_type = 0; // save this for pass 2
+        minfo->return_type = return_type;

     } else if(getset != KW_GET && getset != KW_SET) {
         //class method
         memberinfo_t* m = registry_findmember(state->cls->info, ns.name, name, 0);
         if(m) {
     } else if(getset != KW_GET && getset != KW_SET) {
         //class method
         memberinfo_t* m = registry_findmember(state->cls->info, ns.name, name, 0);
         if(m) {

-            printf("%s.%s | %s.%s\n", 
-                m->package, m->name,
-                ns.name, name);

             syntaxerror("class already contains a %s '%s'", infotypename((slotinfo_t*)m), m->name);
         }
         minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name);
             syntaxerror("class already contains a %s '%s'", infotypename((slotinfo_t*)m), m->name);
         }
         minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name);

-        minfo->return_type = 0; // save this for pass 2 
+        minfo->return_type = return_type;

         // getslot on a member slot only returns "undefined", so no need
         // to actually store these
         //state->minfo->slot = state->method->abc->method->trait->slot_id;
         // getslot on a member slot only returns "undefined", so no need
         // to actually store these
         //state->minfo->slot = state->method->abc->method->trait->slot_id;

@@ -1230,7 +1317,7 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c
         // not sure wether to look into superclasses here, too
         minfo = (methodinfo_t*)registry_findmember(state->cls->info, ns.name, name, 1);
         if(minfo) {
         // not sure wether to look into superclasses here, too
         minfo = (methodinfo_t*)registry_findmember(state->cls->info, ns.name, name, 1);
         if(minfo) {

-            if(minfo->kind!=INFOTYPE_SLOT)
+            if(minfo->kind!=INFOTYPE_VAR)

                 syntaxerror("class already contains a method called '%s'", name);
             if(!(minfo->subtype & (SUBTYPE_GETSET)))
                 syntaxerror("class already contains a field called '%s'", name);
                 syntaxerror("class already contains a method called '%s'", name);
             if(!(minfo->subtype & (SUBTYPE_GETSET)))
                 syntaxerror("class already contains a field called '%s'", name);

@@ -1251,10 +1338,11 @@ static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, c
             }*/
         } else {
             minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name);
             }*/
         } else {
             minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name);

-            minfo->kind = INFOTYPE_SLOT; //hack
+            minfo->kind = INFOTYPE_VAR; //hack

             minfo->subtype = gs;
             minfo->subtype = gs;

-            minfo->return_type = 0;
+            minfo->return_type = type;

         }
         }

+

         /* can't assign a slot as getter and setter might have different slots */
         //minfo->slot = slot;
     }
         /* can't assign a slot as getter and setter might have different slots */
         //minfo->slot = slot;
     }

@@ -1270,19 +1358,28 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type)
     //parserassert(state->method && state->method->info);
 
     methodstate_t*parent_method = state->method;
     //parserassert(state->method && state->method->info);
 
     methodstate_t*parent_method = state->method;

+    variable_t*v = 0;

 
     if(as3_pass==1) {
         return_type = 0; // not valid in pass 1
 
     if(as3_pass==1) {
         return_type = 0; // not valid in pass 1

+        if(name) {
+            v = new_variable2(parent_method, name, 0, 0, 0);
+        }

     }
 
     new_state();
     state->new_vars = 1;
     }
 
     new_state();
     state->new_vars = 1;

+    state->allvars = dict_new();

    
     if(as3_pass == 1) {
         state->method = rfx_calloc(sizeof(methodstate_t));
         state->method->inner = 1;
    
     if(as3_pass == 1) {
         state->method = rfx_calloc(sizeof(methodstate_t));
         state->method->inner = 1;

+        state->method->is_static = parent_method->is_static;

         state->method->variable_count = 0;
         state->method->abc = rfx_calloc(sizeof(abc_method_t));
         state->method->variable_count = 0;
         state->method->abc = rfx_calloc(sizeof(abc_method_t));

+        if(v) {
+            v->is_inner_method = state->method;
+        }

 
         NEW(methodinfo_t,minfo);
         minfo->kind = INFOTYPE_METHOD;
 
         NEW(methodinfo_t,minfo);
         minfo->kind = INFOTYPE_METHOD;

@@ -1295,7 +1392,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type)
 
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);
     
 
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);
     

-        function_initvars(state->method, params, 0, 1);
+        function_initvars(state->method, 1, params, 0, 1);

     }
 
     if(as3_pass == 2) {
     }
 
     if(as3_pass == 2) {

@@ -1304,7 +1401,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type)
         parserassert(state->method);
 
         state->method->info->return_type = return_type;
         parserassert(state->method);
 
         state->method->info->return_type = return_type;

-        function_initvars(state->method, params, 0, 1);
+        function_initvars(state->method, 1, params, 0, 1);

     }
 }
 
     }
 }
 

@@ -1316,10 +1413,12 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name,
     }
     new_state();
     state->new_vars = 1;
     }
     new_state();
     state->new_vars = 1;

-    
+    state->allvars = dict_new();
+

     if(as3_pass == 1) {
         state->method = rfx_calloc(sizeof(methodstate_t));
         state->method->has_super = 0;
     if(as3_pass == 1) {
         state->method = rfx_calloc(sizeof(methodstate_t));
         state->method->has_super = 0;

+        state->method->is_static = mod->flags&FLAG_STATIC;

 
         if(state->cls) {
             state->method->is_constructor = !strcmp(state->cls->info->name,name);
 
         if(state->cls) {
             state->method->is_constructor = !strcmp(state->cls->info->name,name);

@@ -1332,7 +1431,7 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name,
 
         state->method->info = registerfunction(getset, mod, name, params, return_type, 0);
        
 
         state->method->info = registerfunction(getset, mod, name, params, return_type, 0);
        

-        function_initvars(state->method, params, mod->flags, 1);
+        function_initvars(state->method, 1, params, mod->flags, 1);

         
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);
     }
         
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);
     }

@@ -1351,67 +1450,76 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name,
             state->cls->has_constructor |= state->method->is_constructor;
         }
         
             state->cls->has_constructor |= state->method->is_constructor;
         }
         

-        state->method->info->return_type = return_type;
-        function_initvars(state->method, params, mod->flags, 1);
+        function_initvars(state->method, 1, params, mod->flags, 1);

     } 
 }
 
     } 
 }
 

+static void insert_unresolved(methodstate_t*m, dict_t*xvars, dict_t*allvars)
+{
+    parserassert(m->inner);
+    if(m->unresolved_variables) {
+        dict_t*d = m->unresolved_variables;
+        int t;
+        DICT_ITERATE_KEY(d, char*, id) {
+            /* check parent method's variables */
+            variable_t*v;
+            if(dict_contains(allvars, id)) {
+                m->uses_parent_function = 1;
+                state->method->uses_slots = 1;
+                dict_put(xvars, id, 0);
+            }
+        }
+    }
+    methodstate_list_t*ml = m->innerfunctions;
+    while(ml) {
+        insert_unresolved(ml->methodstate, xvars, allvars);
+        ml = ml->next;
+    }
+}
+

 static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*name,
                           params_t*params, classinfo_t*return_type, code_t*body)
 {
 static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*name,
                           params_t*params, classinfo_t*return_type, code_t*body)
 {

-    int flags = mod?mod->flags:0;
-

     if(as3_pass==1) {
     if(as3_pass==1) {

-        // store inner methods in variables
-        function_initvars(state->method, 0, 0, 0);
-
-        methodstate_list_t*ml = state->method->innerfunctions;
-        

         dict_t*xvars = dict_new();
         dict_t*xvars = dict_new();

-
-        while(ml) {
-            methodstate_t*m = ml->methodstate;
-            parserassert(m->inner);
-            if(m->unresolved_variables) {
-                dict_t*d = m->unresolved_variables;
-                int t;
-                for(t=0;t<d->hashsize;t++) {
-                    dictentry_t*l = d->slots[t]; 
-                    while(l) {
-                        /* check parent method's variables */
-                        variable_t*v;
-                        if((v=find_variable(state, l->key))) {
-                            m->uses_parent_function = 1;
-                            state->method->uses_slots = 1;
-                            dict_put(xvars, l->key, 0);
-                        }
-                        l = l->next;
+        
+        if(state->method->unresolved_variables) {
+            DICT_ITERATE_KEY(state->method->unresolved_variables, char*, vname) {
+                if(!state->method->no_variable_scoping && dict_contains(state->allvars, vname)) {
+                    variable_t*v = dict_lookup(state->allvars, vname);
+                    if(!v->is_inner_method) {
+                        state->method->no_variable_scoping = 1;
+                        as3_warning("function %s uses forward or outer block variable references (%s): switching into compatiblity mode", name, vname);

                     }
                     }

-                    if(l) break;

                 }
                 }

-
-                dict_destroy(m->unresolved_variables);
-                m->unresolved_variables = 0;

             }
             }

+        }
+
+        methodstate_list_t*ml = state->method->innerfunctions;
+        while(ml) {
+            insert_unresolved(ml->methodstate, xvars, state->allvars);

             ml = ml->next;
         }
         
         if(state->method->uses_slots) {
             state->method->slots = dict_new();
             int i = 1;
             ml = ml->next;
         }
         
         if(state->method->uses_slots) {
             state->method->slots = dict_new();
             int i = 1;

-            DICT_ITERATE_ITEMS(state->vars, char*, name, variable_t*, v) {
+            DICT_ITERATE_ITEMS(state->allvars, char*, name, variable_t*, v) {
+                if(!name) syntaxerror("internal error");

                 if(v->index && dict_contains(xvars, name)) {
                 if(v->index && dict_contains(xvars, name)) {

-                    v->init = 0;
-                    v->index = i++;
+                    v->init = v->kill = 0;
+                    v->index = i;

                     if(v->is_inner_method) {
                     if(v->is_inner_method) {

-                        v->is_inner_method->is_a_slot = 1;
+                        v->is_inner_method->is_a_slot = i;

                     }
                     }

-                    //v->type = 0;
+                    i++;

                     dict_put(state->method->slots, name, v);
                 }
             }
             state->method->uses_slots = i;
             dict_destroy(state->vars);state->vars = 0;
                     dict_put(state->method->slots, name, v);
                 }
             }
             state->method->uses_slots = i;
             dict_destroy(state->vars);state->vars = 0;

+            parserassert(state->new_vars);
+            dict_destroy(state->allvars);state->allvars = 0;

         }
         old_state();
         return 0;
         }
         old_state();
         return 0;

@@ -1432,10 +1540,9 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*
         } else if(state->method->is_constructor) {
             f = abc_class_getconstructor(state->cls->abc, type2);
         } else if(!state->method->is_global) {
         } else if(state->method->is_constructor) {
             f = abc_class_getconstructor(state->cls->abc, type2);
         } else if(!state->method->is_global) {

-            namespace_t mname_ns = {state->method->info->access, ""};
-            multiname_t mname = {QNAME, &mname_ns, 0, name};
-
-            if(flags&FLAG_STATIC)
+            namespace_t ns = modifiers2access(mod);
+            multiname_t mname = {QNAME, &ns, 0, name};
+            if(mod->flags&FLAG_STATIC)

                 f = abc_class_staticmethod(state->cls->abc, type2, &mname);
             else
                 f = abc_class_method(state->cls->abc, type2, &mname);
                 f = abc_class_staticmethod(state->cls->abc, type2, &mname);
             else
                 f = abc_class_method(state->cls->abc, type2, &mname);

@@ -1445,16 +1552,18 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*
             multiname_t mname = {QNAME, &mname_ns, 0, name};
 
             f = abc_method_new(global->file, type2, 1);
             multiname_t mname = {QNAME, &mname_ns, 0, name};
 
             f = abc_method_new(global->file, type2, 1);

+            if(!global->init) global->init = abc_initscript(global->file);

             trait_t*t = trait_new_method(&global->init->traits, multiname_clone(&mname), f);
             //abc_code_t*c = global->init->method->body->code;
         }
         //flash doesn't seem to allow us to access function slots
         //state->method->info->slot = slot;
 
             trait_t*t = trait_new_method(&global->init->traits, multiname_clone(&mname), f);
             //abc_code_t*c = global->init->method->body->code;
         }
         //flash doesn't seem to allow us to access function slots
         //state->method->info->slot = slot;
 

-        if(flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE;
+        if(mod && mod->flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE;

         if(getset == KW_GET) f->trait->kind = TRAIT_GETTER;
         if(getset == KW_SET) f->trait->kind = TRAIT_SETTER;
         if(params->varargs) f->flags |= METHOD_NEED_REST;
         if(getset == KW_GET) f->trait->kind = TRAIT_GETTER;
         if(getset == KW_SET) f->trait->kind = TRAIT_SETTER;
         if(params->varargs) f->flags |= METHOD_NEED_REST;

+        if(state->method->need_arguments) f->flags |= METHOD_NEED_ARGUMENTS;

 
         char opt=0;
         param_list_t*p=0;
 
         char opt=0;
         param_list_t*p=0;

@@ -1468,7 +1577,7 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*
                 check_constant_against_type(p->param->type, p->param->value);
                 opt=1;list_append(f->optional_parameters, p->param->value);
             } else if(opt) {
                 check_constant_against_type(p->param->type, p->param->value);
                 opt=1;list_append(f->optional_parameters, p->param->value);
             } else if(opt) {

-                syntaxerror("non-optional parameter not allowed after optional parameters");
+                syntaxerror("function %s: non-optional parameter not allowed after optional parameters", name);

             }
         }
         if(state->method->slots) {
             }
         }
         if(state->method->slots) {

@@ -1484,11 +1593,10 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*
 
         check_code_for_break(body);
 
 
         check_code_for_break(body);
 

-        if(state->method->exceptions &&
-           (state->method->late_binding || state->method->uses_slots)) {
-           //syntaxerror("try/catch and activation or late binding not supported yet within the same method");
-           as3_warning("try/catch and activation or late binding not supported yet within the same method");
-        }
+        /* Seems this works now.
+        if(state->method->exceptions && state->method->uses_slots) {
+           as3_warning("try/catch and activation not supported yet within the same method");
+        }*/

 
         if(f->body) {
             f->body->code = body;
 
         if(f->body) {
             f->body->code = body;

@@ -1505,11 +1613,6 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*
     return 0;
 }
 
     return 0;
 }
 

-char is_subtype_of(classinfo_t*type, classinfo_t*supertype)
-{
-    return 1; // FIXME
-}
-

 void breakjumpsto(code_t*c, char*name, code_t*jump) 
 {
     while(c) {
 void breakjumpsto(code_t*c, char*name, code_t*jump) 
 {
     while(c) {

@@ -1537,30 +1640,7 @@ void continuejumpsto(code_t*c, char*name, code_t*jump)
     }
 }
 
     }
 }
 

-#define IS_INT(a) (TYPE_IS_INT((a)) || TYPE_IS_UINT((a)))
-#define IS_NUMBER_OR_INT(a) (TYPE_IS_INT((a)) || TYPE_IS_UINT((a)) || TYPE_IS_NUMBER((a)))
-#define BOTH_INT(a,b) (IS_INT(a) && IS_INT(b))
-
-classinfo_t*join_types(classinfo_t*type1, classinfo_t*type2, char op)
-{
-    if(!type1 || !type2) 
-        return registry_getanytype();
-    if(TYPE_IS_ANY(type1) || TYPE_IS_ANY(type2))
-        return registry_getanytype();
-
-    if(op=='+') {
-        if(IS_NUMBER_OR_INT(type1) && IS_NUMBER_OR_INT(type2)) {
-            return TYPE_NUMBER;
-        } else {
-            return TYPE_ANY;
-        }
-    }
-
-    if(type1 == type2)
-        return type1;
-    return registry_getanytype();
-}
-code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to)
+code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to)

 {
     if(from==to)
         return c;
 {
     if(from==to)
         return c;

@@ -1577,15 +1657,35 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to)
     if((TYPE_IS_NUMBER(from) || TYPE_IS_UINT(from) || TYPE_IS_INT(from)) &&
        (TYPE_IS_NUMBER(to) || TYPE_IS_UINT(to) || TYPE_IS_INT(to))) {
         // allow conversion between number types
     if((TYPE_IS_NUMBER(from) || TYPE_IS_UINT(from) || TYPE_IS_INT(from)) &&
        (TYPE_IS_NUMBER(to) || TYPE_IS_UINT(to) || TYPE_IS_INT(to))) {
         // allow conversion between number types

+        if(TYPE_IS_UINT(to))
+            return abc_convert_u(c);
+        else if(TYPE_IS_INT(to))
+            return abc_convert_i(c);
+        else if(TYPE_IS_NUMBER(to))
+            return abc_convert_d(c);

         return abc_coerce2(c, &m);
     }
         return abc_coerce2(c, &m);
     }

-    //printf("%s.%s\n", from.package, from.name);
-    //printf("%s.%s\n", to.package, to.name);
+
+    if(TYPE_IS_XMLLIST(to) && TYPE_IS_XML(from))
+        return c;
+
+    if(TYPE_IS_BOOLEAN(to))
+        return abc_convert_b(c);
+    if(TYPE_IS_STRING(to))
+        return abc_convert_s(c);
+    if(TYPE_IS_OBJECT(to))
+        return abc_coerce2(c, &m);
+    if(TYPE_IS_OBJECT(from) && TYPE_IS_XMLLIST(to))
+        return abc_coerce2(c, &m);
+    if(TYPE_IS_OBJECT(from) && TYPE_IS_ARRAY(to))
+        return abc_coerce2(c, &m);

 
     classinfo_t*supertype = from;
     while(supertype) {
         if(supertype == to) {
 
     classinfo_t*supertype = from;
     while(supertype) {
         if(supertype == to) {

-             // target type is one of from's superclasses
+             /* target type is one of from's superclasses.
+                (not sure we need this coerce - as far as the verifier
+                 is concerned, object==object (i think) */

              return abc_coerce2(c, &m);
         }
         int t=0;
              return abc_coerce2(c, &m);
         }
         int t=0;

@@ -1606,29 +1706,21 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to)
         return c;
 
     as3_error("can't convert type %s%s%s to %s%s%s", 
         return c;
 
     as3_error("can't convert type %s%s%s to %s%s%s", 

-        from->package, from->package?".":"", from->name, 
-        to->package, to->package?".":"", to->name);
+        from->package, from->package[0]?".":"", from->name, 
+        to->package, to->package[0]?".":"", to->name);
+

     return c;
 }
     return c;
 }

-
-code_t*defaultvalue(code_t*c, classinfo_t*type)
+code_t* coerce_to_type(code_t*c, classinfo_t*t)

 {
 {

-    if(TYPE_IS_INT(type)) {
-       c = abc_pushbyte(c, 0);
-    } else if(TYPE_IS_UINT(type)) {
-       c = abc_pushuint(c, 0);
-    } else if(TYPE_IS_FLOAT(type)) {
-       c = abc_pushnan(c);
-    } else if(TYPE_IS_BOOLEAN(type)) {
-       c = abc_pushfalse(c);
-    } else if(!type) {
-       //c = abc_pushundefined(c);
+    if(!t) {
+        return abc_coerce_a(c);
+    } else if(TYPE_IS_STRING(t)) {
+        return abc_coerce_s(c);

     } else {
     } else {

-       c = abc_pushnull(c);
-       MULTINAME(m, type);
-       c = abc_coerce2(c, &m);
+        MULTINAME(m, t);
+        return abc_coerce2(c, &m);

     }
     }

-    return c;

 }
 
 char is_pushundefined(code_t*c)
 }
 
 char is_pushundefined(code_t*c)

@@ -1636,6 +1728,36 @@ char is_pushundefined(code_t*c)
     return (c && !c->prev && !c->next && c->opcode == OPCODE_PUSHUNDEFINED);
 }
 
     return (c && !c->prev && !c->next && c->opcode == OPCODE_PUSHUNDEFINED);
 }
 

+static const char* get_package_from_name(const char*name)
+{
+    /* try explicit imports */
+    dictentry_t* e = dict_get_slot(state->imports, name);
+    while(e) {
+        if(!strcmp(e->key, name)) {
+            slotinfo_t*c = (slotinfo_t*)e->data;
+            if(c) return c->package;
+        }
+        e = e->next;
+    }
+    return 0;
+}
+static namespace_list_t*get_current_imports()
+{
+    namespace_list_t*searchlist = 0;
+    
+    list_append(searchlist, namespace_new_package(state->package));
+
+    import_list_t*l = state->wildcard_imports;
+    while(l) {
+        namespace_t*ns = namespace_new_package(l->import->package);
+        list_append(searchlist, ns);
+        l = l->next;
+    }
+    list_append(searchlist, namespace_new_package(""));
+    list_append(searchlist, namespace_new_package(internal_filename_package));
+    return searchlist;
+}
+

 static slotinfo_t* find_class(const char*name)
 {
     slotinfo_t*c=0;
 static slotinfo_t* find_class(const char*name)
 {
     slotinfo_t*c=0;

@@ -1686,6 +1808,7 @@ typedcode_t push_class(slotinfo_t*a)
             infotypename(a), a->name, a->package, state->package);
     }
 
             infotypename(a), a->name, a->package, state->package);
     }
 

+

     if(a->kind != INFOTYPE_CLASS) {
         MULTINAME(m, a);
         x.c = abc_findpropstrict2(x.c, &m);
     if(a->kind != INFOTYPE_CLASS) {
         MULTINAME(m, a);
         x.c = abc_findpropstrict2(x.c, &m);

@@ -1697,9 +1820,16 @@ typedcode_t push_class(slotinfo_t*a)
             varinfo_t*v = (varinfo_t*)a;
             x.t = v->type;
         }
             varinfo_t*v = (varinfo_t*)a;
             x.t = v->type;
         }

+        return x;

     } else {
     } else {

+        if(state->cls && state->method == state->cls->static_init) {
+            /* we're in the static initializer. 
+               record the fact that we're using this class here */
+            parsedclass_add_dependency(state->cls->dependencies, (classinfo_t*)a);
+        }

         classinfo_t*c = (classinfo_t*)a;
         classinfo_t*c = (classinfo_t*)a;

-        if(c->slot) {
+        //if(c->slot) {
+        if(0) { //Error #1026: Slot 1 exceeds slotCount=0 of global

             x.c = abc_getglobalscope(x.c);
             x.c = abc_getslot(x.c, c->slot);
         } else {
             x.c = abc_getglobalscope(x.c);
             x.c = abc_getslot(x.c, c->slot);
         } else {

@@ -1711,175 +1841,6 @@ typedcode_t push_class(slotinfo_t*a)
     return x;
 }
 
     return x;
 }
 

-static char is_getlocal(code_t*c)
-{
-    if(!c || c->prev || c->next)
-        return 0;
-    return(c->opcode == OPCODE_GETLOCAL
-        || c->opcode == OPCODE_GETLOCAL_0
-        || c->opcode == OPCODE_GETLOCAL_1
-        || c->opcode == OPCODE_GETLOCAL_2
-        || c->opcode == OPCODE_GETLOCAL_3);
-}
-static int getlocalnr(code_t*c)
-{
-    if(c->opcode == OPCODE_GETLOCAL) {return (ptroff_t)c->data[0];}
-    else if(c->opcode == OPCODE_GETLOCAL_0) {return 0;}
-    else if(c->opcode == OPCODE_GETLOCAL_1) {return 1;}
-    else if(c->opcode == OPCODE_GETLOCAL_2) {return 2;}
-    else if(c->opcode == OPCODE_GETLOCAL_3) {return 3;}
-    else syntaxerror("Internal error: opcode %02x is not a getlocal call", c->opcode);
-    return 0;
-}
-
-static code_t* toreadwrite(code_t*in, code_t*middlepart, char justassign, char readbefore)
-{
-    /* converts this:
-
-       [prefix code] [read instruction]
-
-       to this:
-
-       [prefix code] ([dup]) [read instruction] [middlepart] [setvar] [write instruction] [getvar]
-    */
-    if(in && in->opcode == OPCODE_COERCE_A) {
-        in = code_cutlast(in);
-    }
-    if(in->next)
-        syntaxerror("internal error");
-
-    /* chop off read instruction */
-    code_t*prefix = in;
-    code_t*r = in;
-    if(r->prev) {
-        prefix = r->prev;r->prev = 0;
-        prefix->next=0;
-    } else {
-        prefix = 0;
-    }
-        
-    char use_temp_var = readbefore;
-
-    /* generate the write instruction, and maybe append a dup to the prefix code */
-    code_t* write = abc_nop(0);
-    if(r->opcode == OPCODE_GETPROPERTY) {
-        write->opcode = OPCODE_SETPROPERTY;
-        multiname_t*m = (multiname_t*)r->data[0];
-        write->data[0] = multiname_clone(m);
-        if(m->type == QNAME || m->type == MULTINAME) {
-            if(!justassign) {
-                prefix = abc_dup(prefix); // we need the object, too
-            }
-            use_temp_var = 1;
-        } else if(m->type == MULTINAMEL) {
-            if(!justassign) {
-                /* dupping two values on the stack requires 5 operations and one register- 
-                   couldn't adobe just have given us a dup2? */
-                int temp = gettempvar();
-                prefix = abc_setlocal(prefix, temp);
-                prefix = abc_dup(prefix);
-                prefix = abc_getlocal(prefix, temp);
-                prefix = abc_swap(prefix);
-                prefix = abc_getlocal(prefix, temp);
-                if(!use_temp_var);
-                    prefix = abc_kill(prefix, temp);
-            }
-            use_temp_var = 1;
-        } else {
-            syntaxerror("illegal lvalue: can't assign a value to this expression (not a qname/multiname)");
-        }
-    } else if(r->opcode == OPCODE_GETSLOT) {
-        write->opcode = OPCODE_SETSLOT;
-        write->data[0] = r->data[0];
-        if(!justassign) {
-            prefix = abc_dup(prefix); // we need the object, too
-        }
-        use_temp_var = 1;
-    } else if(r->opcode == OPCODE_GETLOCAL) { 
-        write->opcode = OPCODE_SETLOCAL;
-        write->data[0] = r->data[0];
-    } else if(r->opcode == OPCODE_GETLOCAL_0) { 
-        write->opcode = OPCODE_SETLOCAL_0;
-    } else if(r->opcode == OPCODE_GETLOCAL_1) { 
-        write->opcode = OPCODE_SETLOCAL_1;
-    } else if(r->opcode == OPCODE_GETLOCAL_2) { 
-        write->opcode = OPCODE_SETLOCAL_2;
-    } else if(r->opcode == OPCODE_GETLOCAL_3) { 
-        write->opcode = OPCODE_SETLOCAL_3;
-    } else if(r->opcode == OPCODE_GETSUPER) { 
-        write->opcode = OPCODE_SETSUPER;
-        multiname_t*m = (multiname_t*)r->data[0];
-        write->data[0] = multiname_clone(m);
-    } else {
-        code_dump(r);
-        syntaxerror("illegal lvalue: can't assign a value to this expression");
-    }
-    code_t* c = 0;
-    
-    int temp = -1;
-    if(!justassign) {
-        if(use_temp_var) {
-            /* with getproperty/getslot, we have to be extra careful not
-               to execute the read code twice, as it might have side-effects
-               (e.g. if the property is in fact a setter/getter combination)
-
-               So read the value, modify it, and write it again,
-               using prefix only once and making sure (by using a temporary
-               register) that the return value is what we just wrote */
-            temp = gettempvar();
-            c = code_append(c, prefix);
-            c = code_append(c, r);
-            if(readbefore) {
-                c = abc_dup(c);
-                c = abc_setlocal(c, temp);
-            }
-            c = code_append(c, middlepart);
-            if(!readbefore) {
-                c = abc_dup(c);
-                c = abc_setlocal(c, temp);
-            }
-            c = code_append(c, write);
-            c = abc_getlocal(c, temp);
-            c = abc_kill(c, temp);
-        } else {
-            /* if we're allowed to execute the read code twice *and*
-               the middlepart doesn't modify the code, things are easier.
-            */
-            code_t* r2 = code_dup(r);
-            //c = code_append(c, prefix);
-            parserassert(!prefix);
-            c = code_append(c, r);
-            c = code_append(c, middlepart);
-            c = code_append(c, write);
-            c = code_append(c, r2);
-        }
-    } else {
-        /* even smaller version: overwrite the value without reading
-           it out first */
-        if(!use_temp_var) {
-            if(prefix) {
-                c = code_append(c, prefix);
-                c = abc_dup(c);
-            }
-            c = code_append(c, middlepart);
-            c = code_append(c, write);
-            c = code_append(c, r);
-        } else {
-            code_free(r);r=0;
-            temp = gettempvar();
-            if(prefix) {
-                c = code_append(c, prefix);
-            }
-            c = code_append(c, middlepart);
-            c = abc_dup(c);
-            c = abc_setlocal(c, temp);
-            c = code_append(c, write);
-            c = abc_getlocal(c, temp);
-            c = abc_kill(c, temp);
-        }
-    }
-    return c;
-}

 
 char is_break_or_jump(code_t*c)
 {
 
 char is_break_or_jump(code_t*c)
 {

@@ -1896,7 +1857,6 @@ char is_break_or_jump(code_t*c)
     return 0;
 }
 
     return 0;
 }
 

-

 #define IS_FINALLY_TARGET(op) \
         ((op) == OPCODE___CONTINUE__ || \
          (op) == OPCODE___BREAK__ || \
 #define IS_FINALLY_TARGET(op) \
         ((op) == OPCODE___CONTINUE__ || \
          (op) == OPCODE___BREAK__ || \

@@ -2004,10 +1964,10 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar)
     int lookup_version_cost = 4*num_insertion_points + 5;
 
     if(cantdup || simple_version_cost > lookup_version_cost) {
     int lookup_version_cost = 4*num_insertion_points + 5;
 
     if(cantdup || simple_version_cost > lookup_version_cost) {

-        printf("lookup %d > *%d*\n", simple_version_cost, lookup_version_cost);
+        //printf("(use lookup) simple=%d > lookup=%d\n", simple_version_cost, lookup_version_cost);

         return insert_finally_lookup(c, finally, tempvar);
     } else {
         return insert_finally_lookup(c, finally, tempvar);
     } else {

-        printf("simple *%d* < %d\n", simple_version_cost, lookup_version_cost);
+        //printf("(use simple) simple=%d < lookup=%d\n", simple_version_cost, lookup_version_cost);

         return insert_finally_simple(c, finally, tempvar);
     }
 }
         return insert_finally_simple(c, finally, tempvar);
     }
 }

@@ -2015,13 +1975,255 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar)
 #define PASS1 }} if(as3_pass == 1) {{
 #define PASS1END }} if(as3_pass == 2) {{
 #define PASS2 }} if(as3_pass == 2) {{
 #define PASS1 }} if(as3_pass == 1) {{
 #define PASS1END }} if(as3_pass == 2) {{
 #define PASS2 }} if(as3_pass == 2) {{

-#define PASS12 }} {{
+#define PASS12 }} if(as3_pass == 1 || as3_pass == 2) {{

 #define PASS12END }} if(as3_pass == 2) {{
 #define PASS12END }} if(as3_pass == 2) {{

+#define PASS_ALWAYS }} {{

 
 
 
 /* Line 273 of skeleton.m4  */
 
 
 
 /* Line 273 of skeleton.m4  */

-#line 2025 "parser.tab.c"
+#line 1986 "parser.tab.c"
+/* Unqualified %code blocks.  */
+
+/* Line 274 of skeleton.m4  */
+#line 2077 "parser.y"
+
+    char is_subtype_of(classinfo_t*type, classinfo_t*supertype)
+    {
+        return 1; // FIXME
+    }
+    char do_init_variable(char*name)
+    {
+        if(!state->method->no_variable_scoping)
+            return 0;
+        if(!state->new_vars)
+            return 1;
+        return 1;
+    }
+
+
+/* Line 274 of skeleton.m4  */
+#line 2528 "parser.y"
+
+    static void state_has_imports()
+    {
+        state->wildcard_imports = list_clone(state->wildcard_imports);
+        state->imports = dict_clone(state->imports);
+        state->has_own_imports = 1;
+    }
+    static void import_toplevel(const char*package)
+    {
+        char* s = strdup(package);
+        while(1) {
+            dict_put(state->import_toplevel_packages, s, 0);
+            char*x = strrchr(s, '.');
+            if(!x)
+                break;
+            *x = 0;
+        }
+        free(s);
+    }
+
+
+/* Line 274 of skeleton.m4  */
+#line 2667 "parser.y"
+
+    static int slotstate_varconst = 0;
+    static modifiers_t*slotstate_flags = 0;
+    static void setslotstate(modifiers_t* flags, int varconst)
+    {
+        slotstate_varconst = varconst;
+        slotstate_flags = flags;
+        if(state->cls) {
+            if(flags) {
+                if(flags->flags&FLAG_STATIC) {
+                    state->method = state->cls->static_init;
+                } else {
+                    state->method = state->cls->init;
+                }
+            } else {
+                // reset to "default" state (all in class code is static by default) */
+                state->method = state->cls->static_init;
+            }
+        } else {
+            parserassert(state->method);
+        }
+    }
+    static trait_t* add_abc_slot(modifiers_t* modifiers, const char*name, multiname_t*m, code_t***c)
+    {
+        int flags = modifiers->flags;
+        namespace_t ns = modifiers2access(modifiers);
+
+        /* slot name */
+        multiname_t mname = {QNAME, &ns, 0, name};
+      
+        trait_list_t**traits;
+        code_t**code=0;
+        if(!state->cls) {
+            // global variable
+            if(!global->init) global->init = abc_initscript(global->file);
+            ns.name = state->package;
+            traits = &global->init->traits;
+            code = &global->init->method->body->code;
+        } else if(flags&FLAG_STATIC) {
+            // static variable
+            traits = &state->cls->abc->static_traits;
+            code = &state->cls->static_init->header;
+        } else {
+            // instance variable
+            traits = &state->cls->abc->traits;
+            code = &state->cls->init->header;
+            
+            if(ns.access == ACCESS_PROTECTED) {
+                ns.name = concat3(state->cls->info->package,":",state->cls->info->name);
+            }
+        }
+        if(c)
+            *c = code;
+        if(m) 
+            *m = *multiname_clone(&mname);
+            
+        return trait_new_member(traits, 0, multiname_clone(&mname), 0);
+    }
+
+
+/* Line 274 of skeleton.m4  */
+#line 2847 "parser.y"
+
+    static int xml_level = 0;
+
+
+/* Line 274 of skeleton.m4  */
+#line 3655 "parser.y"
+
+    node_t* resolve_identifier(char*name)
+    {
+        typedcode_t o;
+        o.t = 0;
+        o.c = 0;
+
+        slotinfo_t*a = 0;
+        memberinfo_t*f = 0;
+
+        variable_t*v;
+        /* look at variables */
+        if((v = find_variable(state, name))) {
+            // name is a local variable
+            o.c = abc_getlocal(o.c, v->index);
+            o.t = v->type;
+            return mkcodenode(o);
+        }
+        if((v = find_slot(state->method, name))) {
+            o.c = abc_getscopeobject(o.c, 1);
+            o.c = abc_getslot(o.c, v->index);
+            o.t = v->type;
+            return mkcodenode(o);
+        }
+
+        int i_am_static = state->method->is_static;
+
+        /* look at current class' members */
+        if(!state->method->inner && 
+           !state->xmlfilter &&
+            state->cls && 
+            (f = findmember_nsset(state->cls->info, name, 1)))
+        {
+            // name is a member or attribute in this class
+            int var_is_static = (f->flags&FLAG_STATIC);
+
+            if(f->kind == INFOTYPE_VAR && (f->flags&FLAG_CONST)) {
+                /* if the variable is a constant (and we know what is evaluates to), we
+                   can just use the value itself */
+                varinfo_t*v = (varinfo_t*)f;
+                if(v->value) {
+                    return mkconstnode(v->value);
+                }
+            }
+           
+            if(var_is_static >= i_am_static) {
+                if(f->kind == INFOTYPE_METHOD) {
+                    o.t = TYPE_FUNCTION(f);
+                } else {
+                    o.t = f->type;
+                }
+
+                if(var_is_static && !i_am_static) {
+                /* access to a static member from a non-static location.
+                   do this via findpropstrict:
+                   there doesn't seem to be any non-lookup way to access
+                   static properties of a class */
+                    state->method->late_binding = 1;
+                    o.t = f->type;
+                    namespace_t ns = {f->access, f->package};
+                    multiname_t m = {QNAME, &ns, 0, name};
+                    o.c = abc_findpropstrict2(o.c, &m);
+                    o.c = abc_getproperty2(o.c, &m);
+                    return mkcodenode(o);
+                } else if(f->slot>0) {
+                    o.c = abc_getlocal_0(o.c);
+                    o.c = abc_getslot(o.c, f->slot);
+                    return mkcodenode(o);
+                } else {
+                    MEMBER_MULTINAME(m, f, name);
+                    o.c = abc_getlocal_0(o.c);
+                    o.c = abc_getproperty2(o.c, &m);
+                    return mkcodenode(o);
+                }
+            }
+        } 
+        
+        /* look at actual classes, in the current package and imported */
+        if(!state->xmlfilter && (a = find_class(name))) {
+            if(state->cls && state->cls->info == (classinfo_t*)a && i_am_static) {
+                o.c = abc_getlocal_0(0);
+                o.t = TYPE_CLASS((classinfo_t*)a);
+            } else {
+                o = push_class(a);
+            }
+            return mkcodenode(o);
+        }
+
+        /* look through package prefixes */
+        if(!state->xmlfilter && 
+           (dict_contains(state->import_toplevel_packages, name) || 
+            registry_ispackage(name))) {
+            o.c = abc___pushpackage__(o.c, name);
+            o.t = 0;
+            return mkcodenode(o); //?
+        }
+
+        /* unknown object, let the avm2 resolve it */
+        if(1) {
+            if(!state->method->inner && !state->xmlfilter) {
+                /* we really should make inner functions aware of the class context */
+                as3_warning("Couldn't resolve '%s', doing late binding", name);
+            }
+            state->method->late_binding = 1;
+                    
+            multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, name};
+
+            o.t = 0;
+            o.c = abc_findpropstrict2(o.c, &m);
+            o.c = abc_getproperty2(o.c, &m);
+            return mkcodenode(o);
+        }
+    }
+
+
+/* Line 274 of skeleton.m4  */
+#line 3795 "parser.y"
+
+    void add_active_url(const char*url)
+    {
+        NEW(namespace_t,n);
+        n->name = url;
+        list_append(state->active_namespace_urls, n);
+    }
+
+
+
+/* Line 274 of skeleton.m4  */
+#line 2227 "parser.tab.c"

 
 #ifdef short
 # undef short
 
 #ifdef short
 # undef short

@@ -2234,22 +2436,22 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
 #endif
 
 /* YYFINAL -- State number of the termination state.  */

-#define YYFINAL  145
+#define YYFINAL  164

 /* YYLAST -- Last index in YYTABLE.  */
 /* YYLAST -- Last index in YYTABLE.  */

-#define YYLAST   2999
+#define YYLAST   3411

 
 /* YYNTOKENS -- Number of terminals.  */
 
 /* YYNTOKENS -- Number of terminals.  */

-#define YYNTOKENS  134
+#define YYNTOKENS  136

 /* YYNNTS -- Number of nonterminals.  */
 /* YYNNTS -- Number of nonterminals.  */

-#define YYNNTS  113
+#define YYNNTS  135

 /* YYNRULES -- Number of rules.  */
 /* YYNRULES -- Number of rules.  */

-#define YYNRULES  307
+#define YYNRULES  354

 /* YYNRULES -- Number of states.  */
 /* YYNRULES -- Number of states.  */

-#define YYNSTATES  519
+#define YYNSTATES  601

 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2

-#define YYMAXUTOK   363
+#define YYMAXUTOK   365

 
 #define YYTRANSLATE(YYX)                                               \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 #define YYTRANSLATE(YYX)                                               \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)

@@ -2260,16 +2462,16 @@ static const yytype_uint8 yytranslate[] =
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,   118,     2,     2,     2,   116,   108,     2,
-     122,   133,   115,   113,   100,   112,   127,   114,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   105,    99,
-     109,   102,   110,   104,   128,     2,     2,     2,     2,     2,
+       2,     2,     2,   120,     2,     2,     2,   118,   109,     2,
+     124,   135,   117,   115,   102,   114,   129,   116,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   106,   101,
+     111,   104,   112,   105,   130,     2,     2,     2,     2,     2,

        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,   124,     2,   125,   107,     2,     2,     2,     2,     2,
+       2,   126,     2,   127,   108,     2,     2,     2,     2,     2,

        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

-       2,     2,     2,   126,   106,   132,   117,     2,     2,     2,
+       2,     2,     2,   128,   107,   134,   119,     2,     2,     2,

        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

@@ -2292,8 +2494,8 @@ static const yytype_uint8 yytranslate[] =
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,

-      95,    96,    97,    98,   101,   103,   111,   119,   120,   121,
-     123,   129,   130,   131
+      95,    96,    97,    98,    99,   100,   103,   110,   113,   121,
+     122,   123,   125,   131,   132,   133

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG

@@ -2303,168 +2505,194 @@ static const yytype_uint16 yyprhs[] =
 {
        0,     0,     3,     5,     6,     8,    10,    13,    15,    17,
       19,    21,    23,    25,    30,    32,    33,    35,    37,    40,
 {
        0,     0,     3,     5,     6,     8,    10,    13,    15,    17,
       19,    21,    23,    25,    30,    32,    33,    35,    37,    40,

-      42,    44,    46,    48,    50,    55,    57,    59,    60,    63,
-      65,    67,    69,    71,    73,    75,    77,    79,    81,    83,
-      85,    87,    89,    93,    96,    98,   100,   102,   104,   106,
-     108,   110,   115,   118,   120,   122,   126,   129,   130,   133,
-     136,   138,   142,   146,   147,   150,   151,   159,   160,   162,
-     164,   168,   170,   173,   177,   186,   193,   194,   201,   202,
-     210,   212,   215,   217,   220,   221,   223,   225,   228,   230,
-     233,   238,   242,   243,   252,   253,   263,   264,   270,   272,
-     275,   277,   280,   282,   283,   290,   293,   295,   301,   303,
-     305,   309,   311,   312,   319,   320,   326,   329,   334,   335,
-     337,   339,   342,   344,   346,   348,   350,   352,   354,   356,
-     358,   360,   362,   363,   366,   367,   370,   371,   374,   375,
-     385,   386,   395,   396,   398,   400,   403,   405,   410,   412,
-     414,   416,   417,   419,   421,   424,   426,   429,   438,   440,
-     442,   443,   448,   450,   454,   458,   459,   462,   464,   466,
-     468,   470,   472,   474,   476,   478,   480,   481,   483,   486,
-     491,   495,   497,   502,   505,   507,   509,   510,   511,   524,
-     526,   527,   528,   539,   541,   545,   547,   549,   551,   555,
-     557,   559,   561,   564,   565,   566,   570,   571,   573,   575,
-     577,   580,   583,   584,   589,   594,   599,   602,   604,   607,
-     609,   611,   615,   617,   619,   621,   623,   625,   627,   629,
-     631,   633,   635,   637,   639,   641,   643,   645,   647,   649,
-     651,   655,   659,   663,   667,   671,   675,   679,   683,   687,
-     691,   694,   697,   701,   705,   709,   713,   717,   721,   725,
-     729,   733,   737,   741,   745,   749,   753,   757,   762,   765,
-     767,   771,   774,   779,   783,   784,   786,   790,   796,   800,
-     804,   808,   812,   816,   820,   824,   828,   832,   836,   840,
-     844,   850,   853,   856,   859,   862,   866,   869,   874,   880,
-     884,   890,   894,   896,   899,   904,   909,   912
+      42,    44,    46,    48,    50,    55,    60,    62,    64,    65,
+      68,    70,    72,    74,    76,    78,    80,    82,    84,    86,
+      88,    90,    92,    94,    96,   100,   103,   105,   107,   109,
+     111,   113,   115,   117,   122,   125,   127,   129,   130,   134,
+     137,   138,   141,   144,   146,   150,   154,   155,   158,   159,
+     162,   169,   170,   172,   174,   178,   180,   183,   187,   196,
+     203,   209,   216,   218,   221,   223,   226,   227,   229,   231,
+     234,   236,   239,   244,   248,   249,   258,   259,   269,   270,
+     276,   278,   281,   283,   286,   288,   289,   296,   299,   301,
+     306,   309,   311,   313,   315,   317,   319,   323,   325,   326,
+     333,   334,   340,   343,   346,   351,   352,   354,   356,   359,
+     361,   363,   365,   367,   369,   371,   373,   375,   377,   379,
+     380,   383,   384,   387,   388,   391,   392,   402,   403,   412,
+     413,   415,   417,   420,   422,   427,   429,   431,   433,   434,
+     436,   438,   441,   443,   446,   455,   457,   459,   460,   465,
+     467,   471,   475,   476,   479,   481,   483,   485,   487,   489,
+     491,   493,   495,   497,   499,   501,   503,   504,   505,   510,
+     511,   516,   517,   520,   523,   526,   529,   533,   535,   537,
+     538,   540,   547,   558,   570,   572,   575,   577,   581,   585,
+     589,   593,   594,   596,   599,   604,   608,   610,   615,   618,
+     620,   622,   623,   624,   637,   639,   640,   641,   652,   654,
+     658,   660,   662,   664,   668,   670,   672,   674,   677,   678,
+     679,   683,   684,   686,   688,   690,   693,   696,   697,   702,
+     707,   712,   715,   717,   720,   722,   724,   726,   730,   732,
+     736,   737,   739,   741,   743,   745,   747,   749,   753,   759,
+     761,   763,   765,   767,   769,   771,   773,   775,   777,   779,
+     783,   787,   791,   795,   799,   803,   807,   811,   815,   819,
+     823,   827,   830,   833,   837,   841,   845,   849,   853,   857,
+     861,   865,   869,   873,   877,   881,   885,   889,   893,   896,
+     899,   901,   905,   908,   913,   917,   921,   925,   929,   933,
+     937,   941,   945,   949,   953,   957,   961,   967,   970,   973,
+     976,   979,   983,   986,   987,   994,   996,   998,  1000,  1002,
+    1004,  1010,  1014,  1020,  1025,  1030,  1037,  1044,  1048,  1050,
+    1053,  1058,  1063,  1066,  1071

 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {

-     135,     0,    -1,   136,    -1,    -1,   137,    -1,   138,    -1,
-     137,   138,    -1,   185,    -1,   197,    -1,   195,    -1,   216,
-      -1,   206,    -1,   147,    -1,   148,   126,   136,   132,    -1,
-      99,    -1,    -1,   140,    -1,   141,    -1,   140,   141,    -1,
-     197,    -1,   195,    -1,   216,    -1,   206,    -1,   147,    -1,
-     148,   126,   139,   132,    -1,    99,    -1,   143,    -1,    -1,
-     143,   145,    -1,   145,    -1,   188,    -1,   159,    -1,   160,
-      -1,   161,    -1,   163,    -1,   171,    -1,   154,    -1,   182,
-      -1,   179,    -1,   238,    -1,   246,    -1,   245,    -1,   126,
-     143,   132,    -1,   126,   132,    -1,    99,    -1,   144,    -1,
-     150,    -1,   165,    -1,   166,    -1,   235,    -1,   181,    -1,
-     148,   126,   143,   132,    -1,   145,    99,    -1,   145,    -1,
-     144,    -1,     3,    89,     3,    -1,   102,   236,    -1,    -1,
-      46,   151,    -1,    32,   151,    -1,   152,    -1,   151,   100,
-     152,    -1,     3,   226,   149,    -1,    -1,    65,   146,    -1,
-      -1,    64,   122,   155,   237,   133,   146,   153,    -1,    -1,
-     150,    -1,   238,    -1,    46,     3,   226,    -1,     3,    -1,
-      13,   122,    -1,    13,    50,   122,    -1,   158,   156,    99,
-     237,    99,   238,   133,   146,    -1,   158,   157,    68,   237,
-     133,   146,    -1,    -1,    14,   122,   162,   237,   133,   146,
-      -1,    -1,    15,   164,   146,    14,   122,   237,   133,    -1,
-      66,    -1,    66,     3,    -1,    30,    -1,    30,     3,    -1,
-      -1,   168,    -1,   170,    -1,   168,   170,    -1,   169,    -1,
-     168,   169,    -1,    34,   239,   105,   142,    -1,    62,   105,
-     142,    -1,    -1,    16,   122,   172,   239,   133,   126,   167,
-     132,    -1,    -1,    33,   122,     3,   226,   133,   174,   126,
-     142,   132,    -1,    -1,    28,   126,   176,   142,   132,    -1,
-     173,    -1,   177,   173,    -1,   177,    -1,   177,   175,    -1,
-     175,    -1,    -1,    52,   126,   180,   142,   132,   178,    -1,
-      37,   237,    -1,    37,    -1,    39,   122,   237,   133,   146,
-      -1,     3,    -1,    19,    -1,   184,   127,   183,    -1,   183,
-      -1,    -1,    19,   184,   126,   186,   139,   132,    -1,    -1,
-      19,   126,   187,   139,   132,    -1,    41,   222,    -1,    41,
-     184,   127,   115,    -1,    -1,   190,    -1,   191,    -1,   190,
-     191,    -1,    21,    -1,    22,    -1,    20,    -1,    38,    -1,
-      47,    -1,    49,    -1,    48,    -1,    26,    -1,    24,    -1,
-       4,    -1,    -1,    54,   223,    -1,    -1,    54,   224,    -1,
-      -1,    17,   224,    -1,    -1,   189,    31,     3,   192,   194,
-     126,   196,   199,   132,    -1,    -1,   189,    44,     3,   193,
-     126,   198,   202,   132,    -1,    -1,   200,    -1,   201,    -1,
-     200,   201,    -1,    99,    -1,   148,   126,   199,   132,    -1,
-     206,    -1,   216,    -1,   144,    -1,    -1,   203,    -1,   204,
-      -1,   203,   204,    -1,    99,    -1,    46,     3,    -1,   189,
-      27,   215,     3,   122,   212,   133,   226,    -1,    46,    -1,
-      32,    -1,    -1,   189,   205,   207,   208,    -1,   209,    -1,
-     208,   100,   209,    -1,     3,   226,   149,    -1,    -1,   102,
-     211,    -1,    10,    -1,     8,    -1,     9,    -1,    12,    -1,
-       5,    -1,    56,    -1,    55,    -1,    45,    -1,     3,    -1,
-      -1,   213,    -1,    93,   214,    -1,   213,   100,    93,   214,
-      -1,   213,   100,   214,    -1,   214,    -1,     3,   105,   225,
-     210,    -1,     3,   210,    -1,    51,    -1,    35,    -1,    -1,
-      -1,   189,    27,   215,     3,   122,   212,   133,   226,   126,
-     217,   142,   132,    -1,     3,    -1,    -1,    -1,    27,   218,
-     122,   212,   133,   226,   126,   220,   142,   132,    -1,     3,
-      -1,   184,   127,     3,    -1,   222,    -1,   221,    -1,   223,
-      -1,   224,   100,   223,    -1,   223,    -1,   115,    -1,    36,
-      -1,   105,   225,    -1,    -1,    -1,   122,   228,   133,    -1,
-      -1,   229,    -1,   230,    -1,   236,    -1,   229,   100,    -1,
-     230,   236,    -1,    -1,    25,   239,   231,   227,    -1,   239,
-     122,   228,   133,    -1,    53,   122,   228,   133,    -1,    63,
-     239,    -1,    42,    -1,    42,   237,    -1,   239,    -1,   239,
-      -1,   237,   100,   239,    -1,   237,    -1,   219,    -1,   240,
-      -1,   243,    -1,   232,    -1,   234,    -1,   233,    -1,     6,
-      -1,    10,    -1,    11,    -1,     8,    -1,     9,    -1,    12,
-      -1,     5,    -1,    29,    -1,    56,    -1,    55,    -1,    45,
-      -1,   239,   109,   239,    -1,   239,   110,   239,    -1,   239,
-      75,   239,    -1,   239,    76,   239,    -1,   239,    71,   239,
-      -1,   239,    72,   239,    -1,   239,    74,   239,    -1,   239,
-      73,   239,    -1,   239,    87,   239,    -1,   239,    88,   239,
-      -1,   118,   239,    -1,   117,   239,    -1,   239,   108,   239,
-      -1,   239,   107,   239,    -1,   239,   106,   239,    -1,   239,
-      96,   239,    -1,   239,    95,   239,    -1,   239,    94,   239,
-      -1,   239,   114,   239,    -1,   239,   116,   239,    -1,   239,
-     113,   239,    -1,   239,   112,   239,    -1,   239,   115,   239,
-      -1,   239,    68,   239,    -1,   239,    69,   239,    -1,   239,
-      40,   239,    -1,   239,    67,   239,    -1,    43,   122,   239,
-     133,    -1,    36,   239,    -1,    36,    -1,   122,   237,   133,
-      -1,   112,   239,    -1,   239,   124,   239,   125,    -1,   124,
-     228,   125,    -1,    -1,   242,    -1,   236,   105,   236,    -1,
-     242,   100,   236,   105,   236,    -1,    70,   241,   132,    -1,
-     239,    80,   239,    -1,   239,    79,   239,    -1,   239,    85,
-     239,    -1,   239,    84,   239,    -1,   239,    86,   239,    -1,
-     239,    78,   239,    -1,   239,    77,   239,    -1,   239,    83,
-     239,    -1,   239,    81,   239,    -1,   239,    82,   239,    -1,
-     239,   102,   239,    -1,   239,   104,   239,   105,   239,    -1,
-     239,    91,    -1,   239,    90,    -1,    91,   239,    -1,    90,
-     239,    -1,    53,   127,     3,    -1,   128,     3,    -1,   239,
-     127,   128,     3,    -1,   239,   127,     3,    89,     3,    -1,
-     239,    92,     3,    -1,   239,   127,   122,   239,   133,    -1,
-     239,   127,     3,    -1,     3,    -1,    18,     3,    -1,    18,
-       3,   102,     3,    -1,    18,     3,   102,     5,    -1,   189,
-     244,    -1,    23,    18,   223,    -1
+     137,     0,    -1,   138,    -1,    -1,   139,    -1,   140,    -1,
+     139,   140,    -1,   188,    -1,   200,    -1,   198,    -1,   234,
+      -1,   209,    -1,   149,    -1,   151,   128,   138,   134,    -1,
+     101,    -1,    -1,   142,    -1,   143,    -1,   142,   143,    -1,
+     200,    -1,   198,    -1,   234,    -1,   209,    -1,   149,    -1,
+     151,   128,   141,   134,    -1,   126,   150,   261,   127,    -1,
+     101,    -1,   145,    -1,    -1,   145,   147,    -1,   147,    -1,
+     269,    -1,   191,    -1,   163,    -1,   164,    -1,   165,    -1,
+     166,    -1,   173,    -1,   159,    -1,   185,    -1,   181,    -1,
+     257,    -1,   270,    -1,   268,    -1,   128,   145,   134,    -1,
+     128,   134,    -1,   101,    -1,   146,    -1,   153,    -1,   167,
+      -1,   168,    -1,   253,    -1,   183,    -1,   151,   128,   145,
+     134,    -1,   147,   101,    -1,   147,    -1,   146,    -1,    -1,
+       3,    91,     3,    -1,   104,   261,    -1,    -1,    46,   154,
+      -1,    32,   154,    -1,   155,    -1,   154,   102,   155,    -1,
+       3,   244,   152,    -1,    -1,   157,   148,    -1,    -1,    66,
+     156,    -1,    65,   124,   255,   135,   156,   158,    -1,    -1,
+     153,    -1,   257,    -1,    46,     3,   244,    -1,     3,    -1,
+      11,   124,    -1,    11,    50,   124,    -1,   162,   160,   101,
+     255,   101,   257,   135,   156,    -1,   162,   161,    69,   255,
+     135,   156,    -1,    12,   124,   255,   135,   156,    -1,    13,
+     156,    12,   124,   255,   135,    -1,    67,    -1,    67,     3,
+      -1,    30,    -1,    30,     3,    -1,    -1,   170,    -1,   172,
+      -1,   170,   172,    -1,   171,    -1,   170,   171,    -1,    34,
+     261,   106,   144,    -1,    62,   106,   144,    -1,    -1,    14,
+     124,   174,   261,   135,   128,   169,   134,    -1,    -1,    33,
+     124,     3,   244,   135,   176,   128,   144,   134,    -1,    -1,
+      27,   128,   178,   144,   134,    -1,   175,    -1,   179,   175,
+      -1,   179,    -1,   179,   177,    -1,   177,    -1,    -1,    52,
+     128,   182,   144,   134,   180,    -1,    37,   255,    -1,    37,
+      -1,    39,   124,   255,   135,    -1,   184,   148,    -1,     3,
+      -1,    17,    -1,    16,    -1,    29,    -1,     4,    -1,   187,
+     129,   186,    -1,   186,    -1,    -1,    17,   187,   128,   189,
+     141,   134,    -1,    -1,    17,   128,   190,   141,   134,    -1,
+      41,     3,    -1,    41,   240,    -1,    41,   187,   129,   117,
+      -1,    -1,   193,    -1,   194,    -1,   193,   194,    -1,    20,
+      -1,    21,    -1,    18,    -1,    38,    -1,    47,    -1,    49,
+      -1,    48,    -1,    25,    -1,    23,    -1,     4,    -1,    -1,
+      54,   241,    -1,    -1,    54,   242,    -1,    -1,    15,   242,
+      -1,    -1,   192,    31,     3,   195,   197,   128,   199,   202,
+     134,    -1,    -1,   192,    44,     3,   196,   128,   201,   205,
+     134,    -1,    -1,   203,    -1,   204,    -1,   203,   204,    -1,
+     101,    -1,   151,   128,   202,   134,    -1,   209,    -1,   234,
+      -1,   146,    -1,    -1,   206,    -1,   207,    -1,   206,   207,
+      -1,   101,    -1,    46,     3,    -1,   192,    26,   233,     3,
+     124,   230,   135,   244,    -1,    46,    -1,    32,    -1,    -1,
+     192,   208,   210,   211,    -1,   212,    -1,   211,   102,   212,
+      -1,     3,   244,   152,    -1,    -1,   104,   261,    -1,     8,
+      -1,     9,    -1,    10,    -1,     5,    -1,    56,    -1,    55,
+      -1,    45,    -1,    28,    -1,    29,    -1,   227,    -1,   111,
+      -1,   112,    -1,    -1,    -1,   128,   261,   220,   134,    -1,
+      -1,   128,   261,   222,   134,    -1,    -1,   223,   219,    -1,
+     223,     5,    -1,   223,   112,    -1,   227,   223,    -1,   224,
+     227,   223,    -1,     3,    -1,   221,    -1,    -1,   228,    -1,
+     216,   225,   226,   116,   218,   112,    -1,   216,   225,   226,
+     217,   223,   111,   116,   225,   218,   112,    -1,   216,   225,
+     226,   217,   223,   224,   111,   116,   225,   218,   112,    -1,
+     229,    -1,   228,   229,    -1,   221,    -1,   221,   104,     5,
+      -1,   221,   104,   221,    -1,     3,   104,   221,    -1,     3,
+     104,     5,    -1,    -1,   231,    -1,    95,   232,    -1,   231,
+     102,    95,   232,    -1,   231,   102,   232,    -1,   232,    -1,
+       3,   106,   243,   213,    -1,     3,   213,    -1,    51,    -1,
+      35,    -1,    -1,    -1,   192,    26,   233,     3,   124,   230,
+     135,   244,   128,   235,   144,   134,    -1,     3,    -1,    -1,
+      -1,    26,   236,   124,   230,   135,   244,   128,   238,   144,
+     134,    -1,   186,    -1,   187,   129,   186,    -1,   240,    -1,
+     239,    -1,   241,    -1,   242,   102,   241,    -1,   241,    -1,
+     117,    -1,    36,    -1,   106,   243,    -1,    -1,    -1,   124,
+     246,   135,    -1,    -1,   247,    -1,   248,    -1,   254,    -1,
+     247,   102,    -1,   248,   254,    -1,    -1,    24,   261,   249,
+     245,    -1,   261,   124,   246,   135,    -1,    53,   124,   246,
+     135,    -1,    64,   261,    -1,    42,    -1,    42,   255,    -1,
+     261,    -1,   256,    -1,   261,    -1,   256,   102,   261,    -1,
+     261,    -1,   257,   102,   261,    -1,    -1,   260,    -1,     3,
+      -1,     5,    -1,     8,    -1,     9,    -1,    10,    -1,   259,
+     106,   254,    -1,   260,   102,   259,   106,   254,    -1,   237,
+      -1,   265,    -1,   250,    -1,   252,    -1,   251,    -1,   266,
+      -1,   214,    -1,   215,    -1,     6,    -1,    19,    -1,   126,
+     246,   127,    -1,    71,   258,   134,    -1,   261,   111,   261,
+      -1,   261,   112,   261,    -1,   261,    76,   261,    -1,   261,
+      77,   261,    -1,   261,    72,   261,    -1,   261,    73,   261,
+      -1,   261,    75,   261,    -1,   261,    74,   261,    -1,   261,
+      89,   261,    -1,   261,    90,   261,    -1,   120,   261,    -1,
+     119,   261,    -1,   261,   109,   261,    -1,   261,   108,   261,
+      -1,   261,   107,   261,    -1,   261,    98,   261,    -1,   261,
+      97,   261,    -1,   261,    96,   261,    -1,   261,   116,   261,
+      -1,   261,   118,   261,    -1,   261,   115,   261,    -1,   261,
+     114,   261,    -1,   261,   117,   261,    -1,   261,    69,   261,
+      -1,   261,    70,   261,    -1,   261,    40,   261,    -1,   261,
+      68,   261,    -1,    43,   261,    -1,    36,   261,    -1,    36,
+      -1,   124,   256,   135,    -1,   114,   261,    -1,   261,   126,
+     261,   127,    -1,   261,    81,   261,    -1,   261,    80,   261,
+      -1,   261,    87,   261,    -1,   261,    86,   261,    -1,   261,
+      88,   261,    -1,   261,    79,   261,    -1,   261,    78,   261,
+      -1,   261,    85,   261,    -1,   261,    82,   261,    -1,   261,
+      83,   261,    -1,   261,    84,   261,    -1,   261,   104,   261,
+      -1,   261,   105,   261,   106,   261,    -1,   261,    93,    -1,
+     261,    92,    -1,    93,   261,    -1,    92,   261,    -1,    53,
+     129,     3,    -1,   130,     3,    -1,    -1,   261,   129,   124,
+     262,   261,   135,    -1,     3,    -1,   117,    -1,     4,    -1,
+     186,    -1,   117,    -1,   261,   129,   263,    91,   264,    -1,
+     261,    94,   264,    -1,   261,   129,   126,   261,   127,    -1,
+     261,   129,   130,   264,    -1,   261,    94,   130,   264,    -1,
+     261,   129,   130,   126,   261,   127,    -1,   261,    94,   130,
+     126,   261,   127,    -1,   261,   129,   264,    -1,     3,    -1,
+      16,     3,    -1,    16,     3,   104,     3,    -1,    16,     3,
+     104,     5,    -1,   192,   267,    -1,    63,    16,   104,   261,
+      -1,    22,    16,   241,    -1

 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {

-       0,  2003,  2003,  2005,  2005,  2006,  2007,  2009,  2010,  2011,
-    2012,  2013,  2014,  2015,  2016,  2018,  2018,  2019,  2020,  2022,
-    2023,  2024,  2025,  2026,  2027,  2028,  2030,  2031,  2033,  2034,
-    2037,  2038,  2039,  2040,  2041,  2042,  2043,  2044,  2045,  2046,
-    2047,  2048,  2049,  2050,  2053,  2054,  2055,  2056,  2057,  2058,
-    2059,  2060,  2064,  2065,  2069,  2076,  2080,  2081,  2085,  2086,
-    2088,  2089,  2091,  2152,  2153,  2156,  2156,  2175,  2176,  2177,
-    2182,  2186,  2191,  2192,  2194,  2214,  2262,  2262,  2281,  2281,
-    2296,  2299,  2302,  2305,  2309,  2310,  2311,  2312,  2313,  2314,
-    2316,  2327,  2330,  2330,  2359,  2359,  2383,  2383,  2399,  2400,
-    2401,  2402,  2410,  2419,  2419,  2464,  2468,  2479,  2488,  2489,
-    2491,  2492,  2494,  2494,  2496,  2496,  2499,  2515,  2532,  2533,
-    2534,  2535,  2543,  2544,  2545,  2546,  2547,  2548,  2549,  2550,
-    2551,  2552,  2556,  2557,  2559,  2560,  2562,  2563,  2567,  2565,
-    2573,  2571,  2580,  2581,  2582,  2583,  2584,  2585,  2586,  2587,
-    2589,  2595,  2596,  2597,  2598,  2599,  2600,  2603,  2616,  2616,
-    2618,  2618,  2620,  2621,  2623,  2698,  2699,  2701,  2702,  2703,
-    2704,  2705,  2707,  2708,  2709,  2710,  2722,  2726,  2732,  2738,
-    2746,  2751,  2757,  2765,  2773,  2774,  2775,  2778,  2777,  2794,
-    2795,  2797,  2796,  2820,  2836,  2851,  2852,  2854,  2855,  2857,
-    2858,  2859,  2868,  2869,  2873,  2874,  2876,  2877,  2878,  2880,
-    2884,  2885,  2890,  2891,  2927,  2973,  2994,  3015,  3018,  3025,
-    3026,  3027,  3033,  3039,  3041,  3043,  3045,  3047,  3049,  3051,
-    3068,  3073,  3076,  3079,  3082,  3085,  3088,  3091,  3094,  3097,
-    3101,  3104,  3107,  3110,  3113,  3116,  3119,  3122,  3126,  3137,
-    3155,  3160,  3165,  3170,  3175,  3180,  3184,  3188,  3193,  3197,
-    3201,  3210,  3219,  3229,  3234,  3246,  3252,  3257,  3263,  3269,
-    3273,  3275,  3286,  3295,  3302,  3303,  3305,  3311,  3320,  3327,
-    3339,  3345,  3351,  3357,  3363,  3369,  3375,  3381,  3394,  3405,
-    3412,  3425,  3452,  3466,  3480,  3494,  3509,  3516,  3523,  3530,
-    3537,  3548,  3598,  3703,  3710,  3717,  3724,  3731
+       0,  1968,  1968,  1970,  1970,  1971,  1972,  1974,  1975,  1976,
+    1977,  1978,  1979,  1980,  1981,  1983,  1983,  1984,  1985,  1987,
+    1988,  1989,  1990,  1991,  1992,  1993,  1994,  1996,  1997,  1999,
+    2002,  2005,  2006,  2007,  2008,  2009,  2010,  2011,  2012,  2013,
+    2014,  2015,  2016,  2017,  2018,  2019,  2022,  2023,  2024,  2025,
+    2026,  2027,  2028,  2029,  2041,  2042,  2046,  2057,  2065,  2092,
+    2093,  2095,  2096,  2098,  2099,  2101,  2162,  2162,  2166,  2167,
+    2170,  2186,  2187,  2188,  2193,  2197,  2202,  2203,  2205,  2225,
+    2269,  2285,  2297,  2300,  2303,  2306,  2310,  2311,  2312,  2313,
+    2314,  2315,  2317,  2328,  2331,  2331,  2362,  2362,  2387,  2387,
+    2403,  2404,  2405,  2406,  2414,  2423,  2423,  2472,  2476,  2487,
+    2497,  2514,  2515,  2516,  2517,  2518,  2520,  2521,  2523,  2523,
+    2525,  2525,  2549,  2557,  2568,  2584,  2585,  2586,  2587,  2594,
+    2595,  2596,  2597,  2598,  2599,  2600,  2601,  2602,  2603,  2607,
+    2608,  2610,  2611,  2613,  2614,  2618,  2616,  2624,  2622,  2631,
+    2632,  2633,  2634,  2635,  2636,  2637,  2638,  2640,  2646,  2647,
+    2648,  2649,  2650,  2651,  2654,  2727,  2727,  2729,  2729,  2731,
+    2732,  2734,  2818,  2819,  2828,  2829,  2832,  2833,  2834,  2835,
+    2836,  2837,  2838,  2851,  2862,  2863,  2864,  2866,  2866,  2869,
+    2869,  2872,  2873,  2876,  2881,  2884,  2887,  2890,  2893,  2897,
+    2900,  2904,  2908,  2913,  2919,  2922,  2925,  2928,  2933,  2936,
+    2939,  2949,  2953,  2959,  2965,  2973,  2978,  2984,  2992,  3000,
+    3001,  3002,  3005,  3004,  3021,  3022,  3024,  3023,  3047,  3066,
+    3080,  3081,  3083,  3084,  3086,  3087,  3088,  3097,  3098,  3102,
+    3103,  3105,  3106,  3107,  3109,  3113,  3114,  3119,  3120,  3167,
+    3217,  3238,  3260,  3263,  3270,  3273,  3276,  3279,  3282,  3285,
+    3290,  3291,  3293,  3294,  3295,  3296,  3297,  3299,  3305,  3314,
+    3315,  3316,  3317,  3318,  3319,  3321,  3325,  3330,  3348,  3359,
+    3369,  3378,  3379,  3380,  3381,  3382,  3383,  3384,  3385,  3386,
+    3387,  3388,  3389,  3390,  3391,  3392,  3393,  3394,  3395,  3396,
+    3397,  3398,  3399,  3400,  3401,  3402,  3403,  3404,  3405,  3406,
+    3407,  3408,  3409,  3410,  3411,  3412,  3413,  3414,  3415,  3416,
+    3417,  3418,  3419,  3420,  3421,  3422,  3423,  3425,  3426,  3427,
+    3428,  3430,  3445,  3453,  3453,  3507,  3508,  3509,  3510,  3511,
+    3519,  3537,  3544,  3555,  3562,  3569,  3579,  3590,  3770,  3804,
+    3811,  3818,  3825,  3847,  3853

 };
 #endif
 
 };
 #endif
 

@@ -2474,53 +2702,58 @@ static const yytype_uint16 yyrline[] =
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "T_IDENTIFIER", "T_NAMESPACE",
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "T_IDENTIFIER", "T_NAMESPACE",

-  "T_STRING", "T_REGEXP", "T_EMPTY", "T_INT", "T_UINT", "T_BYTE",
-  "T_SHORT", "T_FLOAT", "\"for\"", "\"while\"", "\"do\"", "\"switch\"",
-  "\"implements\"", "\"namespace\"", "\"package\"", "\"protected\"",
+  "T_STRING", "T_REGEXP", "T_EMPTY", "T_INT", "T_UINT", "T_FLOAT",
+  "\"for\"", "\"while\"", "\"do\"", "\"switch\"", "\"implements\"",
+  "\"namespace\"", "\"package\"", "\"protected\"", "\"arguments\"",

   "\"public\"", "\"private\"", "\"use\"", "\"internal\"", "\"new\"",
   "\"public\"", "\"private\"", "\"use\"", "\"internal\"", "\"new\"",

-  "\"native\"", "\"function\"", "\"finally\"", "\"undefined\"",
+  "\"native\"", "\"function\"", "\"finally\"", "\"undefined\"", "\"NaN\"",

   "\"continue\"", "\"class\"", "\"const\"", "\"catch\"", "\"case\"",
   "\"set\"", "\"void\"", "\"throw\"", "\"static\"", "\"with\"",
   "\"instanceof\"", "\"import\"", "\"return\"", "\"typeof\"",
   "\"interface\"", "\"null\"", "\"var\"", "\"dynamic\"", "\"override\"",
   "\"final\"", "\"each\"", "\"get\"", "\"try\"", "\"super\"",
   "\"extends\"", "\"false\"", "\"true\"", "\"Boolean\"", "\"uint\"",
   "\"continue\"", "\"class\"", "\"const\"", "\"catch\"", "\"case\"",
   "\"set\"", "\"void\"", "\"throw\"", "\"static\"", "\"with\"",
   "\"instanceof\"", "\"import\"", "\"return\"", "\"typeof\"",
   "\"interface\"", "\"null\"", "\"var\"", "\"dynamic\"", "\"override\"",
   "\"final\"", "\"each\"", "\"get\"", "\"try\"", "\"super\"",
   "\"extends\"", "\"false\"", "\"true\"", "\"Boolean\"", "\"uint\"",

-  "\"int\"", "\"Number\"", "\"String\"", "\"default\"", "\"delete\"",
-  "\"if\"", "\"else\"", "\"break\"", "\"is\"", "\"in\"", "\"as\"",
-  "\"{ (dictionary)\"", "\"==\"", "\"===\"", "\"!=\"", "\"!==\"", "\"<=\"",
-  "\">=\"", "\"|=\"", "\"/=\"", "\"%=\"", "\"*=\"", "\"+=\"", "\"-=\"",
-  "\"^=\"", "\">>=\"", "\"<<=\"", "\">>>=\"", "\"||\"", "\"&&\"", "\"::\"",
-  "\"--\"", "\"++\"", "\"..\"", "\"...\"", "\"<<\"", "\">>>\"", "\">>\"",
-  "prec_none", "below_semicolon", "';'", "','", "below_assignment", "'='",
-  "\"&=\"", "'?'", "':'", "'|'", "'^'", "'&'", "'<'", "'>'", "below_minus",
-  "'-'", "'+'", "'/'", "'*'", "'%'", "'~'", "'!'", "minusminus_prefix",
-  "plusplus_prefix", "below_curly", "'('", "new2", "'['", "']'", "'{'",
-  "'.'", "'@'", "above_identifier", "below_else", "above_function", "'}'",
-  "')'", "$accept", "PROGRAM", "MAYBE_PROGRAM_CODE_LIST",
-  "PROGRAM_CODE_LIST", "PROGRAM_CODE", "MAYBE_INPACKAGE_CODE_LIST",
-  "INPACKAGE_CODE_LIST", "INPACKAGE_CODE", "MAYBECODE", "CODE",
-  "CODE_STATEMENT", "CODEPIECE", "CODEBLOCK", "PACKAGE_INITCODE",
-  "CONDITIONAL_COMPILATION", "MAYBEEXPRESSION", "VARIABLE_DECLARATION",
-  "VARIABLE_LIST", "ONE_VARIABLE", "MAYBEELSE", "IF", "$@1", "FOR_INIT",
-  "FOR_IN_INIT", "FOR_START", "FOR", "FOR_IN", "WHILE", "$@2", "DO_WHILE",
-  "$@3", "BREAK", "CONTINUE", "MAYBE_CASE_LIST", "CASE_LIST", "CASE",
-  "DEFAULT", "SWITCH", "$@4", "CATCH", "$@5", "FINALLY", "$@6",
-  "CATCH_LIST", "CATCH_FINALLY_LIST", "TRY", "$@7", "THROW", "WITH",
-  "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@8", "$@9", "IMPORT",
+  "\"int\"", "\"Number\"", "\"String\"", "\"default\"", "\"default xml\"",
+  "\"delete\"", "\"if\"", "\"else\"", "\"break\"", "\"is\"", "\"in\"",
+  "\"as\"", "\"{ (dictionary)\"", "\"==\"", "\"===\"", "\"!=\"", "\"!==\"",
+  "\"<=\"", "\">=\"", "\"|=\"", "\"/=\"", "\"%=\"", "\"*=\"", "\"&=\"",
+  "\"+=\"", "\"-=\"", "\"^=\"", "\">>=\"", "\"<<=\"", "\">>>=\"", "\"||\"",
+  "\"&&\"", "\"::\"", "\"--\"", "\"++\"", "\"..\"", "\"...\"", "\"<<\"",
+  "\">>>\"", "\">>\"", "prec_none", "below_semicolon", "';'", "','",
+  "below_assignment", "'='", "'?'", "':'", "'|'", "'^'", "'&'", "below_lt",
+  "'<'", "'>'", "below_minus", "'-'", "'+'", "'/'", "'*'", "'%'", "'~'",
+  "'!'", "minusminus_prefix", "plusplus_prefix", "below_curly", "'('",
+  "new2", "'['", "']'", "'{'", "'.'", "'@'", "above_identifier",
+  "below_else", "above_function", "'}'", "')'", "$accept", "PROGRAM",
+  "MAYBE_PROGRAM_CODE_LIST", "PROGRAM_CODE_LIST", "PROGRAM_CODE",
+  "MAYBE_INPACKAGE_CODE_LIST", "INPACKAGE_CODE_LIST", "INPACKAGE_CODE",
+  "MAYBECODE", "CODE", "CODE_STATEMENT", "CODEPIECE", "CODEBLOCK",
+  "PACKAGE_INITCODE", "EMBED_START", "CONDITIONAL_COMPILATION",
+  "MAYBEEXPRESSION", "VARIABLE_DECLARATION", "VARIABLE_LIST",
+  "ONE_VARIABLE", "IF_CODEBLOCK", "$@1", "MAYBEELSE", "IF", "FOR_INIT",
+  "FOR_IN_INIT", "FOR_START", "FOR", "FOR_IN", "WHILE", "DO_WHILE",
+  "BREAK", "CONTINUE", "MAYBE_CASE_LIST", "CASE_LIST", "CASE", "DEFAULT",
+  "SWITCH", "$@2", "CATCH", "$@3", "FINALLY", "$@4", "CATCH_LIST",
+  "CATCH_FINALLY_LIST", "TRY", "$@5", "THROW", "WITH_HEAD", "WITH",
+  "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@6", "$@7", "IMPORT",

   "MAYBE_MODIFIERS", "MODIFIER_LIST", "MODIFIER", "EXTENDS",
   "MAYBE_MODIFIERS", "MODIFIER_LIST", "MODIFIER", "EXTENDS",

-  "EXTENDS_LIST", "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10",
-  "INTERFACE_DECLARATION", "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY",
+  "EXTENDS_LIST", "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@8",
+  "INTERFACE_DECLARATION", "$@9", "MAYBE_CLASS_BODY", "CLASS_BODY",

   "CLASS_BODY_ITEM", "MAYBE_INTERFACE_BODY", "INTERFACE_BODY",
   "CLASS_BODY_ITEM", "MAYBE_INTERFACE_BODY", "INTERFACE_BODY",

-  "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@12", "SLOT_LIST",
-  "ONE_SLOT", "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST",
-  "PARAM_LIST", "PARAM", "GETSET", "FUNCTION_DECLARATION", "$@13",
-  "MAYBE_IDENTIFIER", "INNERFUNCTION", "$@14", "CLASS", "PACKAGEANDCLASS",
-  "CLASS_SPEC", "CLASS_SPEC_LIST", "TYPE", "MAYBETYPE",
-  "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", "EXPRESSION_LIST",
-  "EXPRESSION_LIST_AND_COMMA", "XX", "NEW", "FUNCTIONCALL", "DELETE",
-  "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", "VOIDEXPRESSION", "E",
-  "CONSTANT", "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ",
-  "NAMESPACE_ID", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0
+  "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@10", "SLOT_LIST",
+  "ONE_SLOT", "MAYBECONSTANT", "CONSTANT", "XML", "OPEN", "CLOSE",
+  "CLOSE2", "XMLEXPR1", "$@11", "XMLEXPR2", "$@12", "XMLTEXT", "XML2",
+  "XML_ID_OR_EXPR", "MAYBE_XMLATTRIBUTES", "XMLNODE", "XMLATTRIBUTES",
+  "XMLATTRIBUTE", "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET",
+  "FUNCTION_DECLARATION", "$@13", "MAYBE_IDENTIFIER", "INNERFUNCTION",
+  "$@14", "CLASS", "PACKAGEANDCLASS", "CLASS_SPEC", "CLASS_SPEC_LIST",
+  "TYPE", "MAYBETYPE", "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST",
+  "EXPRESSION_LIST", "EXPRESSION_LIST_AND_COMMA", "XX", "NEW",
+  "FUNCTIONCALL", "DELETE", "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION",
+  "COMMA_EXPRESSION", "VOIDEXPRESSION", "MAYBE_DICT_EXPRPAIR_LIST",
+  "DICTLH", "DICT_EXPRPAIR_LIST", "E", "$@15", "ID_OR_NS", "SUBNODE",
+  "MEMBER", "VAR_READ", "NAMESPACE_ID", "NAMESPACE_DECLARATION",
+  "DEFAULT_NAMESPACE", "USE_NAMESPACE", 0

 };
 #endif
 
 };
 #endif
 

@@ -2538,48 +2771,53 @@ static const yytype_uint16 yytoknum[] =
      315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
      325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
      315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
      325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,

-     345,   346,   347,   348,   349,   350,   351,   352,   353,    59,
-      44,   354,    61,   355,    63,    58,   124,    94,    38,    60,
-      62,   356,    45,    43,    47,    42,    37,   126,    33,   357,
-     358,   359,    40,   360,    91,    93,   123,    46,    64,   361,
-     362,   363,   125,    41
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,    59,    44,   356,    61,    63,    58,   124,    94,    38,
+     357,    60,    62,   358,    45,    43,    47,    42,    37,   126,
+      33,   359,   360,   361,    40,   362,    91,    93,   123,    46,
+      64,   363,   364,   365,   125,    41

 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */

-static const yytype_uint8 yyr1[] =
+static const yytype_uint16 yyr1[] =

 {
 {

-       0,   134,   135,   136,   136,   137,   137,   138,   138,   138,
-     138,   138,   138,   138,   138,   139,   139,   140,   140,   141,
-     141,   141,   141,   141,   141,   141,   142,   142,   143,   143,
-     144,   144,   144,   144,   144,   144,   144,   144,   144,   144,
-     144,   144,   144,   144,   145,   145,   145,   145,   145,   145,
-     145,   145,   146,   146,   147,   148,   149,   149,   150,   150,
-     151,   151,   152,   153,   153,   155,   154,   156,   156,   156,
-     157,   157,   158,   158,   159,   160,   162,   161,   164,   163,
-     165,   165,   166,   166,   167,   167,   167,   167,   168,   168,
-     169,   170,   172,   171,   174,   173,   176,   175,   177,   177,
-     178,   178,   178,   180,   179,   181,   181,   182,   183,   183,
-     184,   184,   186,   185,   187,   185,   188,   188,   189,   189,
-     190,   190,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   192,   192,   193,   193,   194,   194,   196,   195,
-     198,   197,   199,   199,   200,   200,   201,   201,   201,   201,
-     201,   202,   202,   203,   203,   204,   204,   204,   205,   205,
-     207,   206,   208,   208,   209,   210,   210,   211,   211,   211,
-     211,   211,   211,   211,   211,   211,   212,   212,   212,   212,
-     213,   213,   214,   214,   215,   215,   215,   217,   216,   218,
-     218,   220,   219,   221,   222,   223,   223,   224,   224,   225,
-     225,   225,   226,   226,   227,   227,   228,   228,   228,   229,
-     230,   229,   231,   232,   233,   233,   234,   235,   235,   236,
-     237,   237,   238,   239,   239,   239,   239,   239,   239,   239,
-     240,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     239,   239,   239,   239,   239,   239,   239,   239,   239,   239,
-     239,   239,   239,   239,   239,   239,   239,   239,   239,   239,
-     239,   239,   239,   239,   239,   239,   239,   239,   239,   239,
-     239,   239,   239,   239,   241,   241,   242,   242,   239,   239,
-     239,   239,   239,   239,   239,   239,   239,   239,   239,   239,
-     239,   239,   239,   239,   239,   239,   239,   239,   239,   239,
-     239,   239,   243,   244,   244,   244,   245,   246
+       0,   136,   137,   138,   138,   139,   139,   140,   140,   140,
+     140,   140,   140,   140,   140,   141,   141,   142,   142,   143,
+     143,   143,   143,   143,   143,   143,   143,   144,   144,   145,
+     145,   146,   146,   146,   146,   146,   146,   146,   146,   146,
+     146,   146,   146,   146,   146,   146,   147,   147,   147,   147,
+     147,   147,   147,   147,   148,   148,   149,   150,   151,   152,
+     152,   153,   153,   154,   154,   155,   157,   156,   158,   158,
+     159,   160,   160,   160,   161,   161,   162,   162,   163,   164,
+     165,   166,   167,   167,   168,   168,   169,   169,   169,   169,
+     170,   170,   171,   172,   174,   173,   176,   175,   178,   177,
+     179,   179,   180,   180,   180,   182,   181,   183,   183,   184,
+     185,   186,   186,   186,   186,   186,   187,   187,   189,   188,
+     190,   188,   191,   191,   191,   192,   192,   193,   193,   194,
+     194,   194,   194,   194,   194,   194,   194,   194,   194,   195,
+     195,   196,   196,   197,   197,   199,   198,   201,   200,   202,
+     202,   203,   203,   204,   204,   204,   204,   204,   205,   205,
+     206,   206,   207,   207,   207,   208,   208,   210,   209,   211,
+     211,   212,   213,   213,   214,   214,   214,   214,   214,   214,
+     214,   214,   214,   215,   216,   217,   218,   220,   219,   222,
+     221,   223,   223,   223,   223,   224,   224,   225,   225,   226,
+     226,   227,   227,   227,   228,   228,   229,   229,   229,   229,
+     229,   230,   230,   230,   230,   231,   231,   232,   232,   233,
+     233,   233,   235,   234,   236,   236,   238,   237,   239,   240,
+     241,   241,   242,   242,   243,   243,   243,   244,   244,   245,
+     245,   246,   246,   246,   247,   248,   247,   249,   250,   251,
+     251,   252,   253,   253,   254,   255,   256,   256,   257,   257,
+     258,   258,   259,   259,   259,   259,   259,   260,   260,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   262,   261,   263,   263,   263,   264,   264,
+     261,   261,   261,   261,   261,   261,   261,   265,   266,   267,
+     267,   267,   268,   269,   270

 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */

@@ -2587,35 +2825,40 @@ static const yytype_uint8 yyr2[] =
 {
        0,     2,     1,     0,     1,     1,     2,     1,     1,     1,
        1,     1,     1,     4,     1,     0,     1,     1,     2,     1,
 {
        0,     2,     1,     0,     1,     1,     2,     1,     1,     1,
        1,     1,     1,     4,     1,     0,     1,     1,     2,     1,

-       1,     1,     1,     1,     4,     1,     1,     0,     2,     1,
+       1,     1,     1,     1,     4,     4,     1,     1,     0,     2,

        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,

-       1,     1,     3,     2,     1,     1,     1,     1,     1,     1,
-       1,     4,     2,     1,     1,     3,     2,     0,     2,     2,
-       1,     3,     3,     0,     2,     0,     7,     0,     1,     1,
-       3,     1,     2,     3,     8,     6,     0,     6,     0,     7,
-       1,     2,     1,     2,     0,     1,     1,     2,     1,     2,
-       4,     3,     0,     8,     0,     9,     0,     5,     1,     2,
-       1,     2,     1,     0,     6,     2,     1,     5,     1,     1,
-       3,     1,     0,     6,     0,     5,     2,     4,     0,     1,
-       1,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     2,     0,     2,     0,     2,     0,     9,
-       0,     8,     0,     1,     1,     2,     1,     4,     1,     1,
-       1,     0,     1,     1,     2,     1,     2,     8,     1,     1,
-       0,     4,     1,     3,     3,     0,     2,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     0,     1,     2,     4,
-       3,     1,     4,     2,     1,     1,     0,     0,    12,     1,
-       0,     0,    10,     1,     3,     1,     1,     1,     3,     1,
-       1,     1,     2,     0,     0,     3,     0,     1,     1,     1,
-       2,     2,     0,     4,     4,     4,     2,     1,     2,     1,
-       1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       2,     2,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     4,     2,     1,
-       3,     2,     4,     3,     0,     1,     3,     5,     3,     3,
+       1,     1,     1,     1,     3,     2,     1,     1,     1,     1,
+       1,     1,     1,     4,     2,     1,     1,     0,     3,     2,
+       0,     2,     2,     1,     3,     3,     0,     2,     0,     2,
+       6,     0,     1,     1,     3,     1,     2,     3,     8,     6,
+       5,     6,     1,     2,     1,     2,     0,     1,     1,     2,
+       1,     2,     4,     3,     0,     8,     0,     9,     0,     5,
+       1,     2,     1,     2,     1,     0,     6,     2,     1,     4,
+       2,     1,     1,     1,     1,     1,     3,     1,     0,     6,
+       0,     5,     2,     2,     4,     0,     1,     1,     2,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     0,
+       2,     0,     2,     0,     2,     0,     9,     0,     8,     0,
+       1,     1,     2,     1,     4,     1,     1,     1,     0,     1,
+       1,     2,     1,     2,     8,     1,     1,     0,     4,     1,
+       3,     3,     0,     2,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     0,     0,     4,     0,
+       4,     0,     2,     2,     2,     2,     3,     1,     1,     0,
+       1,     6,    10,    11,     1,     2,     1,     3,     3,     3,
+       3,     0,     1,     2,     4,     3,     1,     4,     2,     1,
+       1,     0,     0,    12,     1,     0,     0,    10,     1,     3,
+       1,     1,     1,     3,     1,     1,     1,     2,     0,     0,
+       3,     0,     1,     1,     1,     2,     2,     0,     4,     4,
+       4,     2,     1,     2,     1,     1,     1,     3,     1,     3,
+       0,     1,     1,     1,     1,     1,     1,     3,     5,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     3,

        3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
        3,     3,     3,     3,     3,     3,     3,     3,     3,     3,

-       5,     2,     2,     2,     2,     3,     2,     4,     5,     3,
-       5,     3,     1,     2,     4,     4,     2,     3
+       3,     2,     2,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     2,     2,
+       1,     3,     2,     4,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     5,     2,     2,     2,
+       2,     3,     2,     0,     6,     1,     1,     1,     1,     1,
+       5,     3,     5,     4,     4,     6,     6,     3,     1,     2,
+       4,     4,     2,     4,     3

 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state

@@ -2623,822 +2866,937 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {

-     118,   302,   131,   235,   229,   232,   233,   230,   231,   234,
-       0,     0,    78,     0,     0,   124,   122,   123,     0,   130,
-       0,   129,   190,   236,   269,   125,     0,     0,     0,   239,
-     126,   128,   127,     0,     0,   238,   237,     0,     0,   274,
-       0,     0,    14,     0,     0,     0,     0,   206,   118,     0,
-       0,     2,   118,     5,    54,    12,     0,    36,    67,    31,
-      32,    33,    34,    35,    38,    37,     7,    30,     0,   119,
-     120,     9,     8,    11,    10,   223,   226,   228,   227,   222,
-      39,   220,   224,   225,    41,    40,     0,     0,    72,    76,
-     118,    92,   108,   109,   114,   111,     0,     0,   302,   212,
-     189,     0,   268,     0,     0,   116,     0,   103,   206,     0,
-     216,    65,     0,   219,     0,   275,   294,   293,   271,   251,
-     250,     0,     0,   207,   208,   209,    82,     0,   106,   217,
-       0,    80,    44,    43,   118,    45,    29,     0,    46,    47,
-      48,    50,     0,    49,   296,     1,     6,   118,   302,     0,
-      68,     0,     0,    69,     0,   186,     0,   159,     0,   158,
-     160,   306,   121,     0,     0,     0,     0,     0,     0,     0,
+     125,   348,   138,   177,   277,   174,   175,   176,     0,     0,
+      66,     0,     0,   131,   278,   129,   130,     0,   137,     0,
+     136,   225,   181,   182,   310,   132,     0,     0,     0,   180,
+     133,   135,   134,     0,     0,   179,   178,     0,     0,     0,
+     260,     0,     0,    14,   184,     0,     0,     0,     0,   241,
+     125,     0,     0,     2,   125,     5,    56,    12,     0,    38,
+      71,    33,    34,    35,    36,    37,    40,   125,    39,     7,
+      32,     0,   126,   127,     9,     8,    11,   275,   276,     0,
+     183,    10,   269,   271,   273,   272,    41,   258,   270,   274,
+      43,    31,    42,     0,     0,    76,     0,     0,   125,    94,
+     111,   115,   113,   112,   114,   120,   117,     0,     0,   348,
+     247,   224,     0,   309,     0,   122,     0,   123,   308,   105,
+     241,     0,     0,   251,     0,   262,   263,   264,   265,   266,
+       0,     0,   261,   330,   329,   312,   292,   291,     0,   256,
+       0,   242,   243,   244,   254,    84,     0,   108,   252,     0,
+      82,    46,    45,   125,    47,    30,     0,    48,    49,    50,
+      52,     0,    51,   332,     1,     6,   125,   348,     0,    72,
+       0,     0,    73,    55,   110,     0,   221,     0,   166,     0,
+     165,   167,   352,   128,   197,     0,   198,   199,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,   292,   291,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,   206,     0,     0,    55,    73,     0,
-      53,     0,     0,   118,   112,     0,   193,     0,   196,   195,
-     307,   204,   176,     0,     0,     0,    27,     0,   295,     0,
-       0,   278,     0,   270,   273,   210,   211,    83,   203,    59,
-      60,   105,   218,    58,    81,    42,    28,   118,     0,   203,
-       0,     0,   303,   185,   184,     0,   132,   134,     0,   221,
-     265,   266,   263,   264,   244,   245,   247,   246,   242,   243,
-     285,   284,   280,   279,   287,   288,   286,   282,   281,   283,
-     248,   249,   299,   257,   256,   255,   289,     0,   254,   253,
-     252,   240,   241,   261,   260,   258,   262,   259,     0,     0,
-     301,     0,     0,     0,    52,     0,     0,    25,     0,   118,
-      17,    23,     0,    20,    19,    22,    21,   118,   110,     0,
-     206,   213,   165,     0,     0,   177,   181,   118,   194,   117,
-     267,     0,    26,   215,     0,   276,     0,     0,    57,     0,
-     118,    13,    57,     0,     0,     0,     0,     0,   136,     0,
-       0,   203,   161,   162,     0,   214,   272,     0,     0,   297,
-     118,     0,     0,   115,    18,   118,     0,     0,     0,     0,
-     183,   178,   203,     0,   107,     0,   118,     0,   201,   200,
-     199,   202,     0,    62,    61,    51,     0,   118,   304,   305,
-     176,   133,     0,     0,   197,   135,   140,    57,     0,   290,
-     298,   300,    77,     0,    84,     0,   113,   205,   175,   171,
-     168,   169,   167,   170,   174,   173,   172,   166,   165,     0,
-       0,   180,     0,     0,    98,   102,   100,   104,    63,   277,
-      56,     0,    75,     0,   137,   138,     0,   118,   164,   163,
-      79,     0,     0,     0,    85,    88,    86,    24,   182,   191,
-     179,    96,     0,    99,   101,   118,    66,   118,   203,   118,
-     198,     0,   155,     0,     0,   118,   153,     0,    27,    93,
-      89,    87,    27,    27,   203,    64,    74,     0,   146,   150,
-       0,     0,     0,   118,   144,   148,   149,   156,   186,   141,
-     154,    27,    91,     0,     0,     0,   187,   118,   139,   145,
-       0,    90,   192,    97,    94,    27,     0,     0,     0,     0,
-     147,   176,    27,   188,     0,     0,   203,    95,   157
+       0,     0,   328,   327,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     241,     0,     0,    58,    77,     0,   255,     0,    67,     0,
+     125,   118,     0,   228,     0,   231,   230,   354,   239,   211,
+       0,     0,    28,     0,   331,     0,     0,   280,     0,     0,
+       0,   311,   279,   245,   246,    85,   238,    62,    63,   107,
+     253,    61,    83,    44,    29,   125,     0,   238,     0,     0,
+      54,   349,   220,   219,     0,   139,   141,     0,   189,     0,
+     206,     0,   200,   204,   259,   306,   307,   304,   305,   285,
+     286,   288,   287,   283,   284,   320,   319,   315,   314,   322,
+     323,   324,   321,   317,   316,   318,   289,   290,   339,     0,
+     338,   341,   298,   297,   296,   325,     0,   295,   294,   293,
+     281,   282,   302,   301,   299,   303,   300,     0,     0,   111,
+     115,   339,   333,     0,     0,     0,   347,    66,     0,     0,
+      26,    57,     0,   125,    17,    23,     0,    20,    19,    22,
+      21,   125,   116,     0,   241,   248,   172,     0,     0,   212,
+     216,   109,   124,   229,     0,    27,   250,   353,    66,   267,
+       0,   257,     0,    60,     0,   125,    13,    60,     0,     0,
+       0,     0,     0,   143,     0,     0,   238,   168,   169,     0,
+       0,     0,   185,   186,   191,   205,     0,   344,     0,   249,
+     313,     0,     0,     0,   343,     0,    80,     0,     0,     0,
+     121,    18,   125,     0,     0,     0,     0,   218,   213,   238,
+       0,     0,    68,     0,   236,   235,   234,   237,     0,    65,
+      64,    53,     0,    66,   350,   351,   211,   140,     0,     0,
+     232,   142,   147,    60,     0,   190,   210,   209,   207,   208,
+       0,     0,     0,   326,     0,   342,     0,   340,    81,    86,
+       0,     0,   119,   240,   173,   172,     0,     0,   215,     0,
+       0,   100,   104,   102,   106,    66,    70,   268,    59,     0,
+      79,     0,   144,   145,     0,   125,   171,   170,   201,   193,
+     184,   194,     0,   192,     0,   191,   346,   334,   345,     0,
+       0,     0,    87,    90,    88,    25,    24,   217,   226,   214,
+      98,     0,   101,   103,    69,    66,   238,   125,   233,     0,
+     162,     0,     0,   125,   160,     0,   187,   184,   191,   195,
+       0,    28,    95,    91,    89,    28,    28,   238,    78,     0,
+     153,   157,     0,     0,     0,   125,   151,   155,   156,   163,
+     221,   148,   161,   186,     0,     0,   196,    28,    93,     0,
+       0,     0,   222,   125,   146,   152,     0,     0,   188,   186,
+      92,   227,    99,    96,    28,     0,     0,   202,     0,     0,
+       0,   154,   211,   203,    28,   223,     0,     0,   238,    97,
+     164

 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {

-      -1,    50,    51,    52,    53,   308,   309,   310,   331,   332,
-     135,   136,   211,   311,   137,   383,   138,   243,   240,   456,
-      57,   229,   151,   152,    58,    59,    60,    61,   209,    62,
-      90,   139,   140,   443,   444,   445,   446,    63,   212,   424,
-     508,   425,   473,   426,   427,    64,   226,   141,    65,    95,
-     217,    66,   317,   213,    67,   142,    69,    70,   348,   350,
-     393,   313,   459,   314,   437,   482,   483,   484,   464,   465,
-     466,   160,   315,   258,   352,   353,   370,   417,   324,   325,
-     326,   255,   316,   505,   101,    75,   472,   218,   219,   380,
-     395,   381,   338,   321,   122,   123,   124,   221,    76,    77,
-      78,   143,   125,    79,    80,    81,    82,   114,   115,    83,
-     161,    84,    85
+      -1,    52,    53,    54,    55,   352,   353,   354,   374,   375,
+     154,   155,   174,   355,   419,   156,   439,   157,   271,   268,
+      97,    98,   486,    59,   170,   171,    60,    61,    62,    63,
+      64,   158,   159,   511,   512,   513,   514,    65,   239,   481,
+     589,   482,   546,   483,   484,    66,   252,   160,    67,    68,
+     243,   244,    69,   361,   240,    70,   161,    72,    73,   393,
+     395,   449,   357,   527,   358,   495,   554,   555,   556,   532,
+     533,   534,   181,   359,   287,   397,   398,   427,    77,    78,
+      79,   404,   460,   503,   564,   186,   399,   461,   504,   187,
+     291,    80,   292,   293,   368,   369,   370,   284,   360,   584,
+     112,    82,   545,   245,   246,   436,   451,   437,   383,   365,
+     140,   141,   142,   248,    83,    84,    85,   162,   143,   235,
+     236,    86,   130,   131,   132,    87,   411,   345,   321,    88,
+      89,   182,    90,    91,    92

 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */

-#define YYPACT_NINF -386
+#define YYPACT_NINF -515

 static const yytype_int16 yypact[] =
 {
 static const yytype_int16 yypact[] =
 {

-    1672,   -68,  -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,
-     -31,   -80,  -386,   -72,    15,  -386,  -386,  -386,    59,  -386,
-    2092,  -386,    86,  -386,  2162,  -386,     6,    45,    11,  -386,
-    -386,  -386,  -386,   -12,   -43,  -386,  -386,  2092,    13,  2092,
-    2092,  2092,  -386,  2092,  2092,  2092,  2092,  2092,   632,   136,
-     143,  -386,   502,  -386,  -386,  -386,    26,  -386,  2022,  -386,
-    -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,   312,   405,
-    -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,    80,
-    -386,  2567,  -386,  -386,  -386,  -386,   198,    84,  -386,  -386,
-    1924,  -386,  -386,  -386,  -386,  -386,    -2,    83,  -386,   -62,
-    -386,    95,   -46,  2092,    89,  -386,  2092,  -386,  2092,   216,
-     -46,  -386,   115,  2567,   101,   130,   -46,   -46,   237,   -46,
-     -46,   -74,   106,   138,  2092,  -386,   233,   234,  2092,  2092,
-     234,   236,  -386,  -386,   762,  -386,  -386,   117,  -386,  -386,
-    -386,  -386,   223,  -386,  -386,  -386,  -386,  1022,   178,   245,
-    -386,   155,   188,  -386,   254,    94,   260,  -386,   262,  -386,
-    -386,  -386,  -386,  2092,  2092,  2092,  2092,  2092,  2092,  2092,
-    2092,  2092,  2092,  2092,  2092,  2092,  2092,  2092,  2092,  2092,
-    2092,  2092,  2092,  2092,  2092,  2092,  -386,  -386,   263,  2092,
-    2092,  2092,  2092,  2092,  2092,  2092,  2092,  2092,  2092,  2092,
-    2092,  2092,  2092,  2092,  2092,  2092,     8,  -386,  -386,  2092,
-     168,   255,  2092,  1152,  -386,    45,   141,   144,  -386,  -386,
-    -386,   148,    22,   -28,    19,  2187,  1798,   139,  -386,  2092,
-    2092,  -386,  2092,  -386,  -386,  -386,  -386,  -386,   169,   173,
-    -386,    80,    80,   173,  -386,  -386,  -386,  1924,   145,   169,
-    2092,  2092,   179,  -386,  -386,   283,   240,   241,   284,  2567,
-    1014,   494,   494,   494,  2872,  2872,  2872,  2872,  1014,  1014,
-    2567,  2567,  2567,  2567,  2567,  2567,  2567,  2567,  2567,  2567,
-     308,  2628,  -386,   137,   137,   137,  2567,  2384,  2689,  2750,
-    2811,  1014,  1014,   237,   237,   -46,   -46,   -46,   164,  2445,
-     209,  2092,   296,     7,  -386,   186,  2258,  -386,   181,  1282,
-    -386,  -386,   174,  -386,  -386,  -386,  -386,  1152,  -386,   134,
-    2092,  -386,    -1,   298,   182,   214,  -386,  1924,   141,  -386,
-    -386,   184,  1798,  -386,    21,  -386,   215,    63,   219,   234,
-     892,  -386,   -45,   111,    99,    38,   200,    83,   306,    83,
-     205,   169,   224,  -386,  2092,  -386,  -386,   323,  2321,  -386,
-    1924,  2092,   206,  -386,  -386,  1152,   201,   204,   280,    63,
-    -386,  -386,   169,    25,  -386,    98,  1924,  2092,  -386,  -386,
-    -386,  -386,  2092,  -386,  -386,  -386,  2092,  1924,  -386,  -386,
-      22,  -386,    83,   212,  -386,   242,  -386,   219,   284,  2567,
-    -386,  -386,  -386,   102,    46,   208,  -386,  -386,  -386,  -386,
-    -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,   239,   228,
-     298,  -386,   247,   227,  -386,  -386,    98,  -386,   295,  -386,
-    -386,   229,  -386,   230,   242,  -386,    83,    47,  -386,  -386,
-    -386,  2092,   266,   246,    46,  -386,  -386,  -386,  -386,  -386,
-    -386,  -386,   365,  -386,  -386,  1924,  -386,  1924,   169,  1412,
-    -386,   382,  -386,   359,   256,   258,  -386,  2506,  1798,  -386,
-    -386,  -386,  1798,  1798,   169,  -386,  -386,   261,  -386,  -386,
-     265,   194,   257,  1542,  -386,  -386,  -386,  -386,    94,  -386,
-    -386,  1798,  -386,   269,   273,   259,  -386,  1412,  -386,  -386,
-     390,  -386,  -386,  -386,  -386,  1798,   274,   272,   271,   275,
-    -386,    22,  1798,  -386,   277,   276,   169,  -386,  -386
+    1766,    12,  -515,  -515,  -515,  -515,  -515,  -515,   -28,    -6,
+    -515,    16,    94,  -515,  -515,  -515,  -515,   108,  -515,  2220,
+    -515,   122,  -515,  -515,  2277,  -515,    17,   363,  2220,  -515,
+    -515,  -515,  -515,    24,    27,  -515,  -515,   112,  2220,    29,
+     332,  2220,  2220,  -515,  -515,  2220,  2220,  2220,  2220,  2220,
+     710,   158,   165,  -515,   578,  -515,  -515,  -515,    44,  -515,
+    2148,  -515,  -515,  -515,  -515,  -515,  -515,  2022,  -515,  -515,
+    -515,   288,   766,  -515,  -515,  -515,  -515,  -515,  -515,    11,
+    -515,  -515,  -515,  -515,  -515,  -515,   118,  2972,  -515,  -515,
+    -515,  -515,  -515,   218,   101,  -515,  2220,   221,  2022,  -515,
+    -515,  -515,  -515,  -515,  -515,  -515,  -515,   -83,   373,  -515,
+     -50,  -515,   111,   -51,  2220,   110,   124,  -515,   -51,  -515,
+    2220,   253,   155,   -51,  2220,  -515,  -515,  -515,  -515,  -515,
+     127,   159,   162,   -51,   -51,   702,   -51,   -51,   -52,  2910,
+     141,   168,  2220,  -515,  2910,   268,   272,  2220,  2220,   272,
+     273,  -515,  -515,   842,  -515,  -515,   149,  -515,  -515,  -515,
+    -515,   266,  -515,  -515,  -515,  -515,  1106,   214,   282,  -515,
+     191,   225,   118,   202,  -515,   302,    54,   304,  -515,   305,
+    -515,  -515,  -515,  -515,  -515,  2220,  -515,    20,  2220,  2220,
+    2220,  2220,  2220,  2220,  2220,  2220,  2220,  2220,  2220,  2220,
+    2220,  2220,  2220,  2220,  2220,  2220,  2220,  2220,  2220,  2220,
+    2220,  2220,  -515,  -515,   130,  2220,  2220,  2220,  2220,  2220,
+    2220,  2220,  2220,  2220,  2220,  2220,  2220,  2220,  2220,  2220,
+    2220,  2220,   128,  -515,  -515,   174,   209,   188,  -515,  2220,
+    1238,  -515,   373,   184,   187,  -515,  -515,  -515,   194,    21,
+     186,    84,  1894,   193,  -515,  2220,   198,  -515,  2220,   332,
+    2220,  -515,  -515,  -515,  -515,  -515,   216,   236,  -515,  -515,
+    -515,   236,  -515,  -515,  -515,  2022,   226,   216,  2220,  2220,
+    -515,   239,  -515,  -515,   345,   311,   314,   366,  2910,   278,
+     280,   -49,    20,  -515,  2910,   408,   570,   570,   570,  3282,
+    3282,  3282,  3282,   408,   408,  2910,  2910,  2910,  2910,  2910,
+    2910,  2910,  2910,  2910,  2910,  2910,   365,  3034,  -515,   146,
+    -515,  -515,   424,   424,   424,  2910,  2476,  3096,  3158,  3220,
+     408,   408,   702,   702,   -51,   -51,   -51,   250,  2538,   295,
+     306,   307,  -515,  2220,   233,   312,  -515,  -515,  2220,  2336,
+    -515,   279,   259,  1370,  -515,  -515,   267,  -515,  -515,  -515,
+    -515,  1238,  -515,   373,  2220,  -515,   126,   401,   274,   308,
+    -515,  -515,  -515,   283,   281,  1894,  -515,  2910,  -515,  -515,
+     310,  2910,   270,   313,   272,   974,  -515,   -30,   317,   284,
+     104,   290,   373,   393,   373,   292,   216,   323,  -515,   294,
+      14,    15,  -515,  -515,  -515,  -515,  2220,  -515,  2220,  -515,
+    -515,  2220,  2600,  2220,  -515,   354,  -515,   296,   301,  2220,
+    -515,  -515,  1238,   298,   309,  2220,   270,  -515,  -515,   216,
+      22,    39,   364,  2220,  -515,  -515,  -515,  -515,  2220,  -515,
+    -515,  -515,  2220,  -515,  -515,  -515,    21,  -515,   373,   315,
+    -515,   334,  -515,   313,   366,  -515,  -515,  -515,  -515,  -515,
+     333,    43,  2662,  2910,  2406,  -515,  2724,  -515,  -515,    28,
+    2786,   316,  -515,  -515,  2910,   342,   319,   401,  -515,   321,
+     327,  -515,  -515,    39,  -515,  -515,  -515,  -515,  2910,   -41,
+    -515,   318,   334,  -515,   373,   277,  -515,  -515,  -515,  -515,
+     338,  -515,  2220,  -515,   353,  -515,  -515,  -515,  -515,  2220,
+     350,   331,    28,  -515,  -515,  -515,  -515,  -515,  -515,  -515,
+    -515,   463,  -515,  -515,  -515,  -515,   216,  1502,  -515,   464,
+    -515,   442,   335,   326,  -515,    11,  2910,   359,  -515,    46,
+    2848,  1894,  -515,  -515,  -515,  1894,  1894,   216,  -515,   358,
+    -515,  -515,   360,   264,   336,  1634,  -515,  -515,  -515,  -515,
+      54,  -515,  -515,  -515,   344,    11,    46,  1894,  -515,   362,
+     369,   352,  -515,  1502,  -515,  -515,   489,   381,  -515,  -515,
+    -515,  -515,  -515,  -515,  1894,   374,   375,  -515,   386,   379,
+     376,  -515,    21,  -515,  1894,  -515,   377,   380,   216,  -515,
+    -515

 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {

-    -386,  -386,   248,  -386,   360,  -290,  -386,   104,  -385,   -38,
-       1,   -85,  -313,    58,     2,    14,   361,   301,    97,  -386,
-    -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,  -386,
-    -386,  -386,  -386,  -386,  -386,   -10,    -5,  -386,  -386,    12,
-    -386,    16,  -386,  -386,  -386,  -386,  -386,  -386,  -386,  -200,
-      76,  -386,  -386,  -386,  -386,     0,  -386,   371,  -386,  -386,
-    -386,    60,  -386,    61,  -386,   -56,  -386,   -39,  -386,  -386,
-     -20,  -386,     3,  -386,  -386,    48,    29,  -386,  -373,  -386,
-    -303,   -40,     4,  -386,  -386,  -386,  -386,  -386,   422,   -89,
-      64,    81,  -240,  -386,   -95,  -386,  -386,  -386,  -386,  -386,
-    -386,  -386,   -32,    -6,   -52,    -8,  -386,  -386,  -386,  -386,
-    -386,  -386,  -386
+    -515,  -515,   343,  -515,   457,  -340,  -515,   160,  -514,   -37,
+       1,   -58,   417,    60,  -515,     2,    82,   461,   390,   161,
+    -241,  -515,  -515,  -515,  -515,  -515,  -515,  -515,  -515,  -515,
+    -515,  -515,  -515,  -515,  -515,    31,    32,  -515,  -515,    63,
+    -515,    64,  -515,  -515,  -515,  -515,  -515,  -515,  -515,  -515,
+      37,    59,  -515,  -515,  -515,  -515,     0,  -515,   477,  -515,
+    -515,  -515,    65,  -515,    68,  -515,   -22,  -515,    -3,  -515,
+    -515,    30,  -515,     3,  -515,  -515,   100,    85,  -515,  -515,
+    -515,  -515,  -464,  -515,  -515,  -172,  -515,  -453,  -515,  -488,
+    -515,  -423,  -515,   269,  -428,  -515,  -339,     5,     4,  -515,
+    -515,  -515,  -515,  -515,   535,  -103,   116,   140,  -269,  -515,
+    -109,  -515,  -515,  -515,  -515,  -515,  -515,  -515,  -132,   -55,
+     519,   -54,  -515,   320,  -515,   -12,  -515,  -515,  -215,  -515,
+    -515,  -515,  -515,  -515,  -515

 };
 
 /* 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.  */
 };
 
 /* 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 -153
+#define YYTABLE_NINF -338

 static const yytype_int16 yytable[] =
 {
 static const yytype_int16 yytable[] =
 {

-      68,    54,    56,    73,    74,   210,   153,   112,   220,   342,
-     134,   300,    99,   227,   374,   318,   102,   433,    92,    87,
-     371,    86,   328,   -70,   318,   322,   163,   366,   322,   110,
-     188,   113,   116,   117,    93,   118,   119,   120,    93,   113,
-     121,   388,    89,   389,   186,   187,   188,   402,    92,   246,
-      91,     2,    68,    54,    56,    73,    74,   382,    55,   233,
-      71,    72,   205,   428,    93,   206,   216,    15,    16,    17,
-     421,    19,   163,    21,   432,   405,   204,    97,   205,   108,
-     441,   206,    93,   492,   109,    25,   216,   493,   494,   100,
-      96,    88,   236,   461,    30,    31,    32,   223,   225,   378,
-     113,   368,    93,   104,   369,   327,   501,   163,   442,   298,
-      55,   397,    71,    72,   107,   323,   113,   450,   420,   318,
-     509,   163,   241,   242,   214,   215,   422,   515,   103,   253,
-     301,   423,   419,   106,   329,   111,   302,   328,   514,   144,
-     360,    94,   475,   145,   476,   254,   462,    68,    54,    56,
-      73,    74,   147,    93,   376,   259,   260,   261,   262,   263,
-     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
-     274,   275,   276,   277,   278,   279,   280,   281,   379,  -151,
-     163,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,   294,   295,   296,   297,   113,   299,   335,   163,
-     336,   207,   163,   303,   306,    55,   208,    71,    72,   340,
-     386,   163,   154,    68,    54,   312,   224,   222,   477,   228,
-     230,   155,   113,   334,   113,   367,   157,   186,   187,   188,
-     232,   234,   387,   231,   495,   440,   237,   238,   235,   244,
-     159,   154,   210,   247,   343,   344,   -71,   246,   249,   199,
-     200,   201,   202,   203,   250,   246,   251,   252,   391,   204,
-     394,   205,     2,   256,   206,   257,   282,   304,  -108,   305,
-     320,   319,   333,   339,   337,   210,   518,   341,    15,    16,
-      17,   345,    19,   408,    21,   409,   346,   351,   410,   411,
-     412,   210,   413,   358,   347,   349,    25,   355,   357,   359,
-     365,   322,   210,   394,   461,    30,    31,    32,   361,    68,
-      54,   312,   113,   363,   373,   372,   375,    68,    54,   312,
-     377,   382,   390,   392,   398,   414,   400,   186,   187,   188,
-     154,   396,   404,   406,   431,   415,   416,   407,   435,   155,
-     447,   368,   436,   156,   157,   429,   399,   460,   164,   452,
-     430,   201,   202,   203,   449,   403,   158,   462,   159,   204,
-     455,   205,   457,   458,   206,    68,    54,   312,   474,   113,
-     210,   468,   210,   451,   113,   165,   166,   167,   469,   168,
-     169,   170,   171,   172,   173,   487,   488,   496,   489,   498,
-    -152,   497,   504,   507,   511,   248,   185,   512,   186,   187,
-     188,   502,   189,   190,   191,   503,   510,   513,   517,     2,
-     516,   438,   146,   364,   194,   195,   196,   197,   198,   150,
-     199,   200,   201,   202,   203,    15,    16,    17,   239,    19,
-     204,    21,   205,   467,   470,   206,   384,   463,   453,   471,
-     162,   506,   454,    25,   499,   490,   439,   448,   500,   105,
-     418,     0,    30,    31,    32,     0,   434,     0,     0,   481,
-     479,   480,   485,   486,     0,   463,     0,     0,     0,     0,
+      71,    56,    58,    76,    81,   247,   172,   110,   387,   173,
+     264,   253,   113,   153,   184,   290,   118,   346,   491,   456,
+     458,   423,    94,   289,   366,   366,   123,   568,   428,   133,
+     134,   569,   570,   135,   136,   137,   139,   144,   505,   -74,
+     173,   212,   213,   214,   214,   241,   242,   563,   499,   106,
+     260,   499,   539,   580,    71,    56,    58,    76,    81,   250,
+      57,   188,   509,   402,   106,    74,   479,   403,    75,   256,
+     590,   107,   480,   230,   438,   231,   231,   579,   232,   232,
+     597,   538,   471,   261,   139,   566,   116,   100,   101,   282,
+     510,   478,   269,   270,   525,   274,    95,   100,   101,   577,
+     102,   103,   139,    93,   407,   283,   416,   444,   144,   445,
+     102,   103,   139,   104,    57,   588,   367,   477,    96,    74,
+     290,   337,    75,   104,   108,   111,   379,   453,   122,   414,
+     144,   339,   340,   100,   101,   139,   139,   432,   519,   185,
+      99,   114,   185,   185,   102,   103,   102,   103,   185,   100,
+     101,   120,   119,   124,   500,   501,   121,   104,   501,   104,
+     476,   163,   102,   103,   596,   164,    71,    56,    58,    76,
+      81,   502,   166,   288,   502,   104,   294,   295,   296,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
+     467,   372,   490,   322,   323,   324,   325,   326,   327,   328,
+     329,   330,   331,   332,   333,   334,   335,   336,   144,   338,
+     188,   233,   105,   388,   389,   234,    57,   349,   457,   459,
+     425,    74,   426,   237,    75,   249,   100,   101,   385,  -111,
+      71,    56,   356,   377,   524,   341,   144,   318,   381,   102,
+     103,   320,   342,   251,   343,   424,   254,   549,   344,   255,
+     319,   257,   104,   318,   259,   258,   139,   139,   262,   320,
+     263,   265,   406,   100,   101,   266,   272,   275,   571,   362,
+     175,     2,   175,   -75,   548,   277,   102,   103,   373,   447,
+     176,   450,   278,   417,   279,    13,   178,    15,    16,   104,
+      18,   487,    20,   280,   175,   281,   434,   285,   286,   347,
+     180,   260,   348,  -117,   176,    25,   363,   274,   364,   177,
+     178,   371,   382,   529,    30,    31,    32,   274,   376,   600,
+       2,   412,   179,   378,   180,   125,   139,   126,   384,   144,
+     127,   128,   129,   390,    13,   450,    15,    16,   391,    18,
+     318,    20,   144,    71,    56,   356,   320,   100,   101,   413,
+     386,    71,    56,   356,    25,   392,   115,   101,   394,   396,
+     102,   103,   529,    30,    31,    32,   100,   101,   530,   102,
+     103,   320,   400,   104,   401,   409,  -335,   435,   489,   102,
+     103,   528,   104,   420,   462,   422,   463,  -337,  -336,   464,
+     373,   466,   104,   415,   366,   189,  -241,   470,   448,   429,
+     430,  -158,  -116,   474,   446,   431,   433,   438,   442,   443,
+     452,   144,    71,    56,   356,   454,   488,   530,   455,   469,
+     485,   468,   472,   190,   191,   192,   494,   193,   194,   195,
+     196,   197,   198,   493,   473,   498,   425,   518,  -338,   520,
+     516,   521,   320,   526,   535,   211,   541,   212,   213,   214,
+    -159,   215,   216,   217,   537,   542,   547,   559,   560,   561,
+     574,   318,   220,   221,   222,   565,   223,   224,   578,   225,
+     226,   227,   228,   229,  -338,  -338,   572,   583,   573,   230,
+     536,   231,   586,   587,   232,   531,   581,   540,   593,   592,
+     212,   213,   214,   582,   215,   216,   217,   594,   591,   276,
+     595,   165,   598,   421,   599,   238,   212,   213,   214,  -338,
+    -338,   169,   225,   226,   227,   228,   229,   553,   551,   552,
+     557,   558,   230,   531,   231,   496,   267,   232,   225,   226,
+     227,   228,   229,   543,   544,   440,   522,   523,   230,   183,
+     231,   585,   575,   232,   497,   553,   551,   552,   557,   558,
+     517,   405,   117,   562,   492,   576,   475,   138,     0,     0,
+       0,     0,     0,   553,   551,   552,   557,   558,    -4,   380,
+       0,     1,     2,     3,     4,     0,     5,     6,     7,     8,
+       9,    10,    11,     0,     0,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,     0,     0,    22,    23,     0,     0,
+     189,     0,     0,     0,    24,     0,    25,    26,     0,    27,
+       0,    28,     0,    29,     0,    30,    31,    32,     0,     0,
+      33,    34,     0,    35,    36,     0,     0,     0,  -338,  -338,
+    -338,    37,    38,    39,     0,     0,   197,   198,     0,    40,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,   481,   479,   480,   485,   486,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   481,   479,   480,
-     485,   486,    -4,     0,     0,     1,     2,     3,     4,     0,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,     0,
-       0,    14,    15,    16,    17,    18,    19,    20,    21,     0,
-       0,    23,     0,     0,   164,     0,     0,     0,    24,     0,
-      25,    26,     0,    27,     0,    28,     0,    29,     0,    30,
+       0,     0,   212,   213,   214,     0,   215,   216,   217,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,    43,
+       0,   223,   224,     0,   225,   226,   227,   228,   229,    44,
+       0,     0,    45,     0,   230,     0,   231,    46,    47,   232,
+       0,     0,    48,     0,    49,     0,    50,     0,    51,     0,
+       0,     0,    -4,     1,     2,     3,     4,     0,     5,     6,
+       7,     8,     9,    10,    11,     0,     0,     0,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,     0,    22,    23,
+     145,     0,   146,     0,     0,     0,    24,   147,    25,    26,
+       0,    27,   148,    28,     0,    29,   149,    30,    31,    32,
+       0,     0,    33,    34,     0,    35,    36,     0,     0,     0,
+       2,     0,     0,    37,    38,    39,     0,   150,     0,     0,
+       0,    40,     0,     0,    13,     0,    15,    16,     0,    18,
+       0,    20,     0,     0,   212,   213,   214,     0,     0,     0,
+       0,     0,    41,    42,    25,     0,     0,     0,     0,     0,
+       0,   151,     0,    30,    31,    32,     0,     0,   227,   228,
+     229,    44,     0,     0,    45,     0,   230,     0,   231,    46,
+      47,   232,     0,     0,    48,     0,    49,     0,    50,     0,
+      51,     0,     0,     0,   152,     1,     2,     3,     4,     0,
+       5,     6,     7,     8,     9,    10,    11,     0,     0,     0,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,     0,
+      22,    23,   145,     0,   146,     0,     0,     0,    24,   147,
+      25,    26,     0,    27,   148,    28,     0,    29,   149,    30,

       31,    32,     0,     0,    33,    34,     0,    35,    36,     0,
       31,    32,     0,     0,    33,    34,     0,    35,    36,     0,

-       0,  -153,  -153,  -153,     0,    37,    38,     0,     0,   172,
-     173,     0,    39,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   186,   187,   188,     0,   189,   190,
-     191,     0,    40,    41,     0,     0,     0,     0,     0,     0,
-       0,    42,     0,   197,   198,     0,   199,   200,   201,   202,
-     203,     0,     0,     0,    43,     0,   204,     0,   205,    44,
-      45,   206,     0,     0,    46,     0,    47,     0,    48,     0,
-      49,     0,     0,     0,    -4,     1,     2,     3,     4,     0,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,     0,
-       0,     0,    15,    16,    17,    18,    19,    20,    21,    22,
-       0,    23,   126,     0,   127,     0,     0,     0,    24,   128,
-      25,    26,     0,    27,   129,    28,     0,    29,   130,    30,
-      31,    32,     0,     0,    33,    34,     0,    35,    36,     0,
-       0,     0,     0,     0,     0,    37,    38,     0,   131,     0,
-       0,     0,    39,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    37,    38,    39,     0,   150,
+       0,     0,     0,    40,     0,     0,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    40,    41,     0,     0,     0,     0,     0,     0,
-       0,   132,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    43,     0,     0,     0,     0,    44,
-      45,     0,     0,     0,    46,     0,    47,     0,    48,     0,
-      49,     0,     0,     0,   133,     1,     2,     3,     4,     0,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,     0,
-       0,     0,    15,    16,    17,    18,    19,    20,    21,    22,
-       0,    23,   126,     0,   127,     0,     0,     0,    24,   128,
-      25,    26,     0,    27,   129,    28,     0,    29,   130,    30,
-      31,    32,     0,     0,    33,    34,     0,    35,    36,     0,
-       0,     0,     0,     0,     0,    37,    38,     0,   131,     0,
-       0,     0,    39,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,   151,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    44,     0,     0,    45,     0,     0,     0,
+       0,    46,    47,     0,     0,     0,    48,     0,    49,     0,
+      50,     0,    51,     0,     0,     0,   273,     1,     2,     3,
+       4,     0,     5,     6,     7,     8,     9,    10,    11,     0,
+       0,     0,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,     0,    22,    23,   145,     0,   146,     0,     0,     0,
+      24,   147,    25,    26,     0,    27,   148,    28,     0,    29,
+     149,    30,    31,    32,     0,     0,    33,    34,     0,    35,
+      36,     0,     0,     0,     0,     0,     0,    37,    38,    39,
+       0,   150,     0,     0,     0,    40,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    40,    41,     0,     0,     0,     0,     0,     0,
-       0,   132,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    43,     0,     0,     0,     0,    44,
-      45,     0,     0,     0,    46,     0,    47,     0,    48,     0,
-      49,     0,     0,     0,   245,     1,     2,     3,     4,     0,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,     0,
-       0,     0,    15,    16,    17,    18,    19,    20,    21,    22,
-       0,    23,   126,     0,   127,     0,     0,     0,    24,   128,
-      25,    26,     0,    27,   129,    28,     0,    29,   130,    30,
-      31,    32,     0,     0,    33,    34,     0,    35,    36,     0,
-       0,     0,     0,     0,     0,    37,    38,     0,   131,     0,
-       0,     0,    39,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,   151,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    44,     0,     0,    45,     0,
+       0,     0,     0,    46,    47,     0,     0,     0,    48,     0,
+      49,     0,    50,     0,    51,     0,     0,     0,   441,     1,
+       2,     3,     4,     0,     5,     6,     7,     8,     9,    10,
+      11,     0,     0,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,     0,     0,    22,    23,     0,     0,     0,     0,
+       0,     0,    24,     0,    25,    26,     0,    27,     0,    28,
+       0,    29,     0,    30,    31,    32,     0,     0,    33,    34,
+       0,    35,    36,     0,     0,     0,     0,     0,     0,    37,
+      38,    39,     0,     0,     0,     0,     0,    40,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    40,    41,     0,     0,     0,     0,     0,     0,
-       0,   132,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    43,     0,     0,     0,     0,    44,
-      45,     0,     0,     0,    46,     0,    47,     0,    48,     0,
-      49,     0,     0,     0,   385,     1,     2,     3,     4,     0,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,     0,
-       0,    14,    15,    16,    17,    18,    19,    20,    21,     0,
-       0,    23,     0,     0,  -153,     0,     0,     0,    24,     0,
-      25,    26,     0,    27,     0,    28,     0,    29,     0,    30,
-      31,    32,     0,     0,    33,    34,     0,    35,    36,     0,
-       0,     0,     0,     0,     0,    37,    38,     0,     0,  -153,
-    -153,     0,    39,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   186,   187,   188,     0,   189,   190,
-     191,     0,    40,    41,     0,     0,     0,     0,     0,     0,
-       0,    42,     0,  -153,  -153,     0,   199,   200,   201,   202,
-     203,     0,     0,     0,    43,     0,   204,     0,   205,    44,
-      45,   206,     0,     0,    46,     0,    47,     0,    48,     0,
-      49,     0,     0,     0,    -3,     1,     2,     3,     4,     0,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,     0,
-       0,     0,    15,    16,    17,    18,    19,    20,    21,     0,
-       0,    23,     0,     0,     0,     0,     0,     0,    24,     0,
-      25,    26,     0,    27,     0,    28,     0,    29,     0,    30,
-      31,    32,     0,     0,    33,    34,     0,    35,    36,     0,
-       0,     0,     0,     0,     0,    37,    38,     0,     0,     0,
-       0,     0,    39,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,    43,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    44,     0,     0,
+      45,     0,     0,     0,     0,    46,    47,     0,     0,     0,
+      48,     0,    49,     0,    50,     0,    51,     0,     0,     0,
+      -3,     1,     2,     3,     4,     0,     5,     6,     7,     8,
+       9,    10,    11,     0,     0,     0,    13,    14,    15,    16,
+      17,    18,    19,    20,     0,     0,    22,    23,     0,     0,
+       0,     0,     0,     0,    24,     0,    25,    26,     0,    27,
+       0,    28,     0,    29,     0,    30,    31,    32,     0,     0,
+      33,    34,     0,    35,    36,     0,     0,     0,     0,     0,
+       0,    37,    38,    39,     0,     0,     0,     0,     0,    40,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    40,    41,     0,     0,     0,     0,     0,     0,
-       0,   307,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    43,     0,     0,     0,     0,    44,
-      45,     0,     0,     0,    46,     0,    47,     0,    48,     0,
-      49,     0,     0,     0,   -15,     1,     2,     3,     4,     0,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,     0,
-       0,     0,    15,    16,    17,    18,    19,    20,    21,     0,
-       0,    23,     0,     0,     0,     0,     0,     0,    24,     0,
-      25,    26,     0,    27,     0,    28,     0,    29,     0,    30,
-      31,    32,     0,     0,    33,    34,     0,    35,    36,     0,
-       0,     0,     0,     0,     0,    37,    38,     0,     0,     0,
-       0,     0,    39,     0,     0,     0,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    40,    41,     0,     0,     0,     0,     0,     0,
-       0,   307,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    43,     0,     0,     0,     0,    44,
-      45,     0,     0,     0,    46,     0,    47,     0,    48,     0,
-      49,     0,     0,     0,   -16,     1,     2,     3,     4,     0,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,     0,
-       0,     0,    15,    16,    17,    18,    19,    20,    21,     0,
-       0,    23,     0,     0,     0,     0,     0,     0,    24,     0,
-      25,    26,     0,    27,     0,    28,     0,    29,     0,    30,
-      31,    32,     0,     0,    33,    34,     0,    35,    36,     0,
-       0,     0,     0,     0,     0,    37,    38,     0,     0,     0,
-       0,     0,    39,     0,     0,     0,     0,     0,     0,     0,
+      41,    42,     0,     0,     0,     0,     0,     0,     0,   350,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    44,
+       0,     0,    45,     0,     0,     0,     0,    46,    47,     0,
+       0,     0,    48,     0,   351,     0,    50,     0,    51,     0,
+       0,     0,   -15,     1,     2,     3,     4,     0,     5,     6,
+       7,     8,     9,    10,    11,     0,     0,     0,    13,    14,
+      15,    16,    17,    18,    19,    20,     0,     0,    22,    23,
+       0,     0,     0,     0,     0,     0,    24,     0,    25,    26,
+       0,    27,     0,    28,     0,    29,     0,    30,    31,    32,
+       0,     0,    33,    34,     0,    35,    36,     0,     0,     0,
+       0,     0,     0,    37,    38,    39,     0,     0,     0,     0,
+       0,    40,     0,     0,     0,     0,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    40,    41,     0,     0,     0,     0,     0,     0,
-       0,   478,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    43,     0,     0,     0,     0,    44,
-      45,     0,     0,     0,    46,     0,    47,     0,    48,     0,
-      49,     0,     0,     0,  -142,     1,     2,     3,     4,     0,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,     0,
-       0,     0,    15,    16,    17,    18,    19,    20,    21,     0,
-       0,    23,     0,     0,     0,     0,     0,     0,    24,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,   350,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    44,     0,     0,    45,     0,     0,     0,     0,    46,
+      47,     0,     0,     0,    48,     0,   351,     0,    50,     0,
+      51,     0,     0,     0,   -16,     1,     2,     3,     4,     0,
+       5,     6,     7,     8,     9,    10,    11,     0,     0,     0,
+      13,    14,    15,    16,    17,    18,    19,    20,     0,     0,
+      22,    23,     0,     0,     0,     0,     0,     0,    24,     0,

       25,    26,     0,    27,     0,    28,     0,    29,     0,    30,
       31,    32,     0,     0,    33,    34,     0,    35,    36,     0,
       25,    26,     0,    27,     0,    28,     0,    29,     0,    30,
       31,    32,     0,     0,    33,    34,     0,    35,    36,     0,

-       0,     0,     0,     0,     0,    37,    38,     0,     0,     0,
-       0,     0,    39,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    37,    38,    39,     0,     0,
+       0,     0,     0,    40,     0,     0,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    40,    41,     0,     0,     0,     0,     0,     0,
-       0,   478,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    43,     0,     0,     0,     0,    44,
-      45,     0,     0,     0,    46,     0,    47,     0,    48,     0,
-      49,     0,    -3,     0,  -143,     1,     2,     3,     4,     0,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,     0,
-       0,    14,    15,    16,    17,    18,    19,    20,    21,     0,
-       0,    23,     0,     0,     0,     0,     0,     0,    24,     0,
-      25,    26,     0,    27,     0,    28,     0,    29,     0,    30,
-      31,    32,     0,     0,    33,    34,     0,    35,    36,     0,
-       0,     0,     0,     0,     0,    37,    38,     0,     0,     0,
-       0,     0,    39,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,   550,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    44,     0,     0,    45,     0,     0,     0,
+       0,    46,    47,     0,     0,     0,    48,     0,    49,     0,
+      50,     0,    51,     0,     0,     0,  -149,     1,     2,     3,
+       4,     0,     5,     6,     7,     8,     9,    10,    11,     0,
+       0,     0,    13,    14,    15,    16,    17,    18,    19,    20,
+       0,     0,    22,    23,     0,     0,     0,     0,     0,     0,
+      24,     0,    25,    26,     0,    27,     0,    28,     0,    29,
+       0,    30,    31,    32,     0,     0,    33,    34,     0,    35,
+      36,     0,     0,     0,     0,     0,     0,    37,    38,    39,
+       0,     0,     0,     0,     0,    40,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    40,    41,     0,     0,     0,     0,     0,     0,
-       0,    42,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    43,     0,     0,     0,     0,    44,
-      45,     0,     0,     0,    46,     0,    47,     0,    48,     0,
-      49,     1,     2,     3,     4,     0,     5,     6,     7,     8,
-       9,    10,    11,    12,    13,     0,  -118,     0,    15,    16,
-      17,    18,    19,    20,    21,    22,     0,    23,   126,     0,
-     127,     0,     0,     0,    24,   128,    25,    26,     0,    27,
-     129,    28,     0,    29,   130,    30,    31,    32,     0,     0,
-      33,    34,     0,    35,    36,     0,     0,     0,     0,     0,
-       0,    37,    38,     0,   131,     0,     0,     0,    39,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,   550,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    44,     0,     0,    45,     0,
+       0,     0,     0,    46,    47,     0,     0,     0,    48,     0,
+      49,     0,    50,     0,    51,     0,    -3,     0,  -150,     1,
+       2,     3,     4,     0,     5,     6,     7,     8,     9,    10,
+      11,     0,     0,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,     0,     0,    22,    23,     0,     0,     0,     0,
+       0,     0,    24,     0,    25,    26,     0,    27,     0,    28,
+       0,    29,     0,    30,    31,    32,     0,     0,    33,    34,
+       0,    35,    36,     0,     0,     0,     0,     0,     0,    37,
+      38,    39,     0,     0,     0,     0,     0,    40,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,    40,    41,
-       0,     0,     0,     0,     0,     0,     0,   132,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    41,    42,
+       0,     0,     0,     0,     0,     0,     0,    43,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    44,     0,     0,
+      45,     0,     0,     0,     0,    46,    47,     0,     0,     0,
+      48,     0,    49,     0,    50,     0,    51,     1,     2,     3,
+       4,     0,     5,     6,     7,     8,     9,    10,    11,     0,
+    -125,     0,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,     0,    22,    23,   145,     0,   146,     0,     0,     0,
+      24,   147,    25,    26,     0,    27,   148,    28,     0,    29,
+     149,    30,    31,    32,     0,     0,    33,    34,     0,    35,
+      36,     0,     0,     0,     0,     0,     0,    37,    38,    39,
+       0,   150,     0,     0,     0,    40,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-      43,     0,     0,     0,     0,    44,    45,     0,     0,     0,
-      46,     0,    47,     0,    48,     0,    49,     1,     2,     3,
-       4,     0,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,     0,     0,     0,    15,    16,    17,    18,    19,    20,
-      21,    22,     0,    23,   126,     0,   127,     0,     0,     0,
-      24,   128,    25,    26,     0,    27,   129,    28,     0,    29,
-     130,    30,    31,    32,     0,     0,    33,    34,     0,    35,
-      36,     0,     0,     0,     0,     0,     0,    37,    38,     0,
-     131,     0,     0,     0,    39,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    41,    42,     0,     0,
+       0,     0,     0,     0,     0,   151,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    44,     0,     0,    45,     0,
+       0,     0,     0,    46,    47,     0,     0,     0,    48,     0,
+      49,     0,    50,     0,    51,     1,     2,     3,     4,     0,
+       5,     6,     7,     8,     9,    10,    11,     0,     0,     0,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,     0,
+      22,    23,   145,     0,   146,     0,     0,     0,    24,   147,
+      25,    26,     0,    27,   148,    28,     0,    29,   149,    30,
+      31,    32,     0,     0,    33,    34,     0,    35,    36,     0,
+       0,     0,     0,     0,     0,    37,    38,    39,     0,   150,
+       0,     0,     0,    40,     0,     0,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,    40,    41,     0,     0,     0,     0,
-       0,     0,     0,   132,     0,   148,     0,     3,     4,     0,
-       5,     6,     7,     8,     9,     0,    43,     0,     0,     0,
-       0,    44,    45,     0,     0,     0,    46,    20,    47,    22,
-      48,    23,    49,     0,   127,     0,     0,     0,    24,     0,
-       0,     0,     0,     0,     0,    28,     0,    29,   149,     0,
-       0,     0,     0,     0,     0,    34,     0,    35,    36,     0,
-       0,     0,     0,     0,     0,    37,     0,     0,     0,     0,
-       0,     0,    39,     0,     0,    98,     0,     3,     4,     0,
-       5,     6,     7,     8,     9,     0,     0,     0,     0,     0,
-       0,     0,    40,    41,     0,     0,     0,    20,     0,    22,
-       0,    23,     0,     0,     0,     0,     0,     0,    24,     0,
-       0,     0,     0,     0,    43,    28,     0,    29,     0,    44,
-      45,     0,     0,     0,    46,    34,    47,    35,    36,     0,
-      49,     0,     0,     0,     0,    37,     0,     0,     0,     0,
-       0,     0,    39,     0,     0,    98,     0,     3,     4,     0,
-       5,     6,     7,     8,     9,     0,     0,     0,     0,     0,
-       0,     0,    40,    41,     0,     0,     0,    20,     0,    22,
-       0,    23,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    43,     0,     0,    29,     0,    44,
-      45,     0,     0,     0,    46,    34,    47,    35,    36,     0,
-      49,     0,     0,     0,     0,     0,     0,   164,     0,     0,
-       0,     0,    39,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    41,    42,     0,     0,     0,     0,
+       0,     0,     0,   151,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    44,     0,     0,    45,     0,     0,     0,
+       0,    46,    47,     0,     0,     0,    48,     0,    49,     0,
+      50,   167,    51,     3,     4,     0,     5,     6,     7,     0,
+       0,     0,     0,     0,     0,     0,     0,    14,     0,     0,
+       0,     0,    19,     0,    21,     0,    22,    23,     0,     0,
+     146,     0,     0,     0,    24,     0,     0,     0,     0,     0,
+       0,    28,     0,    29,   168,     0,     0,     0,     0,     0,
+       0,    34,     0,    35,    36,     0,     0,     0,     0,     0,
+       0,     0,    38,     0,     0,     0,     0,     0,     0,    40,
+       0,     0,     0,   109,     0,     3,     4,     0,     5,     6,
+       7,     0,     0,     0,     0,     0,     0,     0,     0,    14,
+      41,    42,     0,     0,    19,     0,    21,     0,    22,    23,
+       0,     0,     0,     0,     0,     0,    24,     0,     0,    44,
+       0,     0,    45,    28,     0,    29,     0,    46,    47,     0,
+       0,     0,    48,    34,    49,    35,    36,     0,    51,     0,
+     109,     0,     3,     4,    38,     5,     6,     7,     0,     0,
+       0,    40,     0,     0,     0,     0,    14,     0,     0,     0,
+       0,    19,     0,    21,     0,    22,    23,     0,     0,     0,
+       0,     0,    41,    42,     0,     0,     0,     0,     0,     0,
+       0,     0,    29,     0,     0,     0,     0,     0,     0,     0,
+      34,    44,    35,    36,    45,     0,     0,     0,     0,    46,
+      47,     0,     0,     0,    48,     0,    49,     0,    40,     0,
+      51,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    41,
+      42,     0,     0,     0,     0,     0,   189,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,    40,    41,   165,   166,   167,     0,   168,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,   185,     0,   186,   187,   188,
-       0,   189,   190,   191,    46,     0,    47,     0,     0,   192,
-      49,   193,     0,   194,   195,   196,   197,   198,   164,   199,
-     200,   201,   202,   203,     0,     0,     0,     0,     0,   204,
-       0,   205,     0,     0,   206,     0,     0,     0,     0,     0,
-     330,     0,     0,     0,     0,   165,   166,   167,     0,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,     0,   186,   187,
-     188,     0,   189,   190,   191,     0,     0,     0,     0,     0,
-     192,   164,   193,     0,   194,   195,   196,   197,   198,     0,
-     199,   200,   201,   202,   203,     0,     0,     0,     0,     0,
-     204,     0,   205,     0,     0,   206,     0,     0,   165,   166,
-     167,   362,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-       0,   186,   187,   188,     0,   189,   190,   191,     0,     0,
-       0,     0,     0,   192,   164,   193,     0,   194,   195,   196,
-     197,   198,     0,   199,   200,   201,   202,   203,     0,     0,
-       0,     0,     0,   204,     0,   205,     0,     0,   206,     0,
-       0,   165,   166,   167,   401,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,     0,   186,   187,   188,     0,   189,   190,
-     191,     0,     0,     0,     0,   164,   192,     0,   193,   354,
-     194,   195,   196,   197,   198,     0,   199,   200,   201,   202,
-     203,     0,     0,     0,     0,     0,   204,     0,   205,     0,
-       0,   206,   165,   166,   167,     0,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,     0,   186,   187,   188,     0,   189,
-     190,   191,     0,     0,     0,     0,   164,   192,     0,   193,
-       0,   194,   195,   196,   197,   198,     0,   199,   200,   201,
-     202,   203,     0,     0,     0,     0,     0,   204,     0,   205,
-     356,     0,   206,   165,   166,   167,     0,   168,   169,   170,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,     0,   186,   187,   188,     0,
-     189,   190,   191,     0,     0,     0,     0,   164,   192,     0,
-     193,   491,   194,   195,   196,   197,   198,     0,   199,   200,
-     201,   202,   203,     0,     0,     0,     0,     0,   204,     0,
-     205,     0,     0,   206,   165,   166,   167,     0,   168,   169,
-     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
-     180,   181,   182,   183,   184,   185,     0,   186,   187,   188,
-       0,   189,   190,   191,     0,     0,     0,     0,   164,   192,
-       0,   193,     0,   194,   195,   196,   197,   198,     0,   199,
-     200,   201,   202,   203,     0,     0,     0,     0,     0,   204,
-       0,   205,     0,     0,   206,   165,   166,   167,     0,   168,
-     169,   170,   171,   172,   173,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   186,   187,
-     188,     0,   189,   190,   191,     0,     0,     0,     0,   164,
-       0,     0,     0,     0,   194,   195,   196,   197,   198,     0,
-     199,   200,   201,   202,   203,     0,     0,     0,     0,     0,
-     204,     0,   205,     0,     0,   206,   165,   166,   167,     0,
-     168,   169,   170,   171,   172,   173,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   186,
-     187,   188,     0,   189,   190,   191,     0,     0,     0,     0,
-     164,     0,     0,     0,     0,     0,   195,   196,   197,   198,
-       0,   199,   200,   201,   202,   203,     0,     0,     0,     0,
-       0,   204,     0,   205,     0,     0,   206,   165,   166,   167,
-       0,   168,   169,   170,   171,   172,   173,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-     186,   187,   188,     0,   189,   190,   191,     0,     0,     0,
-       0,   164,     0,     0,     0,     0,     0,     0,   196,   197,
-     198,     0,   199,   200,   201,   202,   203,     0,     0,     0,
-       0,     0,   204,     0,   205,     0,     0,   206,   165,   166,
-     167,     0,   168,   169,   170,   171,   172,   173,     0,     0,
+       0,    48,     0,    49,   190,   191,   192,    51,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,     0,   212,   213,
+     214,     0,   215,   216,   217,     0,     0,     0,     0,     0,
+     218,   219,     0,   220,   221,   222,   189,   223,   224,     0,
+     225,   226,   227,   228,   229,     0,     0,     0,     0,     0,
+     230,     0,   231,     0,     0,   232,     0,     0,     0,     0,
+       0,   418,     0,     0,   190,   191,   192,     0,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,     0,   212,   213,
+     214,     0,   215,   216,   217,     0,     0,     0,     0,     0,
+     218,   219,     0,   220,   221,   222,   189,   223,   224,     0,
+     225,   226,   227,   228,   229,     0,     0,     0,     0,     0,
+     230,     0,   231,     0,     0,   232,     0,     0,     0,     0,
+       0,   507,     0,     0,   190,   191,   192,     0,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,     0,   212,   213,
+     214,     0,   215,   216,   217,     0,     0,     0,   189,     0,
+     218,   219,   408,   220,   221,   222,     0,   223,   224,     0,
+     225,   226,   227,   228,   229,     0,     0,     0,     0,     0,
+     230,     0,   231,     0,     0,   232,   190,   191,   192,     0,
+     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
+     203,   204,   205,   206,   207,   208,   209,   210,   211,     0,
+     212,   213,   214,     0,   215,   216,   217,     0,     0,     0,
+     189,     0,   218,   219,     0,   220,   221,   222,     0,   223,
+     224,     0,   225,   226,   227,   228,   229,     0,     0,     0,
+       0,     0,   230,     0,   231,   410,     0,   232,   190,   191,
+     192,     0,   193,   194,   195,   196,   197,   198,   199,   200,
+     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
+     211,     0,   212,   213,   214,     0,   215,   216,   217,     0,
+       0,     0,   189,     0,   218,   219,     0,   220,   221,   222,
+       0,   223,   224,     0,   225,   226,   227,   228,   229,     0,
+       0,     0,     0,     0,   230,     0,   231,   465,     0,   232,
+     190,   191,   192,     0,   193,   194,   195,   196,   197,   198,
+     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
+     209,   210,   211,     0,   212,   213,   214,     0,   215,   216,
+     217,     0,     0,     0,   189,     0,   218,   219,     0,   220,
+     221,   222,     0,   223,   224,     0,   225,   226,   227,   228,
+     229,     0,     0,     0,     0,     0,   230,     0,   231,   506,
+       0,   232,   190,   191,   192,     0,   193,   194,   195,   196,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,     0,   212,   213,   214,     0,
+     215,   216,   217,     0,     0,     0,   189,     0,   218,   219,
+       0,   220,   221,   222,     0,   223,   224,     0,   225,   226,
+     227,   228,   229,     0,     0,     0,     0,     0,   230,     0,
+     231,   508,     0,   232,   190,   191,   192,     0,   193,   194,
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,     0,   212,   213,
+     214,     0,   215,   216,   217,     0,     0,     0,   189,     0,
+     218,   219,     0,   220,   221,   222,     0,   223,   224,     0,
+     225,   226,   227,   228,   229,     0,     0,     0,     0,     0,
+     230,     0,   231,   515,     0,   232,   190,   191,   192,     0,
+     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
+     203,   204,   205,   206,   207,   208,   209,   210,   211,     0,
+     212,   213,   214,     0,   215,   216,   217,     0,     0,     0,
+     189,     0,   218,   219,   567,   220,   221,   222,     0,   223,
+     224,     0,   225,   226,   227,   228,   229,     0,     0,     0,
+       0,     0,   230,     0,   231,     0,     0,   232,   190,   191,
+     192,     0,   193,   194,   195,   196,   197,   198,   199,   200,
+     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
+     211,     0,   212,   213,   214,     0,   215,   216,   217,     0,
+       0,     0,   189,     0,   218,   219,     0,   220,   221,   222,
+       0,   223,   224,     0,   225,   226,   227,   228,   229,     0,
+       0,     0,     0,     0,   230,     0,   231,     0,     0,   232,
+     190,   191,   192,     0,   193,   194,   195,   196,   197,   198,
+     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
+     209,   210,   211,     0,   212,   213,   214,     0,   215,   216,
+     217,     0,     0,     0,   189,     0,   218,   219,     0,   220,
+     221,   222,     0,     0,   224,     0,   225,   226,   227,   228,
+     229,     0,     0,     0,     0,     0,   230,     0,   231,     0,
+       0,   232,   190,   191,   192,     0,   193,   194,   195,   196,
+     197,   198,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   212,   213,   214,     0,
+     215,   216,   217,     0,     0,     0,   189,     0,     0,     0,
+       0,   220,   221,   222,     0,   223,   224,     0,   225,   226,
+     227,   228,   229,     0,     0,     0,     0,     0,   230,     0,
+     231,     0,     0,   232,   190,   191,   192,     0,   193,   194,
+     195,   196,   197,   198,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   212,   213,
+     214,     0,   215,   216,   217,     0,     0,     0,   189,     0,
+       0,     0,     0,     0,   221,   222,     0,   223,   224,     0,
+     225,   226,   227,   228,   229,     0,     0,     0,     0,     0,
+     230,     0,   231,     0,     0,   232,   190,   191,   192,     0,
+     193,   194,   195,   196,   197,   198,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,   186,   187,   188,     0,   189,   190,   191,     0,     0,
-       0,     0,   164,     0,     0,     0,     0,     0,     0,  -153,
-     197,   198,     0,   199,   200,   201,   202,   203,     0,     0,
-       0,     0,     0,   204,     0,   205,     0,     0,   206,   165,
-     166,   167,     0,  -153,  -153,  -153,  -153,   172,   173,     0,
+     212,   213,   214,     0,   215,   216,   217,     0,     0,     0,
+     189,     0,     0,     0,     0,     0,     0,   222,     0,   223,
+     224,     0,   225,   226,   227,   228,   229,     0,     0,     0,
+       0,     0,   230,     0,   231,     0,     0,   232,   190,   191,
+     192,     0,   193,   194,   195,   196,   197,   198,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,   186,   187,   188,     0,   189,   190,   191,     0,
+       0,     0,   212,   213,   214,     0,   215,   216,   217,     0,
+       0,     0,   189,     0,     0,     0,     0,     0,     0,  -338,
+       0,   223,   224,     0,   225,   226,   227,   228,   229,     0,
+       0,     0,     0,     0,   230,     0,   231,     0,     0,   232,
+     190,   191,   192,     0,  -338,  -338,  -338,  -338,   197,   198,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,   197,   198,     0,   199,   200,   201,   202,   203,     0,
-       0,     0,     0,     0,   204,     0,   205,     0,     0,   206
+       0,     0,     0,     0,   212,   213,   214,     0,   215,   216,
+     217,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   223,   224,     0,   225,   226,   227,   228,
+     229,     0,     0,     0,     0,     0,   230,     0,   231,     0,
+       0,   232

 };
 
 static const yytype_int16 yycheck[] =
 {
 };
 
 static const yytype_int16 yycheck[] =
 {

-       0,     0,     0,     0,     0,    90,    58,    39,    97,   249,
-      48,     3,    20,   108,   327,   215,    24,   390,     3,    50,
-     323,    89,     3,    68,   224,     3,   100,   317,     3,    37,
-      92,    39,    40,    41,    19,    43,    44,    45,    19,    47,
-      46,     3,   122,     5,    90,    91,    92,   360,     3,   134,
-     122,     4,    52,    52,    52,    52,    52,   102,     0,   133,
-       0,     0,   124,   376,    19,   127,     3,    20,    21,    22,
-     373,    24,   100,    26,   387,   365,   122,    18,   124,   122,
-      34,   127,    19,   468,   127,    38,     3,   472,   473,     3,
-      14,   122,   124,    46,    47,    48,    49,   103,   106,    36,
-     108,   102,    19,    27,   105,   133,   491,   100,    62,   204,
-      52,   351,    52,    52,   126,    93,   124,   420,    93,   319,
-     505,   100,   128,   129,   126,   127,    28,   512,   122,    35,
-     122,    33,   372,   122,   115,   122,   128,     3,   511,     3,
-     133,   126,   455,     0,   457,    51,    99,   147,   147,   147,
-     147,   147,   126,    19,   133,   163,   164,   165,   166,   167,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,   115,   132,
-     100,   189,   190,   191,   192,   193,   194,   195,   196,   197,
-     198,   199,   200,   201,   202,   203,   204,   205,   230,   100,
-     232,     3,   100,   209,   212,   147,   122,   147,   147,   247,
-      99,   100,    18,   213,   213,   213,   127,   122,   458,     3,
-     105,    27,   230,   229,   232,   320,    32,    90,    91,    92,
-     100,   125,   133,   132,   474,   133,     3,     3,   100,     3,
-      46,    18,   327,   126,   250,   251,    68,   332,     3,   112,
-     113,   114,   115,   116,    99,   340,    68,     3,   347,   122,
-     349,   124,     4,     3,   127,     3,     3,    99,   127,    14,
-     122,   127,   133,   100,   105,   360,   516,   132,    20,    21,
-      22,   102,    24,     3,    26,     5,     3,     3,     8,     9,
-      10,   376,    12,   301,    54,    54,    38,   133,    89,     3,
-     126,     3,   387,   392,    46,    47,    48,    49,   122,   309,
-     309,   309,   320,   132,   100,   133,   132,   317,   317,   317,
-     105,   102,   122,    17,   100,    45,     3,    90,    91,    92,
-      18,   126,   126,   132,   386,    55,    56,   133,   126,    27,
-     132,   102,   100,    31,    32,   377,   354,   436,    40,   122,
-     382,   114,   115,   116,   126,   361,    44,    99,    46,   122,
-      65,   124,   133,   133,   127,   365,   365,   365,     3,   377,
-     455,   105,   457,   126,   382,    67,    68,    69,   132,    71,
-      72,    73,    74,    75,    76,     3,    27,   126,   132,   132,
-     132,   126,   133,     3,   122,   147,    88,   126,    90,    91,
-      92,   132,    94,    95,    96,   132,   132,   132,   132,     4,
-     133,   397,    52,   309,   106,   107,   108,   109,   110,    58,
-     112,   113,   114,   115,   116,    20,    21,    22,   127,    24,
-     122,    26,   124,   441,   444,   127,   339,   437,   426,   444,
-      69,   497,   426,    38,   483,   465,   398,   418,   488,    27,
-     369,    -1,    47,    48,    49,    -1,   392,    -1,    -1,   459,
-     459,   459,   459,   459,    -1,   465,    -1,    -1,    -1,    -1,
+       0,     0,     0,     0,     0,   108,    60,    19,   277,    67,
+     142,   120,    24,    50,     3,   187,    28,   232,   446,     5,
+       5,   361,    50,     3,     3,     3,    38,   541,   367,    41,
+      42,   545,   546,    45,    46,    47,    48,    49,   461,    69,
+      98,    92,    93,    94,    94,   128,   129,   535,     5,    12,
+     102,     5,   505,   567,    54,    54,    54,    54,    54,   114,
+       0,   102,    34,   112,    27,     0,    27,   116,     0,   124,
+     584,    12,    33,   124,   104,   126,   126,   565,   129,   129,
+     594,   504,   422,   135,    96,   538,    27,     3,     4,    35,
+      62,   430,   147,   148,   135,   153,   124,     3,     4,   563,
+      16,    17,   114,    91,   319,    51,   347,     3,   120,     5,
+      16,    17,   124,    29,    54,   579,    95,    95,   124,    54,
+     292,   230,    54,    29,    16,     3,   258,   396,    16,   344,
+     142,     3,     4,     3,     4,   147,   148,   378,   477,   128,
+     124,   124,   128,   128,    16,    17,    16,    17,   128,     3,
+       4,   124,   128,   124,   111,   112,   129,    29,   112,    29,
+     429,     3,    16,    17,   592,     0,   166,   166,   166,   166,
+     166,   128,   128,   185,   128,    29,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,   210,   211,
+     415,   117,   443,   215,   216,   217,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     102,     3,   128,   278,   279,   124,   166,   239,   400,   401,
+     104,   166,   106,    12,   166,   124,     3,     4,   275,   129,
+     240,   240,   240,   255,   485,   117,   258,   117,   260,    16,
+      17,   214,   124,   129,   126,   364,     3,   526,   130,   104,
+     130,   134,    29,   117,   102,   106,   278,   279,   127,   232,
+     102,     3,   126,     3,     4,     3,     3,   128,   547,   242,
+      16,     4,    16,    69,   525,     3,    16,    17,   251,   392,
+      26,   394,   101,   348,    69,    18,    32,    20,    21,    29,
+      23,   433,    25,   101,    16,     3,    36,     3,     3,   135,
+      46,   102,   124,   129,    26,    38,   129,   375,   124,    31,
+      32,   135,   106,    46,    47,    48,    49,   385,   135,   598,
+       4,   343,    44,   135,    46,     3,   348,     5,   102,   351,
+       8,     9,    10,   104,    18,   448,    20,    21,     3,    23,
+     117,    25,   364,   353,   353,   353,   319,     3,     4,   126,
+     134,   361,   361,   361,    38,    54,     3,     4,    54,     3,
+      16,    17,    46,    47,    48,    49,     3,     4,   101,    16,
+      17,   344,   104,    29,   104,   135,    91,   117,   442,    16,
+      17,   494,    29,   134,   406,   128,   408,    91,    91,   411,
+     363,   413,    29,    91,     3,    40,   127,   419,    15,   135,
+     102,   134,   129,   425,   124,   134,   106,   104,   101,   135,
+     128,   433,   422,   422,   422,   102,   438,   101,   134,   128,
+      66,   135,   134,    68,    69,    70,   102,    72,    73,    74,
+      75,    76,    77,   128,   135,   112,   104,   128,    40,   128,
+     134,   124,   415,   135,   116,    90,   106,    92,    93,    94,
+     134,    96,    97,    98,   111,   134,     3,     3,    26,   134,
+     134,   117,   107,   108,   109,   116,   111,   112,   134,   114,
+     115,   116,   117,   118,    76,    77,   128,   135,   128,   124,
+     502,   126,     3,   112,   129,   495,   134,   509,   112,   124,
+      92,    93,    94,   134,    96,    97,    98,   128,   134,   166,
+     134,    54,   135,   353,   134,    98,    92,    93,    94,   111,
+     112,    60,   114,   115,   116,   117,   118,   527,   527,   527,
+     527,   527,   124,   533,   126,   453,   146,   129,   114,   115,
+     116,   117,   118,   512,   512,   384,   483,   483,   124,    72,
+     126,   573,   555,   129,   454,   555,   555,   555,   555,   555,
+     475,   292,    27,   533,   448,   560,   426,    48,    -1,    -1,
+      -1,    -1,    -1,   573,   573,   573,   573,   573,     0,   259,
+      -1,     3,     4,     5,     6,    -1,     8,     9,    10,    11,
+      12,    13,    14,    -1,    -1,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    -1,    -1,    28,    29,    -1,    -1,
+      40,    -1,    -1,    -1,    36,    -1,    38,    39,    -1,    41,
+      -1,    43,    -1,    45,    -1,    47,    48,    49,    -1,    -1,
+      52,    53,    -1,    55,    56,    -1,    -1,    -1,    68,    69,
+      70,    63,    64,    65,    -1,    -1,    76,    77,    -1,    71,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,   483,   483,   483,   483,   483,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   497,   497,   497,
-     497,   497,     0,    -1,    -1,     3,     4,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    25,    26,    -1,
-      -1,    29,    -1,    -1,    40,    -1,    -1,    -1,    36,    -1,
-      38,    39,    -1,    41,    -1,    43,    -1,    45,    -1,    47,
-      48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,
-      -1,    67,    68,    69,    -1,    63,    64,    -1,    -1,    75,
-      76,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    90,    91,    92,    -1,    94,    95,
-      96,    -1,    90,    91,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,    -1,   109,   110,    -1,   112,   113,   114,   115,
-     116,    -1,    -1,    -1,   112,    -1,   122,    -1,   124,   117,
-     118,   127,    -1,    -1,   122,    -1,   124,    -1,   126,    -1,
-     128,    -1,    -1,    -1,   132,     3,     4,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      -1,    -1,    20,    21,    22,    23,    24,    25,    26,    27,
-      -1,    29,    30,    -1,    32,    -1,    -1,    -1,    36,    37,
-      38,    39,    -1,    41,    42,    43,    -1,    45,    46,    47,
-      48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,
-      -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    66,    -1,
-      -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    90,    91,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   112,    -1,    -1,    -1,    -1,   117,
-     118,    -1,    -1,    -1,   122,    -1,   124,    -1,   126,    -1,
-     128,    -1,    -1,    -1,   132,     3,     4,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      -1,    -1,    20,    21,    22,    23,    24,    25,    26,    27,
-      -1,    29,    30,    -1,    32,    -1,    -1,    -1,    36,    37,
+      -1,    -1,    92,    93,    94,    -1,    96,    97,    98,    -1,
+      92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,
+      -1,   111,   112,    -1,   114,   115,   116,   117,   118,   111,
+      -1,    -1,   114,    -1,   124,    -1,   126,   119,   120,   129,
+      -1,    -1,   124,    -1,   126,    -1,   128,    -1,   130,    -1,
+      -1,    -1,   134,     3,     4,     5,     6,    -1,     8,     9,
+      10,    11,    12,    13,    14,    -1,    -1,    -1,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    -1,    28,    29,
+      30,    -1,    32,    -1,    -1,    -1,    36,    37,    38,    39,
+      -1,    41,    42,    43,    -1,    45,    46,    47,    48,    49,
+      -1,    -1,    52,    53,    -1,    55,    56,    -1,    -1,    -1,
+       4,    -1,    -1,    63,    64,    65,    -1,    67,    -1,    -1,
+      -1,    71,    -1,    -1,    18,    -1,    20,    21,    -1,    23,
+      -1,    25,    -1,    -1,    92,    93,    94,    -1,    -1,    -1,
+      -1,    -1,    92,    93,    38,    -1,    -1,    -1,    -1,    -1,
+      -1,   101,    -1,    47,    48,    49,    -1,    -1,   116,   117,
+     118,   111,    -1,    -1,   114,    -1,   124,    -1,   126,   119,
+     120,   129,    -1,    -1,   124,    -1,   126,    -1,   128,    -1,
+     130,    -1,    -1,    -1,   134,     3,     4,     5,     6,    -1,
+       8,     9,    10,    11,    12,    13,    14,    -1,    -1,    -1,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    -1,
+      28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,    37,

       38,    39,    -1,    41,    42,    43,    -1,    45,    46,    47,
       48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,
       38,    39,    -1,    41,    42,    43,    -1,    45,    46,    47,
       48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,

-      -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    66,    -1,
-      -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    63,    64,    65,    -1,    67,
+      -1,    -1,    -1,    71,    -1,    -1,    -1,    -1,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    90,    91,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   112,    -1,    -1,    -1,    -1,   117,
-     118,    -1,    -1,    -1,   122,    -1,   124,    -1,   126,    -1,
-     128,    -1,    -1,    -1,   132,     3,     4,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      -1,    -1,    20,    21,    22,    23,    24,    25,    26,    27,
-      -1,    29,    30,    -1,    32,    -1,    -1,    -1,    36,    37,
-      38,    39,    -1,    41,    42,    43,    -1,    45,    46,    47,
-      48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,
-      -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    66,    -1,
-      -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    92,    93,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   101,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,    -1,
+      -1,   119,   120,    -1,    -1,    -1,   124,    -1,   126,    -1,
+     128,    -1,   130,    -1,    -1,    -1,   134,     3,     4,     5,
+       6,    -1,     8,     9,    10,    11,    12,    13,    14,    -1,
+      -1,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    -1,    28,    29,    30,    -1,    32,    -1,    -1,    -1,
+      36,    37,    38,    39,    -1,    41,    42,    43,    -1,    45,
+      46,    47,    48,    49,    -1,    -1,    52,    53,    -1,    55,
+      56,    -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    65,
+      -1,    67,    -1,    -1,    -1,    71,    -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,    90,    91,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   112,    -1,    -1,    -1,    -1,   117,
-     118,    -1,    -1,    -1,   122,    -1,   124,    -1,   126,    -1,
-     128,    -1,    -1,    -1,   132,     3,     4,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    25,    26,    -1,
-      -1,    29,    -1,    -1,    40,    -1,    -1,    -1,    36,    -1,
-      38,    39,    -1,    41,    -1,    43,    -1,    45,    -1,    47,
-      48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,
-      -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    -1,    75,
-      76,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    90,    91,    92,    -1,    94,    95,
-      96,    -1,    90,    91,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,    -1,   109,   110,    -1,   112,   113,   114,   115,
-     116,    -1,    -1,    -1,   112,    -1,   122,    -1,   124,   117,
-     118,   127,    -1,    -1,   122,    -1,   124,    -1,   126,    -1,
-     128,    -1,    -1,    -1,   132,     3,     4,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      -1,    -1,    20,    21,    22,    23,    24,    25,    26,    -1,
-      -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,    36,    -1,
-      38,    39,    -1,    41,    -1,    43,    -1,    45,    -1,    47,
-      48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,
-      -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    -1,    -1,
-      -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   101,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   111,    -1,    -1,   114,    -1,
+      -1,    -1,    -1,   119,   120,    -1,    -1,    -1,   124,    -1,
+     126,    -1,   128,    -1,   130,    -1,    -1,    -1,   134,     3,
+       4,     5,     6,    -1,     8,     9,    10,    11,    12,    13,
+      14,    -1,    -1,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    -1,    -1,    28,    29,    -1,    -1,    -1,    -1,
+      -1,    -1,    36,    -1,    38,    39,    -1,    41,    -1,    43,
+      -1,    45,    -1,    47,    48,    49,    -1,    -1,    52,    53,
+      -1,    55,    56,    -1,    -1,    -1,    -1,    -1,    -1,    63,
+      64,    65,    -1,    -1,    -1,    -1,    -1,    71,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    90,    91,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   112,    -1,    -1,    -1,    -1,   117,
-     118,    -1,    -1,    -1,   122,    -1,   124,    -1,   126,    -1,
-     128,    -1,    -1,    -1,   132,     3,     4,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      -1,    -1,    20,    21,    22,    23,    24,    25,    26,    -1,
-      -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,    36,    -1,
-      38,    39,    -1,    41,    -1,    43,    -1,    45,    -1,    47,
-      48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,
-      -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    -1,    -1,
-      -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,    -1,
+     114,    -1,    -1,    -1,    -1,   119,   120,    -1,    -1,    -1,
+     124,    -1,   126,    -1,   128,    -1,   130,    -1,    -1,    -1,
+     134,     3,     4,     5,     6,    -1,     8,     9,    10,    11,
+      12,    13,    14,    -1,    -1,    -1,    18,    19,    20,    21,
+      22,    23,    24,    25,    -1,    -1,    28,    29,    -1,    -1,
+      -1,    -1,    -1,    -1,    36,    -1,    38,    39,    -1,    41,
+      -1,    43,    -1,    45,    -1,    47,    48,    49,    -1,    -1,
+      52,    53,    -1,    55,    56,    -1,    -1,    -1,    -1,    -1,
+      -1,    63,    64,    65,    -1,    -1,    -1,    -1,    -1,    71,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    90,    91,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   112,    -1,    -1,    -1,    -1,   117,
-     118,    -1,    -1,    -1,   122,    -1,   124,    -1,   126,    -1,
-     128,    -1,    -1,    -1,   132,     3,     4,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      -1,    -1,    20,    21,    22,    23,    24,    25,    26,    -1,
-      -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,    36,    -1,
-      38,    39,    -1,    41,    -1,    43,    -1,    45,    -1,    47,
-      48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,
-      -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    -1,    -1,
-      -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    90,    91,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   112,    -1,    -1,    -1,    -1,   117,
-     118,    -1,    -1,    -1,   122,    -1,   124,    -1,   126,    -1,
-     128,    -1,    -1,    -1,   132,     3,     4,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      -1,    -1,    20,    21,    22,    23,    24,    25,    26,    -1,
-      -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,    36,    -1,
-      38,    39,    -1,    41,    -1,    43,    -1,    45,    -1,    47,
-      48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,
-      -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    -1,    -1,
-      -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,
+      -1,    -1,   114,    -1,    -1,    -1,    -1,   119,   120,    -1,
+      -1,    -1,   124,    -1,   126,    -1,   128,    -1,   130,    -1,
+      -1,    -1,   134,     3,     4,     5,     6,    -1,     8,     9,
+      10,    11,    12,    13,    14,    -1,    -1,    -1,    18,    19,
+      20,    21,    22,    23,    24,    25,    -1,    -1,    28,    29,
+      -1,    -1,    -1,    -1,    -1,    -1,    36,    -1,    38,    39,
+      -1,    41,    -1,    43,    -1,    45,    -1,    47,    48,    49,
+      -1,    -1,    52,    53,    -1,    55,    56,    -1,    -1,    -1,
+      -1,    -1,    -1,    63,    64,    65,    -1,    -1,    -1,    -1,
+      -1,    71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    90,    91,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   112,    -1,    -1,    -1,    -1,   117,
-     118,    -1,    -1,    -1,   122,    -1,   124,    -1,   126,    -1,
-     128,    -1,     0,    -1,   132,     3,     4,     5,     6,    -1,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    -1,
-      -1,    19,    20,    21,    22,    23,    24,    25,    26,    -1,
-      -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,    36,    -1,
+      -1,    -1,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   111,    -1,    -1,   114,    -1,    -1,    -1,    -1,   119,
+     120,    -1,    -1,    -1,   124,    -1,   126,    -1,   128,    -1,
+     130,    -1,    -1,    -1,   134,     3,     4,     5,     6,    -1,
+       8,     9,    10,    11,    12,    13,    14,    -1,    -1,    -1,
+      18,    19,    20,    21,    22,    23,    24,    25,    -1,    -1,
+      28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    36,    -1,

       38,    39,    -1,    41,    -1,    43,    -1,    45,    -1,    47,
       48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,
       38,    39,    -1,    41,    -1,    43,    -1,    45,    -1,    47,
       48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,

-      -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    -1,    -1,
-      -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    63,    64,    65,    -1,    -1,
+      -1,    -1,    -1,    71,    -1,    -1,    -1,    -1,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    90,    91,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   112,    -1,    -1,    -1,    -1,   117,
-     118,    -1,    -1,    -1,   122,    -1,   124,    -1,   126,    -1,
-     128,     3,     4,     5,     6,    -1,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    -1,    18,    -1,    20,    21,
-      22,    23,    24,    25,    26,    27,    -1,    29,    30,    -1,
-      32,    -1,    -1,    -1,    36,    37,    38,    39,    -1,    41,
-      42,    43,    -1,    45,    46,    47,    48,    49,    -1,    -1,
-      52,    53,    -1,    55,    56,    -1,    -1,    -1,    -1,    -1,
-      -1,    63,    64,    -1,    66,    -1,    -1,    -1,    70,    -1,
+      -1,    -1,    -1,    -1,    92,    93,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   101,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,    -1,
+      -1,   119,   120,    -1,    -1,    -1,   124,    -1,   126,    -1,
+     128,    -1,   130,    -1,    -1,    -1,   134,     3,     4,     5,
+       6,    -1,     8,     9,    10,    11,    12,    13,    14,    -1,
+      -1,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
+      -1,    -1,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,
+      36,    -1,    38,    39,    -1,    41,    -1,    43,    -1,    45,
+      -1,    47,    48,    49,    -1,    -1,    52,    53,    -1,    55,
+      56,    -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    65,
+      -1,    -1,    -1,    -1,    -1,    71,    -1,    -1,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   101,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   111,    -1,    -1,   114,    -1,
+      -1,    -1,    -1,   119,   120,    -1,    -1,    -1,   124,    -1,
+     126,    -1,   128,    -1,   130,    -1,     0,    -1,   134,     3,
+       4,     5,     6,    -1,     8,     9,    10,    11,    12,    13,
+      14,    -1,    -1,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    -1,    -1,    28,    29,    -1,    -1,    -1,    -1,
+      -1,    -1,    36,    -1,    38,    39,    -1,    41,    -1,    43,
+      -1,    45,    -1,    47,    48,    49,    -1,    -1,    52,    53,
+      -1,    55,    56,    -1,    -1,    -1,    -1,    -1,    -1,    63,
+      64,    65,    -1,    -1,    -1,    -1,    -1,    71,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-     112,    -1,    -1,    -1,    -1,   117,   118,    -1,    -1,    -1,
-     122,    -1,   124,    -1,   126,    -1,   128,     3,     4,     5,
-       6,    -1,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    -1,    -1,    -1,    20,    21,    22,    23,    24,    25,
-      26,    27,    -1,    29,    30,    -1,    32,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,    -1,
+     114,    -1,    -1,    -1,    -1,   119,   120,    -1,    -1,    -1,
+     124,    -1,   126,    -1,   128,    -1,   130,     3,     4,     5,
+       6,    -1,     8,     9,    10,    11,    12,    13,    14,    -1,
+      16,    -1,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    -1,    28,    29,    30,    -1,    32,    -1,    -1,    -1,

       36,    37,    38,    39,    -1,    41,    42,    43,    -1,    45,
       46,    47,    48,    49,    -1,    -1,    52,    53,    -1,    55,
       36,    37,    38,    39,    -1,    41,    42,    43,    -1,    45,
       46,    47,    48,    49,    -1,    -1,    52,    53,    -1,    55,

-      56,    -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    -1,
-      66,    -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,
+      56,    -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    65,
+      -1,    67,    -1,    -1,    -1,    71,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   101,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   111,    -1,    -1,   114,    -1,
+      -1,    -1,    -1,   119,   120,    -1,    -1,    -1,   124,    -1,
+     126,    -1,   128,    -1,   130,     3,     4,     5,     6,    -1,
+       8,     9,    10,    11,    12,    13,    14,    -1,    -1,    -1,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    -1,
+      28,    29,    30,    -1,    32,    -1,    -1,    -1,    36,    37,
+      38,    39,    -1,    41,    42,    43,    -1,    45,    46,    47,
+      48,    49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,
+      -1,    -1,    -1,    -1,    -1,    63,    64,    65,    -1,    67,
+      -1,    -1,    -1,    71,    -1,    -1,    -1,    -1,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    90,    91,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    99,    -1,     3,    -1,     5,     6,    -1,
-       8,     9,    10,    11,    12,    -1,   112,    -1,    -1,    -1,
-      -1,   117,   118,    -1,    -1,    -1,   122,    25,   124,    27,
-     126,    29,   128,    -1,    32,    -1,    -1,    -1,    36,    -1,
-      -1,    -1,    -1,    -1,    -1,    43,    -1,    45,    46,    -1,
-      -1,    -1,    -1,    -1,    -1,    53,    -1,    55,    56,    -1,
-      -1,    -1,    -1,    -1,    -1,    63,    -1,    -1,    -1,    -1,
-      -1,    -1,    70,    -1,    -1,     3,    -1,     5,     6,    -1,
-       8,     9,    10,    11,    12,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    90,    91,    -1,    -1,    -1,    25,    -1,    27,
-      -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,    36,    -1,
-      -1,    -1,    -1,    -1,   112,    43,    -1,    45,    -1,   117,
-     118,    -1,    -1,    -1,   122,    53,   124,    55,    56,    -1,
-     128,    -1,    -1,    -1,    -1,    63,    -1,    -1,    -1,    -1,
-      -1,    -1,    70,    -1,    -1,     3,    -1,     5,     6,    -1,
-       8,     9,    10,    11,    12,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    90,    91,    -1,    -1,    -1,    25,    -1,    27,
-      -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   112,    -1,    -1,    45,    -1,   117,
-     118,    -1,    -1,    -1,   122,    53,   124,    55,    56,    -1,
-     128,    -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,
-      -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    92,    93,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   101,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,    -1,
+      -1,   119,   120,    -1,    -1,    -1,   124,    -1,   126,    -1,
+     128,     3,   130,     5,     6,    -1,     8,     9,    10,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,    -1,    -1,
+      -1,    -1,    24,    -1,    26,    -1,    28,    29,    -1,    -1,
+      32,    -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,
+      -1,    43,    -1,    45,    46,    -1,    -1,    -1,    -1,    -1,
+      -1,    53,    -1,    55,    56,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    64,    -1,    -1,    -1,    -1,    -1,    -1,    71,
+      -1,    -1,    -1,     3,    -1,     5,     6,    -1,     8,     9,
+      10,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,
+      92,    93,    -1,    -1,    24,    -1,    26,    -1,    28,    29,
+      -1,    -1,    -1,    -1,    -1,    -1,    36,    -1,    -1,   111,
+      -1,    -1,   114,    43,    -1,    45,    -1,   119,   120,    -1,
+      -1,    -1,   124,    53,   126,    55,    56,    -1,   130,    -1,
+       3,    -1,     5,     6,    64,     8,     9,    10,    -1,    -1,
+      -1,    71,    -1,    -1,    -1,    -1,    19,    -1,    -1,    -1,
+      -1,    24,    -1,    26,    -1,    28,    29,    -1,    -1,    -1,
+      -1,    -1,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    45,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      53,   111,    55,    56,   114,    -1,    -1,    -1,    -1,   119,
+     120,    -1,    -1,    -1,   124,    -1,   126,    -1,    71,    -1,
+     130,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,
+      93,    -1,    -1,    -1,    -1,    -1,    40,    -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,    90,    91,    67,    68,    69,    -1,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    -1,    90,    91,    92,
-      -1,    94,    95,    96,   122,    -1,   124,    -1,    -1,   102,
-     128,   104,    -1,   106,   107,   108,   109,   110,    40,   112,
-     113,   114,   115,   116,    -1,    -1,    -1,    -1,    -1,   122,
-      -1,   124,    -1,    -1,   127,    -1,    -1,    -1,    -1,    -1,
-     133,    -1,    -1,    -1,    -1,    67,    68,    69,    -1,    71,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   124,    -1,   126,    68,    69,    70,   130,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    -1,    92,    93,
+      94,    -1,    96,    97,    98,    -1,    -1,    -1,    -1,    -1,
+     104,   105,    -1,   107,   108,   109,    40,   111,   112,    -1,
+     114,   115,   116,   117,   118,    -1,    -1,    -1,    -1,    -1,
+     124,    -1,   126,    -1,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,    -1,    -1,    68,    69,    70,    -1,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    -1,    92,    93,
+      94,    -1,    96,    97,    98,    -1,    -1,    -1,    -1,    -1,
+     104,   105,    -1,   107,   108,   109,    40,   111,   112,    -1,
+     114,   115,   116,   117,   118,    -1,    -1,    -1,    -1,    -1,
+     124,    -1,   126,    -1,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,    -1,    -1,    68,    69,    70,    -1,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    -1,    92,    93,
+      94,    -1,    96,    97,    98,    -1,    -1,    -1,    40,    -1,
+     104,   105,   106,   107,   108,   109,    -1,   111,   112,    -1,
+     114,   115,   116,   117,   118,    -1,    -1,    -1,    -1,    -1,
+     124,    -1,   126,    -1,    -1,   129,    68,    69,    70,    -1,

       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,

-      82,    83,    84,    85,    86,    87,    88,    -1,    90,    91,
-      92,    -1,    94,    95,    96,    -1,    -1,    -1,    -1,    -1,
-     102,    40,   104,    -1,   106,   107,   108,   109,   110,    -1,
-     112,   113,   114,   115,   116,    -1,    -1,    -1,    -1,    -1,
-     122,    -1,   124,    -1,    -1,   127,    -1,    -1,    67,    68,
-      69,   133,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      -1,    90,    91,    92,    -1,    94,    95,    96,    -1,    -1,
-      -1,    -1,    -1,   102,    40,   104,    -1,   106,   107,   108,
-     109,   110,    -1,   112,   113,   114,   115,   116,    -1,    -1,
-      -1,    -1,    -1,   122,    -1,   124,    -1,    -1,   127,    -1,
-      -1,    67,    68,    69,   133,    71,    72,    73,    74,    75,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    -1,
+      92,    93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,
+      40,    -1,   104,   105,    -1,   107,   108,   109,    -1,   111,
+     112,    -1,   114,   115,   116,   117,   118,    -1,    -1,    -1,
+      -1,    -1,   124,    -1,   126,   127,    -1,   129,    68,    69,
+      70,    -1,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    -1,    92,    93,    94,    -1,    96,    97,    98,    -1,
+      -1,    -1,    40,    -1,   104,   105,    -1,   107,   108,   109,
+      -1,   111,   112,    -1,   114,   115,   116,   117,   118,    -1,
+      -1,    -1,    -1,    -1,   124,    -1,   126,   127,    -1,   129,
+      68,    69,    70,    -1,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    -1,    92,    93,    94,    -1,    96,    97,
+      98,    -1,    -1,    -1,    40,    -1,   104,   105,    -1,   107,
+     108,   109,    -1,   111,   112,    -1,   114,   115,   116,   117,
+     118,    -1,    -1,    -1,    -1,    -1,   124,    -1,   126,   127,
+      -1,   129,    68,    69,    70,    -1,    72,    73,    74,    75,

       76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
       76,    77,    78,    79,    80,    81,    82,    83,    84,    85,

-      86,    87,    88,    -1,    90,    91,    92,    -1,    94,    95,
-      96,    -1,    -1,    -1,    -1,    40,   102,    -1,   104,   105,
-     106,   107,   108,   109,   110,    -1,   112,   113,   114,   115,
-     116,    -1,    -1,    -1,    -1,    -1,   122,    -1,   124,    -1,
-      -1,   127,    67,    68,    69,    -1,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    -1,    90,    91,    92,    -1,    94,
-      95,    96,    -1,    -1,    -1,    -1,    40,   102,    -1,   104,
-      -1,   106,   107,   108,   109,   110,    -1,   112,   113,   114,
-     115,   116,    -1,    -1,    -1,    -1,    -1,   122,    -1,   124,
-     125,    -1,   127,    67,    68,    69,    -1,    71,    72,    73,
+      86,    87,    88,    89,    90,    -1,    92,    93,    94,    -1,
+      96,    97,    98,    -1,    -1,    -1,    40,    -1,   104,   105,
+      -1,   107,   108,   109,    -1,   111,   112,    -1,   114,   115,
+     116,   117,   118,    -1,    -1,    -1,    -1,    -1,   124,    -1,
+     126,   127,    -1,   129,    68,    69,    70,    -1,    72,    73,

       74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
       74,    75,    76,    77,    78,    79,    80,    81,    82,    83,

-      84,    85,    86,    87,    88,    -1,    90,    91,    92,    -1,
-      94,    95,    96,    -1,    -1,    -1,    -1,    40,   102,    -1,
-     104,   105,   106,   107,   108,   109,   110,    -1,   112,   113,
-     114,   115,   116,    -1,    -1,    -1,    -1,    -1,   122,    -1,
-     124,    -1,    -1,   127,    67,    68,    69,    -1,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    -1,    90,    91,    92,
-      -1,    94,    95,    96,    -1,    -1,    -1,    -1,    40,   102,
-      -1,   104,    -1,   106,   107,   108,   109,   110,    -1,   112,
-     113,   114,   115,   116,    -1,    -1,    -1,    -1,    -1,   122,
-      -1,   124,    -1,    -1,   127,    67,    68,    69,    -1,    71,
-      72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,
-      92,    -1,    94,    95,    96,    -1,    -1,    -1,    -1,    40,
-      -1,    -1,    -1,    -1,   106,   107,   108,   109,   110,    -1,
-     112,   113,   114,   115,   116,    -1,    -1,    -1,    -1,    -1,
-     122,    -1,   124,    -1,    -1,   127,    67,    68,    69,    -1,
-      71,    72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,
-      91,    92,    -1,    94,    95,    96,    -1,    -1,    -1,    -1,
-      40,    -1,    -1,    -1,    -1,    -1,   107,   108,   109,   110,
-      -1,   112,   113,   114,   115,   116,    -1,    -1,    -1,    -1,
-      -1,   122,    -1,   124,    -1,    -1,   127,    67,    68,    69,
-      -1,    71,    72,    73,    74,    75,    76,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      90,    91,    92,    -1,    94,    95,    96,    -1,    -1,    -1,
-      -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,   108,   109,
-     110,    -1,   112,   113,   114,   115,   116,    -1,    -1,    -1,
-      -1,    -1,   122,    -1,   124,    -1,    -1,   127,    67,    68,
-      69,    -1,    71,    72,    73,    74,    75,    76,    -1,    -1,
+      84,    85,    86,    87,    88,    89,    90,    -1,    92,    93,
+      94,    -1,    96,    97,    98,    -1,    -1,    -1,    40,    -1,
+     104,   105,    -1,   107,   108,   109,    -1,   111,   112,    -1,
+     114,   115,   116,   117,   118,    -1,    -1,    -1,    -1,    -1,
+     124,    -1,   126,   127,    -1,   129,    68,    69,    70,    -1,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    -1,
+      92,    93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,
+      40,    -1,   104,   105,   106,   107,   108,   109,    -1,   111,
+     112,    -1,   114,   115,   116,   117,   118,    -1,    -1,    -1,
+      -1,    -1,   124,    -1,   126,    -1,    -1,   129,    68,    69,
+      70,    -1,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    -1,    92,    93,    94,    -1,    96,    97,    98,    -1,
+      -1,    -1,    40,    -1,   104,   105,    -1,   107,   108,   109,
+      -1,   111,   112,    -1,   114,   115,   116,   117,   118,    -1,
+      -1,    -1,    -1,    -1,   124,    -1,   126,    -1,    -1,   129,
+      68,    69,    70,    -1,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    -1,    92,    93,    94,    -1,    96,    97,
+      98,    -1,    -1,    -1,    40,    -1,   104,   105,    -1,   107,
+     108,   109,    -1,    -1,   112,    -1,   114,   115,   116,   117,
+     118,    -1,    -1,    -1,    -1,    -1,   124,    -1,   126,    -1,
+      -1,   129,    68,    69,    70,    -1,    72,    73,    74,    75,
+      76,    77,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,    -1,
+      96,    97,    98,    -1,    -1,    -1,    40,    -1,    -1,    -1,
+      -1,   107,   108,   109,    -1,   111,   112,    -1,   114,   115,
+     116,   117,   118,    -1,    -1,    -1,    -1,    -1,   124,    -1,
+     126,    -1,    -1,   129,    68,    69,    70,    -1,    72,    73,
+      74,    75,    76,    77,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,
+      94,    -1,    96,    97,    98,    -1,    -1,    -1,    40,    -1,
+      -1,    -1,    -1,    -1,   108,   109,    -1,   111,   112,    -1,
+     114,   115,   116,   117,   118,    -1,    -1,    -1,    -1,    -1,
+     124,    -1,   126,    -1,    -1,   129,    68,    69,    70,    -1,
+      72,    73,    74,    75,    76,    77,    -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,    90,    91,    92,    -1,    94,    95,    96,    -1,    -1,
-      -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,   108,
-     109,   110,    -1,   112,   113,   114,   115,   116,    -1,    -1,
-      -1,    -1,    -1,   122,    -1,   124,    -1,    -1,   127,    67,
-      68,    69,    -1,    71,    72,    73,    74,    75,    76,    -1,
+      92,    93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,
+      40,    -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,   111,
+     112,    -1,   114,   115,   116,   117,   118,    -1,    -1,    -1,
+      -1,    -1,   124,    -1,   126,    -1,    -1,   129,    68,    69,
+      70,    -1,    72,    73,    74,    75,    76,    77,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    90,    91,    92,    -1,    94,    95,    96,    -1,
+      -1,    -1,    92,    93,    94,    -1,    96,    97,    98,    -1,
+      -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,   109,
+      -1,   111,   112,    -1,   114,   115,   116,   117,   118,    -1,
+      -1,    -1,    -1,    -1,   124,    -1,   126,    -1,    -1,   129,
+      68,    69,    70,    -1,    72,    73,    74,    75,    76,    77,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,   109,   110,    -1,   112,   113,   114,   115,   116,    -1,
-      -1,    -1,    -1,    -1,   122,    -1,   124,    -1,    -1,   127
+      -1,    -1,    -1,    -1,    92,    93,    94,    -1,    96,    97,
+      98,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   111,   112,    -1,   114,   115,   116,   117,
+     118,    -1,    -1,    -1,    -1,    -1,   124,    -1,   126,    -1,
+      -1,   129

 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */

-static const yytype_uint8 yystos[] =
+static const yytype_uint16 yystos[] =

 {
        0,     3,     4,     5,     6,     8,     9,    10,    11,    12,
 {
        0,     3,     4,     5,     6,     8,     9,    10,    11,    12,

-      13,    14,    15,    16,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    29,    36,    38,    39,    41,    43,    45,
-      47,    48,    49,    52,    53,    55,    56,    63,    64,    70,
-      90,    91,    99,   112,   117,   118,   122,   124,   126,   128,
-     135,   136,   137,   138,   144,   147,   148,   154,   158,   159,
-     160,   161,   163,   171,   179,   182,   185,   188,   189,   190,
-     191,   195,   197,   206,   216,   219,   232,   233,   234,   237,
-     238,   239,   240,   243,   245,   246,    89,    50,   122,   122,
-     164,   122,     3,    19,   126,   183,   184,    18,     3,   239,
-       3,   218,   239,   122,   184,   222,   122,   126,   122,   127,
-     239,   122,   236,   239,   241,   242,   239,   239,   239,   239,
-     239,   237,   228,   229,   230,   236,    30,    32,    37,    42,
-      46,    66,    99,   132,   143,   144,   145,   148,   150,   165,
-     166,   181,   189,   235,     3,     0,   138,   126,     3,    46,
-     150,   156,   157,   238,    18,    27,    31,    32,    44,    46,
-     205,   244,   191,   100,    40,    67,    68,    69,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    90,    91,    92,    94,
-      95,    96,   102,   104,   106,   107,   108,   109,   110,   112,
-     113,   114,   115,   116,   122,   124,   127,     3,   122,   162,
-     145,   146,   172,   187,   126,   127,     3,   184,   221,   222,
-     223,   231,   122,   237,   127,   239,   180,   228,     3,   155,
-     105,   132,   100,   133,   125,   100,   236,     3,     3,   151,
-     152,   237,   237,   151,     3,   132,   145,   126,   136,     3,
-      99,    68,     3,    35,    51,   215,     3,     3,   207,   239,
-     239,   239,   239,   239,   239,   239,   239,   239,   239,   239,
-     239,   239,   239,   239,   239,   239,   239,   239,   239,   239,
-     239,   239,     3,   239,   239,   239,   239,   239,   239,   239,
-     239,   239,   239,   239,   239,   239,   239,   239,   228,   239,
-       3,   122,   128,   237,    99,    14,   239,    99,   139,   140,
-     141,   147,   148,   195,   197,   206,   216,   186,   183,   127,
-     122,   227,     3,    93,   212,   213,   214,   133,     3,   115,
-     133,   142,   143,   133,   237,   236,   236,   105,   226,   100,
-     143,   132,   226,   237,   237,   102,     3,    54,   192,    54,
-     193,     3,   208,   209,   105,   133,   125,    89,   239,     3,
-     133,   122,   133,   132,   141,   126,   139,   228,   102,   105,
-     210,   214,   133,   100,   146,   132,   133,   105,    36,   115,
-     223,   225,   102,   149,   152,   132,    99,   133,     3,     5,
-     122,   223,    17,   194,   223,   224,   126,   226,   100,   239,
-       3,   133,   146,   237,   126,   139,   132,   133,     3,     5,
-       8,     9,    10,    12,    45,    55,    56,   211,   225,   226,
-      93,   214,    28,    33,   173,   175,   177,   178,   146,   236,
-     236,   238,   146,   212,   224,   126,   100,   198,   149,   209,
-     133,    34,    62,   167,   168,   169,   170,   132,   210,   126,
-     214,   126,   122,   173,   175,    65,   153,   133,   133,   196,
-     223,    46,    99,   189,   202,   203,   204,   239,   105,   132,
-     169,   170,   220,   176,     3,   146,   146,   226,    99,   144,
-     148,   189,   199,   200,   201,   206,   216,     3,    27,   132,
-     204,   105,   142,   142,   142,   226,   126,   126,   132,   201,
-     215,   142,   132,   132,   133,   217,   199,     3,   174,   142,
-     132,   122,   126,   132,   212,   142,   133,   132,   226
+      13,    14,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    28,    29,    36,    38,    39,    41,    43,    45,
+      47,    48,    49,    52,    53,    55,    56,    63,    64,    65,
+      71,    92,    93,   101,   111,   114,   119,   120,   124,   126,
+     128,   130,   137,   138,   139,   140,   146,   149,   151,   159,
+     162,   163,   164,   165,   166,   173,   181,   184,   185,   188,
+     191,   192,   193,   194,   198,   200,   209,   214,   215,   216,
+     227,   234,   237,   250,   251,   252,   257,   261,   265,   266,
+     268,   269,   270,    91,    50,   124,   124,   156,   157,   124,
+       3,     4,    16,    17,    29,   128,   186,   187,    16,     3,
+     261,     3,   236,   261,   124,     3,   187,   240,   261,   128,
+     124,   129,    16,   261,   124,     3,     5,     8,     9,    10,
+     258,   259,   260,   261,   261,   261,   261,   261,   256,   261,
+     246,   247,   248,   254,   261,    30,    32,    37,    42,    46,
+      67,   101,   134,   145,   146,   147,   151,   153,   167,   168,
+     183,   192,   253,     3,     0,   140,   128,     3,    46,   153,
+     160,   161,   257,   147,   148,    16,    26,    31,    32,    44,
+      46,   208,   267,   194,     3,   128,   221,   225,   102,    40,
+      68,    69,    70,    72,    73,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    92,    93,    94,    96,    97,    98,   104,   105,
+     107,   108,   109,   111,   112,   114,   115,   116,   117,   118,
+     124,   126,   129,     3,   124,   255,   256,    12,   148,   174,
+     190,   128,   129,   186,   187,   239,   240,   241,   249,   124,
+     255,   129,   182,   246,     3,   104,   255,   134,   106,   102,
+     102,   135,   127,   102,   254,     3,     3,   154,   155,   255,
+     255,   154,     3,   134,   147,   128,   138,     3,   101,    69,
+     101,     3,    35,    51,   233,     3,     3,   210,   261,     3,
+     221,   226,   228,   229,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   117,   130,
+     186,   264,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   246,   261,     3,
+       4,   117,   124,   126,   130,   263,   264,   135,   124,   261,
+     101,   126,   141,   142,   143,   149,   151,   198,   200,   209,
+     234,   189,   186,   129,   124,   245,     3,    95,   230,   231,
+     232,   135,   117,   186,   144,   145,   135,   261,   135,   254,
+     259,   261,   106,   244,   102,   145,   134,   244,   255,   255,
+     104,     3,    54,   195,    54,   196,     3,   211,   212,   222,
+     104,   104,   112,   116,   217,   229,   126,   264,   106,   135,
+     127,   262,   261,   126,   264,    91,   156,   255,   135,   150,
+     134,   143,   128,   141,   246,   104,   106,   213,   232,   135,
+     102,   134,   156,   106,    36,   117,   241,   243,   104,   152,
+     155,   134,   101,   135,     3,     5,   124,   241,    15,   197,
+     241,   242,   128,   244,   102,   134,     5,   221,     5,   221,
+     218,   223,   261,   261,   261,   127,   261,   264,   135,   128,
+     261,   141,   134,   135,   261,   243,   244,    95,   232,    27,
+      33,   175,   177,   179,   180,    66,   158,   254,   261,   257,
+     156,   230,   242,   128,   102,   201,   152,   212,   112,     5,
+     111,   112,   128,   219,   224,   227,   127,   135,   127,    34,
+      62,   169,   170,   171,   172,   127,   134,   213,   128,   232,
+     128,   124,   175,   177,   156,   135,   135,   199,   241,    46,
+     101,   192,   205,   206,   207,   116,   261,   111,   227,   223,
+     261,   106,   134,   171,   172,   238,   178,     3,   156,   244,
+     101,   146,   151,   192,   202,   203,   204,   209,   234,     3,
+      26,   134,   207,   225,   220,   116,   223,   106,   144,   144,
+     144,   244,   128,   128,   134,   204,   233,   218,   134,   225,
+     144,   134,   134,   135,   235,   202,     3,   112,   218,   176,
+     144,   134,   124,   112,   128,   134,   230,   144,   135,   134,
+     244

 };
 
 #define yyerrok                (yyerrstatus = 0)
 };
 
 #define yyerrok                (yyerrstatus = 0)

@@ -4250,182 +4608,228 @@ yyreduce:
   switch (yyn)
     {
         
   switch (yyn)
     {
         

-    case 26:
+    case 13:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2030 "parser.y"
-    {(yyval.code)=(yyvsp[(1) - (1)].code);}
+#line 1980 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 27:
+    case 24:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2031 "parser.y"
-    {(yyval.code)=code_new();}
+#line 1992 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 28:
+    case 25:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2033 "parser.y"
-    {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));}
+#line 1993 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(2) - (4)].number_int);PASS1 as3_warning("embed command ignored");}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 29:
+    case 27:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2034 "parser.y"
+#line 1996 "parser.y"

     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   

-    case 42:
+    case 28:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2049 "parser.y"
-    {(yyval.code)=(yyvsp[(2) - (3)].code);}
+#line 1997 "parser.y"
+    {(yyval.code)=code_new();}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 43:
+    case 29:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2050 "parser.y"
-    {(yyval.code)=0;}
+#line 1999 "parser.y"
+    {
+    (yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 44:
+    case 30:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2053 "parser.y"
-    {(yyval.code)=0;}
+#line 2002 "parser.y"
+    {(yyval.code)=(yyvsp[(1) - (1)].code);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 51:
+    case 44:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2060 "parser.y"
-    {(yyval.code)=(yyvsp[(3) - (4)].code);}
+#line 2018 "parser.y"
+    {(yyval.code)=(yyvsp[(2) - (3)].code);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 52:
+    case 45:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2064 "parser.y"
-    {(yyval.code)=(yyvsp[(1) - (2)].code);}
+#line 2019 "parser.y"
+    {(yyval.code)=0;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 53:
+    case 46:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2065 "parser.y"
-    {(yyval.code)=(yyvsp[(1) - (1)].code);}
+#line 2022 "parser.y"
+    {(yyval.code)=0;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 54:
+    case 53:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2069 "parser.y"
+#line 2029 "parser.y"

     {
     {

-    code_t**cc = &global->init->method->body->code;
-    *cc = code_append(*cc, (yyvsp[(1) - (1)].code));
+    PASS_ALWAYS 
+    if(as3_pass) {
+        (yyval.code) = (yyvsp[(3) - (4)].code);
+    } else {
+        (yyval.code) = 0;
+    }
+    as3_pass=(yyvsp[(1) - (4)].number_int);

 }
     }
     break;
 
 
   
 }
     }
     break;
 
 
   

-    case 56:
+    case 54:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2080 "parser.y"
-    {(yyval.value)=(yyvsp[(2) - (2)].value);}
+#line 2041 "parser.y"
+    {(yyval.code)=(yyvsp[(1) - (2)].code);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 57:
+    case 55:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2081 "parser.y"
-    {(yyval.value).c=abc_pushundefined(0);
-                                  (yyval.value).t=TYPE_ANY;
-                                 }
+#line 2042 "parser.y"
+    {(yyval.code)=(yyvsp[(1) - (1)].code);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 58:
+    case 56:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2085 "parser.y"
-    {(yyval.code)=(yyvsp[(2) - (2)].code);}
+#line 2046 "parser.y"
+    {
+    if((yyvsp[(1) - (1)].code)) {
+        if(!global->init) 
+            global->init = abc_initscript(global->file);
+        code_t**cc = &global->init->method->body->code;
+        *cc = code_append(*cc, (yyvsp[(1) - (1)].code));
+    }
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 59:
+    case 57:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2086 "parser.y"
-    {(yyval.code)=(yyvsp[(2) - (2)].code);}
+#line 2057 "parser.y"
+    {
+    PASS_ALWAYS
+    (yyval.number_int) = as3_pass;
+    as3_pass=0;
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 60:
+    case 58:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2088 "parser.y"
-    {(yyval.code) = (yyvsp[(1) - (1)].code);}
+#line 2065 "parser.y"
+    {
+    PASS12
+    (yyval.number_int)=as3_pass;
+    char*key = concat3((yyvsp[(1) - (3)].id),"::",(yyvsp[(3) - (3)].id));
+    if(!definitions || !dict_contains(definitions, key)) {
+        as3_pass=0;
+    }
+    free(key);
+}
+    }
+    break;
+
+
+  
+    case 59:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2092 "parser.y"
+    {(yyval.node)=(yyvsp[(2) - (2)].node);}
+    }
+    break;
+
+
+  
+    case 60:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2093 "parser.y"
+    {(yyval.node)=mkdummynode();}

     }
     break;
 
     }
     break;
 

@@ -4435,8 +4839,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2089 "parser.y"
-    {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));}
+#line 2095 "parser.y"
+    {(yyval.code)=(yyvsp[(2) - (2)].code);}

     }
     break;
 
     }
     break;
 

@@ -4446,62 +4850,95 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2092 "parser.y"
+#line 2096 "parser.y"
+    {(yyval.code)=(yyvsp[(2) - (2)].code);}
+    }
+    break;
+
+
+  
+    case 63:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2098 "parser.y"
+    {(yyval.code) = (yyvsp[(1) - (1)].code);}
+    }
+    break;
+
+
+  
+    case 64:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2099 "parser.y"
+    {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));}
+    }
+    break;
+
+
+  
+    case 65:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2102 "parser.y"

     {
 PASS12
     {
 PASS12

-    if(variable_exists((yyvsp[(1) - (3)].id)))
+    if(variable_exists((yyvsp[(1) - (3)].id))) 

         syntaxerror("Variable %s already defined", (yyvsp[(1) - (3)].id));
 PASS1
         syntaxerror("Variable %s already defined", (yyvsp[(1) - (3)].id));
 PASS1

-    new_variable((yyvsp[(1) - (3)].id), 0, 1, 0);
+    new_variable(state->method, (yyvsp[(1) - (3)].id), 0, 1, 0);

 PASS2
    
 PASS2
    

-    if(!is_subtype_of((yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo))) {
-        syntaxerror("Can't convert %s to %s", (yyvsp[(3) - (3)].value).t->name, 
-                                              (yyvsp[(2) - (3)].classinfo)->name);
-    }
-

     char slot = 0;
     int index = 0;
     char slot = 0;
     int index = 0;

+    variable_t*v = 0;

     if(state->method->uses_slots) {
     if(state->method->uses_slots) {

-        variable_t* v = find_slot(state, (yyvsp[(1) - (3)].id));
+        v = find_slot(state->method, (yyvsp[(1) - (3)].id));

         if(v && !v->init) {
             // this variable is stored in a slot
             v->init = 1;
             v->type = (yyvsp[(2) - (3)].classinfo);
             slot = 1;
         if(v && !v->init) {
             // this variable is stored in a slot
             v->init = 1;
             v->type = (yyvsp[(2) - (3)].classinfo);
             slot = 1;

-            index = v->index;

         }
     }
         }
     }

-    if(!index) {
-        index = new_variable((yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].classinfo), 1, 0);
+    if(!v) {
+        v = new_variable2(state->method, (yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].classinfo), 1, 0);

     }
 
     (yyval.code) = slot?abc_getscopeobject(0, 1):0;
     
     }
 
     (yyval.code) = slot?abc_getscopeobject(0, 1):0;
     

+    typedcode_t val = node_read((yyvsp[(3) - (3)].node));
+    if(!is_subtype_of(val.t, (yyvsp[(2) - (3)].classinfo))) {
+        syntaxerror("Can't convert %s to %s", val.t->name, (yyvsp[(2) - (3)].classinfo)->name);
+    }

     if((yyvsp[(2) - (3)].classinfo)) {
     if((yyvsp[(2) - (3)].classinfo)) {

-        if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) {
-            (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c);
-            (yyval.code) = converttype((yyval.code), (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo));
+        if(val.c->prev || val.c->opcode != OPCODE_PUSHUNDEFINED) {
+            (yyval.code) = code_append((yyval.code), val.c);
+            (yyval.code) = converttype((yyval.code), val.t, (yyvsp[(2) - (3)].classinfo));

         } else {
         } else {

-            code_free((yyvsp[(3) - (3)].value).c);
+            code_free(val.c);

             (yyval.code) = defaultvalue((yyval.code), (yyvsp[(2) - (3)].classinfo));
         }
     } else {
             (yyval.code) = defaultvalue((yyval.code), (yyvsp[(2) - (3)].classinfo));
         }
     } else {

-        if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) {
-            (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c);
+        if(val.c->prev || val.c->opcode != OPCODE_PUSHUNDEFINED) {
+            (yyval.code) = code_append((yyval.code), val.c);

             (yyval.code) = abc_coerce_a((yyval.code));
         } else {
             // don't do anything
             (yyval.code) = abc_coerce_a((yyval.code));
         } else {
             // don't do anything

-            code_free((yyvsp[(3) - (3)].value).c);
+            code_free(val.c);

             code_free((yyval.code));
             (yyval.code) = 0;
             break;
         }
     }
     if(slot) {
             code_free((yyval.code));
             (yyval.code) = 0;
             break;
         }
     }
     if(slot) {

-        (yyval.code) = abc_setslot((yyval.code), index);
+        (yyval.code) = abc_setslot((yyval.code), v->index);

     } else {
     } else {

-        (yyval.code) = abc_setlocal((yyval.code), index);
+        (yyval.code) = abc_setlocal((yyval.code), v->index);
+        v->init = do_init_variable((yyvsp[(1) - (3)].id));

     }
 }
     }
     }
 }
     }

@@ -4509,97 +4946,108 @@ PASS2
 
 
   
 
 
   

-    case 63:
+    case 66:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2152 "parser.y"
-    {(yyval.code) = code_new();}
+#line 2162 "parser.y"
+    {PASS12 new_state();}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 64:
+    case 67:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2153 "parser.y"
-    {(yyval.code)=(yyvsp[(2) - (2)].code);}
+#line 2162 "parser.y"
+    {
+    (yyval.code) = var_block((yyvsp[(2) - (2)].code), state->vars);
+    PASS12 old_state();
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 65:
+    case 68:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2156 "parser.y"
-    {PASS12 new_state();}
+#line 2166 "parser.y"
+    {(yyval.code) = code_new();}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 66:
+    case 69:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2167 "parser.y"
+    {(yyval.code)=(yyvsp[(2) - (2)].code);}
+    }
+    break;
+
+
+  
+    case 70:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2156 "parser.y"
+#line 2170 "parser.y"

     {
     {

-     

     (yyval.code) = code_new();
     (yyval.code) = code_new();

-    (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (7)].value).c);
+    (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (6)].value).c);

     code_t*myjmp,*myif = (yyval.code) = abc_iffalse((yyval.code), 0);
    
     code_t*myjmp,*myif = (yyval.code) = abc_iffalse((yyval.code), 0);
    

-    (yyval.code) = code_append((yyval.code), (yyvsp[(6) - (7)].code));
-    if((yyvsp[(7) - (7)].code)) {
+    (yyval.code) = code_append((yyval.code), (yyvsp[(5) - (6)].code));
+    if((yyvsp[(6) - (6)].code)) {

         myjmp = (yyval.code) = abc_jump((yyval.code), 0);
     }
     myif->branch = (yyval.code) = abc_nop((yyval.code));
         myjmp = (yyval.code) = abc_jump((yyval.code), 0);
     }
     myif->branch = (yyval.code) = abc_nop((yyval.code));

-    if((yyvsp[(7) - (7)].code)) {
-        (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (7)].code));
+    if((yyvsp[(6) - (6)].code)) {
+        (yyval.code) = code_append((yyval.code), (yyvsp[(6) - (6)].code));

         myjmp->branch = (yyval.code) = abc_nop((yyval.code));
     }
         myjmp->branch = (yyval.code) = abc_nop((yyval.code));
     }

-    (yyval.code) = var_block((yyval.code));
-    PASS12 old_state();

 }
     }
     break;
 
 
   
 }
     }
     break;
 
 
   

-    case 67:
+    case 71:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2175 "parser.y"
+#line 2186 "parser.y"

     {(yyval.code)=code_new();}
     }
     break;
 
 
   
     {(yyval.code)=code_new();}
     }
     break;
 
 
   

-    case 70:
+    case 74:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2182 "parser.y"
+#line 2193 "parser.y"

     {
     {

-    PASS1 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),0,1,0);
-    PASS2 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1,0);
+    PASS1 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable(state->method, (yyvsp[(2) - (3)].id),0,1,0);
+    PASS2 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable(state->method, (yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1,0);

 }
     }
     break;
 
 
   
 }
     }
     break;
 
 
   

-    case 71:
+    case 75:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2186 "parser.y"
+#line 2197 "parser.y"

     {
     PASS12
     (yyval.id)=(yyvsp[(1) - (1)].id);
     {
     PASS12
     (yyval.id)=(yyvsp[(1) - (1)].id);

@@ -4609,33 +5057,33 @@ PASS2
 
 
   
 
 
   

-    case 72:
+    case 76:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2191 "parser.y"
+#line 2202 "parser.y"

     {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;}
     }
     break;
 
 
   
     {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;}
     }
     break;
 
 
   

-    case 73:
+    case 77:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2192 "parser.y"
+#line 2203 "parser.y"

     {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;}
     }
     break;
 
 
   
     {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;}
     }
     break;
 
 
   

-    case 74:
+    case 78:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2194 "parser.y"
+#line 2205 "parser.y"

     {
     if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement");
     (yyval.code) = code_new();
     {
     if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement");
     (yyval.code) = code_new();

@@ -4652,7 +5100,7 @@ PASS2
     continuejumpsto((yyval.code), (yyvsp[(1) - (8)].for_start).name, cont);
     myif->branch = out;
 
     continuejumpsto((yyval.code), (yyvsp[(1) - (8)].for_start).name, cont);
     myif->branch = out;
 

-    (yyval.code) = var_block((yyval.code));
+    (yyval.code) = var_block((yyval.code), state->vars);

     PASS12 old_state();
 }
     }
     PASS12 old_state();
 }
     }

@@ -4660,21 +5108,18 @@ PASS2
 
 
   
 
 
   

-    case 75:
+    case 79:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2214 "parser.y"
+#line 2225 "parser.y"

     {
     variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id));
     if(!var) {
         syntaxerror("variable %s not known in this scope", (yyvsp[(2) - (6)].id));
     }
     {
     variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id));
     if(!var) {
         syntaxerror("variable %s not known in this scope", (yyvsp[(2) - (6)].id));
     }

-
-    char*tmp1name = concat2((yyvsp[(2) - (6)].id), "__tmp1__");
-    int it = new_variable(tmp1name, TYPE_INT, 0, 0);
-    char*tmp2name = concat2((yyvsp[(2) - (6)].id), "__array__");
-    int array = new_variable(tmp1name, 0, 0, 0);
+    int it = alloc_local();
+    int array = alloc_local();

 
     (yyval.code) = code_new();
     (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (6)].value).c);
 
     (yyval.code) = code_new();
     (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (6)].value).c);

@@ -4705,11 +5150,10 @@ PASS2
     
     myif->branch = out;
 
     
     myif->branch = out;
 

-    (yyval.code) = var_block((yyval.code));
-
-    free(tmp1name);
-    free(tmp2name);
+    (yyval.code) = abc_kill((yyval.code), it);
+    (yyval.code) = abc_kill((yyval.code), array);

 
 

+    (yyval.code) = var_block((yyval.code), state->vars);

     PASS12 old_state();
 }
     }
     PASS12 old_state();
 }
     }

@@ -4717,85 +5161,57 @@ PASS2
 
 
   
 
 
   

-    case 76:
-    if(as3_pass==2) {
-
-/* Line 1464 of skeleton.m4  */
-#line 2262 "parser.y"
-    {PASS12 new_state();}
-    }
-    break;
-
-
-  
-    case 77:
+    case 80:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2262 "parser.y"
+#line 2269 "parser.y"

     {
 
     (yyval.code) = code_new();
 
     code_t*myjmp = (yyval.code) = abc_jump((yyval.code), 0);
     code_t*loopstart = (yyval.code) = abc_label((yyval.code));
     {
 
     (yyval.code) = code_new();
 
     code_t*myjmp = (yyval.code) = abc_jump((yyval.code), 0);
     code_t*loopstart = (yyval.code) = abc_label((yyval.code));

-    (yyval.code) = code_append((yyval.code), (yyvsp[(6) - (6)].code));
+    (yyval.code) = code_append((yyval.code), (yyvsp[(5) - (5)].code));

     code_t*cont = (yyval.code) = abc_nop((yyval.code));
     myjmp->branch = cont;
     code_t*cont = (yyval.code) = abc_nop((yyval.code));
     myjmp->branch = cont;

-    (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (6)].value).c);
+    (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (5)].value).c);

     (yyval.code) = abc_iftrue((yyval.code), loopstart);
     code_t*out = (yyval.code) = abc_nop((yyval.code));
     (yyval.code) = abc_iftrue((yyval.code), loopstart);
     code_t*out = (yyval.code) = abc_nop((yyval.code));

-    breakjumpsto((yyval.code), (yyvsp[(1) - (6)].id), out);
-    continuejumpsto((yyval.code), (yyvsp[(1) - (6)].id), cont);
-
-    (yyval.code) = var_block((yyval.code));
-    PASS12 old_state();
+    breakjumpsto((yyval.code), (yyvsp[(1) - (5)].id), out);
+    continuejumpsto((yyval.code), (yyvsp[(1) - (5)].id), cont);

 }
     }
     break;
 
 
   
 }
     }
     break;
 
 
   

-    case 78:
-    if(as3_pass==2) {
-
-/* Line 1464 of skeleton.m4  */
-#line 2281 "parser.y"
-    {PASS12 new_state();}
-    }
-    break;
-
-
-  
-    case 79:
+    case 81:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2281 "parser.y"
+#line 2285 "parser.y"

     {
     (yyval.code) = code_new();
     code_t*loopstart = (yyval.code) = abc_label((yyval.code));
     {
     (yyval.code) = code_new();
     code_t*loopstart = (yyval.code) = abc_label((yyval.code));

-    (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (7)].code));
+    (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (6)].code));

     code_t*cont = (yyval.code) = abc_nop((yyval.code));
     code_t*cont = (yyval.code) = abc_nop((yyval.code));

-    (yyval.code) = code_append((yyval.code), (yyvsp[(6) - (7)].value).c);
+    (yyval.code) = code_append((yyval.code), (yyvsp[(5) - (6)].value).c);

     (yyval.code) = abc_iftrue((yyval.code), loopstart);
     code_t*out = (yyval.code) = abc_nop((yyval.code));
     (yyval.code) = abc_iftrue((yyval.code), loopstart);
     code_t*out = (yyval.code) = abc_nop((yyval.code));

-    breakjumpsto((yyval.code), (yyvsp[(1) - (7)].id), out);
-    continuejumpsto((yyval.code), (yyvsp[(1) - (7)].id), cont);
-    
-    (yyval.code) = var_block((yyval.code));
-    PASS12 old_state();
+    breakjumpsto((yyval.code), (yyvsp[(1) - (6)].id), out);
+    continuejumpsto((yyval.code), (yyvsp[(1) - (6)].id), cont);

 }
     }
     break;
 
 
   
 }
     }
     break;
 
 
   

-    case 80:
+    case 82:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2296 "parser.y"
+#line 2297 "parser.y"

     {
     (yyval.code) = abc___break__(0, "");
 }
     {
     (yyval.code) = abc___break__(0, "");
 }

@@ -4804,11 +5220,11 @@ PASS2
 
 
   
 
 
   

-    case 81:
+    case 83:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2299 "parser.y"
+#line 2300 "parser.y"

     {
     (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id));
 }
     {
     (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id));
 }

@@ -4817,11 +5233,11 @@ PASS2
 
 
   
 
 
   

-    case 82:
+    case 84:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2302 "parser.y"
+#line 2303 "parser.y"

     {
     (yyval.code) = abc___continue__(0, "");
 }
     {
     (yyval.code) = abc___continue__(0, "");
 }

@@ -4830,11 +5246,11 @@ PASS2
 
 
   
 
 
   

-    case 83:
+    case 85:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2305 "parser.y"
+#line 2306 "parser.y"

     {
     (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id));
 }
     {
     (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id));
 }

@@ -4843,80 +5259,80 @@ PASS2
 
 
   
 
 
   

-    case 84:
+    case 86:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2309 "parser.y"
+#line 2310 "parser.y"

     {(yyval.code)=0;}
     }
     break;
 
 
   
     {(yyval.code)=0;}
     }
     break;
 
 
   

-    case 85:
+    case 87:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2310 "parser.y"
+#line 2311 "parser.y"

     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   

-    case 86:
+    case 88:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2311 "parser.y"
+#line 2312 "parser.y"

     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   

-    case 87:
+    case 89:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2312 "parser.y"
+#line 2313 "parser.y"

     {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));}
     }
     break;
 
 
   
     {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));}
     }
     break;
 
 
   

-    case 88:
+    case 90:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2313 "parser.y"
+#line 2314 "parser.y"

     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   

-    case 89:
+    case 91:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2314 "parser.y"
+#line 2315 "parser.y"

     {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));}
     }
     break;
 
 
   
     {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));}
     }
     break;
 
 
   

-    case 90:
+    case 92:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2316 "parser.y"
+#line 2317 "parser.y"

     {
     {

-    (yyval.code) = abc_dup(0);
-    (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c);
+    (yyval.code) = abc_getlocal(0, state->switch_var);
+    (yyval.code) = code_append((yyval.code), node_read((yyvsp[(2) - (4)].node)).c);

     code_t*j = (yyval.code) = abc_ifne((yyval.code), 0);
     (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (4)].code));
     if((yyval.code)->opcode != OPCODE___BREAK__) {
     code_t*j = (yyval.code) = abc_ifne((yyval.code), 0);
     (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (4)].code));
     if((yyval.code)->opcode != OPCODE___BREAK__) {

@@ -4930,11 +5346,11 @@ PASS2
 
 
   
 
 
   

-    case 91:
+    case 93:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2327 "parser.y"
+#line 2328 "parser.y"

     {
     (yyval.code) = (yyvsp[(3) - (3)].code);
 }
     {
     (yyval.code) = (yyvsp[(3) - (3)].code);
 }

@@ -4943,26 +5359,28 @@ PASS2
 
 
   
 
 
   

-    case 92:
+    case 94:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2330 "parser.y"
-    {PASS12 new_state();}
+#line 2331 "parser.y"
+    {PASS12 new_state();state->switch_var=alloc_local();}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 93:
+    case 95:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2330 "parser.y"
+#line 2331 "parser.y"

     {
     {

-    (yyval.code)=(yyvsp[(4) - (8)].value).c;
+    (yyval.code) = node_read((yyvsp[(4) - (8)].node)).c;
+    (yyval.code) = abc_setlocal((yyval.code), state->switch_var);

     (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code));
     (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code));

-    code_t*out = (yyval.code) = abc_pop((yyval.code));
+
+    code_t*out = (yyval.code) = abc_kill((yyval.code), state->switch_var);

     breakjumpsto((yyval.code), (yyvsp[(1) - (8)].id), out);
     
     code_t*c = (yyval.code),*lastblock=0;
     breakjumpsto((yyval.code), (yyvsp[(1) - (8)].id), out);
     
     code_t*c = (yyval.code),*lastblock=0;

@@ -4982,7 +5400,7 @@ PASS2
         c=c->prev;
     }
    
         c=c->prev;
     }
    

-    (yyval.code) = var_block((yyval.code));
+    (yyval.code) = var_block((yyval.code), state->vars);

     PASS12 old_state();
 }
     }
     PASS12 old_state();
 }
     }

@@ -4990,26 +5408,26 @@ PASS2
 
 
   
 
 
   

-    case 94:
+    case 96:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2359 "parser.y"
+#line 2362 "parser.y"

     {PASS12 new_state();
                                                       state->exception_name=(yyvsp[(3) - (5)].id);
     {PASS12 new_state();
                                                       state->exception_name=(yyvsp[(3) - (5)].id);

-                                               PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0);
-                                               PASS2 new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0, 0);
+                                               PASS1 new_variable(state->method, (yyvsp[(3) - (5)].id), 0, 0, 0);
+                                               PASS2 new_variable(state->method, (yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0, 0);

                                               }
     }
     break;
 
 
   
                                               }
     }
     break;
 
 
   

-    case 95:
+    case 97:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2364 "parser.y"
+#line 2367 "parser.y"

     {
     namespace_t name_ns = {ACCESS_PACKAGE, ""};
     multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)};
     {
     namespace_t name_ns = {ACCESS_PACKAGE, ""};
     multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)};

@@ -5023,10 +5441,11 @@ PASS2
     int i = find_variable_safe(state, (yyvsp[(3) - (9)].id))->index;
     e->target = c = abc_nop(0);
     c = abc_setlocal(c, i);
     int i = find_variable_safe(state, (yyvsp[(3) - (9)].id))->index;
     e->target = c = abc_nop(0);
     c = abc_setlocal(c, i);

+    c = code_append(c, code_dup(state->method->scope_code));

     c = code_append(c, (yyvsp[(8) - (9)].code));
     c = abc_kill(c, i);
 
     c = code_append(c, (yyvsp[(8) - (9)].code));
     c = abc_kill(c, i);
 

-    c = var_block(c);
+    c = var_block(c, state->vars);

     PASS12 old_state();
 }
     }
     PASS12 old_state();
 }
     }

@@ -5034,24 +5453,24 @@ PASS2
 
 
   
 
 
   

-    case 96:
+    case 98:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2383 "parser.y"
+#line 2387 "parser.y"

     {PASS12 new_state();state->exception_name=0;}
     }
     break;
 
 
   
     {PASS12 new_state();state->exception_name=0;}
     }
     break;
 
 
   

-    case 97:
+    case 99:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2383 "parser.y"
+#line 2387 "parser.y"

     {
     {

-    (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code));
+    (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code), state->vars);

     if(!(yyvsp[(4) - (5)].code)) {
         (yyval.exception)=0;
     } else {
     if(!(yyvsp[(4) - (5)].code)) {
         (yyval.exception)=0;
     } else {

@@ -5070,44 +5489,44 @@ PASS2
 
 
   
 
 
   

-    case 98:
+    case 100:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2399 "parser.y"
+#line 2403 "parser.y"

     {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));}
     }
     break;
 
 
   
     {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));}
     }
     break;
 
 
   

-    case 99:
+    case 101:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2400 "parser.y"
+#line 2404 "parser.y"

     {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));}
     }
     break;
 
 
   
     {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));}
     }
     break;
 
 
   

-    case 100:
+    case 102:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2401 "parser.y"
+#line 2405 "parser.y"

     {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);}
     }
     break;
 
 
   
     {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);}
     }
     break;
 
 
   

-    case 101:
+    case 103:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2402 "parser.y"
+#line 2406 "parser.y"

     {
     (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list);
     (yyval.catch_list).finally = 0;
     {
     (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list);
     (yyval.catch_list).finally = 0;

@@ -5121,11 +5540,11 @@ PASS2
 
 
   
 
 
   

-    case 102:
+    case 104:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2410 "parser.y"
+#line 2414 "parser.y"

     {
     (yyval.catch_list).l=list_new();
     (yyval.catch_list).finally = 0;
     {
     (yyval.catch_list).l=list_new();
     (yyval.catch_list).finally = 0;

@@ -5139,22 +5558,25 @@ PASS2
 
 
   
 
 
   

-    case 103:
+    case 105:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2419 "parser.y"
-    {PASS12 new_state();}
+#line 2423 "parser.y"
+    {PASS12 new_state();
+                 state->method->has_exceptions=1;
+                 state->method->late_binding=1;//for invariant scope_code
+                }

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 104:
+    case 106:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2419 "parser.y"
+#line 2426 "parser.y"

     {
     code_t*out = abc_nop(0);
 
     {
     code_t*out = abc_nop(0);
 

@@ -5167,7 +5589,7 @@ PASS2
   
     int tmp;
     if((yyvsp[(6) - (6)].catch_list).finally)
   
     int tmp;
     if((yyvsp[(6) - (6)].catch_list).finally)

-        tmp = new_variable("__finally__", 0, 0, 0);
+        tmp = alloc_local();

     
     abc_exception_list_t*l = (yyvsp[(6) - (6)].catch_list).l;
     int count=0;
     
     abc_exception_list_t*l = (yyvsp[(6) - (6)].catch_list).l;
     int count=0;

@@ -5180,6 +5602,7 @@ PASS2
             parserassert((ptroff_t)(yyvsp[(6) - (6)].catch_list).finally);
             // finally block
             e->target = (yyval.code) = abc_nop((yyval.code));
             parserassert((ptroff_t)(yyvsp[(6) - (6)].catch_list).finally);
             // finally block
             e->target = (yyval.code) = abc_nop((yyval.code));

+            (yyval.code) = code_append((yyval.code), code_dup(state->method->scope_code));

             (yyval.code) = abc___rethrow__((yyval.code));
         }
         
             (yyval.code) = abc___rethrow__((yyval.code));
         }
         

@@ -5194,7 +5617,7 @@ PASS2
         
     list_concat(state->method->exceptions, (yyvsp[(6) - (6)].catch_list).l);
    
         
     list_concat(state->method->exceptions, (yyvsp[(6) - (6)].catch_list).l);
    

-    (yyval.code) = var_block((yyval.code));
+    (yyval.code) = var_block((yyval.code), state->vars);

     PASS12 old_state();
 }
     }
     PASS12 old_state();
 }
     }

@@ -5202,11 +5625,11 @@ PASS2
 
 
   
 
 
   

-    case 105:
+    case 107:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2464 "parser.y"
+#line 2472 "parser.y"

     {
     (yyval.code)=(yyvsp[(2) - (2)].value).c;
     (yyval.code)=abc_throw((yyval.code));
     {
     (yyval.code)=(yyvsp[(2) - (2)].value).c;
     (yyval.code)=abc_throw((yyval.code));

@@ -5216,11 +5639,11 @@ PASS2
 
 
   
 
 
   

-    case 106:
+    case 108:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2468 "parser.y"
+#line 2476 "parser.y"

     {
     if(!state->exception_name)
         syntaxerror("re-throw only possible within a catch block");
     {
     if(!state->exception_name)
         syntaxerror("re-throw only possible within a catch block");

@@ -5234,137 +5657,210 @@ PASS2
 
 
   
 
 
   

-    case 107:
+    case 109:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2479 "parser.y"
+#line 2487 "parser.y"

     {
     {

-     (yyval.code) = (yyvsp[(3) - (5)].value).c;
-     (yyval.code) = abc_pushwith((yyval.code));
-     (yyval.code) = code_append((yyval.code), (yyvsp[(5) - (5)].code));
-     (yyval.code) = abc_popscope((yyval.code));
+     new_state();
+     if(state->method->has_exceptions) {
+         int v = alloc_local();
+         state->method->scope_code = abc_getlocal(state->method->scope_code, v);
+         state->method->scope_code = abc_pushwith(state->method->scope_code);
+         (yyval.value_list).number = v;
+     }
+     (yyval.value_list).cc = (yyvsp[(3) - (4)].value).c;

 }
     }
     break;
 
 
   
 }
     }
     break;
 
 
   

-    case 109:
+    case 110:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2489 "parser.y"
-    {PASS12 (yyval.id)="package";}
+#line 2497 "parser.y"
+    {
+     /* remove getlocal;pushwith from scope code again */
+     state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code));
+
+     (yyval.code) = (yyvsp[(1) - (2)].value_list).cc;
+     if(state->method->has_exceptions) {
+         (yyval.code) = abc_dup((yyval.code));
+         (yyval.code) = abc_setlocal((yyval.code), (yyvsp[(1) - (2)].value_list).number);
+     }
+     (yyval.code) = abc_pushwith((yyval.code));
+     (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (2)].code));
+     (yyval.code) = abc_popscope((yyval.code));
+     old_state();
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 110:
+    case 112:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2491 "parser.y"
-    {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;}
+#line 2515 "parser.y"
+    {PASS12 (yyval.id)="package";}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 111:
+    case 113:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2492 "parser.y"
-    {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));}
+#line 2516 "parser.y"
+    {PASS12 (yyval.id)="namespace";}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 112:
+    case 114:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2494 "parser.y"
-    {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;}
+#line 2517 "parser.y"
+    {PASS12 (yyval.id)="NaN";}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 113:
+    case 115:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2495 "parser.y"
-    {PASS12 endpackage();(yyval.code)=0;}
+#line 2518 "parser.y"
+    {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 114:
+    case 116:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2496 "parser.y"
-    {PASS12 startpackage("");}
+#line 2520 "parser.y"
+    {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 115:
+    case 117:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2497 "parser.y"
-    {PASS12 endpackage();(yyval.code)=0;}
+#line 2521 "parser.y"
+    {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 116:
+    case 118:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2499 "parser.y"
-    {
-       PASS12
-       slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name);
-       if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) {
-           as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name);
-       }
-
-       PASS2
-       classinfo_t*c = (yyvsp[(2) - (2)].classinfo);
-       if(!c) 
-            syntaxerror("Couldn't import class\n");
-       state_has_imports();
-       dict_put(state->imports, c->name, c);
-       import_toplevel(c->package);
-       (yyval.code)=0;
-}
+#line 2523 "parser.y"
+    {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 117:
+    case 119:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2515 "parser.y"
-    {
-       PASS12
+#line 2524 "parser.y"
+    {PASS12 endpackage();(yyval.code)=0;}
+    }
+    break;
+
+
+  
+    case 120:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2525 "parser.y"
+    {PASS12 startpackage("");}
+    }
+    break;
+
+
+  
+    case 121:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2526 "parser.y"
+    {PASS12 endpackage();(yyval.code)=0;}
+    }
+    break;
+
+
+  
+    case 122:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2549 "parser.y"
+    {
+       PASS12
+       slotinfo_t*s = registry_find(state->package, (yyvsp[(2) - (2)].id));
+       if(!s && as3_pass==1) {as3_schedule_class(state->package, (yyvsp[(2) - (2)].id));}
+       state_has_imports();
+       dict_put(state->imports, state->package, (yyvsp[(2) - (2)].id));
+       (yyval.code)=0;
+}
+    }
+    break;
+
+
+  
+    case 123:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2557 "parser.y"
+    {
+       PASS12
+       slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name);
+       if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) {
+           as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name);
+       }
+       state_has_imports();
+       dict_put(state->imports, (yyvsp[(2) - (2)].classinfo)->name, (yyvsp[(2) - (2)].classinfo));
+       import_toplevel((yyvsp[(2) - (2)].classinfo)->package);
+       (yyval.code)=0;
+}
+    }
+    break;
+
+
+  
+    case 124:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2568 "parser.y"
+    {
+       PASS12

        if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6) && as3_pass==1) {
            as3_schedule_package((yyvsp[(2) - (4)].id));
        }
 
        if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6) && as3_pass==1) {
            as3_schedule_package((yyvsp[(2) - (4)].id));
        }
 

-       PASS2

        NEW(import_t,i);
        i->package = (yyvsp[(2) - (4)].id);
        state_has_imports();
        NEW(import_t,i);
        i->package = (yyvsp[(2) - (4)].id);
        state_has_imports();

@@ -5377,44 +5873,44 @@ PASS2
 
 
   
 
 
   

-    case 118:
+    case 125:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2532 "parser.y"
+#line 2584 "parser.y"

     {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;}
     }
     break;
 
 
   

-    case 119:
+    case 126:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2533 "parser.y"
+#line 2585 "parser.y"

     {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);}
     }
     break;
 
 
   
     {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);}
     }
     break;
 
 
   

-    case 120:
+    case 127:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2534 "parser.y"
+#line 2586 "parser.y"

     {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);}
     }
     break;
 
 
   
     {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);}
     }
     break;
 
 
   

-    case 121:
+    case 128:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2535 "parser.y"
+#line 2587 "parser.y"

     {
     PASS12 
     (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags;
     {
     PASS12 
     (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags;

@@ -5427,110 +5923,110 @@ PASS2
 
 
   
 
 
   

-    case 122:
+    case 129:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2543 "parser.y"
+#line 2594 "parser.y"

     {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;}
     }
     break;
 
 
   

-    case 123:
+    case 130:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2544 "parser.y"
+#line 2595 "parser.y"

     {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;}
     }
     break;
 
 
   

-    case 124:
+    case 131:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2545 "parser.y"
+#line 2596 "parser.y"

     {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;}
     }
     break;
 
 
   

-    case 125:
+    case 132:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2546 "parser.y"
+#line 2597 "parser.y"

     {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;}
     }
     break;
 
 
   

-    case 126:
+    case 133:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2547 "parser.y"
+#line 2598 "parser.y"

     {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;}
     }
     break;
 
 
   

-    case 127:
+    case 134:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2548 "parser.y"
+#line 2599 "parser.y"

     {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;}
     }
     break;
 
 
   

-    case 128:
+    case 135:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2549 "parser.y"
+#line 2600 "parser.y"

     {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;}
     }
     break;
 
 
   

-    case 129:
+    case 136:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2550 "parser.y"
+#line 2601 "parser.y"

     {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;}
     }
     break;
 
 
   

-    case 130:
+    case 137:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2551 "parser.y"
+#line 2602 "parser.y"

     {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;}
     }
     break;
 
 
   

-    case 131:
+    case 138:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2552 "parser.y"
+#line 2603 "parser.y"

     {PASS12 (yyval.flags).flags=FLAG_NAMESPACE;
                                (yyval.flags).ns=(yyvsp[(1) - (1)].id);
                        }
     {PASS12 (yyval.flags).flags=FLAG_NAMESPACE;
                                (yyval.flags).ns=(yyvsp[(1) - (1)].id);
                        }

@@ -5539,99 +6035,99 @@ PASS2
 
 
   
 
 
   

-    case 132:
+    case 139:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2556 "parser.y"
-    {(yyval.classinfo)=0;}
+#line 2607 "parser.y"
+    {PASS12 (yyval.classinfo)=0;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 133:
+    case 140:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2557 "parser.y"
-    {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
+#line 2608 "parser.y"
+    {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 134:
+    case 141:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2559 "parser.y"
+#line 2610 "parser.y"

     {PASS12 (yyval.classinfo_list)=list_new();}
     }
     break;
 
 
   
     {PASS12 (yyval.classinfo_list)=list_new();}
     }
     break;
 
 
   

-    case 135:
+    case 142:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2560 "parser.y"
+#line 2611 "parser.y"

     {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
     }
     break;
 
 
   
     {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
     }
     break;
 
 
   

-    case 136:
+    case 143:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2562 "parser.y"
+#line 2613 "parser.y"

     {PASS12 (yyval.classinfo_list)=list_new();}
     }
     break;
 
 
   
     {PASS12 (yyval.classinfo_list)=list_new();}
     }
     break;
 
 
   

-    case 137:
+    case 144:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2563 "parser.y"
+#line 2614 "parser.y"

     {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
     }
     break;
 
 
   
     {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
     }
     break;
 
 
   

-    case 138:
+    case 145:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2567 "parser.y"
+#line 2618 "parser.y"

     {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));}
     }
     break;
 
 
   
     {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));}
     }
     break;
 
 
   

-    case 139:
+    case 146:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2569 "parser.y"
+#line 2620 "parser.y"

     {PASS12 endclass();(yyval.code)=0;}
     }
     break;
 
 
   
     {PASS12 endclass();(yyval.code)=0;}
     }
     break;
 
 
   

-    case 140:
+    case 147:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2573 "parser.y"
+#line 2624 "parser.y"

     {PASS12 (yyvsp[(1) - (5)].flags).flags|=FLAG_INTERFACE;
                                           startclass(&(yyvsp[(1) - (5)].flags),(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));}
     }
     {PASS12 (yyvsp[(1) - (5)].flags).flags|=FLAG_INTERFACE;
                                           startclass(&(yyvsp[(1) - (5)].flags),(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));}
     }

@@ -5639,22 +6135,33 @@ PASS2
 
 
   
 
 
   

-    case 141:
+    case 148:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2576 "parser.y"
+#line 2627 "parser.y"

     {PASS12 endclass();(yyval.code)=0;}
     }
     break;
 
 
   
     {PASS12 endclass();(yyval.code)=0;}
     }
     break;
 
 
   

-    case 150:
+    case 154:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2636 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);}
+    }
+    break;
+
+
+  
+    case 157:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2589 "parser.y"
+#line 2640 "parser.y"

     {
     code_t*c = state->cls->static_init->header;
     c = code_append(c, (yyvsp[(1) - (1)].code));  
     {
     code_t*c = state->cls->static_init->header;
     c = code_append(c, (yyvsp[(1) - (1)].code));  

@@ -5665,11 +6172,11 @@ PASS2
 
 
   
 
 
   

-    case 156:
+    case 163:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2600 "parser.y"
+#line 2651 "parser.y"

     {
     syntaxerror("variable declarations not allowed in interfaces");
 }
     {
     syntaxerror("variable declarations not allowed in interfaces");
 }

@@ -5678,11 +6185,11 @@ PASS2
 
 
   
 
 
   

-    case 157:
+    case 164:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2603 "parser.y"
+#line 2654 "parser.y"

     {
     PASS12
     (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC;
     {
     PASS12
     (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC;

@@ -5698,122 +6205,131 @@ PASS2
 
 
   
 
 
   

-    case 160:
+    case 167:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2618 "parser.y"
-    {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));}
+#line 2729 "parser.y"
+    {PASS12 setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 161:
+    case 168:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2618 "parser.y"
-    {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);}
+#line 2729 "parser.y"
+    {PASS12 (yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 162:
+    case 169:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2620 "parser.y"
-    {(yyval.code) = (yyvsp[(1) - (1)].code);}
+#line 2731 "parser.y"
+    {PASS12 (yyval.code)=0;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 163:
+    case 170:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2621 "parser.y"
-    {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));}
+#line 2732 "parser.y"
+    {PASS12 (yyval.code)=0;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 164:
+    case 171:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2624 "parser.y"
+#line 2735 "parser.y"

     {
     {

+PASS12

     int flags = slotstate_flags->flags;
     namespace_t ns = modifiers2access(slotstate_flags);
 
     int flags = slotstate_flags->flags;
     namespace_t ns = modifiers2access(slotstate_flags);
 

-    varinfo_t* info = 0;
-    if(state->cls) {
-        memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1);
-        if(i) {
-            check_override(i, flags);
-        }
-        info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id));
-    } else {
-        slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id));
-        if(i) {
-            syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id));
-        }
-        if(ns.name && ns.name[0]) {
-            syntaxerror("namespaces not allowed on package-level variables");
+    if(as3_pass == 1) {
+
+        varinfo_t* info = 0;
+        if(state->cls) {
+            memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1);
+            if(i) {
+                check_override(i, flags);
+            }
+            info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id));
+        } else {
+            slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id));
+            if(i) {
+                syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id));
+            }
+            if(ns.name && ns.name[0]) {
+                syntaxerror("namespaces not allowed on package-level variables");
+            }
+            info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id));

         }
         }

-        info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id));
+
+        info->type = (yyvsp[(2) - (3)].classinfo);
+        info->flags = flags;
+        
+        dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, info);

     }
 
     }
 

-    info->type = (yyvsp[(2) - (3)].classinfo);
-    info->flags = flags;
+    if(as3_pass == 2) {
+        varinfo_t*info = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);

 
 

-    /* slot name */
-    multiname_t mname = {QNAME, &ns, 0, (yyvsp[(1) - (3)].id)};
-  
-    trait_list_t**traits;
-    code_t**code;
-    if(!state->cls) {
-        // global variable
-        ns.name = state->package;
-        traits = &global->init->traits;
-        code = &global->init->method->body->code;
-    } else if(flags&FLAG_STATIC) {
-        // static variable
-        traits = &state->cls->abc->static_traits;
-        code = &state->cls->static_init->header;
-    } else {
-        // instance variable
-        traits = &state->cls->abc->traits;
-        code = &state->cls->init->header;
-    }
-    
-    trait_t*t=0;
-    if((yyvsp[(2) - (3)].classinfo)) {
-        MULTINAME(m, (yyvsp[(2) - (3)].classinfo));
-        t = trait_new_member(traits, multiname_clone(&m), multiname_clone(&mname), 0);
-    } else {
-        t = trait_new_member(traits, 0, multiname_clone(&mname), 0);
-    }
-    info->slot = t->slot_id;
-    
-    /* initalization code (if needed) */
-    code_t*c = 0;
-    if((yyvsp[(3) - (3)].value).c && !is_pushundefined((yyvsp[(3) - (3)].value).c)) {
-        c = abc_getlocal_0(c);
-        c = code_append(c, (yyvsp[(3) - (3)].value).c);
-        c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo));
-        c = abc_setslot(c, t->slot_id);
-    }
+        multiname_t mname;
+        code_t**code;
+        trait_t*t = add_abc_slot(slotstate_flags, (yyvsp[(1) - (3)].id), &mname, &code);

 
 

-    *code = code_append(*code, c);
+        if((yyvsp[(2) - (3)].classinfo)) {
+            MULTINAME(m, (yyvsp[(2) - (3)].classinfo));
+            t->type_name = multiname_clone(&m);
+        }
+        info->slot = t->slot_id;
+        
+        /* workaround for "VerifyError: Error #1053: Illegal override of ::test2 in C1" 
+           FIXME: is there a way to use slots and still don't have conflicting overrides?
+        */
+        info->slot = t->slot_id = 0;
+       
+        constant_t cval = (yyvsp[(3) - (3)].node)->type->eval((yyvsp[(3) - (3)].node));
+        if(cval.type!=CONSTANT_UNKNOWN) {
+            /* compile time constant */
+            t->value = malloc(sizeof(constant_t));
+            memcpy(t->value, &cval, sizeof(constant_t));
+            info->value = constant_clone(t->value);
+        } else {
+            typedcode_t v = node_read((yyvsp[(3) - (3)].node));
+            /* initalization code (if needed) */
+            code_t*c = 0;
+            if(v.c && !is_pushundefined(v.c)) {
+                c = abc_getlocal_0(c);
+                c = code_append(c, v.c);
+                c = converttype(c, v.t, (yyvsp[(2) - (3)].classinfo));
+                if(!t->slot_id) {
+                    c = abc_initproperty2(c, &mname);
+                } else {
+                    c = abc_setslot(c, t->slot_id);
+                }
+            }
+            *code = code_append(*code, c);
+        }

 
 

-    if(slotstate_varconst==KW_CONST) {
-        t->kind= TRAIT_CONST;
+        if(slotstate_varconst==KW_CONST) {
+            t->kind= TRAIT_CONST;
+            info->flags |= FLAG_CONST;
+        }

     }
 
     (yyval.code)=0;
     }
 
     (yyval.code)=0;

@@ -5823,229 +6339,601 @@ PASS2
 
 
   
 
 
   

-    case 165:
+    case 172:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2698 "parser.y"
+#line 2818 "parser.y"

     {(yyval.constant)=0;}
     }
     break;
 
 
   
     {(yyval.constant)=0;}
     }
     break;
 
 
   

-    case 166:
-    if(as3_pass==2) {
-
-/* Line 1464 of skeleton.m4  */
-#line 2699 "parser.y"
-    {(yyval.constant)=(yyvsp[(2) - (2)].constant);}
-    }
-    break;
-
-
-  
-    case 167:
+    case 173:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2701 "parser.y"
-    {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));}
+#line 2819 "parser.y"
+    {
+  (yyval.constant) = malloc(sizeof(constant_t));
+  *(yyval.constant) = node_eval((yyvsp[(2) - (2)].node));
+  if((yyval.constant)->type == CONSTANT_UNKNOWN) {
+    syntaxerror("can't evaluate default parameter value (needs to be a compile-time constant)");
+  }
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 168:
+    case 174:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2702 "parser.y"
+#line 2828 "parser.y"

     {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));}
     }
     break;
 
 
   
     {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));}
     }
     break;
 
 
   

-    case 169:
+    case 175:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2703 "parser.y"
-    {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));}
+#line 2829 "parser.y"
+    {
+    (yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 170:
+    case 176:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2704 "parser.y"
+#line 2832 "parser.y"

     {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));}
     }
     break;
 
 
   
     {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));}
     }
     break;
 
 
   

-    case 171:
+    case 177:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2705 "parser.y"
+#line 2833 "parser.y"

     {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);}
     }
     break;
 
 
   
     {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);}
     }
     break;
 
 
   

-    case 172:
+    case 178:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2707 "parser.y"
+#line 2834 "parser.y"

     {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
     {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   

-    case 173:
+    case 179:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2708 "parser.y"
+#line 2835 "parser.y"

     {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
     {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   

-    case 174:
+    case 180:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2709 "parser.y"
+#line 2836 "parser.y"

     {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
     {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   

-    case 175:
+    case 181:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2710 "parser.y"
-    {
-    if(!strcmp((yyvsp[(1) - (1)].id), "NaN")) {
-        (yyval.constant) = constant_new_float(__builtin_nan(""));
-    } else {
-        as3_warning("Couldn't evaluate constant value of %s", (yyvsp[(1) - (1)].id));
-        (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id));
-    }
-}
+#line 2837 "parser.y"
+    {(yyval.constant) = constant_new_undefined((yyvsp[(1) - (1)].token));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 176:
+    case 182:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2722 "parser.y"
-    {
-    PASS12
-    memset(&(yyval.params),0,sizeof((yyval.params)));
-}
+#line 2838 "parser.y"
+    {(yyval.constant) = constant_new_float(__builtin_nan(""));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 177:
+    case 183:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2726 "parser.y"
+#line 2851 "parser.y"

     {
     {

-    PASS12
-    (yyval.params)=(yyvsp[(1) - (1)].params);
+   multiname_t m = {QNAME, &stdns, 0, "XML"};
+   typedcode_t v;
+   v.c = 0;
+   v.c = abc_getlex2(v.c, &m);
+   v.c = code_append(v.c, node_read((yyvsp[(1) - (1)].node)).c);
+   v.c = abc_construct(v.c, 1);
+   v.t = TYPE_XML;
+   (yyval.node) = mkcodenode(v);

 }
     }
     break;
 
 
   
 }
     }
     break;
 
 
   

-    case 178:
+    case 184:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2732 "parser.y"
-    {
-    PASS12
-    memset(&(yyval.params),0,sizeof((yyval.params)));
-    (yyval.params).varargs=1;
-    list_append((yyval.params).list, (yyvsp[(2) - (2)].param));
-}
+#line 2862 "parser.y"
+    {PASS_ALWAYS if(!xml_level++) tokenizer_begin_xml();}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 179:
+    case 185:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2738 "parser.y"
-    {
-    PASS12
-    (yyval.params) =(yyvsp[(1) - (4)].params);
-    (yyval.params).varargs=1;
-    list_append((yyval.params).list, (yyvsp[(4) - (4)].param));
-}
+#line 2863 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xmltext();}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 180:
+    case 186:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2746 "parser.y"
-    {
-    PASS12
-    (yyval.params) = (yyvsp[(1) - (3)].params);
-    list_append((yyval.params).list, (yyvsp[(3) - (3)].param));
-}
+#line 2864 "parser.y"
+    {PASS_ALWAYS if(!--xml_level) tokenizer_end_xml(); else tokenizer_begin_xmltext();}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 181:
+    case 187:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2751 "parser.y"
-    {
-    PASS12
-    memset(&(yyval.params),0,sizeof((yyval.params)));
-    list_append((yyval.params).list, (yyvsp[(1) - (1)].param));
-}
+#line 2866 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xmltext();}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 182:
+    case 188:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2866 "parser.y"
+    {
+    (yyval.node) = (yyvsp[(2) - (4)].node);
+}
+    }
+    break;
+
+
+  
+    case 189:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2869 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xml();}
+    }
+    break;
+
+
+  
+    case 190:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2869 "parser.y"
+    {
+    (yyval.node) = (yyvsp[(2) - (4)].node);
+}
+    }
+    break;
+
+
+  
+    case 191:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2872 "parser.y"
+    {(yyval.node)=mkstringnode("");}
+    }
+    break;
+
+
+  
+    case 192:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2873 "parser.y"
+    {
+    (yyval.node) = mkaddnode((yyvsp[(1) - (2)].node),(yyvsp[(2) - (2)].node));
+}
+    }
+    break;
+
+
+  
+    case 193:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2876 "parser.y"
+    {
+    char* str = string_cstr(&(yyvsp[(2) - (2)].str));
+    (yyval.node) = mkaddnode((yyvsp[(1) - (2)].node),mkstringnode(str));
+    free(str);
+}
+    }
+    break;
+
+
+  
+    case 194:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2881 "parser.y"
+    {
+    (yyval.node) = mkaddnode((yyvsp[(1) - (2)].node), mkstringnode(">"));
+}
+    }
+    break;
+
+
+  
+    case 195:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2884 "parser.y"
+    {
+    (yyval.node) = mkaddnode((yyvsp[(1) - (2)].node),(yyvsp[(2) - (2)].node));
+}
+    }
+    break;
+
+
+  
+    case 196:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2887 "parser.y"
+    {
+    (yyval.node) = mkaddnode((yyvsp[(1) - (3)].node), mkaddnode((yyvsp[(2) - (3)].node),(yyvsp[(3) - (3)].node)));
+}
+    }
+    break;
+
+
+  
+    case 197:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2890 "parser.y"
+    {
+    (yyval.node) = mkstringnode((yyvsp[(1) - (1)].id));
+}
+    }
+    break;
+
+
+  
+    case 198:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2893 "parser.y"
+    {
+    (yyval.node) = (yyvsp[(1) - (1)].node);
+}
+    }
+    break;
+
+
+  
+    case 199:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2897 "parser.y"
+    {
+    (yyval.node) = mkstringnode("");
+}
+    }
+    break;
+
+
+  
+    case 200:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2900 "parser.y"
+    {
+    (yyval.node) = mkaddnode(mkstringnode(" "),(yyvsp[(1) - (1)].node));
+}
+    }
+    break;
+
+
+  
+    case 201:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2904 "parser.y"
+    {
+    //$$ = allocprintf("<%s%s/>", $2, $3, $5, $8);
+    (yyval.node) = mkaddnode(mkaddnode(mkaddnode(mkstringnode("<"),(yyvsp[(2) - (6)].node)),(yyvsp[(3) - (6)].node)),mkstringnode("/>"));
+}
+    }
+    break;
+
+
+  
+    case 202:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2908 "parser.y"
+    {
+    //$$ = allocprintf("<%s%s>%s</%s>", $2, $3, $5, $8);
+    (yyval.node) = mkaddnode(mkaddnode(mkaddnode(mkaddnode(mkaddnode(mkaddnode(mkaddnode(
+         mkstringnode("<"),(yyvsp[(2) - (10)].node)),(yyvsp[(3) - (10)].node)),mkstringnode(">")),(yyvsp[(5) - (10)].node)),mkstringnode("</")),(yyvsp[(8) - (10)].node)),mkstringnode(">"));
+}
+    }
+    break;
+
+
+  
+    case 203:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2913 "parser.y"
+    {
+    //$$ = allocprintf("<%s%s>%s%s</%s>", $2, $3, $5, $6, $9);
+    (yyval.node) = mkaddnode(mkaddnode(mkaddnode(mkaddnode(mkaddnode(mkaddnode(mkaddnode(mkaddnode(
+         mkstringnode("<"),(yyvsp[(2) - (11)].node)),(yyvsp[(3) - (11)].node)),mkstringnode(">")),(yyvsp[(5) - (11)].node)),(yyvsp[(6) - (11)].node)),mkstringnode("</")),(yyvsp[(9) - (11)].node)),mkstringnode(">"));
+}
+    }
+    break;
+
+
+  
+    case 204:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2757 "parser.y"
+#line 2919 "parser.y"
+    {
+    (yyval.node) = (yyvsp[(1) - (1)].node);
+}
+    }
+    break;
+
+
+  
+    case 205:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2922 "parser.y"
+    {
+    (yyval.node) = mkaddnode((yyvsp[(1) - (2)].node), mkaddnode(mkstringnode(" "),(yyvsp[(2) - (2)].node)));
+}
+    }
+    break;
+
+
+  
+    case 206:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2925 "parser.y"
+    {
+    (yyval.node) = (yyvsp[(1) - (1)].node);
+}
+    }
+    break;
+
+
+  
+    case 207:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2928 "parser.y"
+    {
+    char* str = string_cstr(&(yyvsp[(3) - (3)].str));
+    (yyval.node) = mkaddnode((yyvsp[(1) - (3)].node), mkstringnode(concat2("=",str)));
+    free(str);
+}
+    }
+    break;
+
+
+  
+    case 208:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2933 "parser.y"
+    {
+    (yyval.node) = mkaddnode((yyvsp[(1) - (3)].node), mkaddnode(mkstringnode("=\""), mkaddnode((yyvsp[(3) - (3)].node), mkstringnode("\""))));
+}
+    }
+    break;
+
+
+  
+    case 209:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2936 "parser.y"
+    {
+    (yyval.node) = mkaddnode(mkaddnode(mkstringnode(concat2((yyvsp[(1) - (3)].id),"=\"")), (yyvsp[(3) - (3)].node)), mkstringnode("\""));
+}
+    }
+    break;
+
+
+  
+    case 210:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2939 "parser.y"
+    {
+    char* str = string_cstr(&(yyvsp[(3) - (3)].str));
+    (yyval.node)=mkstringnode(allocprintf("%s=%s", (yyvsp[(1) - (3)].id),str));
+    free(str);
+    free((yyvsp[(1) - (3)].id));free((char*)(yyvsp[(3) - (3)].str).str);
+}
+    }
+    break;
+
+
+  
+    case 211:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2949 "parser.y"
+    {
+    PASS12
+    memset(&(yyval.params),0,sizeof((yyval.params)));
+}
+    }
+    break;
+
+
+  
+    case 212:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2953 "parser.y"
+    {
+    PASS12
+    (yyval.params)=(yyvsp[(1) - (1)].params);
+}
+    }
+    break;
+
+
+  
+    case 213:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2959 "parser.y"
+    {
+    PASS12
+    memset(&(yyval.params),0,sizeof((yyval.params)));
+    (yyval.params).varargs=1;
+    list_append((yyval.params).list, (yyvsp[(2) - (2)].param));
+}
+    }
+    break;
+
+
+  
+    case 214:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2965 "parser.y"
+    {
+    PASS12
+    (yyval.params) =(yyvsp[(1) - (4)].params);
+    (yyval.params).varargs=1;
+    list_append((yyval.params).list, (yyvsp[(4) - (4)].param));
+}
+    }
+    break;
+
+
+  
+    case 215:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2973 "parser.y"
+    {
+    PASS12
+    (yyval.params) = (yyvsp[(1) - (3)].params);
+    list_append((yyval.params).list, (yyvsp[(3) - (3)].param));
+}
+    }
+    break;
+
+
+  
+    case 216:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2978 "parser.y"
+    {
+    PASS12
+    memset(&(yyval.params),0,sizeof((yyval.params)));
+    list_append((yyval.params).list, (yyvsp[(1) - (1)].param));
+}
+    }
+    break;
+
+
+  
+    case 217:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2984 "parser.y"

     {
      PASS12
      (yyval.param) = rfx_calloc(sizeof(param_t));
     {
      PASS12
      (yyval.param) = rfx_calloc(sizeof(param_t));

@@ -6059,11 +6947,11 @@ PASS2
 
 
   
 
 
   

-    case 183:
+    case 218:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2765 "parser.y"
+#line 2992 "parser.y"

     {
      PASS12
      (yyval.param) = rfx_calloc(sizeof(param_t));
     {
      PASS12
      (yyval.param) = rfx_calloc(sizeof(param_t));

@@ -6077,33 +6965,33 @@ PASS2
 
 
   
 
 
   

-    case 186:
+    case 221:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2775 "parser.y"
+#line 3002 "parser.y"

     {PASS12 (yyval.token)=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.token)=0;}
     }
     break;
 
 
   

-    case 187:
+    case 222:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2778 "parser.y"
+#line 3005 "parser.y"

     {PASS12 startfunction(&(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));}
     }
     break;
 
 
   
     {PASS12 startfunction(&(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));}
     }
     break;
 
 
   

-    case 188:
+    case 223:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2779 "parser.y"
+#line 3006 "parser.y"

     {
     PASS1 
     endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0);
     {
     PASS1 
     endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0);

@@ -6123,33 +7011,33 @@ PASS2
 
 
   
 
 
   

-    case 190:
+    case 225:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2795 "parser.y"
+#line 3022 "parser.y"

     {PASS12 (yyval.id)=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.id)=0;}
     }
     break;
 
 
   

-    case 191:
+    case 226:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2797 "parser.y"
+#line 3024 "parser.y"

     {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));}
     }
     break;
 
 
   
     {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));}
     }
     break;
 
 
   

-    case 192:
+    case 227:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2798 "parser.y"
+#line 3025 "parser.y"

     {
     PASS1
     endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0);
     {
     PASS1
     endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0);

@@ -6173,21 +7061,24 @@ PASS2
 
 
   
 
 
   

-    case 193:
+    case 228:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2820 "parser.y"
+#line 3047 "parser.y"

     {
     {

-    PASS1 static classinfo_t c;
-          memset(&c, 0, sizeof(c));
-          c.kind = INFOTYPE_CLASS;
-          c.subtype = 255;
-          c.name = (yyvsp[(1) - (1)].id);
-          (yyval.classinfo) = &c;
-   
-          /* let the compiler know that we might be looking for this soon */
-          as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id));
+    PASS1 NEW(unresolvedinfo_t,c);
+          memset(c, 0, sizeof(*c));
+          c->kind = INFOTYPE_UNRESOLVED;
+          c->name = (yyvsp[(1) - (1)].id);
+          c->package = get_package_from_name((yyvsp[(1) - (1)].id));
+          if(!c->package) {
+              c->nsset = get_current_imports();
+              /* make the compiler look for this class in the current directory,
+                 just in case: */
+              as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id));
+          }
+          (yyval.classinfo) = (classinfo_t*)c;

     PASS2
     slotinfo_t*s = find_class((yyvsp[(1) - (1)].id));
     if(!s) syntaxerror("Could not find class/method %s (current package: %s)\n", (yyvsp[(1) - (1)].id), state->package);
     PASS2
     slotinfo_t*s = find_class((yyvsp[(1) - (1)].id));
     if(!s) syntaxerror("Could not find class/method %s (current package: %s)\n", (yyvsp[(1) - (1)].id), state->package);

@@ -6198,19 +7089,18 @@ PASS2
 
 
   
 
 
   

-    case 194:
+    case 229:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2836 "parser.y"
+#line 3066 "parser.y"

     {
     {

-    PASS1 static classinfo_t c;
-          memset(&c, 0, sizeof(c));
-          c.kind = INFOTYPE_CLASS;
-          c.subtype = 255;
-          c.package = (yyvsp[(1) - (3)].id);
-          c.name = (yyvsp[(3) - (3)].id);
-          (yyval.classinfo) = &c;
+    PASS1 NEW(unresolvedinfo_t,c);
+          memset(c, 0, sizeof(*c));
+          c->kind = INFOTYPE_UNRESOLVED;
+          c->package = (yyvsp[(1) - (3)].id);
+          c->name = (yyvsp[(3) - (3)].id);
+          (yyval.classinfo) = (classinfo_t*)c;

     PASS2
     slotinfo_t*s = registry_find((yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id));
     if(!s) syntaxerror("Couldn't find class/method %s.%s\n", (yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id));
     PASS2
     slotinfo_t*s = registry_find((yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id));
     if(!s) syntaxerror("Couldn't find class/method %s.%s\n", (yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id));

@@ -6222,122 +7112,122 @@ PASS2
 
 
   
 
 
   

-    case 197:
+    case 232:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2854 "parser.y"
+#line 3083 "parser.y"

     {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));}
     }
     break;
 
 
   
     {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));}
     }
     break;
 
 
   

-    case 198:
+    case 233:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2855 "parser.y"
+#line 3084 "parser.y"

     {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));}
     }
     break;
 
 
   
     {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));}
     }
     break;
 
 
   

-    case 199:
+    case 234:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2857 "parser.y"
+#line 3086 "parser.y"

     {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);}
     }
     break;
 
 
   
     {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);}
     }
     break;
 
 
   

-    case 200:
+    case 235:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2858 "parser.y"
-    {PASS12 (yyval.classinfo)=registry_getanytype();}
+#line 3087 "parser.y"
+    {PASS12 (yyval.classinfo)=TYPE_ANY;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 201:
+    case 236:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2859 "parser.y"
-    {PASS12 (yyval.classinfo)=registry_getanytype();}
+#line 3088 "parser.y"
+    {PASS12 (yyval.classinfo)=TYPE_VOID;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 202:
+    case 237:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2868 "parser.y"
+#line 3097 "parser.y"

     {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
     }
     break;
 
 
   
     {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
     }
     break;
 
 
   

-    case 203:
+    case 238:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2869 "parser.y"
+#line 3098 "parser.y"

     {PASS12 (yyval.classinfo)=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.classinfo)=0;}
     }
     break;
 
 
   

-    case 204:
+    case 239:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2873 "parser.y"
-    {(yyval.value_list).cc=0;(yyval.value_list).len=0;}
+#line 3102 "parser.y"
+    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 205:
+    case 240:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2874 "parser.y"
+#line 3103 "parser.y"

     {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);}
     }
     break;
 
 
   
     {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);}
     }
     break;
 
 
   

-    case 206:
+    case 241:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2876 "parser.y"
-    {(yyval.value_list).cc=0;(yyval.value_list).len=0;}
+#line 3105 "parser.y"
+    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 209:
+    case 244:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2880 "parser.y"
-    {(yyval.value_list).len=1;
+#line 3109 "parser.y"
+    {(yyval.value_list).number=1;

                                                   (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c;
                                                  }
     }
                                                   (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c;
                                                  }
     }

@@ -6345,24 +7235,24 @@ PASS2
 
 
   
 
 
   

-    case 210:
+    case 245:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2884 "parser.y"
+#line 3113 "parser.y"

     {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);}
     }
     break;
 
 
   
     {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);}
     }
     break;
 
 
   

-    case 211:
+    case 246:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2885 "parser.y"
+#line 3114 "parser.y"

     {
     {

-                                                  (yyval.value_list).len= (yyvsp[(1) - (2)].value_list).len+1;
+                                                  (yyval.value_list).number= (yyvsp[(1) - (2)].value_list).number+1;

                                                   (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c);
                                                   }
     }
                                                   (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c);
                                                   }
     }

@@ -6370,13 +7260,14 @@ PASS2
 
 
   
 
 
   

-    case 213:
+    case 248:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2891 "parser.y"
+#line 3120 "parser.y"

     {
     {

-    (yyval.value).c = (yyvsp[(2) - (4)].value).c;
+    typedcode_t v = node_read((yyvsp[(2) - (4)].node));
+    (yyval.value).c = v.c;

     if((yyval.value).c->opcode == OPCODE_COERCE_A) (yyval.value).c = code_cutlast((yyval.value).c);
     
     code_t*paramcode = (yyvsp[(4) - (4)].value_list).cc;
     if((yyval.value).c->opcode == OPCODE_COERCE_A) (yyval.value).c = code_cutlast((yyval.value).c);
     
     code_t*paramcode = (yyvsp[(4) - (4)].value_list).cc;

@@ -6384,23 +7275,33 @@ PASS2
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);

-        (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).len);
+        (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).number);

         multiname_destroy(name);
         multiname_destroy(name);

-    } else if((yyval.value).c->opcode == OPCODE_GETSLOT) {
-        int slot = (int)(ptroff_t)(yyval.value).c->data[0];
+    } else if(is_getlocal((yyval.value).c)) {
+        (yyval.value).c = code_append((yyval.value).c, paramcode);
+        (yyval.value).c = abc_construct((yyval.value).c, (yyvsp[(4) - (4)].value_list).number);
+    } else if(TYPE_IS_CLASS(v.t) && v.t->data) {
+        code_free((yyval.value).c);
+        classinfo_t*c = v.t->data;
+        MULTINAME(m, c);
+        (yyval.value).c = abc_findpropstrict2(0, &m);
+        (yyval.value).c = code_append((yyval.value).c, paramcode);
+        (yyval.value).c = abc_constructprop2((yyval.value).c, &m, (yyvsp[(4) - (4)].value_list).number);
+    /*} else if($$.c->opcode == OPCODE_GETSLOT) {
+        int slot = (int)(ptroff_t)$$.c->data[0];

         trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);//FIXME
         multiname_t*name = t->name;
         trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);//FIXME
         multiname_t*name = t->name;

-        (yyval.value).c = code_cutlast((yyval.value).c);
-        (yyval.value).c = code_append((yyval.value).c, paramcode);
-        (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).len);
+        $$.c = code_cutlast($$.c);
+        $$.c = code_append($$.c, paramcode);
+        $$.c = abc_constructprop2($$.c, name, $4.number);*/

     } else {
         (yyval.value).c = code_append((yyval.value).c, paramcode);
     } else {
         (yyval.value).c = code_append((yyval.value).c, paramcode);

-        (yyval.value).c = abc_construct((yyval.value).c, (yyvsp[(4) - (4)].value_list).len);
+        (yyval.value).c = abc_construct((yyval.value).c, (yyvsp[(4) - (4)].value_list).number);

     }
    
     (yyval.value).t = TYPE_ANY;
     }
    
     (yyval.value).t = TYPE_ANY;

-    if(TYPE_IS_CLASS((yyvsp[(2) - (4)].value).t) && (yyvsp[(2) - (4)].value).t->data) {
-        (yyval.value).t = (yyvsp[(2) - (4)].value).t->data;
+    if(TYPE_IS_CLASS(v.t) && v.t->data) {
+        (yyval.value).t = v.t->data;

     } else {
         (yyval.value).c = abc_coerce_a((yyval.value).c);
         (yyval.value).t = TYPE_ANY;
     } else {
         (yyval.value).c = abc_coerce_a((yyval.value).c);
         (yyval.value).t = TYPE_ANY;

@@ -6411,14 +7312,15 @@ PASS2
 
 
   
 
 
   

-    case 214:
+    case 249:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2927 "parser.y"
+#line 3167 "parser.y"

     {
     {

-    
-    (yyval.value).c = (yyvsp[(1) - (4)].value).c;
+   
+    typedcode_t v = node_read((yyvsp[(1) - (4)].node));
+    (yyval.value).c = v.c;

     if((yyval.value).c->opcode == OPCODE_COERCE_A) {
         (yyval.value).c = code_cutlast((yyval.value).c);
     }
     if((yyval.value).c->opcode == OPCODE_COERCE_A) {
         (yyval.value).c = code_cutlast((yyval.value).c);
     }

@@ -6429,36 +7331,39 @@ PASS2
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);

-        (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len);
+        (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number);

         multiname_destroy(name);
         multiname_destroy(name);

-    } else if((yyval.value).c->opcode == OPCODE_GETSLOT && (yyval.value).c->prev->opcode != OPCODE_GETSCOPEOBJECT) {
-        int slot = (int)(ptroff_t)(yyval.value).c->data[0];
+/*    } else if($$.c->opcode == OPCODE_GETSLOT && $$.c->prev->opcode != OPCODE_GETSCOPEOBJECT) {
+        int slot = (int)(ptroff_t)$$.c->data[0];

         trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);
         if(t->kind!=TRAIT_METHOD) {
             //ok: flash allows to assign closures to members.
         }
         multiname_t*name = t->name;
         trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);
         if(t->kind!=TRAIT_METHOD) {
             //ok: flash allows to assign closures to members.
         }
         multiname_t*name = t->name;

-        (yyval.value).c = code_cutlast((yyval.value).c);
-        (yyval.value).c = code_append((yyval.value).c, paramcode);
+        $$.c = code_cutlast($$.c);
+        $$.c = code_append($$.c, paramcode);

         //$$.c = abc_callmethod($$.c, t->method, len); //#1051 illegal early access binding
         //$$.c = abc_callmethod($$.c, t->method, len); //#1051 illegal early access binding

-        (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len);
+        $$.c = abc_callproperty2($$.c, name, $3.number);*/

     } else if((yyval.value).c->opcode == OPCODE_GETSUPER) {
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);
     } else if((yyval.value).c->opcode == OPCODE_GETSUPER) {
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);

-        (yyval.value).c = abc_callsuper2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len);
+        (yyval.value).c = abc_callsuper2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number);

         multiname_destroy(name);
     } else {
         (yyval.value).c = abc_getglobalscope((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);
         multiname_destroy(name);
     } else {
         (yyval.value).c = abc_getglobalscope((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);

-        (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).len);
+        (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).number);

     }
    
     }
    

-    if(TYPE_IS_FUNCTION((yyvsp[(1) - (4)].value).t) && (yyvsp[(1) - (4)].value).t->data) {
-        (yyval.value).t = ((methodinfo_t*)((yyvsp[(1) - (4)].value).t->data))->return_type;
+    if(TYPE_IS_FUNCTION(v.t) && v.t->data) {
+        (yyval.value).t = ((methodinfo_t*)(v.t->data))->return_type;
+    } else if(TYPE_IS_CLASS(v.t) && v.t->data) {
+        // calling a class is like a typecast
+        (yyval.value).t = (classinfo_t*)v.t->data;

     } else {
     } else {

-        (yyval.value).c = abc_coerce_a((yyval.value).c);

         (yyval.value).t = TYPE_ANY;
         (yyval.value).t = TYPE_ANY;

+        (yyval.value).c = abc_coerce_a((yyval.value).c);

     }
 }
     }
     }
 }
     }

@@ -6466,11 +7371,11 @@ PASS2
 
 
   
 
 
   

-    case 215:
+    case 250:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2973 "parser.y"
+#line 3217 "parser.y"

     {
     if(!state->cls) syntaxerror("super() not allowed outside of a class");
     if(!state->method) syntaxerror("super() not allowed outside of a function");
     {
     if(!state->cls) syntaxerror("super() not allowed outside of a class");
     if(!state->method) syntaxerror("super() not allowed outside of a function");

@@ -6487,7 +7392,7 @@ PASS2
     */
     state->method->has_super = 1;
 
     */
     state->method->has_super = 1;
 

-    (yyval.value).c = abc_constructsuper((yyval.value).c, (yyvsp[(3) - (4)].value_list).len);
+    (yyval.value).c = abc_constructsuper((yyval.value).c, (yyvsp[(3) - (4)].value_list).number);

     (yyval.value).c = abc_pushundefined((yyval.value).c);
     (yyval.value).t = TYPE_ANY;
 }
     (yyval.value).c = abc_pushundefined((yyval.value).c);
     (yyval.value).t = TYPE_ANY;
 }

@@ -6496,13 +7401,14 @@ PASS2
 
 
   
 
 
   

-    case 216:
+    case 251:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2994 "parser.y"
+#line 3238 "parser.y"

     {
     {

-    (yyval.value).c = (yyvsp[(2) - (2)].value).c;
+    typedcode_t v = node_read((yyvsp[(2) - (2)].node));
+    (yyval.value).c = v.c;

     if((yyval.value).c->opcode == OPCODE_COERCE_A) {
         (yyval.value).c = code_cutlast((yyval.value).c);
     }
     if((yyval.value).c->opcode == OPCODE_COERCE_A) {
         (yyval.value).c = code_cutlast((yyval.value).c);
     }

@@ -6516,7 +7422,7 @@ PASS2
         (yyval.value).c = abc_deleteproperty2((yyval.value).c, name);
     } else {
         (yyval.value).c = abc_getlocal_0((yyval.value).c);
         (yyval.value).c = abc_deleteproperty2((yyval.value).c, name);
     } else {
         (yyval.value).c = abc_getlocal_0((yyval.value).c);

-        MULTINAME_LATE(m, (yyvsp[(2) - (2)].value).t?(yyvsp[(2) - (2)].value).t->access:ACCESS_PACKAGE, "");
+        MULTINAME_LATE(m, v.t?v.t->access:ACCESS_PACKAGE, "");

         (yyval.value).c = abc_deleteproperty2((yyval.value).c, &m);
     }
     (yyval.value).t = TYPE_BOOLEAN;
         (yyval.value).c = abc_deleteproperty2((yyval.value).c, &m);
     }
     (yyval.value).t = TYPE_BOOLEAN;

@@ -6526,11 +7432,11 @@ PASS2
 
 
   
 
 
   

-    case 217:
+    case 252:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3015 "parser.y"
+#line 3260 "parser.y"

     {
     (yyval.code) = abc_returnvoid(0);
 }
     {
     (yyval.code) = abc_returnvoid(0);
 }

@@ -6539,11 +7445,11 @@ PASS2
 
 
   
 
 
   

-    case 218:
+    case 253:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3018 "parser.y"
+#line 3263 "parser.y"

     {
     (yyval.code) = (yyvsp[(2) - (2)].value).c;
     (yyval.code) = abc_returnvalue((yyval.code));
     {
     (yyval.code) = (yyvsp[(2) - (2)].value).c;
     (yyval.code) = abc_returnvalue((yyval.code));

@@ -6553,1295 +7459,1250 @@ PASS2
 
 
   
 
 
   

-    case 219:
+    case 254:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3025 "parser.y"
-    {(yyval.value)=(yyvsp[(1) - (1)].value);}
+#line 3270 "parser.y"
+    {
+    (yyval.value) = node_read((yyvsp[(1) - (1)].node));
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 220:
+    case 255:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3026 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3273 "parser.y"
+    {
+    (yyval.value) = node_read((yyvsp[(1) - (1)].node));
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 221:
+    case 256:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3027 "parser.y"
+#line 3276 "parser.y"

     {
     {

-    (yyval.value).c = (yyvsp[(1) - (3)].value).c;
-    (yyval.value).c = cut_last_push((yyval.value).c);
-    (yyval.value).c = code_append((yyval.value).c,(yyvsp[(3) - (3)].value).c);
-    (yyval.value).t = (yyvsp[(3) - (3)].value).t;
+    (yyval.node) = mkmultinode(&node_comma, (yyvsp[(1) - (1)].node));

 }
     }
     break;
 
 
   
 }
     }
     break;
 
 
   

-    case 222:
+    case 257:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3033 "parser.y"
+#line 3279 "parser.y"

     {
     {

-    (yyval.code)=cut_last_push((yyvsp[(1) - (1)].value).c);
+    (yyval.node) = multinode_extend((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));

 }
     }
     break;
 
 
   
 }
     }
     break;
 
 
   

-    case 223:
+    case 258:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3039 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3282 "parser.y"
+    { 
+    (yyval.code) = node_exec((yyvsp[(1) - (1)].node)); 
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 225:
+    case 259:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3043 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3285 "parser.y"
+    { 
+    (yyval.code) = (yyvsp[(1) - (3)].code);
+    (yyval.code) = code_append((yyval.code), node_exec((yyvsp[(3) - (3)].node))); 
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 226:
+    case 260:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3045 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3290 "parser.y"
+    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 227:
+    case 261:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3047 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3291 "parser.y"
+    {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 229:
+    case 262:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3293 "parser.y"
+    {(yyval.code)=abc_pushstring(0,(yyvsp[(1) - (1)].id));}
+    }
+    break;
+
+
+  
+    case 263:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3294 "parser.y"
+    {(yyval.code)=abc_pushstring2(0,&(yyvsp[(1) - (1)].str));}
+    }
+    break;
+
+
+  
+    case 264:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3295 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}
+    }
+    break;
+
+
+  
+    case 265:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3296 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}
+    }
+    break;
+
+
+  
+    case 266:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3297 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}
+    }
+    break;
+
+
+  
+    case 267:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3051 "parser.y"
+#line 3299 "parser.y"

     {
     {

-    (yyval.value).c = 0;
-    namespace_t ns = {ACCESS_PACKAGE, ""};
-    multiname_t m = {QNAME, &ns, 0, "RegExp"};
-    if(!(yyvsp[(1) - (1)].regexp).options) {
-        (yyval.value).c = abc_getlex2((yyval.value).c, &m);
-        (yyval.value).c = abc_pushstring((yyval.value).c, (yyvsp[(1) - (1)].regexp).pattern);
-        (yyval.value).c = abc_construct((yyval.value).c, 1);
-    } else {
-        (yyval.value).c = abc_getlex2((yyval.value).c, &m);
-        (yyval.value).c = abc_pushstring((yyval.value).c, (yyvsp[(1) - (1)].regexp).pattern);
-        (yyval.value).c = abc_pushstring((yyval.value).c, (yyvsp[(1) - (1)].regexp).options);
-        (yyval.value).c = abc_construct((yyval.value).c, 2);
+    (yyval.value_list).cc = 0;
+    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].code));
+    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (3)].value).c);
+    (yyval.value_list).number = 2;
+}

     }
     }

-    (yyval.value).t = TYPE_REGEXP;
+    break;
+
+
+  
+    case 268:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3305 "parser.y"
+    {
+    (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc;
+    (yyval.value_list).number = (yyvsp[(1) - (5)].value_list).number+2;
+    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (5)].code));
+    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(5) - (5)].value).c);

 }
     }
     break;
 
 
   
 }
     }
     break;
 
 
   

-    case 230:
+    case 269:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3068 "parser.y"
-    {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint));
-                   //MULTINAME(m, registry_getintclass());
-                   //$$.c = abc_coerce2($$.c, &m); // FIXME
-                   (yyval.value).t = TYPE_INT;
-                  }
+#line 3314 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 231:
+    case 270:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3073 "parser.y"
-    {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint));
-                    (yyval.value).t = TYPE_INT;
-                   }
+#line 3315 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 232:
+    case 271:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3076 "parser.y"
-    {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int));
-                  (yyval.value).t = TYPE_INT;
-                 }
+#line 3316 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 233:
+    case 272:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3079 "parser.y"
-    {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint));
-                   (yyval.value).t = TYPE_UINT;
-                  }
+#line 3317 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 234:
+    case 273:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3082 "parser.y"
-    {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float));
-                    (yyval.value).t = TYPE_FLOAT;
-                   }
+#line 3318 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 235:
+    case 274:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3085 "parser.y"
-    {(yyval.value).c = abc_pushstring2(0, &(yyvsp[(1) - (1)].str));free((char*)(yyvsp[(1) - (1)].str).str);
-                     (yyval.value).t = TYPE_STRING;
-                    }
+#line 3319 "parser.y"
+    {(yyval.node) = (yyvsp[(1) - (1)].node);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 236:
+    case 275:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3088 "parser.y"
-    {(yyval.value).c = abc_pushundefined(0);
-                    (yyval.value).t = TYPE_ANY;
-                   }
+#line 3321 "parser.y"
+    { 
+    (yyval.node) = mkconstnode((yyvsp[(1) - (1)].constant));
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 237:
+    case 276:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3091 "parser.y"
-    {(yyval.value).c = abc_pushtrue(0);
-                    (yyval.value).t = TYPE_BOOLEAN;
-                   }
+#line 3325 "parser.y"
+    {
+    (yyval.node) = (yyvsp[(1) - (1)].node);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 238:
+    case 277:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3094 "parser.y"
-    {(yyval.value).c = abc_pushfalse(0);
-                     (yyval.value).t = TYPE_BOOLEAN;
-                    }
+#line 3330 "parser.y"
+    {
+    typedcode_t v;
+    v.c = 0;
+    multiname_t m = {QNAME, &stdns, 0, "RegExp"};
+    if(!(yyvsp[(1) - (1)].regexp).options) {
+        v.c = abc_getlex2(v.c, &m);
+        v.c = abc_pushstring(v.c, (yyvsp[(1) - (1)].regexp).pattern);
+        v.c = abc_construct(v.c, 1);
+    } else {
+        v.c = abc_getlex2(v.c, &m);
+        v.c = abc_pushstring(v.c, (yyvsp[(1) - (1)].regexp).pattern);
+        v.c = abc_pushstring(v.c, (yyvsp[(1) - (1)].regexp).options);
+        v.c = abc_construct(v.c, 2);
+    }
+    v.t = TYPE_REGEXP;
+    (yyval.node) = mkcodenode(v);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 239:
+    case 278:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3097 "parser.y"
-    {(yyval.value).c = abc_pushnull(0);
-                    (yyval.value).t = TYPE_NULL;
-                   }
+#line 3348 "parser.y"
+    {
+    PASS1
+    state->method->need_arguments = 1;
+    PASS2
+    typedcode_t v;
+    v.c = abc_getlocal(0, state->method->need_arguments);
+    v.t = TYPE_ARRAY;
+    (yyval.node) = mkcodenode(v);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 240:
+    case 279:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3101 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c);
-             (yyval.value).t = TYPE_BOOLEAN;
-            }
+#line 3359 "parser.y"
+    {
+    typedcode_t v;
+    v.c = code_new();
+    v.c = code_append(v.c, (yyvsp[(2) - (3)].value_list).cc);
+    v.c = abc_newarray(v.c, (yyvsp[(2) - (3)].value_list).number);
+    v.t = registry_getarrayclass();
+    (yyval.node) = mkcodenode(v);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 241:
+    case 280:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3369 "parser.y"
+    {
+    typedcode_t v;
+    v.c = code_new();
+    v.c = code_append(v.c, (yyvsp[(2) - (3)].value_list).cc);
+    v.c = abc_newobject(v.c, (yyvsp[(2) - (3)].value_list).number/2);
+    v.t = registry_getobjectclass();
+    (yyval.node) =  mkcodenode(v);
+}
+    }
+    break;
+
+
+  
+    case 281:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3378 "parser.y"
+    {(yyval.node) = mknode2(&node_lt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 282:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3379 "parser.y"
+    {(yyval.node) = mknode2(&node_gt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 283:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3380 "parser.y"
+    {(yyval.node) = mknode2(&node_le,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 284:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3381 "parser.y"
+    {(yyval.node) = mknode2(&node_ge,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 285:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3382 "parser.y"
+    {(yyval.node) = mknode2(&node_eqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 286:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3104 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c);
-             (yyval.value).t = TYPE_BOOLEAN;
-            }
+#line 3383 "parser.y"
+    {(yyval.node) = mknode2(&node_eqeqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 242:
+    case 287:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3107 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3384 "parser.y"
+    {(yyval.node) = mknode2(&node_noteqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 243:
+    case 288:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3110 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3385 "parser.y"
+    {(yyval.node) = mknode2(&node_noteq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 244:
+    case 289:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3113 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3386 "parser.y"
+    {(yyval.node) = mknode2(&node_oror,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 245:
+    case 290:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3116 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-              }
+#line 3387 "parser.y"
+    {(yyval.node) = mknode2(&node_andand,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 246:
+    case 291:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3119 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3388 "parser.y"
+    {(yyval.node) = mknode1(&node_not, (yyvsp[(2) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 247:
+    case 292:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3122 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3389 "parser.y"
+    {(yyval.node) = mknode1(&node_bitnot, (yyvsp[(2) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 248:
+    case 293:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3126 "parser.y"
-    {(yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'O');
-              (yyval.value).c = (yyvsp[(1) - (3)].value).c;
-              (yyval.value).c = converttype((yyval.value).c, (yyvsp[(1) - (3)].value).t, (yyval.value).t);
-              (yyval.value).c = abc_dup((yyval.value).c);
-              code_t*jmp = (yyval.value).c = abc_iftrue((yyval.value).c, 0);
-              (yyval.value).c = cut_last_push((yyval.value).c);
-              (yyval.value).c = code_append((yyval.value).c,(yyvsp[(3) - (3)].value).c);
-              (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (3)].value).t, (yyval.value).t);
-              code_t*label = (yyval.value).c = abc_label((yyval.value).c);
-              jmp->branch = label;
-             }
+#line 3390 "parser.y"
+    {(yyval.node) = mknode2(&node_bitand, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 249:
+    case 294:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3137 "parser.y"
-    {
-              (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A');
-              /*printf("%08x:\n",$1.t);
-              code_dump($1.c, 0, 0, "", stdout);
-              printf("%08x:\n",$3.t);
-              code_dump($3.c, 0, 0, "", stdout);
-              printf("joining %08x and %08x to %08x\n", $1.t, $3.t, $$.t);*/
-              (yyval.value).c = (yyvsp[(1) - (3)].value).c;
-              (yyval.value).c = converttype((yyval.value).c, (yyvsp[(1) - (3)].value).t, (yyval.value).t);
-              (yyval.value).c = abc_dup((yyval.value).c);
-              code_t*jmp = (yyval.value).c = abc_iffalse((yyval.value).c, 0);
-              (yyval.value).c = cut_last_push((yyval.value).c);
-              (yyval.value).c = code_append((yyval.value).c,(yyvsp[(3) - (3)].value).c);
-              (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (3)].value).t, (yyval.value).t);
-              code_t*label = (yyval.value).c = abc_label((yyval.value).c);
-              jmp->branch = label;              
-             }
+#line 3391 "parser.y"
+    {(yyval.node) = mknode2(&node_bitxor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 250:
+    case 295:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3155 "parser.y"
-    {(yyval.value).c=(yyvsp[(2) - (2)].value).c;
-              (yyval.value).c = abc_not((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3392 "parser.y"
+    {(yyval.node) = mknode2(&node_bitor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 251:
+    case 296:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3160 "parser.y"
-    {(yyval.value).c=(yyvsp[(2) - (2)].value).c;
-              (yyval.value).c = abc_bitnot((yyval.value).c);
-              (yyval.value).t = TYPE_INT;
-             }
+#line 3393 "parser.y"
+    {(yyval.node) = mknode2(&node_shr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 252:
+    case 297:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3165 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_bitand((yyval.value).c);
-             (yyval.value).t = TYPE_INT;
-            }
+#line 3394 "parser.y"
+    {(yyval.node) = mknode2(&node_ushr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 253:
+    case 298:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3170 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_bitxor((yyval.value).c);
-             (yyval.value).t = TYPE_INT;
-            }
+#line 3395 "parser.y"
+    {(yyval.node) = mknode2(&node_shl, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 254:
+    case 299:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3175 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_bitor((yyval.value).c);
-             (yyval.value).t = TYPE_INT;
-            }
+#line 3396 "parser.y"
+    {(yyval.node) = mknode2(&node_div, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 255:
+    case 300:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3180 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_rshift((yyval.value).c);
-             (yyval.value).t = TYPE_INT;
-            }
+#line 3397 "parser.y"
+    {(yyval.node) = mknode2(&node_mod, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 256:
+    case 301:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3184 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_urshift((yyval.value).c);
-             (yyval.value).t = TYPE_INT;
-            }
+#line 3398 "parser.y"
+    {(yyval.node) = mknode2(&node_plus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 257:
+    case 302:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3188 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_lshift((yyval.value).c);
-             (yyval.value).t = TYPE_INT;
-            }
+#line 3399 "parser.y"
+    {(yyval.node) = mknode2(&node_minus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 258:
+    case 303:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3193 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_divide((yyval.value).c);
-             (yyval.value).t = TYPE_NUMBER;
-            }
+#line 3400 "parser.y"
+    {(yyval.node) = mknode2(&node_multiply, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 259:
+    case 304:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3197 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_modulo((yyval.value).c);
-             (yyval.value).t = TYPE_NUMBER;
-            }
+#line 3401 "parser.y"
+    {(yyval.node) = mknode2(&node_in, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 260:
+    case 305:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3201 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             if(BOTH_INT((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t)) {
-                (yyval.value).c = abc_add_i((yyval.value).c);
-                (yyval.value).t = TYPE_INT;
-             } else {
-                (yyval.value).c = abc_add((yyval.value).c);
-                (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t,'+');
-             }
-            }
+#line 3402 "parser.y"
+    {(yyval.node) = mknode2(&node_as, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 261:
+    case 306:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3210 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) {
-                (yyval.value).c = abc_subtract_i((yyval.value).c);
-                (yyval.value).t = TYPE_INT;
-             } else {
-                (yyval.value).c = abc_subtract((yyval.value).c);
-                (yyval.value).t = TYPE_NUMBER;
-             }
-            }
+#line 3403 "parser.y"
+    {(yyval.node) = mknode2(&node_instanceof, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 262:
+    case 307:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3219 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) {
-                (yyval.value).c = abc_multiply_i((yyval.value).c);
-                (yyval.value).t = TYPE_INT;
-             } else {
-                (yyval.value).c = abc_multiply((yyval.value).c);
-                (yyval.value).t = TYPE_NUMBER;
-             }
-            }
+#line 3404 "parser.y"
+    {(yyval.node) = mknode2(&node_is, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 263:
+    case 308:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3229 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-              (yyval.value).c = abc_in((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3405 "parser.y"
+    {(yyval.node) = mknode1(&node_typeof, (yyvsp[(2) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 264:
+    case 309:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3234 "parser.y"
-    {char use_astype=0; // flash player's astype works differently than astypelate
-              if(use_astype && TYPE_IS_CLASS((yyvsp[(3) - (3)].value).t) && (yyvsp[(3) - (3)].value).t->data) {
-                MULTINAME(m, (classinfo_t*)((yyvsp[(3) - (3)].value).t->data));
-                (yyval.value).c = abc_astype2((yyvsp[(1) - (3)].value).c, &m);
-                (yyval.value).t = (yyvsp[(3) - (3)].value).t->data;
-              } else {
-                (yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c);
-                (yyval.value).c = abc_astypelate((yyval.value).c);
-                (yyval.value).t = TYPE_ANY;
-              }
-             }
+#line 3406 "parser.y"
+    {(yyval.node) = mknode1(&node_void, (yyvsp[(2) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 265:
+    case 310:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3247 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c);
-              (yyval.value).c = abc_instanceof((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3407 "parser.y"
+    { (yyval.node) = mkconstnode(constant_new_undefined());}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 266:
+    case 311:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3252 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c);
-              (yyval.value).c = abc_istypelate((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3408 "parser.y"
+    { (yyval.node)=(yyvsp[(2) - (3)].node);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 267:
+    case 312:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3257 "parser.y"
-    {
-              (yyval.value).c = (yyvsp[(3) - (4)].value).c;
-              (yyval.value).c = abc_typeof((yyval.value).c);
-              (yyval.value).t = TYPE_STRING;
-             }
+#line 3409 "parser.y"
+    {(yyval.node) = mknode1(&node_neg, (yyvsp[(2) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 268:
+    case 313:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3263 "parser.y"
-    {
-              (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c);
-              (yyval.value).c = abc_pushundefined((yyval.value).c);
-              (yyval.value).t = TYPE_ANY;
-             }
+#line 3410 "parser.y"
+    {(yyval.node) = mknode2(&node_arraylookup, (yyvsp[(1) - (4)].node),(yyvsp[(3) - (4)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 269:
+    case 314:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3269 "parser.y"
-    { (yyval.value).c = abc_pushundefined(0);
-             (yyval.value).t = TYPE_ANY;
-           }
+#line 3411 "parser.y"
+    {(yyval.node) = mknode2(&node_muleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 270:
+    case 315:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3273 "parser.y"
-    {(yyval.value)=(yyvsp[(2) - (3)].value);}
+#line 3412 "parser.y"
+    {(yyval.node) = mknode2(&node_modeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 271:
+    case 316:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3275 "parser.y"
-    {
-  (yyval.value)=(yyvsp[(2) - (2)].value);
-  if(IS_INT((yyvsp[(2) - (2)].value).t)) {
-   (yyval.value).c=abc_negate_i((yyval.value).c);
-   (yyval.value).t = TYPE_INT;
-  } else {
-   (yyval.value).c=abc_negate((yyval.value).c);
-   (yyval.value).t = TYPE_NUMBER;
-  }
-}
+#line 3413 "parser.y"
+    {(yyval.node) = mknode2(&node_shleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 272:
+    case 317:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3286 "parser.y"
-    {
-  (yyval.value).c = (yyvsp[(1) - (4)].value).c;
-  (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c);
-
-  MULTINAME_LATE(m, (yyvsp[(1) - (4)].value).t?(yyvsp[(1) - (4)].value).t->access:ACCESS_PACKAGE, "");
-  (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
-  (yyval.value).t = 0; // array elements have unknown type
-}
+#line 3414 "parser.y"
+    {(yyval.node) = mknode2(&node_shreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 273:
+    case 318:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3295 "parser.y"
-    {
-    (yyval.value).c = code_new();
-    (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc);
-    (yyval.value).c = abc_newarray((yyval.value).c, (yyvsp[(2) - (3)].value_list).len);
-    (yyval.value).t = registry_getarrayclass();
-}
+#line 3415 "parser.y"
+    {(yyval.node) = mknode2(&node_ushreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 274:
+    case 319:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3302 "parser.y"
-    {(yyval.value_list).cc=0;(yyval.value_list).len=0;}
+#line 3416 "parser.y"
+    { (yyval.node) = mknode2(&node_diveq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 275:
+    case 320:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3303 "parser.y"
-    {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);}
+#line 3417 "parser.y"
+    { (yyval.node) = mknode2(&node_bitoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 276:
+    case 321:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3305 "parser.y"
-    {
-    (yyval.value_list).cc = 0;
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c);
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (3)].value).c);
-    (yyval.value_list).len = 2;
-}
+#line 3418 "parser.y"
+    { (yyval.node) = mknode2(&node_bitxoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 277:
+    case 322:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3311 "parser.y"
-    {
-    (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc;
-    (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2;
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (5)].value).c);
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(5) - (5)].value).c);
-}
+#line 3419 "parser.y"
+    { (yyval.node) = mknode2(&node_bitandeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 278:
+    case 323:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3320 "parser.y"
-    {
-    (yyval.value).c = code_new();
-    (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc);
-    (yyval.value).c = abc_newobject((yyval.value).c, (yyvsp[(2) - (3)].value_list).len/2);
-    (yyval.value).t = registry_getobjectclass();
-}
+#line 3420 "parser.y"
+    { (yyval.node) = mknode2(&node_pluseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 279:
+    case 324:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3327 "parser.y"
-    { 
-               code_t*c = (yyvsp[(3) - (3)].value).c;
-               if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) {
-                c=abc_multiply_i(c);
-               } else {
-                c=abc_multiply(c);
-               }
-               c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '*'), (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3421 "parser.y"
+    { (yyval.node) = mknode2(&node_minuseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 280:
+    case 325:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3339 "parser.y"
-    { 
-               code_t*c = abc_modulo((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '%'), (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3422 "parser.y"
+    { (yyval.node) = mknode2(&node_assign, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 281:
+    case 326:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3345 "parser.y"
-    { 
-               code_t*c = abc_lshift((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '<'), (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3423 "parser.y"
+    { (yyval.node) = mknode3(&node_tenary, (yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 282:
+    case 327:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3351 "parser.y"
-    { 
-               code_t*c = abc_rshift((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '>'), (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3425 "parser.y"
+    { (yyval.node) = mknode1(&node_rplusplus, (yyvsp[(1) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 283:
+    case 328:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3357 "parser.y"
-    { 
-               code_t*c = abc_urshift((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'U'), (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3426 "parser.y"
+    { (yyval.node) = mknode1(&node_rminusminus, (yyvsp[(1) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 284:
+    case 329:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3363 "parser.y"
-    { 
-               code_t*c = abc_divide((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '/'), (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3427 "parser.y"
+    {(yyval.node) = mknode1(&node_lplusplus, (yyvsp[(2) - (2)].node)); }

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 285:
+    case 330:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3369 "parser.y"
-    { 
-               code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3428 "parser.y"
+    {(yyval.node) = mknode1(&node_lminusminus, (yyvsp[(2) - (2)].node)); }

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 286:
+    case 331:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3375 "parser.y"
-    { 
-               code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3431 "parser.y"
+    { if(!state->cls->info)
+                  syntaxerror("super keyword not allowed outside a class");
+              classinfo_t*t = state->cls->info->superclass;
+              if(!t) t = TYPE_OBJECT;
+              memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1);
+              MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id));
+              typedcode_t v;
+              v.c = 0;
+              v.c = abc_getlocal_0(v.c);
+              v.c = abc_getsuper2(v.c, &m);
+              v.t = slotinfo_gettype((slotinfo_t*)f);
+              (yyval.node) = mkcodenode(v);
+           }

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 287:
+    case 332:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3381 "parser.y"
-    { 
-               code_t*c = (yyvsp[(3) - (3)].value).c;
-
-               if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) {
-                c=abc_add_i(c);
-               } else {
-                c=abc_add(c);
-                c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '+'), (yyvsp[(1) - (3)].value).t);
-               }
-               
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3445 "parser.y"
+    {
+    typedcode_t v;
+    multiname_t m = {MULTINAMEA, 0, &nopackage_namespace_set, (yyvsp[(2) - (2)].id)};
+    v.c = abc_getlex2(0, &m);
+    v.t = TYPE_STRING;
+    (yyval.node) = mkcodenode(v);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 288:
+    case 333:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3394 "parser.y"
-    { code_t*c = (yyvsp[(3) - (3)].value).c; 
-               if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) {
-                c=abc_subtract_i(c);
-               } else {
-                c=abc_subtract(c);
-                c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '-'), (yyvsp[(1) - (3)].value).t);
-               }
-               
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-             }
+#line 3453 "parser.y"
+    {PASS12 new_state();state->xmlfilter=1;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 289:
+    case 334:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3405 "parser.y"
-    { code_t*c = 0;
-              c = code_append(c, (yyvsp[(3) - (3)].value).c);
-              c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(1) - (3)].value).t);
-              (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 1, 0);
-              (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-            }
+#line 3453 "parser.y"
+    {
+    PASS1 old_state();
+    PASS2
+    typedcode_t v = node_read((yyvsp[(1) - (6)].node));
+    typedcode_t w = node_read((yyvsp[(5) - (6)].node));
+    code_t*c = 0;
+    int index = alloc_local();
+    int result = alloc_local();
+    int tmp = alloc_local();
+    int xml = alloc_local();
+    
+    c = code_append(c, v.c);
+    c = abc_checkfilter(c);
+    c = abc_coerce_a(c); //hasnext2 converts to *
+    c = abc_setlocal(c, xml);
+    multiname_t m = {QNAME, &stdns, 0, "XMLList"};
+    c = abc_getlex2(c, &m);
+    c = abc_construct(c, 0);
+    c = abc_setlocal(c, result);
+    c = abc_pushbyte(c, 0);
+    c = abc_setlocal(c, index);
+    code_t*jmp = c = abc_jump(c, 0);
+    code_t*loop = c = abc_label(c);
+    c = abc_getlocal(c, xml);
+    c = abc_getlocal(c, index);
+    c = abc_nextvalue(c);
+    c = abc_dup(c);
+    c = abc_setlocal(c, tmp);
+    c = abc_pushwith(c);
+    c = code_append(c, w.c);
+    c = abc_popscope(c);
+    code_t*b = c = abc_iffalse(c, 0);
+    c = abc_getlocal(c, result);
+    c = abc_getlocal(c, index);
+    c = abc_getlocal(c, tmp);
+    multiname_t m2 = {MULTINAMEL, 0, &nopackage_namespace_set, 0};
+    c = abc_setproperty2(c, &m2);
+    c = b->branch = jmp->branch = abc_nop(c);
+    c = abc_kill(c, tmp);
+    c = abc_hasnext2(c, xml, index);
+    c = abc_iftrue(c, loop);
+    c = abc_getlocal(c, result);
+    c = abc_kill(c, xml);
+    c = abc_kill(c, result);
+    c = abc_kill(c, index);
+    
+    c = var_block(c, state->vars);
+    old_state();
+    typedcode_t r;
+    r.c = c;
+    r.t = TYPE_XMLLIST;
+    (yyval.node) = mkcodenode(r);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 290:
+    case 335:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3412 "parser.y"
-    { 
-              (yyval.value).t = join_types((yyvsp[(3) - (5)].value).t,(yyvsp[(5) - (5)].value).t,'?');
-              (yyval.value).c = (yyvsp[(1) - (5)].value).c;
-              code_t*j1 = (yyval.value).c = abc_iffalse((yyval.value).c, 0);
-              (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (5)].value).c);
-              (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (5)].value).t, (yyval.value).t);
-              code_t*j2 = (yyval.value).c = abc_jump((yyval.value).c, 0);
-              (yyval.value).c = j1->branch = abc_label((yyval.value).c);
-              (yyval.value).c = code_append((yyval.value).c, (yyvsp[(5) - (5)].value).c);
-              (yyval.value).c = converttype((yyval.value).c, (yyvsp[(5) - (5)].value).t, (yyval.value).t);
-              (yyval.value).c = j2->branch = abc_label((yyval.value).c);
-            }
+#line 3507 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 291:
+    case 336:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3425 "parser.y"
-    { code_t*c = 0;
-             classinfo_t*type = (yyvsp[(1) - (2)].value).t;
-             if(is_getlocal((yyvsp[(1) - (2)].value).c) && (TYPE_IS_INT((yyvsp[(1) - (2)].value).t) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t))) {
-                 int nr = getlocalnr((yyvsp[(1) - (2)].value).c);
-                 code_free((yyvsp[(1) - (2)].value).c);(yyvsp[(1) - (2)].value).c=0;
-                 if(TYPE_IS_INT((yyvsp[(1) - (2)].value).t)) {
-                    (yyval.value).c = abc_getlocal(0, nr);
-                    (yyval.value).c = abc_inclocal_i((yyval.value).c, nr);
-                 } else if(TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t)) {
-                    (yyval.value).c = abc_getlocal(0, nr);
-                    (yyval.value).c = abc_inclocal((yyval.value).c, nr);
-                 } else syntaxerror("internal error");
-             } else {
-                 if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) {
-                     c=abc_increment_i(c);
-                     type = TYPE_INT;
-                 } else {
-                     c=abc_increment(c);
-                     type = TYPE_NUMBER;
-                 }
-                 c=converttype(c, type, (yyvsp[(1) - (2)].value).t);
-                 (yyval.value).c = toreadwrite((yyvsp[(1) - (2)].value).c, c, 0, 1);
-                 (yyval.value).t = (yyvsp[(1) - (2)].value).t;
-             }
-           }
+#line 3508 "parser.y"
+    {(yyval.id)="*";}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 292:
+    case 337:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3452 "parser.y"
-    { code_t*c = 0;
-             classinfo_t*type = (yyvsp[(1) - (2)].value).t;
-             if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) {
-                 c=abc_decrement_i(c);
-                 type = TYPE_INT;
-             } else {
-                 c=abc_decrement(c);
-                 type = TYPE_NUMBER;
-             }
-             c=converttype(c, type, (yyvsp[(1) - (2)].value).t);
-             (yyval.value).c = toreadwrite((yyvsp[(1) - (2)].value).c, c, 0, 1);
-             (yyval.value).t = (yyvsp[(1) - (2)].value).t;
-            }
+#line 3509 "parser.y"
+    {(yyval.id)=(char*)(yyvsp[(1) - (1)].id);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 293:
+    case 339:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3466 "parser.y"
-    { code_t*c = 0;
-             classinfo_t*type = (yyvsp[(2) - (2)].value).t;
-             if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) {
-                 c=abc_increment_i(c);
-                 type = TYPE_INT;
-             } else {
-                 c=abc_increment(c);
-                 type = TYPE_NUMBER;
-             }
-             c=converttype(c, type, (yyvsp[(2) - (2)].value).t);
-             (yyval.value).c = toreadwrite((yyvsp[(2) - (2)].value).c, c, 0, 0);
-             (yyval.value).t = (yyvsp[(2) - (2)].value).t;
-           }
+#line 3511 "parser.y"
+    {(yyval.id)="*";}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 294:
+    case 340:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3480 "parser.y"
-    { code_t*c = 0;
-             classinfo_t*type = (yyvsp[(2) - (2)].value).t;
-             if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) {
-                 c=abc_decrement_i(c);
-                 type = TYPE_INT;
-             } else {
-                 c=abc_decrement(c);
-                 type = TYPE_NUMBER;
-             }
-             c=converttype(c, type, (yyvsp[(2) - (2)].value).t);
-             (yyval.value).c = toreadwrite((yyvsp[(2) - (2)].value).c, c, 0, 0);
-             (yyval.value).t = (yyvsp[(2) - (2)].value).t;
-           }
+#line 3519 "parser.y"
+    {
+    typedcode_t v = node_read((yyvsp[(1) - (5)].node));
+    typedcode_t w = node_read(resolve_identifier((yyvsp[(3) - (5)].id)));
+    v.c = code_append(v.c, w.c);
+    if(!TYPE_IS_NAMESPACE(w.t)) {
+        as3_softwarning("%s might not be a namespace", (yyvsp[(3) - (5)].id));
+    }
+    v.c = converttype(v.c, w.t, TYPE_NAMESPACE);
+    multiname_t m = {RTQNAME, 0, 0, (yyvsp[(5) - (5)].id)};
+    v.c = abc_getproperty2(v.c, &m);
+    if(TYPE_IS_XML(v.t)) {
+        v.t = TYPE_XMLLIST;
+    } else {
+        v.c = abc_coerce_a(v.c);
+        v.t = TYPE_ANY;
+    }
+    (yyval.node) = mkcodenode(v);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 295:
+    case 341:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3495 "parser.y"
-    { if(!state->cls->info)
-                  syntaxerror("super keyword not allowed outside a class");
-              classinfo_t*t = state->cls->info->superclass;
-              if(!t) t = TYPE_OBJECT;
-
-              memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1);
-
-              MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id));
-              (yyval.value).c = 0;
-              (yyval.value).c = abc_getlocal_0((yyval.value).c);
-              (yyval.value).c = abc_getsuper2((yyval.value).c, &m);
-              (yyval.value).t = slotinfo_gettype((slotinfo_t*)f);
-           }
+#line 3537 "parser.y"
+    {
+    typedcode_t v = node_read((yyvsp[(1) - (3)].node));
+    multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)};
+    v.c = abc_getdescendants2(v.c, &m);
+    v.t = TYPE_XMLLIST;
+    (yyval.node) = mkcodenode(v);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 296:
+    case 342:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3509 "parser.y"
+#line 3544 "parser.y"

     {
     {

-              // attribute TODO
-              (yyval.value).c = abc_pushundefined(0);
-              (yyval.value).t = 0;
-              as3_warning("ignored @ operator");
-           }
+    typedcode_t v = node_read((yyvsp[(1) - (5)].node));
+    typedcode_t w = node_read((yyvsp[(4) - (5)].node));
+    multiname_t m = {MULTINAMEL, 0, &nopackage_namespace_set, 0};
+    v.c = code_append(v.c, w.c);
+    v.c = converttype(w.c, w.t, TYPE_STRING);
+    v.c = abc_getproperty2(v.c, &m);
+    v.t = TYPE_XMLLIST;
+    (yyval.node) = mkcodenode(v);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 297:
+    case 343:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3516 "parser.y"
+#line 3555 "parser.y"

     {
     {

-              // child attribute  TODO
-              (yyval.value).c = abc_pushundefined(0);
-              (yyval.value).t = 0;
-              as3_warning("ignored .@ operator");
-           }
+    typedcode_t v = node_read((yyvsp[(1) - (4)].node));
+    multiname_t m = {MULTINAMEA, 0, &nopackage_namespace_set, (yyvsp[(4) - (4)].id)};
+    v.c = abc_getproperty2(v.c, &m);
+    v.t = TYPE_STRING;
+    (yyval.node) = mkcodenode(v);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 298:
+    case 344:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3523 "parser.y"
+#line 3562 "parser.y"

     {
     {

-              // namespace declaration TODO
-              (yyval.value).c = abc_pushundefined(0);
-              (yyval.value).t = 0;
-              as3_warning("ignored :: operator");
-           }
+    typedcode_t v = node_read((yyvsp[(1) - (4)].node));
+    multiname_t m = {MULTINAMEA, 0, &nopackage_namespace_set, (yyvsp[(4) - (4)].id)};
+    v.c = abc_getdescendants2(v.c, &m);
+    v.t = TYPE_STRING;
+    (yyval.node) = mkcodenode(v);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 299:
+    case 345:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3530 "parser.y"
+#line 3569 "parser.y"

     {
     {

-              // descendants TODO
-              (yyval.value).c = abc_pushundefined(0);
-              (yyval.value).t = 0;
-              as3_warning("ignored .. operator");
-           }
+    typedcode_t v = node_read((yyvsp[(1) - (6)].node));
+    typedcode_t w = node_read((yyvsp[(5) - (6)].node));
+    multiname_t m = {MULTINAMELA, 0, &nopackage_namespace_set, 0};
+    v.c = code_append(v.c, w.c);
+    v.c = converttype(w.c, w.t, TYPE_STRING);
+    v.c = abc_getproperty2(v.c, &m);
+    v.t = TYPE_STRING;
+    (yyval.node) = mkcodenode(v);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 300:
+    case 346:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3537 "parser.y"
+#line 3579 "parser.y"

     {
     {

-              // filter TODO
-              (yyval.value).c = abc_pushundefined(0);
-              (yyval.value).t = 0;
-              as3_warning("ignored .() operator");
-           }
+    typedcode_t v = node_read((yyvsp[(1) - (6)].node));
+    typedcode_t w = node_read((yyvsp[(5) - (6)].node));
+    multiname_t m = {MULTINAMELA, 0, &nopackage_namespace_set, 0};
+    v.c = code_append(v.c, w.c);
+    v.c = converttype(w.c, w.t, TYPE_STRING);
+    v.c = abc_getdescendants2(v.c, &m);
+    v.t = TYPE_STRING;
+    (yyval.node) = mkcodenode(v);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 301:
+    case 347:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3548 "parser.y"
+#line 3590 "parser.y"

     {
     {

-    (yyval.value).c = (yyvsp[(1) - (3)].value).c;
-    classinfo_t*t = (yyvsp[(1) - (3)].value).t;
+    typedcode_t v1 = node_read((yyvsp[(1) - (3)].node));
+    (yyval.value).c = v1.c;
+    classinfo_t*t = v1.t;

     char is_static = 0;
     if(TYPE_IS_CLASS(t) && t->data) {
         t = t->data;
         is_static = 1;
     }
     char is_static = 0;
     if(TYPE_IS_CLASS(t) && t->data) {
         t = t->data;
         is_static = 1;
     }

-    if(t) {
-        if(t->subtype==0xff) {
+    if(TYPE_IS_XML(t)) {
+        multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)};
+        (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
+        (yyval.value).c = abc_coerce_a((yyval.value).c);
+        (yyval.value).t = TYPE_XMLLIST;
+    } else if(t) {
+        if(t->subtype==INFOTYPE_UNRESOLVED) {

             syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", (yyvsp[(3) - (3)].id), t->name);
         }
             syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", (yyvsp[(3) - (3)].id), t->name);
         }

-        memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1);
+        memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1);

         char noslot = 0;
         if(f && !is_static != !(f->flags&FLAG_STATIC))
            noslot=1;
         if(f && f->slot && !noslot) {
             (yyval.value).c = abc_getslot((yyval.value).c, f->slot);
         } else {
         char noslot = 0;
         if(f && !is_static != !(f->flags&FLAG_STATIC))
            noslot=1;
         if(f && f->slot && !noslot) {
             (yyval.value).c = abc_getslot((yyval.value).c, f->slot);
         } else {

+            if(!f) {
+                if(!TYPE_IS_XMLLIST(t)) {
+                    as3_softwarning("Access of undefined property '%s' in %s", (yyvsp[(3) - (3)].id), t->name);
+                }
+            }

             MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id));
             (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
         }
             MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id));
             (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
         }

@@ -7849,27 +8710,31 @@ PASS2
         (yyval.value).t = slotinfo_gettype((slotinfo_t*)f);
         if(!(yyval.value).t)
            (yyval.value).c = abc_coerce_a((yyval.value).c);
         (yyval.value).t = slotinfo_gettype((slotinfo_t*)f);
         if(!(yyval.value).t)
            (yyval.value).c = abc_coerce_a((yyval.value).c);

-    } else if((yyvsp[(1) - (3)].value).c && (yyvsp[(1) - (3)].value).c->opcode == OPCODE___PUSHPACKAGE__) {
-        string_t*package = (yyvsp[(1) - (3)].value).c->data[0];
+        
+    } else if(v1.c && v1.c->opcode == OPCODE___PUSHPACKAGE__) {
+        string_t*package = v1.c->data[0];

         char*package2 = concat3(package->str, ".", (yyvsp[(3) - (3)].id));
         char*package2 = concat3(package->str, ".", (yyvsp[(3) - (3)].id));

-        if(dict_contains(state->import_toplevel_packages, package2)) {
-            (yyval.value).c = (yyvsp[(1) - (3)].value).c;
+
+        slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id));
+        if(a) {
+            (yyval.value) = push_class(a);
+        } else if(dict_contains(state->import_toplevel_packages, package2) ||
+                  registry_ispackage(package2)) {
+            (yyval.value).c = v1.c;

             (yyval.value).c->data[0] = string_new4(package2);
             (yyval.value).t = 0;
         } else {
             (yyval.value).c->data[0] = string_new4(package2);
             (yyval.value).t = 0;
         } else {

-            slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id));
-            if(!a) 
-                syntaxerror("couldn't resolve %s", package2);
-            (yyval.value) = push_class(a);
+            syntaxerror("couldn't resolve %s", package2);

         }
     } else {
         /* when resolving a property on an unknown type, we do know the
            name of the property (and don't seem to need the package), but
            we need to make avm2 try out all access modes */
         }
     } else {
         /* when resolving a property on an unknown type, we do know the
            name of the property (and don't seem to need the package), but
            we need to make avm2 try out all access modes */

+        as3_softwarning("Resolving %s on unknown type", (yyvsp[(3) - (3)].id));

         multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)};
         (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
         (yyval.value).c = abc_coerce_a((yyval.value).c);
         multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)};
         (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
         (yyval.value).c = abc_coerce_a((yyval.value).c);

-        (yyval.value).t = registry_getanytype();
+        (yyval.value).t = TYPE_ANY;

     }
 }
     }
     }
 }
     }

@@ -7877,11 +8742,11 @@ PASS2
 
 
   
 
 
   

-    case 302:
+    case 348:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3598 "parser.y"
+#line 3770 "parser.y"

     {
     PASS1
     /* Queue unresolved identifiers for checking against the parent
     {
     PASS1
     /* Queue unresolved identifiers for checking against the parent

@@ -7891,114 +8756,34 @@ PASS2
        etc. which is *correct* because local variables of the parent function
        would shadow those.
        */
        etc. which is *correct* because local variables of the parent function
        would shadow those.
        */

-    if(state->method->inner && !find_variable(state, (yyvsp[(1) - (1)].id))) {
+
+    if(!find_variable(state, (yyvsp[(1) - (1)].id))) {

         unknown_variable((yyvsp[(1) - (1)].id));
         unknown_variable((yyvsp[(1) - (1)].id));

+        /* let the compiler know that it might want to check the current directory/package
+           for this identifier- maybe there's a file $1.as defining $1. */
+        as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id));

     }
    
     }
    

-    /* let the compiler know that it might check the current directory/package
-       for this identifier- maybe there's a file $1.as defining $1. */
-    as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id));
+    (yyval.node) = 0;

     PASS2
 
     PASS2
 

-    (yyval.value).t = 0;
-    (yyval.value).c = 0;
-    slotinfo_t*a = 0;
-    memberinfo_t*f = 0;
-
-    variable_t*v;
-    /* look at variables */
-    if((v = find_variable(state, (yyvsp[(1) - (1)].id)))) {
-        // $1 is a local variable
-        (yyval.value).c = abc_getlocal((yyval.value).c, v->index);
-        (yyval.value).t = v->type;
-        break;
-    }
-    if((v = find_slot(state, (yyvsp[(1) - (1)].id)))) {
-        (yyval.value).c = abc_getscopeobject((yyval.value).c, 1);
-        (yyval.value).c = abc_getslot((yyval.value).c, v->index);
-        (yyval.value).t = v->type;
-        break;
-    }
-
-    int i_am_static = (state->method && state->method->info)?(state->method->info->flags&FLAG_STATIC):FLAG_STATIC;
-
-    /* look at current class' members */
-    if(state->cls && (f = registry_findmember_nsset(state->cls->info, state->active_namespaces, (yyvsp[(1) - (1)].id), 1)) &&
-        (f->flags&FLAG_STATIC) >= i_am_static) {
-        // $1 is a function in this class
-        int var_is_static = (f->flags&FLAG_STATIC);
-
-        if(f->kind == INFOTYPE_METHOD) {
-            (yyval.value).t = TYPE_FUNCTION(f);
-        } else {
-            (yyval.value).t = f->type;
-        }
-        if(var_is_static && !i_am_static) {
-        /* access to a static member from a non-static location.
-           do this via findpropstrict:
-           there doesn't seem to be any non-lookup way to access
-           static properties of a class */
-            state->method->late_binding = 1;
-            (yyval.value).t = f->type;
-            namespace_t ns = {f->access, ""};
-            multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)};
-            (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m);
-            (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
-            break;
-        } else if(f->slot>0) {
-            (yyval.value).c = abc_getlocal_0((yyval.value).c);
-            (yyval.value).c = abc_getslot((yyval.value).c, f->slot);
-            break;
-        } else {
-            namespace_t ns = {f->access, ""};
-            multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)};
-            (yyval.value).c = abc_getlocal_0((yyval.value).c);
-            (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
-            break;
-        }
-    } 
-    
-    /* look at actual classes, in the current package and imported */
-    if((a = find_class((yyvsp[(1) - (1)].id)))) {
-        (yyval.value) = push_class(a);
-        break;
-    }
-
-    /* look through package prefixes */
-    if(dict_contains(state->import_toplevel_packages, (yyvsp[(1) - (1)].id))) {
-        (yyval.value).c = abc___pushpackage__((yyval.value).c, (yyvsp[(1) - (1)].id));
-        (yyval.value).t = 0;
-        break;
-    }
-
-    /* unknown object, let the avm2 resolve it */
-    if(1) {
-        //as3_softwarning("Couldn't resolve '%s', doing late binding", $1);
-        as3_warning("Couldn't resolve '%s', doing late binding", (yyvsp[(1) - (1)].id));
-        state->method->late_binding = 1;
-                
-        multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(1) - (1)].id)};
-
-        (yyval.value).t = 0;
-        (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m);
-        (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
-    }
+    (yyval.node) = resolve_identifier((yyvsp[(1) - (1)].id));

 }
     }
     break;
 
 
   
 }
     }
     break;
 
 
   

-    case 303:
+    case 349:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3703 "parser.y"
+#line 3804 "parser.y"

     {
     PASS12
     NEW(namespace_decl_t,n);
     n->name = (yyvsp[(2) - (2)].id);
     {
     PASS12
     NEW(namespace_decl_t,n);
     n->name = (yyvsp[(2) - (2)].id);

-    n->url = 0;
+    n->url = (yyvsp[(2) - (2)].id);

     (yyval.namespace_decl)=n;
 }
     }
     (yyval.namespace_decl)=n;
 }
     }

@@ -8006,11 +8791,11 @@ PASS2
 
 
   
 
 
   

-    case 304:
+    case 350:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3710 "parser.y"
+#line 3811 "parser.y"

     {
     PASS12
     NEW(namespace_decl_t,n);
     {
     PASS12
     NEW(namespace_decl_t,n);

@@ -8023,11 +8808,11 @@ PASS2
 
 
   
 
 
   

-    case 305:
+    case 351:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3717 "parser.y"
+#line 3818 "parser.y"

     {
     PASS12
     NEW(namespace_decl_t,n);
     {
     PASS12
     NEW(namespace_decl_t,n);

@@ -8040,15 +8825,30 @@ PASS2
 
 
   
 
 
   

-    case 306:
+    case 352:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3724 "parser.y"
+#line 3825 "parser.y"

     {
     PASS12
     {
     PASS12

-    list_append(state->new_namespaces, (yyvsp[(2) - (2)].namespace_decl));
-    tokenizer_register_namespace((yyvsp[(2) - (2)].namespace_decl)->name);
+    trie_put(active_namespaces, (yyvsp[(2) - (2)].namespace_decl)->name, (void*)(yyvsp[(2) - (2)].namespace_decl)->url);
+
+    namespace_t access = modifiers2access(&(yyvsp[(1) - (2)].flags));
+    varinfo_t* var = varinfo_register_global(access.access, state->package, (yyvsp[(2) - (2)].namespace_decl)->name);
+    var->type = TYPE_NAMESPACE;
+    namespace_t ns;
+    ns.access = ACCESS_NAMESPACE;
+    ns.name = (yyvsp[(2) - (2)].namespace_decl)->url;
+    var->value = constant_new_namespace(&ns);
+      
+    if(as3_pass==2) {
+        MULTINAME(m, TYPE_NAMESPACE);
+        trait_t*t = add_abc_slot(&(yyvsp[(1) - (2)].flags), (yyvsp[(2) - (2)].namespace_decl)->name, 0, 0);
+        t->value = var->value;
+        t->type_name = multiname_clone(&m);
+    }
+

     (yyval.code)=0;
 }
     }
     (yyval.code)=0;
 }
     }

@@ -8056,20 +8856,44 @@ PASS2
 
 
   
 
 
   

-    case 307:
+    case 353:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3848 "parser.y"
+    {
+    as3_warning("default xml namespaces not supported yet");
+    (yyval.code) = 0;
+}
+    }
+    break;
+
+
+  
+    case 354:

     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3731 "parser.y"
+#line 3853 "parser.y"

     {
     PASS12
     {
     PASS12

-    NEW(namespace_decl_t,n);
-    n->name = (yyvsp[(3) - (3)].classinfo)->name;
-    n->url = 0;
-    /* FIXME: for pass2, we should now try to figure out what the URL of 
-              this thing is */
-    list_append(state->new_namespaces, n);
-    tokenizer_register_namespace((yyvsp[(3) - (3)].classinfo)->name);
+    const char*url = (yyvsp[(3) - (3)].classinfo)->name;
+
+    varinfo_t*s = (varinfo_t*)(yyvsp[(3) - (3)].classinfo);
+    if(s->kind == INFOTYPE_UNRESOLVED) {
+        s = (varinfo_t*)registry_resolve((slotinfo_t*)s);
+        if(!s)
+            syntaxerror("Couldn't resolve namespace %s", (yyvsp[(3) - (3)].classinfo)->name);
+    }
+
+    if(!s || s->kind != INFOTYPE_VAR)
+        syntaxerror("%s.%s is not a public namespace (%d)", (yyvsp[(3) - (3)].classinfo)->package, (yyvsp[(3) - (3)].classinfo)->name, s?s->kind:-1);
+    if(!s->value || !NS_TYPE(s->value->type))
+        syntaxerror("%s.%s is not a namespace", (yyvsp[(3) - (3)].classinfo)->package, (yyvsp[(3) - (3)].classinfo)->name);
+    url = s->value->ns->name;
+
+    trie_put(active_namespaces, (yyvsp[(3) - (3)].classinfo)->name, (void*)url);
+    add_active_url(url);

     (yyval.code)=0;
 }
     }
     (yyval.code)=0;
 }
     }

@@ -8079,7 +8903,7 @@ PASS2
 
 
 /* Line 1464 of skeleton.m4  */
 
 
 /* Line 1464 of skeleton.m4  */

-#line 8083 "parser.tab.c"
+#line 8907 "parser.tab.c"

       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);