This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository facile.
commit b696d592e948daff0b7617f6f92b5dbef42ee595
Author: Mehdi Dogguy <me...@debian.org>
Date: Sun Jan 17 22:58:35 2016 +0100
Imported Upstream version 1.1.1
---
src/Makefile | 4 ++--
src/fcl_data.ml | 2 +-
src/fcl_domain.ml | 6 +++---
src/fcl_expr.ml | 2 +-
src/fcl_invariant.ml | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 94d8326..5daa17b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
# $Id: Makefile,v 1.73 2004/09/01 12:33:49 barnier Exp $
-OCAMLC = ocamlc.opt -g
-OCAMLMLI = ocamlc.opt
+OCAMLC = ocamlc -g
+OCAMLMLI = ocamlc
OCAMLOPT = ocamlopt -unsafe -noassert -inline 10
OCAMLDEP = ocamldep
INCLUDES =
diff --git a/src/fcl_data.ml b/src/fcl_data.ml
index b5f25be..f20c8b3 100644
--- a/src/fcl_data.ml
+++ b/src/fcl_data.ml
@@ -16,7 +16,7 @@ end
module Hashtbl = struct
type ('a, 'b) t = ('a, 'b) Hashtbl.t
- let create = Hashtbl.create
+ let create n = Hashtbl.create n
let get h = h
let add h k d =
diff --git a/src/fcl_domain.ml b/src/fcl_domain.ml
index 6ffd6a2..87db48b 100644
--- a/src/fcl_domain.ml
+++ b/src/fcl_domain.ml
@@ -149,7 +149,7 @@ let is_empty d = d.size = 0
let remove x d =
match d with
{domain = l;max = m; size = s; min = min_d} ->
- if x < min_d or x > m then d
+ if x < min_d || x > m then d
else begin
let rec remo = function
N -> raise Not_found
@@ -215,9 +215,9 @@ let remove_closed_inter min max ({domain = l;max = ma;
min=mi} as d) =
let rec rem = function
N -> N
| C(mi,ma,es) ->
- if min <= mi & ma <= max
+ if min <= mi && ma <= max
then rem es
- else if mi <= max & max <= ma or mi <= min & min <= ma
+ else if mi <= max && max <= ma || mi <= min && min <= ma
then cons mi (min-1) (cons (max+1) ma (rem es))
else C(mi,ma,rem es) in
let newl = rem l in
diff --git a/src/fcl_expr.ml b/src/fcl_expr.ml
index c7d7356..c71f125 100644
--- a/src/fcl_expr.ml
+++ b/src/fcl_expr.ml
@@ -317,7 +317,7 @@ and agg_reduce typ es c =
| (coef, e) :: es -> begin
match reduce e with
(* Pi ... * 0 ^ coef * ... -> 0 *)
- Inte 0 as re when typ = Multe -> (0, [])
+ Inte 0 when typ = Multe -> (0, [])
| Inte i -> agg_reduce_rec new_es (op c (coef_op i coef)) es
(* Sum ... + coef * (Sum ees + ec) + ... -> Sum ... *)
(* Pi ... * (ec * Pi ees) ^ coef * ... -> Pi ... *)
diff --git a/src/fcl_invariant.ml b/src/fcl_invariant.ml
index 9cb082b..d39a146 100644
--- a/src/fcl_invariant.ml
+++ b/src/fcl_invariant.ml
@@ -87,7 +87,7 @@ let prod array =
if n = 0 then raise (Invalid_argument name);
let rname = Printf.sprintf "prod(%s...%s)" array.(0).name array.(n-1).name in
- let r = create (Array.fold_left (fun r x -> get x * r) 1 array)
+ let r = create ~name:rname (Array.fold_left (fun r x -> get x * r) 1 array)
and lasts = Array.map get array in
let update i =
let new_ai = get array.(i) in
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/facile.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
