Fix issue #79

For first_order_matching, adding a bound_vars set to disallow substitution
by terms containing bounded vars.

src/transform/apply.ml

@@ -208,7 +208,8 @@ let replace_subst lp lv f1 f2 withed_terms t =
       begin
         (* Catch any error from first_order_matching or with_terms. *)
         match matching_with_terms ~trans_name:"rewrite" slv lv f1 t (Some withed_terms) with
-        | exception _ -> Term.t_map_fold
+        | exception _e ->
+            Term.t_map_fold
                 (fun is_replaced t -> replace is_replaced f1 f2 t)
                 is_replaced t
         | subst_ty, subst ->
@@ -224,7 +225,7 @@ let replace_subst lp lv f1 f2 withed_terms t =
   let is_replaced, t =
     t_map_fold (fun is_replaced t -> replace is_replaced f1 f2 t) None t in
   match is_replaced with
-  | None -> raise (Arg_trans "matching/replace")
+  | None -> raise (Arg_trans "rewrite: no term matching the given pattern")
   | Some(subst_ty,subst) ->
       (List.map (t_ty_subst subst_ty subst) lp, t)
 

tests/demo-itp.mlw

@@ -3,12 +3,55 @@ module ApplyRewrite
 
   use import int.Int
 
-  (* Use apply H require some cases of quantifications in first_order_matching *)
-  goal g: (forall y. exists x. x <= y /\ y = 0) -> forall x. exists y. y <= x /\ x = 0
+  function f int int : int
 
+  use HighOrd
+
+  axiom H: forall x. (\z: int. x + z) =  f x
+
+  goal g1: (\toto. 42 + toto) = f 42
+  
+  axiom Ha: forall x. (\z: int. x + z) 2 = 2
+  
+  goal g3: (\toto. 42 + toto) 2 = 2 
+    
+  goal g2: (\y. y + y) = f 24
+end
+
+module A
+  
+  use import int.Int
+  use HighOrd
+
+  function f int: int
+
+  axiom H: forall y. exists x. f x = x + y
+  
+  goal g1: exists x. f x = x + 42
+  
+  goal g: (\y. f y) 0 = 3
+
+  constant b: bool
+
+  axiom Ha: forall y. if b = true then let x = 3 in f x = x + y else false
+  
+  goal ga: if b = true then let z = 3 in f z = z + 42 else false
+
+  goal gb: if b  = true then let z = 453 in f z = z + 42 else false
 
 end
 
+module Soundness
+  use import int.Int
+  use HighOrd
+  function f0 (x y z:int) : int = x * y + z
+  predicate p (f:int -> int) =
+    f (-1) = 0 && forall n:int. f n = f 0 + (f 1 - f 0) * n
+  lemma A : forall y z:int. p (\x. f0 x y z) <-> y = z
+  meta rewrite prop A
+  lemma Fail : p (\x. f0 x x x)
+  lemma Absurd : false
+end
 
 module TestCEX
 

tests/demo-itp/why3session.xml

@@ -10,10 +10,61 @@
 <prover id="5" name="Eprover" version="2.0" timelimit="5" steplimit="0" memlimit="1000"/>
 <prover id="6" name="Alt-Ergo" version="2.0.0" timelimit="5" steplimit="0" memlimit="1000"/>
 <file name="../demo-itp.mlw">
-<theory name="ApplyRewrite" proved="true" sum="06c28a672d2fbb0de6998078f2cfe895">
- <goal name="g" proved="true">
+<theory name="ApplyRewrite" sum="a5d903eba2570fb4645483c4ff500ebb">
+ <goal name="g1" proved="true">
  <transf name="apply" proved="true" arg1="H">
  </transf>
+ <transf name="rewrite" proved="true" arg1="H">
+  <goal name="g1.0" proved="true">
+  <transf name="compute_in_goal" proved="true" >
+  </transf>
+  </goal>
+ </transf>
+ </goal>
+ <goal name="g3" proved="true">
+ <transf name="apply" proved="true" arg1="Ha">
+ </transf>
+ </goal>
+ <goal name="g2">
+ <transf name="compute_specified" >
+  <goal name="g2.0">
+  </goal>
+ </transf>
+ </goal>
+</theory>
+<theory name="A" sum="1abc5293356c4003ce35806f735459dc">
+ <goal name="g1" proved="true">
+ <transf name="apply" proved="true" arg1="H">
+ </transf>
+ </goal>
+ <goal name="g">
+ </goal>
+ <goal name="ga" proved="true">
+ <transf name="apply" proved="true" arg1="Ha">
+ </transf>
+ </goal>
+ <goal name="gb">
+ </goal>
+</theory>
+<theory name="Soundness" sum="198ba2949deb2335512120811dfebfc6">
+ <goal name="A" proved="true">
+ <proof prover="2" timelimit="5"><result status="valid" time="0.24"/></proof>
+ </goal>
+ <goal name="Fail">
+ <transf name="assert" arg1="(forall y:int, z:int. y = z -&gt; p (\ x:int. f0 x y z))">
+  <goal name="Fail.0" proved="true">
+  <proof prover="2" timelimit="5"><result status="valid" time="0.21"/></proof>
+  </goal>
+  <goal name="Fail.1">
+  <transf name="compute_specified" >
+   <goal name="Fail.1.0">
+   </goal>
+  </transf>
+  </goal>
+ </transf>
+ </goal>
+ <goal name="Absurd" proved="true">
+ <proof prover="2" timelimit="5"><result status="valid" time="0.02"/></proof>
  </goal>
 </theory>
 <theory name="TestCEX" sum="55ceea8b24a88c1829a53af2c814f1a6">