module dependency adjustment

Makefile

@@ -34,7 +34,7 @@ EXPORT=../../../projects/motionTools/haxe
 
 MODULES=ast type lexer common genxml parser typecore optimizer typeload \
 codegen gencommon genas3 gencpp genjs genneko genphp genswf8 \
-	genswf9 genswf genjava gencs interp typer matcher dce filters version main
+	genswf9 genswf genjava gencs interp dce filters typer matcher version main
 
 ADD_REVISION=0
 
@@ -151,7 +151,7 @@ typecore.cmx: type.cmx common.cmx ast.cmx
 
 typeload.cmx: typecore.cmx type.cmx parser.cmx optimizer.cmx lexer.cmx common.cmx ast.cmx
 
-typer.cmx: typeload.cmx typecore.cmx type.cmx parser.cmx optimizer.cmx lexer.cmx interp.cmx genneko.cmx genjs.cmx common.cmx codegen.cmx ast.cmx
+typer.cmx: typeload.cmx typecore.cmx type.cmx parser.cmx optimizer.cmx lexer.cmx interp.cmx genneko.cmx genjs.cmx common.cmx codegen.cmx ast.cmx filters.cmx
 
 lexer.cmx: lexer.ml
 

typer.ml

@@ -2894,11 +2894,11 @@ and type_expr ctx (e,p) (with_type:with_type) =
 		| Some v ->
 			if params <> [] || inline then v.v_extra <- Some (params,if inline then Some e else None);
 			let rec loop = function
-				| Codegen.Block f | Codegen.Loop f | Codegen.Function f -> f loop
-				| Codegen.Use v2 when v == v2 -> raise Exit
-				| Codegen.Use _ | Codegen.Declare _ -> ()
+				| Filters.Block f | Filters.Loop f | Filters.Function f -> f loop
+				| Filters.Use v2 when v == v2 -> raise Exit
+				| Filters.Use _ | Filters.Declare _ -> ()
 			in
-			let is_rec = (try Codegen.local_usage loop e; false with Exit -> true) in
+			let is_rec = (try Filters.local_usage loop e; false with Exit -> true) in
 			let decl = (if is_rec then begin
 				if inline then display_error ctx "Inline function cannot be recursive" e.epos;
 				let vnew = add_local ctx v.v_name ft in
@@ -3842,9 +3842,9 @@ and flush_macro_context mint ctx =
 		mint
 	end else mint in
 	(* we should maybe ensure that all filters in Main are applied. Not urgent atm *)
-	(try Interp.add_types mint types (Codegen.post_process mctx [Codegen.Abstract.handle_abstract_casts mctx; Codegen.captured_vars mctx.com; Codegen.rename_local_vars mctx.com])
+	(try Interp.add_types mint types (Filters.post_process mctx [Codegen.Abstract.handle_abstract_casts mctx; Filters.captured_vars mctx.com; Filters.rename_local_vars mctx.com])
 	with Error (e,p) -> raise (Fatal_error(error_msg e,p)));
-	Codegen.post_process_end()
+	Filters.post_process_end()
 
 let create_macro_interp ctx mctx =
 	let com2 = mctx.com in