Просмотр исходного кода

[display] rename DMDefault to DMField

Dan Korostelev 9 лет назад
Родитель
Сommit
031110fc56
4 измененных файлов с 8 добавлено и 8 удалено
  1. 2 2
      src/display/displayOutput.ml
  2. 4 4
      src/typing/common.ml
  3. 1 1
      src/typing/typeload.ml
  4. 1 1
      src/typing/typer.ml

+ 2 - 2
src/display/displayOutput.ml

@@ -669,7 +669,7 @@ let handle_display_argument com file_pos pre_compilation did_something =
 			| "signature" ->
 				DMSignature
 			| "" ->
-				DMDefault
+				DMField
 			| _ ->
 				let smode,arg = try ExtString.String.split smode "@" with _ -> pos,"" in
 				match smode with
@@ -679,7 +679,7 @@ let handle_display_argument com file_pos pre_compilation did_something =
 						Common.define com Define.NoCOpt;
 						DMModuleSymbols (Some arg)
 					| _ ->
-						DMDefault
+						DMField
 		in
 		let pos = try int_of_string pos with _ -> failwith ("Invalid format : "  ^ pos) in
 		com.display <- DisplayMode.create mode;

+ 4 - 4
src/typing/common.ml

@@ -92,7 +92,7 @@ type platform_config = {
 module DisplayMode = struct
 	type t =
 		| DMNone
-		| DMDefault
+		| DMField
 		| DMUsage of bool (* true = also report definition *)
 		| DMPosition
 		| DMToplevel
@@ -128,7 +128,7 @@ module DisplayMode = struct
 	}
 
 	let default_display_settings = {
-		dms_kind = DMDefault;
+		dms_kind = DMField;
 		dms_display = true;
 		dms_full_typing = false;
 		dms_force_macro_typing = false;
@@ -157,7 +157,7 @@ module DisplayMode = struct
 		let settings = { default_display_settings with dms_kind = dm } in
 		match dm with
 		| DMNone -> default_compilation_settings
-		| DMDefault | DMPosition | DMResolve _ | DMPackage | DMType | DMSignature -> settings
+		| DMField | DMPosition | DMResolve _ | DMPackage | DMType | DMSignature -> settings
 		| DMUsage _ -> { settings with
 				dms_full_typing = true;
 				dms_collect_data = true;
@@ -188,7 +188,7 @@ module DisplayMode = struct
 
 	let to_string = function
 		| DMNone -> "none"
-		| DMDefault -> "default"
+		| DMField -> "field"
 		| DMPosition -> "position"
 		| DMResolve s -> "resolve " ^ s
 		| DMPackage -> "package"

+ 1 - 1
src/typing/typeload.ml

@@ -1823,7 +1823,7 @@ let check_global_metadata ctx meta f_add mpath tpath so =
 						(* TODO: hack until we support proper output for hover display mode *)
 						 raise (Display.Metadata ("<metadata>" ^ s ^ "</metadata>"));
 			) meta
-		| DMDefault ->
+		| DMField ->
 			List.iter (fun (meta,_,p) ->
 				if Display.is_display_position p then begin
 					let all,_ = MetaInfo.get_documentation_list() in

+ 1 - 1
src/typing/typer.ml

@@ -3872,7 +3872,7 @@ and display_expr ctx e_ast e with_type p =
 		raise (Display.DisplayPosition pl);
 	| DMToplevel ->
 		raise (Display.DisplayToplevel (Display.ToplevelCollector.run ctx false))
-	| DMDefault | DMNone | DMModuleSymbols _ | DMDiagnostics _ | DMStatistics ->
+	| DMField | DMNone | DMModuleSymbols _ | DMDiagnostics _ | DMStatistics ->
 		let opt_args args ret = TFun(List.map(fun (n,o,t) -> n,true,t) args,ret) in
 		let e = match e.eexpr with
 			| TField (e1,fa) ->