X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.tab.c;h=3e68d39dd17a49a6031c01adaab23d0b706390db;hb=5a9b4530f6a84ce3666a94605270bddaf43c9ff2;hp=36cc3fcea9b294f3dcbdf169272fbf6e5aa2b7dc;hpb=780e53f414a281c516c153a578638c4f7414434c;p=swftools.git

diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c
index 36cc3fc..3e68d39 100644
--- a/lib/as3/parser.tab.c
+++ b/lib/as3/parser.tab.c
@@ -84,18 +84,21 @@
 #include "abc.h"
 #include "pool.h"
 #include "files.h"
+#include "common.h"
 #include "tokenizer.h"
 #include "registry.h"
 #include "code.h"
 #include "opcodes.h"
 #include "compiler.h"
+#include "expr.h"
+#include "initcode.h"
 
 extern int a3_lex();
 
 
 
 /* Line 198 of skeleton.m4  */
-#line 99 "parser.tab.c"
+#line 102 "parser.tab.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -129,26 +132,26 @@ extern int a3_lex();
      T_EMPTY = 262,
      T_INT = 263,
      T_UINT = 264,
-     T_BYTE = 265,
-     T_SHORT = 266,
-     T_FLOAT = 267,
-     T_FOR = 268,
-     T_WHILE = 269,
-     T_DO = 270,
-     T_SWITCH = 271,
-     KW_IMPLEMENTS = 272,
-     KW_NAMESPACE = 273,
-     KW_PACKAGE = 274,
-     KW_PROTECTED = 275,
-     KW_PUBLIC = 276,
-     KW_PRIVATE = 277,
-     KW_USE = 278,
-     KW_INTERNAL = 279,
-     KW_NEW = 280,
-     KW_NATIVE = 281,
-     KW_FUNCTION = 282,
-     KW_FINALLY = 283,
-     KW_UNDEFINED = 284,
+     T_FLOAT = 265,
+     T_FOR = 266,
+     T_WHILE = 267,
+     T_DO = 268,
+     T_SWITCH = 269,
+     KW_IMPLEMENTS = 270,
+     KW_NAMESPACE = 271,
+     KW_PACKAGE = 272,
+     KW_PROTECTED = 273,
+     KW_ARGUMENTS = 274,
+     KW_PUBLIC = 275,
+     KW_PRIVATE = 276,
+     KW_USE = 277,
+     KW_INTERNAL = 278,
+     KW_NEW = 279,
+     KW_NATIVE = 280,
+     KW_FUNCTION = 281,
+     KW_FINALLY = 282,
+     KW_UNDEFINED = 283,
+     KW_NAN = 284,
      KW_CONTINUE = 285,
      KW_CLASS = 286,
      KW_CONST = 287,
@@ -182,51 +185,54 @@ extern int a3_lex();
      KW_NUMBER = 315,
      KW_STRING = 316,
      KW_DEFAULT = 317,
-     KW_DELETE = 318,
-     KW_IF = 319,
-     KW_ELSE = 320,
-     KW_BREAK = 321,
-     KW_IS = 322,
-     KW_IN = 323,
-     KW_AS = 324,
-     T_DICTSTART = 325,
-     T_EQEQ = 326,
-     T_EQEQEQ = 327,
-     T_NE = 328,
-     T_NEE = 329,
-     T_LE = 330,
-     T_GE = 331,
-     T_ORBY = 332,
-     T_DIVBY = 333,
-     T_MODBY = 334,
-     T_MULBY = 335,
-     T_PLUSBY = 336,
-     T_MINUSBY = 337,
-     T_XORBY = 338,
-     T_SHRBY = 339,
-     T_SHLBY = 340,
-     T_USHRBY = 341,
-     T_OROR = 342,
-     T_ANDAND = 343,
-     T_COLONCOLON = 344,
-     T_MINUSMINUS = 345,
-     T_PLUSPLUS = 346,
-     T_DOTDOT = 347,
-     T_DOTDOTDOT = 348,
-     T_SHL = 349,
-     T_USHR = 350,
-     T_SHR = 351,
-     prec_none = 352,
-     below_semicolon = 353,
-     below_assignment = 354,
-     below_minus = 356,
-     minusminus_prefix = 357,
-     plusplus_prefix = 358,
-     below_curly = 359,
-     new2 = 360,
-     above_identifier = 361,
-     below_else = 362,
-     above_function = 363
+     KW_DEFAULT_XML = 318,
+     KW_DELETE = 319,
+     KW_IF = 320,
+     KW_ELSE = 321,
+     KW_BREAK = 322,
+     KW_IS = 323,
+     KW_IN = 324,
+     KW_AS = 325,
+     T_DICTSTART = 326,
+     T_EQEQ = 327,
+     T_EQEQEQ = 328,
+     T_NE = 329,
+     T_NEE = 330,
+     T_LE = 331,
+     T_GE = 332,
+     T_ORBY = 333,
+     T_DIVBY = 334,
+     T_MODBY = 335,
+     T_MULBY = 336,
+     T_ANDBY = 337,
+     T_PLUSBY = 338,
+     T_MINUSBY = 339,
+     T_XORBY = 340,
+     T_SHRBY = 341,
+     T_SHLBY = 342,
+     T_USHRBY = 343,
+     T_OROR = 344,
+     T_ANDAND = 345,
+     T_COLONCOLON = 346,
+     T_MINUSMINUS = 347,
+     T_PLUSPLUS = 348,
+     T_DOTDOT = 349,
+     T_DOTDOTDOT = 350,
+     T_SHL = 351,
+     T_USHR = 352,
+     T_SHR = 353,
+     prec_none = 354,
+     below_semicolon = 355,
+     below_assignment = 356,
+     below_lt = 357,
+     below_minus = 358,
+     minusminus_prefix = 359,
+     plusplus_prefix = 360,
+     below_curly = 361,
+     new2 = 362,
+     above_identifier = 363,
+     below_else = 364,
+     above_function = 365
    };
 #endif
 
@@ -235,18 +241,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;
@@ -263,6 +270,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;
@@ -271,7 +281,7 @@ tokenunion
 
 
 /* Line 223 of skeleton.m4  */
-#line 275 "parser.tab.c"
+#line 285 "parser.tab.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -282,7 +292,7 @@ tokenunion
 /* Copy the second part of user declarations.  */
 
 /* Line 273 of skeleton.m4  */
-#line 259 "parser.y"
+#line 276 "parser.y"
 
 
 static int a3_error(char*s)
@@ -291,6 +301,13 @@ static int a3_error(char*s)
    return 0; //make gcc happy
 }
 
+static void parsererror(const char*file, int line, const char*f)
+{
+    syntaxerror("internal error in %s, %s:%d", f, file, line);
+}
+
+#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);}
+
 
 static char* concat2(const char* t1, const char* t2)
 {
@@ -318,7 +335,6 @@ static char* concat3(const char* t1, const char* t2, const char* t3)
 typedef struct _import {
     char*package;
 } import_t;
-
 DECLARE_LIST(import);
 
 DECLARE(methodstate);
@@ -328,11 +344,12 @@ typedef struct _classstate {
     /* class data */
     classinfo_t*info;
     abc_class_t*abc;
-   
+
     methodstate_t*init;
     methodstate_t*static_init;
     //code_t*init;
     //code_t*static_init;
+    parsedclass_t*dependencies;
 
     char has_constructor;
 } classstate_t;
@@ -340,10 +357,12 @@ typedef struct _classstate {
 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;
@@ -352,12 +371,18 @@ struct _methodstate {
     char uses_parent_function;
     int uses_slots;
     dict_t*slots;
+    int activation_var;
+
+    int need_arguments;
 
     abc_method_t*abc;
     int var_index; // for inner methods
+    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;
@@ -369,21 +394,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;
@@ -393,18 +431,21 @@ 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 = ((slotinfo_t*)(f))->access; \
-        m##_ns.name = ""; \
+        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; \
@@ -429,13 +470,22 @@ DECLARE_LIST(state);
 static namespace_t ns1 = {ACCESS_PRIVATE, ""};
 static namespace_t ns2 = {ACCESS_PROTECTED, ""};
 static namespace_t ns3 = {ACCESS_PACKAGEINTERNAL, ""};
-static namespace_t ns4 = {ACCESS_PACKAGE, ""};
-static namespace_list_t nl4 = {&ns4,0};
+static namespace_t stdns = {ACCESS_PACKAGE, ""};
+static namespace_list_t nl4 = {&stdns,0};
 static namespace_list_t nl3 = {&ns3,&nl4};
 static namespace_list_t nl2 = {&ns2,&nl3};
 static namespace_list_t nl1 = {&ns1,&nl2};
 static namespace_set_t nopackage_namespace_set = {&nl1};
 
+static dict_t*definitions=0;
+void as3_set_define(const char*c)
+{
+    if(!definitions) 
+        definitions = dict_new();
+    if(!dict_contains(definitions,c))
+        dict_put(definitions,c,0);
+}
+
 static void new_state()
 {
     NEW(state_t, s);
@@ -445,18 +495,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;
     state->new_vars = 0;
-}
-static void state_has_imports()
-{
-    state->wildcard_imports = list_clone(state->wildcard_imports);
-    state->imports = dict_clone(state->imports);
-    state->has_own_imports = 1;
+
+    trie_remember(active_namespaces);
+   
+    if(oldstate)
+        state->active_namespace_urls = list_clone(oldstate->active_namespace_urls);
 }
 
 static void state_destroy(state_t*state)
@@ -469,28 +521,32 @@ static void state_destroy(state_t*state)
         dict_destroy(state->imports);state->imports=0;
     }
     if(state->vars) {
-        int t;
-        for(t=0;t<state->vars->hashsize;t++) {
-            dictentry_t*e =state->vars->slots[t];
-            while(e) {
-                free(e->data);e->data=0;
-                e = e->next;
-            }
-        }
         dict_destroy(state->vars);state->vars=0;
     }
+    if(state->new_vars && state->allvars) {
+        parserassert(!state->old || state->old->allvars != state->allvars);
+        DICT_ITERATE_DATA(state->allvars, void*, data) {
+            free(data);
+        }
+        dict_destroy(state->allvars);
+    }
+    
+    list_free(state->active_namespace_urls)
+    state->active_namespace_urls = 0;
     
     free(state);
 }
 
 static void old_state()
 {
+    trie_rollback(active_namespaces);
+
     if(!state || !state->old)
         syntaxerror("invalid nesting");
     state_t*leaving = state;
     
     state = state->old;
-    
+
     if(as3_pass>1 && leaving->method && leaving->method != state->method && !leaving->method->inner) {
         free(leaving->method);
         leaving->method=0;
@@ -499,13 +555,13 @@ static void old_state()
         free(leaving->cls);
         leaving->cls=0;
     }
-    
+
     state_destroy(leaving);
 }
 
 static code_t* method_header(methodstate_t*m);
 static code_t* wrap_function(code_t*c,code_t*header, code_t*body);
-static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0);
+static void function_initvars(methodstate_t*m, char has_params, params_t*params, int flags, char var0);
 
 
 static char* internal_filename_package = 0;
@@ -514,8 +570,12 @@ void initialize_file(char*filename)
     if(state) {
         syntaxerror("invalid call to initialize_file during parsing of another file");
     }
+    
+    active_namespaces = trie_new();
+
     new_state();
     state->package = internal_filename_package = strdup(filename);
+    state->allvars = dict_new();
     
     global->token2info = dict_lookup(global->file2token2info, 
                                      current_filename // use long version
@@ -528,11 +588,14 @@ void initialize_file(char*filename)
     if(as3_pass==1) {
         state->method = rfx_calloc(sizeof(methodstate_t));
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);
+        state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope
     } else {
         state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);
-        function_initvars(state->method, 0, 0, 1);
-        global->init = abc_initscript(global->file);
-        state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope
+        state->method->variable_count = 0;
+        if(!state->method)
+            syntaxerror("internal error: skewed tokencount");
+        function_initvars(state->method, 0, 0, 0, 1);
+        global->init = 0;
     }
 }
 
@@ -541,12 +604,16 @@ void finish_file()
     if(!state || state->level!=1) {
         syntaxerror("unexpected end of file in pass %d", as3_pass);
     }
-
+    
     if(as3_pass==2) {
+        dict_del(global->file2token2info, current_filename);
         code_t*header = method_header(state->method);
-        code_t*c = wrap_function(header, 0, global->init->method->body->code);
-        global->init->method->body->code = c;
-        free(state->method);state->method=0;
+        //if(global->init->method->body->code || global->init->traits) {
+        if(global->init) {
+            code_t*c = wrap_function(header, 0, global->init->method->body->code);
+            global->init->method->body->code = abc_returnvoid(c);
+            free(state->method);state->method=0;
+        }
     }
 
     //free(state->package);state->package=0; // used in registry
@@ -560,56 +627,30 @@ void initialize_parser()
     global->file->flags &= ~ABCFILE_LAZY;
     global->file2token2info = dict_new();
     global->token2info = 0;
+    global->classinit = abc_initscript(global->file);
 }
 
 void* finish_parser()
 {
     dict_free_all(global->file2token2info, 1, (void*)dict_destroy);
-
     global->token2info=0;
-
-    return global->file;
-}
-
-
-static void xx_scopetest() 
-{
-    /* findpropstrict doesn't just return a scope object- it
-       also makes it "active" somehow. Push local_0 on the
-       scope stack and read it back with findpropstrict, it'll
-       contain properties like "trace". Trying to find the same
-       property on a "vanilla" local_0 yields only a "undefined" */
-    //c = abc_findpropstrict(c, "[package]::trace");
     
-    /*c = abc_getlocal_0(c);
-    c = abc_findpropstrict(c, "[package]::trace");
-    c = abc_coerce_a(c);
-    c = abc_setlocal_1(c);
+    initcode_add_classlist(global->classinit, global->classes);
 
-    c = abc_pushbyte(c, 0);
-    c = abc_setlocal_2(c);
-   
-    code_t*xx = c = abc_label(c);
-    c = abc_findpropstrict(c, "[package]::trace");
-    c = abc_pushstring(c, "prop:");
-    c = abc_hasnext2(c, 1, 2);
-    c = abc_dup(c);
-    c = abc_setlocal_3(c);
-    c = abc_callpropvoid(c, "[package]::trace", 2);
-    c = abc_getlocal_3(c);
-    c = abc_kill(c, 3);
-    c = abc_iftrue(c,xx);*/
+    return global->file;
 }
 
 typedef struct _variable {
     int index;
     classinfo_t*type;
     char init;
+    char is_parameter;
     methodstate_t*is_inner_method;
 } variable_t;
 
 static variable_t* find_variable(state_t*s, char*name)
 {
+    state_t*top = s;
     while(s) {
         variable_t*v = 0;
         v = dict_lookup(s->vars, name);
@@ -617,7 +658,7 @@ static variable_t* find_variable(state_t*s, char*name)
         if(s->new_vars) break;
         s = s->old;
     }
-    return 0;
+    return dict_lookup(top->allvars, name);
 }
 static variable_t* find_slot(state_t*s, const char*name)
 {
@@ -633,26 +674,60 @@ static variable_t* find_variable_safe(state_t*s, char*name)
         syntaxerror("undefined variable: %s", name);
     return v;
 }
+
 static char variable_exists(char*name) 
 {
     return dict_contains(state->vars, name);
 }
-code_t*defaultvalue(code_t*c, classinfo_t*type);
+
+static code_t*defaultvalue(code_t*c, classinfo_t*type)
+{
+    if(TYPE_IS_INT(type)) {
+       c = abc_pushbyte(c, 0);
+    } else if(TYPE_IS_UINT(type)) {
+       c = abc_pushuint(c, 0);
+    } else if(TYPE_IS_FLOAT(type)) {
+       c = abc_pushnan(c);
+    } else if(TYPE_IS_BOOLEAN(type)) {
+       c = abc_pushfalse(c);
+    } else if(TYPE_IS_STRING(type)) {
+       c = abc_pushnull(c);
+       c = abc_coerce_s(c);
+    } else if(!type) {
+       //c = abc_pushundefined(c);
+        syntaxerror("internal error: can't generate default value for * type");
+    } else {
+       c = abc_pushnull(c);
+       MULTINAME(m, type);
+       c = abc_coerce2(c, &m);
+    }
+    return c;
+}
+
+static int alloc_local()
+{
+    return state->method->variable_count++;
+}
 
 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)
+        if(v) {
+            alloc_local(); 
             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 v;
 }
@@ -662,31 +737,30 @@ static int new_variable(const char*name, classinfo_t*type, char init, char maybe
 }
 
 #define TEMPVARNAME "__as3_temp__"
-static int gettempvar()
+int gettempvar()
 {
     variable_t*v = find_variable(state, TEMPVARNAME);
+    int i;
     if(v) 
-        return v->index;
-    return new_variable(TEMPVARNAME, 0, 0, 0);
+        i = v->index;
+    else
+        i = new_variable(TEMPVARNAME, 0, 0, 0);
+    parserassert(i);
+    return i;
 }
 
-code_t* var_block(code_t*body) 
+static code_t* var_block(code_t*body) 
 {
     code_t*c = 0;
     code_t*k = 0;
     int t;
     int num=0;
-    for(t=0;t<state->vars->hashsize;t++) {
-        dictentry_t*e = state->vars->slots[t];
-        while(e) {
-            variable_t*v = (variable_t*)e->data;
-            if(v->type && v->init) {
-                c = defaultvalue(c, v->type);
-                c = abc_setlocal(c, v->index);
-                k = abc_kill(k, v->index); 
-                num++;
-            }
-            e = e->next;
+    DICT_ITERATE_DATA(state->vars, variable_t*, v) {
+        if(v->type && v->init) {
+            c = defaultvalue(c, v->type);
+            c = abc_setlocal(c, v->index);
+            k = abc_kill(k, v->index); 
+            num++;
         }
     }
 
@@ -714,7 +788,7 @@ code_t* var_block(code_t*body)
     return c;
 }
 
-void unknown_variable(char*name) 
+static void unknown_variable(char*name) 
 {
     if(!state->method->unresolved_variables)
         state->method->unresolved_variables = dict_new();
@@ -722,25 +796,37 @@ void unknown_variable(char*name)
         dict_put(state->method->unresolved_variables, name, 0);
 }
 
-#define parserassert(b) {if(!(b)) parsererror(__FILE__, __LINE__,__func__);}
-
-static void parsererror(const char*file, int line, const char*f)
-{
-    syntaxerror("internal error in %s, %s:%d", f, file, line);
-}
-
-   
-static code_t* method_header(methodstate_t*m)
+static code_t* add_scope_code(code_t*c, methodstate_t*m, char init)
 {
-    code_t*c = 0;
-    if(m->uses_slots || (m->late_binding && !m->inner)) {
+    if(m->uses_slots || (m->late_binding && !m->inner)) { //???? especially inner functions need the pushscope
         c = abc_getlocal_0(c);
         c = abc_pushscope(c);
     }
     if(m->uses_slots) {
-        c = abc_newactivation(c);
-        c = abc_pushscope(c);
+        /* FIXME: this alloc_local() causes variable indexes to be
+           different in pass2 than in pass1 */
+        if(!m->activation_var) {
+            m->activation_var = alloc_local();
+        }
+        if(init) {
+            c = abc_newactivation(c);
+            c = abc_dup(c);
+            c = abc_pushscope(c);
+            c = abc_setlocal(c, m->activation_var);
+        } else {
+            c = abc_getlocal(c, m->activation_var);
+            c = abc_pushscope(c);
+        }
     }
+    return c;
+}
+
+static code_t* method_header(methodstate_t*m)
+{
+    code_t*c = 0;
+
+    c = add_scope_code(c, m, 1);
+
     methodstate_list_t*l = m->innerfunctions;
     while(l) {
         parserassert(l->methodstate->abc);
@@ -749,7 +835,7 @@ static code_t* method_header(methodstate_t*m)
             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->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);
@@ -766,6 +852,19 @@ static code_t* method_header(methodstate_t*m)
         c = abc_getlocal_0(c);
         c = abc_constructsuper(c, 0);
     }
+
+    if(m->slots) {
+        /* all parameters that are used by inner functions
+           need to be copied from local to slot */
+        parserassert(m->activation_var);
+        DICT_ITERATE_ITEMS(m->slots,char*,name,variable_t*,v) {
+            if(v->is_parameter) {
+                c = abc_getlocal(c, m->activation_var); 
+                c = abc_getlocal(c, v->index); 
+                c = abc_setslot(c, v->index); 
+            }
+        }
+    }
     list_free(m->innerfunctions);
     m->innerfunctions = 0;
     return c;
@@ -784,20 +883,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();
 }
 
@@ -807,28 +901,64 @@ 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 innerfunctions2vars(methodstate_t*m)
+{
+    methodstate_list_t*l = m->innerfunctions;
+    while(l) {
+        methodstate_t*m = l->methodstate;
+        
+        variable_t* v = new_variable2(m->info->name, TYPE_FUNCTION(m->info), 0, 0);
+        m->var_index = v->index;
+        if(m->is_a_slot)
+            m->slot_index = m->is_a_slot;
+        v->is_inner_method = m;
+        l = l->next;
     }
-    return access;
 }
 
-static void function_initvars(methodstate_t*m, params_t*params, int flags, char var0)
+static void function_initvars(methodstate_t*m, char has_params, params_t*params, int flags, char var0)
 {
     if(var0) {
         int index = -1;
@@ -838,57 +968,84 @@ static void function_initvars(methodstate_t*m, params_t*params, int flags, char
             index = new_variable((flags&FLAG_STATIC)?"class":"this", state->cls?state->cls->info:0, 0, 0);
         else
             index = new_variable("globalscope", 0, 0, 0);
-        if(index)
-            *(int*)0=0;
+        if(index) {
+            printf("pass: %d\n", as3_pass);
+            DICT_ITERATE_ITEMS(state->vars, char*, name, variable_t*, v) {
+                printf("%d) %s\n", v->index, name);
+            }
+            printf("count: %d\n", state->method->variable_count);
+        }
         parserassert(!index);
     }
-    if(m->uses_slots) {
-        /* as variables and slots share the same number, make sure
-           that those variable indices are reserved */
-        m->variable_count = m->uses_slots; 
-    }
 
-    if(params) {
+    if(has_params) {
         param_list_t*p=0;
         for(p=params->list;p;p=p->next) {
-            new_variable(p->param->name, p->param->type, 0, 1);
+            variable_t*v = new_variable2(p->param->name, p->param->type, 0, 1);
+            v->is_parameter = 1;
+        }
+        if(as3_pass==2 && m->need_arguments) {
+            /* arguments can never be used by an innerfunction (the inner functions
+               have their own arguments var), so it's ok to  not initialize this until
+               pass 2. (We don't know whether we need it before, anyway) */
+            variable_t*v = new_variable2("arguments", TYPE_ARRAY, 0, 0);
+            m->need_arguments = v->index;
         }
     }
     
-    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;
-        v->is_inner_method = m;
-        l = l->next;
+    innerfunctions2vars(m);
+    
+    if(as3_pass==2) {
+        m->scope_code = add_scope_code(m->scope_code, m, 0);
+        if(m->slots) {
+            /* exchange unresolved identifiers with the actual objects */
+            DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) {
+                if(v->type && v->type->kind == INFOTYPE_UNRESOLVED) {
+                    classinfo_t*type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type);
+                    if(!type || type->kind != INFOTYPE_CLASS) {
+                        syntaxerror("Couldn't find class %s::%s (%s)", v->type->package, v->type->name, name);
+                    }
+                    v->type = type;
+                }
+            }
+        }
     }
 }
 
 
 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();
     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)) == (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;
@@ -900,8 +1057,10 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo
         state->cls = rfx_calloc(sizeof(classstate_t));
         state->cls->init = rfx_calloc(sizeof(methodstate_t));
         state->cls->static_init = rfx_calloc(sizeof(methodstate_t));
+        state->cls->static_init->is_static=FLAG_STATIC;
+        state->cls->static_init->variable_count=1;
         /* notice: we make no effort to initialize the top variable (local0) here,
-           even though it has special meaning. We just rely on the facat
+           even though it has special meaning. We just rely on the fact
            that pass 1 won't do anything with variables */
         
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->cls);
@@ -916,102 +1075,62 @@ 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->cls = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);
-        
+    
         state->method = state->cls->init;
         parserassert(state->cls && state->cls->info);
        
-        function_initvars(state->cls->init, 0, 0, 1);
-        function_initvars(state->cls->static_init, 0, 0, 0);
+        function_initvars(state->cls->init, 0, 0, 0, 1);
+        function_initvars(state->cls->static_init, 0, 0, 0, 0);
 
         if(extends && (extends->flags & FLAG_FINAL))
             syntaxerror("Can't extend final class '%s'", extends->name);
-
-        /* 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);
+        state->cls->dependencies = parsedclass_new(state->cls->info, state->cls->abc);
+        list_append(global->classes, state->cls->dependencies);
 
         /* flash.display.MovieClip handling */
-
-        if(!as3_globalclass && (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 {
@@ -1021,19 +1140,6 @@ static void startclass(int flags, char*classname, classinfo_t*extends, classinfo
     }
 }
 
-static void setstaticfunction(int x)
-{
-    if(state->cls) {
-        if(x&FLAG_STATIC) {
-            state->method = state->cls->static_init;
-        } else {
-            state->method = state->cls->init;
-        }
-    } else {
-        parserassert(state->method);
-    }
-}
-
 static void endclass()
 {
     if(as3_pass == 2) {
@@ -1059,6 +1165,21 @@ static void endclass()
             code_t*c = method_header(state->cls->static_init);
             m->body->code = wrap_function(c, 0, m->body->code);
         }
+      
+        trait_list_t*trait = state->cls->abc->traits;
+        /* switch all protected members to the protected ns of this class */
+        while(trait) {
+            trait_t*t = trait->trait;
+            if(t->name->ns->access == ACCESS_PROTECTED) {
+                if(!state->cls->abc->protectedNS) {
+                    char*n = concat3(state->cls->info->package, ":", state->cls->info->name);
+                    state->cls->abc->protectedNS = namespace_new_protected(n);
+                    state->cls->abc->flags |= CLASS_PROTECTED_NS;
+                }
+                t->name->ns->name = strdup(state->cls->abc->protectedNS->name);
+            }
+            trait = trait->next;
+        }
     }
 
     old_state();
@@ -1075,11 +1196,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)
@@ -1110,12 +1240,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");
@@ -1125,21 +1258,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
@@ -1148,14 +1281,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);
@@ -1163,24 +1298,31 @@ 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;
 }
 
@@ -1196,10 +1338,12 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type)
 
     new_state();
     state->new_vars = 1;
+    state->allvars = dict_new();
    
     if(as3_pass == 1) {
         state->method = rfx_calloc(sizeof(methodstate_t));
         state->method->inner = 1;
+        state->method->is_static = parent_method->is_static;
         state->method->variable_count = 0;
         state->method->abc = rfx_calloc(sizeof(abc_method_t));
 
@@ -1213,8 +1357,8 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type)
             list_append(parent_method->innerfunctions, state->method);
 
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);
-       
-        function_initvars(state->method, params, 0, 1);
+    
+        function_initvars(state->method, 1, params, 0, 1);
     }
 
     if(as3_pass == 2) {
@@ -1223,11 +1367,11 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type)
         parserassert(state->method);
 
         state->method->info->return_type = return_type;
-        function_initvars(state->method, params, 0, 1);
+        function_initvars(state->method, 1, params, 0, 1);
     }
 }
 
-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) {
@@ -1235,10 +1379,12 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n
     }
     new_state();
     state->new_vars = 1;
-    
+    state->allvars = dict_new();
+
     if(as3_pass == 1) {
         state->method = rfx_calloc(sizeof(methodstate_t));
         state->method->has_super = 0;
+        state->method->is_static = mod->flags&FLAG_STATIC;
 
         if(state->cls) {
             state->method->is_constructor = !strcmp(state->cls->info->name,name);
@@ -1249,10 +1395,9 @@ 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, params, flags, 1);
+        function_initvars(state->method, 1, params, mod->flags, 1);
         
         dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, state->method);
     }
@@ -1263,72 +1408,68 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n
         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(state->method, params, flags, 1);
+        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);
+        innerfunctions2vars(state->method);
 
         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 */
-                        if(find_variable(state, l->key)) {
-                            m->uses_parent_function = 1;
-                            state->method->uses_slots = 1;
-                            dict_put(xvars, l->key, 0);
-                        }
-                        l = l->next;
+                DICT_ITERATE_KEY(d, char*, id) {
+                    /* check parent method's variables */
+                    variable_t*v;
+                    if((v=find_variable(state, id))) {
+                        m->uses_parent_function = 1;
+                        state->method->uses_slots = 1;
+                        dict_put(xvars, id, 0);
                     }
-                    if(l) break;
                 }
-
-                dict_destroy(m->unresolved_variables);
-                m->unresolved_variables = 0;
+                dict_destroy(m->unresolved_variables);m->unresolved_variables = 0;
             }
             ml = ml->next;
         }
+        
         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++;
+                    v->index = i;
                     if(v->is_inner_method) {
-                        v->is_inner_method->is_a_slot = 1;
+                        v->is_inner_method->is_a_slot = i;
                     }
-                    //v->type = 0;
+                    i++;
                     dict_put(state->method->slots, name, v);
                 }
             }
             state->method->uses_slots = i;
             dict_destroy(state->vars);state->vars = 0;
+            parserassert(state->new_vars);
+            dict_destroy(state->allvars);state->allvars = 0;
         }
-        dict_destroy(xvars);
-
         old_state();
         return 0;
     }
@@ -1348,10 +1489,9 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset,
         } else if(state->method->is_constructor) {
             f = abc_class_getconstructor(state->cls->abc, type2);
         } else if(!state->method->is_global) {
-            namespace_t mname_ns = {state->method->info->access, ""};
-            multiname_t mname = {QNAME, &mname_ns, 0, name};
-
-            if(flags&FLAG_STATIC)
+            namespace_t ns = modifiers2access(mod);
+            multiname_t mname = {QNAME, &ns, 0, name};
+            if(mod->flags&FLAG_STATIC)
                 f = abc_class_staticmethod(state->cls->abc, type2, &mname);
             else
                 f = abc_class_method(state->cls->abc, type2, &mname);
@@ -1361,16 +1501,18 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset,
             multiname_t mname = {QNAME, &mname_ns, 0, name};
 
             f = abc_method_new(global->file, type2, 1);
+            if(!global->init) global->init = abc_initscript(global->file);
             trait_t*t = trait_new_method(&global->init->traits, multiname_clone(&mname), f);
             //abc_code_t*c = global->init->method->body->code;
         }
         //flash doesn't seem to allow us to access function slots
         //state->method->info->slot = slot;
 
