X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=b67e11b5f235719a6548090ac33997df9831dcec;hb=639ac6b9f7a89f10d02c5d9ef41bca3bad4eaf2b;hp=b9826cffafdb4b780f09c96e796815ce8c7f2c7d;hpb=a5b36820121471188e8418567cb8e0f4cba32c75;p=swftools.git

diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c
index b9826cf..b67e11b 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,
@@ -189,42 +192,46 @@ extern int a3_lex();
      KW_IS = 322,
      KW_IN = 323,
      KW_AS = 324,
-     T_EQEQ = 325,
-     T_EQEQEQ = 326,
-     T_NE = 327,
-     T_NEE = 328,
-     T_LE = 329,
-     T_GE = 330,
-     T_ORBY = 331,
-     T_DIVBY = 332,
-     T_MODBY = 333,
-     T_MULBY = 334,
-     T_PLUSBY = 335,
-     T_MINUSBY = 336,
-     T_SHRBY = 337,
-     T_SHLBY = 338,
-     T_USHRBY = 339,
-     T_OROR = 340,
-     T_ANDAND = 341,
-     T_COLONCOLON = 342,
-     T_MINUSMINUS = 343,
-     T_PLUSPLUS = 344,
-     T_DOTDOT = 345,
-     T_DOTDOTDOT = 346,
-     T_SHL = 347,
-     T_USHR = 348,
-     T_SHR = 349,
-     prec_none = 350,
-     below_semicolon = 351,
-     below_assignment = 352,
-     below_minus = 355,
-     minusminus_prefix = 356,
-     plusplus_prefix = 357,
-     below_curly = 358,
-     new2 = 359,
-     above_identifier = 360,
-     below_else = 361,
-     above_function = 362
+     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_ANDBY = 336,
+     T_PLUSBY = 337,
+     T_MINUSBY = 338,
+     T_XORBY = 339,
+     T_SHRBY = 340,
+     T_SHLBY = 341,
+     T_USHRBY = 342,
+     T_OROR = 343,
+     T_ANDAND = 344,
+     T_COLONCOLON = 345,
+     T_MINUSMINUS = 346,
+     T_PLUSPLUS = 347,
+     T_DOTDOT = 348,
+     T_DOTDOTDOT = 349,
+     T_SHL = 350,
+     T_USHR = 351,
+     T_SHR = 352,
+     prec_none = 353,
+     below_semicolon = 354,
+     below_assignment = 355,
+     below_lt = 356,
+     below_minus = 357,
+     minusminus_prefix = 358,
+     plusplus_prefix = 359,
+     below_curly = 360,
+     new2 = 361,
+     above_identifier = 362,
+     below_else = 363,
+     above_function = 364
    };
 #endif
 
@@ -233,18 +240,19 @@ 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;
-    int flags;
 
     classinfo_t*classinfo;
     classinfo_list_t*classinfo_list;
+    slotinfo_t*slotinfo;
+    slotinfo_list_t*slotinfo_list;
 
     int number_int;
     unsigned int number_uint;
@@ -261,6 +269,9 @@ tokenunion
     for_start_t for_start;
     abc_exception_t *exception;
     regexp_t regexp;
+    modifiers_t flags;
+    namespace_decl_t* namespace_decl;
+    node_t*node;
     struct {
         abc_exception_list_t *l;
         code_t*finally;
@@ -269,7 +280,7 @@ tokenunion
 
 
 /* Line 223 of skeleton.m4  */
-#line 273 "parser.tab.c"
+#line 284 "parser.tab.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -280,7 +291,7 @@ tokenunion
 /* Copy the second part of user declarations.  */
 
 /* Line 273 of skeleton.m4  */
-#line 257 "parser.y"
+#line 274 "parser.y"
 
 
 static int a3_error(char*s)
@@ -289,6 +300,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)
 {
@@ -316,37 +334,57 @@ static char* concat3(const char* t1, const char* t2, const char* t3)
 typedef struct _import {
     char*package;
 } import_t;
-
 DECLARE_LIST(import);
 
+DECLARE(methodstate);
+DECLARE_LIST(methodstate);
+
 typedef struct _classstate {
     /* class data */
     classinfo_t*info;
     abc_class_t*abc;
-    code_t*init;
-    code_t*static_init;
+
+    methodstate_t*init;
+    methodstate_t*static_init;
+    //code_t*init;
+    //code_t*static_init;
+
     char has_constructor;
 } classstate_t;
 
-DECLARE_LIST(methodstate);
-
-typedef struct _methodstate {
+struct _methodstate {
     /* method data */
     methodinfo_t*info;
+    char has_exceptions;
     char late_binding;
     char is_constructor;
     char has_super;
     char is_global;
+    char is_static;
     int variable_count;
 
+    dict_t*unresolved_variables;
+
     char inner;
+    char uses_parent_function;
+    int uses_slots;
+    dict_t*slots;
+    int activation_var;
+
+    int need_arguments;
+
     abc_method_t*abc;
     int var_index; // for inner methods
+    int slot_index; // for inner methods
+    char is_a_slot; // for inner methods
+
+    code_t*header;
 
+    code_t*scope_code;
     abc_exception_list_t*exceptions;
     
     methodstate_list_t*innerfunctions;
-} methodstate_t;
+};
 
 typedef struct _state {
     struct _state*old;
@@ -354,21 +392,34 @@ typedef struct _state {
     
     char*package;     
     import_list_t*wildcard_imports;
+    dict_t*import_toplevel_packages;
     dict_t*imports;
+
+    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;
 
     char*exception_name;
+
+    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;
@@ -378,22 +429,25 @@ 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) { \
-        m##_ns.access = (f)->access; \
-        m##_ns.name = ""; \
+        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; \
         m.ns = &m##_ns; \
         m.namespace_set = 0; \
-        m.name = f->name; \
+        m.name = ((slotinfo_t*)(f))->name; \
     } else { \
         m.type = MULTINAME; \
         m.ns =0; \
@@ -414,13 +468,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);
@@ -430,17 +493,20 @@ static void new_state()
     if(!s->imports) {
         s->imports = dict_new();
     }
+    if(!s->import_toplevel_packages) {
+        s->import_toplevel_packages = dict_new(); 
+    }
     state = s;
     state->level++;
     state->has_own_imports = 0;    
     state->vars = dict_new(); 
     state->old = oldstate;
-}
-static void state_has_imports()
-{
-    state->wildcard_imports = list_clone(state->wildcard_imports);
-    state->imports = dict_clone(state->imports);
-    state->has_own_imports = 1;
+    state->new_vars = 0;
+
+    trie_remember(active_namespaces);
+   
+    if(oldstate)
+        state->active_namespace_urls = list_clone(oldstate->active_namespace_urls);
 }
 
 static void state_destroy(state_t*state)
@@ -453,52 +519,62 @@ 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;
-    
+
     if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) {
         free(leaving->method);
         leaving->method=0;
     }
-    if(leaving->cls && leaving->cls != state->cls) {
+    if(as3_pass>1 && leaving->cls && leaving->cls != state->cls) {
         free(leaving->cls);
         leaving->cls=0;
     }
-    
+
     state_destroy(leaving);
 }
 
+static code_t* method_header(methodstate_t*m);
+static code_t* wrap_function(code_t*c,code_t*header, code_t*body);
+static void function_initvars(methodstate_t*m, char has_params, params_t*params, int flags, char var0);
+
+
 static char* internal_filename_package = 0;
 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();
     
-    state->method = rfx_calloc(sizeof(methodstate_t));
-    state->method->variable_count = 1;
-
     global->token2info = dict_lookup(global->file2token2info, 
                                      current_filename // use long version
                                     );
@@ -506,6 +582,18 @@ void initialize_file(char*filename)
         global->token2info = dict_new2(&ptr_type);
         dict_put(global->file2token2info, current_filename, global->token2info);
     }
+  
+    if(as3_pass==1) {
+        state->method = rfx_calloc(sizeof(methodstate_t));
+        dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);
+        state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope
+    } else {
+        state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);
+        if(!state->method)
+            syntaxerror("internal error: skewed tokencount");
+        function_initvars(state->method, 0, 0, 0, 1);
+        global->init = abc_initscript(global->file);
+    }
 }
 
 void finish_file()
@@ -513,10 +601,16 @@ void finish_file()
     if(!state || state->level!=1) {
         syntaxerror("unexpected end of file in pass %d", as3_pass);
     }
-    free(state->method);state->method=0;
+    
+    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 = abc_returnvoid(c);
+        free(state->method);state->method=0;
+    }
 
     //free(state->package);state->package=0; // used in registry
-
     state_destroy(state);state=0;
 }
 
@@ -527,116 +621,124 @@ void initialize_parser()
     global->file->flags &= ~ABCFILE_LAZY;
     global->file2token2info = dict_new();
     global->token2info = 0;
-    
-    global->init = abc_initscript(global->file);
-    code_t*c = global->init->method->body->code;
-    c = abc_getlocal_0(c);
-    c = abc_pushscope(c);
-    global->init->method->body->code = c;
+    global->classinit = abc_initscript(global->file);
 }
 
 void* finish_parser()
 {
-    code_t*c = global->init->method->body->code;
-    /*c = abc_findpropstrict(c, "[package]::trace");
-      c = abc_pushstring(c, "[leaving global init function]");
-      c = abc_callpropvoid(c, "[package]::trace", 1);*/
-    c = abc_returnvoid(c);
-    global->init->method->body->code = c;
-
     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(char*name)
+static variable_t* find_variable(state_t*s, char*name)
 {
-    state_t* s = state;
+    state_t*top = s;
     while(s) {
         variable_t*v = 0;
-        if(s->method)
-            v = dict_lookup(s->vars, name);
-        if(v) {
-            return v;
-        }
-        if(s->new_vars)
-            break;
+        v = dict_lookup(s->vars, name);
+        if(v) return v;
+        if(s->new_vars) break;
         s = s->old;
     }
+    return dict_lookup(top->allvars, name);
+}
+static variable_t* find_slot(state_t*s, const char*name)
+{
+    if(s->method && s->method->slots)
+        return dict_lookup(s->method->slots, name);
     return 0;
-} 
-static variable_t* find_variable_safe(char*name)
+}
+
+static variable_t* find_variable_safe(state_t*s, char*name)
 {
-    variable_t* v = find_variable(name);
+    variable_t* v = find_variable(s, name);
     if(!v)
         syntaxerror("undefined variable: %s", name);
     return v;
 }
+
 static char variable_exists(char*name) 
 {
-    return dict_lookup(state->vars, name)!=0;
+    return dict_contains(state->vars, name);
+}
+
+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) {
+       //c = abc_pushundefined(c);
+        syntaxerror("internal error: can't generate default value for * type");
+    } else {
+       c = abc_pushnull(c);
+       MULTINAME(m, type);
+       c = abc_coerce2(c, &m);
+    }
+    return c;
+}
+
+static int alloc_local()
+{
+    return state->method->variable_count++;
 }
-code_t*defaultvalue(code_t*c, classinfo_t*type);
-static int new_variable(const char*name, classinfo_t*type, char init)
+
+static variable_t* new_variable2(const char*name, classinfo_t*type, char init, char maybeslot)
 {
+    if(maybeslot) {
+        variable_t*v = find_slot(state, name);
+        if(v)
+            return v;
+    }
+
     NEW(variable_t, v);
-    v->index = state->method->variable_count;
+    v->index = alloc_local();
     v->type = type;
     v->init = init;
-    
-    dict_put(state->vars, name, v);
+ 
+    if(name) {
+        dict_put(state->vars, name, v);
+        dict_put(state->allvars, name, v);
+    }
 
-    return state->method->variable_count++;
+    return v;
+}
+static int new_variable(const char*name, classinfo_t*type, char init, char maybeslot)
+{
+    return new_variable2(name, type, init, maybeslot)->index;
 }
+
 #define TEMPVARNAME "__as3_temp__"
-static int gettempvar()
+int gettempvar()
 {
-    variable_t*v = find_variable(TEMPVARNAME);
+    variable_t*v = find_variable(state, TEMPVARNAME);
+    int i;
     if(v) 
-        return v->index;
-    return new_variable(TEMPVARNAME, 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;
@@ -680,40 +782,85 @@ code_t* var_block(code_t*body)
     return c;
 }
 
-#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);}
-
-static void parsererror(const char*file, int line, const char*f)
+static void unknown_variable(char*name) 
 {
-    syntaxerror("internal error in %s, %s:%d", f, file, line);
+    if(!state->method->unresolved_variables)
+        state->method->unresolved_variables = dict_new();
+    if(!dict_contains(state->method->unresolved_variables, name))
+        dict_put(state->method->unresolved_variables, name, 0);
 }
 
-   
-code_t* method_header()
+static code_t* add_scope_code(code_t*c, methodstate_t*m, char init)
 {
-    code_t*c = 0;
-    if(state->method->late_binding && !state->method->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(state->method->innerfunctions) {
-        c = abc_newactivation(c);
-        c = abc_pushscope(c);
-    }*/
-    if(state->method->is_constructor && !state->method->has_super) {
-        // call default constructor
-        c = abc_getlocal_0(c);
-        c = abc_constructsuper(c, 0);
+    if(m->uses_slots) {
+        /* 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);
+        }
     }
-    methodstate_list_t*l = state->method->innerfunctions;
+    return c;
+}
+
+static code_t* method_header(methodstate_t*m)
+{
+    code_t*c = 0;
+
+    c = add_scope_code(c, m, 1);
+
+    methodstate_list_t*l = m->innerfunctions;
     while(l) {
         parserassert(l->methodstate->abc);
-        c = abc_newfunction(c, l->methodstate->abc);
-        c = abc_setlocal(c, l->methodstate->var_index);
+        if(m->uses_slots && l->methodstate->is_a_slot) {
+            c = abc_getscopeobject(c, 1);
+            c = abc_newfunction(c, l->methodstate->abc);
+            c = abc_dup(c);
+            c = abc_setlocal(c, l->methodstate->var_index);
+            c = abc_setslot(c, l->methodstate->slot_index);
+        } else {
+            c = abc_newfunction(c, l->methodstate->abc);
+            c = abc_setlocal(c, l->methodstate->var_index);
+        }
         free(l->methodstate);l->methodstate=0;
         l = l->next;
     }
-    list_free(state->method->innerfunctions);
-    state->method->innerfunctions = 0;
+    if(m->header) {
+        c = code_append(c, m->header);
+        m->header = 0;
+    }
+    if(m->is_constructor && !m->has_super) {
+        // call default constructor
+        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;
 }
     
@@ -730,20 +877,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();
 }
 
@@ -753,52 +895,146 @@ static void endpackage()
 #define FLAG_PACKAGEINTERNAL 2048
 #define FLAG_NAMESPACE 4096
 
-static int flags2access(int flags)
+static namespace_t modifiers2access(modifiers_t*mod)
 {
-    int access = 0;
-    if(flags&FLAG_PUBLIC)  {
-        if(access&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) 
+    namespace_t ns;
+    ns.access = 0;
+    ns.name = "";
+    if(mod->flags&FLAG_NAMESPACE)  {
+        if(mod->flags&(FLAG_PRIVATE|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) 
+            syntaxerror("invalid combination of access levels and namespaces");
+        ns.access = ACCESS_NAMESPACE;
+        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");
-        access = ACCESS_PACKAGE;
-    } else if(flags&FLAG_PRIVATE) {
-        if(access&(FLAG_PUBLIC|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) 
+        ns.access = ACCESS_PACKAGE;
+    } else if(mod->flags&FLAG_PRIVATE) {
+        if(mod->flags&(FLAG_PUBLIC|FLAG_PROTECTED|FLAG_PACKAGEINTERNAL)) 
             syntaxerror("invalid combination of access levels");
-        access = ACCESS_PRIVATE;
-    } else if(flags&FLAG_PROTECTED) {
-        if(access&(FLAG_PUBLIC|FLAG_PRIVATE|FLAG_PACKAGEINTERNAL)) 
+        ns.access = ACCESS_PRIVATE;
+    } else if(mod->flags&FLAG_PROTECTED) {
+        if(mod->flags&(FLAG_PUBLIC|FLAG_PRIVATE|FLAG_PACKAGEINTERNAL)) 
             syntaxerror("invalid combination of access levels");
-        access = ACCESS_PROTECTED;
+        ns.access = ACCESS_PROTECTED;
     } else {
-        access = ACCESS_PACKAGEINTERNAL;
+        ns.access = ACCESS_PACKAGEINTERNAL;
+    }
+    return ns;
+}
+static slotinfo_t* find_class(const char*name);
+
+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 function_initvars(methodstate_t*m, char has_params, params_t*params, int flags, char var0)
+{
+    if(var0) {
+        int index = -1;
+        if(m->inner)
+            index = new_variable("this", 0, 0, 0);
+        else if(!m->is_global)
+            index = new_variable((flags&FLAG_STATIC)?"class":"this", state->cls?state->cls->info:0, 0, 0);
+        else
+            index = new_variable("globalscope", 0, 0, 0);
+        parserassert(!index);
+    }
+
+    if(has_params) {
+        param_list_t*p=0;
+        for(p=params->list;p;p=p->next) {
+            variable_t*v = new_variable2(p->param->name, p->param->type, 0, 1);
+            v->is_parameter = 1;
+        }
+        variable_t*v = new_variable2("arguments", TYPE_ARRAY, 0, 0);
+        if(as3_pass==2 && m->need_arguments) {
+            m->need_arguments = v->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;
+    }
+
+
+    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;
+    }
+    
+    if(as3_pass==2) {
+        m->scope_code = add_scope_code(m->scope_code, m, 0);
+    }
+    
+    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) {
+                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;
+            }
+        }
     }
-    return access;
 }
 
+
 char*as3_globalclass=0;
-static void startclass(int flags, char*classname, classinfo_t*extends, classinfo_list_t*implements)
+static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, classinfo_list_t*implements)
 {
     if(state->cls) {
         syntaxerror("inner classes now allowed"); 
     }
-    new_state();
-    state->cls = rfx_calloc(sizeof(classstate_t));
 
+    new_state();
     token_list_t*t=0;
     classinfo_list_t*mlist=0;
 
-    if(flags&~(FLAG_PACKAGEINTERNAL|FLAG_PUBLIC|FLAG_FINAL|FLAG_DYNAMIC|FLAG_INTERFACE))
+    if(mod->flags&~(FLAG_PACKAGEINTERNAL|FLAG_PUBLIC|FLAG_FINAL|FLAG_DYNAMIC|FLAG_INTERFACE))
         syntaxerror("invalid modifier(s)");
 
-    if((flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL))
+    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))
+        syntaxerror("protected and static not supported at the same time.");
+    
+    //if(!(mod->flags&FLAG_INTERFACE) && !extends) {
+    if(!(mod->flags&FLAG_INTERFACE) && !extends) {
+        // all classes extend object
+        extends = registry_getobjectclass();
+    }
 
     /* create the class name, together with the proper attributes */
     int access=0;
     char*package=0;
 
-    if(!(flags&FLAG_PUBLIC) && state->package==internal_filename_package) {
+    if(!(mod->flags&FLAG_PUBLIC) && state->package==internal_filename_package) {
         access = ACCESS_PRIVATE; package = internal_filename_package;
-    } else if(!(flags&FLAG_PUBLIC) && state->package!=internal_filename_package) {
+    } else if(!(mod->flags&FLAG_PUBLIC) && state->package!=internal_filename_package) {
         access = ACCESS_PACKAGEINTERNAL; package = state->package;
     } else if(state->package!=internal_filename_package) {
         access = ACCESS_PACKAGE; package = state->package;
@@ -807,9 +1043,20 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo
     }
 
     if(as3_pass==1) {
-        state->method = rfx_calloc(sizeof(methodstate_t)); // method state, for static constructor
-        state->method->variable_count = 1;
-        dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);
+        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 fact
+           that pass 1 won't do anything with variables */
+        
+        dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->cls);
+
+        /* set current method to constructor- all code within the class-level (except
+           static variable initializations) will be executed during construction time */
+        state->method = state->cls->init;
 
         if(registry_find(package, classname)) {
             syntaxerror("Package \"%s\" already contains a class called \"%s\"", package, classname);
@@ -817,99 +1064,64 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo
         /* build info struct */
         int num_interfaces = (list_length(implements));
         state->cls->info = classinfo_register(access, package, classname, num_interfaces);
-        state->cls->info->flags |= flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL);
+        state->cls->info->flags |= mod->flags & (FLAG_DYNAMIC|FLAG_INTERFACE|FLAG_FINAL);
+        state->cls->info->superclass = extends;
+        
+        int pos = 0;
+        classinfo_list_t*l = implements;
+        for(l=implements;l;l=l->next) {
+            state->cls->info->interfaces[pos++] = l->classinfo;
+        }
     }
     
     if(as3_pass == 2) {
-        state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);
-
-        state->cls->info = (classinfo_t*)registry_find(package, classname);
-        parserassert((int)state->cls->info);
+        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, 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);
-
-        /* fill out interfaces and extends (we couldn't resolve those during the first pass) */
-        state->cls->info->superclass = extends?extends:TYPE_OBJECT;
+        
         int pos = 0;
-        classinfo_list_t*l = implements;
-        for(l=implements;l;l=l->next) {
-            if(!(l->classinfo->flags & FLAG_INTERFACE))
-                syntaxerror("'%s' is not an interface", l->classinfo->name);
-            state->cls->info->interfaces[pos++] = l->classinfo;
+        while(state->cls->info->interfaces[pos]) {
+            if(!(state->cls->info->interfaces[pos]->flags & FLAG_INTERFACE))
+                syntaxerror("'%s' is not an interface", 
+                    state->cls->info->interfaces[pos]->name);
+            pos++;
         }
 
         /* generate the abc code for this class */
         MULTINAME(classname2,state->cls->info);
         multiname_t*extends2 = sig2mname(extends);
 
-        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);
+        NEW(parsedclass_t,p);
+        p->cls = state->cls->info;
+        p->abc = state->cls->abc;
+        list_append(global->classes, p);
 
         /* flash.display.MovieClip handling */
-
-        if(!as3_globalclass && (flags&FLAG_PUBLIC) && slotinfo_equals((slotinfo_t*)registry_getMovieClip(),(slotinfo_t*)extends)) {
+        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);
             } else {
@@ -926,23 +1138,38 @@ static void endclass()
             code_t*c = 0;
             c = abc_getlocal_0(c);
             c = abc_constructsuper(c, 0);
-            state->cls->init = code_append(state->cls->init, c);
-        }
-        if(!state->method->late_binding) {
-            // class initialization code uses late binding
-            code_t*c = 0;
-            c = abc_getlocal_0(c);
-            c = abc_pushscope(c);
-            state->cls->static_init = code_append(c, state->cls->static_init);
+            state->cls->init->header = code_append(state->cls->init->header, c);
+            state->cls->has_constructor=1;
         }
-
         if(state->cls->init) {
-            abc_method_t*m = abc_class_getconstructor(state->cls->abc, 0);
-            m->body->code = wrap_function(0, state->cls->init, m->body->code);
+            if(state->cls->info->flags&FLAG_INTERFACE) {
+                if(state->cls->init->header) 
+                    syntaxerror("interface can not have class-level code");
+            } else {
+                abc_method_t*m = abc_class_getconstructor(state->cls->abc, 0);
+                code_t*c = method_header(state->cls->init);
+                m->body->code = wrap_function(c, 0, m->body->code);
+            }
         }
         if(state->cls->static_init) {
             abc_method_t*m = abc_class_getstaticconstructor(state->cls->abc, 0);
-            m->body->code = wrap_function(0, state->cls->static_init, m->body->code);
+            code_t*c = method_header(state->cls->static_init);
+            m->body->code = wrap_function(c, 0, m->body->code);
+        }
+      
+        trait_list_t*trait = state->cls->abc->traits;
+        /* switch all protected members to the protected ns of this class */
+        while(trait) {
+            trait_t*t = trait->trait;
+            if(t->name->ns->access == ACCESS_PROTECTED) {
+                if(!state->cls->abc->protectedNS) {
+                    char*n = concat3(state->cls->info->package, ":", state->cls->info->name);
+                    state->cls->abc->protectedNS = namespace_new_protected(n);
+                    state->cls->abc->flags |= CLASS_PROTECTED_NS;
+                }
+                t->name->ns->name = strdup(state->cls->abc->protectedNS->name);
+            }
+            trait = trait->next;
         }
     }
 
@@ -960,11 +1187,20 @@ 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);
+        }
         c=c->prev;
     }
 }
 
-
 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)
@@ -974,7 +1210,7 @@ static void check_constant_against_type(classinfo_t*t, constant_t*c)
              || c->type == CONSTANT_UINT);
    } else if(TYPE_IS_UINT(t)) {
         xassert(c->type == CONSTANT_UINT ||
-               (c->type == CONSTANT_INT && c->i>0));
+               (c->type == CONSTANT_INT && c->i>=0));
    } else if(TYPE_IS_INT(t)) {
         xassert(c->type == CONSTANT_INT);
    } else if(TYPE_IS_BOOLEAN(t)) {
@@ -995,12 +1231,15 @@ static void check_override(memberinfo_t*m, int flags)
         return;
     if(m->flags & FLAG_FINAL)
         syntaxerror("can't override final member %s", m->name);
+    
+    /* allow this. it's no issue.
     if((m->flags & FLAG_STATIC) && !(flags&FLAG_STATIC))
-        syntaxerror("can't override static member %s", m->name);
+        syntaxerror("can't override static member %s", m->name);*/
+
     if(!(m->flags & FLAG_STATIC) && (flags&FLAG_STATIC))
         syntaxerror("can't override non-static member %s with static declaration", m->name);
 
-    if(!(flags&FLAG_OVERRIDE)) {
+    if(!(flags&FLAG_OVERRIDE) && !(flags&FLAG_STATIC) && !(m->flags&FLAG_STATIC)) {
         if(m->parent && !(m->parent->flags&FLAG_INTERFACE)) {
             if(m->kind == INFOTYPE_METHOD)
                 syntaxerror("can't override without explicit 'override' declaration");
@@ -1010,21 +1249,21 @@ static void check_override(memberinfo_t*m, int flags)
     }
 }
 
-static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*name, params_t*params, classinfo_t*return_type, int slot)
+static methodinfo_t*registerfunction(enum yytokentype getset, modifiers_t*mod, char*name, params_t*params, classinfo_t*return_type, int slot)
 {
     methodinfo_t*minfo = 0;
-    U8 access = flags2access(flags);
+    namespace_t ns = modifiers2access(mod);
     if(!state->cls) {
         //package method
-        minfo = methodinfo_register_global(access, state->package, name);
+        minfo = methodinfo_register_global(ns.access, state->package, name);
         minfo->return_type = return_type;
     } else if(getset != KW_GET && getset != KW_SET) {
         //class method
-        memberinfo_t* m = registry_findmember(state->cls->info, name, 0);
+        memberinfo_t* m = registry_findmember(state->cls->info, ns.name, name, 0);
         if(m) {
             syntaxerror("class already contains a %s '%s'", infotypename((slotinfo_t*)m), m->name);
         }
-        minfo = methodinfo_register_onclass(state->cls->info, access, name);
+        minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name);
         minfo->return_type = return_type;
         // getslot on a member slot only returns "undefined", so no need
         // to actually store these
@@ -1033,14 +1272,16 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na
         //class getter/setter
         int gs = getset==KW_GET?SUBTYPE_GET:SUBTYPE_SET;
         classinfo_t*type=0;
-        if(getset == KW_GET)
+        if(getset == KW_GET) {
             type = return_type;
-        else if(params->list && params->list->param)
+        } else if(params->list && params->list->param && !params->list->next) {
             type = params->list->param->type;
+        } else
+            syntaxerror("setter function needs to take exactly one argument");
         // not sure wether to look into superclasses here, too
-        minfo = (methodinfo_t*)registry_findmember(state->cls->info, name, 1);
+        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);
@@ -1048,63 +1289,47 @@ static methodinfo_t*registerfunction(enum yytokentype getset, int flags, char*na
                 syntaxerror("getter/setter for '%s' already defined", name);
             /* make a setter or getter into a getset */
             minfo->subtype |= gs;
-            if(!minfo->return_type) {
-                minfo->return_type = type;
-            } else {
-                if(minfo && minfo->return_type != type)
-                    syntaxerror("different type in getter and setter");
-            }
+            
+            /*
+            FIXME: this check needs to be done in pass 2
+            
+            if((!minfo->return_type != !type) ||
+                (minfo->return_type && type && 
+                 !strcmp(minfo->return_type->name, type->name))) {
+                syntaxerror("different type in getter and setter: %s and %s", 
+                    minfo->return_type?minfo->return_type->name:"*", 
+                    type?type->name:"*");
+            }*/
         } else {
-            minfo = methodinfo_register_onclass(state->cls->info, access, name);
-            minfo->kind = INFOTYPE_SLOT; //hack
+            minfo = methodinfo_register_onclass(state->cls->info, ns.access, ns.name, name);
+            minfo->kind = INFOTYPE_VAR; //hack
             minfo->subtype = gs;
             minfo->return_type = type;
         }
+
         /* can't assign a slot as getter and setter might have different slots */
         //minfo->slot = slot;
     }
-    if(flags&FLAG_FINAL) minfo->flags |= FLAG_FINAL;
-    if(flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC;
-    if(flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE;
+    if(mod->flags&FLAG_FINAL) minfo->flags |= FLAG_FINAL;
+    if(mod->flags&FLAG_STATIC) minfo->flags |= FLAG_STATIC;
+    if(mod->flags&FLAG_OVERRIDE) minfo->flags |= FLAG_OVERRIDE;
+
     return minfo;
 }
 
-static void function_initvars(params_t*params, int flags)
+static void innerfunction(char*name, params_t*params, classinfo_t*return_type)
 {
-    if(state->method->inner)
-        new_variable("this", 0, 0);
-    else if(!state->method->is_global)
-        new_variable((flags&FLAG_STATIC)?"class":"this", state->cls->info, 0);
-    else
-        new_variable("globalscope", 0, 0);
+    //parserassert(state->method && state->method->info);
 
-    param_list_t*p=0;
-    for(p=params->list;p;p=p->next) {
-        new_variable(p->param->name, p->param->type, 0);
-    }
-    
-    methodstate_list_t*l = state->method->innerfunctions;
-    while(l) {
-        methodstate_t*m = l->methodstate;
-        m->var_index = new_variable(m->info->name, TYPE_FUNCTION(m->info), 0);
-        l = l->next;
-    }
-}
-
-static void innerfunction(char*name, params_t*params, classinfo_t*return_type)
-{
-    parserassert(state->method && state->method->info);
-
-    methodstate_t*parent_method = state->method;
-
-    if(as3_pass==1) {
-        // not valid yet
-        params = 0;
-        return_type = 0;
+    methodstate_t*parent_method = state->method;
+
+    if(as3_pass==1) {
+        return_type = 0; // not valid in pass 1
     }
 
     new_state();
     state->new_vars = 1;
+    state->allvars = dict_new();
    
     if(as3_pass == 1) {
         state->method = rfx_calloc(sizeof(methodstate_t));
@@ -1113,35 +1338,43 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type)
         state->method->abc = rfx_calloc(sizeof(abc_method_t));
 
         NEW(methodinfo_t,minfo);
+        minfo->kind = INFOTYPE_METHOD;
+        minfo->access = ACCESS_PACKAGEINTERNAL;
         minfo->name = name;
         state->method->info = minfo;
 
-        list_append(parent_method->innerfunctions, state->method);
+        if(parent_method)
+            list_append(parent_method->innerfunctions, state->method);
 
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);
+    
+        function_initvars(state->method, 1, params, 0, 1);
     }
 
     if(as3_pass == 2) {
         state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);
+        state->method->variable_count = 0;
         parserassert(state->method);
 
         state->method->info->return_type = return_type;
-        function_initvars(params, 0);
+        function_initvars(state->method, 1, params, 0, 1);
     }
 }
 
