Author: Ralf Treinen <treinen@debian.org>
Description: replace deprected "or" by "||"

Index: why/src/hypotheses_filtering.ml
===================================================================
--- why.orig/src/hypotheses_filtering.ml	2014-01-17 21:56:48.223034684 +0100
+++ why/src/hypotheses_filtering.ml	2014-01-17 21:56:48.215034677 +0100
@@ -862,7 +862,7 @@
 module PdlSet = Set.Make(struct type t = vertexLabel
     let compare = compare end)
 let abstr_mem_of el pdl_set =
-  PdlSet.mem { l = el.l; pol = Pos } pdl_set or
+  PdlSet.mem { l = el.l; pol = Pos } pdl_set ||
   PdlSet.mem { l = el.l; pol = Neg } pdl_set
 
 let is_positive el =
@@ -874,10 +874,10 @@
   (PdlSet.mem { l = el.l; pol = el.pol } pdl_set )
 
 let mem_of_or_pos el pdl_set =
-  (PdlSet.mem { l = el.l; pol = el.pol } pdl_set ) or el.pol == Pos
+  (PdlSet.mem { l = el.l; pol = el.pol } pdl_set ) || el.pol == Pos
 
 let mem_of_or_neg el pdl_set =
-  (PdlSet.mem { l = el.l; pol = el.pol } pdl_set ) or el.pol == Neg
+  (PdlSet.mem { l = el.l; pol = el.pol } pdl_set ) || el.pol == Neg
 
 let abstr_subset_of_pdl set1 set2 =
   if polarized_preds then
@@ -1099,11 +1099,11 @@
 (* in (remove_percents s) *)
 
 let is_comparison id =
-    (is_int_comparison id or is_real_comparison id or is_comparison id)
+    (is_int_comparison id || is_real_comparison id || is_comparison id)
 
 let comparison_to_consider id =
   use_comparison_as_criteria_for_graph_construction && (
-    ((not comparison_eqOnly) && (is_int_comparison id or is_real_comparison id))
+    ((not comparison_eqOnly) && (is_int_comparison id || is_real_comparison id))
     || (id == t_eq || id == t_neq || id == t_eq_int || id == t_neq_int || id == t_eq_real || id == t_neq_real )
   )
 
@@ -2121,7 +2121,7 @@
           display_str "vars" vars;
           display_str "concl_rep" concl_rep;
         end;
-        if (!variablesMaximumDepth< !vb) or condition then
+        if (!variablesMaximumDepth< !vb) || condition then
           begin
             if debug then
 	      begin
@@ -2142,7 +2142,7 @@
                   display_symb_of_pdl_set pred_symb;
                 end;
 	      
-	      if (!predicateMaximumDepth< !pb) or (abstr_subset_of_pdl preds_of_p pred_symb) then
+	      if (!predicateMaximumDepth< !pb) || (abstr_subset_of_pdl preds_of_p pred_symb) then
                 begin
                   if debug then 
  		    begin
@@ -2182,7 +2182,7 @@
         let preds_of_p = get_preds_of p use_comparison_as_criteria_for_hypothesis_filtering in
 
 
-	if (!predicateMaximumDepth< !pb) or (abstr_subset_of_pdl preds_of_p relevantPreds) then
+	if (!predicateMaximumDepth< !pb) || (abstr_subset_of_pdl preds_of_p relevantPreds) then
 	  begin
             if debug then 
 	      begin
@@ -2206,7 +2206,7 @@
         
         | (p_cnf, Dpredicate_def (loc, ident, def)) :: l ->
             let preds_of_p_cnf = get_preds_of p_cnf use_comparison_as_criteria_for_hypothesis_filtering in
-	    if (!predicateMaximumDepth< !pb) or (abstr_subset_of_pdl preds_of_p_cnf relevantPreds) then
+	    if (!predicateMaximumDepth< !pb) || (abstr_subset_of_pdl preds_of_p_cnf relevantPreds) then
 	      begin
                 (* On garde tout le predicat *)
                 if debug then
@@ -2240,7 +2240,7 @@
         
         | (p_cnf, Daxiom (loc, ident, ps)) :: l ->
             let preds_of_p_cnf = get_preds_of p_cnf use_comparison_as_criteria_for_hypothesis_filtering in