-        if(flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE;
+        if(mod && mod->flags&FLAG_OVERRIDE) f->trait->attributes |= TRAIT_ATTR_OVERRIDE;
         if(getset == KW_GET) f->trait->kind = TRAIT_GETTER;
         if(getset == KW_SET) f->trait->kind = TRAIT_SETTER;
         if(params->varargs) f->flags |= METHOD_NEED_REST;
+        if(state->method->need_arguments) f->flags |= METHOD_NEED_ARGUMENTS;
 
         char opt=0;
         param_list_t*p=0;
@@ -1384,7 +1526,7 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset,
                 check_constant_against_type(p->param->type, p->param->value);
                 opt=1;list_append(f->optional_parameters, p->param->value);
             } else if(opt) {
-                syntaxerror("non-optional parameter not allowed after optional parameters");
+                syntaxerror("function %s: non-optional parameter not allowed after optional parameters", name);
             }
         }
         if(state->method->slots) {
@@ -1400,6 +1542,11 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset,
 
         check_code_for_break(body);
 
+        /* 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;
@@ -1415,11 +1562,6 @@ static abc_method_t* endfunction(token_t*ns, int flags, enum yytokentype getset,
     return 0;
 }
 
-char is_subtype_of(classinfo_t*type, classinfo_t*supertype)
-{
-    return 1; // FIXME
-}
-
 void breakjumpsto(code_t*c, char*name, code_t*jump) 
 {
     while(c) {
@@ -1447,29 +1589,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)
@@ -1487,15 +1606,35 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to)
     if((TYPE_IS_NUMBER(from) || TYPE_IS_UINT(from) || TYPE_IS_INT(from)) &&
        (TYPE_IS_NUMBER(to) || TYPE_IS_UINT(to) || TYPE_IS_INT(to))) {
         // allow conversion between number types
+        if(TYPE_IS_UINT(to))
+            return abc_convert_u(c);
+        else if(TYPE_IS_INT(to))
+            return abc_convert_i(c);
+        else if(TYPE_IS_NUMBER(to))
+            return abc_convert_d(c);
         return abc_coerce2(c, &m);
     }
-    //printf("%s.%s\n", from.package, from.name);
-    //printf("%s.%s\n", to.package, to.name);
+
+    if(TYPE_IS_XMLLIST(to) && TYPE_IS_XML(from))
+        return c;
+
+    if(TYPE_IS_BOOLEAN(to))
+        return abc_convert_b(c);
+    if(TYPE_IS_STRING(to))
+        return abc_convert_s(c);
+    if(TYPE_IS_OBJECT(to))
+        return abc_coerce2(c, &m);
+    if(TYPE_IS_OBJECT(from) && TYPE_IS_XMLLIST(to))
+        return abc_coerce2(c, &m);
+    if(TYPE_IS_OBJECT(from) && TYPE_IS_ARRAY(to))
+        return abc_coerce2(c, &m);
 
     classinfo_t*supertype = from;
     while(supertype) {
         if(supertype == to) {
-             // target type is one of from's superclasses
+             /* target type is one of from's superclasses.
+                (not sure we need this coerce - as far as the verifier
+                 is concerned, object==object (i think) */
              return abc_coerce2(c, &m);
         }
         int t=0;
@@ -1516,29 +1655,21 @@ code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to)
         return c;
 
     as3_error("can't convert type %s%s%s to %s%s%s", 
-        from->package, from->package?".":"", from->name, 
-        to->package, to->package?".":"", to->name);
+        from->package, from->package[0]?".":"", from->name, 
+        to->package, to->package[0]?".":"", to->name);
+
     return c;
 }
-
-code_t*defaultvalue(code_t*c, classinfo_t*type)
+code_t* coerce_to_type(code_t*c, classinfo_t*t)
 {
-    if(TYPE_IS_INT(type)) {
-       c = abc_pushbyte(c, 0);
-    } else if(TYPE_IS_UINT(type)) {
-       c = abc_pushuint(c, 0);
-    } else if(TYPE_IS_FLOAT(type)) {
-       c = abc_pushnan(c);
-    } else if(TYPE_IS_BOOLEAN(type)) {
-       c = abc_pushfalse(c);
-    } else if(!type) {
-       //c = abc_pushundefined(c);
+    if(!t) {
+        return abc_coerce_a(c);
+    } else if(TYPE_IS_STRING(t)) {
+        return abc_coerce_s(c);
     } else {
-       c = abc_pushnull(c);
-       MULTINAME(m, type);
-       c = abc_coerce2(c, &m);
+        MULTINAME(m, t);
+        return abc_coerce2(c, &m);
     }
-    return c;
 }
 
 char is_pushundefined(code_t*c)
@@ -1546,7 +1677,37 @@ 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;
 
@@ -1583,173 +1744,53 @@ 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;
+    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 {
-            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
+            varinfo_t*v = (varinfo_t*)a;
+            x.t = v->type;
         }
-        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;
+        return x;
     } else {
-        code_dump(r);
-        syntaxerror("illegal lvalue: can't assign a value to this expression");
-    }
-    code_t* c = 0;
-    
-    int temp = -1;
-    if(!justassign) {
-        if(use_temp_var) {
-            /* with getproperty/getslot, we have to be extra careful not
-               to execute the read code twice, as it might have side-effects
-               (e.g. if the property is in fact a setter/getter combination)
-
-               So read the value, modify it, and write it again,
-               using prefix only once and making sure (by using a temporary
-               register) that the return value is what we just wrote */
-            temp = gettempvar();
-            c = code_append(c, prefix);
-            c = code_append(c, r);
-            if(readbefore) {
-                c = abc_dup(c);
-                c = abc_setlocal(c, temp);
-            }
-            c = code_append(c, middlepart);
-            if(!readbefore) {
-                c = abc_dup(c);
-                c = abc_setlocal(c, temp);
-            }
-            c = code_append(c, write);
-            c = abc_getlocal(c, temp);
-            c = abc_kill(c, temp);
-        } else {
-            /* if we're allowed to execute the read code twice *and*
-               the middlepart doesn't modify the code, things are easier.
-            */
-            code_t* r2 = code_dup(r);
-            //c = code_append(c, prefix);
-            parserassert(!prefix);
-            c = code_append(c, r);
-            c = code_append(c, middlepart);
-            c = code_append(c, write);
-            c = code_append(c, r2);
+        if(state->cls && state->method == state->cls->static_init) {
+            /* we're in the static initializer. 
+               record the fact that we're using this class here */
+            parsedclass_add_dependency(state->cls->dependencies, (classinfo_t*)a);
         }
-    } 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)
@@ -1765,7 +1806,6 @@ char is_break_or_jump(code_t*c)
     return 0;
 }
 
-
 #define IS_FINALLY_TARGET(op) \
         ((op) == OPCODE___CONTINUE__ || \
          (op) == OPCODE___BREAK__ || \
@@ -1873,10 +1913,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);
     }
 }
@@ -1884,13 +1924,247 @@ 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 1894 "parser.tab.c"
+#line 1935 "parser.tab.c"
+/* Unqualified %code blocks.  */
+
+/* Line 274 of skeleton.m4  */
+#line 2017 "parser.y"
+
+    char is_subtype_of(classinfo_t*type, classinfo_t*supertype)
+    {
+        return 1; // FIXME
+    }
+
+
+/* Line 274 of skeleton.m4  */
+#line 2468 "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 2607 "parser.y"
+
+    static int slotstate_varconst = 0;
+    static modifiers_t*slotstate_flags = 0;
+    static void setslotstate(modifiers_t* flags, int varconst)
+    {
+        slotstate_varconst = varconst;
+        slotstate_flags = flags;
+        if(state->cls) {
+            if(flags) {
+                if(flags->flags&FLAG_STATIC) {
+                    state->method = state->cls->static_init;
+                } else {
+                    state->method = state->cls->init;
+                }
+            } else {
+                // reset to "default" state (all in class code is static by default) */
+                state->method = state->cls->static_init;
+            }
+        } else {
+            parserassert(state->method);
+        }
+    }
+    static trait_t* add_abc_slot(modifiers_t* modifiers, const char*name, multiname_t*m, code_t***c)
+    {
+        int flags = modifiers->flags;
+        namespace_t ns = modifiers2access(modifiers);
+
+        /* slot name */
+        multiname_t mname = {QNAME, &ns, 0, name};
+      
+        trait_list_t**traits;
+        code_t**code=0;
+        if(!state->cls) {
+            // global variable
+            if(!global->init) global->init = abc_initscript(global->file);
+            ns.name = state->package;
+            traits = &global->init->traits;
+            code = &global->init->method->body->code;
+        } else if(flags&FLAG_STATIC) {
+            // static variable
+            traits = &state->cls->abc->static_traits;
+            code = &state->cls->static_init->header;
+        } else {
+            // instance variable
+            traits = &state->cls->abc->traits;
+            code = &state->cls->init->header;
+            
+            if(ns.access == ACCESS_PROTECTED) {
+                ns.name = concat3(state->cls->info->package,":",state->cls->info->name);
+            }
+        }
+        if(c)
+            *c = code;
+        if(m) 
+            *m = *multiname_clone(&mname);
+            
+        return trait_new_member(traits, 0, multiname_clone(&mname), 0);
+    }
+
+
+/* Line 274 of skeleton.m4  */
+#line 2787 "parser.y"
+
+    static int xml_level = 0;
+
+
+/* Line 274 of skeleton.m4  */
+#line 3566 "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 3708 "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 2168 "parser.tab.c"
 
 #ifdef short
 # undef short
@@ -2103,22 +2377,22 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  145
+#define YYFINAL  163
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2994
+#define YYLAST   3351
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  134
+#define YYNTOKENS  136
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  110
+#define YYNNTS  135
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  303
+#define YYNRULES  353
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  514
+#define YYNSTATES  598
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   363
+#define YYMAXUTOK   365
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -2129,16 +2403,16 @@ static const yytype_uint8 yytranslate[] =
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   118,     2,     2,     2,   116,   108,     2,
-     122,   133,   115,   113,   100,   112,   127,   114,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   105,    99,
-     109,   102,   110,   104,   128,     2,     2,     2,     2,     2,
+       2,     2,     2,   120,     2,     2,     2,   118,   109,     2,
+     124,   135,   117,   115,   102,   114,   129,   116,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,   106,   101,
+     111,   104,   112,   105,   130,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   124,     2,   125,   107,     2,     2,     2,     2,     2,
+       2,   126,     2,   127,   108,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   126,   106,   132,   117,     2,     2,     2,
+       2,     2,     2,   128,   107,   134,   119,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -2161,8 +2435,8 @@ static const yytype_uint8 yytranslate[] =
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,   101,   103,   111,   119,   120,   121,
-     123,   129,   130,   131
+      95,    96,    97,    98,    99,   100,   103,   110,   113,   121,
+     122,   123,   125,   131,   132,   133
 };
 
 #if YYDEBUG
@@ -2174,165 +2448,192 @@ 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,    91,    94,    96,    98,   100,   102,   104,   106,
-     108,   113,   115,   118,   120,   122,   126,   129,   130,   133,
-     136,   138,   142,   146,   147,   150,   151,   159,   160,   162,
-     164,   168,   170,   173,   177,   186,   193,   194,   201,   202,
-     210,   212,   215,   217,   220,   221,   223,   225,   228,   230,
-     233,   238,   242,   243,   252,   253,   263,   264,   270,   272,
-     275,   277,   280,   282,   283,   290,   293,   295,   301,   303,
-     305,   309,   311,   312,   319,   320,   326,   329,   334,   335,
-     337,   339,   342,   344,   346,   348,   350,   352,   354,   356,
-     358,   360,   362,   363,   366,   367,   370,   371,   374,   375,
-     385,   386,   395,   396,   398,   400,   403,   405,   410,   412,
-     414,   416,   417,   419,   421,   424,   426,   429,   438,   440,
-     442,   443,   450,   451,   454,   456,   458,   460,   462,   464,
-     466,   468,   470,   472,   473,   475,   478,   483,   487,   489,
-     494,   497,   499,   501,   502,   503,   516,   518,   519,   520,
-     531,   533,   537,   539,   541,   543,   547,   549,   551,   553,
-     556,   557,   558,   562,   563,   565,   567,   569,   572,   575,
-     576,   581,   586,   591,   594,   596,   599,   601,   603,   607,
-     609,   611,   613,   615,   617,   619,   621,   623,   625,   627,
-     629,   631,   633,   635,   637,   639,   641,   643,   647,   651,
-     655,   659,   663,   667,   671,   675,   679,   683,   686,   689,
-     693,   697,   701,   705,   709,   713,   717,   721,   725,   729,
-     733,   737,   741,   745,   749,   754,   757,   759,   763,   766,
-     771,   775,   776,   778,   782,   788,   792,   796,   800,   804,
-     808,   812,   816,   820,   824,   828,   832,   836,   842,   845,
-     848,   851,   854,   858,   861,   866,   872,   876,   882,   886,
-     888,   892,   898,   904
+      85,    87,    89,    91,    95,    98,   100,   102,   104,   106,
+     108,   110,   112,   117,   120,   122,   124,   128,   131,   132,
+     135,   138,   140,   144,   148,   149,   152,   153,   161,   162,
+     164,   166,   170,   172,   175,   179,   188,   195,   196,   203,
+     204,   212,   214,   217,   219,   222,   223,   225,   227,   230,
+     232,   235,   240,   244,   245,   254,   255,   265,   266,   272,
+     274,   277,   279,   282,   284,   285,   292,   295,   297,   302,
+     305,   307,   309,   311,   313,   315,   319,   321,   322,   329,
+     330,   336,   339,   342,   347,   348,   350,   352,   355,   357,
+     359,   361,   363,   365,   367,   369,   371,   373,   375,   376,
+     379,   380,   383,   384,   387,   388,   398,   399,   408,   409,
+     411,   413,   416,   418,   423,   425,   427,   429,   430,   432,
+     434,   437,   439,   442,   451,   453,   455,   456,   461,   463,
+     467,   471,   472,   475,   477,   479,   481,   483,   485,   487,
+     489,   491,   493,   495,   497,   499,   500,   501,   506,   507,
+     512,   513,   516,   519,   522,   525,   529,   531,   533,   544,
+     551,   563,   564,   566,   568,   571,   573,   577,   581,   585,
+     589,   590,   592,   595,   600,   604,   606,   611,   614,   616,
+     618,   619,   620,   633,   635,   636,   637,   648,   650,   654,
+     656,   658,   660,   664,   666,   668,   670,   673,   674,   675,
+     679,   680,   682,   684,   686,   689,   692,   693,   698,   703,
+     708,   711,   713,   716,   718,   720,   722,   726,   728,   732,
+     733,   735,   737,   739,   741,   743,   745,   749,   755,   757,
+     759,   761,   763,   765,   767,   769,   771,   773,   775,   779,
+     783,   787,   791,   795,   799,   803,   807,   811,   815,   819,
+     823,   826,   829,   833,   837,   841,   845,   849,   853,   857,
+     861,   865,   869,   873,   877,   881,   885,   889,   892,   895,
+     897,   901,   904,   909,   913,   917,   921,   925,   929,   933,
+     937,   941,   945,   949,   953,   957,   963,   966,   969,   972,
+     975,   979,   982,   983,   990,   992,   994,   996,   998,  1000,
+    1006,  1010,  1016,  1021,  1026,  1033,  1040,  1044,  1046,  1049,
+    1054,  1059,  1062,  1067
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     135,     0,    -1,   136,    -1,    -1,   137,    -1,   138,    -1,
-     137,   138,    -1,   185,    -1,   197,    -1,   195,    -1,   214,
-      -1,   206,    -1,   147,    -1,   148,   126,   136,   132,    -1,
-      99,    -1,    -1,   140,    -1,   141,    -1,   140,   141,    -1,
-     197,    -1,   195,    -1,   214,    -1,   206,    -1,   147,    -1,
-     148,   126,   139,   132,    -1,    99,    -1,   143,    -1,    -1,
-     143,   145,    -1,   145,    -1,   188,    -1,   159,    -1,   160,
-      -1,   161,    -1,   163,    -1,   171,    -1,   154,    -1,   182,
-      -1,   179,    -1,   236,    -1,   243,    -1,   126,   143,   132,
-      -1,   126,   132,    -1,    99,    -1,   144,    -1,   150,    -1,
-     165,    -1,   166,    -1,   233,    -1,   181,    -1,   148,   126,
-     143,   132,    -1,   242,    -1,   145,    99,    -1,   145,    -1,
-     144,    -1,     3,    89,     3,    -1,   102,   234,    -1,    -1,
-      46,   151,    -1,    32,   151,    -1,   152,    -1,   151,   100,
-     152,    -1,     3,   224,   149,    -1,    -1,    65,   146,    -1,
-      -1,    64,   122,   155,   235,   133,   146,   153,    -1,    -1,
-     150,    -1,   236,    -1,    46,     3,   224,    -1,     3,    -1,
-      13,   122,    -1,    13,    50,   122,    -1,   158,   156,    99,
-     235,    99,   236,   133,   146,    -1,   158,   157,    68,   235,
-     133,   146,    -1,    -1,    14,   122,   162,   235,   133,   146,
-      -1,    -1,    15,   164,   146,    14,   122,   235,   133,    -1,
-      66,    -1,    66,     3,    -1,    30,    -1,    30,     3,    -1,
-      -1,   168,    -1,   170,    -1,   168,   170,    -1,   169,    -1,
-     168,   169,    -1,    34,   237,   105,   142,    -1,    62,   105,
-     142,    -1,    -1,    16,   122,   172,   237,   133,   126,   167,
-     132,    -1,    -1,    33,   122,     3,   224,   133,   174,   126,
-     142,   132,    -1,    -1,    28,   126,   176,   142,   132,    -1,
-     173,    -1,   177,   173,    -1,   177,    -1,   177,   175,    -1,
-     175,    -1,    -1,    52,   126,   180,   142,   132,   178,    -1,
-      37,   235,    -1,    37,    -1,    39,   122,   235,   133,   146,
-      -1,     3,    -1,    19,    -1,   184,   127,   183,    -1,   183,
-      -1,    -1,    19,   184,   126,   186,   139,   132,    -1,    -1,
-      19,   126,   187,   139,   132,    -1,    41,   220,    -1,    41,
-     184,   127,   115,    -1,    -1,   190,    -1,   191,    -1,   190,
-     191,    -1,    21,    -1,    22,    -1,    20,    -1,    38,    -1,
-      47,    -1,    49,    -1,    48,    -1,    26,    -1,    24,    -1,
-       4,    -1,    -1,    54,   221,    -1,    -1,    54,   222,    -1,
-      -1,    17,   222,    -1,    -1,   189,    31,     3,   192,   194,
-     126,   196,   199,   132,    -1,    -1,   189,    44,     3,   193,
-     126,   198,   202,   132,    -1,    -1,   200,    -1,   201,    -1,
-     200,   201,    -1,    99,    -1,   148,   126,   199,   132,    -1,
-     206,    -1,   214,    -1,   144,    -1,    -1,   203,    -1,   204,
-      -1,   203,   204,    -1,    99,    -1,    46,     3,    -1,   189,
-      27,   213,     3,   122,   210,   133,   224,    -1,    46,    -1,
-      32,    -1,    -1,   189,   205,     3,   207,   224,   149,    -1,
-      -1,   102,   209,    -1,    10,    -1,     8,    -1,     9,    -1,
-      12,    -1,     5,    -1,    56,    -1,    55,    -1,    45,    -1,
-       3,    -1,    -1,   211,    -1,    93,   212,    -1,   211,   100,
-      93,   212,    -1,   211,   100,   212,    -1,   212,    -1,     3,
-     105,   223,   208,    -1,     3,   208,    -1,    51,    -1,    35,
-      -1,    -1,    -1,   189,    27,   213,     3,   122,   210,   133,
-     224,   126,   215,   142,   132,    -1,     3,    -1,    -1,    -1,
-      27,   216,   122,   210,   133,   224,   126,   218,   142,   132,
-      -1,     3,    -1,   184,   127,     3,    -1,   220,    -1,   219,
-      -1,   221,    -1,   222,   100,   221,    -1,   221,    -1,   115,
-      -1,    36,    -1,   105,   223,    -1,    -1,    -1,   122,   226,
-     133,    -1,    -1,   227,    -1,   228,    -1,   234,    -1,   227,
-     100,    -1,   228,   234,    -1,    -1,    25,   237,   229,   225,
-      -1,   237,   122,   226,   133,    -1,    53,   122,   226,   133,
-      -1,    63,   237,    -1,    42,    -1,    42,   235,    -1,   237,
-      -1,   237,    -1,   235,   100,   237,    -1,   235,    -1,   217,
-      -1,   238,    -1,   241,    -1,   230,    -1,   232,    -1,   231,
-      -1,     6,    -1,    10,    -1,    11,    -1,     8,    -1,     9,
-      -1,    12,    -1,     5,    -1,    29,    -1,    56,    -1,    55,
-      -1,    45,    -1,   237,   109,   237,    -1,   237,   110,   237,
-      -1,   237,    75,   237,    -1,   237,    76,   237,    -1,   237,
-      71,   237,    -1,   237,    72,   237,    -1,   237,    74,   237,
-      -1,   237,    73,   237,    -1,   237,    87,   237,    -1,   237,
-      88,   237,    -1,   118,   237,    -1,   117,   237,    -1,   237,
-     108,   237,    -1,   237,   107,   237,    -1,   237,   106,   237,
-      -1,   237,    96,   237,    -1,   237,    95,   237,    -1,   237,
-      94,   237,    -1,   237,   114,   237,    -1,   237,   116,   237,
-      -1,   237,   113,   237,    -1,   237,   112,   237,    -1,   237,
-     115,   237,    -1,   237,    68,   237,    -1,   237,    69,   237,
-      -1,   237,    40,   237,    -1,   237,    67,   237,    -1,    43,
-     122,   237,   133,    -1,    36,   237,    -1,    36,    -1,   122,
-     235,   133,    -1,   112,   237,    -1,   237,   124,   237,   125,
-      -1,   124,   226,   125,    -1,    -1,   240,    -1,   234,   105,
-     234,    -1,   240,   100,   234,   105,   234,    -1,    70,   239,
-     132,    -1,   237,    80,   237,    -1,   237,    79,   237,    -1,
-     237,    85,   237,    -1,   237,    84,   237,    -1,   237,    86,
-     237,    -1,   237,    78,   237,    -1,   237,    77,   237,    -1,
-     237,    83,   237,    -1,   237,    81,   237,    -1,   237,    82,
-     237,    -1,   237,   102,   237,    -1,   237,   104,   237,   105,
-     237,    -1,   237,    91,    -1,   237,    90,    -1,    91,   237,
-      -1,    90,   237,    -1,    53,   127,     3,    -1,   128,     3,
-      -1,   237,   127,   128,     3,    -1,   237,   127,     3,    89,
-       3,    -1,   237,    92,     3,    -1,   237,   127,   122,   237,
-     133,    -1,   237,   127,     3,    -1,     3,    -1,   189,    18,
-       3,    -1,   189,    18,     3,   102,     3,    -1,   189,    18,
-       3,   102,     5,    -1,    23,    18,     3,    -1
+     137,     0,    -1,   138,    -1,    -1,   139,    -1,   140,    -1,
+     139,   140,    -1,   188,    -1,   200,    -1,   198,    -1,   234,
+      -1,   209,    -1,   149,    -1,   150,   128,   138,   134,    -1,
+     101,    -1,    -1,   142,    -1,   143,    -1,   142,   143,    -1,
+     200,    -1,   198,    -1,   234,    -1,   209,    -1,   149,    -1,
+     150,   128,   141,   134,    -1,   101,    -1,   145,    -1,    -1,
+     145,   147,    -1,   147,    -1,   269,    -1,   191,    -1,   161,
+      -1,   162,    -1,   163,    -1,   165,    -1,   173,    -1,   156,
+      -1,   185,    -1,   181,    -1,   257,    -1,   270,    -1,   268,
+      -1,   128,   145,   134,    -1,   128,   134,    -1,   101,    -1,
+     146,    -1,   152,    -1,   167,    -1,   168,    -1,   253,    -1,
+     183,    -1,   150,   128,   145,   134,    -1,   147,   101,    -1,
+     147,    -1,   146,    -1,     3,    91,     3,    -1,   104,   261,
+      -1,    -1,    46,   153,    -1,    32,   153,    -1,   154,    -1,
+     153,   102,   154,    -1,     3,   244,   151,    -1,    -1,    66,
+     148,    -1,    -1,    65,   124,   157,   255,   135,   148,   155,
+      -1,    -1,   152,    -1,   257,    -1,    46,     3,   244,    -1,
+       3,    -1,    11,   124,    -1,    11,    50,   124,    -1,   160,
+     158,   101,   255,   101,   257,   135,   148,    -1,   160,   159,
+      69,   255,   135,   148,    -1,    -1,    12,   124,   164,   255,
+     135,   148,    -1,    -1,    13,   166,   148,    12,   124,   255,
+     135,    -1,    67,    -1,    67,     3,    -1,    30,    -1,    30,
+       3,    -1,    -1,   170,    -1,   172,    -1,   170,   172,    -1,
+     171,    -1,   170,   171,    -1,    34,   261,   106,   144,    -1,
+      62,   106,   144,    -1,    -1,    14,   124,   174,   261,   135,
+     128,   169,   134,    -1,    -1,    33,   124,     3,   244,   135,
+     176,   128,   144,   134,    -1,    -1,    27,   128,   178,   144,
+     134,    -1,   175,    -1,   179,   175,    -1,   179,    -1,   179,
+     177,    -1,   177,    -1,    -1,    52,   128,   182,   144,   134,
+     180,    -1,    37,   255,    -1,    37,    -1,    39,   124,   255,
+     135,    -1,   184,   148,    -1,     3,    -1,    17,    -1,    16,
+      -1,    29,    -1,     4,    -1,   187,   129,   186,    -1,   186,
+      -1,    -1,    17,   187,   128,   189,   141,   134,    -1,    -1,
+      17,   128,   190,   141,   134,    -1,    41,     3,    -1,    41,
+     240,    -1,    41,   187,   129,   117,    -1,    -1,   193,    -1,
+     194,    -1,   193,   194,    -1,    20,    -1,    21,    -1,    18,
+      -1,    38,    -1,    47,    -1,    49,    -1,    48,    -1,    25,
+      -1,    23,    -1,     4,    -1,    -1,    54,   241,    -1,    -1,
+      54,   242,    -1,    -1,    15,   242,    -1,    -1,   192,    31,
+       3,   195,   197,   128,   199,   202,   134,    -1,    -1,   192,
+      44,     3,   196,   128,   201,   205,   134,    -1,    -1,   203,
+      -1,   204,    -1,   203,   204,    -1,   101,    -1,   150,   128,
+     202,   134,    -1,   209,    -1,   234,    -1,   146,    -1,    -1,
+     206,    -1,   207,    -1,   206,   207,    -1,   101,    -1,    46,
+       3,    -1,   192,    26,   233,     3,   124,   230,   135,   244,
+      -1,    46,    -1,    32,    -1,    -1,   192,   208,   210,   211,
+      -1,   212,    -1,   211,   102,   212,    -1,     3,   244,   151,
+      -1,    -1,   104,   261,    -1,     8,    -1,     9,    -1,    10,
+      -1,     5,    -1,    56,    -1,    55,    -1,    45,    -1,    28,
+      -1,    29,    -1,   226,    -1,   111,    -1,   112,    -1,    -1,
+      -1,   128,   261,   220,   134,    -1,    -1,   128,   261,   222,
+     134,    -1,    -1,   223,   219,    -1,   223,     5,    -1,   223,
+     112,    -1,   226,   223,    -1,   224,   226,   223,    -1,     3,
+      -1,   221,    -1,   216,   225,   227,   217,   223,   111,   116,
+     225,   218,   112,    -1,   216,   225,   227,   116,   218,   112,
+      -1,   216,   225,   227,   217,   223,   224,   111,   116,   225,
+     218,   112,    -1,    -1,   228,    -1,   229,    -1,   228,   229,
+      -1,   221,    -1,   221,   104,     5,    -1,   221,   104,   221,
+      -1,     3,   104,   221,    -1,     3,   104,     5,    -1,    -1,
+     231,    -1,    95,   232,    -1,   231,   102,    95,   232,    -1,
+     231,   102,   232,    -1,   232,    -1,     3,   106,   243,   213,
+      -1,     3,   213,    -1,    51,    -1,    35,    -1,    -1,    -1,
+     192,    26,   233,     3,   124,   230,   135,   244,   128,   235,
+     144,   134,    -1,     3,    -1,    -1,    -1,    26,   236,   124,
+     230,   135,   244,   128,   238,   144,   134,    -1,   186,    -1,
+     187,   129,   186,    -1,   240,    -1,   239,    -1,   241,    -1,
+     242,   102,   241,    -1,   241,    -1,   117,    -1,    36,    -1,
+     106,   243,    -1,    -1,    -1,   124,   246,   135,    -1,    -1,
+     247,    -1,   248,    -1,   254,    -1,   247,   102,    -1,   248,
+     254,    -1,    -1,    24,   261,   249,   245,    -1,   261,   124,
+     246,   135,    -1,    53,   124,   246,   135,    -1,    64,   261,
+      -1,    42,    -1,    42,   255,    -1,   261,    -1,   256,    -1,
+     261,    -1,   256,   102,   261,    -1,   261,    -1,   257,   102,
+     261,    -1,    -1,   260,    -1,     3,    -1,     5,    -1,     8,
+      -1,     9,    -1,    10,    -1,   259,   106,   254,    -1,   260,
+     102,   259,   106,   254,    -1,   237,    -1,   265,    -1,   250,
+      -1,   252,    -1,   251,    -1,   266,    -1,   214,    -1,   215,
+      -1,     6,    -1,    19,    -1,   126,   246,   127,    -1,    71,
+     258,   134,    -1,   261,   111,   261,    -1,   261,   112,   261,
+      -1,   261,    76,   261,    -1,   261,    77,   261,    -1,   261,
+      72,   261,    -1,   261,    73,   261,    -1,   261,    75,   261,
+      -1,   261,    74,   261,    -1,   261,    89,   261,    -1,   261,
+      90,   261,    -1,   120,   261,    -1,   119,   261,    -1,   261,
+     109,   261,    -1,   261,   108,   261,    -1,   261,   107,   261,
+      -1,   261,    98,   261,    -1,   261,    97,   261,    -1,   261,
+      96,   261,    -1,   261,   116,   261,    -1,   261,   118,   261,
+      -1,   261,   115,   261,    -1,   261,   114,   261,    -1,   261,
+     117,   261,    -1,   261,    69,   261,    -1,   261,    70,   261,
+      -1,   261,    40,   261,    -1,   261,    68,   261,    -1,    43,
+     261,    -1,    36,   261,    -1,    36,    -1,   124,   256,   135,
+      -1,   114,   261,    -1,   261,   126,   261,   127,    -1,   261,
+      81,   261,    -1,   261,    80,   261,    -1,   261,    87,   261,
+      -1,   261,    86,   261,    -1,   261,    88,   261,    -1,   261,
+      79,   261,    -1,   261,    78,   261,    -1,   261,    85,   261,
+      -1,   261,    82,   261,    -1,   261,    83,   261,    -1,   261,
+      84,   261,    -1,   261,   104,   261,    -1,   261,   105,   261,
+     106,   261,    -1,   261,    93,    -1,   261,    92,    -1,    93,
+     261,    -1,    92,   261,    -1,    53,   129,     3,    -1,   130,
+       3,    -1,    -1,   261,   129,   124,   262,   261,   135,    -1,
+       3,    -1,   117,    -1,     4,    -1,   186,    -1,   117,    -1,
+     261,   129,   263,    91,   264,    -1,   261,    94,   264,    -1,
+     261,   129,   126,   261,   127,    -1,   261,   129,   130,   264,
+      -1,   261,    94,   130,   264,    -1,   261,   129,   130,   126,
+     261,   127,    -1,   261,    94,   130,   126,   261,   127,    -1,
+     261,   129,   264,    -1,     3,    -1,    16,     3,    -1,    16,
+       3,   104,     3,    -1,    16,     3,   104,     5,    -1,   192,
+     267,    -1,    63,    16,   104,   261,    -1,    22,    16,   241,
+      -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,  1869,  1869,  1871,  1871,  1872,  1873,  1875,  1876,  1877,
-    1878,  1879,  1880,  1881,  1882,  1884,  1884,  1885,  1886,  1888,
-    1889,  1890,  1891,  1892,  1893,  1894,  1896,  1897,  1899,  1900,
-    1903,  1904,  1905,  1906,  1907,  1908,  1909,  1910,  1911,  1912,
-    1913,  1914,  1915,  1918,  1919,  1920,  1921,  1922,  1923,  1924,
-    1925,  1927,  1931,  1932,  1936,  1943,  1947,  1948,  1952,  1953,
-    1955,  1956,  1958,  2019,  2020,  2023,  2023,  2042,  2043,  2044,
-    2049,  2053,  2058,  2059,  2061,  2081,  2125,  2125,  2144,  2144,
-    2159,  2162,  2165,  2168,  2172,  2173,  2174,  2175,  2176,  2177,
-    2179,  2190,  2193,  2193,  2222,  2222,  2246,  2246,  2262,  2263,
-    2264,  2265,  2273,  2282,  2282,  2327,  2331,  2342,  2351,  2352,
-    2354,  2355,  2357,  2357,  2359,  2359,  2362,  2377,  2393,  2394,
-    2395,  2396,  2398,  2399,  2400,  2401,  2402,  2403,  2404,  2405,
-    2406,  2407,  2409,  2410,  2412,  2413,  2415,  2416,  2420,  2418,
-    2426,  2424,  2432,  2433,  2434,  2435,  2436,  2437,  2438,  2439,
-    2441,  2447,  2448,  2449,  2450,  2451,  2452,  2455,  2468,  2468,
-    2470,  2470,  2543,  2544,  2546,  2547,  2548,  2549,  2550,  2552,
-    2553,  2554,  2555,  2564,  2568,  2574,  2580,  2588,  2593,  2599,
-    2607,  2615,  2616,  2617,  2620,  2619,  2636,  2637,  2639,  2638,
-    2662,  2670,  2683,  2684,  2686,  2687,  2689,  2690,  2691,  2700,
-    2701,  2705,  2706,  2708,  2709,  2710,  2712,  2716,  2717,  2722,
-    2723,  2759,  2805,  2826,  2847,  2850,  2857,  2858,  2859,  2865,
-    2871,  2873,  2875,  2877,  2879,  2881,  2883,  2900,  2905,  2908,
-    2911,  2914,  2917,  2920,  2923,  2926,  2929,  2933,  2936,  2939,
-    2942,  2945,  2948,  2951,  2954,  2958,  2969,  2987,  2992,  2997,
-    3002,  3007,  3012,  3016,  3020,  3025,  3029,  3033,  3042,  3051,
-    3061,  3066,  3078,  3084,  3089,  3095,  3101,  3105,  3107,  3118,
-    3127,  3134,  3135,  3137,  3143,  3152,  3159,  3171,  3177,  3183,
-    3189,  3195,  3201,  3207,  3213,  3226,  3237,  3244,  3257,  3284,
-    3298,  3312,  3326,  3341,  3348,  3355,  3362,  3369,  3380,  3414,
-    3535,  3536,  3537,  3539
+       0,  1917,  1917,  1919,  1919,  1920,  1921,  1923,  1924,  1925,
+    1926,  1927,  1928,  1929,  1930,  1932,  1932,  1933,  1934,  1936,
+    1937,  1938,  1939,  1940,  1941,  1942,  1944,  1945,  1947,  1950,
+    1953,  1954,  1955,  1956,  1957,  1958,  1959,  1960,  1961,  1962,
+    1963,  1964,  1965,  1966,  1967,  1970,  1971,  1972,  1973,  1974,
+    1975,  1976,  1977,  1989,  1990,  1994,  2005,  2024,  2025,  2027,
+    2028,  2030,  2031,  2033,  2093,  2094,  2097,  2097,  2116,  2117,
+    2118,  2123,  2127,  2132,  2133,  2135,  2155,  2203,  2203,  2222,
+    2222,  2237,  2240,  2243,  2246,  2250,  2251,  2252,  2253,  2254,
+    2255,  2257,  2268,  2271,  2271,  2302,  2302,  2327,  2327,  2343,
+    2344,  2345,  2346,  2354,  2363,  2363,  2412,  2416,  2427,  2437,
+    2454,  2455,  2456,  2457,  2458,  2460,  2461,  2463,  2463,  2465,
+    2465,  2489,  2497,  2508,  2524,  2525,  2526,  2527,  2534,  2535,
+    2536,  2537,  2538,  2539,  2540,  2541,  2542,  2543,  2547,  2548,
+    2550,  2551,  2553,  2554,  2558,  2556,  2564,  2562,  2571,  2572,
+    2573,  2574,  2575,  2576,  2577,  2578,  2580,  2586,  2587,  2588,
+    2589,  2590,  2591,  2594,  2667,  2667,  2669,  2669,  2671,  2672,
+    2674,  2758,  2759,  2768,  2769,  2772,  2773,  2774,  2775,  2776,
+    2777,  2778,  2791,  2793,  2794,  2795,  2797,  2797,  2801,  2801,
+    2805,  2806,  2809,  2810,  2812,  2813,  2815,  2816,  2818,  2822,
+    2825,  2830,  2831,  2832,  2833,  2835,  2838,  2842,  2845,  2848,
+    2858,  2862,  2868,  2874,  2882,  2887,  2893,  2901,  2909,  2910,
+    2911,  2914,  2913,  2930,  2931,  2933,  2932,  2956,  2975,  2989,
+    2990,  2992,  2993,  2995,  2996,  2997,  3006,  3007,  3011,  3012,
+    3014,  3015,  3016,  3018,  3022,  3023,  3028,  3029,  3073,  3123,
+    3144,  3166,  3169,  3176,  3179,  3182,  3185,  3188,  3191,  3196,
+    3197,  3199,  3200,  3201,  3202,  3203,  3205,  3211,  3220,  3221,
+    3222,  3223,  3224,  3225,  3227,  3231,  3243,  3261,  3272,  3282,
+    3291,  3292,  3293,  3294,  3295,  3296,  3297,  3298,  3299,  3300,
+    3301,  3302,  3303,  3304,  3305,  3306,  3307,  3308,  3309,  3310,
+    3311,  3312,  3313,  3314,  3315,  3316,  3317,  3318,  3319,  3320,
+    3321,  3322,  3323,  3324,  3325,  3326,  3327,  3328,  3329,  3330,
+    3331,  3332,  3333,  3334,  3335,  3336,  3338,  3339,  3340,  3341,
+    3343,  3358,  3366,  3366,  3420,  3421,  3422,  3423,  3424,  3432,
+    3450,  3457,  3468,  3475,  3482,  3492,  3503,  3681,  3717,  3724,
+    3731,  3738,  3760,  3766
 };
 #endif
 
