fixed 'make bench'

drivers/pvs-common.gen

@@ -295,7 +295,7 @@ theory set.Set
 
   syntax function  empty    "(emptyset :: %t0)"
   syntax predicate is_empty "empty?(%1)"
-  remove prop      mem_empty
+  remove prop      is_empty_empty
 
   syntax function add "add(%1, %2)"
   syntax function singleton "singleton(%1)"

examples/WP_revisited/wp2/why3session.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
 "http://why3.lri.fr/why3session.dtd">
-<why3session shape_version="5">
+<why3session shape_version="6">
 <prover id="0" name="Coq" version="8.7.1" timelimit="3" steplimit="0" memlimit="0"/>
 <prover id="1" name="CVC4" version="1.4" timelimit="1" steplimit="0" memlimit="1000"/>
 <prover id="2" name="Alt-Ergo" version="2.0.0" timelimit="5" steplimit="0" memlimit="1000"/>
+<prover id="3" name="CVC4" version="1.6" timelimit="1" steplimit="0" memlimit="1000"/>
 <prover id="8" name="Eprover" version="1.8-001" timelimit="30" steplimit="0" memlimit="4000"/>
 <prover id="10" name="Z3" version="4.5.0" timelimit="1" steplimit="0" memlimit="1000"/>
-<file name="../wp2.mlw" proved="true">
+<file proved="true">
+<path name=".."/>
+<path name="wp2.mlw"/>
 <theory name="Imp" proved="true">
  <goal name="eval_subst_term" proved="true">
  <transf name="induction_ty_lex" proved="true" >
@@ -34,7 +37,7 @@
  <proof prover="10"><result status="valid" time="0.02"/></proof>
  </goal>
  <goal name="eval_change_free" proved="true">
- <proof prover="0" timelimit="5" edited="wp2_Imp_eval_change_free_1.v"><result status="valid" time="0.34"/></proof>
+ <proof prover="0" timelimit="5" edited="wp2_Imp_eval_change_free_1.v"><result status="valid" time="1.30"/></proof>
  </goal>
  <goal name="check_skip" proved="true">
  <proof prover="2"><result status="valid" time="0.01" steps="2"/></proof>
@@ -50,7 +53,7 @@
  </transf>
  </goal>
  <goal name="many_steps_seq" proved="true">
- <proof prover="0" edited="wp2_Imp_many_steps_seq_1.v"><result status="valid" time="0.41"/></proof>
+ <proof prover="0" edited="wp2_Imp_many_steps_seq_1.v"><result status="valid" time="1.22"/></proof>
  </goal>
 </theory>
 <theory name="TestSemantics" proved="true">
@@ -120,7 +123,7 @@
  <proof prover="2"><result status="valid" time="0.14" steps="407"/></proof>
  </goal>
  <goal name="if_rule" proved="true">
- <proof prover="0" edited="wp2_HoareLogic_if_rule_1.v"><result status="valid" time="0.49"/></proof>
+ <proof prover="0" edited="wp2_HoareLogic_if_rule_1.v"><result status="valid" time="1.40"/></proof>
  </goal>
  <goal name="assert_rule" proved="true">
  <proof prover="2"><result status="valid" time="0.22" steps="518"/></proof>
@@ -129,13 +132,16 @@
  <proof prover="2"><result status="valid" time="0.17" steps="836"/></proof>
  </goal>
  <goal name="while_rule" proved="true">
- <proof prover="0" edited="wp2_HoareLogic_while_rule_1.v"><result status="valid" time="0.48"/></proof>
+ <proof prover="0" edited="wp2_HoareLogic_while_rule_1.v"><result status="valid" time="1.36"/></proof>
  </goal>
  <goal name="while_rule_ext" proved="true">
- <proof prover="0" edited="wp2_HoareLogic_while_rule_ext_1.v"><result status="valid" time="0.54"/></proof>
+ <proof prover="0" edited="wp2_HoareLogic_while_rule_ext_1.v"><result status="valid" time="1.53"/></proof>
  </goal>
 </theory>
 <theory name="WP" proved="true">
+ <goal name="S.VC eq" expl="VC for eq" proved="true">
+ <proof prover="3"><result status="valid" time="0.05"/></proof>
+ </goal>
  <goal name="assigns_refl" proved="true">
  <proof prover="2"><result status="valid" time="0.02" steps="3"/></proof>
  </goal>
@@ -143,10 +149,10 @@
  <proof prover="2"><result status="valid" time="0.02" steps="9"/></proof>
  </goal>
  <goal name="assigns_union_left" proved="true">
- <proof prover="2"><result status="valid" time="0.03" steps="12"/></proof>
+ <proof prover="2"><result status="valid" time="0.03" steps="14"/></proof>
  </goal>
  <goal name="assigns_union_right" proved="true">
- <proof prover="2"><result status="valid" time="0.02" steps="18"/></proof>
+ <proof prover="2"><result status="valid" time="0.02" steps="20"/></proof>
  </goal>
  <goal name="VC compute_writes" expl="VC for compute_writes" proved="true">
  <transf name="split_goal_right" proved="true" >
@@ -168,22 +174,22 @@
   <goal name="VC compute_writes.5" expl="postcondition" proved="true">
   <transf name="split_goal_right" proved="true" >
    <goal name="VC compute_writes.5.0" expl="postcondition" proved="true">
-   <proof prover="10"><result status="valid" time="0.04"/></proof>
+   <proof prover="2" timelimit="1"><result status="valid" time="0.13" steps="123"/></proof>
    </goal>
    <goal name="VC compute_writes.5.1" expl="postcondition" proved="true">
-   <proof prover="2" timelimit="1"><result status="valid" time="0.13" steps="324"/></proof>
+   <proof prover="10"><result status="valid" time="0.24"/></proof>
    </goal>
    <goal name="VC compute_writes.5.2" expl="postcondition" proved="true">
    <proof prover="10"><result status="valid" time="0.03"/></proof>
    </goal>
    <goal name="VC compute_writes.5.3" expl="postcondition" proved="true">
-   <proof prover="2" timelimit="1"><result status="valid" time="0.07" steps="287"/></proof>
+   <proof prover="2"><result status="valid" time="0.09" steps="431"/></proof>
    </goal>
    <goal name="VC compute_writes.5.4" expl="postcondition" proved="true">
-   <proof prover="0" timelimit="5" memlimit="1000" edited="wp2_WP_VC_compute_writes_1.v"><result status="valid" time="0.48"/></proof>
+   <proof prover="0" timelimit="0" edited="wp2_WP_VC_compute_writes_2.v"><result status="valid" time="1.22"/></proof>
    </goal>
    <goal name="VC compute_writes.5.5" expl="postcondition" proved="true">
-   <proof prover="10"><result status="valid" time="0.32"/></proof>
+   <proof prover="10"><result status="valid" time="0.23"/></proof>
    </goal>
   </transf>
   </goal>
@@ -224,7 +230,7 @@
    <proof prover="2"><result status="valid" time="0.02" steps="21"/></proof>
    </goal>
    <goal name="VC wp.5.5" expl="postcondition" proved="true">
-   <proof prover="0" timelimit="0" edited="wp2_WP_VC_wp_1.v"><result status="valid" time="0.52"/></proof>
+   <proof prover="0" timelimit="0" edited="wp2_WP_VC_wp_1.v"><result status="valid" time="1.42"/></proof>
    </goal>
   </transf>
   </goal>