瀏覽代碼

make some adjustments for display mode

Simon Krajewski 9 年之前
父節點
當前提交
793d573959
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 2 1
      src/typing/typeload.ml
  2. 1 1
      src/typing/typer.ml

+ 2 - 1
src/typing/typeload.ml

@@ -1096,7 +1096,8 @@ let type_function_arg_value ctx t c =
 				| TConst c -> Some c
 				| TCast(e,None) -> loop e
 				| _ ->
-					if not ctx.com.display.dms_display || ctx.com.display.dms_error_policy = EPCollect then display_error ctx "Parameter default value should be constant" p;
+					if not ctx.com.display.dms_display || ctx.com.display.dms_inline && ctx.com.display.dms_error_policy = EPCollect then
+						display_error ctx "Parameter default value should be constant" p;
 					None
 			in
 			loop e

+ 1 - 1
src/typing/typer.ml

@@ -1066,7 +1066,7 @@ let rec acc_get ctx g p =
 		let cmode = (match fmode with FStatic _ -> fmode | FInstance (c,tl,f) -> FClosure (Some (c,tl),f) | _ -> assert false) in
 		ignore(follow f.cf_type); (* force computing *)
 		(match f.cf_expr with
-		| _ when ctx.com.display.dms_display ->
+		| None when ctx.com.display.dms_display ->
 			mk (TField (e,cmode)) t p
 		| None ->
 			error "Recursive inline is not supported" p