X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fas3%2Fcompiler.c;h=8bd8dd290b9ce33296843d41c1d11834d48cd86a;hp=02726509901fda2e1d916d01e299df46144b2e18;hb=4da50aa69285c6f5abd97e41dd195648b8df49fe;hpb=65dec90461cf9ceb574ba89189a65980960a3f56

diff --git a/lib/as3/compiler.c b/lib/as3/compiler.c
index 0272650..8bd8dd2 100644
--- a/lib/as3/compiler.c
+++ b/lib/as3/compiler.c
@@ -39,6 +39,8 @@ extern int a3_parse();
 extern int as3_lex();
 extern int as3_lex_destroy();
 
+static char config_recurse = 0;
+
 void as3_setverbosity(int level)
 {
     as3_verbosity=level;
@@ -47,6 +49,12 @@ void as3_add_include_dir(char*dir)
 {
     add_include_dir(dir);
 }
+void as3_set_option(char*key, char*value)
+{
+    if(!strcmp(key, "recurse")) {
+        config_recurse=atoi(value);
+    }
+}
 
 static char registry_initialized = 0;
 static char parser_initialized = 0;
@@ -56,36 +64,20 @@ static char parser_initialized = 0;
 //#define DEBUG
 #define DEBUG if(0)
 
-#ifdef STORE_TOKENS
-static mem_t tokens;
-#endif
-
 int a3_lex()
 {
     as3_tokencount++;
-#ifdef STORE_TOKENS
-    if(as3_pass==1) {
-        int token = as3_lex();
-        /* FIXME: current_file needs to be stored, too */
-        mem_put(&tokens, &token, sizeof(token));
-        mem_put(&tokens, &a3_lval, sizeof(a3_lval));
-        mem_put(&tokens, &current_line, sizeof(current_line));
-        mem_put(&tokens, &current_column, sizeof(current_column));
-        return token;
-    } else {
-        int token;
-        mem_get(&tokens, &token, sizeof(token));
-        mem_get(&tokens, &a3_lval, sizeof(a3_lval));
-        mem_get(&tokens, &current_line, sizeof(current_line));
-        mem_get(&tokens, &current_column, sizeof(current_column));
-        return token;
-    }
-#else
     return as3_lex();
-#endif
 }
 
-static void as3_parse_file_or_array(int pass, const char*name, const char*filename, const void*mem, int length)
+typedef struct _compile_list {
+    const char*name;
+    const char*filename;
+    struct _compile_list*next;
+} compile_list_t;
+static compile_list_t*compile_list=0;
+
+static void as3_parse_file_or_array(const char*name, const char*filename, const void*mem, int length)
 {
     if(!registry_initialized) {
         registry_initialized = 1;
@@ -94,19 +86,23 @@ static void as3_parse_file_or_array(int pass, const char*name, const char*filena
     if(!parser_initialized) {
         parser_initialized = 1;
         initialize_parser();
-#if defined(STORE_TOKENS)
-        mem_init(&tokens);
-#endif
     }
-    as3_pass=pass;
 
     FILE*fi = 0;
     if(filename) {
-        DEBUG printf("[pass %d] parse file %s %s\n", pass, name, filename);
+        if(as3_pass==1 && !mem) {
+            // record the fact that we compiled this file
+            compile_list_t*c = rfx_calloc(sizeof(compile_list_t));
+            c->next = compile_list;
+            c->name = strdup(name);
+            c->filename = strdup(filename);
+            compile_list = c;
+        }
+        DEBUG printf("[pass %d] parse file %s %s\n", as3_pass, name, filename);
         fi = enter_file2(name, filename, 0);
         as3_file_input(fi);
     } else {
-        DEBUG printf("[pass %d] parse bytearray %s (%d bytes)\n", pass, name, length);
+        DEBUG printf("[pass %d] parse bytearray %s (%d bytes)\n", as3_pass, name, length);
         enter_file(name, name, 0);
         as3_buffer_input((void*)mem, length);
     }
@@ -127,16 +123,16 @@ typedef struct _scheduled_file {
 static scheduled_file_t*scheduled=0;
 dict_t*scheduled_dict=0;
 
-void as3_parse_scheduled(int pass)
+void as3_parse_scheduled()
 {
-    DEBUG printf("[pass %d] parse scheduled\n", pass);
+    DEBUG printf("[pass %d] parse scheduled\n", as3_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);
+            as3_parse_file_or_array(s->name, s->filename, 0,0);
             s = s->next;
 
             free(old->filename);
@@ -173,40 +169,60 @@ void as3_schedule_file(const char*name, const char*filename)
     scheduled = f;
 }
 
+void as3_parse_list()
+{
+    while(compile_list) {
+        as3_parse_file_or_array(compile_list->name, compile_list->filename, 0,0);
+        compile_list = compile_list->next;
+    }
+}
+
 void as3_parse_bytearray(const char*name, const void*mem, int length)
 {
-    as3_parse_file_or_array(1, name, 0, mem, length);
-    as3_parse_scheduled(1);
+    as3_pass = 1;
+    as3_parse_file_or_array(name, 0, mem, length);
+    as3_parse_scheduled();
     
-    as3_parse_file_or_array(2, name, 0, mem, length);
-    as3_parse_scheduled(2);
+    registry_resolve_all();
+    
+    as3_pass = 2;
+    as3_parse_file_or_array(name, 0, mem, length);
+    as3_parse_list();
 }
 
 void as3_parse_file(const char*filename) 
 {
-    char*fullfilename = find_file(filename);
+    char*fullfilename = find_file(filename, 1);
     if(!fullfilename)
         return; // not found
+
+    compile_list = 0;
+    as3_pass = 1;
+    as3_parse_file_or_array(filename, fullfilename, 0,0);
+    as3_parse_scheduled();
     
-    as3_parse_file_or_array(1, filename, fullfilename, 0,0);
-    as3_parse_scheduled(1);
+    registry_resolve_all();
 
-    as3_parse_file_or_array(2, filename, fullfilename, 0,0);
-    as3_parse_scheduled(2);
+    as3_pass = 2;
+    as3_parse_list();
 
     free(fullfilename);
 }
 
 void as3_parse_directory(const char*dir)
 {
-    as3_pass=1;
+    compile_list = 0;
+
+    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);
+    as3_parse_scheduled();
+
+    registry_resolve_all();
+
+    as3_pass = 2;
+    as3_parse_list();
 }
 
 char as3_schedule_directory(const char*dirname)
@@ -255,13 +271,15 @@ void as3_schedule_package(const char*package)
         if(dirname[s]=='.') dirname[s]='/';
         s++;
     };
-    if(!as3_schedule_directory(package))
+    if(!as3_schedule_directory(dirname))
         as3_softwarning("Could not find package %s in file system", package);
 }
 
-void as3_schedule_class(const char*package, const char*cls)
+static void schedule_class(const char*package, const char*cls, char error)
 {
-    DEBUG printf("[pass %d] schedule class %s.%s\n",  as3_pass, package, cls);
+    if(error) {
+        DEBUG printf("[pass %d] schedule class %s.%s\n",  as3_pass, package, cls);
+    }
     if(!cls) {
         as3_schedule_package(package);
         return;
@@ -283,23 +301,38 @@ void as3_schedule_class(const char*package, const char*cls)
     strcpy(filename+t, cls);
     strcpy(filename+t+l2, ".as");
     char*f=0;
-    if(!(f=find_file(filename))) {
+    if(!(f=find_file(filename, error))) {
         int i;
         /* try lower case filename (not packagename!), too */
         for(i=t;i<t+l2;i++) {
             if(filename[i]>='A' && filename[i]<='Z')
                 filename[i] += 'a'-'A';
         }
-        if(!(f=find_file(filename))) {
-            strcpy(filename+t, cls);
-            strcpy(filename+t+l2, ".as");
-            as3_warning("Could not open file %s", filename);
+        if(!(f=find_file(filename, error))) {
+            if(error) {
+                strcpy(filename+t, cls);
+                strcpy(filename+t+l2, ".as");
+                as3_warning("Could not open file %s", filename);
+            }
             return;
         }
     }
     as3_schedule_file(filename, f);
 }
 
+void as3_schedule_class(const char*package, const char*cls)
+{
+    schedule_class(package, cls, 1);
+}
+
+void as3_schedule_class_noerror(const char*package, const char*cls)
+{
+    if(config_recurse) {
+        schedule_class(package, cls, 0);
+    }
+}
+
+
 static void*as3code = 0;
 void* as3_getcode()
 {