소스 검색

do not override DCE settings if `-D doc-gen` is in place (closes #3939)

Simon Krajewski 10 년 전
부모
커밋
2652bb23c2
2개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 0
      extra/CHANGES.txt
  2. 1 1
      filters.ml

+ 1 - 0
extra/CHANGES.txt

@@ -46,6 +46,7 @@
 	all : allowed variance on interface variables
 	all : allowed variance on interface variables
 	all : allowed pattern matching on arrays if they are typed as Dynamic
 	all : allowed pattern matching on arrays if they are typed as Dynamic
 	all : allowed pattern matching on fields of parent classes
 	all : allowed pattern matching on fields of parent classes
+	all : -D doc-gen no longer implies -dce no
 	flash/js: optimized haxe.ds.StringMap
 	flash/js: optimized haxe.ds.StringMap
 	neko : create output directory if it does not exist
 	neko : create output directory if it does not exist
 	js : inline Math methods and fields
 	js : inline Math methods and fields

+ 1 - 1
filters.ml

@@ -1110,7 +1110,7 @@ let run com tctx main =
 	(* check @:remove metadata before DCE so it is ignored there (issue #2923) *)
 	(* check @:remove metadata before DCE so it is ignored there (issue #2923) *)
 	List.iter (check_remove_metadata tctx) com.types;
 	List.iter (check_remove_metadata tctx) com.types;
 	(* DCE *)
 	(* DCE *)
-	let dce_mode = if Common.defined com Define.As3 || Common.defined com Define.DocGen then
+	let dce_mode = if Common.defined com Define.As3 then
 		"no"
 		"no"
 	else
 	else
 		(try Common.defined_value com Define.Dce with _ -> "no")
 		(try Common.defined_value com Define.Dce with _ -> "no")