[location] Remove Loc.ghost.

Now it is a private field, locations are optional.

1 files changed, 5 insertions, 12 deletions

diff --git a/lib/loc.mli b/lib/loc.mli
index 10f63a8dd7..82792613c0 100644
--- a/lib/loc.mli
+++ b/lib/loc.mli
@@ -32,14 +32,15 @@ val unloc : t -> int * int
 val make_loc : int * int -> t
 (** Make a location out of its start and end position *)
 
-val ghost : t
-(** Dummy location *)
-
+val internal_ghost : t
 val is_ghost : t -> bool
 (** Test whether the location is meaningful *)
 
 val merge : t -> t -> t
 
+val merge_opt : t option -> t -> t
+val opt_merge : t -> t option -> t
+
 (** {5 Located exceptions} *)
 
 val add_loc : Exninfo.info -> t -> Exninfo.info
@@ -71,15 +72,7 @@ val map_with_loc : (loc:t -> 'a -> 'b) -> 'a located -> 'b located
 val located_fold_left : ('a -> 'b -> 'a) -> 'a -> 'b located -> 'a
 val down_located : ('a -> 'b) -> 'a located -> 'b
 
-(* Current not used *)
+(* Currently not used *)
 val located_iter2 : ('a -> 'b -> unit) -> 'a located -> 'b located -> unit
 
 (** Projects out a located object *)
-
-(** {5 Backward compatibility} *)
-
-val dummy_loc : t
-(** Same as [ghost] *)
-
-val join_loc : t -> t -> t
-(** Same as [merge] *)