Commit e36ba39d authored by Giuseppe Castagna's avatar Giuseppe Castagna
Browse files

Bumped to version 0.5.3

   * Port to OCaml 3.10 (courtesy of Richard Jones)
   * fixed to work with ocaml-curl library >= 0.5

parent dc3e7047
0.5.3
* Port to OCaml 3.10 (courtesy of Richard Jones)
* fixed to work with ocaml-curl library >= 0.5
- Tools - Tools
* Fixed dtd2cduce bug when handling of "FIXED" attributes * Fixed dtd2cduce bug when handling of "FIXED" attributes
* Fixed bug in building: PXP was not build if GCI not present * Fixed bug in building: PXP was not build if GCI not present
......
VERSION=0.5.2 VERSION=0.5.3
...@@ -41,6 +41,7 @@ clean: ...@@ -41,6 +41,7 @@ clean:
rm -Rf ocaml_files *~ *.cm* rm -Rf ocaml_files *~ *.cm*
COPY_FILES=\ COPY_FILES=\
typing/annot.mli \
utils/misc.ml utils/tbl.ml \ utils/misc.ml utils/tbl.ml \
utils/consistbl.ml utils/warnings.ml utils/terminfo.ml utils/clflags.ml \ utils/consistbl.ml utils/warnings.ml utils/terminfo.ml utils/clflags.ml \
parsing/asttypes.mli parsing/location.mli \ parsing/asttypes.mli parsing/location.mli \
...@@ -57,7 +58,7 @@ COMPILE_FILES=\ ...@@ -57,7 +58,7 @@ COMPILE_FILES=\
asttypes.mli outcometree.mli asttypes.ml \ asttypes.mli outcometree.mli asttypes.ml \
config.ml misc.ml tbl.ml \ config.ml misc.ml tbl.ml \
clflags.ml consistbl.ml warnings.ml terminfo.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 \ ident.ml path.ml \
primitive.ml types.ml \ primitive.ml types.ml \
btype.ml oprint.ml \ btype.ml oprint.ml \
......
...@@ -15,6 +15,8 @@ let rhs_loc = dummy ...@@ -15,6 +15,8 @@ let rhs_loc = dummy
let input_name = ref "" let input_name = ref ""
let input_lexbuf = ref None let input_lexbuf = ref None
let get_pos_info = dummy let get_pos_info = dummy
let print_error_cur_file = dummy
let print_error = dummy
let print = dummy let print = dummy
let print_warning = dummy let print_warning = dummy
let prerr_warning = dummy let prerr_warning = dummy
......
...@@ -163,14 +163,14 @@ let rec unfold_constr env p args = ...@@ -163,14 +163,14 @@ let rec unfold_constr env p args =
slot.def <- slot.def <-
(match decl.type_kind, decl.type_manifest with (match decl.type_kind, decl.type_manifest with
| Type_variant (cstrs,pub), _ -> | Type_variant (cstrs), _ ->
let cstrs = let cstrs =
List.map List.map
(fun (cst,f) -> (cst,List.map (unfold env) f)) cstrs in (fun (cst,f) -> (cst,List.map (unfold env) f)) cstrs in
Variant (prefix, cstrs, pub = Caml_cduce.Asttypes.Public) Variant (prefix, cstrs, true)
| Type_record (f,_,pub), _ -> | Type_record (f,_), _ ->
let f = List.map (fun (l,_,t) -> (l,unfold env t)) f in 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 -> | Type_abstract, Some t ->
Link (unfold env t) Link (unfold env t)
| Type_abstract, None -> | Type_abstract, None ->
......
...@@ -3,7 +3,14 @@ let load_url s = ...@@ -3,7 +3,14 @@ let load_url s =
let buff = Buffer.create 4096 in let buff = Buffer.create 4096 in
let conn = Curl.init () in let conn = Curl.init () in
Curl.set_url conn s; Curl.set_url conn s;
Curl.set_writefunction conn (Buffer.add_string buff); Curl.set_writefunction conn (
fun str ->
try
Buffer.add_string buff str;
String.length str
with
Failure _ -> 0
);
Curl.perform conn; Curl.perform conn;
Buffer.contents buff Buffer.contents buff
with Curl.CurlException (code, n, msg) -> with Curl.CurlException (code, n, msg) ->
......
...@@ -102,7 +102,6 @@ let to_buf ~utf8 buffer ns_table v = ...@@ -102,7 +102,6 @@ let to_buf ~utf8 buffer ns_table v =
let wms = write_markup_string ~to_enc buffer let wms = write_markup_string ~to_enc buffer
and wds s = write_data_string ~to_enc buffer (U.get_str s) and wds s = write_data_string ~to_enc buffer (U.get_str s)
and wcs s = buffer (U.get_str s) in and wcs s = buffer (U.get_str s) in
in
let write_att (n,v) = let write_att (n,v) =
wms (" " ^ (Ns.Printer.attr printer (Label.value n)) ^ "=\""); wds v; wms "\"" in wms (" " ^ (Ns.Printer.attr printer (Label.value n)) ^ "=\""); wds v; wms "\"" in
let write_xmlns (pr,ns) = let write_xmlns (pr,ns) =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment