Browse Source

m_macro_calls -> m_reuse_macro_calls (more clear name)

Dan Korostelev 8 years ago
parent
commit
ea50e593c1
3 changed files with 5 additions and 5 deletions
  1. 1 1
      src/compiler/server.ml
  2. 3 3
      src/core/type.ml
  3. 1 1
      src/typing/macroContext.ml

+ 1 - 1
src/compiler/server.ml

@@ -385,7 +385,7 @@ let rec wait_loop process_params verbose accept =
 					PMap.iter (Hashtbl.replace com2.resources) m.m_extra.m_binded_res;
 					if ctx.Typecore.in_macro || com2.display.dms_full_typing then
 						PMap.iter (fun _ m2 -> add_modules (tabs ^ "  ") m0 m2) m.m_extra.m_deps;
-					List.iter (MacroContext.call_init_macro ctx) m.m_extra.m_macro_calls
+					List.iter (MacroContext.call_init_macro ctx) m.m_extra.m_reuse_macro_calls
 				)
 			end
 		in

+ 3 - 3
src/core/type.ml

@@ -321,7 +321,7 @@ and module_def_extra = {
 	mutable m_processed : int;
 	mutable m_kind : module_kind;
 	mutable m_binded_res : (string, string) PMap.t;
-	mutable m_macro_calls : string list;
+	mutable m_reuse_macro_calls : string list;
 	mutable m_if_feature : (string *(tclass * tclass_field * bool)) list;
 	mutable m_features : (string,bool) Hashtbl.t;
 }
@@ -426,7 +426,7 @@ let module_extra file sign time kind policy =
 		m_deps = PMap.empty;
 		m_kind = kind;
 		m_binded_res = PMap.empty;
-		m_macro_calls = [];
+		m_reuse_macro_calls = [];
 		m_if_feature = [];
 		m_features = Hashtbl.create 0;
 		m_check_policy = policy;
@@ -1486,7 +1486,7 @@ module Printer = struct
 			"m_processed",string_of_int me.m_processed;
 			"m_kind",s_module_kind me.m_kind;
 			"m_binded_res",""; (* TODO *)
-			"m_macro_calls",String.concat ", " me.m_macro_calls;
+			"m_reuse_macro_calls",String.concat ", " me.m_reuse_macro_calls;
 			"m_if_feature",""; (* TODO *)
 			"m_features",""; (* TODO *)
 		]

+ 1 - 1
src/typing/macroContext.ml

@@ -334,7 +334,7 @@ let make_macro_api ctx p =
 		MacroApi.module_dependency = (fun mpath file ismacro ->
 			let m = typing_timer ctx false (fun() -> Typeload.load_module ctx (parse_path mpath) p) in
 			if ismacro then
-				m.m_extra.m_macro_calls <- file :: List.filter ((<>) file) m.m_extra.m_macro_calls
+				m.m_extra.m_reuse_macro_calls <- file :: List.filter ((<>) file) m.m_extra.m_reuse_macro_calls
 			else
 				add_dependency m (create_fake_module ctx file);
 		);