X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=06375f48580d82b2c0303a872704078024b20af0;hb=4dacf8e5890fb8cd0f53afbd4305c8b9ff9e7986;hp=0623611e58bdcca292a56593aaee95d62933a545;hpb=6b14c68239f98b818a7aacacc49bb7a16bfa7812;p=swftools.git

diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c
index 0623611..06375f4 100644
--- a/lib/as3/parser.tab.c
+++ b/lib/as3/parser.tab.c
@@ -84,18 +84,21 @@
 #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 "expr.h"
+#include "initcode.h"
 
 extern int a3_lex();
 
 
 
 /* Line 198 of skeleton.m4  */
-#line 99 "parser.tab.c"
+#line 102 "parser.tab.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -129,26 +132,26 @@ extern int a3_lex();
      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,
@@ -182,51 +185,54 @@ extern int a3_lex();
      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
 
@@ -235,12 +241,12 @@ extern int a3_lex();
 #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  */
-#line 44 "parser.y"
+#line 47 "parser.y"
 
     enum yytokentype token;
 
@@ -266,6 +272,7 @@ tokenunion
     regexp_t regexp;
     modifiers_t flags;
     namespace_decl_t* namespace_decl;
+    node_t*node;
     struct {
         abc_exception_list_t *l;
         code_t*finally;
@@ -274,7 +281,7 @@ tokenunion
 
 
 /* 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 */
@@ -285,7 +292,7 @@ tokenunion
 /* Copy the second part of user declarations.  */
 
 /* Line 273 of skeleton.m4  */
-#line 265 "parser.y"
+#line 275 "parser.y"
 
 
 static int a3_error(char*s)
@@ -294,6 +301,13 @@ static int a3_error(char*s)
    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)
 {
@@ -321,7 +335,6 @@ static char* concat3(const char* t1, const char* t2, const char* t3)
 typedef struct _import {
     char*package;
 } import_t;
-
 DECLARE_LIST(import);
 
 DECLARE(methodstate);
@@ -331,11 +344,12 @@ typedef struct _classstate {
     /* class data */
     classinfo_t*info;
     abc_class_t*abc;
-   
+
     methodstate_t*init;
     methodstate_t*static_init;
     //code_t*init;
     //code_t*static_init;
+    parsedclass_t*dependencies;
 
     char has_constructor;
 } classstate_t;
@@ -348,6 +362,7 @@ struct _methodstate {
     char is_constructor;
     char has_super;
     char is_global;
+    char is_static;
     int variable_count;
 
     dict_t*unresolved_variables;
@@ -356,6 +371,9 @@ struct _methodstate {
     char uses_parent_function;
     int uses_slots;
     dict_t*slots;
+    int activation_var;
+
+    int need_arguments;
 
     abc_method_t*abc;
     int var_index; // for inner methods
@@ -378,10 +396,12 @@ typedef struct _state {
     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 xmlfilter; // are we inside a xmlobj..() filter?
   
     classstate_t*cls;   
     methodstate_t*method;
@@ -391,11 +411,17 @@ typedef struct _state {
     int switch_var;
     
     dict_t*vars;
+    dict_t*allvars; // also contains variables from sublevels
 } 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;
@@ -405,18 +431,19 @@ static state_t* state = 0;
 
 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) { \
-        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; \
+        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; \
@@ -443,13 +470,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 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 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);
@@ -465,28 +501,14 @@ static void new_state()
     state = s;
     state->level++;
     state->has_own_imports = 0;    
-    state->new_namespaces = 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)
@@ -499,34 +521,32 @@ static void state_destroy(state_t*state)
         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;
     }
+    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()
 {
+    trie_rollback(active_namespaces);
+
     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) {
         free(leaving->method);
         leaving->method=0;
@@ -535,13 +555,13 @@ static void old_state()
         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);
-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;
@@ -550,8 +570,12 @@ void initialize_file(char*filename)
     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);
+    state->allvars = dict_new();
     
     global->token2info = dict_lookup(global->file2token2info, 
                                      current_filename // use long version
@@ -567,7 +591,9 @@ void initialize_file(char*filename)
         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);
-        function_initvars(state->method, 0, 0, 1);
+        if(!state->method)
+            syntaxerror("internal error: skewed tokencount");
+        function_initvars(state->method, 0, 0, 0, 1);
         global->init = abc_initscript(global->file);
     }
 }
@@ -577,11 +603,12 @@ void finish_file()
     if(!state || state->level!=1) {
         syntaxerror("unexpected end of file in pass %d", as3_pass);
     }
-
+    
     if(as3_pass==2) {
+        dict_del(global->file2token2info, current_filename);
         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;
+        global->init->method->body->code = abc_returnvoid(c);
         free(state->method);state->method=0;
     }
 
@@ -596,56 +623,30 @@ void initialize_parser()
     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);
-
     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;
+    char is_parameter;
     methodstate_t*is_inner_method;
 } variable_t;
 
 static variable_t* find_variable(state_t*s, char*name)
 {
+    state_t*top = s;
     while(s) {
         variable_t*v = 0;
         v = dict_lookup(s->vars, name);
@@ -653,7 +654,7 @@ static variable_t* find_variable(state_t*s, char*name)
         if(s->new_vars) break;
         s = s->old;
     }
-    return 0;
+    return dict_lookup(top->allvars, name);
 }
 static variable_t* find_slot(state_t*s, const char*name)
 {
@@ -669,11 +670,35 @@ static variable_t* find_variable_safe(state_t*s, char*name)
         syntaxerror("undefined variable: %s", name);
     return v;
 }
+
 static char variable_exists(char*name) 
 {
     return dict_contains(state->vars, name);
 }
-code_t*defaultvalue(code_t*c, classinfo_t*type);
+
+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()
 {
@@ -684,8 +709,10 @@ static variable_t* new_variable2(const char*name, classinfo_t*type, char init, c
 {
     if(maybeslot) {
         variable_t*v = find_slot(state, name);
-        if(v)
+        if(v) {
+            alloc_local(); 
             return v;
+        }
     }
 
     NEW(variable_t, v);
@@ -693,8 +720,10 @@ static variable_t* new_variable2(const char*name, classinfo_t*type, char init, c
     v->type = type;
     v->init = init;
  
-    if(name) 
+    if(name) {
         dict_put(state->vars, name, v);
+        dict_put(state->allvars, name, v);
+    }
 
     return v;
 }
@@ -704,31 +733,30 @@ static int new_variable(const char*name, classinfo_t*type, char init, char maybe
 }
 
 #define TEMPVARNAME "__as3_temp__"
-static int gettempvar()
+int gettempvar()
 {
     variable_t*v = find_variable(state, TEMPVARNAME);
+    int i;
     if(v) 
-        return v->index;
-    return new_variable(TEMPVARNAME, 0, 0, 0);
+        i = v->index;
+    else
+        i = new_variable(TEMPVARNAME, 0, 0, 0);
+    parserassert(i);
+    return i;
 }
 
-code_t* var_block(code_t*body) 
+static code_t* var_block(code_t*body) 
 {
     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(state->vars, variable_t*, v) {
+        if(v->type && v->init) {
+            c = defaultvalue(c, v->type);
+            c = abc_setlocal(c, v->index);
+            k = abc_kill(k, v->index); 
+            num++;
         }
     }
 
@@ -756,7 +784,7 @@ code_t* var_block(code_t*body)
     return c;
 }
 
-void unknown_variable(char*name) 
+static void unknown_variable(char*name) 
 {
     if(!state->method->unresolved_variables)
         state->method->unresolved_variables = dict_new();
@@ -764,25 +792,27 @@ void unknown_variable(char*name)
         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* add_scope_code(code_t*c, methodstate_t*m)
+static code_t* add_scope_code(code_t*c, methodstate_t*m, char init)
 {
-    if(m->uses_slots || (m->late_binding && !m->inner)) {
+    if(m->uses_slots || (m->late_binding && !m->inner)) { //???? especially inner functions need the pushscope
         c = abc_getlocal_0(c);
         c = abc_pushscope(c);
     }
     if(m->uses_slots) {
-        /* FIXME: does this need to be the same activation object as
-                  in the function header? */
-        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;
 }
@@ -791,7 +821,7 @@ static code_t* method_header(methodstate_t*m)
 {
     code_t*c = 0;
 
-    c = add_scope_code(c, m);
+    c = add_scope_code(c, m, 1);
 
     methodstate_list_t*l = m->innerfunctions;
     while(l) {
@@ -818,6 +848,19 @@ static code_t* method_header(methodstate_t*m)
         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;
@@ -836,20 +879,15 @@ static code_t* wrap_function(code_t*c,code_t*header, code_t*body)
     return c;
 }
 
-
 static void startpackage(char*name)
 {
     new_state();
-    /*printf("entering package \"%s\"\n", name);*/
     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;
-
     old_state();
 }
 
@@ -868,7 +906,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;
-        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");
@@ -888,7 +934,27 @@ static namespace_t modifiers2access(modifiers_t*mod)
 }
 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(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;
@@ -898,50 +964,37 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char
             index = new_variable((flags&FLAG_STATIC)?"class":"this", state->cls?state->cls->info:0, 0, 0);
         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;
-    }
-
-    if(params) {
+    if(has_params) {
         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(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("arguments", TYPE_ARRAY, 0, 0);
+            m->need_arguments = v->index;
         }
     }
-
-    if(as3_pass==2) {
-        m->scope_code = add_scope_code(m->scope_code, m);
-    }
-
     
-    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->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) {
-                v->type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type);
-                if(!v->type || v->type->kind != INFOTYPE_CLASS) {
-                    syntaxerror("Couldn't find class %s", v->type->name);
+    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;
                 }
             }
         }
@@ -966,6 +1019,9 @@ 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_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
@@ -990,8 +1046,10 @@ 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->static_init->is_static=FLAG_STATIC;
+        state->cls->static_init->variable_count=1;
         /* 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);
@@ -1007,6 +1065,7 @@ 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);
+        state->cls->info->superclass = extends;
         
         int pos = 0;
         classinfo_list_t*l = implements;
@@ -1017,12 +1076,12 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl
     
     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);
        
-        function_initvars(state->cls->init, 0, 0, 1);
-        function_initvars(state->cls->static_init, 0, 0, 0);
+        function_initvars(state->cls->init, 0, 0, 0, 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);
@@ -1035,79 +1094,31 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl
             pos++;
         }
 
-        /* fill out interfaces and extends (we couldn't resolve those during the first pass) */
-        state->cls->info->superclass = 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);
         }
 
-        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);
         }
 
-        /* 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 */
-
         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);
@@ -1118,23 +1129,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) {
@@ -1160,6 +1154,21 @@ static void endclass()
             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();
@@ -1176,6 +1185,12 @@ void check_code_for_break(code_t*c)
             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);
@@ -1184,7 +1199,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)
@@ -1240,18 +1254,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);
-        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) {
-            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);
-        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;
@@ -1268,7 +1279,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) {
-            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);
@@ -1289,10 +1300,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);
-            minfo->kind = INFOTYPE_SLOT; //hack
+            minfo->kind = INFOTYPE_VAR; //hack
             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;
     }
@@ -1315,10 +1327,12 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type)
 
     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;
+        state->method->is_static = parent_method->is_static;
         state->method->variable_count = 0;
         state->method->abc = rfx_calloc(sizeof(abc_method_t));
 
@@ -1333,7 +1347,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type)
 
         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) {
@@ -1342,7 +1356,7 @@ static void innerfunction(char*name, params_t*params, classinfo_t*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);
     }
 }
 
@@ -1354,10 +1368,12 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name,
     }
     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;
+        state->method->is_static = mod->flags&FLAG_STATIC;
 
         if(state->cls) {
             state->method->is_constructor = !strcmp(state->cls->info->name,name);
@@ -1370,7 +1386,7 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name,
 
         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);
     }
@@ -1389,19 +1405,15 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name,
             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 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) {
-        // store inner methods in variables
-        function_initvars(state->method, 0, 0, 0);
+        innerfunctions2vars(state->method);
 
         methodstate_list_t*ml = state->method->innerfunctions;
         
@@ -1413,23 +1425,16 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*
             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;
+                DICT_ITERATE_KEY(d, char*, id) {
+                    /* check parent method's variables */
+                    variable_t*v;
+                    if((v=find_variable(state, id))) {
+                        m->uses_parent_function = 1;
+                        state->method->uses_slots = 1;
+                        dict_put(xvars, id, 0);
                     }
-                    if(l) break;
                 }
-
-                dict_destroy(m->unresolved_variables);
-                m->unresolved_variables = 0;
+                dict_destroy(m->unresolved_variables);m->unresolved_variables = 0;
             }
             ml = ml->next;
         }
@@ -1441,16 +1446,18 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*
                 if(!name) syntaxerror("internal error");
                 if(v->index && dict_contains(xvars, name)) {
                     v->init = 0;
-                    v->index = i++;
+                    v->index = i;
                     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;
+            parserassert(state->new_vars);
+            dict_destroy(state->allvars);state->allvars = 0;
         }
         old_state();
         return 0;
@@ -1471,10 +1478,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) {
-            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);
@@ -1490,10 +1496,11 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*
         //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(state->method->need_arguments) f->flags |= METHOD_NEED_ARGUMENTS;
 
         char opt=0;
         param_list_t*p=0;
@@ -1507,7 +1514,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) {
-                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) {
@@ -1543,11 +1550,6 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*
     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) {
@@ -1575,29 +1577,6 @@ 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)
 {
     if(from==to)
@@ -1615,15 +1594,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_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);
     }
-    //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) {
-             // 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;
@@ -1644,29 +1643,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", 
-        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;
 }
-
-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 {
-       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)
@@ -1754,6 +1745,7 @@ typedcode_t push_class(slotinfo_t*a)
             infotypename(a), a->name, a->package, state->package);
     }
 
+
     if(a->kind != INFOTYPE_CLASS) {
         MULTINAME(m, a);
         x.c = abc_findpropstrict2(x.c, &m);
@@ -1765,9 +1757,16 @@ typedcode_t push_class(slotinfo_t*a)
             varinfo_t*v = (varinfo_t*)a;
             x.t = v->type;
         }
+        return x;
     } 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;
-        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 {
@@ -1779,175 +1778,6 @@ typedcode_t push_class(slotinfo_t*a)
     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)
 {
@@ -1964,7 +1794,6 @@ char is_break_or_jump(code_t*c)
     return 0;
 }
 
