Commits

Anonymous committed e15bc90

ocaml 4.01.0 compatible now

Comments (0)

Files changed (9)

   Path:       src
   BuildDepends: num
   Modules:    Cadastr, Monoid, Cd_All, Cd_Int, Cd_List, Cd_Ops, Cd_Byte, Cd_Bytes, Cd_Chars, Cd_Strings, Cd_Array, Cd_Typeinfo, Cdt, Cd_Types, Cd_Option, Cd_Num, Cd_Tuples, Cd_Bool, Cd_Ref, Cd_Partapp, Cd_Int64, Cd_Ser, Cd_SortedArray, Cd_SortedArraySet, Cd_Utf8, Cd_Buffer, Cd_StringsCommon, Cd_Exn, Cd_Queue, Cd_Stream, Cd_Sys, Cd_Memo, Cd_BitArray, Cd_Hashtbl
-  NativeOpt:       -w A
-  ByteOpt:         -w A
+  NativeOpt:       -w A-44
+  ByteOpt:         -w A-44
 
 
 Library "cadastr_json"
   Modules:
     Cd_Json
   BuildDepends: json-wheel, cadastr
-  NativeOpt:       -w A
-  ByteOpt:         -w A
   XMETADescription: some json support for cadastr
 
-
 Library "cadastr_ds"
   FindlibName: ds
   FindlibParent: cadastr
   Modules:
     Cd_Ds
   BuildDepends: cadastr
-  NativeOpt:       -w A
-  ByteOpt:         -w A
   XMETADescription: dumbstreaming support for cadastr
 
 
   CompiledObject: byte
   BuildDepends: oUnit, cadastr
   Install: false
-  NativeOpt:       -w A
-  ByteOpt:         -w A
 
 Test all
   Command: env OCAMLRUNPARAM=b ./test.byte
 # OASIS_START