-static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*name,
+static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name,
                           params_t*params, classinfo_t*return_type)
 {
     if(state->method && state->method->info) {
         syntaxerror("not able to start another method scope");
     }
     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->variable_count = 0;
+        state->method->is_static = mod->flags&FLAG_STATIC;
 
         if(state->cls) {
             state->method->is_constructor = !strcmp(state->cls->info->name,name);
@@ -1152,104 +1385,178 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n
         if(state->method->is_constructor)
             name = "__as3_constructor__";
 
-        return_type = 0;
-        state->method->info = registerfunction(getset, flags, name, params, return_type, 0);
+        state->method->info = registerfunction(getset, mod, name, params, return_type, 0);
+       
+        function_initvars(state->method, 1, params, mod->flags, 1);
         
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);
     }
 
     if(as3_pass == 2) {
         state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);
+        state->method->variable_count = 0;
         parserassert(state->method);
-
+                
         if(state->cls) {
-            memberinfo_t*m = registry_findmember(state->cls->info, name, 2);
-            check_override(m, flags);
+            memberinfo_t*m = registry_findmember(state->cls->info, mod->ns, name, 2);
+            check_override(m, mod->flags);
         }
             
         if(state->cls) { 
             state->cls->has_constructor |= state->method->is_constructor;
         }
         
-        state->method->info->return_type = return_type;
-        function_initvars(params, flags);
+        function_initvars(state->method, 1, params, mod->flags, 1);
     } 
 }
 
-static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset, char*name,
+static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*name,
                           params_t*params, classinfo_t*return_type, code_t*body)
 {
     if(as3_pass==1) {
+        // store inner methods in variables
+        function_initvars(state->method, 0, 0, 0, 0);
+
+        methodstate_list_t*ml = state->method->innerfunctions;
+        
+        dict_t*xvars = dict_new();
+
+        while(ml) {
+            methodstate_t*m = ml->methodstate;
+            parserassert(m->inner);
+            if(m->unresolved_variables) {
+                dict_t*d = m->unresolved_variables;
+                int t;
+                for(t=0;t<d->hashsize;t++) {
+                    dictentry_t*l = d->slots[t]; 
+                    while(l) {
+                        /* check parent method's variables */
+                        variable_t*v;
+                        if((v=find_variable(state, l->key))) {
+                            m->uses_parent_function = 1;
+                            state->method->uses_slots = 1;
+                            dict_put(xvars, l->key, 0);
+                        }
+                        l = l->next;
+                    }
+                    if(l) break;
+                }
+
+                dict_destroy(m->unresolved_variables);
+                m->unresolved_variables = 0;
+            }
+            ml = ml->next;
+        }
+        
+        if(state->method->uses_slots) {
+            state->method->slots = dict_new();
+            int i = 1;
+            DICT_ITERATE_ITEMS(state->vars, char*, name, variable_t*, v) {
+                if(!name) syntaxerror("internal error");
+                if(v->index && dict_contains(xvars, name)) {
+                    v->init = 0;
+                    v->index = i++;
+                    if(v->is_inner_method) {
+                        v->is_inner_method->is_a_slot = 1;
+                    }
+                    //v->type = 0;
+                    dict_put(state->method->slots, name, v);
+                }
+            }
+            state->method->uses_slots = i;
+            dict_destroy(state->vars);state->vars = 0;
+            parserassert(state->new_vars);
+            dict_destroy(state->allvars);state->allvars = 0;
+        }
         old_state();
         return 0;
     }
 
-    abc_method_t*f = 0;
+    if(as3_pass==2) {
+        /*if(state->method->uses_parent_function){
+            syntaxerror("accessing variables of parent function from inner functions not supported yet");
+        }*/
 
-    multiname_t*type2 = sig2mname(return_type);
-    int slot = 0;
-    if(state->method->inner) {
-        f = state->method->abc;
-        abc_method_init(f, global->file, type2, 1);
-    } 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};
+        abc_method_t*f = 0;
 
-        if(flags&FLAG_STATIC)
-            f = abc_class_staticmethod(state->cls->abc, type2, &mname);
-        else
-            f = abc_class_method(state->cls->abc, type2, &mname);
-        slot = f->trait->slot_id;
-    } else {
-        namespace_t mname_ns = {state->method->info->access, state->package};
-        multiname_t mname = {QNAME, &mname_ns, 0, name};
-
-        f = abc_method_new(global->file, type2, 1);
-        trait_t*t = trait_new_method(&global->init->traits, multiname_clone(&mname), f);
-        //abc_code_t*c = global->init->method->body->code;
-    }
-    //flash doesn't seem to allow us to access function slots
-    //state->method->info->slot = slot;
-
-    if(flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE;
-    if(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;
-
-    char opt=0;
-    param_list_t*p=0;
-    for(p=params->list;p;p=p->next) {
-        if(params->varargs && !p->next) {
-            break; //varargs: omit last parameter in function signature
+        multiname_t*type2 = sig2mname(return_type);
+        int slot = 0;
+        if(state->method->inner) {
+            f = state->method->abc;
+            abc_method_init(f, global->file, type2, 1);
+        } else if(state->method->is_constructor) {
+            f = abc_class_getconstructor(state->cls->abc, type2);
+        } else if(!state->method->is_global) {
+            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);
+            slot = f->trait->slot_id;
+        } else {
+            namespace_t mname_ns = {state->method->info->access, state->package};
+            multiname_t mname = {QNAME, &mname_ns, 0, name};
+
+            f = abc_method_new(global->file, type2, 1);
+            trait_t*t = trait_new_method(&global->init->traits, multiname_clone(&mname), f);
+            //abc_code_t*c = global->init->method->body->code;
+        }
+        //flash doesn't seem to allow us to access function slots
+        //state->method->info->slot = slot;
+
+        if(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;
+        for(p=params->list;p;p=p->next) {
+            if(params->varargs && !p->next) {
+                break; //varargs: omit last parameter in function signature
+            }
+            multiname_t*m = sig2mname(p->param->type);
+            list_append(f->parameters, m);
+            if(p->param->value) {
+                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");
+            }
         }
-        multiname_t*m = sig2mname(p->param->type);
-	list_append(f->parameters, m);
-        if(p->param->value) {
-            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");
+        if(state->method->slots) {
+            DICT_ITERATE_ITEMS(state->method->slots, char*, name, variable_t*, v) {
+                if(v->index) {
+                    multiname_t*mname = multiname_new(namespace_new(ACCESS_PACKAGE, ""), name);
+                    multiname_t*type = sig2mname(v->type);
+                    trait_t*t = trait_new_member(&f->body->traits, type, mname, 0);
+                    t->slot_id = v->index;
+                }
+            }
         }
-    }
-    check_code_for_break(body);
 
-    if(f->body) {
-        f->body->code = body;
-        f->body->exceptions = state->method->exceptions;
-    } else { //interface
-        if(body)
-            syntaxerror("interface methods can't have a method body");
-    }
-       
-    old_state();
-    return f;
-}
+        check_code_for_break(body);
 
-char is_subtype_of(classinfo_t*type, classinfo_t*supertype)
-{
-    return 1; // FIXME
+        /* Seems this works now.
+        if(state->method->exceptions && state->method->uses_slots) {
+           as3_warning("try/catch and activation not supported yet within the same method");
+        }*/
+
+        if(f->body) {
+            f->body->code = body;
+            f->body->exceptions = state->method->exceptions;
+        } else { //interface
+            if(body)
+                syntaxerror("interface methods can't have a method body");
+        }
+
+        old_state();
+        return f;
+    }
+        
+    return 0;
 }
 
 void breakjumpsto(code_t*c, char*name, code_t*jump) 
@@ -1279,29 +1586,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)
@@ -1319,10 +1603,24 @@ 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_convert_o(c);
 
     classinfo_t*supertype = from;
     while(supertype) {
@@ -1346,36 +1644,51 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to)
         return c;
     if(TYPE_IS_NULL(from) && !IS_NUMBER_OR_INT(to))
         return c;
-    syntaxerror("can't convert type %s to %s", from->name, to->name);
-    return 0; // make gcc happy
-}
 
-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) {
-       //c = abc_pushundefined(c);
-    } else {
-       c = abc_pushnull(c);
-       MULTINAME(m, type);
-       c = abc_coerce2(c, &m);
-    }
+    as3_error("can't convert type %s%s%s to %s%s%s", 
+        from->package, from->package[0]?".":"", from->name, 
+        to->package, to->package[0]?".":"", to->name);
+
     return c;
 }
+/* move to ast.c todo end */
 
 char is_pushundefined(code_t*c)
 {
     return (c && !c->prev && !c->next && c->opcode == OPCODE_PUSHUNDEFINED);
 }
 
-static slotinfo_t* find_class(char*name)
+static const char* get_package_from_name(const char*name)
+{
+    /* try explicit imports */
+    dictentry_t* e = dict_get_slot(state->imports, name);
+    while(e) {
+        if(!strcmp(e->key, name)) {
+            slotinfo_t*c = (slotinfo_t*)e->data;
+            if(c) return c->package;
+        }
+        e = e->next;
+    }
+    return 0;
+}
+static namespace_list_t*get_current_imports()
+{
+    namespace_list_t*searchlist = 0;
+    
+    list_append(searchlist, namespace_new_package(state->package));
+
+    import_list_t*l = state->wildcard_imports;
+    while(l) {
+        namespace_t*ns = namespace_new_package(l->import->package);
+        list_append(searchlist, ns);
+        l = l->next;
+    }
+    list_append(searchlist, namespace_new_package(""));
+    list_append(searchlist, namespace_new_package(internal_filename_package));
+    return searchlist;
+}
+
+static slotinfo_t* find_class(const char*name)
 {
     slotinfo_t*c=0;
 
@@ -1412,173 +1725,46 @@ static slotinfo_t* find_class(char*name)
 
     return 0;
 }
-
-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)
+typedcode_t push_class(slotinfo_t*a)
 {
-    /* 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 {
-        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);
+    typedcode_t x;
+    x.c = 0;
+    x.t = 0;
+    if(a->access == ACCESS_PACKAGEINTERNAL &&
+       strcmp(a->package, state->package) &&
+       strcmp(a->package, internal_filename_package)
+       ) {
+       syntaxerror("Can't access internal %s %s in package '%s' from package '%s'",
+            infotypename(a), a->name, a->package, state->package);
+    }
+
+    if(a->kind != INFOTYPE_CLASS) {
+        MULTINAME(m, a);
+        x.c = abc_findpropstrict2(x.c, &m);
+        x.c = abc_getproperty2(x.c, &m);
+        if(a->kind == INFOTYPE_METHOD) {
+            methodinfo_t*f = (methodinfo_t*)a;
+            x.t = TYPE_FUNCTION(f);
         } 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);
+            varinfo_t*v = (varinfo_t*)a;
+            x.t = v->type;
         }
     } 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);
+        classinfo_t*c = (classinfo_t*)a;
+        //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 {
-            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);
+            MULTINAME(m, c);
+            x.c = abc_getlex2(x.c, &m);
         }
+        x.t = TYPE_CLASS(c);
     }
-    return c;
+    return x;
 }
 
+
 char is_break_or_jump(code_t*c)
 {
     if(!c)
@@ -1594,7 +1780,6 @@ char is_break_or_jump(code_t*c)
     return 0;
 }
 
-
 #define IS_FINALLY_TARGET(op) \
         ((op) == OPCODE___CONTINUE__ || \
          (op) == OPCODE___BREAK__ || \
@@ -1702,10 +1887,10 @@ code_t* insert_finally(code_t*c, code_t*finally, int tempvar)
     int lookup_version_cost = 4*num_insertion_points + 5;
 
     if(cantdup || simple_version_cost > lookup_version_cost) {
-        printf("lookup %d > *%d*\n", simple_version_cost, lookup_version_cost);
+        //printf("(use lookup) simple=%d > lookup=%d\n", simple_version_cost, lookup_version_cost);
         return insert_finally_lookup(c, finally, tempvar);
     } else {
-        printf("simple *%d* < %d\n", simple_version_cost, lookup_version_cost);
+        //printf("(use simple) simple=%d < lookup=%d\n", simple_version_cost, lookup_version_cost);
         return insert_finally_simple(c, finally, tempvar);
     }
 }
@@ -1713,13 +1898,242 @@ 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 1723 "parser.tab.c"
+#line 1909 "parser.tab.c"
+/* Unqualified %code blocks.  */
+
+/* Line 274 of skeleton.m4  */
+#line 1985 "parser.y"
+
+    char is_subtype_of(classinfo_t*type, classinfo_t*supertype)
+    {
+        return 1; // FIXME
+    }
+
+
+/* Line 274 of skeleton.m4  */
+#line 2434 "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 2567 "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(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 2747 "parser.y"
+
+    static int xml_level = 0;
+
+
+/* Line 274 of skeleton.m4  */
+#line 3519 "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 3661 "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 2137 "parser.tab.c"
 
 #ifdef short
 # undef short
@@ -1932,22 +2346,22 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  125
+#define YYFINAL  157
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   3223
+#define YYLAST   3397
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  133
+#define YYNTOKENS  135
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  109
+#define YYNNTS  134
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  301
+#define YYNRULES  347
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  512
+#define YYNSTATES  591
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   362
+#define YYMAXUTOK   364
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -1958,16 +2372,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,   117,     2,     2,     2,   115,   107,     2,
-     121,   132,   114,   112,    98,   111,   126,   113,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   104,    97,
-     108,   100,   109,   103,   127,     2,     2,     2,     2,     2,
+       2,     2,     2,   119,     2,     2,     2,   117,   108,     2,
+     123,   134,   116,   114,   101,   113,   128,   115,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   105,   100,
+     110,   103,   111,   104,   129,     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,   123,     2,   124,   106,     2,     2,     2,     2,     2,
+       2,   125,     2,   126,   107,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   125,   105,   131,   116,     2,     2,     2,
+       2,     2,     2,   127,   106,   133,   118,     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,
@@ -1990,8 +2404,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,    99,   101,   102,   110,   118,   119,   120,   122,
-     128,   129,   130
+      95,    96,    97,    98,    99,   102,   109,   112,   120,   121,
+     122,   124,   130,   131,   132
 };
 
 #if YYDEBUG
@@ -2003,165 +2417,188 @@ 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,    91,    93,    95,    97,    99,   101,   106,
-     108,   112,   115,   118,   120,   122,   126,   129,   130,   133,
+      85,    87,    89,    93,    96,    98,   100,   102,   104,   106,
+     108,   110,   115,   118,   120,   122,   126,   129,   130,   133,
      136,   138,   142,   146,   147,   150,   151,   159,   160,   162,
      164,   168,   170,   173,   177,   186,   193,   194,   201,   202,
      210,   212,   215,   217,   220,   221,   223,   225,   228,   230,
      233,   238,   242,   243,   252,   253,   263,   264,   270,   272,
-     275,   277,   280,   282,   283,   290,   293,   295,   301,   303,
-     305,   309,   311,   312,   319,   320,   326,   329,   334,   335,
-     337,   339,   342,   344,   346,   348,   350,   352,   354,   356,
-     358,   360,   362,   363,   366,   367,   370,   371,   374,   375,
-     385,   386,   395,   396,   398,   400,   403,   405,   410,   412,
-     414,   416,   417,   419,   421,   424,   426,   429,   438,   440,
-     442,   448,   449,   452,   454,   456,   458,   460,   462,   464,
-     466,   468,   470,   471,   473,   476,   481,   485,   487,   492,
-     495,   497,   499,   500,   501,   514,   516,   517,   518,   529,
-     531,   535,   537,   539,   541,   545,   547,   549,   551,   554,
-     555,   556,   560,   561,   563,   565,   567,   570,   573,   574,
-     579,   584,   589,   592,   594,   597,   599,   601,   605,   607,
-     609,   611,   613,   615,   617,   619,   621,   623,   625,   627,
-     629,   631,   633,   635,   637,   639,   641,   645,   649,   653,
-     657,   661,   665,   669,   673,   677,   681,   684,   687,   691,
-     695,   699,   703,   707,   711,   715,   719,   723,   727,   731,
-     735,   739,   743,   747,   752,   755,   757,   761,   764,   769,
-     773,   774,   776,   780,   786,   790,   794,   798,   802,   806,
-     810,   814,   818,   822,   826,   830,   836,   839,   842,   845,
-     848,   852,   855,   860,   866,   870,   876,   880,   882,   886,
-     892,   898
+     275,   277,   280,   282,   283,   290,   293,   295,   300,   303,
+     305,   307,   309,   313,   315,   316,   323,   324,   330,   333,
+     338,   339,   341,   343,   346,   348,   350,   352,   354,   356,
+     358,   360,   362,   364,   366,   367,   370,   371,   374,   375,
+     378,   379,   389,   390,   399,   400,   402,   404,   407,   409,
+     414,   416,   418,   420,   421,   423,   425,   428,   430,   433,
+     442,   444,   446,   447,   452,   454,   458,   462,   463,   466,
+     468,   470,   472,   474,   476,   478,   480,   482,   484,   486,
+     488,   490,   491,   492,   497,   498,   503,   504,   507,   510,
+     513,   516,   520,   522,   524,   535,   542,   554,   555,   557,
+     559,   562,   564,   568,   572,   576,   580,   581,   583,   586,
+     591,   595,   597,   602,   605,   607,   609,   610,   611,   624,
+     626,   627,   628,   639,   641,   645,   647,   649,   651,   655,
+     657,   659,   661,   664,   665,   666,   670,   671,   673,   675,
+     677,   680,   683,   684,   689,   694,   699,   702,   704,   707,
+     709,   711,   713,   717,   719,   723,   724,   726,   728,   730,
+     732,   734,   736,   740,   746,   748,   750,   752,   754,   756,
+     758,   760,   762,   764,   766,   770,   774,   778,   782,   786,
+     790,   794,   798,   802,   806,   810,   814,   817,   820,   824,
+     828,   832,   836,   840,   844,   848,   852,   856,   860,   864,
+     868,   872,   876,   880,   885,   888,   890,   894,   897,   902,
+     906,   910,   914,   918,   922,   926,   930,   934,   938,   942,
+     946,   950,   956,   959,   962,   965,   968,   972,   975,   976,
+     983,   985,   987,   989,   991,   997,  1001,  1007,  1012,  1017,
+    1024,  1031,  1035,  1037,  1040,  1045,  1050,  1053
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     134,     0,    -1,   135,    -1,    -1,   136,    -1,   137,    -1,
-     136,   137,    -1,   184,    -1,   196,    -1,   194,    -1,   212,
-      -1,   205,    -1,   146,    -1,   147,   125,   135,   131,    -1,
-      97,    -1,    -1,   139,    -1,   140,    -1,   139,   140,    -1,
-     196,    -1,   194,    -1,   212,    -1,   205,    -1,   146,    -1,
-     147,   125,   138,   131,    -1,    97,    -1,   142,    -1,    -1,
-     142,   144,    -1,   144,    -1,   187,    -1,   158,    -1,   159,
-      -1,   160,    -1,   162,    -1,   170,    -1,   153,    -1,   181,
-      -1,   178,    -1,   234,    -1,   241,    -1,    97,    -1,   143,
-      -1,   149,    -1,   164,    -1,   165,    -1,   231,    -1,   180,
-      -1,   147,   125,   142,   131,    -1,   240,    -1,   125,   142,
-     131,    -1,   125,   131,    -1,   144,    97,    -1,   144,    -1,
-     143,    -1,     3,    87,     3,    -1,   100,   232,    -1,    -1,
-      46,   150,    -1,    32,   150,    -1,   151,    -1,   150,    98,
-     151,    -1,     3,   222,   148,    -1,    -1,    65,   145,    -1,
-      -1,    64,   121,   154,   233,   132,   145,   152,    -1,    -1,
-     149,    -1,   234,    -1,    46,     3,   222,    -1,     3,    -1,
-      13,   121,    -1,    13,    50,   121,    -1,   157,   155,    97,
-     233,    97,   234,   132,   145,    -1,   157,   156,    68,   233,
-     132,   145,    -1,    -1,    14,   121,   161,   233,   132,   145,
-      -1,    -1,    15,   163,   145,    14,   121,   233,   132,    -1,
+     136,     0,    -1,   137,    -1,    -1,   138,    -1,   139,    -1,
+     138,   139,    -1,   187,    -1,   199,    -1,   197,    -1,   233,
+      -1,   208,    -1,   148,    -1,   149,   127,   137,   133,    -1,
+     100,    -1,    -1,   141,    -1,   142,    -1,   141,   142,    -1,
+     199,    -1,   197,    -1,   233,    -1,   208,    -1,   148,    -1,
+     149,   127,   140,   133,    -1,   100,    -1,   144,    -1,    -1,
+     144,   146,    -1,   146,    -1,   190,    -1,   160,    -1,   161,
+      -1,   162,    -1,   164,    -1,   172,    -1,   155,    -1,   184,
+      -1,   180,    -1,   256,    -1,   268,    -1,   267,    -1,   127,
+     144,   133,    -1,   127,   133,    -1,   100,    -1,   145,    -1,
+     151,    -1,   166,    -1,   167,    -1,   252,    -1,   182,    -1,
+     149,   127,   144,   133,    -1,   146,   100,    -1,   146,    -1,
+     145,    -1,     3,    90,     3,    -1,   103,   260,    -1,    -1,
+      46,   152,    -1,    32,   152,    -1,   153,    -1,   152,   101,
+     153,    -1,     3,   243,   150,    -1,    -1,    65,   147,    -1,
+      -1,    64,   123,   156,   254,   134,   147,   154,    -1,    -1,
+     151,    -1,   256,    -1,    46,     3,   243,    -1,     3,    -1,
+      11,   123,    -1,    11,    50,   123,    -1,   159,   157,   100,
+     254,   100,   256,   134,   147,    -1,   159,   158,    68,   254,
+     134,   147,    -1,    -1,    12,   123,   163,   254,   134,   147,
+      -1,    -1,    13,   165,   147,    12,   123,   254,   134,    -1,
       66,    -1,    66,     3,    -1,    30,    -1,    30,     3,    -1,