-
 #define IS_FINALLY_TARGET(op) \
         ((op) == OPCODE___CONTINUE__ || \
          (op) == OPCODE___BREAK__ || \
@@ -2083,19 +1912,252 @@ 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 PASS12 }} {{
+#define PASS12 }} if(as3_pass == 1 || as3_pass == 2) {{
 #define PASS12END }} if(as3_pass == 2) {{
+#define PASS_ALWAYS }} {{
 
 
 
 /* Line 273 of skeleton.m4  */
-#line 2093 "parser.tab.c"
+#line 1923 "parser.tab.c"
+/* Unqualified %code blocks.  */
 
-#ifdef short
-# undef short
-#endif
+/* Line 274 of skeleton.m4  */
+#line 2000 "parser.y"
 
-#ifdef YYTYPE_UINT8
+    char is_subtype_of(classinfo_t*type, classinfo_t*supertype)
+    {
+        return 1; // FIXME
+    }
+
+
+/* Line 274 of skeleton.m4  */
+#line 2450 "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 2583 "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
+            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 2767 "parser.y"
+
+    static int xml_level = 0;
+
+
+/* Line 274 of skeleton.m4  */
+#line 3546 "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, 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 3688 "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 2155 "parser.tab.c"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
 typedef YYTYPE_UINT8 yytype_uint8;
 #else
 typedef unsigned char yytype_uint8;
@@ -2302,22 +2364,22 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  146
+#define YYFINAL  161
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   3061
+#define YYLAST   3421
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  134
+#define YYNTOKENS  136
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  114
+#define YYNNTS  135
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  308
+#define YYNRULES  351
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  520
+#define YYNSTATES  598
 
 /* 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)
@@ -2328,16 +2390,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,
-       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,   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,   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,
@@ -2360,8 +2422,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,
-      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
@@ -2373,166 +2435,191 @@ static const yytype_uint16 yyprhs[] =
       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,   300,   303,
-     305,   307,   311,   313,   314,   321,   322,   328,   331,   336,
-     337,   339,   341,   344,   346,   348,   350,   352,   354,   356,
-     358,   360,   362,   364,   365,   368,   369,   372,   373,   376,
-     377,   387,   388,   397,   398,   400,   402,   405,   407,   412,
-     414,   416,   418,   419,   421,   423,   426,   428,   431,   440,
-     442,   444,   445,   450,   452,   456,   460,   461,   464,   466,
-     468,   470,   472,   474,   476,   478,   480,   482,   483,   485,
-     488,   493,   497,   499,   504,   507,   509,   511,   512,   513,
-     526,   528,   529,   530,   541,   543,   547,   549,   551,   553,
-     557,   559,   561,   563,   566,   567,   568,   572,   573,   575,
-     577,   579,   582,   585,   586,   591,   596,   601,   604,   606,
-     609,   611,   613,   617,   619,   621,   623,   625,   627,   629,
-     631,   633,   635,   637,   639,   641,   643,   645,   647,   649,
-     651,   653,   657,   661,   665,   669,   673,   677,   681,   685,
-     689,   693,   696,   699,   703,   707,   711,   715,   719,   723,
-     727,   731,   735,   739,   743,   747,   751,   755,   759,   764,
-     767,   769,   773,   776,   781,   785,   786,   788,   792,   798,
-     802,   806,   810,   814,   818,   822,   826,   830,   834,   838,
-     842,   846,   852,   855,   858,   861,   864,   868,   871,   876,
-     882,   886,   892,   896,   898,   901,   906,   911,   914
+      85,    87,    89,    91,    95,    98,   100,   102,   104,   106,
+     108,   110,   112,   117,   120,   122,   124,   128,   131,   132,
+     135,   138,   140,   144,   148,   149,   152,   153,   161,   162,
+     164,   166,   170,   172,   175,   179,   188,   195,   196,   203,
+     204,   212,   214,   217,   219,   222,   223,   225,   227,   230,
+     232,   235,   240,   244,   245,   254,   255,   265,   266,   272,
+     274,   277,   279,   282,   284,   285,   292,   295,   297,   302,
+     305,   307,   309,   311,   313,   317,   319,   320,   327,   328,
+     334,   337,   342,   343,   345,   347,   350,   352,   354,   356,
+     358,   360,   362,   364,   366,   368,   370,   371,   374,   375,
+     378,   379,   382,   383,   393,   394,   403,   404,   406,   408,
+     411,   413,   418,   420,   422,   424,   425,   427,   429,   432,
+     434,   437,   446,   448,   450,   451,   456,   458,   462,   466,
+     467,   470,   472,   474,   476,   478,   480,   482,   484,   486,
+     488,   490,   492,   494,   495,   496,   501,   502,   507,   508,
+     511,   514,   517,   520,   524,   526,   528,   539,   546,   558,
+     559,   561,   563,   566,   568,   572,   576,   580,   584,   585,
+     587,   590,   595,   599,   601,   606,   609,   611,   613,   614,
+     615,   628,   630,   631,   632,   643,   645,   649,   651,   653,
+     655,   659,   661,   663,   665,   668,   669,   670,   674,   675,
+     677,   679,   681,   684,   687,   688,   693,   698,   703,   706,
+     708,   711,   713,   715,   717,   721,   723,   727,   728,   730,
+     732,   734,   736,   738,   740,   744,   750,   752,   754,   756,
+     758,   760,   762,   764,   766,   768,   770,   774,   778,   782,
+     786,   790,   794,   798,   802,   806,   810,   814,   818,   821,
+     824,   828,   832,   836,   840,   844,   848,   852,   856,   860,
+     864,   868,   872,   876,   880,   884,   889,   892,   894,   898,
+     901,   906,   910,   914,   918,   922,   926,   930,   934,   938,
+     942,   946,   950,   954,   960,   963,   966,   969,   972,   976,
+     979,   980,   987,   989,   991,   993,   995,   997,  1003,  1007,
+    1013,  1018,  1023,  1030,  1037,  1041,  1043,  1046,  1051,  1056,
+    1059,  1064
 };
 
 /* 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,   186,    -1,   198,    -1,   196,    -1,   217,
-      -1,   207,    -1,   147,    -1,   148,   126,   136,   132,    -1,
-      99,    -1,    -1,   140,    -1,   141,    -1,   140,   141,    -1,
-     198,    -1,   196,    -1,   217,    -1,   207,    -1,   147,    -1,
-     148,   126,   139,   132,    -1,    99,    -1,   143,    -1,    -1,
-     143,   145,    -1,   145,    -1,   189,    -1,   159,    -1,   160,
-      -1,   161,    -1,   163,    -1,   171,    -1,   154,    -1,   183,
-      -1,   179,    -1,   239,    -1,   247,    -1,   246,    -1,   126,
-     143,   132,    -1,   126,   132,    -1,    99,    -1,   144,    -1,
-     150,    -1,   165,    -1,   166,    -1,   236,    -1,   181,    -1,
-     148,   126,   143,   132,    -1,   145,    99,    -1,   145,    -1,
-     144,    -1,     3,    89,     3,    -1,   102,   237,    -1,    -1,
-      46,   151,    -1,    32,   151,    -1,   152,    -1,   151,   100,
-     152,    -1,     3,   227,   149,    -1,    -1,    65,   146,    -1,
-      -1,    64,   122,   155,   238,   133,   146,   153,    -1,    -1,
-     150,    -1,   239,    -1,    46,     3,   227,    -1,     3,    -1,
-      13,   122,    -1,    13,    50,   122,    -1,   158,   156,    99,
-     238,    99,   239,   133,   146,    -1,   158,   157,    68,   238,
-     133,   146,    -1,    -1,    14,   122,   162,   238,   133,   146,
-      -1,    -1,    15,   164,   146,    14,   122,   238,   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,   240,   105,   142,    -1,    62,   105,
-     142,    -1,    -1,    16,   122,   172,   240,   133,   126,   167,
-     132,    -1,    -1,    33,   122,     3,   227,   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,   238,    -1,    37,    -1,    39,   122,   238,   133,    -1,
-     182,   146,    -1,     3,    -1,    19,    -1,   185,   127,   184,
-      -1,   184,    -1,    -1,    19,   185,   126,   187,   139,   132,
-      -1,    -1,    19,   126,   188,   139,   132,    -1,    41,   223,
-      -1,    41,   185,   127,   115,    -1,    -1,   191,    -1,   192,
-      -1,   191,   192,    -1,    21,    -1,    22,    -1,    20,    -1,
-      38,    -1,    47,    -1,    49,    -1,    48,    -1,    26,    -1,
-      24,    -1,     4,    -1,    -1,    54,   224,    -1,    -1,    54,
-     225,    -1,    -1,    17,   225,    -1,    -1,   190,    31,     3,
-     193,   195,   126,   197,   200,   132,    -1,    -1,   190,    44,
-       3,   194,   126,   199,   203,   132,    -1,    -1,   201,    -1,
-     202,    -1,   201,   202,    -1,    99,    -1,   148,   126,   200,
-     132,    -1,   207,    -1,   217,    -1,   144,    -1,    -1,   204,
-      -1,   205,    -1,   204,   205,    -1,    99,    -1,    46,     3,
-      -1,   190,    27,   216,     3,   122,   213,   133,   227,    -1,
-      46,    -1,    32,    -1,    -1,   190,   206,   208,   209,    -1,
-     210,    -1,   209,   100,   210,    -1,     3,   227,   149,    -1,
-      -1,   102,   212,    -1,    10,    -1,     8,    -1,     9,    -1,
-      12,    -1,     5,    -1,    56,    -1,    55,    -1,    45,    -1,
-       3,    -1,    -1,   214,    -1,    93,   215,    -1,   214,   100,
-      93,   215,    -1,   214,   100,   215,    -1,   215,    -1,     3,
-     105,   226,   211,    -1,     3,   211,    -1,    51,    -1,    35,
-      -1,    -1,    -1,   190,    27,   216,     3,   122,   213,   133,
-     227,   126,   218,   142,   132,    -1,     3,    -1,    -1,    -1,
-      27,   219,   122,   213,   133,   227,   126,   221,   142,   132,
-      -1,     3,    -1,   185,   127,     3,    -1,   223,    -1,   222,
-      -1,   224,    -1,   225,   100,   224,    -1,   224,    -1,   115,
-      -1,    36,    -1,   105,   226,    -1,    -1,    -1,   122,   229,
-     133,    -1,    -1,   230,    -1,   231,    -1,   237,    -1,   230,
-     100,    -1,   231,   237,    -1,    -1,    25,   240,   232,   228,
-      -1,   240,   122,   229,   133,    -1,    53,   122,   229,   133,
-      -1,    63,   240,    -1,    42,    -1,    42,   238,    -1,   240,
-      -1,   240,    -1,   238,   100,   240,    -1,   238,    -1,   220,
-      -1,   241,    -1,   244,    -1,   233,    -1,   235,    -1,   234,
-      -1,     6,    -1,    10,    -1,    11,    -1,     8,    -1,     9,
-      -1,    12,    -1,     5,    -1,    29,    -1,    56,    -1,    55,
-      -1,    45,    -1,   240,   109,   240,    -1,   240,   110,   240,
-      -1,   240,    75,   240,    -1,   240,    76,   240,    -1,   240,
-      71,   240,    -1,   240,    72,   240,    -1,   240,    74,   240,
-      -1,   240,    73,   240,    -1,   240,    87,   240,    -1,   240,
-      88,   240,    -1,   118,   240,    -1,   117,   240,    -1,   240,
-     108,   240,    -1,   240,   107,   240,    -1,   240,   106,   240,
-      -1,   240,    96,   240,    -1,   240,    95,   240,    -1,   240,
-      94,   240,    -1,   240,   114,   240,    -1,   240,   116,   240,
-      -1,   240,   113,   240,    -1,   240,   112,   240,    -1,   240,
-     115,   240,    -1,   240,    68,   240,    -1,   240,    69,   240,
-      -1,   240,    40,   240,    -1,   240,    67,   240,    -1,    43,
-     122,   240,   133,    -1,    36,   240,    -1,    36,    -1,   122,
-     238,   133,    -1,   112,   240,    -1,   240,   124,   240,   125,
-      -1,   124,   229,   125,    -1,    -1,   243,    -1,   237,   105,
-     237,    -1,   243,   100,   237,   105,   237,    -1,    70,   242,
-     132,    -1,   240,    80,   240,    -1,   240,    79,   240,    -1,
-     240,    85,   240,    -1,   240,    84,   240,    -1,   240,    86,
-     240,    -1,   240,    78,   240,    -1,   240,    77,   240,    -1,
-     240,    83,   240,    -1,   240,    81,   240,    -1,   240,    82,
-     240,    -1,   240,   102,   240,    -1,   240,   104,   240,   105,
-     240,    -1,   240,    91,    -1,   240,    90,    -1,    91,   240,
-      -1,    90,   240,    -1,    53,   127,     3,    -1,   128,     3,
-      -1,   240,   127,   128,     3,    -1,   240,   127,     3,    89,
-       3,    -1,   240,    92,     3,    -1,   240,   127,   122,   240,
-     133,    -1,   240,   127,     3,    -1,     3,    -1,    18,     3,
-      -1,    18,     3,   102,     3,    -1,    18,     3,   102,     5,
-      -1,   190,   245,    -1,    23,    18,   224,    -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,   150,   128,   138,   134,    -1,
+     101,    -1,    -1,   142,    -1,   143,    -1,   142,   143,    -1,
+     200,    -1,   198,    -1,   234,    -1,   209,    -1,   149,    -1,
+     150,   128,   141,   134,    -1,   101,    -1,   145,    -1,    -1,
+     145,   147,    -1,   147,    -1,   269,    -1,   191,    -1,   161,
+      -1,   162,    -1,   163,    -1,   165,    -1,   173,    -1,   156,
+      -1,   185,    -1,   181,    -1,   257,    -1,   270,    -1,   268,
+      -1,   128,   145,   134,    -1,   128,   134,    -1,   101,    -1,
+     146,    -1,   152,    -1,   167,    -1,   168,    -1,   253,    -1,
+     183,    -1,   150,   128,   145,   134,    -1,   147,   101,    -1,
+     147,    -1,   146,    -1,     3,    91,     3,    -1,   104,   261,
+      -1,    -1,    46,   153,    -1,    32,   153,    -1,   154,    -1,
+     153,   102,   154,    -1,     3,   244,   151,    -1,    -1,    66,
+     148,    -1,    -1,    65,   124,   157,   255,   135,   148,   155,
+      -1,    -1,   152,    -1,   257,    -1,    46,     3,   244,    -1,
+       3,    -1,    11,   124,    -1,    11,    50,   124,    -1,   160,
+     158,   101,   255,   101,   257,   135,   148,    -1,   160,   159,
+      69,   255,   135,   148,    -1,    -1,    12,   124,   164,   255,
+     135,   148,    -1,    -1,    13,   166,   148,    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,     4,    -1,   187,   129,   186,    -1,   186,    -1,    -1,
+      17,   187,   128,   189,   141,   134,    -1,    -1,    17,   128,
+     190,   141,   134,    -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,   150,   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,   151,    -1,    -1,   104,   261,    -1,
+       8,    -1,     9,    -1,    10,    -1,     5,    -1,    56,    -1,
+      55,    -1,    45,    -1,    28,    -1,    29,    -1,   226,    -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,   226,   223,    -1,
+     224,   226,   223,    -1,     3,    -1,   221,    -1,   216,   225,
+     227,   217,   223,   111,   116,   225,   218,   112,    -1,   216,
+     225,   227,   116,   218,   112,    -1,   216,   225,   227,   217,
+     223,   224,   111,   116,   225,   218,   112,    -1,    -1,   228,
+      -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,   124,   261,   135,    -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[] =
 {
-       0,  2071,  2071,  2073,  2073,  2074,  2075,  2077,  2078,  2079,
-    2080,  2081,  2082,  2083,  2084,  2086,  2086,  2087,  2088,  2090,
-    2091,  2092,  2093,  2094,  2095,  2096,  2098,  2099,  2101,  2102,
-    2105,  2106,  2107,  2108,  2109,  2110,  2111,  2112,  2113,  2114,
-    2115,  2116,  2117,  2118,  2121,  2122,  2123,  2124,  2125,  2126,
-    2127,  2128,  2132,  2133,  2137,  2144,  2148,  2149,  2153,  2154,
-    2156,  2157,  2159,  2220,  2221,  2224,  2224,  2243,  2244,  2245,
-    2250,  2254,  2259,  2260,  2262,  2282,  2330,  2330,  2349,  2349,
-    2364,  2367,  2370,  2373,  2377,  2378,  2379,  2380,  2381,  2382,
-    2384,  2395,  2398,  2398,  2429,  2429,  2454,  2454,  2470,  2471,
-    2472,  2473,  2481,  2490,  2490,  2539,  2543,  2554,  2564,  2581,
-    2582,  2584,  2585,  2587,  2587,  2589,  2589,  2592,  2608,  2625,
-    2626,  2627,  2628,  2636,  2637,  2638,  2639,  2640,  2641,  2642,
-    2643,  2644,  2645,  2649,  2650,  2652,  2653,  2655,  2656,  2660,
-    2658,  2666,  2664,  2673,  2674,  2675,  2676,  2677,  2678,  2679,
-    2680,  2682,  2688,  2689,  2690,  2691,  2692,  2693,  2696,  2709,
-    2709,  2711,  2711,  2713,  2714,  2716,  2791,  2792,  2794,  2795,
-    2796,  2797,  2798,  2800,  2801,  2802,  2803,  2815,  2819,  2825,
-    2831,  2839,  2844,  2850,  2858,  2866,  2867,  2868,  2871,  2870,
-    2887,  2888,  2890,  2889,  2913,  2932,  2946,  2947,  2949,  2950,
-    2952,  2953,  2954,  2963,  2964,  2968,  2969,  2971,  2972,  2973,
-    2975,  2979,  2980,  2985,  2986,  3022,  3068,  3089,  3110,  3113,
-    3120,  3121,  3122,  3128,  3134,  3136,  3138,  3140,  3142,  3144,
-    3146,  3163,  3168,  3171,  3174,  3177,  3180,  3183,  3186,  3189,
-    3192,  3196,  3199,  3202,  3205,  3208,  3211,  3214,  3217,  3221,
-    3232,  3250,  3255,  3260,  3265,  3270,  3275,  3279,  3283,  3288,
-    3292,  3296,  3305,  3314,  3324,  3329,  3341,  3347,  3352,  3358,
-    3364,  3368,  3370,  3381,  3390,  3397,  3398,  3400,  3406,  3415,
-    3422,  3434,  3440,  3446,  3452,  3458,  3464,  3470,  3476,  3489,
-    3500,  3507,  3520,  3547,  3561,  3575,  3589,  3604,  3611,  3618,
-    3625,  3632,  3643,  3693,  3798,  3805,  3812,  3819,  3826
+       0,  1904,  1904,  1906,  1906,  1907,  1908,  1910,  1911,  1912,
+    1913,  1914,  1915,  1916,  1917,  1919,  1919,  1920,  1921,  1923,
+    1924,  1925,  1926,  1927,  1928,  1929,  1931,  1932,  1934,  1937,
+    1940,  1941,  1942,  1943,  1944,  1945,  1946,  1947,  1948,  1949,
+    1950,  1951,  1952,  1953,  1954,  1957,  1958,  1959,  1960,  1961,
+    1962,  1963,  1964,  1976,  1977,  1981,  1988,  2007,  2008,  2010,
+    2011,  2013,  2014,  2016,  2076,  2077,  2080,  2080,  2099,  2100,
+    2101,  2106,  2110,  2115,  2116,  2118,  2138,  2186,  2186,  2205,
+    2205,  2220,  2223,  2226,  2229,  2233,  2234,  2235,  2236,  2237,
+    2238,  2240,  2251,  2254,  2254,  2285,  2285,  2310,  2310,  2326,
+    2327,  2328,  2329,  2337,  2346,  2346,  2395,  2399,  2410,  2420,
+    2437,  2438,  2439,  2440,  2442,  2443,  2445,  2445,  2447,  2447,
+    2470,  2484,  2500,  2501,  2502,  2503,  2510,  2511,  2512,  2513,
+    2514,  2515,  2516,  2517,  2518,  2519,  2523,  2524,  2526,  2527,
+    2529,  2530,  2534,  2532,  2540,  2538,  2547,  2548,  2549,  2550,
+    2551,  2552,  2553,  2554,  2556,  2562,  2563,  2564,  2565,  2566,
+    2567,  2570,  2642,  2642,  2644,  2644,  2646,  2647,  2649,  2733,
+    2734,  2743,  2744,  2747,  2748,  2749,  2750,  2751,  2752,  2753,
+    2771,  2773,  2774,  2775,  2777,  2777,  2781,  2781,  2785,  2786,
+    2789,  2790,  2792,  2793,  2795,  2796,  2798,  2802,  2805,  2810,
+    2811,  2812,  2813,  2815,  2818,  2822,  2825,  2828,  2838,  2842,
+    2848,  2854,  2862,  2867,  2873,  2881,  2889,  2890,  2891,  2894,
+    2893,  2910,  2911,  2913,  2912,  2936,  2955,  2969,  2970,  2972,
+    2973,  2975,  2976,  2977,  2986,  2987,  2991,  2992,  2994,  2995,
+    2996,  2998,  3002,  3003,  3008,  3009,  3053,  3103,  3124,  3146,
+    3149,  3156,  3159,  3162,  3165,  3168,  3171,  3176,  3177,  3179,
+    3180,  3181,  3182,  3183,  3185,  3191,  3200,  3201,  3202,  3203,
+    3204,  3205,  3207,  3211,  3223,  3241,  3252,  3262,  3271,  3272,
+    3273,  3274,  3275,  3276,  3277,  3278,  3279,  3280,  3281,  3282,
+    3283,  3284,  3285,  3286,  3287,  3288,  3289,  3290,  3291,  3292,
+    3293,  3294,  3295,  3296,  3297,  3298,  3299,  3300,  3301,  3302,
+    3303,  3304,  3305,  3306,  3307,  3308,  3309,  3310,  3311,  3312,
+    3313,  3314,  3315,  3316,  3318,  3319,  3320,  3321,  3323,  3338,
+    3346,  3346,  3400,  3401,  3402,  3403,  3404,  3412,  3430,  3437,
+    3448,  3455,  3462,  3472,  3483,  3661,  3697,  3704,  3711,  3718,
+    3740,  3745
 };
 #endif
 
@@ -2542,53 +2629,58 @@ static const yytype_uint16 yyrline[] =
 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\"",
-  "\"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\"",
-  "\"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_HEAD",
-  "WITH", "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@8", "$@9",
-  "IMPORT", "MAYBE_MODIFIERS", "MODIFIER_LIST", "MODIFIER", "EXTENDS",
-  "EXTENDS_LIST", "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10",
-  "INTERFACE_DECLARATION", "$@11", "MAYBE_CLASS_BODY", "CLASS_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
+  "\"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", "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_HEAD", "WITH", "X_IDENTIFIER", "PACKAGE",
+  "PACKAGE_DECLARATION", "$@8", "$@9", "IMPORT", "MAYBE_MODIFIERS",
+  "MODIFIER_LIST", "MODIFIER", "EXTENDS", "EXTENDS_LIST",
+  "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10", "INTERFACE_DECLARATION",
+  "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY", "CLASS_BODY_ITEM",
+  "MAYBE_INTERFACE_BODY", "INTERFACE_BODY", "IDECLARATION", "VARCONST",
+  "SLOT_DECLARATION", "$@12", "SLOT_LIST", "ONE_SLOT", "MAYBECONSTANT",
+  "CONSTANT", "XML", "OPEN", "CLOSE", "CLOSE2", "XMLEXPR1", "$@13",
+  "XMLEXPR2", "$@14", "XMLTEXT", "XML2", "XML_ID_OR_EXPR", "XMLNODE",
+  "MAYBE_XMLATTRIBUTES", "XMLATTRIBUTES", "XMLATTRIBUTE",
+  "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET",
+  "FUNCTION_DECLARATION", "$@15", "MAYBE_IDENTIFIER", "INNERFUNCTION",
+  "$@16", "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", "$@17", "ID_OR_NS", "SUBNODE",
+  "MEMBER", "VAR_READ", "NAMESPACE_ID", "NAMESPACE_DECLARATION",
+  "DEFAULT_NAMESPACE", "USE_NAMESPACE", 0
 };
 #endif
 
@@ -2606,48 +2698,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,
-     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.  */
-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,   184,
-     184,   185,   185,   187,   186,   188,   186,   189,   189,   190,
-     190,   191,   191,   192,   192,   192,   192,   192,   192,   192,
-     192,   192,   192,   193,   193,   194,   194,   195,   195,   197,
-     196,   199,   198,   200,   200,   201,   201,   202,   202,   202,
-     202,   202,   203,   203,   204,   204,   205,   205,   205,   206,
-     206,   208,   207,   209,   209,   210,   211,   211,   212,   212,
-     212,   212,   212,   212,   212,   212,   212,   213,   213,   213,
-     213,   214,   214,   215,   215,   216,   216,   216,   218,   217,
-     219,   219,   221,   220,   222,   223,   224,   224,   225,   225,
-     226,   226,   226,   227,   227,   228,   228,   229,   229,   229,
-     230,   231,   230,   232,   233,   234,   234,   235,   236,   236,
-     237,   238,   238,   239,   240,   240,   240,   240,   240,   240,
-     240,   241,   241,   241,   241,   241,   241,   241,   241,   241,
-     241,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   240,   240,   240,   240,   242,   242,   243,   243,   240,
-     240,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   240,   240,   244,   245,   245,   245,   246,   247
+       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,   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,   151,   152,
+     152,   153,   153,   154,   155,   155,   157,   156,   158,   158,
+     158,   159,   159,   160,   160,   161,   162,   164,   163,   166,
+     165,   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,   187,   187,   189,   188,   190,   188,
+     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,   226,   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.  */
@@ -2657,33 +2754,38 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     4,     1,     0,     1,     1,     2,     1,
        1,     1,     1,     1,     4,     1,     1,     0,     2,     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,     4,     2,     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,
+       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,     4,     2,
+       1,     1,     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,
+       1,     1,     1,     0,     0,     4,     0,     4,     0,     2,
+       2,     2,     2,     3,     1,     1,    10,     6,    11,     0,
+       1,     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,     2,     2,
        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,     3,     3,     3,     3,     4,     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
@@ -2691,836 +2793,936 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-     119,   303,   132,   236,   230,   233,   234,   231,   232,   235,
-       0,     0,    78,     0,     0,   125,   123,   124,     0,   131,
-       0,   130,   191,   237,   270,   126,     0,     0,     0,   240,
-     127,   129,   128,     0,     0,   239,   238,     0,     0,   275,
-       0,     0,    14,     0,     0,     0,     0,   207,   119,     0,
-       0,     2,   119,     5,    54,    12,     0,    36,    67,    31,
-      32,    33,    34,    35,    38,   119,    37,     7,    30,     0,
-     120,   121,     9,     8,    11,    10,   224,   227,   229,   228,
-     223,    39,   221,   225,   226,    41,    40,     0,     0,    72,
-      76,   119,    92,   109,   110,   115,   112,     0,     0,   303,
-     213,   190,     0,   269,     0,     0,   117,     0,   103,   207,
-       0,   217,    65,     0,   220,     0,   276,   295,   294,   272,
-     252,   251,     0,     0,   208,   209,   210,    82,     0,   106,
-     218,     0,    80,    44,    43,   119,    45,    29,     0,    46,
-      47,    48,    50,     0,    49,   297,     1,     6,   119,   303,
-       0,    68,     0,     0,    69,    53,   108,     0,   187,     0,
-     160,     0,   159,   161,   307,   122,     0,     0,     0,     0,
+     122,   345,   135,   174,   274,   171,   172,   173,     0,     0,
+      79,     0,     0,   128,   275,   126,   127,     0,   134,     0,
+     133,   222,   178,   179,   307,   129,     0,     0,     0,   177,
+     130,   132,   131,     0,     0,   176,   175,     0,     0,     0,
+     257,     0,     0,    14,   181,     0,     0,     0,     0,   238,
+     122,     0,     0,     2,   122,     5,    55,    12,     0,    37,
+      68,    32,    33,    34,    35,    36,    39,   122,    38,     7,
+      31,     0,   123,   124,     9,     8,    11,   272,   273,     0,
+     180,    10,   266,   268,   270,   269,    40,   255,   267,   271,
+      42,    30,    41,     0,     0,    73,    77,   122,    93,   110,
+     113,   112,   111,   118,   115,     0,     0,   345,   244,   221,
+       0,   306,     0,     0,   120,     0,   104,   238,     0,     0,
+     248,    66,   259,   260,   261,   262,   263,     0,     0,   258,
+     327,   326,   309,   289,   288,     0,   253,     0,   239,   240,
+     241,   251,    83,     0,   107,   249,     0,    81,    45,    44,
+     122,    46,    29,     0,    47,    48,    49,    51,     0,    50,
+     329,     1,     6,   122,   345,     0,    69,     0,     0,    70,
+      54,   109,     0,   218,     0,   163,     0,   162,   164,   349,
+     125,   194,     0,   195,   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,   293,
-     292,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   207,     0,     0,
-      55,    73,     0,     0,     0,   119,   113,     0,   194,     0,
-     197,   196,   308,   205,   177,     0,     0,     0,    27,     0,
-     296,     0,     0,   279,     0,   271,   274,   211,   212,    83,
-     204,    59,    60,   105,   219,    58,    81,    42,    28,   119,
-       0,   204,     0,     0,    52,   304,   186,   185,     0,   133,
-     135,     0,   222,   266,   267,   264,   265,   245,   246,   248,
-     247,   243,   244,   286,   285,   281,   280,   288,   289,   287,
-     283,   282,   284,   249,   250,   300,   258,   257,   256,   290,
-       0,   255,   254,   253,   241,   242,   262,   261,   259,   263,
-     260,     0,     0,   302,     0,     0,     0,     0,     0,    25,
-       0,   119,    17,    23,     0,    20,    19,    22,    21,   119,
-     111,     0,   207,   214,   166,     0,     0,   178,   182,   107,
-     195,   118,   268,     0,    26,   216,     0,   277,     0,     0,
-      57,     0,   119,    13,    57,     0,     0,     0,     0,     0,
-     137,     0,     0,   204,   162,   163,     0,   215,   273,     0,
-       0,   298,   119,     0,     0,   116,    18,   119,     0,     0,
-       0,     0,   184,   179,   204,     0,     0,   119,     0,   202,
-     201,   200,   203,     0,    62,    61,    51,     0,   119,   305,
-     306,   177,   134,     0,     0,   198,   136,   141,    57,     0,
-     291,   299,   301,    77,     0,    84,     0,   114,   206,   176,
-     172,   169,   170,   168,   171,   175,   174,   173,   167,   166,
-       0,     0,   181,     0,     0,    98,   102,   100,   104,    63,
-     278,    56,     0,    75,     0,   138,   139,     0,   119,   165,
-     164,    79,     0,     0,     0,    85,    88,    86,    24,   183,
-     192,   180,    96,     0,    99,   101,   119,    66,   119,   204,
-     119,   199,     0,   156,     0,     0,   119,   154,     0,    27,
-      93,    89,    87,    27,    27,   204,    64,    74,     0,   147,
-     151,     0,     0,     0,   119,   145,   149,   150,   157,   187,
-     142,   155,    27,    91,     0,     0,     0,   188,   119,   140,
-     146,     0,    90,   193,    97,    94,    27,     0,     0,     0,
-       0,   148,   177,    27,   189,     0,     0,   204,    95,   158
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   325,
+     324,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   238,     0,     0,
+      56,    74,     0,     0,     0,   122,   116,     0,   225,     0,
+     228,   227,   351,   236,   208,     0,   252,     0,     0,    27,
+       0,   328,     0,     0,   277,     0,     0,     0,   308,   276,
+     242,   243,    84,   235,    60,    61,   106,   250,    59,    82,
+      43,    28,   122,     0,   235,     0,     0,    53,   346,   217,
+     216,     0,   136,   138,     0,   186,     0,   203,     0,   200,
+     201,   256,   303,   304,   301,   302,   282,   283,   285,   284,
+     280,   281,   317,   316,   312,   311,   319,   320,   321,   318,
+     314,   313,   315,   286,   287,   336,     0,   335,   338,   295,
+     294,   293,   322,     0,   292,   291,   290,   278,   279,   299,
+     298,   296,   300,   297,     0,     0,   110,   113,   336,   330,
+       0,     0,     0,   344,     0,     0,     0,    25,     0,   122,
+      17,    23,     0,    20,    19,    22,    21,   122,   114,     0,
+     238,   245,   169,     0,     0,   209,   213,   108,   121,   226,
+     305,     0,    26,   247,   350,     0,   264,     0,   254,     0,
+      58,     0,   122,    13,    58,     0,     0,     0,     0,     0,
+     140,     0,     0,   235,   165,   166,     0,     0,     0,   182,
+     183,   188,   202,     0,   341,     0,   246,   310,     0,     0,
+       0,   340,     0,   122,     0,     0,   119,    18,   122,     0,
+       0,     0,     0,   215,   210,   235,     0,     0,   122,     0,
+     233,   232,   231,   234,     0,    63,    62,    52,     0,   122,
+     347,   348,   208,   137,     0,     0,   229,   139,   144,    58,
+       0,   187,   207,   206,   204,   205,     0,     0,     0,   323,
+       0,   339,     0,   337,    78,     0,    85,     0,   117,   237,
+     170,   169,     0,     0,   212,     0,     0,    99,   103,   101,
+     105,    64,   265,    57,     0,    76,     0,   141,   142,     0,
+     122,   168,   167,   197,   190,   181,   191,     0,   189,     0,
+     188,   343,   331,   342,    80,     0,     0,     0,    86,    89,
+      87,    24,   214,   223,   211,    97,     0,   100,   102,   122,
+      67,   122,   235,   122,   230,     0,   159,     0,     0,   122,
+     157,     0,   184,   181,   188,   192,     0,    27,    94,    90,
+      88,    27,    27,   235,    65,    75,     0,   150,   154,     0,
+       0,     0,   122,   148,   152,   153,   160,   218,   145,   158,
+     183,     0,     0,   193,    27,    92,     0,     0,     0,   219,
+     122,   143,   149,     0,     0,   185,   183,    91,   224,    98,
+      95,    27,     0,     0,   196,     0,     0,     0,   151,   208,
+     198,    27,   220,     0,     0,   235,    96,   161
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,    50,    51,    52,    53,   310,   311,   312,   333,   334,
-     136,   137,   156,   313,   138,   384,   139,   245,   242,   457,
-      57,   231,   152,   153,    58,    59,    60,    61,   212,    62,
-      91,   140,   141,   444,   445,   446,   447,    63,   214,   425,
-     509,   426,   474,   427,   428,    64,   228,   142,    65,    66,
-      96,   219,    67,   319,   215,    68,   143,    70,    71,   350,
-     352,   394,   315,   460,   316,   438,   483,   484,   485,   465,
-     466,   467,   163,   317,   261,   354,   355,   372,   418,   326,
-     327,   328,   258,   318,   506,   102,    76,   473,   220,   221,
-     381,   396,   382,   340,   323,   123,   124,   125,   223,    77,
-      78,    79,   144,   126,    80,    81,    82,    83,   115,   116,
-      84,   164,    85,    86
+      -1,    52,    53,    54,    55,   348,   349,   350,   371,   372,
+     151,   152,   171,   351,   153,   435,   154,   268,   265,   520,
+      59,   253,   167,   168,    60,    61,    62,    63,   232,    64,
+      97,   155,   156,   507,   508,   509,   510,    65,   234,   477,
+     586,   478,   542,   479,   480,    66,   249,   157,    67,    68,
+     238,   239,    69,   357,   235,    70,   158,    72,    73,   390,
+     392,   445,   353,   523,   354,   490,   551,   552,   553,   528,
+     529,   530,   178,   355,   284,   394,   395,   423,    77,    78,
+      79,   401,   456,   498,   561,   183,   396,   457,   499,   184,
+      80,   288,   289,   290,   364,   365,   366,   281,   356,   581,
+     110,    82,   541,   240,   241,   432,   447,   433,   380,   361,
+     137,   138,   139,   243,    83,    84,    85,   159,   140,   245,
+     246,    86,   127,   128,   129,    87,   408,   342,   318,    88,
+      89,   179,    90,    91,    92
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -388
+#define YYPACT_NINF -494
 static const yytype_int16 yypact[] =
 {
-    1673,   -42,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,
-     -29,   -72,  -388,   -47,    16,  -388,  -388,  -388,    74,  -388,
-    2093,  -388,    64,  -388,  2163,  -388,   -24,    42,    25,  -388,
-    -388,  -388,  -388,    -1,     5,  -388,  -388,  2093,    56,  2093,
-    2093,  2093,  -388,  2093,  2093,  2093,  2093,  2093,   633,   110,
-     144,  -388,   503,  -388,  -388,  -388,    50,  -388,  2023,  -388,
-    -388,  -388,  -388,  -388,  -388,  1925,  -388,  -388,  -388,    97,
-     233,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,
-     104,  -388,  2568,  -388,  -388,  -388,  -388,   196,    84,  -388,
-    -388,  1925,  -388,  -388,  -388,  -388,  -388,    85,    70,  -388,
-     -59,  -388,    91,   237,  2093,    87,  -388,  2093,  -388,  2093,
-     225,   237,  -388,   130,  2568,   106,   139,   237,   237,   174,
-     237,   237,   -61,   121,   147,  2093,  -388,   245,   253,  2093,
-    2093,   253,   255,  -388,  -388,   763,  -388,  -388,   135,  -388,
-    -388,  -388,  -388,   249,  -388,  -388,  -388,  -388,  1023,   195,
-     265,  -388,   170,   202,  -388,   173,  -388,   270,    72,   271,
-    -388,   272,  -388,  -388,  -388,  -388,  2093,  2093,  2093,  2093,
-    2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,
-    2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,  -388,
-    -388,   273,  2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,
-    2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,    11,
-    -388,  -388,  2093,   269,  2093,  1153,  -388,    42,   157,   158,
-    -388,  -388,  -388,   164,    13,   -57,    19,  2188,  1799,   160,
-    -388,  2093,  2093,  -388,  2093,  -388,  -388,  -388,  -388,  -388,
-     189,   197,  -388,   104,   104,   197,  -388,  -388,  -388,  1925,
-     163,   189,  2093,  2093,  -388,   198,  -388,  -388,   296,   251,
-     252,   305,  2568,   301,   495,   495,   495,  2934,  2934,  2934,
-    2934,   301,   301,  2568,  2568,  2568,  2568,  2568,  2568,  2568,
-    2568,  2568,  2568,  2629,  2690,  -388,   118,   118,   118,  2568,
-    2385,  2751,  2812,  2873,   301,   301,   174,   174,   237,   237,
-     237,   177,  2446,   226,  2093,   311,   -56,   194,  2259,  -388,
-     185,  1283,  -388,  -388,   192,  -388,  -388,  -388,  -388,  1153,
-    -388,   119,  2093,  -388,   100,   320,   191,   230,  -388,  -388,
-     157,  -388,  -388,   193,  1799,  -388,   -54,  -388,   221,    22,
-     229,   253,   893,  -388,   -28,    31,   -16,    99,   210,    70,
-     317,    70,   212,   189,   236,  -388,  2093,  -388,  -388,   339,
-    2322,  -388,  1925,  2093,   213,  -388,  -388,  1153,   214,   217,
-      54,    22,  -388,  -388,   189,    15,   112,  1925,  2093,  -388,
-    -388,  -388,  -388,  2093,  -388,  -388,  -388,  2093,  1925,  -388,
-    -388,    13,  -388,    70,   219,  -388,   247,  -388,   229,   305,
-    2568,  -388,  -388,  -388,   -15,    26,   220,  -388,  -388,  -388,
-    -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,   261,
-     227,   320,  -388,   240,   250,  -388,  -388,   112,  -388,   286,
-    -388,  -388,   222,  -388,   242,   247,  -388,    70,   203,  -388,
-    -388,  -388,  2093,   274,   246,    26,  -388,  -388,  -388,  -388,
-    -388,  -388,  -388,   377,  -388,  -388,  1925,  -388,  1925,   189,
-    1413,  -388,   378,  -388,   359,   256,   336,  -388,  2507,  1799,
-    -388,  -388,  -388,  1799,  1799,   189,  -388,  -388,   263,  -388,
-    -388,   264,    51,   262,  1543,  -388,  -388,  -388,  -388,    72,
-    -388,  -388,  1799,  -388,   266,   267,   254,  -388,  1413,  -388,
-    -388,   397,  -388,  -388,  -388,  -388,  1799,   275,   280,   278,
-     276,  -388,    13,  1799,  -388,   279,   277,   189,  -388,  -388
+    1763,   -21,  -494,  -494,  -494,  -494,  -494,  -494,   -29,   -45,
+    -494,   -36,    68,  -494,  -494,  -494,  -494,    75,  -494,  2217,
+    -494,    91,  -494,  -494,   438,  -494,   -15,   316,    -5,  -494,
+    -494,  -494,  -494,     7,   -37,  -494,  -494,   107,  2217,    24,
+     367,  2217,  2217,  -494,  -494,  2217,  2217,  2217,  2217,  2217,
+     707,   127,   139,  -494,   575,  -494,  -494,  -494,    23,  -494,
+    2145,  -494,  -494,  -494,  -494,  -494,  -494,  2019,  -494,  -494,
+    -494,   488,   431,  -494,  -494,  -494,  -494,  -494,  -494,    17,
+    -494,  -494,  -494,  -494,  -494,  -494,    57,  2920,  -494,  -494,
+    -494,  -494,  -494,   155,    36,  -494,  -494,  2019,  -494,  -494,
+    -494,  -494,  -494,  -494,  -494,    28,   316,  -494,   -48,  -494,
+      47,   213,  2217,    69,  -494,  2217,  -494,  2217,   194,   116,
+     213,  -494,  -494,  -494,  -494,  -494,  -494,    92,   121,   132,
+     213,   213,   379,   213,   213,   -42,  2858,   114,   146,  2217,
+    -494,  2858,   246,   247,  2217,  2217,   247,   249,  -494,  -494,
+     839,  -494,  -494,   125,  -494,  -494,  -494,  -494,   248,  -494,
+    -494,  -494,  -494,  1103,   197,   264,  -494,   168,   203,    57,
+     173,  -494,   274,    66,   276,  -494,   278,  -494,  -494,  -494,
+    -494,  -494,  2217,  -494,    21,  2217,  2217,  2217,  2217,  2217,
+    2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,
+    2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,  -494,
+    -494,   138,  2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,
+    2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,   130,
+    -494,  -494,  2217,   273,  2217,  1235,  -494,   316,   158,   160,
+    -494,  -494,  -494,   167,    15,   157,   192,   229,  2276,  1891,
+     165,  -494,  2217,  2217,  -494,  2217,   367,  2217,  -494,  -494,
+    -494,  -494,  -494,   207,   212,  -494,  -494,  -494,   212,  -494,
+    -494,  -494,  2019,   181,   207,  2217,  2217,  -494,   217,  -494,
+    -494,   314,   262,   269,   315,  2858,   220,   221,     6,    21,
+    -494,  2858,  1095,   567,   567,   567,  3292,  3292,  3292,  3292,
+    1095,  1095,  2858,  2858,  2858,  2858,  2858,  2858,  2858,  2858,
+    2858,  2858,  2858,  2982,  3044,  -494,   214,  -494,  -494,   313,
+     313,   313,  2858,  2486,  3106,  3168,  3230,  1095,  1095,   379,
+     379,   213,   213,   213,   199,  2548,   238,   244,   245,  -494,
+    2217,   267,   254,  -494,   226,   224,  2346,  -494,   228,  1367,
+    -494,  -494,   235,  -494,  -494,  -494,  -494,  1235,  -494,   316,
+    2217,  -494,   -55,   363,   232,   280,  -494,  -494,  -494,   240,
+    -494,   237,  1891,  -494,  2858,   243,  -494,   277,  2858,   292,
+     281,   247,   971,  -494,    -6,   279,   252,   135,   270,   316,
+     376,   316,   268,   207,   296,  -494,   265,    22,    34,  -494,
+    -494,  -494,  -494,  2217,  -494,  2217,  -494,  -494,  2217,  2610,
+    2217,  -494,   294,  2019,  2217,   272,  -494,  -494,  1235,   283,
+     275,  2217,   292,  -494,  -494,   207,    19,    78,  2019,  2217,
+    -494,  -494,  -494,  -494,  2217,  -494,  -494,  -494,  2217,  2019,
+    -494,  -494,    15,  -494,   316,   284,  -494,   300,  -494,   281,
+     315,  -494,  -494,  -494,  -494,  -494,   291,   253,  2672,  2858,
+    2416,  -494,  2734,  -494,  -494,   287,    46,   289,  -494,  -494,
+    2858,   309,   286,   363,  -494,   297,   312,  -494,  -494,    78,
+    -494,   338,  -494,  2858,   -38,  -494,   298,   300,  -494,   316,
+      27,  -494,  -494,  -494,  -494,   299,  -494,  2217,  -494,   327,
+    -494,  -494,  -494,  -494,  -494,  2217,   318,   306,    46,  -494,
+    -494,  -494,  -494,  -494,  -494,  -494,   442,  -494,  -494,  2019,
+    -494,  2019,   207,  1499,  -494,   447,  -494,   427,   321,   255,
+    -494,    17,  2858,   342,  -494,    25,  2796,  1891,  -494,  -494,
+    -494,  1891,  1891,   207,  -494,  -494,   332,  -494,  -494,   335,
+     328,   331,  1631,  -494,  -494,  -494,  -494,    66,  -494,  -494,
+    -494,   334,    17,    25,  1891,  -494,   336,   340,   341,  -494,
+    1499,  -494,  -494,   472,   365,  -494,  -494,  -494,  -494,  -494,
+    -494,  1891,   347,   358,  -494,   373,   359,   352,  -494,    15,
+    -494,  1891,  -494,   353,   355,   207,  -494,  -494
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -388,  -388,   257,  -388,   354,  -296,  -388,   107,  -387,   -31,
-       1,   -55,   -85,    29,     2,    21,   362,   293,    81,  -388,
-    -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,
-    -388,  -388,  -388,  -388,  -388,   -21,   -19,  -388,  -388,     6,
-    -388,     7,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,
-    -175,    76,  -388,  -388,  -388,  -388,     0,  -388,   357,  -388,
-    -388,  -388,    48,  -388,    49,  -388,   -68,  -388,   -53,  -388,
-    -388,   -30,  -388,     3,  -388,  -388,    33,    18,  -388,  -376,
-    -388,  -305,   -49,     4,  -388,  -388,  -388,  -388,  -388,   412,
-     -89,    52,    71,  -239,  -388,   -96,  -388,  -388,  -388,  -388,
-    -388,  -388,  -388,   -34,    -9,   -50,   -13,  -388,  -388,  -388,
-    -388,  -388,  -388,  -388
+    -494,  -494,   337,  -494,   444,  -315,  -494,   150,  -475,   -34,
+       1,   -60,   -87,    53,     2,    52,   446,   364,   129,  -494,
+    -494,  -494,  -494,  -494,  -494,  -494,  -494,  -494,  -494,  -494,
+    -494,  -494,  -494,  -494,  -494,     5,     8,  -494,  -494,    32,
+    -494,    33,  -494,  -494,  -494,  -494,  -494,  -494,  -494,  -494,
+      14,    56,  -494,  -494,  -494,  -494,     0,  -494,   430,  -494,
+    -494,  -494,    59,  -494,    61,  -494,   -53,  -494,   -31,  -494,
+    -494,   -14,  -494,     3,  -494,  -494,    72,    62,  -494,  -494,
+    -494,  -494,  -464,  -494,  -494,  -169,  -494,  -457,  -494,  -493,
+    -413,  -494,  -494,   239,  -419,  -494,  -344,   -39,     4,  -494,
+    -494,  -494,  -494,  -494,   508,  -101,    93,   117,  -257,  -494,
+    -103,  -494,  -494,  -494,  -494,  -494,  -494,  -494,  -130,  -132,
+     490,   -52,  -494,   285,  -494,   -13,  -494,  -494,  -189,  -494,
+    -494,  -494,  -494,  -494,  -494
 };
 
 /* 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 -154
+#define YYTABLE_NINF -335
 static const yytype_int16 yytable[] =
 {
-      69,    54,    56,    74,    75,   113,   213,   100,   154,   222,
-     155,   103,   344,   229,   303,   434,   324,   135,   324,    93,
-     373,    88,   330,   368,   111,   218,   114,   117,   118,    55,
-     119,   120,   121,   191,   114,    94,   155,   122,    94,   166,
-     -70,    94,   320,   166,   166,    93,   166,    87,    72,    73,
-      90,   320,    69,    54,    56,    74,    75,   409,   379,   410,
-     442,    94,   411,   412,   413,   208,   414,   101,   209,   157,
-     422,   406,   235,   218,   383,    92,   329,   362,   158,   377,
-     248,    55,   493,   160,   166,   166,   494,   495,   443,    94,
-      97,   238,    98,    89,   227,   225,   114,   162,   104,   415,
-      72,    73,   389,   105,   390,   502,   325,   256,   421,   416,
-     417,   301,   114,   145,   398,   157,   451,   388,   441,   510,
-     243,   244,   330,   257,   158,   108,   516,   109,   159,   160,
-     387,   166,   110,   304,   331,   420,   515,   380,    94,   305,
-     423,   161,    95,   162,   146,   424,   320,   107,    69,    54,
-      56,    74,    75,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   148,    55,   112,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   114,   302,    72,    73,   337,   210,
-     338,   308,   370,   306,   166,   371,   211,     2,   189,   190,
-     191,   216,   217,   224,   226,    69,    54,   314,   342,   114,
-     478,   114,   336,    15,    16,    17,   369,    19,   230,    21,
-     202,   203,   204,   205,   206,   232,   496,     2,   233,   234,
-     207,    25,   208,   345,   346,   209,   236,   237,   239,   462,
-      30,    31,    32,    15,    16,    17,   240,    19,   246,    21,
-     392,   249,   395,   -71,   189,   190,   191,   157,   251,   252,
-     253,    25,   254,   255,   259,   260,   285,   403,   519,   248,
-      30,    31,    32,   307,  -109,   321,   322,   248,   204,   205,
-     206,   360,   429,   335,   339,   343,   207,   341,   208,   348,
-     347,   209,   463,   433,   395,   349,   351,   155,   353,   114,
-     357,    69,    54,   314,   361,   359,   363,   365,   367,    69,
-      54,   314,   155,   324,   374,   376,   378,   189,   190,   191,
-     375,   383,   391,   155,   393,  -152,   399,   432,   397,   405,
-       2,  -154,   401,   400,   430,   436,   407,   437,   461,   431,
-     408,   456,   448,   450,   404,   458,    15,    16,    17,   207,
-      19,   208,    21,   370,   209,   114,   452,    69,    54,   314,
-     114,   476,   453,   477,    25,   459,  -154,  -154,   470,   469,
-     475,   488,   462,    30,    31,    32,   489,   505,   490,   497,
-     498,   189,   190,   191,   499,   192,   193,   194,   503,   504,
-     508,   155,   512,   155,   513,   250,   147,   511,   514,   518,
-    -154,  -154,   517,   202,   203,   204,   205,   206,   366,   439,
-     151,   241,   385,   207,   471,   208,   472,   165,   209,   468,
-     507,   500,   440,   454,   455,   463,   491,   449,   464,   106,
-     501,     0,   419,     0,     0,   435,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     482,   480,   481,   486,   487,     0,   464,     0,  -153,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   482,   480,   481,   486,   487,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   482,   480,
-     481,   486,   487,    -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,   167,     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,  -154,  -154,  -154,     0,    37,    38,     0,     0,
-     175,   176,     0,    39,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   189,   190,   191,     0,   192,
-     193,   194,     0,    40,    41,     0,     0,     0,     0,     0,
-       0,     0,    42,     0,   200,   201,     0,   202,   203,   204,
-     205,   206,     0,     0,     0,    43,     0,   207,     0,   208,
-      44,    45,   209,     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,   127,     0,   128,     0,     0,     0,    24,
-     129,    25,    26,     0,    27,   130,    28,     0,    29,   131,
-      30,    31,    32,     0,     0,    33,    34,     0,    35,    36,
-       0,     0,     0,     0,     0,     0,    37,    38,     0,   132,
-       0,     0,     0,    39,     0,     0,     0,     0,     0,     0,
+      71,    56,    58,    76,    81,   242,   108,   170,   169,   261,
+     233,   111,   266,   267,   250,   287,   150,   384,   362,   424,
+     181,    94,   362,   486,   286,   120,   104,   452,   130,   131,
+     494,     2,   132,   133,   134,   136,   141,   170,   560,   454,
+     343,   104,   419,   535,   500,    13,   211,    15,    16,   421,
+      18,   422,    20,    57,    71,    56,    58,    76,    81,    74,
+     257,    75,   565,   -71,   185,    25,   566,   567,   105,   576,
+      93,    99,   100,   525,    30,    31,    32,   563,   228,    96,
+     505,   229,   474,   113,   101,   102,   534,   117,    98,   577,
+     271,   106,   118,   258,   109,    95,   574,   521,   434,   136,
+     344,   279,   248,   467,   141,   475,   587,    57,   506,   112,
+     363,   476,   585,    74,   473,    75,   594,   280,   399,   115,
+     287,   375,   400,   119,   334,   376,   141,   404,   526,   514,
+     160,   136,   136,   336,   337,   116,   449,   496,   440,   161,
+     441,    99,   100,   385,   386,   182,   101,   102,   121,   182,
+     182,   163,   411,   497,   101,   102,   236,   237,   230,   185,
+     231,  -155,   182,    71,    56,    58,    76,    81,   472,   285,
+     593,   244,   291,   292,   293,   294,   295,   296,   297,   298,
+     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,   313,   314,   103,   251,   247,   319,
+     320,   321,   322,   323,   324,   325,   326,   327,   328,   329,
+     330,   331,   332,   333,   141,   335,    57,    99,   100,   136,
+     252,   346,    74,   463,    75,   317,   254,   255,   453,   455,
+     101,   102,    99,   100,   256,    71,    56,   352,   382,   374,
+     136,   259,   141,   317,   378,   101,   102,   338,   260,   262,
+     263,   358,   269,   272,   339,   315,   340,   420,   494,     2,
+     341,   369,   136,   136,   172,   546,   -72,   274,   316,   275,
+      99,   100,   276,    13,   277,    15,    16,   278,    18,   282,
+      20,   283,   465,   101,   102,   345,   568,  -115,   443,   359,
+     446,   360,   367,    25,   257,    99,   100,    99,   100,   482,
+     373,   525,    30,    31,    32,   209,   210,   211,   101,   102,
+     101,   102,   271,   379,   381,   383,   389,   388,   393,    99,
+     100,   387,   271,   391,   397,   398,   464,   409,   430,  -332,
+     317,   315,   101,   102,   406,  -334,  -333,   227,   597,   228,
+     403,   481,   229,   446,   172,   412,   368,   141,   414,    71,
+      56,   352,   485,   170,   173,   317,   526,    71,    56,   352,
+     175,   413,   416,   418,   495,   496,   362,   425,   170,  -114,
+     122,   427,   123,   369,   177,   124,   125,   126,   428,   170,
+     438,   497,   426,   429,   315,   434,   484,   439,   524,  -156,
+     458,   444,   459,   410,   442,   460,   448,   462,   450,   451,
+     466,   136,   489,   493,   519,   209,   210,   211,   470,   431,
+     469,   315,   488,   421,   513,   531,   141,   468,    71,    56,
+     352,   483,   504,   511,   537,   515,   317,   222,   223,   224,
+     225,   226,   544,   522,   545,     2,   516,   227,   533,   228,
+     538,   107,   229,     3,     4,   543,     5,     6,     7,    13,
+     556,    15,    16,   557,    18,   558,    20,    14,   562,   170,
+     569,   170,    19,   570,    21,   571,    22,    23,   575,    25,
+     578,   209,   210,   211,   579,   583,   580,   584,    30,    31,
+      32,   588,   589,    29,   532,   590,   592,   591,   595,   596,
+     527,    34,   536,    35,    36,   224,   225,   226,   162,   417,
+     273,   491,   180,   227,   172,   228,   166,   264,   229,    40,
+     436,   517,   518,   539,   173,   559,   540,   582,   573,   174,
+     175,   572,   492,   550,   548,   549,   554,   555,   402,   527,
+      41,    42,   176,   512,   177,   114,     0,   487,   135,   471,
+       0,   377,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   550,   548,   549,   554,   555,     0,     0,     0,
+       0,     0,    48,     0,    49,     0,     0,     0,    51,     0,
+     550,   548,   549,   554,   555,    -4,     0,     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,   186,     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,  -335,  -335,  -335,    37,    38,
+      39,     0,     0,   194,   195,     0,    40,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   209,
+     210,   211,     0,   212,   213,   214,     0,    41,    42,     0,
+       0,     0,     0,     0,     0,     0,    43,     0,   220,   221,
+       0,   222,   223,   224,   225,   226,    44,     0,     0,    45,
+       0,   227,     0,   228,    46,    47,   229,     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,   142,     0,   143,
+       0,     0,     0,    24,   144,    25,    26,     0,    27,   145,
+      28,     0,    29,   146,    30,    31,    32,     0,     0,    33,
+      34,     0,    35,    36,     0,     0,     0,     0,     0,     0,
+      37,    38,    39,     0,   147,     0,     0,     0,    40,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    40,    41,     0,     0,     0,     0,     0,
-       0,     0,   133,     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,   134,     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,   127,     0,   128,     0,     0,     0,    24,
-     129,    25,    26,     0,    27,   130,    28,     0,    29,   131,
-      30,    31,    32,     0,     0,    33,    34,     0,    35,    36,
-       0,     0,     0,     0,     0,     0,    37,    38,     0,   132,
-       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,   148,     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,    21,     0,    22,    23,   142,
+       0,   143,     0,     0,     0,    24,   144,    25,    26,     0,
+      27,   145,    28,     0,    29,   146,    30,    31,    32,     0,
+       0,    33,    34,     0,    35,    36,     0,     0,     0,     0,
+       0,     0,    37,    38,    39,     0,   147,     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,   133,     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,   247,     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,   127,     0,   128,     0,     0,     0,    24,
-     129,    25,    26,     0,    27,   130,    28,     0,    29,   131,
-      30,    31,    32,     0,     0,    33,    34,     0,    35,    36,
-       0,     0,     0,     0,     0,     0,    37,    38,     0,   132,
-       0,     0,     0,    39,     0,     0,     0,     0,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
+     148,     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,   270,     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,   142,     0,   143,     0,     0,     0,    24,   144,    25,
+      26,     0,    27,   145,    28,     0,    29,   146,    30,    31,
+      32,     0,     0,    33,    34,     0,    35,    36,     0,     0,
+       0,     0,     0,     0,    37,    38,    39,     0,   147,     0,
+       0,     0,    40,     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,   133,     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,   386,     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,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,   148,     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,   437,     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,  -335,     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,    37,    38,    39,     0,
+       0,  -335,  -335,     0,    40,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   209,   210,   211,
+       0,   212,   213,   214,     0,    41,    42,     0,     0,     0,
+       0,     0,     0,     0,    43,     0,  -335,  -335,     0,   222,
+     223,   224,   225,   226,    44,     0,     0,    45,     0,   227,
+       0,   228,    46,    47,   229,     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,    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,     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,    41,    42,     0,
+       0,     0,     0,     0,     0,     0,   347,     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,   -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,    40,    41,     0,     0,     0,     0,     0,
-       0,     0,   309,     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,    41,
+      42,     0,     0,     0,     0,     0,     0,     0,   347,     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,   -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,     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,   309,     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,
+     547,     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,  -146,     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,    40,    41,     0,     0,     0,     0,     0,
-       0,     0,   479,     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,  -143,     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,   547,     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,  -147,     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,     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,    40,    41,     0,     0,     0,     0,     0,
-       0,     0,   479,     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,  -144,     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,    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,  -122,     0,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,     0,    22,
+      23,   142,     0,   143,     0,     0,     0,    24,   144,    25,
+      26,     0,    27,   145,    28,     0,    29,   146,    30,    31,
+      32,     0,     0,    33,    34,     0,    35,    36,     0,     0,
+       0,     0,     0,     0,    37,    38,    39,     0,   147,     0,
+       0,     0,    40,     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,  -119,     0,    15,
-      16,    17,    18,    19,    20,    21,    22,     0,    23,   127,
-       0,   128,     0,     0,     0,    24,   129,    25,    26,     0,
-      27,   130,    28,     0,    29,   131,    30,    31,    32,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,   148,     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,   142,
+       0,   143,     0,     0,     0,    24,   144,    25,    26,     0,
+      27,   145,    28,     0,    29,   146,    30,    31,    32,     0,
        0,    33,    34,     0,    35,    36,     0,     0,     0,     0,
-       0,     0,    37,    38,     0,   132,     0,     0,     0,    39,
-       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,   133,     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,   127,     0,   128,     0,     0,
-       0,    24,   129,    25,    26,     0,    27,   130,    28,     0,
-      29,   131,    30,    31,    32,     0,     0,    33,    34,     0,
-      35,    36,     0,     0,     0,     0,     0,     0,    37,    38,
-       0,   132,     0,     0,     0,    39,     0,     0,     0,     0,
+       0,     0,    37,    38,    39,     0,   147,     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,   133,     0,   149,     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,   128,     0,     0,     0,    24,
-       0,     0,     0,     0,     0,     0,    28,     0,    29,   150,
-       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,    99,     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,    99,     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,   167,     0,
-       0,     0,     0,    39,     0,     0,     0,     0,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
+     148,     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,   164,    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,   143,     0,     0,
+       0,    24,     0,     0,     0,     0,     0,     0,    28,     0,
+      29,   165,     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,
+     107,     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,     0,     0,     0,
+       0,    38,     0,     0,     0,     0,     0,     0,    40,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    40,    41,   168,   169,   170,     0,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,     0,   189,   190,
-     191,     0,   192,   193,   194,    46,     0,    47,     0,     0,
-     195,    49,   196,     0,   197,   198,   199,   200,   201,   167,
-     202,   203,   204,   205,   206,     0,     0,     0,     0,     0,
-     207,     0,   208,     0,     0,   209,     0,     0,     0,     0,
-       0,   332,     0,     0,     0,     0,   168,   169,   170,     0,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,     0,   189,
-     190,   191,     0,   192,   193,   194,     0,     0,     0,     0,
-       0,   195,   167,   196,     0,   197,   198,   199,   200,   201,
-       0,   202,   203,   204,   205,   206,     0,     0,     0,     0,
-       0,   207,     0,   208,     0,     0,   209,     0,     0,   168,
-     169,   170,   364,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,     0,   189,   190,   191,     0,   192,   193,   194,     0,
-       0,     0,     0,     0,   195,   167,   196,     0,   197,   198,
-     199,   200,   201,     0,   202,   203,   204,   205,   206,     0,
-       0,     0,     0,     0,   207,     0,   208,     0,     0,   209,
-       0,     0,   168,   169,   170,   402,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,     0,   189,   190,   191,     0,   192,
-     193,   194,     0,     0,     0,     0,   167,   195,     0,   196,
-     356,   197,   198,   199,   200,   201,     0,   202,   203,   204,
-     205,   206,     0,     0,     0,     0,     0,   207,     0,   208,
-       0,     0,   209,   168,   169,   170,     0,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,   185,   186,   187,   188,     0,   189,   190,   191,     0,
-     192,   193,   194,     0,     0,     0,     0,   167,   195,     0,
-     196,     0,   197,   198,   199,   200,   201,     0,   202,   203,
-     204,   205,   206,     0,     0,     0,     0,     0,   207,     0,
-     208,   358,     0,   209,   168,   169,   170,     0,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,     0,   189,   190,   191,
-       0,   192,   193,   194,     0,     0,     0,     0,   167,   195,
-       0,   196,   492,   197,   198,   199,   200,   201,     0,   202,
-     203,   204,   205,   206,     0,     0,     0,     0,     0,   207,
-       0,   208,     0,     0,   209,   168,   169,   170,     0,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,     0,   189,   190,
-     191,     0,   192,   193,   194,     0,     0,     0,     0,   167,
-     195,     0,   196,     0,   197,   198,   199,   200,   201,     0,
-     202,   203,   204,   205,   206,     0,     0,     0,     0,     0,
-     207,     0,   208,     0,     0,   209,   168,   169,   170,     0,
-     171,   172,   173,   174,   175,   176,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   188,     0,   189,
-     190,   191,     0,   192,   193,   194,     0,     0,     0,     0,
-     167,     0,     0,     0,     0,   197,   198,   199,   200,   201,
-       0,   202,   203,   204,   205,   206,     0,     0,     0,     0,
-       0,   207,     0,   208,     0,     0,   209,   168,   169,   170,
-       0,   171,   172,   173,   174,   175,   176,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    41,
+      42,     0,     0,     0,     0,     0,   186,     0,     0,     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,   187,   188,   189,    51,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,     0,   209,   210,
+     211,     0,   212,   213,   214,     0,     0,     0,     0,     0,
+     215,   216,     0,   217,   218,   219,   186,   220,   221,     0,
+     222,   223,   224,   225,   226,     0,     0,     0,     0,     0,
+     227,     0,   228,     0,     0,   229,     0,     0,     0,     0,
+       0,   370,     0,     0,   187,   188,   189,     0,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,     0,   209,   210,
+     211,     0,   212,   213,   214,     0,     0,     0,     0,     0,
+     215,   216,     0,   217,   218,   219,   186,   220,   221,     0,
+     222,   223,   224,   225,   226,     0,     0,     0,     0,     0,
+     227,     0,   228,     0,     0,   229,     0,     0,     0,     0,
+       0,   415,     0,     0,   187,   188,   189,     0,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,     0,   209,   210,
+     211,     0,   212,   213,   214,     0,     0,     0,     0,     0,
+     215,   216,     0,   217,   218,   219,   186,   220,   221,     0,
+     222,   223,   224,   225,   226,     0,     0,     0,     0,     0,
+     227,     0,   228,     0,     0,   229,     0,     0,     0,     0,
+       0,   502,     0,     0,   187,   188,   189,     0,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,     0,   209,   210,
+     211,     0,   212,   213,   214,     0,     0,     0,   186,     0,
+     215,   216,   405,   217,   218,   219,     0,   220,   221,     0,
+     222,   223,   224,   225,   226,     0,     0,     0,     0,     0,
+     227,     0,   228,     0,     0,   229,   187,   188,   189,     0,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,     0,
+     209,   210,   211,     0,   212,   213,   214,     0,     0,     0,
+     186,     0,   215,   216,     0,   217,   218,   219,     0,   220,
+     221,     0,   222,   223,   224,   225,   226,     0,     0,     0,
+       0,     0,   227,     0,   228,   407,     0,   229,   187,   188,
+     189,     0,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,     0,   209,   210,   211,     0,   212,   213,   214,     0,
+       0,     0,   186,     0,   215,   216,     0,   217,   218,   219,
+       0,   220,   221,     0,   222,   223,   224,   225,   226,     0,
+       0,     0,     0,     0,   227,     0,   228,   461,     0,   229,
+     187,   188,   189,     0,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,     0,   209,   210,   211,     0,   212,   213,
+     214,     0,     0,     0,   186,     0,   215,   216,     0,   217,
+     218,   219,     0,   220,   221,     0,   222,   223,   224,   225,
+     226,     0,     0,     0,     0,     0,   227,     0,   228,   501,
+       0,   229,   187,   188,   189,     0,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,     0,   209,   210,   211,     0,
+     212,   213,   214,     0,     0,     0,   186,     0,   215,   216,
+       0,   217,   218,   219,     0,   220,   221,     0,   222,   223,
+     224,   225,   226,     0,     0,     0,     0,     0,   227,     0,
+     228,   503,     0,   229,   187,   188,   189,     0,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,     0,   209,   210,
+     211,     0,   212,   213,   214,     0,     0,     0,   186,     0,
+     215,   216,   564,   217,   218,   219,     0,   220,   221,     0,
+     222,   223,   224,   225,   226,     0,     0,     0,     0,     0,
+     227,     0,   228,     0,     0,   229,   187,   188,   189,     0,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,     0,
+     209,   210,   211,     0,   212,   213,   214,     0,     0,     0,
+     186,     0,   215,   216,     0,   217,   218,   219,     0,   220,
+     221,     0,   222,   223,   224,   225,   226,     0,     0,     0,
+       0,     0,   227,     0,   228,     0,     0,   229,   187,   188,
+     189,     0,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,     0,   209,   210,   211,     0,   212,   213,   214,     0,
+       0,     0,   186,     0,   215,   216,     0,   217,   218,   219,
+       0,     0,   221,     0,   222,   223,   224,   225,   226,     0,
+       0,     0,     0,     0,   227,     0,   228,     0,     0,   229,
+     187,   188,   189,     0,   190,   191,   192,   193,   194,   195,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     189,   190,   191,     0,   192,   193,   194,     0,     0,     0,
-       0,   167,     0,     0,     0,     0,   197,   198,   199,   200,
-     201,     0,   202,   203,   204,   205,   206,     0,     0,     0,
-       0,     0,   207,     0,   208,     0,     0,   209,   168,   169,
-     170,     0,   171,   172,   173,   174,   175,   176,     0,     0,
+       0,     0,   208,     0,   209,   210,   211,     0,   212,   213,
+     214,     0,     0,     0,   186,     0,     0,     0,     0,   217,
+     218,   219,     0,   220,   221,     0,   222,   223,   224,   225,
+     226,     0,     0,     0,     0,     0,   227,     0,   228,     0,
+       0,   229,   187,   188,   189,     0,   190,   191,   192,   193,
+     194,   195,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   209,   210,   211,     0,
+     212,   213,   214,     0,     0,     0,   186,     0,     0,     0,
+       0,   217,   218,   219,     0,   220,   221,     0,   222,   223,
+     224,   225,   226,     0,     0,     0,     0,     0,   227,     0,
+     228,     0,     0,   229,   187,   188,   189,     0,   190,   191,
+     192,   193,   194,   195,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   209,   210,
+     211,     0,   212,   213,   214,     0,     0,     0,   186,     0,
+       0,     0,     0,     0,   218,   219,     0,   220,   221,     0,
+     222,   223,   224,   225,   226,     0,     0,     0,     0,     0,
+     227,     0,   228,     0,     0,   229,   187,   188,   189,     0,
+     190,   191,   192,   193,   194,   195,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   189,   190,   191,     0,   192,   193,   194,     0,     0,
-       0,     0,   167,     0,     0,     0,     0,     0,   198,   199,
-     200,   201,     0,   202,   203,   204,   205,   206,     0,     0,
-       0,     0,     0,   207,     0,   208,     0,     0,   209,   168,
-     169,   170,     0,   171,   172,   173,   174,   175,   176,     0,
+     209,   210,   211,     0,   212,   213,   214,     0,     0,     0,
+     186,     0,     0,     0,     0,     0,     0,   219,     0,   220,
+     221,     0,   222,   223,   224,   225,   226,     0,     0,     0,
+       0,     0,   227,     0,   228,     0,     0,   229,   187,   188,
+     189,     0,   190,   191,   192,   193,   194,   195,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   189,   190,   191,     0,   192,   193,   194,     0,
-       0,     0,     0,   167,     0,     0,     0,     0,     0,     0,
-     199,   200,   201,     0,   202,   203,   204,   205,   206,     0,
-       0,     0,     0,     0,   207,     0,   208,     0,     0,   209,
-     168,   169,   170,     0,   171,   172,   173,   174,   175,   176,
+       0,     0,   209,   210,   211,     0,   212,   213,   214,     0,
+       0,     0,   186,     0,     0,     0,     0,     0,     0,  -335,
+       0,   220,   221,     0,   222,   223,   224,   225,   226,     0,
+       0,     0,     0,     0,   227,     0,   228,     0,     0,   229,
+     187,   188,   189,     0,  -335,  -335,  -335,  -335,   194,   195,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   189,   190,   191,     0,   192,   193,   194,
-       0,     0,     0,     0,   167,     0,     0,     0,     0,     0,
-       0,  -154,   200,   201,     0,   202,   203,   204,   205,   206,
-       0,     0,     0,     0,     0,   207,     0,   208,     0,     0,
-     209,   168,   169,   170,     0,  -154,  -154,  -154,  -154,   175,
-     176,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   189,   190,   191,     0,   192,   193,
-     194,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   200,   201,     0,   202,   203,   204,   205,
-     206,     0,     0,     0,     0,     0,   207,     0,   208,     0,
-       0,   209
+       0,     0,     0,     0,   209,   210,   211,     0,   212,   213,
+     214,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   220,   221,     0,   222,   223,   224,   225,
+     226,     0,     0,     0,     0,     0,   227,     0,   228,     0,
+       0,   229
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,     0,     0,     0,     0,    39,    91,    20,    58,    98,
-      65,    24,   251,   109,     3,   391,     3,    48,     3,     3,
-     325,    50,     3,   319,    37,     3,    39,    40,    41,     0,
-      43,    44,    45,    92,    47,    19,    91,    46,    19,   100,
-      68,    19,   217,   100,   100,     3,   100,    89,     0,     0,
-     122,   226,    52,    52,    52,    52,    52,     3,    36,     5,
-      34,    19,     8,     9,    10,   124,    12,     3,   127,    18,
-     375,   367,   133,     3,   102,   122,   133,   133,    27,   133,
-     135,    52,   469,    32,   100,   100,   473,   474,    62,    19,
-      14,   125,    18,   122,   107,   104,   109,    46,   122,    45,
-      52,    52,     3,    27,     5,   492,    93,    35,    93,    55,
-      56,   207,   125,     3,   353,    18,   421,   133,   133,   506,
-     129,   130,     3,    51,    27,   126,   513,   122,    31,    32,
-      99,   100,   127,   122,   115,   374,   512,   115,    19,   128,
-      28,    44,   126,    46,     0,    33,   321,   122,   148,   148,
-     148,   148,   148,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,   126,   148,   122,   192,
+       0,     0,     0,     0,     0,   106,    19,    67,    60,   139,
+      97,    24,   144,   145,   117,   184,    50,   274,     3,   363,
+       3,    50,     3,   442,     3,    38,    12,     5,    41,    42,
+       5,     4,    45,    46,    47,    48,    49,    97,   531,     5,
+     229,    27,   357,   500,   457,    18,    94,    20,    21,   104,
+      23,   106,    25,     0,    54,    54,    54,    54,    54,     0,
+     102,     0,   537,    69,   102,    38,   541,   542,    12,   562,
+      91,     3,     4,    46,    47,    48,    49,   534,   126,   124,
+      34,   129,   426,    27,    16,    17,   499,   124,   124,   564,
+     150,    16,   129,   135,     3,   124,   560,   135,   104,   112,
+     232,    35,   115,   418,   117,    27,   581,    54,    62,   124,
+      95,    33,   576,    54,    95,    54,   591,    51,   112,   124,
+     289,   253,   116,    16,   227,   255,   139,   316,   101,   473,
+       3,   144,   145,     3,     4,   128,   393,   112,     3,     0,
+       5,     3,     4,   275,   276,   128,    16,    17,   124,   128,
+     128,   128,   341,   128,    16,    17,   128,   129,     3,   102,
+     124,   134,   128,   163,   163,   163,   163,   163,   425,   182,
+     589,   124,   185,   186,   187,   188,   189,   190,   191,   192,
      193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
-     203,   204,   205,   206,   207,   208,   148,   148,   232,     3,
-     234,   214,   102,   212,   100,   105,   122,     4,    90,    91,
-      92,   126,   127,   122,   127,   215,   215,   215,   249,   232,
-     459,   234,   231,    20,    21,    22,   322,    24,     3,    26,
-     112,   113,   114,   115,   116,   105,   475,     4,   132,   100,
-     122,    38,   124,   252,   253,   127,   125,   100,     3,    46,
-      47,    48,    49,    20,    21,    22,     3,    24,     3,    26,
-     349,   126,   351,    68,    90,    91,    92,    18,     3,    99,
-      68,    38,    99,     3,     3,     3,     3,   362,   517,   334,
-      47,    48,    49,    14,   127,   127,   122,   342,   114,   115,
-     116,   304,   377,   133,   105,   132,   122,   100,   124,     3,
-     102,   127,    99,   388,   393,    54,    54,   362,     3,   322,
-     133,   311,   311,   311,     3,    89,   122,   132,   126,   319,
-     319,   319,   377,     3,   133,   132,   105,    90,    91,    92,
-     100,   102,   122,   388,    17,   132,   100,   387,   126,   126,
-       4,    40,     3,   356,   378,   126,   132,   100,   437,   383,
-     133,    65,   132,   126,   363,   133,    20,    21,    22,   122,
-      24,   124,    26,   102,   127,   378,   126,   367,   367,   367,
-     383,   456,   122,   458,    38,   133,    75,    76,   132,   105,
-       3,     3,    46,    47,    48,    49,    27,   133,   132,   126,
-     126,    90,    91,    92,   132,    94,    95,    96,   132,   132,
-       3,   456,   122,   458,   126,   148,    52,   132,   132,   132,
-     109,   110,   133,   112,   113,   114,   115,   116,   311,   398,
-      58,   128,   341,   122,   445,   124,   445,    70,   127,   442,
-     498,   484,   399,   427,   427,    99,   466,   419,   438,    27,
-     489,    -1,   371,    -1,    -1,   393,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     460,   460,   460,   460,   460,    -1,   466,    -1,   132,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   484,   484,   484,   484,   484,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   498,   498,
-     498,   498,   498,     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,
+     203,   204,   205,   206,   207,   208,   128,     3,   129,   212,
+     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
+     223,   224,   225,   226,   227,   228,   163,     3,     4,   232,
+     104,   234,   163,   412,   163,   211,   134,   106,   397,   398,
+      16,    17,     3,     4,   102,   235,   235,   235,   272,   252,
+     253,   127,   255,   229,   257,    16,    17,   117,   102,     3,
+       3,   237,     3,   128,   124,   117,   126,   360,     5,     4,
+     130,   247,   275,   276,    16,   522,    69,     3,   130,   101,
+       3,     4,    69,    18,   101,    20,    21,     3,    23,     3,
+      25,     3,   414,    16,    17,    12,   543,   129,   389,   129,
+     391,   124,   135,    38,   102,     3,     4,     3,     4,   429,
+     135,    46,    47,    48,    49,    92,    93,    94,    16,    17,
+      16,    17,   372,   106,   102,   134,    54,     3,     3,     3,
+       4,   104,   382,    54,   104,   104,   413,   340,    36,    91,
+     316,   117,    16,    17,   135,    91,    91,   124,   595,   126,
+     126,   428,   129,   444,    16,    91,   117,   360,   124,   349,
+     349,   349,   439,   413,    26,   341,   101,   357,   357,   357,
+      32,   135,   134,   128,   111,   112,     3,   135,   428,   129,
+       3,   134,     5,   359,    46,     8,     9,    10,   135,   439,
+     101,   128,   102,   106,   117,   104,   438,   135,   489,   134,
+     403,    15,   405,   126,   124,   408,   128,   410,   102,   134,
+     128,   414,   102,   112,    66,    92,    93,    94,   421,   117,
+     135,   117,   128,   104,   128,   116,   429,   134,   418,   418,
+     418,   434,   135,   134,   106,   128,   412,   114,   115,   116,
+     117,   118,   519,   135,   521,     4,   124,   124,   111,   126,
+     134,     3,   129,     5,     6,     3,     8,     9,    10,    18,
+       3,    20,    21,    26,    23,   134,    25,    19,   116,   519,
+     128,   521,    24,   128,    26,   134,    28,    29,   134,    38,
+     134,    92,    93,    94,   134,     3,   135,   112,    47,    48,
+      49,   134,   124,    45,   497,   112,   134,   128,   135,   134,
+     490,    53,   505,    55,    56,   116,   117,   118,    54,   349,
+     163,   449,    72,   124,    16,   126,    60,   143,   129,    71,
+     381,   479,   479,   508,    26,   529,   508,   570,   557,    31,
+      32,   552,   450,   523,   523,   523,   523,   523,   289,   529,
+      92,    93,    44,   471,    46,    27,    -1,   444,    48,   422,
+      -1,   256,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   552,   552,   552,   552,   552,    -1,    -1,    -1,
+      -1,    -1,   124,    -1,   126,    -1,    -1,    -1,   130,    -1,
+     570,   570,   570,   570,   570,     0,    -1,    -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,    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,    -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,    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,    -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,    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,    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,    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,    -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,
+      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,    -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,    76,    77,    -1,    71,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -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,    -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,    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,    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,    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,    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,    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,    -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,    -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,    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,    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,    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,    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,    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,    -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,    -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,    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,   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,    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,     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,    -1,    -1,    -1,
+      -1,    64,    -1,    -1,    -1,    -1,    -1,    -1,    71,    -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,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    90,    91,    67,    68,    69,    -1,    71,
+      -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,   111,    -1,
+      -1,   114,    -1,    -1,    -1,    -1,   119,   120,    -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,    -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,
-      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,    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,
+      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,    -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,    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,
+      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,    -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,    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,
+      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,    -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,    88,    -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,
+      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,
-      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,    90,    -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,   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,    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,
+      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,    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,    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,    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,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    90,    91,    92,    -1,    94,    95,
-      96,    -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.  */
-static const yytype_uint8 yystos[] =
+static const yytype_uint16 yystos[] =
 {
        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,   183,   186,   189,   190,
-     191,   192,   196,   198,   207,   217,   220,   233,   234,   235,
-     238,   239,   240,   241,   244,   246,   247,    89,    50,   122,
-     122,   164,   122,     3,    19,   126,   184,   185,    18,     3,
-     240,     3,   219,   240,   122,   185,   223,   122,   126,   122,
-     127,   240,   122,   237,   240,   242,   243,   240,   240,   240,
-     240,   240,   238,   229,   230,   231,   237,    30,    32,    37,
-      42,    46,    66,    99,   132,   143,   144,   145,   148,   150,
-     165,   166,   181,   190,   236,     3,     0,   138,   126,     3,
-      46,   150,   156,   157,   239,   145,   146,    18,    27,    31,
-      32,    44,    46,   206,   245,   192,   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,   146,   172,   188,   126,   127,     3,   185,
-     222,   223,   224,   232,   122,   238,   127,   240,   180,   229,
-       3,   155,   105,   132,   100,   133,   125,   100,   237,     3,
-       3,   151,   152,   238,   238,   151,     3,   132,   145,   126,
-     136,     3,    99,    68,    99,     3,    35,    51,   216,     3,
-       3,   208,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   240,   240,   240,   240,     3,   240,   240,   240,   240,
-     240,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   229,   240,     3,   122,   128,   238,    14,   240,    99,
-     139,   140,   141,   147,   148,   196,   198,   207,   217,   187,
-     184,   127,   122,   228,     3,    93,   213,   214,   215,   133,
-       3,   115,   133,   142,   143,   133,   238,   237,   237,   105,
-     227,   100,   143,   132,   227,   238,   238,   102,     3,    54,
-     193,    54,   194,     3,   209,   210,   105,   133,   125,    89,
-     240,     3,   133,   122,   133,   132,   141,   126,   139,   229,
-     102,   105,   211,   215,   133,   100,   132,   133,   105,    36,
-     115,   224,   226,   102,   149,   152,   132,    99,   133,     3,
-       5,   122,   224,    17,   195,   224,   225,   126,   227,   100,
-     240,     3,   133,   146,   238,   126,   139,   132,   133,     3,
-       5,     8,     9,    10,    12,    45,    55,    56,   212,   226,
-     227,    93,   215,    28,    33,   173,   175,   177,   178,   146,
-     237,   237,   239,   146,   213,   225,   126,   100,   199,   149,
-     210,   133,    34,    62,   167,   168,   169,   170,   132,   211,
-     126,   215,   126,   122,   173,   175,    65,   153,   133,   133,
-     197,   224,    46,    99,   190,   203,   204,   205,   240,   105,
-     132,   169,   170,   221,   176,     3,   146,   146,   227,    99,
-     144,   148,   190,   200,   201,   202,   207,   217,     3,    27,
-     132,   205,   105,   142,   142,   142,   227,   126,   126,   132,
-     202,   216,   142,   132,   132,   133,   218,   200,     3,   174,
-     142,   132,   122,   126,   132,   213,   142,   133,   132,   227
+      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,   150,   156,
+     160,   161,   162,   163,   165,   173,   181,   184,   185,   188,
+     191,   192,   193,   194,   198,   200,   209,   214,   215,   216,
+     226,   234,   237,   250,   251,   252,   257,   261,   265,   266,
+     268,   269,   270,    91,    50,   124,   124,   166,   124,     3,
+       4,    16,    17,   128,   186,   187,    16,     3,   261,     3,
+     236,   261,   124,   187,   240,   124,   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,   150,   152,   167,   168,   183,   192,   253,
+       3,     0,   140,   128,     3,    46,   152,   158,   159,   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,   164,   148,   174,   190,   128,   129,   186,   187,
+     239,   240,   241,   249,   124,   255,   256,   129,   261,   182,
+     246,     3,   104,   157,   134,   106,   102,   102,   135,   127,
+     102,   254,     3,     3,   153,   154,   255,   255,   153,     3,
+     134,   147,   128,   138,     3,   101,    69,   101,     3,    35,
+      51,   233,     3,     3,   210,   261,     3,   221,   227,   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,   255,    12,   261,   101,   141,   142,
+     143,   149,   150,   198,   200,   209,   234,   189,   186,   129,
+     124,   245,     3,    95,   230,   231,   232,   135,   117,   186,
+     135,   144,   145,   135,   261,   255,   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,   135,   124,   135,   134,   143,   128,   141,
+     246,   104,   106,   213,   232,   135,   102,   134,   135,   106,
+      36,   117,   241,   243,   104,   151,   154,   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,   148,   255,   128,   141,   134,   135,
+     261,   243,   244,    95,   232,    27,    33,   175,   177,   179,
+     180,   148,   254,   261,   257,   148,   230,   242,   128,   102,
+     201,   151,   212,   112,     5,   111,   112,   128,   219,   224,
+     226,   127,   135,   127,   135,    34,    62,   169,   170,   171,
+     172,   134,   213,   128,   232,   128,   124,   175,   177,    66,
+     155,   135,   135,   199,   241,    46,   101,   192,   205,   206,
+     207,   116,   261,   111,   226,   223,   261,   106,   134,   171,
+     172,   238,   178,     3,   148,   148,   244,   101,   146,   150,
+     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)
@@ -4332,11 +4534,33 @@ yyreduce:
   switch (yyn)
     {
         
+    case 13:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 1916 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);}
+    }
+    break;
+
+
+  
+    case 24:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 1928 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);}
+    }
+    break;
+
+
+  
     case 26:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2098 "parser.y"
