encodage des types

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@9646 85f007b7-540e-0410-9357-904b9bb8a0f7

3 files changed, 12 insertions, 9 deletions

diff --git a/contrib/dp/dp.ml b/contrib/dp/dp.ml
index 49d1c20d19..9636206b03 100644
--- a/contrib/dp/dp.ml
+++ b/contrib/dp/dp.ml
@@ -646,7 +646,7 @@ let remove_files = List.iter (fun f -> try Sys.remove f with _ -> ())
 let sprintf = Format.sprintf
 
 let call_simplify fwhy =
-  let cmd = sprintf "why --no-prelude --simplify %s" fwhy in
+  let cmd = sprintf "why --no-arrays --simplify --encoding strat %s" fwhy in
   if Sys.command cmd <> 0 then error ("call to " ^ cmd ^ " failed");
   let fsx = Filename.chop_suffix fwhy ".why" ^ "_why.sx" in
   let cmd = 
@@ -693,7 +693,7 @@ let call_zenon fwhy =
   end
 
 let call_yices fwhy =
-  let cmd = sprintf "why -smtlib --encoding sstrat %s" fwhy in
+  let cmd = sprintf "why --no-arrays -smtlib --encoding sstrat %s" fwhy in
   if Sys.command cmd <> 0 then error ("call to " ^ cmd ^ " failed");
   let fsmt = Filename.chop_suffix fwhy ".why" ^ "_why.smt" in
   let cmd = 
@@ -708,7 +708,7 @@ let call_yices fwhy =
   r
 
 let call_cvcl fwhy =
-  let cmd = sprintf "why --cvcl --encoding sstrat %s" fwhy in
+  let cmd = sprintf "why --no-arrays --cvcl --encoding sstrat %s" fwhy in
   if Sys.command cmd <> 0 then error ("call to " ^ cmd ^ " failed");
   let fcvc = Filename.chop_suffix fwhy ".why" ^ "_why.cvc" in
   let cmd = 
@@ -723,7 +723,7 @@ let call_cvcl fwhy =
   r
 
 let call_harvey fwhy =
-  let cmd = sprintf "why --harvey %s" fwhy in
+  let cmd = sprintf "why --no-arrays --harvey --encoding strat %s" fwhy in
   if Sys.command cmd <> 0 then error ("call to " ^ cmd ^ " failed");
   let frv = Filename.chop_suffix fwhy ".why" ^ "_why.rv" in
   let out = Sys.command (sprintf "rvc -e -t %s > /dev/null 2>&1" frv) in
diff --git a/contrib/dp/test2.v b/contrib/dp/test2.v
index 4e933a3cdc..3e4c0f6dd0 100644
--- a/contrib/dp/test2.v
+++ b/contrib/dp/test2.v
@@ -5,6 +5,10 @@ Require Import List.
 Open Scope list_scope.
 Open Scope Z_scope.
 
+Dp_debug.
+Dp_timeout 3.
+Require Export zenon.
+
 Definition neg (z:Z) : Z := match z with
   | Z0 => Z0
   | Zpos p => Zneg p
@@ -18,9 +22,7 @@ Open Scope nat_scope.
 Print plus.
 
 Goal forall x, x+0=x.
-  induction x.
-  zenon.
-  zenon.
+  induction x; ergo.
   (* simplify resoud le premier, pas le second *)
   Admitted.
 
diff --git a/contrib/dp/tests.v b/contrib/dp/tests.v
index 984d66c8fe..b32c45e742 100644
--- a/contrib/dp/tests.v
+++ b/contrib/dp/tests.v
@@ -4,6 +4,9 @@ Require Import Classical.
 
 Require Export zenon.
 
+Dp_debug.
+Dp_timeout 3.
+
 (* First example with the 0 and the equality translated *)
 
 Goal 0 = 0.
@@ -39,8 +42,6 @@ Goal ((((A -> C) -> A) -> A) -> C) -> C.
 zenon.
 Qed.
 
-Dp_debug.
-
 (* Arithmetic *)
 Open Scope Z_scope.