Merge PR #9478: Remove the comment fields of locations.

Reviewed-by: ejgallego

4 files changed, 5 insertions, 14 deletions

diff --git a/gramlib/ploc.ml b/gramlib/ploc.ml
index 9342fc6c1d..056a2b7ad3 100644
--- a/gramlib/ploc.ml
+++ b/gramlib/ploc.ml
@@ -6,17 +6,16 @@ open Loc
 
 let make_unlined (bp, ep) =
   {fname = InFile ""; line_nb = 1; bol_pos = 0; line_nb_last = -1; bol_pos_last = 0;
-   bp = bp; ep = ep; comm = ""; ecomm = ""}
+   bp = bp; ep = ep; }
 
 let dummy =
   {fname = InFile ""; line_nb = 1; bol_pos = 0; line_nb_last = -1; bol_pos_last = 0;
-   bp = 0; ep = 0; comm = ""; ecomm = ""}
+   bp = 0; ep = 0; }
 
 (* *)
 
 let sub loc sh len = {loc with bp = loc.bp + sh; ep = loc.bp + sh + len}
 let after loc sh len = {loc with bp = loc.ep + sh; ep = loc.ep + sh + len}
-let with_comment loc comm = {loc with comm = comm}
 
 exception Exc of Loc.t * exn
 
diff --git a/gramlib/ploc.mli b/gramlib/ploc.mli
index 100fbc7271..15a5a74455 100644
--- a/gramlib/ploc.mli
+++ b/gramlib/ploc.mli
@@ -35,6 +35,3 @@ val after : Loc.t -> int -> int -> Loc.t
    (** [Ploc.after loc sh len] is the location just after loc (starting at
        the end position of [loc]) shifted with [sh] characters and of length
        [len]. *)
-
-val with_comment : Loc.t -> string -> Loc.t
-   (** Change the comment part of the given location *)
diff --git a/lib/loc.ml b/lib/loc.ml
index c08648911b..66b7a7da70 100644
--- a/lib/loc.ml
+++ b/lib/loc.ml
@@ -22,19 +22,17 @@ type t = {
   bol_pos_last : int; (** position of the beginning of end line *)
   bp : int; (** start position *)
   ep : int; (** end position *)
-  comm : string; (** start comment *)
-  ecomm : string (** end comment *)
 }
 
 let create fname line_nb bol_pos bp ep = {
   fname = fname; line_nb = line_nb; bol_pos = bol_pos;
   line_nb_last = line_nb; bol_pos_last = bol_pos; bp = bp; ep = ep;
-  comm = ""; ecomm = "" }
+}
 
 let make_loc (bp, ep) = {
   fname = ToplevelInput; line_nb = -1; bol_pos = 0; line_nb_last = -1; bol_pos_last = 0;
   bp = bp; ep = ep;
-  comm = ""; ecomm = "" }
+}
 
 let mergeable loc1 loc2 =
   loc1.fname = loc2.fname
@@ -50,7 +48,7 @@ let merge loc1 loc2 =
       line_nb_last = loc2.line_nb_last;
       bol_pos_last = loc2.bol_pos_last;
       bp = loc1.bp; ep = loc2.ep;
-      comm = loc1.comm; ecomm = loc2.comm }
+    }
     else loc1
   else if loc2.ep < loc1.ep then {
     fname = loc2.fname;
@@ -59,7 +57,6 @@ let merge loc1 loc2 =
     line_nb_last = loc1.line_nb_last;
     bol_pos_last = loc1.bol_pos_last;
     bp = loc2.bp; ep = loc1.ep;
-    comm = loc2.comm; ecomm = loc1.comm
   }
   else loc2
 
diff --git a/lib/loc.mli b/lib/loc.mli
index c46311b639..23df1ebd9a 100644
--- a/lib/loc.mli
+++ b/lib/loc.mli
@@ -22,8 +22,6 @@ type t = {
   bol_pos_last : int; (** position of the beginning of end line *)
   bp : int; (** start position *)
   ep : int; (** end position *)
-  comm : string; (** start comment *)
-  ecomm : string (** end comment *)
 }
 
 (** {5 Location manipulation} *)