+#line 1931 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
@@ -4347,7 +4571,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2099 "parser.y"
+#line 1932 "parser.y"
     {(yyval.code)=code_new();}
     }
     break;
@@ -4358,8 +4582,10 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2101 "parser.y"
-    {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));}
+#line 1934 "parser.y"
+    {
+    (yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));
+}
     }
     break;
 
@@ -4369,84 +4595,92 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2102 "parser.y"
+#line 1937 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
-    case 42:
+    case 43:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2117 "parser.y"
+#line 1953 "parser.y"
     {(yyval.code)=(yyvsp[(2) - (3)].code);}
     }
     break;
 
 
   
-    case 43:
+    case 44:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2118 "parser.y"
+#line 1954 "parser.y"
     {(yyval.code)=0;}
     }
     break;
 
 
   
-    case 44:
+    case 45:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2121 "parser.y"
+#line 1957 "parser.y"
     {(yyval.code)=0;}
     }
     break;
 
 
   
-    case 51:
+    case 52:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2128 "parser.y"
-    {(yyval.code)=(yyvsp[(3) - (4)].code);}
+#line 1964 "parser.y"
+    {
+    PASS_ALWAYS 
+    if(as3_pass) {
+        (yyval.code) = (yyvsp[(3) - (4)].code);
+    } else {
+        (yyval.code) = 0;
+    }
+    as3_pass=(yyvsp[(1) - (4)].number_int);
+}
     }
     break;
 
 
   
