Added patches to devel/ocaml-deriving-ocsigen for OCaml 4.06.


(jaapb)

$NetBSD: patch-lib_deriving__Dump.ml,v 1.1 2018/01/10 14:57:35 jaapb Exp $

Patch to compile with safe-string.
--- lib/deriving_Dump.ml.orig	2016-05-25 16:51:52.000000000 +0000
+++ lib/deriving_Dump.ml
@@ -142,7 +142,7 @@ module Dump_string = Defaults (
         for i = 0 to len - 1 do
           Bytes.unsafe_set s i (Stream.next stream)
         done;
-        s
+        Bytes.to_string s
   end
 )
 
@@ -226,8 +226,8 @@ module Dump_alpha(P: sig type a end) = D
   let from_stream _ = assert false
 end)
 
-module Dump_undumpable (P : sig type a val tname : string end) = Defaults ( 
-  struct 
+module Dump_undumpable (P : sig type a val tname : string end) = Defaults (
+  struct
     type a = P.a
     let to_buffer _ _ = failwith ("Dump: attempt to serialise a value of unserialisable type : " ^ P.tname)
     let from_stream _ = failwith ("Dump: attempt to deserialise a value of unserialisable type : " ^ P.tname)
@@ -252,5 +252,5 @@ module Dump_via_marshal (P : sig type a 
       let header = readn Marshal.header_size in
       let datasize = Marshal.data_size header 0 in
       let datapart = readn datasize in
-        Marshal.from_string (header ^ datapart) 0
+        Marshal.from_bytes (Bytes.cat header datapart) 0
   end)

$NetBSD: patch-lib_deriving__interned.ml,v 1.1 2018/01/10 14:57:35 jaapb Exp $

Patch to compile with safe-string.
--- lib/deriving_interned.ml.orig	2016-05-25 16:51:52.000000000 +0000
+++ lib/deriving_interned.ml
@@ -14,15 +14,16 @@ type t = int * string
     deriving (Show)
 
 let intern s =
-  try BytesMap.find s !map
+	let bs = Bytes.of_string s in
+  try BytesMap.find bs !map
   with Not_found ->
-    let fresh = (!counter, Bytes.of_string s) in begin
-      map := BytesMap.add s fresh !map;
+    let fresh = (!counter, s) in begin
+      map := BytesMap.add bs fresh !map;
       incr counter;
       fresh
     end
 
-let to_string (_,s) = Bytes.to_string s
+let to_string (_,s) = s
 let name = snd
 let compare (l,_) (r,_) = compare l r
 let eq (l,_) (r,_) = l = r

$NetBSD: patch-syntax_common_utils.ml,v 1.1 2018/01/10 14:57:35 jaapb Exp $

Patch to compile with safe-string.
--- syntax/common/utils.ml.orig	2016-05-25 16:51:52.000000000 +0000
+++ syntax/common/utils.ml
@@ -216,7 +216,7 @@ let random_id length =
     for i = 0 to length - 1 do
       Bytes.set s i idchars.[Random.int nidchars]
     done;
-    s
+    Bytes.to_string s
 
 (* The function used in OCaml to convert variant labels to their
    integer representations.  The formula is given in Jacques