as3compile: small bugfixes, added documentation

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

diff --git a/lib/as3/parser.tab.c b/lib/as3/parser.tab.c
index 0623611..3e68d39 100644 (file)
--- 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 "abc.h"
 #include "pool.h"
 #include "files.h"

+#include "common.h"

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

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

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

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

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

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

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

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

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

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

    };
 #endif
 
    };
 #endif
 

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

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

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

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

 
     enum yytokentype token;
 
 
     enum yytokentype token;
 

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

+    node_t*node;

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

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

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

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

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

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

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

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

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

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

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

-

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

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

-   
+

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

+    parsedclass_t*dependencies;

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

@@ -348,6 +362,7 @@ struct _methodstate {
     char is_constructor;
     char has_super;
     char is_global;
     char is_constructor;
     char has_super;
     char is_global;

+    char is_static;

     int variable_count;
 
     dict_t*unresolved_variables;
     int variable_count;
 
     dict_t*unresolved_variables;

@@ -356,6 +371,9 @@ struct _methodstate {
     char uses_parent_function;
     int uses_slots;
     dict_t*slots;
     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
 
     abc_method_t*abc;
     int var_index; // for inner methods

@@ -378,10 +396,12 @@ typedef struct _state {
     import_list_t*wildcard_imports;
     dict_t*import_toplevel_packages;
     dict_t*imports;
     import_list_t*wildcard_imports;
     dict_t*import_toplevel_packages;
     dict_t*imports;

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

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

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

   
     classstate_t*cls;   
     methodstate_t*method;
   
     classstate_t*cls;   
     methodstate_t*method;

@@ -391,11 +411,17 @@ typedef struct _state {
     int switch_var;
     
     dict_t*vars;
     int switch_var;
     
     dict_t*vars;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    state->new_namespaces = 0;

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

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

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

@@ -499,34 +521,32 @@ static void state_destroy(state_t*state)
         dict_destroy(state->imports);state->imports=0;
     }
     if(state->vars) {
         dict_destroy(state->imports);state->imports=0;
     }
     if(state->vars) {

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

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

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

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

+    trie_rollback(active_namespaces);
+

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

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

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

@@ -535,13 +555,13 @@ static void old_state()
         free(leaving->cls);
         leaving->cls=0;
     }
         free(leaving->cls);
         leaving->cls=0;
     }

-    
+

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

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

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

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

+    
+    active_namespaces = trie_new();
+

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

+    state->allvars = dict_new();

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

@@ -567,8 +591,11 @@ void initialize_file(char*filename)
         state->method->late_binding = 1; // init scripts use getglobalscope, so we need a getlocal0/pushscope
     } else {
         state->method = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);
         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->variable_count = 0;
+        if(!state->method)
+            syntaxerror("internal error: skewed tokencount");
+        function_initvars(state->method, 0, 0, 0, 1);
+        global->init = 0;

     }
 }
 
     }
 }
 

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

-
+    

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

+        dict_del(global->file2token2info, current_filename);

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

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

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

@@ -596,56 +627,30 @@ void initialize_parser()
     global->file->flags &= ~ABCFILE_LAZY;
     global->file2token2info = dict_new();
     global->token2info = 0;
     global->file->flags &= ~ABCFILE_LAZY;
     global->file2token2info = dict_new();
     global->token2info = 0;

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

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

-

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

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

     
     

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

 
 

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

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

+    char is_parameter;

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

+    state_t*top = s;

     while(s) {
         variable_t*v = 0;
         v = dict_lookup(s->vars, name);
     while(s) {
         variable_t*v = 0;
         v = dict_lookup(s->vars, name);

@@ -653,7 +658,7 @@ static variable_t* find_variable(state_t*s, char*name)
         if(s->new_vars) break;
         s = s->old;
     }
         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)
 {
 }
 static variable_t* find_slot(state_t*s, const char*name)
 {

@@ -669,11 +674,35 @@ static variable_t* find_variable_safe(state_t*s, char*name)
         syntaxerror("undefined variable: %s", name);
     return v;
 }
         syntaxerror("undefined variable: %s", name);
     return v;
 }

+

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

-code_t*defaultvalue(code_t*c, classinfo_t*type);
+
+static 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()
 {
 
 static int alloc_local()
 {

@@ -684,8 +713,10 @@ static variable_t* new_variable2(const char*name, classinfo_t*type, char init, c
 {
     if(maybeslot) {
         variable_t*v = find_slot(state, name);
 {
     if(maybeslot) {
         variable_t*v = find_slot(state, name);

-        if(v)
+        if(v) {
+            alloc_local(); 

             return v;
             return v;

+        }

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

@@ -693,8 +724,10 @@ static variable_t* new_variable2(const char*name, classinfo_t*type, char init, c
     v->type = type;
     v->init = init;
  
     v->type = type;
     v->init = init;
  

-    if(name) 
+    if(name) {

         dict_put(state->vars, name, v);
         dict_put(state->vars, name, v);

+        dict_put(state->allvars, name, v);
+    }

 
     return v;
 }
 
     return v;
 }

@@ -704,31 +737,30 @@ static int new_variable(const char*name, classinfo_t*type, char init, char maybe
 }
 
 #define TEMPVARNAME "__as3_temp__"
 }
 
 #define TEMPVARNAME "__as3_temp__"

-static int gettempvar()
+int gettempvar()

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

+    int i;

     if(v) 
     if(v) 

-        return v->index;
-    return new_variable(TEMPVARNAME, 0, 0, 0);
+        i = v->index;
+    else
+        i = new_variable(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;
 {
     code_t*c = 0;
     code_t*k = 0;
     int t;
     int num=0;

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

         }
     }
 
         }
     }
 

@@ -756,7 +788,7 @@ code_t* var_block(code_t*body)
     return c;
 }
 
     return c;
 }
 

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

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

@@ -764,25 +796,27 @@ void unknown_variable(char*name)
         dict_put(state->method->unresolved_variables, name, 0);
 }
 
         dict_put(state->method->unresolved_variables, name, 0);
 }
 

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

 {
 {

-    if(m->uses_slots || (m->late_binding && !m->inner)) {
+    if(m->uses_slots || (m->late_binding && !m->inner)) { //???? especially inner functions need the pushscope

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

-        /* FIXME: does this need to be the same activation object as
-                  in the function header? */
-        c = abc_newactivation(c);
-        c = abc_pushscope(c);
+        /* FIXME: this alloc_local() causes variable indexes to be
+           different in pass2 than in pass1 */
+        if(!m->activation_var) {
+            m->activation_var = alloc_local();
+        }
+        if(init) {
+            c = abc_newactivation(c);
+            c = abc_dup(c);
+            c = abc_pushscope(c);
+            c = abc_setlocal(c, m->activation_var);
+        } else {
+            c = abc_getlocal(c, m->activation_var);
+            c = abc_pushscope(c);
+        }

     }
     return c;
 }
     }
     return c;
 }

@@ -791,7 +825,7 @@ static code_t* method_header(methodstate_t*m)
 {
     code_t*c = 0;
 
 {
     code_t*c = 0;
 

-    c = add_scope_code(c, m);
+    c = add_scope_code(c, m, 1);

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

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

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

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

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

-

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

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

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

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

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

-

     old_state();
 }
 
     old_state();
 }
 

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

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

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

@@ -888,7 +938,27 @@ static namespace_t modifiers2access(modifiers_t*mod)
 }
 static slotinfo_t* find_class(const char*name);
 
 }
 static slotinfo_t* find_class(const char*name);
 

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

 {
     if(var0) {
         int index = -1;
 {
     if(var0) {
         int index = -1;

@@ -898,50 +968,44 @@ 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);
             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);
     }
 
         parserassert(!index);
     }
 

-    if(m->uses_slots) {
-        /* as variables and slots share the same number, make sure
-           that those variable indices are reserved. It's up to the
-           optimizer to later shuffle the variables down to lower
-           indices */
-        m->variable_count = m->uses_slots;
-    }
-
-    if(params) {
+    if(has_params) {

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

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

         }
     }
         }
     }

-
-    if(as3_pass==2) {
-        m->scope_code = add_scope_code(m->scope_code, m);
-    }
-

     
     

-    methodstate_list_t*l = m->innerfunctions;
-    while(l) {
-        methodstate_t*m = l->methodstate;
-        
-        variable_t* v = new_variable2(m->info->name, TYPE_FUNCTION(m->info), 0, 1);
-        m->var_index = v->index;
-        m->slot_index = v->index;
-        v->is_inner_method = m;
-
-        l = l->next;
-    }
+    innerfunctions2vars(m);

     
     

-    if(as3_pass==2 && m->slots) {
-        /* exchange unresolved identifiers with the actual objects */
-        DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) {
-            if(v->type && v->type->kind == INFOTYPE_UNRESOLVED) {
-                v->type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type);
-                if(!v->type || v->type->kind != INFOTYPE_CLASS) {
-                    syntaxerror("Couldn't find class %s", v->type->name);
+    if(as3_pass==2) {
+        m->scope_code = add_scope_code(m->scope_code, m, 0);
+        if(m->slots) {
+            /* exchange unresolved identifiers with the actual objects */
+            DICT_ITERATE_ITEMS(m->slots, char*, name, variable_t*, v) {
+                if(v->type && v->type->kind == INFOTYPE_UNRESOLVED) {
+                    classinfo_t*type = (classinfo_t*)registry_resolve((slotinfo_t*)v->type);
+                    if(!type || type->kind != INFOTYPE_CLASS) {
+                        syntaxerror("Couldn't find class %s::%s (%s)", v->type->package, v->type->name, name);
+                    }
+                    v->type = type;

                 }
             }
         }
                 }
             }
         }

@@ -966,6 +1030,9 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl
     if((mod->flags&(FLAG_PUBLIC|FLAG_PACKAGEINTERNAL)) == (FLAG_PUBLIC|FLAG_PACKAGEINTERNAL))
         syntaxerror("public and internal not supported at the same time.");
     
     if((mod->flags&(FLAG_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
     //if(!(mod->flags&FLAG_INTERFACE) && !extends) {
     if(!(mod->flags&FLAG_INTERFACE) && !extends) {
         // all classes extend object

@@ -990,8 +1057,10 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl
         state->cls = rfx_calloc(sizeof(classstate_t));
         state->cls->init = rfx_calloc(sizeof(methodstate_t));
         state->cls->static_init = rfx_calloc(sizeof(methodstate_t));
         state->cls = 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,
         /* notice: we make no effort to initialize the top variable (local0) here,

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

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

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

+        state->cls->info->superclass = extends;

         
         int pos = 0;
         classinfo_list_t*l = implements;
         
         int pos = 0;
         classinfo_list_t*l = implements;

@@ -1017,12 +1087,12 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl
     
     if(as3_pass == 2) {
         state->cls = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);
     
     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);
        
         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);
 
         if(extends && (extends->flags & FLAG_FINAL))
             syntaxerror("Can't extend final class '%s'", extends->name);

@@ -1035,79 +1105,31 @@ static void startclass(modifiers_t* mod, char*classname, classinfo_t*extends, cl
             pos++;
         }
 
             pos++;
         }
 

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

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

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

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

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

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

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

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

-

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

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

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

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

@@ -1160,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);
         }
             code_t*c = method_header(state->cls->static_init);
             m->body->code = wrap_function(c, 0, m->body->code);
         }

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

     }
 
     old_state();
     }
 
     old_state();

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

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

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

@@ -1184,7 +1210,6 @@ void check_code_for_break(code_t*c)
     }
 }
 
     }
 }
 

-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

         }
         }

+

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

@@ -1315,10 +1338,12 @@ static void innerfunction(char*name, params_t*params, classinfo_t*return_type)
 
     new_state();
     state->new_vars = 1;
 
     new_state();
     state->new_vars = 1;

+    state->allvars = dict_new();

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

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

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

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

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

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

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

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

     }
 }
 
     }
 }
 

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

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

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

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

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

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

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

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

@@ -1389,19 +1416,15 @@ static void startfunction(modifiers_t*mod, enum yytokentype getset, char*name,
             state->cls->has_constructor |= state->method->is_constructor;
         }
         
             state->cls->has_constructor |= state->method->is_constructor;
         }
         

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

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

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

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

-        // store inner methods in variables
-        function_initvars(state->method, 0, 0, 0);
+        innerfunctions2vars(state->method);

 
         methodstate_list_t*ml = state->method->innerfunctions;
         
 
         methodstate_list_t*ml = state->method->innerfunctions;
         

@@ -1413,23 +1436,16 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*
             if(m->unresolved_variables) {
                 dict_t*d = m->unresolved_variables;
                 int t;
             if(m->unresolved_variables) {
                 dict_t*d = m->unresolved_variables;
                 int t;

-                for(t=0;t<d->hashsize;t++) {
-                    dictentry_t*l = d->slots[t]; 
-                    while(l) {
-                        /* check parent method's variables */
-                        variable_t*v;
-                        if((v=find_variable(state, l->key))) {
-                            m->uses_parent_function = 1;
-                            state->method->uses_slots = 1;
-                            dict_put(xvars, l->key, 0);
-                        }
-                        l = l->next;
+                DICT_ITERATE_KEY(d, char*, id) {
+                    /* check parent method's variables */
+                    variable_t*v;
+                    if((v=find_variable(state, id))) {
+                        m->uses_parent_function = 1;
+                        state->method->uses_slots = 1;
+                        dict_put(xvars, id, 0);

                     }
                     }

-                    if(l) break;

                 }
                 }

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

             }
             ml = ml->next;
         }
             }
             ml = ml->next;
         }

@@ -1441,16 +1457,18 @@ static abc_method_t* endfunction(modifiers_t*mod, enum yytokentype getset, char*
                 if(!name) syntaxerror("internal error");
                 if(v->index && dict_contains(xvars, name)) {
                     v->init = 0;
                 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) {
                     if(v->is_inner_method) {

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

                     }
                     }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1575,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)
 code_t*converttype(code_t*c, classinfo_t*from, classinfo_t*to)
 {
     if(from==to)

@@ -1615,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_NUMBER(from) || TYPE_IS_UINT(from) || TYPE_IS_INT(from)) &&
        (TYPE_IS_NUMBER(to) || TYPE_IS_UINT(to) || TYPE_IS_INT(to))) {
         // allow conversion between number types

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

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

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

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

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

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

@@ -1644,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", 
         return c;
 
     as3_error("can't convert type %s%s%s to %s%s%s", 

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

     return c;
 }
     return c;
 }

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

 {
 {

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

     } else {
     } else {

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

     }
     }

-    return c;

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

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

+

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

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

+        return x;

     } else {
     } else {

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

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

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

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

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

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

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

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

-

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

@@ -2083,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 PASS1 }} if(as3_pass == 1) {{
 #define PASS1END }} if(as3_pass == 2) {{
 #define PASS2 }} if(as3_pass == 2) {{

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

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

+#define PASS_ALWAYS }} {{

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

-#line 2093 "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
 
 #ifdef short
 # undef short

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

-#define YYFINAL  146
+#define YYFINAL  163

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

-#define YYLAST   3061
+#define YYLAST   3351

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

-#define YYNTOKENS  134
+#define YYNTOKENS  136

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

-#define YYNNTS  114
+#define YYNNTS  135

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

-#define YYNRULES  308
+#define YYNRULES  353

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

-#define YYNSTATES  520
+#define YYNSTATES  598

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

-#define YYMAXUTOK   363
+#define YYMAXUTOK   365

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

@@ -2328,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,
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,

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

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

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

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

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

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

@@ -2360,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,
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
       75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,

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

 };
 
 #if YYDEBUG
 };
 
 #if YYDEBUG

@@ -2373,166 +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,
       19,    21,    23,    25,    30,    32,    33,    35,    37,    40,
       42,    44,    46,    48,    50,    55,    57,    59,    60,    63,
       65,    67,    69,    71,    73,    75,    77,    79,    81,    83,