-    case 52:
+    case 53:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2132 "parser.y"
+#line 1976 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (2)].code);}
     }
     break;
 
 
   
-    case 53:
+    case 54:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2133 "parser.y"
+#line 1977 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
-    case 54:
+    case 55:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2137 "parser.y"
+#line 1981 "parser.y"
     {
     code_t**cc = &global->init->method->body->code;
     *cc = code_append(*cc, (yyvsp[(1) - (1)].code));
@@ -4460,8 +4694,16 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2148 "parser.y"
-    {(yyval.value)=(yyvsp[(2) - (2)].value);}
+#line 1988 "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;
 
@@ -4471,10 +4713,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2149 "parser.y"
-    {(yyval.value).c=abc_pushundefined(0);
-                                  (yyval.value).t=TYPE_ANY;
-                                 }
+#line 2007 "parser.y"
+    {(yyval.node)=(yyvsp[(2) - (2)].node);}
     }
     break;
 
@@ -4484,8 +4724,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2153 "parser.y"
-    {(yyval.code)=(yyvsp[(2) - (2)].code);}
+#line 2008 "parser.y"
+    {(yyval.node)=mkdummynode();}
     }
     break;
 
@@ -4495,7 +4735,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2154 "parser.y"
+#line 2010 "parser.y"
     {(yyval.code)=(yyvsp[(2) - (2)].code);}
     }
     break;