-      -1,   167,    -1,   169,    -1,   167,   169,    -1,   168,    -1,
-     167,   168,    -1,    34,   235,   104,   141,    -1,    62,   104,
-     141,    -1,    -1,    16,   121,   171,   235,   132,   125,   166,
-     131,    -1,    -1,    33,   121,     3,   222,   132,   173,   125,
-     141,   131,    -1,    -1,    28,   125,   175,   141,   131,    -1,
-     172,    -1,   176,   172,    -1,   176,    -1,   176,   174,    -1,
-     174,    -1,    -1,    52,   125,   179,   141,   131,   177,    -1,
-      37,   233,    -1,    37,    -1,    39,   121,   233,   132,   145,
-      -1,     3,    -1,    19,    -1,   183,   126,   182,    -1,   182,
-      -1,    -1,    19,   183,   125,   185,   138,   131,    -1,    -1,
-      19,   125,   186,   138,   131,    -1,    41,   218,    -1,    41,
-     183,   126,   114,    -1,    -1,   189,    -1,   190,    -1,   189,
-     190,    -1,    21,    -1,    22,    -1,    20,    -1,    38,    -1,
-      47,    -1,    49,    -1,    48,    -1,    26,    -1,    24,    -1,
-       4,    -1,    -1,    54,   219,    -1,    -1,    54,   220,    -1,
-      -1,    17,   220,    -1,    -1,   188,    31,     3,   191,   193,
-     125,   195,   198,   131,    -1,    -1,   188,    44,     3,   192,
-     125,   197,   201,   131,    -1,    -1,   199,    -1,   200,    -1,
-     199,   200,    -1,    97,    -1,   147,   125,   198,   131,    -1,
-     205,    -1,   212,    -1,   143,    -1,    -1,   202,    -1,   203,
-      -1,   202,   203,    -1,    97,    -1,    46,     3,    -1,   188,
-      27,   211,     3,   121,   208,   132,   222,    -1,    46,    -1,
-      32,    -1,   188,   204,     3,   222,   148,    -1,    -1,   100,
-     207,    -1,    10,    -1,     8,    -1,     9,    -1,    12,    -1,
-       5,    -1,    56,    -1,    55,    -1,    45,    -1,     3,    -1,
-      -1,   209,    -1,    91,   210,    -1,   209,    98,    91,   210,
-      -1,   209,    98,   210,    -1,   210,    -1,     3,   104,   221,
-     206,    -1,     3,   206,    -1,    51,    -1,    35,    -1,    -1,
-      -1,   188,    27,   211,     3,   121,   208,   132,   222,   125,
-     213,   141,   131,    -1,     3,    -1,    -1,    -1,    27,   214,
-     121,   208,   132,   222,   125,   216,   141,   131,    -1,     3,
-      -1,   183,   126,     3,    -1,   218,    -1,   217,    -1,   219,
-      -1,   220,    98,   219,    -1,   219,    -1,   114,    -1,    36,
-      -1,   104,   221,    -1,    -1,    -1,   121,   224,   132,    -1,
-      -1,   225,    -1,   226,    -1,   232,    -1,   225,    98,    -1,
-     226,   232,    -1,    -1,    25,   235,   227,   223,    -1,   235,
-     121,   224,   132,    -1,    53,   121,   224,   132,    -1,    63,
-     235,    -1,    42,    -1,    42,   233,    -1,   235,    -1,   235,
-      -1,   233,    98,   235,    -1,   233,    -1,   215,    -1,   236,
-      -1,   239,    -1,   228,    -1,   230,    -1,   229,    -1,     6,
-      -1,    10,    -1,    11,    -1,     8,    -1,     9,    -1,    12,
-      -1,     5,    -1,    29,    -1,    56,    -1,    55,    -1,    45,
-      -1,   235,   108,   235,    -1,   235,   109,   235,    -1,   235,
-      74,   235,    -1,   235,    75,   235,    -1,   235,    70,   235,
-      -1,   235,    71,   235,    -1,   235,    73,   235,    -1,   235,
-      72,   235,    -1,   235,    85,   235,    -1,   235,    86,   235,
-      -1,   117,   235,    -1,   116,   235,    -1,   235,   107,   235,
-      -1,   235,   106,   235,    -1,   235,   105,   235,    -1,   235,
-      94,   235,    -1,   235,    93,   235,    -1,   235,    92,   235,
-      -1,   235,   113,   235,    -1,   235,   115,   235,    -1,   235,
-     112,   235,    -1,   235,   111,   235,    -1,   235,   114,   235,
-      -1,   235,    68,   235,    -1,   235,    69,   235,    -1,   235,
-      40,   235,    -1,   235,    67,   235,    -1,    43,   121,   235,
-     132,    -1,    36,   235,    -1,    36,    -1,   121,   233,   132,
-      -1,   111,   235,    -1,   235,   123,   235,   124,    -1,   123,
-     224,   124,    -1,    -1,   238,    -1,   232,   104,   232,    -1,
-     238,    98,   232,   104,   232,    -1,   125,   237,   131,    -1,
-     235,    79,   235,    -1,   235,    78,   235,    -1,   235,    83,
-     235,    -1,   235,    82,   235,    -1,   235,    84,   235,    -1,
-     235,    77,   235,    -1,   235,    76,   235,    -1,   235,    80,
-     235,    -1,   235,    81,   235,    -1,   235,   100,   235,    -1,
-     235,   103,   235,   104,   235,    -1,   235,    89,    -1,   235,
-      88,    -1,    89,   235,    -1,    88,   235,    -1,    53,   126,
-       3,    -1,   127,     3,    -1,   235,   126,   127,     3,    -1,
-     235,   126,     3,    87,     3,    -1,   235,    90,     3,    -1,
-     235,   126,   121,   235,   132,    -1,   235,   126,     3,    -1,
-       3,    -1,   188,    18,     3,    -1,   188,    18,     3,   100,
-       3,    -1,   188,    18,     3,   100,     5,    -1,    23,    18,
-       3,    -1
+      -1,   169,    -1,   171,    -1,   169,   171,    -1,   170,    -1,
+     169,   170,    -1,    34,   260,   105,   143,    -1,    62,   105,
+     143,    -1,    -1,    14,   123,   173,   260,   134,   127,   168,
+     133,    -1,    -1,    33,   123,     3,   243,   134,   175,   127,
+     143,   133,    -1,    -1,    27,   127,   177,   143,   133,    -1,
+     174,    -1,   178,   174,    -1,   178,    -1,   178,   176,    -1,
+     176,    -1,    -1,    52,   127,   181,   143,   133,   179,    -1,
+      37,   254,    -1,    37,    -1,    39,   123,   254,   134,    -1,
+     183,   147,    -1,     3,    -1,    17,    -1,     4,    -1,   186,
+     128,   185,    -1,   185,    -1,    -1,    17,   186,   127,   188,
+     140,   133,    -1,    -1,    17,   127,   189,   140,   133,    -1,
+      41,   239,    -1,    41,   186,   128,   116,    -1,    -1,   192,
+      -1,   193,    -1,   192,   193,    -1,    20,    -1,    21,    -1,
+      18,    -1,    38,    -1,    47,    -1,    49,    -1,    48,    -1,
+      25,    -1,    23,    -1,     4,    -1,    -1,    54,   240,    -1,
+      -1,    54,   241,    -1,    -1,    15,   241,    -1,    -1,   191,
+      31,     3,   194,   196,   127,   198,   201,   133,    -1,    -1,
+     191,    44,     3,   195,   127,   200,   204,   133,    -1,    -1,
+     202,    -1,   203,    -1,   202,   203,    -1,   100,    -1,   149,
+     127,   201,   133,    -1,   208,    -1,   233,    -1,   145,    -1,
+      -1,   205,    -1,   206,    -1,   205,   206,    -1,   100,    -1,
+      46,     3,    -1,   191,    26,   232,     3,   123,   229,   134,
+     243,    -1,    46,    -1,    32,    -1,    -1,   191,   207,   209,
+     210,    -1,   211,    -1,   210,   101,   211,    -1,     3,   243,
+     150,    -1,    -1,   103,   260,    -1,     8,    -1,     9,    -1,
+      10,    -1,     5,    -1,    56,    -1,    55,    -1,    45,    -1,
+      28,    -1,    29,    -1,   225,    -1,   110,    -1,   111,    -1,
+      -1,    -1,   127,   260,   219,   133,    -1,    -1,   127,   260,
+     221,   133,    -1,    -1,   222,   218,    -1,   222,     5,    -1,
+     222,   111,    -1,   225,   222,    -1,   223,   225,   222,    -1,
+       3,    -1,   220,    -1,   215,   224,   226,   216,   222,   110,
+     115,   224,   217,   111,    -1,   215,   224,   226,   115,   217,
+     111,    -1,   215,   224,   226,   216,   222,   223,   110,   115,
+     224,   217,   111,    -1,    -1,   227,    -1,   228,    -1,   227,
+     228,    -1,   220,    -1,   220,   103,     5,    -1,   220,   103,
+     220,    -1,     3,   103,   220,    -1,     3,   103,     5,    -1,
+      -1,   230,    -1,    94,   231,    -1,   230,   101,    94,   231,
+      -1,   230,   101,   231,    -1,   231,    -1,     3,   105,   242,
+     212,    -1,     3,   212,    -1,    51,    -1,    35,    -1,    -1,
+      -1,   191,    26,   232,     3,   123,   229,   134,   243,   127,
+     234,   143,   133,    -1,     3,    -1,    -1,    -1,    26,   235,
+     123,   229,   134,   243,   127,   237,   143,   133,    -1,   185,
+      -1,   186,   128,   185,    -1,   239,    -1,   238,    -1,   240,
+      -1,   241,   101,   240,    -1,   240,    -1,   116,    -1,    36,
+      -1,   105,   242,    -1,    -1,    -1,   123,   245,   134,    -1,
+      -1,   246,    -1,   247,    -1,   253,    -1,   246,   101,    -1,
+     247,   253,    -1,    -1,    24,   260,   248,   244,    -1,   260,
+     123,   245,   134,    -1,    53,   123,   245,   134,    -1,    63,
+     260,    -1,    42,    -1,    42,   254,    -1,   260,    -1,   255,
+      -1,   260,    -1,   255,   101,   260,    -1,   260,    -1,   256,
+     101,   260,    -1,    -1,   259,    -1,     3,    -1,     5,    -1,
+       8,    -1,     9,    -1,    10,    -1,   258,   105,   253,    -1,
+     259,   101,   258,   105,   253,    -1,   236,    -1,   264,    -1,
+     249,    -1,   251,    -1,   250,    -1,   265,    -1,   213,    -1,
+     214,    -1,     6,    -1,    19,    -1,   125,   245,   126,    -1,
+      70,   257,   133,    -1,   260,   110,   260,    -1,   260,   111,
+     260,    -1,   260,    75,   260,    -1,   260,    76,   260,    -1,
+     260,    71,   260,    -1,   260,    72,   260,    -1,   260,    74,
+     260,    -1,   260,    73,   260,    -1,   260,    88,   260,    -1,
+     260,    89,   260,    -1,   119,   260,    -1,   118,   260,    -1,
+     260,   108,   260,    -1,   260,   107,   260,    -1,   260,   106,
+     260,    -1,   260,    97,   260,    -1,   260,    96,   260,    -1,
+     260,    95,   260,    -1,   260,   115,   260,    -1,   260,   117,
+     260,    -1,   260,   114,   260,    -1,   260,   113,   260,    -1,
+     260,   116,   260,    -1,   260,    68,   260,    -1,   260,    69,
+     260,    -1,   260,    40,   260,    -1,   260,    67,   260,    -1,
+      43,   123,   260,   134,    -1,    36,   260,    -1,    36,    -1,
+     123,   255,   134,    -1,   113,   260,    -1,   260,   125,   260,
+     126,    -1,   260,    80,   260,    -1,   260,    79,   260,    -1,
+     260,    86,   260,    -1,   260,    85,   260,    -1,   260,    87,
+     260,    -1,   260,    78,   260,    -1,   260,    77,   260,    -1,
+     260,    84,   260,    -1,   260,    81,   260,    -1,   260,    82,
+     260,    -1,   260,    83,   260,    -1,   260,   103,   260,    -1,
+     260,   104,   260,   105,   260,    -1,   260,    92,    -1,   260,
+      91,    -1,    92,   260,    -1,    91,   260,    -1,    53,   128,
+       3,    -1,   129,     3,    -1,    -1,   260,   128,   123,   261,
+     260,   134,    -1,     3,    -1,     4,    -1,     3,    -1,   116,
+      -1,   260,   128,   262,    90,   263,    -1,   260,    93,   263,
+      -1,   260,   128,   125,   260,   126,    -1,   260,   128,   129,
+     263,    -1,   260,    93,   129,   263,    -1,   260,   128,   129,
+     125,   260,   126,    -1,   260,    93,   129,   125,   260,   126,
+      -1,   260,   128,   263,    -1,     3,    -1,    16,     3,    -1,
+      16,     3,   103,     3,    -1,    16,     3,   103,     5,    -1,
+     191,   266,    -1,    22,    16,   240,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,  1698,  1698,  1700,  1700,  1701,  1702,  1704,  1705,  1706,
-    1707,  1708,  1709,  1710,  1711,  1713,  1713,  1714,  1715,  1717,
-    1718,  1719,  1720,  1721,  1722,  1723,  1725,  1726,  1728,  1729,
-    1732,  1733,  1734,  1735,  1736,  1737,  1738,  1739,  1740,  1741,
-    1742,  1745,  1746,  1747,  1748,  1749,  1750,  1751,  1752,  1754,
-    1756,  1757,  1758,  1759,  1763,  1770,  1774,  1775,  1779,  1780,
-    1782,  1783,  1785,  1828,  1829,  1832,  1832,  1851,  1852,  1853,
-    1856,  1859,  1863,  1864,  1866,  1886,  1929,  1929,  1948,  1948,
-    1963,  1966,  1969,  1972,  1976,  1977,  1978,  1979,  1980,  1981,
-    1983,  1994,  1997,  1997,  2026,  2026,  2046,  2046,  2063,  2064,
-    2065,  2066,  2074,  2083,  2083,  2128,  2132,  2143,  2152,  2153,
-    2155,  2156,  2158,  2158,  2160,  2160,  2163,  2177,  2193,  2194,
-    2195,  2196,  2198,  2199,  2200,  2201,  2202,  2203,  2204,  2205,
-    2206,  2207,  2209,  2210,  2212,  2213,  2215,  2216,  2220,  2218,
-    2226,  2224,  2232,  2233,  2234,  2235,  2236,  2237,  2238,  2239,
-    2241,  2247,  2248,  2249,  2250,  2251,  2252,  2255,  2268,  2268,
-    2270,  2343,  2344,  2346,  2347,  2348,  2349,  2350,  2352,  2353,
-    2354,  2355,  2364,  2368,  2374,  2380,  2388,  2393,  2399,  2407,
-    2415,  2416,  2417,  2420,  2419,  2434,  2435,  2437,  2436,  2458,
-    2467,  2480,  2481,  2483,  2484,  2486,  2487,  2488,  2497,  2498,
-    2502,  2503,  2505,  2506,  2507,  2509,  2513,  2514,  2519,  2520,
-    2556,  2602,  2623,  2644,  2647,  2654,  2655,  2656,  2662,  2668,
-    2670,  2672,  2674,  2676,  2678,  2680,  2697,  2702,  2705,  2708,
-    2711,  2714,  2717,  2720,  2723,  2726,  2730,  2733,  2736,  2739,
-    2742,  2745,  2748,  2751,  2755,  2766,  2784,  2789,  2794,  2799,
-    2804,  2809,  2813,  2817,  2822,  2826,  2830,  2839,  2848,  2858,
-    2863,  2875,  2881,  2886,  2892,  2898,  2902,  2904,  2915,  2924,
-    2931,  2932,  2934,  2940,  2949,  2956,  2968,  2974,  2980,  2986,
-    2992,  2998,  3004,  3017,  3028,  3035,  3048,  3075,  3089,  3103,
-    3117,  3132,  3139,  3146,  3153,  3160,  3171,  3205,  3307,  3308,
-    3309,  3311
+       0,  1890,  1890,  1892,  1892,  1893,  1894,  1896,  1897,  1898,
+    1899,  1900,  1901,  1902,  1903,  1905,  1905,  1906,  1907,  1909,
+    1910,  1911,  1912,  1913,  1914,  1915,  1917,  1918,  1920,  1923,
+    1926,  1927,  1928,  1929,  1930,  1931,  1932,  1933,  1934,  1935,
+    1936,  1937,  1938,  1939,  1942,  1943,  1944,  1945,  1946,  1947,
+    1948,  1949,  1961,  1962,  1966,  1973,  1992,  1993,  1995,  1996,
+    1998,  1999,  2001,  2061,  2062,  2065,  2065,  2084,  2085,  2086,
+    2091,  2095,  2100,  2101,  2103,  2123,  2171,  2171,  2190,  2190,
+    2205,  2208,  2211,  2214,  2218,  2219,  2220,  2221,  2222,  2223,
+    2225,  2236,  2239,  2239,  2270,  2270,  2295,  2295,  2311,  2312,
+    2313,  2314,  2322,  2331,  2331,  2380,  2384,  2395,  2405,  2422,
+    2423,  2424,  2426,  2427,  2429,  2429,  2431,  2431,  2454,  2468,
+    2484,  2485,  2486,  2487,  2494,  2495,  2496,  2497,  2498,  2499,
+    2500,  2501,  2502,  2503,  2507,  2508,  2510,  2511,  2513,  2514,
+    2518,  2516,  2524,  2522,  2531,  2532,  2533,  2534,  2535,  2536,
+    2537,  2538,  2540,  2546,  2547,  2548,  2549,  2550,  2551,  2554,
+    2622,  2622,  2624,  2624,  2626,  2627,  2629,  2713,  2714,  2723,
+    2724,  2727,  2728,  2729,  2730,  2731,  2732,  2733,  2751,  2753,
+    2754,  2755,  2757,  2757,  2761,  2761,  2765,  2766,  2769,  2770,
+    2772,  2773,  2775,  2776,  2778,  2782,  2785,  2790,  2791,  2792,
+    2793,  2795,  2798,  2802,  2805,  2808,  2818,  2822,  2828,  2834,
+    2842,  2847,  2853,  2861,  2869,  2870,  2871,  2874,  2873,  2890,
+    2891,  2893,  2892,  2916,  2935,  2949,  2950,  2952,  2953,  2955,
+    2956,  2957,  2966,  2967,  2971,  2972,  2974,  2975,  2976,  2978,
+    2982,  2983,  2988,  2989,  3033,  3083,  3104,  3126,  3129,  3136,
+    3139,  3142,  3145,  3148,  3151,  3156,  3157,  3159,  3160,  3161,
+    3162,  3163,  3165,  3171,  3180,  3181,  3182,  3183,  3184,  3185,
+    3187,  3191,  3203,  3221,  3232,  3242,  3251,  3252,  3253,  3254,
+    3255,  3256,  3257,  3258,  3259,  3260,  3261,  3262,  3263,  3264,
+    3265,  3266,  3267,  3268,  3269,  3270,  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,  3298,  3299,  3300,  3301,  3303,  3318,  3326,  3326,
+    3380,  3381,  3382,  3383,  3385,  3403,  3410,  3421,  3428,  3435,
+    3445,  3456,  3634,  3670,  3677,  3684,  3691,  3713
 };
 #endif
 
@@ -2171,11 +2608,11 @@ 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\"",
@@ -2184,39 +2621,45 @@ static const char *const yytname[] =
   "\"extends\"", "\"false\"", "\"true\"", "\"Boolean\"", "\"uint\"",
   "\"int\"", "\"Number\"", "\"String\"", "\"default\"", "\"delete\"",
   "\"if\"", "\"else\"", "\"break\"", "\"is\"", "\"in\"", "\"as\"",
-  "\"==\"", "\"===\"", "\"!=\"", "\"!==\"", "\"<=\"", "\">=\"", "\"|=\"",
-  "\"/=\"", "\"%=\"", "\"*=\"", "\"+=\"", "\"-=\"", "\">>=\"", "\"<<=\"",
-  "\">>>=\"", "\"||\"", "\"&&\"", "\"::\"", "\"--\"", "\"++\"", "\"..\"",
-  "\"...\"", "\"<<\"", "\">>>\"", "\">>\"", "prec_none", "below_semicolon",
-  "';'", "','", "below_assignment", "'='", "\"&=\"", "\"^=\"", "'?'",
-  "':'", "'|'", "'^'", "'&'", "'<'", "'>'", "below_minus", "'-'", "'+'",
-  "'/'", "'*'", "'%'", "'~'", "'!'", "minusminus_prefix",
-  "plusplus_prefix", "below_curly", "'('", "new2", "'['", "']'", "'{'",
-  "'.'", "'@'", "above_identifier", "below_else", "above_function", "'}'",
-  "')'", "$accept", "PROGRAM", "MAYBE_PROGRAM_CODE_LIST",
-  "PROGRAM_CODE_LIST", "PROGRAM_CODE", "MAYBE_INPACKAGE_CODE_LIST",
-  "INPACKAGE_CODE_LIST", "INPACKAGE_CODE", "MAYBECODE", "CODE",
-  "CODE_STATEMENT", "CODEPIECE", "CODEBLOCK", "PACKAGE_INITCODE",
-  "CONDITIONAL_COMPILATION", "MAYBEEXPRESSION", "VARIABLE_DECLARATION",
-  "VARIABLE_LIST", "ONE_VARIABLE", "MAYBEELSE", "IF", "$@1", "FOR_INIT",
-  "FOR_IN_INIT", "FOR_START", "FOR", "FOR_IN", "WHILE", "$@2", "DO_WHILE",
-  "$@3", "BREAK", "CONTINUE", "MAYBE_CASE_LIST", "CASE_LIST", "CASE",
-  "DEFAULT", "SWITCH", "$@4", "CATCH", "$@5", "FINALLY", "$@6",
-  "CATCH_LIST", "CATCH_FINALLY_LIST", "TRY", "$@7", "THROW", "WITH",
-  "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@8", "$@9", "IMPORT",
-  "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", "MAYBESTATICCONSTANT",
-  "STATICCONSTANT", "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET",
-  "FUNCTION_DECLARATION", "$@12", "MAYBE_IDENTIFIER", "INNERFUNCTION",
-  "$@13", "CLASS", "PACKAGEANDCLASS", "CLASS_SPEC", "CLASS_SPEC_LIST",
+  "\"{ (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",
-  "VOIDEXPRESSION", "E", "CONSTANT", "MAYBE_EXPRPAIR_LIST",
-  "EXPRPAIR_LIST", "VAR_READ", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0
+  "COMMA_EXPRESSION", "VOIDEXPRESSION", "MAYBE_DICT_EXPRPAIR_LIST",
+  "DICTLH", "DICT_EXPRPAIR_LIST", "E", "$@17", "ID_OR_NS", "SUBNODE",
+  "MEMBER", "VAR_READ", "NAMESPACE_ID", "NAMESPACE_DECLARATION",
+  "USE_NAMESPACE", 0
 };
 #endif
 