-            if (!predicateMaximumDepth< !pb) or (abstr_subset_of_pdl preds_of_p_cnf relevantPreds) then
+            if (!predicateMaximumDepth< !pb) || (abstr_subset_of_pdl preds_of_p_cnf relevantPreds) then
               begin
                 (* On garde tout l'axiome en forme originale *)
                 if debug then
Index: why/src/main.ml
===================================================================
--- why.orig/src/main.ml	2014-01-17 21:56:48.223034684 +0100
+++ why/src/main.ml	2014-01-17 21:56:48.215034677 +0100
@@ -726,7 +726,7 @@
       if Options.delete_old_vcs then delete_old_vcs files;
       iter_with_last deal_file files;
       if type_only then exit 0;
-      if (pruning) or (Options.pruning_hyp_v != -1) then
+      if (pruning) || (Options.pruning_hyp_v != -1) then
 	begin
 	  let q =  declarationQueue in 
 	  encode q 
Index: why/jc/output.ml
===================================================================
--- why.orig/jc/output.ml	2014-01-17 21:56:48.223034684 +0100
+++ why/jc/output.ml	2014-01-17 21:56:48.215034677 +0100
@@ -825,12 +825,12 @@
   match t with
     | Prod_type(id,t1,t2) ->
 	  if !why3syntax then
-            let id = if id="" or anon then "_anonymous" else id in
+            let id = if id="" || anon then "_anonymous" else id in
             fprintf form "@[<hov 1>(%s:%a)@ %a@]" (why3ident id)
 	    (fprintf_type ~need_colon:false anon) t1
               (fprintf_type ~need_colon anon) t2
           else
-	    if id="" or anon then
+	    if id="" || anon then
 	      fprintf form "@[<hov 1>%a ->@ %a@]"
 	        (fprintf_type ~need_colon:false anon) t1
                 (fprintf_type ~need_colon anon) t2
Index: why/jc/jc_typing.ml
===================================================================
--- why.orig/jc/jc_typing.ml	2014-01-17 21:56:48.223034684 +0100
+++ why/jc/jc_typing.ml	2014-01-17 21:56:48.215034677 +0100
@@ -2553,7 +2553,7 @@
     jc_field_info_type = ty;
     jc_field_info_hroot = root;
     jc_field_info_struct = st;
-    jc_field_info_rep = rep or (not (is_pointer_type ty));
+    jc_field_info_rep = rep || (not (is_pointer_type ty));
     jc_field_info_abstract = abs;
     jc_field_info_bitsize = bitsize;
   } in
Index: why/intf/colors.ml
===================================================================
--- why.orig/intf/colors.ml	2014-01-17 21:56:48.223034684 +0100
+++ why/intf/colors.ml	2014-01-17 21:56:48.215034677 +0100
@@ -96,7 +96,7 @@
   get_bc "lpredicate"
 
 let color_exists ty = 
-  (Hashtbl.mem fcolors ty) or (Hashtbl.mem bcolors ty)
+  (Hashtbl.mem fcolors ty) || (Hashtbl.mem bcolors ty)
 
 let get_all_colors () = 
   List.map 
Index: why/intf/pprinter.ml
===================================================================
--- why.orig/intf/pprinter.ml	2014-01-17 21:56:48.223034684 +0100
+++ why/intf/pprinter.ml	2014-01-17 21:56:48.219034680 +0100
@@ -67,7 +67,7 @@
       ("file \""^ff^"\", line "^l^", characters "^s^" - "^e)
 
 let is_cfile f = 
-  Filename.check_suffix f ".c" or Filename.check_suffix f ".h"
+  Filename.check_suffix f ".c" || Filename.check_suffix f ".h"
   (* otherwise it's .why *)
 
 let read_file = function 
Index: why/intf/stat.ml
===================================================================
--- why.orig/intf/stat.ml	2014-01-17 21:56:03.962891601 +0100
+++ why/intf/stat.ml	2014-01-17 21:57:54.939248060 +0100
@@ -379,8 +379,8 @@
  *)
 let try_proof oblig =
   (Cache.hard_proof ())
-  or not (Cache.is_enabled ())
-  or (Cache.is_enabled () && not (in_cache (Cache.clean oblig))) 
+  || not (Cache.is_enabled ())
+  || (Cache.is_enabled () && not (in_cache (Cache.clean oblig))) 
 
 
 (* 
@@ -391,7 +391,7 @@
   let column_p = p.Model.pr_icon in
   let column_i = p.Model.pr_image in
   let (_, _, _, oblig, seq) = o in
-  if bench or (try_proof seq) then
+  if bench || (try_proof seq) then
     try 
       let row = 
 	try Hashtbl.find Model.orows oblig 
@@ -439,7 +439,7 @@
       model#set ~row ~column:p.Model.pr_result result;
       model#set ~row ~column:Model.result 
 	(max result (model#get ~row ~column:Model.result));
-      if alone or (Tools.live_update ())then begin 
+      if alone || (Tools.live_update ())then begin 
 	build_statistics model (model#get ~row ~column:Model.parent)
       end;
       result
@@ -558,7 +558,7 @@
 	    (let old_w = ref 0 
 	     and old_h = ref 0 in
 	     fun {Gtk.width=w;Gtk.height=h} -> 
-	       if !old_w <> w or !old_h <> h then begin
+	       if !old_w <> w || !old_h <> h then begin
 		 old_h := h;
 		 old_w := w;
 		 Colors.window_height := h;