@@ -4506,8 +4746,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2156 "parser.y"
-    {(yyval.code) = (yyvsp[(1) - (1)].code);}
+#line 2011 "parser.y"
+    {(yyval.code)=(yyvsp[(2) - (2)].code);}
     }
     break;
 
@@ -4517,8 +4757,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2157 "parser.y"
-    {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));}
+#line 2013 "parser.y"
+    {(yyval.code) = (yyvsp[(1) - (1)].code);}
     }
     break;
 
@@ -4528,7 +4768,18 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2160 "parser.y"
+#line 2014 "parser.y"
+    {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));}
+    }
+    break;
+
+
+  
+    case 63:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2017 "parser.y"
     {
 PASS12
     if(variable_exists((yyvsp[(1) - (3)].id)))
@@ -4537,11 +4788,6 @@ PASS1
     new_variable((yyvsp[(1) - (3)].id), 0, 1, 0);
 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;
     if(state->method->uses_slots) {
@@ -4560,21 +4806,25 @@ PASS2
 
     (yyval.code) = slot?abc_getscopeobject(0, 1):0;
     
+    typedcode_t v = node_read((yyvsp[(3) - (3)].node));
+    if(!is_subtype_of(v.t, (yyvsp[(2) - (3)].classinfo))) {
+        syntaxerror("Can't convert %s to %s", v.t->name, (yyvsp[(2) - (3)].classinfo)->name);
+    }
     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(v.c->prev || v.c->opcode != OPCODE_PUSHUNDEFINED) {
+            (yyval.code) = code_append((yyval.code), v.c);
+            (yyval.code) = converttype((yyval.code), v.t, (yyvsp[(2) - (3)].classinfo));
         } else {
-            code_free((yyvsp[(3) - (3)].value).c);
+            code_free(v.c);
             (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(v.c->prev || v.c->opcode != OPCODE_PUSHUNDEFINED) {
+            (yyval.code) = code_append((yyval.code), v.c);
             (yyval.code) = abc_coerce_a((yyval.code));
         } else {
             // don't do anything
-            code_free((yyvsp[(3) - (3)].value).c);
+            code_free(v.c);
             code_free((yyval.code));
             (yyval.code) = 0;
             break;
@@ -4591,44 +4841,44 @@ PASS2
 
 
   
-    case 63:
+    case 64:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2220 "parser.y"
+#line 2076 "parser.y"
     {(yyval.code) = code_new();}
     }
     break;
 
 
   
-    case 64:
+    case 65:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2221 "parser.y"
+#line 2077 "parser.y"
     {(yyval.code)=(yyvsp[(2) - (2)].code);}
     }
     break;
 
 
   
-    case 65:
+    case 66:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2224 "parser.y"
+#line 2080 "parser.y"
     {PASS12 new_state();}
     }
     break;
 
 
   
-    case 66:
+    case 67:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2224 "parser.y"
+#line 2080 "parser.y"
     {
      
     (yyval.code) = code_new();
@@ -4652,22 +4902,22 @@ PASS2
 
 
   
-    case 67:
+    case 68:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2243 "parser.y"
+#line 2099 "parser.y"
     {(yyval.code)=code_new();}
     }
     break;
 
 
   
-    case 70:
+    case 71:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2250 "parser.y"
+#line 2106 "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);
@@ -4677,11 +4927,11 @@ PASS2
 
 
   
-    case 71:
+    case 72:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2254 "parser.y"
+#line 2110 "parser.y"
     {
     PASS12
     (yyval.id)=(yyvsp[(1) - (1)].id);
@@ -4691,33 +4941,33 @@ PASS2
 
 
   
-    case 72:
+    case 73:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2259 "parser.y"
+#line 2115 "parser.y"
     {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;}
     }
     break;
 
 
   
-    case 73:
+    case 74:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2260 "parser.y"
+#line 2116 "parser.y"
     {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;}
     }
     break;
 
 
   
-    case 74:
+    case 75:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2262 "parser.y"
+#line 2118 "parser.y"
     {
     if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement");
     (yyval.code) = code_new();
@@ -4742,11 +4992,11 @@ PASS2
 
 
   
-    case 75:
+    case 76:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2282 "parser.y"
+#line 2138 "parser.y"
     {
     variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id));
     if(!var) {
@@ -4799,22 +5049,22 @@ PASS2
 
 
   
-    case 76:
+    case 77:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2330 "parser.y"
+#line 2186 "parser.y"
     {PASS12 new_state();}
     }
     break;
 
 
   
-    case 77:
+    case 78:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2330 "parser.y"
+#line 2186 "parser.y"
     {
 
     (yyval.code) = code_new();
@@ -4838,22 +5088,22 @@ PASS2
 
 
   
-    case 78:
+    case 79:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2349 "parser.y"
+#line 2205 "parser.y"
     {PASS12 new_state();}
     }
     break;
 
 
   
-    case 79:
+    case 80:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2349 "parser.y"
+#line 2205 "parser.y"
     {
     (yyval.code) = code_new();
     code_t*loopstart = (yyval.code) = abc_label((yyval.code));
@@ -4873,11 +5123,11 @@ PASS2
 
 
   
-    case 80:
+    case 81:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2364 "parser.y"
+#line 2220 "parser.y"
     {
     (yyval.code) = abc___break__(0, "");
 }
@@ -4886,11 +5136,11 @@ PASS2
 
 
   
-    case 81:
+    case 82:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2367 "parser.y"
+#line 2223 "parser.y"
     {
     (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id));
 }
@@ -4899,11 +5149,11 @@ PASS2
 
 
   
-    case 82:
+    case 83:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2370 "parser.y"
+#line 2226 "parser.y"
     {
     (yyval.code) = abc___continue__(0, "");
 }
@@ -4912,11 +5162,11 @@ PASS2
 
 
   
-    case 83:
+    case 84:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2373 "parser.y"
+#line 2229 "parser.y"
     {
     (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id));
 }