@@ -2234,48 +2677,52 @@ 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,    59,    44,   352,
-      61,   353,   354,    63,    58,   124,    94,    38,    60,    62,
-     355,    45,    43,    47,    42,    37,   126,    33,   356,   357,
-     358,    40,   359,    91,    93,   123,    46,    64,   360,   361,
-     362,   125,    41
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+      59,    44,   355,    61,    63,    58,   124,    94,    38,   356,
+      60,    62,   357,    45,    43,    47,    42,    37,   126,    33,
+     358,   359,   360,    40,   361,    91,    93,   123,    46,    64,
+     362,   363,   364,   125,    41
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
+static const yytype_uint16 yyr1[] =
 {
-       0,   133,   134,   135,   135,   136,   136,   137,   137,   137,
-     137,   137,   137,   137,   137,   138,   138,   139,   139,   140,
-     140,   140,   140,   140,   140,   140,   141,   141,   142,   142,
-     143,   143,   143,   143,   143,   143,   143,   143,   143,   143,
-     143,   144,   144,   144,   144,   144,   144,   144,   144,   144,
-     145,   145,   145,   145,   146,   147,   148,   148,   149,   149,
-     150,   150,   151,   152,   152,   154,   153,   155,   155,   155,
-     156,   156,   157,   157,   158,   159,   161,   160,   163,   162,
-     164,   164,   165,   165,   166,   166,   166,   166,   167,   167,
-     168,   169,   171,   170,   173,   172,   175,   174,   176,   176,
-     177,   177,   177,   179,   178,   180,   180,   181,   182,   182,
-     183,   183,   185,   184,   186,   184,   187,   187,   188,   188,
-     189,   189,   190,   190,   190,   190,   190,   190,   190,   190,
-     190,   190,   191,   191,   192,   192,   193,   193,   195,   194,
-     197,   196,   198,   198,   199,   199,   200,   200,   200,   200,
-     200,   201,   201,   202,   202,   203,   203,   203,   204,   204,
-     205,   206,   206,   207,   207,   207,   207,   207,   207,   207,
-     207,   207,   208,   208,   208,   208,   209,   209,   210,   210,
-     211,   211,   211,   213,   212,   214,   214,   216,   215,   217,
-     218,   219,   219,   220,   220,   221,   221,   221,   222,   222,
-     223,   223,   224,   224,   224,   225,   226,   225,   227,   228,
-     229,   229,   230,   231,   231,   232,   233,   233,   234,   235,
-     235,   235,   235,   235,   235,   235,   236,   236,   236,   236,
-     236,   236,   236,   236,   236,   236,   235,   235,   235,   235,
-     235,   235,   235,   235,   235,   235,   235,   235,   235,   235,
-     235,   235,   235,   235,   235,   235,   235,   235,   235,   235,
-     235,   235,   235,   235,   235,   235,   235,   235,   235,   235,
-     237,   237,   238,   238,   235,   235,   235,   235,   235,   235,
-     235,   235,   235,   235,   235,   235,   235,   235,   235,   235,
-     235,   235,   235,   235,   235,   235,   235,   239,   240,   240,
-     240,   241
+       0,   135,   136,   137,   137,   138,   138,   139,   139,   139,
+     139,   139,   139,   139,   139,   140,   140,   141,   141,   142,
+     142,   142,   142,   142,   142,   142,   143,   143,   144,   144,
+     145,   145,   145,   145,   145,   145,   145,   145,   145,   145,
+     145,   145,   145,   145,   146,   146,   146,   146,   146,   146,
+     146,   146,   147,   147,   148,   149,   150,   150,   151,   151,
+     152,   152,   153,   154,   154,   156,   155,   157,   157,   157,
+     158,   158,   159,   159,   160,   161,   163,   162,   165,   164,
+     166,   166,   167,   167,   168,   168,   168,   168,   169,   169,
+     170,   171,   173,   172,   175,   174,   177,   176,   178,   178,
+     179,   179,   179,   181,   180,   182,   182,   183,   184,   185,
+     185,   185,   186,   186,   188,   187,   189,   187,   190,   190,
+     191,   191,   192,   192,   193,   193,   193,   193,   193,   193,
+     193,   193,   193,   193,   194,   194,   195,   195,   196,   196,
+     198,   197,   200,   199,   201,   201,   202,   202,   203,   203,
+     203,   203,   203,   204,   204,   205,   205,   206,   206,   206,
+     207,   207,   209,   208,   210,   210,   211,   212,   212,   213,
+     213,   213,   213,   213,   213,   213,   213,   213,   214,   215,
+     216,   217,   219,   218,   221,   220,   222,   222,   222,   222,
+     223,   223,   224,   224,   225,   225,   225,   226,   226,   227,
+     227,   228,   228,   228,   228,   228,   229,   229,   229,   229,
+     230,   230,   231,   231,   232,   232,   232,   234,   233,   235,
+     235,   237,   236,   238,   239,   240,   240,   241,   241,   242,
+     242,   242,   243,   243,   244,   244,   245,   245,   245,   246,
+     247,   246,   248,   249,   250,   250,   251,   252,   252,   253,
+     254,   255,   255,   256,   256,   257,   257,   258,   258,   258,
+     258,   258,   259,   259,   260,   260,   260,   260,   260,   260,
+     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
+     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
+     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
+     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
+     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
+     260,   260,   260,   260,   260,   260,   260,   260,   261,   260,
+     262,   262,   263,   263,   260,   260,   260,   260,   260,   260,
+     260,   264,   265,   266,   266,   266,   267,   268
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -2285,33 +2732,37 @@ 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,     1,     1,     1,     1,     1,     1,     4,     1,
-       3,     2,     2,     1,     1,     3,     2,     0,     2,     2,
+       1,     1,     3,     2,     1,     1,     1,     1,     1,     1,
+       1,     4,     2,     1,     1,     3,     2,     0,     2,     2,
        1,     3,     3,     0,     2,     0,     7,     0,     1,     1,
        3,     1,     2,     3,     8,     6,     0,     6,     0,     7,
        1,     2,     1,     2,     0,     1,     1,     2,     1,     2,
        4,     3,     0,     8,     0,     9,     0,     5,     1,     2,
-       1,     2,     1,     0,     6,     2,     1,     5,     1,     1,
-       3,     1,     0,     6,     0,     5,     2,     4,     0,     1,
-       1,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     2,     0,     2,     0,     2,     0,     9,
-       0,     8,     0,     1,     1,     2,     1,     4,     1,     1,
-       1,     0,     1,     1,     2,     1,     2,     8,     1,     1,
-       5,     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,     2,     1,     0,     6,     2,     1,     4,     2,     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,     1,     1,     1,     1,     1,     3,     3,     3,     3,
+       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,     3,
        3,     3,     3,     4,     2,     1,     3,     2,     4,     3,
-       0,     1,     3,     5,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     5,     2,     2,     2,     2,
-       3,     2,     4,     5,     3,     5,     3,     1,     3,     5,
-       5,     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,     5,     3,     5,     4,     4,     6,
+       6,     3,     1,     2,     4,     4,     2,     3
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -2319,866 +2770,930 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-     118,   297,   131,   231,   225,   228,   229,   226,   227,   230,
-       0,     0,    78,     0,     0,   124,   122,   123,     0,   130,
-       0,   129,   186,   232,   265,   125,     0,     0,     0,   235,
-     126,   128,   127,     0,     0,   234,   233,     0,     0,     0,
-       0,    14,     0,     0,     0,     0,   202,   270,     0,     0,
-       2,   118,     5,    54,    12,     0,    36,    67,    31,    32,
-      33,    34,    35,    38,    37,     7,    30,     0,   119,   120,
-       9,     8,    11,    10,   219,   222,   224,   223,   218,    39,
-     216,   220,   221,    40,     0,     0,    72,    76,   118,    92,
-     108,   109,   114,   111,     0,     0,   297,   208,   185,     0,
-     264,     0,     0,   116,     0,   103,   202,     0,   212,    65,
-     289,   288,   267,   247,   246,     0,     0,   203,   204,   205,
-     215,     0,     0,   271,   291,     1,     6,   118,   297,     0,
-       0,    68,     0,     0,    69,   182,     0,   159,     0,   158,
-       0,   121,     0,     0,     0,     0,     0,     0,     0,     0,
+     120,   342,   133,   172,   272,   169,   170,   171,     0,     0,
+      78,     0,     0,   126,   273,   124,   125,     0,   132,     0,
+     131,   220,   176,   177,   305,   127,     0,     0,     0,   175,
+     128,   130,   129,     0,     0,   174,   173,     0,     0,   255,
+       0,     0,    14,   179,     0,     0,     0,     0,   236,   120,
+       0,     0,     2,   120,     5,    54,    12,     0,    36,    67,
+      31,    32,    33,    34,    35,    38,   120,    37,     7,    30,
+       0,   121,   122,     9,     8,    11,   270,   271,     0,   178,
+      10,   264,   266,   268,   267,    39,   253,   265,   269,    41,
+      40,     0,     0,    72,    76,   120,    92,   109,   111,   110,
+     116,   113,     0,     0,   342,   242,   219,     0,   304,     0,
+       0,   118,     0,   103,   236,     0,   246,    65,   257,   258,
+     259,   260,   261,     0,     0,   256,   325,   324,   307,   287,
+     286,     0,   251,     0,   237,   238,   239,   249,    82,     0,
+     106,   247,     0,    80,    44,    43,   120,    45,    29,     0,
+      46,    47,    48,    50,     0,    49,   327,     1,     6,   120,
+     342,     0,    68,     0,     0,    69,    53,   108,     0,   216,
+       0,   161,     0,   160,   162,   346,   123,   192,     0,   193,
+     197,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   287,   286,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   323,   322,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   202,     0,     0,    55,    73,     0,    82,   106,
-     213,     0,    80,    41,   118,    42,    53,     0,     0,    43,
-      44,    45,    47,     0,    46,    49,     0,   118,   112,     0,
-     301,   200,   172,     0,     0,     0,    27,     0,   290,     0,
-     266,   269,   206,   207,     0,   274,     0,     0,   199,    59,
-      60,   199,    58,     0,     0,   181,   180,     0,   132,   134,
-     199,   217,   261,   262,   259,   260,   240,   241,   243,   242,
-     238,   239,   281,   280,   276,   275,   282,   283,   278,   277,
-     279,   244,   245,   294,   253,   252,   251,   284,     0,   250,
-     249,   248,   236,   237,   257,   256,   254,   258,   255,     0,
-       0,   296,     0,     0,     0,    83,   105,   214,    81,    51,
-     118,    29,   216,    52,     0,   118,     0,     0,    25,     0,
-     118,    17,    23,     0,    20,    19,    22,    21,   118,   110,
-     202,   209,   161,     0,     0,   173,   177,   118,   190,   117,
-     263,     0,    26,   211,     0,   272,     0,    13,     0,    57,
-       0,    57,     0,     0,     0,     0,   136,     0,     0,    57,
-       0,   210,   268,     0,     0,   292,   118,    50,    28,     0,
-     118,   298,     0,   115,    18,   118,     0,     0,     0,     0,
-     179,   174,   199,     0,   107,     0,   118,     0,   189,   197,
-     196,     0,   192,   191,   195,   198,     0,    62,    61,     0,
-     118,   172,   133,     0,     0,   193,   135,   140,   160,   285,
-     293,   295,    77,     0,    48,     0,    84,     0,   113,   201,
-     171,   167,   164,   165,   163,   166,   170,   169,   168,   162,
-     161,     0,     0,   176,     0,     0,    98,   102,   100,   104,
-      63,   273,     0,    56,     0,    75,     0,   137,   138,     0,
-     118,    79,   299,   300,     0,     0,     0,    85,    88,    86,
-      24,   178,   187,   175,    96,     0,    99,   101,   118,    66,
-     118,   199,   118,   194,     0,   155,     0,     0,   118,   153,
-       0,    27,    93,    89,    87,    27,    27,   199,    64,    74,
-       0,   146,   150,     0,     0,     0,   118,   144,   148,   149,
-     156,   182,   141,   154,    27,    91,     0,     0,     0,   183,
-     118,   139,   145,     0,    90,   188,    97,    94,    27,     0,
-       0,     0,     0,   147,   172,    27,   184,     0,     0,   199,
-      95,   157
+       0,     0,     0,   236,     0,     0,    55,    73,     0,     0,
+       0,   120,   114,     0,   223,     0,   226,   225,   347,   234,
+     206,     0,   250,     0,     0,    27,     0,   326,     0,   275,
+       0,     0,     0,   306,   274,   240,   241,    83,   233,    59,
+      60,   105,   248,    58,    81,    42,    28,   120,     0,   233,
+       0,     0,    52,   343,   215,   214,     0,   134,   136,     0,
+     184,     0,   201,     0,   198,   199,   254,   301,   302,   299,
+     300,   280,   281,   283,   282,   278,   279,   315,   314,   310,
+     309,   317,   318,   319,   316,   312,   311,   313,   284,   285,
+     332,   333,     0,   335,   293,   292,   291,   320,     0,   290,
+     289,   288,   276,   277,   297,   296,   294,   298,   295,     0,
+       0,   332,   331,   328,     0,     0,     0,   341,     0,     0,
+       0,    25,     0,   120,    17,    23,     0,    20,    19,    22,
+      21,   120,   112,     0,   236,   243,   167,     0,     0,   207,
+     211,   107,   119,   224,   303,     0,    26,   245,     0,   262,
+       0,   252,     0,    57,     0,   120,    13,    57,     0,     0,
+       0,     0,     0,   138,     0,     0,   233,   163,   164,     0,
+       0,     0,   180,   181,   186,   200,     0,   338,     0,   244,
+     308,     0,     0,     0,   337,     0,   120,     0,     0,   117,
+      18,   120,     0,     0,     0,     0,   213,   208,   233,     0,
+       0,   120,     0,   231,   230,   229,   232,     0,    62,    61,
+      51,     0,   120,   344,   345,   206,   135,     0,     0,   227,
+     137,   142,    57,     0,   185,   205,   204,   202,   203,     0,
+       0,     0,   321,     0,   336,     0,   334,    77,     0,    84,
+       0,   115,   235,   168,   167,     0,     0,   210,     0,     0,
+      98,   102,   100,   104,    63,   263,    56,     0,    75,     0,
+     139,   140,     0,   120,   166,   165,   195,   188,   179,   189,
+       0,   187,     0,   186,   340,   329,   339,    79,     0,     0,
+       0,    85,    88,    86,    24,   212,   221,   209,    96,     0,
+      99,   101,   120,    66,   120,   233,   120,   228,     0,   157,
+       0,     0,   120,   155,     0,   182,   179,   186,   190,     0,
+      27,    93,    89,    87,    27,    27,   233,    64,    74,     0,
+     148,   152,     0,     0,     0,   120,   146,   150,   151,   158,
+     216,   143,   156,   181,     0,     0,   191,    27,    91,     0,
+       0,     0,   217,   120,   141,   147,     0,     0,   183,   181,
+      90,   222,    97,    94,    27,     0,     0,   194,     0,     0,
+       0,   149,   206,   196,    27,   218,     0,     0,   233,    95,
+     159
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,    49,    50,    51,    52,   299,   300,   301,   321,   322,
-     195,   291,   197,   302,   198,   377,   199,   232,   230,   449,
-      56,   219,   132,   133,    57,    58,    59,    60,   187,    61,
-      88,   200,   201,   436,   437,   438,   439,    62,   206,   416,
-     501,   417,   466,   418,   419,    63,   216,   202,    64,    93,
-     371,    65,   308,   207,    66,   203,    68,    69,   336,   338,
-     384,   304,   452,   305,   430,   475,   476,   477,   457,   458,
-     459,   140,   306,   360,   409,   314,   315,   316,   237,   307,
-     498,    99,    74,   465,   372,   373,   374,   386,   375,   329,
-     311,   116,   117,   118,   211,    75,    76,    77,   204,   119,
-      78,    79,    80,    81,   122,   123,    82,   205,    83
+      -1,    51,    52,    53,    54,   342,   343,   344,   365,   366,
+     147,   148,   167,   345,   149,   428,   150,   263,   260,   513,
+      58,   248,   163,   164,    59,    60,    61,    62,   228,    63,
+      95,   151,   152,   500,   501,   502,   503,    64,   230,   470,
+     579,   471,   535,   472,   473,    65,   245,   153,    66,    67,
+     234,   235,    68,   351,   231,    69,   154,    71,    72,   383,
+     385,   438,   347,   516,   348,   483,   544,   545,   546,   521,
+     522,   523,   174,   349,   279,   387,   388,   416,    76,    77,
+      78,   394,   449,   491,   554,   179,   389,   450,   492,   180,
+      79,   283,   284,   285,   358,   359,   360,   276,   350,   574,
+     107,    81,   534,   236,   237,   425,   440,   426,   373,   355,
+     133,   134,   135,   239,    82,    83,    84,   155,   136,   241,
+     242,    85,   123,   124,   125,    86,   401,   336,   313,    87,
+      88,   175,    89,    90
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -348
+#define YYPACT_NINF -474
 static const yytype_int16 yypact[] =
 {
-    1656,   -44,  -348,  -348,  -348,  -348,  -348,  -348,  -348,  -348,
-     -31,   -41,  -348,   -30,     7,  -348,  -348,  -348,    82,  -348,
-    2221,  -348,   100,  -348,   336,  -348,    -1,    19,    13,  -348,
-    -348,  -348,  -348,    -2,   -77,  -348,  -348,  2221,    38,  2221,
-    2221,  -348,  2221,  2221,  2221,  2221,  2221,  2221,   179,   196,
-    -348,   495,  -348,  -348,  -348,    78,  -348,  2128,  -348,  -348,
-    -348,  -348,  -348,  -348,  -348,  -348,  -348,   166,   240,  -348,
-    -348,  -348,  -348,  -348,  -348,  -348,  -348,  -348,   115,  -348,
-    2736,  -348,  -348,  -348,   213,   102,  -348,  -348,  1906,  -348,
-    -348,  -348,  -348,  -348,  -102,   222,  -348,    -4,  -348,   109,
-     -25,  2221,   110,  -348,  2221,  -348,  2221,   237,   -25,  -348,
-     -25,   -25,   305,   -25,   -25,   -56,   118,   145,  2221,  -348,
-    2736,   141,   116,   150,  -348,  -348,  -348,  1011,   181,   247,
-     248,  -348,   155,   190,  -348,   -10,   253,  -348,   260,  -348,
-     262,  -348,  2221,  2221,  2221,  2221,  2221,  2221,  2221,  2221,
-    2221,  2221,  2221,  2221,  2221,  2221,  2221,  2221,  2221,  2221,
-    2221,  2221,  2221,  2221,  -348,  -348,   266,  2221,  2221,  2221,
-    2221,  2221,  2221,  2221,  2221,  2221,  2221,  2221,  2221,  2221,
-    2221,  2221,  2221,  2221,    64,  -348,  -348,  2221,   273,  2221,
-    2221,   247,   281,  -348,   624,  -348,   189,   271,   167,  -348,
-    -348,  -348,  -348,   275,  -348,  -348,  2221,  1140,  -348,    19,
-    -348,   173,    24,   -38,    66,  2282,  1781,   163,  -348,  2221,
-    -348,  -348,  -348,  -348,  2221,  -348,  2221,   165,   193,   200,
-    -348,   193,   200,  2221,  2221,  -348,  -348,   296,   252,   259,
-     193,  2736,   998,   487,   487,   487,  3097,  3097,  3097,  3097,
-     998,   998,  2736,  2736,  2736,  2736,  2736,  2736,  2736,  2736,
-    2736,  2797,  2857,  -348,   287,   287,   287,  2736,  2492,  2917,
-    2977,  3037,   998,   998,   305,   305,   -25,   -25,   -25,   175,
-    2553,   227,  2221,   312,   -28,  -348,   115,   115,  -348,  -348,
-     753,  -348,  2614,  -348,   195,  2031,   314,  2352,  -348,   187,
-    1269,  -348,  -348,   194,  -348,  -348,  -348,  -348,  1140,  -348,
-    2221,  -348,   131,   317,   191,   223,  -348,  1906,   198,  -348,
-    -348,   197,  1781,  -348,   -27,  -348,   218,  -348,    12,   226,
-     247,   -39,   135,   -14,   208,    89,   315,    89,   209,   226,
-    2221,  -348,  -348,   332,  2422,  -348,  1906,  -348,  -348,  2221,
-     882,   236,   212,  -348,  -348,  1140,   207,   211,    69,    12,
-    -348,  -348,   193,    25,  -348,    60,  1906,  2221,   198,  -348,
-    -348,   224,  -348,  -348,  -348,  -348,  2221,  -348,  -348,  2221,
-    1906,    24,  -348,    89,   228,  -348,   251,  -348,  -348,  2736,
-    -348,  -348,  -348,   -11,  -348,   178,    11,   220,  -348,  -348,
-    -348,  -348,  -348,  -348,  -348,  -348,  -348,  -348,  -348,  -348,
-     258,   234,   317,  -348,   241,   231,  -348,  -348,    60,  -348,
-     297,  -348,   202,  -348,   235,  -348,   238,   251,  -348,    89,
-     180,  -348,  -348,  -348,  2221,   264,   242,    11,  -348,  -348,
-    -348,  -348,  -348,  -348,  -348,   368,  -348,  -348,  1906,  -348,
-    1906,   193,  1398,  -348,   375,  -348,   352,   249,   233,  -348,
-    2675,  1781,  -348,  -348,  -348,  1781,  1781,   193,  -348,  -348,
-     257,  -348,  -348,   261,   188,   254,  1527,  -348,  -348,  -348,
-    -348,   -10,  -348,  -348,  1781,  -348,   256,   265,   272,  -348,
-    1398,  -348,  -348,   380,  -348,  -348,  -348,  -348,  1781,   274,
-     263,   278,   276,  -348,    24,  1781,  -348,   277,   280,   193,
-    -348,  -348
+    1747,   -27,  -474,  -474,  -474,  -474,  -474,  -474,   -10,   -46,
+    -474,   -25,    26,  -474,  -474,  -474,  -474,    90,  -474,  2197,
+    -474,   106,  -474,  -474,   412,  -474,    11,   133,    23,  -474,
+    -474,  -474,  -474,    13,   -53,  -474,  -474,  2197,    32,   257,
+    2197,  2197,  -474,  -474,  2197,  2197,  2197,  2197,  2197,   699,
+     154,   224,  -474,   568,  -474,  -474,  -474,    99,  -474,  2126,
+    -474,  -474,  -474,  -474,  -474,  -474,  2001,  -474,  -474,  -474,
+     361,    70,  -474,  -474,  -474,  -474,  -474,  -474,    65,  -474,
+    -474,  -474,  -474,  -474,  -474,   141,  2897,  -474,  -474,  -474,
+    -474,   242,   125,  -474,  -474,  2001,  -474,  -474,  -474,  -474,
+    -474,  -474,   143,   133,  -474,   -52,  -474,   127,   -44,  2197,
+     124,  -474,  2197,  -474,  2197,   256,   -44,  -474,  -474,  -474,
+    -474,  -474,  -474,   135,   176,   182,   -44,   -44,   202,   -44,
+     -44,   -37,  2835,   159,   186,  2197,  -474,  2835,   286,   288,
+    2197,  2197,   288,   289,  -474,  -474,   830,  -474,  -474,   169,
+    -474,  -474,  -474,  -474,   287,  -474,  -474,  -474,  -474,  1092,
+     236,   302,  -474,   206,   241,   141,   211,  -474,   311,    43,
+     312,  -474,   320,  -474,  -474,  -474,  -474,  -474,  2197,  -474,
+      66,  2197,  2197,  2197,  2197,  2197,  2197,  2197,  2197,  2197,
+    2197,  2197,  2197,  2197,  2197,  2197,  2197,  2197,  2197,  2197,
+    2197,  2197,  2197,  2197,  2197,  -474,  -474,    15,  2197,  2197,
+    2197,  2197,  2197,  2197,  2197,  2197,  2197,  2197,  2197,  2197,
+    2197,  2197,  2197,  2197,  2197,    22,  -474,  -474,  2197,   317,
+    2197,  1223,  -474,   133,   196,   203,  -474,  -474,  -474,   209,
+      35,   199,   235,   107,  2256,  1874,   204,  -474,  2197,  -474,
+    2197,   257,  2197,  -474,  -474,  -474,  -474,  -474,   232,   239,
+    -474,  -474,  -474,   239,  -474,  -474,  -474,  2001,   215,   232,
+    2197,  2197,  -474,   246,  -474,  -474,   347,   300,   303,   353,
+    2835,   255,   258,    37,    66,  -474,  2835,   383,   560,   560,
+     560,  3269,  3269,  3269,  3269,   383,   383,  2835,  2835,  2835,
+    2835,  2835,  2835,  2835,  2835,  2835,  2835,  2835,  2959,  3021,
+    -474,  -474,    42,  -474,   185,   185,   185,  2835,  2463,  3083,
+    3145,  3207,   383,   383,   202,   202,   -44,   -44,   -44,   230,
+    2525,   270,  -474,  -474,  2197,   100,   275,  -474,   233,   243,
+    2325,  -474,   237,  1354,  -474,  -474,   248,  -474,  -474,  -474,
+    -474,  1223,  -474,   133,  2197,  -474,    36,   375,   245,   280,
+    -474,  -474,  -474,   254,  -474,   253,  1874,  -474,   261,  -474,
+     291,  2835,   252,   299,   288,   961,  -474,   -18,   304,   269,
+     151,   268,   133,   391,   133,   281,   232,   309,  -474,   283,
+      67,    87,  -474,  -474,  -474,  -474,  2197,  -474,  2197,  -474,
+    -474,  2197,  2587,  2197,  -474,    17,  2001,  2197,   292,  -474,
+    -474,  1223,   294,   290,  2197,   252,  -474,  -474,   232,    41,
+      33,  2001,  2197,  -474,  -474,  -474,  -474,  2197,  -474,  -474,
+    -474,  2197,  2001,  -474,  -474,    35,  -474,   133,   298,  -474,
+     328,  -474,   299,   353,  -474,  -474,  -474,  -474,  -474,   319,
+     102,  2649,  2835,  2394,  -474,  2711,  -474,  -474,   301,    24,
+     306,  -474,  -474,  2835,   329,   307,   375,  -474,   310,   321,
+    -474,  -474,    33,  -474,   368,  -474,  2835,   -30,  -474,   308,
+     328,  -474,   133,   226,  -474,  -474,  -474,  -474,   330,  -474,
+    2197,  -474,   333,  -474,  -474,  -474,  -474,  -474,  2197,   341,
+     314,    24,  -474,  -474,  -474,  -474,  -474,  -474,  -474,   445,
+    -474,  -474,  2001,  -474,  2001,   232,  1485,  -474,   446,  -474,
+     424,   323,   351,  -474,    65,  2835,   337,  -474,   111,  2773,
+    1874,  -474,  -474,  -474,  1874,  1874,   232,  -474,  -474,   327,
+    -474,  -474,   334,   296,   331,  1616,  -474,  -474,  -474,  -474,
+      43,  -474,  -474,  -474,   336,    65,   111,  1874,  -474,   338,
+     339,   326,  -474,  1485,  -474,  -474,   459,   352,  -474,  -474,
+    -474,  -474,  -474,  -474,  1874,   340,   343,  -474,   359,   354,
+     355,  -474,    35,  -474,  1874,  -474,   356,   358,   232,  -474,
+    -474
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -348,  -348,   270,  -348,   337,  -287,  -348,    90,  -193,  -178,
-       1,   -76,  -271,     6,     2,    67,   355,   285,    85,  -348,
-    -348,  -348,  -348,  -348,  -348,  -348,  -348,  -348,  -348,  -348,
-    -348,  -348,  -348,  -348,  -348,   -21,   -20,  -348,  -348,    14,
-    -348,    15,  -348,  -348,  -348,  -348,  -348,  -348,  -348,  -200,
-      75,  -348,  -348,  -348,  -348,     0,  -348,   353,  -348,  -348,
-    -348,    59,  -348,    62,  -348,   -68,  -348,   -53,  -348,  -348,
-     -29,  -348,     3,    26,  -348,  -347,  -348,  -305,   -47,     4,
-    -348,  -348,  -348,  -348,  -348,   408,  -317,    54,    79,  -184,
-    -348,   -99,  -348,  -348,  -348,  -348,  -348,  -348,  -348,   -36,
-       5,   -52,    -7,  -348,  -348,  -348,  -348,  -348,  -348
+    -474,  -474,   342,  -474,   433,  -309,  -474,   144,  -294,   -33,
+       1,   -59,   -86,    59,     2,    47,   436,   363,   118,  -474,
+    -474,  -474,  -474,  -474,  -474,  -474,  -474,  -474,  -474,  -474,
+    -474,  -474,  -474,  -474,  -474,     6,     8,  -474,  -474,    38,
+    -474,    49,  -474,  -474,  -474,  -474,  -474,  -474,  -474,  -474,
+      10,    40,  -474,  -474,  -474,  -474,     0,  -474,   434,  -474,
+    -474,  -474,    61,  -474,    62,  -474,   -50,  -474,   -31,  -474,
+    -474,    -7,  -474,     3,  -474,  -474,    69,    60,  -474,  -474,
+    -474,  -474,  -464,  -474,  -474,  -163,  -474,  -447,  -474,  -473,
+    -427,  -474,  -474,   244,  -416,  -474,  -336,   -24,     4,  -474,
+    -474,  -474,  -474,  -474,   496,   -98,    88,   112,  -254,  -474,
+    -100,  -474,  -474,  -474,  -474,  -474,  -474,  -474,  -125,  -128,
+     482,   -51,  -474,   279,  -474,   -13,  -474,  -474,  -186,  -474,
+    -474,  -474,  -474,  -474
 };
 
 /* 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 -216
+#define YYTABLE_NINF -331
 static const yytype_int16 yytable[] =
 {
-      67,    53,    55,    72,    73,   134,    54,   217,   361,   309,
-      90,   121,   196,    97,   309,   368,   290,   100,   382,    85,
-     385,   356,    90,   208,   209,   235,    91,   312,   312,   -70,
-     108,    91,   110,   111,   426,   112,   113,   114,    91,   120,
-     120,   236,   142,    84,   106,   434,   364,   331,   369,   107,
-     115,    67,    53,    55,    72,    73,   339,    54,   413,    70,
-     142,   376,    71,   164,   165,   166,   385,   281,   397,   318,
-     142,   142,   400,   435,   401,   392,   220,   402,   403,   404,
-      87,   405,   223,   279,   142,    91,   166,   142,   414,    94,
-      86,    89,   368,   415,   317,   420,   182,   215,   183,   120,
-      95,   184,   102,    98,   346,   366,   213,   443,    91,   425,
-      70,   120,   453,    71,   406,   313,   412,   350,   380,   183,
-     101,   431,   184,   105,   407,   408,   370,    67,    53,    55,
-      72,    73,    92,    54,   104,   241,   242,   243,   244,   245,
-     246,   247,   248,   249,   250,   251,   252,   253,   254,   255,
-     256,   257,   258,   259,   260,   261,   262,   507,   121,   109,
-     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
-     274,   275,   276,   277,   278,   120,   280,   468,   411,   469,
-     319,   432,   124,   433,     2,   282,    70,   292,   325,    71,
-     326,   283,   284,   135,   286,   287,   125,   136,   137,   297,
-      15,    16,    17,   127,    19,   318,    21,    67,    53,   303,
-     138,   357,   139,   142,   348,   135,   185,   120,    25,   120,
-     137,    91,   309,   186,   324,   210,   454,    30,    31,    32,
-     212,   358,   379,   142,   139,   359,   214,     2,   332,   333,
-     218,   196,   221,   222,     2,   224,   348,   225,   226,   -71,
-     228,   231,   233,    15,    16,    17,   238,    19,   234,    21,
-      15,    16,    17,   239,    19,   240,    21,   470,   485,   263,
-     196,    25,   486,   487,   348,   344,   285,   455,    25,   454,
-      30,    31,    32,   488,   288,   294,   293,    30,    31,    32,
-     196,   494,   295,   296,   310,   323,   327,   328,   330,   334,
-      67,    53,   303,   120,   196,   502,   335,   341,    67,    53,
-     303,  -151,   508,   337,   343,   345,   349,   351,   353,   355,
-     312,   363,   367,   362,  -108,   511,   376,   424,   365,   381,
-     455,   421,   383,   389,   387,   390,   395,   396,   398,    96,
-     423,     3,     4,   399,     5,     6,     7,     8,     9,   429,
-     422,   440,   445,   428,   393,    67,    53,   303,   358,   442,
-     120,    20,   448,    22,  -152,    23,   444,   450,   461,   120,
-     451,   467,   196,   462,   196,   164,   165,   166,   480,   481,
-     482,    29,   489,   500,   504,   491,   490,   495,   126,    34,
-     354,    35,    36,   164,   165,   166,   496,   227,   177,   178,
-     179,   180,   181,   505,   497,   503,   388,   506,   182,   509,
-     183,   510,   131,   184,   229,   378,   463,   464,   179,   180,
-     181,   141,   499,   492,    39,    40,   182,   460,   183,   483,
-     456,   184,   446,   447,   493,   103,   441,   427,   410,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   474,   472,   473,   478,   479,    45,   456,    46,
-       0,    47,     0,    48,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   474,   472,   473,   478,
-     479,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     474,   472,   473,   478,   479,    -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,   143,     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,  -216,  -216,  -216,     0,    37,    38,
-       0,   151,   152,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   164,   165,   166,     0,   167,
-     168,   169,     0,    39,    40,     0,     0,     0,     0,     0,
-       0,     0,    41,     0,     0,   175,   176,     0,   177,   178,
-     179,   180,   181,     0,     0,     0,    42,     0,   182,     0,
-     183,    43,    44,   184,     0,     0,    45,     0,    46,     0,
-      47,     0,    48,     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,   188,     0,   129,     0,     0,     0,
-      24,   189,    25,    26,     0,    27,   190,    28,     0,    29,
-     191,    30,    31,    32,     0,     0,    33,    34,     0,    35,
-      36,     0,     0,     0,     0,     0,     0,    37,    38,     0,
-     192,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    39,    40,     0,     0,     0,     0,     0,     0,
-       0,   193,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    42,     0,     0,     0,     0,
-      43,    44,     0,     0,     0,    45,     0,    46,     0,    47,
-       0,    48,     0,     0,     0,   289,     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,   188,     0,   129,     0,     0,     0,    24,
-     189,    25,    26,     0,    27,   190,    28,     0,    29,   191,
-      30,    31,    32,     0,     0,    33,    34,     0,    35,    36,
-       0,     0,     0,     0,     0,     0,    37,    38,     0,   192,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      70,    55,    57,    75,    80,   238,   105,   166,   165,   229,
+     256,   108,   261,   262,   246,   377,   146,   282,   310,   479,
+     310,   417,   101,   493,   116,   331,   332,   126,   127,    97,
+      98,   128,   129,   130,   132,   137,   166,   101,   356,   337,
+      92,   207,   412,    99,   356,   310,   528,   205,   206,   207,
+     -70,   553,   102,    70,    55,    57,    75,    80,   498,    56,
+     468,    73,    74,    91,   252,   527,   469,   110,   177,   281,
+     114,   181,   445,   224,     2,   115,   225,    94,   274,   223,
+     556,   224,   569,   467,   225,   427,   499,   266,    13,   567,
+      15,    16,   447,    18,   275,    20,   132,   253,    96,   244,
+     338,   137,   460,   310,   514,   578,   103,   487,    25,   106,
+      97,    98,    56,    93,    73,    74,   487,    30,    31,    32,
+     368,   282,   137,   329,    99,   369,   397,   132,   132,   357,
+     507,   311,   442,   311,   109,   466,    97,    98,   311,   414,
+     113,   415,   378,   379,   312,   333,   112,   334,   392,   404,
+      99,   335,   393,   100,   433,   117,   434,   156,   311,    70,
+      55,    57,    75,    80,   465,   280,   586,   396,   286,   287,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   178,   178,   178,   314,   315,   316,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
+     137,   330,   488,   489,   178,   132,   311,   340,    56,   456,
+      73,    74,   489,   362,   157,   403,   159,   446,   448,   490,
+       2,    70,    55,   346,   375,   132,   558,   137,   490,   371,
+     559,   560,   181,   352,    13,   226,    15,    16,   227,    18,
+     240,    20,   243,   363,   413,    97,    98,   132,   132,   247,
+     118,   539,   119,   570,    25,   120,   121,   122,   249,    99,
+     232,   233,   518,    30,    31,    32,   205,   206,   207,   458,
+     580,   250,   561,   251,   436,   254,   439,   255,   423,   257,
+     587,   258,   264,   205,   206,   207,   267,   475,   218,   219,
+     220,   221,   222,   168,   -71,   269,   270,   266,   223,   271,
+     224,   272,   168,   225,   273,   277,   266,   220,   221,   222,
+     457,   402,   169,   278,  -113,   223,   519,   224,   171,   339,
+     225,   353,   354,   361,   590,   474,   252,   372,   367,   439,
+     374,   137,   173,    70,    55,   346,   478,   166,   376,   380,
+     381,    70,    55,   346,   382,     2,   386,   384,   390,  -153,
+    -330,   391,   166,   363,   399,   405,   407,   406,   424,    13,
+     409,    15,    16,   166,    18,   411,    20,   168,   356,   418,
+     477,   419,  -112,   451,   517,   452,   420,   169,   453,    25,
+     455,   435,   170,   171,   132,   421,   422,   518,    30,    31,
+      32,   463,   427,   432,   431,   172,   437,   173,   441,   137,
+     443,    70,    55,   346,   476,   104,   444,     3,     4,   459,
+       5,     6,     7,  -331,   462,   481,   537,   461,   538,   482,
+     486,    14,   414,   512,   506,   497,    19,   508,    21,   504,
+      22,    23,   515,   526,   509,   524,   530,   531,   536,   549,
+     550,   519,   555,   166,   562,   166,   551,    29,  -331,  -331,
+     573,   563,   576,   577,   564,    34,   582,    35,    36,   568,
+     583,   571,   572,   581,   205,   206,   207,   525,   208,   209,
+     210,   584,    39,   520,  -154,   529,   158,   410,   585,   484,
+     588,   589,   429,  -331,  -331,   162,   218,   219,   220,   221,
+     222,   268,   259,    40,    41,   176,   223,   532,   224,   533,
+     510,   225,   485,   575,   565,   552,   543,   541,   542,   547,
+     548,   511,   520,   111,   505,   480,   566,   464,   395,   131,
+     370,     0,     0,     0,     0,    47,     0,    48,     0,     0,
+       0,    50,     0,     0,     0,   543,   541,   542,   547,   548,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    39,    40,     0,     0,     0,     0,     0,     0,     0,
-     193,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    42,     0,     0,     0,     0,    43,
-      44,     0,     0,     0,    45,     0,    46,     0,    47,     0,
-      48,     0,     0,     0,   347,     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,   188,     0,   129,     0,     0,     0,    24,   189,
-      25,    26,     0,    27,   190,    28,     0,    29,   191,    30,
-      31,    32,     0,     0,    33,    34,     0,    35,    36,     0,
-       0,     0,     0,     0,     0,    37,    38,     0,   192,     0,
+       0,     0,     0,   543,   541,   542,   547,   548,    -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,
+     182,     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,  -331,  -331,  -331,
+       0,    37,    38,     0,     0,   190,   191,     0,    39,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   205,   206,   207,     0,   208,   209,   210,     0,    40,
+      41,     0,     0,     0,     0,     0,     0,     0,    42,     0,
+     216,   217,     0,   218,   219,   220,   221,   222,    43,     0,
+       0,    44,     0,   223,     0,   224,    45,    46,   225,     0,
+       0,    47,     0,    48,     0,    49,     0,    50,     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,   138,
+       0,   139,     0,     0,     0,    24,   140,    25,    26,     0,
+      27,   141,    28,     0,    29,   142,    30,    31,    32,     0,
+       0,    33,    34,     0,    35,    36,     0,     0,     0,     0,
+       0,     0,    37,    38,     0,   143,     0,     0,     0,    39,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      39,    40,     0,     0,     0,     0,     0,     0,     0,   193,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    42,     0,     0,     0,     0,    43,    44,
-       0,     0,     0,    45,     0,    46,     0,    47,     0,    48,
-       0,     0,     0,   394,     1,     2,     3,     4,     0,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,     0,     0,
-      14,    15,    16,    17,    18,    19,    20,    21,  -216,     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,  -216,  -216,    37,    38,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   164,   165,   166,     0,
-     167,   168,   169,     0,     0,     0,     0,     0,     0,    39,
-      40,     0,     0,     0,     0,     0,  -216,  -216,    41,   177,
-     178,   179,   180,   181,     0,     0,     0,     0,     0,   182,
-       0,   183,    42,     0,   184,     0,     0,    43,    44,     0,
-       0,     0,    45,     0,    46,     0,    47,     0,    48,     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,
+      40,    41,     0,     0,     0,     0,     0,     0,     0,   144,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    43,
+       0,     0,    44,     0,     0,     0,     0,    45,    46,     0,
+       0,     0,    47,     0,    48,     0,    49,     0,    50,     0,
+       0,     0,   145,     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,
+     138,     0,   139,     0,     0,     0,    24,   140,    25,    26,
+       0,    27,   141,    28,     0,    29,   142,    30,    31,    32,
        0,     0,    33,    34,     0,    35,    36,     0,     0,     0,
-       0,     0,     0,    37,    38,     0,     0,     0,     0,     0,
+       0,     0,     0,    37,    38,     0,   143,     0,     0,     0,
+      39,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    39,    40,
-       0,     0,     0,     0,     0,     0,     0,   298,     0,     0,
+       0,    40,    41,     0,     0,     0,     0,     0,     0,     0,
+     144,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      43,     0,     0,    44,     0,     0,     0,     0,    45,    46,
+       0,     0,     0,    47,     0,    48,     0,    49,     0,    50,
+       0,     0,     0,   265,     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,   138,     0,   139,     0,     0,     0,    24,   140,    25,
+      26,     0,    27,   141,    28,     0,    29,   142,    30,    31,
+      32,     0,     0,    33,    34,     0,    35,    36,     0,     0,
+       0,     0,     0,     0,    37,    38,     0,   143,     0,     0,
+       0,    39,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    42,     0,     0,     0,     0,    43,    44,     0,     0,
-       0,    45,     0,    46,     0,    47,     0,    48,     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,     0,
+       0,     0,    40,    41,     0,     0,     0,     0,     0,     0,
+       0,   144,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    43,     0,     0,    44,     0,     0,     0,     0,    45,
+      46,     0,     0,     0,    47,     0,    48,     0,    49,     0,
+      50,     0,     0,     0,   430,     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,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    39,    40,     0,
-       0,     0,     0,     0,     0,     0,   298,     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,    43,     0,     0,    44,     0,     0,     0,     0,
+      45,    46,     0,     0,     0,    47,     0,    48,     0,    49,
+       0,    50,     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,     0,     0,
+       0,     0,     0,    39,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      42,     0,     0,     0,     0,    43,    44,     0,     0,     0,
-      45,     0,    46,     0,    47,     0,    48,     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,     0,     0,
+       0,     0,     0,     0,    40,    41,     0,     0,     0,     0,
+       0,     0,     0,   341,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    43,     0,     0,    44,     0,     0,     0,
+       0,    45,    46,     0,     0,     0,    47,     0,    48,     0,
+      49,     0,    50,     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,     0,
+       0,     0,     0,     0,    39,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    39,    40,     0,     0,
-       0,     0,     0,     0,     0,   471,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    42,
-       0,     0,     0,     0,    43,    44,     0,     0,     0,    45,
-       0,    46,     0,    47,     0,    48,     0,     0,     0,  -142,
-       1,     2,     3,     4,     0,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,     0,     0,     0,    15,    16,    17,
-      18,    19,    20,    21,     0,     0,    23,     0,     0,     0,
-       0,     0,     0,    24,     0,    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,     0,     0,     0,
+       0,     0,     0,     0,     0,    40,    41,     0,     0,     0,
+       0,     0,     0,     0,   341,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    43,     0,     0,    44,     0,     0,
+       0,     0,    45,    46,     0,     0,     0,    47,     0,    48,
+       0,    49,     0,    50,     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,
+       0,     0,     0,     0,     0,    39,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    39,    40,     0,     0,     0,
-       0,     0,     0,     0,   471,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    42,     0,
-       0,     0,     0,    43,    44,     0,     0,     0,    45,     0,
-      46,     0,    47,     0,    48,     0,    -3,     0,  -143,     1,
+       0,     0,     0,     0,     0,     0,    40,    41,     0,     0,
+       0,     0,     0,     0,     0,   540,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    43,     0,     0,    44,     0,
+       0,     0,     0,    45,    46,     0,     0,     0,    47,     0,
+      48,     0,    49,     0,    50,     0,     0,     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,
+      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,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      38,     0,     0,     0,     0,     0,    39,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    40,    41,     0,
+       0,     0,     0,     0,     0,     0,   540,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    43,     0,     0,    44,
+       0,     0,     0,     0,    45,    46,     0,     0,     0,    47,
+       0,    48,     0,    49,     0,    50,     0,    -3,     0,  -145,
+       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,
-       0,     0,     0,     0,    39,    40,     0,     0,     0,     0,
-       0,     0,     0,    41,     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,    43,    44,     0,     0,     0,    45,     0,    46,
-       0,    47,     0,    48,     1,     2,     3,     4,     0,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,     0,  -118,
-       0,    15,    16,    17,    18,    19,    20,    21,    22,     0,
-      23,   188,     0,   129,     0,     0,     0,    24,   189,    25,
-      26,     0,    27,   190,    28,     0,    29,   191,    30,    31,
-      32,     0,     0,    33,    34,     0,    35,    36,     0,     0,
-       0,     0,     0,     0,    37,    38,     0,   192,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    43,     0,     0,
+      44,     0,     0,     0,     0,    45,    46,     0,     0,     0,
+      47,     0,    48,     0,    49,     0,    50,     1,     2,     3,
+       4,     0,     5,     6,     7,     8,     9,    10,    11,     0,
+    -120,     0,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,     0,    22,    23,   138,     0,   139,     0,     0,     0,
+      24,   140,    25,    26,     0,    27,   141,    28,     0,    29,
+     142,    30,    31,    32,     0,     0,    33,    34,     0,    35,
+      36,     0,     0,     0,     0,     0,     0,    37,    38,     0,
+     143,     0,     0,     0,    39,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    39,
-      40,     0,     0,     0,     0,     0,     0,     0,   193,     0,
+       0,     0,     0,     0,     0,    40,    41,     0,     0,     0,
+       0,     0,     0,     0,   144,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    43,     0,     0,    44,     0,     0,
+       0,     0,    45,    46,     0,     0,     0,    47,     0,    48,
+       0,    49,     0,    50,     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,   138,     0,   139,     0,     0,     0,    24,   140,    25,
+      26,     0,    27,   141,    28,     0,    29,   142,    30,    31,
+      32,     0,     0,    33,    34,     0,    35,    36,     0,     0,
+       0,     0,     0,     0,    37,    38,     0,   143,     0,     0,
+       0,    39,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    42,     0,     0,     0,     0,    43,    44,     0,
-       0,     0,    45,     0,    46,     0,    47,     0,    48,     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,   188,     0,   129,     0,
-       0,     0,    24,   189,    25,    26,     0,    27,   190,    28,
-       0,    29,   191,    30,    31,    32,     0,     0,    33,    34,
+       0,     0,    40,    41,     0,     0,     0,     0,     0,     0,
+       0,   144,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    43,     0,     0,    44,     0,     0,     0,     0,    45,
+      46,     0,     0,     0,    47,     0,    48,     0,    49,   160,
+      50,     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,   139,     0,
+       0,     0,    24,     0,     0,     0,     0,     0,     0,    28,
+       0,    29,   161,     0,     0,     0,     0,     0,     0,    34,
        0,    35,    36,     0,     0,     0,     0,     0,     0,    37,
-      38,     0,   192,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    39,     0,     0,     0,
+     104,     0,     3,     4,     0,     5,     6,     7,     0,     0,
+       0,     0,     0,     0,     0,     0,    14,    40,    41,     0,
+       0,    19,     0,    21,     0,    22,    23,     0,     0,     0,
+       0,     0,     0,    24,     0,     0,    43,     0,     0,    44,
+      28,     0,    29,     0,    45,    46,     0,     0,     0,    47,
+      34,    48,    35,    36,     0,    50,     0,     0,     0,     0,
+      37,     0,     0,     0,     0,     0,     0,    39,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    39,    40,     0,     0,     0,     0,
-       0,     0,     0,   193,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    42,     0,     0,
-       0,     0,    43,    44,     0,     0,     0,    45,     0,    46,
-       0,   194,     0,    48,     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,   188,     0,   129,     0,     0,     0,    24,   189,    25,
-      26,     0,    27,   190,    28,     0,    29,   191,    30,    31,
-      32,     0,     0,    33,    34,     0,    35,    36,     0,     0,
-       0,     0,     0,     0,    37,    38,     0,   192,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    40,    41,
+       0,     0,     0,     0,     0,     0,   182,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    43,     0,     0,
+      44,     0,     0,     0,     0,    45,    46,     0,     0,     0,
+      47,     0,    48,   183,   184,   185,    50,   186,   187,   188,
+     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
+     199,   200,   201,   202,   203,   204,     0,   205,   206,   207,
+       0,   208,   209,   210,     0,     0,     0,     0,     0,   211,
+     212,     0,   213,   214,   215,   182,   216,   217,     0,   218,
+     219,   220,   221,   222,     0,     0,     0,     0,     0,   223,
+       0,   224,     0,     0,   225,     0,     0,     0,     0,     0,
+     364,     0,   183,   184,   185,     0,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,     0,   205,   206,   207,     0,
+     208,   209,   210,     0,     0,     0,     0,     0,   211,   212,
+       0,   213,   214,   215,   182,   216,   217,     0,   218,   219,
+     220,   221,   222,     0,     0,     0,     0,     0,   223,     0,
+     224,     0,     0,   225,     0,     0,     0,     0,     0,   408,
+       0,   183,   184,   185,     0,   186,   187,   188,   189,   190,
+     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
+     201,   202,   203,   204,     0,   205,   206,   207,     0,   208,
+     209,   210,     0,     0,     0,     0,     0,   211,   212,     0,
+     213,   214,   215,   182,   216,   217,     0,   218,   219,   220,
+     221,   222,     0,     0,     0,     0,     0,   223,     0,   224,
+       0,     0,   225,     0,     0,     0,     0,     0,   495,     0,
+     183,   184,   185,     0,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,     0,   205,   206,   207,     0,   208,   209,
+     210,     0,     0,     0,     0,   182,   211,   212,   398,   213,
+     214,   215,     0,   216,   217,     0,   218,   219,   220,   221,
+     222,     0,     0,     0,     0,     0,   223,     0,   224,     0,
+       0,   225,   183,   184,   185,     0,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,     0,   205,   206,   207,     0,
+     208,   209,   210,     0,     0,     0,     0,   182,   211,   212,
+       0,   213,   214,   215,     0,   216,   217,     0,   218,   219,
+     220,   221,   222,     0,     0,     0,     0,     0,   223,     0,
+     224,   400,     0,   225,   183,   184,   185,     0,   186,   187,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,     0,   205,   206,
+     207,     0,   208,   209,   210,     0,     0,     0,     0,   182,
+     211,   212,     0,   213,   214,   215,     0,   216,   217,     0,
+     218,   219,   220,   221,   222,     0,     0,     0,     0,     0,
+     223,     0,   224,   454,     0,   225,   183,   184,   185,     0,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,     0,
+     205,   206,   207,     0,   208,   209,   210,     0,     0,     0,
+       0,   182,   211,   212,     0,   213,   214,   215,     0,   216,
+     217,     0,   218,   219,   220,   221,   222,     0,     0,     0,
+       0,     0,   223,     0,   224,   494,     0,   225,   183,   184,
+     185,     0,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,     0,   205,   206,   207,     0,   208,   209,   210,     0,
+       0,     0,     0,   182,   211,   212,     0,   213,   214,   215,
+       0,   216,   217,     0,   218,   219,   220,   221,   222,     0,
+       0,     0,     0,     0,   223,     0,   224,   496,     0,   225,
+     183,   184,   185,     0,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,     0,   205,   206,   207,     0,   208,   209,
+     210,     0,     0,     0,     0,   182,   211,   212,   557,   213,
+     214,   215,     0,   216,   217,     0,   218,   219,   220,   221,
+     222,     0,     0,     0,     0,     0,   223,     0,   224,     0,
+       0,   225,   183,   184,   185,     0,   186,   187,   188,   189,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,     0,   205,   206,   207,     0,
+     208,   209,   210,     0,     0,     0,     0,   182,   211,   212,
+       0,   213,   214,   215,     0,   216,   217,     0,   218,   219,
+     220,   221,   222,     0,     0,     0,     0,     0,   223,     0,
+     224,     0,     0,   225,   183,   184,   185,     0,   186,   187,
+     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,     0,   205,   206,
+     207,     0,   208,   209,   210,     0,     0,     0,     0,   182,
+     211,   212,     0,   213,   214,   215,     0,     0,   217,     0,
+     218,   219,   220,   221,   222,     0,     0,     0,     0,     0,
+     223,     0,   224,     0,     0,   225,   183,   184,   185,     0,
+     186,   187,   188,   189,   190,   191,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   204,     0,
+     205,   206,   207,     0,   208,   209,   210,     0,     0,     0,
+       0,   182,     0,     0,     0,   213,   214,   215,     0,   216,
+     217,     0,   218,   219,   220,   221,   222,     0,     0,     0,
+       0,     0,   223,     0,   224,     0,     0,   225,   183,   184,
+     185,     0,   186,   187,   188,   189,   190,   191,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    39,
-      40,     0,     0,     0,     0,     0,     0,     0,   193,     0,
-       0,   128,     0,     3,     4,     0,     5,     6,     7,     8,
-       9,     0,    42,     0,     0,     0,     0,    43,    44,     0,
-       0,     0,    45,    20,    46,    22,    47,    23,    48,     0,
-     129,     0,     0,     0,    24,     0,     0,     0,     0,     0,
-       0,    28,     0,    29,   130,     0,     0,     0,     0,     0,
-       0,    34,     0,    35,    36,     0,     0,     0,     0,     0,
-       0,    37,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   205,   206,   207,     0,   208,   209,   210,     0,
+       0,     0,     0,   182,     0,     0,     0,   213,   214,   215,
+       0,   216,   217,     0,   218,   219,   220,   221,   222,     0,
+       0,     0,     0,     0,   223,     0,   224,     0,     0,   225,
+     183,   184,   185,     0,   186,   187,   188,   189,   190,   191,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    39,    40,     0,     0,
-       0,     0,     0,     0,    96,     0,     3,     4,     0,     5,
-       6,     7,     8,     9,     0,     0,     0,     0,     0,    42,
-       0,     0,     0,     0,    43,    44,    20,     0,    22,    45,
-      23,    46,     0,    47,     0,    48,     0,    24,     0,     0,
-       0,     0,     0,     0,    28,     0,    29,     0,     0,     0,
-       0,     0,     0,     0,    34,     0,    35,    36,     0,     0,
-       0,     0,     0,     0,    37,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   205,   206,   207,     0,   208,   209,
+     210,     0,     0,     0,     0,   182,     0,     0,     0,     0,
+     214,   215,     0,   216,   217,     0,   218,   219,   220,   221,
+     222,     0,     0,     0,     0,     0,   223,     0,   224,     0,
+       0,   225,   183,   184,   185,     0,   186,   187,   188,   189,
+     190,   191,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   205,   206,   207,     0,
+     208,   209,   210,     0,     0,     0,     0,   182,     0,     0,
+       0,     0,     0,   215,     0,   216,   217,     0,   218,   219,
+     220,   221,   222,     0,     0,     0,     0,     0,   223,     0,
+     224,     0,     0,   225,   183,   184,   185,     0,   186,   187,
+     188,   189,   190,   191,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   205,   206,
+     207,     0,   208,   209,   210,     0,     0,     0,     0,   182,
+       0,     0,     0,     0,     0,  -331,     0,   216,   217,     0,
+     218,   219,   220,   221,   222,     0,     0,     0,     0,     0,
+     223,     0,   224,     0,     0,   225,   183,   184,   185,     0,
+    -331,  -331,  -331,  -331,   190,   191,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    39,
-      40,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   143,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    42,     0,     0,     0,     0,    43,    44,     0,
-       0,     0,    45,     0,    46,     0,    47,     0,    48,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,     0,
-     164,   165,   166,     0,   167,   168,   169,     0,     0,     0,
-       0,     0,   170,     0,     0,   171,     0,   172,   173,   174,
-     175,   176,   143,   177,   178,   179,   180,   181,     0,     0,
-       0,     0,     0,   182,     0,   183,     0,     0,   184,     0,
-       0,     0,     0,     0,   320,     0,     0,     0,     0,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,     0,
-     164,   165,   166,     0,   167,   168,   169,     0,     0,     0,
-       0,     0,   170,     0,     0,   171,     0,   172,   173,   174,
-     175,   176,   143,   177,   178,   179,   180,   181,     0,     0,
-       0,     0,     0,   182,     0,   183,     0,     0,   184,     0,
-       0,     0,     0,     0,   352,     0,     0,     0,     0,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,     0,
-     164,   165,   166,     0,   167,   168,   169,     0,     0,     0,
-       0,     0,   170,     0,     0,   171,     0,   172,   173,   174,
-     175,   176,   143,   177,   178,   179,   180,   181,     0,     0,
-       0,     0,     0,   182,     0,   183,     0,     0,   184,     0,
-       0,     0,     0,     0,   391,     0,     0,     0,     0,   144,
-     145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161,   162,   163,     0,
-     164,   165,   166,     0,   167,   168,   169,     0,     0,     0,
-       0,     0,   170,   143,     0,   171,   340,   172,   173,   174,
-     175,   176,     0,   177,   178,   179,   180,   181,     0,     0,
-       0,     0,     0,   182,     0,   183,     0,     0,   184,     0,
-     144,   145,   146,   147,   148,   149,   150,   151,   152,   153,
-     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
-       0,   164,   165,   166,     0,   167,   168,   169,     0,     0,
-       0,     0,     0,   170,   143,     0,   171,     0,   172,   173,
-     174,   175,   176,     0,   177,   178,   179,   180,   181,     0,
-       0,     0,     0,     0,   182,     0,   183,   342,     0,   184,
-       0,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,     0,   164,   165,   166,     0,   167,   168,   169,     0,
-       0,     0,     0,     0,   170,   143,     0,   171,  -215,   172,
-     173,   174,   175,   176,     0,   177,   178,   179,   180,   181,
-       0,     0,     0,     0,     0,   182,     0,   183,     0,     0,
-     184,     0,   144,   145,   146,   147,   148,   149,   150,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,     0,   164,   165,   166,     0,   167,   168,   169,
-       0,     0,     0,     0,     0,   170,   143,     0,   171,   484,
-     172,   173,   174,   175,   176,     0,   177,   178,   179,   180,
-     181,     0,     0,     0,     0,     0,   182,     0,   183,     0,
-       0,   184,     0,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   160,
-     161,   162,   163,     0,   164,   165,   166,     0,   167,   168,
-     169,     0,     0,     0,     0,     0,   170,   143,     0,   171,
-       0,   172,   173,   174,   175,   176,     0,   177,   178,   179,
-     180,   181,     0,     0,     0,     0,     0,   182,     0,   183,
-       0,     0,   184,     0,   144,   145,   146,   147,   148,   149,
-     150,   151,   152,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   163,     0,   164,   165,   166,     0,   167,
-     168,   169,     0,     0,     0,     0,     0,   143,     0,     0,
-       0,     0,   172,   173,   174,   175,   176,     0,   177,   178,
-     179,   180,   181,     0,     0,     0,     0,     0,   182,     0,
-     183,     0,     0,   184,   144,   145,   146,   147,   148,   149,
-     150,   151,   152,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   164,   165,   166,     0,   167,
-     168,   169,     0,     0,     0,     0,     0,   143,     0,     0,
-       0,     0,   172,   173,   174,   175,   176,     0,   177,   178,
-     179,   180,   181,     0,     0,     0,     0,     0,   182,     0,
-     183,     0,     0,   184,   144,   145,   146,   147,   148,   149,
-     150,   151,   152,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   164,   165,   166,     0,   167,
-     168,   169,     0,     0,     0,     0,     0,   143,     0,     0,
-       0,     0,     0,   173,   174,   175,   176,     0,   177,   178,
-     179,   180,   181,     0,     0,     0,     0,     0,   182,     0,
-     183,     0,     0,   184,   144,   145,   146,   147,   148,   149,
-     150,   151,   152,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   164,   165,   166,     0,   167,
-     168,   169,     0,     0,     0,     0,     0,   143,     0,     0,
-       0,     0,     0,     0,   174,   175,   176,     0,   177,   178,
-     179,   180,   181,     0,     0,     0,     0,     0,   182,     0,
-     183,     0,     0,   184,   144,   145,   146,   147,   148,   149,
-     150,   151,   152,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   164,   165,   166,     0,   167,
-     168,   169,     0,     0,     0,     0,     0,   143,     0,     0,
-       0,     0,     0,     0,  -216,   175,   176,     0,   177,   178,
-     179,   180,   181,     0,     0,     0,     0,     0,   182,     0,
-     183,     0,     0,   184,   144,   145,   146,  -216,  -216,  -216,
-    -216,   151,   152,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   164,   165,   166,     0,   167,
-     168,   169,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   175,   176,     0,   177,   178,
-     179,   180,   181,     0,     0,     0,     0,     0,   182,     0,
-     183,     0,     0,   184
+     205,   206,   207,     0,   208,   209,   210,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   216,
+     217,     0,   218,   219,   220,   221,   222,     0,     0,     0,
+       0,     0,   223,     0,   224,     0,     0,   225
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,     0,     0,     0,     0,    57,     0,   106,   313,   209,
-       3,    47,    88,    20,   214,     3,   194,    24,   335,    50,
-     337,   308,     3,   125,   126,    35,    19,     3,     3,    68,
-      37,    19,    39,    40,   381,    42,    43,    44,    19,    46,
-      47,    51,    98,    87,   121,    34,   317,   231,    36,   126,
-      45,    51,    51,    51,    51,    51,   240,    51,   363,     0,
-      98,   100,     0,    88,    89,    90,   383,     3,   355,     3,
-      98,    98,     3,    62,     5,   346,   132,     8,     9,    10,
-     121,    12,   118,   182,    98,    19,    90,    98,    28,    14,
-     121,   121,     3,    33,   132,   366,   121,   104,   123,   106,
-      18,   126,    27,     3,   132,   132,   101,   412,    19,   380,
-      51,   118,   429,    51,    45,    91,    91,   295,   132,   123,
-     121,   132,   126,   125,    55,    56,   114,   127,   127,   127,
-     127,   127,   125,   127,   121,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   159,   160,   161,   162,   163,   504,   194,   121,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   448,   362,   450,
-     114,     3,     3,     5,     4,   121,   127,   194,   224,   127,
-     226,   127,   187,    27,   189,   190,     0,    31,    32,   206,
-      20,    21,    22,   125,    24,     3,    26,   207,   207,   207,
-      44,   310,    46,    98,   290,    27,     3,   224,    38,   226,
-      32,    19,   422,   121,   219,     3,    46,    47,    48,    49,
-     121,   100,    97,    98,    46,   104,   126,     4,   233,   234,
-       3,   317,   124,    98,     4,   104,   322,   131,    98,    68,
-       3,     3,    97,    20,    21,    22,     3,    24,    68,    26,
-      20,    21,    22,     3,    24,     3,    26,   451,   461,     3,
-     346,    38,   465,   466,   350,   282,     3,    97,    38,    46,
-      47,    48,    49,   467,     3,    14,    97,    47,    48,    49,
-     366,   484,   125,    18,   121,   132,   131,   104,    98,     3,
-     300,   300,   300,   310,   380,   498,    54,   132,   308,   308,
-     308,   131,   505,    54,    87,     3,   121,     3,   131,   125,
-       3,    98,   104,   132,   126,   509,   100,   379,   131,   121,
-      97,   367,    17,   340,   125,     3,   100,   125,   131,     3,
-     376,     5,     6,   132,     8,     9,    10,    11,    12,    98,
-     126,   131,   121,   125,   349,   355,   355,   355,   100,   125,
-     367,    25,    65,    27,   131,    29,   125,   132,   104,   376,
-     132,     3,   448,   131,   450,    88,    89,    90,     3,    27,
-     131,    45,   125,     3,   121,   131,   125,   131,    51,    53,
-     300,    55,    56,    88,    89,    90,   131,   127,   111,   112,
-     113,   114,   115,   125,   132,   131,   339,   131,   121,   132,
-     123,   131,    57,   126,   129,   330,   437,   437,   113,   114,
-     115,    68,   490,   476,    88,    89,   121,   434,   123,   458,
-     430,   126,   418,   418,   481,    27,   410,   383,   359,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   452,   452,   452,   452,   452,   121,   458,   123,
-      -1,   125,    -1,   127,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   476,   476,   476,   476,
-     476,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     490,   490,   490,   490,   490,     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,    74,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    88,    89,    90,    -1,    92,
-      93,    94,    -1,    88,    89,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    97,    -1,    -1,   108,   109,    -1,   111,   112,
-     113,   114,   115,    -1,    -1,    -1,   111,    -1,   121,    -1,
-     123,   116,   117,   126,    -1,    -1,   121,    -1,   123,    -1,
-     125,    -1,   127,    -1,    -1,    -1,   131,     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,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    88,    89,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    97,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,
-     116,   117,    -1,    -1,    -1,   121,    -1,   123,    -1,   125,
-      -1,   127,    -1,    -1,    -1,   131,     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,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       0,     0,     0,     0,     0,   103,    19,    66,    59,    95,
+     135,    24,   140,   141,   114,   269,    49,   180,     3,   435,
+       3,   357,    12,   450,    37,     3,     4,    40,    41,     3,
+       4,    44,    45,    46,    47,    48,    95,    27,     3,   225,
+      50,    93,   351,    17,     3,     3,   493,    91,    92,    93,
+      68,   524,    12,    53,    53,    53,    53,    53,    34,     0,
+      27,     0,     0,    90,   101,   492,    33,    27,     3,     3,
+     123,   101,     5,   125,     4,   128,   128,   123,    35,   123,
+     527,   125,   555,   419,   128,   103,    62,   146,    18,   553,
+      20,    21,     5,    23,    51,    25,   109,   134,   123,   112,
+     228,   114,   411,     3,   134,   569,    16,     5,    38,     3,
+       3,     4,    53,   123,    53,    53,     5,    47,    48,    49,
+     248,   284,   135,   223,    17,   250,   312,   140,   141,    94,
+     466,   116,   386,   116,   123,    94,     3,     4,   116,   103,
+     127,   105,   270,   271,   129,   123,   123,   125,   111,   335,
+      17,   129,   115,   127,     3,   123,     5,     3,   116,   159,
+     159,   159,   159,   159,   418,   178,   582,   125,   181,   182,
+     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
+     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
+     203,   204,   127,   127,   127,   208,   209,   210,   211,   212,
+     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
+     223,   224,   110,   111,   127,   228,   116,   230,   159,   405,
+     159,   159,   111,   116,     0,   125,   127,   390,   391,   127,
+       4,   231,   231,   231,   267,   248,   530,   250,   127,   252,
+     534,   535,   101,   233,    18,     3,    20,    21,   123,    23,
+     123,    25,   128,   243,   354,     3,     4,   270,   271,     3,
+       3,   515,     5,   557,    38,     8,     9,    10,   133,    17,
+     127,   128,    46,    47,    48,    49,    91,    92,    93,   407,
+     574,   105,   536,   101,   382,   126,   384,   101,    36,     3,
+     584,     3,     3,    91,    92,    93,   127,   422,   113,   114,
+     115,   116,   117,    16,    68,     3,   100,   366,   123,    68,
+     125,   100,    16,   128,     3,     3,   375,   115,   116,   117,
+     406,   334,    26,     3,   128,   123,   100,   125,    32,    12,
+     128,   128,   123,   134,   588,   421,   101,   105,   134,   437,
+     101,   354,    46,   343,   343,   343,   432,   406,   133,   103,
+       3,   351,   351,   351,    54,     4,     3,    54,   103,   133,
+      90,   103,   421,   353,   134,    90,   123,   134,   116,    18,
+     133,    20,    21,   432,    23,   127,    25,    16,     3,   134,
+     431,   101,   128,   396,   482,   398,   133,    26,   401,    38,
+     403,   123,    31,    32,   407,   134,   105,    46,    47,    48,
+      49,   414,   103,   134,   100,    44,    15,    46,   127,   422,
+     101,   411,   411,   411,   427,     3,   133,     5,     6,   127,
+       8,     9,    10,    40,   134,   127,   512,   133,   514,   101,
+     111,    19,   103,    65,   127,   134,    24,   127,    26,   133,
+      28,    29,   134,   110,   123,   115,   105,   133,     3,     3,
+      26,   100,   115,   512,   127,   514,   133,    45,    75,    76,
+     134,   127,     3,   111,   133,    53,   123,    55,    56,   133,
+     111,   133,   133,   133,    91,    92,    93,   490,    95,    96,
+      97,   127,    70,   483,   133,   498,    53,   343,   133,   442,
+     134,   133,   374,   110,   111,    59,   113,   114,   115,   116,
+     117,   159,   139,    91,    92,    71,   123,   501,   125,   501,
+     472,   128,   443,   563,   545,   522,   516,   516,   516,   516,
+     516,   472,   522,    27,   464,   437,   550,   415,   284,    47,
+     251,    -1,    -1,    -1,    -1,   123,    -1,   125,    -1,    -1,
+      -1,   129,    -1,    -1,    -1,   545,   545,   545,   545,   545,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    88,    89,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      97,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,   116,
-     117,    -1,    -1,    -1,   121,    -1,   123,    -1,   125,    -1,
-     127,    -1,    -1,    -1,   131,     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,    -1,   563,   563,   563,   563,   563,     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,    67,    68,    69,
+      -1,    63,    64,    -1,    -1,    75,    76,    -1,    70,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    91,    92,    93,    -1,    95,    96,    97,    -1,    91,
+      92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,    -1,
+     110,   111,    -1,   113,   114,   115,   116,   117,   110,    -1,
+      -1,   113,    -1,   123,    -1,   125,   118,   119,   128,    -1,
+      -1,   123,    -1,   125,    -1,   127,    -1,   129,    -1,    -1,
+      -1,   133,     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,
-      88,    89,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    97,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   111,    -1,    -1,    -1,    -1,   116,   117,
-      -1,    -1,    -1,   121,    -1,   123,    -1,   125,    -1,   127,
-      -1,    -1,    -1,   131,     3,     4,     5,     6,    -1,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    -1,    -1,
-      19,    20,    21,    22,    23,    24,    25,    26,    40,    -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,    74,    75,    63,    64,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    90,    -1,
-      92,    93,    94,    -1,    -1,    -1,    -1,    -1,    -1,    88,
-      89,    -1,    -1,    -1,    -1,    -1,   108,   109,    97,   111,
-     112,   113,   114,   115,    -1,    -1,    -1,    -1,    -1,   121,
-      -1,   123,   111,    -1,   126,    -1,    -1,   116,   117,    -1,
-      -1,    -1,   121,    -1,   123,    -1,   125,    -1,   127,    -1,
-      -1,    -1,   131,     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,
+      91,    92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   110,
+      -1,    -1,   113,    -1,    -1,    -1,    -1,   118,   119,    -1,
+      -1,    -1,   123,    -1,   125,    -1,   127,    -1,   129,    -1,
+      -1,    -1,   133,     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,    -1,    -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,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    89,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    97,    -1,    -1,
+      -1,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     110,    -1,    -1,   113,    -1,    -1,    -1,    -1,   118,   119,
+      -1,    -1,    -1,   123,    -1,   125,    -1,   127,    -1,   129,
+      -1,    -1,    -1,   133,     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,   111,    -1,    -1,    -1,    -1,   116,   117,    -1,    -1,
-      -1,   121,    -1,   123,    -1,   125,    -1,   127,    -1,    -1,
-      -1,   131,     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,    -1,
+      -1,    -1,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   110,    -1,    -1,   113,    -1,    -1,    -1,    -1,   118,
+     119,    -1,    -1,    -1,   123,    -1,   125,    -1,   127,    -1,
+     129,    -1,    -1,    -1,   133,     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,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    97,    -1,    -1,    -1,
+      -1,    -1,    -1,    91,    92,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   110,    -1,    -1,   113,    -1,    -1,    -1,    -1,
+     118,   119,    -1,    -1,    -1,   123,    -1,   125,    -1,   127,
+      -1,   129,    -1,    -1,    -1,   133,     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,    -1,    -1,
+      -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     111,    -1,    -1,    -1,    -1,   116,   117,    -1,    -1,    -1,
-     121,    -1,   123,    -1,   125,    -1,   127,    -1,    -1,    -1,
-     131,     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,    -1,    -1,
+      -1,    -1,    -1,    -1,    91,    92,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   100,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   110,    -1,    -1,   113,    -1,    -1,    -1,
+      -1,   118,   119,    -1,    -1,    -1,   123,    -1,   125,    -1,
+     127,    -1,   129,    -1,    -1,    -1,   133,     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,    -1,
+      -1,    -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    97,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,
-      -1,    -1,    -1,    -1,   116,   117,    -1,    -1,    -1,   121,
-      -1,   123,    -1,   125,    -1,   127,    -1,    -1,    -1,   131,
-       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,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    91,    92,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   100,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   110,    -1,    -1,   113,    -1,    -1,
+      -1,    -1,   118,   119,    -1,    -1,    -1,   123,    -1,   125,
+      -1,   127,    -1,   129,    -1,    -1,    -1,   133,     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,
+      -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    88,    89,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    97,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
-      -1,    -1,    -1,   116,   117,    -1,    -1,    -1,   121,    -1,
-     123,    -1,   125,    -1,   127,    -1,     0,    -1,   131,     3,
+      -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   100,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,    -1,
+      -1,    -1,    -1,   118,   119,    -1,    -1,    -1,   123,    -1,
+     125,    -1,   127,    -1,   129,    -1,    -1,    -1,   133,     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,
+      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,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      64,    -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    88,    89,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    97,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,    -1,
-      -1,    -1,   116,   117,    -1,    -1,    -1,   121,    -1,   123,
-      -1,   125,    -1,   127,     3,     4,     5,     6,    -1,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    -1,    18,
-      -1,    20,    21,    22,    23,    24,    25,    26,    27,    -1,
-      29,    30,    -1,    32,    -1,    -1,    -1,    36,    37,    38,
-      39,    -1,    41,    42,    43,    -1,    45,    46,    47,    48,
-      49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,    -1,
-      -1,    -1,    -1,    -1,    63,    64,    -1,    66,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,
-      89,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    97,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   100,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   110,    -1,    -1,   113,
+      -1,    -1,    -1,    -1,   118,   119,    -1,    -1,    -1,   123,
+      -1,   125,    -1,   127,    -1,   129,    -1,     0,    -1,   133,
+       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,
-      -1,    -1,   111,    -1,    -1,    -1,    -1,   116,   117,    -1,
-      -1,    -1,   121,    -1,   123,    -1,   125,    -1,   127,     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,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   100,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   110,    -1,    -1,
+     113,    -1,    -1,    -1,    -1,   118,   119,    -1,    -1,    -1,
+     123,    -1,   125,    -1,   127,    -1,   129,     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,    -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,    88,    89,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    97,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,    -1,
-      -1,    -1,   116,   117,    -1,    -1,    -1,   121,    -1,   123,
-      -1,   125,    -1,   127,     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,
+      -1,    -1,    -1,    -1,    -1,    91,    92,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   100,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   110,    -1,    -1,   113,    -1,    -1,
+      -1,    -1,   118,   119,    -1,    -1,    -1,   123,    -1,   125,
+      -1,   127,    -1,   129,     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,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,
-      89,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    97,    -1,
-      -1,     3,    -1,     5,     6,    -1,     8,     9,    10,    11,
-      12,    -1,   111,    -1,    -1,    -1,    -1,   116,   117,    -1,
-      -1,    -1,   121,    25,   123,    27,   125,    29,   127,    -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,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    -1,    -1,
-      -1,    -1,    -1,    -1,     3,    -1,     5,     6,    -1,     8,
-       9,    10,    11,    12,    -1,    -1,    -1,    -1,    -1,   111,
-      -1,    -1,    -1,    -1,   116,   117,    25,    -1,    27,   121,
-      29,   123,    -1,   125,    -1,   127,    -1,    36,    -1,    -1,
-      -1,    -1,    -1,    -1,    43,    -1,    45,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    53,    -1,    55,    56,    -1,    -1,
-      -1,    -1,    -1,    -1,    63,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    91,    92,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   100,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   110,    -1,    -1,   113,    -1,    -1,    -1,    -1,   118,
+     119,    -1,    -1,    -1,   123,    -1,   125,    -1,   127,     3,
+     129,     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,    63,
+      -1,    -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,    -1,
+       3,    -1,     5,     6,    -1,     8,     9,    10,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    19,    91,    92,    -1,
+      -1,    24,    -1,    26,    -1,    28,    29,    -1,    -1,    -1,
+      -1,    -1,    -1,    36,    -1,    -1,   110,    -1,    -1,   113,
+      43,    -1,    45,    -1,   118,   119,    -1,    -1,    -1,   123,
+      53,   125,    55,    56,    -1,   129,    -1,    -1,    -1,    -1,
+      63,    -1,    -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,
-      89,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   111,    -1,    -1,    -1,    -1,   116,   117,    -1,
-      -1,    -1,   121,    -1,   123,    -1,   125,    -1,   127,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
-      88,    89,    90,    -1,    92,    93,    94,    -1,    -1,    -1,
-      -1,    -1,   100,    -1,    -1,   103,    -1,   105,   106,   107,
-     108,   109,    40,   111,   112,   113,   114,   115,    -1,    -1,
-      -1,    -1,    -1,   121,    -1,   123,    -1,    -1,   126,    -1,
-      -1,    -1,    -1,    -1,   132,    -1,    -1,    -1,    -1,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
-      88,    89,    90,    -1,    92,    93,    94,    -1,    -1,    -1,
-      -1,    -1,   100,    -1,    -1,   103,    -1,   105,   106,   107,
-     108,   109,    40,   111,   112,   113,   114,   115,    -1,    -1,
-      -1,    -1,    -1,   121,    -1,   123,    -1,    -1,   126,    -1,
-      -1,    -1,    -1,    -1,   132,    -1,    -1,    -1,    -1,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
-      88,    89,    90,    -1,    92,    93,    94,    -1,    -1,    -1,
-      -1,    -1,   100,    -1,    -1,   103,    -1,   105,   106,   107,
-     108,   109,    40,   111,   112,   113,   114,   115,    -1,    -1,
-      -1,    -1,    -1,   121,    -1,   123,    -1,    -1,   126,    -1,
-      -1,    -1,    -1,    -1,   132,    -1,    -1,    -1,    -1,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    -1,
-      88,    89,    90,    -1,    92,    93,    94,    -1,    -1,    -1,
-      -1,    -1,   100,    40,    -1,   103,   104,   105,   106,   107,
-     108,   109,    -1,   111,   112,   113,   114,   115,    -1,    -1,
-      -1,    -1,    -1,   121,    -1,   123,    -1,    -1,   126,    -1,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      -1,    88,    89,    90,    -1,    92,    93,    94,    -1,    -1,
-      -1,    -1,    -1,   100,    40,    -1,   103,    -1,   105,   106,
-     107,   108,   109,    -1,   111,   112,   113,   114,   115,    -1,
-      -1,    -1,    -1,    -1,   121,    -1,   123,   124,    -1,   126,
-      -1,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
+      -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   110,    -1,    -1,
+     113,    -1,    -1,    -1,    -1,   118,   119,    -1,    -1,    -1,
+     123,    -1,   125,    67,    68,    69,   129,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    -1,    91,    92,    93,
+      -1,    95,    96,    97,    -1,    -1,    -1,    -1,    -1,   103,
+     104,    -1,   106,   107,   108,    40,   110,   111,    -1,   113,
+     114,   115,   116,   117,    -1,    -1,    -1,    -1,    -1,   123,
+      -1,   125,    -1,    -1,   128,    -1,    -1,    -1,    -1,    -1,
+     134,    -1,    67,    68,    69,    -1,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    -1,    91,    92,    93,    -1,
+      95,    96,    97,    -1,    -1,    -1,    -1,    -1,   103,   104,
+      -1,   106,   107,   108,    40,   110,   111,    -1,   113,   114,
+     115,   116,   117,    -1,    -1,    -1,    -1,    -1,   123,    -1,
+     125,    -1,    -1,   128,    -1,    -1,    -1,    -1,    -1,   134,
+      -1,    67,    68,    69,    -1,    71,    72,    73,    74,    75,
       76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    -1,    88,    89,    90,    -1,    92,    93,    94,    -1,
-      -1,    -1,    -1,    -1,   100,    40,    -1,   103,   104,   105,
-     106,   107,   108,   109,    -1,   111,   112,   113,   114,   115,
-      -1,    -1,    -1,    -1,    -1,   121,    -1,   123,    -1,    -1,
-     126,    -1,    67,    68,    69,    70,    71,    72,    73,    74,
+      86,    87,    88,    89,    -1,    91,    92,    93,    -1,    95,
+      96,    97,    -1,    -1,    -1,    -1,    -1,   103,   104,    -1,
+     106,   107,   108,    40,   110,   111,    -1,   113,   114,   115,
+     116,   117,    -1,    -1,    -1,    -1,    -1,   123,    -1,   125,
+      -1,    -1,   128,    -1,    -1,    -1,    -1,    -1,   134,    -1,
+      67,    68,    69,    -1,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    -1,    91,    92,    93,    -1,    95,    96,
+      97,    -1,    -1,    -1,    -1,    40,   103,   104,   105,   106,
+     107,   108,    -1,   110,   111,    -1,   113,   114,   115,   116,
+     117,    -1,    -1,    -1,    -1,    -1,   123,    -1,   125,    -1,
+      -1,   128,    67,    68,    69,    -1,    71,    72,    73,    74,
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    -1,    88,    89,    90,    -1,    92,    93,    94,
-      -1,    -1,    -1,    -1,    -1,   100,    40,    -1,   103,   104,
-     105,   106,   107,   108,   109,    -1,   111,   112,   113,   114,
-     115,    -1,    -1,    -1,    -1,    -1,   121,    -1,   123,    -1,
-      -1,   126,    -1,    67,    68,    69,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    -1,    88,    89,    90,    -1,    92,    93,
-      94,    -1,    -1,    -1,    -1,    -1,   100,    40,    -1,   103,
-      -1,   105,   106,   107,   108,   109,    -1,   111,   112,   113,
-     114,   115,    -1,    -1,    -1,    -1,    -1,   121,    -1,   123,
-      -1,    -1,   126,    -1,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    86,    -1,    88,    89,    90,    -1,    92,
-      93,    94,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,
-      -1,    -1,   105,   106,   107,   108,   109,    -1,   111,   112,
-     113,   114,   115,    -1,    -1,    -1,    -1,    -1,   121,    -1,
-     123,    -1,    -1,   126,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    88,    89,    90,    -1,    92,
-      93,    94,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,
-      -1,    -1,   105,   106,   107,   108,   109,    -1,   111,   112,
-     113,   114,   115,    -1,    -1,    -1,    -1,    -1,   121,    -1,
-     123,    -1,    -1,   126,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    88,    89,    90,    -1,    92,
-      93,    94,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,
-      -1,    -1,    -1,   106,   107,   108,   109,    -1,   111,   112,
-     113,   114,   115,    -1,    -1,    -1,    -1,    -1,   121,    -1,
-     123,    -1,    -1,   126,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    88,    89,    90,    -1,    92,
-      93,    94,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,
-      -1,    -1,    -1,    -1,   107,   108,   109,    -1,   111,   112,
-     113,   114,   115,    -1,    -1,    -1,    -1,    -1,   121,    -1,
-     123,    -1,    -1,   126,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    88,    89,    90,    -1,    92,
-      93,    94,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,
-      -1,    -1,    -1,    -1,   107,   108,   109,    -1,   111,   112,
-     113,   114,   115,    -1,    -1,    -1,    -1,    -1,   121,    -1,
-     123,    -1,    -1,   126,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    88,    89,    90,    -1,    92,
-      93,    94,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   108,   109,    -1,   111,   112,
-     113,   114,   115,    -1,    -1,    -1,    -1,    -1,   121,    -1,
-     123,    -1,    -1,   126
+      85,    86,    87,    88,    89,    -1,    91,    92,    93,    -1,
+      95,    96,    97,    -1,    -1,    -1,    -1,    40,   103,   104,
+      -1,   106,   107,   108,    -1,   110,   111,    -1,   113,   114,
+     115,   116,   117,    -1,    -1,    -1,    -1,    -1,   123,    -1,
+     125,   126,    -1,   128,    67,    68,    69,    -1,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    -1,    91,    92,
+      93,    -1,    95,    96,    97,    -1,    -1,    -1,    -1,    40,
+     103,   104,    -1,   106,   107,   108,    -1,   110,   111,    -1,
+     113,   114,   115,   116,   117,    -1,    -1,    -1,    -1,    -1,
+     123,    -1,   125,   126,    -1,   128,    67,    68,    69,    -1,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    -1,
+      91,    92,    93,    -1,    95,    96,    97,    -1,    -1,    -1,
+      -1,    40,   103,   104,    -1,   106,   107,   108,    -1,   110,
+     111,    -1,   113,   114,   115,   116,   117,    -1,    -1,    -1,
+      -1,    -1,   123,    -1,   125,   126,    -1,   128,    67,    68,
+      69,    -1,    71,    72,    73,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    -1,    91,    92,    93,    -1,    95,    96,    97,    -1,
+      -1,    -1,    -1,    40,   103,   104,    -1,   106,   107,   108,
+      -1,   110,   111,    -1,   113,   114,   115,   116,   117,    -1,
+      -1,    -1,    -1,    -1,   123,    -1,   125,   126,    -1,   128,
+      67,    68,    69,    -1,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    -1,    91,    92,    93,    -1,    95,    96,
+      97,    -1,    -1,    -1,    -1,    40,   103,   104,   105,   106,
+     107,   108,    -1,   110,   111,    -1,   113,   114,   115,   116,
+     117,    -1,    -1,    -1,    -1,    -1,   123,    -1,   125,    -1,
+      -1,   128,    67,    68,    69,    -1,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    -1,    91,    92,    93,    -1,
+      95,    96,    97,    -1,    -1,    -1,    -1,    40,   103,   104,
+      -1,   106,   107,   108,    -1,   110,   111,    -1,   113,   114,
+     115,   116,   117,    -1,    -1,    -1,    -1,    -1,   123,    -1,
+     125,    -1,    -1,   128,    67,    68,    69,    -1,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    -1,    91,    92,
+      93,    -1,    95,    96,    97,    -1,    -1,    -1,    -1,    40,
+     103,   104,    -1,   106,   107,   108,    -1,    -1,   111,    -1,
+     113,   114,   115,   116,   117,    -1,    -1,    -1,    -1,    -1,
+     123,    -1,   125,    -1,    -1,   128,    67,    68,    69,    -1,
+      71,    72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    89,    -1,
+      91,    92,    93,    -1,    95,    96,    97,    -1,    -1,    -1,
+      -1,    40,    -1,    -1,    -1,   106,   107,   108,    -1,   110,
+     111,    -1,   113,   114,   115,   116,   117,    -1,    -1,    -1,
+      -1,    -1,   123,    -1,   125,    -1,    -1,   128,    67,    68,
+      69,    -1,    71,    72,    73,    74,    75,    76,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    91,    92,    93,    -1,    95,    96,    97,    -1,
+      -1,    -1,    -1,    40,    -1,    -1,    -1,   106,   107,   108,
+      -1,   110,   111,    -1,   113,   114,   115,   116,   117,    -1,
+      -1,    -1,    -1,    -1,   123,    -1,   125,    -1,    -1,   128,
+      67,    68,    69,    -1,    71,    72,    73,    74,    75,    76,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    91,    92,    93,    -1,    95,    96,
+      97,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,
+     107,   108,    -1,   110,   111,    -1,   113,   114,   115,   116,
+     117,    -1,    -1,    -1,    -1,    -1,   123,    -1,   125,    -1,
+      -1,   128,    67,    68,    69,    -1,    71,    72,    73,    74,
+      75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    91,    92,    93,    -1,
+      95,    96,    97,    -1,    -1,    -1,    -1,    40,    -1,    -1,
+      -1,    -1,    -1,   108,    -1,   110,   111,    -1,   113,   114,
+     115,   116,   117,    -1,    -1,    -1,    -1,    -1,   123,    -1,
+     125,    -1,    -1,   128,    67,    68,    69,    -1,    71,    72,
+      73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    91,    92,
+      93,    -1,    95,    96,    97,    -1,    -1,    -1,    -1,    40,
+      -1,    -1,    -1,    -1,    -1,   108,    -1,   110,   111,    -1,
+     113,   114,   115,   116,   117,    -1,    -1,    -1,    -1,    -1,
+     123,    -1,   125,    -1,    -1,   128,    67,    68,    69,    -1,
+      71,    72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      91,    92,    93,    -1,    95,    96,    97,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   110,
+     111,    -1,   113,   114,   115,   116,   117,    -1,    -1,    -1,
+      -1,    -1,   123,    -1,   125,    -1,    -1,   128
 };
 
 /* 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,    88,
-      89,    97,   111,   116,   117,   121,   123,   125,   127,   134,
-     135,   136,   137,   143,   146,   147,   153,   157,   158,   159,
-     160,   162,   170,   178,   181,   184,   187,   188,   189,   190,
-     194,   196,   205,   212,   215,   228,   229,   230,   233,   234,
-     235,   236,   239,   241,    87,    50,   121,   121,   163,   121,
-       3,    19,   125,   182,   183,    18,     3,   235,     3,   214,
-     235,   121,   183,   218,   121,   125,   121,   126,   235,   121,
-     235,   235,   235,   235,   235,   233,   224,   225,   226,   232,
-     235,   232,   237,   238,     3,     0,   137,   125,     3,    32,
-      46,   149,   155,   156,   234,    27,    31,    32,    44,    46,
-     204,   190,    98,    40,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    88,    89,    90,    92,    93,    94,
-     100,   103,   105,   106,   107,   108,   109,   111,   112,   113,
-     114,   115,   121,   123,   126,     3,   121,   161,    30,    37,
-      42,    46,    66,    97,   125,   143,   144,   145,   147,   149,
-     164,   165,   180,   188,   231,   240,   171,   186,   125,   126,
-       3,   227,   121,   233,   126,   235,   179,   224,     3,   154,
-     132,   124,    98,   232,   104,   131,    98,   135,     3,   150,
-     151,     3,   150,    97,    68,    35,    51,   211,     3,     3,
-       3,   235,   235,   235,   235,   235,   235,   235,   235,   235,
-     235,   235,   235,   235,   235,   235,   235,   235,   235,   235,
-     235,   235,   235,     3,   235,   235,   235,   235,   235,   235,
-     235,   235,   235,   235,   235,   235,   235,   235,   235,   224,
-     235,     3,   121,   127,   233,     3,   233,   233,     3,   131,
-     142,   144,   235,    97,    14,   125,    18,   235,    97,   138,
-     139,   140,   146,   147,   194,   196,   205,   212,   185,   182,
-     121,   223,     3,    91,   208,   209,   210,   132,     3,   114,
-     132,   141,   142,   132,   233,   232,   232,   131,   104,   222,
-      98,   222,   233,   233,     3,    54,   191,    54,   192,   222,
-     104,   132,   124,    87,   235,     3,   132,   131,   144,   121,
-     142,     3,   132,   131,   140,   125,   138,   224,   100,   104,
-     206,   210,   132,    98,   145,   131,   132,   104,     3,    36,
-     114,   183,   217,   218,   219,   221,   100,   148,   151,    97,
-     132,   121,   219,    17,   193,   219,   220,   125,   148,   235,
-       3,   132,   145,   233,   131,   100,   125,   138,   131,   132,
-       3,     5,     8,     9,    10,    12,    45,    55,    56,   207,
-     221,   222,    91,   210,    28,    33,   172,   174,   176,   177,
-     145,   232,   126,   232,   234,   145,   208,   220,   125,    98,
-     197,   132,     3,     5,    34,    62,   166,   167,   168,   169,
-     131,   206,   125,   210,   125,   121,   172,   174,    65,   152,
-     132,   132,   195,   219,    46,    97,   188,   201,   202,   203,
-     235,   104,   131,   168,   169,   216,   175,     3,   145,   145,
-     222,    97,   143,   147,   188,   198,   199,   200,   205,   212,
-       3,    27,   131,   203,   104,   141,   141,   141,   222,   125,
-     125,   131,   200,   211,   141,   131,   131,   132,   213,   198,
-       3,   173,   141,   131,   121,   125,   131,   208,   141,   132,
-     131,   222
+      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,    70,
+      91,    92,   100,   110,   113,   118,   119,   123,   125,   127,
+     129,   136,   137,   138,   139,   145,   148,   149,   155,   159,
+     160,   161,   162,   164,   172,   180,   183,   184,   187,   190,
+     191,   192,   193,   197,   199,   208,   213,   214,   215,   225,
+     233,   236,   249,   250,   251,   256,   260,   264,   265,   267,
+     268,    90,    50,   123,   123,   165,   123,     3,     4,    17,
+     127,   185,   186,    16,     3,   260,     3,   235,   260,   123,
+     186,   239,   123,   127,   123,   128,   260,   123,     3,     5,
+       8,     9,    10,   257,   258,   259,   260,   260,   260,   260,
+     260,   255,   260,   245,   246,   247,   253,   260,    30,    32,
+      37,    42,    46,    66,   100,   133,   144,   145,   146,   149,
+     151,   166,   167,   182,   191,   252,     3,     0,   139,   127,
+       3,    46,   151,   157,   158,   256,   146,   147,    16,    26,
+      31,    32,    44,    46,   207,   266,   193,     3,   127,   220,
+     224,   101,    40,    67,    68,    69,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    91,    92,    93,    95,    96,
+      97,   103,   104,   106,   107,   108,   110,   111,   113,   114,
+     115,   116,   117,   123,   125,   128,     3,   123,   163,   147,
+     173,   189,   127,   128,   185,   186,   238,   239,   240,   248,
+     123,   254,   255,   128,   260,   181,   245,     3,   156,   133,
+     105,   101,   101,   134,   126,   101,   253,     3,     3,   152,
+     153,   254,   254,   152,     3,   133,   146,   127,   137,     3,
+     100,    68,   100,     3,    35,    51,   232,     3,     3,   209,
+     260,     3,   220,   226,   227,   228,   260,   260,   260,   260,
+     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
+     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
+       3,   116,   129,   263,   260,   260,   260,   260,   260,   260,
+     260,   260,   260,   260,   260,   260,   260,   260,   260,   245,
+     260,     3,     4,   123,   125,   129,   262,   263,   254,    12,
+     260,   100,   140,   141,   142,   148,   149,   197,   199,   208,
+     233,   188,   185,   128,   123,   244,     3,    94,   229,   230,
+     231,   134,   116,   185,   134,   143,   144,   134,   254,   253,
+     258,   260,   105,   243,   101,   144,   133,   243,   254,   254,
+     103,     3,    54,   194,    54,   195,     3,   210,   211,   221,
+     103,   103,   111,   115,   216,   228,   125,   263,   105,   134,
+     126,   261,   260,   125,   263,    90,   134,   123,   134,   133,
+     142,   127,   140,   245,   103,   105,   212,   231,   134,   101,
+     133,   134,   105,    36,   116,   240,   242,   103,   150,   153,
+     133,   100,   134,     3,     5,   123,   240,    15,   196,   240,
+     241,   127,   243,   101,   133,     5,   220,     5,   220,   217,
+     222,   260,   260,   260,   126,   260,   263,   147,   254,   127,
+     140,   133,   134,   260,   242,   243,    94,   231,    27,    33,
+     174,   176,   178,   179,   147,   253,   260,   256,   147,   229,
+     241,   127,   101,   200,   150,   211,   111,     5,   110,   111,
+     127,   218,   223,   225,   126,   134,   126,   134,    34,    62,
+     168,   169,   170,   171,   133,   212,   127,   231,   127,   123,
+     174,   176,    65,   154,   134,   134,   198,   240,    46,   100,
+     191,   204,   205,   206,   115,   260,   110,   225,   222,   260,
+     105,   133,   170,   171,   237,   177,     3,   147,   147,   243,
+     100,   145,   149,   191,   201,   202,   203,   208,   233,     3,
+      26,   133,   206,   224,   219,   115,   222,   105,   143,   143,
+     143,   243,   127,   127,   133,   203,   232,   217,   133,   224,
+     143,   133,   133,   134,   234,   201,     3,   111,   217,   175,
+     143,   133,   123,   111,   127,   133,   229,   143,   134,   133,
+     243
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -3990,89 +4505,102 @@ yyreduce:
   switch (yyn)
     {
         
-    case 26:
+    case 13:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1725 "parser.y"
-    {(yyval.code)=(yyvsp[(1) - (1)].code);}
+#line 1902 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);}
     }
     break;
 
 
   
-    case 27:
+    case 24:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1726 "parser.y"
-    {(yyval.code)=code_new();}
+#line 1914 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);}
     }
     break;
 
 
   
-    case 28:
+    case 26:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1728 "parser.y"
-    {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));}
+#line 1917 "parser.y"
+    {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
-    case 29:
+    case 27:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1729 "parser.y"
-    {(yyval.code)=(yyvsp[(1) - (1)].code);}
+#line 1918 "parser.y"
+    {(yyval.code)=code_new();}
     }
     break;
 
 
   
-    case 41:
+    case 28:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1745 "parser.y"
-    {(yyval.code)=0;}
+#line 1920 "parser.y"
+    {
+    (yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));
+}
+    }
+    break;
+
+
+  
+    case 29:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 1923 "parser.y"
+    {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
-    case 48:
+    case 42:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1752 "parser.y"
-    {(yyval.code)=(yyvsp[(3) - (4)].code);}
+#line 1938 "parser.y"
+    {(yyval.code)=(yyvsp[(2) - (3)].code);}
     }
     break;
 
 
   
-    case 49:
+    case 43:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1754 "parser.y"
-    {/*TODO*/(yyval.code)=0;}
+#line 1939 "parser.y"
+    {(yyval.code)=0;}
     }
     break;
 
 
   