-      85,    87,    89,    93,    96,    98,   100,   102,   104,   106,
-     108,   110,   115,   118,   120,   122,   126,   129,   130,   133,
-     136,   138,   142,   146,   147,   150,   151,   159,   160,   162,
-     164,   168,   170,   173,   177,   186,   193,   194,   201,   202,
-     210,   212,   215,   217,   220,   221,   223,   225,   228,   230,
-     233,   238,   242,   243,   252,   253,   263,   264,   270,   272,
-     275,   277,   280,   282,   283,   290,   293,   295,   300,   303,
-     305,   307,   311,   313,   314,   321,   322,   328,   331,   336,
-     337,   339,   341,   344,   346,   348,   350,   352,   354,   356,
-     358,   360,   362,   364,   365,   368,   369,   372,   373,   376,
-     377,   387,   388,   397,   398,   400,   402,   405,   407,   412,
-     414,   416,   418,   419,   421,   423,   426,   428,   431,   440,
-     442,   444,   445,   450,   452,   456,   460,   461,   464,   466,
-     468,   470,   472,   474,   476,   478,   480,   482,   483,   485,
-     488,   493,   497,   499,   504,   507,   509,   511,   512,   513,
-     526,   528,   529,   530,   541,   543,   547,   549,   551,   553,
-     557,   559,   561,   563,   566,   567,   568,   572,   573,   575,
-     577,   579,   582,   585,   586,   591,   596,   601,   604,   606,
-     609,   611,   613,   617,   619,   621,   623,   625,   627,   629,
-     631,   633,   635,   637,   639,   641,   643,   645,   647,   649,
-     651,   653,   657,   661,   665,   669,   673,   677,   681,   685,
-     689,   693,   696,   699,   703,   707,   711,   715,   719,   723,
-     727,   731,   735,   739,   743,   747,   751,   755,   759,   764,
-     767,   769,   773,   776,   781,   785,   786,   788,   792,   798,
-     802,   806,   810,   814,   818,   822,   826,   830,   834,   838,
-     842,   846,   852,   855,   858,   861,   864,   868,   871,   876,
-     882,   886,   892,   896,   898,   901,   906,   911,   914
+      85,    87,    89,    91,    95,    98,   100,   102,   104,   106,
+     108,   110,   112,   117,   120,   122,   124,   128,   131,   132,
+     135,   138,   140,   144,   148,   149,   152,   153,   161,   162,
+     164,   166,   170,   172,   175,   179,   188,   195,   196,   203,
+     204,   212,   214,   217,   219,   222,   223,   225,   227,   230,
+     232,   235,   240,   244,   245,   254,   255,   265,   266,   272,
+     274,   277,   279,   282,   284,   285,   292,   295,   297,   302,
+     305,   307,   309,   311,   313,   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[] =
 {
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {

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

-       0,  2071,  2071,  2073,  2073,  2074,  2075,  2077,  2078,  2079,
-    2080,  2081,  2082,  2083,  2084,  2086,  2086,  2087,  2088,  2090,
-    2091,  2092,  2093,  2094,  2095,  2096,  2098,  2099,  2101,  2102,
-    2105,  2106,  2107,  2108,  2109,  2110,  2111,  2112,  2113,  2114,
-    2115,  2116,  2117,  2118,  2121,  2122,  2123,  2124,  2125,  2126,
-    2127,  2128,  2132,  2133,  2137,  2144,  2148,  2149,  2153,  2154,
-    2156,  2157,  2159,  2220,  2221,  2224,  2224,  2243,  2244,  2245,
-    2250,  2254,  2259,  2260,  2262,  2282,  2330,  2330,  2349,  2349,
-    2364,  2367,  2370,  2373,  2377,  2378,  2379,  2380,  2381,  2382,
-    2384,  2395,  2398,  2398,  2429,  2429,  2454,  2454,  2470,  2471,
-    2472,  2473,  2481,  2490,  2490,  2539,  2543,  2554,  2564,  2581,
-    2582,  2584,  2585,  2587,  2587,  2589,  2589,  2592,  2608,  2625,
-    2626,  2627,  2628,  2636,  2637,  2638,  2639,  2640,  2641,  2642,
-    2643,  2644,  2645,  2649,  2650,  2652,  2653,  2655,  2656,  2660,
-    2658,  2666,  2664,  2673,  2674,  2675,  2676,  2677,  2678,  2679,
-    2680,  2682,  2688,  2689,  2690,  2691,  2692,  2693,  2696,  2709,
-    2709,  2711,  2711,  2713,  2714,  2716,  2791,  2792,  2794,  2795,
-    2796,  2797,  2798,  2800,  2801,  2802,  2803,  2815,  2819,  2825,
-    2831,  2839,  2844,  2850,  2858,  2866,  2867,  2868,  2871,  2870,
-    2887,  2888,  2890,  2889,  2913,  2932,  2946,  2947,  2949,  2950,
-    2952,  2953,  2954,  2963,  2964,  2968,  2969,  2971,  2972,  2973,
-    2975,  2979,  2980,  2985,  2986,  3022,  3068,  3089,  3110,  3113,
-    3120,  3121,  3122,  3128,  3134,  3136,  3138,  3140,  3142,  3144,
-    3146,  3163,  3168,  3171,  3174,  3177,  3180,  3183,  3186,  3189,
-    3192,  3196,  3199,  3202,  3205,  3208,  3211,  3214,  3217,  3221,
-    3232,  3250,  3255,  3260,  3265,  3270,  3275,  3279,  3283,  3288,
-    3292,  3296,  3305,  3314,  3324,  3329,  3341,  3347,  3352,  3358,
-    3364,  3368,  3370,  3381,  3390,  3397,  3398,  3400,  3406,  3415,
-    3422,  3434,  3440,  3446,  3452,  3458,  3464,  3470,  3476,  3489,
-    3500,  3507,  3520,  3547,  3561,  3575,  3589,  3604,  3611,  3618,
-    3625,  3632,  3643,  3693,  3798,  3805,  3812,  3819,  3826
+       0,  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
 
 };
 #endif
 

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

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

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

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

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

-  "\"int\"", "\"Number\"", "\"String\"", "\"default\"", "\"delete\"",
-  "\"if\"", "\"else\"", "\"break\"", "\"is\"", "\"in\"", "\"as\"",
-  "\"{ (dictionary)\"", "\"==\"", "\"===\"", "\"!=\"", "\"!==\"", "\"<=\"",
-  "\">=\"", "\"|=\"", "\"/=\"", "\"%=\"", "\"*=\"", "\"+=\"", "\"-=\"",
-  "\"^=\"", "\">>=\"", "\"<<=\"", "\">>>=\"", "\"||\"", "\"&&\"", "\"::\"",
-  "\"--\"", "\"++\"", "\"..\"", "\"...\"", "\"<<\"", "\">>>\"", "\">>\"",
-  "prec_none", "below_semicolon", "';'", "','", "below_assignment", "'='",
-  "\"&=\"", "'?'", "':'", "'|'", "'^'", "'&'", "'<'", "'>'", "below_minus",
-  "'-'", "'+'", "'/'", "'*'", "'%'", "'~'", "'!'", "minusminus_prefix",
-  "plusplus_prefix", "below_curly", "'('", "new2", "'['", "']'", "'{'",
-  "'.'", "'@'", "above_identifier", "below_else", "above_function", "'}'",
-  "')'", "$accept", "PROGRAM", "MAYBE_PROGRAM_CODE_LIST",
-  "PROGRAM_CODE_LIST", "PROGRAM_CODE", "MAYBE_INPACKAGE_CODE_LIST",
-  "INPACKAGE_CODE_LIST", "INPACKAGE_CODE", "MAYBECODE", "CODE",
-  "CODE_STATEMENT", "CODEPIECE", "CODEBLOCK", "PACKAGE_INITCODE",
-  "CONDITIONAL_COMPILATION", "MAYBEEXPRESSION", "VARIABLE_DECLARATION",
-  "VARIABLE_LIST", "ONE_VARIABLE", "MAYBEELSE", "IF", "$@1", "FOR_INIT",
-  "FOR_IN_INIT", "FOR_START", "FOR", "FOR_IN", "WHILE", "$@2", "DO_WHILE",
-  "$@3", "BREAK", "CONTINUE", "MAYBE_CASE_LIST", "CASE_LIST", "CASE",
-  "DEFAULT", "SWITCH", "$@4", "CATCH", "$@5", "FINALLY", "$@6",
-  "CATCH_LIST", "CATCH_FINALLY_LIST", "TRY", "$@7", "THROW", "WITH_HEAD",
-  "WITH", "X_IDENTIFIER", "PACKAGE", "PACKAGE_DECLARATION", "$@8", "$@9",
-  "IMPORT", "MAYBE_MODIFIERS", "MODIFIER_LIST", "MODIFIER", "EXTENDS",
-  "EXTENDS_LIST", "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10",
-  "INTERFACE_DECLARATION", "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY",
-  "CLASS_BODY_ITEM", "MAYBE_INTERFACE_BODY", "INTERFACE_BODY",
-  "IDECLARATION", "VARCONST", "SLOT_DECLARATION", "$@12", "SLOT_LIST",
-  "ONE_SLOT", "MAYBESTATICCONSTANT", "STATICCONSTANT", "MAYBE_PARAM_LIST",
-  "PARAM_LIST", "PARAM", "GETSET", "FUNCTION_DECLARATION", "$@13",
-  "MAYBE_IDENTIFIER", "INNERFUNCTION", "$@14", "CLASS", "PACKAGEANDCLASS",
-  "CLASS_SPEC", "CLASS_SPEC_LIST", "TYPE", "MAYBETYPE",
-  "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST", "EXPRESSION_LIST",
-  "EXPRESSION_LIST_AND_COMMA", "XX", "NEW", "FUNCTIONCALL", "DELETE",
-  "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION", "VOIDEXPRESSION", "E",
-  "CONSTANT", "MAYBE_EXPRPAIR_LIST", "EXPRPAIR_LIST", "VAR_READ",
-  "NAMESPACE_ID", "NAMESPACE_DECLARATION", "USE_NAMESPACE", 0
+  "\"int\"", "\"Number\"", "\"String\"", "\"default\"", "\"default xml\"",
+  "\"delete\"", "\"if\"", "\"else\"", "\"break\"", "\"is\"", "\"in\"",
+  "\"as\"", "\"{ (dictionary)\"", "\"==\"", "\"===\"", "\"!=\"", "\"!==\"",
+  "\"<=\"", "\">=\"", "\"|=\"", "\"/=\"", "\"%=\"", "\"*=\"", "\"&=\"",
+  "\"+=\"", "\"-=\"", "\"^=\"", "\">>=\"", "\"<<=\"", "\">>>=\"", "\"||\"",
+  "\"&&\"", "\"::\"", "\"--\"", "\"++\"", "\"..\"", "\"...\"", "\"<<\"",
+  "\">>>\"", "\">>\"", "prec_none", "below_semicolon", "';'", "','",
+  "below_assignment", "'='", "'?'", "':'", "'|'", "'^'", "'&'", "below_lt",
+  "'<'", "'>'", "below_minus", "'-'", "'+'", "'/'", "'*'", "'%'", "'~'",
+  "'!'", "minusminus_prefix", "plusplus_prefix", "below_curly", "'('",
+  "new2", "'['", "']'", "'{'", "'.'", "'@'", "above_identifier",
+  "below_else", "above_function", "'}'", "')'", "$accept", "PROGRAM",
+  "MAYBE_PROGRAM_CODE_LIST", "PROGRAM_CODE_LIST", "PROGRAM_CODE",
+  "MAYBE_INPACKAGE_CODE_LIST", "INPACKAGE_CODE_LIST", "INPACKAGE_CODE",
+  "MAYBECODE", "CODE", "CODE_STATEMENT", "CODEPIECE", "CODEBLOCK",
+  "PACKAGE_INITCODE", "CONDITIONAL_COMPILATION", "MAYBEEXPRESSION",
+  "VARIABLE_DECLARATION", "VARIABLE_LIST", "ONE_VARIABLE", "MAYBEELSE",
+  "IF", "$@1", "FOR_INIT", "FOR_IN_INIT", "FOR_START", "FOR", "FOR_IN",
+  "WHILE", "$@2", "DO_WHILE", "$@3", "BREAK", "CONTINUE",
+  "MAYBE_CASE_LIST", "CASE_LIST", "CASE", "DEFAULT", "SWITCH", "$@4",
+  "CATCH", "$@5", "FINALLY", "$@6", "CATCH_LIST", "CATCH_FINALLY_LIST",
+  "TRY", "$@7", "THROW", "WITH_HEAD", "WITH", "X_IDENTIFIER", "PACKAGE",
+  "PACKAGE_DECLARATION", "$@8", "$@9", "IMPORT", "MAYBE_MODIFIERS",
+  "MODIFIER_LIST", "MODIFIER", "EXTENDS", "EXTENDS_LIST",
+  "IMPLEMENTS_LIST", "CLASS_DECLARATION", "$@10", "INTERFACE_DECLARATION",
+  "$@11", "MAYBE_CLASS_BODY", "CLASS_BODY", "CLASS_BODY_ITEM",
+  "MAYBE_INTERFACE_BODY", "INTERFACE_BODY", "IDECLARATION", "VARCONST",
+  "SLOT_DECLARATION", "$@12", "SLOT_LIST", "ONE_SLOT", "MAYBECONSTANT",
+  "CONSTANT", "XML", "OPEN", "CLOSE", "CLOSE2", "XMLEXPR1", "$@13",
+  "XMLEXPR2", "$@14", "XMLTEXT", "XML2", "XML_ID_OR_EXPR", "XMLNODE",
+  "MAYBE_XMLATTRIBUTES", "XMLATTRIBUTES", "XMLATTRIBUTE",
+  "MAYBE_PARAM_LIST", "PARAM_LIST", "PARAM", "GETSET",
+  "FUNCTION_DECLARATION", "$@15", "MAYBE_IDENTIFIER", "INNERFUNCTION",
+  "$@16", "CLASS", "PACKAGEANDCLASS", "CLASS_SPEC", "CLASS_SPEC_LIST",
+  "TYPE", "MAYBETYPE", "MAYBE_PARAM_VALUES", "MAYBE_EXPRESSION_LIST",
+  "EXPRESSION_LIST", "EXPRESSION_LIST_AND_COMMA", "XX", "NEW",
+  "FUNCTIONCALL", "DELETE", "RETURN", "NONCOMMAEXPRESSION", "EXPRESSION",
+  "COMMA_EXPRESSION", "VOIDEXPRESSION", "MAYBE_DICT_EXPRPAIR_LIST",
+  "DICTLH", "DICT_EXPRPAIR_LIST", "E", "$@17", "ID_OR_NS", "SUBNODE",
+  "MEMBER", "VAR_READ", "NAMESPACE_ID", "NAMESPACE_DECLARATION",
+  "DEFAULT_NAMESPACE", "USE_NAMESPACE", 0

 };
 #endif
 
 };
 #endif
 

