Replace depracted usage of Pervasives or.

genfft/algsimp.ml

@@ -57,10 +57,10 @@ end = struct
     | (NaN a, NaN b) -> a == b
     | (Load a, Load b) -> Variable.same a b
     | (Times (a, a'), Times (b, b')) ->
- 	((a == b) && (a' == b')) or
+ 	((a == b) && (a' == b')) ||
  	((a == b') && (a' == b))
     | (CTimes (a, a'), CTimes (b, b')) ->
- 	((a == b) && (a' == b')) or
+ 	((a == b) && (a' == b')) ||
  	((a == b') && (a' == b))
     | (CTimesJ (a, a'), CTimesJ (b, b')) -> ((a == b) && (a' == b'))
     | (Plus a, Plus b) -> subset a b && subset b a

genfft/annotate.ml

@@ -80,7 +80,7 @@ let reorder l =
 	let c' =
 	  Sort.list 
 	    (fun (_, (a, la)) (_, (b, lb)) -> 
-	      la < lb or a > b)
+	      la < lb || a > b)
 	    c in
 	let b' = List.map (fun (a, _) -> a) c' in
 	a :: (loop b') in
@@ -273,7 +273,7 @@ let rec rewrite_declarations force_declarations
   let m = !Magic.number_of_variables in
 
   let declare_it declared =
-    if (force_declarations or List.length declared >= m) then
+    if (force_declarations || List.length declared >= m) then
       ([], declared)
     else
       (declared, [])

genfft/dag.ml

@@ -56,7 +56,7 @@ let node_clobbers node v =
 
 (* true if nodeb depends on nodea *)
 let depends_on nodea nodeb =
-  node_uses nodea.assigned nodeb or
+  node_uses nodea.assigned nodeb ||
   node_clobbers nodea nodeb.assigned
 
 (* transform an assignment list into a dag *)

genfft/number.ml

@@ -62,7 +62,7 @@ let mone = of_int (-1)
 (* comparison predicate for real numbers *)
 let equal (N x) (N y) = (* use both relative and absolute error *)
   let absdiff = abs_num (x -/ y) in
-  absdiff <=/ pepsilon or
+  absdiff <=/ pepsilon ||
   absdiff <=/ pepsilon */ (abs_num x +/ abs_num y)
 
 let is_zero = equal zero