-    case 50:
+    case 44:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1756 "parser.y"
-    {(yyval.code)=(yyvsp[(2) - (3)].code);}
+#line 1942 "parser.y"
+    {(yyval.code)=0;}
     }
     break;
 
@@ -4082,8 +4610,16 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1757 "parser.y"
-    {(yyval.code)=0;}
+#line 1949 "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;
 
@@ -4093,7 +4629,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1758 "parser.y"
+#line 1961 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (2)].code);}
     }
     break;
@@ -4104,7 +4640,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1759 "parser.y"
+#line 1962 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
@@ -4115,7 +4651,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1763 "parser.y"
+#line 1966 "parser.y"
     {
     code_t**cc = &global->init->method->body->code;
     *cc = code_append(*cc, (yyvsp[(1) - (1)].code));
@@ -4125,12 +4661,31 @@ yyreduce:
 
 
   
+    case 55:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 1973 "parser.y"
+    {
+    PASS12
+    (yyval.number_int)=as3_pass;
+    char*key = concat3((yyvsp[(1) - (3)].id),"::",(yyvsp[(3) - (3)].id));
+    if(!definitions || !dict_contains(definitions, key)) {
+        as3_pass=0;
+    }
+    free(key);
+}
+    }
+    break;
+
+
+  
     case 56:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1774 "parser.y"