-# DO NOT EDIT (digest: 372c57da302235514cc092e35c700a03)
+# DO NOT EDIT (digest: fb803adf26421c2c95113d3f50400aff)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
 <src/*.ml{,i}>: oasis_library_cadastr_native
 # Library cadastr_json
 "src/cadastr_json.cmxs": use_cadastr_json
-<src/cadastr_json.{cma,cmxa}>: oasis_library_cadastr_json_byte
-<src/*.ml{,i}>: oasis_library_cadastr_json_byte
-<src/cadastr_json.{cma,cmxa}>: oasis_library_cadastr_json_native
-<src/*.ml{,i}>: oasis_library_cadastr_json_native
 <src/*.ml{,i}>: pkg_json-wheel
 # Library cadastr_ds
 "src/cadastr_ds.cmxs": use_cadastr_ds
-<src/cadastr_ds.{cma,cmxa}>: oasis_library_cadastr_ds_byte
-<src/*.ml{,i}>: oasis_library_cadastr_ds_byte
-<src/cadastr_ds.{cma,cmxa}>: oasis_library_cadastr_ds_native
-<src/*.ml{,i}>: oasis_library_cadastr_ds_native
 <src/*.ml{,i}>: pkg_num
 <src/*.ml{,i}>: use_cadastr
 # Executable tests
-"test/test.byte": oasis_executable_tests_byte
-<test/*.ml{,i}>: oasis_executable_tests_byte
-"test/test.byte": oasis_executable_tests_native
-<test/*.ml{,i}>: oasis_executable_tests_native
 "test/test.byte": pkg_num
 "test/test.byte": pkg_oUnit
 "test/test.byte": use_cadastr
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 6aa124b8861322c8406ae362a840f44e) *)
+(* DO NOT EDIT (digest: 66f4a0525bc9c1c8ec6067fbef52c6a7) *)
 module OASISGettext = struct
 (* # 22 "src/oasis/OASISGettext.ml" *)
 
      flags =
        [
           (["oasis_library_cadastr_byte"; "ocaml"; "link"; "byte"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
+            [(OASISExpr.EBool true, S [A "-w"; A "A-44"])]);
           (["oasis_library_cadastr_native"; "ocaml"; "link"; "native"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
+            [(OASISExpr.EBool true, S [A "-w"; A "A-44"])]);
           (["oasis_library_cadastr_byte"; "ocaml"; "ocamldep"; "byte"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
+            [(OASISExpr.EBool true, S [A "-w"; A "A-44"])]);
           (["oasis_library_cadastr_native"; "ocaml"; "ocamldep"; "native"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
+            [(OASISExpr.EBool true, S [A "-w"; A "A-44"])]);
           (["oasis_library_cadastr_byte"; "ocaml"; "compile"; "byte"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
+            [(OASISExpr.EBool true, S [A "-w"; A "A-44"])]);
           (["oasis_library_cadastr_native"; "ocaml"; "compile"; "native"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_library_cadastr_json_byte"; "ocaml"; "link"; "byte"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_library_cadastr_json_native"; "ocaml"; "link"; "native"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_library_cadastr_json_byte"; "ocaml"; "ocamldep"; "byte"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          ([
-              "oasis_library_cadastr_json_native";
-              "ocaml";
-              "ocamldep";
-              "native"
-           ],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_library_cadastr_json_byte"; "ocaml"; "compile"; "byte"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_library_cadastr_json_native"; "ocaml"; "compile"; "native"
-           ],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_library_cadastr_ds_byte"; "ocaml"; "link"; "byte"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_library_cadastr_ds_native"; "ocaml"; "link"; "native"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_library_cadastr_ds_byte"; "ocaml"; "ocamldep"; "byte"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_library_cadastr_ds_native"; "ocaml"; "ocamldep"; "native"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_library_cadastr_ds_byte"; "ocaml"; "compile"; "byte"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_library_cadastr_ds_native"; "ocaml"; "compile"; "native"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_executable_tests_byte"; "ocaml"; "link"; "byte"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_executable_tests_native"; "ocaml"; "link"; "native"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_executable_tests_byte"; "ocaml"; "ocamldep"; "byte"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_executable_tests_native"; "ocaml"; "ocamldep"; "native"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_executable_tests_byte"; "ocaml"; "compile"; "byte"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])]);
-          (["oasis_executable_tests_native"; "ocaml"; "compile"; "native"],
-            [(OASISExpr.EBool true, S [A "-w"; A "A"])])
+            [(OASISExpr.EBool true, S [A "-w"; A "A-44"])])
        ];
      includes = [("test", ["src"])]
   }
 
 let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
 
-# 669 "myocamlbuild.ml"
+# 627 "myocamlbuild.ml"
 (* OASIS_STOP *)
 Ocamlbuild_plugin.dispatch dispatch_default;;
 (* setup.ml generated for the first time by OASIS v0.2.1~alpha1 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 608444884eeabb3dca5bb54b575d4f8a) *)
+(* DO NOT EDIT (digest: a40cc52262865e4b47b7af6609012d42) *)
 (*
    Regenerated by OASIS v0.4.4
    Visit http://oasis.forge.ocamlcore.org for more information and
                       bs_cclib = [(OASISExpr.EBool true, [])];
                       bs_dlllib = [(OASISExpr.EBool true, [])];
                       bs_dllpath = [(OASISExpr.EBool true, [])];
-                      bs_byteopt = [(OASISExpr.EBool true, ["-w"; "A"])];
-                      bs_nativeopt = [(OASISExpr.EBool true, ["-w"; "A"])]
+                      bs_byteopt = [(OASISExpr.EBool true, ["-w"; "A-44"])];
+                      bs_nativeopt = [(OASISExpr.EBool true, ["-w"; "A-44"])]
                    },
                    {
                       lib_modules =
                       bs_cclib = [(OASISExpr.EBool true, [])];
                       bs_dlllib = [(OASISExpr.EBool true, [])];
                       bs_dllpath = [(OASISExpr.EBool true, [])];
-                      bs_byteopt = [(OASISExpr.EBool true, ["-w"; "A"])];
-                      bs_nativeopt = [(OASISExpr.EBool true, ["-w"; "A"])]
+                      bs_byteopt = [(OASISExpr.EBool true, [])];
+                      bs_nativeopt = [(OASISExpr.EBool true, [])]
                    },
                    {
                       lib_modules = ["Cd_Json"];
                       bs_cclib = [(OASISExpr.EBool true, [])];
                       bs_dlllib = [(OASISExpr.EBool true, [])];
                       bs_dllpath = [(OASISExpr.EBool true, [])];
-                      bs_byteopt = [(OASISExpr.EBool true, ["-w"; "A"])];
-                      bs_nativeopt = [(OASISExpr.EBool true, ["-w"; "A"])]
+                      bs_byteopt = [(OASISExpr.EBool true, [])];
+                      bs_nativeopt = [(OASISExpr.EBool true, [])]
                    },
                    {
                       lib_modules = ["Cd_Ds"];
                       bs_cclib = [(OASISExpr.EBool true, [])];
                       bs_dlllib = [(OASISExpr.EBool true, [])];
                       bs_dllpath = [(OASISExpr.EBool true, [])];
-                      bs_byteopt = [(OASISExpr.EBool true, ["-w"; "A"])];
-                      bs_nativeopt = [(OASISExpr.EBool true, ["-w"; "A"])]
+                      bs_byteopt = [(OASISExpr.EBool true, [])];
+                      bs_nativeopt = [(OASISExpr.EBool true, [])]
                    },
                    {exec_custom = false; exec_main_is = "test.ml"});
                Test
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.4";
-     oasis_digest = Some "&y\233\146gF\193;\1347M^<\207\177D";
+     oasis_digest = Some "\135\238\014\156&\142\003\194V)\004v7p\150\130";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
 
         method folddown_trie
          (* see virtual class "folddown_trie" for type *)
-         = fun f_mid_node f_level_trie f_node init_down ->
+         = fun (type down) (f_mid_node : down -> _ -> _)
+               f_level_trie f_node init_down ->
 
              let node = node_list in
 
 
 
 (* should add to and from methods both. *)
-value rec ti_add_json
+value ti_add_json
  : #ti 'a
    -> ?json_to:('a -> Jt.t)
    -> ?json_from:(Jt.t -> 'a)
 
     type t 'a = list 'a;
 
-    open Cd_Ops;
-
     value of_option = fun [ Some x -> [x] | None -> [] ]
     ;
 

src/cd_Strings.ml

  =
   struct
 
-    open Cd_Typeinfo;
     open Cdt;
 
     value monoid_concat_gen = new Monoid.t "" ( ^ );
               ]
         ;
 
-        value eq a b =
-          let open String in
-          let len = length a in
-          if len <> length b
-          then False
-          else
-            loop 0
-            where rec loop i =
-              if i = len
-              then True
-              else
-                if (unsafe_get a i) = (unsafe_get b i)
-                then loop (i + 1)
-                else False
-        ;
-
-
         (* } from amall *)
 
 
  =
   struct
 
-    open Printf;
-
     class type uti
      =
       object
          and ub_uti = ub.ub_uti in
          failwith "Cdt.uget_exn: expected %S/%i, got %S/%i"
            (uti_type_name exp_uti)
-           (exp_uti#type_id :> int)
+           (exp_uti#type_id : Type_id.t :> int)
            (uti_type_name ub_uti)
-           (ub_uti#type_id :> int)
+           (ub_uti#type_id : Type_id.t :> int)
      ]
 ;
 
         "can't add method %S to type %S (type_id=%i): method already exists"
         meth_name
         (uti#type_name)
-        (uti#type_id :> int)
+        (uti#type_id : Type_id.t :> int)
   ]
 ;
 
 ;
 
 
-value rec u_app
+value u_app
  : ubox -> ubox -> ubox
  = fun ufunc uarg ->
      let uti_arg = uarg.ub_uti in
                (Printf.sprintf "Cdt.No: method %S on type %S (type_id=%i)"
                   meth_name
                   uti#type_name
-                  (uti#type_id :> int)
+                  (uti#type_id : Type_id.t :> int)
                )
          | _ -> None
          ])
 ;
 
 
-value rec cmp_struc
+value cmp_struc
  : #uti -> ubox -> ubox -> cmp_res
  =
   binop_struc_gen
 
 
 
-value rec eq_struc
+value eq_struc
  : #uti -> ubox -> ubox -> bool
  =
   binop_struc_gen