X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=lib%2Fas3%2Fparser.y;h=08900d19f4a9d0ffb3664930c1c88bb40e5be289;hb=4d69b9f6d19e31a9f9215b1f127dc56b24c559f5;hp=89d80ecb15e22e33dc9b11b80defa4157c087a20;hpb=6ead8227212dc074744a3a4282a6a572d120fecc;p=swftools.git

diff --git a/lib/as3/parser.y b/lib/as3/parser.y
index 89d80ec..08900d1 100644
--- a/lib/as3/parser.y
+++ b/lib/as3/parser.y
@@ -764,16 +764,18 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n
     multiname_t mname = {QNAME, &mname_ns, 0, name};
 
     multiname_t*type2 = sig2mname(return_type);
+    int slot = 0;
     if(!strcmp(state->clsinfo->name,name)) {
         state->m = abc_class_constructor(state->cls, type2);
+        name = "__as3_constructor__";
     } else {
         if(flags&FLAG_STATIC)
             state->m = abc_class_staticmethod(state->cls, type2, &mname);
         else
             state->m = abc_class_method(state->cls, type2, &mname);
-        int slot = state->m->trait->slot_id;
-        state->minfo = registerfunction(getset, flags, name, params, return_type, slot);
+        slot = state->m->trait->slot_id;
     }
+    state->minfo = registerfunction(getset, flags, name, params, return_type, slot);
 
     if(getset == KW_GET) state->m->trait->kind = TRAIT_GETTER;
     if(getset == KW_SET) state->m->trait->kind = TRAIT_SETTER;
@@ -796,7 +798,7 @@ static void startfunction(token_t*ns, int flags, enum yytokentype getset, char*n
     }
 
     /* state->vars is initialized by state_new */
-    if(new_variable("this", state->clsinfo)!=0) syntaxerror("Internal error");
+    if(new_variable((flags&FLAG_STATIC)?"class":"this", state->clsinfo)!=0) syntaxerror("Internal error");
 
     for(p=params->list;p;p=p->next) {
         new_variable(p->param->name, p->param->type);
@@ -1326,18 +1328,18 @@ SLOT_DECLARATION: MAYBE_MODIFIERS VARCONST T_IDENTIFIER MAYBETYPE MAYBEEXPRESSIO
         if($4) {
             MULTINAME(m, $4);
             t=abc_class_slot(state->cls, &mname, &m);
-            info->slot = t->slot_id;
         } else {
             t=abc_class_slot(state->cls, &mname, 0);
         }
+        info->slot = t->slot_id;
     } else {
         if($4) {
             MULTINAME(m, $4);
             t=abc_class_staticslot(state->cls, &mname, &m);
-            //info->slot = t->slot_id;
         } else {
             t=abc_class_staticslot(state->cls, &mname, 0);
         }
+        info->slot = t->slot_id;
     }
     if($5.c && !is_pushundefined($5.c)) {
         code_t*c = 0;
@@ -1882,13 +1884,20 @@ VAR_READ : T_IDENTIFIER {
     $$.t = 0;
     $$.c = 0;
     int i;
+    classinfo_t*a = 0;
     memberinfo_t*f = 0;
+
+    /* look at variables */
     if((i = find_variable($1, &$$.t)) >= 0) {
         // $1 is a local variable
         $$.c = abc_getlocal($$.c, i);
-    } else if(f = registry_findmember(state->clsinfo, $1)) {
+
+    /* look at current class' members */
+    } else if((f = registry_findmember(state->clsinfo, $1))) {
         // $1 is a function in this class
-        if(f->flags&FLAG_STATIC) {
+        int var_is_static = (f->flags&FLAG_STATIC);
+        int i_am_static = (state->minfo?(state->minfo->flags&FLAG_STATIC):FLAG_STATIC);
+        if(var_is_static != i_am_static) {
             /* there doesn't seem to be any "static" way to access
                static properties of a class */
             state->late_binding = 1;
@@ -1913,10 +1922,24 @@ VAR_READ : T_IDENTIFIER {
         } else {
             $$.t = f->type;
         }
+    
+    /* look at classes in the current package */
+    } else if((a = registry_findclass(state->package, $1))) {
+        if(a->slot) {
+            $$.c = abc_getglobalscope($$.c);
+            $$.c = abc_getslot($$.c, a->slot);
+        } else {
+            MULTINAME(m, a);
+            $$.c = abc_getlex2($$.c, &m);
+        }
+        /* this is not entirely correct (this is the class itself,
+           not an object of this class) */
+        $$.t = a;
+
+    /* unknown object, let the avm2 resolve it */
     } else {
-        // let the avm2 resolve $1 
         if(strcmp($1,"trace"))
-        warning("Couldn't resolve %s, doing late binding", $1);
+            warning("Couldn't resolve %s, doing late binding", $1);
         state->late_binding = 1;
                 
         multiname_t m = {MULTINAME, 0, &nopackage_namespace_set, $1};