-    {(yyval.value)=(yyvsp[(2) - (2)].value);}
+#line 1992 "parser.y"
+    {(yyval.node)=(yyvsp[(2) - (2)].node);}
     }
     break;
 
@@ -4140,10 +4695,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1775 "parser.y"
-    {(yyval.value).c=abc_pushundefined(0);
-                                  (yyval.value).t=TYPE_ANY;
-                                 }
+#line 1993 "parser.y"
+    {(yyval.node)=mkdummynode();}
     }
     break;
 
@@ -4153,7 +4706,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1779 "parser.y"
+#line 1995 "parser.y"
     {(yyval.code)=(yyvsp[(2) - (2)].code);}
     }
     break;
@@ -4164,7 +4717,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1780 "parser.y"
+#line 1996 "parser.y"
     {(yyval.code)=(yyvsp[(2) - (2)].code);}
     }
     break;
@@ -4175,7 +4728,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1782 "parser.y"
+#line 1998 "parser.y"
     {(yyval.code) = (yyvsp[(1) - (1)].code);}
     }
     break;
@@ -4186,7 +4739,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1783 "parser.y"
+#line 1999 "parser.y"
     {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));}
     }
     break;
@@ -4197,45 +4750,62 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1786 "parser.y"
+#line 2002 "parser.y"
     {
+PASS12
     if(variable_exists((yyvsp[(1) - (3)].id)))
         syntaxerror("Variable %s already defined", (yyvsp[(1) - (3)].id));
+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) {
+        variable_t* v = find_slot(state, (yyvsp[(1) - (3)].id));
+        if(v && !v->init) {
+            // this variable is stored in a slot
+            v->init = 1;
+            v->type = (yyvsp[(2) - (3)].classinfo);
+            slot = 1;
+            index = v->index;
+        }
+    }
+    if(!index) {
+        index = new_variable((yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].classinfo), 1, 0);
     }
 
-    int index = new_variable((yyvsp[(1) - (3)].id), (yyvsp[(2) - (3)].classinfo), 1);
+    (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) = (yyvsp[(3) - (3)].value).c;
-            (yyval.code) = converttype((yyval.code), (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo));
-            (yyval.code) = abc_setlocal((yyval.code), index);
+        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);
-            (yyval.code) = defaultvalue(0, (yyvsp[(2) - (3)].classinfo));
-            (yyval.code) = abc_setlocal((yyval.code), index);
+            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) = (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));
-            (yyval.code) = abc_setlocal((yyval.code), index);
         } else {
-            code_free((yyvsp[(3) - (3)].value).c);
-            (yyval.code) = code_new();
+            // don't do anything
+            code_free(v.c);
+            code_free((yyval.code));
+            (yyval.code) = 0;
+            break;
         }
     }
-    
-    /* that's the default for a local register, anyway
-        else {
-        state->method->initcode = abc_pushundefined(state->method->initcode);
-        state->method->initcode = abc_setlocal(state->method->initcode, index);
-    }*/
-    //printf("variable %s -> %d (%s)\n", $2->text, index, $4.t?$4.t->name:"");
+    if(slot) {
+        (yyval.code) = abc_setslot((yyval.code), index);
+    } else {
+        (yyval.code) = abc_setlocal((yyval.code), index);
+    }
 }
     }
     break;
@@ -4246,7 +4816,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1828 "parser.y"
+#line 2061 "parser.y"
     {(yyval.code) = code_new();}
     }
     break;
@@ -4257,7 +4827,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1829 "parser.y"
+#line 2062 "parser.y"
     {(yyval.code)=(yyvsp[(2) - (2)].code);}
     }
     break;
@@ -4268,8 +4838,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1832 "parser.y"
-    {new_state();}
+#line 2065 "parser.y"
+    {PASS12 new_state();}
     }
     break;
 
@@ -4279,7 +4849,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1832 "parser.y"
+#line 2065 "parser.y"
     {
      
     (yyval.code) = code_new();
@@ -4296,7 +4866,7 @@ yyreduce:
         myjmp->branch = (yyval.code) = abc_nop((yyval.code));
     }
     (yyval.code) = var_block((yyval.code));
-    old_state();
+    PASS12 old_state();
 }
     }
     break;
@@ -4307,7 +4877,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1851 "parser.y"
+#line 2084 "parser.y"
     {(yyval.code)=code_new();}
     }
     break;
@@ -4318,9 +4888,10 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1856 "parser.y"
+#line 2091 "parser.y"
     {
-    (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1);
+    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);
 }
     }
     break;
@@ -4331,8 +4902,9 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1859 "parser.y"
+#line 2095 "parser.y"
     {
+    PASS12
     (yyval.id)=(yyvsp[(1) - (1)].id);
 }
     }
@@ -4344,8 +4916,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1863 "parser.y"
-    {new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;}
+#line 2100 "parser.y"
+    {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;}
     }
     break;
 
@@ -4355,8 +4927,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1864 "parser.y"
-    {new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;}
+#line 2101 "parser.y"
+    {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;}
     }
     break;
 
@@ -4366,7 +4938,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1866 "parser.y"
+#line 2103 "parser.y"
     {
     if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement");
     (yyval.code) = code_new();
@@ -4384,7 +4956,7 @@ yyreduce:
     myif->branch = out;
 
     (yyval.code) = var_block((yyval.code));
-    old_state();
+    PASS12 old_state();
 }
     }
     break;
@@ -4395,13 +4967,17 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1886 "parser.y"
+#line 2123 "parser.y"
     {
-    variable_t*var = find_variable((yyvsp[(2) - (6)].id));
+    variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id));
+    if(!var) {
+        syntaxerror("variable %s not known in this scope", (yyvsp[(2) - (6)].id));
+    }
+
     char*tmp1name = concat2((yyvsp[(2) - (6)].id), "__tmp1__");
-    int it = new_variable(tmp1name, TYPE_INT, 0);
+    int it = new_variable(tmp1name, TYPE_INT, 0, 0);
     char*tmp2name = concat2((yyvsp[(2) - (6)].id), "__array__");
-    int array = new_variable(tmp1name, 0, 0);
+    int array = new_variable(tmp1name, 0, 0, 0);
 
     (yyval.code) = code_new();
     (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (6)].value).c);
@@ -4433,10 +5009,11 @@ yyreduce:
     myif->branch = out;
 
     (yyval.code) = var_block((yyval.code));
-    old_state();
 
     free(tmp1name);
     free(tmp2name);
+
+    PASS12 old_state();
 }
     }
     break;
@@ -4447,8 +5024,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1929 "parser.y"
-    {new_state();}
+#line 2171 "parser.y"
+    {PASS12 new_state();}
     }
     break;
 
@@ -4458,7 +5035,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1929 "parser.y"
+#line 2171 "parser.y"
     {
 
     (yyval.code) = code_new();
@@ -4475,7 +5052,7 @@ yyreduce:
     continuejumpsto((yyval.code), (yyvsp[(1) - (6)].id), cont);
 
     (yyval.code) = var_block((yyval.code));
-    old_state();
+    PASS12 old_state();
 }
     }
     break;
@@ -4486,8 +5063,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1948 "parser.y"
-    {new_state();}
+#line 2190 "parser.y"
+    {PASS12 new_state();}
     }
     break;
 
@@ -4497,7 +5074,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1948 "parser.y"
+#line 2190 "parser.y"
     {
     (yyval.code) = code_new();
     code_t*loopstart = (yyval.code) = abc_label((yyval.code));
@@ -4510,7 +5087,7 @@ yyreduce:
     continuejumpsto((yyval.code), (yyvsp[(1) - (7)].id), cont);
     
     (yyval.code) = var_block((yyval.code));
-    old_state();
+    PASS12 old_state();
 }
     }
     break;
@@ -4521,7 +5098,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1963 "parser.y"
+#line 2205 "parser.y"
     {
     (yyval.code) = abc___break__(0, "");
 }
@@ -4534,7 +5111,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1966 "parser.y"
+#line 2208 "parser.y"
     {
     (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id));
 }
@@ -4547,7 +5124,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1969 "parser.y"
+#line 2211 "parser.y"
     {
     (yyval.code) = abc___continue__(0, "");
 }
@@ -4560,7 +5137,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1972 "parser.y"
+#line 2214 "parser.y"
     {
     (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id));
 }
@@ -4573,7 +5150,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1976 "parser.y"
+#line 2218 "parser.y"
     {(yyval.code)=0;}
     }
     break;
@@ -4584,7 +5161,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1977 "parser.y"
+#line 2219 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
@@ -4595,7 +5172,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1978 "parser.y"
+#line 2220 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
@@ -4606,7 +5183,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1979 "parser.y"
+#line 2221 "parser.y"
     {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));}
     }
     break;
@@ -4617,7 +5194,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1980 "parser.y"
+#line 2222 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
@@ -4628,7 +5205,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1981 "parser.y"
+#line 2223 "parser.y"
     {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));}
     }
     break;