@@ -2606,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,
      315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
      325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
      335,   336,   337,   338,   339,   340,   341,   342,   343,   344,

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

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

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

 {
 {

-       0,   134,   135,   136,   136,   137,   137,   138,   138,   138,
-     138,   138,   138,   138,   138,   139,   139,   140,   140,   141,
-     141,   141,   141,   141,   141,   141,   142,   142,   143,   143,
-     144,   144,   144,   144,   144,   144,   144,   144,   144,   144,
-     144,   144,   144,   144,   145,   145,   145,   145,   145,   145,
-     145,   145,   146,   146,   147,   148,   149,   149,   150,   150,
-     151,   151,   152,   153,   153,   155,   154,   156,   156,   156,
-     157,   157,   158,   158,   159,   160,   162,   161,   164,   163,
-     165,   165,   166,   166,   167,   167,   167,   167,   168,   168,
-     169,   170,   172,   171,   174,   173,   176,   175,   177,   177,
-     178,   178,   178,   180,   179,   181,   181,   182,   183,   184,
-     184,   185,   185,   187,   186,   188,   186,   189,   189,   190,
-     190,   191,   191,   192,   192,   192,   192,   192,   192,   192,
-     192,   192,   192,   193,   193,   194,   194,   195,   195,   197,
-     196,   199,   198,   200,   200,   201,   201,   202,   202,   202,
-     202,   202,   203,   203,   204,   204,   205,   205,   205,   206,
-     206,   208,   207,   209,   209,   210,   211,   211,   212,   212,
-     212,   212,   212,   212,   212,   212,   212,   213,   213,   213,
-     213,   214,   214,   215,   215,   216,   216,   216,   218,   217,
-     219,   219,   221,   220,   222,   223,   224,   224,   225,   225,
-     226,   226,   226,   227,   227,   228,   228,   229,   229,   229,
-     230,   231,   230,   232,   233,   234,   234,   235,   236,   236,
-     237,   238,   238,   239,   240,   240,   240,   240,   240,   240,
-     240,   241,   241,   241,   241,   241,   241,   241,   241,   241,
-     241,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   240,   240,   240,   240,   242,   242,   243,   243,   240,
-     240,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   240,   240,   240,   240,   240,   240,   240,   240,   240,
-     240,   240,   240,   244,   245,   245,   245,   246,   247
+       0,   136,   137,   138,   138,   139,   139,   140,   140,   140,
+     140,   140,   140,   140,   140,   141,   141,   142,   142,   143,
+     143,   143,   143,   143,   143,   143,   144,   144,   145,   145,
+     146,   146,   146,   146,   146,   146,   146,   146,   146,   146,
+     146,   146,   146,   146,   146,   147,   147,   147,   147,   147,
+     147,   147,   147,   148,   148,   149,   150,   151,   151,   152,
+     152,   153,   153,   154,   155,   155,   157,   156,   158,   158,
+     158,   159,   159,   160,   160,   161,   162,   164,   163,   166,
+     165,   167,   167,   168,   168,   169,   169,   169,   169,   170,
+     170,   171,   172,   174,   173,   176,   175,   178,   177,   179,
+     179,   180,   180,   180,   182,   181,   183,   183,   184,   185,
+     186,   186,   186,   186,   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.  */
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */

@@ -2657,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,     1,     1,     4,     1,     0,     1,     1,     2,     1,
        1,     1,     1,     1,     4,     1,     1,     0,     2,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,

-       1,     1,     3,     2,     1,     1,     1,     1,     1,     1,
-       1,     4,     2,     1,     1,     3,     2,     0,     2,     2,
-       1,     3,     3,     0,     2,     0,     7,     0,     1,     1,
-       3,     1,     2,     3,     8,     6,     0,     6,     0,     7,
-       1,     2,     1,     2,     0,     1,     1,     2,     1,     2,
-       4,     3,     0,     8,     0,     9,     0,     5,     1,     2,
-       1,     2,     1,     0,     6,     2,     1,     4,     2,     1,
-       1,     3,     1,     0,     6,     0,     5,     2,     4,     0,
-       1,     1,     2,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     0,     2,     0,     2,     0,     2,     0,
-       9,     0,     8,     0,     1,     1,     2,     1,     4,     1,
-       1,     1,     0,     1,     1,     2,     1,     2,     8,     1,
-       1,     0,     4,     1,     3,     3,     0,     2,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     0,     1,     2,
-       4,     3,     1,     4,     2,     1,     1,     0,     0,    12,
-       1,     0,     0,    10,     1,     3,     1,     1,     1,     3,
-       1,     1,     1,     2,     0,     0,     3,     0,     1,     1,
-       1,     2,     2,     0,     4,     4,     4,     2,     1,     2,
-       1,     1,     3,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     2,     2,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     4,     2,
-       1,     3,     2,     4,     3,     0,     1,     3,     5,     3,
+       1,     1,     1,     3,     2,     1,     1,     1,     1,     1,
+       1,     1,     4,     2,     1,     1,     3,     2,     0,     2,
+       2,     1,     3,     3,     0,     2,     0,     7,     0,     1,
+       1,     3,     1,     2,     3,     8,     6,     0,     6,     0,
+       7,     1,     2,     1,     2,     0,     1,     1,     2,     1,
+       2,     4,     3,     0,     8,     0,     9,     0,     5,     1,
+       2,     1,     2,     1,     0,     6,     2,     1,     4,     2,
+       1,     1,     1,     1,     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,     3,     3,     3,     3,     3,     3,

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

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

@@ -2691,836 +2807,922 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {

-     119,   303,   132,   236,   230,   233,   234,   231,   232,   235,
-       0,     0,    78,     0,     0,   125,   123,   124,     0,   131,
-       0,   130,   191,   237,   270,   126,     0,     0,     0,   240,
-     127,   129,   128,     0,     0,   239,   238,     0,     0,   275,
-       0,     0,    14,     0,     0,     0,     0,   207,   119,     0,
-       0,     2,   119,     5,    54,    12,     0,    36,    67,    31,
-      32,    33,    34,    35,    38,   119,    37,     7,    30,     0,
-     120,   121,     9,     8,    11,    10,   224,   227,   229,   228,
-     223,    39,   221,   225,   226,    41,    40,     0,     0,    72,
-      76,   119,    92,   109,   110,   115,   112,     0,     0,   303,
-     213,   190,     0,   269,     0,     0,   117,     0,   103,   207,
-       0,   217,    65,     0,   220,     0,   276,   295,   294,   272,
-     252,   251,     0,     0,   208,   209,   210,    82,     0,   106,
-     218,     0,    80,    44,    43,   119,    45,    29,     0,    46,
-      47,    48,    50,     0,    49,   297,     1,     6,   119,   303,
-       0,    68,     0,     0,    69,    53,   108,     0,   187,     0,
-     160,     0,   159,   161,   307,   122,     0,     0,     0,     0,
+     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,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,   293,
-     292,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   207,     0,     0,
-      55,    73,     0,     0,     0,   119,   113,     0,   194,     0,
-     197,   196,   308,   205,   177,     0,     0,     0,    27,     0,
-     296,     0,     0,   279,     0,   271,   274,   211,   212,    83,
-     204,    59,    60,   105,   219,    58,    81,    42,    28,   119,
-       0,   204,     0,     0,    52,   304,   186,   185,     0,   133,
-     135,     0,   222,   266,   267,   264,   265,   245,   246,   248,
-     247,   243,   244,   286,   285,   281,   280,   288,   289,   287,
-     283,   282,   284,   249,   250,   300,   258,   257,   256,   290,
-       0,   255,   254,   253,   241,   242,   262,   261,   259,   263,
-     260,     0,     0,   302,     0,     0,     0,     0,     0,    25,
-       0,   119,    17,    23,     0,    20,    19,    22,    21,   119,
-     111,     0,   207,   214,   166,     0,     0,   178,   182,   107,
-     195,   118,   268,     0,    26,   216,     0,   277,     0,     0,
-      57,     0,   119,    13,    57,     0,     0,     0,     0,     0,
-     137,     0,     0,   204,   162,   163,     0,   215,   273,     0,
-       0,   298,   119,     0,     0,   116,    18,   119,     0,     0,
-       0,     0,   184,   179,   204,     0,     0,   119,     0,   202,
-     201,   200,   203,     0,    62,    61,    51,     0,   119,   305,
-     306,   177,   134,     0,     0,   198,   136,   141,    57,     0,
-     291,   299,   301,    77,     0,    84,     0,   114,   206,   176,
-     172,   169,   170,   168,   171,   175,   174,   173,   167,   166,
-       0,     0,   181,     0,     0,    98,   102,   100,   104,    63,
-     278,    56,     0,    75,     0,   138,   139,     0,   119,   165,
-     164,    79,     0,     0,     0,    85,    88,    86,    24,   183,
-     192,   180,    96,     0,    99,   101,   119,    66,   119,   204,
-     119,   199,     0,   156,     0,     0,   119,   154,     0,    27,
-      93,    89,    87,    27,    27,   204,    64,    74,     0,   147,
-     151,     0,     0,     0,   119,   145,   149,   150,   157,   187,
-     142,   155,    27,    91,     0,     0,     0,   188,   119,   140,
-     146,     0,    90,   193,    97,    94,    27,     0,     0,     0,
-       0,   148,   177,    27,   189,     0,     0,   204,    95,   158
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       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[] =
 {
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {

-      -1,    50,    51,    52,    53,   310,   311,   312,   333,   334,
-     136,   137,   156,   313,   138,   384,   139,   245,   242,   457,
-      57,   231,   152,   153,    58,    59,    60,    61,   212,    62,
-      91,   140,   141,   444,   445,   446,   447,    63,   214,   425,
-     509,   426,   474,   427,   428,    64,   228,   142,    65,    66,
-      96,   219,    67,   319,   215,    68,   143,    70,    71,   350,
-     352,   394,   315,   460,   316,   438,   483,   484,   485,   465,
-     466,   467,   163,   317,   261,   354,   355,   372,   418,   326,
-     327,   328,   258,   318,   506,   102,    76,   473,   220,   221,
-     381,   396,   382,   340,   323,   123,   124,   125,   223,    77,
-      78,    79,   144,   126,    80,    81,    82,    83,   115,   116,
-      84,   164,    85,    86
+      -1,    52,    53,    54,    55,   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.  */
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */

-#define YYPACT_NINF -388
+#define YYPACT_NINF -490

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

-    1673,   -42,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,
-     -29,   -72,  -388,   -47,    16,  -388,  -388,  -388,    74,  -388,
-    2093,  -388,    64,  -388,  2163,  -388,   -24,    42,    25,  -388,
-    -388,  -388,  -388,    -1,     5,  -388,  -388,  2093,    56,  2093,
-    2093,  2093,  -388,  2093,  2093,  2093,  2093,  2093,   633,   110,
-     144,  -388,   503,  -388,  -388,  -388,    50,  -388,  2023,  -388,
-    -388,  -388,  -388,  -388,  -388,  1925,  -388,  -388,  -388,    97,
-     233,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,
-     104,  -388,  2568,  -388,  -388,  -388,  -388,   196,    84,  -388,
-    -388,  1925,  -388,  -388,  -388,  -388,  -388,    85,    70,  -388,
-     -59,  -388,    91,   237,  2093,    87,  -388,  2093,  -388,  2093,
-     225,   237,  -388,   130,  2568,   106,   139,   237,   237,   174,
-     237,   237,   -61,   121,   147,  2093,  -388,   245,   253,  2093,
-    2093,   253,   255,  -388,  -388,   763,  -388,  -388,   135,  -388,
-    -388,  -388,  -388,   249,  -388,  -388,  -388,  -388,  1023,   195,
-     265,  -388,   170,   202,  -388,   173,  -388,   270,    72,   271,
-    -388,   272,  -388,  -388,  -388,  -388,  2093,  2093,  2093,  2093,
-    2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,
-    2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,  -388,
-    -388,   273,  2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,
-    2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,  2093,    11,
-    -388,  -388,  2093,   269,  2093,  1153,  -388,    42,   157,   158,
-    -388,  -388,  -388,   164,    13,   -57,    19,  2188,  1799,   160,
-    -388,  2093,  2093,  -388,  2093,  -388,  -388,  -388,  -388,  -388,
-     189,   197,  -388,   104,   104,   197,  -388,  -388,  -388,  1925,
-     163,   189,  2093,  2093,  -388,   198,  -388,  -388,   296,   251,
-     252,   305,  2568,   301,   495,   495,   495,  2934,  2934,  2934,
-    2934,   301,   301,  2568,  2568,  2568,  2568,  2568,  2568,  2568,
-    2568,  2568,  2568,  2629,  2690,  -388,   118,   118,   118,  2568,
-    2385,  2751,  2812,  2873,   301,   301,   174,   174,   237,   237,
-     237,   177,  2446,   226,  2093,   311,   -56,   194,  2259,  -388,
-     185,  1283,  -388,  -388,   192,  -388,  -388,  -388,  -388,  1153,
-    -388,   119,  2093,  -388,   100,   320,   191,   230,  -388,  -388,
-     157,  -388,  -388,   193,  1799,  -388,   -54,  -388,   221,    22,
-     229,   253,   893,  -388,   -28,    31,   -16,    99,   210,    70,
-     317,    70,   212,   189,   236,  -388,  2093,  -388,  -388,   339,
-    2322,  -388,  1925,  2093,   213,  -388,  -388,  1153,   214,   217,
-      54,    22,  -388,  -388,   189,    15,   112,  1925,  2093,  -388,
-    -388,  -388,  -388,  2093,  -388,  -388,  -388,  2093,  1925,  -388,
-    -388,    13,  -388,    70,   219,  -388,   247,  -388,   229,   305,
-    2568,  -388,  -388,  -388,   -15,    26,   220,  -388,  -388,  -388,
-    -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,   261,
-     227,   320,  -388,   240,   250,  -388,  -388,   112,  -388,   286,
-    -388,  -388,   222,  -388,   242,   247,  -388,    70,   203,  -388,
-    -388,  -388,  2093,   274,   246,    26,  -388,  -388,  -388,  -388,
-    -388,  -388,  -388,   377,  -388,  -388,  1925,  -388,  1925,   189,
-    1413,  -388,   378,  -388,   359,   256,   336,  -388,  2507,  1799,
-    -388,  -388,  -388,  1799,  1799,   189,  -388,  -388,   263,  -388,
-    -388,   264,    51,   262,  1543,  -388,  -388,  -388,  -388,    72,
-    -388,  -388,  1799,  -388,   266,   267,   254,  -388,  1413,  -388,
-    -388,   397,  -388,  -388,  -388,  -388,  1799,   275,   280,   278,
-     276,  -388,    13,  1799,  -388,   279,   277,   189,  -388,  -388
+    1763,   -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[] =
 {
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {

-    -388,  -388,   257,  -388,   354,  -296,  -388,   107,  -387,   -31,
-       1,   -55,   -85,    29,     2,    21,   362,   293,    81,  -388,
-    -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,
-    -388,  -388,  -388,  -388,  -388,   -21,   -19,  -388,  -388,     6,
-    -388,     7,  -388,  -388,  -388,  -388,  -388,  -388,  -388,  -388,
-    -175,    76,  -388,  -388,  -388,  -388,     0,  -388,   357,  -388,
-    -388,  -388,    48,  -388,    49,  -388,   -68,  -388,   -53,  -388,
-    -388,   -30,  -388,     3,  -388,  -388,    33,    18,  -388,  -376,
-    -388,  -305,   -49,     4,  -388,  -388,  -388,  -388,  -388,   412,
-     -89,    52,    71,  -239,  -388,   -96,  -388,  -388,  -388,  -388,
-    -388,  -388,  -388,   -34,    -9,   -50,   -13,  -388,  -388,  -388,
-    -388,  -388,  -388,  -388
+    -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.  */
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */

-#define YYTABLE_NINF -154
+#define YYTABLE_NINF -337

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

-      69,    54,    56,    74,    75,   113,   213,   100,   154,   222,
-     155,   103,   344,   229,   303,   434,   324,   135,   324,    93,
-     373,    88,   330,   368,   111,   218,   114,   117,   118,    55,
-     119,   120,   121,   191,   114,    94,   155,   122,    94,   166,
-     -70,    94,   320,   166,   166,    93,   166,    87,    72,    73,
-      90,   320,    69,    54,    56,    74,    75,   409,   379,   410,
-     442,    94,   411,   412,   413,   208,   414,   101,   209,   157,
-     422,   406,   235,   218,   383,    92,   329,   362,   158,   377,
-     248,    55,   493,   160,   166,   166,   494,   495,   443,    94,
-      97,   238,    98,    89,   227,   225,   114,   162,   104,   415,
-      72,    73,   389,   105,   390,   502,   325,   256,   421,   416,
-     417,   301,   114,   145,   398,   157,   451,   388,   441,   510,
-     243,   244,   330,   257,   158,   108,   516,   109,   159,   160,
-     387,   166,   110,   304,   331,   420,   515,   380,    94,   305,
-     423,   161,    95,   162,   146,   424,   320,   107,    69,    54,
-      56,    74,    75,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   148,    55,   112,   286,
-     287,   288,   289,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   114,   302,    72,    73,   337,   210,
-     338,   308,   370,   306,   166,   371,   211,     2,   189,   190,
-     191,   216,   217,   224,   226,    69,    54,   314,   342,   114,
-     478,   114,   336,    15,    16,    17,   369,    19,   230,    21,
-     202,   203,   204,   205,   206,   232,   496,     2,   233,   234,
-     207,    25,   208,   345,   346,   209,   236,   237,   239,   462,
-      30,    31,    32,    15,    16,    17,   240,    19,   246,    21,
-     392,   249,   395,   -71,   189,   190,   191,   157,   251,   252,
-     253,    25,   254,   255,   259,   260,   285,   403,   519,   248,
-      30,    31,    32,   307,  -109,   321,   322,   248,   204,   205,
-     206,   360,   429,   335,   339,   343,   207,   341,   208,   348,
-     347,   209,   463,   433,   395,   349,   351,   155,   353,   114,
-     357,    69,    54,   314,   361,   359,   363,   365,   367,    69,
-      54,   314,   155,   324,   374,   376,   378,   189,   190,   191,
-     375,   383,   391,   155,   393,  -152,   399,   432,   397,   405,
-       2,  -154,   401,   400,   430,   436,   407,   437,   461,   431,
-     408,   456,   448,   450,   404,   458,    15,    16,    17,   207,
-      19,   208,    21,   370,   209,   114,   452,    69,    54,   314,
-     114,   476,   453,   477,    25,   459,  -154,  -154,   470,   469,
-     475,   488,   462,    30,    31,    32,   489,   505,   490,   497,
-     498,   189,   190,   191,   499,   192,   193,   194,   503,   504,
-     508,   155,   512,   155,   513,   250,   147,   511,   514,   518,
-    -154,  -154,   517,   202,   203,   204,   205,   206,   366,   439,
-     151,   241,   385,   207,   471,   208,   472,   165,   209,   468,
-     507,   500,   440,   454,   455,   463,   491,   449,   464,   106,
-     501,     0,   419,     0,     0,   435,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     482,   480,   481,   486,   487,     0,   464,     0,  -153,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   482,   480,   481,   486,   487,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   482,   480,
-     481,   486,   487,    -4,     0,     0,     1,     2,     3,     4,
-       0,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-       0,     0,    14,    15,    16,    17,    18,    19,    20,    21,
-       0,     0,    23,     0,     0,   167,     0,     0,     0,    24,
-       0,    25,    26,     0,    27,     0,    28,     0,    29,     0,
-      30,    31,    32,     0,     0,    33,    34,     0,    35,    36,
-       0,     0,  -154,  -154,  -154,     0,    37,    38,     0,     0,
-     175,   176,     0,    39,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   189,   190,   191,     0,   192,
-     193,   194,     0,    40,    41,     0,     0,     0,     0,     0,
-       0,     0,    42,     0,   200,   201,     0,   202,   203,   204,
-     205,   206,     0,     0,     0,    43,     0,   207,     0,   208,
-      44,    45,   209,     0,     0,    46,     0,    47,     0,    48,
-       0,    49,     0,     0,     0,    -4,     1,     2,     3,     4,
-       0,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-       0,     0,     0,    15,    16,    17,    18,    19,    20,    21,
-      22,     0,    23,   127,     0,   128,     0,     0,     0,    24,
-     129,    25,    26,     0,    27,   130,    28,     0,    29,   131,
-      30,    31,    32,     0,     0,    33,    34,     0,    35,    36,
-       0,     0,     0,     0,     0,     0,    37,    38,     0,   132,
-       0,     0,     0,    39,     0,     0,     0,     0,     0,     0,
+      71,    56,    58,    76,    81,   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,     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,   133,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    43,     0,     0,     0,     0,
-      44,    45,     0,     0,     0,    46,     0,    47,     0,    48,
-       0,    49,     0,     0,     0,   134,     1,     2,     3,     4,
-       0,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-       0,     0,     0,    15,    16,    17,    18,    19,    20,    21,
-      22,     0,    23,   127,     0,   128,     0,     0,     0,    24,
-     129,    25,    26,     0,    27,   130,    28,     0,    29,   131,
-      30,    31,    32,     0,     0,    33,    34,     0,    35,    36,
-       0,     0,     0,     0,     0,     0,    37,    38,     0,   132,
-       0,     0,     0,    39,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    41,
+      42,     0,     0,     0,     0,     0,     0,     0,   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,     0,     0,     0,

-       0,     0,     0,    40,    41,     0,     0,     0,     0,     0,
-       0,     0,   133,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    43,     0,     0,     0,     0,
-      44,    45,     0,     0,     0,    46,     0,    47,     0,    48,
-       0,    49,     0,     0,     0,   247,     1,     2,     3,     4,
-       0,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-       0,     0,     0,    15,    16,    17,    18,    19,    20,    21,
-      22,     0,    23,   127,     0,   128,     0,     0,     0,    24,
-     129,    25,    26,     0,    27,   130,    28,     0,    29,   131,
-      30,    31,    32,     0,     0,    33,    34,     0,    35,    36,
-       0,     0,     0,     0,     0,     0,    37,    38,     0,   132,
-       0,     0,     0,    39,     0,     0,     0,     0,     0,     0,
+       0,    41,    42,     0,     0,     0,     0,     0,     0,     0,
+     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,     0,     0,     0,

-       0,     0,     0,    40,    41,     0,     0,     0,     0,     0,
-       0,     0,   133,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    43,     0,     0,     0,     0,
-      44,    45,     0,     0,     0,    46,     0,    47,     0,    48,
-       0,    49,     0,     0,     0,   386,     1,     2,     3,     4,
-       0,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-       0,     0,    14,    15,    16,    17,    18,    19,    20,    21,
-       0,     0,    23,     0,     0,     0,     0,     0,     0,    24,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,   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,    25,    26,     0,    27,     0,    28,     0,    29,     0,
       30,    31,    32,     0,     0,    33,    34,     0,    35,    36,

-       0,     0,     0,     0,     0,     0,    37,    38,     0,     0,
-       0,     0,     0,    39,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    37,    38,    39,     0,
+       0,  -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,     0,     0,     0,

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

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

-       0,     0,     0,    40,    41,     0,     0,     0,     0,     0,
-       0,     0,   479,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    43,     0,     0,     0,     0,
-      44,    45,     0,     0,     0,    46,     0,    47,     0,    48,
-       0,    49,     0,     0,     0,  -143,     1,     2,     3,     4,
-       0,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-       0,     0,     0,    15,    16,    17,    18,    19,    20,    21,
-       0,     0,    23,     0,     0,     0,     0,     0,     0,    24,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,   547,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    44,     0,     0,    45,     0,     0,     0,     0,
+      46,    47,     0,     0,     0,    48,     0,    49,     0,    50,
+       0,    51,     0,    -3,     0,  -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,    25,    26,     0,    27,     0,    28,     0,    29,     0,
       30,    31,    32,     0,     0,    33,    34,     0,    35,    36,

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

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

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

-       0,     0,     0,    40,    41,     0,     0,     0,     0,     0,
-       0,     0,    42,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    43,     0,     0,     0,     0,
-      44,    45,     0,     0,     0,    46,     0,    47,     0,    48,
-       0,    49,     1,     2,     3,     4,     0,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,     0,  -119,     0,    15,
-      16,    17,    18,    19,    20,    21,    22,     0,    23,   127,
-       0,   128,     0,     0,     0,    24,   129,    25,    26,     0,
-      27,   130,    28,     0,    29,   131,    30,    31,    32,     0,
+       0,     0,     0,    41,    42,     0,     0,     0,     0,     0,
+       0,     0,   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,    33,    34,     0,    35,    36,     0,     0,     0,     0,

-       0,     0,    37,    38,     0,   132,     0,     0,     0,    39,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    40,
-      41,     0,     0,     0,     0,     0,     0,     0,   133,     0,
+       0,     0,    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,     0,

-       0,    43,     0,     0,     0,     0,    44,    45,     0,     0,
-       0,    46,     0,    47,     0,    48,     0,    49,     1,     2,
-       3,     4,     0,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,     0,     0,     0,    15,    16,    17,    18,    19,
-      20,    21,    22,     0,    23,   127,     0,   128,     0,     0,
-       0,    24,   129,    25,    26,     0,    27,   130,    28,     0,
-      29,   131,    30,    31,    32,     0,     0,    33,    34,     0,
-      35,    36,     0,     0,     0,     0,     0,     0,    37,    38,
-       0,   132,     0,     0,     0,    39,     0,     0,     0,     0,
+       0,    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,     0,

-       0,     0,     0,     0,     0,    40,    41,     0,     0,     0,
-       0,     0,     0,     0,   133,     0,   149,     0,     3,     4,
-       0,     5,     6,     7,     8,     9,     0,    43,     0,     0,
-       0,     0,    44,    45,     0,     0,     0,    46,    20,    47,
-      22,    48,    23,    49,     0,   128,     0,     0,     0,    24,
-       0,     0,     0,     0,     0,     0,    28,     0,    29,   150,
-       0,     0,     0,     0,     0,     0,    34,     0,    35,    36,
-       0,     0,     0,     0,     0,     0,    37,     0,     0,     0,
-       0,     0,     0,    39,     0,     0,    99,     0,     3,     4,
-       0,     5,     6,     7,     8,     9,     0,     0,     0,     0,
-       0,     0,     0,    40,    41,     0,     0,     0,    20,     0,
-      22,     0,    23,     0,     0,     0,     0,     0,     0,    24,
-       0,     0,     0,     0,     0,    43,    28,     0,    29,     0,
-      44,    45,     0,     0,     0,    46,    34,    47,    35,    36,
-       0,    49,     0,     0,     0,     0,    37,     0,     0,     0,
-       0,     0,     0,    39,     0,     0,    99,     0,     3,     4,
-       0,     5,     6,     7,     8,     9,     0,     0,     0,     0,
-       0,     0,     0,    40,    41,     0,     0,     0,    20,     0,
-      22,     0,    23,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    43,     0,     0,    29,     0,
-      44,    45,     0,     0,     0,    46,    34,    47,    35,    36,
-       0,    49,     0,     0,     0,     0,     0,     0,   167,     0,
-       0,     0,     0,    39,     0,     0,     0,     0,     0,     0,
+       0,     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,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,    40,    41,   168,   169,   170,     0,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,     0,   189,   190,
-     191,     0,   192,   193,   194,    46,     0,    47,     0,     0,
-     195,    49,   196,     0,   197,   198,   199,   200,   201,   167,
-     202,   203,   204,   205,   206,     0,     0,     0,     0,     0,
-     207,     0,   208,     0,     0,   209,     0,     0,     0,     0,
-       0,   332,     0,     0,     0,     0,   168,   169,   170,     0,
-     171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,     0,   189,
-     190,   191,     0,   192,   193,   194,     0,     0,     0,     0,
-       0,   195,   167,   196,     0,   197,   198,   199,   200,   201,
-       0,   202,   203,   204,   205,   206,     0,     0,     0,     0,
-       0,   207,     0,   208,     0,     0,   209,     0,     0,   168,
-     169,   170,   364,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,     0,   189,   190,   191,     0,   192,   193,   194,     0,
-       0,     0,     0,     0,   195,   167,   196,     0,   197,   198,
-     199,   200,   201,     0,   202,   203,   204,   205,   206,     0,
-       0,     0,     0,     0,   207,     0,   208,     0,     0,   209,
-       0,     0,   168,   169,   170,   402,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,     0,   189,   190,   191,     0,   192,
-     193,   194,     0,     0,     0,     0,   167,   195,     0,   196,
-     356,   197,   198,   199,   200,   201,     0,   202,   203,   204,
-     205,   206,     0,     0,     0,     0,     0,   207,     0,   208,
-       0,     0,   209,   168,   169,   170,     0,   171,   172,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,   185,   186,   187,   188,     0,   189,   190,   191,     0,
-     192,   193,   194,     0,     0,     0,     0,   167,   195,     0,
-     196,     0,   197,   198,   199,   200,   201,     0,   202,   203,
-     204,   205,   206,     0,     0,     0,     0,     0,   207,     0,
-     208,   358,     0,   209,   168,   169,   170,     0,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,     0,   189,   190,   191,
-       0,   192,   193,   194,     0,     0,     0,     0,   167,   195,
-       0,   196,   492,   197,   198,   199,   200,   201,     0,   202,
-     203,   204,   205,   206,     0,     0,     0,     0,     0,   207,
-       0,   208,     0,     0,   209,   168,   169,   170,     0,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,     0,   189,   190,
-     191,     0,   192,   193,   194,     0,     0,     0,     0,   167,
-     195,     0,   196,     0,   197,   198,   199,   200,   201,     0,
-     202,   203,   204,   205,   206,     0,     0,     0,     0,     0,
-     207,     0,   208,     0,     0,   209,   168,   169,   170,     0,
-     171,   172,   173,   174,   175,   176,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   188,     0,   189,
-     190,   191,     0,   192,   193,   194,     0,     0,     0,     0,
-     167,     0,     0,     0,     0,   197,   198,   199,   200,   201,
-       0,   202,   203,   204,   205,   206,     0,     0,     0,     0,
-       0,   207,     0,   208,     0,     0,   209,   168,   169,   170,
-       0,   171,   172,   173,   174,   175,   176,     0,     0,     0,
+       0,     0,   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,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-     189,   190,   191,     0,   192,   193,   194,     0,     0,     0,
-       0,   167,     0,     0,     0,     0,   197,   198,   199,   200,
-     201,     0,   202,   203,   204,   205,   206,     0,     0,     0,
-       0,     0,   207,     0,   208,     0,     0,   209,   168,   169,
-     170,     0,   171,   172,   173,   174,   175,   176,     0,     0,
+     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,     0,     0,     0,

-       0,   189,   190,   191,     0,   192,   193,   194,     0,     0,
-       0,     0,   167,     0,     0,     0,     0,     0,   198,   199,
-     200,   201,     0,   202,   203,   204,   205,   206,     0,     0,
-       0,     0,     0,   207,     0,   208,     0,     0,   209,   168,
-     169,   170,     0,   171,   172,   173,   174,   175,   176,     0,
+       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,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,   189,   190,   191,     0,   192,   193,   194,     0,
-       0,     0,     0,   167,     0,     0,     0,     0,     0,     0,
-     199,   200,   201,     0,   202,   203,   204,   205,   206,     0,
-       0,     0,     0,     0,   207,     0,   208,     0,     0,   209,
-     168,   169,   170,     0,   171,   172,   173,   174,   175,   176,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   189,   190,   191,     0,   192,   193,   194,
-       0,     0,     0,     0,   167,     0,     0,     0,     0,     0,
-       0,  -154,   200,   201,     0,   202,   203,   204,   205,   206,
-       0,     0,     0,     0,     0,   207,     0,   208,     0,     0,
-     209,   168,   169,   170,     0,  -154,  -154,  -154,  -154,   175,
-     176,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   189,   190,   191,     0,   192,   193,
-     194,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   200,   201,     0,   202,   203,   204,   205,
-     206,     0,     0,     0,     0,     0,   207,     0,   208,     0,
-       0,   209
+       0,     0,     0,     0,   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[] =
 {
 };
 
 static const yytype_int16 yycheck[] =
 {

-       0,     0,     0,     0,     0,    39,    91,    20,    58,    98,
-      65,    24,   251,   109,     3,   391,     3,    48,     3,     3,
-     325,    50,     3,   319,    37,     3,    39,    40,    41,     0,
-      43,    44,    45,    92,    47,    19,    91,    46,    19,   100,
-      68,    19,   217,   100,   100,     3,   100,    89,     0,     0,
-     122,   226,    52,    52,    52,    52,    52,     3,    36,     5,
-      34,    19,     8,     9,    10,   124,    12,     3,   127,    18,
-     375,   367,   133,     3,   102,   122,   133,   133,    27,   133,
-     135,    52,   469,    32,   100,   100,   473,   474,    62,    19,
-      14,   125,    18,   122,   107,   104,   109,    46,   122,    45,
-      52,    52,     3,    27,     5,   492,    93,    35,    93,    55,
-      56,   207,   125,     3,   353,    18,   421,   133,   133,   506,
-     129,   130,     3,    51,    27,   126,   513,   122,    31,    32,
-      99,   100,   127,   122,   115,   374,   512,   115,    19,   128,
-      28,    44,   126,    46,     0,    33,   321,   122,   148,   148,
-     148,   148,   148,   166,   167,   168,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185,   186,   187,   188,   126,   148,   122,   192,
+       0,     0,     0,     0,     0,    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,
      193,   194,   195,   196,   197,   198,   199,   200,   201,   202,

-     203,   204,   205,   206,   207,   208,   148,   148,   232,     3,
-     234,   214,   102,   212,   100,   105,   122,     4,    90,    91,
-      92,   126,   127,   122,   127,   215,   215,   215,   249,   232,
-     459,   234,   231,    20,    21,    22,   322,    24,     3,    26,
-     112,   113,   114,   115,   116,   105,   475,     4,   132,   100,
-     122,    38,   124,   252,   253,   127,   125,   100,     3,    46,
-      47,    48,    49,    20,    21,    22,     3,    24,     3,    26,
-     349,   126,   351,    68,    90,    91,    92,    18,     3,    99,
-      68,    38,    99,     3,     3,     3,     3,   362,   517,   334,
-      47,    48,    49,    14,   127,   127,   122,   342,   114,   115,
-     116,   304,   377,   133,   105,   132,   122,   100,   124,     3,
-     102,   127,    99,   388,   393,    54,    54,   362,     3,   322,
-     133,   311,   311,   311,     3,    89,   122,   132,   126,   319,
-     319,   319,   377,     3,   133,   132,   105,    90,    91,    92,
-     100,   102,   122,   388,    17,   132,   100,   387,   126,   126,
-       4,    40,     3,   356,   378,   126,   132,   100,   437,   383,
-     133,    65,   132,   126,   363,   133,    20,    21,    22,   122,
-      24,   124,    26,   102,   127,   378,   126,   367,   367,   367,
-     383,   456,   122,   458,    38,   133,    75,    76,   132,   105,
-       3,     3,    46,    47,    48,    49,    27,   133,   132,   126,
-     126,    90,    91,    92,   132,    94,    95,    96,   132,   132,
-       3,   456,   122,   458,   126,   148,    52,   132,   132,   132,
-     109,   110,   133,   112,   113,   114,   115,   116,   311,   398,
-      58,   128,   341,   122,   445,   124,   445,    70,   127,   442,
-     498,   484,   399,   427,   427,    99,   466,   419,   438,    27,
-     489,    -1,   371,    -1,    -1,   393,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     460,   460,   460,   460,   460,    -1,   466,    -1,   132,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   484,   484,   484,   484,   484,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   498,   498,
-     498,   498,   498,     0,    -1,    -1,     3,     4,     5,     6,
-      -1,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      -1,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
-      -1,    -1,    29,    -1,    -1,    40,    -1,    -1,    -1,    36,
-      -1,    38,    39,    -1,    41,    -1,    43,    -1,    45,    -1,
-      47,    48,    49,    -1,    -1,    52,    53,    -1,    55,    56,
-      -1,    -1,    67,    68,    69,    -1,    63,    64,    -1,    -1,
-      75,    76,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    90,    91,    92,    -1,    94,
-      95,    96,    -1,    90,    91,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    99,    -1,   109,   110,    -1,   112,   113,   114,
-     115,   116,    -1,    -1,    -1,   112,    -1,   122,    -1,   124,
-     117,   118,   127,    -1,    -1,   122,    -1,   124,    -1,   126,
-      -1,   128,    -1,    -1,    -1,   132,     3,     4,     5,     6,
-      -1,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      -1,    -1,    -1,    20,    21,    22,    23,    24,    25,    26,
-      27,    -1,    29,    30,    -1,    32,    -1,    -1,    -1,    36,
-      37,    38,    39,    -1,    41,    42,    43,    -1,    45,    46,
-      47,    48,    49,    -1,    -1,    52,    53,    -1,    55,    56,
-      -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    66,
-      -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+     203,   204,   205,   206,   207,   208,   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,    -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,
-      27,    -1,    29,    30,    -1,    32,    -1,    -1,    -1,    36,
-      37,    38,    39,    -1,    41,    42,    43,    -1,    45,    46,
-      47,    48,    49,    -1,    -1,    52,    53,    -1,    55,    56,
-      -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    66,
-      -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,
+      93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   101,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   111,    -1,
+      -1,   114,    -1,    -1,    -1,    -1,   119,   120,    -1,    -1,
+      -1,   124,    -1,   126,    -1,   128,    -1,   130,    -1,    -1,
+      -1,   134,     3,     4,     5,     6,    -1,     8,     9,    10,
+      11,    12,    13,    14,    -1,    -1,    -1,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    -1,    28,    29,    30,
+      -1,    32,    -1,    -1,    -1,    36,    37,    38,    39,    -1,
+      41,    42,    43,    -1,    45,    46,    47,    48,    49,    -1,
+      -1,    52,    53,    -1,    55,    56,    -1,    -1,    -1,    -1,
+      -1,    -1,    63,    64,    65,    -1,    67,    -1,    -1,    -1,
+      71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

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

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

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

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

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

-      -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    -1,
-      -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    65,    -1,
+      -1,    76,    77,    -1,    71,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,
+      -1,    96,    97,    98,    -1,    92,    93,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   101,    -1,   111,   112,    -1,   114,
+     115,   116,   117,   118,   111,    -1,    -1,   114,    -1,   124,
+      -1,   126,   119,   120,   129,    -1,    -1,   124,    -1,   126,
+      -1,   128,    -1,   130,    -1,    -1,    -1,   134,     3,     4,
+       5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
+      -1,    -1,    -1,    18,    19,    20,    21,    22,    23,    24,
+      25,    -1,    -1,    28,    29,    -1,    -1,    -1,    -1,    -1,
+      -1,    36,    -1,    38,    39,    -1,    41,    -1,    43,    -1,
+      45,    -1,    47,    48,    49,    -1,    -1,    52,    53,    -1,
+      55,    56,    -1,    -1,    -1,    -1,    -1,    -1,    63,    64,
+      65,    -1,    -1,    -1,    -1,    -1,    71,    -1,    -1,    -1,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

       -1,    32,    -1,    -1,    -1,    36,    37,    38,    39,    -1,
       41,    42,    43,    -1,    45,    46,    47,    48,    49,    -1,
       -1,    52,    53,    -1,    55,    56,    -1,    -1,    -1,    -1,
       -1,    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,     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,    63,    64,    65,    -1,    67,    -1,    -1,    -1,
+      71,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

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

-      -1,    -1,    -1,    -1,    -1,    90,    91,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    99,    -1,     3,    -1,     5,     6,
-      -1,     8,     9,    10,    11,    12,    -1,   112,    -1,    -1,
-      -1,    -1,   117,   118,    -1,    -1,    -1,   122,    25,   124,
-      27,   126,    29,   128,    -1,    32,    -1,    -1,    -1,    36,
-      -1,    -1,    -1,    -1,    -1,    -1,    43,    -1,    45,    46,
-      -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,    55,    56,
-      -1,    -1,    -1,    -1,    -1,    -1,    63,    -1,    -1,    -1,
-      -1,    -1,    -1,    70,    -1,    -1,     3,    -1,     5,     6,
-      -1,     8,     9,    10,    11,    12,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    90,    91,    -1,    -1,    -1,    25,    -1,
-      27,    -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,    36,
-      -1,    -1,    -1,    -1,    -1,   112,    43,    -1,    45,    -1,
-     117,   118,    -1,    -1,    -1,   122,    53,   124,    55,    56,
-      -1,   128,    -1,    -1,    -1,    -1,    63,    -1,    -1,    -1,
-      -1,    -1,    -1,    70,    -1,    -1,     3,    -1,     5,     6,
-      -1,     8,     9,    10,    11,    12,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    90,    91,    -1,    -1,    -1,    25,    -1,
-      27,    -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   112,    -1,    -1,    45,    -1,
-     117,   118,    -1,    -1,    -1,   122,    53,   124,    55,    56,
-      -1,   128,    -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,
-      -1,    -1,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    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,    -1,    -1,    -1,

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

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

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

       78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
       78,    79,    80,    81,    82,    83,    84,    85,    86,    87,

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

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

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

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

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

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

-      90,    91,    92,    -1,    94,    95,    96,    -1,    -1,    -1,
-      -1,    40,    -1,    -1,    -1,    -1,   106,   107,   108,   109,
-     110,    -1,   112,   113,   114,   115,   116,    -1,    -1,    -1,
-      -1,    -1,   122,    -1,   124,    -1,    -1,   127,    67,    68,
-      69,    -1,    71,    72,    73,    74,    75,    76,    -1,    -1,
+      -1,    -1,    90,    -1,    92,    93,    94,    -1,    96,    97,
+      98,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,   107,
+     108,   109,    -1,   111,   112,    -1,   114,   115,   116,   117,
+     118,    -1,    -1,    -1,    -1,    -1,   124,    -1,   126,    -1,
+      -1,   129,    68,    69,    70,    -1,    72,    73,    74,    75,
+      76,    77,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,    -1,
+      96,    97,    98,    -1,    -1,    -1,    40,    -1,    -1,    -1,
+      -1,   107,   108,   109,    -1,   111,   112,    -1,   114,   115,
+     116,   117,   118,    -1,    -1,    -1,    -1,    -1,   124,    -1,
+     126,    -1,    -1,   129,    68,    69,    70,    -1,    72,    73,
+      74,    75,    76,    77,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,
+      94,    -1,    96,    97,    98,    -1,    -1,    -1,    40,    -1,
+      -1,    -1,    -1,    -1,   108,   109,    -1,   111,   112,    -1,
+     114,   115,   116,   117,   118,    -1,    -1,    -1,    -1,    -1,
+     124,    -1,   126,    -1,    -1,   129,    68,    69,    70,    -1,
+      72,    73,    74,    75,    76,    77,    -1,    -1,    -1,    -1,

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

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

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

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

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

-      -1,    -1,    -1,    90,    91,    92,    -1,    94,    95,    96,
-      -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-      -1,   108,   109,   110,    -1,   112,   113,   114,   115,   116,
-      -1,    -1,    -1,    -1,    -1,   122,    -1,   124,    -1,    -1,
-     127,    67,    68,    69,    -1,    71,    72,    73,    74,    75,
-      76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    90,    91,    92,    -1,    94,    95,
-      96,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   109,   110,    -1,   112,   113,   114,   115,
-     116,    -1,    -1,    -1,    -1,    -1,   122,    -1,   124,    -1,
-      -1,   127
+      -1,    -1,    -1,    -1,    92,    93,    94,    -1,    96,    97,
+      98,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   111,   112,    -1,   114,   115,   116,   117,
+     118,    -1,    -1,    -1,    -1,    -1,   124,    -1,   126,    -1,
+      -1,   129

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

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

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

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

@@ -4332,11 +4534,33 @@ yyreduce:
   switch (yyn)
     {
         
   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  */
     case 26:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2098 "parser.y"
+#line 1944 "parser.y"

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

@@ -4347,7 +4571,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2099 "parser.y"
+#line 1945 "parser.y"

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

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

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

     }
     break;
 
     }
     break;
 

@@ -4369,87 +4595,99 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2102 "parser.y"
+#line 1950 "parser.y"

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

-    case 42:
+    case 43:

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

-#line 2117 "parser.y"
+#line 1966 "parser.y"

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

-    case 43:
+    case 44:

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

-#line 2118 "parser.y"
+#line 1967 "parser.y"

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

-    case 44:
+    case 45:

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

-#line 2121 "parser.y"
+#line 1970 "parser.y"

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

-    case 51:
+    case 52:

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

-#line 2128 "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;
+    }
+    as3_pass=(yyvsp[(1) - (4)].number_int);
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 52:
+    case 53:

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

-#line 2132 "parser.y"
+#line 1989 "parser.y"

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

-    case 53:
+    case 54:

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

-#line 2133 "parser.y"
+#line 1990 "parser.y"

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

-    case 54:
+    case 55:

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

-#line 2137 "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;
 }
     }
     break;

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

-#line 2148 "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;
 
     }
     break;
 

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

-#line 2149 "parser.y"
-    {(yyval.value).c=abc_pushundefined(0);
-                                  (yyval.value).t=TYPE_ANY;
-                                 }
+#line 2024 "parser.y"
+    {(yyval.node)=(yyvsp[(2) - (2)].node);}

     }
     break;
 
     }
     break;
 

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

-#line 2153 "parser.y"
-    {(yyval.code)=(yyvsp[(2) - (2)].code);}
+#line 2025 "parser.y"
+    {(yyval.node)=mkdummynode();}

     }
     break;
 
     }
     break;
 

