From af4962a9211a707943e7b0627439a731c3e7d23f Mon Sep 17 00:00:00 2001
From: Pierre Letouzey
Date: Sat, 4 Feb 2017 19:29:15 +0100
Subject: Extraction : get_duplicates (via option) instead of check_duplicates
 (via Not_found)

 This clarifies the execution flow
---
 plugins/extraction/common.mli | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/extraction/common.mli')

diff --git a/plugins/extraction/common.mli b/plugins/extraction/common.mli
index 2f5601964e..b8e95afb38 100644
--- a/plugins/extraction/common.mli
+++ b/plugins/extraction/common.mli
@@ -62,7 +62,7 @@ val top_visible_mp : unit -> module_path
 val push_visible : module_path -> module_path list -> unit
 val pop_visible : unit -> unit
 
-val check_duplicate : module_path -> Label.t -> string
+val get_duplicate : module_path -> Label.t -> string option
 
 type reset_kind = AllButExternal | Everything
 
-- 
cgit v1.2.3


From 69c4e7cfa0271f024b2178082e4be2e3ca3be263 Mon Sep 17 00:00:00 2001
From: Pierre Letouzey
Date: Sun, 5 Feb 2017 01:46:41 +0100
Subject: Extraction: avoid deprecated functions of module String

 - A few tweaks of string are now done via the Bytes module
 - lots of String.capitalize_ascii and co
---
 plugins/extraction/common.mli | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins/extraction/common.mli')

diff --git a/plugins/extraction/common.mli b/plugins/extraction/common.mli
index b8e95afb38..a6351fc4c4 100644
--- a/plugins/extraction/common.mli
+++ b/plugins/extraction/common.mli
@@ -36,6 +36,9 @@ val pr_binding : Id.t list -> std_ppcmds
 
 val rename_id : Id.t -> Id.Set.t -> Id.t
 
+(** For Scheme extraction, replace the ['] by [~] *)
+val unquote : string -> string
+
 type env = Id.t list * Id.Set.t
 val empty_env : unit -> env
 
-- 
cgit v1.2.3


From 3550120641c3b8d84290dc950e717aaf099775f9 Mon Sep 17 00:00:00 2001
From: Pierre Letouzey
Date: Tue, 7 Feb 2017 23:28:36 +0100
Subject: Revert "Extraction: avoid deprecated functions of module String"

This reverts commit 69c4e7cfa0271f024b2178082e4be2e3ca3be263.

String.capitalize_ascii are only available for ocaml >= 4.03, sorry...
---
 plugins/extraction/common.mli | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'plugins/extraction/common.mli')

diff --git a/plugins/extraction/common.mli b/plugins/extraction/common.mli
index a6351fc4c4..b8e95afb38 100644
--- a/plugins/extraction/common.mli
+++ b/plugins/extraction/common.mli
@@ -36,9 +36,6 @@ val pr_binding : Id.t list -> std_ppcmds
 
 val rename_id : Id.t -> Id.Set.t -> Id.t
 
-(** For Scheme extraction, replace the ['] by [~] *)
-val unquote : string -> string
-
 type env = Id.t list * Id.Set.t
 val empty_env : unit -> env
 
-- 
cgit v1.2.3