@@ -2342,53 +2643,58 @@ static const yytype_uint16 yyrline[] =
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "T_IDENTIFIER", "T_NAMESPACE",
-  "T_STRING", "T_REGEXP", "T_EMPTY", "T_INT", "T_UINT", "T_BYTE",
-  "T_SHORT", "T_FLOAT", "\"for\"", "\"while\"", "\"do\"", "\"switch\"",
-  "\"implements\"", "\"namespace\"", "\"package\"", "\"protected\"",
+  "T_STRING", "T_REGEXP", "T_EMPTY", "T_INT", "T_UINT", "T_FLOAT",
+  "\"for\"", "\"while\"", "\"do\"", "\"switch\"", "\"implements\"",
+  "\"namespace\"", "\"package\"", "\"protected\"", "\"arguments\"",
   "\"public\"", "\"private\"", "\"use\"", "\"internal\"", "\"new\"",
-  "\"native\"", "\"function\"", "\"finally\"", "\"undefined\"",
+  "\"native\"", "\"function\"", "\"finally\"", "\"undefined\"", "\"NaN\"",
   "\"continue\"", "\"class\"", "\"const\"", "\"catch\"", "\"case\"",
   "\"set\"", "\"void\"", "\"throw\"", "\"static\"", "\"with\"",
   "\"instanceof\"", "\"import\"", "\"return\"", "\"typeof\"",
   "\"interface\"", "\"null\"", "\"var\"", "\"dynamic\"", "\"override\"",
   "\"final\"", "\"each\"", "\"get\"", "\"try\"", "\"super\"",
   "\"extends\"", "\"false\"", "\"true\"", "\"Boolean\"", "\"uint\"",
-  "\"int\"", "\"Number\"", "\"String\"", "\"default\"", "\"delete\"",
-  "\"if\"", "\"else\"", "\"break\"", "\"is\"", "\"in\"", "\"as\"",
-  "\"{ (dictionary)\"", "\"==\"", "\"===\"", "\"!=\"", "\"!==\"", "\"<=\"",
-  "\">=\"", "\"|=\"", "\"/=\"", "\"%=\"", "\"*=\"", "\"+=\"", "\"-=\"",
-  "\"^=\"", "\">>=\"", "\"<<=\"", "\">>>=\"", "\"||\"", "\"&&\"", "\"::\"",
-  "\"--\"", "\"++\"", "\"..\"", "\"...\"", "\"<<\"", "\">>>\"", "\">>\"",
-  "prec_none", "below_semicolon", "';'", "','", "below_assignment", "'='",
-  "\"&=\"", "'?'", "':'", "'|'", "'^'", "'&'", "'<'", "'>'", "below_minus",
-  "'-'", "'+'", "'/'", "'*'", "'%'", "'~'", "'!'", "minusminus_prefix",
-  "plusplus_prefix", "below_curly", "'('", "new2", "'['", "']'", "'{'",
-  "'.'", "'@'", "above_identifier", "below_else", "above_function", "'}'",
-  "')'", "$accept", "PROGRAM", "MAYBE_PROGRAM_CODE_LIST",
-  "PROGRAM_CODE_LIST", "PROGRAM_CODE", "MAYBE_INPACKAGE_CODE_LIST",
-  "INPACKAGE_CODE_LIST", "INPACKAGE_CODE", "MAYBECODE", "CODE",
-  "CODE_STATEMENT", "CODEPIECE", "CODEBLOCK", "PACKAGE_INITCODE",
-  "CONDITIONAL_COMPILATION", "MAYBEEXPRESSION", "VARIABLE_DECLARATION",
-  "VARIABLE_LIST", "ONE_VARIABLE", "MAYBEELSE", "IF", "$@1", "FOR_INIT",
-  "FOR_IN_INIT", "FOR_START", "FOR", "FOR_IN", "WHILE", "$@2", "DO_WHILE",
-  "$@3", "BREAK", "CONTINUE", "MAYBE_CASE_LIST", "CASE_LIST", "CASE",
-  "DEFAULT", "SWITCH", "$@4", "CATCH", "$@5", "FINALLY", "$@6",
-  "CATCH_LIST", "CATCH_FINALLY_LIST", "TRY", "$@7", "THROW", "WITH",
-  "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",
-  "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST",
-  "PARAM_LIST", "PARAM", "GETSET", "FUNCTION_DECLARATION", "$@13",
-  "MAYBE_IDENTIFIER", "INNERFUNCTION", "$@14", "CLASS", "PACKAGEANDCLASS",
-  "CLASS_SPEC", "CLASS_SPEC_LIST", "TYPE", "MAYBETYPE",
-  "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", "EXPRESSION_LIST",
-  "EXPRESSION_LIST_AND_COMMA", "XX", "NEW", "FUNCTIONCALL", "DELETE",
-  "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", "VOIDEXPRESSION", "E",
-  "CONSTANT", "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ",
-  "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0
+  "\"int\"", "\"Number\"", "\"String\"", "\"default\"", "\"default xml\"",
+  "\"delete\"", "\"if\"", "\"else\"", "\"break\"", "\"is\"", "\"in\"",
+  "\"as\"", "\"{ (dictionary)\"", "\"==\"", "\"===\"", "\"!=\"", "\"!==\"",
+  "\"<=\"", "\">=\"", "\"|=\"", "\"/=\"", "\"%=\"", "\"*=\"", "\"&=\"",
+  "\"+=\"", "\"-=\"", "\"^=\"", "\">>=\"", "\"<<=\"", "\">>>=\"", "\"||\"",
+  "\"&&\"", "\"::\"", "\"--\"", "\"++\"", "\"..\"", "\"...\"", "\"<<\"",
+  "\">>>\"", "\">>\"", "prec_none", "below_semicolon", "';'", "','",
+  "below_assignment", "'='", "'?'", "':'", "'|'", "'^'", "'&'", "below_lt",
+  "'<'", "'>'", "below_minus", "'-'", "'+'", "'/'", "'*'", "'%'", "'~'",
+  "'!'", "minusminus_prefix", "plusplus_prefix", "below_curly", "'('",
+  "new2", "'['", "']'", "'{'", "'.'", "'@'", "above_identifier",
+  "below_else", "above_function", "'}'", "')'", "$accept", "PROGRAM",
+  "MAYBE_PROGRAM_CODE_LIST", "PROGRAM_CODE_LIST", "PROGRAM_CODE",
+  "MAYBE_INPACKAGE_CODE_LIST", "INPACKAGE_CODE_LIST", "INPACKAGE_CODE",
+  "MAYBECODE", "CODE", "CODE_STATEMENT", "CODEPIECE", "CODEBLOCK",
+  "PACKAGE_INITCODE", "CONDITIONAL_COMPILATION", "MAYBEEXPRESSION",
+  "VARIABLE_DECLARATION", "VARIABLE_LIST", "ONE_VARIABLE", "MAYBEELSE",
+  "IF", "$@1", "FOR_INIT", "FOR_IN_INIT", "FOR_START", "FOR", "FOR_IN",
+  "WHILE", "$@2", "DO_WHILE", "$@3", "BREAK", "CONTINUE",
+  "MAYBE_CASE_LIST", "CASE_LIST", "CASE", "DEFAULT", "SWITCH", "$@4",
+  "CATCH", "$@5", "FINALLY", "$@6", "CATCH_LIST", "CATCH_FINALLY_LIST",
+  "TRY", "$@7", "THROW", "WITH_HEAD", "WITH", "X_IDENTIFIER", "PACKAGE",
+  "PACKAGE_DECLARATION", "$@8", "$@9", "IMPORT", "MAYBE_MODIFIERS",
+  "MODIFIER_LIST", "MODIFIER", "EXTENDS", "EXTENDS_LIST",
+  "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10", "INTERFACE_DECLARATION",
+  "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY", "CLASS_BODY_ITEM",
+  "MAYBE_INTERFACE_BODY", "INTERFACE_BODY", "IDECLARATION", "VARCONST",
+  "SLOT_DECLARATION", "$@12", "SLOT_LIST", "ONE_SLOT", "MAYBECONSTANT",
+  "CONSTANT", "XML", "OPEN", "CLOSE", "CLOSE2", "XMLEXPR1", "$@13",
+  "XMLEXPR2", "$@14", "XMLTEXT", "XML2", "XML_ID_OR_EXPR", "XMLNODE",
+  "MAYBE_XMLATTRIBUTES", "XMLATTRIBUTES", "XMLATTRIBUTE",
+  "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET",
+  "FUNCTION_DECLARATION", "$@15", "MAYBE_IDENTIFIER", "INNERFUNCTION",
+  "$@16", "CLASS", "PACKAGEANDCLASS", "CLASS_SPEC", "CLASS_SPEC_LIST",
+  "TYPE", "MAYBETYPE", "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST",
+  "EXPRESSION_LIST", "EXPRESSION_LIST_AND_COMMA", "XX", "NEW",
+  "FUNCTIONCALL", "DELETE", "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION",
+  "COMMA_EXPRESSION", "VOIDEXPRESSION", "MAYBE_DICT_EXPRPAIR_LIST",
+  "DICTLH", "DICT_EXPRPAIR_LIST", "E", "$@17", "ID_OR_NS", "SUBNODE",
+  "MEMBER", "VAR_READ", "NAMESPACE_ID", "NAMESPACE_DECLARATION",
+  "DEFAULT_NAMESPACE", "USE_NAMESPACE", 0
 };
 #endif
 
@@ -2406,48 +2712,53 @@ static const yytype_uint16 yytoknum[] =
      315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
      325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