@@ -4495,7 +4739,7 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2154 "parser.y"
+#line 2027 "parser.y"

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

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

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

     }
     break;
 
     }
     break;
 

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

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

     }
     break;
 
     }
     break;
 

@@ -4528,7 +4772,18 @@ yyreduce:
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2160 "parser.y"
+#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)))
     {
 PASS12
     if(variable_exists((yyvsp[(1) - (3)].id)))

@@ -4537,11 +4792,6 @@ PASS1
     new_variable((yyvsp[(1) - (3)].id), 0, 1, 0);
 PASS2
    
     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) {
     char slot = 0;
     int index = 0;
     if(state->method->uses_slots) {

@@ -4560,21 +4810,25 @@ PASS2
 
     (yyval.code) = slot?abc_getscopeobject(0, 1):0;
     
 
     (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[(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 {
         } else {

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

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

-        if((yyvsp[(3) - (3)].value).c->prev || (yyvsp[(3) - (3)].value).c->opcode != OPCODE_PUSHUNDEFINED) {
-            (yyval.code) = code_append((yyval.code), (yyvsp[(3) - (3)].value).c);
+        if(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
             (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;
             code_free((yyval.code));
             (yyval.code) = 0;
             break;

@@ -4591,44 +4845,44 @@ PASS2
 
 
   
 
 
   

-    case 63:
+    case 64:

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

-#line 2220 "parser.y"
+#line 2093 "parser.y"

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

-    case 64:
+    case 65:

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

-#line 2221 "parser.y"
+#line 2094 "parser.y"

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

-    case 65:
+    case 66:

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

-#line 2224 "parser.y"
+#line 2097 "parser.y"

     {PASS12 new_state();}
     }
     break;
 
 
   
     {PASS12 new_state();}
     }
     break;
 
 
   

-    case 66:
+    case 67:

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

-#line 2224 "parser.y"
+#line 2097 "parser.y"

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

@@ -4652,22 +4906,22 @@ PASS2
 
 
   
 
 
   

-    case 67:
+    case 68:

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

-#line 2243 "parser.y"
+#line 2116 "parser.y"

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

-    case 70:
+    case 71:

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

-#line 2250 "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);
     {
     PASS1 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),0,1,0);
     PASS2 (yyval.id)=(yyvsp[(2) - (3)].id);new_variable((yyvsp[(2) - (3)].id),(yyvsp[(3) - (3)].classinfo),1,0);

@@ -4677,11 +4931,11 @@ PASS2
 
 
   
 
 
   

-    case 71:
+    case 72:

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

-#line 2254 "parser.y"
+#line 2127 "parser.y"

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

@@ -4691,33 +4945,33 @@ PASS2
 
 
   
 
 
   

-    case 72:
+    case 73:

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

-#line 2259 "parser.y"
+#line 2132 "parser.y"

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

-    case 73:
+    case 74:

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

-#line 2260 "parser.y"
+#line 2133 "parser.y"

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

-    case 74:
+    case 75:

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

-#line 2262 "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();
     {
     if((yyvsp[(1) - (8)].for_start).each) syntaxerror("invalid syntax: ; not allowed in for each statement");
     (yyval.code) = code_new();

@@ -4742,11 +4996,11 @@ PASS2
 
 
   
 
 
   

-    case 75:
+    case 76:

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

-#line 2282 "parser.y"
+#line 2155 "parser.y"

     {
     variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id));
     if(!var) {
     {
     variable_t*var = find_variable(state, (yyvsp[(2) - (6)].id));
     if(!var) {

@@ -4799,22 +5053,22 @@ PASS2
 
 
   
 
 
   

-    case 76:
+    case 77:

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

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

     {PASS12 new_state();}
     }
     break;
 
 
   
     {PASS12 new_state();}
     }
     break;
 
 
   

-    case 77:
+    case 78:

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

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

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

@@ -4838,22 +5092,22 @@ PASS2
 
 
   
 
 
   

-    case 78:
+    case 79:

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

-#line 2349 "parser.y"
+#line 2222 "parser.y"

     {PASS12 new_state();}
     }
     break;
 
 
   
     {PASS12 new_state();}
     }
     break;
 
 
   

-    case 79:
+    case 80:

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

-#line 2349 "parser.y"
+#line 2222 "parser.y"

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

@@ -4873,11 +5127,11 @@ PASS2
 
 
   
 
 
   

-    case 80:
+    case 81:

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

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

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

@@ -4886,11 +5140,11 @@ PASS2
 
 
   
 
 
   

-    case 81:
+    case 82:

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

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

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

@@ -4899,11 +5153,11 @@ PASS2
 
 
   
 
 
   

-    case 82:
+    case 83:

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

-#line 2370 "parser.y"
+#line 2243 "parser.y"

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

@@ -4912,11 +5166,11 @@ PASS2
 
 
   
 
 
   

-    case 83:
+    case 84:

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

-#line 2373 "parser.y"
+#line 2246 "parser.y"

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

@@ -4925,80 +5179,80 @@ PASS2
 
 
   
 
 
   

-    case 84:
+    case 85:

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

-#line 2377 "parser.y"
+#line 2250 "parser.y"

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

-    case 85:
+    case 86:

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

-#line 2378 "parser.y"
+#line 2251 "parser.y"

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

-    case 86:
+    case 87:

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

-#line 2379 "parser.y"
+#line 2252 "parser.y"

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

-    case 87:
+    case 88:

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

-#line 2380 "parser.y"
+#line 2253 "parser.y"

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

-    case 88:
+    case 89:

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

-#line 2381 "parser.y"
+#line 2254 "parser.y"

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

-    case 89:
+    case 90:

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

-#line 2382 "parser.y"
+#line 2255 "parser.y"

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

-    case 90:
+    case 91:

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

-#line 2384 "parser.y"
+#line 2257 "parser.y"

     {
     (yyval.code) = abc_getlocal(0, state->switch_var);
     {
     (yyval.code) = abc_getlocal(0, state->switch_var);

-    (yyval.code) = code_append((yyval.code), (yyvsp[(2) - (4)].value).c);
+    (yyval.code) = code_append((yyval.code), node_read((yyvsp[(2) - (4)].node)).c);

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

@@ -5012,11 +5266,11 @@ PASS2
 
 
   
 
 
   

-    case 91:
+    case 92:

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

-#line 2395 "parser.y"
+#line 2268 "parser.y"

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

@@ -5025,24 +5279,24 @@ PASS2
 
 
   
 
 
   

-    case 92:
+    case 93:

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

-#line 2398 "parser.y"
+#line 2271 "parser.y"

     {PASS12 new_state();state->switch_var=alloc_local();}
     }
     break;
 
 
   
     {PASS12 new_state();state->switch_var=alloc_local();}
     }
     break;
 
 
   

-    case 93:
+    case 94:

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

-#line 2398 "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));
 
     (yyval.code) = abc_setlocal((yyval.code), state->switch_var);
     (yyval.code) = code_append((yyval.code), (yyvsp[(7) - (8)].code));
 

@@ -5074,11 +5328,11 @@ PASS2
 
 
   
 
 
   

-    case 94:
+    case 95:

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

-#line 2429 "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);
     {PASS12 new_state();
                                                       state->exception_name=(yyvsp[(3) - (5)].id);
                                                PASS1 new_variable((yyvsp[(3) - (5)].id), 0, 0, 0);

@@ -5089,11 +5343,11 @@ PASS2
 
 
   
 
 
   

-    case 95:
+    case 96:

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

-#line 2434 "parser.y"
+#line 2307 "parser.y"

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

@@ -5119,22 +5373,22 @@ PASS2
 
 
   
 
 
   

-    case 96:
+    case 97:

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

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

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

-    case 97:
+    case 98:

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

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

     {
     (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code));
     if(!(yyvsp[(4) - (5)].code)) {
     {
     (yyvsp[(4) - (5)].code) = var_block((yyvsp[(4) - (5)].code));
     if(!(yyvsp[(4) - (5)].code)) {

@@ -5155,44 +5409,44 @@ PASS2
 
 
   
 
 
   

-    case 98:
+    case 99:

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

-#line 2470 "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;
 
 
   
     {(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  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2471 "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;
 
 
   
     {(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  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

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

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

-    case 101:
+    case 102:

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

-#line 2473 "parser.y"
+#line 2346 "parser.y"

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

@@ -5206,11 +5460,11 @@ PASS2
 
 
   
 
 
   

-    case 102:
+    case 103:

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

-#line 2481 "parser.y"
+#line 2354 "parser.y"

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

@@ -5224,11 +5478,11 @@ PASS2
 
 
   
 
 
   

-    case 103:
+    case 104:

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

-#line 2490 "parser.y"
+#line 2363 "parser.y"

     {PASS12 new_state();
                  state->method->has_exceptions=1;
                  state->method->late_binding=1;//for invariant scope_code
     {PASS12 new_state();
                  state->method->has_exceptions=1;
                  state->method->late_binding=1;//for invariant scope_code

@@ -5238,11 +5492,11 @@ PASS2
 
 
   
 
 
   

-    case 104:
+    case 105:

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

-#line 2493 "parser.y"
+#line 2366 "parser.y"

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

@@ -5291,11 +5545,11 @@ PASS2
 
 
   
 
 
   

-    case 105:
+    case 106:

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

-#line 2539 "parser.y"
+#line 2412 "parser.y"

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

@@ -5305,11 +5559,11 @@ PASS2
 
 
   
 
 
   

-    case 106:
+    case 107:

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

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

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

@@ -5323,11 +5577,11 @@ PASS2
 
 
   
 
 
   

-    case 107:
+    case 108:

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

-#line 2554 "parser.y"
+#line 2427 "parser.y"

     {
      new_state();
      if(state->method->has_exceptions) {
     {
      new_state();
      if(state->method->has_exceptions) {

@@ -5343,11 +5597,11 @@ PASS2
 
 
   
 
 
   

-    case 108:
+    case 109:

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

-#line 2564 "parser.y"
+#line 2437 "parser.y"

     {
      /* remove getlocal;pushwith from scope code again */
      state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code));
     {
      /* remove getlocal;pushwith from scope code again */
      state->method->scope_code = code_cutlast(code_cutlast(state->method->scope_code));

@@ -5367,102 +5621,148 @@ PASS2
 
 
   
 
 
   

-    case 110:
+    case 111:

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

-#line 2582 "parser.y"
+#line 2455 "parser.y"

     {PASS12 (yyval.id)="package";}
     }
     break;
 
 
   
     {PASS12 (yyval.id)="package";}
     }
     break;
 
 
   

-    case 111:
+    case 112:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2456 "parser.y"
+    {PASS12 (yyval.id)="namespace";}
+    }
+    break;
+
+
+  
+    case 113:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2457 "parser.y"
+    {PASS12 (yyval.id)="NaN";}
+    }
+    break;
+
+
+  
+    case 114:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2458 "parser.y"
+    {PASS12 (yyval.id)=(yyvsp[(1) - (1)].id);}
+    }
+    break;
+
+
+  
+    case 115:

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

-#line 2584 "parser.y"
+#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;
 
 
   
     {PASS12 (yyval.id) = concat3((yyvsp[(1) - (3)].id),".",(yyvsp[(3) - (3)].id));free((yyvsp[(1) - (3)].id));(yyvsp[(1) - (3)].id)=0;}
     }
     break;
 
 
   

-    case 112:
+    case 116:

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

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

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

-    case 113:
+    case 117:

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

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

     {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;}
     }
     break;
 
 
   
     {PASS12 startpackage((yyvsp[(2) - (3)].id));free((yyvsp[(2) - (3)].id));(yyvsp[(2) - (3)].id)=0;}
     }
     break;
 
 
   

-    case 114:
+    case 118:

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

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

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

-    case 115:
+    case 119:

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

-#line 2589 "parser.y"
+#line 2465 "parser.y"

     {PASS12 startpackage("");}
     }
     break;
 
 
   
     {PASS12 startpackage("");}
     }
     break;
 
 
   

-    case 116:
+    case 120:

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

-#line 2590 "parser.y"
+#line 2466 "parser.y"

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

-    case 117:
+    case 121:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#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;
+
+
+  
+    case 122:

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

-#line 2592 "parser.y"
+#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);
        }
     {
        PASS12
        slotinfo_t*s = registry_find((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name);
        if(!s && as3_pass==1) {// || !(s->flags&FLAG_BUILTIN)) {
            as3_schedule_class((yyvsp[(2) - (2)].classinfo)->package, (yyvsp[(2) - (2)].classinfo)->name);
        }

-
-       PASS2
-       classinfo_t*c = (yyvsp[(2) - (2)].classinfo);
-       if(!c) 
-            syntaxerror("Couldn't import class\n");

        state_has_imports();
        state_has_imports();

-       dict_put(state->imports, c->name, c);
-       import_toplevel(c->package);
+       dict_put(state->imports, (yyvsp[(2) - (2)].classinfo)->name, (yyvsp[(2) - (2)].classinfo));
+       import_toplevel((yyvsp[(2) - (2)].classinfo)->package);

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

@@ -5470,18 +5770,17 @@ PASS2
 
 
   
 
 
   

-    case 118:
+    case 123:

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

-#line 2608 "parser.y"
+#line 2508 "parser.y"

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

-       PASS2

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

@@ -5494,44 +5793,44 @@ PASS2
 
 
   
 
 
   

-    case 119:
+    case 124:

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

-#line 2625 "parser.y"
+#line 2524 "parser.y"

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

-    case 120:
+    case 125:

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

-#line 2626 "parser.y"
+#line 2525 "parser.y"

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

-    case 121:
+    case 126:

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

-#line 2627 "parser.y"
+#line 2526 "parser.y"

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

-    case 122:
+    case 127:

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

-#line 2628 "parser.y"
+#line 2527 "parser.y"

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

@@ -5544,110 +5843,110 @@ PASS2
 
 
   
 
 
   

-    case 123:
+    case 128:

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

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

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

-    case 124:
+    case 129:

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

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

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

-    case 125:
+    case 130:

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

-#line 2638 "parser.y"
+#line 2536 "parser.y"

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

-    case 126:
+    case 131:

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

-#line 2639 "parser.y"
+#line 2537 "parser.y"

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

-    case 127:
+    case 132:

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

-#line 2640 "parser.y"
+#line 2538 "parser.y"

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

-    case 128:
+    case 133:

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

-#line 2641 "parser.y"
+#line 2539 "parser.y"

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

-    case 129:
+    case 134:

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

-#line 2642 "parser.y"
+#line 2540 "parser.y"

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

-    case 130:
+    case 135:

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

-#line 2643 "parser.y"
+#line 2541 "parser.y"

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

-    case 131:
+    case 136:

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

-#line 2644 "parser.y"
+#line 2542 "parser.y"

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

-    case 132:
+    case 137:

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

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

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

@@ -5656,99 +5955,99 @@ PASS2
 
 
   
 
 
   

-    case 133:
+    case 138:

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

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

     {PASS12 (yyval.classinfo)=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.classinfo)=0;}
     }
     break;
 
 
   

-    case 134:
+    case 139:

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

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

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

-    case 135:
+    case 140:

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

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

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

-    case 136:
+    case 141:

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

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

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

-    case 137:
+    case 142:

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

-#line 2655 "parser.y"
+#line 2553 "parser.y"

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

-    case 138:
+    case 143:

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

-#line 2656 "parser.y"
+#line 2554 "parser.y"

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

-    case 139:
+    case 144:

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

-#line 2660 "parser.y"
+#line 2558 "parser.y"

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

-    case 140:
+    case 145:

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

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

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

-    case 141:
+    case 146:

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

-#line 2666 "parser.y"
+#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));}
     }
     {PASS12 (yyvsp[(1) - (5)].flags).flags|=FLAG_INTERFACE;
                                           startclass(&(yyvsp[(1) - (5)].flags),(yyvsp[(3) - (5)].id),0,(yyvsp[(4) - (5)].classinfo_list));}
     }

@@ -5756,22 +6055,33 @@ PASS2
 
 
   
 
 
   

-    case 142:
+    case 147:

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

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

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

-    case 151:
+    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  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 2682 "parser.y"
+#line 2580 "parser.y"

     {
     code_t*c = state->cls->static_init->header;
     c = code_append(c, (yyvsp[(1) - (1)].code));  
     {
     code_t*c = state->cls->static_init->header;
     c = code_append(c, (yyvsp[(1) - (1)].code));  

@@ -5782,11 +6092,11 @@ PASS2
 
 
   
 
 
   

-    case 157:
+    case 162:

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

-#line 2693 "parser.y"
+#line 2591 "parser.y"

     {
     syntaxerror("variable declarations not allowed in interfaces");
 }
     {
     syntaxerror("variable declarations not allowed in interfaces");
 }

@@ -5795,11 +6105,11 @@ PASS2
 
 
   
 
 
   

-    case 158:
+    case 163:

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

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

     {
     PASS12
     (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC;
     {
     PASS12
     (yyvsp[(1) - (8)].flags).flags |= FLAG_PUBLIC;

@@ -5815,122 +6125,131 @@ PASS2
 
 
   
 
 
   

-    case 161:
+    case 166:

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

-#line 2711 "parser.y"
-    {setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));}
+#line 2669 "parser.y"
+    {PASS12 setslotstate(&(yyvsp[(1) - (2)].flags),(yyvsp[(2) - (2)].token));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 162:
+    case 167:

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

-#line 2711 "parser.y"
-    {(yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);}
+#line 2669 "parser.y"
+    {PASS12 (yyval.code)=(yyvsp[(4) - (4)].code);setslotstate(0, 0);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 163:
+    case 168:

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

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

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 164:
+    case 169:

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

-#line 2714 "parser.y"
-    {(yyval.code) = code_append((yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code));}
+#line 2672 "parser.y"
+    {PASS12 (yyval.code)=0;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 165:
+    case 170:

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

-#line 2717 "parser.y"
+#line 2675 "parser.y"

     {
     {

+PASS12

     int flags = slotstate_flags->flags;
     namespace_t ns = modifiers2access(slotstate_flags);
 
     int flags = slotstate_flags->flags;
     namespace_t ns = modifiers2access(slotstate_flags);
 

-    varinfo_t* info = 0;
-    if(state->cls) {
-        memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1);
-        if(i) {
-            check_override(i, flags);
-        }
-        info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id));
-    } else {
-        slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id));
-        if(i) {
-            syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id));
-        }
-        if(ns.name && ns.name[0]) {
-            syntaxerror("namespaces not allowed on package-level variables");
+    if(as3_pass == 1) {
+
+        varinfo_t* info = 0;
+        if(state->cls) {
+            memberinfo_t*i = registry_findmember(state->cls->info, ns.name, (yyvsp[(1) - (3)].id), 1);
+            if(i) {
+                check_override(i, flags);
+            }
+            info = varinfo_register_onclass(state->cls->info, ns.access, ns.name, (yyvsp[(1) - (3)].id));
+        } else {
+            slotinfo_t*i = registry_find(state->package, (yyvsp[(1) - (3)].id));
+            if(i) {
+                syntaxerror("package %s already contains '%s'", state->package, (yyvsp[(1) - (3)].id));
+            }
+            if(ns.name && ns.name[0]) {
+                syntaxerror("namespaces not allowed on package-level variables");
+            }
+            info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id));

         }
         }

-        info = varinfo_register_global(ns.access, state->package, (yyvsp[(1) - (3)].id));
+
+        info->type = (yyvsp[(2) - (3)].classinfo);
+        info->flags = flags;
+        
+        dict_put(global->token2info, (void*)(ptroff_t)as3_tokencount, info);

     }
 
     }
 

-    info->type = (yyvsp[(2) - (3)].classinfo);
-    info->flags = flags;
+    if(as3_pass == 2) {
+        varinfo_t*info = dict_lookup(global->token2info, (void*)(ptroff_t)as3_tokencount);

 
 

-    /* slot name */
-    multiname_t mname = {QNAME, &ns, 0, (yyvsp[(1) - (3)].id)};
-  
-    trait_list_t**traits;
-    code_t**code;
-    if(!state->cls) {
-        // global variable
-        ns.name = state->package;
-        traits = &global->init->traits;
-        code = &global->init->method->body->code;
-    } else if(flags&FLAG_STATIC) {
-        // static variable
-        traits = &state->cls->abc->static_traits;
-        code = &state->cls->static_init->header;
-    } else {
-        // instance variable
-        traits = &state->cls->abc->traits;
-        code = &state->cls->init->header;
-    }
-    
-    trait_t*t=0;
-    if((yyvsp[(2) - (3)].classinfo)) {
-        MULTINAME(m, (yyvsp[(2) - (3)].classinfo));
-        t = trait_new_member(traits, multiname_clone(&m), multiname_clone(&mname), 0);
-    } else {
-        t = trait_new_member(traits, 0, multiname_clone(&mname), 0);
-    }
-    info->slot = t->slot_id;
-    
-    /* initalization code (if needed) */
-    code_t*c = 0;
-    if((yyvsp[(3) - (3)].value).c && !is_pushundefined((yyvsp[(3) - (3)].value).c)) {
-        c = abc_getlocal_0(c);
-        c = code_append(c, (yyvsp[(3) - (3)].value).c);
-        c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(2) - (3)].classinfo));
-        c = abc_setslot(c, t->slot_id);
-    }
+        multiname_t mname;
+        code_t**code;
+        trait_t*t = add_abc_slot(slotstate_flags, (yyvsp[(1) - (3)].id), &mname, &code);

 
 

-    *code = code_append(*code, c);
+        if((yyvsp[(2) - (3)].classinfo)) {
+            MULTINAME(m, (yyvsp[(2) - (3)].classinfo));
+            t->type_name = multiname_clone(&m);
+        }
+        info->slot = t->slot_id;
+        
+        /* workaround for "VerifyError: Error #1053: Illegal override of ::test2 in C1" 
+           FIXME: is there a way to use slots and still don't have conflicting overrides?
+        */
+        info->slot = t->slot_id = 0;
+       
+        constant_t cval = (yyvsp[(3) - (3)].node)->type->eval((yyvsp[(3) - (3)].node));
+        if(cval.type!=CONSTANT_UNKNOWN) {
+            /* compile time constant */
+            t->value = malloc(sizeof(constant_t));
+            memcpy(t->value, &cval, sizeof(constant_t));
+            info->value = constant_clone(t->value);
+        } else {
+            typedcode_t v = node_read((yyvsp[(3) - (3)].node));
+            /* initalization code (if needed) */
+            code_t*c = 0;
+            if(v.c && !is_pushundefined(v.c)) {
+                c = abc_getlocal_0(c);
+                c = code_append(c, v.c);
+                c = converttype(c, v.t, (yyvsp[(2) - (3)].classinfo));
+                if(!t->slot_id) {
+                    c = abc_initproperty2(c, &mname);
+                } else {
+                    c = abc_setslot(c, t->slot_id);
+                }
+            }
+            *code = code_append(*code, c);
+        }

 
 

-    if(slotstate_varconst==KW_CONST) {
-        t->kind= TRAIT_CONST;
+        if(slotstate_varconst==KW_CONST) {
+            t->kind= TRAIT_CONST;
+            info->flags |= FLAG_CONST;
+        }

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

@@ -5940,184 +6259,512 @@ PASS2
 
 
   
 
 
   

-    case 166:
+    case 171:

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

-#line 2791 "parser.y"
+#line 2758 "parser.y"

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

-    case 167:
-    if(as3_pass==2) {
-
-/* Line 1464 of skeleton.m4  */
-#line 2792 "parser.y"
-    {(yyval.constant)=(yyvsp[(2) - (2)].constant);}
-    }
-    break;
-
-
-  
-    case 168:
+    case 172:

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

-#line 2794 "parser.y"
-    {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_uint));}
+#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;
 
 
   
     }
     break;
 
 
   

-    case 169:
+    case 173:

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

-#line 2795 "parser.y"
+#line 2768 "parser.y"

     {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));}
     }
     break;
 
 
   
     {(yyval.constant) = constant_new_int((yyvsp[(1) - (1)].number_int));}
     }
     break;
 
 
   

