X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fas3%2Fmain.c;h=1ce83a67e446b4d473a59a7defcb5aef9eca100d;hp=cfc7bbe3d6669153dfaf2c1fb45f57a6241eeaef;hb=9ed9a87914fc9a590967d46de404e0f6290b7bb2;hpb=2b9a0946679238ca5790825745ca752b340f0608

diff --git a/lib/as3/main.c b/lib/as3/main.c
index cfc7bbe..1ce83a6 100644
--- a/lib/as3/main.c
+++ b/lib/as3/main.c
@@ -27,24 +27,32 @@
 #include "../rfxswf.h"
 #include "../os.h"
 #include "files.h"
+#include "common.h"
 #include "tokenizer.h"
 #include "parser.tab.h"
 #include "parser.h"
+#include "compiler.h"
+#include "import.h"
 
-void test_lexer()
+void test_lexer(char*filename)
 {
+    char*fullfilename = find_file(filename, 1);
+    enter_file(filename, fullfilename, 0);
+    FILE*fi = fopen(fullfilename, "rb");
+    as3_file_input(fi);
     while(1) {
-        int token = avm2_lex();
+        int token = as3_lex();
         if(token==T_EOF)
             break;
         if(token>=32 && token<256) {
             printf("'%c'\n", token);
         } else {
-            printf("%s\n", token2string(token, avm2_lval));
+            printf("%s\n", token2string(token, a3_lval));
         }
     }
 }
 
+extern int a3_debug;
 int main(int argn, char*argv[])
 {
     char*filename = 0;
@@ -54,27 +62,62 @@ int main(int argn, char*argv[])
         fprintf(stderr, "please supply a filename\n");
         exit(1);
     }
-    filename=argv[1];
-    
+    filename=argv[argn-1];
+
+#ifdef BISONDEBUG
+    a3_debug = 1; //if bison was called with -t
+#endif
+   
+    as3_add_include_dir(getcwd(buf, 512));
+
     registry_init();
-    
-    add_include_dir(getcwd(buf, 512));
-    char*fullfilename = enter_file(filename, 0);
 
-    FILE*fi = fopen(fullfilename, "rb");
-    if(!fi) {
-        perror(fullfilename);
-        return 1;
+    int t=0;
+    char*mainclass = 0;
+    for(t=1;t<argn-1;t++) {
+        if(!strcmp(argv[t], "-lex")) {
+            test_lexer(filename);
+            return 0;
+        }
+        if(!strcmp(argv[t], "-M")) {
+            mainclass = argv[++t];
+        }
+        if(!strcmp(argv[t], "-v")) {
+            as3_verbosity++;
+        }
+        if(!strcmp(argv[t], "-q")) {
+            as3_verbosity--;
+        }
+        if(!strcmp(argv[t], "-D")) {
+            char*c = argv[t+1];
+            if(!strstr(c, "::"))
+                printf("Error: compile definition must contain \"::\"\n");
+            as3_set_define(c);
+        }
+        if(!strcmp(argv[t], "-R")) {
+            as3_set_option("recurse","1");
+        }
+        if(!strcmp(argv[t], "-I")) {
+            as3_add_include_dir(argv[++t]);
+        }
+        if(!strcmp(argv[t], "-l")) {
+            as3_import_file(argv[++t]);
+        }
     }
-    initialize_state();
-    avm2_set_in(fi);
 
-    if(argn>2 && !strcmp(argv[2], "-lex")) {
-        test_lexer();
-        return 0;
+    //extern int avm2_debug;
+    //avm2_debug = 1;
+
+    //memfile_t*m = memfile_open(filename);
+    //as3_parse_bytearray(filename, m->data, m->len);
+    //memfile_close(m);
+    if(!strcmp(filename, ".")) {
+        as3_parse_directory(".");
+    } else {
+        as3_parse_file(filename);
     }
-    avm2_parse();
-    void*code = finalize_state();
+
+    void*code = as3_getcode();
 
     SWF swf;
     memset(&swf, 0, sizeof(swf));
@@ -83,14 +126,23 @@ int main(int argn, char*argv[])
     swf.movieSize.xmin = swf.movieSize.ymin = 0;
     swf.movieSize.xmax = 20*20;
     swf.movieSize.ymax = 10*20;
-    TAG*tag = swf.firstTag = swf_InsertTag(0, ST_DOABC);
+    TAG*tag = (TAG*)as3_getassets(0);
+    if(!swf.firstTag && tag) swf.firstTag = tag;
+
+    while(tag && tag->next) tag = tag->next;
+
+    tag = swf_InsertTag(tag, ST_DOABC);
+    if(!swf.firstTag && tag) swf.firstTag = tag;
     swf_WriteABC(tag, code);
 
-    if(globalclass) {
+    if(!mainclass)
+        mainclass = as3_getglobalclass();
+
+    if(mainclass) {
         tag = swf_InsertTag(tag, ST_SYMBOLCLASS);
         swf_SetU16(tag, 1);
         swf_SetU16(tag, 0);
-        swf_SetString(tag, globalclass);
+        swf_SetString(tag, mainclass);
     } else {
         printf("Warning: no global public MovieClip subclass\n");
     }
@@ -104,5 +156,7 @@ int main(int argn, char*argv[])
     swf_WriteSWF(f,&swf);
     close(f);
 
+    swf_FreeTags(&swf);
+
     return 0;
 }