-     345,   346,   347,   348,   349,   350,   351,   352,   353,    59,
-      44,   354,    61,   355,    63,    58,   124,    94,    38,    60,
-      62,   356,    45,    43,    47,    42,    37,   126,    33,   357,
-     358,   359,    40,   360,    91,    93,   123,    46,    64,   361,
-     362,   363,   125,    41
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,    59,    44,   356,    61,    63,    58,   124,    94,    38,
+     357,    60,    62,   358,    45,    43,    47,    42,    37,   126,
+      33,   359,   360,   361,    40,   362,    91,    93,   123,    46,
+      64,   363,   364,   365,   125,    41
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
+static const yytype_uint16 yyr1[] =
 {
-       0,   134,   135,   136,   136,   137,   137,   138,   138,   138,
-     138,   138,   138,   138,   138,   139,   139,   140,   140,   141,
-     141,   141,   141,   141,   141,   141,   142,   142,   143,   143,
-     144,   144,   144,   144,   144,   144,   144,   144,   144,   144,
-     144,   144,   144,   145,   145,   145,   145,   145,   145,   145,
-     145,   145,   146,   146,   147,   148,   149,   149,   150,   150,
-     151,   151,   152,   153,   153,   155,   154,   156,   156,   156,
-     157,   157,   158,   158,   159,   160,   162,   161,   164,   163,
-     165,   165,   166,   166,   167,   167,   167,   167,   168,   168,
-     169,   170,   172,   171,   174,   173,   176,   175,   177,   177,
-     178,   178,   178,   180,   179,   181,   181,   182,   183,   183,
-     184,   184,   186,   185,   187,   185,   188,   188,   189,   189,
-     190,   190,   191,   191,   191,   191,   191,   191,   191,   191,
-     191,   191,   192,   192,   193,   193,   194,   194,   196,   195,
-     198,   197,   199,   199,   200,   200,   201,   201,   201,   201,
-     201,   202,   202,   203,   203,   204,   204,   204,   205,   205,
-     207,   206,   208,   208,   209,   209,   209,   209,   209,   209,
-     209,   209,   209,   210,   210,   210,   210,   211,   211,   212,
-     212,   213,   213,   213,   215,   214,   216,   216,   218,   217,
-     219,   220,   221,   221,   222,   222,   223,   223,   223,   224,
-     224,   225,   225,   226,   226,   226,   227,   228,   227,   229,
-     230,   231,   231,   232,   233,   233,   234,   235,   235,   236,
-     237,   237,   237,   237,   237,   237,   237,   238,   238,   238,
-     238,   238,   238,   238,   238,   238,   238,   237,   237,   237,
-     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
-     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
-     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
-     237,   239,   239,   240,   240,   237,   237,   237,   237,   237,
-     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
-     237,   237,   237,   237,   237,   237,   237,   237,   237,   241,
-     242,   242,   242,   243
+       0,   136,   137,   138,   138,   139,   139,   140,   140,   140,
+     140,   140,   140,   140,   140,   141,   141,   142,   142,   143,
+     143,   143,   143,   143,   143,   143,   144,   144,   145,   145,
+     146,   146,   146,   146,   146,   146,   146,   146,   146,   146,
+     146,   146,   146,   146,   146,   147,   147,   147,   147,   147,
+     147,   147,   147,   148,   148,   149,   150,   151,   151,   152,
+     152,   153,   153,   154,   155,   155,   157,   156,   158,   158,
+     158,   159,   159,   160,   160,   161,   162,   164,   163,   166,
+     165,   167,   167,   168,   168,   169,   169,   169,   169,   170,
+     170,   171,   172,   174,   173,   176,   175,   178,   177,   179,
+     179,   180,   180,   180,   182,   181,   183,   183,   184,   185,
+     186,   186,   186,   186,   186,   187,   187,   189,   188,   190,
+     188,   191,   191,   191,   192,   192,   193,   193,   194,   194,
+     194,   194,   194,   194,   194,   194,   194,   194,   195,   195,
+     196,   196,   197,   197,   199,   198,   201,   200,   202,   202,
+     203,   203,   204,   204,   204,   204,   204,   205,   205,   206,
+     206,   207,   207,   207,   208,   208,   210,   209,   211,   211,
+     212,   213,   213,   214,   214,   214,   214,   214,   214,   214,
+     214,   214,   215,   216,   217,   218,   220,   219,   222,   221,
+     223,   223,   223,   223,   224,   224,   225,   225,   226,   226,
+     226,   227,   227,   228,   228,   229,   229,   229,   229,   229,
+     230,   230,   230,   230,   231,   231,   232,   232,   233,   233,
+     233,   235,   234,   236,   236,   238,   237,   239,   240,   241,
+     241,   242,   242,   243,   243,   243,   244,   244,   245,   245,
+     246,   246,   246,   247,   248,   247,   249,   250,   251,   251,
+     252,   253,   253,   254,   255,   256,   256,   257,   257,   258,
+     258,   259,   259,   259,   259,   259,   260,   260,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   262,   261,   263,   263,   263,   264,   264,   261,
+     261,   261,   261,   261,   261,   261,   265,   266,   267,   267,
+     267,   268,   269,   270
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -2457,33 +2768,38 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     4,     1,     0,     1,     1,     2,     1,
        1,     1,     1,     1,     4,     1,     1,     0,     2,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     3,     2,     1,     1,     1,     1,     1,     1,     1,
-       4,     1,     2,     1,     1,     3,     2,     0,     2,     2,
-       1,     3,     3,     0,     2,     0,     7,     0,     1,     1,
-       3,     1,     2,     3,     8,     6,     0,     6,     0,     7,
-       1,     2,     1,     2,     0,     1,     1,     2,     1,     2,
-       4,     3,     0,     8,     0,     9,     0,     5,     1,     2,
-       1,     2,     1,     0,     6,     2,     1,     5,     1,     1,
-       3,     1,     0,     6,     0,     5,     2,     4,     0,     1,
-       1,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     2,     0,     2,     0,     2,     0,     9,
-       0,     8,     0,     1,     1,     2,     1,     4,     1,     1,
-       1,     0,     1,     1,     2,     1,     2,     8,     1,     1,
-       0,     6,     0,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     0,     1,     2,     4,     3,     1,     4,
-       2,     1,     1,     0,     0,    12,     1,     0,     0,    10,
-       1,     3,     1,     1,     1,     3,     1,     1,     1,     2,
-       0,     0,     3,     0,     1,     1,     1,     2,     2,     0,
-       4,     4,     4,     2,     1,     2,     1,     1,     3,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     2,     2,     3,
+       1,     1,     1,     3,     2,     1,     1,     1,     1,     1,
+       1,     1,     4,     2,     1,     1,     3,     2,     0,     2,
+       2,     1,     3,     3,     0,     2,     0,     7,     0,     1,
+       1,     3,     1,     2,     3,     8,     6,     0,     6,     0,
+       7,     1,     2,     1,     2,     0,     1,     1,     2,     1,
+       2,     4,     3,     0,     8,     0,     9,     0,     5,     1,
+       2,     1,     2,     1,     0,     6,     2,     1,     4,     2,
+       1,     1,     1,     1,     1,     3,     1,     0,     6,     0,
+       5,     2,     2,     4,     0,     1,     1,     2,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     0,     2,
+       0,     2,     0,     2,     0,     9,     0,     8,     0,     1,
+       1,     2,     1,     4,     1,     1,     1,     0,     1,     1,
+       2,     1,     2,     8,     1,     1,     0,     4,     1,     3,
+       3,     0,     2,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     0,     0,     4,     0,     4,
+       0,     2,     2,     2,     2,     3,     1,     1,    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,
-       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,     3,     5,     2,     2,
-       2,     2,     3,     2,     4,     5,     3,     5,     3,     1,
-       3,     5,     5,     3
+       2,     2,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     2,     2,     1,
+       3,     2,     4,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     5,     2,     2,     2,     2,
+       3,     2,     0,     6,     1,     1,     1,     1,     1,     5,
+       3,     5,     4,     4,     6,     6,     3,     1,     2,     4,
+       4,     2,     4,     3
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -2491,820 +2807,922 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-     118,   299,   131,   232,   226,   229,   230,   227,   228,   231,
-       0,     0,    78,     0,     0,   124,   122,   123,     0,   130,
-       0,   129,   187,   233,   266,   125,     0,     0,     0,   236,
-     126,   128,   127,     0,     0,   235,   234,     0,     0,   271,
-       0,     0,    14,     0,     0,     0,     0,   203,   118,     0,
-       0,     2,   118,     5,    54,    12,     0,    36,    67,    31,
-      32,    33,    34,    35,    38,    37,     7,    30,     0,   119,
-     120,     9,     8,    11,    10,   220,   223,   225,   224,   219,
-      39,   217,   221,   222,    40,     0,     0,    72,    76,   118,
-      92,   108,   109,   114,   111,     0,     0,   299,   209,   186,
-       0,   265,     0,     0,   116,     0,   103,   203,     0,   213,
-      65,     0,   216,     0,   272,   291,   290,   268,   248,   247,
-       0,     0,   204,   205,   206,    82,     0,   106,   214,     0,
-      80,    43,    42,   118,    44,    29,     0,    45,    46,    47,
-      49,     0,    48,    51,   293,     1,     6,   118,   299,     0,
-      68,     0,     0,    69,   183,     0,   159,     0,   158,     0,
-     121,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     124,   347,   137,   176,   276,   173,   174,   175,     0,     0,
+      79,     0,     0,   130,   277,   128,   129,     0,   136,     0,
+     135,   224,   180,   181,   309,   131,     0,     0,     0,   179,
+     132,   134,   133,     0,     0,   178,   177,     0,     0,     0,
+     259,     0,     0,    14,   183,     0,     0,     0,     0,   240,
+     124,     0,     0,     2,   124,     5,    55,    12,     0,    37,
+      68,    32,    33,    34,    35,    36,    39,   124,    38,     7,
+      31,     0,   125,   126,     9,     8,    11,   274,   275,     0,
+     182,    10,   268,   270,   272,   271,    40,   257,   269,   273,
+      42,    30,    41,     0,     0,    73,    77,   124,    93,   110,
+     114,   112,   111,   113,   119,   116,     0,     0,   347,   246,
+     223,     0,   308,     0,   121,     0,   122,   307,   104,   240,
+       0,     0,   250,    66,   261,   262,   263,   264,   265,     0,
+       0,   260,   329,   328,   311,   291,   290,     0,   255,     0,
+     241,   242,   243,   253,    83,     0,   107,   251,     0,    81,
+      45,    44,   124,    46,    29,     0,    47,    48,    49,    51,
+       0,    50,   331,     1,     6,   124,   347,     0,    69,     0,
+       0,    70,    54,   109,     0,   220,     0,   165,     0,   164,
+     166,   351,   127,   196,     0,   197,   201,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   289,   288,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   203,     0,     0,    55,    73,     0,    53,     0,
-       0,   118,   112,     0,   303,   201,   173,     0,     0,     0,
-      27,     0,   292,     0,     0,   275,     0,   267,   270,   207,
-     208,    83,   200,    59,    60,   105,   215,    58,    81,    41,
-      28,   118,     0,     0,   200,     0,     0,   182,   181,     0,
-     132,   134,   160,   218,   262,   263,   260,   261,   241,   242,
-     244,   243,   239,   240,   282,   281,   277,   276,   284,   285,
-     283,   279,   278,   280,   245,   246,   296,   254,   253,   252,
-     286,     0,   251,   250,   249,   237,   238,   258,   257,   255,
-     259,   256,     0,     0,   298,     0,     0,     0,    52,     0,
-       0,    25,     0,   118,    17,    23,     0,    20,    19,    22,
-      21,   118,   110,   203,   210,   162,     0,     0,   174,   178,
-     118,   191,   117,   264,     0,    26,   212,     0,   273,     0,
-       0,    57,     0,   118,   300,    13,    57,     0,     0,     0,
-       0,   136,     0,     0,   200,     0,   211,   269,     0,     0,
-     294,   118,     0,     0,   115,    18,   118,     0,     0,     0,
-       0,   180,   175,   200,     0,   107,     0,   118,     0,   190,
-     198,   197,     0,   193,   192,   196,   199,     0,    62,    61,
-      50,     0,     0,   118,   173,   133,     0,     0,   194,   135,
-     140,    57,   287,   295,   297,    77,     0,    84,     0,   113,
-     202,   172,   168,   165,   166,   164,   167,   171,   170,   169,
-     163,   162,     0,     0,   177,     0,     0,    98,   102,   100,
-     104,    63,   274,     0,    56,   301,   302,     0,    75,     0,
-     137,   138,     0,   118,   161,    79,     0,     0,     0,    85,
-      88,    86,    24,   179,   188,   176,    96,     0,    99,   101,
-     118,    66,   118,   200,   118,   195,     0,   155,     0,     0,
-     118,   153,     0,    27,    93,    89,    87,    27,    27,   200,
-      64,    74,     0,   146,   150,     0,     0,     0,   118,   144,
-     148,   149,   156,   183,   141,   154,    27,    91,     0,     0,
-       0,   184,   118,   139,   145,     0,    90,   189,    97,    94,
-      27,     0,     0,     0,     0,   147,   173,    27,   185,     0,
-       0,   200,    95,   157
+       0,   327,   326,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   240,
+       0,     0,    56,    74,     0,     0,     0,   124,   117,     0,
+     227,     0,   230,   229,   353,   238,   210,     0,   254,     0,
+      27,     0,   330,     0,     0,   279,     0,     0,     0,   310,
+     278,   244,   245,    84,   237,    60,    61,   106,   252,    59,
+      82,    43,    28,   124,     0,   237,     0,     0,    53,   348,
+     219,   218,     0,   138,   140,     0,   188,     0,   205,     0,
+     202,   203,   258,   305,   306,   303,   304,   284,   285,   287,
+     286,   282,   283,   319,   318,   314,   313,   321,   322,   323,
+     320,   316,   315,   317,   288,   289,   338,     0,   337,   340,
+     297,   296,   295,   324,     0,   294,   293,   292,   280,   281,
+     301,   300,   298,   302,   299,     0,     0,   110,   114,   338,
+     332,     0,     0,     0,   346,     0,     0,     0,    25,     0,
+     124,    17,    23,     0,    20,    19,    22,    21,   124,   115,
+       0,   240,   247,   171,     0,     0,   211,   215,   108,   123,
+     228,     0,    26,   249,   352,     0,   266,     0,   256,     0,
+      58,     0,   124,    13,    58,     0,     0,     0,     0,     0,
+     142,     0,     0,   237,   167,   168,     0,     0,     0,   184,
+     185,   190,   204,     0,   343,     0,   248,   312,     0,     0,
+       0,   342,     0,   124,     0,     0,   120,    18,   124,     0,
+       0,     0,     0,   217,   212,   237,     0,     0,   124,     0,
+     235,   234,   233,   236,     0,    63,    62,    52,     0,   124,
+     349,   350,   210,   139,     0,     0,   231,   141,   146,    58,
+       0,   189,   209,   208,   206,   207,     0,     0,     0,   325,
+       0,   341,     0,   339,    78,     0,    85,     0,   118,   239,
+     172,   171,     0,     0,   214,     0,     0,    99,   103,   101,
+     105,    64,   267,    57,     0,    76,     0,   143,   144,     0,
+     124,   170,   169,   199,   192,   183,   193,     0,   191,     0,
+     190,   345,   333,   344,    80,     0,     0,     0,    86,    89,
+      87,    24,   216,   225,   213,    97,     0,   100,   102,   124,
+      67,   124,   237,   124,   232,     0,   161,     0,     0,   124,
+     159,     0,   186,   183,   190,   194,     0,    27,    94,    90,
+      88,    27,    27,   237,    65,    75,     0,   152,   156,     0,
+       0,     0,   124,   150,   154,   155,   162,   220,   147,   160,
+     185,     0,     0,   195,    27,    92,     0,     0,     0,   221,
+     124,   145,   151,     0,     0,   187,   185,    91,   226,    98,
+      95,    27,     0,     0,   198,     0,     0,     0,   153,   210,
+     200,    27,   222,     0,     0,   237,    96,   163
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,    50,    51,    52,    53,   302,   303,   304,   324,   325,
-     134,   135,   209,   305,   136,   378,   137,   237,   234,   451,
-      57,   223,   151,   152,    58,    59,    60,    61,   207,    62,
-      89,   138,   139,   438,   439,   440,   441,    63,   210,   417,
-     503,   418,   468,   419,   420,    64,   220,   140,    65,    94,
-     372,    66,   311,   211,    67,   141,    69,    70,   341,   343,
-     387,   307,   454,   308,   433,   477,   478,   479,   459,   460,
-     461,   159,   309,   344,   361,   410,   317,   318,   319,   249,
-     310,   500,   100,    75,   467,   373,   374,   375,   389,   376,
-     331,   314,   121,   122,   123,   215,    76,    77,    78,   142,
-     124,    79,    80,    81,    82,   113,   114,    83,   143,    84
+      -1,    52,    53,    54,    55,   349,   350,   351,   371,   372,
+     153,   154,   173,   352,   155,   435,   156,   269,   266,   520,
+      59,   254,   169,   170,    60,    61,    62,    63,   234,    64,
+      97,   157,   158,   507,   508,   509,   510,    65,   236,   477,
+     586,   478,   542,   479,   480,    66,   250,   159,    67,    68,
+     240,   241,    69,   358,   237,    70,   160,    72,    73,   390,
+     392,   445,   354,   523,   355,   490,   551,   552,   553,   528,
+     529,   530,   180,   356,   285,   394,   395,   423,    77,    78,
+      79,   401,   456,   498,   561,   185,   396,   457,   499,   186,
+      80,   289,   290,   291,   365,   366,   367,   282,   357,   581,
+     111,    82,   541,   242,   243,   432,   447,   433,   380,   362,
+     139,   140,   141,   245,    83,    84,    85,   161,   142,   247,
+     248,    86,   129,   130,   131,    87,   408,   343,   319,    88,
+      89,   181,    90,    91,    92
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -374
+#define YYPACT_NINF -490
 static const yytype_int16 yypact[] =
 {
-    1667,   -68,  -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,
-     -30,   -97,  -374,   -57,    20,  -374,  -374,  -374,    49,  -374,
-    2087,  -374,    71,  -374,  2157,  -374,   -37,    85,   -35,  -374,
-    -374,  -374,  -374,     6,     8,  -374,  -374,  2087,    14,  2087,
-    2087,  2087,  -374,  2087,  2087,  2087,  2087,  2087,   627,    88,
-     177,  -374,   497,  -374,  -374,  -374,    81,  -374,  2017,  -374,
-    -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,   308,   298,
-    -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,    79,
-    -374,  2562,  -374,  -374,  -374,   197,    86,  -374,  -374,  1919,
-    -374,  -374,  -374,  -374,  -374,   -18,   206,  -374,   -46,  -374,
-      93,   133,  2087,    83,  -374,  2087,  -374,  2087,   215,   133,
-    -374,   117,  2562,    94,   127,   133,   133,   201,   133,   133,
-     -53,   103,   129,  2087,  -374,   227,   228,  2087,  2087,   228,
-     232,  -374,  -374,   757,  -374,  -374,   107,  -374,  -374,  -374,
-    -374,   219,  -374,  -374,  -374,  -374,  -374,  1017,   170,   236,
-    -374,   141,   176,  -374,    70,   242,  -374,   243,  -374,   244,
-    -374,  2087,  2087,  2087,  2087,  2087,  2087,  2087,  2087,  2087,
-    2087,  2087,  2087,  2087,  2087,  2087,  2087,  2087,  2087,  2087,
-    2087,  2087,  2087,  2087,  -374,  -374,   245,  2087,  2087,  2087,
-    2087,  2087,  2087,  2087,  2087,  2087,  2087,  2087,  2087,  2087,
-    2087,  2087,  2087,  2087,    11,  -374,  -374,  2087,   159,   247,
-    2087,  1147,  -374,    85,  -374,   137,    24,   -49,    16,  2182,
-    1793,   130,  -374,  2087,  2087,  -374,  2087,  -374,  -374,  -374,
-    -374,  -374,   157,   164,  -374,    79,    79,   164,  -374,  -374,
-    -374,  1919,   262,   134,   157,  2087,  2087,  -374,  -374,   269,
-     226,   231,  -374,  2562,  1009,   489,   489,   489,  2867,  2867,
-    2867,  2867,  1009,  1009,  2562,  2562,  2562,  2562,  2562,  2562,
-    2562,  2562,  2562,  2562,   304,  2623,  -374,   349,   349,   349,
-    2562,  2379,  2684,  2745,  2806,  1009,  1009,   201,   201,   133,
-     133,   133,   148,  2440,   193,  2087,   281,   -40,  -374,   167,
-    2253,  -374,   154,  1277,  -374,  -374,   168,  -374,  -374,  -374,
-    -374,  1147,  -374,  2087,  -374,    96,   287,   174,   200,  -374,
-    1919,   181,  -374,  -374,   169,  1793,  -374,   -36,  -374,   204,
-      26,   208,   228,   887,   212,  -374,   -20,    53,   -31,   199,
-     125,   309,   125,   205,   157,  2087,  -374,  -374,   324,  2316,
-    -374,  1919,  2087,   207,  -374,  -374,  1147,   202,   209,    67,
-      26,  -374,  -374,   157,    25,  -374,   110,  1919,  2087,   181,
-    -374,  -374,   210,  -374,  -374,  -374,  -374,  2087,  -374,  -374,
-    -374,    39,  2087,  1919,    24,  -374,   125,   217,  -374,   251,
-    -374,   208,  2562,  -374,  -374,  -374,   -14,    27,   221,  -374,
-    -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,
-    -374,   253,   233,   287,  -374,   234,   241,  -374,  -374,   110,
-    -374,   267,  -374,   126,  -374,  -374,  -374,   250,  -374,   252,
-     251,  -374,   125,   230,  -374,  -374,  2087,   259,   235,    27,
-    -374,  -374,  -374,  -374,  -374,  -374,  -374,   362,  -374,  -374,
-    1919,  -374,  1919,   157,  1407,  -374,   366,  -374,   347,   254,
-     249,  -374,  2501,  1793,  -374,  -374,  -374,  1793,  1793,   157,
-    -374,  -374,   256,  -374,  -374,   258,    74,   255,  1537,  -374,
-    -374,  -374,  -374,    70,  -374,  -374,  1793,  -374,   257,   261,
-     264,  -374,  1407,  -374,  -374,   385,  -374,  -374,  -374,  -374,
-    1793,   270,   268,   265,   271,  -374,    24,  1793,  -374,   272,
-     274,   157,  -374,  -374
+    1763,   -22,  -490,  -490,  -490,  -490,  -490,  -490,   -28,   -44,
+    -490,   -38,    94,  -490,  -490,  -490,  -490,    73,  -490,  2217,
+    -490,   102,  -490,  -490,   247,  -490,   -12,   547,  2217,  -490,
+    -490,  -490,  -490,    10,   -36,  -490,  -490,   120,  2217,     5,
+     147,  2217,  2217,  -490,  -490,  2217,  2217,  2217,  2217,  2217,
+     707,   136,   141,  -490,   575,  -490,  -490,  -490,    20,  -490,
+    2145,  -490,  -490,  -490,  -490,  -490,  -490,  2019,  -490,  -490,
+    -490,   338,   286,  -490,  -490,  -490,  -490,  -490,  -490,    17,
+    -490,  -490,  -490,  -490,  -490,  -490,    49,  2850,  -490,  -490,
+    -490,  -490,  -490,   151,    34,  -490,  -490,  2019,  -490,  -490,
+    -490,  -490,  -490,  -490,  -490,  -490,    -9,   671,  -490,   -27,
+    -490,    35,   406,  2217,    32,    41,  -490,   406,  -490,  2217,
+     160,    68,   406,  -490,  -490,  -490,  -490,  -490,  -490,    39,
+      92,   118,   406,   406,   378,   406,   406,   -41,  2788,    99,
+     125,  2217,  -490,  2788,   225,   229,  2217,  2217,   229,   230,
+    -490,  -490,   839,  -490,  -490,   103,  -490,  -490,  -490,  -490,
+     218,  -490,  -490,  -490,  -490,  1103,   166,   233,  -490,   145,
+     178,    49,   161,  -490,   258,    28,   264,  -490,   265,  -490,
+    -490,  -490,  -490,  -490,  2217,  -490,    18,  2217,  2217,  2217,
+    2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,
+    2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,
+    2217,  -490,  -490,    23,  2217,  2217,  2217,  2217,  2217,  2217,
+    2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,  2217,
+    2217,   327,  -490,  -490,  2217,   260,  2217,  1235,  -490,   671,
+     149,   150,  -490,  -490,  -490,   146,    40,   153,   182,   358,
+    1891,   154,  -490,  2217,  2217,  -490,  2217,   147,  2217,  -490,
+    -490,  -490,  -490,  -490,   179,   184,  -490,  -490,  -490,   184,
+    -490,  -490,  -490,  2019,   163,   179,  2217,  2217,  -490,   190,
+    -490,  -490,   296,   251,   256,   298,  2788,   209,   210,    -8,
+      18,  -490,  2788,  1095,   567,   567,   567,  3222,  3222,  3222,
+    3222,  1095,  1095,  2788,  2788,  2788,  2788,  2788,  2788,  2788,
+    2788,  2788,  2788,  2788,  2912,  2974,  -490,   396,  -490,  -490,
+     362,   362,   362,  2788,  2416,  3036,  3098,  3160,  1095,  1095,
+     378,   378,   406,   406,   406,   181,  2478,   226,   232,   234,
+    -490,  2217,   420,   235,  -490,   185,   195,  2276,  -490,   193,
+    1367,  -490,  -490,   201,  -490,  -490,  -490,  -490,  1235,  -490,
+     671,  2217,  -490,    11,   334,   203,   239,  -490,  -490,  -490,
+     213,   211,  1891,  -490,  2788,   214,  -490,   257,  2788,   279,
+     253,   229,   971,  -490,    -1,   266,   231,   113,   241,   671,
+     357,   671,   248,   179,   276,  -490,   249,    71,    72,  -490,
+    -490,  -490,  -490,  2217,  -490,  2217,  -490,  -490,  2217,  2540,
+    2217,  -490,   431,  2019,  2217,   261,  -490,  -490,  1235,   259,
+     246,  2217,   279,  -490,  -490,   179,    42,    57,  2019,  2217,
+    -490,  -490,  -490,  -490,  2217,  -490,  -490,  -490,  2217,  2019,
+    -490,  -490,    40,  -490,   671,   275,  -490,   283,  -490,   253,
+     298,  -490,  -490,  -490,  -490,  -490,   282,   137,  2602,  2788,
+    2346,  -490,  2664,  -490,  -490,   271,     8,   277,  -490,  -490,
+    2788,   306,   287,   334,  -490,   289,   290,  -490,  -490,    57,
+    -490,   360,  -490,  2788,   -40,  -490,   293,   283,  -490,   671,
+      26,  -490,  -490,  -490,  -490,   322,  -490,  2217,  -490,   328,
+    -490,  -490,  -490,  -490,  -490,  2217,   335,   308,     8,  -490,
+    -490,  -490,  -490,  -490,  -490,  -490,   437,  -490,  -490,  2019,
+    -490,  2019,   179,  1499,  -490,   440,  -490,   419,   312,   384,
+    -490,    17,  2788,   336,  -490,    19,  2726,  1891,  -490,  -490,
+    -490,  1891,  1891,   179,  -490,  -490,   330,  -490,  -490,   337,
+     228,   329,  1631,  -490,  -490,  -490,  -490,    28,  -490,  -490,
+    -490,   339,    17,    19,  1891,  -490,   340,   347,   333,  -490,
+    1499,  -490,  -490,   461,   370,  -490,  -490,  -490,  -490,  -490,
+    -490,  1891,   349,   345,  -490,   375,   365,   363,  -490,    40,
+    -490,  1891,  -490,   366,   369,   179,  -490,  -490
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -374,  -374,   260,  -374,   352,  -285,  -374,    98,  -373,   -39,
-       1,   -84,  -310,    31,     2,    17,   351,   289,    89,  -374,
-    -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,  -374,
-    -374,  -374,  -374,  -374,  -374,   -17,   -16,  -374,  -374,     5,
-    -374,    13,  -374,  -374,  -374,  -374,  -374,  -374,  -374,  -202,
-      36,  -374,  -374,  -374,  -374,     0,  -374,   356,  -374,  -374,
-    -374,    58,  -374,    59,  -374,   -65,  -374,   -48,  -374,  -374,
-     -26,  -374,     3,  -374,    32,  -374,  -369,  -374,  -298,   -47,
-       4,  -374,  -374,  -374,  -374,  -374,   408,  -318,    51,    78,
-    -237,  -374,   -99,  -374,  -374,  -374,  -374,  -374,  -374,  -374,
-     -27,    -3,   -52,    -7,  -374,  -374,  -374,  -374,  -374,  -374
+    -490,  -490,   343,  -490,   451,  -327,  -490,   159,   -75,   -31,
+       1,   -60,   -92,    53,     2,    61,   452,   372,   130,  -490,
+    -490,  -490,  -490,  -490,  -490,  -490,  -490,  -490,  -490,  -490,
+    -490,  -490,  -490,  -490,  -490,     6,     7,  -490,  -490,    52,
+    -490,    55,  -490,  -490,  -490,  -490,  -490,  -490,  -490,  -490,
+      38,    54,  -490,  -490,  -490,  -490,     0,  -490,   447,  -490,
+    -490,  -490,    59,  -490,    60,  -490,   -50,  -490,   -24,  -490,
+    -490,     9,  -490,     3,  -490,  -490,    83,    50,  -490,  -490,
+    -490,  -490,  -489,  -490,  -490,  -168,  -490,  -452,  -490,  -453,
+    -416,  -490,  -490,   250,  -425,  -490,  -341,   -21,     4,  -490,
+    -490,  -490,  -490,  -490,   512,   -98,    97,   121,  -263,  -490,
+    -103,  -490,  -490,  -490,  -490,  -490,  -490,  -490,  -131,  -133,
+     494,   -52,  -490,   288,  -490,   -13,  -490,  -490,  -193,  -490,
+    -490,  -490,  -490,  -490,  -490
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -153
+#define YYTABLE_NINF -337
 static const yytype_int16 yytable[] =
 {
-      68,    54,    56,    73,    74,   208,   153,   336,   221,   133,
-     365,   312,   111,    98,   294,   429,   312,   101,   362,   321,
-      86,    85,   385,    91,   388,    88,   357,   315,   315,   369,
-     109,    55,   112,   115,   116,    92,   117,   118,   119,    92,
-     112,   395,   425,   120,   426,    92,   186,   161,   -70,   240,
-      95,   161,    68,    54,    56,    73,    74,   421,    71,    72,
-     161,   436,   370,   103,   161,    90,   414,    96,   388,   161,
-     401,   398,   402,   428,    99,   403,   404,   405,   203,   406,
-     227,   204,   377,    55,   320,   102,   161,   105,    91,   437,
-     487,   144,    87,   351,   488,   489,   230,   367,   219,   217,
-     112,   154,   383,   292,    92,   247,   156,   391,   212,   213,
-      71,    72,   407,   496,   455,   445,   112,   316,   413,   435,
-     158,   248,   408,   409,   235,   236,   412,   504,   369,   321,
-     107,   322,   106,   295,   510,   108,   110,   509,   415,   296,
-     470,   371,   471,   416,    92,    92,    93,    68,    54,    56,
-      73,    74,   382,   161,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   145,    55,   161,
-     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
-     287,   288,   289,   290,   291,   112,   293,   328,   359,   329,
-     205,   360,   333,   300,   297,    71,    72,   147,   206,   214,
-     218,    68,    54,   306,   358,   216,   472,   112,   222,   112,
-     327,   312,   224,   184,   185,   186,   225,   226,   228,   229,
-     231,   232,   490,   241,     2,   238,   208,   242,   -71,   244,
-     245,   240,   337,   338,   246,   250,   251,   252,   276,   240,
-      15,    16,    17,     2,    19,   202,    21,   203,   298,   313,
-     204,   299,   330,   326,   332,   334,   335,   208,    25,    15,
-      16,    17,   339,    19,   513,    21,   456,    30,    31,    32,
-     340,   346,   348,   208,   350,   342,   354,    25,   349,   352,
-     315,   184,   185,   186,   356,   456,    30,    31,    32,   208,
-     364,   366,     2,    68,    54,   306,   112,   363,  -108,   368,
-     377,    68,    54,   306,   381,   199,   200,   201,    15,    16,
-      17,   384,    19,   202,    21,   203,   386,   393,   204,   457,
-     427,   390,   450,   397,   399,   154,    25,   423,   392,   155,
-     156,   422,   400,   431,   162,    30,    31,    32,   457,   396,
-     424,   432,   157,   442,   158,   359,    68,    54,   306,   444,
-     446,   112,  -151,   447,   463,   469,   208,   464,   208,   482,
-     112,   163,   164,   165,   483,   166,   167,   168,   169,   170,
-     171,  -152,   491,   452,   492,   453,   484,   493,   502,   497,
-     506,   507,   183,   498,   184,   185,   186,   499,   187,   188,
-     189,   355,   505,   508,   146,   511,   512,   243,   434,   150,
-     192,   193,   194,   195,   196,   233,   197,   198,   199,   200,
-     201,   379,   465,   466,   448,   160,   202,   501,   203,   462,
-     494,   204,   449,   458,   485,   104,   495,   430,   411,   184,
-     185,   186,     0,   443,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   476,   474,   475,   480,   481,     0,
-     458,   197,   198,   199,   200,   201,     0,     0,     0,     0,
-       0,   202,     0,   203,     0,     0,   204,     0,   476,   474,
-     475,   480,   481,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   476,   474,   475,   480,   481,    -4,     0,     0,
+      71,    56,    58,    76,    81,   235,   109,   172,   171,   244,
+     262,   112,   384,   267,   268,   117,   251,   486,   288,   152,
+     183,   287,    94,   424,   494,   122,    99,   100,   132,   133,
+       2,   419,   134,   135,   136,   138,   143,   172,   344,   101,
+     102,   500,   505,   363,    13,   363,    15,    16,   535,    18,
+     105,    20,   103,    57,    71,    56,    58,    76,    81,    74,
+      75,   258,   187,   280,    25,   105,   106,   213,   -71,    93,
+     506,   574,   525,    30,    31,    32,   452,   454,   560,   281,
+      96,   115,   563,   534,   475,   474,    98,   585,   119,   107,
+     476,   467,   272,   120,   259,   521,    95,    99,   100,   230,
+     138,   345,   231,   434,   399,   110,   143,    57,   400,   576,
+     101,   102,   113,    74,    75,   421,   440,   422,   441,   238,
+     239,   375,   288,   103,   404,   376,   335,   526,   143,   123,
+     449,   496,   514,   138,   138,   364,   121,   473,   118,   162,
+     316,   163,   494,   385,   386,   184,   184,   497,   165,   411,
+     124,   187,   125,   317,   232,   126,   127,   128,   233,   246,
+    -157,  -110,   472,   252,   593,    71,    56,    58,    76,    81,
+     249,   286,   253,   255,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
+     308,   309,   310,   311,   312,   313,   314,   315,   256,   184,
+     184,   320,   321,   322,   323,   324,   325,   326,   327,   328,
+     329,   330,   331,   332,   333,   334,   143,   336,    57,   463,
+     257,   138,   104,   347,    74,    75,   260,   261,   263,   453,
+     455,   273,   264,   270,   174,   -72,   275,    71,    56,   353,
+     374,   138,   382,   143,   174,   378,   276,   277,   495,   496,
+     108,   318,     3,     4,   175,     5,     6,     7,   420,   546,
+     177,   279,   278,   138,   138,   497,    14,   283,   284,   318,
+     361,    19,   346,    21,   179,    22,    23,   359,  -116,   360,
+     568,   465,    99,   100,   258,   379,   381,   370,   368,   373,
+       2,   443,    29,   446,   387,   101,   102,   383,   482,   388,
+      34,   393,    35,    36,    13,   389,    15,    16,   103,    18,
+     391,    20,   272,   397,   398,   430,   406,  -334,    40,   414,
+     413,   464,   272,  -336,    25,  -335,   412,   416,   409,   418,
+     337,   338,   597,    30,    31,    32,   481,   363,   425,    41,
+      42,   426,  -115,   101,   102,   427,   446,   485,   143,   428,
+      71,    56,   353,   172,   174,   318,   103,   434,    71,    56,
+     353,    99,   100,   429,   175,   442,   439,   438,   172,   176,
+     177,    48,   444,    49,   101,   102,   448,    51,   450,   172,
+     318,   469,   178,   451,   179,   489,   484,   103,     2,   466,
+     458,   524,   459,   468,   493,   460,   431,   462,   370,    99,
+     100,   138,    13,   488,    15,    16,   504,    18,   470,    20,
+     421,   511,   101,   102,   516,   513,   143,   515,    71,    56,
+     353,   483,    25,    99,   100,   103,   519,   544,   522,   545,
+     525,    30,    31,    32,    99,   100,   101,   102,   531,   533,
+     543,   537,   538,   556,   339,   557,   558,   101,   102,   103,
+     318,   340,   562,   341,   211,   212,   213,   342,   569,   172,
+     103,   172,   565,   571,   583,   570,   566,   567,   580,   589,
+     211,   212,   213,   575,   578,   369,   224,   225,   226,   227,
+     228,   579,   584,   588,   532,   526,   229,   590,   230,   577,
+     527,   231,   536,   591,   226,   227,   228,   592,   211,   212,
+     213,   595,   229,   596,   230,   164,   587,   231,   274,   417,
+     491,   436,   168,   316,   539,   540,   594,   265,  -158,   182,
+     582,   512,   403,   550,   548,   549,   554,   555,   572,   527,
+     229,   517,   230,   492,   518,   231,   573,   316,   559,   116,
+     402,   487,   137,   471,     0,   377,   410,     0,   316,     0,
+     114,   100,   550,   548,   549,   554,   555,     0,     0,     0,
+       0,     0,     0,   101,   102,     0,     0,     0,     0,     0,
+     550,   548,   549,   554,   555,    -4,   103,     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,   188,     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,  -337,  -337,  -337,    37,    38,
+      39,     0,     0,   196,   197,     0,    40,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   211,
+     212,   213,     0,   214,   215,   216,     0,    41,    42,     0,
+       0,     0,     0,     0,    99,   100,    43,     0,   222,   223,
+       0,   224,   225,   226,   227,   228,    44,   101,   102,    45,
+       0,   229,     0,   230,    46,    47,   231,     0,     0,    48,
+     103,    49,     0,    50,     0,    51,     0,     0,     0,    -4,
        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,   162,
-       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,  -153,  -153,  -153,     0,
-      37,    38,     0,     0,   170,   171,     0,    39,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   184,
-     185,   186,     0,   187,   188,   189,     0,    40,    41,     0,
-       0,     0,     0,     0,     0,     0,    42,     0,   195,   196,
-       0,   197,   198,   199,   200,   201,     0,     0,     0,    43,
-       0,   202,     0,   203,    44,    45,   204,     0,     0,    46,
-       0,    47,     0,    48,     0,    49,     0,     0,     0,    -4,
-       1,     2,     3,     4,     0,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,     0,     0,     0,    15,    16,    17,
-      18,    19,    20,    21,    22,     0,    23,   125,     0,   126,
-       0,     0,     0,    24,   127,    25,    26,     0,    27,   128,
-      28,     0,    29,   129,    30,    31,    32,     0,     0,    33,
-      34,     0,    35,    36,     0,     0,     0,     0,     0,     0,
-      37,    38,     0,   130,     0,     0,     0,    39,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    40,    41,     0,
-       0,     0,     0,     0,     0,     0,   131,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    43,
-       0,     0,     0,     0,    44,    45,     0,     0,     0,    46,
-       0,    47,     0,    48,     0,    49,     0,     0,     0,   132,
-       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,   125,     0,   126,
-       0,     0,     0,    24,   127,    25,    26,     0,    27,   128,
-      28,     0,    29,   129,    30,    31,    32,     0,     0,    33,
+      10,    11,     0,     0,     0,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,     0,    22,    23,   144,     0,   145,
+       0,     0,     0,    24,   146,    25,    26,     0,    27,   147,
+      28,     0,    29,   148,    30,    31,    32,     0,     0,    33,
       34,     0,    35,    36,     0,     0,     0,     0,     0,     0,
-      37,    38,     0,   130,     0,     0,     0,    39,     0,     0,
+      37,    38,    39,     0,   149,     0,     0,     0,    40,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    40,    41,     0,
-       0,     0,     0,     0,     0,     0,   131,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    43,
-       0,     0,     0,     0,    44,    45,     0,     0,     0,    46,
-       0,    47,     0,    48,     0,    49,     0,     0,     0,   239,
-       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,   125,     0,   126,
-       0,     0,     0,    24,   127,    25,    26,     0,    27,   128,
-      28,     0,    29,   129,    30,    31,    32,     0,     0,    33,
-      34,     0,    35,    36,     0,     0,     0,     0,     0,     0,
-      37,    38,     0,   130,     0,     0,     0,    39,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    41,
+      42,     0,     0,     0,     0,     0,     0,     0,   150,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    44,     0,
+       0,    45,     0,     0,     0,     0,    46,    47,     0,     0,
+       0,    48,     0,    49,     0,    50,     0,    51,     0,     0,
+       0,   151,     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,   144,
+       0,   145,     0,     0,     0,    24,   146,    25,    26,     0,
+      27,   147,    28,     0,    29,   148,    30,    31,    32,     0,
+       0,    33,    34,     0,    35,    36,     0,     0,     0,     0,
+       0,     0,    37,    38,    39,     0,   149,     0,     0,     0,
+      40,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    40,    41,     0,
-       0,     0,     0,     0,     0,     0,   131,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    43,
-       0,     0,     0,     0,    44,    45,     0,     0,     0,    46,
-       0,    47,     0,    48,     0,    49,     0,     0,     0,   380,
-       1,     2,     3,     4,     0,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,     0,     0,    14,    15,    16,    17,
-      18,    19,    20,    21,     0,     0,    23,     0,     0,  -153,
-       0,     0,     0,    24,     0,    25,    26,     0,    27,     0,
-      28,     0,    29,     0,    30,    31,    32,     0,     0,    33,
-      34,     0,    35,    36,     0,     0,     0,     0,     0,     0,
-      37,    38,     0,     0,  -153,  -153,     0,    39,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   184,
-     185,   186,     0,   187,   188,   189,     0,    40,    41,     0,
-       0,     0,     0,     0,     0,     0,    42,     0,  -153,  -153,
-       0,   197,   198,   199,   200,   201,     0,     0,     0,    43,
-       0,   202,     0,   203,    44,    45,   204,     0,     0,    46,
-       0,    47,     0,    48,     0,    49,     0,     0,     0,    -3,
-       1,     2,     3,     4,     0,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,     0,     0,     0,    15,    16,    17,
-      18,    19,    20,    21,     0,     0,    23,     0,     0,     0,
-       0,     0,     0,    24,     0,    25,    26,     0,    27,     0,
-      28,     0,    29,     0,    30,    31,    32,     0,     0,    33,
-      34,     0,    35,    36,     0,     0,     0,     0,     0,     0,
-      37,    38,     0,     0,     0,     0,     0,    39,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
+     150,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      44,     0,     0,    45,     0,     0,     0,     0,    46,    47,
+       0,     0,     0,    48,     0,    49,     0,    50,     0,    51,
+       0,     0,     0,   271,     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,   144,     0,   145,     0,     0,     0,    24,   146,    25,
+      26,     0,    27,   147,    28,     0,    29,   148,    30,    31,
+      32,     0,     0,    33,    34,     0,    35,    36,     0,     0,
+       0,     0,     0,     0,    37,    38,    39,     0,   149,     0,
+       0,     0,    40,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    40,    41,     0,
-       0,     0,     0,     0,     0,     0,   301,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    43,
-       0,     0,     0,     0,    44,    45,     0,     0,     0,    46,
-       0,    47,     0,    48,     0,    49,     0,     0,     0,   -15,
-       1,     2,     3,     4,     0,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,     0,     0,     0,    15,    16,    17,
-      18,    19,    20,    21,     0,     0,    23,     0,     0,     0,
-       0,     0,     0,    24,     0,    25,    26,     0,    27,     0,
-      28,     0,    29,     0,    30,    31,    32,     0,     0,    33,
-      34,     0,    35,    36,     0,     0,     0,     0,     0,     0,
-      37,    38,     0,     0,     0,     0,     0,    39,     0,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,   150,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    44,     0,     0,    45,     0,     0,     0,     0,
+      46,    47,     0,     0,     0,    48,     0,    49,     0,    50,
+       0,    51,     0,     0,     0,   437,     1,     2,     3,     4,
+       0,     5,     6,     7,     8,     9,    10,    11,     0,     0,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,     0,
+       0,    22,    23,     0,     0,  -337,     0,     0,     0,    24,
+       0,    25,    26,     0,    27,     0,    28,     0,    29,     0,
+      30,    31,    32,     0,     0,    33,    34,     0,    35,    36,
+       0,     0,     0,     0,     0,     0,    37,    38,    39,     0,
+       0,  -337,  -337,     0,    40,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   211,   212,   213,
+       0,   214,   215,   216,     0,    41,    42,     0,     0,     0,
+       0,     0,     0,     0,    43,     0,  -337,  -337,     0,   224,
+     225,   226,   227,   228,    44,     0,     0,    45,     0,   229,
+       0,   230,    46,    47,   231,     0,     0,    48,     0,    49,
+       0,    50,     0,    51,     0,     0,     0,    -3,     1,     2,
+       3,     4,     0,     5,     6,     7,     8,     9,    10,    11,
+       0,     0,     0,    13,    14,    15,    16,    17,    18,    19,
+      20,     0,     0,    22,    23,     0,     0,     0,     0,     0,
+       0,    24,     0,    25,    26,     0,    27,     0,    28,     0,
+      29,     0,    30,    31,    32,     0,     0,    33,    34,     0,
+      35,    36,     0,     0,     0,     0,     0,     0,    37,    38,
+      39,     0,     0,     0,     0,     0,    40,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    40,    41,     0,
-       0,     0,     0,     0,     0,     0,   301,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    43,
-       0,     0,     0,     0,    44,    45,     0,     0,     0,    46,
-       0,    47,     0,    48,     0,    49,     0,     0,     0,   -16,
+       0,     0,     0,     0,     0,     0,     0,    41,    42,     0,
+       0,     0,     0,     0,     0,     0,   348,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    44,     0,     0,    45,
+       0,     0,     0,     0,    46,    47,     0,     0,     0,    48,
+       0,    49,     0,    50,     0,    51,     0,     0,     0,   -15,
        1,     2,     3,     4,     0,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,     0,     0,     0,    15,    16,    17,
-      18,    19,    20,    21,     0,     0,    23,     0,     0,     0,
+      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,
+      37,    38,    39,     0,     0,     0,     0,     0,    40,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    40,    41,     0,
-       0,     0,     0,     0,     0,     0,   473,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    43,
-       0,     0,     0,     0,    44,    45,     0,     0,     0,    46,
-       0,    47,     0,    48,     0,    49,     0,     0,     0,  -142,
-       1,     2,     3,     4,     0,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,     0,     0,     0,    15,    16,    17,
-      18,    19,    20,    21,     0,     0,    23,     0,     0,     0,
-       0,     0,     0,    24,     0,    25,    26,     0,    27,     0,
-      28,     0,    29,     0,    30,    31,    32,     0,     0,    33,
-      34,     0,    35,    36,     0,     0,     0,     0,     0,     0,
-      37,    38,     0,     0,     0,     0,     0,    39,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    41,
+      42,     0,     0,     0,     0,     0,     0,     0,   348,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    44,     0,
+       0,    45,     0,     0,     0,     0,    46,    47,     0,     0,
+       0,    48,     0,    49,     0,    50,     0,    51,     0,     0,
+       0,   -16,     1,     2,     3,     4,     0,     5,     6,     7,
+       8,     9,    10,    11,     0,     0,     0,    13,    14,    15,
+      16,    17,    18,    19,    20,     0,     0,    22,    23,     0,
+       0,     0,     0,     0,     0,    24,     0,    25,    26,     0,
+      27,     0,    28,     0,    29,     0,    30,    31,    32,     0,
+       0,    33,    34,     0,    35,    36,     0,     0,     0,     0,
+       0,     0,    37,    38,    39,     0,     0,     0,     0,     0,
+      40,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    40,    41,     0,
-       0,     0,     0,     0,     0,     0,   473,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    43,
-       0,     0,     0,     0,    44,    45,     0,     0,     0,    46,
-       0,    47,     0,    48,     0,    49,     0,    -3,     0,  -143,
-       1,     2,     3,     4,     0,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,     0,     0,    14,    15,    16,    17,
-      18,    19,    20,    21,     0,     0,    23,     0,     0,     0,
-       0,     0,     0,    24,     0,    25,    26,     0,    27,     0,
-      28,     0,    29,     0,    30,    31,    32,     0,     0,    33,
-      34,     0,    35,    36,     0,     0,     0,     0,     0,     0,
-      37,    38,     0,     0,     0,     0,     0,    39,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
+     547,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      44,     0,     0,    45,     0,     0,     0,     0,    46,    47,
+       0,     0,     0,    48,     0,    49,     0,    50,     0,    51,
+       0,     0,     0,  -148,     1,     2,     3,     4,     0,     5,
+       6,     7,     8,     9,    10,    11,     0,     0,     0,    13,
+      14,    15,    16,    17,    18,    19,    20,     0,     0,    22,
+      23,     0,     0,     0,     0,     0,     0,    24,     0,    25,
+      26,     0,    27,     0,    28,     0,    29,     0,    30,    31,
+      32,     0,     0,    33,    34,     0,    35,    36,     0,     0,
+       0,     0,     0,     0,    37,    38,    39,     0,     0,     0,
+       0,     0,    40,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    40,    41,     0,
-       0,     0,     0,     0,     0,     0,    42,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    43,
-       0,     0,     0,     0,    44,    45,     0,     0,     0,    46,
-       0,    47,     0,    48,     0,    49,     1,     2,     3,     4,
-       0,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-       0,  -118,     0,    15,    16,    17,    18,    19,    20,    21,
-      22,     0,    23,   125,     0,   126,     0,     0,     0,    24,
-     127,    25,    26,     0,    27,   128,    28,     0,    29,   129,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,   547,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    44,     0,     0,    45,     0,     0,     0,     0,
+      46,    47,     0,     0,     0,    48,     0,    49,     0,    50,
+       0,    51,     0,    -3,     0,  -149,     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,   130,
-       0,     0,     0,    39,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    37,    38,    39,     0,
+       0,     0,     0,     0,    40,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    41,    42,     0,     0,     0,
+       0,     0,     0,     0,    43,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    44,     0,     0,    45,     0,     0,
+       0,     0,    46,    47,     0,     0,     0,    48,     0,    49,
+       0,    50,     0,    51,     1,     2,     3,     4,     0,     5,
+       6,     7,     8,     9,    10,    11,     0,  -124,     0,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,     0,    22,
+      23,   144,     0,   145,     0,     0,     0,    24,   146,    25,
+      26,     0,    27,   147,    28,     0,    29,   148,    30,    31,
+      32,     0,     0,    33,    34,     0,    35,    36,     0,     0,
+       0,     0,     0,     0,    37,    38,    39,     0,   149,     0,
+       0,     0,    40,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    40,    41,     0,     0,     0,     0,     0,
-       0,     0,   131,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    43,     0,     0,     0,     0,
-      44,    45,     0,     0,     0,    46,     0,    47,     0,    48,
-       0,    49,     1,     2,     3,     4,     0,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,     0,     0,     0,    15,
-      16,    17,    18,    19,    20,    21,    22,     0,    23,   125,
-       0,   126,     0,     0,     0,    24,   127,    25,    26,     0,
-      27,   128,    28,     0,    29,   129,    30,    31,    32,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,   150,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    44,     0,     0,    45,     0,     0,     0,     0,
+      46,    47,     0,     0,     0,    48,     0,    49,     0,    50,
+       0,    51,     1,     2,     3,     4,     0,     5,     6,     7,
+       8,     9,    10,    11,     0,     0,     0,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,     0,    22,    23,   144,
+       0,   145,     0,     0,     0,    24,   146,    25,    26,     0,
+      27,   147,    28,     0,    29,   148,    30,    31,    32,     0,
        0,    33,    34,     0,    35,    36,     0,     0,     0,     0,
-       0,     0,    37,    38,     0,   130,     0,     0,     0,    39,
+       0,     0,    37,    38,    39,     0,   149,     0,     0,     0,
+      40,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    40,
-      41,     0,     0,     0,     0,     0,     0,     0,   131,     0,
-     148,     0,     3,     4,     0,     5,     6,     7,     8,     9,
-       0,    43,     0,     0,     0,     0,    44,    45,     0,     0,
-       0,    46,    20,    47,    22,    48,    23,    49,     0,   126,
-       0,     0,     0,    24,     0,     0,     0,     0,     0,     0,
-      28,     0,    29,   149,     0,     0,     0,     0,     0,     0,
-      34,     0,    35,    36,     0,     0,     0,     0,     0,     0,
-      37,     0,     0,     0,     0,     0,     0,    39,     0,     0,
-      97,     0,     3,     4,     0,     5,     6,     7,     8,     9,
-       0,     0,     0,     0,     0,     0,     0,    40,    41,     0,
-       0,     0,    20,     0,    22,     0,    23,     0,     0,     0,
-       0,     0,     0,    24,     0,     0,     0,     0,     0,    43,
-      28,     0,    29,     0,    44,    45,     0,     0,     0,    46,
-      34,    47,    35,    36,     0,    49,     0,     0,     0,     0,
-      37,     0,     0,     0,     0,     0,     0,    39,     0,     0,
-      97,     0,     3,     4,     0,     5,     6,     7,     8,     9,
-       0,     0,     0,     0,     0,     0,     0,    40,    41,     0,
-       0,     0,    20,     0,    22,     0,    23,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    43,
-       0,     0,    29,     0,    44,    45,     0,     0,     0,    46,
-      34,    47,    35,    36,     0,    49,     0,     0,     0,     0,
-       0,     0,   162,     0,     0,     0,     0,    39,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
+     150,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      44,     0,     0,    45,     0,     0,     0,     0,    46,    47,
+       0,     0,     0,    48,     0,    49,     0,    50,   166,    51,
+       3,     4,     0,     5,     6,     7,     0,     0,     0,     0,
+       0,     0,     0,     0,    14,     0,     0,     0,     0,    19,
+       0,    21,     0,    22,    23,     0,     0,   145,     0,     0,
+       0,    24,     0,     0,     0,     0,     0,     0,    28,     0,
+      29,   167,     0,     0,     0,     0,     0,     0,    34,     0,
+      35,    36,     0,     0,     0,     0,     0,     0,     0,    38,
+       0,     0,     0,     0,     0,     0,    40,     0,     0,     0,
+     108,     0,     3,     4,     0,     5,     6,     7,     0,     0,
+       0,     0,     0,     0,     0,     0,    14,    41,    42,     0,
+       0,    19,     0,    21,     0,    22,    23,     0,     0,     0,
+       0,     0,     0,    24,     0,     0,    44,     0,     0,    45,
+      28,     0,    29,     0,    46,    47,     0,     0,     0,    48,
+      34,    49,    35,    36,     0,    51,     0,     0,     0,     0,
+       0,    38,     0,     0,     0,     0,     0,     0,    40,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    41,
+      42,     0,     0,     0,     0,     0,   188,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    44,     0,
+       0,    45,     0,     0,     0,     0,    46,    47,     0,     0,
+       0,    48,     0,    49,   189,   190,   191,    51,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,     0,   211,   212,
+     213,     0,   214,   215,   216,     0,     0,     0,     0,     0,
+     217,   218,     0,   219,   220,   221,   188,   222,   223,     0,
+     224,   225,   226,   227,   228,     0,     0,     0,     0,     0,
+     229,     0,   230,     0,     0,   231,     0,     0,     0,     0,
+       0,   415,     0,     0,   189,   190,   191,     0,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,     0,   211,   212,
+     213,     0,   214,   215,   216,     0,     0,     0,     0,     0,
+     217,   218,     0,   219,   220,   221,   188,   222,   223,     0,
+     224,   225,   226,   227,   228,     0,     0,     0,     0,     0,
+     229,     0,   230,     0,     0,   231,     0,     0,     0,     0,
+       0,   502,     0,     0,   189,   190,   191,     0,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,     0,   211,   212,
+     213,     0,   214,   215,   216,     0,     0,     0,   188,     0,
+     217,   218,   405,   219,   220,   221,     0,   222,   223,     0,
+     224,   225,   226,   227,   228,     0,     0,     0,     0,     0,
+     229,     0,   230,     0,     0,   231,   189,   190,   191,     0,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,   210,     0,
+     211,   212,   213,     0,   214,   215,   216,     0,     0,     0,
+     188,     0,   217,   218,     0,   219,   220,   221,     0,   222,
+     223,     0,   224,   225,   226,   227,   228,     0,     0,     0,
+       0,     0,   229,     0,   230,   407,     0,   231,   189,   190,
+     191,     0,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,     0,   211,   212,   213,     0,   214,   215,   216,     0,
+       0,     0,   188,     0,   217,   218,     0,   219,   220,   221,
+       0,   222,   223,     0,   224,   225,   226,   227,   228,     0,
+       0,     0,     0,     0,   229,     0,   230,   461,     0,   231,
+     189,   190,   191,     0,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
+     208,   209,   210,     0,   211,   212,   213,     0,   214,   215,
+     216,     0,     0,     0,   188,     0,   217,   218,     0,   219,
+     220,   221,     0,   222,   223,     0,   224,   225,   226,   227,
+     228,     0,     0,     0,     0,     0,   229,     0,   230,   501,
+       0,   231,   189,   190,   191,     0,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,   210,     0,   211,   212,   213,     0,
+     214,   215,   216,     0,     0,     0,   188,     0,   217,   218,
+       0,   219,   220,   221,     0,   222,   223,     0,   224,   225,
+     226,   227,   228,     0,     0,     0,     0,     0,   229,     0,
+     230,   503,     0,   231,   189,   190,   191,     0,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,     0,   211,   212,
+     213,     0,   214,   215,   216,     0,     0,     0,   188,     0,
+     217,   218,   564,   219,   220,   221,     0,   222,   223,     0,
+     224,   225,   226,   227,   228,     0,     0,     0,     0,     0,
+     229,     0,   230,     0,     0,   231,   189,   190,   191,     0,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,   210,     0,
+     211,   212,   213,     0,   214,   215,   216,     0,     0,     0,
+     188,     0,   217,   218,     0,   219,   220,   221,     0,   222,
+     223,     0,   224,   225,   226,   227,   228,     0,     0,     0,
+       0,     0,   229,     0,   230,     0,     0,   231,   189,   190,
+     191,     0,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+     210,     0,   211,   212,   213,     0,   214,   215,   216,     0,
+       0,     0,   188,     0,   217,   218,     0,   219,   220,   221,
+       0,     0,   223,     0,   224,   225,   226,   227,   228,     0,
+       0,     0,     0,     0,   229,     0,   230,     0,     0,   231,
+     189,   190,   191,     0,   192,   193,   194,   195,   196,   197,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   210,     0,   211,   212,   213,     0,   214,   215,
+     216,     0,     0,     0,   188,     0,     0,     0,     0,   219,
+     220,   221,     0,   222,   223,     0,   224,   225,   226,   227,
+     228,     0,     0,     0,     0,     0,   229,     0,   230,     0,
+       0,   231,   189,   190,   191,     0,   192,   193,   194,   195,
+     196,   197,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   211,   212,   213,     0,
+     214,   215,   216,     0,     0,     0,   188,     0,     0,     0,
+       0,   219,   220,   221,     0,   222,   223,     0,   224,   225,
+     226,   227,   228,     0,     0,     0,     0,     0,   229,     0,
+     230,     0,     0,   231,   189,   190,   191,     0,   192,   193,
+     194,   195,   196,   197,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   211,   212,
+     213,     0,   214,   215,   216,     0,     0,     0,   188,     0,
+       0,     0,     0,     0,   220,   221,     0,   222,   223,     0,
+     224,   225,   226,   227,   228,     0,     0,     0,     0,     0,
+     229,     0,   230,     0,     0,   231,   189,   190,   191,     0,
+     192,   193,   194,   195,   196,   197,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     211,   212,   213,     0,   214,   215,   216,     0,     0,     0,
+     188,     0,     0,     0,     0,     0,     0,   221,     0,   222,
+     223,     0,   224,   225,   226,   227,   228,     0,     0,     0,
+       0,     0,   229,     0,   230,     0,     0,   231,   189,   190,
+     191,     0,   192,   193,   194,   195,   196,   197,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    40,    41,   163,
-     164,   165,     0,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,     0,   184,   185,   186,     0,   187,   188,   189,    46,
-       0,    47,     0,     0,   190,    49,   191,     0,   192,   193,
-     194,   195,   196,   162,   197,   198,   199,   200,   201,     0,
-       0,     0,     0,     0,   202,     0,   203,     0,     0,   204,
-       0,     0,     0,     0,     0,   323,     0,     0,     0,     0,
-     163,   164,   165,     0,   166,   167,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,     0,   184,   185,   186,     0,   187,   188,   189,
-       0,     0,     0,     0,     0,   190,   162,   191,     0,   192,
-     193,   194,   195,   196,     0,   197,   198,   199,   200,   201,
-       0,     0,     0,     0,     0,   202,     0,   203,     0,     0,
-     204,     0,     0,   163,   164,   165,   353,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,     0,   184,   185,   186,     0,
-     187,   188,   189,     0,     0,     0,     0,     0,   190,   162,
-     191,     0,   192,   193,   194,   195,   196,     0,   197,   198,
-     199,   200,   201,     0,     0,     0,     0,     0,   202,     0,
-     203,     0,     0,   204,     0,     0,   163,   164,   165,   394,
-     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,     0,   184,
-     185,   186,     0,   187,   188,   189,     0,     0,     0,     0,
-     162,   190,     0,   191,   345,   192,   193,   194,   195,   196,
-       0,   197,   198,   199,   200,   201,     0,     0,     0,     0,
-       0,   202,     0,   203,     0,     0,   204,   163,   164,   165,
-       0,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,     0,
-     184,   185,   186,     0,   187,   188,   189,     0,     0,     0,
-       0,   162,   190,     0,   191,     0,   192,   193,   194,   195,
-     196,     0,   197,   198,   199,   200,   201,     0,     0,     0,
-       0,     0,   202,     0,   203,   347,     0,   204,   163,   164,
-     165,     0,   166,   167,   168,   169,   170,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-       0,   184,   185,   186,     0,   187,   188,   189,     0,     0,
-       0,     0,   162,   190,     0,   191,   486,   192,   193,   194,
-     195,   196,     0,   197,   198,   199,   200,   201,     0,     0,
-       0,     0,     0,   202,     0,   203,     0,     0,   204,   163,
-     164,   165,     0,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,     0,   184,   185,   186,     0,   187,   188,   189,     0,
-       0,     0,     0,   162,   190,     0,   191,     0,   192,   193,
-     194,   195,   196,     0,   197,   198,   199,   200,   201,     0,
-       0,     0,     0,     0,   202,     0,   203,     0,     0,   204,
-     163,   164,   165,     0,   166,   167,   168,   169,   170,   171,
+       0,     0,   211,   212,   213,     0,   214,   215,   216,     0,
+       0,     0,   188,     0,     0,     0,     0,     0,     0,  -337,
+       0,   222,   223,     0,   224,   225,   226,   227,   228,     0,
+       0,     0,     0,     0,   229,     0,   230,     0,     0,   231,
+     189,   190,   191,     0,  -337,  -337,  -337,  -337,   196,   197,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   184,   185,   186,     0,   187,   188,   189,
-       0,     0,     0,     0,   162,     0,     0,     0,     0,   192,
-     193,   194,   195,   196,     0,   197,   198,   199,   200,   201,
-       0,     0,     0,     0,     0,   202,     0,   203,     0,     0,
-     204,   163,   164,   165,     0,   166,   167,   168,   169,   170,
-     171,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   184,   185,   186,     0,   187,   188,
-     189,     0,     0,     0,     0,   162,     0,     0,     0,     0,
-       0,   193,   194,   195,   196,     0,   197,   198,   199,   200,
-     201,     0,     0,     0,     0,     0,   202,     0,   203,     0,
-       0,   204,   163,   164,   165,     0,   166,   167,   168,   169,
-     170,   171,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   184,   185,   186,     0,   187,
-     188,   189,     0,     0,     0,     0,   162,     0,     0,     0,
-       0,     0,     0,   194,   195,   196,     0,   197,   198,   199,
-     200,   201,     0,     0,     0,     0,     0,   202,     0,   203,
-       0,     0,   204,   163,   164,   165,     0,   166,   167,   168,
-     169,   170,   171,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   184,   185,   186,     0,
-     187,   188,   189,     0,     0,     0,     0,   162,     0,     0,
-       0,     0,     0,     0,  -153,   195,   196,     0,   197,   198,
-     199,   200,   201,     0,     0,     0,     0,     0,   202,     0,
-     203,     0,     0,   204,   163,   164,   165,     0,  -153,  -153,
-    -153,  -153,   170,   171,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   184,   185,   186,
-       0,   187,   188,   189,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   195,   196,     0,   197,
-     198,   199,   200,   201,     0,     0,     0,     0,     0,   202,
-       0,   203,     0,     0,   204
+       0,     0,     0,     0,   211,   212,   213,     0,   214,   215,
+     216,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   222,   223,     0,   224,   225,   226,   227,
+     228,     0,     0,     0,     0,     0,   229,     0,   230,     0,
+       0,   231
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,     0,     0,     0,     0,    89,    58,   244,   107,    48,
-     320,   213,    39,    20,     3,   384,   218,    24,   316,     3,
-      50,    89,   340,     3,   342,   122,   311,     3,     3,     3,
-      37,     0,    39,    40,    41,    19,    43,    44,    45,    19,
-      47,   351,     3,    46,     5,    19,    92,   100,    68,   133,
-      14,   100,    52,    52,    52,    52,    52,   367,     0,     0,
-     100,    34,    36,    27,   100,   122,   364,    18,   386,   100,
-       3,   356,     5,   383,     3,     8,     9,    10,   124,    12,
-     133,   127,   102,    52,   133,   122,   100,   122,     3,    62,
-     463,     3,   122,   133,   467,   468,   123,   133,   105,   102,
-     107,    27,   133,   202,    19,    35,    32,   344,   126,   127,
-      52,    52,    45,   486,   432,   413,   123,    93,    93,   133,
-      46,    51,    55,    56,   127,   128,   363,   500,     3,     3,
-     122,   115,   126,   122,   507,   127,   122,   506,    28,   128,
-     450,   115,   452,    33,    19,    19,   126,   147,   147,   147,
-     147,   147,    99,   100,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,     0,   147,   100,
-     187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
-     197,   198,   199,   200,   201,   202,   203,   224,   102,   226,
-       3,   105,   241,   210,   207,   147,   147,   126,   122,     3,
-     127,   211,   211,   211,   313,   122,   453,   224,     3,   226,
-     223,   423,   105,    90,    91,    92,   132,   100,   125,   100,
-       3,     3,   469,   126,     4,     3,   320,    18,    68,     3,
-      99,   325,   245,   246,    68,     3,     3,     3,     3,   333,
-      20,    21,    22,     4,    24,   122,    26,   124,    99,   122,
-     127,    14,   105,   133,   100,     3,   132,   351,    38,    20,
-      21,    22,     3,    24,   511,    26,    46,    47,    48,    49,
-      54,   133,    89,   367,     3,    54,   132,    38,   295,   122,
-       3,    90,    91,    92,   126,    46,    47,    48,    49,   383,
-     100,   132,     4,   303,   303,   303,   313,   133,   127,   105,
-     102,   311,   311,   311,   102,   114,   115,   116,    20,    21,
-      22,   122,    24,   122,    26,   124,    17,     3,   127,    99,
-     382,   126,    65,   126,   132,    27,    38,   127,   345,    31,
-      32,   368,   133,   126,    40,    47,    48,    49,    99,   352,
-     377,   100,    44,   132,    46,   102,   356,   356,   356,   126,
-     126,   368,   132,   122,   105,     3,   450,   132,   452,     3,
-     377,    67,    68,    69,    27,    71,    72,    73,    74,    75,
-      76,   132,   126,   133,   126,   133,   132,   132,     3,   132,
-     122,   126,    88,   132,    90,    91,    92,   133,    94,    95,
-      96,   303,   132,   132,    52,   133,   132,   147,   391,    58,
-     106,   107,   108,   109,   110,   126,   112,   113,   114,   115,
-     116,   332,   439,   439,   419,    69,   122,   492,   124,   436,
-     478,   127,   419,   433,   460,    27,   483,   386,   360,    90,
-      91,    92,    -1,   411,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   454,   454,   454,   454,   454,    -1,
-     460,   112,   113,   114,   115,   116,    -1,    -1,    -1,    -1,
-      -1,   122,    -1,   124,    -1,    -1,   127,    -1,   478,   478,
-     478,   478,   478,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   492,   492,   492,   492,   492,     0,    -1,    -1,
-       3,     4,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    25,    26,    -1,    -1,    29,    -1,    -1,    40,
-      -1,    -1,    -1,    36,    -1,    38,    39,    -1,    41,    -1,
-      43,    -1,    45,    -1,    47,    48,    49,    -1,    -1,    52,
-      53,    -1,    55,    56,    -1,    -1,    67,    68,    69,    -1,
-      63,    64,    -1,    -1,    75,    76,    -1,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,
-      91,    92,    -1,    94,    95,    96,    -1,    90,    91,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,   109,   110,
-      -1,   112,   113,   114,   115,   116,    -1,    -1,    -1,   112,
-      -1,   122,    -1,   124,   117,   118,   127,    -1,    -1,   122,
-      -1,   124,    -1,   126,    -1,   128,    -1,    -1,    -1,   132,
-       3,     4,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    -1,    -1,    -1,    20,    21,    22,
-      23,    24,    25,    26,    27,    -1,    29,    30,    -1,    32,
-      -1,    -1,    -1,    36,    37,    38,    39,    -1,    41,    42,
-      43,    -1,    45,    46,    47,    48,    49,    -1,    -1,    52,
-      53,    -1,    55,    56,    -1,    -1,    -1,    -1,    -1,    -1,
-      63,    64,    -1,    66,    -1,    -1,    -1,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   112,
-      -1,    -1,    -1,    -1,   117,   118,    -1,    -1,    -1,   122,
-      -1,   124,    -1,   126,    -1,   128,    -1,    -1,    -1,   132,
+       0,     0,     0,     0,     0,    97,    19,    67,    60,   107,
+     141,    24,   275,   146,   147,    28,   119,   442,   186,    50,
+       3,     3,    50,   364,     5,    38,     3,     4,    41,    42,
+       4,   358,    45,    46,    47,    48,    49,    97,   231,    16,
+      17,   457,    34,     3,    18,     3,    20,    21,   500,    23,
+      12,    25,    29,     0,    54,    54,    54,    54,    54,     0,
+       0,   102,   102,    35,    38,    27,    12,    94,    69,    91,
+      62,   560,    46,    47,    48,    49,     5,     5,   531,    51,
+     124,    27,   534,   499,    27,   426,   124,   576,   124,    16,
+      33,   418,   152,   129,   135,   135,   124,     3,     4,   126,
+     113,   234,   129,   104,   112,     3,   119,    54,   116,   562,
+      16,    17,   124,    54,    54,   104,     3,   106,     5,   128,
+     129,   254,   290,    29,   317,   256,   229,   101,   141,   124,
+     393,   112,   473,   146,   147,    95,    16,    95,   128,     3,
+     117,     0,     5,   276,   277,   128,   128,   128,   128,   342,
+       3,   102,     5,   130,     3,     8,     9,    10,   124,   124,
+     134,   129,   425,     3,   589,   165,   165,   165,   165,   165,
+     129,   184,   104,   134,   187,   188,   189,   190,   191,   192,
+     193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
+     203,   204,   205,   206,   207,   208,   209,   210,   106,   128,
+     128,   214,   215,   216,   217,   218,   219,   220,   221,   222,
+     223,   224,   225,   226,   227,   228,   229,   230,   165,   412,
+     102,   234,   128,   236,   165,   165,   127,   102,     3,   397,
+     398,   128,     3,     3,    16,    69,     3,   237,   237,   237,
+     253,   254,   273,   256,    16,   258,   101,    69,   111,   112,
+       3,   213,     5,     6,    26,     8,     9,    10,   361,   522,
+      32,     3,   101,   276,   277,   128,    19,     3,     3,   231,
+     124,    24,    12,    26,    46,    28,    29,   239,   129,   129,
+     543,   414,     3,     4,   102,   106,   102,   249,   135,   135,
+       4,   389,    45,   391,   104,    16,    17,   134,   429,     3,
+      53,     3,    55,    56,    18,    54,    20,    21,    29,    23,
+      54,    25,   372,   104,   104,    36,   135,    91,    71,   124,
+     135,   413,   382,    91,    38,    91,    91,   134,   341,   128,
+       3,     4,   595,    47,    48,    49,   428,     3,   135,    92,
+      93,   102,   129,    16,    17,   134,   444,   439,   361,   135,
+     350,   350,   350,   413,    16,   317,    29,   104,   358,   358,
+     358,     3,     4,   106,    26,   124,   135,   101,   428,    31,
+      32,   124,    15,   126,    16,    17,   128,   130,   102,   439,
+     342,   135,    44,   134,    46,   102,   438,    29,     4,   128,
+     403,   489,   405,   134,   112,   408,   117,   410,   360,     3,
+       4,   414,    18,   128,    20,    21,   135,    23,   421,    25,
+     104,   134,    16,    17,   124,   128,   429,   128,   418,   418,
+     418,   434,    38,     3,     4,    29,    66,   519,   135,   521,
+      46,    47,    48,    49,     3,     4,    16,    17,   116,   111,
+       3,   106,   134,     3,   117,    26,   134,    16,    17,    29,
+     412,   124,   116,   126,    92,    93,    94,   130,   128,   519,
+      29,   521,   537,   134,     3,   128,   541,   542,   135,   124,
+      92,    93,    94,   134,   134,   117,   114,   115,   116,   117,
+     118,   134,   112,   134,   497,   101,   124,   112,   126,   564,
+     490,   129,   505,   128,   116,   117,   118,   134,    92,    93,
+      94,   135,   124,   134,   126,    54,   581,   129,   165,   350,
+     449,   381,    60,   117,   508,   508,   591,   145,   134,    72,
+     570,   471,   126,   523,   523,   523,   523,   523,   552,   529,
+     124,   479,   126,   450,   479,   129,   557,   117,   529,    27,
+     290,   444,    48,   422,    -1,   257,   126,    -1,   117,    -1,
+       3,     4,   552,   552,   552,   552,   552,    -1,    -1,    -1,
+      -1,    -1,    -1,    16,    17,    -1,    -1,    -1,    -1,    -1,
+     570,   570,   570,   570,   570,     0,    29,    -1,     3,     4,
+       5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
+      -1,    -1,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    -1,    -1,    28,    29,    -1,    -1,    40,    -1,    -1,
+      -1,    36,    -1,    38,    39,    -1,    41,    -1,    43,    -1,
+      45,    -1,    47,    48,    49,    -1,    -1,    52,    53,    -1,
+      55,    56,    -1,    -1,    -1,    68,    69,    70,    63,    64,
+      65,    -1,    -1,    76,    77,    -1,    71,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,
+      93,    94,    -1,    96,    97,    98,    -1,    92,    93,    -1,
+      -1,    -1,    -1,    -1,     3,     4,   101,    -1,   111,   112,
+      -1,   114,   115,   116,   117,   118,   111,    16,    17,   114,
+      -1,   124,    -1,   126,   119,   120,   129,    -1,    -1,   124,
+      29,   126,    -1,   128,    -1,   130,    -1,    -1,    -1,   134,
        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,
+      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,
+      63,    64,    65,    -1,    67,    -1,    -1,    -1,    71,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   112,
-      -1,    -1,    -1,    -1,   117,   118,    -1,    -1,    -1,   122,
-      -1,   124,    -1,   126,    -1,   128,    -1,    -1,    -1,   132,
-       3,     4,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    -1,    -1,    -1,    20,    21,    22,
-      23,    24,    25,    26,    27,    -1,    29,    30,    -1,    32,
-      -1,    -1,    -1,    36,    37,    38,    39,    -1,    41,    42,
-      43,    -1,    45,    46,    47,    48,    49,    -1,    -1,    52,
-      53,    -1,    55,    56,    -1,    -1,    -1,    -1,    -1,    -1,
-      63,    64,    -1,    66,    -1,    -1,    -1,    70,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,
+      93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
+      -1,   114,    -1,    -1,    -1,    -1,   119,   120,    -1,    -1,
+      -1,   124,    -1,   126,    -1,   128,    -1,   130,    -1,    -1,
+      -1,   134,     3,     4,     5,     6,    -1,     8,     9,    10,
+      11,    12,    13,    14,    -1,    -1,    -1,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    -1,    28,    29,    30,
+      -1,    32,    -1,    -1,    -1,    36,    37,    38,    39,    -1,
+      41,    42,    43,    -1,    45,    46,    47,    48,    49,    -1,
+      -1,    52,    53,    -1,    55,    56,    -1,    -1,    -1,    -1,
+      -1,    -1,    63,    64,    65,    -1,    67,    -1,    -1,    -1,
+      71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   112,
-      -1,    -1,    -1,    -1,   117,   118,    -1,    -1,    -1,   122,
-      -1,   124,    -1,   126,    -1,   128,    -1,    -1,    -1,   132,
-       3,     4,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    25,    26,    -1,    -1,    29,    -1,    -1,    40,
-      -1,    -1,    -1,    36,    -1,    38,    39,    -1,    41,    -1,
-      43,    -1,    45,    -1,    47,    48,    49,    -1,    -1,    52,
-      53,    -1,    55,    56,    -1,    -1,    -1,    -1,    -1,    -1,
-      63,    64,    -1,    -1,    75,    76,    -1,    70,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,
-      91,    92,    -1,    94,    95,    96,    -1,    90,    91,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,   109,   110,
-      -1,   112,   113,   114,   115,   116,    -1,    -1,    -1,   112,
-      -1,   122,    -1,   124,   117,   118,   127,    -1,    -1,   122,
-      -1,   124,    -1,   126,    -1,   128,    -1,    -1,    -1,   132,
-       3,     4,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    -1,    -1,    -1,    20,    21,    22,
-      23,    24,    25,    26,    -1,    -1,    29,    -1,    -1,    -1,
-      -1,    -1,    -1,    36,    -1,    38,    39,    -1,    41,    -1,
-      43,    -1,    45,    -1,    47,    48,    49,    -1,    -1,    52,
-      53,    -1,    55,    56,    -1,    -1,    -1,    -1,    -1,    -1,
-      63,    64,    -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,
+      -1,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     111,    -1,    -1,   114,    -1,    -1,    -1,    -1,   119,   120,
+      -1,    -1,    -1,   124,    -1,   126,    -1,   128,    -1,   130,
+      -1,    -1,    -1,   134,     3,     4,     5,     6,    -1,     8,
+       9,    10,    11,    12,    13,    14,    -1,    -1,    -1,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    -1,    28,
+      29,    30,    -1,    32,    -1,    -1,    -1,    36,    37,    38,
+      39,    -1,    41,    42,    43,    -1,    45,    46,    47,    48,
+      49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,    -1,
+      -1,    -1,    -1,    -1,    63,    64,    65,    -1,    67,    -1,
+      -1,    -1,    71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   112,
-      -1,    -1,    -1,    -1,   117,   118,    -1,    -1,    -1,   122,
-      -1,   124,    -1,   126,    -1,   128,    -1,    -1,    -1,   132,
-       3,     4,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    -1,    -1,    -1,    20,    21,    22,
-      23,    24,    25,    26,    -1,    -1,    29,    -1,    -1,    -1,
-      -1,    -1,    -1,    36,    -1,    38,    39,    -1,    41,    -1,
-      43,    -1,    45,    -1,    47,    48,    49,    -1,    -1,    52,
-      53,    -1,    55,    56,    -1,    -1,    -1,    -1,    -1,    -1,
-      63,    64,    -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,
+      -1,    -1,    -1,    92,    93,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   111,    -1,    -1,   114,    -1,    -1,    -1,    -1,
+     119,   120,    -1,    -1,    -1,   124,    -1,   126,    -1,   128,
+      -1,   130,    -1,    -1,    -1,   134,     3,     4,     5,     6,
+      -1,     8,     9,    10,    11,    12,    13,    14,    -1,    -1,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
+      -1,    28,    29,    -1,    -1,    40,    -1,    -1,    -1,    36,
+      -1,    38,    39,    -1,    41,    -1,    43,    -1,    45,    -1,
+      47,    48,    49,    -1,    -1,    52,    53,    -1,    55,    56,
+      -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    65,    -1,
+      -1,    76,    77,    -1,    71,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,
+      -1,    96,    97,    98,    -1,    92,    93,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   101,    -1,   111,   112,    -1,   114,
+     115,   116,   117,   118,   111,    -1,    -1,   114,    -1,   124,
+      -1,   126,   119,   120,   129,    -1,    -1,   124,    -1,   126,
+      -1,   128,    -1,   130,    -1,    -1,    -1,   134,     3,     4,
+       5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
+      -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
+      25,    -1,    -1,    28,    29,    -1,    -1,    -1,    -1,    -1,
+      -1,    36,    -1,    38,    39,    -1,    41,    -1,    43,    -1,
+      45,    -1,    47,    48,    49,    -1,    -1,    52,    53,    -1,
+      55,    56,    -1,    -1,    -1,    -1,    -1,    -1,    63,    64,
+      65,    -1,    -1,    -1,    -1,    -1,    71,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   112,
-      -1,    -1,    -1,    -1,   117,   118,    -1,    -1,    -1,   122,
-      -1,   124,    -1,   126,    -1,   128,    -1,    -1,    -1,   132,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   101,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,    -1,   114,
+      -1,    -1,    -1,    -1,   119,   120,    -1,    -1,    -1,   124,
+      -1,   126,    -1,   128,    -1,   130,    -1,    -1,    -1,   134,
        3,     4,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    -1,    -1,    -1,    20,    21,    22,
-      23,    24,    25,    26,    -1,    -1,    29,    -1,    -1,    -1,
+      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,
+      63,    64,    65,    -1,    -1,    -1,    -1,    -1,    71,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   112,
-      -1,    -1,    -1,    -1,   117,   118,    -1,    -1,    -1,   122,
-      -1,   124,    -1,   126,    -1,   128,    -1,    -1,    -1,   132,
-       3,     4,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    -1,    -1,    -1,    20,    21,    22,
-      23,    24,    25,    26,    -1,    -1,    29,    -1,    -1,    -1,
-      -1,    -1,    -1,    36,    -1,    38,    39,    -1,    41,    -1,
-      43,    -1,    45,    -1,    47,    48,    49,    -1,    -1,    52,
-      53,    -1,    55,    56,    -1,    -1,    -1,    -1,    -1,    -1,
-      63,    64,    -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,
+      93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
+      -1,   114,    -1,    -1,    -1,    -1,   119,   120,    -1,    -1,
+      -1,   124,    -1,   126,    -1,   128,    -1,   130,    -1,    -1,
+      -1,   134,     3,     4,     5,     6,    -1,     8,     9,    10,
+      11,    12,    13,    14,    -1,    -1,    -1,    18,    19,    20,
+      21,    22,    23,    24,    25,    -1,    -1,    28,    29,    -1,
+      -1,    -1,    -1,    -1,    -1,    36,    -1,    38,    39,    -1,
+      41,    -1,    43,    -1,    45,    -1,    47,    48,    49,    -1,
+      -1,    52,    53,    -1,    55,    56,    -1,    -1,    -1,    -1,
+      -1,    -1,    63,    64,    65,    -1,    -1,    -1,    -1,    -1,
+      71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   112,
-      -1,    -1,    -1,    -1,   117,   118,    -1,    -1,    -1,   122,
-      -1,   124,    -1,   126,    -1,   128,    -1,     0,    -1,   132,
-       3,     4,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    -1,    -1,    19,    20,    21,    22,
-      23,    24,    25,    26,    -1,    -1,    29,    -1,    -1,    -1,
-      -1,    -1,    -1,    36,    -1,    38,    39,    -1,    41,    -1,
-      43,    -1,    45,    -1,    47,    48,    49,    -1,    -1,    52,
-      53,    -1,    55,    56,    -1,    -1,    -1,    -1,    -1,    -1,
-      63,    64,    -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,
+      -1,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     111,    -1,    -1,   114,    -1,    -1,    -1,    -1,   119,   120,
+      -1,    -1,    -1,   124,    -1,   126,    -1,   128,    -1,   130,
+      -1,    -1,    -1,   134,     3,     4,     5,     6,    -1,     8,
+       9,    10,    11,    12,    13,    14,    -1,    -1,    -1,    18,
+      19,    20,    21,    22,    23,    24,    25,    -1,    -1,    28,
+      29,    -1,    -1,    -1,    -1,    -1,    -1,    36,    -1,    38,
+      39,    -1,    41,    -1,    43,    -1,    45,    -1,    47,    48,
+      49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,    -1,
+      -1,    -1,    -1,    -1,    63,    64,    65,    -1,    -1,    -1,
+      -1,    -1,    71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   112,
-      -1,    -1,    -1,    -1,   117,   118,    -1,    -1,    -1,   122,
-      -1,   124,    -1,   126,    -1,   128,     3,     4,     5,     6,
-      -1,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      -1,    18,    -1,    20,    21,    22,    23,    24,    25,    26,
-      27,    -1,    29,    30,    -1,    32,    -1,    -1,    -1,    36,
-      37,    38,    39,    -1,    41,    42,    43,    -1,    45,    46,
+      -1,    -1,    -1,    92,    93,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   111,    -1,    -1,   114,    -1,    -1,    -1,    -1,
+     119,   120,    -1,    -1,    -1,   124,    -1,   126,    -1,   128,
+      -1,   130,    -1,     0,    -1,   134,     3,     4,     5,     6,
+      -1,     8,     9,    10,    11,    12,    13,    14,    -1,    -1,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
+      -1,    28,    29,    -1,    -1,    -1,    -1,    -1,    -1,    36,
+      -1,    38,    39,    -1,    41,    -1,    43,    -1,    45,    -1,
       47,    48,    49,    -1,    -1,    52,    53,    -1,    55,    56,
-      -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    66,
-      -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    65,    -1,
+      -1,    -1,    -1,    -1,    71,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    92,    93,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   101,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   111,    -1,    -1,   114,    -1,    -1,
+      -1,    -1,   119,   120,    -1,    -1,    -1,   124,    -1,   126,
+      -1,   128,    -1,   130,     3,     4,     5,     6,    -1,     8,
+       9,    10,    11,    12,    13,    14,    -1,    16,    -1,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    -1,    28,
+      29,    30,    -1,    32,    -1,    -1,    -1,    36,    37,    38,
+      39,    -1,    41,    42,    43,    -1,    45,    46,    47,    48,
+      49,    -1,    -1,    52,    53,    -1,    55,    56,    -1,    -1,
+      -1,    -1,    -1,    -1,    63,    64,    65,    -1,    67,    -1,
+      -1,    -1,    71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    90,    91,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   112,    -1,    -1,    -1,    -1,
-     117,   118,    -1,    -1,    -1,   122,    -1,   124,    -1,   126,
-      -1,   128,     3,     4,     5,     6,    -1,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    -1,    -1,    -1,    20,
-      21,    22,    23,    24,    25,    26,    27,    -1,    29,    30,
+      -1,    -1,    -1,    92,    93,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   111,    -1,    -1,   114,    -1,    -1,    -1,    -1,
+     119,   120,    -1,    -1,    -1,   124,    -1,   126,    -1,   128,
+      -1,   130,     3,     4,     5,     6,    -1,     8,     9,    10,
+      11,    12,    13,    14,    -1,    -1,    -1,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    -1,    28,    29,    30,
       -1,    32,    -1,    -1,    -1,    36,    37,    38,    39,    -1,
       41,    42,    43,    -1,    45,    46,    47,    48,    49,    -1,
       -1,    52,    53,    -1,    55,    56,    -1,    -1,    -1,    -1,
-      -1,    -1,    63,    64,    -1,    66,    -1,    -1,    -1,    70,
+      -1,    -1,    63,    64,    65,    -1,    67,    -1,    -1,    -1,
+      71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,
-      91,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    99,    -1,
-       3,    -1,     5,     6,    -1,     8,     9,    10,    11,    12,
-      -1,   112,    -1,    -1,    -1,    -1,   117,   118,    -1,    -1,
-      -1,   122,    25,   124,    27,   126,    29,   128,    -1,    32,
-      -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,
-      43,    -1,    45,    46,    -1,    -1,    -1,    -1,    -1,    -1,
-      53,    -1,    55,    56,    -1,    -1,    -1,    -1,    -1,    -1,
-      63,    -1,    -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,
-       3,    -1,     5,     6,    -1,     8,     9,    10,    11,    12,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    -1,
-      -1,    -1,    25,    -1,    27,    -1,    29,    -1,    -1,    -1,
-      -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,   112,
-      43,    -1,    45,    -1,   117,   118,    -1,    -1,    -1,   122,
-      53,   124,    55,    56,    -1,   128,    -1,    -1,    -1,    -1,
-      63,    -1,    -1,    -1,    -1,    -1,    -1,    70,    -1,    -1,
-       3,    -1,     5,     6,    -1,     8,     9,    10,    11,    12,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    -1,
-      -1,    -1,    25,    -1,    27,    -1,    29,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   112,
-      -1,    -1,    45,    -1,   117,   118,    -1,    -1,    -1,   122,
-      53,   124,    55,    56,    -1,   128,    -1,    -1,    -1,    -1,
-      -1,    -1,    40,    -1,    -1,    -1,    -1,    70,    -1,    -1,
+      -1,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     101,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     111,    -1,    -1,   114,    -1,    -1,    -1,    -1,   119,   120,
+      -1,    -1,    -1,   124,    -1,   126,    -1,   128,     3,   130,
+       5,     6,    -1,     8,     9,    10,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    19,    -1,    -1,    -1,    -1,    24,
+      -1,    26,    -1,    28,    29,    -1,    -1,    32,    -1,    -1,
+      -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,    43,    -1,
+      45,    46,    -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,
+      55,    56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    64,
+      -1,    -1,    -1,    -1,    -1,    -1,    71,    -1,    -1,    -1,
+       3,    -1,     5,     6,    -1,     8,     9,    10,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    19,    92,    93,    -1,
+      -1,    24,    -1,    26,    -1,    28,    29,    -1,    -1,    -1,
+      -1,    -1,    -1,    36,    -1,    -1,   111,    -1,    -1,   114,
+      43,    -1,    45,    -1,   119,   120,    -1,    -1,    -1,   124,
+      53,   126,    55,    56,    -1,   130,    -1,    -1,    -1,    -1,
+      -1,    64,    -1,    -1,    -1,    -1,    -1,    -1,    71,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    67,
-      68,    69,    -1,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    -1,    90,    91,    92,    -1,    94,    95,    96,   122,
-      -1,   124,    -1,    -1,   102,   128,   104,    -1,   106,   107,
-     108,   109,   110,    40,   112,   113,   114,   115,   116,    -1,
-      -1,    -1,    -1,    -1,   122,    -1,   124,    -1,    -1,   127,
-      -1,    -1,    -1,    -1,    -1,   133,    -1,    -1,    -1,    -1,
-      67,    68,    69,    -1,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    -1,    90,    91,    92,    -1,    94,    95,    96,
-      -1,    -1,    -1,    -1,    -1,   102,    40,   104,    -1,   106,
-     107,   108,   109,   110,    -1,   112,   113,   114,   115,   116,
-      -1,    -1,    -1,    -1,    -1,   122,    -1,   124,    -1,    -1,
-     127,    -1,    -1,    67,    68,    69,   133,    71,    72,    73,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,
+      93,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
+      -1,   114,    -1,    -1,    -1,    -1,   119,   120,    -1,    -1,
+      -1,   124,    -1,   126,    68,    69,    70,   130,    72,    73,
       74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    88,    -1,    90,    91,    92,    -1,
-      94,    95,    96,    -1,    -1,    -1,    -1,    -1,   102,    40,
-     104,    -1,   106,   107,   108,   109,   110,    -1,   112,   113,
-     114,   115,   116,    -1,    -1,    -1,    -1,    -1,   122,    -1,
-     124,    -1,    -1,   127,    -1,    -1,    67,    68,    69,   133,
-      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    -1,    90,
-      91,    92,    -1,    94,    95,    96,    -1,    -1,    -1,    -1,
-      40,   102,    -1,   104,   105,   106,   107,   108,   109,   110,
-      -1,   112,   113,   114,   115,   116,    -1,    -1,    -1,    -1,
-      -1,   122,    -1,   124,    -1,    -1,   127,    67,    68,    69,
-      -1,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    -1,
-      90,    91,    92,    -1,    94,    95,    96,    -1,    -1,    -1,
-      -1,    40,   102,    -1,   104,    -1,   106,   107,   108,   109,
-     110,    -1,   112,   113,   114,   115,   116,    -1,    -1,    -1,
-      -1,    -1,   122,    -1,   124,   125,    -1,   127,    67,    68,
-      69,    -1,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      -1,    90,    91,    92,    -1,    94,    95,    96,    -1,    -1,
-      -1,    -1,    40,   102,    -1,   104,   105,   106,   107,   108,
-     109,   110,    -1,   112,   113,   114,   115,   116,    -1,    -1,
-      -1,    -1,    -1,   122,    -1,   124,    -1,    -1,   127,    67,
-      68,    69,    -1,    71,    72,    73,    74,    75,    76,    77,
+      84,    85,    86,    87,    88,    89,    90,    -1,    92,    93,
+      94,    -1,    96,    97,    98,    -1,    -1,    -1,    -1,    -1,
+     104,   105,    -1,   107,   108,   109,    40,   111,   112,    -1,
+     114,   115,   116,   117,   118,    -1,    -1,    -1,    -1,    -1,
+     124,    -1,   126,    -1,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,    -1,    -1,    68,    69,    70,    -1,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    -1,    92,    93,
+      94,    -1,    96,    97,    98,    -1,    -1,    -1,    -1,    -1,
+     104,   105,    -1,   107,   108,   109,    40,   111,   112,    -1,
+     114,   115,   116,   117,   118,    -1,    -1,    -1,    -1,    -1,
+     124,    -1,   126,    -1,    -1,   129,    -1,    -1,    -1,    -1,
+      -1,   135,    -1,    -1,    68,    69,    70,    -1,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    -1,    92,    93,
+      94,    -1,    96,    97,    98,    -1,    -1,    -1,    40,    -1,
+     104,   105,   106,   107,   108,   109,    -1,   111,   112,    -1,
+     114,   115,   116,   117,   118,    -1,    -1,    -1,    -1,    -1,
+     124,    -1,   126,    -1,    -1,   129,    68,    69,    70,    -1,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    -1,
+      92,    93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,
+      40,    -1,   104,   105,    -1,   107,   108,   109,    -1,   111,
+     112,    -1,   114,   115,   116,   117,   118,    -1,    -1,    -1,
+      -1,    -1,   124,    -1,   126,   127,    -1,   129,    68,    69,
+      70,    -1,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    -1,    92,    93,    94,    -1,    96,    97,    98,    -1,
+      -1,    -1,    40,    -1,   104,   105,    -1,   107,   108,   109,
+      -1,   111,   112,    -1,   114,   115,   116,   117,   118,    -1,
+      -1,    -1,    -1,    -1,   124,    -1,   126,   127,    -1,   129,
+      68,    69,    70,    -1,    72,    73,    74,    75,    76,    77,
       78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    -1,    90,    91,    92,    -1,    94,    95,    96,    -1,
-      -1,    -1,    -1,    40,   102,    -1,   104,    -1,   106,   107,
-     108,   109,   110,    -1,   112,   113,   114,   115,   116,    -1,
-      -1,    -1,    -1,    -1,   122,    -1,   124,    -1,    -1,   127,
-      67,    68,    69,    -1,    71,    72,    73,    74,    75,    76,
+      88,    89,    90,    -1,    92,    93,    94,    -1,    96,    97,
+      98,    -1,    -1,    -1,    40,    -1,   104,   105,    -1,   107,
+     108,   109,    -1,   111,   112,    -1,   114,   115,   116,   117,
+     118,    -1,    -1,    -1,    -1,    -1,   124,    -1,   126,   127,
+      -1,   129,    68,    69,    70,    -1,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    -1,    92,    93,    94,    -1,
+      96,    97,    98,    -1,    -1,    -1,    40,    -1,   104,   105,
+      -1,   107,   108,   109,    -1,   111,   112,    -1,   114,   115,
+     116,   117,   118,    -1,    -1,    -1,    -1,    -1,   124,    -1,
+     126,   127,    -1,   129,    68,    69,    70,    -1,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    -1,    92,    93,
+      94,    -1,    96,    97,    98,    -1,    -1,    -1,    40,    -1,
+     104,   105,   106,   107,   108,   109,    -1,   111,   112,    -1,
+     114,   115,   116,   117,   118,    -1,    -1,    -1,    -1,    -1,
+     124,    -1,   126,    -1,    -1,   129,    68,    69,    70,    -1,
+      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    -1,
+      92,    93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,
+      40,    -1,   104,   105,    -1,   107,   108,   109,    -1,   111,
+     112,    -1,   114,   115,   116,   117,   118,    -1,    -1,    -1,
+      -1,    -1,   124,    -1,   126,    -1,    -1,   129,    68,    69,
+      70,    -1,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    -1,    92,    93,    94,    -1,    96,    97,    98,    -1,
+      -1,    -1,    40,    -1,   104,   105,    -1,   107,   108,   109,
+      -1,    -1,   112,    -1,   114,   115,   116,   117,   118,    -1,
+      -1,    -1,    -1,    -1,   124,    -1,   126,    -1,    -1,   129,
+      68,    69,    70,    -1,    72,    73,    74,    75,    76,    77,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    90,    -1,    92,    93,    94,    -1,    96,    97,
+      98,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,   107,
+     108,   109,    -1,   111,   112,    -1,   114,   115,   116,   117,
+     118,    -1,    -1,    -1,    -1,    -1,   124,    -1,   126,    -1,
+      -1,   129,    68,    69,    70,    -1,    72,    73,    74,    75,
+      76,    77,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,    -1,
+      96,    97,    98,    -1,    -1,    -1,    40,    -1,    -1,    -1,
+      -1,   107,   108,   109,    -1,   111,   112,    -1,   114,   115,
+     116,   117,   118,    -1,    -1,    -1,    -1,    -1,   124,    -1,
+     126,    -1,    -1,   129,    68,    69,    70,    -1,    72,    73,
+      74,    75,    76,    77,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,
+      94,    -1,    96,    97,    98,    -1,    -1,    -1,    40,    -1,
+      -1,    -1,    -1,    -1,   108,   109,    -1,   111,   112,    -1,
+     114,   115,   116,   117,   118,    -1,    -1,    -1,    -1,    -1,
+     124,    -1,   126,    -1,    -1,   129,    68,    69,    70,    -1,
+      72,    73,    74,    75,    76,    77,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    90,    91,    92,    -1,    94,    95,    96,
-      -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,   106,
-     107,   108,   109,   110,    -1,   112,   113,   114,   115,   116,
-      -1,    -1,    -1,    -1,    -1,   122,    -1,   124,    -1,    -1,
-     127,    67,    68,    69,    -1,    71,    72,    73,    74,    75,
-      76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    90,    91,    92,    -1,    94,    95,
-      96,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,
-      -1,   107,   108,   109,   110,    -1,   112,   113,   114,   115,
-     116,    -1,    -1,    -1,    -1,    -1,   122,    -1,   124,    -1,
-      -1,   127,    67,    68,    69,    -1,    71,    72,    73,    74,
-      75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    90,    91,    92,    -1,    94,
-      95,    96,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,
-      -1,    -1,    -1,   108,   109,   110,    -1,   112,   113,   114,
-     115,   116,    -1,    -1,    -1,    -1,    -1,   122,    -1,   124,
-      -1,    -1,   127,    67,    68,    69,    -1,    71,    72,    73,
-      74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    92,    -1,
-      94,    95,    96,    -1,    -1,    -1,    -1,    40,    -1,    -1,
-      -1,    -1,    -1,    -1,   108,   109,   110,    -1,   112,   113,
-     114,   115,   116,    -1,    -1,    -1,    -1,    -1,   122,    -1,
-     124,    -1,    -1,   127,    67,    68,    69,    -1,    71,    72,
-      73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    92,
-      -1,    94,    95,    96,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   109,   110,    -1,   112,
-     113,   114,   115,   116,    -1,    -1,    -1,    -1,    -1,   122,
-      -1,   124,    -1,    -1,   127
+      92,    93,    94,    -1,    96,    97,    98,    -1,    -1,    -1,
+      40,    -1,    -1,    -1,    -1,    -1,    -1,   109,    -1,   111,
+     112,    -1,   114,   115,   116,   117,   118,    -1,    -1,    -1,
+      -1,    -1,   124,    -1,   126,    -1,    -1,   129,    68,    69,
+      70,    -1,    72,    73,    74,    75,    76,    77,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    92,    93,    94,    -1,    96,    97,    98,    -1,
+      -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,   109,
+      -1,   111,   112,    -1,   114,   115,   116,   117,   118,    -1,
+      -1,    -1,    -1,    -1,   124,    -1,   126,    -1,    -1,   129,
+      68,    69,    70,    -1,    72,    73,    74,    75,    76,    77,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    92,    93,    94,    -1,    96,    97,
+      98,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   111,   112,    -1,   114,   115,   116,   117,
+     118,    -1,    -1,    -1,    -1,    -1,   124,    -1,   126,    -1,
+      -1,   129
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
+static const yytype_uint16 yystos[] =
 {
        0,     3,     4,     5,     6,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    29,    36,    38,    39,    41,    43,    45,
-      47,    48,    49,    52,    53,    55,    56,    63,    64,    70,
-      90,    91,    99,   112,   117,   118,   122,   124,   126,   128,
-     135,   136,   137,   138,   144,   147,   148,   154,   158,   159,
-     160,   161,   163,   171,   179,   182,   185,   188,   189,   190,
-     191,   195,   197,   206,   214,   217,   230,   231,   232,   235,
-     236,   237,   238,   241,   243,    89,    50,   122,   122,   164,
-     122,     3,    19,   126,   183,   184,    18,     3,   237,     3,
-     216,   237,   122,   184,   220,   122,   126,   122,   127,   237,
-     122,   234,   237,   239,   240,   237,   237,   237,   237,   237,
-     235,   226,   227,   228,   234,    30,    32,    37,    42,    46,
-      66,    99,   132,   143,   144,   145,   148,   150,   165,   166,
-     181,   189,   233,   242,     3,     0,   138,   126,     3,    46,
-     150,   156,   157,   236,    27,    31,    32,    44,    46,   205,
-     191,   100,    40,    67,    68,    69,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    90,    91,    92,    94,    95,    96,
-     102,   104,   106,   107,   108,   109,   110,   112,   113,   114,
-     115,   116,   122,   124,   127,     3,   122,   162,   145,   146,
-     172,   187,   126,   127,     3,   229,   122,   235,   127,   237,
-     180,   226,     3,   155,   105,   132,   100,   133,   125,   100,
-     234,     3,     3,   151,   152,   235,   235,   151,     3,   132,
-     145,   126,    18,   136,     3,    99,    68,    35,    51,   213,
-       3,     3,     3,   237,   237,   237,   237,   237,   237,   237,
-     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
-     237,   237,   237,   237,   237,   237,     3,   237,   237,   237,
-     237,   237,   237,   237,   237,   237,   237,   237,   237,   237,
-     237,   237,   226,   237,     3,   122,   128,   235,    99,    14,
-     237,    99,   139,   140,   141,   147,   148,   195,   197,   206,
-     214,   186,   183,   122,   225,     3,    93,   210,   211,   212,
-     133,     3,   115,   133,   142,   143,   133,   235,   234,   234,
-     105,   224,   100,   143,     3,   132,   224,   235,   235,     3,
-      54,   192,    54,   193,   207,   105,   133,   125,    89,   237,
-       3,   133,   122,   133,   132,   141,   126,   139,   226,   102,
-     105,   208,   212,   133,   100,   146,   132,   133,   105,     3,
-      36,   115,   184,   219,   220,   221,   223,   102,   149,   152,
-     132,   102,    99,   133,   122,   221,    17,   194,   221,   222,
-     126,   224,   237,     3,   133,   146,   235,   126,   139,   132,
-     133,     3,     5,     8,     9,    10,    12,    45,    55,    56,
-     209,   223,   224,    93,   212,    28,    33,   173,   175,   177,
-     178,   146,   234,   127,   234,     3,     5,   236,   146,   210,
-     222,   126,   100,   198,   149,   133,    34,    62,   167,   168,
-     169,   170,   132,   208,   126,   212,   126,   122,   173,   175,
-      65,   153,   133,   133,   196,   221,    46,    99,   189,   202,
-     203,   204,   237,   105,   132,   169,   170,   218,   176,     3,
-     146,   146,   224,    99,   144,   148,   189,   199,   200,   201,
-     206,   214,     3,    27,   132,   204,   105,   142,   142,   142,
-     224,   126,   126,   132,   201,   213,   142,   132,   132,   133,
-     215,   199,     3,   174,   142,   132,   122,   126,   132,   210,
-     142,   133,   132,   224
+      13,    14,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    28,    29,    36,    38,    39,    41,    43,    45,
+      47,    48,    49,    52,    53,    55,    56,    63,    64,    65,
+      71,    92,    93,   101,   111,   114,   119,   120,   124,   126,
+     128,   130,   137,   138,   139,   140,   146,   149,   150,   156,
+     160,   161,   162,   163,   165,   173,   181,   184,   185,   188,
+     191,   192,   193,   194,   198,   200,   209,   214,   215,   216,
+     226,   234,   237,   250,   251,   252,   257,   261,   265,   266,
+     268,   269,   270,    91,    50,   124,   124,   166,   124,     3,
+       4,    16,    17,    29,   128,   186,   187,    16,     3,   261,
+       3,   236,   261,   124,     3,   187,   240,   261,   128,   124,
+     129,    16,   261,   124,     3,     5,     8,     9,    10,   258,
+     259,   260,   261,   261,   261,   261,   261,   256,   261,   246,
+     247,   248,   254,   261,    30,    32,    37,    42,    46,    67,
+     101,   134,   145,   146,   147,   150,   152,   167,   168,   183,
+     192,   253,     3,     0,   140,   128,     3,    46,   152,   158,
+     159,   257,   147,   148,    16,    26,    31,    32,    44,    46,
+     208,   267,   194,     3,   128,   221,   225,   102,    40,    68,
+      69,    70,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    92,    93,    94,    96,    97,    98,   104,   105,   107,
+     108,   109,   111,   112,   114,   115,   116,   117,   118,   124,
+     126,   129,     3,   124,   164,   148,   174,   190,   128,   129,
+     186,   187,   239,   240,   241,   249,   124,   255,   256,   129,
+     182,   246,     3,   104,   157,   134,   106,   102,   102,   135,
+     127,   102,   254,     3,     3,   153,   154,   255,   255,   153,
+       3,   134,   147,   128,   138,     3,   101,    69,   101,     3,
+      35,    51,   233,     3,     3,   210,   261,     3,   221,   227,
+     228,   229,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   261,   117,   130,   186,   264,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261,   261,   261,   261,   246,   261,     3,     4,   117,
+     124,   126,   130,   263,   264,   255,    12,   261,   101,   141,
+     142,   143,   149,   150,   198,   200,   209,   234,   189,   186,
+     129,   124,   245,     3,    95,   230,   231,   232,   135,   117,
+     186,   144,   145,   135,   261,   255,   254,   259,   261,   106,
+     244,   102,   145,   134,   244,   255,   255,   104,     3,    54,
+     195,    54,   196,     3,   211,   212,   222,   104,   104,   112,
+     116,   217,   229,   126,   264,   106,   135,   127,   262,   261,
+     126,   264,    91,   135,   124,   135,   134,   143,   128,   141,
+     246,   104,   106,   213,   232,   135,   102,   134,   135,   106,
+      36,   117,   241,   243,   104,   151,   154,   134,   101,   135,
+       3,     5,   124,   241,    15,   197,   241,   242,   128,   244,
+     102,   134,     5,   221,     5,   221,   218,   223,   261,   261,
+     261,   127,   261,   264,   148,   255,   128,   141,   134,   135,
+     261,   243,   244,    95,   232,    27,    33,   175,   177,   179,
+     180,   148,   254,   261,   257,   148,   230,   242,   128,   102,
+     201,   151,   212,   112,     5,   111,   112,   128,   219,   224,
+     226,   127,   135,   127,   135,    34,    62,   169,   170,   171,
+     172,   134,   213,   128,   232,   128,   124,   175,   177,    66,
+     155,   135,   135,   199,   241,    46,   101,   192,   205,   206,
+     207,   116,   261,   111,   226,   223,   261,   106,   134,   171,
+     172,   238,   178,     3,   148,   148,   244,   101,   146,   150,
+     192,   202,   203,   204,   209,   234,     3,    26,   134,   207,
+     225,   220,   116,   223,   106,   144,   144,   144,   244,   128,
+     128,   134,   204,   233,   218,   134,   225,   144,   134,   134,
+     135,   235,   202,     3,   112,   218,   176,   144,   134,   124,
+     112,   128,   134,   230,   144,   135,   134,   244
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -4116,11 +4534,33 @@ yyreduce:
   switch (yyn)
     {
         
+    case 13:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 1929 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);}
+    }
+    break;
+
+
+  
+    case 24:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 1941 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);}
+    }
+    break;
+
+
+  
     case 26:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1896 "parser.y"