-    case 170:
+    case 174:

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

-#line 2796 "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;
 
 
   
     }
     break;
 
 
   

-    case 171:
+    case 175:

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

-#line 2797 "parser.y"
+#line 2772 "parser.y"

     {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));}
     }
     break;
 
 
   
     {(yyval.constant) = constant_new_float((yyvsp[(1) - (1)].number_float));}
     }
     break;
 
 
   

-    case 172:
+    case 176:

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

-#line 2798 "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;
 
 
   
     {(yyval.constant) = constant_new_string2((yyvsp[(1) - (1)].str).str,(yyvsp[(1) - (1)].str).len);free((char*)(yyvsp[(1) - (1)].str).str);}
     }
     break;
 
 
   

-    case 173:
+    case 177:

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

-#line 2800 "parser.y"
+#line 2774 "parser.y"

     {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
     {(yyval.constant) = constant_new_true((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   

-    case 174:
+    case 178:

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

-#line 2801 "parser.y"
+#line 2775 "parser.y"

     {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
     {(yyval.constant) = constant_new_false((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   

-    case 175:
+    case 179:

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

-#line 2802 "parser.y"
+#line 2776 "parser.y"

     {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   
     {(yyval.constant) = constant_new_null((yyvsp[(1) - (1)].token));}
     }
     break;
 
 
   

-    case 176:
+    case 180:

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

-#line 2803 "parser.y"
-    {
-    if(!strcmp((yyvsp[(1) - (1)].id), "NaN")) {
-        (yyval.constant) = constant_new_float(__builtin_nan(""));
-    } else {
-        as3_warning("Couldn't evaluate constant value of %s", (yyvsp[(1) - (1)].id));
-        (yyval.constant) = constant_new_null((yyvsp[(1) - (1)].id));
-    }
-}
+#line 2777 "parser.y"
+    {(yyval.constant) = constant_new_undefined((yyvsp[(1) - (1)].token));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 177:
+    case 181:

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

-#line 2815 "parser.y"
-    {
-    PASS12
-    memset(&(yyval.params),0,sizeof((yyval.params)));
-}
+#line 2778 "parser.y"
+    {(yyval.constant) = constant_new_float(__builtin_nan(""));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 178:
+    case 183:

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

-#line 2819 "parser.y"
-    {
-    PASS12
-    (yyval.params)=(yyvsp[(1) - (1)].params);
-}
+#line 2793 "parser.y"
+    {PASS_ALWAYS if(!xml_level++) tokenizer_begin_xml();}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 179:
+    case 184:

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

-#line 2825 "parser.y"
-    {
-    PASS12
-    memset(&(yyval.params),0,sizeof((yyval.params)));
-    (yyval.params).varargs=1;
-    list_append((yyval.params).list, (yyvsp[(2) - (2)].param));
-}
+#line 2794 "parser.y"
+    {PASS_ALWAYS tokenizer_begin_xmltext();}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 180:
+    case 185:

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

-#line 2831 "parser.y"
-    {
+#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 2797 "parser.y"
+    {
+    (yyval.id)=strdup("{...}");
+    as3_warning("xml string substitution not yet supported");
+}
+    }
+    break;
+
+
+  
+    case 188:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 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)));
+}
+    }
+    break;
+
+
+  
+    case 211:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2862 "parser.y"
+    {
+    PASS12
+    (yyval.params)=(yyvsp[(1) - (1)].params);
+}
+    }
+    break;
+
+
+  
+    case 212:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2868 "parser.y"
+    {
+    PASS12
+    memset(&(yyval.params),0,sizeof((yyval.params)));
+    (yyval.params).varargs=1;
+    list_append((yyval.params).list, (yyvsp[(2) - (2)].param));
+}
+    }
+    break;
+
+
+  
+    case 213:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 2874 "parser.y"
+    {

     PASS12
     (yyval.params) =(yyvsp[(1) - (4)].params);
     (yyval.params).varargs=1;
     PASS12
     (yyval.params) =(yyvsp[(1) - (4)].params);
     (yyval.params).varargs=1;

@@ -6128,11 +6775,11 @@ PASS2
 
 
   
 
 
   

-    case 181:
+    case 214:

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

-#line 2839 "parser.y"
+#line 2882 "parser.y"

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

@@ -6143,11 +6790,11 @@ PASS2
 
 
   
 
 
   

-    case 182:
+    case 215:

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

-#line 2844 "parser.y"
+#line 2887 "parser.y"

     {
     PASS12
     memset(&(yyval.params),0,sizeof((yyval.params)));
     {
     PASS12
     memset(&(yyval.params),0,sizeof((yyval.params)));

@@ -6158,11 +6805,11 @@ PASS2
 
 
   
 
 
   

-    case 183:
+    case 216:

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

-#line 2850 "parser.y"
+#line 2893 "parser.y"

     {
      PASS12
      (yyval.param) = rfx_calloc(sizeof(param_t));
     {
      PASS12
      (yyval.param) = rfx_calloc(sizeof(param_t));

@@ -6176,11 +6823,11 @@ PASS2
 
 
   
 
 
   

-    case 184:
+    case 217:

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

-#line 2858 "parser.y"
+#line 2901 "parser.y"

     {
      PASS12
      (yyval.param) = rfx_calloc(sizeof(param_t));
     {
      PASS12
      (yyval.param) = rfx_calloc(sizeof(param_t));

@@ -6194,33 +6841,33 @@ PASS2
 
 
   
 
 
   

-    case 187:
+    case 220:

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

-#line 2868 "parser.y"
+#line 2911 "parser.y"

     {PASS12 (yyval.token)=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.token)=0;}
     }
     break;
 
 
   

-    case 188:
+    case 221:

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

-#line 2871 "parser.y"
+#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;
 
 
   
     {PASS12 startfunction(&(yyvsp[(1) - (9)].flags),(yyvsp[(3) - (9)].token),(yyvsp[(4) - (9)].id),&(yyvsp[(6) - (9)].params),(yyvsp[(8) - (9)].classinfo));}
     }
     break;
 
 
   

-    case 189:
+    case 222:

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

-#line 2872 "parser.y"
+#line 2915 "parser.y"

     {
     PASS1 
     endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0);
     {
     PASS1 
     endfunction(&(yyvsp[(1) - (12)].flags),(yyvsp[(3) - (12)].token),(yyvsp[(4) - (12)].id),&(yyvsp[(6) - (12)].params),0,0);

@@ -6240,33 +6887,33 @@ PASS2
 
 
   
 
 
   

-    case 191:
+    case 224:

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

-#line 2888 "parser.y"
+#line 2931 "parser.y"

     {PASS12 (yyval.id)=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.id)=0;}
     }
     break;
 
 
   

-    case 192:
+    case 225:

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

-#line 2890 "parser.y"
+#line 2933 "parser.y"

     {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));}
     }
     break;
 
 
   
     {PASS12 innerfunction((yyvsp[(2) - (7)].id),&(yyvsp[(4) - (7)].params),(yyvsp[(6) - (7)].classinfo));}
     }
     break;
 
 
   

-    case 193:
+    case 226:

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

-#line 2891 "parser.y"
+#line 2934 "parser.y"

     {
     PASS1
     endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0);
     {
     PASS1
     endfunction(0,0,(yyvsp[(2) - (10)].id),&(yyvsp[(4) - (10)].params),0,0);

@@ -6290,11 +6937,11 @@ PASS2
 
 
   
 
 
   

-    case 194:
+    case 227:

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

-#line 2913 "parser.y"
+#line 2956 "parser.y"

     {
     PASS1 NEW(unresolvedinfo_t,c);
           memset(c, 0, sizeof(*c));
     {
     PASS1 NEW(unresolvedinfo_t,c);
           memset(c, 0, sizeof(*c));

@@ -6318,11 +6965,11 @@ PASS2
 
 
   
 
 
   

-    case 195:
+    case 228:

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

-#line 2932 "parser.y"
+#line 2975 "parser.y"

     {
     PASS1 NEW(unresolvedinfo_t,c);
           memset(c, 0, sizeof(*c));
     {
     PASS1 NEW(unresolvedinfo_t,c);
           memset(c, 0, sizeof(*c));

@@ -6341,121 +6988,121 @@ PASS2
 
 
   
 
 
   

-    case 198:
+    case 231:

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

-#line 2949 "parser.y"
+#line 2992 "parser.y"

     {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));}
     }
     break;
 
 
   
     {PASS12 (yyval.classinfo_list)=list_new();list_append((yyval.classinfo_list), (yyvsp[(1) - (1)].classinfo));}
     }
     break;
 
 
   

-    case 199:
+    case 232:

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

-#line 2950 "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;
 
 
   
     {PASS12 (yyval.classinfo_list)=(yyvsp[(1) - (3)].classinfo_list);list_append((yyval.classinfo_list),(yyvsp[(3) - (3)].classinfo));}
     }
     break;
 
 
   

-    case 200:
+    case 233:

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

-#line 2952 "parser.y"
+#line 2995 "parser.y"

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

-    case 201:
+    case 234:

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

-#line 2953 "parser.y"
-    {PASS12 (yyval.classinfo)=registry_getanytype();}
+#line 2996 "parser.y"
+    {PASS12 (yyval.classinfo)=TYPE_ANY;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 202:
+    case 235:

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

-#line 2954 "parser.y"
-    {PASS12 (yyval.classinfo)=registry_getanytype();}
+#line 2997 "parser.y"
+    {PASS12 (yyval.classinfo)=TYPE_VOID;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 203:
+    case 236:

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

-#line 2963 "parser.y"
+#line 3006 "parser.y"

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

-    case 204:
+    case 237:

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

-#line 2964 "parser.y"
+#line 3007 "parser.y"

     {PASS12 (yyval.classinfo)=0;}
     }
     break;
 
 
   
     {PASS12 (yyval.classinfo)=0;}
     }
     break;
 
 
   

-    case 205:
+    case 238:

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

-#line 2968 "parser.y"
+#line 3011 "parser.y"

     {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   
     {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   

-    case 206:
+    case 239:

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

-#line 2969 "parser.y"
+#line 3012 "parser.y"

     {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);}
     }
     break;
 
 
   
     {(yyval.value_list)=(yyvsp[(2) - (3)].value_list);}
     }
     break;
 
 
   

-    case 207:
+    case 240:

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

-#line 2971 "parser.y"
+#line 3014 "parser.y"

     {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   
     {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
     }
     break;
 
 
   

-    case 210:
+    case 243:

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

-#line 2975 "parser.y"
+#line 3018 "parser.y"

     {(yyval.value_list).number=1;
                                                   (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c;
                                                  }
     {(yyval.value_list).number=1;
                                                   (yyval.value_list).cc = (yyvsp[(1) - (1)].value).c;
                                                  }

@@ -6464,22 +7111,22 @@ PASS2
 
 
   
 
 
   

-    case 211:
+    case 244:

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

-#line 2979 "parser.y"
+#line 3022 "parser.y"

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

-    case 212:
+    case 245:

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

-#line 2980 "parser.y"
+#line 3023 "parser.y"

     {
                                                   (yyval.value_list).number= (yyvsp[(1) - (2)].value_list).number+1;
                                                   (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c);
     {
                                                   (yyval.value_list).number= (yyvsp[(1) - (2)].value_list).number+1;
                                                   (yyval.value_list).cc = code_append((yyvsp[(1) - (2)].value_list).cc, (yyvsp[(2) - (2)].value).c);

@@ -6489,13 +7136,14 @@ PASS2
 
 
   
 
 
   

-    case 214:
+    case 247:

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

-#line 2986 "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;
     if((yyval.value).c->opcode == OPCODE_COERCE_A) (yyval.value).c = code_cutlast((yyval.value).c);
     
     code_t*paramcode = (yyvsp[(4) - (4)].value_list).cc;

@@ -6505,21 +7153,28 @@ PASS2
         (yyval.value).c = code_append((yyval.value).c, paramcode);
         (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).number);
         multiname_destroy(name);
         (yyval.value).c = code_append((yyval.value).c, paramcode);
         (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).number);
         multiname_destroy(name);

-    } else if((yyval.value).c->opcode == OPCODE_GETSLOT) {
-        int slot = (int)(ptroff_t)(yyval.value).c->data[0];
+    } else if(TYPE_IS_CLASS(v.t) && v.t->data) {
+        code_free((yyval.value).c);
+        classinfo_t*c = v.t->data;
+        MULTINAME(m, c);
+        (yyval.value).c = abc_findpropstrict2(0, &m);
+        (yyval.value).c = code_append((yyval.value).c, paramcode);
+        (yyval.value).c = abc_constructprop2((yyval.value).c, &m, (yyvsp[(4) - (4)].value_list).number);
+    /*} else if($$.c->opcode == OPCODE_GETSLOT) {
+        int slot = (int)(ptroff_t)$$.c->data[0];

         trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);//FIXME
         multiname_t*name = t->name;
         trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);//FIXME
         multiname_t*name = t->name;

-        (yyval.value).c = code_cutlast((yyval.value).c);
-        (yyval.value).c = code_append((yyval.value).c, paramcode);
-        (yyval.value).c = abc_constructprop2((yyval.value).c, name, (yyvsp[(4) - (4)].value_list).number);
+        $$.c = code_cutlast($$.c);
+        $$.c = code_append($$.c, paramcode);
+        $$.c = abc_constructprop2($$.c, name, $4.number);*/

     } else {
         (yyval.value).c = code_append((yyval.value).c, paramcode);
         (yyval.value).c = abc_construct((yyval.value).c, (yyvsp[(4) - (4)].value_list).number);
     }
    
     (yyval.value).t = TYPE_ANY;
     } else {
         (yyval.value).c = code_append((yyval.value).c, paramcode);
         (yyval.value).c = abc_construct((yyval.value).c, (yyvsp[(4) - (4)].value_list).number);
     }
    
     (yyval.value).t = TYPE_ANY;

-    if(TYPE_IS_CLASS((yyvsp[(2) - (4)].value).t) && (yyvsp[(2) - (4)].value).t->data) {
-        (yyval.value).t = (yyvsp[(2) - (4)].value).t->data;
+    if(TYPE_IS_CLASS(v.t) && v.t->data) {
+        (yyval.value).t = v.t->data;

     } else {
         (yyval.value).c = abc_coerce_a((yyval.value).c);
         (yyval.value).t = TYPE_ANY;
     } else {
         (yyval.value).c = abc_coerce_a((yyval.value).c);
         (yyval.value).t = TYPE_ANY;

@@ -6530,14 +7185,15 @@ PASS2
 
 
   
 
 
   

-    case 215:
+    case 248:

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

-#line 3022 "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);
     }
     if((yyval.value).c->opcode == OPCODE_COERCE_A) {
         (yyval.value).c = code_cutlast((yyval.value).c);
     }

@@ -6550,17 +7206,17 @@ PASS2
         (yyval.value).c = code_append((yyval.value).c, paramcode);
         (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number);
         multiname_destroy(name);
         (yyval.value).c = code_append((yyval.value).c, paramcode);
         (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number);
         multiname_destroy(name);

-    } else if((yyval.value).c->opcode == OPCODE_GETSLOT && (yyval.value).c->prev->opcode != OPCODE_GETSCOPEOBJECT) {
-        int slot = (int)(ptroff_t)(yyval.value).c->data[0];
+/*    } else if($$.c->opcode == OPCODE_GETSLOT && $$.c->prev->opcode != OPCODE_GETSCOPEOBJECT) {
+        int slot = (int)(ptroff_t)$$.c->data[0];

         trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);
         if(t->kind!=TRAIT_METHOD) {
             //ok: flash allows to assign closures to members.
         }
         multiname_t*name = t->name;
         trait_t*t = traits_find_slotid(state->cls->abc->traits,slot);
         if(t->kind!=TRAIT_METHOD) {
             //ok: flash allows to assign closures to members.
         }
         multiname_t*name = t->name;

-        (yyval.value).c = code_cutlast((yyval.value).c);
-        (yyval.value).c = code_append((yyval.value).c, paramcode);
+        $$.c = code_cutlast($$.c);
+        $$.c = code_append($$.c, paramcode);

         //$$.c = abc_callmethod($$.c, t->method, len); //#1051 illegal early access binding
         //$$.c = abc_callmethod($$.c, t->method, len); //#1051 illegal early access binding

-        (yyval.value).c = abc_callproperty2((yyval.value).c, name, (yyvsp[(3) - (4)].value_list).number);
+        $$.c = abc_callproperty2($$.c, name, $3.number);*/

     } else if((yyval.value).c->opcode == OPCODE_GETSUPER) {
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);
     } else if((yyval.value).c->opcode == OPCODE_GETSUPER) {
         multiname_t*name = (yyval.value).c->data[0];(yyval.value).c->data[0]=0;
         (yyval.value).c = code_cutlast((yyval.value).c);

@@ -6573,11 +7229,14 @@ PASS2
         (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).number);
     }
    
         (yyval.value).c = abc_call((yyval.value).c, (yyvsp[(3) - (4)].value_list).number);
     }
    

