X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fas3%2Fcompiler.c;h=de23f22b6a13f2d2e92784d7dfe5f7f0566ab19b;hb=8a7da6f65154bb96d47695cbcbf42684cccb0aad;hp=79fd1fa485061111e10e0cb48ebbc30fdf2d464f;hpb=3d8151ede9ec5731b2d20833b4d338c05975bdc8;p=swftools.git diff --git a/lib/as3/compiler.c b/lib/as3/compiler.c index 79fd1fa..de23f22 100644 --- a/lib/as3/compiler.c +++ b/lib/as3/compiler.c @@ -21,6 +21,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "common.h" #include "tokenizer.h" #include "files.h" #include "parser.h" @@ -39,6 +40,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 +50,12 @@ void as3_add_include_dir(char*dir) { add_include_dir(dir); } +void as3_set_option(const char*key, const char*value) +{ + if(!strcmp(key, "recurse")) { + config_recurse=atoi(value); + } +} static char registry_initialized = 0; static char parser_initialized = 0; @@ -56,33 +65,10 @@ 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, ¤t_line, sizeof(current_line)); - mem_put(&tokens, ¤t_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, ¤t_line, sizeof(current_line)); - mem_get(&tokens, ¤t_column, sizeof(current_column)); - return token; - } -#else return as3_lex(); -#endif } typedef struct _compile_list { @@ -92,7 +78,7 @@ typedef struct _compile_list { } compile_list_t; static compile_list_t*compile_list=0; -static void as3_parse_file_or_array(int pass, const char*name, const char*filename, const void*mem, int length) +static void as3_parse_file_or_array(const char*name, const char*filename, const void*mem, int length) { if(!registry_initialized) { registry_initialized = 1; @@ -101,26 +87,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) { 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", pass, name, filename); + 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); } @@ -141,16 +124,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); @@ -190,7 +173,7 @@ void as3_schedule_file(const char*name, const char*filename) void as3_parse_list() { while(compile_list) { - as3_parse_file_or_array(2, compile_list->name, compile_list->filename, 0,0); + as3_parse_file_or_array(compile_list->name, compile_list->filename, 0,0); compile_list = compile_list->next; } } @@ -198,11 +181,13 @@ void as3_parse_list() void as3_parse_bytearray(const char*name, const void*mem, int length) { as3_pass = 1; - as3_parse_file_or_array(1, name, 0, mem, length); - as3_parse_scheduled(1); + as3_parse_file_or_array(name, 0, mem, length); + as3_parse_scheduled(); + + registry_resolve_all(); as3_pass = 2; - as3_parse_file_or_array(2, name, 0, mem, length); + as3_parse_file_or_array(name, 0, mem, length); as3_parse_list(); } @@ -214,8 +199,10 @@ void as3_parse_file(const char*filename) compile_list = 0; as3_pass = 1; - as3_parse_file_or_array(1, filename, fullfilename, 0,0); - as3_parse_scheduled(1); + as3_schedule_file(filename, fullfilename); + as3_parse_scheduled(); + + registry_resolve_all(); as3_pass = 2; as3_parse_list(); @@ -226,13 +213,16 @@ void as3_parse_file(const char*filename) void as3_parse_directory(const char*dir) { compile_list = 0; - as3_pass=1; + + 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_parse_scheduled(); + + registry_resolve_all(); - as3_pass=2; + as3_pass = 2; as3_parse_list(); } @@ -338,7 +328,9 @@ void as3_schedule_class(const char*package, const char*cls) void as3_schedule_class_noerror(const char*package, const char*cls) { - schedule_class(package, cls, 0); + if(config_recurse) { + schedule_class(package, cls, 0); + } }