+#line 1944 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
@@ -4131,7 +4571,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1897 "parser.y"
+#line 1945 "parser.y"
     {(yyval.code)=code_new();}
     }
     break;
@@ -4142,8 +4582,10 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1899 "parser.y"
-    {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));}
+#line 1947 "parser.y"
+    {
+    (yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));
+}
     }
     break;
 
@@ -4153,98 +4595,99 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1900 "parser.y"
+#line 1950 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
-    case 41:
+    case 43:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1914 "parser.y"
+#line 1966 "parser.y"
     {(yyval.code)=(yyvsp[(2) - (3)].code);}
     }
     break;
 
 
   
-    case 42:
+    case 44:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1915 "parser.y"
+#line 1967 "parser.y"
     {(yyval.code)=0;}
     }
     break;
 
 
   
-    case 43:
+    case 45:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1918 "parser.y"
+#line 1970 "parser.y"
     {(yyval.code)=0;}
     }
     break;
 
 
   
-    case 50:
+    case 52:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1925 "parser.y"
-    {(yyval.code)=(yyvsp[(3) - (4)].code);}
+#line 1977 "parser.y"
+    {
+    PASS_ALWAYS 
+    if(as3_pass) {
+        (yyval.code) = (yyvsp[(3) - (4)].code);
+    } else {
+        (yyval.code) = 0;
     }
-    break;
-
-
-  
-    case 51:
-    if(as3_pass==2) {
-
-/* Line 1464 of skeleton.m4  */
-#line 1927 "parser.y"
-    {/*TODO*/(yyval.code)=0;}
+    as3_pass=(yyvsp[(1) - (4)].number_int);
+}
     }
     break;
 
 
   