-    if(TYPE_IS_FUNCTION((yyvsp[(1) - (4)].value).t) && (yyvsp[(1) - (4)].value).t->data) {
-        (yyval.value).t = ((methodinfo_t*)((yyvsp[(1) - (4)].value).t->data))->return_type;
+    if(TYPE_IS_FUNCTION(v.t) && v.t->data) {
+        (yyval.value).t = ((methodinfo_t*)(v.t->data))->return_type;
+    } else if(TYPE_IS_CLASS(v.t) && v.t->data) {
+        // calling a class is like a typecast
+        (yyval.value).t = (classinfo_t*)v.t->data;

     } else {
     } else {

-        (yyval.value).c = abc_coerce_a((yyval.value).c);

         (yyval.value).t = TYPE_ANY;
         (yyval.value).t = TYPE_ANY;

+        (yyval.value).c = abc_coerce_a((yyval.value).c);

     }
 }
     }
     }
 }
     }

@@ -6585,11 +7244,11 @@ PASS2
 
 
   
 
 
   

-    case 216:
+    case 249:

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

-#line 3068 "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");
     {
     if(!state->cls) syntaxerror("super() not allowed outside of a class");
     if(!state->method) syntaxerror("super() not allowed outside of a function");

@@ -6615,13 +7274,14 @@ PASS2
 
 
   
 
 
   

-    case 217:
+    case 250:

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

-#line 3089 "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);
     }
     if((yyval.value).c->opcode == OPCODE_COERCE_A) {
         (yyval.value).c = code_cutlast((yyval.value).c);
     }

@@ -6635,7 +7295,7 @@ PASS2
         (yyval.value).c = abc_deleteproperty2((yyval.value).c, name);
     } else {
         (yyval.value).c = abc_getlocal_0((yyval.value).c);
         (yyval.value).c = abc_deleteproperty2((yyval.value).c, name);
     } else {
         (yyval.value).c = abc_getlocal_0((yyval.value).c);

-        MULTINAME_LATE(m, (yyvsp[(2) - (2)].value).t?(yyvsp[(2) - (2)].value).t->access:ACCESS_PACKAGE, "");
+        MULTINAME_LATE(m, v.t?v.t->access:ACCESS_PACKAGE, "");

         (yyval.value).c = abc_deleteproperty2((yyval.value).c, &m);
     }
     (yyval.value).t = TYPE_BOOLEAN;
         (yyval.value).c = abc_deleteproperty2((yyval.value).c, &m);
     }
     (yyval.value).t = TYPE_BOOLEAN;

@@ -6645,11 +7305,11 @@ PASS2
 
 
   
 
 
   

-    case 218:
+    case 251:

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

-#line 3110 "parser.y"
+#line 3166 "parser.y"

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

@@ -6658,11 +7318,11 @@ PASS2
 
 
   
 
 
   

-    case 219:
+    case 252:

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

-#line 3113 "parser.y"
+#line 3169 "parser.y"

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

@@ -6672,1295 +7332,1255 @@ PASS2
 
 
   
 
 
   

-    case 220:
+    case 253:

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

-#line 3120 "parser.y"
-    {(yyval.value)=(yyvsp[(1) - (1)].value);}
+#line 3176 "parser.y"
+    {
+    (yyval.value) = node_read((yyvsp[(1) - (1)].node));
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 221:
+    case 254:

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

-#line 3121 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3179 "parser.y"
+    {
+    (yyval.value) = node_read((yyvsp[(1) - (1)].node));
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 222:
+    case 255:

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

-#line 3122 "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;
 
 
   
 }
     }
     break;
 
 
   

-    case 223:
+    case 256:

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

-#line 3128 "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;
 
 
   
 }
     }
     break;
 
 
   

-    case 224:
+    case 257:

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

-#line 3134 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3188 "parser.y"
+    { 
+    (yyval.code) = node_exec((yyvsp[(1) - (1)].node)); 
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 226:
+    case 258:

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

-#line 3138 "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;
 
 
   
     }
     break;
 
 
   

-    case 227:
+    case 259:

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

-#line 3140 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3196 "parser.y"
+    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 228:
+    case 260:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3197 "parser.y"
+    {(yyval.value_list)=(yyvsp[(1) - (1)].value_list);}
+    }
+    break;
+
+
+  
+    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  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3142 "parser.y"
-    {(yyval.value) = (yyvsp[(1) - (1)].value);}
+#line 3203 "parser.y"
+    {syntaxerror("dictionary keys must be strings");}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 230:
+    case 266:

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

-#line 3146 "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;
 
 
   
 }
     }
     break;
 
 
   

-    case 231:
+    case 268:

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

-#line 3163 "parser.y"
-    {(yyval.value).c = abc_pushbyte(0, (yyvsp[(1) - (1)].number_uint));
-                   //MULTINAME(m, registry_getintclass());
-                   //$$.c = abc_coerce2($$.c, &m); // FIXME
-                   (yyval.value).t = TYPE_INT;
-                  }
+#line 3220 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 232:
+    case 269:

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

-#line 3168 "parser.y"
-    {(yyval.value).c = abc_pushshort(0, (yyvsp[(1) - (1)].number_uint));
-                    (yyval.value).t = TYPE_INT;
-                   }
+#line 3221 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 233:
+    case 270:

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

