finished ast implementation

[swftools.git] / lib / as3 / tokenizer.h

diff --git a/lib/as3/tokenizer.h b/lib/as3/tokenizer.h
index 914ba0c..0da4f12 100644 (file)
--- a/lib/as3/tokenizer.h
+++ b/lib/as3/tokenizer.h
@@ -27,13 +27,13 @@
 #include "registry.h"
 #include "code.h"
 #include "opcodes.h"
+#include "ast.h"
 
 DECLARE(token);
 DECLARE_LIST(token);
 DECLARE(param);
 DECLARE_LIST(param);
 DECLARE(params);
-DECLARE(typedcode);
 DECLARE(modifiers);
 DECLARE(namespace_decl);
 DECLARE_LIST(namespace_decl);
@@ -50,10 +50,6 @@ struct _params {
     char varargs;
 };
 
-struct _typedcode {
-    code_t*c;
-    classinfo_t*t;
-};
 struct _modifiers {
     int flags;
     char*ns;
@@ -66,7 +62,7 @@ struct _namespace_decl {
 /* small helper structs: */
 typedef struct _codeandnumber {
     code_t*cc;
-    int len;
+    int number;
 } codeandnumber_t;
 typedef struct _for_start {
     char*name;
@@ -81,22 +77,15 @@ extern char start_of_expression;
 
 typedef token_t*tokenptr_t;
 
+extern trie_t*active_namespaces;
+
 #include "parser.tab.h"
 
-extern int as3_verbosity;
-extern int as3_pass;
 extern unsigned int as3_tokencount;
-#define syntaxerror as3_error
-void as3_error(const char*format, ...);
-void as3_warning(const char*format, ...);
-void as3_softwarning(const char*format, ...);
 
 void as3_buffer_input(void*buffer, int len);
 void as3_file_input(FILE*fi);
 
-void tokenizer_register_namespace(const char*id);
-void tokenizer_unregister_namespace(const char*id);
-
 #define T_EOF 0
 
 extern int avm2_lex();