[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

CDuce mailing list active? ... Here is a 3.11.0 version



I don't see any postings in the mailing list archive for CDuce since
April 2008.  Am I looking in the right place?

CDuce currently doesn't build with OCaml 3.11.0.  However I have made
it build at least using the attached patch.  Note that although this
builds I haven't really tested it very much, so someone who knows what
they are doing needs to check this patch carefully.

As usual you can find Fedora's build of cduce, plus any special
patches we may be applying, here:

http://cvs.fedoraproject.org/viewvc/devel/cduce/

Rich.

-- 
Richard Jones
Red Hat
diff -ur cduce-0.5.2.orig/ocamliface/location.ml cduce-0.5.2.newcaml/ocamliface/location.ml
--- cduce-0.5.2.orig/ocamliface/location.ml	2008-02-25 10:10:27.000000000 +0000
+++ cduce-0.5.2.newcaml/ocamliface/location.ml	2008-12-05 14:20:56.000000000 +0000
@@ -15,6 +15,8 @@
 let input_name = ref ""
 let input_lexbuf = ref None
 let get_pos_info = dummy
+let print_error_cur_file = dummy
+let print_error = dummy
 let print = dummy
 let print_warning = dummy
 let prerr_warning = dummy
diff -ur cduce-0.5.2.orig/ocamliface/Makefile cduce-0.5.2.newcaml/ocamliface/Makefile
--- cduce-0.5.2.orig/ocamliface/Makefile	2008-12-05 14:36:18.000000000 +0000
+++ cduce-0.5.2.newcaml/ocamliface/Makefile	2008-12-05 14:38:27.000000000 +0000
@@ -41,6 +41,7 @@
 	rm -Rf ocaml_files *~ *.cm*
 
 COPY_FILES=\
+  typing/annot.mli \
   utils/misc.ml utils/tbl.ml \
   utils/consistbl.ml utils/warnings.ml utils/terminfo.ml utils/clflags.ml \
   parsing/asttypes.mli parsing/location.mli \
@@ -57,7 +58,7 @@
   asttypes.mli outcometree.mli asttypes.ml \
   config.ml misc.ml tbl.ml \
   clflags.ml consistbl.ml warnings.ml terminfo.ml \
-  location.mli location.ml longident.ml \
+  location.mli location.ml annot.mli longident.ml \
   ident.ml path.ml \
   primitive.ml types.ml \
   btype.ml oprint.ml \
diff -ur cduce-0.5.2.orig/ocamliface/mltypes.ml cduce-0.5.2.newcaml/ocamliface/mltypes.ml
--- cduce-0.5.2.orig/ocamliface/mltypes.ml	2008-02-25 10:10:42.000000000 +0000
+++ cduce-0.5.2.newcaml/ocamliface/mltypes.ml	2008-12-05 14:26:27.000000000 +0000
@@ -169,14 +169,14 @@
 
       slot.def <- 
 	(match decl.type_kind, decl.type_manifest with
-	   | Type_variant (cstrs,pub), _ ->
+	   | Type_variant (cstrs), _ ->
 	       let cstrs =
 		 List.map 
 		   (fun (cst,f) -> (cst,List.map (unfold env) f)) cstrs in
-	       Variant (prefix, cstrs, pub = Caml_cduce.Asttypes.Public)
-	   | Type_record (f,_,pub), _ ->
+	       Variant (prefix, cstrs, true)
+	   | Type_record (f,_), _ ->
 	       let f = List.map (fun (l,_,t) -> (l,unfold env t)) f in
-	       Record (prefix, f, pub = Caml_cduce.Asttypes.Public)
+	       Record (prefix, f, true)
 	   | Type_abstract, Some t ->
 	       Link (unfold env t)
 	   | Type_abstract, None ->
diff -ur cduce-0.5.2.orig/parser/cduce_curl.ml cduce-0.5.2.newcaml/parser/cduce_curl.ml
--- cduce-0.5.2.orig/parser/cduce_curl.ml	2008-02-25 10:10:42.000000000 +0000
+++ cduce-0.5.2.newcaml/parser/cduce_curl.ml	2008-12-05 14:34:07.000000000 +0000
@@ -9,7 +9,12 @@
     let buff = Buffer.create 4096 in 
     let conn = Curl.init () in
     Curl.set_url conn s;
-    Curl.set_writefunction conn (Buffer.add_string buff);
+    Curl.set_writefunction conn (
+      fun str ->
+        Buffer.add_string buff str;
+	(* Not clear what Curl is expecting -- the string length? (RWMJ) *)
+	String.length str
+      );
     Curl.perform conn;
     Buffer.contents buff
   with Curl.CurlException (code, n, msg) ->
diff -ur cduce-0.5.2.orig/runtime/print_xml.ml cduce-0.5.2.newcaml/runtime/print_xml.ml
--- cduce-0.5.2.orig/runtime/print_xml.ml	2008-02-25 10:10:40.000000000 +0000
+++ cduce-0.5.2.newcaml/runtime/print_xml.ml	2008-12-05 14:11:05.000000000 +0000
@@ -108,7 +108,6 @@
   let wms = write_markup_string ~to_enc buffer
   and wds s = write_data_string ~to_enc buffer (U.get_str s)
   and wcs s = buffer (U.get_str s) in
-  in
   let write_att (n,v) =
     wms (" " ^ (Ns.Printer.attr printer (Label.value n)) ^ "=\""); wds v; wms "\"" in
   let write_xmlns (pr,ns) =

Reply to: