From bf13037e9ca39da28fb648e5488ce56ef8a1f1e2 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Tue, 17 Jan 2017 15:06:26 +0100
Subject: [location] Use located in misctypes.

---
 printing/pputils.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'printing/pputils.ml')

diff --git a/printing/pputils.ml b/printing/pputils.ml
index 50630fb9b5..e90b54685e 100644
--- a/printing/pputils.ml
+++ b/printing/pputils.ml
@@ -105,7 +105,7 @@ let pr_red_expr (pr_constr,pr_lconstr,pr_ref,pr_pattern) keyword = function
 
 let pr_or_by_notation f = function
   | AN v -> f v
-  | ByNotation (_,s,sc) -> qs s ++ pr_opt (fun sc -> str "%" ++ str sc) sc
+  | ByNotation (_,(s,sc)) -> qs s ++ pr_opt (fun sc -> str "%" ++ str sc) sc
 
 let hov_if_not_empty n p = if Pp.ismt p then p else hov n p
 
-- 
cgit v1.2.3


From 30d3515546cf244837c6340b6b87c5f51e68cbf4 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Tue, 17 Jan 2017 23:40:35 +0100
Subject: [location] Remove Loc.ghost.

Now it is a private field, locations are optional.
---
 printing/pputils.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'printing/pputils.ml')

diff --git a/printing/pputils.ml b/printing/pputils.ml
index e90b54685e..4ae5035a26 100644
--- a/printing/pputils.ml
+++ b/printing/pputils.ml
@@ -15,7 +15,7 @@ open Locus
 open Genredexpr
 
 let pr_located pr (loc, x) =
-  if !Flags.beautify && loc <> Loc.ghost then
+  if !Flags.beautify && not (Loc.is_ghost loc) then
     let (b, e) = Loc.unloc loc in
     (* Side-effect: order matters *)
     let before = Pp.comment (CLexer.extract_comments b) in
-- 
cgit v1.2.3


From e8a6467545c2814c9418889201e8be19c0cef201 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Wed, 18 Jan 2017 15:46:23 +0100
Subject: [location] Make location optional in Loc.located

This completes the Loc.ghost removal, the idea is to gear the API
towards optional, but uniform, location handling.

We don't print <unknown> anymore in the case there is no location.
This is what the test suite expects.

The old printing logic for located items was a bit inconsistent as
it sometimes printed <unknown> and other times it printed nothing as
the caller checked for `is_ghost` upstream.
---
 printing/pputils.ml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'printing/pputils.ml')

diff --git a/printing/pputils.ml b/printing/pputils.ml
index 4ae5035a26..d1ba1a4a10 100644
--- a/printing/pputils.ml
+++ b/printing/pputils.ml
@@ -15,14 +15,15 @@ open Locus
 open Genredexpr
 
 let pr_located pr (loc, x) =
-  if !Flags.beautify && not (Loc.is_ghost loc) then
+  match loc with
+  | Some loc when !Flags.beautify ->
     let (b, e) = Loc.unloc loc in
     (* Side-effect: order matters *)
     let before = Pp.comment (CLexer.extract_comments b) in
     let x = pr x in
     let after = Pp.comment (CLexer.extract_comments e) in
     before ++ x ++ after
-  else pr x
+  | _ -> pr x
 
 let pr_or_var pr = function
   | ArgArg x -> pr x
-- 
cgit v1.2.3