From 826eb7c6d11007dfd747d49852e71a22e0a3850a Mon Sep 17 00:00:00 2001
From: xclerc
Date: Thu, 19 Sep 2013 12:59:04 +0000
Subject: Get rid of the uses of deprecated OCaml elements (still remaining
 compatible with OCaml 3.12.1).

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16787 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 proofs/logic.ml        | 8 ++++----
 proofs/tactic_debug.ml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'proofs')

diff --git a/proofs/logic.ml b/proofs/logic.ml
index 84bbd9751e..e93319cae8 100644
--- a/proofs/logic.ml
+++ b/proofs/logic.ml
@@ -333,7 +333,7 @@ let check_meta_variables c =
     raise (RefinerError (NonLinearProof c))
 
 let check_conv_leq_goal env sigma arg ty conclty =
-  if !check & not (is_conv_leq env sigma ty conclty) then
+  if !check && not (is_conv_leq env sigma ty conclty) then
     raise (RefinerError (BadType (arg,ty,conclty)))
 
 let goal_type_of env sigma c =
@@ -371,7 +371,7 @@ let rec mk_refgoals sigma goal goalacc conclty trm =
 	let (acc',hdty,sigma,applicand) =
 	  match kind_of_term f with
 	    | Ind _ | Const _
-		when (isInd f or has_polymorphic_type (destConst f)) ->
+		when (isInd f || has_polymorphic_type (destConst f)) ->
 		(* Sort-polymorphism of definition and inductive types *)
 		goalacc,
                 type_of_global_reference_knowing_conclusion env sigma f conclty,
@@ -423,8 +423,8 @@ and mk_hdgoals sigma goal goalacc trm =
 
     | App (f,l) ->
 	let (acc',hdty,sigma,applicand) =
-	  if isInd f or isConst f
-	     & not (Array.exists occur_meta l) (* we could be finer *)
+	  if isInd f || isConst f
+	     && not (Array.exists occur_meta l) (* we could be finer *)
 	  then
 	   (goalacc,type_of_global_reference_knowing_parameters env sigma f l,sigma,f)
 	  else mk_hdgoals sigma goal goalacc f
diff --git a/proofs/tactic_debug.ml b/proofs/tactic_debug.ml
index d73561f37d..1b49f9ff85 100644
--- a/proofs/tactic_debug.ml
+++ b/proofs/tactic_debug.ml
@@ -71,7 +71,7 @@ let rec drop_spaces inst i =
   else i
 
 let possibly_unquote s =
-  if String.length s >= 2 & s.[0] == '"' & s.[String.length s - 1] == '"' then
+  if String.length s >= 2 && s.[0] == '"' && s.[String.length s - 1] == '"' then
     String.sub s 1 (String.length s - 2)
   else
     s
-- 
cgit v1.2.3