@@ -4639,10 +5216,10 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1983 "parser.y"
+#line 2225 "parser.y"
     {
-    (yyval.code) = abc_dup(0);
-    (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c);
+    (yyval.code) = abc_getlocal(0, state->switch_var);
+    (yyval.code) = code_append((yyval.code), node_read((yyvsp[(2) - (4)].node)).c);
     code_t*j = (yyval.code) = abc_ifne((yyval.code), 0);
     (yyval.code) = code_append((yyval.code), (yyvsp[(4) - (4)].code));
     if((yyval.code)->opcode != OPCODE___BREAK__) {
@@ -4660,7 +5237,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1994 "parser.y"
+#line 2236 "parser.y"
     {
     (yyval.code) = (yyvsp[(3) - (3)].code);
 }
@@ -4673,8 +5250,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1997 "parser.y"
-    {new_state();}
+#line 2239 "parser.y"
+    {PASS12 new_state();state->switch_var=alloc_local();}
     }
     break;
 
@@ -4684,11 +5261,13 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1997 "parser.y"
+#line 2239 "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));
-    code_t*out = (yyval.code) = abc_pop((yyval.code));
+
+    code_t*out = (yyval.code) = abc_kill((yyval.code), state->switch_var);
     breakjumpsto((yyval.code), (yyvsp[(1) - (8)].id), out);
     
     code_t*c = (yyval.code),*lastblock=0;
@@ -4709,7 +5288,7 @@ yyreduce:
     }
    
     (yyval.code) = var_block((yyval.code));
-    old_state();
+    PASS12 old_state();
 }
     }
     break;
@@ -4720,8 +5299,12 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2026 "parser.y"
-    {new_state();state->exception_name=(yyvsp[(3) - (5)].id);new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0);}
+#line 2270 "parser.y"
+    {PASS12 new_state();
+                                                      state->exception_name=(yyvsp[(3) - (5)].id);
+                                               PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0);
+                                               PASS2 new_variable((yyvsp[(3) - (5)].id), (yyvsp[(4) - (5)].classinfo), 0, 0);
+                                              }
     }
     break;
 
@@ -4731,7 +5314,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2027 "parser.y"
+#line 2275 "parser.y"
     {
     namespace_t name_ns = {ACCESS_PACKAGE, ""};
     multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)};
@@ -4742,14 +5325,15 @@ yyreduce:
     (yyval.exception) = e;
 
     code_t*c = 0;
-    int i = find_variable_safe((yyvsp[(3) - (9)].id))->index;
+    int i = find_variable_safe(state, (yyvsp[(3) - (9)].id))->index;
     e->target = c = abc_nop(0);
     c = abc_setlocal(c, i);
+    c = code_append(c, code_dup(state->method->scope_code));
     c = code_append(c, (yyvsp[(8) - (9)].code));
     c = abc_kill(c, i);
 
     c = var_block(c);
-    old_state();
+    PASS12 old_state();
 }
     }
     break;
@@ -4760,8 +5344,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2046 "parser.y"
-    {new_state();state->exception_name=0;}
+#line 2295 "parser.y"
+    {PASS12 new_state();state->exception_name=0;}
     }
     break;
 
@@ -4771,12 +5355,11 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2046 "parser.y"
+#line 2295 "parser.y"
     {
     (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code));
     if(!(yyvsp[(4) - (5)].code)) {
         (yyval.exception)=0;
-        old_state();
     } else {
         NEW(abc_exception_t, e)
         e->exc_type = 0; //all exceptions
@@ -4784,9 +5367,9 @@ yyreduce:
         e->target = 0;
         e->to = abc_nop(0);
         e->to = code_append(e->to, (yyvsp[(4) - (5)].code));
-        old_state();
         (yyval.exception) = e;
     }
+    PASS12 old_state();
 }
     }
     break;
@@ -4797,7 +5380,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2063 "parser.y"
+#line 2311 "parser.y"
     {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));}
     }
     break;
@@ -4808,7 +5391,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2064 "parser.y"
+#line 2312 "parser.y"
     {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));}
     }
     break;
@@ -4819,7 +5402,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2065 "parser.y"
+#line 2313 "parser.y"
     {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);}
     }
     break;
@@ -4830,7 +5413,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2066 "parser.y"
+#line 2314 "parser.y"
     {
     (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list);
     (yyval.catch_list).finally = 0;
@@ -4848,7 +5431,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2074 "parser.y"
+#line 2322 "parser.y"
     {
     (yyval.catch_list).l=list_new();
     (yyval.catch_list).finally = 0;
@@ -4866,8 +5449,11 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2083 "parser.y"
-    {new_state();}
+#line 2331 "parser.y"
+    {PASS12 new_state();
+                 state->method->has_exceptions=1;
+                 state->method->late_binding=1;//for invariant scope_code
+                }
     }
     break;
 
@@ -4877,7 +5463,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2083 "parser.y"
+#line 2334 "parser.y"
     {
     code_t*out = abc_nop(0);
 
@@ -4890,7 +5476,7 @@ yyreduce:
   
     int tmp;
     if((yyvsp[(6) - (6)].catch_list).finally)
-        tmp = new_variable("__finally__", 0, 0);
+        tmp = new_variable("__finally__", 0, 0, 0);
     
     abc_exception_list_t*l = (yyvsp[(6) - (6)].catch_list).l;
     int count=0;
@@ -4903,6 +5489,7 @@ yyreduce:
             parserassert((ptroff_t)(yyvsp[(6) - (6)].catch_list).finally);
             // finally block
             e->target = (yyval.code) = abc_nop((yyval.code));
+            (yyval.code) = code_append((yyval.code), code_dup(state->method->scope_code));
             (yyval.code) = abc___rethrow__((yyval.code));
         }
         
@@ -4918,7 +5505,7 @@ yyreduce:
     list_concat(state->method->exceptions, (yyvsp[(6) - (6)].catch_list).l);
    
     (yyval.code) = var_block((yyval.code));
-    old_state();
+    PASS12 old_state();
 }
     }
     break;
@@ -4929,7 +5516,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2128 "parser.y"
+#line 2380 "parser.y"
     {
     (yyval.code)=(yyvsp[(2) - (2)].value).c;
     (yyval.code)=abc_throw((yyval.code));
@@ -4943,11 +5530,11 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2132 "parser.y"
+#line 2384 "parser.y"
     {
     if(!state->exception_name)
         syntaxerror("re-throw only possible within a catch block");
-    variable_t*v = find_variable(state->exception_name);
+    variable_t*v = find_variable(state, state->exception_name);
     (yyval.code)=code_new();
     (yyval.code)=abc_getlocal((yyval.code), v->index);
     (yyval.code)=abc_throw((yyval.code));
@@ -4961,24 +5548,41 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2143 "parser.y"
+#line 2395 "parser.y"
     {
-     (yyval.code) = (yyvsp[(3) - (5)].value).c;
-     (yyval.code) = abc_pushscope((yyval.code));
-     (yyval.code) = code_append((yyval.code), (yyvsp[(5) - (5)].code));
-     (yyval.code) = abc_popscope((yyval.code));
+     new_state();
+     if(state->method->has_exceptions) {
+         int v = alloc_local();
+         state->method->scope_code = abc_getlocal(state->method->scope_code, v);
+         state->method->scope_code = abc_pushwith(state->method->scope_code);
+         (yyval.value_list).number = v;
+     }
+     (yyval.value_list).cc = (yyvsp[(3) - (4)].value).c;
 }
     }
     break;
 
 
   
-    case 109:
+    case 108:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2153 "parser.y"
-    {PASS12 (yyval.id)="package";}
+#line 2405 "parser.y"
+    {
+     /* remove getlocal;pushwith from scope code again */
+     state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code));
+
+     (yyval.code) = (yyvsp[(1) - (2)].value_list).cc;
+     if(state->method->has_exceptions) {
+         (yyval.code) = abc_dup((yyval.code));
+         (yyval.code) = abc_setlocal((yyval.code), (yyvsp[(1) - (2)].value_list).number);
+     }
+     (yyval.code) = abc_pushwith((yyval.code));
+     (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (2)].code));
+     (yyval.code) = abc_popscope((yyval.code));
+     old_state();
+}
     }
     break;
 
@@ -4988,8 +5592,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2155 "parser.y"
-    {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;}
+#line 2423 "parser.y"
+    {PASS12 (yyval.id)="package";}
     }
     break;
 
@@ -4999,8 +5603,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2156 "parser.y"
-    {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));}
+#line 2424 "parser.y"
+    {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);}
     }
     break;
 
@@ -5010,8 +5614,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2158 "parser.y"
-    {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;}
+#line 2426 "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;
 
@@ -5021,8 +5625,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2159 "parser.y"
-    {PASS12 endpackage();(yyval.code)=0;}
+#line 2427 "parser.y"
+    {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));}
     }
     break;
 
@@ -5032,8 +5636,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2160 "parser.y"
-    {PASS12 startpackage("");}
+#line 2429 "parser.y"
+    {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;}
     }
     break;
 
@@ -5043,7 +5647,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2161 "parser.y"
+#line 2430 "parser.y"
     {PASS12 endpackage();(yyval.code)=0;}
     }
     break;
@@ -5054,19 +5658,41 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2163 "parser.y"
+#line 2431 "parser.y"
+    {PASS12 startpackage("");}
+    }
+    break;
+
+
+  
+    case 117:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2432 "parser.y"
+    {PASS12 endpackage();(yyval.code)=0;}
+    }
+    break;
+
+
+  
+    case 118:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2454 "parser.y"
     {
-       PASS1 
-       if(!registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name)) {
+       PASS12
+       slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name);
+       if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) {
            as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name);
        }
-
-       PASS2
        classinfo_t*c = (yyvsp[(2) - (2)].classinfo);
        if(!c) 
             syntaxerror("Couldn't import class\n");
        state_has_imports();
        dict_put(state->imports, c->name, c);
+       import_toplevel(c->package);
        (yyval.code)=0;
 }
     }
@@ -5074,22 +5700,22 @@ yyreduce:
 
 
   
-    case 117:
+    case 119:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2177 "parser.y"
+#line 2468 "parser.y"
     {
-       PASS1 
-       if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6)) {
+       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();
        list_append(state->wildcard_imports, i);
+       import_toplevel(i->package);
        (yyval.code)=0;
 }
     }
@@ -5097,34 +5723,12 @@ yyreduce:
 
 
   
-    case 118:
-    if(as3_pass==2) {
-
-/* Line 1464 of skeleton.m4  */
-#line 2193 "parser.y"
-    {PASS12 (yyval.flags)=0;}
-    }
-    break;
-
-
-  
-    case 119:
-    if(as3_pass==2) {
-
-/* Line 1464 of skeleton.m4  */
-#line 2194 "parser.y"
-    {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);}
-    }
-    break;
-
-
-  
     case 120:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2195 "parser.y"
-    {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].token);}
+#line 2484 "parser.y"
+    {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5134,8 +5738,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2196 "parser.y"
-    {PASS12 (yyval.flags)=(yyvsp[(1) - (2)].flags)|(yyvsp[(2) - (2)].token);}
+#line 2485 "parser.y"
+    {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);}
     }
     break;
 
@@ -5145,8 +5749,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2198 "parser.y"
-    {PASS12 (yyval.token)=FLAG_PUBLIC;}
+#line 2486 "parser.y"
+    {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);}
     }
     break;
 
@@ -5156,8 +5760,14 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2199 "parser.y"
-    {PASS12 (yyval.token)=FLAG_PRIVATE;}
+#line 2487 "parser.y"
+    {
+    PASS12 
+    (yyval.flags).flags=(yyvsp[(1) - (2)].flags).flags|(yyvsp[(2) - (2)].flags).flags;
+    if((yyvsp[(1) - (2)].flags).ns && (yyvsp[(2) - (2)].flags).ns) syntaxerror("only one namespace allowed in one declaration");
+    (yyval.flags).ns=(yyvsp[(1) - (2)].flags).ns?(yyvsp[(1) - (2)].flags).ns:(yyvsp[(2) - (2)].flags).ns;
+
+}
     }
     break;
 
@@ -5167,8 +5777,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2200 "parser.y"
-    {PASS12 (yyval.token)=FLAG_PROTECTED;}
+#line 2494 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5178,8 +5788,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2201 "parser.y"
-    {PASS12 (yyval.token)=FLAG_STATIC;}
+#line 2495 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5189,8 +5799,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2202 "parser.y"
-    {PASS12 (yyval.token)=FLAG_DYNAMIC;}
+#line 2496 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5200,8 +5810,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2203 "parser.y"
-    {PASS12 (yyval.token)=FLAG_FINAL;}
+#line 2497 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5211,8 +5821,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2204 "parser.y"
-    {PASS12 (yyval.token)=FLAG_OVERRIDE;}
+#line 2498 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5222,8 +5832,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2205 "parser.y"
-    {PASS12 (yyval.token)=FLAG_NATIVE;}
+#line 2499 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5233,8 +5843,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2206 "parser.y"
-    {PASS12 (yyval.token)=FLAG_PACKAGEINTERNAL;}
+#line 2500 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5244,8 +5854,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2207 "parser.y"
-    {PASS12 (yyval.token)=FLAG_NAMESPACE;}
+#line 2501 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5255,8 +5865,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2209 "parser.y"
-    {(yyval.classinfo)=registry_getobjectclass();}
+#line 2502 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5266,8 +5876,10 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2210 "parser.y"
-    {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
+#line 2503 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_NAMESPACE;
+                               (yyval.flags).ns=(yyvsp[(1) - (1)].id);
+                       }
     }
     break;
 
@@ -5277,8 +5889,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2212 "parser.y"
-    {PASS12 (yyval.classinfo_list)=list_new();}
+#line 2507 "parser.y"
+    {PASS12 (yyval.classinfo)=0;}
     }
     break;
 
@@ -5288,8 +5900,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2213 "parser.y"
-    {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
+#line 2508 "parser.y"
+    {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
     }
     break;
 
@@ -5299,7 +5911,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2215 "parser.y"
+#line 2510 "parser.y"
     {PASS12 (yyval.classinfo_list)=list_new();}
     }
     break;
@@ -5310,7 +5922,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2216 "parser.y"
+#line 2511 "parser.y"
     {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
     }
     break;
@@ -5321,8 +5933,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2220 "parser.y"
-    {PASS12 startclass((yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));}
+#line 2513 "parser.y"
+    {PASS12 (yyval.classinfo_list)=list_new();}
     }
     break;
 
@@ -5332,8 +5944,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2222 "parser.y"
-    {PASS12 endclass();(yyval.code)=0;}
+#line 2514 "parser.y"
+    {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
     }
     break;
 
@@ -5343,8 +5955,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2226 "parser.y"
-    {PASS12 startclass((yyvsp[(1) - (5)].flags)|FLAG_INTERFACE,(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));}
+#line 2518 "parser.y"
+    {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));}
     }
     break;
 
@@ -5354,147 +5966,90 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2228 "parser.y"
+#line 2520 "parser.y"
     {PASS12 endclass();(yyval.code)=0;}
     }
     break;
 
 
   
-    case 150:
+    case 142:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2241 "parser.y"
-    {
-    code_t*c = state->cls->static_init;
-    c = code_append(c, (yyvsp[(1) - (1)].code));  
-    state->cls->static_init = c;
-}
+#line 2524 "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));}
     }
     break;
 
 
   
-    case 156:
+    case 143:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2252 "parser.y"
-    {
-    syntaxerror("variable declarations not allowed in interfaces");
-}
+#line 2527 "parser.y"
+    {PASS12 endclass();(yyval.code)=0;}
     }
     break;
 
 
   
-    case 157:
+    case 149:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2255 "parser.y"
-    {
-    PASS12
-    (yyvsp[(1) - (8)].flags) |= FLAG_PUBLIC;
-    if((yyvsp[(1) - (8)].flags)&(FLAG_PRIVATE|FLAG_PACKAGEINTERNAL|FLAG_PROTECTED)) {
-        syntaxerror("invalid method modifiers: interface methods always need to be public");
-    }
-    startfunction(0,(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo));
-    endfunction(0,(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo), 0);
-    list_deep_free((yyvsp[(6) - (8)].params).list);
-}
+#line 2536 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);}
     }
     break;
 
 
   
-    case 160:
+    case 152:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2270 "parser.y"
+#line 2540 "parser.y"
     {
-    int flags = (yyvsp[(1) - (5)].flags);
-    U8 access = flags2access((yyvsp[(1) - (5)].flags));
-
-    varinfo_t* info = 0;
-    if(state->cls) {
-        memberinfo_t*i = registry_findmember(state->cls->info, (yyvsp[(3) - (5)].id), 1);
-        if(i) {
-            check_override(i, flags);
-        }
-
-        info = varinfo_register_onclass(state->cls->info, access, (yyvsp[(3) - (5)].id));
-    } else {
-        slotinfo_t*i = registry_find(state->package, (yyvsp[(3) - (5)].id));
-        if(i) {
-            syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(3) - (5)].id));
-        }
-        info = varinfo_register_global(access, state->package, (yyvsp[(3) - (5)].id));
+    code_t*c = state->cls->static_init->header;
+    c = code_append(c, (yyvsp[(1) - (1)].code));  
+    state->cls->static_init->header = c;
+}
     }
+    break;
 
-    info->type = (yyvsp[(4) - (5)].classinfo);
-    info->flags = flags;
 
-    /* slot name */
-    namespace_t mname_ns = {access, ""};
-    multiname_t mname = {QNAME, &mname_ns, 0, (yyvsp[(3) - (5)].id)};
   
-    trait_list_t**traits;
-    code_t**code;
-    if(!state->cls) {
-        // global variable
-        mname_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;
-    } else {
-        // instance variable
-        traits = &state->cls->abc->traits;
-        code = &state->cls->init;
-    }
-    
-    trait_t*t=0;
-    if((yyvsp[(4) - (5)].classinfo)) {
-        MULTINAME(m, (yyvsp[(4) - (5)].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[(5) - (5)].value).c && !is_pushundefined((yyvsp[(5) - (5)].value).c)) {
-        c = abc_getlocal_0(c);
-        c = code_append(c, (yyvsp[(5) - (5)].value).c);
-        c = converttype(c, (yyvsp[(5) - (5)].value).t, (yyvsp[(4) - (5)].classinfo));
-        c = abc_setslot(c, t->slot_id);
-    }
-
-    *code = code_append(*code, c);
-
-    if((yyvsp[(2) - (5)].token)==KW_CONST) {
-        t->kind= TRAIT_CONST;
-    }
+    case 158:
+    if(as3_pass==2) {
 
-    (yyval.code)=0;
+/* Line 1464 of skeleton.m4  */
+#line 2551 "parser.y"
+    {
+    syntaxerror("variable declarations not allowed in interfaces");
 }
     }
     break;
 
 
   
-    case 161:
+    case 159:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2343 "parser.y"
-    {(yyval.constant)=0;}
+#line 2554 "parser.y"
+    {
+    PASS12
+    (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC;
+    if((yyvsp[(1) - (8)].flags).flags&(FLAG_PRIVATE|FLAG_PACKAGEINTERNAL|FLAG_PROTECTED)) {
+        syntaxerror("invalid method modifiers: interface methods always need to be public");
+    }
+    startfunction(&(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo));
+    endfunction(&(yyvsp[(1) - (8)].flags),(yyvsp[(3) - (8)].token),(yyvsp[(4) - (8)].id),&(yyvsp[(6) - (8)].params),(yyvsp[(8) - (8)].classinfo), 0);
+    list_deep_free((yyvsp[(6) - (8)].params).list);
+}
     }
     break;
 
@@ -5504,8 +6059,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2344 "parser.y"
-    {(yyval.constant)=(yyvsp[(2) - (2)].constant);}
+#line 2624 "parser.y"
+    {PASS12 setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));}
     }
     break;
 
@@ -5515,8 +6070,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2346 "parser.y"
-    {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));}
+#line 2624 "parser.y"
+    {PASS12 (yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);}
     }
     break;
 
@@ -5526,8 +6081,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2347 "parser.y"
-    {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));}
+#line 2626 "parser.y"
+    {PASS12 (yyval.code)=0;}
     }
     break;
 
@@ -5537,8 +6092,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2348 "parser.y"
-    {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));}
+#line 2627 "parser.y"
+    {PASS12 (yyval.code)=0;}
     }
     break;
 
@@ -5548,9 +6103,88 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2349 "parser.y"
-    {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));}
-    }
+#line 2630 "parser.y"
+    {
+PASS12
+    int flags = slotstate_flags->flags;
+    namespace_t ns = modifiers2access(slotstate_flags);
+
+    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->type = (yyvsp[(2) - (3)].classinfo);
+        info->flags = flags;
+        
+        dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, info);
+    }
+
+    if(as3_pass == 2) {
+        varinfo_t*info = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);
+
+        multiname_t mname;
+        code_t**code;
+        trait_t*t = add_abc_slot(slotstate_flags, (yyvsp[(1) - (3)].id), &mname, &code);
+
+        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;
+            info->flags |= FLAG_CONST;
+        }
+    }
+
+    (yyval.code)=0;
+}
+    }
     break;
 
 
@@ -5559,8 +6193,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2350 "parser.y"
-    {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);}
+#line 2713 "parser.y"
+    {(yyval.constant)=0;}
     }
     break;
 
@@ -5570,8 +6204,14 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2352 "parser.y"
-    {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));}
+#line 2714 "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;
 
@@ -5581,8 +6221,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2353 "parser.y"
-    {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));}
+#line 2723 "parser.y"
+    {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));}
     }
     break;
 
@@ -5592,8 +6232,10 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2354 "parser.y"
-    {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));}
+#line 2724 "parser.y"
+    {
+    (yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));
+}
     }
     break;
 
@@ -5603,201 +6245,570 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2355 "parser.y"
+#line 2727 "parser.y"
+    {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));}
+    }
+    break;
+
+
+  
+    case 172:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2728 "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:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2729 "parser.y"
+    {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));}
+    }
+    break;
+
+
+  
+    case 174:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2730 "parser.y"
+    {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));}
+    }
+    break;
+
+
+  
+    case 175:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2731 "parser.y"
+    {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));}
+    }
+    break;
+
+
+  
+    case 176:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2732 "parser.y"
+    {(yyval.constant) = constant_new_undefined((yyvsp[(1) - (1)].token));}
+    }
+    break;
+
+
+  
+    case 177:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2733 "parser.y"
+    {(yyval.constant) = constant_new_float(__builtin_nan(""));}
+    }
+    break;
+
+
+  
+    case 179:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2753 "parser.y"
+    {PASS_ALWAYS if(!xml_level++) tokenizer_begin_xml();}
+    }
+    break;
+
+
+  
+    case 180:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2754 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xmltext();}
+    }
+    break;
+
+
+  
+    case 181:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2755 "parser.y"
+    {PASS_ALWAYS if(!--xml_level) tokenizer_end_xml(); else tokenizer_begin_xmltext();}
+    }
+    break;
+
+
+  
+    case 182:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2757 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xmltext();}
+    }
+    break;
+
+
+  
+    case 183:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2757 "parser.y"
     {
-    // TODO
-    as3_warning("Couldn't resolve %s", (yyvsp[(1) - (1)].id));
-    (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id));
+    (yyval.id)=strdup("{...}");
+    as3_warning("xml string substitution not yet supported");
 }
     }
     break;
 
 
   
-    case 172:
+    case 184:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2364 "parser.y"
+#line 2761 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xml();}
+    }
+    break;
+
+
+  
+    case 185:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2761 "parser.y"
     {
-    PASS12
-    memset(&(yyval.params),0,sizeof((yyval.params)));
+    (yyval.id)=strdup("{...}");
+    as3_warning("xml string substitution not yet supported");
 }
     }
     break;
 
 
   
-    case 173:
+    case 186:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2765 "parser.y"
+    {(yyval.id)="";}
+    }
+    break;
+
+
+  
+    case 187:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2368 "parser.y"
+#line 2766 "parser.y"
     {
-    PASS12
-    (yyval.params)=(yyvsp[(1) - (1)].params);
+    (yyval.id) = concat2((yyvsp[(1) - (2)].id), "{...}");
 }
     }
     break;
 
 
   
-    case 174:
+    case 188:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2374 "parser.y"
+#line 2769 "parser.y"
+    {(yyval.id)=concat2((yyvsp[(1) - (2)].id), string_cstr(&(yyvsp[(2) - (2)].str)));}
+    }
+    break;
+
+
+  
+    case 189:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2770 "parser.y"
+    {(yyval.id)=concat2((yyvsp[(1) - (2)].id), ">");}
+    }
+    break;
+
+
+  
+    case 190:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2772 "parser.y"
+    {(yyval.id)=concat2((yyvsp[(1) - (2)].id),(yyvsp[(2) - (2)].id));}
+    }
+    break;
+
+
+  
+    case 191:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2773 "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 192:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2775 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}
+    }
+    break;
+
+
+  
+    case 193:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2776 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}
+    }
+    break;
+
+
+  
+    case 194:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2778 "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 195:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2782 "parser.y"
+    {
+    (yyval.id) = allocprintf("<%s%s/>", (yyvsp[(2) - (6)].id), (yyvsp[(3) - (6)].id));
+}
+    }
+    break;
+
+
+  
+    case 196:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2785 "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 197:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2790 "parser.y"
+    {(yyval.id)=strdup("");}
+    }
+    break;
+
+
+  
+    case 198:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2791 "parser.y"
+    {(yyval.id)=concat2(" ",(yyvsp[(1) - (1)].id));}
+    }
+    break;
+
+
+  
+    case 199:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2792 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}
+    }
+    break;
+
+
+  
+    case 200:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2793 "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 201:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2795 "parser.y"
+    {
+    (yyval.id) = strdup("{...}");
+}
+    }
+    break;
+
+
+  
+    case 202:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2798 "parser.y"
+    {
+    char* str = string_cstr(&(yyvsp[(3) - (3)].str));
+    (yyval.id) = concat2("{...}=",str);
+}
+    }
+    break;
+
+
+  
+    case 203:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2802 "parser.y"
+    {
+    (yyval.id) = strdup("{...}={...}");
+}
+    }
+    break;
+
+
+  
+    case 204:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2805 "parser.y"
+    {
+    (yyval.id) = concat2((yyvsp[(1) - (3)].id),"={...}");
+}
+    }
+    break;
+
+
+  
+    case 205:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2808 "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 206:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2818 "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 175:
+    case 207:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2380 "parser.y"
+#line 2822 "parser.y"
     {
     PASS12
-    (yyval.params) =(yyvsp[(1) - (4)].params);
-    (yyval.params).varargs=1;
-    list_append((yyval.params).list, (yyvsp[(4) - (4)].param));
+    (yyval.params)=(yyvsp[(1) - (1)].params);
 }
     }
     break;
 
 
   
-    case 176:
+    case 208:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2388 "parser.y"
+#line 2828 "parser.y"
     {
     PASS12
-    (yyval.params) = (yyvsp[(1) - (3)].params);
-    list_append((yyval.params).list, (yyvsp[(3) - (3)].param));
+    memset(&(yyval.params),0,sizeof((yyval.params)));
+    (yyval.params).varargs=1;
+    list_append((yyval.params).list, (yyvsp[(2) - (2)].param));
 }
     }
     break;
 
 
   
-    case 177:
+    case 209:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2393 "parser.y"
+#line 2834 "parser.y"
     {
     PASS12
-    memset(&(yyval.params),0,sizeof((yyval.params)));
-    list_append((yyval.params).list, (yyvsp[(1) - (1)].param));
+    (yyval.params) =(yyvsp[(1) - (4)].params);
+    (yyval.params).varargs=1;
+    list_append((yyval.params).list, (yyvsp[(4) - (4)].param));
 }
     }
     break;
 
 
   
-    case 178:
+    case 210:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2399 "parser.y"
+#line 2842 "parser.y"
     {
-     PASS1 (yyval.param)=0;
-     PASS2
-     (yyval.param) = malloc(sizeof(param_t));
-     (yyval.param)->name=(yyvsp[(1) - (4)].id);
-     (yyval.param)->type = (yyvsp[(3) - (4)].classinfo);
-     (yyval.param)->value = (yyvsp[(4) - (4)].constant);
+    PASS12
+    (yyval.params) = (yyvsp[(1) - (3)].params);
+    list_append((yyval.params).list, (yyvsp[(3) - (3)].param));
 }
     }
     break;
 
 
   
-    case 179:
+    case 211:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2407 "parser.y"
+#line 2847 "parser.y"
     {
-     PASS1 (yyval.param)=0;
-     PASS2
-     (yyval.param) = malloc(sizeof(param_t));
-     (yyval.param)->name=(yyvsp[(1) - (2)].id);
-     (yyval.param)->type = TYPE_ANY;
-     (yyval.param)->value = (yyvsp[(2) - (2)].constant);
+    PASS12
+    memset(&(yyval.params),0,sizeof((yyval.params)));
+    list_append((yyval.params).list, (yyvsp[(1) - (1)].param));
 }
     }
     break;
 
 
   
-    case 180:
+    case 212:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2415 "parser.y"
-    {(yyval.token)=(yyvsp[(1) - (1)].token);}
+#line 2853 "parser.y"
+    {
+     PASS12
+     (yyval.param) = rfx_calloc(sizeof(param_t));
+     (yyval.param)->name=(yyvsp[(1) - (4)].id);
+     (yyval.param)->type = (yyvsp[(3) - (4)].classinfo);
+     PASS2
+     (yyval.param)->value = (yyvsp[(4) - (4)].constant);
+}
     }
     break;
 
 
   
-    case 181:
+    case 213:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2416 "parser.y"
-    {(yyval.token)=(yyvsp[(1) - (1)].token);}
+#line 2861 "parser.y"
+    {
+     PASS12
+     (yyval.param) = rfx_calloc(sizeof(param_t));
+     (yyval.param)->name=(yyvsp[(1) - (2)].id);
+     (yyval.param)->type = TYPE_ANY;
+     PASS2
+     (yyval.param)->value = (yyvsp[(2) - (2)].constant);
+}
     }
     break;
 
 
   
-    case 182:
+    case 216:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2417 "parser.y"
-    {(yyval.token)=0;}
+#line 2871 "parser.y"
+    {PASS12 (yyval.token)=0;}
     }
     break;
 
 
   
-    case 183:
+    case 217:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2420 "parser.y"
-    {PASS12 startfunction(0,(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));}
+#line 2874 "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 184:
+    case 218:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2421 "parser.y"
+#line 2875 "parser.y"
     {
-    PASS1 old_state();list_deep_free((yyvsp[(6) - (12)].params).list);
+    PASS1 
+    endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0);
     PASS2
     if(!state->method->info) syntaxerror("internal error");
     
-    code_t*c = method_header();
+    code_t*c = method_header(state->method);
     c = wrap_function(c, 0, (yyvsp[(11) - (12)].code));
 
-    endfunction(0,(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),(yyvsp[(8) - (12)].classinfo),c);
+    endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),(yyvsp[(8) - (12)].classinfo),c);
+    PASS12
     list_deep_free((yyvsp[(6) - (12)].params).list);
     (yyval.code)=0;
 }
@@ -5806,65 +6817,77 @@ yyreduce:
 
 
   
-    case 186:
+    case 220:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2435 "parser.y"
+#line 2891 "parser.y"
     {PASS12 (yyval.id)=0;}
     }
     break;
 
 
   
