From b1d749e59444f86e40f897c41739168bb1b1b9b3 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Sun, 25 Feb 2018 22:43:42 +0100
Subject: [located] Push inner locations in `reference` to a CAst.t node.

The `reference` type contains some ad-hoc locations in its
constructors, but there is no reason not to handle them with the
standard attribute container provided by `CAst.t`.

An orthogonal topic to this commit is whether the `reference` type
should contain a location or not at all.

It seems that many places would become a bit clearer by splitting
`reference` into non-located `reference` and `lreference`, however
some other places become messier so we maintain the current status-quo
for now.
---
 intf/misctypes.ml  | 6 ++++--
 intf/vernacexpr.ml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'intf')

diff --git a/intf/misctypes.ml b/intf/misctypes.ml
index 1eee3dfc79..9eb6f62cc3 100644
--- a/intf/misctypes.ml
+++ b/intf/misctypes.ml
@@ -113,9 +113,11 @@ type 'a or_var =
 
 type 'a and_short_name = 'a * lident option
 
-type 'a or_by_notation =
+type 'a or_by_notation_r =
   | AN of 'a
-  | ByNotation of (string * string option) CAst.t
+  | ByNotation of (string * string option)
+
+type 'a or_by_notation = 'a or_by_notation_r CAst.t
 
 (* NB: the last string in [ByNotation] is actually a [Notation.delimiters],
    but this formulation avoids a useless dependency. *)
diff --git a/intf/vernacexpr.ml b/intf/vernacexpr.ml
index dca4910574..df061bfb72 100644
--- a/intf/vernacexpr.ml
+++ b/intf/vernacexpr.ml
@@ -106,7 +106,7 @@ type comment =
   | CommentString of string
   | CommentInt of int
 
-type reference_or_constr = 
+type reference_or_constr =
   | HintsReference of reference
   | HintsConstr of constr_expr
 
-- 
cgit v1.2.3