From 8256236dd59c753da186173f4d227565903f123a Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sun, 13 May 2018 22:37:47 +0200
Subject: Removing a superfluous trailing newline in "Locate" for a notation.

---
 interp/notation.ml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'interp')

diff --git a/interp/notation.ml b/interp/notation.ml
index 20e46bfe3f..e6df7b96c9 100644
--- a/interp/notation.ml
+++ b/interp/notation.ml
@@ -1051,7 +1051,7 @@ let locate_notation prglob ntn scope =
   | [] -> str "Unknown notation"
   | _ ->
     str "Notation" ++ fnl () ++
-    prlist (fun (ntn,l) ->
+    prlist_with_sep fnl (fun (ntn,l) ->
       let scope = find_default ntn scopes in
       prlist
 	(fun (sc,r,(_,df)) ->
@@ -1060,8 +1060,7 @@ let locate_notation prglob ntn scope =
 	    (if String.equal sc default_scope then mt ()
              else (spc () ++ str ": " ++ str sc)) ++
 	    (if Option.equal String.equal (Some sc) scope
-             then spc () ++ str "(default interpretation)" else mt ())
-	    ++ fnl ()))
+             then spc () ++ str "(default interpretation)" else mt ())))
 	l) ntns
 
 let collect_notation_in_scope scope sc known =
-- 
cgit v1.2.3


From ea271504e92ec30991e9767e0fbe2e536bc3417e Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Sun, 13 May 2018 22:28:53 +0200
Subject: Fixing a bug in printing the body of a located notation.

This was introduced between v8.5 and v8.6 (presumably 63f3ca8).
---
 interp/notation_ops.ml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'interp')

diff --git a/interp/notation_ops.ml b/interp/notation_ops.ml
index 6a282624e4..b806dce0b1 100644
--- a/interp/notation_ops.ml
+++ b/interp/notation_ops.ml
@@ -165,15 +165,15 @@ let glob_constr_of_notation_constr_with_binders ?loc g f e nc =
   | NApp (a,args) -> GApp (f e a, List.map (f e) args)
   | NList (x,y,iter,tail,swap) ->
       let t = f e tail in let it = f e iter in
-      let innerl = (ldots_var,t)::(if swap then [] else [x, lt @@ GVar y]) in
+      let innerl = (ldots_var,t)::(if swap then [y, lt @@ GVar x] else []) in
       let inner  = lt @@ GApp (lt @@ GVar (ldots_var),[subst_glob_vars innerl it]) in
-      let outerl = (ldots_var,inner)::(if swap then [x, lt @@ GVar y] else []) in
+      let outerl = (ldots_var,inner)::(if swap then [] else [y, lt @@ GVar x]) in
       DAst.get (subst_glob_vars outerl it)
   | NBinderList (x,y,iter,tail,swap) ->
       let t = f e tail in let it = f e iter in
-      let innerl = (ldots_var,t)::(if swap then [] else [x, lt @@ GVar y]) in
+      let innerl = (ldots_var,t)::(if swap then [y, lt @@ GVar x] else []) in
       let inner  = lt @@ GApp (lt @@ GVar ldots_var,[subst_glob_vars innerl it]) in
-      let outerl = (ldots_var,inner)::(if swap then [x, lt @@ GVar y] else []) in
+      let outerl = (ldots_var,inner)::(if swap then [] else [y, lt @@ GVar x]) in
       DAst.get (subst_glob_vars outerl it)
   | NLambda (na,ty,c) ->
       let e',disjpat,na = g e na in GLambda (na,Explicit,f e ty,Option.fold_right (apply_cases_pattern ?loc) disjpat (f e' c))
-- 
cgit v1.2.3