-    case 52:
+    case 53:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1931 "parser.y"
+#line 1989 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (2)].code);}
     }
     break;
 
 
   
-    case 53:
+    case 54:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1932 "parser.y"
+#line 1990 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
-    case 54:
+    case 55:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1936 "parser.y"
+#line 1994 "parser.y"
     {
-    code_t**cc = &global->init->method->body->code;
-    *cc = code_append(*cc, (yyvsp[(1) - (1)].code));
+    if((yyvsp[(1) - (1)].code)) {
+        if(!global->init) 
+            global->init = abc_initscript(global->file);
+        code_t**cc = &global->init->method->body->code;
+        *cc = code_append(*cc, (yyvsp[(1) - (1)].code));
+    }
 }
     }
     break;
@@ -4255,8 +4698,16 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1947 "parser.y"
-    {(yyval.value)=(yyvsp[(2) - (2)].value);}
+#line 2005 "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;
 
@@ -4266,10 +4717,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1948 "parser.y"
-    {(yyval.value).c=abc_pushundefined(0);
-                                  (yyval.value).t=TYPE_ANY;
-                                 }
+#line 2024 "parser.y"
+    {(yyval.node)=(yyvsp[(2) - (2)].node);}
     }
     break;
 
@@ -4279,8 +4728,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1952 "parser.y"
-    {(yyval.code)=(yyvsp[(2) - (2)].code);}
+#line 2025 "parser.y"
+    {(yyval.node)=mkdummynode();}
     }
     break;
 