@@ -4925,80 +5175,80 @@ PASS2
 
 
   
-    case 84:
+    case 85:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2377 "parser.y"
+#line 2233 "parser.y"
     {(yyval.code)=0;}
     }
     break;
 
 
   
-    case 85:
+    case 86:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2378 "parser.y"
+#line 2234 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
-    case 86:
+    case 87:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2379 "parser.y"
+#line 2235 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
-    case 87:
+    case 88:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2380 "parser.y"
+#line 2236 "parser.y"
     {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));}
     }
     break;
 
 
   
-    case 88:
+    case 89:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2381 "parser.y"
+#line 2237 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
-    case 89:
+    case 90:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2382 "parser.y"
+#line 2238 "parser.y"
     {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));}
     }
     break;
 
 
   
-    case 90:
+    case 91:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2384 "parser.y"
+#line 2240 "parser.y"
     {
     (yyval.code) = abc_getlocal(0, state->switch_var);
-    (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c);
+    (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__) {
@@ -5012,11 +5262,11 @@ PASS2
 
 
   
-    case 91:
+    case 92:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2395 "parser.y"
+#line 2251 "parser.y"
     {
     (yyval.code) = (yyvsp[(3) - (3)].code);
 }
@@ -5025,24 +5275,24 @@ PASS2
 
 
   
-    case 92:
+    case 93:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2398 "parser.y"
+#line 2254 "parser.y"
     {PASS12 new_state();state->switch_var=alloc_local();}
     }
     break;
 
 
   
-    case 93:
+    case 94:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2398 "parser.y"
+#line 2254 "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));
 
@@ -5074,11 +5324,11 @@ PASS2
 
 
   
-    case 94:
+    case 95:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2429 "parser.y"
+#line 2285 "parser.y"
     {PASS12 new_state();
                                                       state->exception_name=(yyvsp[(3) - (5)].id);
                                                PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0);
@@ -5089,11 +5339,11 @@ PASS2
 
 
   
-    case 95:
+    case 96:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2434 "parser.y"
+#line 2290 "parser.y"
     {
     namespace_t name_ns = {ACCESS_PACKAGE, ""};
     multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)};
@@ -5119,22 +5369,22 @@ PASS2
 
 
   
-    case 96:
+    case 97:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2454 "parser.y"
+#line 2310 "parser.y"
     {PASS12 new_state();state->exception_name=0;}
     }
     break;
 
 
   
-    case 97:
+    case 98:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2454 "parser.y"
+#line 2310 "parser.y"
     {
     (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code));
     if(!(yyvsp[(4) - (5)].code)) {
@@ -5155,44 +5405,44 @@ PASS2
 
 
   
-    case 98:
+    case 99:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2470 "parser.y"
+#line 2326 "parser.y"
     {(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 100:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2471 "parser.y"
+#line 2327 "parser.y"
     {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));}
     }
     break;
 
 
   
-    case 100:
+    case 101:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2472 "parser.y"
+#line 2328 "parser.y"
     {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);}
     }
     break;
 
 
   
-    case 101:
+    case 102:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2473 "parser.y"
+#line 2329 "parser.y"
     {
     (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list);
     (yyval.catch_list).finally = 0;
@@ -5206,11 +5456,11 @@ PASS2
 
 
   
-    case 102:
+    case 103:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2481 "parser.y"
+#line 2337 "parser.y"
     {
     (yyval.catch_list).l=list_new();
     (yyval.catch_list).finally = 0;
@@ -5224,11 +5474,11 @@ PASS2
 
 
   
-    case 103:
+    case 104:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2490 "parser.y"
+#line 2346 "parser.y"
     {PASS12 new_state();
                  state->method->has_exceptions=1;
                  state->method->late_binding=1;//for invariant scope_code
@@ -5238,11 +5488,11 @@ PASS2
 
 
   
-    case 104:
+    case 105:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2493 "parser.y"
+#line 2349 "parser.y"
     {
     code_t*out = abc_nop(0);
 
@@ -5291,11 +5541,11 @@ PASS2
 
 
   
-    case 105:
+    case 106:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2539 "parser.y"
+#line 2395 "parser.y"
     {
     (yyval.code)=(yyvsp[(2) - (2)].value).c;
     (yyval.code)=abc_throw((yyval.code));
@@ -5305,11 +5555,11 @@ PASS2
 
 
   
-    case 106:
+    case 107:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2543 "parser.y"
+#line 2399 "parser.y"
     {
     if(!state->exception_name)
         syntaxerror("re-throw only possible within a catch block");
@@ -5323,11 +5573,11 @@ PASS2
 
 
   
-    case 107:
+    case 108:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2554 "parser.y"
+#line 2410 "parser.y"
     {
      new_state();
      if(state->method->has_exceptions) {
@@ -5343,11 +5593,11 @@ PASS2
 
 
   
-    case 108:
+    case 109:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2564 "parser.y"
+#line 2420 "parser.y"
     {
      /* remove getlocal;pushwith from scope code again */
      state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code));
@@ -5367,96 +5617,116 @@ PASS2
 
 
   
-    case 110:
+    case 111:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2582 "parser.y"
+#line 2438 "parser.y"
     {PASS12 (yyval.id)="package";}
     }
     break;
 
 
   
-    case 111:
+    case 112:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2584 "parser.y"
+#line 2439 "parser.y"
+    {PASS12 (yyval.id)="namespace";}
+    }
+    break;
+
+
+  
+    case 113:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2440 "parser.y"
+    {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);}
+    }
+    break;
+
+
+  
+    case 114:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2442 "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;
 
 
   
-    case 112:
+    case 115:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2585 "parser.y"
+#line 2443 "parser.y"
     {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));}
     }
     break;
 
 
   
-    case 113:
+    case 116:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2587 "parser.y"
+#line 2445 "parser.y"
     {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;}
     }
     break;
 
 
   
-    case 114:
+    case 117:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2588 "parser.y"
+#line 2446 "parser.y"
     {PASS12 endpackage();(yyval.code)=0;}
     }
     break;
 
 
   
-    case 115:
+    case 118:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2589 "parser.y"
+#line 2447 "parser.y"
     {PASS12 startpackage("");}
     }
     break;
 
 
   
-    case 116:
+    case 119:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2590 "parser.y"
+#line 2448 "parser.y"
     {PASS12 endpackage();(yyval.code)=0;}
     }
     break;
 
 
   
