facile/trunk/ocaml5.patch

   1 diff -ub lib/fcl_cstr.ml lib.sic/fcl_cstr.ml
   2 --- lib/fcl_cstr.ml     2017-11-30 20:24:10.000000000 +0100
   3 +++ lib.sic/fcl_cstr.ml 2023-05-18 12:20:58.691033891 +0200
   4 @@ -50,7 +50,7 @@
   5    and nb_solved = Fcl_stak.ref 0 in
   6    let update i =
   7      if update i then
   8 -      if Pervasives.not solved.(i) then begin
   9 +      if Stdlib.not solved.(i) then begin
  10                 Fcl_stak.set nb_solved (Fcl_stak.get nb_solved + 1);
  11                 array_set_true solved i
  12        end in
  13 diff -ub lib/fcl_fdArray.ml lib.sic/fcl_fdArray.ml
  14 --- lib/fcl_fdArray.ml  2017-11-30 20:24:10.000000000 +0100
  15 +++ lib.sic/fcl_fdArray.ml      2023-05-18 12:22:34.355125486 +0200
  16 @@ -299,7 +299,7 @@
  17        let (mi, ma) =
  18         Array.fold_left
  19           (fun (mi, ma) e ->
  20 -           (Pervasives.min mi (Fd.min e), Pervasives.max ma (Fd.max e)))
  21 +           (Stdlib.min mi (Fd.min e), Stdlib.max ma (Fd.max e)))
  22           (max_int, min_int) array in
  23        if mi = ma then Fd.int mi else
  24        let value = Fd.create (Fcl_domain.interval mi ma) in
  25 diff -ub lib/fcl_misc.ml lib.sic/fcl_misc.ml
  26 --- lib/fcl_misc.ml     2017-11-30 20:24:10.000000000 +0100
  27 +++ lib.sic/fcl_misc.ml 2023-05-18 12:20:22.631984218 +0200
  28 @@ -50,9 +50,9 @@
  29      x - y
  30  *)
  31
  32 -  let (+) = Pervasives.(+)
  33 -  let (-) = Pervasives.(-)
  34 -  let ( * ) = Pervasives.( * )
  35 +  let (+) = Stdlib.(+)
  36 +  let (-) = Stdlib.(-)
  37 +  let ( * ) = Stdlib.( * )
  38
  39    let (=+) x y = x := !x + y
  40    let (=+.) x y = x := !x +. y
  41 diff -ub lib/fcl_nonlinear.ml lib.sic/fcl_nonlinear.ml
  42 --- lib/fcl_nonlinear.ml        2017-11-30 20:24:10.000000000 +0100
  43 +++ lib.sic/fcl_nonlinear.ml    2023-05-18 12:22:26.218697740 +0200
  44 @@ -274,7 +274,7 @@
  45  let min_max_of_remainder x y =
  46    let r_abs_max =
  47      let min_y, max_y = Fd.min_max y in
  48 -    max (Pervasives.abs min_y) (Pervasives.abs max_y) - 1 in
  49 +    max (Stdlib.abs min_y) (Stdlib.abs max_y) - 1 in
  50    if Fd.min x >= 0 then (0, r_abs_max)
  51    else if Fd.max x <= 0 then ((0 - r_abs_max), 0)
  52    else ((0 - r_abs_max), r_abs_max)
  53 diff -ub lib/fcl_sorting.ml lib.sic/fcl_sorting.ml
  54 --- lib/fcl_sorting.ml  2017-11-30 20:24:10.000000000 +0100
  55 +++ lib.sic/fcl_sorting.ml      2023-05-18 12:22:07.745882402 +0200
  56 @@ -355,7 +355,7 @@
  57    else
  58      let inf, sup =
  59        Array.fold_left
  60 -       (fun (inf, sup) x -> Pervasives.min (Fd.min x) inf, Pervasives.max (Fd.max x) sup) (max_int, min_int) a in
  61 +       (fun (inf, sup) x -> Stdlib.min (Fd.min x) inf, Stdlib.max (Fd.max x) sup) (max_int, min_int) a in
  62      let d = Fd.array n inf sup
  63      and p = Fd.array n 0 (n - 1) in
  64      Fcl_cstr.post (cstr a ~p:(Some p) d);
  65 @@ -368,7 +368,7 @@
  66    else
  67      let inf, sup =
  68        Array.fold_left
  69 -       (fun (inf, sup) x -> Pervasives.min (Fd.min x) inf, Pervasives.max (Fd.max x) sup) (max_int, min_int) a in
  70 +       (fun (inf, sup) x -> Stdlib.min (Fd.min x) inf, Stdlib.max (Fd.max x) sup) (max_int, min_int) a in
  71      let d = Fd.array n inf sup in
  72      Fcl_cstr.post (cstr a d);
  73      d;;
  74