@@ -4290,7 +4739,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1953 "parser.y"
+#line 2027 "parser.y"
     {(yyval.code)=(yyvsp[(2) - (2)].code);}
     }
     break;
@@ -4301,8 +4750,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1955 "parser.y"
-    {(yyval.code) = (yyvsp[(1) - (1)].code);}
+#line 2028 "parser.y"
+    {(yyval.code)=(yyvsp[(2) - (2)].code);}
     }
     break;
 
@@ -4312,8 +4761,8 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1956 "parser.y"
-    {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));}
+#line 2030 "parser.y"
+    {(yyval.code) = (yyvsp[(1) - (1)].code);}
     }
     break;
 
@@ -4323,20 +4772,26 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 1959 "parser.y"
-    {
-PASS12
-    if(variable_exists((yyvsp[(1) - (3)].id)))
-        syntaxerror("Variable %s already defined", (yyvsp[(1) - (3)].id));
+#line 2031 "parser.y"
+    {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));}
+    }
+    break;
+
+
+  
+    case 63:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2034 "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) {
@@ -4355,21 +4810,25 @@ PASS2
 
     (yyval.code) = slot?abc_getscopeobject(0, 1):0;
     
+    typedcode_t v = node_read((yyvsp[(3) - (3)].node));
+    if(!is_subtype_of(v.t, (yyvsp[(2) - (3)].classinfo))) {
+        syntaxerror("Can't convert %s to %s", v.t->name, (yyvsp[(2) - (3)].classinfo)->name);
+    }
     if((yyvsp[(2) - (3)].classinfo)) {
-        if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) {
-            (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c);
-            (yyval.code) = converttype((yyval.code), (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo));
+        if(v.c->prev || v.c->opcode != OPCODE_PUSHUNDEFINED) {
+            (yyval.code) = code_append((yyval.code), v.c);
+            (yyval.code) = converttype((yyval.code), v.t, (yyvsp[(2) - (3)].classinfo));
         } else {
-            code_free((yyvsp[(3) - (3)].value).c);
+            code_free(v.c);
             (yyval.code) = defaultvalue((yyval.code), (yyvsp[(2) - (3)].classinfo));
         }
     } else {
-        if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) {
-            (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c);
+        if(v.c->prev || v.c->opcode != OPCODE_PUSHUNDEFINED) {
+            (yyval.code) = code_append((yyval.code), v.c);
             (yyval.code) = abc_coerce_a((yyval.code));
         } else {
             // don't do anything
-            code_free((yyvsp[(3) - (3)].value).c);
+            code_free(v.c);
             code_free((yyval.code));
             (yyval.code) = 0;
             break;
@@ -4386,44 +4845,44 @@ PASS2
 
 
   
-    case 63:
+    case 64:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2019 "parser.y"
+#line 2093 "parser.y"
     {(yyval.code) = code_new();}
     }
     break;
 
 
   
-    case 64:
+    case 65:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2020 "parser.y"
+#line 2094 "parser.y"
     {(yyval.code)=(yyvsp[(2) - (2)].code);}
     }
     break;
 
 
   
-    case 65:
+    case 66:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2023 "parser.y"
+#line 2097 "parser.y"
     {PASS12 new_state();}
     }
     break;
 
 
   
-    case 66:
+    case 67:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2023 "parser.y"
+#line 2097 "parser.y"
     {
      
     (yyval.code) = code_new();
@@ -4447,22 +4906,22 @@ PASS2
 
 
   
-    case 67:
+    case 68:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2042 "parser.y"
+#line 2116 "parser.y"
     {(yyval.code)=code_new();}
     }
     break;
 
 
   
-    case 70:
+    case 71:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2049 "parser.y"
+#line 2123 "parser.y"
     {
     PASS1 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),0,1,0);
     PASS2 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1,0);
@@ -4472,11 +4931,11 @@ PASS2
 
 
   
-    case 71:
+    case 72:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2053 "parser.y"
+#line 2127 "parser.y"
     {
     PASS12
     (yyval.id)=(yyvsp[(1) - (1)].id);
@@ -4486,33 +4945,33 @@ PASS2
 
 
   
-    case 72:
+    case 73:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2058 "parser.y"
+#line 2132 "parser.y"
     {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (2)].id);(yyval.for_start).each=0;}
     }
     break;
 
 
   
-    case 73:
+    case 74:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2059 "parser.y"
+#line 2133 "parser.y"
     {PASS12 new_state();(yyval.for_start).name=(yyvsp[(1) - (3)].id);(yyval.for_start).each=1;}
     }
     break;
 
 
   
-    case 74:
+    case 75:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2061 "parser.y"
+#line 2135 "parser.y"
     {
     if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement");
     (yyval.code) = code_new();
@@ -4537,13 +4996,17 @@ PASS2
 
 
   
-    case 75:
+    case 76:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2081 "parser.y"
+#line 2155 "parser.y"
     {
     variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id));
+    if(!var) {
+        syntaxerror("variable %s not known in this scope", (yyvsp[(2) - (6)].id));
+    }
+
     char*tmp1name = concat2((yyvsp[(2) - (6)].id), "__tmp1__");
     int it = new_variable(tmp1name, TYPE_INT, 0, 0);
     char*tmp2name = concat2((yyvsp[(2) - (6)].id), "__array__");
@@ -4590,22 +5053,22 @@ PASS2
 
 
   
-    case 76:
+    case 77:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2125 "parser.y"
+#line 2203 "parser.y"
     {PASS12 new_state();}
     }
     break;
 
 
   
-    case 77:
+    case 78:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2125 "parser.y"
+#line 2203 "parser.y"
     {
 
     (yyval.code) = code_new();
@@ -4629,22 +5092,22 @@ PASS2
 
 
   
-    case 78:
+    case 79:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2144 "parser.y"
+#line 2222 "parser.y"
     {PASS12 new_state();}
     }
     break;
 
 
   
-    case 79:
+    case 80:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2144 "parser.y"
+#line 2222 "parser.y"
     {
     (yyval.code) = code_new();
     code_t*loopstart = (yyval.code) = abc_label((yyval.code));
@@ -4664,11 +5127,11 @@ PASS2
 
 
   
-    case 80:
+    case 81:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2159 "parser.y"
+#line 2237 "parser.y"
     {
     (yyval.code) = abc___break__(0, "");
 }
@@ -4677,11 +5140,11 @@ PASS2
 
 
   
-    case 81:
+    case 82:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2162 "parser.y"
+#line 2240 "parser.y"
     {
     (yyval.code) = abc___break__(0, (yyvsp[(2) - (2)].id));
 }
@@ -4690,11 +5153,11 @@ PASS2
 
 
   
-    case 82:
+    case 83:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2165 "parser.y"
+#line 2243 "parser.y"
     {
     (yyval.code) = abc___continue__(0, "");
 }
@@ -4703,11 +5166,11 @@ PASS2
 
 
   
-    case 83:
+    case 84:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2168 "parser.y"
+#line 2246 "parser.y"
     {
     (yyval.code) = abc___continue__(0, (yyvsp[(2) - (2)].id));
 }
@@ -4716,80 +5179,80 @@ PASS2
 
 
   
-    case 84:
+    case 85:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2172 "parser.y"
+#line 2250 "parser.y"
     {(yyval.code)=0;}
     }
     break;
 
 
   
-    case 85:
+    case 86:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2173 "parser.y"
+#line 2251 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
-    case 86:
+    case 87:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2174 "parser.y"
+#line 2252 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
-    case 87:
+    case 88:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2175 "parser.y"
+#line 2253 "parser.y"
     {(yyval.code)=code_append((yyvsp[(1) - (2)].code),(yyvsp[(2) - (2)].code));}
     }
     break;
 
 
   
-    case 88:
+    case 89:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2176 "parser.y"
+#line 2254 "parser.y"
     {(yyval.code)=(yyvsp[(1) - (1)].code);}
     }
     break;
 
 
   
-    case 89:
+    case 90:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2177 "parser.y"
+#line 2255 "parser.y"
     {(yyval.code)=code_append((yyval.code),(yyvsp[(2) - (2)].code));}
     }
     break;
 
 
   
-    case 90:
+    case 91:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2179 "parser.y"
+#line 2257 "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__) {
@@ -4803,11 +5266,11 @@ PASS2
 
 
   
-    case 91:
+    case 92:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2190 "parser.y"
+#line 2268 "parser.y"
     {
     (yyval.code) = (yyvsp[(3) - (3)].code);
 }
@@ -4816,26 +5279,28 @@ PASS2
 
 
   
-    case 92:
+    case 93:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2193 "parser.y"
-    {PASS12 new_state();}
+#line 2271 "parser.y"
+    {PASS12 new_state();state->switch_var=alloc_local();}
     }
     break;
 
 
   
-    case 93:
+    case 94:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2193 "parser.y"
+#line 2271 "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;
@@ -4863,11 +5328,11 @@ PASS2
 
 
   
-    case 94:
+    case 95:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2222 "parser.y"
+#line 2302 "parser.y"
     {PASS12 new_state();
                                                       state->exception_name=(yyvsp[(3) - (5)].id);
                                                PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0);
@@ -4878,11 +5343,11 @@ PASS2
 
 
   
-    case 95:
+    case 96:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2227 "parser.y"
+#line 2307 "parser.y"
     {
     namespace_t name_ns = {ACCESS_PACKAGE, ""};
     multiname_t name = {QNAME, &name_ns, 0, (yyvsp[(3) - (9)].id)};
@@ -4896,6 +5361,7 @@ PASS2
     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);
 
@@ -4907,22 +5373,22 @@ PASS2
 
 
   
-    case 96:
+    case 97:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2246 "parser.y"
+#line 2327 "parser.y"
     {PASS12 new_state();state->exception_name=0;}
     }
     break;
 
 
   
-    case 97:
+    case 98:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2246 "parser.y"
+#line 2327 "parser.y"
     {
     (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code));
     if(!(yyvsp[(4) - (5)].code)) {
@@ -4943,44 +5409,44 @@ PASS2
 
 
   
-    case 98:
+    case 99:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2262 "parser.y"
+#line 2343 "parser.y"
     {(yyval.catch_list).l=list_new();(yyval.catch_list).finally=0;list_append((yyval.catch_list).l,(yyvsp[(1) - (1)].exception));}
     }
     break;
 
 
   
-    case 99:
+    case 100:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2263 "parser.y"
+#line 2344 "parser.y"
     {(yyval.catch_list)=(yyvsp[(1) - (2)].catch_list);list_append((yyval.catch_list).l,(yyvsp[(2) - (2)].exception));}
     }
     break;
 
 
   
-    case 100:
+    case 101:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2264 "parser.y"
+#line 2345 "parser.y"
     {(yyval.catch_list)=(yyvsp[(1) - (1)].catch_list);}
     }
     break;
 
 
   
-    case 101:
+    case 102:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2265 "parser.y"
+#line 2346 "parser.y"
     {
     (yyval.catch_list) = (yyvsp[(1) - (2)].catch_list);
     (yyval.catch_list).finally = 0;
@@ -4994,11 +5460,11 @@ PASS2
 
 
   
-    case 102:
+    case 103:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2273 "parser.y"
+#line 2354 "parser.y"
     {
     (yyval.catch_list).l=list_new();
     (yyval.catch_list).finally = 0;
@@ -5012,22 +5478,25 @@ PASS2
 
 
   
-    case 103:
+    case 104:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2282 "parser.y"
-    {PASS12 new_state();}
+#line 2363 "parser.y"
+    {PASS12 new_state();
+                 state->method->has_exceptions=1;
+                 state->method->late_binding=1;//for invariant scope_code
+                }
     }
     break;
 
 
   
-    case 104:
+    case 105:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2282 "parser.y"
+#line 2366 "parser.y"
     {
     code_t*out = abc_nop(0);
 
@@ -5053,6 +5522,7 @@ PASS2
             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));
         }
         
@@ -5075,11 +5545,11 @@ PASS2
 
 
   
-    case 105:
+    case 106:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2327 "parser.y"
+#line 2412 "parser.y"
     {
     (yyval.code)=(yyvsp[(2) - (2)].value).c;
     (yyval.code)=abc_throw((yyval.code));
@@ -5089,11 +5559,11 @@ PASS2
 
 
   
-    case 106:
+    case 107:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2331 "parser.y"
+#line 2416 "parser.y"
     {
     if(!state->exception_name)
         syntaxerror("re-throw only possible within a catch block");
@@ -5107,16 +5577,20 @@ PASS2
 
 
   
-    case 107:
+    case 108:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2342 "parser.y"
+#line 2427 "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;
@@ -5127,19 +5601,21 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2352 "parser.y"
-    {PASS12 (yyval.id)="package";}
-    }
-    break;
-
-
-  
-    case 110:
-    if(as3_pass==2) {
-
-/* Line 1464 of skeleton.m4  */
-#line 2354 "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 2437 "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;
 
@@ -5149,8 +5625,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2355 "parser.y"
-    {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));}
+#line 2455 "parser.y"
+    {PASS12 (yyval.id)="package";}
     }
     break;
 
@@ -5160,8 +5636,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2357 "parser.y"
-    {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;}
+#line 2456 "parser.y"
+    {PASS12 (yyval.id)="namespace";}
     }
     break;
 
@@ -5171,8 +5647,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2358 "parser.y"
-    {PASS12 endpackage();(yyval.code)=0;}
+#line 2457 "parser.y"
+    {PASS12 (yyval.id)="NaN";}
     }
     break;
 
@@ -5182,8 +5658,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2359 "parser.y"
-    {PASS12 startpackage("");}
+#line 2458 "parser.y"
+    {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);}
     }
     break;
 
@@ -5193,8 +5669,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2360 "parser.y"
-    {PASS12 endpackage();(yyval.code)=0;}
+#line 2460 "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;
 
@@ -5204,22 +5680,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2362 "parser.y"
-    {
-       PASS12
-       slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name);
-       if(!s) {// || !(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);
-       (yyval.code)=0;
-}
+#line 2461 "parser.y"
+    {PASS12 (yyval.id)=strdup((yyvsp[(1) - (1)].id));}
     }
     break;
 
@@ -5229,20 +5691,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2377 "parser.y"
-    {
-       PASS12
-       if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6)) {
-           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);
-       (yyval.code)=0;
-}
+#line 2463 "parser.y"
+    {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;}
     }
     break;
 
@@ -5252,8 +5702,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2393 "parser.y"
-    {PASS12 (yyval.flags)=0;}
+#line 2464 "parser.y"
+    {PASS12 endpackage();(yyval.code)=0;}
     }
     break;
 
@@ -5263,8 +5713,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2394 "parser.y"
-    {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);}
+#line 2465 "parser.y"
+    {PASS12 startpackage("");}
     }
     break;
 
@@ -5274,8 +5724,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2395 "parser.y"
-    {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].token);}
+#line 2466 "parser.y"
+    {PASS12 endpackage();(yyval.code)=0;}
     }
     break;
 
@@ -5285,8 +5735,15 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2396 "parser.y"
-    {PASS12 (yyval.flags)=(yyvsp[(1) - (2)].flags)|(yyvsp[(2) - (2)].token);}
+#line 2489 "parser.y"
+    {
+       PASS12
+       slotinfo_t*s = registry_find(state->package, (yyvsp[(2) - (2)].id));
+       if(!s && as3_pass==1) {as3_schedule_class(state->package, (yyvsp[(2) - (2)].id));}
+       state_has_imports();
+       dict_put(state->imports, state->package, (yyvsp[(2) - (2)].id));
+       (yyval.code)=0;
+}
     }
     break;
 
@@ -5296,8 +5753,18 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2398 "parser.y"
-    {PASS12 (yyval.token)=FLAG_PUBLIC;}
+#line 2497 "parser.y"
+    {
+       PASS12
+       slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name);
+       if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) {
+           as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name);
+       }
+       state_has_imports();
+       dict_put(state->imports, (yyvsp[(2) - (2)].classinfo)->name, (yyvsp[(2) - (2)].classinfo));
+       import_toplevel((yyvsp[(2) - (2)].classinfo)->package);
+       (yyval.code)=0;
+}
     }
     break;
 
@@ -5307,8 +5774,20 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2399 "parser.y"
-    {PASS12 (yyval.token)=FLAG_PRIVATE;}
+#line 2508 "parser.y"
+    {
+       PASS12
+       if(strncmp("flash.", (yyvsp[(2) - (4)].id), 6) && as3_pass==1) {
+           as3_schedule_package((yyvsp[(2) - (4)].id));
+       }
+
+       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;
+}
     }
     break;
 
@@ -5318,8 +5797,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2400 "parser.y"
-    {PASS12 (yyval.token)=FLAG_PROTECTED;}
+#line 2524 "parser.y"
+    {PASS12 (yyval.flags).flags=0;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5329,8 +5808,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2401 "parser.y"
-    {PASS12 (yyval.token)=FLAG_STATIC;}
+#line 2525 "parser.y"
+    {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);}
     }
     break;
 
@@ -5340,8 +5819,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2402 "parser.y"
-    {PASS12 (yyval.token)=FLAG_DYNAMIC;}
+#line 2526 "parser.y"
+    {PASS12 (yyval.flags)=(yyvsp[(1) - (1)].flags);}
     }
     break;
 
@@ -5351,8 +5830,14 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2403 "parser.y"
-    {PASS12 (yyval.token)=FLAG_FINAL;}
+#line 2527 "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;
 
@@ -5362,8 +5847,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2404 "parser.y"
-    {PASS12 (yyval.token)=FLAG_OVERRIDE;}
+#line 2534 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_PUBLIC;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5373,8 +5858,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2405 "parser.y"
-    {PASS12 (yyval.token)=FLAG_NATIVE;}
+#line 2535 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_PRIVATE;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5384,8 +5869,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2406 "parser.y"
-    {PASS12 (yyval.token)=FLAG_PACKAGEINTERNAL;}
+#line 2536 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_PROTECTED;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5395,8 +5880,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2407 "parser.y"
-    {PASS12 (yyval.token)=FLAG_NAMESPACE;}
+#line 2537 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_STATIC;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5406,8 +5891,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2409 "parser.y"
-    {(yyval.classinfo)=registry_getobjectclass();}
+#line 2538 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_DYNAMIC;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5417,8 +5902,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2410 "parser.y"
-    {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
+#line 2539 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_FINAL;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5428,8 +5913,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2412 "parser.y"
-    {PASS12 (yyval.classinfo_list)=list_new();}
+#line 2540 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_OVERRIDE;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5439,8 +5924,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2413 "parser.y"
-    {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
+#line 2541 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_NATIVE;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5450,8 +5935,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2415 "parser.y"
-    {PASS12 (yyval.classinfo_list)=list_new();}
+#line 2542 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_PACKAGEINTERNAL;(yyval.flags).ns=0;}
     }
     break;
 
@@ -5461,8 +5946,10 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2416 "parser.y"
-    {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
+#line 2543 "parser.y"
+    {PASS12 (yyval.flags).flags=FLAG_NAMESPACE;
+                               (yyval.flags).ns=(yyvsp[(1) - (1)].id);
+                       }
     }
     break;
 
@@ -5472,8 +5959,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2420 "parser.y"
-    {PASS12 startclass((yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));}
+#line 2547 "parser.y"
+    {PASS12 (yyval.classinfo)=0;}
     }
     break;
 
@@ -5483,8 +5970,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2422 "parser.y"
-    {PASS12 endclass();(yyval.code)=0;}
+#line 2548 "parser.y"
+    {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
     }
     break;
 
@@ -5494,8 +5981,8 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2426 "parser.y"
-    {PASS12 startclass((yyvsp[(1) - (5)].flags)|FLAG_INTERFACE,(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));}
+#line 2550 "parser.y"
+    {PASS12 (yyval.classinfo_list)=list_new();}
     }
     break;
 
@@ -5505,146 +5992,100 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2428 "parser.y"
-    {PASS12 endclass();(yyval.code)=0;}
+#line 2551 "parser.y"
+    {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
     }
     break;
 
 
   
-    case 150:
+    case 142:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2441 "parser.y"
-    {
-    code_t*c = state->cls->static_init->header;
-    c = code_append(c, (yyvsp[(1) - (1)].code));  
-    state->cls->static_init->header = c;
-}
+#line 2553 "parser.y"
+    {PASS12 (yyval.classinfo_list)=list_new();}
     }
     break;
 
 
   
-    case 156:
+    case 143:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2452 "parser.y"
-    {
-    syntaxerror("variable declarations not allowed in interfaces");
-}
+#line 2554 "parser.y"
+    {PASS12 (yyval.classinfo_list)=(yyvsp[(2) - (2)].classinfo_list);}
     }
     break;
 
 
   
-    case 157:
+    case 144:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2455 "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 2558 "parser.y"
+    {PASS12 startclass(&(yyvsp[(1) - (6)].flags),(yyvsp[(3) - (6)].id),(yyvsp[(4) - (6)].classinfo),(yyvsp[(5) - (6)].classinfo_list));}
     }
     break;
 
 
   
-    case 160:
+    case 145:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2470 "parser.y"
-    {setstaticfunction((yyvsp[(1) - (3)].flags));}
+#line 2560 "parser.y"
+    {PASS12 endclass();(yyval.code)=0;}
     }
     break;
 
 
   
-    case 161:
+    case 146:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2470 "parser.y"
-    {
-    int flags = (yyvsp[(1) - (6)].flags);
-    U8 access = flags2access((yyvsp[(1) - (6)].flags));
-
-    varinfo_t* info = 0;
-    if(state->cls) {
-        memberinfo_t*i = registry_findmember(state->cls->info, (yyvsp[(3) - (6)].id), 1);
-        if(i) {
-            check_override(i, flags);
-        }
-        info = varinfo_register_onclass(state->cls->info, access, (yyvsp[(3) - (6)].id));
-    } else {
-        slotinfo_t*i = registry_find(state->package, (yyvsp[(3) - (6)].id));
-        if(i) {
-            syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(3) - (6)].id));
-        }
-        info = varinfo_register_global(access, state->package, (yyvsp[(3) - (6)].id));
+#line 2564 "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;
 
-    info->type = (yyvsp[(5) - (6)].classinfo);
-    info->flags = flags;
 
-    /* slot name */
-    namespace_t mname_ns = {access, ""};
-    multiname_t mname = {QNAME, &mname_ns, 0, (yyvsp[(3) - (6)].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->header;
-    } else {
-        // instance variable
-        traits = &state->cls->abc->traits;
-        code = &state->cls->init->header;
-    }
-    
-    trait_t*t=0;
-    if((yyvsp[(5) - (6)].classinfo)) {
-        MULTINAME(m, (yyvsp[(5) - (6)].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[(6) - (6)].value).c && !is_pushundefined((yyvsp[(6) - (6)].value).c)) {
-        c = abc_getlocal_0(c);
-        c = code_append(c, (yyvsp[(6) - (6)].value).c);
-        c = converttype(c, (yyvsp[(6) - (6)].value).t, (yyvsp[(5) - (6)].classinfo));
-        c = abc_setslot(c, t->slot_id);
-    }
-
-    *code = code_append(*code, c);
+    case 147:
+    if(as3_pass==2) {
 
-    if((yyvsp[(2) - (6)].token)==KW_CONST) {
-        t->kind= TRAIT_CONST;
+/* Line 1464 of skeleton.m4  */
+#line 2567 "parser.y"
+    {PASS12 endclass();(yyval.code)=0;}
     }
+    break;
 
-    (yyval.code)=0;
-    setstaticfunction(0);
+
+  
+    case 153:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2576 "parser.y"
+    {PASS_ALWAYS as3_pass=(yyvsp[(1) - (4)].number_int);}
+    }
+    break;
+
+
+  
+    case 156:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2580 "parser.y"
+    {
+    code_t*c = state->cls->static_init->header;
+    c = code_append(c, (yyvsp[(1) - (1)].code));  
+    state->cls->static_init->header = c;
 }
     }
     break;
@@ -5655,8 +6096,10 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2543 "parser.y"
-    {(yyval.constant)=0;}
+#line 2591 "parser.y"
+    {
+    syntaxerror("variable declarations not allowed in interfaces");
+}
     }
     break;
 
@@ -5666,121 +6109,617 @@ PASS2
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2544 "parser.y"
-    {(yyval.constant)=(yyvsp[(2) - (2)].constant);}
+#line 2594 "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;
+
+
+  
+    case 166:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2669 "parser.y"
+    {PASS12 setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));}
     }
     break;
 
 
   
-    case 164:
+    case 167:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2546 "parser.y"
-    {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));}
+#line 2669 "parser.y"
+    {PASS12 (yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);}
     }
     break;
 
 
   
-    case 165:
+    case 168:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2547 "parser.y"
+#line 2671 "parser.y"
+    {PASS12 (yyval.code)=0;}
+    }
+    break;
+
+
+  
+    case 169:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2672 "parser.y"
+    {PASS12 (yyval.code)=0;}
+    }
+    break;
+
+
+  
+    case 170:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2675 "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;
+
+
+  
+    case 171:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2758 "parser.y"
+    {(yyval.constant)=0;}
+    }
+    break;
+
+
+  
+    case 172:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2759 "parser.y"
+    {
+  (yyval.constant) = malloc(sizeof(constant_t));
+  *(yyval.constant) = node_eval((yyvsp[(2) - (2)].node));
+  if((yyval.constant)->type == CONSTANT_UNKNOWN) {
+    syntaxerror("can't evaluate default parameter value (needs to be a compile-time constant)");
+  }
+}
+    }
+    break;
+
+
+  
+    case 173:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2768 "parser.y"
     {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));}
     }
     break;
 
 
   
-    case 166:
+    case 174:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2548 "parser.y"
-    {(yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));}
+#line 2769 "parser.y"
+    {
+    (yyval.constant) = constant_new_uint((yyvsp[(1) - (1)].number_uint));
+}
     }
     break;
 
 
   
-    case 167:
+    case 175:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2549 "parser.y"
+#line 2772 "parser.y"
     {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));}
     }
     break;
 
 
   
-    case 168:
+    case 176:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2550 "parser.y"
+#line 2773 "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 169:
+    case 177:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2552 "parser.y"
+#line 2774 "parser.y"
     {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
-    case 170:
+    case 178:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2553 "parser.y"
+#line 2775 "parser.y"
     {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
-    case 171:
+    case 179:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2554 "parser.y"
+#line 2776 "parser.y"
     {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
-    case 172:
+    case 180:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2777 "parser.y"
+    {(yyval.constant) = constant_new_undefined((yyvsp[(1) - (1)].token));}
+    }
+    break;
+
+
+  
+    case 181:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2778 "parser.y"
+    {(yyval.constant) = constant_new_float(__builtin_nan(""));}
+    }
+    break;
+
+
+  
+    case 183:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2793 "parser.y"
+    {PASS_ALWAYS if(!xml_level++) tokenizer_begin_xml();}
+    }
+    break;
+
+
+  
+    case 184:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2794 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xmltext();}
+    }
+    break;
+
+
+  
+    case 185:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2795 "parser.y"
+    {PASS_ALWAYS if(!--xml_level) tokenizer_end_xml(); else tokenizer_begin_xmltext();}
+    }
+    break;
+
+
+  
+    case 186:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2797 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xmltext();}
+    }
+    break;
+
+
+  
+    case 187:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2555 "parser.y"
+#line 2797 "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 173:
+    case 188:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2564 "parser.y"
+#line 2801 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xml();}
+    }
+    break;
+
+
+  
+    case 189:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2801 "parser.y"
+    {
+    (yyval.id)=strdup("{...}");
+    as3_warning("xml string substitution not yet supported");
+}
+    }
+    break;
+
+
+  
+    case 190:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2805 "parser.y"
+    {(yyval.id)="";}
+    }
+    break;
+
+
+  
+    case 191:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2806 "parser.y"
+    {
+    (yyval.id) = concat2((yyvsp[(1) - (2)].id), "{...}");
+}
+    }
+    break;
+
+
+  
+    case 192:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2809 "parser.y"
+    {(yyval.id)=concat2((yyvsp[(1) - (2)].id), string_cstr(&(yyvsp[(2) - (2)].str)));}
+    }
+    break;
+
+
+  
+    case 193:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2810 "parser.y"
+    {(yyval.id)=concat2((yyvsp[(1) - (2)].id), ">");}
+    }
+    break;
+
+
+  
+    case 194:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2812 "parser.y"
+    {(yyval.id)=concat2((yyvsp[(1) - (2)].id),(yyvsp[(2) - (2)].id));}
+    }
+    break;
+
+
+  
+    case 195:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2813 "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 196:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2815 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}
+    }
+    break;
+
+
+  
+    case 197:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2816 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}
+    }
+    break;
+
+
+  
+    case 198:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2818 "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 199:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2822 "parser.y"
+    {
+    (yyval.id) = allocprintf("<%s%s/>", (yyvsp[(2) - (6)].id), (yyvsp[(3) - (6)].id));
+}
+    }
+    break;
+
+
+  
+    case 200:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2825 "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 201:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2830 "parser.y"
+    {(yyval.id)=strdup("");}
+    }
+    break;
+
+
+  
+    case 202:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2831 "parser.y"
+    {(yyval.id)=concat2(" ",(yyvsp[(1) - (1)].id));}
+    }
+    break;
+
+
+  
+    case 203:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2832 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}
+    }
+    break;
+
+
+  
+    case 204:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2833 "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 205:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2835 "parser.y"
+    {
+    (yyval.id) = strdup("{...}");
+}
+    }
+    break;
+
+
+  
+    case 206:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2838 "parser.y"
+    {
+    char* str = string_cstr(&(yyvsp[(3) - (3)].str));
+    (yyval.id) = concat2("{...}=",str);
+}
+    }
+    break;
+
+
+  
+    case 207:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2842 "parser.y"
+    {
+    (yyval.id) = strdup("{...}={...}");
+}
+    }
+    break;
+
+
+  
+    case 208:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2845 "parser.y"
+    {
+    (yyval.id) = concat2((yyvsp[(1) - (3)].id),"={...}");
+}
+    }
+    break;
+
+
+  
+    case 209:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2848 "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 210:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2858 "parser.y"
     {
     PASS12
     memset(&(yyval.params),0,sizeof((yyval.params)));
@@ -5790,11 +6729,11 @@ PASS2
 
 
   
-    case 174:
+    case 211:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2568 "parser.y"
+#line 2862 "parser.y"
     {
     PASS12
     (yyval.params)=(yyvsp[(1) - (1)].params);
@@ -5804,11 +6743,11 @@ PASS2
 
 
   
-    case 175:
+    case 212:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2574 "parser.y"
+#line 2868 "parser.y"
     {
     PASS12
     memset(&(yyval.params),0,sizeof((yyval.params)));
@@ -5820,11 +6759,11 @@ PASS2
 
 
   
-    case 176:
+    case 213:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2580 "parser.y"
+#line 2874 "parser.y"
     {
     PASS12
     (yyval.params) =(yyvsp[(1) - (4)].params);
@@ -5836,11 +6775,11 @@ PASS2
 
 
   
-    case 177:
+    case 214:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2588 "parser.y"
+#line 2882 "parser.y"
     {
     PASS12
     (yyval.params) = (yyvsp[(1) - (3)].params);
@@ -5851,11 +6790,11 @@ PASS2
 
 
   
-    case 178:
+    case 215:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2593 "parser.y"
+#line 2887 "parser.y"
     {
     PASS12
     memset(&(yyval.params),0,sizeof((yyval.params)));
@@ -5866,11 +6805,11 @@ PASS2
 
 
   
-    case 179:
+    case 216:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2599 "parser.y"
+#line 2893 "parser.y"
     {
      PASS12
      (yyval.param) = rfx_calloc(sizeof(param_t));
@@ -5884,11 +6823,11 @@ PASS2
 
 
   
-    case 180:
+    case 217:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2607 "parser.y"
+#line 2901 "parser.y"
     {
      PASS12
      (yyval.param) = rfx_calloc(sizeof(param_t));
@@ -5902,43 +6841,43 @@ PASS2
 
 
   
-    case 183:
+    case 220:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2617 "parser.y"
+#line 2911 "parser.y"
     {PASS12 (yyval.token)=0;}
     }
     break;
 
 
   
-    case 184:
+    case 221:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2620 "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 2914 "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 185:
+    case 222:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2621 "parser.y"
+#line 2915 "parser.y"
     {
     PASS1 
-    endfunction(0,(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0);
+    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(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;
@@ -5948,36 +6887,36 @@ PASS2
 
 
   
-    case 187:
+    case 224:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2637 "parser.y"
+#line 2931 "parser.y"
     {PASS12 (yyval.id)=0;}
     }
     break;
 
 
   
-    case 188:
+    case 225:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2639 "parser.y"
+#line 2933 "parser.y"
     {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));}
     }
     break;
 
 
   
-    case 189:
+    case 226:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2640 "parser.y"
+#line 2934 "parser.y"
     {
     PASS1
-    endfunction(0,0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0);
+    endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0);
     PASS2
     methodinfo_t*f = state->method->info;
     if(!f || !f->kind) syntaxerror("internal error");
@@ -5986,7 +6925,7 @@ PASS2
     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);
+    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);
@@ -5998,13 +6937,24 @@ PASS2
 
 
   
-    case 190:
+    case 227:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2662 "parser.y"
+#line 2956 "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
     slotinfo_t*s = find_class((yyvsp[(1) - (1)].id));
     if(!s) syntaxerror("Could not find class/method %s (current package: %s)\n", (yyvsp[(1) - (1)].id), state->package);
@@ -6015,17 +6965,18 @@ PASS2
 
 
   
-    case 191:
+    case 228:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2670 "parser.y"
+#line 2975 "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));
@@ -6037,122 +6988,122 @@ PASS2
 
 
   
-    case 194:
+    case 231:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2686 "parser.y"
+#line 2992 "parser.y"
     {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));}
     }
     break;
 
 
   
-    case 195:
+    case 232:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2687 "parser.y"
+#line 2993 "parser.y"
     {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));}
     }
     break;
 
 
   
