X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fcompiler.c;h=07bc983fce2fb606c680bdb02722a1e6b4cd65f1;hb=a638a0d9f8ea2aade9dd1aa8fda629d796bc02a6;hp=11c67929717ae48be61e8af4935728dae4cc746d;hpb=d16ffd1b2bce99cfda0269331b1d900a7695dcfe;p=swftools.git

diff --git a/lib/as3/compiler.c b/lib/as3/compiler.c
index 11c6792..07bc983 100644
--- a/lib/as3/compiler.c
+++ b/lib/as3/compiler.c
@@ -27,6 +27,9 @@
 #include "parser.tab.h"
 #include "compiler.h"
 #include "../os.h"
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
 #ifdef HAVE_DIRENT_H
 #include <dirent.h>
 #endif
@@ -50,6 +53,9 @@ static char parser_initialized = 0;
 
 //#define STORE_TOKENS
 
+#define DEBUG
+//#define DEBUG if(0)
+
 #ifdef STORE_TOKENS
 static mem_t tokens;
 #endif
@@ -96,11 +102,11 @@ static void as3_parse_file_or_array(int pass, const char*name, const char*filena
 
     FILE*fi = 0;
     if(filename) {
-        //printf("[pass %d] parse file %s %s\n", pass, name, filename);
+        DEBUG printf("[pass %d] parse file %s %s\n", pass, name, filename);
         fi = enter_file2(name, filename, 0);
         as3_file_input(fi);
     } else {
-        //printf("[pass %d] parse bytearray %s (%d bytes)\n", pass, name, length);
+        DEBUG printf("[pass %d] parse bytearray %s (%d bytes)\n", pass, name, length);
         enter_file(name, name, 0);
         as3_buffer_input(mem, length);
     }
@@ -123,35 +129,42 @@ dict_t*scheduled_dict=0;
 
 void as3_parse_scheduled(int pass)
 {
-    scheduled_file_t*s = scheduled;
-    scheduled = 0;
-    while(s) {
-        scheduled_file_t*old = s;
-        as3_parse_file_or_array(pass, s->name, s->filename, 0,0);
-        s = s->next;
-
-        free(old->filename);
-        free(old->name);
-        old->filename = old->name = 0;
-        free(old);
+    DEBUG printf("[pass %d] parse scheduled\n", pass);
+
+    while(scheduled) {
+        scheduled_file_t*s = scheduled;
+        scheduled = 0;
+        while(s) {
+            scheduled_file_t*old = s;
+            as3_parse_file_or_array(pass, s->name, s->filename, 0,0);
+            s = s->next;
+
+            free(old->filename);
+            free(old->name);
+            old->filename = old->name = 0;
+            free(old);
+        }
     }
     if(scheduled_dict) {
         dict_destroy(scheduled_dict);
         scheduled_dict=0;
     }
 }
+
 void as3_schedule_file(const char*name, const char*filename) 
 {
-    if(!scheduled_dict) 
+    if(!scheduled_dict) {
         scheduled_dict = dict_new();
-    
-    //printf("schedule %s %s\n", name, filename);
+    }
 
+    filename = normalize_path(filename);
+    
     if(dict_contains(scheduled_dict, filename)) {
         return; //already processed
     } else {
         dict_put(scheduled_dict, filename, 0);
     }
+    DEBUG printf("[pass %d] schedule %s %s\n", as3_pass, name, filename);
 
     NEW(scheduled_file_t, f);
     f->name = strdup(name);
@@ -184,20 +197,28 @@ void as3_parse_file(const char*filename)
     free(fullfilename);
 }
 
-void as3_schedule_package(const char*package)
+void as3_parse_directory(const char*dir)
 {
-    char*dirname = strdup(package);
-    int s=0;
-    while(dirname[s]) {
-        if(package[s]=='.') dirname[s]='/';
-        s++;
-    };
+    as3_pass=1;
+    as3_schedule_directory(dir);
+    if(!scheduled)
+        as3_warning("Directory %s doesn't contain any ActionScript files", dir);
+    as3_parse_scheduled(1);
+    as3_pass=2;
+    as3_schedule_directory(dir);
+    as3_parse_scheduled(2);
+}
+
+char as3_schedule_directory(const char*dirname)
+{
+    DEBUG printf("[pass %d] schedule directory %s\n", as3_pass, dirname);
     char ok=0;
 #ifdef HAVE_DIRENT_H
     include_dir_t*i = current_include_dirs;
     while(i) {
-        char*fulldirname = concatPaths(i->path, dirname);
-        DIR*dir = opendir(dirname);
+        char*fulldirname = concat_paths(i->path, dirname);
+        DEBUG printf("[pass %d] ... %s\n", as3_pass, fulldirname);
+        DIR*dir = opendir(fulldirname);
         if(dir) {
             ok = 1;
             struct dirent*ent;
@@ -213,7 +234,7 @@ void as3_schedule_package(const char*package)
                     continue;
                 if(strncasecmp(&name[l-3], ".as", 3)) 
                     continue;
-                char*fullfilename = concatPaths(dirname, name);
+                char*fullfilename = concatPaths(fulldirname, name);
                 as3_schedule_file(name, fullfilename);
                 free(fullfilename);
             }
@@ -222,12 +243,25 @@ void as3_schedule_package(const char*package)
         i = i->next;
     }
 #endif
-    if(!ok)
+    return ok;
+}
+
+void as3_schedule_package(const char*package)
+{
+    DEBUG printf("[pass %d] schedule package %s\n", as3_pass, package);
+    char*dirname = strdup(package);
+    int s=0;
+    while(dirname[s]) {
+        if(dirname[s]=='.') dirname[s]='/';
+        s++;
+    };
+    if(!as3_schedule_directory(package))
         as3_softwarning("Could not find package %s in file system", package);
 }
 
 void as3_schedule_class(const char*package, const char*cls)
 {
+    DEBUG printf("[pass %d] schedule class %s.%s\n",  as3_pass, package, cls);
     if(!cls) {
         as3_schedule_package(package);
         return;