-    case 117:
+    case 120:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2592 "parser.y"
+#line 2470 "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");
@@ -5470,18 +5740,17 @@ PASS2
 
 
   
-    case 118:
+    case 121:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2608 "parser.y"
+#line 2484 "parser.y"
     {
        PASS12
        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();
@@ -5494,44 +5763,44 @@ PASS2
 
 
   
-    case 119:
+    case 122:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2625 "parser.y"
+#line 2500 "parser.y"
     {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;}
     }
     break;
 
 
   
-    case 120:
+    case 123:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2626 "parser.y"
+#line 2501 "parser.y"
     {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);}
     }
     break;
 
 
   
-    case 121:
+    case 124:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2627 "parser.y"
+#line 2502 "parser.y"
     {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);}
     }
     break;
 
 
   
-    case 122:
+    case 125:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2628 "parser.y"
+#line 2503 "parser.y"
     {
     PASS12 
     (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags;
@@ -5544,110 +5813,110 @@ PASS2
 
 
   
-    case 123:
+    case 126:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2636 "parser.y"
+#line 2510 "parser.y"
     {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;}
     }
     break;
 
 
   
-    case 124:
+    case 127:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2637 "parser.y"
+#line 2511 "parser.y"
     {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;}
     }
     break;
 
 
   
-    case 125:
+    case 128:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2638 "parser.y"
+#line 2512 "parser.y"
     {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;}
     }
     break;
 
 
   
-    case 126:
+    case 129:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2639 "parser.y"
+#line 2513 "parser.y"
     {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;}
     }
     break;
 
 
   
-    case 127:
+    case 130:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2640 "parser.y"
+#line 2514 "parser.y"
     {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;}
     }
     break;
 
 
   
-    case 128:
+    case 131:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2641 "parser.y"
+#line 2515 "parser.y"
     {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;}
     }
     break;
 
 
   
-    case 129:
+    case 132:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2642 "parser.y"
+#line 2516 "parser.y"
     {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;}
     }
     break;
 
 
   
-    case 130:
+    case 133:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2643 "parser.y"
+#line 2517 "parser.y"
     {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;}
     }
     break;
 
 
   
-    case 131:
+    case 134:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2644 "parser.y"
+#line 2518 "parser.y"
     {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;}
     }
     break;
 
 
   
-    case 132:
+    case 135:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2645 "parser.y"
+#line 2519 "parser.y"
     {PASS12 (yyval.flags).flags=FLAG_NAMESPACE;
                                (yyval.flags).ns=(yyvsp[(1) - (1)].id);
                        }
@@ -5656,99 +5925,99 @@ PASS2
 
 
   
-    case 133:
+    case 136:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2649 "parser.y"
+#line 2523 "parser.y"
     {PASS12 (yyval.classinfo)=0;}
     }
     break;
 
 
   
-    case 134:
+    case 137:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2650 "parser.y"
+#line 2524 "parser.y"
     {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
     }
     break;
 
 
   
-    case 135:
+    case 138:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2652 "parser.y"
+#line 2526 "parser.y"
     {PASS12 (yyval.classinfo_list)=list_new();}
     }
     break;
 
 
   
-    case 136:
+    case 139:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2653 "parser.y"
+#line 2527 "parser.y"
     {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
     }
     break;
 
 
   
-    case 137:
+    case 140:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2655 "parser.y"
+#line 2529 "parser.y"
     {PASS12 (yyval.classinfo_list)=list_new();}
     }
     break;
 
 
   
-    case 138:
+    case 141:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2656 "parser.y"
+#line 2530 "parser.y"
     {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
     }
     break;
 
 
   
-    case 139:
+    case 142:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2660 "parser.y"
+#line 2534 "parser.y"
     {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));}
     }
     break;
 
 
   
-    case 140:
+    case 143:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2662 "parser.y"
+#line 2536 "parser.y"
     {PASS12 endclass();(yyval.code)=0;}
     }
     break;
 
 
   
-    case 141:
+    case 144:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2666 "parser.y"
+#line 2540 "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));}
     }
@@ -5756,11 +6025,11 @@ PASS2
 
 
   
-    case 142:
+    case 145:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2669 "parser.y"
+#line 2543 "parser.y"
     {PASS12 endclass();(yyval.code)=0;}
     }
     break;
@@ -5771,7 +6040,18 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2682 "parser.y"
+#line 2552 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);}
+    }
+    break;
+
+
+  
+    case 154:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2556 "parser.y"
     {
     code_t*c = state->cls->static_init->header;
     c = code_append(c, (yyvsp[(1) - (1)].code));  
@@ -5782,11 +6062,11 @@ PASS2
 
 
   
-    case 157:
+    case 160:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2693 "parser.y"
+#line 2567 "parser.y"
     {
     syntaxerror("variable declarations not allowed in interfaces");
 }
@@ -5795,11 +6075,11 @@ PASS2
 
 
   
-    case 158:
+    case 161:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2696 "parser.y"
+#line 2570 "parser.y"
     {
     PASS12
     (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC;
@@ -5815,122 +6095,131 @@ PASS2
 
 
   
-    case 161:
+    case 164:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2711 "parser.y"
-    {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));}
+#line 2644 "parser.y"
+    {PASS12 setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));}
     }
     break;
 
 
   
-    case 162:
+    case 165:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2711 "parser.y"
-    {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);}
+#line 2644 "parser.y"
+    {PASS12 (yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);}
     }
     break;
 
 
   
-    case 163:
+    case 166:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2713 "parser.y"
-    {(yyval.code) = (yyvsp[(1) - (1)].code);}
+#line 2646 "parser.y"
+    {PASS12 (yyval.code)=0;}
     }
     break;
 
 
   
-    case 164:
+    case 167:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2714 "parser.y"
-    {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));}
+#line 2647 "parser.y"
+    {PASS12 (yyval.code)=0;}
     }
     break;
 
 
   
-    case 165:
+    case 168:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2717 "parser.y"
+#line 2650 "parser.y"
     {
+PASS12
     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;
@@ -5940,229 +6229,557 @@ PASS2
 
 
   
-    case 166:
+    case 169:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2791 "parser.y"
+#line 2733 "parser.y"
     {(yyval.constant)=0;}
     }
     break;
 
 
   
-    case 167:
-    if(as3_pass==2) {
-
-/* Line 1464 of skeleton.m4  */
-#line 2792 "parser.y"
-    {(yyval.constant)=(yyvsp[(2) - (2)].constant);}
-    }
-    break;
-
-
-  
-    case 168:
+    case 170:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2794 "parser.y"
-    {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));}
+#line 2734 "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;
 
 
   
-    case 169:
+    case 171:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2795 "parser.y"
+#line 2743 "parser.y"
     {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));}
     }
     break;
 
 
   
-    case 170:
+    case 172:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2796 "parser.y"
-    {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));}
+#line 2744 "parser.y"
+    {
+    (yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));
+}
     }
     break;
 
 
   
-    case 171:
+    case 173:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2797 "parser.y"
+#line 2747 "parser.y"
     {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));}
     }
     break;
 
 
   
-    case 172:
+    case 174:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2798 "parser.y"
+#line 2748 "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;
 
 
   
-    case 173:
+    case 175:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2800 "parser.y"
+#line 2749 "parser.y"
     {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
-    case 174:
+    case 176:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2801 "parser.y"
+#line 2750 "parser.y"
     {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
-    case 175:
+    case 177:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2802 "parser.y"
+#line 2751 "parser.y"
     {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
-    case 176:
+    case 178:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2803 "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 2752 "parser.y"
+    {(yyval.constant) = constant_new_undefined((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
-    case 177:
+    case 179:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2815 "parser.y"
-    {
-    PASS12
-    memset(&(yyval.params),0,sizeof((yyval.params)));
-}
+#line 2753 "parser.y"
+    {(yyval.constant) = constant_new_float(__builtin_nan(""));}
     }
     break;
 
 
   
-    case 178:
+    case 181:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2819 "parser.y"
-    {
-    PASS12
-    (yyval.params)=(yyvsp[(1) - (1)].params);
-}
+#line 2773 "parser.y"
+    {PASS_ALWAYS if(!xml_level++) tokenizer_begin_xml();}
     }
     break;
 
 
   
-    case 179:
+    case 182:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2825 "parser.y"
-    {
-    PASS12
-    memset(&(yyval.params),0,sizeof((yyval.params)));
-    (yyval.params).varargs=1;
-    list_append((yyval.params).list, (yyvsp[(2) - (2)].param));
-}
+#line 2774 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xmltext();}
     }
     break;
 
 
   
-    case 180:
+    case 183:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2831 "parser.y"
-    {
-    PASS12
-    (yyval.params) =(yyvsp[(1) - (4)].params);
-    (yyval.params).varargs=1;
-    list_append((yyval.params).list, (yyvsp[(4) - (4)].param));
-}
+#line 2775 "parser.y"
+    {PASS_ALWAYS if(!--xml_level) tokenizer_end_xml(); else tokenizer_begin_xmltext();}
     }
     break;
 
 
   
-    case 181:
+    case 184:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2839 "parser.y"
-    {
-    PASS12
-    (yyval.params) = (yyvsp[(1) - (3)].params);
-    list_append((yyval.params).list, (yyvsp[(3) - (3)].param));
-}
+#line 2777 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xmltext();}
     }
     break;
 
 
   
-    case 182:
+    case 185:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2844 "parser.y"
+#line 2777 "parser.y"
     {
-    PASS12
-    memset(&(yyval.params),0,sizeof((yyval.params)));
-    list_append((yyval.params).list, (yyvsp[(1) - (1)].param));
+    (yyval.id)=strdup("{...}");
+    as3_warning("xml string substitution not yet supported");
 }
     }
     break;
 
 
   
-    case 183:
+    case 186:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2850 "parser.y"
+#line 2781 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xml();}
+    }
+    break;
+
+
+  
+    case 187:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2781 "parser.y"
+    {
+    (yyval.id)=strdup("{...}");
+    as3_warning("xml string substitution not yet supported");
+}
+    }
+    break;
+
+
+  
+    case 188:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2785 "parser.y"
+    {(yyval.id)="";}
+    }
+    break;
+
+
+  
+    case 189:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2786 "parser.y"
+    {
+    (yyval.id) = concat2((yyvsp[(1) - (2)].id), "{...}");
+}
+    }
+    break;
+
+
+  
+    case 190:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2789 "parser.y"
+    {(yyval.id)=concat2((yyvsp[(1) - (2)].id), string_cstr(&(yyvsp[(2) - (2)].str)));}
+    }
+    break;
+
+
+  
+    case 191:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2790 "parser.y"
+    {(yyval.id)=concat2((yyvsp[(1) - (2)].id), ">");}
+    }
+    break;
+
+
+  
+    case 192:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2792 "parser.y"
+    {(yyval.id)=concat2((yyvsp[(1) - (2)].id),(yyvsp[(2) - (2)].id));}
+    }
+    break;
+
+
+  
+    case 193:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2793 "parser.y"
+    {(yyval.id)=concat3((yyvsp[(1) - (3)].id),(yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));free((yyvsp[(2) - (3)].id));free((yyvsp[(3) - (3)].id));}
+    }
+    break;
+
+
+  
+    case 194:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2795 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}
+    }
+    break;
+
+
+  
+    case 195:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2796 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}
+    }
+    break;
+
+
+  
+    case 196:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2798 "parser.y"
+    {
+    (yyval.id) = allocprintf("<%s%s>%s</%s>", (yyvsp[(2) - (10)].id), (yyvsp[(3) - (10)].id), (yyvsp[(5) - (10)].id), (yyvsp[(8) - (10)].id));
+    free((yyvsp[(2) - (10)].id));free((yyvsp[(3) - (10)].id));free((yyvsp[(5) - (10)].id));free((yyvsp[(8) - (10)].id));
+}
+    }
+    break;
+
+
+  
+    case 197:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2802 "parser.y"
+    {
+    (yyval.id) = allocprintf("<%s%s/>", (yyvsp[(2) - (6)].id), (yyvsp[(3) - (6)].id));
+}
+    }
+    break;
+
+
+  
+    case 198:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2805 "parser.y"
+    {
+    (yyval.id) = allocprintf("<%s%s>%s%s</%s>", (yyvsp[(2) - (11)].id), (yyvsp[(3) - (11)].id), (yyvsp[(5) - (11)].id), (yyvsp[(6) - (11)].id), (yyvsp[(9) - (11)].id));
+    free((yyvsp[(2) - (11)].id));free((yyvsp[(3) - (11)].id));free((yyvsp[(5) - (11)].id));free((yyvsp[(6) - (11)].id));free((yyvsp[(9) - (11)].id));
+}
+    }
+    break;
+
+
+  
+    case 199:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2810 "parser.y"
+    {(yyval.id)=strdup("");}
+    }
+    break;
+
+
+  
+    case 200:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2811 "parser.y"
+    {(yyval.id)=concat2(" ",(yyvsp[(1) - (1)].id));}
+    }
+    break;
+
+
+  
+    case 201:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2812 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}
+    }
+    break;
+
+
+  
+    case 202:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2813 "parser.y"
+    {(yyval.id)=concat3((yyvsp[(1) - (2)].id)," ",(yyvsp[(2) - (2)].id));free((yyvsp[(1) - (2)].id));free((yyvsp[(2) - (2)].id));}
+    }
+    break;
+
+
+  
+    case 203:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2815 "parser.y"
+    {
+    (yyval.id) = strdup("{...}");
+}
+    }
+    break;
+
+
+  
+    case 204:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2818 "parser.y"
+    {
+    char* str = string_cstr(&(yyvsp[(3) - (3)].str));
+    (yyval.id) = concat2("{...}=",str);
+}
+    }
+    break;
+
+
+  
+    case 205:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2822 "parser.y"
+    {
+    (yyval.id) = strdup("{...}={...}");
+}
+    }
+    break;
+
+
+  
+    case 206:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2825 "parser.y"
+    {
+    (yyval.id) = concat2((yyvsp[(1) - (3)].id),"={...}");
+}
+    }
+    break;
+
+
+  
+    case 207:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2828 "parser.y"
+    {
+    char* str = string_cstr(&(yyvsp[(3) - (3)].str));
+    (yyval.id)=allocprintf("%s=%s", (yyvsp[(1) - (3)].id),str);
+    free(str);
+    free((yyvsp[(1) - (3)].id));free((char*)(yyvsp[(3) - (3)].str).str);
+}
+    }
+    break;
+
+
+  
+    case 208:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2838 "parser.y"
+    {
+    PASS12
+    memset(&(yyval.params),0,sizeof((yyval.params)));
+}
+    }
+    break;
+
+
+  
+    case 209:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2842 "parser.y"
+    {
+    PASS12
+    (yyval.params)=(yyvsp[(1) - (1)].params);
+}
+    }
+    break;
+
+
+  
+    case 210:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2848 "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 211:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2854 "parser.y"
+    {
+    PASS12
+    (yyval.params) =(yyvsp[(1) - (4)].params);
+    (yyval.params).varargs=1;
+    list_append((yyval.params).list, (yyvsp[(4) - (4)].param));
+}
+    }
+    break;
+
+
+  
+    case 212:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2862 "parser.y"
+    {
+    PASS12
+    (yyval.params) = (yyvsp[(1) - (3)].params);
+    list_append((yyval.params).list, (yyvsp[(3) - (3)].param));
+}
+    }
+    break;
+
+
+  
+    case 213:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2867 "parser.y"
+    {
+    PASS12
+    memset(&(yyval.params),0,sizeof((yyval.params)));
+    list_append((yyval.params).list, (yyvsp[(1) - (1)].param));
+}
+    }
+    break;
+
+
+  
+    case 214:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2873 "parser.y"
     {
      PASS12
      (yyval.param) = rfx_calloc(sizeof(param_t));
@@ -6176,11 +6793,11 @@ PASS2
 
 
   
-    case 184:
+    case 215:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2858 "parser.y"
+#line 2881 "parser.y"
     {
      PASS12
      (yyval.param) = rfx_calloc(sizeof(param_t));
@@ -6194,33 +6811,33 @@ PASS2
 
 
   
-    case 187:
+    case 218:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2868 "parser.y"
+#line 2891 "parser.y"
     {PASS12 (yyval.token)=0;}
     }
     break;
 
 
   
-    case 188:
+    case 219:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2871 "parser.y"
+#line 2894 "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;
 
 
   
-    case 189:
+    case 220:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2872 "parser.y"
+#line 2895 "parser.y"
     {
     PASS1 
     endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0);
@@ -6240,33 +6857,33 @@ PASS2
 
 
   
-    case 191:
+    case 222:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2888 "parser.y"
+#line 2911 "parser.y"
     {PASS12 (yyval.id)=0;}
     }
     break;
 
 
   
-    case 192:
+    case 223:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2890 "parser.y"
+#line 2913 "parser.y"
     {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));}
     }
     break;
 
 
   
-    case 193:
+    case 224:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2891 "parser.y"
+#line 2914 "parser.y"
     {
     PASS1
     endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0);
@@ -6290,11 +6907,11 @@ PASS2
 
 
   
-    case 194:
+    case 225:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2913 "parser.y"
+#line 2936 "parser.y"
     {
     PASS1 NEW(unresolvedinfo_t,c);
           memset(c, 0, sizeof(*c));
@@ -6318,11 +6935,11 @@ PASS2
 
 
   
-    case 195:
+    case 226:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2932 "parser.y"
+#line 2955 "parser.y"
     {
     PASS1 NEW(unresolvedinfo_t,c);
           memset(c, 0, sizeof(*c));
@@ -6341,121 +6958,121 @@ PASS2
 
 
   
-    case 198:
+    case 229:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2949 "parser.y"
+#line 2972 "parser.y"
     {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));}
     }
     break;
 
 
   
-    case 199:
+    case 230:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2950 "parser.y"
+#line 2973 "parser.y"
     {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));}
     }
     break;
 
 
   
-    case 200:
+    case 231:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2952 "parser.y"
+#line 2975 "parser.y"
     {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);}
     }
     break;
 
 
   
-    case 201:
+    case 232:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2953 "parser.y"
-    {PASS12 (yyval.classinfo)=registry_getanytype();}
+#line 2976 "parser.y"
+    {PASS12 (yyval.classinfo)=TYPE_ANY;}
     }
     break;
 
 
   
-    case 202:
+    case 233:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2954 "parser.y"
-    {PASS12 (yyval.classinfo)=registry_getanytype();}
+#line 2977 "parser.y"
+    {PASS12 (yyval.classinfo)=TYPE_VOID;}
     }
     break;
 
 
   
-    case 203:
+    case 234:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2963 "parser.y"
+#line 2986 "parser.y"
     {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
     }
     break;
 
 
   
-    case 204:
+    case 235:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2964 "parser.y"
+#line 2987 "parser.y"
     {PASS12 (yyval.classinfo)=0;}
     }
     break;
 
 
   
-    case 205:
+    case 236:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2968 "parser.y"
+#line 2991 "parser.y"
     {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   
-    case 206:
+    case 237:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2969 "parser.y"
+#line 2992 "parser.y"
     {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);}
     }
     break;
 
 
   
-    case 207:
+    case 238:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2971 "parser.y"
+#line 2994 "parser.y"
     {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   
-    case 210:
+    case 241:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2975 "parser.y"
+#line 2998 "parser.y"
     {(yyval.value_list).number=1;
                                                   (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c;
                                                  }
@@ -6464,22 +7081,22 @@ PASS2
 
 
   
-    case 211:
+    case 242:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2979 "parser.y"
+#line 3002 "parser.y"
     {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);}
     }
     break;
 
 
   
