as3: improved protected handling, xml support. added 'arguments' keyword

[swftools.git] / lib / as3 / import.c

diff --git a/lib/as3/import.c b/lib/as3/import.c
index 4353202..b5290bd 100644 (file)
--- a/lib/as3/import.c
+++ b/lib/as3/import.c
@@ -103,7 +103,9 @@ static int compare_traits(const void*v1, const void*v2)
 static classinfo_t*resolve_class(char*filename, char*what, multiname_t*n)
 {
     if(!n) return 0;
-    if(!n->name[0] || !strcmp(n->name, "void")) return 0;
+    if(!n->name[0]) return 0;
+    if(!strcmp(n->name, "void")) 
+        return &voidclass;
 
     classinfo_t*c = 0;
     if(n->ns && n->ns->name) {
@@ -188,7 +190,7 @@ static void import_code(void*_abc, char*filename, int pass)
             if(access==ACCESS_PRIVATE)
                 goto cont;
             const char*name = trait->name->name;
-            char* ns= ACCESS_NAMESPACE?strdup(trait->name->ns->name):"";
+            char* ns = access==ACCESS_NAMESPACE?strdup(trait->name->ns->name):"";
             if(registry_findmember(c, ns, name, 0))
                 goto cont;
             name = strdup(name);