Commits

camlspotter  committed 8d7c46d

fix for OCaml version 4.02.0+dev0-2013-06-13

  • Participants
  • Parent commits 49513c0
  • Branches trunk

Comments (0)

Files changed (9)

File json/json_conv.mli

 open Meta_conv.Types
 open Meta_conv.Open
-open Json
 
 (** json_conv.ml proivdes a tutorial how to implement your Xxx_conv modules. *)
 

File json/tests/OMakefile

 .DEFAULT: test.out.ml test.out # test.out.auto.mli
 
 %.out.ml: %.ml ../../pa/pa_meta_conv.cma 
-    camlp4o -I $(OCAMLFIND_DESTDIR)/type_conv pa_type_conv.cma ../../pa/pa_meta_conv.cma  -printer Camlp4OCamlPrinter $< > $@
+    camlp4o -I $(OCAMLFIND_QUERY type_conv) pa_type_conv.cma ../../pa/pa_meta_conv.cma  -printer Camlp4OCamlPrinter $< > $@
 
 %.out.mli: %.mli ../../pa/pa_meta_conv.cma 
-    camlp4o -I $(OCAMLFIND_DESTDIR)/type_conv pa_type_conv.cma ../../pa/pa_meta_conv.cma  -printer Camlp4OCamlPrinter $< > $@
+    camlp4o -I $(OCAMLFIND_QUERY type_conv) pa_type_conv.cma ../../pa/pa_meta_conv.cma  -printer Camlp4OCamlPrinter $< > $@
 
 # %.out.auto.mli: %.out.ml ../json_conv.cmi
 #     $(OCAMLC) $(CAMLFLAGS) -c -i -I .. -I ../../lib  %.out.ml > $@

File lib/coder.mli

 open Types
-open Open
-open Internal
 
 (** If you want to write an instance of meta_conv implementation, 
     you define the following primitive encoders and decoders at least.

File lib/internal.mli

 (** You should not open this module, unless you are writing decoders/encoders for a new target data type. *)
 
 open Types
-open Open
 
 (** { 6 Tools used by generated code } *)
 

File ocaml/OMakefile

 OCAMLINCLUDES += ../lib
 
+OCAMLWARNING_IGNORE += 44
+OCAMLWARNING_NON_ERROR += 44
+
 OCAMLPACKS[] =
     compiler-libs.common
 

File ocaml/ocaml.ml

 
 open Format
 
-let format_sprintf fmt = Format.(
+let format_sprintf fmt =
   let buf = Buffer.create 100 in
   let ppf = formatter_of_buffer buf in
   kfprintf (fun ppf -> pp_print_flush ppf (); Buffer.contents buf) ppf fmt
-)
 
 let rec format_list (sep : (unit, formatter, unit) format)  f ppf = function
   | [] -> ()
         let open Syntaxerr in
         begin match e with
         | Unclosed (loc, _, _, _) -> loc
+        | Expecting (loc, _) -> loc
         | Applicative_path loc -> loc
         | Variable_in_scope (loc, _) -> loc
         | Other loc -> loc

File ocaml/ocaml_conv.mli

 open Meta_conv.Types
 open Meta_conv.Open
-open Ocaml
 
 include S with type target = Ocaml.t
 

File ocaml/tests/OMakefile

 OCAMLWARNING_NON_ERROR += 24
 
 %.out.ml: %.ml ../../pa/pa_meta_conv.cma 
-    camlp4o -I $(OCAMLFIND_DESTDIR)/type_conv pa_type_conv.cma ../../pa/pa_meta_conv.cma  -printer Camlp4OCamlPrinter $< > $@
+    camlp4o -I $(OCAMLFIND_QUERY type_conv) pa_type_conv.cma ../../pa/pa_meta_conv.cma  -printer Camlp4OCamlPrinter $< > $@
 
 %.out.mli: %.mli ../../pa/pa_meta_conv.cma 
-    camlp4o -I $(OCAMLFIND_DESTDIR)/type_conv pa_type_conv.cma ../../pa/pa_meta_conv.cma  -printer Camlp4OCamlPrinter $< > $@
+    camlp4o -I $(OCAMLFIND_QUERY type_conv) pa_type_conv.cma ../../pa/pa_meta_conv.cma  -printer Camlp4OCamlPrinter $< > $@
 
 OCAMLPACKS += compiler-libs.common
 

File pa/tests/OMakefile

 %.out.ml: %.ml ../pa_meta_conv.cma 
-    camlp4o -I $(OCAMLFIND_DESTDIR)/type_conv pa_type_conv.cma ../pa_meta_conv.cma  -printer Camlp4OCamlPrinter $< > $@
+    camlp4o -I $(OCAMLFIND_QUERY type_conv) pa_type_conv.cma ../pa_meta_conv.cma  -printer Camlp4OCamlPrinter $< > $@
 
 %.out.mli: %.mli ../pa_meta_conv.cma 
-    camlp4o -I $(OCAMLFIND_DESTDIR)/type_conv pa_type_conv.cma ../pa_meta_conv.cma  -printer Camlp4OCamlPrinter $< > $@
+    camlp4o -I $(OCAMLFIND_QUERY type_conv) pa_type_conv.cma ../pa_meta_conv.cma  -printer Camlp4OCamlPrinter $< > $@
 
 .DEFAULT: test.out.ml test_mli.out.mli test_multi.out.ml test_record_arg.out.ml test_rest.out.ml
 .DEFAULT: test_optional.out.ml test_closed_variants.out.ml