-    case 212:
+    case 243:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2980 "parser.y"
+#line 3003 "parser.y"
     {
                                                   (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);
@@ -6489,13 +7106,14 @@ PASS2
 
 
   
-    case 214:
+    case 245:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2986 "parser.y"
+#line 3009 "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;
@@ -6505,21 +7123,28 @@ PASS2
         (yyval.value).c = code_append((yyval.value).c, paramcode);
         (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).number);
         multiname_destroy(name);
-    } else if((yyval.value).c->opcode == OPCODE_GETSLOT) {
-        int slot = (int)(ptroff_t)(yyval.value).c->data[0];
+    } 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;
-        (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).number);
+        $$.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);
         (yyval.value).c = abc_construct((yyval.value).c, (yyvsp[(4) - (4)].value_list).number);
     }
    
     (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;
@@ -6530,14 +7155,15 @@ PASS2
 
 
   
-    case 215:
+    case 246:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3022 "parser.y"
+#line 3053 "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);
     }
@@ -6550,17 +7176,17 @@ PASS2
         (yyval.value).c = code_append((yyval.value).c, paramcode);
         (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number);
         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;
-        (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
-        (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number);
+        $$.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);
@@ -6573,11 +7199,14 @@ PASS2
         (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 {
-        (yyval.value).c = abc_coerce_a((yyval.value).c);
         (yyval.value).t = TYPE_ANY;
+        (yyval.value).c = abc_coerce_a((yyval.value).c);
     }
 }
     }
@@ -6585,11 +7214,11 @@ PASS2
 
 
   
-    case 216:
+    case 247:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3068 "parser.y"
+#line 3103 "parser.y"
     {
     if(!state->cls) syntaxerror("super() not allowed outside of a class");
     if(!state->method) syntaxerror("super() not allowed outside of a function");
@@ -6615,13 +7244,14 @@ PASS2
 
 
   
-    case 217:
+    case 248:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3089 "parser.y"
+#line 3124 "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);
     }
@@ -6635,7 +7265,7 @@ PASS2
         (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;
@@ -6645,11 +7275,11 @@ PASS2
 
 
   
-    case 218:
+    case 249:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3110 "parser.y"
+#line 3146 "parser.y"
     {
     (yyval.code) = abc_returnvoid(0);
 }
@@ -6658,11 +7288,11 @@ PASS2
 
 
   
-    case 219:
+    case 250:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3113 "parser.y"
+#line 3149 "parser.y"
     {
     (yyval.code) = (yyvsp[(2) - (2)].value).c;
     (yyval.code) = abc_returnvalue((yyval.code));
@@ -6672,1295 +7302,1255 @@ PASS2
 
 
   
-    case 220:
+    case 251:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3120 "parser.y"
-    {(yyval.value)=(yyvsp[(1) - (1)].value);}
+#line 3156 "parser.y"
+    {
+    (yyval.value) = node_read((yyvsp[(1) - (1)].node));
+}
     }
     break;
 
 
   
-    case 221:
+    case 252:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3121 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3159 "parser.y"
+    {
+    (yyval.value) = node_read((yyvsp[(1) - (1)].node));
+}
     }
     break;
 
 
   
-    case 222:
+    case 253:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3122 "parser.y"
+#line 3162 "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;
 
 
   
-    case 223:
+    case 254:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3128 "parser.y"
+#line 3165 "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;
 
 
   
-    case 224:
+    case 255:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3134 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3168 "parser.y"
+    { 
+    (yyval.code) = node_exec((yyvsp[(1) - (1)].node)); 
+}
     }
     break;
 
 
   
-    case 226:
+    case 256:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3171 "parser.y"
+    { 
+    (yyval.code) = (yyvsp[(1) - (3)].code);
+    (yyval.code) = code_append((yyval.code), node_exec((yyvsp[(3) - (3)].node))); 
+}
+    }
+    break;
+
+
+  
+    case 257:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3138 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3176 "parser.y"
+    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   
-    case 227:
+    case 258:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3140 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3177 "parser.y"
+    {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);}
     }
     break;
 
 
   
-    case 228:
+    case 259:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3142 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3179 "parser.y"
+    {(yyval.code)=abc_pushstring(0,(yyvsp[(1) - (1)].id));}
     }
     break;
 
 
   
-    case 230:
+    case 260:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3146 "parser.y"
+#line 3180 "parser.y"
+    {(yyval.code)=abc_pushstring2(0,&(yyvsp[(1) - (1)].str));}
+    }
+    break;
+
+
+  
+    case 261:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3181 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}
+    }
+    break;
+
+
+  
+    case 262:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3182 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}
+    }
+    break;
+
+
+  
+    case 263:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3183 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}
+    }
+    break;
+
+
+  
+    case 264:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3185 "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 265:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3191 "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;
 
 
   
-    case 231:
+    case 266:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3163 "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 3200 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 232:
+    case 267:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3168 "parser.y"
-    {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint));
-                    (yyval.value).t = TYPE_INT;
-                   }
+#line 3201 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 233:
+    case 268:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3171 "parser.y"
-    {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int));
-                  (yyval.value).t = TYPE_INT;
-                 }
+#line 3202 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 234:
+    case 269:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3174 "parser.y"
-    {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint));
-                   (yyval.value).t = TYPE_UINT;
-                  }
+#line 3203 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 235:
+    case 270:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3177 "parser.y"
-    {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float));
-                    (yyval.value).t = TYPE_FLOAT;
-                   }
+#line 3204 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 236:
+    case 271:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3180 "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 3205 "parser.y"
+    {(yyval.node) = (yyvsp[(1) - (1)].node);}
     }
     break;
 
 
   
-    case 237:
+    case 272:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3183 "parser.y"
-    {(yyval.value).c = abc_pushundefined(0);
-                    (yyval.value).t = TYPE_ANY;
-                   }
+#line 3207 "parser.y"
+    { 
+    (yyval.node) = mkconstnode((yyvsp[(1) - (1)].constant));
+}
     }
     break;
 
 
   
-    case 238:
+    case 273:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3186 "parser.y"
-    {(yyval.value).c = abc_pushtrue(0);
-                    (yyval.value).t = TYPE_BOOLEAN;
-                   }
+#line 3211 "parser.y"
+    {
+    typedcode_t v;
+    v.c = 0;
+    multiname_t m = {QNAME, &stdns, 0, "XML"};
+    v.c = abc_getlex2(v.c, &m);
+    v.c = abc_pushstring(v.c, (yyvsp[(1) - (1)].id));
+    v.c = abc_construct(v.c, 1);
+    v.t = TYPE_XML;
+    (yyval.node) = mkcodenode(v);
+}
     }
     break;
 
 
   
-    case 239:
+    case 274:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3189 "parser.y"
-    {(yyval.value).c = abc_pushfalse(0);
-                     (yyval.value).t = TYPE_BOOLEAN;
-                    }
+#line 3223 "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;
 
 
   
-    case 240:
+    case 275:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3192 "parser.y"
-    {(yyval.value).c = abc_pushnull(0);
-                    (yyval.value).t = TYPE_NULL;
-                   }
+#line 3241 "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;
 
 
   
-    case 241:
+    case 276:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3196 "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 3252 "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;
 
 
   
-    case 242:
+    case 277:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3199 "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 3262 "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 243:
+    case 278:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3202 "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 3271 "parser.y"
+    {(yyval.node) = mknode2(&node_lt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 279:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3272 "parser.y"
+    {(yyval.node) = mknode2(&node_gt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 244:
+    case 280:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3205 "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 3273 "parser.y"
+    {(yyval.node) = mknode2(&node_le,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 245:
+    case 281:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3208 "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 3274 "parser.y"
+    {(yyval.node) = mknode2(&node_ge,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 246:
+    case 282:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3211 "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 3275 "parser.y"
+    {(yyval.node) = mknode2(&node_eqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 247:
+    case 283:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3276 "parser.y"
+    {(yyval.node) = mknode2(&node_eqeqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 284:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3277 "parser.y"
+    {(yyval.node) = mknode2(&node_noteqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 285:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3278 "parser.y"
+    {(yyval.node) = mknode2(&node_noteq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 286:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3279 "parser.y"
+    {(yyval.node) = mknode2(&node_oror,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 287:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3280 "parser.y"
+    {(yyval.node) = mknode2(&node_andand,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 288:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3214 "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 3281 "parser.y"
+    {(yyval.node) = mknode1(&node_not, (yyvsp[(2) - (2)].node));}
     }
     break;
 
 
   
-    case 248:
+    case 289:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3217 "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 3282 "parser.y"
+    {(yyval.node) = mknode1(&node_bitnot, (yyvsp[(2) - (2)].node));}
     }
     break;
 
 
   
-    case 249:
+    case 290:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3221 "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 3283 "parser.y"
+    {(yyval.node) = mknode2(&node_bitand, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 250:
+    case 291:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3232 "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 3284 "parser.y"
+    {(yyval.node) = mknode2(&node_bitxor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 251:
+    case 292:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3250 "parser.y"
-    {(yyval.value).c=(yyvsp[(2) - (2)].value).c;
-              (yyval.value).c = abc_not((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3285 "parser.y"
+    {(yyval.node) = mknode2(&node_bitor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 252:
+    case 293:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3255 "parser.y"
-    {(yyval.value).c=(yyvsp[(2) - (2)].value).c;
-              (yyval.value).c = abc_bitnot((yyval.value).c);
-              (yyval.value).t = TYPE_INT;
-             }
+#line 3286 "parser.y"
+    {(yyval.node) = mknode2(&node_shr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 253:
+    case 294:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3260 "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 3287 "parser.y"
+    {(yyval.node) = mknode2(&node_ushr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 254:
+    case 295:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3265 "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 3288 "parser.y"
+    {(yyval.node) = mknode2(&node_shl, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 255:
+    case 296:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3270 "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 3289 "parser.y"
+    {(yyval.node) = mknode2(&node_div, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 256:
+    case 297:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3275 "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 3290 "parser.y"
+    {(yyval.node) = mknode2(&node_mod, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 257:
+    case 298:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3279 "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 3291 "parser.y"
+    {(yyval.node) = mknode2(&node_plus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 258:
+    case 299:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3283 "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 3292 "parser.y"
+    {(yyval.node) = mknode2(&node_minus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 259:
+    case 300:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3288 "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 3293 "parser.y"
+    {(yyval.node) = mknode2(&node_multiply, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 260:
+    case 301:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3292 "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 3294 "parser.y"
+    {(yyval.node) = mknode2(&node_in, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 261:
+    case 302:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3296 "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 3295 "parser.y"
+    {(yyval.node) = mknode2(&node_as, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 262:
+    case 303:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3305 "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 3296 "parser.y"
+    {(yyval.node) = mknode2(&node_instanceof, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 263:
+    case 304:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3314 "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 3297 "parser.y"
+    {(yyval.node) = mknode2(&node_is, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 264:
+    case 305:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3324 "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 3298 "parser.y"
+    {(yyval.node) = mknode1(&node_typeof, (yyvsp[(3) - (4)].node));}
     }
     break;
 
 
   
-    case 265:
+    case 306:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3329 "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 3299 "parser.y"
+    {(yyval.node) = mknode1(&node_void, (yyvsp[(2) - (2)].node));}
     }
     break;
 
 
   
-    case 266:
+    case 307:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3342 "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 3300 "parser.y"
+    { (yyval.node) = mkconstnode(constant_new_undefined());}
     }
     break;
 
 
   
-    case 267:
+    case 308:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3347 "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 3301 "parser.y"
+    { (yyval.node)=(yyvsp[(2) - (3)].node);}
     }
     break;
 
 
   
-    case 268:
+    case 309:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3352 "parser.y"
-    {
-              (yyval.value).c = (yyvsp[(3) - (4)].value).c;
-              (yyval.value).c = abc_typeof((yyval.value).c);
-              (yyval.value).t = TYPE_STRING;
-             }
+#line 3302 "parser.y"
+    {(yyval.node) = mknode1(&node_neg, (yyvsp[(2) - (2)].node));}
     }
     break;
 
 
   
-    case 269:
+    case 310:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3358 "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 3303 "parser.y"
+    {(yyval.node) = mknode2(&node_arraylookup, (yyvsp[(1) - (4)].node),(yyvsp[(3) - (4)].node));}
     }
     break;
 
 
   
-    case 270:
+    case 311:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3364 "parser.y"
-    { (yyval.value).c = abc_pushundefined(0);
-             (yyval.value).t = TYPE_ANY;
-           }
+#line 3304 "parser.y"
+    {(yyval.node) = mknode2(&node_muleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 271:
+    case 312:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3368 "parser.y"
-    {(yyval.value)=(yyvsp[(2) - (3)].value);}
+#line 3305 "parser.y"
+    {(yyval.node) = mknode2(&node_modeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 272:
+    case 313:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3370 "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 3306 "parser.y"
+    {(yyval.node) = mknode2(&node_shleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 273:
+    case 314:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3381 "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 3307 "parser.y"
+    {(yyval.node) = mknode2(&node_shreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 274:
+    case 315:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3390 "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).number);
-    (yyval.value).t = registry_getarrayclass();
-}
+#line 3308 "parser.y"
+    {(yyval.node) = mknode2(&node_ushreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 275:
+    case 316:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3397 "parser.y"
-    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
+#line 3309 "parser.y"
+    { (yyval.node) = mknode2(&node_diveq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 276:
+    case 317:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3398 "parser.y"
-    {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);}
+#line 3310 "parser.y"
+    { (yyval.node) = mknode2(&node_bitoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 277:
+    case 318:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3400 "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).number = 2;
-}
+#line 3311 "parser.y"
+    { (yyval.node) = mknode2(&node_bitxoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 278:
+    case 319:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3406 "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)].value).c);
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(5) - (5)].value).c);
-}
+#line 3312 "parser.y"
+    { (yyval.node) = mknode2(&node_bitandeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 279:
+    case 320:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3415 "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).number/2);
-    (yyval.value).t = registry_getobjectclass();
-}
+#line 3313 "parser.y"
+    { (yyval.node) = mknode2(&node_pluseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 280:
+    case 321:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3422 "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 3314 "parser.y"
+    { (yyval.node) = mknode2(&node_minuseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 281:
+    case 322:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3434 "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 3315 "parser.y"
+    { (yyval.node) = mknode2(&node_assign, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 282:
+    case 323:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3440 "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 3316 "parser.y"
+    { (yyval.node) = mknode3(&node_tenary, (yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));}
     }
     break;
 
 
   
-    case 283:
+    case 324:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3446 "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 3318 "parser.y"
+    { (yyval.node) = mknode1(&node_rplusplus, (yyvsp[(1) - (2)].node));}
     }
     break;
 
 
   
-    case 284:
+    case 325:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3452 "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 3319 "parser.y"
+    { (yyval.node) = mknode1(&node_rminusminus, (yyvsp[(1) - (2)].node));}
     }
     break;
 
 
   
-    case 285:
+    case 326:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3458 "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 3320 "parser.y"
+    {(yyval.node) = mknode1(&node_lplusplus, (yyvsp[(2) - (2)].node)); }
     }
     break;
 
 
   
-    case 286:
+    case 327:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3464 "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 3321 "parser.y"
+    {(yyval.node) = mknode1(&node_lminusminus, (yyvsp[(2) - (2)].node)); }
     }
     break;
 
 
   
-    case 287:
+    case 328:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3470 "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 3324 "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;
 
 
   
-    case 288:
+    case 329:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3476 "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 3338 "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;
 
 
   
-    case 289:
+    case 330:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3489 "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 3346 "parser.y"
+    {PASS12 new_state();state->xmlfilter=1;}
     }
     break;
 
 
   
-    case 290:
+    case 331:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3500 "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 3346 "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);
+    old_state();
+    typedcode_t r;
+    r.c = c;
+    r.t = TYPE_XMLLIST;
+    (yyval.node) = mkcodenode(r);
+}
     }
     break;
 
 
   
-    case 291:
+    case 332:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3507 "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 3400 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}
     }
     break;
 
 
   
-    case 292:
+    case 333:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3520 "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 3401 "parser.y"
+    {(yyval.id)="*";}
     }
     break;
 
 
   
-    case 293:
+    case 334:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3547 "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 3402 "parser.y"
+    {(yyval.id)=(char*)(yyvsp[(1) - (1)].id);}
     }
     break;
 
 
   
-    case 294:
+    case 336:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3561 "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 3404 "parser.y"
+    {(yyval.id)="*";}
     }
     break;
 
 
   
-    case 295:
+    case 337:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3575 "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 3412 "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;
 
 
   
-    case 296:
+    case 338:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3590 "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 3430 "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;
 
 
   
-    case 297:
+    case 339:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3604 "parser.y"
+#line 3437 "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;
 
 
   
-    case 298:
+    case 340:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3611 "parser.y"
+#line 3448 "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;
 
 
   
-    case 299:
+    case 341:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3618 "parser.y"
+#line 3455 "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;
 
 
   
-    case 300:
+    case 342:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3625 "parser.y"
+#line 3462 "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;
 
 
   
-    case 301:
+    case 343:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3632 "parser.y"
+#line 3472 "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;
 
 
   
-    case 302:
+    case 344:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3643 "parser.y"
+#line 3483 "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;
     }
-    if(t) {
+    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);
         }
-        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 {
+            if(!f) {
+                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);
         }
@@ -7968,27 +8558,31 @@ PASS2
         (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));
-        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 {
-            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 */
+        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);
-        (yyval.value).t = registry_getanytype();
+        (yyval.value).t = TYPE_ANY;
     }
 }
     }
@@ -7996,11 +8590,11 @@ PASS2
 
 
   
-    case 303:
+    case 345:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3693 "parser.y"
+#line 3661 "parser.y"
     {
     PASS1
     /* Queue unresolved identifiers for checking against the parent
@@ -8010,114 +8604,36 @@ PASS2
        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))) {
-        unknown_variable((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));
-    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;
+    if(!find_variable(state, (yyvsp[(1) - (1)].id))) {
+        if(state->method->inner) {
+            unknown_variable((yyvsp[(1) - (1)].id));
         }
-    } 
-    
-    /* 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;
+        /* 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));
     }
+   
+    (yyval.node) = 0;
+    PASS2
 
-    /* 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;
 
 
   
-    case 304:
+    case 346:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3798 "parser.y"
+#line 3697 "parser.y"
     {
     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;
 }
     }
@@ -8125,11 +8641,11 @@ PASS2
 
 
   
-    case 305:
+    case 347:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3805 "parser.y"
+#line 3704 "parser.y"
     {
     PASS12
     NEW(namespace_decl_t,n);
@@ -8142,11 +8658,11 @@ PASS2
 
 
   
-    case 306:
+    case 348:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3812 "parser.y"
+#line 3711 "parser.y"
     {
     PASS12
     NEW(namespace_decl_t,n);
@@ -8159,15 +8675,30 @@ PASS2
 
 
   
-    case 307:
+    case 349:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3819 "parser.y"
+#line 3718 "parser.y"
     {
     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;
 }
     }
@@ -8175,20 +8706,43 @@ PASS2
 
 
   
-    case 308:
+    case 350:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3741 "parser.y"
+    {
+    as3_warning("default xml namespaces not supported yet");
+}
+    }
+    break;
+
+
+  
+    case 351:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3826 "parser.y"
+#line 3745 "parser.y"
     {
     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;
 }
     }
@@ -8198,7 +8752,7 @@ PASS2
 
 
 /* Line 1464 of skeleton.m4  */
-#line 8202 "parser.tab.c"
+#line 8756 "parser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);