-#line 3171 "parser.y"
-    {(yyval.value).c = abc_pushint(0, (yyvsp[(1) - (1)].number_int));
-                  (yyval.value).t = TYPE_INT;
-                 }
+#line 3222 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 234:
+    case 271:

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

-#line 3174 "parser.y"
-    {(yyval.value).c = abc_pushuint(0, (yyvsp[(1) - (1)].number_uint));
-                   (yyval.value).t = TYPE_UINT;
-                  }
+#line 3223 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 235:
+    case 272:

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

-#line 3177 "parser.y"
-    {(yyval.value).c = abc_pushdouble(0, (yyvsp[(1) - (1)].number_float));
-                    (yyval.value).t = TYPE_FLOAT;
-                   }
+#line 3224 "parser.y"
+    {(yyval.node) = mkcodenode((yyvsp[(1) - (1)].value));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 236:
+    case 273:

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

-#line 3180 "parser.y"
-    {(yyval.value).c = 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;
 
 
   
     }
     break;
 
 
   

-    case 237:
+    case 274:

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

-#line 3183 "parser.y"
-    {(yyval.value).c = abc_pushundefined(0);
-                    (yyval.value).t = TYPE_ANY;
-                   }
+#line 3227 "parser.y"
+    { 
+    (yyval.node) = mkconstnode((yyvsp[(1) - (1)].constant));
+}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 238:
+    case 275:

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

-#line 3186 "parser.y"
-    {(yyval.value).c = abc_pushtrue(0);
-                    (yyval.value).t = TYPE_BOOLEAN;
-                   }
+#line 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;
 
 
   
     }
     break;
 
 
   

-    case 239:
+    case 276:

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

-#line 3189 "parser.y"
-    {(yyval.value).c = abc_pushfalse(0);
-                     (yyval.value).t = TYPE_BOOLEAN;
-                    }
+#line 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;
 
 
   
     }
     break;
 
 
   

-    case 240:
+    case 277:

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

-#line 3192 "parser.y"
-    {(yyval.value).c = abc_pushnull(0);
-                    (yyval.value).t = TYPE_NULL;
-                   }
+#line 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;
 
 
   
     }
     break;
 
 
   

-    case 241:
+    case 278:

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

-#line 3196 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c);
-             (yyval.value).t = TYPE_BOOLEAN;
-            }
+#line 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;
 
 
   
     }
     break;
 
 
   

-    case 242:
+    case 279:

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

-#line 3199 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c);
-             (yyval.value).t = TYPE_BOOLEAN;
-            }
+#line 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;
 
 
   
     }
     break;
 
 
   

-    case 243:
+    case 280:

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

