Răsfoiți Sursa

remove -D haxe-next check for deprecated defines

also remove parser timer spam
Simon Krajewski 5 luni în urmă
părinte
comite
6124193718
2 a modificat fișierele cu 15 adăugiri și 17 ștergeri
  1. 14 16
      src/compiler/compiler.ml
  2. 1 1
      src/typing/typeloadParse.ml

+ 14 - 16
src/compiler/compiler.ml

@@ -270,22 +270,20 @@ module Setup = struct
 end
 
 let check_defines com =
-	if is_next com then begin
-		PMap.iter (fun k v ->
-			try
-				let reason = Hashtbl.find Define.deprecation_lut k in
-				let p = fake_pos ("-D " ^ k) in
-				begin match reason with
-				| DueTo reason ->
-					com.warning WDeprecatedDefine [] reason p
-				| InFavorOf d ->
-					Define.raw_define_value com.defines d v;
-					com.warning WDeprecatedDefine [] (Printf.sprintf "-D %s has been deprecated in favor of -D %s" k d) p
-				end;
-			with Not_found ->
-				()
-		) com.defines.values
-	end
+	PMap.iter (fun k v ->
+		try
+			let reason = Hashtbl.find Define.deprecation_lut k in
+			let p = fake_pos ("-D " ^ k) in
+			begin match reason with
+			| DueTo reason ->
+				com.warning WDeprecatedDefine [] reason p
+			| InFavorOf d ->
+				Define.raw_define_value com.defines d v;
+				com.warning WDeprecatedDefine [] (Printf.sprintf "-D %s has been deprecated in favor of -D %s" k d) p
+			end;
+		with Not_found ->
+			()
+	) com.defines.values
 
 (** Creates the typer context and types [classes] into it. *)
 let do_type ctx mctx actx display_file_dot_path =

+ 1 - 1
src/typing/typeloadParse.ml

@@ -56,7 +56,7 @@ let parse_file_from_lexbuf com file p lexbuf =
 	parse_result
 
 let parse_file_from_lexbuf com file p lexbuf =
-	Timer.time com.timer_ctx ["parsing";file] (parse_file_from_lexbuf com file p) lexbuf
+	Timer.time com.timer_ctx ["parsing"] (parse_file_from_lexbuf com file p) lexbuf
 
 let parse_file_from_string com file p string =
 	parse_file_from_lexbuf com file p (Sedlexing.Utf8.from_string string)