-    case 196:
+    case 233:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2689 "parser.y"
-    {(yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);}
+#line 2995 "parser.y"
+    {PASS12 (yyval.classinfo)=(yyvsp[(1) - (1)].classinfo);}
     }
     break;
 
 
   
-    case 197:
+    case 234:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2690 "parser.y"
-    {(yyval.classinfo)=registry_getanytype();}
+#line 2996 "parser.y"
+    {PASS12 (yyval.classinfo)=TYPE_ANY;}
     }
     break;
 
 
   
-    case 198:
+    case 235:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2691 "parser.y"
-    {(yyval.classinfo)=registry_getanytype();}
+#line 2997 "parser.y"
+    {PASS12 (yyval.classinfo)=TYPE_VOID;}
     }
     break;
 
 
   
-    case 199:
+    case 236:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2700 "parser.y"
-    {(yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
+#line 3006 "parser.y"
+    {PASS12 (yyval.classinfo)=(yyvsp[(2) - (2)].classinfo);}
     }
     break;
 
 
   
-    case 200:
+    case 237:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2701 "parser.y"
-    {(yyval.classinfo)=0;}
+#line 3007 "parser.y"
+    {PASS12 (yyval.classinfo)=0;}
     }
     break;
 
 
   
-    case 201:
+    case 238:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2705 "parser.y"
-    {(yyval.value_list).cc=0;(yyval.value_list).len=0;}
+#line 3011 "parser.y"
+    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   
-    case 202:
+    case 239:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2706 "parser.y"
+#line 3012 "parser.y"
     {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);}
     }
     break;
 
 
   
-    case 203:
+    case 240:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2708 "parser.y"
-    {(yyval.value_list).cc=0;(yyval.value_list).len=0;}
+#line 3014 "parser.y"
+    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   
-    case 206:
+    case 243:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2712 "parser.y"
-    {(yyval.value_list).len=1;
+#line 3018 "parser.y"
+    {(yyval.value_list).number=1;
                                                   (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c;
                                                  }
     }
@@ -6160,24 +7111,24 @@ PASS2
 
 
   
-    case 207:
+    case 244:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2716 "parser.y"
+#line 3022 "parser.y"
     {(yyval.value_list) = (yyvsp[(1) - (2)].value_list);}
     }
     break;
 
 
   
-    case 208:
+    case 245:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2717 "parser.y"
+#line 3023 "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);
                                                   }
     }
@@ -6185,13 +7136,14 @@ PASS2
 
 
   
-    case 210:
+    case 247:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2723 "parser.y"
+#line 3029 "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;
@@ -6199,23 +7151,30 @@ PASS2
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);
-        (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];
+    } else if(TYPE_IS_CLASS(v.t) && v.t->data) {
+        code_free((yyval.value).c);
+        classinfo_t*c = v.t->data;
+        MULTINAME(m, c);
+        (yyval.value).c = abc_findpropstrict2(0, &m);
+        (yyval.value).c = code_append((yyval.value).c, paramcode);
+        (yyval.value).c = abc_constructprop2((yyval.value).c, &m, (yyvsp[(4) - (4)].value_list).number);
+    /*} else if($$.c->opcode == OPCODE_GETSLOT) {
+        int slot = (int)(ptroff_t)$$.c->data[0];
         trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);//FIXME
         multiname_t*name = t->name;
-        (yyval.value).c = code_cutlast((yyval.value).c);
-        (yyval.value).c = code_append((yyval.value).c, paramcode);
-        (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).len);
+        $$.c = code_cutlast($$.c);
+        $$.c = code_append($$.c, paramcode);
+        $$.c = abc_constructprop2($$.c, name, $4.number);*/
     } else {
         (yyval.value).c = code_append((yyval.value).c, paramcode);
-        (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;
@@ -6226,14 +7185,15 @@ PASS2
 
 
   
-    case 211:
+    case 248:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2759 "parser.y"
+#line 3073 "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);
     }
@@ -6244,36 +7204,39 @@ PASS2
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);
         (yyval.value).c = code_append((yyval.value).c, paramcode);
-        (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 && (yyval.value).c->prev->opcode != OPCODE_GETSCOPEOBJECT) {
-        int slot = (int)(ptroff_t)(yyval.value).c->data[0];
+/*    } else if($$.c->opcode == OPCODE_GETSLOT && $$.c->prev->opcode != OPCODE_GETSCOPEOBJECT) {
+        int slot = (int)(ptroff_t)$$.c->data[0];
         trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);
         if(t->kind!=TRAIT_METHOD) {
             //ok: flash allows to assign closures to members.
         }
         multiname_t*name = t->name;
-        (yyval.value).c = code_cutlast((yyval.value).c);
-        (yyval.value).c = code_append((yyval.value).c, paramcode);
+        $$.c = code_cutlast($$.c);
+        $$.c = code_append($$.c, paramcode);
         //$$.c = abc_callmethod($$.c, t->method, len); //#1051 illegal early access binding
-        (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).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;
+        (yyval.value).c = abc_coerce_a((yyval.value).c);
     }
 }
     }
@@ -6281,11 +7244,11 @@ PASS2
 
 
   
-    case 212:
+    case 249:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2805 "parser.y"
+#line 3123 "parser.y"
     {
     if(!state->cls) syntaxerror("super() not allowed outside of a class");
     if(!state->method) syntaxerror("super() not allowed outside of a function");
@@ -6302,7 +7265,7 @@ PASS2
     */
     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;
 }
@@ -6311,13 +7274,14 @@ PASS2
 
 
   
-    case 213:
+    case 250:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2826 "parser.y"
+#line 3144 "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);
     }
@@ -6331,7 +7295,7 @@ PASS2
         (yyval.value).c = abc_deleteproperty2((yyval.value).c, name);
     } else {
         (yyval.value).c = abc_getlocal_0((yyval.value).c);
-        MULTINAME_LATE(m, (yyvsp[(2) - (2)].value).t?(yyvsp[(2) - (2)].value).t->access:ACCESS_PACKAGE, "");
+        MULTINAME_LATE(m, v.t?v.t->access:ACCESS_PACKAGE, "");
         (yyval.value).c = abc_deleteproperty2((yyval.value).c, &m);
     }
     (yyval.value).t = TYPE_BOOLEAN;
@@ -6341,11 +7305,11 @@ PASS2
 
 
   
-    case 214:
+    case 251:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2847 "parser.y"
+#line 3166 "parser.y"
     {
     (yyval.code) = abc_returnvoid(0);
 }
@@ -6354,11 +7318,11 @@ PASS2
 
 
   
-    case 215:
+    case 252:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2850 "parser.y"
+#line 3169 "parser.y"
     {
     (yyval.code) = (yyvsp[(2) - (2)].value).c;
     (yyval.code) = abc_returnvalue((yyval.code));
@@ -6368,1482 +7332,1448 @@ PASS2
 
 
   
-    case 216:
+    case 253:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2857 "parser.y"
-    {(yyval.value)=(yyvsp[(1) - (1)].value);}
+#line 3176 "parser.y"
+    {
+    (yyval.value) = node_read((yyvsp[(1) - (1)].node));
+}
     }
     break;
 
 
   
-    case 217:
+    case 254:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2858 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3179 "parser.y"
+    {
+    (yyval.value) = node_read((yyvsp[(1) - (1)].node));
+}
     }
     break;
 
 
   
-    case 218:
+    case 255:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2859 "parser.y"
+#line 3182 "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 219:
+    case 256:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2865 "parser.y"
+#line 3185 "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 220:
+    case 257:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2871 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3188 "parser.y"
+    { 
+    (yyval.code) = node_exec((yyvsp[(1) - (1)].node)); 
+}
     }
     break;
 
 
   
-    case 222:
+    case 258:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2875 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3191 "parser.y"
+    { 
+    (yyval.code) = (yyvsp[(1) - (3)].code);
+    (yyval.code) = code_append((yyval.code), node_exec((yyvsp[(3) - (3)].node))); 
+}
     }
     break;
 
 
   
-    case 223:
+    case 259:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2877 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3196 "parser.y"
+    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   
-    case 224:
+    case 260:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2879 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3197 "parser.y"
+    {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);}
     }
     break;
 
 
   
-    case 226:
+    case 261:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3199 "parser.y"
+    {(yyval.code)=abc_pushstring(0,(yyvsp[(1) - (1)].id));}
+    }
+    break;
+
+
+  
+    case 262:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3200 "parser.y"
+    {(yyval.code)=abc_pushstring2(0,&(yyvsp[(1) - (1)].str));}
+    }
+    break;
+
+
+  
+    case 263:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3201 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}
+    }
+    break;
+
+
+  
+    case 264:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3202 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}
+    }
+    break;
+
+
+  
+    case 265:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3203 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}
+    }
+    break;
+
+
+  
+    case 266:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2883 "parser.y"
+#line 3205 "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 267:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3211 "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 227:
+    case 268:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2900 "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 3220 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 228:
+    case 269:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2905 "parser.y"
-    {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint));
-                    (yyval.value).t = TYPE_INT;
-                   }
+#line 3221 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 229:
+    case 270:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2908 "parser.y"
-    {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int));
-                  (yyval.value).t = TYPE_INT;
-                 }
+#line 3222 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 230:
+    case 271:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2911 "parser.y"
-    {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint));
-                   (yyval.value).t = TYPE_UINT;
-                  }
+#line 3223 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 231:
+    case 272:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2914 "parser.y"
-    {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float));
-                    (yyval.value).t = TYPE_FLOAT;
-                   }
+#line 3224 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}
     }
     break;
 
 
   
-    case 232:
+    case 273:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2917 "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 3225 "parser.y"
+    {(yyval.node) = (yyvsp[(1) - (1)].node);}
     }
     break;
 
 
   
-    case 233:
+    case 274:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2920 "parser.y"
-    {(yyval.value).c = abc_pushundefined(0);
-                    (yyval.value).t = TYPE_ANY;
-                   }
+#line 3227 "parser.y"
+    { 
+    (yyval.node) = mkconstnode((yyvsp[(1) - (1)].constant));
+}
     }
     break;
 
 
   
-    case 234:
+    case 275:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2923 "parser.y"
-    {(yyval.value).c = abc_pushtrue(0);
-                    (yyval.value).t = TYPE_BOOLEAN;
-                   }
+#line 3231 "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 235:
+    case 276:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2926 "parser.y"
-    {(yyval.value).c = abc_pushfalse(0);
-                     (yyval.value).t = TYPE_BOOLEAN;
-                    }
+#line 3243 "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 236:
+    case 277:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2929 "parser.y"
-    {(yyval.value).c = abc_pushnull(0);
-                    (yyval.value).t = TYPE_NULL;
-                   }
+#line 3261 "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 237:
+    case 278:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2933 "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 3272 "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 238:
+    case 279:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2936 "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 3282 "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 239:
+    case 280:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2939 "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 3291 "parser.y"
+    {(yyval.node) = mknode2(&node_lt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 240:
+    case 281:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2942 "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 3292 "parser.y"
+    {(yyval.node) = mknode2(&node_gt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 241:
+    case 282:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2945 "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 3293 "parser.y"
+    {(yyval.node) = mknode2(&node_le,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 242:
+    case 283:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2948 "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 3294 "parser.y"
+    {(yyval.node) = mknode2(&node_ge,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 243:
+    case 284:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2951 "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 3295 "parser.y"
+    {(yyval.node) = mknode2(&node_eqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 244:
+    case 285:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2954 "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 3296 "parser.y"
+    {(yyval.node) = mknode2(&node_eqeqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 245:
+    case 286:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3297 "parser.y"
+    {(yyval.node) = mknode2(&node_noteqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 287:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3298 "parser.y"
+    {(yyval.node) = mknode2(&node_noteq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 288:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3299 "parser.y"
+    {(yyval.node) = mknode2(&node_oror,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 289:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3300 "parser.y"
+    {(yyval.node) = mknode2(&node_andand,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 290:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3301 "parser.y"
+    {(yyval.node) = mknode1(&node_not, (yyvsp[(2) - (2)].node));}
+    }
+    break;
+
+
+  
+    case 291:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3302 "parser.y"
+    {(yyval.node) = mknode1(&node_bitnot, (yyvsp[(2) - (2)].node));}
+    }
+    break;
+
+
+  
+    case 292:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2958 "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 3303 "parser.y"
+    {(yyval.node) = mknode2(&node_bitand, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 246:
+    case 293:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2969 "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 3304 "parser.y"
+    {(yyval.node) = mknode2(&node_bitxor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 247:
+    case 294:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2987 "parser.y"
-    {(yyval.value).c=(yyvsp[(2) - (2)].value).c;
-              (yyval.value).c = abc_not((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3305 "parser.y"
+    {(yyval.node) = mknode2(&node_bitor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 248:
+    case 295:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2992 "parser.y"
-    {(yyval.value).c=(yyvsp[(2) - (2)].value).c;
-              (yyval.value).c = abc_bitnot((yyval.value).c);
-              (yyval.value).t = TYPE_INT;
-             }
+#line 3306 "parser.y"
+    {(yyval.node) = mknode2(&node_shr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 249:
+    case 296:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 2997 "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 3307 "parser.y"
+    {(yyval.node) = mknode2(&node_ushr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 250:
+    case 297:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3002 "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 3308 "parser.y"
+    {(yyval.node) = mknode2(&node_shl, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 251:
+    case 298:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3007 "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 3309 "parser.y"
+    {(yyval.node) = mknode2(&node_div, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 252:
+    case 299:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3012 "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 3310 "parser.y"
+    {(yyval.node) = mknode2(&node_mod, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 253:
+    case 300:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3016 "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 3311 "parser.y"
+    {(yyval.node) = mknode2(&node_plus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 254:
+    case 301:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3020 "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 3312 "parser.y"
+    {(yyval.node) = mknode2(&node_minus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 255:
+    case 302:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3025 "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 3313 "parser.y"
+    {(yyval.node) = mknode2(&node_multiply, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 256:
+    case 303:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3029 "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 3314 "parser.y"
+    {(yyval.node) = mknode2(&node_in, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 257:
+    case 304:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3033 "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 3315 "parser.y"
+    {(yyval.node) = mknode2(&node_as, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 258:
+    case 305:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3042 "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 3316 "parser.y"
+    {(yyval.node) = mknode2(&node_instanceof, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 259:
+    case 306:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3051 "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 3317 "parser.y"
+    {(yyval.node) = mknode2(&node_is, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 260:
+    case 307:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3061 "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 3318 "parser.y"
+    {(yyval.node) = mknode1(&node_typeof, (yyvsp[(2) - (2)].node));}
     }
     break;
 
 
   
-    case 261:
+    case 308:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3066 "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 3319 "parser.y"
+    {(yyval.node) = mknode1(&node_void, (yyvsp[(2) - (2)].node));}
     }
     break;
 
 
   
-    case 262:
+    case 309:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3079 "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 3320 "parser.y"
+    { (yyval.node) = mkconstnode(constant_new_undefined());}
     }
     break;
 
 
   
-    case 263:
+    case 310:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3084 "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 3321 "parser.y"
+    { (yyval.node)=(yyvsp[(2) - (3)].node);}
     }
     break;
 
 
   
-    case 264:
+    case 311:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3089 "parser.y"
-    {
-              (yyval.value).c = (yyvsp[(3) - (4)].value).c;
-              (yyval.value).c = abc_typeof((yyval.value).c);
-              (yyval.value).t = TYPE_STRING;
-             }
+#line 3322 "parser.y"
+    {(yyval.node) = mknode1(&node_neg, (yyvsp[(2) - (2)].node));}
     }
     break;
 
 
   
-    case 265:
+    case 312:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3095 "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 3323 "parser.y"
+    {(yyval.node) = mknode2(&node_arraylookup, (yyvsp[(1) - (4)].node),(yyvsp[(3) - (4)].node));}
     }
     break;
 
 
   
-    case 266:
+    case 313:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3101 "parser.y"
-    { (yyval.value).c = abc_pushundefined(0);
-             (yyval.value).t = TYPE_ANY;
-           }
+#line 3324 "parser.y"
+    {(yyval.node) = mknode2(&node_muleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 267:
+    case 314:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3105 "parser.y"
-    {(yyval.value)=(yyvsp[(2) - (3)].value);}
+#line 3325 "parser.y"
+    {(yyval.node) = mknode2(&node_modeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 268:
+    case 315:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3107 "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 3326 "parser.y"
+    {(yyval.node) = mknode2(&node_shleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 269:
+    case 316:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3118 "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 3327 "parser.y"
+    {(yyval.node) = mknode2(&node_shreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 270:
+    case 317:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3127 "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 3328 "parser.y"
+    {(yyval.node) = mknode2(&node_ushreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 271:
+    case 318:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3134 "parser.y"
-    {(yyval.value_list).cc=0;(yyval.value_list).len=0;}
+#line 3329 "parser.y"
+    { (yyval.node) = mknode2(&node_diveq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 272:
+    case 319:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3135 "parser.y"
-    {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);}
+#line 3330 "parser.y"
+    { (yyval.node) = mknode2(&node_bitoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 273:
+    case 320:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3137 "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 3331 "parser.y"
+    { (yyval.node) = mknode2(&node_bitxoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 274:
+    case 321:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3143 "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 3332 "parser.y"
+    { (yyval.node) = mknode2(&node_bitandeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 275:
+    case 322:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3152 "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 3333 "parser.y"
+    { (yyval.node) = mknode2(&node_pluseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 276:
+    case 323:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3159 "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 3334 "parser.y"
+    { (yyval.node) = mknode2(&node_minuseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 277:
+    case 324:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3171 "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 3335 "parser.y"
+    { (yyval.node) = mknode2(&node_assign, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}
     }
     break;
 
 
   
-    case 278:
+    case 325:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3177 "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 3336 "parser.y"
+    { (yyval.node) = mknode3(&node_tenary, (yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));}
     }
     break;
 
 
   
-    case 279:
+    case 326:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3183 "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 3338 "parser.y"
+    { (yyval.node) = mknode1(&node_rplusplus, (yyvsp[(1) - (2)].node));}
     }
     break;
 
 
   
-    case 280:
+    case 327:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3189 "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 3339 "parser.y"
+    { (yyval.node) = mknode1(&node_rminusminus, (yyvsp[(1) - (2)].node));}
     }
     break;
 
 
   
-    case 281:
+    case 328:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3195 "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 3340 "parser.y"
+    {(yyval.node) = mknode1(&node_lplusplus, (yyvsp[(2) - (2)].node)); }
     }
     break;
 
 
   
-    case 282:
+    case 329:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3201 "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 3341 "parser.y"
+    {(yyval.node) = mknode1(&node_lminusminus, (yyvsp[(2) - (2)].node)); }
     }
     break;
 
 
   
-    case 283:
+    case 330:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3207 "parser.y"
-    { 
-               code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3344 "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 331:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3213 "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 3358 "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 332:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3226 "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 3366 "parser.y"
+    {PASS12 new_state();state->xmlfilter=1;}
     }
     break;
 
 
   
-    case 286:
+    case 333:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3237 "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 3366 "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 334:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3244 "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 3420 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}
     }
     break;
 
 
   
-    case 288:
+    case 335:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3257 "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 3421 "parser.y"
+    {(yyval.id)="*";}
     }
     break;
 
 
   
-    case 289:
+    case 336:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3284 "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 3422 "parser.y"
+    {(yyval.id)=(char*)(yyvsp[(1) - (1)].id);}
     }
     break;
 
 
   
-    case 290:
+    case 338:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3298 "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 3424 "parser.y"
+    {(yyval.id)="*";}
     }
     break;
 
 
   
-    case 291:
+    case 339:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3312 "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 3432 "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 292:
+    case 340:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3327 "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 3450 "parser.y"
+    {
+    typedcode_t v = node_read((yyvsp[(1) - (3)].node));
+    multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)};
+    v.c = abc_getdescendants2(v.c, &m);
+    v.t = TYPE_XMLLIST;
+    (yyval.node) = mkcodenode(v);
+}
     }
     break;
 
 
   
-    case 293:
+    case 341:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3341 "parser.y"
+#line 3457 "parser.y"
     {
-              // attribute TODO
-              (yyval.value).c = abc_pushundefined(0);
-              (yyval.value).t = 0;
-              as3_warning("ignored @ operator");
-           }
+    typedcode_t v = node_read((yyvsp[(1) - (5)].node));
+    typedcode_t w = node_read((yyvsp[(4) - (5)].node));
+    multiname_t m = {MULTINAMEL, 0, &nopackage_namespace_set, 0};
+    v.c = code_append(v.c, w.c);
+    v.c = converttype(w.c, w.t, TYPE_STRING);
+    v.c = abc_getproperty2(v.c, &m);
+    v.t = TYPE_XMLLIST;
+    (yyval.node) = mkcodenode(v);
+}
     }
     break;
 
 
   
-    case 294:
+    case 342:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3348 "parser.y"
+#line 3468 "parser.y"
     {
-              // child attribute  TODO
-              (yyval.value).c = abc_pushundefined(0);
-              (yyval.value).t = 0;
-              as3_warning("ignored .@ operator");
-           }
+    typedcode_t v = node_read((yyvsp[(1) - (4)].node));
+    multiname_t m = {MULTINAMEA, 0, &nopackage_namespace_set, (yyvsp[(4) - (4)].id)};
+    v.c = abc_getproperty2(v.c, &m);
+    v.t = TYPE_STRING;
+    (yyval.node) = mkcodenode(v);
+}
     }
     break;
 
 
   
-    case 295:
+    case 343:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3355 "parser.y"
+#line 3475 "parser.y"
     {
-              // namespace declaration TODO
-              (yyval.value).c = abc_pushundefined(0);
-              (yyval.value).t = 0;
-              as3_warning("ignored :: operator");
-           }
+    typedcode_t v = node_read((yyvsp[(1) - (4)].node));
+    multiname_t m = {MULTINAMEA, 0, &nopackage_namespace_set, (yyvsp[(4) - (4)].id)};
+    v.c = abc_getdescendants2(v.c, &m);
+    v.t = TYPE_STRING;
+    (yyval.node) = mkcodenode(v);
+}
     }
     break;
 
 
   
-    case 296:
+    case 344:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3362 "parser.y"
+#line 3482 "parser.y"
     {
-              // descendants TODO
-              (yyval.value).c = abc_pushundefined(0);
-              (yyval.value).t = 0;
-              as3_warning("ignored .. operator");
-           }
+    typedcode_t v = node_read((yyvsp[(1) - (6)].node));
+    typedcode_t w = node_read((yyvsp[(5) - (6)].node));
+    multiname_t m = {MULTINAMELA, 0, &nopackage_namespace_set, 0};
+    v.c = code_append(v.c, w.c);
+    v.c = converttype(w.c, w.t, TYPE_STRING);
+    v.c = abc_getproperty2(v.c, &m);
+    v.t = TYPE_STRING;
+    (yyval.node) = mkcodenode(v);
+}
     }
     break;
 
 
   
-    case 297:
+    case 345:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3369 "parser.y"
+#line 3492 "parser.y"
     {
-              // filter TODO
-              (yyval.value).c = abc_pushundefined(0);
-              (yyval.value).t = 0;
-              as3_warning("ignored .() operator");
-           }
+    typedcode_t v = node_read((yyvsp[(1) - (6)].node));
+    typedcode_t w = node_read((yyvsp[(5) - (6)].node));
+    multiname_t m = {MULTINAMELA, 0, &nopackage_namespace_set, 0};
+    v.c = code_append(v.c, w.c);
+    v.c = converttype(w.c, w.t, TYPE_STRING);
+    v.c = abc_getdescendants2(v.c, &m);
+    v.t = TYPE_STRING;
+    (yyval.node) = mkcodenode(v);
+}
     }
     break;
 
 
   
-    case 298:
+    case 346:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3381 "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 3503 "parser.y"
+    {
+    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);
+        }
+        memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1);
+        char noslot = 0;
+        if(f && !is_static != !(f->flags&FLAG_STATIC))
+           noslot=1;
+        if(f && f->slot && !noslot) {
+            (yyval.value).c = abc_getslot((yyval.value).c, f->slot);
+        } else {
+            if(!f) {
+                as3_softwarning("Access of undefined property '%s' in %s", (yyvsp[(3) - (3)].id), t->name);
             }
+            MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id));
+            (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
+        }
+        /* 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 {
+            syntaxerror("couldn't resolve %s", package2);
+        }
+    } else {
+        /* when resolving a property on an unknown type, we do know the
+           name of the property (and don't seem to need the package), but
+           we need to make avm2 try out all access modes */
+        as3_softwarning("Resolving %s on unknown type", (yyvsp[(3) - (3)].id));
+        multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)};
+        (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
+        (yyval.value).c = abc_coerce_a((yyval.value).c);
+        (yyval.value).t = TYPE_ANY;
+    }
+}
     }
     break;
 
 
   
-    case 299:
+    case 347:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3414 "parser.y"
+#line 3681 "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 *correct* because local variables of the parent function
+       etc. which is *correct* because local variables of the parent function
        would shadow those.
        */
-    if(state->method->inner && !find_variable(state, (yyvsp[(1) - (1)].id))) {
-        unknown_variable((yyvsp[(1) - (1)].id));
+
+    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.value).t = 0;
-    (yyval.value).c = 0;
-    slotinfo_t*a = 0;
-    memberinfo_t*f = 0;
-
-    variable_t*v;
-    /* look at variables */
-    if((v = find_variable(state, (yyvsp[(1) - (1)].id)))) {
-        // $1 is a local variable
-        (yyval.value).c = abc_getlocal((yyval.value).c, v->index);
-        (yyval.value).t = v->type;
-        break;
-    }
-    if((v = find_slot(state, (yyvsp[(1) - (1)].id)))) {
-        (yyval.value).c = abc_getscopeobject((yyval.value).c, 1);
-        (yyval.value).c = abc_getslot((yyval.value).c, v->index);
-        (yyval.value).t = v->type;
-        break;
+    (yyval.node) = resolve_identifier((yyvsp[(1) - (1)].id));
+}
     }
+    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);
+  
+    case 348:
+    if(as3_pass==2) {
 
-        if(f->kind == INFOTYPE_METHOD) {
-            (yyval.value).t = TYPE_FUNCTION(f);
-        } else {
-            (yyval.value).t = f->type;
-        }
-        if(var_is_static && !i_am_static) {
-        /* access to a static member from a non-static location.
-           do this via findpropstrict:
-           there doesn't seem to be any non-lookup way to access
-           static properties of a class */
-            state->method->late_binding = 1;
-            (yyval.value).t = f->type;
-            namespace_t ns = {f->access, ""};
-            multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)};
-            (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m);
-            (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
-            break;
-        } else if(f->slot>0) {
-            (yyval.value).c = abc_getlocal_0((yyval.value).c);
-            (yyval.value).c = abc_getslot((yyval.value).c, f->slot);
-            break;
-        } else {
-            namespace_t ns = {f->access, ""};
-            multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)};
-            (yyval.value).c = abc_getlocal_0((yyval.value).c);
-            (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
-            break;
-        }
-    } 
-    
-    /* look at actual classes, in the current package and imported */
-    if((a = find_class((yyvsp[(1) - (1)].id)))) {
-        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;
-            }
-        } 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);
-        }
-        break;
+/* Line 1464 of skeleton.m4  */
+#line 3717 "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;
 
-    /* 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 349:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3724 "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 350:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3535 "parser.y"
-    {(yyval.code)=0;}
+#line 3731 "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 351:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3536 "parser.y"
-    {(yyval.code)=0;}
+#line 3738 "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 302:
+    case 352:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3537 "parser.y"
-    {(yyval.code)=0;}
+#line 3761 "parser.y"
+    {
+    as3_warning("default xml namespaces not supported yet");
+    (yyval.code) = 0;
+}
     }
     break;
 
 
   
-    case 303:
+    case 353:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
-#line 3539 "parser.y"
+#line 3766 "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;
 }
     }
@@ -7853,7 +8783,7 @@ PASS2
 
 
 /* Line 1464 of skeleton.m4  */
-#line 7857 "parser.tab.c"
+#line 8787 "parser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);