-#line 3202 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterthan((yyval.value).c);(yyval.value).c=abc_not((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3291 "parser.y"
+    {(yyval.node) = mknode2(&node_lt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 244:
+    case 281:

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

-#line 3205 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_greaterequals((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3292 "parser.y"
+    {(yyval.node) = mknode2(&node_gt,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 245:
+    case 282:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3293 "parser.y"
+    {(yyval.node) = mknode2(&node_le,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 283:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3294 "parser.y"
+    {(yyval.node) = mknode2(&node_ge,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 284:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3295 "parser.y"
+    {(yyval.node) = mknode2(&node_eqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    case 285:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3296 "parser.y"
+    {(yyval.node) = mknode2(&node_eqeqeq,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}
+    }
+    break;
+
+
+  
+    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  */
     if(as3_pass==2) {
 
 /* Line 1464 of skeleton.m4  */

-#line 3208 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3299 "parser.y"
+    {(yyval.node) = mknode2(&node_oror,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 246:
+    case 289:

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

-#line 3211 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-              }
+#line 3300 "parser.y"
+    {(yyval.node) = mknode2(&node_andand,(yyvsp[(1) - (3)].node),(yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 247:
+    case 290:

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

-#line 3214 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_strictequals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3301 "parser.y"
+    {(yyval.node) = mknode1(&node_not, (yyvsp[(2) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 248:
+    case 291:

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

-#line 3217 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);(yyval.value).c = abc_equals((yyval.value).c);(yyval.value).c = abc_not((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3302 "parser.y"
+    {(yyval.node) = mknode1(&node_bitnot, (yyvsp[(2) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 249:
+    case 292:

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

-#line 3221 "parser.y"
-    {(yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'O');
-              (yyval.value).c = (yyvsp[(1) - (3)].value).c;
-              (yyval.value).c = converttype((yyval.value).c, (yyvsp[(1) - (3)].value).t, (yyval.value).t);
-              (yyval.value).c = abc_dup((yyval.value).c);
-              code_t*jmp = (yyval.value).c = abc_iftrue((yyval.value).c, 0);
-              (yyval.value).c = cut_last_push((yyval.value).c);
-              (yyval.value).c = code_append((yyval.value).c,(yyvsp[(3) - (3)].value).c);
-              (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (3)].value).t, (yyval.value).t);
-              code_t*label = (yyval.value).c = abc_label((yyval.value).c);
-              jmp->branch = label;
-             }
+#line 3303 "parser.y"
+    {(yyval.node) = mknode2(&node_bitand, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 250:
+    case 293:

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

-#line 3232 "parser.y"
-    {
-              (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, 'A');
-              /*printf("%08x:\n",$1.t);
-              code_dump($1.c, 0, 0, "", stdout);
-              printf("%08x:\n",$3.t);
-              code_dump($3.c, 0, 0, "", stdout);
-              printf("joining %08x and %08x to %08x\n", $1.t, $3.t, $$.t);*/
-              (yyval.value).c = (yyvsp[(1) - (3)].value).c;
-              (yyval.value).c = converttype((yyval.value).c, (yyvsp[(1) - (3)].value).t, (yyval.value).t);
-              (yyval.value).c = abc_dup((yyval.value).c);
-              code_t*jmp = (yyval.value).c = abc_iffalse((yyval.value).c, 0);
-              (yyval.value).c = cut_last_push((yyval.value).c);
-              (yyval.value).c = code_append((yyval.value).c,(yyvsp[(3) - (3)].value).c);
-              (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (3)].value).t, (yyval.value).t);
-              code_t*label = (yyval.value).c = abc_label((yyval.value).c);
-              jmp->branch = label;              
-             }
+#line 3304 "parser.y"
+    {(yyval.node) = mknode2(&node_bitxor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 251:
+    case 294:

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

-#line 3250 "parser.y"
-    {(yyval.value).c=(yyvsp[(2) - (2)].value).c;
-              (yyval.value).c = abc_not((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3305 "parser.y"
+    {(yyval.node) = mknode2(&node_bitor, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 252:
+    case 295:

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

-#line 3255 "parser.y"
-    {(yyval.value).c=(yyvsp[(2) - (2)].value).c;
-              (yyval.value).c = abc_bitnot((yyval.value).c);
-              (yyval.value).t = TYPE_INT;
-             }
+#line 3306 "parser.y"
+    {(yyval.node) = mknode2(&node_shr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 253:
+    case 296:

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

-#line 3260 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_bitand((yyval.value).c);
-             (yyval.value).t = TYPE_INT;
-            }
+#line 3307 "parser.y"
+    {(yyval.node) = mknode2(&node_ushr, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 254:
+    case 297:

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

-#line 3265 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_bitxor((yyval.value).c);
-             (yyval.value).t = TYPE_INT;
-            }
+#line 3308 "parser.y"
+    {(yyval.node) = mknode2(&node_shl, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 255:
+    case 298:

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

-#line 3270 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_bitor((yyval.value).c);
-             (yyval.value).t = TYPE_INT;
-            }
+#line 3309 "parser.y"
+    {(yyval.node) = mknode2(&node_div, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 256:
+    case 299:

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

-#line 3275 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_rshift((yyval.value).c);
-             (yyval.value).t = TYPE_INT;
-            }
+#line 3310 "parser.y"
+    {(yyval.node) = mknode2(&node_mod, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 257:
+    case 300:

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

-#line 3279 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_urshift((yyval.value).c);
-             (yyval.value).t = TYPE_INT;
-            }
+#line 3311 "parser.y"
+    {(yyval.node) = mknode2(&node_plus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 258:
+    case 301:

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

-#line 3283 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_lshift((yyval.value).c);
-             (yyval.value).t = TYPE_INT;
-            }
+#line 3312 "parser.y"
+    {(yyval.node) = mknode2(&node_minus, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 259:
+    case 302:

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

-#line 3288 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_divide((yyval.value).c);
-             (yyval.value).t = TYPE_NUMBER;
-            }
+#line 3313 "parser.y"
+    {(yyval.node) = mknode2(&node_multiply, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 260:
+    case 303:

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

-#line 3292 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             (yyval.value).c = abc_modulo((yyval.value).c);
-             (yyval.value).t = TYPE_NUMBER;
-            }
+#line 3314 "parser.y"
+    {(yyval.node) = mknode2(&node_in, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 261:
+    case 304:

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

-#line 3296 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             if(BOTH_INT((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t)) {
-                (yyval.value).c = abc_add_i((yyval.value).c);
-                (yyval.value).t = TYPE_INT;
-             } else {
-                (yyval.value).c = abc_add((yyval.value).c);
-                (yyval.value).t = join_types((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t,'+');
-             }
-            }
+#line 3315 "parser.y"
+    {(yyval.node) = mknode2(&node_as, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 262:
+    case 305:

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

-#line 3305 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) {
-                (yyval.value).c = abc_subtract_i((yyval.value).c);
-                (yyval.value).t = TYPE_INT;
-             } else {
-                (yyval.value).c = abc_subtract((yyval.value).c);
-                (yyval.value).t = TYPE_NUMBER;
-             }
-            }
+#line 3316 "parser.y"
+    {(yyval.node) = mknode2(&node_instanceof, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 263:
+    case 306:

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

-#line 3314 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-             if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) {
-                (yyval.value).c = abc_multiply_i((yyval.value).c);
-                (yyval.value).t = TYPE_INT;
-             } else {
-                (yyval.value).c = abc_multiply((yyval.value).c);
-                (yyval.value).t = TYPE_NUMBER;
-             }
-            }
+#line 3317 "parser.y"
+    {(yyval.node) = mknode2(&node_is, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 264:
+    case 307:

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

-#line 3324 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c,(yyvsp[(3) - (3)].value).c);
-              (yyval.value).c = abc_in((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3318 "parser.y"
+    {(yyval.node) = mknode1(&node_typeof, (yyvsp[(2) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 265:
+    case 308:

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

-#line 3329 "parser.y"
-    {char use_astype=0; // flash player's astype works differently than astypelate
-              if(use_astype && TYPE_IS_CLASS((yyvsp[(3) - (3)].value).t) && (yyvsp[(3) - (3)].value).t->data) {
-                MULTINAME(m, (classinfo_t*)((yyvsp[(3) - (3)].value).t->data));
-                (yyval.value).c = abc_astype2((yyvsp[(1) - (3)].value).c, &m);
-                (yyval.value).t = (yyvsp[(3) - (3)].value).t->data;
-              } else {
-                (yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c);
-                (yyval.value).c = abc_astypelate((yyval.value).c);
-                (yyval.value).t = TYPE_ANY;
-              }
-             }
+#line 3319 "parser.y"
+    {(yyval.node) = mknode1(&node_void, (yyvsp[(2) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 266:
+    case 309:

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

-#line 3342 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c);
-              (yyval.value).c = abc_instanceof((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3320 "parser.y"
+    { (yyval.node) = mkconstnode(constant_new_undefined());}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 267:
+    case 310:

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

-#line 3347 "parser.y"
-    {(yyval.value).c = code_append((yyvsp[(1) - (3)].value).c, (yyvsp[(3) - (3)].value).c);
-              (yyval.value).c = abc_istypelate((yyval.value).c);
-              (yyval.value).t = TYPE_BOOLEAN;
-             }
+#line 3321 "parser.y"
+    { (yyval.node)=(yyvsp[(2) - (3)].node);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 268:
+    case 311:

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

-#line 3352 "parser.y"
-    {
-              (yyval.value).c = (yyvsp[(3) - (4)].value).c;
-              (yyval.value).c = abc_typeof((yyval.value).c);
-              (yyval.value).t = TYPE_STRING;
-             }
+#line 3322 "parser.y"
+    {(yyval.node) = mknode1(&node_neg, (yyvsp[(2) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 269:
+    case 312:

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

-#line 3358 "parser.y"
-    {
-              (yyval.value).c = cut_last_push((yyvsp[(2) - (2)].value).c);
-              (yyval.value).c = abc_pushundefined((yyval.value).c);
-              (yyval.value).t = TYPE_ANY;
-             }
+#line 3323 "parser.y"
+    {(yyval.node) = mknode2(&node_arraylookup, (yyvsp[(1) - (4)].node),(yyvsp[(3) - (4)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 270:
+    case 313:

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

-#line 3364 "parser.y"
-    { (yyval.value).c = abc_pushundefined(0);
-             (yyval.value).t = TYPE_ANY;
-           }
+#line 3324 "parser.y"
+    {(yyval.node) = mknode2(&node_muleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 271:
+    case 314:

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

-#line 3368 "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;
 
 
   
     }
     break;
 
 
   

-    case 272:
+    case 315:

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

-#line 3370 "parser.y"
-    {
-  (yyval.value)=(yyvsp[(2) - (2)].value);
-  if(IS_INT((yyvsp[(2) - (2)].value).t)) {
-   (yyval.value).c=abc_negate_i((yyval.value).c);
-   (yyval.value).t = TYPE_INT;
-  } else {
-   (yyval.value).c=abc_negate((yyval.value).c);
-   (yyval.value).t = TYPE_NUMBER;
-  }
-}
+#line 3326 "parser.y"
+    {(yyval.node) = mknode2(&node_shleq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 273:
+    case 316:

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

-#line 3381 "parser.y"
-    {
-  (yyval.value).c = (yyvsp[(1) - (4)].value).c;
-  (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (4)].value).c);
-
-  MULTINAME_LATE(m, (yyvsp[(1) - (4)].value).t?(yyvsp[(1) - (4)].value).t->access:ACCESS_PACKAGE, "");
-  (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
-  (yyval.value).t = 0; // array elements have unknown type
-}
+#line 3327 "parser.y"
+    {(yyval.node) = mknode2(&node_shreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 274:
+    case 317:

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

-#line 3390 "parser.y"
-    {
-    (yyval.value).c = code_new();
-    (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc);
-    (yyval.value).c = abc_newarray((yyval.value).c, (yyvsp[(2) - (3)].value_list).number);
-    (yyval.value).t = registry_getarrayclass();
-}
+#line 3328 "parser.y"
+    {(yyval.node) = mknode2(&node_ushreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 275:
+    case 318:

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

-#line 3397 "parser.y"
-    {(yyval.value_list).cc=0;(yyval.value_list).number=0;}
+#line 3329 "parser.y"
+    { (yyval.node) = mknode2(&node_diveq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 276:
+    case 319:

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

-#line 3398 "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;
 
 
   
     }
     break;
 
 
   

-    case 277:
+    case 320:

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

-#line 3400 "parser.y"
-    {
-    (yyval.value_list).cc = 0;
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(1) - (3)].value).c);
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (3)].value).c);
-    (yyval.value_list).number = 2;
-}
+#line 3331 "parser.y"
+    { (yyval.node) = mknode2(&node_bitxoreq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 278:
+    case 321:

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

-#line 3406 "parser.y"
-    {
-    (yyval.value_list).cc = (yyvsp[(1) - (5)].value_list).cc;
-    (yyval.value_list).number = (yyvsp[(1) - (5)].value_list).number+2;
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(3) - (5)].value).c);
-    (yyval.value_list).cc = code_append((yyval.value_list).cc, (yyvsp[(5) - (5)].value).c);
-}
+#line 3332 "parser.y"
+    { (yyval.node) = mknode2(&node_bitandeq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 279:
+    case 322:

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

-#line 3415 "parser.y"
-    {
-    (yyval.value).c = code_new();
-    (yyval.value).c = code_append((yyval.value).c, (yyvsp[(2) - (3)].value_list).cc);
-    (yyval.value).c = abc_newobject((yyval.value).c, (yyvsp[(2) - (3)].value_list).number/2);
-    (yyval.value).t = registry_getobjectclass();
-}
+#line 3333 "parser.y"
+    { (yyval.node) = mknode2(&node_pluseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 280:
+    case 323:

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

-#line 3422 "parser.y"
-    { 
-               code_t*c = (yyvsp[(3) - (3)].value).c;
-               if(BOTH_INT((yyvsp[(1) - (3)].value).t,(yyvsp[(3) - (3)].value).t)) {
-                c=abc_multiply_i(c);
-               } else {
-                c=abc_multiply(c);
-               }
-               c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '*'), (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3334 "parser.y"
+    { (yyval.node) = mknode2(&node_minuseq, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 281:
+    case 324:

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

-#line 3434 "parser.y"
-    { 
-               code_t*c = abc_modulo((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '%'), (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3335 "parser.y"
+    { (yyval.node) = mknode2(&node_assign, (yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 282:
+    case 325:

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

-#line 3440 "parser.y"
-    { 
-               code_t*c = abc_lshift((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '<'), (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3336 "parser.y"
+    { (yyval.node) = mknode3(&node_tenary, (yyvsp[(1) - (5)].node), (yyvsp[(3) - (5)].node), (yyvsp[(5) - (5)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 283:
+    case 326:

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

-#line 3446 "parser.y"
-    { 
-               code_t*c = abc_rshift((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '>'), (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3338 "parser.y"
+    { (yyval.node) = mknode1(&node_rplusplus, (yyvsp[(1) - (2)].node));}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 284:
+    case 327:

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

-#line 3452 "parser.y"
-    { 
-               code_t*c = 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;
 
 
   
     }
     break;
 
 
   

-    case 285:
+    case 328:

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

-#line 3458 "parser.y"
-    { 
-               code_t*c = abc_divide((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '/'), (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3340 "parser.y"
+    {(yyval.node) = mknode1(&node_lplusplus, (yyvsp[(2) - (2)].node)); }

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 286:
+    case 329:

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

-#line 3464 "parser.y"
-    { 
-               code_t*c = abc_bitor((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 3341 "parser.y"
+    {(yyval.node) = mknode1(&node_lminusminus, (yyvsp[(2) - (2)].node)); }

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 287:
+    case 330:

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

-#line 3470 "parser.y"
-    { 
-               code_t*c = abc_bitxor((yyvsp[(3) - (3)].value).c);
-               c=converttype(c, TYPE_INT, (yyvsp[(1) - (3)].value).t);
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 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;
 
 
   
     }
     break;
 
 
   

-    case 288:
+    case 331:

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

-#line 3476 "parser.y"
-    { 
-               code_t*c = (yyvsp[(3) - (3)].value).c;
-
-               if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) {
-                c=abc_add_i(c);
-               } else {
-                c=abc_add(c);
-                c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '+'), (yyvsp[(1) - (3)].value).t);
-               }
-               
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-              }
+#line 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;
 
 
   
     }
     break;
 
 
   

-    case 289:
+    case 332:

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

-#line 3489 "parser.y"
-    { code_t*c = (yyvsp[(3) - (3)].value).c; 
-               if(TYPE_IS_INT((yyvsp[(1) - (3)].value).t)) {
-                c=abc_subtract_i(c);
-               } else {
-                c=abc_subtract(c);
-                c=converttype(c, join_types((yyvsp[(1) - (3)].value).t, (yyvsp[(3) - (3)].value).t, '-'), (yyvsp[(1) - (3)].value).t);
-               }
-               
-               (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 0, 0);
-               (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-             }
+#line 3366 "parser.y"
+    {PASS12 new_state();state->xmlfilter=1;}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 290:
+    case 333:

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

-#line 3500 "parser.y"
-    { code_t*c = 0;
-              c = code_append(c, (yyvsp[(3) - (3)].value).c);
-              c = converttype(c, (yyvsp[(3) - (3)].value).t, (yyvsp[(1) - (3)].value).t);
-              (yyval.value).c = toreadwrite((yyvsp[(1) - (3)].value).c, c, 1, 0);
-              (yyval.value).t = (yyvsp[(1) - (3)].value).t;
-            }
+#line 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;
 
 
   
     }
     break;
 
 
   

-    case 291:
+    case 334:

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

-#line 3507 "parser.y"
-    { 
-              (yyval.value).t = join_types((yyvsp[(3) - (5)].value).t,(yyvsp[(5) - (5)].value).t,'?');
-              (yyval.value).c = (yyvsp[(1) - (5)].value).c;
-              code_t*j1 = (yyval.value).c = abc_iffalse((yyval.value).c, 0);
-              (yyval.value).c = code_append((yyval.value).c, (yyvsp[(3) - (5)].value).c);
-              (yyval.value).c = converttype((yyval.value).c, (yyvsp[(3) - (5)].value).t, (yyval.value).t);
-              code_t*j2 = (yyval.value).c = abc_jump((yyval.value).c, 0);
-              (yyval.value).c = j1->branch = abc_label((yyval.value).c);
-              (yyval.value).c = code_append((yyval.value).c, (yyvsp[(5) - (5)].value).c);
-              (yyval.value).c = converttype((yyval.value).c, (yyvsp[(5) - (5)].value).t, (yyval.value).t);
-              (yyval.value).c = j2->branch = abc_label((yyval.value).c);
-            }
+#line 3420 "parser.y"
+    {(yyval.id)=(yyvsp[(1) - (1)].id);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 292:
+    case 335:

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

-#line 3520 "parser.y"
-    { code_t*c = 0;
-             classinfo_t*type = (yyvsp[(1) - (2)].value).t;
-             if(is_getlocal((yyvsp[(1) - (2)].value).c) && (TYPE_IS_INT((yyvsp[(1) - (2)].value).t) || TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t))) {
-                 int nr = getlocalnr((yyvsp[(1) - (2)].value).c);
-                 code_free((yyvsp[(1) - (2)].value).c);(yyvsp[(1) - (2)].value).c=0;
-                 if(TYPE_IS_INT((yyvsp[(1) - (2)].value).t)) {
-                    (yyval.value).c = abc_getlocal(0, nr);
-                    (yyval.value).c = abc_inclocal_i((yyval.value).c, nr);
-                 } else if(TYPE_IS_NUMBER((yyvsp[(1) - (2)].value).t)) {
-                    (yyval.value).c = abc_getlocal(0, nr);
-                    (yyval.value).c = abc_inclocal((yyval.value).c, nr);
-                 } else syntaxerror("internal error");
-             } else {
-                 if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) {
-                     c=abc_increment_i(c);
-                     type = TYPE_INT;
-                 } else {
-                     c=abc_increment(c);
-                     type = TYPE_NUMBER;
-                 }
-                 c=converttype(c, type, (yyvsp[(1) - (2)].value).t);
-                 (yyval.value).c = toreadwrite((yyvsp[(1) - (2)].value).c, c, 0, 1);
-                 (yyval.value).t = (yyvsp[(1) - (2)].value).t;
-             }
-           }
+#line 3421 "parser.y"
+    {(yyval.id)="*";}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 293:
+    case 336:

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

-#line 3547 "parser.y"
-    { code_t*c = 0;
-             classinfo_t*type = (yyvsp[(1) - (2)].value).t;
-             if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) {
-                 c=abc_decrement_i(c);
-                 type = TYPE_INT;
-             } else {
-                 c=abc_decrement(c);
-                 type = TYPE_NUMBER;
-             }
-             c=converttype(c, type, (yyvsp[(1) - (2)].value).t);
-             (yyval.value).c = toreadwrite((yyvsp[(1) - (2)].value).c, c, 0, 1);
-             (yyval.value).t = (yyvsp[(1) - (2)].value).t;
-            }
+#line 3422 "parser.y"
+    {(yyval.id)=(char*)(yyvsp[(1) - (1)].id);}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 294:
+    case 338:

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

-#line 3561 "parser.y"
-    { code_t*c = 0;
-             classinfo_t*type = (yyvsp[(2) - (2)].value).t;
-             if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) {
-                 c=abc_increment_i(c);
-                 type = TYPE_INT;
-             } else {
-                 c=abc_increment(c);
-                 type = TYPE_NUMBER;
-             }
-             c=converttype(c, type, (yyvsp[(2) - (2)].value).t);
-             (yyval.value).c = toreadwrite((yyvsp[(2) - (2)].value).c, c, 0, 0);
-             (yyval.value).t = (yyvsp[(2) - (2)].value).t;
-           }
+#line 3424 "parser.y"
+    {(yyval.id)="*";}

     }
     break;
 
 
   
     }
     break;
 
 
   

-    case 295:
+    case 339:

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

-#line 3575 "parser.y"
-    { code_t*c = 0;
-             classinfo_t*type = (yyvsp[(2) - (2)].value).t;
-             if(TYPE_IS_INT(type) || TYPE_IS_UINT(type)) {
-                 c=abc_decrement_i(c);
-                 type = TYPE_INT;
-             } else {
-                 c=abc_decrement(c);
-                 type = TYPE_NUMBER;
-             }
-             c=converttype(c, type, (yyvsp[(2) - (2)].value).t);
-             (yyval.value).c = toreadwrite((yyvsp[(2) - (2)].value).c, c, 0, 0);
-             (yyval.value).t = (yyvsp[(2) - (2)].value).t;
-           }
+#line 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;
 
 
   
     }
     break;
 
 
   

-    case 296:
+    case 340:

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

-#line 3590 "parser.y"
-    { if(!state->cls->info)
-                  syntaxerror("super keyword not allowed outside a class");
-              classinfo_t*t = state->cls->info->superclass;
-              if(!t) t = TYPE_OBJECT;
-
-              memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1);
-
-              MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id));
-              (yyval.value).c = 0;
-              (yyval.value).c = abc_getlocal_0((yyval.value).c);
-              (yyval.value).c = abc_getsuper2((yyval.value).c, &m);
-              (yyval.value).t = slotinfo_gettype((slotinfo_t*)f);
-           }
+#line 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;
 
 
   
     }
     break;
 
 
   

-    case 297:
+    case 341:

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

-#line 3604 "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;
 
 
   
     }
     break;
 
 
   

-    case 298:
+    case 342:

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

-#line 3611 "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;
 
 
   
     }
     break;
 
 
   

-    case 299:
+    case 343:

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

-#line 3618 "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;
 
 
   
     }
     break;
 
 
   

-    case 300:
+    case 344:

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

-#line 3625 "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;
 
 
   
     }
     break;
 
 
   

-    case 301:
+    case 345:

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

-#line 3632 "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;
 
 
   
     }
     break;
 
 
   

-    case 302:
+    case 346:

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

-#line 3643 "parser.y"
+#line 3503 "parser.y"

     {
     {

-    (yyval.value).c = (yyvsp[(1) - (3)].value).c;
-    classinfo_t*t = (yyvsp[(1) - (3)].value).t;
+    typedcode_t v1 = node_read((yyvsp[(1) - (3)].node));
+    (yyval.value).c = v1.c;
+    classinfo_t*t = v1.t;

     char is_static = 0;
     if(TYPE_IS_CLASS(t) && t->data) {
         t = t->data;
         is_static = 1;
     }
     char is_static = 0;
     if(TYPE_IS_CLASS(t) && t->data) {
         t = t->data;
         is_static = 1;
     }

-    if(t) {
+    if(TYPE_IS_XML(t)) {
+        multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)};
+        (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
+        (yyval.value).c = abc_coerce_a((yyval.value).c);
+        (yyval.value).t = TYPE_XMLLIST;
+    } else if(t) {

         if(t->subtype==INFOTYPE_UNRESOLVED) {
             syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", (yyvsp[(3) - (3)].id), t->name);
         }
         if(t->subtype==INFOTYPE_UNRESOLVED) {
             syntaxerror("syntaxerror: trying to resolve property '%s' on incomplete object '%s'", (yyvsp[(3) - (3)].id), t->name);
         }

-        memberinfo_t*f = registry_findmember_nsset(t, state->active_namespaces, (yyvsp[(3) - (3)].id), 1);
+        memberinfo_t*f = findmember_nsset(t, (yyvsp[(3) - (3)].id), 1);

         char noslot = 0;
         if(f && !is_static != !(f->flags&FLAG_STATIC))
            noslot=1;
         if(f && f->slot && !noslot) {
             (yyval.value).c = abc_getslot((yyval.value).c, f->slot);
         } else {
         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);
         }
             MEMBER_MULTINAME(m, f, (yyvsp[(3) - (3)].id));
             (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
         }

@@ -7968,27 +8588,31 @@ PASS2
         (yyval.value).t = slotinfo_gettype((slotinfo_t*)f);
         if(!(yyval.value).t)
            (yyval.value).c = abc_coerce_a((yyval.value).c);
         (yyval.value).t = slotinfo_gettype((slotinfo_t*)f);
         if(!(yyval.value).t)
            (yyval.value).c = abc_coerce_a((yyval.value).c);

-    } else if((yyvsp[(1) - (3)].value).c && (yyvsp[(1) - (3)].value).c->opcode == OPCODE___PUSHPACKAGE__) {
-        string_t*package = (yyvsp[(1) - (3)].value).c->data[0];
+        
+    } else if(v1.c && v1.c->opcode == OPCODE___PUSHPACKAGE__) {
+        string_t*package = v1.c->data[0];

         char*package2 = concat3(package->str, ".", (yyvsp[(3) - (3)].id));
         char*package2 = concat3(package->str, ".", (yyvsp[(3) - (3)].id));

-        if(dict_contains(state->import_toplevel_packages, package2)) {
-            (yyval.value).c = (yyvsp[(1) - (3)].value).c;
+
+        slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id));
+        if(a) {
+            (yyval.value) = push_class(a);
+        } else if(dict_contains(state->import_toplevel_packages, package2) ||
+                  registry_ispackage(package2)) {
+            (yyval.value).c = v1.c;

             (yyval.value).c->data[0] = string_new4(package2);
             (yyval.value).t = 0;
         } else {
             (yyval.value).c->data[0] = string_new4(package2);
             (yyval.value).t = 0;
         } else {

-            slotinfo_t*a = registry_find(package->str, (yyvsp[(3) - (3)].id));
-            if(!a) 
-                syntaxerror("couldn't resolve %s", package2);
-            (yyval.value) = push_class(a);
+            syntaxerror("couldn't resolve %s", package2);

         }
     } else {
         /* when resolving a property on an unknown type, we do know the
            name of the property (and don't seem to need the package), but
            we need to make avm2 try out all access modes */
         }
     } else {
         /* when resolving a property on an unknown type, we do know the
            name of the property (and don't seem to need the package), but
            we need to make avm2 try out all access modes */

+        as3_softwarning("Resolving %s on unknown type", (yyvsp[(3) - (3)].id));

         multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)};
         (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
         (yyval.value).c = abc_coerce_a((yyval.value).c);
         multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(3) - (3)].id)};
         (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
         (yyval.value).c = abc_coerce_a((yyval.value).c);

-        (yyval.value).t = registry_getanytype();
+        (yyval.value).t = TYPE_ANY;

     }
 }
     }
     }
 }
     }

@@ -7996,11 +8620,11 @@ PASS2
 
 
   
 
 
   

-    case 303:
+    case 347:

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

-#line 3693 "parser.y"
+#line 3681 "parser.y"

     {
     PASS1
     /* Queue unresolved identifiers for checking against the parent
     {
     PASS1
     /* Queue unresolved identifiers for checking against the parent

@@ -8010,114 +8634,36 @@ PASS2
        etc. which is *correct* because local variables of the parent function
        would shadow those.
        */
        etc. which is *correct* because local variables of the parent function
        would shadow those.
        */

-    if(state->method->inner && !find_variable(state, (yyvsp[(1) - (1)].id))) {
-        unknown_variable((yyvsp[(1) - (1)].id));
-    }
-   
-    /* let the compiler know that it might check the current directory/package
-       for this identifier- maybe there's a file $1.as defining $1. */
-    as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id));
-    PASS2
-
-    (yyval.value).t = 0;
-    (yyval.value).c = 0;
-    slotinfo_t*a = 0;
-    memberinfo_t*f = 0;
-
-    variable_t*v;
-    /* look at variables */
-    if((v = find_variable(state, (yyvsp[(1) - (1)].id)))) {
-        // $1 is a local variable
-        (yyval.value).c = abc_getlocal((yyval.value).c, v->index);
-        (yyval.value).t = v->type;
-        break;
-    }
-    if((v = find_slot(state, (yyvsp[(1) - (1)].id)))) {
-        (yyval.value).c = abc_getscopeobject((yyval.value).c, 1);
-        (yyval.value).c = abc_getslot((yyval.value).c, v->index);
-        (yyval.value).t = v->type;
-        break;
-    }

 
 

-    int i_am_static = (state->method && state->method->info)?(state->method->info->flags&FLAG_STATIC):FLAG_STATIC;
-
-    /* look at current class' members */
-    if(state->cls && (f = registry_findmember_nsset(state->cls->info, state->active_namespaces, (yyvsp[(1) - (1)].id), 1)) &&
-        (f->flags&FLAG_STATIC) >= i_am_static) {
-        // $1 is a function in this class
-        int var_is_static = (f->flags&FLAG_STATIC);
-
-        if(f->kind == INFOTYPE_METHOD) {
-            (yyval.value).t = TYPE_FUNCTION(f);
-        } else {
-            (yyval.value).t = f->type;
-        }
-        if(var_is_static && !i_am_static) {
-        /* access to a static member from a non-static location.
-           do this via findpropstrict:
-           there doesn't seem to be any non-lookup way to access
-           static properties of a class */
-            state->method->late_binding = 1;
-            (yyval.value).t = f->type;
-            namespace_t ns = {f->access, ""};
-            multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)};
-            (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m);
-            (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
-            break;
-        } else if(f->slot>0) {
-            (yyval.value).c = abc_getlocal_0((yyval.value).c);
-            (yyval.value).c = abc_getslot((yyval.value).c, f->slot);
-            break;
-        } else {
-            namespace_t ns = {f->access, ""};
-            multiname_t m = {QNAME, &ns, 0, (yyvsp[(1) - (1)].id)};
-            (yyval.value).c = abc_getlocal_0((yyval.value).c);
-            (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
-            break;
+    if(!find_variable(state, (yyvsp[(1) - (1)].id))) {
+        if(state->method->inner) {
+            unknown_variable((yyvsp[(1) - (1)].id));

         }
         }

-    } 
-    
-    /* look at actual classes, in the current package and imported */
-    if((a = find_class((yyvsp[(1) - (1)].id)))) {
-        (yyval.value) = push_class(a);
-        break;
-    }
-
-    /* look through package prefixes */
-    if(dict_contains(state->import_toplevel_packages, (yyvsp[(1) - (1)].id))) {
-        (yyval.value).c = abc___pushpackage__((yyval.value).c, (yyvsp[(1) - (1)].id));
-        (yyval.value).t = 0;
-        break;
+        /* let the compiler know that it might want to check the current directory/package
+           for this identifier- maybe there's a file $1.as defining $1. */
+        as3_schedule_class_noerror(state->package, (yyvsp[(1) - (1)].id));

     }
     }

+   
+    (yyval.node) = 0;
+    PASS2

 
 

-    /* unknown object, let the avm2 resolve it */
-    if(1) {
-        //as3_softwarning("Couldn't resolve '%s', doing late binding", $1);
-        as3_warning("Couldn't resolve '%s', doing late binding", (yyvsp[(1) - (1)].id));
-        state->method->late_binding = 1;
-                
-        multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, (yyvsp[(1) - (1)].id)};
-
-        (yyval.value).t = 0;
-        (yyval.value).c = abc_findpropstrict2((yyval.value).c, &m);
-        (yyval.value).c = abc_getproperty2((yyval.value).c, &m);
-    }
+    (yyval.node) = resolve_identifier((yyvsp[(1) - (1)].id));

 }
     }
     break;
 
 
   
 }
     }
     break;
 
 
   

-    case 304:
+    case 348:

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

-#line 3798 "parser.y"
+#line 3717 "parser.y"

     {
     PASS12
     NEW(namespace_decl_t,n);
     n->name = (yyvsp[(2) - (2)].id);
     {
     PASS12
     NEW(namespace_decl_t,n);
     n->name = (yyvsp[(2) - (2)].id);

-    n->url = 0;
+    n->url = (yyvsp[(2) - (2)].id);

     (yyval.namespace_decl)=n;
 }
     }
     (yyval.namespace_decl)=n;
 }
     }

@@ -8125,11 +8671,11 @@ PASS2
 
 
   
 
 
   

-    case 305:
+    case 349:

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

-#line 3805 "parser.y"
+#line 3724 "parser.y"

     {
     PASS12
     NEW(namespace_decl_t,n);
     {
     PASS12
     NEW(namespace_decl_t,n);

@@ -8142,11 +8688,11 @@ PASS2
 
 
   
 
 
   

-    case 306:
+    case 350:

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

-#line 3812 "parser.y"
+#line 3731 "parser.y"

     {
     PASS12
     NEW(namespace_decl_t,n);
     {
     PASS12
     NEW(namespace_decl_t,n);

@@ -8159,15 +8705,30 @@ PASS2
 
 
   
 
 
   

-    case 307:
+    case 351:

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

-#line 3819 "parser.y"
+#line 3738 "parser.y"

     {
     PASS12
     {
     PASS12

-    list_append(state->new_namespaces, (yyvsp[(2) - (2)].namespace_decl));
-    tokenizer_register_namespace((yyvsp[(2) - (2)].namespace_decl)->name);
+    trie_put(active_namespaces, (yyvsp[(2) - (2)].namespace_decl)->name, (void*)(yyvsp[(2) - (2)].namespace_decl)->url);
+
+    namespace_t access = modifiers2access(&(yyvsp[(1) - (2)].flags));
+    varinfo_t* var = varinfo_register_global(access.access, state->package, (yyvsp[(2) - (2)].namespace_decl)->name);
+    var->type = TYPE_NAMESPACE;
+    namespace_t ns;
+    ns.access = ACCESS_NAMESPACE;
+    ns.name = (yyvsp[(2) - (2)].namespace_decl)->url;
+    var->value = constant_new_namespace(&ns);
+      
+    if(as3_pass==2) {
+        MULTINAME(m, TYPE_NAMESPACE);
+        trait_t*t = add_abc_slot(&(yyvsp[(1) - (2)].flags), (yyvsp[(2) - (2)].namespace_decl)->name, 0, 0);
+        t->value = var->value;
+        t->type_name = multiname_clone(&m);
+    }
+

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

@@ -8175,20 +8736,44 @@ PASS2
 
 
   
 
 
   

-    case 308:
+    case 352:
+    if(as3_pass==2) {
+
+/* Line 1464 of skeleton.m4  */
+#line 3761 "parser.y"
+    {
+    as3_warning("default xml namespaces not supported yet");
+    (yyval.code) = 0;
+}
+    }
+    break;
+
+
+  
+    case 353:

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

-#line 3826 "parser.y"
+#line 3766 "parser.y"

     {
     PASS12
     {
     PASS12

-    NEW(namespace_decl_t,n);
-    n->name = (yyvsp[(3) - (3)].classinfo)->name;
-    n->url = 0;
-    /* FIXME: for pass2, we should now try to figure out what the URL of 
-              this thing is */
-    list_append(state->new_namespaces, n);
-    tokenizer_register_namespace((yyvsp[(3) - (3)].classinfo)->name);
+    const char*url = (yyvsp[(3) - (3)].classinfo)->name;
+
+    varinfo_t*s = (varinfo_t*)(yyvsp[(3) - (3)].classinfo);
+    if(s->kind == INFOTYPE_UNRESOLVED) {
+        s = (varinfo_t*)registry_resolve((slotinfo_t*)s);
+        if(!s)
+            syntaxerror("Couldn't resolve namespace %s", (yyvsp[(3) - (3)].classinfo)->name);
+    }
+
+    if(!s || s->kind != INFOTYPE_VAR)
+        syntaxerror("%s.%s is not a public namespace (%d)", (yyvsp[(3) - (3)].classinfo)->package, (yyvsp[(3) - (3)].classinfo)->name, s?s->kind:-1);
+    if(!s->value || !NS_TYPE(s->value->type))
+        syntaxerror("%s.%s is not a namespace", (yyvsp[(3) - (3)].classinfo)->package, (yyvsp[(3) - (3)].classinfo)->name);
+    url = s->value->ns->name;
+
+    trie_put(active_namespaces, (yyvsp[(3) - (3)].classinfo)->name, (void*)url);
+    add_active_url(url);

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

@@ -8198,7 +8783,7 @@ PASS2
 
 
 /* Line 1464 of skeleton.m4  */
 
 
 /* Line 1464 of skeleton.m4  */

-#line 8202 "parser.tab.c"
+#line 8787 "parser.tab.c"

       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);