-    case 187:
+    case 221:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2437 "parser.y"
+#line 2893 "parser.y"
     {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));}
     }
     break;
 
 
   
-    case 188:
+    case 222:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2438 "parser.y"
+#line 2894 "parser.y"
     {
-    PASS1 old_state();list_deep_free((yyvsp[(4) - (10)].params).list);
+    PASS1
+    endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0);
     PASS2
     methodinfo_t*f = state->method->info;
-    if(!f) syntaxerror("internal error");
+    if(!f || !f->kind) syntaxerror("internal error");
     
-    code_t*c = method_header();
+    code_t*c = method_header(state->method);
     c = wrap_function(c, 0, (yyvsp[(9) - (10)].code));
 
     int index = state->method->var_index;
-    endfunction(0,0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),(yyvsp[(6) - (10)].classinfo),c);
-    list_deep_free((yyvsp[(4) - (10)].params).list);
+    endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),(yyvsp[(6) - (10)].classinfo),c);
     
     (yyval.value).c = abc_getlocal(0, index);
     (yyval.value).t = TYPE_FUNCTION(f);
+
+    PASS12 list_deep_free((yyvsp[(4) - (10)].params).list);
 }
     }
     break;
 
 
   
-    case 189:
+    case 223:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2458 "parser.y"
+#line 2916 "parser.y"
     {
-    PASS1 (yyval.classinfo)=0;
+    PASS1 NEW(unresolvedinfo_t,c);
+          memset(c, 0, sizeof(*c));
+          c->kind = INFOTYPE_UNRESOLVED;
+          c->name = (yyvsp[(1) - (1)].id);
+          c->package = get_package_from_name((yyvsp[(1) - (1)].id));
+          if(!c->package) {
+              c->nsset = get_current_imports();
+              /* make the compiler look for this class in the current directory,
+                 just in case: */
+              as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id));
+          }
+          (yyval.classinfo) = (classinfo_t*)c;
     PASS2
-    /* try current package */
     slotinfo_t*s = find_class((yyvsp[(1) - (1)].id));
-    if(!s) syntaxerror("Could not find class/method %s\n", (yyvsp[(1) - (1)].id));
+    if(!s) syntaxerror("Could not find class/method %s (current package: %s)\n", (yyvsp[(1) - (1)].id), state->package);
     (yyval.classinfo) = (classinfo_t*)s;
 }
     }
@@ -5872,17 +6895,18 @@ yyreduce:
 
 
   
-    case 190:
+    case 224:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2467 "parser.y"
+#line 2935 "parser.y"
     {
-    PASS1 static classinfo_t c;
-          memset(&c, 0, sizeof(c));
-          c.package = (yyvsp[(1) - (3)].id);
-          c.name = (yyvsp[(3) - (3)].id);
-          (yyval.classinfo)=&c;
+    PASS1 NEW(unresolvedinfo_t,c);
+          memset(c, 0, sizeof(*c));
+          c->kind = INFOTYPE_UNRESOLVED;
+          c->package = (yyvsp[(1) - (3)].id);
+          c->name = (yyvsp[(3) - (3)].id);
+          (yyval.classinfo) = (classinfo_t*)c;
     PASS2
     slotinfo_t*s = registry_find((yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id));
     if(!s) syntaxerror("Couldn't find class/method %s.%s\n", (yyvsp[(1) - (3)].id), (yyvsp[(3) - (3)].id));
@@ -5894,122 +6918,122 @@ yyreduce:
 
 
   
-    case 193:
+    case 227:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2483 "parser.y"
+#line 2952 "parser.y"
     {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));}
     }
     break;
 
 
   
-    case 194:
+    case 228:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2484 "parser.y"
+#line 2953 "parser.y"
     {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));}
     }
     break;
 
 
   
-    case 195:
+    case 229:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2486 "parser.y"
-    {(yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);}
+#line 2955 "parser.y"
+    {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);}
     }
     break;
 
 
   
-    case 196:
+    case 230:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2487 "parser.y"
-    {(yyval.classinfo)=registry_getanytype();}
+#line 2956 "parser.y"
+    {PASS12 (yyval.classinfo)=TYPE_ANY;}
     }
     break;
 
 
   
-    case 197:
+    case 231:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2488 "parser.y"
-    {(yyval.classinfo)=registry_getanytype();}
+#line 2957 "parser.y"
+    {PASS12 (yyval.classinfo)=TYPE_VOID;}
     }
     break;
 
 
   
-    case 198:
+    case 232:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2497 "parser.y"
-    {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
+#line 2966 "parser.y"
+    {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
     }
     break;
 
 
   
-    case 199:
+    case 233:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2498 "parser.y"
-    {(yyval.classinfo)=0;}
+#line 2967 "parser.y"
+    {PASS12 (yyval.classinfo)=0;}
     }
     break;
 
 
   
-    case 200:
+    case 234:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2502 "parser.y"
-    {(yyval.value_list).cc=0;(yyval.value_list).len=0;}
+#line 2971 "parser.y"
+    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   
-    case 201:
+    case 235:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2503 "parser.y"
+#line 2972 "parser.y"
     {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);}
     }
     break;
 
 
   
-    case 202:
+    case 236:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2505 "parser.y"
-    {(yyval.value_list).cc=0;(yyval.value_list).len=0;}
+#line 2974 "parser.y"
+    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   
-    case 205:
+    case 239:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2509 "parser.y"
-    {(yyval.value_list).len=1;
+#line 2978 "parser.y"
+    {(yyval.value_list).number=1;
                                                   (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c;
                                                  }
     }
@@ -6017,24 +7041,24 @@ yyreduce:
 
 
   
-    case 206:
+    case 240:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2513 "parser.y"
+#line 2982 "parser.y"
     {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);}
     }
     break;
 
 
   
-    case 207:
+    case 241:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2514 "parser.y"
+#line 2983 "parser.y"
     {
-                                                  (yyval.value_list).len= (yyvsp[(1) - (2)].value_list).len+1;
+                                                  (yyval.value_list).number= (yyvsp[(1) - (2)].value_list).number+1;
                                                   (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c);
                                                   }
     }
@@ -6042,13 +7066,14 @@ yyreduce:
 
 
   
-    case 209:
+    case 243:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2520 "parser.y"
+#line 2989 "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;
@@ -6056,23 +7081,30 @@ yyreduce:
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);
-        (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).len);
+        (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).number);
         multiname_destroy(name);
-    } else if((yyval.value).c->opcode == OPCODE_GETSLOT) {
-        int slot = (int)(ptroff_t)(yyval.value).c->data[0];
-        trait_t*t = abc_class_find_slotid(state->cls->abc,slot);//FIXME
-        multiname_t*name = t->name;
-        (yyval.value).c = code_cutlast((yyval.value).c);
+    } 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, name, (yyvsp[(4) - (4)].value_list).len);
+        (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;
+        $$.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).len);
+        (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;
@@ -6083,14 +7115,15 @@ yyreduce:
 
 
   
-    case 210:
+    case 244:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2556 "parser.y"
+#line 3033 "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);
     }
@@ -6101,33 +7134,36 @@ yyreduce:
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);
-        (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len);
+        (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number);
         multiname_destroy(name);
-    } else if((yyval.value).c->opcode == OPCODE_GETSLOT) {
-        int slot = (int)(ptroff_t)(yyval.value).c->data[0];
-        trait_t*t = abc_class_find_slotid(state->cls->abc,slot);//FIXME
+/*    } 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).len);
+        $$.c = abc_callproperty2($$.c, name, $3.number);*/
     } else if((yyval.value).c->opcode == OPCODE_GETSUPER) {
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);
-        (yyval.value).c = abc_callsuper2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).len);
+        (yyval.value).c = abc_callsuper2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number);
         multiname_destroy(name);
     } else {
         (yyval.value).c = abc_getglobalscope((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);
-        (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).len);
+        (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).number);
     }
    
-    if(TYPE_IS_FUNCTION((yyvsp[(1) - (4)].value).t) && (yyvsp[(1) - (4)].value).t->data) {
-        (yyval.value).t = ((methodinfo_t*)((yyvsp[(1) - (4)].value).t->data))->return_type;
+    if(TYPE_IS_FUNCTION(v.t) && v.t->data) {
+        (yyval.value).t = ((methodinfo_t*)(v.t->data))->return_type;
+    } else if(TYPE_IS_CLASS(v.t) && v.t->data) {
+        // calling a class is like a typecast
+        (yyval.value).t = (classinfo_t*)v.t->data;
     } else {
         (yyval.value).c = abc_coerce_a((yyval.value).c);
         (yyval.value).t = TYPE_ANY;
@@ -6138,11 +7174,11 @@ yyreduce:
 
 
   
-    case 211:
+    case 245:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2602 "parser.y"
+#line 3083 "parser.y"
     {
     if(!state->cls) syntaxerror("super() not allowed outside of a class");
     if(!state->method) syntaxerror("super() not allowed outside of a function");
@@ -6159,7 +7195,7 @@ yyreduce:
     */
     state->method->has_super = 1;
 
-    (yyval.value).c = abc_constructsuper((yyval.value).c, (yyvsp[(3) - (4)].value_list).len);
+    (yyval.value).c = abc_constructsuper((yyval.value).c, (yyvsp[(3) - (4)].value_list).number);
     (yyval.value).c = abc_pushundefined((yyval.value).c);
     (yyval.value).t = TYPE_ANY;
 }
@@ -6168,13 +7204,14 @@ yyreduce:
 
 
   
-    case 212:
+    case 246:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2623 "parser.y"
+#line 3104 "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);
     }
@@ -6183,12 +7220,12 @@ yyreduce:
         (yyval.value).c->opcode = OPCODE_DELETEPROPERTY;
     } else if((yyval.value).c->opcode == OPCODE_GETSLOT) {
         int slot = (int)(ptroff_t)(yyval.value).c->data[0];
-        multiname_t*name = abc_class_find_slotid(state->cls->abc,slot)->name;
+        multiname_t*name = traits_find_slotid(state->cls->abc->traits,slot)->name;
         (yyval.value).c = code_cutlast((yyval.value).c);
         (yyval.value).c = abc_deleteproperty2((yyval.value).c, name);
     } else {
         (yyval.value).c = abc_getlocal_0((yyval.value).c);
-        MULTINAME_LATE(m, (yyvsp[(2) - (2)].value).t?(yyvsp[(2) - (2)].value).t->access:ACCESS_PACKAGE, "");
+        MULTINAME_LATE(m, v.t?v.t->access:ACCESS_PACKAGE, "");
         (yyval.value).c = abc_deleteproperty2((yyval.value).c, &m);
     }
     (yyval.value).t = TYPE_BOOLEAN;
@@ -6198,11 +7235,11 @@ yyreduce:
 
 
   
-    case 213:
+    case 247:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2644 "parser.y"
+#line 3126 "parser.y"
     {
     (yyval.code) = abc_returnvoid(0);
 }
@@ -6211,11 +7248,11 @@ yyreduce:
 
 
   
-    case 214:
+    case 248:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2647 "parser.y"
+#line 3129 "parser.y"
     {
     (yyval.code) = (yyvsp[(2) - (2)].value).c;
     (yyval.code) = abc_returnvalue((yyval.code));
@@ -6225,1447 +7262,1423 @@ yyreduce:
 
 
   
-    case 215:
+    case 249:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2654 "parser.y"
-    {(yyval.value)=(yyvsp[(1) - (1)].value);}
+#line 3136 "parser.y"
+    {
+    (yyval.value) = node_read((yyvsp[(1) - (1)].node));
+}
     }
     break;
 
 
   
-    case 216:
+    case 250:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2655 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3139 "parser.y"
+    {
+    (yyval.value) = node_read((yyvsp[(1) - (1)].node));
+}
     }
     break;
 
 
   
-    case 217:
+    case 251:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2656 "parser.y"
+#line 3142 "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 218:
+    case 252:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2662 "parser.y"
+#line 3145 "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 253:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3148 "parser.y"
+    { 
+    (yyval.code) = node_exec((yyvsp[(1) - (1)].node)); 
 }
     }
     break;
 
 
   
-    case 219:
+    case 254:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2668 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3151 "parser.y"
+    { 
+    (yyval.code) = (yyvsp[(1) - (3)].code);
+    (yyval.code) = code_append((yyval.code), node_exec((yyvsp[(3) - (3)].node))); 
+}
     }
     break;
 
 
   
-    case 221:
+    case 255:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2672 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3156 "parser.y"
+    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   
-    case 222:
+    case 256:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2674 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3157 "parser.y"
+    {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);}
     }
     break;
 
 
   
-    case 223:
+    case 257:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3159 "parser.y"
+    {(yyval.code)=abc_pushstring(0,(yyvsp[(1) - (1)].id));}
+    }
+    break;
+
+
+  
+    case 258:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3160 "parser.y"
+    {(yyval.code)=abc_pushstring2(0,&(yyvsp[(1) - (1)].str));}
+    }
+    break;
+
+
+  
+    case 259:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3161 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}
+    }
+    break;
+
+
+  
+    case 260:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2676 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3162 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}
     }
     break;
 
 
   
-    case 225:
+    case 261:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3163 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}
+    }
+    break;
+
+
+  
+    case 262:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2680 "parser.y"
+#line 3165 "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 263:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3171 "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 226:
+    case 264:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2697 "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 3180 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 227:
+    case 265:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2702 "parser.y"
-    {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint));
-                    (yyval.value).t = TYPE_INT;
-                   }
+#line 3181 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 228:
+    case 266:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2705 "parser.y"
-    {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int));
-                  (yyval.value).t = TYPE_INT;
-                 }
+#line 3182 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 229:
+    case 267:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2708 "parser.y"
-    {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint));
-                   (yyval.value).t = TYPE_UINT;
-                  }
+#line 3183 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 230:
+    case 268:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2711 "parser.y"
-    {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float));
-                    (yyval.value).t = TYPE_FLOAT;
-                   }
+#line 3184 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 231:
+    case 269:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2714 "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 3185 "parser.y"
+    {(yyval.node) = (yyvsp[(1) - (1)].node);}
     }
     break;
 
 
   
-    case 232:
+    case 270:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2717 "parser.y"
-    {(yyval.value).c = abc_pushundefined(0);
-                    (yyval.value).t = TYPE_ANY;
-                   }
+#line 3187 "parser.y"
+    { 
+    (yyval.node) = mkconstnode((yyvsp[(1) - (1)].constant));
+}
     }
     break;
 
 
   
-    case 233:
+    case 271:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2720 "parser.y"
-    {(yyval.value).c = abc_pushtrue(0);
-                    (yyval.value).t = TYPE_BOOLEAN;
-                   }
+#line 3191 "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 234:
+    case 272:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2723 "parser.y"
-    {(yyval.value).c = abc_pushfalse(0);
-                     (yyval.value).t = TYPE_BOOLEAN;
-                    }
+#line 3203 "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 235:
+    case 273:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2726 "parser.y"
-    {(yyval.value).c = abc_pushnull(0);
-                    (yyval.value).t = TYPE_NULL;
-                   }
+#line 3221 "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 236:
+    case 274:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3232 "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 275:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3242 "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 276:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3251 "parser.y"
+    {(yyval.node) = mknode2(&node_lt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 277:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3252 "parser.y"
+    {(yyval.node) = mknode2(&node_gt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 278:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3253 "parser.y"
+    {(yyval.node) = mknode2(&node_le,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 279:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2730 "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 3254 "parser.y"
+    {(yyval.node) = mknode2(&node_ge,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 237:
+    case 280:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2733 "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 3255 "parser.y"
+    {(yyval.node) = mknode2(&node_eqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 238:
+    case 281:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2736 "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 3256 "parser.y"
+    {(yyval.node) = mknode2(&node_eqeqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 239:
+    case 282:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2739 "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 3257 "parser.y"
+    {(yyval.node) = mknode2(&node_noteqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 240:
+    case 283:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2742 "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 3258 "parser.y"
+    {(yyval.node) = mknode2(&node_noteq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 241:
+    case 284:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2745 "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 3259 "parser.y"
+    {(yyval.node) = mknode2(&node_oror,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 242:
+    case 285:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2748 "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 3260 "parser.y"
+    {(yyval.node) = mknode2(&node_andand,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 243:
+    case 286:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2751 "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 3261 "parser.y"
+    {(yyval.node) = mknode1(&node_not, (yyvsp[(2) - (2)].node));}
     }
     break;
 
 
   
-    case 244:
+    case 287:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2755 "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 3262 "parser.y"
+    {(yyval.node) = mknode1(&node_bitnot, (yyvsp[(2) - (2)].node));}
     }
     break;
 
 
   
-    case 245:
+    case 288:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2766 "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 3263 "parser.y"
+    {(yyval.node) = mknode2(&node_bitand, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 246:
+    case 289:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2784 "parser.y"
-    {(yyval.value).c=(yyvsp[(2) - (2)].value).c;
-              (yyval.value).c = abc_not((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3264 "parser.y"
+    {(yyval.node) = mknode2(&node_bitxor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 247:
+    case 290:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2789 "parser.y"
-    {(yyval.value).c=(yyvsp[(2) - (2)].value).c;
-              (yyval.value).c = abc_bitnot((yyval.value).c);
-              (yyval.value).t = TYPE_INT;
-             }
+#line 3265 "parser.y"
+    {(yyval.node) = mknode2(&node_bitor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 248:
+    case 291:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2794 "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 3266 "parser.y"
+    {(yyval.node) = mknode2(&node_shr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 249:
+    case 292:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2799 "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 3267 "parser.y"
+    {(yyval.node) = mknode2(&node_ushr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 250:
+    case 293:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2804 "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 3268 "parser.y"
+    {(yyval.node) = mknode2(&node_shl, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 251:
+    case 294:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2809 "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 3269 "parser.y"
+    {(yyval.node) = mknode2(&node_div, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 252:
+    case 295:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2813 "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 3270 "parser.y"
+    {(yyval.node) = mknode2(&node_mod, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 253:
+    case 296:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2817 "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 3271 "parser.y"
+    {(yyval.node) = mknode2(&node_plus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 254:
+    case 297:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2822 "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 3272 "parser.y"
+    {(yyval.node) = mknode2(&node_minus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 255:
+    case 298:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2826 "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 3273 "parser.y"
+    {(yyval.node) = mknode2(&node_multiply, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 256:
+    case 299:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2830 "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 3274 "parser.y"
+    {(yyval.node) = mknode2(&node_in, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 257:
+    case 300:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2839 "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 3275 "parser.y"
+    {(yyval.node) = mknode2(&node_as, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 258:
+    case 301:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2848 "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 3276 "parser.y"
+    {(yyval.node) = mknode2(&node_instanceof, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 259:
+    case 302:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2858 "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 3277 "parser.y"
+    {(yyval.node) = mknode2(&node_is, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 260:
+    case 303:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2863 "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 3278 "parser.y"
+    {(yyval.node) = mknode1(&node_typeof, (yyvsp[(3) - (4)].node));}
     }
     break;
 
 
   
-    case 261:
+    case 304:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2876 "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 3279 "parser.y"
+    {(yyval.node) = mknode1(&node_void, (yyvsp[(2) - (2)].node));}
     }
     break;
 
 
   
-    case 262:
+    case 305:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2881 "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 3280 "parser.y"
+    { (yyval.node) = mkconstnode(constant_new_undefined());}
     }
     break;
 
 
   
-    case 263:
+    case 306:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2886 "parser.y"
-    {
-              (yyval.value).c = (yyvsp[(3) - (4)].value).c;
-              (yyval.value).c = abc_typeof((yyval.value).c);
-              (yyval.value).t = TYPE_STRING;
-             }
+#line 3281 "parser.y"
+    { (yyval.node)=(yyvsp[(2) - (3)].node);}
     }
     break;
 
 
   
-    case 264:
+    case 307:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2892 "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 3282 "parser.y"
+    {(yyval.node) = mknode1(&node_neg, (yyvsp[(2) - (2)].node));}
     }
     break;
 
 
   
-    case 265:
+    case 308:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2898 "parser.y"
-    { (yyval.value).c = abc_pushundefined(0);
-             (yyval.value).t = TYPE_ANY;
-           }
+#line 3283 "parser.y"
+    {(yyval.node) = mknode2(&node_arraylookup, (yyvsp[(1) - (4)].node),(yyvsp[(3) - (4)].node));}
     }
     break;
 
 
   
-    case 266:
+    case 309:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2902 "parser.y"
-    {(yyval.value)=(yyvsp[(2) - (3)].value);}
+#line 3284 "parser.y"
+    {(yyval.node) = mknode2(&node_muleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 267:
+    case 310:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2904 "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 3285 "parser.y"
+    {(yyval.node) = mknode2(&node_modeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 268:
+    case 311:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2915 "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 3286 "parser.y"
+    {(yyval.node) = mknode2(&node_shleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 269:
+    case 312:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2924 "parser.y"
-    {
-    (yyval.value).c = code_new();
-    (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc);
-    (yyval.value).c = abc_newarray((yyval.value).c, (yyvsp[(2) - (3)].value_list).len);
-    (yyval.value).t = registry_getarrayclass();
-}
+#line 3287 "parser.y"
+    {(yyval.node) = mknode2(&node_shreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 270:
+    case 313:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2931 "parser.y"
-    {(yyval.value_list).cc=0;(yyval.value_list).len=0;}
+#line 3288 "parser.y"
+    {(yyval.node) = mknode2(&node_ushreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 271:
+    case 314:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2932 "parser.y"
-    {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);}
+#line 3289 "parser.y"
+    { (yyval.node) = mknode2(&node_diveq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 272:
+    case 315:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2934 "parser.y"
-    {
-    (yyval.value_list).cc = 0;
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c);
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (3)].value).c);
-    (yyval.value_list).len = 2;
-}
+#line 3290 "parser.y"
+    { (yyval.node) = mknode2(&node_bitoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 273:
+    case 316:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2940 "parser.y"
-    {
-    (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc;
-    (yyval.value_list).len = (yyvsp[(1) - (5)].value_list).len+2;
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (5)].value).c);
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(5) - (5)].value).c);
-}
+#line 3291 "parser.y"
+    { (yyval.node) = mknode2(&node_bitxoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 274:
+    case 317:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2949 "parser.y"
-    {
-    (yyval.value).c = code_new();
-    (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc);
-    (yyval.value).c = abc_newobject((yyval.value).c, (yyvsp[(2) - (3)].value_list).len/2);
-    (yyval.value).t = registry_getobjectclass();
-}
+#line 3292 "parser.y"
+    { (yyval.node) = mknode2(&node_bitandeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 275:
+    case 318:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2956 "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 3293 "parser.y"
+    { (yyval.node) = mknode2(&node_pluseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 276:
+    case 319:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2968 "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 3294 "parser.y"
+    { (yyval.node) = mknode2(&node_minuseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 277:
+    case 320:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2974 "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 3295 "parser.y"
+    { (yyval.node) = mknode2(&node_assign, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 278:
+    case 321:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2980 "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 3296 "parser.y"
+    { (yyval.node) = mknode3(&node_tenary, (yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));}
     }
     break;
 
 
   
-    case 279:
+    case 322:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2986 "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 3298 "parser.y"
+    { (yyval.node) = mknode1(&node_rplusplus, (yyvsp[(1) - (2)].node));}
     }
     break;
 
 
   
-    case 280:
+    case 323:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2992 "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 3299 "parser.y"
+    { (yyval.node) = mknode1(&node_rminusminus, (yyvsp[(1) - (2)].node));}
     }
     break;
 
 
   
-    case 281:
+    case 324:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2998 "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 3300 "parser.y"
+    {(yyval.node) = mknode1(&node_lplusplus, (yyvsp[(2) - (2)].node)); }
     }
     break;
 
 
   
-    case 282:
+    case 325:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3004 "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 3301 "parser.y"
+    {(yyval.node) = mknode1(&node_lminusminus, (yyvsp[(2) - (2)].node)); }
     }
     break;
 
 
   
-    case 283:
+    case 326:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3017 "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 3304 "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 284:
+    case 327:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3028 "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 3318 "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 285:
+    case 328:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3035 "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[(3) - (5)].value).t, (yyval.value).t);
-              (yyval.value).c = j2->branch = abc_label((yyval.value).c);
-            }
+#line 3326 "parser.y"
+    {PASS12 new_state();state->xmlfilter=1;}
     }
     break;
 
 
   
-    case 286:
+    case 329:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3048 "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 3326 "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 287:
+    case 330:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3075 "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 3380 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}
     }
     break;
 
 
   
-    case 288:
+    case 331:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3089 "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 3381 "parser.y"
+    {(yyval.id)=(char*)(yyvsp[(1) - (1)].id);}
     }
     break;
 
 
   
-    case 289:
+    case 333:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3103 "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 3383 "parser.y"
+    {(yyval.id)="*";}
     }
     break;
 
 
   
-    case 290:
+    case 334:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3118 "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(t, (yyvsp[(3) - (3)].id), 1);
-              namespace_t ns = {f->access, ""};
-              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 3385 "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 291:
+    case 335:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3132 "parser.y"
+#line 3403 "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) - (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 292:
+    case 336:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3139 "parser.y"
+#line 3410 "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) - (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 293:
+    case 337:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3146 "parser.y"
+#line 3421 "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_getproperty2(v.c, &m);
+    v.t = TYPE_STRING;
+    (yyval.node) = mkcodenode(v);
+}
     }
     break;
 
 
   
-    case 294:
+    case 338:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3153 "parser.y"
+#line 3428 "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) - (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 295:
+    case 339:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3160 "parser.y"
+#line 3435 "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_getproperty2(v.c, &m);
+    v.t = TYPE_STRING;
+    (yyval.node) = mkcodenode(v);
+}
     }
     break;
 
 
   
-    case 296:
+    case 340:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3172 "parser.y"
-    {(yyval.value).c = (yyvsp[(1) - (3)].value).c;
-             classinfo_t*t = (yyvsp[(1) - (3)].value).t;
-             char is_static = 0;
-             if(TYPE_IS_CLASS(t) && t->data) {
-                 t = t->data;
-                 is_static = 1;
-             }
-             if(t) {
-                 memberinfo_t*f = registry_findmember(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 {
-                     MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id));
-                     (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
-                 }
-                 /* determine type */
-                 (yyval.value).t = slotinfo_gettype((slotinfo_t*)f);
-                 if(!(yyval.value).t)
-                    (yyval.value).c = abc_coerce_a((yyval.value).c);
-             } 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 */
-                 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();
-             }
-            }
+#line 3445 "parser.y"
+    {
+    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 297:
+    case 341:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3205 "parser.y"
+#line 3456 "parser.y"
     {
-    (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((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;
-    }
-
-    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(state->cls->info, (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;
+    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(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);
         }
-        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);
+        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);
-            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);
+            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);
-            break;
         }
-    } 
-    
-    /* look at actual classes, in the current package and imported */
-    if((a = find_class((yyvsp[(1) - (1)].id)))) {
-        if(a->access == ACCESS_PACKAGEINTERNAL &&
-           strcmp(a->package, state->package) &&
-           strcmp(a->package, internal_filename_package)
-           )
-           syntaxerror("Can't access internal %s %s in package '%s' from package '%s'",
-                infotypename(a),(yyvsp[(1) - (1)].id), a->package, state->package);
-
-        if(a->kind != INFOTYPE_CLASS) {
-            MULTINAME(m, a);
-            (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m);
-            (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
-            if(a->kind == INFOTYPE_METHOD) {
-                methodinfo_t*f = (methodinfo_t*)a;
-                (yyval.value).t = TYPE_FUNCTION(f);
-            } else {
-                varinfo_t*v = (varinfo_t*)a;
-                (yyval.value).t = v->type;
-            }
+        /* determine type */
+        (yyval.value).t = slotinfo_gettype((slotinfo_t*)f);
+        if(!(yyval.value).t)
+           (yyval.value).c = abc_coerce_a((yyval.value).c);
+        
+    } 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));
+
+        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 {
-            classinfo_t*c = (classinfo_t*)a;
-            if(c->slot) {
-                (yyval.value).c = abc_getglobalscope((yyval.value).c);
-                (yyval.value).c = abc_getslot((yyval.value).c, c->slot);
-            } else {
-                MULTINAME(m, c);
-                (yyval.value).c = abc_getlex2((yyval.value).c, &m);
-            }
-            (yyval.value).t = TYPE_CLASS(c);
+            syntaxerror("couldn't resolve %s", package2);
         }
-        break;
+    } 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 = TYPE_ANY;
+    }
+}
     }
+    break;
 
-    /* unknown object, let the avm2 resolve it */
-    if(1) {
-        as3_softwarning("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);
+  
+    case 342:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3634 "parser.y"
+    {
+    PASS1
+    /* Queue unresolved identifiers for checking against the parent
+       function's variables.
+       We consider everything which is not a local variable "unresolved".
+       This encompasses class names, members of the surrounding class
+       etc. which is *correct* because local variables of the parent function
+       would shadow those.
+       */
+
+    if(!find_variable(state, (yyvsp[(1) - (1)].id))) {
+        if(state->method->inner) {
+            unknown_variable((yyvsp[(1) - (1)].id));
+        }
+        /* let the compiler know that it might want to check the current directory/package
+           for this identifier- maybe there's a file $1.as defining $1. */
+        as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id));
     }
+   
+    (yyval.node) = 0;
+    PASS2
+
+    (yyval.node) = resolve_identifier((yyvsp[(1) - (1)].id));
 }
     }
     break;
 
 
   
-    case 298:
+    case 343:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3307 "parser.y"
-    {(yyval.code)=0;}
+#line 3670 "parser.y"
+    {
+    PASS12
+    NEW(namespace_decl_t,n);
+    n->name = (yyvsp[(2) - (2)].id);
+    n->url = (yyvsp[(2) - (2)].id);
+    (yyval.namespace_decl)=n;
+}
     }
     break;
 
 
   
-    case 299:
+    case 344:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3308 "parser.y"
-    {(yyval.code)=0;}
+#line 3677 "parser.y"
+    {
+    PASS12
+    NEW(namespace_decl_t,n);
+    n->name = (yyvsp[(2) - (4)].id);
+    n->url = (yyvsp[(4) - (4)].id);
+    (yyval.namespace_decl)=n;
+}
     }
     break;
 
 
   
-    case 300:
+    case 345:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3309 "parser.y"
-    {(yyval.code)=0;}
+#line 3684 "parser.y"
+    {
+    PASS12
+    NEW(namespace_decl_t,n);
+    n->name = (yyvsp[(2) - (4)].id);
+    n->url = (yyvsp[(4) - (4)].str).str;
+    (yyval.namespace_decl)=n;
+}
     }
     break;
 
 
   
-    case 301:
+    case 346:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3691 "parser.y"
+    {
+    PASS12
+    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;
+}
+    }
+    break;
+
+
+  
+    case 347:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3311 "parser.y"
+#line 3713 "parser.y"
     {
     PASS12
-    tokenizer_register_namespace((yyvsp[(3) - (3)].id));
+    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;
 }
     }
@@ -7675,7 +8688,7 @@ yyreduce:
 
 
 /* Line 1464 of skeleton.m4  */
-#line 7679 "parser.tab.c"
+#line 8692 "parser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);