Merge branch 'development' into hxb_server_cache_simn_cleanup

# Conflicts:
#	src/compiler/compiler.ml
#	src/compiler/server.ml
#	src/core/tUnification.ml

src/compiler/compiler.ml

@@ -281,9 +281,7 @@ let do_type ctx mctx actx display_file_dot_path macro_cache_enabled =
 	CommonCache.maybe_add_context_sign cs com "before_init_macros";
 	enter_stage com CInitMacrosStart;
 	ServerMessage.compiler_stage com;
-
 	Setup.init_native_libs com actx.hxb_libs;
-
 	let mctx = List.fold_left (fun mctx path ->
 		Some (MacroContext.call_init_macro ctx.com mctx path)
 	) mctx (List.rev actx.config_macros) in

src/compiler/server.ml

@@ -311,10 +311,13 @@ let check_module sctx ctx m_path m_extra p =
 				end
 			end
 		in
+		let find_module_extra sign mpath =
+			(com.cs#get_context sign)#find_module_extra mpath
+		in
 		let check_dependencies () =
 			PMap.iter (fun _ (sign,mpath) ->
 				let m2_extra = try
-					(com.cs#get_context sign)#find_module_extra mpath
+					find_module_extra sign mpath
 				with Not_found ->
 					die (Printf.sprintf "Could not find dependency %s of %s in the cache" (s_type_path mpath) (s_type_path m_path)) __LOC__;
 				in

src/core/tUnification.ml

@@ -959,8 +959,8 @@ and unify_anons uctx a b a1 a2 =
 			)
 		| ClassStatics c1,_ ->
 			unify_fields c1.cl_statics (fun f1 ->
-					if not (Meta.has Meta.MaybeUsed f1.cf_meta) then
-						f1.cf_meta <- (Meta.MaybeUsed,[],f1.cf_pos) :: f1.cf_meta
+				if not (Meta.has Meta.MaybeUsed f1.cf_meta) then
+					f1.cf_meta <- (Meta.MaybeUsed,[],f1.cf_pos) :: f1.cf_meta
 			) (fun _ -> false)
 		| _ ->
 			unify_fields a1.a_fields (fun _ -> ()) (fun _ -> false)