diff --git a/src/kernel_services/ast_data/property_status.ml b/src/kernel_services/ast_data/property_status.ml
index ea653a36c45d240f33ab4f23cefd7f791e13e4fb..e70cdf7f9f84b12b778be4a0a1d7bbf12263a12f 100644
--- a/src/kernel_services/ast_data/property_status.ml
+++ b/src/kernel_services/ast_data/property_status.ml
@@ -507,13 +507,12 @@ and unsafe_emit_and_get e ~hyps ~auto ppt ?(distinct=false) s =
let old_s = Emitter_with_properties.Hashtbl.find by_emitter emitter in
try
let first =
- (if distinct then merge_distinct_emitted
- else check_strongest_emitted)
- s
- old_s
- in
- if first then emit s else old_s
- with Unmergeable -> emit Dont_know
+ if distinct then merge_distinct_emitted s old_s
+ else check_strongest_emitted s old_s
+ in if first then emit s else old_s
+ with
+ | Unmergeable -> emit Dont_know
+ | Inconsistent_emitted_status _ -> emit False_if_reachable
with Not_found ->
emit s)
with Not_found ->
diff --git a/src/plugins/report/tests/report/no_hyp.ml b/src/plugins/report/tests/report/no_hyp.ml
index cb651465511efe31508fe10453ec0bc0f76d1b87..a145963f447e8e630717bf5a0a162627a51bf43f 100644
--- a/src/plugins/report/tests/report/no_hyp.ml
+++ b/src/plugins/report/tests/report/no_hyp.ml
@@ -1,4 +1,4 @@
-let emitter =
+let emitter =
Emitter.create "Test" [ Emitter.Property_status ] ~correctness:[] ~tuning:[]
let set_status s =
@@ -11,7 +11,7 @@ let set_status s =
let print_status =
Dynamic.get
~plugin:"Report"
- "print"
+ "print"
(Datatype.func Datatype.unit Datatype.unit)
let clear () =
@@ -20,26 +20,36 @@ let clear () =
()
let main () =
- Ast.compute ();
- Kernel.feedback "SETTING STATUS TO dont_know";
- set_status Property_status.Dont_know;
- print_status ();
- Kernel.feedback "SETTING STATUS TO true";
- set_status Property_status.True;
- print_status ();
+ begin
+ Ast.compute ();
+ Kernel.feedback "SETTING STATUS TO dont_know";
+ set_status Property_status.Dont_know;
+ print_status ();
+ Kernel.feedback "SETTING STATUS TO true";
+ set_status Property_status.True;
+ print_status ();
+ Kernel.feedback "SETTING STATUS TO false_if_reachable";
+ set_status Property_status.False_if_reachable;
+ print_status ();
+ Kernel.feedback "SETTING STATUS TO dont_know";
+ set_status Property_status.Dont_know;
+ print_status ();
+ Kernel.feedback "SETTING STATUS TO true";
+ set_status Property_status.True;
+ print_status ();
+ Kernel.feedback "SETTING STATUS TO false_if_reachable";
+ set_status Property_status.False_if_reachable;
+ print_status ();
+ (*
Kernel.feedback "SETTING STATUS TO false_if_reachable";
(try set_status Property_status.False_if_reachable
with Property_status.Inconsistent_emitted_status(s1, s2) ->
- Kernel.result "inconsistency between %a and %a"
+ Kernel.result "inconsistency between %a and %a"
Property_status.Emitted_status.pretty s1
Property_status.Emitted_status.pretty s2);
Kernel.feedback "CLEARING";
clear ();
- Kernel.feedback "SETTING STATUS TO false_if_reachable";
- set_status Property_status.False_if_reachable;
- print_status ();
- Kernel.feedback "SETTING STATUS TO false_and_reachable";
- set_status Property_status.False_and_reachable;
- print_status ()
+ *)
+ end
let () = Db.Main.extend main
diff --git a/src/plugins/report/tests/report/oracle/single.1.res.oracle b/src/plugins/report/tests/report/oracle/single.1.res.oracle
index a47026150e026717af27c229e66c8b3ff8bd1ae6..088835a7a6788b5f36665493ce3d57f1b512377b 100644
--- a/src/plugins/report/tests/report/oracle/single.1.res.oracle
+++ b/src/plugins/report/tests/report/oracle/single.1.res.oracle
@@ -32,9 +32,6 @@
1 Total
--------------------------------------------------------------------------------
[kernel] SETTING STATUS TO false_if_reachable
-[kernel] inconsistency between **NOT** VALID and VALID
-[kernel] CLEARING
-[kernel] SETTING STATUS TO false_if_reachable
[report] Computing properties status...
--------------------------------------------------------------------------------
@@ -51,19 +48,54 @@
1 Alarm emitted
1 Total
--------------------------------------------------------------------------------
-[kernel] SETTING STATUS TO false_and_reachable
+[kernel] SETTING STATUS TO dont_know
[report] Computing properties status...
--------------------------------------------------------------------------------
--- Properties of Function 'main'
--------------------------------------------------------------------------------
-[ Bug ] Assertion (file tests/report/single.i, line 9)
- by Test.
+[ Alarm ] Assertion (file tests/report/single.i, line 9)
+ By Test, with pending:
+ - Unreachable program point (file tests/report/single.i, line 9)
--------------------------------------------------------------------------------
--- Status Report Summary
--------------------------------------------------------------------------------
- 1 Bugs found
+ 1 Alarm emitted
+ 1 Total
+--------------------------------------------------------------------------------
+[kernel] SETTING STATUS TO true
+[report] Computing properties status...
+
+--------------------------------------------------------------------------------
+--- Properties of Function 'main'
+--------------------------------------------------------------------------------
+
+[ Alarm ] Assertion (file tests/report/single.i, line 9)
+ By Test, with pending:
+ - Unreachable program point (file tests/report/single.i, line 9)
+
+--------------------------------------------------------------------------------
+--- Status Report Summary
+--------------------------------------------------------------------------------
+ 1 Alarm emitted
+ 1 Total
+--------------------------------------------------------------------------------
+[kernel] SETTING STATUS TO false_if_reachable
+[report] Computing properties status...
+
+--------------------------------------------------------------------------------
+--- Properties of Function 'main'
+--------------------------------------------------------------------------------
+
+[ Alarm ] Assertion (file tests/report/single.i, line 9)
+ By Test, with pending:
+ - Unreachable program point (file tests/report/single.i, line 9)
+
+--------------------------------------------------------------------------------
+--- Status Report Summary
+--------------------------------------------------------------------------------
+ 1 Alarm emitted
1 Total
--------------------------------------------------------------------------------
diff --git a/src/plugins/wp/GuiGoal.ml b/src/plugins/wp/GuiGoal.ml
index 071f6a3ef89b6d980ef56b9f4605d7bf58a09142..c9693efd719de9374a866e8dbe6f619b095f781e 100644
--- a/src/plugins/wp/GuiGoal.ml
+++ b/src/plugins/wp/GuiGoal.ml
@@ -421,6 +421,25 @@ class pane (gprovers : GuiConfig.provers) =
save_script#set_enabled save ;
end
+ method private update_pending kind proof n =
+ match ProofEngine.current proof with
+ | `Main | `Internal _ ->
+ next#set_enabled false ;
+ prev#set_enabled false ;
+ if n = 1 then
+ Pretty_utils.ksfprintf status#set_text "One %s Goal" kind
+ else
+ Pretty_utils.ksfprintf status#set_text "%d %s Goals" n kind
+ | `Leaf(k,_) ->
+ prev#set_enabled (0 < k) ;
+ next#set_enabled (k+1 < n) ;
+ if k = 0 && n = 1 then
+ Pretty_utils.ksfprintf status#set_text
+ "Last %s Goal" kind
+ else
+ Pretty_utils.ksfprintf status#set_text
+ "%s Goal #%d /%d" kind (succ k) n
+
method private update_statusbar =
match state with
| Empty ->
@@ -442,20 +461,27 @@ class pane (gprovers : GuiConfig.provers) =
help#set_enabled
(match state with Proof _ -> not helpmode | _ -> false) ;
match ProofEngine.status proof with
- | `Main ->
+ | `Unproved ->
icon#set_icon GuiProver.ko_status ;
next#set_enabled false ;
prev#set_enabled false ;
cancel#set_enabled false ;
forward#set_enabled false ;
status#set_text "Non Proved Property" ;
- | `Invalid ->
+ | `Invalid | `StillResist 0 ->
icon#set_icon GuiProver.wg_status ;
next#set_enabled false ;
prev#set_enabled false ;
cancel#set_enabled false ;
forward#set_enabled false ;
status#set_text "Invalid Smoke-test" ;
+ | `Passed ->
+ icon#set_icon GuiProver.smoke_status ;
+ next#set_enabled false ;
+ prev#set_enabled false ;
+ cancel#set_enabled false ;
+ forward#set_enabled false ;
+ status#set_text "Passed Smoke Test" ;
| `Proved ->
icon#set_icon GuiProver.ok_status ;
next#set_enabled false ;
@@ -474,23 +500,12 @@ class pane (gprovers : GuiConfig.provers) =
icon#set_icon GuiProver.ko_status ;
forward#set_enabled nofork ;
cancel#set_enabled nofork ;
- match ProofEngine.current proof with
- | `Main | `Internal _ ->
- next#set_enabled false ;
- prev#set_enabled false ;
- if n = 1 then
- Pretty_utils.ksfprintf status#set_text "One Pending Goal"
- else
- Pretty_utils.ksfprintf status#set_text "%d Pending Goals" n
- | `Leaf(k,_) ->
- prev#set_enabled (0 < k) ;
- next#set_enabled (k+1 < n) ;
- if k = 0 && n = 1 then
- Pretty_utils.ksfprintf status#set_text
- "Last Pending Goal"
- else
- Pretty_utils.ksfprintf status#set_text
- "%d/%d Pending Goals" (succ k) n
+ self#update_pending "Pending" proof n ;
+ | `StillResist n ->
+ icon#set_icon GuiProver.smoke_status ;
+ forward#set_enabled nofork ;
+ cancel#set_enabled nofork ;
+ self#update_pending "Smoking" proof n ;
end
method private update_tacticbar =
diff --git a/src/plugins/wp/GuiProver.ml b/src/plugins/wp/GuiProver.ml
index 7a37b05f13126b95f785abc8b10711dd26e74117..e89389d6cdf08deac6f6f1b7f749121863b9e658 100644
--- a/src/plugins/wp/GuiProver.ml
+++ b/src/plugins/wp/GuiProver.ml
@@ -24,6 +24,7 @@ let no_status = `Share "theme/default/never_tried.png"
let ok_status = `Share "theme/default/surely_valid.png"
let ko_status = `Share "theme/default/unknown.png"
let wg_status = `Share "theme/default/surely_invalid.png"
+let smoke_status = `Share "theme/default/valid_under_hyp.png"
let filter = function
| VCS.Qed | VCS.Tactical | VCS.NativeCoq -> false
diff --git a/src/plugins/wp/GuiProver.mli b/src/plugins/wp/GuiProver.mli
index cd297753bb8f85419ab6c785a1b3fd5eb795d577..6cc37b2e8be081e06ae2ded0f0c9dc1fe9e58b26 100644
--- a/src/plugins/wp/GuiProver.mli
+++ b/src/plugins/wp/GuiProver.mli
@@ -26,6 +26,7 @@ val no_status : icon
val ok_status : icon
val ko_status : icon
val wg_status : icon
+val smoke_status : icon
val filter : VCS.prover -> bool
diff --git a/src/plugins/wp/ProofEngine.ml b/src/plugins/wp/ProofEngine.ml
index cc42ed6f12e9fdd1c9e3567752f04ced188c8f18..714b170998037ebafd474f101107c79c290b6e12 100644
--- a/src/plugins/wp/ProofEngine.ml
+++ b/src/plugins/wp/ProofEngine.ml
@@ -205,18 +205,28 @@ let children n =
(* --- State & Status --- *)
(* -------------------------------------------------------------------------- *)
-type status = [ `Main | `Proved | `Invalid | `Pending of int ]
+type status = [
+ | `Unproved (* proof obligation not proved *)
+ | `Proved (* proof obligation is proved *)
+ | `Pending of int (* proof is pending *)
+ | `Passed (* smoke test is passed (PO is not proved) *)
+ | `Invalid (* smoke test has failed (PO is proved) *)
+ | `StillResist of int (* proof is pending *)
+]
let status t : status =
match t.root with
| None ->
if Wpo.is_proved t.main
then if Wpo.is_smoke_test t.main then `Invalid else `Proved
- else `Main
+ else if Wpo.is_smoke_test t.main then `Passed else `Unproved
| Some root ->
match root.script with
- | Opened | Script _ -> `Main
- | Tactic _ -> `Pending (pending root)
+ | Opened | Script _ ->
+ if Wpo.is_smoke_test t.main then `Passed else `Unproved
+ | Tactic _ ->
+ let n = pending root in
+ if Wpo.is_smoke_test t.main then `StillResist n else `Pending n
(* -------------------------------------------------------------------------- *)
(* --- Navigation --- *)
diff --git a/src/plugins/wp/ProofEngine.mli b/src/plugins/wp/ProofEngine.mli
index 764505da0849e9b313b0cd3449b7f5b3eed72efd..764064f9df937ab639fcfa91a16a7a0764728cca 100644
--- a/src/plugins/wp/ProofEngine.mli
+++ b/src/plugins/wp/ProofEngine.mli
@@ -35,7 +35,15 @@ val validate : ?incomplete:bool -> tree -> unit
(** Leaves are numbered from 0 to n-1 *)
-type status = [ `Main | `Invalid | `Proved | `Pending of int ]
+
+type status = [
+ | `Unproved (** proof obligation not proved *)
+ | `Proved (** proof obligation is proved *)
+ | `Pending of int (** proof is pending *)
+ | `Passed (** smoke test is passed (PO is not proved) *)
+ | `Invalid (** smoke test has failed (PO is proved) *)
+ | `StillResist of int (** proof is pending *)
+]
type current = [ `Main | `Internal of node | `Leaf of int * node ]
type position = [ `Main | `Node of node | `Leaf of int ]
diff --git a/src/plugins/wp/ProverScript.ml b/src/plugins/wp/ProverScript.ml
index 9458666cfc60d2dcc01e346c2aba174f0f1afde5..7a264f1e5f55a90b2df5bc1924e92f40d928a839 100644
--- a/src/plugins/wp/ProverScript.ml
+++ b/src/plugins/wp/ProverScript.ml
@@ -165,9 +165,10 @@ struct
Prover.prove wpo ?config ~mode:VCS.BatchMode
~progress:env.progress prover
- let pending env =
+ let backtracking env =
match ProofEngine.status env.tree with
- | `Main | `Invalid | `Proved -> 0 | `Pending n -> n
+ | `Unproved | `Invalid | `Proved | `Passed -> 0
+ | `Pending n | `StillResist n -> n
let setup_backtrack env node depth =
if env.backtrack > 0 then
@@ -181,11 +182,11 @@ struct
bk_node = node ;
bk_best = (-1) ;
bk_depth = depth ;
- bk_pending = pending env ;
+ bk_pending = backtracking env ;
}
let search env node ~depth =
- if env.auto <> [] && depth < env.depth && pending env < env.width
+ if env.auto <> [] && depth < env.depth && backtracking env < env.width
then
match ProverSearch.search env.tree ~anchor:node env.auto with
| None -> None
@@ -197,7 +198,7 @@ struct
match env.backtracking with
| None -> None
| Some point ->
- let n = pending env in
+ let n = backtracking env in
let anchor = point.bk_node in
if n < point.bk_pending then
begin
@@ -300,7 +301,7 @@ and autosearch env ~depth node : bool Task.task =
and autofork env ~depth fork =
let _,children = ProofEngine.commit fork in
- let pending = Env.pending env in
+ let pending = Env.backtracking env in
if pending > 0 then
begin
Env.progress env (Printf.sprintf "Auto %d" pending) ;
@@ -391,16 +392,20 @@ let task
~depth ~width ~backtrack ~auto
~start ~progress ~result ~success wpo =
begin fun () ->
- start wpo ;
- let json = ProofSession.load wpo in
- let script = Priority.sort (ProofScript.decode json) in
- let tree = ProofEngine.proof ~main:wpo in
- let env = Env.make tree
- ~valid ~failed ~provers
- ~depth ~width ~backtrack ~auto
- ~progress ~result ~success in
- crawl env (process env) None script >>?
- (fun _ -> ProofEngine.forward tree) ;
+ Prover.simplify ~start ~result wpo >>= fun succeed ->
+ if succeed
+ then
+ ( success wpo (Some VCS.Qed) ; Task.return ())
+ else
+ let json = ProofSession.load wpo in
+ let script = Priority.sort (ProofScript.decode json) in
+ let tree = ProofEngine.proof ~main:wpo in
+ let env = Env.make tree
+ ~valid ~failed ~provers
+ ~depth ~width ~backtrack ~auto
+ ~progress ~result ~success in
+ crawl env (process env) None script >>?
+ (fun _ -> ProofEngine.forward tree) ;
end
(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/wp/ProverTask.ml b/src/plugins/wp/ProverTask.ml
index c1c45be5d62bba655bacdcc1b17665ad4c7ca5ad..724cb237f7ccf9e12801e503530b77b1da0a171d 100644
--- a/src/plugins/wp/ProverTask.ml
+++ b/src/plugins/wp/ProverTask.ml
@@ -314,18 +314,25 @@ let schedule task =
Task.spawn server (Task.thread task)
let silent _ = ()
-let spawn ?(monitor=silent) ?pool ~all
+let spawn ?(monitor=silent) ?pool ~all ~smoke
(jobs : ('a * bool Task.task) list) =
if jobs <> [] then
begin
let step = ref 0 in
let monitored = ref [] in
- let canceled = ref false in
+ let finalized = ref false in
let callback a r =
if r then
- begin if not all && not !canceled then
+ begin
+ if smoke then
+ begin
+ finalized := true ;
+ monitor (Some a) ;
+ end
+ else
+ if not all && not !finalized then
begin
- canceled := true ;
+ finalized := true ;
monitor (Some a) ;
List.iter Task.cancel !monitored ;
end
@@ -333,7 +340,7 @@ let spawn ?(monitor=silent) ?pool ~all
else
begin
decr step ;
- if not !canceled && !step = 0 then
+ if not !finalized && !step = 0 then
monitor None ;
end in
let pack (a,t) = Task.thread (t >>= Task.call (callback a)) in
diff --git a/src/plugins/wp/ProverTask.mli b/src/plugins/wp/ProverTask.mli
index 4f0bc09934e924175358840fe95a8bc3cb697930..f964e61ea1075dcf09fa133e9028b7f14a88c2dc 100644
--- a/src/plugins/wp/ProverTask.mli
+++ b/src/plugins/wp/ProverTask.mli
@@ -85,7 +85,7 @@ val schedule : 'a Task.task -> unit
val spawn :
?monitor:('a option -> unit) ->
?pool:Task.pool ->
- all:bool ->
+ all:bool -> smoke:bool ->
('a * bool Task.task) list -> unit
(** Spawn all the tasks over the server and retain the first 'validated' one.
diff --git a/src/plugins/wp/VC.ml b/src/plugins/wp/VC.ml
index 2f2241b5a01bdedbe4b6d4b31406e30b5ed2e55b..65a60848639e15d5840c11cfedd1094c014bb150 100644
--- a/src/plugins/wp/VC.ml
+++ b/src/plugins/wp/VC.ml
@@ -97,6 +97,6 @@ let spawn = Prover.spawn ~delayed:true
let server = ProverTask.server
let command ?provers ?tip vcs =
- Register.do_wp_proofs_iter ?provers ?tip (fun f -> Bag.iter f vcs)
+ Register.do_wp_proofs ?provers ?tip vcs
(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/wp/prover.ml b/src/plugins/wp/prover.ml
index 78092c65d91230a40272035b3714575a84da6e1a..08291e8aeea9ec4e9fc2fe1b7f5f2b9be9945853 100644
--- a/src/plugins/wp/prover.ml
+++ b/src/plugins/wp/prover.ml
@@ -112,7 +112,8 @@ let spawn wpo ~delayed
let process (mode,prover) =
prove wpo ?config ~mode ?start ?progress ?result prover in
let all = Wp_parameters.RunAllProvers.get() in
- ProverTask.spawn ?monitor ?pool ~all
+ let smoke = Wpo.is_smoke_test wpo in
+ ProverTask.spawn ?monitor ?pool ~all ~smoke
(List.map
(fun mp ->
let prover = snd mp in
@@ -124,3 +125,5 @@ let spawn wpo ~delayed
let thread = Task.thread process in
let server = ProverTask.server () in
Task.spawn server ?pool thread
+
+(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/wp/prover.mli b/src/plugins/wp/prover.mli
index 6a2711c2704f71a1ba7ba1f2e7346f3728aa83f1..32e1ca6ff6a93ba513a1851a0f108fb008ba5df1 100644
--- a/src/plugins/wp/prover.mli
+++ b/src/plugins/wp/prover.mli
@@ -26,6 +26,11 @@ open VCS
(* --- Prover Implementation against Task API --- *)
(* -------------------------------------------------------------------------- *)
+val simplify :
+ ?start:(Wpo.t -> unit) ->
+ ?result:(Wpo.t -> prover -> result -> unit) ->
+ Wpo.t -> bool Task.task
+
val prove : Wpo.t ->
?config:config ->
?mode:mode ->
diff --git a/src/plugins/wp/register.ml b/src/plugins/wp/register.ml
index 58c0b6ab08ba24e487a3d5de3182d46d467661a9..ed3a27c63af70ad7d6bc876c6d3adbb5c88fd0f9 100644
--- a/src/plugins/wp/register.ml
+++ b/src/plugins/wp/register.ml
@@ -234,21 +234,14 @@ module GOALS = Wpo.S.Set
let scheduled = ref 0
let exercised = ref 0
-let spy = ref false
let session = ref GOALS.empty
-let proved = ref GOALS.empty
let provers = ref PM.empty
-let begin_session () = session := GOALS.empty ; spy := true
-let clear_session () = session := GOALS.empty
-let end_session () = session := GOALS.empty ; spy := false
-let iter_session f = GOALS.iter f !session
-
let clear_scheduled () =
begin
scheduled := 0 ;
exercised := 0 ;
- proved := GOALS.empty ;
+ session := GOALS.empty ;
provers := PM.empty ;
end
@@ -279,14 +272,15 @@ let add_time s t =
if t > s.u_time then s.u_time <- t ;
end
-let do_list_scheduled iter_on_goals =
+let do_list_scheduled goals =
clear_scheduled () ;
- iter_on_goals
+ Bag.iter
(fun goal ->
begin
incr scheduled ;
- if !spy then session := GOALS.add goal !session ;
- end) ;
+ session := GOALS.add goal !session ;
+ end)
+ goals ;
match !scheduled with
| 0 -> Wp_parameters.warning ~current:false "No goal generated"
| 1 -> Wp_parameters.feedback "1 goal scheduled"
@@ -370,8 +364,6 @@ let do_wpo_stat goal prover res =
| Failed | Invalid ->
s.failed <- succ s.failed
| Valid ->
- if not (Wpo.is_tactic goal) then
- proved := GOALS.add goal !proved ;
s.proved <- succ s.proved ;
add_step s res.prover_steps ;
add_time s res.prover_time ;
@@ -531,12 +523,15 @@ let do_report_scheduled () =
else
if !scheduled > 0 then
begin
- let proved = GOALS.cardinal !proved in
+ let passed = GOALS.fold
+ (fun g n ->
+ if Wpo.is_passed g then succ n else n
+ ) !session 0 in
let mode = Cache.get_mode () in
if mode <> Cache.NoCache then do_report_cache_usage mode ;
Wp_parameters.result "%t"
begin fun fmt ->
- Format.fprintf fmt "Proved goals: %4d / %d@\n" proved !scheduled ;
+ Format.fprintf fmt "Proved goals: %4d / %d@\n" passed !scheduled ;
Pretty_utils.pp_items
~min:12 ~align:`Left
~title:(fun (prover,_) -> VCS.title_of_prover prover)
@@ -566,12 +561,12 @@ type mode = {
mutable provers : (VCS.mode * VCS.prover) list ;
}
-let spawn_wp_proofs_iter ~mode iter_on_goals =
+let spawn_wp_proofs ~mode goals =
if mode.tactical || mode.provers<>[] then
begin
let server = ProverTask.server () in
ignore (Wp_parameters.Share.get_dir "."); (* To prevent further errors *)
- iter_on_goals
+ Bag.iter
(fun goal ->
if mode.tactical
&& not (Wpo.is_trivial goal)
@@ -597,7 +592,7 @@ let spawn_wp_proofs_iter ~mode iter_on_goals =
~result:do_wpo_result
~success:do_wpo_success
mode.provers
- ) ;
+ ) goals ;
Task.on_server_wait server do_wpo_wait ;
Task.launch server
end
@@ -664,13 +659,13 @@ let compute_auto ~mode =
if mode.auto <> [] then mode.tactical <- true ;
end
-let do_update_session mode iter =
+let do_update_session mode goals =
if mode.update then
begin
let removed = ref 0 in
let updated = ref 0 in
let invalid = ref 0 in
- iter
+ Bag.iter
begin fun goal ->
let results = Wpo.get_results goal in
let autoproof (p,r) =
@@ -701,7 +696,7 @@ let do_update_session mode iter =
ProofSession.save goal (ProofScript.encode scripts)
end
end
- end ;
+ end goals ;
let r = !removed in
let u = !updated in
let f = !invalid in
@@ -718,7 +713,7 @@ let do_update_session mode iter =
Wp_parameters.result "Updated session with %d new script%s to complete." f s );
end
-let do_wp_proofs_iter ?provers ?tip iter =
+let do_wp_proofs ?provers ?tip (goals : Wpo.t Bag.t) =
let mode = default_mode () in
compute_provers ~mode ;
compute_auto ~mode ;
@@ -731,21 +726,17 @@ let do_wp_proofs_iter ?provers ?tip iter =
end ;
let spawned = mode.tactical || mode.provers <> [] in
begin
- if spawned then do_list_scheduled iter ;
- spawn_wp_proofs_iter ~mode iter ;
+ if spawned then do_list_scheduled goals ;
+ spawn_wp_proofs ~mode goals ;
if spawned then
begin
do_list_scheduled_result () ;
- do_update_session mode iter ;
+ do_update_session mode goals ;
end
else if not (Wp_parameters.Print.get ()) then
- iter do_wpo_display
+ Bag.iter do_wpo_display goals
end
-let do_wp_proofs () = do_wp_proofs_iter (fun f -> Wpo.iter ~on_goal:f ())
-
-let do_wp_proofs_for goals = do_wp_proofs_iter (fun f -> Bag.iter f goals)
-
(* registered at frama-c (normal) exit *)
let do_cache_cleanup () =
begin
@@ -757,38 +748,6 @@ let do_cache_cleanup () =
Wp_parameters.result "[Cache] removed:%d" removed
end
-(* ------------------------------------------------------------------------ *)
-(* --- Secondary Entry Points --- *)
-(* ------------------------------------------------------------------------ *)
-
-(* Deprecated entry point in Dynamic. *)
-
-let deprecated_wp_compute kf bhv ipopt =
- let model = computer () in
- let goals =
- match ipopt with
- | None -> Generator.compute_kf model ?kf ~bhv ()
- | Some ip -> Generator.compute_ip model ip
- in do_wp_proofs_for goals
-
-let deprecated_wp_compute_kf kf bhv prop =
- let model = computer () in
- do_wp_proofs_for (Generator.compute_kf model ?kf ~bhv ~prop ())
-
-
-let deprecated_wp_compute_ip ip =
- Wp_parameters.warning ~once:true "Dynamic 'wp_compute_ip' is now deprecated." ;
- let model = computer () in
- do_wp_proofs_for (Generator.compute_ip model ip)
-
-let deprecated_wp_compute_call stmt =
- Wp_parameters.warning ~once:true "Dynamic 'wp_compute_ip' is now deprecated." ;
- do_wp_proofs_for (Generator.compute_call (computer ()) stmt)
-
-let deprecated_wp_clear () =
- Wp_parameters.warning ~once:true "Dynamic 'wp_compute_ip' is now deprecated." ;
- Wpo.clear ()
-
(* ------------------------------------------------------------------------ *)
(* --- Command-line Entry Points --- *)
(* ------------------------------------------------------------------------ *)
@@ -829,22 +788,18 @@ let cmdline_run () =
if Wp_parameters.CachePrint.get () then
Kernel.feedback "Cache directory: %s" (Cache.get_dir ()) ;
let fct = Wp_parameters.get_wp () in
- match fct with
- | Wp_parameters.Fct_none -> ()
- | Wp_parameters.Fct_all ->
- begin
- ignore (wp_main fct);
- do_wp_proofs ();
- do_wp_print ();
- do_wp_report ();
- end
- | _ ->
+ if fct <> Wp_parameters.Fct_none then
+ begin
+ let goals = wp_main fct in
+ do_wp_proofs goals ;
begin
- let goals = wp_main fct in
- do_wp_proofs_for goals ;
- do_wp_print_for goals ;
- do_wp_report () ;
- end
+ if fct <> Wp_parameters.Fct_all then
+ do_wp_print_for goals
+ else
+ do_wp_print () ;
+ end ;
+ do_wp_report () ;
+ end
(* ------------------------------------------------------------------------ *)
(* --- Register external functions --- *)
@@ -861,56 +816,6 @@ let register name ty code =
(fun x -> deprecated name ; code x)
in ()
-(* DEPRECATED *)
-let () =
- let module OLS = Datatype.List(Datatype.String) in
- let module OKF = Datatype.Option(Kernel_function) in
- let module OP = Datatype.Option(Property) in
- register "wp_compute"
- (Datatype.func3 OKF.ty OLS.ty OP.ty Datatype.unit)
- deprecated_wp_compute
-
-let () =
- let module OKF = Datatype.Option(Kernel_function) in
- let module OLS = Datatype.List(Datatype.String) in
- register "wp_compute_kf"
- (Datatype.func3 OKF.ty OLS.ty OLS.ty Datatype.unit)
- deprecated_wp_compute_kf
-
-let () =
- register "wp_compute_ip"
- (Datatype.func Property.ty Datatype.unit)
- deprecated_wp_compute_ip
-
-let () =
- register "wp_compute_call"
- (Datatype.func Cil_datatype.Stmt.ty Datatype.unit)
- deprecated_wp_compute_call
-
-let () =
- register "wp_clear"
- (Datatype.func Datatype.unit Datatype.unit)
- deprecated_wp_clear
-
-let run = Dynamic.register ~plugin:"Wp" "run"
- (Datatype.func Datatype.unit Datatype.unit)
- ~journalize:true
- cmdline_run
-
-let () =
- let open Datatype in
- begin
- let t_job = func Unit.ty Unit.ty in
- let t_iter = func (func Wpo.S.ty Unit.ty) Unit.ty in
- let register name ty f =
- ignore (Dynamic.register name ty ~plugin:"Wp" ~journalize:false f)
- in
- register "wp_begin_session" t_job begin_session ;
- register "wp_end_session" t_job end_session ;
- register "wp_clear_session" t_job clear_session ;
- register "wp_iter_session" t_iter iter_session ;
- end
-
(* ------------------------------------------------------------------------ *)
(* --- Tracing WP Invocation --- *)
(* ------------------------------------------------------------------------ *)
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/cfg_loop.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/cfg_loop.res.oracle
index 0f4c53717a141099c6061c88405bc8945dfb5abd..813798a56de622e0c795b05199b7ad14e250e025 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/cfg_loop.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/cfg_loop.res.oracle
@@ -3,9 +3,6 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 15 goals scheduled
-[wp] [Qed] Goal typed_loop_continue_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_loop_continue_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_loop_continue_loop_assigns : Valid
[wp] [Qed] Goal typed_loop_switch_loop_invariant_preserved_part1 : Valid
[wp] [Qed] Goal typed_loop_switch_loop_invariant_preserved_part2 : Valid
[wp] [Qed] Goal typed_loop_switch_loop_invariant_preserved_part3 : Valid
@@ -18,6 +15,9 @@
[wp] [Qed] Goal typed_loop_switch_loop_assigns_part2 : Valid
[wp] [Qed] Goal typed_loop_switch_loop_assigns_part3 : Valid
[wp] [Qed] Goal typed_loop_switch_loop_assigns_part4 : Valid
+[wp] [Qed] Goal typed_loop_continue_loop_invariant_preserved : Valid
+[wp] [Qed] Goal typed_loop_continue_loop_invariant_established : Valid
+[wp] [Qed] Goal typed_loop_continue_loop_assigns : Valid
[wp] Proved goals: 15 / 15
Qed: 15
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.res.oracle
index c396c4f4d7b63c91166e35804f8f51354e78de20..6e1e0c0d7c30baad20ca78800a4bacd2573751f7 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/stmtcompiler_test.res.oracle
@@ -9,26 +9,17 @@
[wp] tests/wp/stmtcompiler_test.i:81: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 27 goals scheduled
-[wp] [Qed] Goal typed_behavior2_assert : Valid
-[wp] [Qed] Goal typed_behavior3_assert : Valid
-[wp] [Qed] Goal typed_behavior4_assert : Valid
-[wp] [Alt-Ergo] Goal typed_behavior5_assert_bad : Unsuccess
-[wp] [Qed] Goal typed_compare_assert : Valid
[wp] [Qed] Goal typed_empty_assert : Valid
-[wp] [Alt-Ergo] Goal typed_if_assert_assert : Valid
-[wp] [Alt-Ergo] Goal typed_if_assert_assert_2 : Unsuccess
-[wp] [Qed] Goal typed_if_assert_assert_3 : Valid
-[wp] [Alt-Ergo] Goal typed_if_assert_assert_missing_return : Unsuccess
-[wp] [Qed] Goal typed_main_assert : Valid
-[wp] [Qed] Goal typed_main_assigns_global_assert : Valid
-[wp] [Qed] Goal typed_main_assigns_global_assert_2 : Valid
-[wp] [Alt-Ergo] Goal typed_main_assigns_global_assert_bad : Unsuccess
-[wp] [Qed] Goal typed_main_ensures_result_assert : Valid
-[wp] [Alt-Ergo] Goal typed_not_main_assert_bad : Unsuccess
[wp] [Qed] Goal typed_one_assign_assert : Valid
[wp] [Qed] Goal typed_one_if_assert : Valid
[wp] [Qed] Goal typed_some_seq_assert : Valid
[wp] [Qed] Goal typed_some_seq_assert_2 : Valid
+[wp] [Qed] Goal typed_main_ensures_result_assert : Valid
+[wp] [Qed] Goal typed_main_assert : Valid
+[wp] [Alt-Ergo] Goal typed_not_main_assert_bad : Unsuccess
+[wp] [Qed] Goal typed_main_assigns_global_assert : Valid
+[wp] [Qed] Goal typed_main_assigns_global_assert_2 : Valid
+[wp] [Alt-Ergo] Goal typed_main_assigns_global_assert_bad : Unsuccess
[wp] [Qed] Goal typed_zloop_ensures : Valid
[wp] [Alt-Ergo] Goal typed_zloop_loop_invariant_preserved : Unsuccess
[wp] [Qed] Goal typed_zloop_loop_invariant_established : Valid
@@ -36,6 +27,15 @@
[wp] [Qed] Goal typed_zloop_assert_2 : Valid
[wp] [Alt-Ergo] Goal typed_zloop_assert_3 : Unsuccess
[wp] [Alt-Ergo] Goal typed_zloop_assert_bad : Unsuccess
+[wp] [Qed] Goal typed_behavior2_assert : Valid
+[wp] [Qed] Goal typed_behavior3_assert : Valid
+[wp] [Qed] Goal typed_behavior4_assert : Valid
+[wp] [Alt-Ergo] Goal typed_behavior5_assert_bad : Unsuccess
+[wp] [Alt-Ergo] Goal typed_if_assert_assert : Valid
+[wp] [Alt-Ergo] Goal typed_if_assert_assert_2 : Unsuccess
+[wp] [Qed] Goal typed_if_assert_assert_3 : Valid
+[wp] [Alt-Ergo] Goal typed_if_assert_assert_missing_return : Unsuccess
+[wp] [Qed] Goal typed_compare_assert : Valid
[wp] Proved goals: 19 / 27
Qed: 18
Alt-Ergo: 1 (unsuccess: 8)
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.res.oracle
index 8fb43bd64b1b3aa4b102d3b4fac41559d491f382..367808737638d33e42c15d3193b3e69cb7dde789 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_behav.0.res.oracle
@@ -13,44 +13,44 @@
[wp] tests/wp/wp_behav.c:176: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 38 goals scheduled
-[wp] [Alt-Ergo] Goal typed_assert_needed_assert_ko : Unsuccess
-[wp] [Qed] Goal typed_assert_needed_assert_qed_ok_ok_with_hyp : Valid
-[wp] [Alt-Ergo] Goal typed_bhv_complete_pos_neg : Valid
-[wp] [Qed] Goal typed_bhv_neg_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_bhv_pos_ensures_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_bts0513_ensures_ko1 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bts0513_ensures_ko2 : Unsuccess
[wp] [Qed] Goal typed_f_ensures_qed_ok : Valid
[wp] [Qed] Goal typed_f_x1_ensures_qed_ok : Valid
[wp] [Qed] Goal typed_f_assert_qed_ok : Valid
[wp] [Qed] Goal typed_f_x2_ensures_qed_ok : Valid
[wp] [Qed] Goal typed_f_assert_qed_ok_2 : Valid
-[wp] [Qed] Goal typed_local_named_behavior_xpos_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_local_named_behavior_xpos_ensures_qed_ok_2 : Valid
[wp] [Qed] Goal typed_min_complete_bx_by : Valid
[wp] [Qed] Goal typed_min_disjoint_bx_by : Valid
[wp] [Qed] Goal typed_min_bx_ensures_qed_ok : Valid
[wp] [Qed] Goal typed_min_by_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_more_stmt_assigns_ensures_qed_ok_ok_with_hoare : Valid
-[wp] [Qed] Goal typed_more_stmt_assigns_blk_assigns_part1 : Valid
-[wp] [Qed] Goal typed_more_stmt_assigns_blk_assigns_part2 : Valid
-[wp] [Qed] Goal typed_part_stmt_bhv_b1_ensures_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_part_stmt_bhv_bs_ensures : Unsuccess
-[wp] [Alt-Ergo] Goal typed_razT_loop_invariant_qed_ok_preserved : Valid
-[wp] [Qed] Goal typed_razT_loop_invariant_qed_ok_established : Valid
-[wp] [Alt-Ergo] Goal typed_razT_b1_ensures_e1 : Unsuccess
-[wp] [Qed] Goal typed_stmt_assigns_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_stmt_assigns_assigns : Unsuccess
+[wp] [Alt-Ergo] Goal typed_bhv_complete_pos_neg : Valid
+[wp] [Qed] Goal typed_bhv_pos_ensures_qed_ok : Valid
+[wp] [Qed] Goal typed_bhv_neg_ensures_qed_ok : Valid
[wp] [Qed] Goal typed_stmt_contract_requires_qed_ok : Valid
[wp] [Qed] Goal typed_stmt_contract_ensures_qed_ok : Valid
[wp] [Qed] Goal typed_stmt_contract_ok_ensures_qed_ok : Valid
+[wp] [Qed] Goal typed_stmt_contract_label_ensures_qed_ok : Valid
+[wp] [Qed] Goal typed_stmt_contract_label_ensures_qed_ok_2 : Valid
[wp] [Qed] Goal typed_stmt_contract_assigns_requires_qed_ok : Valid
[wp] [Qed] Goal typed_stmt_contract_assigns_ensures_qed_ok : Valid
[wp] [Qed] Goal typed_stmt_contract_assigns_assigns : Valid
[wp] [Qed] Goal typed_stmt_contract_assigns_ok_ensures_qed_ok : Valid
[wp] [Qed] Goal typed_stmt_contract_assigns_ok_asgn_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_stmt_contract_label_ensures_qed_ok_2 : Valid
-[wp] [Qed] Goal typed_stmt_contract_label_ensures_qed_ok : Valid
+[wp] [Qed] Goal typed_local_named_behavior_xpos_ensures_qed_ok : Valid
+[wp] [Qed] Goal typed_local_named_behavior_xpos_ensures_qed_ok_2 : Valid
+[wp] [Alt-Ergo] Goal typed_assert_needed_assert_ko : Unsuccess
+[wp] [Qed] Goal typed_assert_needed_assert_qed_ok_ok_with_hyp : Valid
+[wp] [Alt-Ergo] Goal typed_bts0513_ensures_ko1 : Unsuccess
+[wp] [Alt-Ergo] Goal typed_bts0513_ensures_ko2 : Unsuccess
+[wp] [Alt-Ergo] Goal typed_stmt_assigns_assigns : Unsuccess
+[wp] [Qed] Goal typed_stmt_assigns_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_razT_loop_invariant_qed_ok_preserved : Valid
+[wp] [Qed] Goal typed_razT_loop_invariant_qed_ok_established : Valid
+[wp] [Alt-Ergo] Goal typed_razT_b1_ensures_e1 : Unsuccess
+[wp] [Qed] Goal typed_more_stmt_assigns_blk_assigns_part1 : Valid
+[wp] [Qed] Goal typed_more_stmt_assigns_blk_assigns_part2 : Valid
+[wp] [Qed] Goal typed_more_stmt_assigns_ensures_qed_ok_ok_with_hoare : Valid
+[wp] [Alt-Ergo] Goal typed_part_stmt_bhv_bs_ensures : Unsuccess
+[wp] [Qed] Goal typed_part_stmt_bhv_b1_ensures_qed_ok : Valid
[wp] Proved goals: 32 / 38
Qed: 30
Alt-Ergo: 2 (unsuccess: 6)
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.res.oracle
index 2da6874c320d29930e5aad1b37fdab14f1728ce8..bad25e7802e2219b75ae036e67603294e2d6093e 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_call_pre.res.oracle
@@ -7,16 +7,16 @@
No code nor implicit assigns clause for function g, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
[wp] 10 goals scheduled
-[wp] [Qed] Goal typed_call_g_call_g_requires_qed_ok_Rga : Valid
-[wp] [Qed] Goal typed_call_g_call_g_requires_Rgb : Valid
-[wp] [Qed] Goal typed_call_main_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_call_main_call_main_requires_qed_ok_Rmain : Valid
[wp] [Qed] Goal typed_double_call_call_f_requires_qed_ok_Rf : Valid
[wp] [Alt-Ergo] Goal typed_double_call_call_f_2_requires_qed_ok_Rf : Valid
[wp] [Qed] Goal typed_main_requires_qed_ok_Rmain : Valid
[wp] [Qed] Goal typed_main_ensures_qed_ok_Emain : Valid
[wp] [Qed] Goal typed_main_call_f_requires_qed_ok_Rf : Valid
+[wp] [Qed] Goal typed_call_main_ensures_qed_ok : Valid
+[wp] [Qed] Goal typed_call_main_call_main_requires_qed_ok_Rmain : Valid
[wp] [Qed] Goal typed_stmt_pre_requires_qed_ok_Rstmt : Valid
+[wp] [Qed] Goal typed_call_g_call_g_requires_qed_ok_Rga : Valid
+[wp] [Qed] Goal typed_call_g_call_g_requires_Rgb : Valid
[wp] Proved goals: 10 / 10
Qed: 9
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.res.oracle b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.res.oracle
index e630f56e9a5a7ace83a2ecb62aec2d7cd30a65fc..90bb89816b2808947e23ae7a45f9a42897429a66 100644
--- a/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.res.oracle
+++ b/src/plugins/wp/tests/wp/oracle_qualif/wp_strategy.res.oracle
@@ -14,27 +14,27 @@
[wp] [Alt-Ergo] Goal hoare_bts0513_ensures_qed_ko_ko2 : Unsuccess
[wp] [Alt-Ergo] Goal hoare_bts0513_bis_assert_qed_ko_ko1 : Unsuccess
[wp] [Qed] Goal hoare_bts0513_bis_assert_qed_ok_ok : Valid
-[wp] [Qed] Goal hoare_default_behaviors_ensures_qed_ok : Valid
-[wp] [Qed] Goal hoare_default_behaviors_assert_qed_ok_2 : Valid
-[wp] [Qed] Goal hoare_default_behaviors_ensures_qed_ok_stmt_p : Valid
-[wp] [Qed] Goal hoare_default_behaviors_assert_qed_ok : Valid
-[wp] [Alt-Ergo] Goal hoare_default_behaviors_assert_rte_signed_overflow : Unsuccess
-[wp] [Qed] Goal hoare_default_behaviors_assigns : Valid
[wp] [Qed] Goal hoare_dpd1_assert_qed_ok_A : Valid
[wp] [Alt-Ergo] Goal hoare_dpd1_ensures_qed_ko_Eko : Unsuccess
[wp] [Qed] Goal hoare_dpd1_assigns : Valid
-[wp] [Qed] Goal hoare_dpd2_assert_qed_ok_A : Valid
[wp] [Alt-Ergo] Goal hoare_dpd2_ensures_qed_ko_Eko : Unsuccess
[wp] [Qed] Goal hoare_dpd2_assigns : Valid
-[wp] [Qed] Goal hoare_spec_if_ensures_qed_ok_2 : Valid
+[wp] [Qed] Goal hoare_dpd2_assert_qed_ok_A : Valid
[wp] [Qed] Goal hoare_spec_if_ensures_qed_ok : Valid
[wp] [Qed] Goal hoare_spec_if_assigns : Valid
[wp] [Alt-Ergo] Goal hoare_spec_if_assert_rte_signed_overflow : Unsuccess
[wp] [Qed] Goal hoare_spec_if_assigns_2 : Valid
[wp] [Alt-Ergo] Goal hoare_spec_if_assert_rte_signed_overflow_2 : Unsuccess
[wp] [Qed] Goal hoare_spec_if_assigns_3 : Valid
+[wp] [Qed] Goal hoare_spec_if_ensures_qed_ok_2 : Valid
[wp] [Qed] Goal hoare_spec_if_cond_ensures_qed_ok : Valid
[wp] [Qed] Goal hoare_spec_if_not_cond_ensures_qed_ok : Valid
+[wp] [Qed] Goal hoare_default_behaviors_ensures_qed_ok_stmt_p : Valid
+[wp] [Qed] Goal hoare_default_behaviors_assert_qed_ok : Valid
+[wp] [Alt-Ergo] Goal hoare_default_behaviors_assert_rte_signed_overflow : Unsuccess
+[wp] [Qed] Goal hoare_default_behaviors_assigns : Valid
+[wp] [Qed] Goal hoare_default_behaviors_ensures_qed_ok : Valid
+[wp] [Qed] Goal hoare_default_behaviors_assert_qed_ok_2 : Valid
[wp] Proved goals: 17 / 25
Qed: 17
Alt-Ergo: 0 (unsuccess: 8)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/float_const.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/float_const.res.oracle
index 47c04b9140b066c0dc43a1ac6cec9c18ac6744db..6d6043595cf02040d1ccd036cab58b9a0246bbf2 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/float_const.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/float_const.res.oracle
@@ -35,8 +35,8 @@
goal wp_goal :
forall f:t.
- let r = of_f32 (to_f32 (of_f64 f)) in
- eq_f64 f (0x1.999999999999Ap-4:t) -> of_f64 (to_f64 r) = r
+ let r = of_f32 f in
+ eq_f32 f (0x1.99999Ap-4:t) -> of_f32 (to_f32 (of_f64 (to_f64 r))) = r
end
[wp:print-generated]
theory WP1
@@ -66,8 +66,8 @@
goal wp_goal :
forall f:t.
- eq_f64 f (0x1.999999999999Ap-4:t) ->
- not of_f64 f = (13421773.0 / 134217728.0)
+ eq_f32 f (0x1.99999Ap-4:t) ->
+ not of_f32 f = (3602879701896397.0 / 36028797018963968.0)
end
[wp:print-generated]
theory WP2
@@ -97,8 +97,7 @@
goal wp_goal :
forall f:t.
- eq_f64 f (0x1.999999999999Ap-4:t) ->
- of_f64 f = (3602879701896397.0 / 36028797018963968.0)
+ eq_f32 f (0x1.99999Ap-4:t) -> of_f32 f = (13421773.0 / 134217728.0)
end
[wp:print-generated]
theory WP3
@@ -127,8 +126,7 @@
(* use frama_c_wp.cfloat.Cfloat *)
goal wp_goal :
- forall f:t.
- eq_f64 f (0x1.999999999999Ap-4:t) -> not of_f64 f = (1.0 / 10.0)
+ forall f:t. eq_f32 f (0x1.99999Ap-4:t) -> not of_f32 f = (1.0 / 10.0)
end
[wp:print-generated]
theory WP4
@@ -158,9 +156,8 @@
goal wp_goal :
forall f:t1.
- let r = of_f321 f in
- eq_f32 f (0x1.99999Ap-4:t1) ->
- of_f321 (to_f321 (of_f641 (to_f641 r))) = r
+ let r = of_f321 (to_f321 (of_f641 f)) in
+ eq_f64 f (0x1.999999999999Ap-4:t1) -> of_f641 (to_f641 r) = r
end
[wp:print-generated]
theory WP5
@@ -190,8 +187,8 @@
goal wp_goal :
forall f:t1.
- eq_f32 f (0x1.99999Ap-4:t1) ->
- not of_f321 f = (3602879701896397.0 /' 36028797018963968.0)
+ eq_f64 f (0x1.999999999999Ap-4:t1) ->
+ not of_f641 f = (13421773.0 /' 134217728.0)
end
[wp:print-generated]
theory WP6
@@ -221,7 +218,8 @@
goal wp_goal :
forall f:t1.
- eq_f32 f (0x1.99999Ap-4:t1) -> of_f321 f = (13421773.0 /' 134217728.0)
+ eq_f64 f (0x1.999999999999Ap-4:t1) ->
+ of_f641 f = (3602879701896397.0 /' 36028797018963968.0)
end
[wp:print-generated]
theory WP7
@@ -250,7 +248,8 @@
(* use frama_c_wp.cfloat.Cfloat1 *)
goal wp_goal :
- forall f:t1. eq_f32 f (0x1.99999Ap-4:t1) -> not of_f321 f = (1.0 /' 10.0)
+ forall f:t1.
+ eq_f64 f (0x1.999999999999Ap-4:t1) -> not of_f641 f = (1.0 /' 10.0)
end
[wp] 8 goals generated
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memtyped.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memtyped.res.oracle
index 4179df2cf6fd8edcbcb8ca036938c5d3cd3e4b56..660872093ac27a7d2ae67acedee77f2b66c6c471 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memtyped.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memtyped.res.oracle
@@ -3,10 +3,37 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 42 goals scheduled
+[wp] [Alt-Ergo] Goal typed_initialize_loop_invariant_CHECK_preserved : Valid
+[wp] [Qed] Goal typed_initialize_loop_invariant_CHECK_established : Valid
+[wp] [Alt-Ergo] Goal typed_initialize_check_CHECK : Valid
+[wp] [Qed] Goal typed_initialize_loop_assigns_part1 : Valid
+[wp] [Qed] Goal typed_initialize_loop_assigns_part2 : Valid
+[wp] [Qed] Goal typed_initialize_loop_assigns_part3 : Valid
+[wp] [Alt-Ergo] Goal typed_range_check_CHECK : Valid
+[wp] [Qed] Goal typed_range_loop_assigns_part1 : Valid
+[wp] [Qed] Goal typed_range_loop_assigns_part2 : Valid
+[wp] [Qed] Goal typed_range_loop_assigns_part3 : Valid
+[wp] [Alt-Ergo] Goal typed_field_check_CHECK : Valid
+[wp] [Qed] Goal typed_field_loop_assigns_part1 : Valid
+[wp] [Qed] Goal typed_field_loop_assigns_part2 : Valid
[wp] [Alt-Ergo] Goal typed_array_check_CHECK : Valid
[wp] [Qed] Goal typed_array_loop_assigns_part1 : Valid
[wp] [Qed] Goal typed_array_loop_assigns_part2 : Valid
[wp] [Qed] Goal typed_array_loop_assigns_part3 : Valid
+[wp] [Alt-Ergo] Goal typed_index_check_CHECK : Valid
+[wp] [Qed] Goal typed_index_loop_assigns_part1 : Valid
+[wp] [Qed] Goal typed_index_loop_assigns_part2 : Valid
+[wp] [Qed] Goal typed_index_loop_assigns_part3 : Valid
+[wp] [Alt-Ergo] Goal typed_descr_check_CHECK : Valid
+[wp] [Qed] Goal typed_descr_loop_assigns_part1 : Valid
+[wp] [Alt-Ergo] Goal typed_descr_loop_assigns_part2 : Valid
+[wp] [Qed] Goal typed_descr_loop_assigns_part3 : Valid
+[wp] [Qed] Goal typed_descr_loop_assigns_part4 : Valid
+[wp] [Qed] Goal typed_descr_loop_assigns_part5 : Valid
+[wp] [Alt-Ergo] Goal typed_comp_check_CHECK : Valid
+[wp] [Qed] Goal typed_comp_loop_assigns_part1 : Valid
+[wp] [Qed] Goal typed_comp_loop_assigns_part2 : Valid
+[wp] [Alt-Ergo] Goal typed_comp_loop_assigns_part3 : Valid
[wp] [Alt-Ergo] Goal typed_assigned_glob_check_CHECK : Valid
[wp] [Alt-Ergo] Goal typed_assigned_glob_loop_invariant_CHECK_preserved : Valid
[wp] [Qed] Goal typed_assigned_glob_loop_invariant_CHECK_established : Valid
@@ -18,33 +45,6 @@
[wp] [Qed] Goal typed_assigned_glob_loop_assigns_2_part1 : Valid
[wp] [Qed] Goal typed_assigned_glob_loop_assigns_2_part2 : Valid
[wp] [Alt-Ergo] Goal typed_assigned_glob_loop_assigns_2_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_comp_check_CHECK : Valid
-[wp] [Qed] Goal typed_comp_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_comp_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_comp_loop_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_descr_check_CHECK : Valid
-[wp] [Qed] Goal typed_descr_loop_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_descr_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_descr_loop_assigns_part3 : Valid
-[wp] [Qed] Goal typed_descr_loop_assigns_part4 : Valid
-[wp] [Qed] Goal typed_descr_loop_assigns_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_field_check_CHECK : Valid
-[wp] [Qed] Goal typed_field_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_field_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_index_check_CHECK : Valid
-[wp] [Qed] Goal typed_index_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_index_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_index_loop_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_initialize_loop_invariant_CHECK_preserved : Valid
-[wp] [Qed] Goal typed_initialize_loop_invariant_CHECK_established : Valid
-[wp] [Alt-Ergo] Goal typed_initialize_check_CHECK : Valid
-[wp] [Qed] Goal typed_initialize_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_initialize_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_initialize_loop_assigns_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_range_check_CHECK : Valid
-[wp] [Qed] Goal typed_range_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_range_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_range_loop_assigns_part3 : Valid
[wp] Proved goals: 42 / 42
Qed: 27
Alt-Ergo: 15
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memvar.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memvar.res.oracle
index bca9df7601cd35aae9305795c5b5cf4bff74949d..73c1299e84eef5626085f89187fbc140eae7a64b 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memvar.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_initialized_memvar.res.oracle
@@ -3,28 +3,28 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 22 goals scheduled
+[wp] [Alt-Ergo] Goal typed_initialize_loop_invariant_CHECK_preserved : Valid
+[wp] [Qed] Goal typed_initialize_loop_invariant_CHECK_established : Valid
+[wp] [Alt-Ergo] Goal typed_initialize_check_CHECK : Valid
+[wp] [Qed] Goal typed_initialize_loop_assigns : Valid
+[wp] [Alt-Ergo] Goal typed_range_check_CHECK : Valid
+[wp] [Qed] Goal typed_range_loop_assigns_part1 : Valid
+[wp] [Qed] Goal typed_range_loop_assigns_part2 : Valid
+[wp] [Alt-Ergo] Goal typed_field_check_CHECK : Valid
+[wp] [Qed] Goal typed_field_loop_assigns : Valid
[wp] [Alt-Ergo] Goal typed_array_check_CHECK : Valid
[wp] [Qed] Goal typed_array_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_comp_check_CHECK : Valid
-[wp] [Qed] Goal typed_comp_loop_assigns : Valid
+[wp] [Alt-Ergo] Goal typed_index_check_CHECK : Valid
+[wp] [Qed] Goal typed_index_loop_assigns_part1 : Valid
+[wp] [Qed] Goal typed_index_loop_assigns_part2 : Valid
[wp] [Alt-Ergo] Goal typed_descr_check_CHECK : Valid
[wp] [Qed] Goal typed_descr_loop_assigns_part1 : Valid
[wp] [Alt-Ergo] Goal typed_descr_loop_assigns_part2 : Valid
[wp] [Qed] Goal typed_descr_loop_assigns_part3 : Valid
[wp] [Qed] Goal typed_descr_loop_assigns_part4 : Valid
[wp] [Qed] Goal typed_descr_loop_assigns_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_field_check_CHECK : Valid
-[wp] [Qed] Goal typed_field_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_index_check_CHECK : Valid
-[wp] [Qed] Goal typed_index_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_index_loop_assigns_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_initialize_loop_invariant_CHECK_preserved : Valid
-[wp] [Qed] Goal typed_initialize_loop_invariant_CHECK_established : Valid
-[wp] [Alt-Ergo] Goal typed_initialize_check_CHECK : Valid
-[wp] [Qed] Goal typed_initialize_loop_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_range_check_CHECK : Valid
-[wp] [Qed] Goal typed_range_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_range_loop_assigns_part2 : Valid
+[wp] [Alt-Ergo] Goal typed_comp_check_CHECK : Valid
+[wp] [Qed] Goal typed_comp_loop_assigns : Valid
[wp] Proved goals: 22 / 22
Qed: 13
Alt-Ergo: 9
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memtyped.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memtyped.res.oracle
index f95259fd6149cb787685439b165c8a3120456651..183c0c59b683a4e8f1257724c2d6ea67dbd8ef8a 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memtyped.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memtyped.res.oracle
@@ -3,15 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
+[wp] [Alt-Ergo] Goal typed_atomic_check_FAIL : Unsuccess
+[wp] [Alt-Ergo] Goal typed_comp_check_FAIL : Unsuccess
[wp] [Alt-Ergo] Goal typed_array_check_FAIL : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigned_glob_array_check_FAIL : Unsuccess
-[wp] [Alt-Ergo] Goal typed_assigned_glob_array_check_OK : Valid
[wp] [Alt-Ergo] Goal typed_assigned_glob_atomic_check_FAIL : Unsuccess
[wp] [Alt-Ergo] Goal typed_assigned_glob_atomic_check_OK : Valid
[wp] [Alt-Ergo] Goal typed_assigned_glob_comp_check_FAIL : Unsuccess
[wp] [Alt-Ergo] Goal typed_assigned_glob_comp_check_OK : Valid
-[wp] [Alt-Ergo] Goal typed_atomic_check_FAIL : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comp_check_FAIL : Unsuccess
+[wp] [Alt-Ergo] Goal typed_assigned_glob_array_check_FAIL : Unsuccess
+[wp] [Alt-Ergo] Goal typed_assigned_glob_array_check_OK : Valid
[wp] Proved goals: 3 / 9
Qed: 0
Alt-Ergo: 3 (unsuccess: 6)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memvar.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memvar.res.oracle
index f7b59bf049bd1f27aaa6c3f7477e04b92b54476d..e5a1208fc8f44c52782c44786da7d621138f1091 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memvar.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/assigned_not_initialized_memvar.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_array_check_FAIL : Unsuccess
[wp] [Alt-Ergo] Goal typed_atomic_check_FAIL : Unsuccess
[wp] [Alt-Ergo] Goal typed_comp_check_FAIL : Unsuccess
+[wp] [Alt-Ergo] Goal typed_array_check_FAIL : Unsuccess
[wp] Proved goals: 0 / 3
Alt-Ergo: 0 (unsuccess: 3)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.res.oracle
index be66e97ea6ad2bddd1fb2fb3b937e6c0951c441f..a91b7a0149b5b87b9fc08bf7b402236915adc151 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise.res.oracle
@@ -11,27 +11,27 @@
[wp] [Qed] Goal typed_band_bit2_ensures_band4 : Valid
[wp] [Qed] Goal typed_band_bit3_ensures_band5 : Valid
[wp] [Qed] Goal typed_band_bit4_ensures_band6 : Valid
-[wp] [Alt-Ergo] Goal typed_band_bool_false_ensures : Valid
-[wp] [Qed] Goal typed_band_bool_true_ensures : Valid
-[wp] [Qed] Goal typed_bnot_ensures : Valid
[wp] [Qed] Goal typed_bor_ensures : Valid
[wp] [Qed] Goal typed_bor_ensures_bor0 : Valid
[wp] [Qed] Goal typed_bor_bit1_ensures_bor1 : Valid
[wp] [Qed] Goal typed_bor_bit2_ensures_bor2 : Valid
[wp] [Qed] Goal typed_bor_bit3_ensures_bor3 : Valid
-[wp] [Alt-Ergo] Goal typed_bor_bool_false_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_bor_bool_true_ensures : Valid
[wp] [Qed] Goal typed_bxor_ensures : Valid
[wp] [Qed] Goal typed_bxor_bit1_ensures : Valid
[wp] [Qed] Goal typed_bxor_bit2_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_bxor_bool_false_ensures : Valid
-[wp] [Qed] Goal typed_bxor_bool_true_ensures : Valid
+[wp] [Qed] Goal typed_bnot_ensures : Valid
[wp] [Qed] Goal typed_lshift_ensures : Valid
[wp] [Qed] Goal typed_lshift_shift1_ensures_lsl1 : Valid
[wp] [Qed] Goal typed_lshift_shift1_ensures_lsl2 : Valid
[wp] [Qed] Goal typed_lshift_shift2_ensures_lsl3 : Valid
[wp] [Qed] Goal typed_rshift_ensures : Valid
[wp] [Qed] Goal typed_rshift_shift1_ensures_lsr1 : Valid
+[wp] [Alt-Ergo] Goal typed_bor_bool_true_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_bor_bool_false_ensures : Valid
+[wp] [Qed] Goal typed_band_bool_true_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_band_bool_false_ensures : Valid
+[wp] [Qed] Goal typed_bxor_bool_true_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_bxor_bool_false_ensures : Valid
[wp] Proved goals: 29 / 29
Qed: 25
Alt-Ergo: 4
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.res.oracle
index da0936200fd220b116561c80332d57bcd091f63b..950c758b70c5295e2c48394f5367085488c07c9f 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/equal.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Alt-Ergo] Goal typed_simple_array_ensures : Valid
[wp] [Qed] Goal typed_simple_struct_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_simple_array_ensures : Valid
[wp] [Alt-Ergo] Goal typed_with_array_struct_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_with_ptr_and_array_struct_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_with_ptr_array_ensures : Valid
[wp] [Alt-Ergo] Goal typed_with_ptr_struct_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_with_ptr_array_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_with_ptr_and_array_struct_ensures : Valid
[wp] Proved goals: 6 / 6
Qed: 1
Alt-Ergo: 5
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.res.oracle
index 484d3489bb0e59e2bcdad1acd13dd15d78276e1b..0bf8482694768045a032e0ddceb752fb2a1dac83 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.0.res.oracle
@@ -9,6 +9,9 @@
[wp] [Alt-Ergo] Goal typed_lemma_test_double_compare_greater : Valid
[wp] [Alt-Ergo] Goal typed_lemma_test_float_compare : Valid
[wp] [Alt-Ergo] Goal typed_lemma_test_float_compare_greater : Valid
+[wp] [Alt-Ergo] Goal typed_cmp_ff_ensures_DEF : Valid
+[wp] [Alt-Ergo] Goal typed_cmp_ff_ensures_REL1 : Valid
+[wp] [Alt-Ergo] Goal typed_cmp_ff_ensures_REL2 : Valid
[wp] [Alt-Ergo] Goal typed_cmp_dd_ensures_DEF : Valid
[wp] [Alt-Ergo] Goal typed_cmp_dd_ensures_REL1 : Valid
[wp] [Alt-Ergo] Goal typed_cmp_dd_ensures_REL2 : Valid
@@ -17,9 +20,6 @@
[wp] [Alt-Ergo] Goal typed_cmp_fd_ensures_REL2 : Valid
[wp] [Alt-Ergo] Goal typed_cmp_fd_assert : Valid
[wp] [Alt-Ergo] Goal typed_cmp_fd_assert_2 : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_ff_ensures_DEF : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_ff_ensures_REL1 : Valid
-[wp] [Alt-Ergo] Goal typed_cmp_ff_ensures_REL2 : Valid
[wp] [Qed] Goal typed_cmp_fnan_ensures_POS : Valid
[wp] [Qed] Goal typed_cmp_fnan_ensures_NEG : Valid
[wp] Proved goals: 19 / 19
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.1.res.oracle
index 37aaf32ef37285871060a657e05dc53df980ec39..27675ba0b6830fff79c02e047b5d86136f7f0eee 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_compare.1.res.oracle
@@ -9,6 +9,9 @@
[wp] [Alt-Ergo] Goal typed_real_lemma_test_double_compare_greater : Valid
[wp] [Alt-Ergo] Goal typed_real_lemma_test_float_compare : Valid
[wp] [Alt-Ergo] Goal typed_real_lemma_test_float_compare_greater : Valid
+[wp] [Qed] Goal typed_real_cmp_ff_ensures_DEF : Valid
+[wp] [Qed] Goal typed_real_cmp_ff_ensures_REL1 : Valid
+[wp] [Qed] Goal typed_real_cmp_ff_ensures_REL2 : Valid
[wp] [Qed] Goal typed_real_cmp_dd_ensures_DEF : Valid
[wp] [Qed] Goal typed_real_cmp_dd_ensures_REL1 : Valid
[wp] [Qed] Goal typed_real_cmp_dd_ensures_REL2 : Valid
@@ -17,9 +20,6 @@
[wp] [Qed] Goal typed_real_cmp_fd_ensures_REL2 : Valid
[wp] [Qed] Goal typed_real_cmp_fd_assert : Valid
[wp] [Qed] Goal typed_real_cmp_fd_assert_2 : Valid
-[wp] [Qed] Goal typed_real_cmp_ff_ensures_DEF : Valid
-[wp] [Qed] Goal typed_real_cmp_ff_ensures_REL1 : Valid
-[wp] [Qed] Goal typed_real_cmp_ff_ensures_REL2 : Valid
[wp] [Qed] Goal typed_real_cmp_fnan_ensures_POS : Valid
[wp] [Qed] Goal typed_real_cmp_fnan_ensures_NEG : Valid
[wp] Proved goals: 19 / 19
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_const.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_const.res.oracle
index a5148398dc49ac2d163ebf312c3891f6f01807ec..ff8fe2744f860a45392f3658b1e2e6f238fb2b38 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_const.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/float_const.res.oracle
@@ -6,14 +6,14 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 8 goals scheduled
-[wp] [Alt-Ergo] Goal typed_double_convertible_check : Valid
-[wp] [Alt-Ergo] Goal typed_double_convertible_check_2 : Valid
-[wp] [Alt-Ergo] Goal typed_double_convertible_check_3 : Valid
-[wp] [Alt-Ergo] Goal typed_double_convertible_check_4 : Valid
[wp] [Alt-Ergo] Goal typed_float_convertible_check : Valid
[wp] [Alt-Ergo] Goal typed_float_convertible_check_2 : Valid
[wp] [Alt-Ergo] Goal typed_float_convertible_check_3 : Valid
[wp] [Alt-Ergo] Goal typed_float_convertible_check_4 : Valid
+[wp] [Alt-Ergo] Goal typed_double_convertible_check : Valid
+[wp] [Alt-Ergo] Goal typed_double_convertible_check_2 : Valid
+[wp] [Alt-Ergo] Goal typed_double_convertible_check_3 : Valid
+[wp] [Alt-Ergo] Goal typed_double_convertible_check_4 : Valid
[wp] Proved goals: 8 / 8
Qed: 0
Alt-Ergo: 8
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/generalized_checks.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/generalized_checks.res.oracle
index f34b9052819a59cc9fbaf75fec6c23f9b8379308..ee38ba7972748686bc43809b5174f8930279ea0e 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/generalized_checks.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/generalized_checks.res.oracle
@@ -5,6 +5,12 @@
[wp] 17 goals scheduled
[wp] [Alt-Ergo] Goal typed_check_lemma_C_ko : Unsuccess
[wp] [Alt-Ergo] Goal typed_lemma_L_ko : Unsuccess
+[wp] [Alt-Ergo] Goal typed_job_ensures_B : Valid
+[wp] [Alt-Ergo] Goal typed_job_check_ensures_CB1 : Valid
+[wp] [Alt-Ergo] Goal typed_job_check_ensures_CB2_ko : Unsuccess
+[wp] [Qed] Goal typed_job_assigns_exit : Valid
+[wp] [Qed] Goal typed_job_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_job_assigns_normal_part2 : Valid
[wp] [Qed] Goal typed_caller_ensures_R : Valid
[wp] [Alt-Ergo] Goal typed_caller_ensures_R1_ko : Unsuccess
[wp] [Alt-Ergo] Goal typed_caller_ensures_R2_ko : Unsuccess
@@ -14,12 +20,6 @@
[wp] [Qed] Goal typed_caller_call_job_requires_A : Valid
[wp] [Qed] Goal typed_caller_call_job_check_requires_CA1 : Valid
[wp] [Alt-Ergo] Goal typed_caller_call_job_check_requires_CA2_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_job_ensures_B : Valid
-[wp] [Alt-Ergo] Goal typed_job_check_ensures_CB1 : Valid
-[wp] [Alt-Ergo] Goal typed_job_check_ensures_CB2_ko : Unsuccess
-[wp] [Qed] Goal typed_job_assigns_exit : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_job_assigns_normal_part2 : Valid
[wp] Proved goals: 11 / 17
Qed: 9
Alt-Ergo: 2 (unsuccess: 6)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.res.oracle
index 880080271e2c5cd391bb557894a1b906aef43a6b..e48f553e2947fc9590f4931437b4a48767d92ff5 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_label.res.oracle
@@ -5,10 +5,10 @@
No code nor implicit assigns clause for function main, generating default assigns from the prototype
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Alt-Ergo] Goal typed_extra_ensures_KO : Unsuccess
-[wp] [Qed] Goal typed_foreign_ensures_OK : Valid
-[wp] [Alt-Ergo] Goal typed_job_ensures_OK : Valid
[wp] [Qed] Goal typed_main_requires_OK : Valid
+[wp] [Alt-Ergo] Goal typed_job_ensures_OK : Valid
+[wp] [Qed] Goal typed_foreign_ensures_OK : Valid
+[wp] [Alt-Ergo] Goal typed_extra_ensures_KO : Unsuccess
[wp] Proved goals: 3 / 4
Qed: 2
Alt-Ergo: 1 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.res.oracle
index b396aef3b543d85d0aaf92e4d9d7cb596dbc7be0..d6bc501d6c9ad682aa1542e85bb31d2df4ed5cf6 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.0.res.oracle
@@ -3,10 +3,6 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 24 goals scheduled
-[wp] [Qed] Goal typed_fa1_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_fa2_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_fa3_ensures_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_fs1_ensures_qed_ok : Valid
[wp] [Qed] Goal typed_main_requires_qed_ok_Struct_Simple_a : Valid
[wp] [Qed] Goal typed_main_requires_qed_ok_Struct_Simple_b : Valid
[wp] [Qed] Goal typed_main_requires_qed_ok_Simple_Array_0 : Valid
@@ -27,6 +23,10 @@
[wp] [Qed] Goal typed_main_requires_qed_ok_4 : Valid
[wp] [Alt-Ergo] Goal typed_main_requires_qed_ok_5 : Valid
[wp] [Qed] Goal typed_main_requires_qed_ok_direct_init_union : Valid
+[wp] [Qed] Goal typed_fa1_ensures_qed_ok : Valid
+[wp] [Qed] Goal typed_fa2_ensures_qed_ok : Valid
+[wp] [Qed] Goal typed_fa3_ensures_qed_ok : Valid
+[wp] [Alt-Ergo] Goal typed_fs1_ensures_qed_ok : Valid
[wp] Proved goals: 24 / 24
Qed: 19
Alt-Ergo: 5
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.res.oracle
index 853a40b3b238555f8881d827cd75486cd7fbec92..3d74eca2ac3488de79a65c2b32cf9e21149e3922 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/init_value.1.res.oracle
@@ -3,15 +3,6 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 18 goals scheduled
-[wp] [Alt-Ergo] Goal typed_fa1_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa1_ensures_qed_ko_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa2_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa2_ensures_qed_ko_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa3_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa3_ensures_qed_ko_2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fa3_ensures_qed_ko_3 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fs1_ensures_qed_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_fs1_ensures_qed_ko_2 : Unsuccess
[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_Sc_eq_ko : Unsuccess
[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_Sc_t : Unsuccess
[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_Sc_c_2 : Unsuccess
@@ -21,6 +12,15 @@
[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_T1_6 : Unsuccess
[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_indirect_init_union_b : Unsuccess
[wp] [Alt-Ergo] Goal typed_main_ko_requires_qed_ko_indirect_init_union_t : Unsuccess
+[wp] [Alt-Ergo] Goal typed_fa1_ensures_qed_ko : Unsuccess
+[wp] [Alt-Ergo] Goal typed_fa1_ensures_qed_ko_2 : Unsuccess
+[wp] [Alt-Ergo] Goal typed_fa2_ensures_qed_ko : Unsuccess
+[wp] [Alt-Ergo] Goal typed_fa2_ensures_qed_ko_2 : Unsuccess
+[wp] [Alt-Ergo] Goal typed_fa3_ensures_qed_ko : Unsuccess
+[wp] [Alt-Ergo] Goal typed_fa3_ensures_qed_ko_2 : Unsuccess
+[wp] [Alt-Ergo] Goal typed_fa3_ensures_qed_ko_3 : Unsuccess
+[wp] [Alt-Ergo] Goal typed_fs1_ensures_qed_ko : Unsuccess
+[wp] [Alt-Ergo] Goal typed_fs1_ensures_qed_ko_2 : Unsuccess
[wp] Proved goals: 0 / 18
Alt-Ergo: 0 (unsuccess: 18)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_memtyped.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_memtyped.res.oracle
index 11647c01b3df9fbfe42ee0f3c1b6ba4a787cb00b..88684268b9cb445cdfdf9909b4e607ac18a0664f 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_memtyped.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/initialized_memtyped.res.oracle
@@ -3,11 +3,6 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 28 goals scheduled
-[wp] [Alt-Ergo] Goal typed_formal_assert_provable : Valid
-[wp] [Alt-Ergo] Goal typed_glob_arr_ensures_provable : Valid
-[wp] [Alt-Ergo] Goal typed_glob_arr_ensures_unknown : Unsuccess
-[wp] [Alt-Ergo] Goal typed_glob_var_ensures_provable : Valid
-[wp] [Alt-Ergo] Goal typed_glob_var_ensures_unknown : Unsuccess
[wp] [Alt-Ergo] Goal typed_test_check_unknown : Unsuccess
[wp] [Alt-Ergo] Goal typed_test_check_unknown_2 : Unsuccess
[wp] [Alt-Ergo] Goal typed_test_check_unknown_3 : Unsuccess
@@ -31,6 +26,11 @@
[wp] [Alt-Ergo] Goal typed_test_check_provable_3 : Valid
[wp] [Alt-Ergo] Goal typed_test_check_unknown_13 : Unsuccess
[wp] [Alt-Ergo] Goal typed_test_check_provable_4 : Valid
+[wp] [Alt-Ergo] Goal typed_glob_var_ensures_provable : Valid
+[wp] [Alt-Ergo] Goal typed_glob_var_ensures_unknown : Unsuccess
+[wp] [Alt-Ergo] Goal typed_glob_arr_ensures_provable : Valid
+[wp] [Alt-Ergo] Goal typed_glob_arr_ensures_unknown : Unsuccess
+[wp] [Alt-Ergo] Goal typed_formal_assert_provable : Valid
[wp] Proved goals: 13 / 28
Qed: 6
Alt-Ergo: 7 (unsuccess: 15)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/invalid_pointer.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/invalid_pointer.res.oracle
index e4c9550dc034c193d936035c2d76d20a7b552be6..089501d0a3a6713dce8e372db5c147a9a61e7bbb 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/invalid_pointer.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/invalid_pointer.res.oracle
@@ -4,6 +4,15 @@
[wp] Warning: Missing RTE guards
[wp] tests/wp_acsl/invalid_pointer.c:21: Warning: void object
[wp] 19 goals scheduled
+[wp] [Qed] Goal typed_memvar_check_M1 : Valid
+[wp] [Qed] Goal typed_memvar_check_P0 : Valid
+[wp] [Qed] Goal typed_memvar_check_P1 : Valid
+[wp] [Qed] Goal typed_memvar_check_P2 : Valid
+[wp] [Alt-Ergo] Goal typed_pointer_check_M1 : Valid
+[wp] [Alt-Ergo] Goal typed_pointer_check_P0 : Valid
+[wp] [Alt-Ergo] Goal typed_pointer_check_P1 : Valid
+[wp] [Alt-Ergo] Goal typed_pointer_check_P2 : Valid
+[wp] [Alt-Ergo] Goal typed_pointer_check_NULL : Valid
[wp] [Alt-Ergo] Goal typed_array_check_ARR : Valid
[wp] [Qed] Goal typed_compound_check_M1 : Valid
[wp] [Qed] Goal typed_compound_check_P0 : Valid
@@ -14,15 +23,6 @@
[wp] [Alt-Ergo] Goal typed_compound_check_F2 : Valid
[wp] [Alt-Ergo] Goal typed_compound_check_G2 : Valid
[wp] [Qed] Goal typed_compound_check_AM : Valid
-[wp] [Qed] Goal typed_memvar_check_M1 : Valid
-[wp] [Qed] Goal typed_memvar_check_P0 : Valid
-[wp] [Qed] Goal typed_memvar_check_P1 : Valid
-[wp] [Qed] Goal typed_memvar_check_P2 : Valid
-[wp] [Alt-Ergo] Goal typed_pointer_check_M1 : Valid
-[wp] [Alt-Ergo] Goal typed_pointer_check_P0 : Valid
-[wp] [Alt-Ergo] Goal typed_pointer_check_P1 : Valid
-[wp] [Alt-Ergo] Goal typed_pointer_check_P2 : Valid
-[wp] [Alt-Ergo] Goal typed_pointer_check_NULL : Valid
[wp] Proved goals: 19 / 19
Qed: 9
Alt-Ergo: 10
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.res.oracle
index b078d29e16536e7b77f3c3bab70fe92865f4a775..9e0fd3122c659339481553df508465ea91fdba64 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.0.res.oracle
@@ -7,15 +7,15 @@
[wp] tests/wp_acsl/pointer.i:49: Warning:
Uncomparable locations p_0 and mem:t.(0)
[wp] 9 goals scheduled
-[wp] [Alt-Ergo] Goal typed_ref_absurd_ensures_qed_ko_Base_oracle_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_ref_absurd_ensures_qed_ko_Comp_oracle_ko : Unsuccess
[wp] [Qed] Goal typed_ref_array_ensures_Lt : Valid
[wp] [Qed] Goal typed_ref_array_ensures_Le : Valid
[wp] [Qed] Goal typed_ref_array_ensures_Eq : Valid
-[wp] [Alt-Ergo] Goal typed_ref_mixed_array_pointer_ensures_qed_ko_Le_oracle_ko : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_ref_mixed_array_pointer_ensures_qed_ko_Lt_oracle_ko : Unsuccess (Stronger)
[wp] [Alt-Ergo] Goal typed_ref_pointer_ensures_qed_ko_Le_oracle_ko : Unsuccess
[wp] [Alt-Ergo] Goal typed_ref_pointer_ensures_qed_ko_Eq_oracle_ko : Unsuccess
+[wp] [Alt-Ergo] Goal typed_ref_mixed_array_pointer_ensures_qed_ko_Le_oracle_ko : Unsuccess (Stronger)
+[wp] [Alt-Ergo] Goal typed_ref_mixed_array_pointer_ensures_qed_ko_Lt_oracle_ko : Unsuccess (Stronger)
+[wp] [Alt-Ergo] Goal typed_ref_absurd_ensures_qed_ko_Base_oracle_ko : Unsuccess
+[wp] [Alt-Ergo] Goal typed_ref_absurd_ensures_qed_ko_Comp_oracle_ko : Unsuccess
[wp] Proved goals: 3 / 9
Qed: 3
Alt-Ergo: 0 (unsuccess: 6)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.res.oracle
index a902f3f43d88764dfdbbdf7b2001e00d89aa7d43..5e0172dd87d30107441b9959cdf9c1f5460443b4 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/pointer.1.res.oracle
@@ -7,15 +7,15 @@
[wp] tests/wp_acsl/pointer.i:49: Warning:
Uncomparable locations p_0 and mem:t.(0)
[wp] 9 goals scheduled
-[wp] [Alt-Ergo] Goal typed_absurd_ensures_qed_ko_Base_oracle_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_absurd_ensures_qed_ko_Comp_oracle_ko : Unsuccess
[wp] [Qed] Goal typed_array_ensures_Lt : Valid
[wp] [Qed] Goal typed_array_ensures_Le : Valid
[wp] [Qed] Goal typed_array_ensures_Eq : Valid
-[wp] [Alt-Ergo] Goal typed_mixed_array_pointer_ensures_qed_ko_Le_oracle_ko : Unsuccess (Stronger)
-[wp] [Alt-Ergo] Goal typed_mixed_array_pointer_ensures_qed_ko_Lt_oracle_ko : Unsuccess (Stronger)
[wp] [Alt-Ergo] Goal typed_pointer_ensures_qed_ko_Le_oracle_ko : Unsuccess
[wp] [Alt-Ergo] Goal typed_pointer_ensures_qed_ko_Eq_oracle_ko : Unsuccess
+[wp] [Alt-Ergo] Goal typed_mixed_array_pointer_ensures_qed_ko_Le_oracle_ko : Unsuccess (Stronger)
+[wp] [Alt-Ergo] Goal typed_mixed_array_pointer_ensures_qed_ko_Lt_oracle_ko : Unsuccess (Stronger)
+[wp] [Alt-Ergo] Goal typed_absurd_ensures_qed_ko_Base_oracle_ko : Unsuccess
+[wp] [Alt-Ergo] Goal typed_absurd_ensures_qed_ko_Comp_oracle_ko : Unsuccess
[wp] Proved goals: 3 / 9
Qed: 3
Alt-Ergo: 0 (unsuccess: 6)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.res.oracle
index b27efefadcdec02581efc8bc21738d88dca0b834..24278f6c3aaaaf689932142d4c270d79f18cc1a7 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.0.res.oracle
@@ -39,26 +39,6 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 52 goals scheduled
-[wp] [Qed] Goal typed_bitwise_ensures_r_precedence_and_xor : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_l_precedence_and_xor : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_r_precedence_xor_or : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_l_precedence_xor_or : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_r_precedence_or_implies : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_l_precedence_or_implies : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_ok_r_precedence_implies_or : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_ok_since : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_r_assoc_implies : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_r_precedence_implies_equiv : Valid
-[wp] [Qed] Goal typed_bitwise_ensures_l_precedence_implies_equiv : Valid
-[wp] [Qed] Goal typed_comparison_ensures_chainable_lt_lt : Valid
-[wp] [Qed] Goal typed_comparison_ensures_chainable_le_le : Valid
-[wp] [Qed] Goal typed_comparison_ensures_chainable_gt_gt : Valid
-[wp] [Qed] Goal typed_comparison_ensures_chainable_ge_ge : Valid
-[wp] [Qed] Goal typed_comparison_ensures_chainable_eq_eq : Valid
-[wp] [Qed] Goal typed_comparison_ensures_r_precedence_eq_and : Valid
-[wp] [Qed] Goal typed_comparison_ensures_l_precedence_eq_and : Valid
-[wp] [Qed] Goal typed_comparison_ensures_r_precedence_neq_and : Valid
-[wp] [Qed] Goal typed_comparison_ensures_l_precedence_neq_and : Valid
[wp] [Qed] Goal typed_predicate_ensures_r_precedence_and_xor : Valid
[wp] [Qed] Goal typed_predicate_ensures_l_precedence_and_xor : Valid
[wp] [Qed] Goal typed_predicate_ensures_r_precedence_xor_or : Valid
@@ -89,6 +69,26 @@
[wp] [Qed] Goal typed_predicate_ensures_scope_let : Valid
[wp] [Qed] Goal typed_predicate_ensures_scope_let_2 : Valid
[wp] [Qed] Goal typed_predicate_ensures_r_precedence_ite_naming : Valid
+[wp] [Qed] Goal typed_comparison_ensures_chainable_lt_lt : Valid
+[wp] [Qed] Goal typed_comparison_ensures_chainable_le_le : Valid
+[wp] [Qed] Goal typed_comparison_ensures_chainable_gt_gt : Valid
+[wp] [Qed] Goal typed_comparison_ensures_chainable_ge_ge : Valid
+[wp] [Qed] Goal typed_comparison_ensures_chainable_eq_eq : Valid
+[wp] [Qed] Goal typed_comparison_ensures_r_precedence_eq_and : Valid
+[wp] [Qed] Goal typed_comparison_ensures_l_precedence_eq_and : Valid
+[wp] [Qed] Goal typed_comparison_ensures_r_precedence_neq_and : Valid
+[wp] [Qed] Goal typed_comparison_ensures_l_precedence_neq_and : Valid
+[wp] [Qed] Goal typed_bitwise_ensures_r_precedence_and_xor : Valid
+[wp] [Qed] Goal typed_bitwise_ensures_l_precedence_and_xor : Valid
+[wp] [Qed] Goal typed_bitwise_ensures_r_precedence_xor_or : Valid
+[wp] [Qed] Goal typed_bitwise_ensures_l_precedence_xor_or : Valid
+[wp] [Qed] Goal typed_bitwise_ensures_r_precedence_or_implies : Valid
+[wp] [Qed] Goal typed_bitwise_ensures_l_precedence_or_implies : Valid
+[wp] [Qed] Goal typed_bitwise_ensures_ok_r_precedence_implies_or : Valid
+[wp] [Qed] Goal typed_bitwise_ensures_ok_since : Valid
+[wp] [Qed] Goal typed_bitwise_ensures_r_assoc_implies : Valid
+[wp] [Qed] Goal typed_bitwise_ensures_r_precedence_implies_equiv : Valid
+[wp] [Qed] Goal typed_bitwise_ensures_l_precedence_implies_equiv : Valid
[wp] [Qed] Goal typed_predicate_bitwise_ensures_r_precedence_equiv_Pand : Valid
[wp] [Qed] Goal typed_predicate_bitwise_ensures_l_precedence_equiv_Pand : Valid
[wp] Proved goals: 52 / 52
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.res.oracle
index 16f68c44ff1103550d1ef4717329ba069b96c1e1..1aa717f83fed226738c1ce9aaeaabf722f6e8206 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/precedence.1.res.oracle
@@ -39,20 +39,6 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 37 goals scheduled
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_precedence_xor_and : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_r_precedence_xor_and : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_precedence_or_xor : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_r_precedence_or_xor : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_precedence_implies_or : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_assoc_implies : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_r_precedence_equiv_implies : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_precedence_equiv_implies : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_r_precedence_and_eq : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_l_precedence_and_eq : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_l_nonassoc_eq : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_r_nonassoc_eq : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_r_precedence_and_neq : Unsuccess
-[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_l_precedence_and_neq : Unsuccess
[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_precedence_xor_and : Unsuccess
[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_r_precedence_xor_and : Unsuccess
[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_precedence_or_xor : Unsuccess
@@ -76,6 +62,20 @@
[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_m_precedence_let_ite : Unsuccess
[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_precedence_let_ite : Unsuccess
[wp] [Alt-Ergo] Goal typed_predicate_ensures_ko_l_assoc_naming : Unsuccess
+[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_r_precedence_and_eq : Unsuccess
+[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_l_precedence_and_eq : Unsuccess
+[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_l_nonassoc_eq : Unsuccess
+[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_r_nonassoc_eq : Unsuccess
+[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_r_precedence_and_neq : Unsuccess
+[wp] [Alt-Ergo] Goal typed_comparison_ensures_ko_l_precedence_and_neq : Unsuccess
+[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_precedence_xor_and : Unsuccess
+[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_r_precedence_xor_and : Unsuccess
+[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_precedence_or_xor : Unsuccess
+[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_r_precedence_or_xor : Unsuccess
+[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_precedence_implies_or : Unsuccess
+[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_assoc_implies : Unsuccess
+[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_r_precedence_equiv_implies : Unsuccess
+[wp] [Alt-Ergo] Goal typed_bitwise_ensures_ko_l_precedence_equiv_implies : Unsuccess
[wp] Proved goals: 0 / 37
Alt-Ergo: 0 (unsuccess: 37)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.res.oracle
index 9befe574b90fbf4b38a3b69e13fbd0b75468134c..119c06c6c1dfbb48898ce45bc196e5c3689084ff 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.0.res.oracle
@@ -5,11 +5,11 @@
[wp] 7 goals scheduled
[wp] [Alt-Ergo] Goal typed_f_ensures_qed_ok : Valid
[wp] [Alt-Ergo] Goal typed_g_ensures_qed_ok : Valid
-[wp] [Qed] Goal typed_modifies_x_ensures_qed_ok_F_OK : Valid
-[wp] [Alt-Ergo] Goal typed_modifies_x_ensures_qed_ok_W_OK_todo : Unsuccess
[wp] [Qed] Goal typed_modifies_y_ensures_qed_ok_F_OK : Valid
[wp] [Qed] Goal typed_modifies_y_ensures_qed_ok_G_OK : Valid
[wp] [Alt-Ergo] Goal typed_modifies_y_ensures_qed_ok_W_OK_todo : Unsuccess
+[wp] [Qed] Goal typed_modifies_x_ensures_qed_ok_F_OK : Valid
+[wp] [Alt-Ergo] Goal typed_modifies_x_ensures_qed_ok_W_OK_todo : Unsuccess
[wp] Proved goals: 5 / 7
Qed: 3
Alt-Ergo: 2 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.res.oracle
index 11234264105999b92326127758f4ef34bfb4efbc..213fdec4cb23e08311a46680cd43fd429fcbdb8b 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/reads.1.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
+[wp] [Alt-Ergo] Goal typed_modifies_y_ensures_qed_ko_H_KO : Unsuccess
[wp] [Alt-Ergo] Goal typed_modifies_x_ensures_qed_ko_G_KO : Unsuccess
[wp] [Alt-Ergo] Goal typed_modifies_x_ensures_qed_ko_H_KO : Unsuccess
-[wp] [Alt-Ergo] Goal typed_modifies_y_ensures_qed_ko_H_KO : Unsuccess
[wp] Proved goals: 0 / 3
Alt-Ergo: 0 (unsuccess: 3)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.res.oracle
index 7db00e97afe6aebfc022b51f22d7aebc7a7e823e..514d6f40bcb0115e003f31c0188db30b84330fa2 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/simpl_is_type.res.oracle
@@ -3,9 +3,6 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 18 goals scheduled
-[wp] [Alt-Ergo] Goal typed_check_acsl_check_ok_C1_absurd_is_cint : Valid
-[wp] [Alt-Ergo] Goal typed_check_acsl_check_ok_C2_absurd_is_cint : Valid
-[wp] [Qed] Goal typed_check_acsl_check_ok_C5_absurd_cmp : Valid
[wp] [Alt-Ergo] Goal typed_f_ensures : Valid
[wp] [Alt-Ergo] Goal typed_f_loop_invariant_preserved : Valid
[wp] [Qed] Goal typed_f_loop_invariant_established : Valid
@@ -21,6 +18,9 @@
[wp] [Alt-Ergo] Goal typed_g_loop_invariant_2_preserved : Valid
[wp] [Qed] Goal typed_g_loop_invariant_2_established : Valid
[wp] [Qed] Goal typed_g_loop_assigns : Valid
+[wp] [Alt-Ergo] Goal typed_check_acsl_check_ok_C1_absurd_is_cint : Valid
+[wp] [Alt-Ergo] Goal typed_check_acsl_check_ok_C2_absurd_is_cint : Valid
+[wp] [Qed] Goal typed_check_acsl_check_ok_C5_absurd_cmp : Valid
[wp] Proved goals: 18 / 18
Qed: 7
Alt-Ergo: 11
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.res.oracle
index d886facd8a83386e139679b749c597720893203f..e1fcca70b0a74d4ec83cc56da21c38db1866d05f 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/unit_bit_test.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
-[wp] [Qed] Goal typed_rotate_left_ensures_bit_zero : Valid
-[wp] [Alt-Ergo] Goal typed_rotate_left_ensures_other_bits : Valid
[wp] [Qed] Goal typed_sum_ensures_ok : Valid
[wp] [Alt-Ergo] Goal typed_sum_ensures_ko : Unsuccess
+[wp] [Qed] Goal typed_rotate_left_ensures_bit_zero : Valid
+[wp] [Alt-Ergo] Goal typed_rotate_left_ensures_other_bits : Valid
[wp] Proved goals: 3 / 4
Qed: 2
Alt-Ergo: 1 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_2110.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_2110.res.oracle
index 38acae5e6e428d50a0186a79f24373926e87e957..ccaf0802ca728955534bc9243cd74a446b58e60b 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_2110.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_2110.res.oracle
@@ -95,16 +95,15 @@ end
(* use frama_c_wp.memory.Memory *)
+ (* use S2_A *)
+
(* use Compound *)
goal wp_goal :
- forall t:int -> int, t1:addr -> int, a:addr, a1:addr, i:int.
- let a2 = shiftfield_F1_FD_pos a1 in
- let x = get t1 a2 in
- not x = i ->
- region (base a1) <= 0 ->
- region (base a) <= 0 ->
- linked t -> is_sint32 i -> is_sint32 x -> not invalid t a2 1 -> a2 = a
+ forall t:addr -> int, t1:addr -> int, a:addr.
+ let a1 = Load_S2_A a t in
+ let a2 = Load_S2_A a (havoc t1 t a 1) in
+ region (base a) <= 0 -> IsS2_A a1 -> IsS2_A a2 -> EqS2_A a2 a1
end
[wp:print-generated]
theory WP1
@@ -124,14 +123,15 @@ end
(* use frama_c_wp.memory.Memory *)
- (* use S2_A *)
-
(* use Compound *)
goal wp_goal :
- forall t:addr -> int, t1:addr -> int, a:addr.
- let a1 = Load_S2_A a t in
- let a2 = Load_S2_A a (havoc t1 t a 1) in
- region (base a) <= 0 -> IsS2_A a1 -> IsS2_A a2 -> EqS2_A a2 a1
+ forall t:int -> int, t1:addr -> int, a:addr, a1:addr, i:int.
+ let a2 = shiftfield_F1_FD_pos a1 in
+ let x = get t1 a2 in
+ not x = i ->
+ region (base a1) <= 0 ->
+ region (base a) <= 0 ->
+ linked t -> is_sint32 i -> is_sint32 x -> not invalid t a2 1 -> a2 = a
end
[wp] 2 goals generated
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.res.oracle
index 2dd56ced0525d32c285202bcaa24340617a20c2c..15fb0108e378694f738e976e4a1618109cb9519f 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts0708.res.oracle
@@ -12,12 +12,11 @@
f - 1 1 100%
------------------------------------------------------------
[wp] Running WP plugin...
-[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_f_ensures_A : Valid
+[wp] 1 goal scheduled
[wp] [Alt-Ergo] Goal typed_f_ensures_B : Valid
-[wp] Proved goals: 2 / 2
+[wp] Proved goals: 1 / 1
Qed: 0
- Alt-Ergo: 2
+ Alt-Ergo: 1
------------------------------------------------------------
Functions WP Alt-Ergo Total Success
f - 2 2 100%
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.res.oracle
index 3472cd3cdfd26d8ad9265ed4e98207fe7a0e12fb..0d96c29ae0cfc5a4764a83ebf72d2b57b8f48240 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1360.res.oracle
@@ -4,16 +4,16 @@
[rte] annotating function foo_correct
[rte] annotating function foo_wrong
[wp] 10 goals scheduled
-[wp] [Qed] Goal typed_foo_correct_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_foo_correct_assert_rte_mem_access : Valid
-[wp] [Qed] Goal typed_foo_correct_assert_rte_mem_access_2 : Valid
-[wp] [Qed] Goal typed_foo_correct_assert_rte_mem_access_3 : Valid
-[wp] [Qed] Goal typed_foo_correct_assigns : Valid
[wp] [Qed] Goal typed_foo_wrong_ensures : Valid
[wp] [Qed] Goal typed_foo_wrong_assert_rte_mem_access : Valid
[wp] [Qed] Goal typed_foo_wrong_assert_rte_mem_access_2 : Valid
[wp] [Alt-Ergo] Goal typed_foo_wrong_assert_rte_mem_access_3 : Unsuccess
[wp] [Qed] Goal typed_foo_wrong_assigns : Valid
+[wp] [Qed] Goal typed_foo_correct_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_foo_correct_assert_rte_mem_access : Valid
+[wp] [Qed] Goal typed_foo_correct_assert_rte_mem_access_2 : Valid
+[wp] [Qed] Goal typed_foo_correct_assert_rte_mem_access_3 : Valid
+[wp] [Qed] Goal typed_foo_correct_assigns : Valid
[wp] Proved goals: 9 / 10
Qed: 8
Alt-Ergo: 1 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.res.oracle
index 0b3c861aaa90fba8d43eb45dc097a8c531e129a4..c34b04935c1d1bddbbe582eea0d3fc8cfdc4f5ae 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1462.res.oracle
@@ -3,10 +3,6 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 13 goals scheduled
-[wp] [Qed] Goal typed_local_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_local_loop_invariant_established : Valid
-[wp] [Qed] Goal typed_local_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_local_loop_assigns_part2 : Valid
[wp] [Alt-Ergo] Goal typed_wrong_assert_for_value : Valid
[wp] [Alt-Ergo] Goal typed_wrong_loop_invariant_A_KO_preserved : Unsuccess
[wp] [Qed] Goal typed_wrong_loop_invariant_A_KO_established : Valid
@@ -16,6 +12,10 @@
[wp] [Qed] Goal typed_wrong_loop_invariant_C_established : Valid
[wp] [Alt-Ergo] Goal typed_wrong_assert_consequence_of_false_invariant : Valid
[wp] [Qed] Goal typed_wrong_loop_assigns : Valid
+[wp] [Qed] Goal typed_local_loop_invariant_preserved : Valid
+[wp] [Qed] Goal typed_local_loop_invariant_established : Valid
+[wp] [Qed] Goal typed_local_loop_assigns_part1 : Valid
+[wp] [Qed] Goal typed_local_loop_assigns_part2 : Valid
[wp] Proved goals: 12 / 13
Qed: 10
Alt-Ergo: 2 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.res.oracle
index 31ff857069fd4bcad307a94feb4622cc816f18de..91203bd8a7c316be36b9377c010047ff59f965b9 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.0.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
+[wp] [Alt-Ergo] Goal typed_local_frame_assert_ok : Valid
[wp] [Alt-Ergo] Goal typed_global_frame_ensures_sep_iff_ref : Unsuccess
[wp] [Alt-Ergo] Goal typed_global_frame_ensures_one_iff_ref : Unsuccess
[wp] [Qed] Goal typed_global_frame_ensures_zero_always : Valid
[wp] [Qed] Goal typed_global_frame_assert_ok : Valid
[wp] [Qed] Goal typed_global_frame_assert_ok_2 : Valid
-[wp] [Alt-Ergo] Goal typed_local_frame_assert_ok : Valid
[wp] Proved goals: 4 / 6
Qed: 3
Alt-Ergo: 1 (unsuccess: 2)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.res.oracle
index efbd5c95df37d1cf94c26e4381967f45fba7dfa3..e5edde37e9b7b942c93989d95bb6fd04d5118460 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1828.1.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
+[wp] [Alt-Ergo] Goal typed_ref_local_frame_assert_ok : Valid
[wp] [Qed] Goal typed_ref_global_frame_ensures_sep_iff_ref : Valid
[wp] [Qed] Goal typed_ref_global_frame_ensures_one_iff_ref : Valid
[wp] [Qed] Goal typed_ref_global_frame_ensures_zero_always : Valid
[wp] [Qed] Goal typed_ref_global_frame_assert_ok : Valid
[wp] [Qed] Goal typed_ref_global_frame_assert_ok_2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_local_frame_assert_ok : Valid
[wp] Proved goals: 6 / 6
Qed: 5
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.res.oracle
index 0f948292e59cef95e400626256c08b717ae197ff..9d615ddd682dd47aa3bb673b79d3b40cb090cb74 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.0.res.oracle
@@ -2,8 +2,8 @@
[kernel] Parsing tests/wp_bts/issue_143.i (no preprocessing)
[wp] Running WP plugin...
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_ok_because_inconsistent : Valid
[wp] [Alt-Ergo] Goal typed_lemma_ok_because_consistent : Valid
+[wp] [Alt-Ergo] Goal typed_lemma_ok_because_inconsistent : Valid
[wp] Proved goals: 2 / 2
Qed: 0
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.res.oracle
index c34591c0821fb4509b9c2ee41523e1306b521817..08841f4f3a5743e7882829ae4b5b2530c704ef60 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.1.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: native support for coq is deprecated, use tip instead
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_ok_because_inconsistent : Valid
[wp] [Alt-Ergo] Goal typed_lemma_ok_because_consistent : Valid
+[wp] [Alt-Ergo] Goal typed_lemma_ok_because_inconsistent : Valid
[wp] Proved goals: 2 / 2
Qed: 0
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.res.oracle
index 0f948292e59cef95e400626256c08b717ae197ff..9d615ddd682dd47aa3bb673b79d3b40cb090cb74 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.2.res.oracle
@@ -2,8 +2,8 @@
[kernel] Parsing tests/wp_bts/issue_143.i (no preprocessing)
[wp] Running WP plugin...
[wp] 2 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_ok_because_inconsistent : Valid
[wp] [Alt-Ergo] Goal typed_lemma_ok_because_consistent : Valid
+[wp] [Alt-Ergo] Goal typed_lemma_ok_because_inconsistent : Valid
[wp] Proved goals: 2 / 2
Qed: 0
Alt-Ergo: 2
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.3.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.3.res.oracle
index c4d6c3bd19213d9856ba2a9860cd15d6f0370988..376255d0dcbdd0874f047745de334d291a25548a 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.3.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_143.3.res.oracle
@@ -3,11 +3,11 @@
[wp] Running WP plugin...
[wp] Warning: native support for coq is deprecated, use tip instead
[wp] 2 goals scheduled
+[wp] [Coq (native)] Goal typed_lemma_ok_because_consistent : Failed
+ Command './tests/inexistant-prover' not found
[wp] [Coq] Goal typed_lemma_ok_because_inconsistent : Default tactic
[wp] [Coq (native)] Goal typed_lemma_ok_because_inconsistent : Failed
Command './tests/inexistant-prover' not found
-[wp] [Coq (native)] Goal typed_lemma_ok_because_consistent : Failed
- Command './tests/inexistant-prover' not found
[wp] Proved goals: 0 / 2
Coq (native): 0 (failed: 2)
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_825.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_825.res.oracle
index cdf10ae70906c92f74e87debe17d04066af1e9c6..2b809a025c2ffac3da40e70fc650e26459984b06 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_825.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_825.res.oracle
@@ -3,14 +3,14 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 8 goals scheduled
-[wp] [Alt-Ergo] Goal typed_issue_check_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_issue_check_ko_2 : Unsuccess
[wp] [Alt-Ergo] Goal typed_job_ensures : Unsuccess
[wp] [Qed] Goal typed_job_loop_invariant_preserved : Valid
[wp] [Qed] Goal typed_job_loop_invariant_established : Valid
[wp] [Qed] Goal typed_job_loop_assigns_part1 : Valid
[wp] [Alt-Ergo] Goal typed_job_loop_assigns_part2 : Unsuccess
[wp] [Qed] Goal typed_job_assigns : Valid
+[wp] [Alt-Ergo] Goal typed_issue_check_ko : Unsuccess
+[wp] [Alt-Ergo] Goal typed_issue_check_ko_2 : Unsuccess
[wp] Proved goals: 4 / 8
Qed: 4
Alt-Ergo: 0 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_837.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_837.res.oracle
index c8ec6fc55f27e36a0907309c57a6d9ed3f859773..64c3d264d8c78c5fc4f60fd53162e685061f1d06 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_837.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/issue_837.res.oracle
@@ -3,15 +3,15 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 9 goals scheduled
+[wp] [Qed] Goal typed_foo_assigns_part1 : Valid
+[wp] [Qed] Goal typed_foo_assigns_part2 : Valid
+[wp] [Qed] Goal typed_foo_assigns_part3 : Valid
+[wp] [Qed] Goal typed_foo_assigns_part4 : Valid
[wp] [Qed] Goal typed_bar_assigns_part1 : Valid
[wp] [Qed] Goal typed_bar_assigns_part2 : Valid
[wp] [Qed] Goal typed_bar_assigns_part3 : Valid
[wp] [Qed] Goal typed_bar_assigns_part4 : Valid
[wp] [Qed] Goal typed_bar_assigns_part5 : Valid
-[wp] [Qed] Goal typed_foo_assigns_part1 : Valid
-[wp] [Qed] Goal typed_foo_assigns_part2 : Valid
-[wp] [Qed] Goal typed_foo_assigns_part3 : Valid
-[wp] [Qed] Goal typed_foo_assigns_part4 : Valid
[wp] Proved goals: 9 / 9
Qed: 9
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/find.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/find.res.oracle
index e0c5b20b99e274c837850814d215b2f00fee3c5e..b8198f111f13136e793f65b38dfee5cbd67a1d9d 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/find.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/find.res.oracle
@@ -19,9 +19,9 @@
[wp] Goal typed_find_loop_assigns : trivial
[wp] Goal typed_find_loop_variant_decrease : not tried
[wp] Goal typed_find_loop_variant_positive : not tried
+[wp] Goal typed_find_not_found_ensures : not tried
[wp] Goal typed_find_found_ensures : not tried
[wp] Goal typed_find_found_ensures_2 : not tried
-[wp] Goal typed_find_not_found_ensures : not tried
[wp] Goal typed_find_ptr_complete_found_not_found : trivial
[wp] Goal typed_find_ptr_disjoint_found_not_found : trivial
[wp] Goal typed_find_ptr_ensures_Range : not tried
@@ -37,9 +37,9 @@
[wp] Goal typed_find_ptr_loop_assigns : trivial
[wp] Goal typed_find_ptr_loop_variant_decrease : not tried
[wp] Goal typed_find_ptr_loop_variant_positive : not tried
+[wp] Goal typed_find_ptr_not_found_ensures : not tried
[wp] Goal typed_find_ptr_found_ensures : not tried
[wp] Goal typed_find_ptr_found_ensures_2 : not tried
-[wp] Goal typed_find_ptr_not_found_ensures : not tried
[wp] Goal typed_iter_ptr_ensures_Last : not tried
[wp] Goal typed_iter_ptr_loop_invariant_Range_preserved : not tried
[wp] Goal typed_iter_ptr_loop_invariant_Range_established : not tried
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.simplified.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.simplified.res.oracle
index 21850665dd122865783a31dd2f3cc8a23dfb02cc..fb3bb56176fc1dab5f0860370d48c9f6384ab68a 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.simplified.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_exo3_solved.simplified.res.oracle
@@ -35,5 +35,5 @@
[wp] Goal typed_pair_loop_variant_positive : not tried
[wp] Goal typed_pair_loop_variant_2_decrease : not tried
[wp] Goal typed_pair_loop_variant_2_positive : not tried
-[wp] Goal typed_pair_has_pair_ensures : not tried
[wp] Goal typed_pair_no_pair_ensures : not tried
+[wp] Goal typed_pair_has_pair_ensures : not tried
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_hashtbl_solved.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_hashtbl_solved.res.oracle
index a73f6deff1e986ca843364662c85eba648bb5c54..b4db2ed7bddb4b89ef0bb5252ec75a712daea063 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/frama_c_hashtbl_solved.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/frama_c_hashtbl_solved.res.oracle
@@ -7,60 +7,6 @@
[rte] annotating function init
[rte] annotating function mem_binding
[rte] annotating function size
-[wp] Goal typed_add_complete_full_nominal : not tried
-[wp] Goal typed_add_disjoint_full_nominal : not tried
-[wp] Goal typed_add_assert_rte_index_bound : not tried
-[wp] Goal typed_add_assert_rte_mem_access : not tried
-[wp] Goal typed_add_assert_rte_index_bound_2 : not tried
-[wp] Goal typed_add_assert_rte_index_bound_3 : not tried
-[wp] Goal typed_add_assert_rte_index_bound_4 : not tried
-[wp] Goal typed_add_assert_rte_index_bound_5 : not tried
-[wp] Goal typed_add_assert_rte_mem_access_2 : not tried
-[wp] Goal typed_add_assert_rte_mem_access_3 : not tried
-[wp] Goal typed_add_assert_rte_index_bound_6 : not tried
-[wp] Goal typed_add_assert_rte_mem_access_4 : not tried
-[wp] Goal typed_add_assert_rte_mem_access_5 : not tried
-[wp] Goal typed_add_assert_rte_signed_overflow : not tried
-[wp] Goal typed_add_assert_rte_mem_access_6 : not tried
-[wp] Goal typed_add_assert_rte_mem_access_7 : not tried
-[wp] Goal typed_add_assert_rte_signed_overflow_2 : not tried
-[wp] Goal typed_add_assigns_exit : trivial
-[wp] Goal typed_add_assigns_normal_part1 : trivial
-[wp] Goal typed_add_assigns_normal_part2 : not tried
-[wp] Goal typed_add_assigns_normal_part3 : not tried
-[wp] Goal typed_add_assigns_normal_part4 : not tried
-[wp] Goal typed_add_assigns_normal_part5 : not tried
-[wp] Goal typed_add_assigns_normal_part6 : not tried
-[wp] Goal typed_add_assigns_normal_part7 : not tried
-[wp] Goal typed_add_assigns_normal_part8 : not tried
-[wp] Goal typed_add_assigns_normal_part9 : not tried
-[wp] Goal typed_add_call_hash_requires : not tried
-[wp] Goal typed_add_full_ensures : not tried
-[wp] Goal typed_add_full_assigns_exit : trivial
-[wp] Goal typed_add_full_assigns_normal_part1 : trivial
-[wp] Goal typed_add_full_assigns_normal_part2 : not tried
-[wp] Goal typed_add_full_assigns_normal_part3 : not tried
-[wp] Goal typed_add_full_assigns_normal_part4 : not tried
-[wp] Goal typed_add_full_assigns_normal_part5 : not tried
-[wp] Goal typed_add_full_assigns_normal_part6 : not tried
-[wp] Goal typed_add_full_assigns_normal_part7 : not tried
-[wp] Goal typed_add_full_assigns_normal_part8 : not tried
-[wp] Goal typed_add_full_assigns_normal_part9 : not tried
-[wp] Goal typed_add_nominal_ensures : not tried
-[wp] Goal typed_add_nominal_ensures_2 : not tried
-[wp] Goal typed_add_nominal_ensures_3 : not tried
-[wp] Goal typed_add_nominal_ensures_4 : not tried
-[wp] Goal typed_add_nominal_ensures_5 : not tried
-[wp] Goal typed_add_nominal_assigns_exit : trivial
-[wp] Goal typed_add_nominal_assigns_normal_part1 : trivial
-[wp] Goal typed_add_nominal_assigns_normal_part2 : not tried
-[wp] Goal typed_add_nominal_assigns_normal_part3 : not tried
-[wp] Goal typed_add_nominal_assigns_normal_part4 : not tried
-[wp] Goal typed_add_nominal_assigns_normal_part5 : not tried
-[wp] Goal typed_add_nominal_assigns_normal_part6 : not tried
-[wp] Goal typed_add_nominal_assigns_normal_part7 : not tried
-[wp] Goal typed_add_nominal_assigns_normal_part8 : not tried
-[wp] Goal typed_add_nominal_assigns_normal_part9 : not tried
[wp] Goal typed_eq_string_complete_not_eq_eq : trivial
[wp] Goal typed_eq_string_disjoint_not_eq_eq : trivial
[wp] Goal typed_eq_string_loop_invariant_preserved : not tried
@@ -90,6 +36,9 @@
[wp] Goal typed_hash_assigns_part2 : not tried
[wp] Goal typed_hash_loop_variant_decrease : not tried
[wp] Goal typed_hash_loop_variant_positive : not tried
+[wp] Goal typed_size_ensures : not tried
+[wp] Goal typed_size_assert_rte_mem_access : not tried
+[wp] Goal typed_size_assigns : not tried
[wp] Goal typed_init_ensures : not tried
[wp] Goal typed_init_ensures_2 : not tried
[wp] Goal typed_init_assert_rte_mem_access : not tried
@@ -108,6 +57,60 @@
[wp] Goal typed_init_assigns_part3 : not tried
[wp] Goal typed_init_loop_variant_decrease : not tried
[wp] Goal typed_init_loop_variant_positive : not tried
+[wp] Goal typed_add_complete_full_nominal : not tried
+[wp] Goal typed_add_disjoint_full_nominal : not tried
+[wp] Goal typed_add_assert_rte_index_bound : not tried
+[wp] Goal typed_add_assert_rte_mem_access : not tried
+[wp] Goal typed_add_assert_rte_index_bound_2 : not tried
+[wp] Goal typed_add_assert_rte_index_bound_3 : not tried
+[wp] Goal typed_add_assert_rte_index_bound_4 : not tried
+[wp] Goal typed_add_assert_rte_index_bound_5 : not tried
+[wp] Goal typed_add_assert_rte_mem_access_2 : not tried
+[wp] Goal typed_add_assert_rte_mem_access_3 : not tried
+[wp] Goal typed_add_assert_rte_index_bound_6 : not tried
+[wp] Goal typed_add_assert_rte_mem_access_4 : not tried
+[wp] Goal typed_add_assert_rte_mem_access_5 : not tried
+[wp] Goal typed_add_assert_rte_signed_overflow : not tried
+[wp] Goal typed_add_assert_rte_mem_access_6 : not tried
+[wp] Goal typed_add_assert_rte_mem_access_7 : not tried
+[wp] Goal typed_add_assert_rte_signed_overflow_2 : not tried
+[wp] Goal typed_add_assigns_exit : trivial
+[wp] Goal typed_add_assigns_normal_part1 : trivial
+[wp] Goal typed_add_assigns_normal_part2 : not tried
+[wp] Goal typed_add_assigns_normal_part3 : not tried
+[wp] Goal typed_add_assigns_normal_part4 : not tried
+[wp] Goal typed_add_assigns_normal_part5 : not tried
+[wp] Goal typed_add_assigns_normal_part6 : not tried
+[wp] Goal typed_add_assigns_normal_part7 : not tried
+[wp] Goal typed_add_assigns_normal_part8 : not tried
+[wp] Goal typed_add_assigns_normal_part9 : not tried
+[wp] Goal typed_add_call_hash_requires : not tried
+[wp] Goal typed_add_nominal_ensures : not tried
+[wp] Goal typed_add_nominal_ensures_2 : not tried
+[wp] Goal typed_add_nominal_ensures_3 : not tried
+[wp] Goal typed_add_nominal_ensures_4 : not tried
+[wp] Goal typed_add_nominal_ensures_5 : not tried
+[wp] Goal typed_add_nominal_assigns_exit : trivial
+[wp] Goal typed_add_nominal_assigns_normal_part1 : trivial
+[wp] Goal typed_add_nominal_assigns_normal_part2 : not tried
+[wp] Goal typed_add_nominal_assigns_normal_part3 : not tried
+[wp] Goal typed_add_nominal_assigns_normal_part4 : not tried
+[wp] Goal typed_add_nominal_assigns_normal_part5 : not tried
+[wp] Goal typed_add_nominal_assigns_normal_part6 : not tried
+[wp] Goal typed_add_nominal_assigns_normal_part7 : not tried
+[wp] Goal typed_add_nominal_assigns_normal_part8 : not tried
+[wp] Goal typed_add_nominal_assigns_normal_part9 : not tried
+[wp] Goal typed_add_full_ensures : not tried
+[wp] Goal typed_add_full_assigns_exit : trivial
+[wp] Goal typed_add_full_assigns_normal_part1 : trivial
+[wp] Goal typed_add_full_assigns_normal_part2 : not tried
+[wp] Goal typed_add_full_assigns_normal_part3 : not tried
+[wp] Goal typed_add_full_assigns_normal_part4 : not tried
+[wp] Goal typed_add_full_assigns_normal_part5 : not tried
+[wp] Goal typed_add_full_assigns_normal_part6 : not tried
+[wp] Goal typed_add_full_assigns_normal_part7 : not tried
+[wp] Goal typed_add_full_assigns_normal_part8 : not tried
+[wp] Goal typed_add_full_assigns_normal_part9 : not tried
[wp] Goal typed_mem_binding_complete_not_found_found : not tried
[wp] Goal typed_mem_binding_disjoint_not_found_found : not tried
[wp] Goal typed_mem_binding_loop_invariant_preserved : not tried
@@ -148,6 +151,3 @@
[wp] Goal typed_mem_binding_call_eq_string_requires_2 : not tried
[wp] Goal typed_mem_binding_found_ensures : not tried
[wp] Goal typed_mem_binding_not_found_ensures : not tried
-[wp] Goal typed_size_ensures : not tried
-[wp] Goal typed_size_assert_rte_mem_access : not tried
-[wp] Goal typed_size_assigns : not tried
diff --git a/src/plugins/wp/tests/wp_gallery/oracle/loop-statement.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle/loop-statement.res.oracle
index 128fa9a9dd685b98a91179a3554847a921d39b21..50da7d7cc9742dc4a67cbc33ad14e981cf8ba729 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle/loop-statement.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle/loop-statement.res.oracle
@@ -3,6 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] Goal typed_lemma_Lb : not tried
+[wp] Goal typed_loop_statement_requires_Scond : not tried
+[wp] Goal typed_loop_statement_ensures_Sbody : not tried
+[wp] Goal typed_loop_statement_assigns : trivial
+[wp] Goal typed_loop_statement_requires_Rinv : not tried
[wp] Goal typed_loop_statement_ensures_Scond : not tried
[wp] Goal typed_loop_statement_ensures_Sloop : not tried
[wp] Goal typed_loop_statement_loop_invariant_Iloop_preserved : not tried
@@ -13,7 +17,3 @@
[wp] Goal typed_loop_statement_assigns_2_exit_part2 : not tried
[wp] Goal typed_loop_statement_assigns_2_normal_part1 : trivial
[wp] Goal typed_loop_statement_assigns_2_normal_part2 : not tried
-[wp] Goal typed_loop_statement_requires_Rinv : not tried
-[wp] Goal typed_loop_statement_requires_Scond : not tried
-[wp] Goal typed_loop_statement_ensures_Sbody : not tried
-[wp] Goal typed_loop_statement_assigns : trivial
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/find.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/find.res.oracle
index f6155b9473b6f4f2fa67d5dacc2925606237e04a..a081d0c388b7caff1c718d895bacd308dfeaf6aa 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/find.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/find.res.oracle
@@ -16,9 +16,9 @@
[wp] [Qed] Goal typed_find_loop_assigns : Valid
[wp] [Qed] Goal typed_find_loop_variant_decrease : Valid
[wp] [Qed] Goal typed_find_loop_variant_positive : Valid
+[wp] [Alt-Ergo] Goal typed_find_not_found_ensures : Valid
[wp] [Alt-Ergo] Goal typed_find_found_ensures : Valid
[wp] [Alt-Ergo] Goal typed_find_found_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_find_not_found_ensures : Valid
[wp] [Qed] Goal typed_find_ptr_complete_found_not_found : Valid
[wp] [Qed] Goal typed_find_ptr_disjoint_found_not_found : Valid
[wp] [Qed] Goal typed_find_ptr_ensures_Range : Valid
@@ -33,9 +33,9 @@
[wp] [Qed] Goal typed_find_ptr_loop_assigns : Valid
[wp] [Qed] Goal typed_find_ptr_loop_variant_decrease : Valid
[wp] [Alt-Ergo] Goal typed_find_ptr_loop_variant_positive : Valid
+[wp] [Alt-Ergo] Goal typed_find_ptr_not_found_ensures : Valid
[wp] [Alt-Ergo] Goal typed_find_ptr_found_ensures : Valid
[wp] [Alt-Ergo] Goal typed_find_ptr_found_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_not_found_ensures : Valid
[wp] [Alt-Ergo] Goal typed_iter_ptr_ensures_Last : Valid
[wp] [Alt-Ergo] Goal typed_iter_ptr_loop_invariant_Range_preserved : Valid
[wp] [Alt-Ergo] Goal typed_iter_ptr_loop_invariant_Range_established : Valid
@@ -57,54 +57,13 @@
[rte] annotating function find
[rte] annotating function find_ptr
[rte] annotating function iter_ptr
-[wp] 44 goals scheduled
-[wp] [Qed] Goal typed_find_complete_found_not_found : Valid
-[wp] [Qed] Goal typed_find_disjoint_found_not_found : Valid
-[wp] [Qed] Goal typed_find_ensures_Range : Valid
-[wp] [Qed] Goal typed_find_ensures_NoneBefore : Valid
-[wp] [Alt-Ergo] Goal typed_find_loop_invariant_NotFound_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_find_loop_invariant_NotFound_established : Valid
-[wp] [Alt-Ergo] Goal typed_find_loop_invariant_Range_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_find_loop_invariant_Range_established : Valid
-[wp] [Alt-Ergo] Goal typed_find_loop_invariant_Valid_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_find_loop_invariant_Valid_established : Valid
+[wp] 3 goals scheduled
[wp] [Alt-Ergo] Goal typed_find_assert_rte_mem_access : Valid
[wp] [Alt-Ergo] Goal typed_find_assert_rte_signed_overflow : Valid
-[wp] [Qed] Goal typed_find_loop_assigns : Valid
-[wp] [Qed] Goal typed_find_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_find_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_find_found_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_find_found_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_find_not_found_ensures : Valid
-[wp] [Qed] Goal typed_find_ptr_complete_found_not_found : Valid
-[wp] [Qed] Goal typed_find_ptr_disjoint_found_not_found : Valid
-[wp] [Qed] Goal typed_find_ptr_ensures_Range : Valid
-[wp] [Qed] Goal typed_find_ptr_ensures_NoneBefore : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_invariant_NotFound_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_invariant_NotFound_established : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_invariant_Range_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_invariant_Range_established : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_invariant_Valid_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_invariant_Valid_established : Valid
[wp] [Alt-Ergo] Goal typed_find_ptr_assert_rte_mem_access : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_assert_Hack : Valid
-[wp] [Qed] Goal typed_find_ptr_loop_assigns : Valid
-[wp] [Qed] Goal typed_find_ptr_loop_variant_decrease : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_found_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_found_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_find_ptr_not_found_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_iter_ptr_ensures_Last : Valid
-[wp] [Alt-Ergo] Goal typed_iter_ptr_loop_invariant_Range_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_iter_ptr_loop_invariant_Range_established : Valid
-[wp] [Alt-Ergo] Goal typed_iter_ptr_loop_invariant_Valid_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_iter_ptr_loop_invariant_Valid_established : Valid
-[wp] [Qed] Goal typed_iter_ptr_loop_assigns : Valid
-[wp] [Qed] Goal typed_iter_ptr_loop_variant_decrease : Valid
-[wp] [Alt-Ergo] Goal typed_iter_ptr_loop_variant_positive : Valid
-[wp] Proved goals: 29 / 44
+[wp] Proved goals: 3 / 3
Qed: 0
- Alt-Ergo: 29
+ Alt-Ergo: 3
------------------------------------------------------------
Functions WP Alt-Ergo Total Success
find 7 11 18 100%
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.res.oracle
index e6750a21946341e1d5c8c9e4a0fc333232e87ed0..06ee2377636c52ca390ad6ed61e81275c8185c01 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo1_solved.res.oracle
@@ -22,25 +22,15 @@
------------------------------------------------------------
[wp] Running WP plugin...
[rte] annotating function exo1
-[wp] 15 goals scheduled
-[wp] [Alt-Ergo] Goal typed_exo1_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_exo1_ensures_2 : Valid
+[wp] 5 goals scheduled
[wp] [Alt-Ergo] Goal typed_exo1_assert_rte_signed_overflow : Valid
-[wp] [Alt-Ergo] Goal typed_exo1_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_exo1_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_exo1_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_exo1_loop_invariant_2_established : Valid
[wp] [Alt-Ergo] Goal typed_exo1_assert_rte_mem_access : Valid
[wp] [Alt-Ergo] Goal typed_exo1_assert_rte_mem_access_2 : Valid
[wp] [Alt-Ergo] Goal typed_exo1_assert_rte_signed_overflow_2 : Valid
[wp] [Alt-Ergo] Goal typed_exo1_assert_rte_signed_overflow_3 : Valid
-[wp] [Qed] Goal typed_exo1_loop_assigns : Valid
-[wp] [Qed] Goal typed_exo1_assigns : Valid
-[wp] [Qed] Goal typed_exo1_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_exo1_loop_variant_positive : Valid
-[wp] Proved goals: 9 / 15
+[wp] Proved goals: 5 / 5
Qed: 0
- Alt-Ergo: 9
+ Alt-Ergo: 5
------------------------------------------------------------
Functions WP Alt-Ergo Total Success
exo1 6 9 15 100%
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.res.oracle
index 5af041259b1ca49c25e5305942a19e77e7752bdb..1780ec5c89a9b45027afa30b5a132043047e4271 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo2_solved.res.oracle
@@ -34,33 +34,11 @@
------------------------------------------------------------
[wp] Running WP plugin...
[rte] annotating function max_subarray
-[wp] 23 goals scheduled
-[wp] [Alt-Ergo] Goal typed_max_subarray_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_2_established : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_3_preserved : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_3_established : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_4_preserved : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_invariant_4_established : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_5_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_5_established : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_6_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_6_established : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_7_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_7_established : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_8_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_max_subarray_loop_invariant_8_established : Valid
+[wp] 1 goal scheduled
[wp] [Alt-Ergo] Goal typed_max_subarray_assert_rte_mem_access : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_assigns : Valid
-[wp] [Qed] Goal typed_max_subarray_assigns : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_max_subarray_loop_variant_positive : Valid
-[wp] Proved goals: 14 / 23
+[wp] Proved goals: 1 / 1
Qed: 0
- Alt-Ergo: 14
+ Alt-Ergo: 1
------------------------------------------------------------
Functions WP Alt-Ergo Total Success
max_subarray 9 14 23 100%
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.res.oracle
index ee4bb865187f340d0937eed1cc9350efbd917959..e75ffe7ec64e8d454c01d3b2497ea7e10bd7e9c7 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.res.oracle
@@ -54,35 +54,12 @@
void equal_elements(int *a, int *v1, int *v2);
[wp] Running WP plugin...
[rte] annotating function equal_elements
-[wp] 50 goals scheduled
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_ensures_3 : Valid
+[wp] 16 goals scheduled
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access : Valid
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_2_established : Valid
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound : Valid
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound_2 : Valid
[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_signed_overflow : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_3_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_3_established : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_4_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_4_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_5_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_5_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_6_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_6_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_7_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_7_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_8_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_8_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_9_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_9_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_10_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_10_established : Valid
[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_mem_access_3 : Valid
[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_index_bound_3 : Valid
[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_index_bound_4 : Valid
@@ -91,23 +68,12 @@
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_6 : Valid
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_7 : Valid
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_8 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert : Valid
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound_5 : Valid
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound_6 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_2 : Valid
[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_signed_overflow_2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_assigns : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_assigns_2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assigns_part1 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assigns_part2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assigns_part3 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_2_decrease : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_2_positive : Valid
-[wp] Proved goals: 32 / 50
+[wp] Proved goals: 16 / 16
Qed: 11
- Alt-Ergo: 21
+ Alt-Ergo: 5
------------------------------------------------------------
Functions WP Alt-Ergo Total Success
equal_elements 29 21 50 100%
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.res.oracle
index e7d12e16b297109fd7270130ec0b7f3d698bed88..7672a505bc9fa5d57e9cd506b0e0b2ed7d01591d 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.old.v2.res.oracle
@@ -55,38 +55,12 @@
void equal_elements(int *a, int *v1, int *v2);
[wp] Running WP plugin...
[rte] annotating function equal_elements
-[wp] 51 goals scheduled
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_ensures_v1_good : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_ensures_v2_good : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_ensures_v1_v2_diff : Valid
+[wp] 16 goals scheduled
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access : Valid
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_mem_access_2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_set_at_0_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_set_at_0_established : Valid
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound : Valid
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound_2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_set_at_1 : Valid
[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_signed_overflow : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_bound_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_bound_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_seen_sound1_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_seen_sound1_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_seen_sound2_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_seen_sound2_established : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_v1_first_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_v1_first_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v1_sound1_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_v1_sound1_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v1_sound2_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v1_sound2_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v1_v2_diff_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_v1_v2_diff_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v2_sound1_preserved : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_invariant_v2_sound1_established : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v2_sound2_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_ref_equal_elements_loop_invariant_v2_sound2_established : Valid
[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_mem_access_3 : Valid
[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_index_bound_3 : Valid
[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_index_bound_4 : Valid
@@ -98,18 +72,9 @@
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound_5 : Valid
[wp] [Qed] Goal typed_ref_equal_elements_assert_rte_index_bound_6 : Valid
[wp] [Alt-Ergo] Goal typed_ref_equal_elements_assert_rte_signed_overflow_2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_assigns : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_assigns_2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assigns_part1 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assigns_part2 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_assigns_part3 : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_2_decrease : Valid
-[wp] [Qed] Goal typed_ref_equal_elements_loop_variant_2_positive : Valid
-[wp] Proved goals: 34 / 51
+[wp] Proved goals: 16 / 16
Qed: 11
- Alt-Ergo: 23
+ Alt-Ergo: 5
------------------------------------------------------------
Functions WP Alt-Ergo Total Success
equal_elements 28 23 51 100%
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.res.oracle
index c3667e36d84126bec70f0aebec2a7d430c082e85..72409b7f36cfd6816e0e20df25e04071390908b1 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_exo3_solved.simplified.res.oracle
@@ -27,8 +27,8 @@
[wp] [Qed] Goal typed_pair_loop_variant_positive : Valid
[wp] [Qed] Goal typed_pair_loop_variant_2_decrease : Valid
[wp] [Qed] Goal typed_pair_loop_variant_2_positive : Valid
-[wp] [Alt-Ergo] Goal typed_pair_has_pair_ensures : Valid
[wp] [Alt-Ergo] Goal typed_pair_no_pair_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_pair_has_pair_ensures : Valid
[wp] Proved goals: 26 / 26
Qed: 16
Alt-Ergo: 10
@@ -38,45 +38,19 @@
------------------------------------------------------------
[wp] Running WP plugin...
[rte] annotating function pair
-[wp] 35 goals scheduled
-[wp] [Qed] Goal typed_pair_complete_has_pair_no_pair : Valid
-[wp] [Qed] Goal typed_pair_disjoint_has_pair_no_pair : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_pair_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_pair_loop_invariant_2_established : Valid
+[wp] 9 goals scheduled
[wp] [Qed] Goal typed_pair_assert_rte_index_bound : Valid
[wp] [Qed] Goal typed_pair_assert_rte_index_bound_2 : Valid
[wp] [Alt-Ergo] Goal typed_pair_assert_rte_signed_overflow : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_3_preserved : Valid
-[wp] [Qed] Goal typed_pair_loop_invariant_3_established : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_4_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_4_established : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_5_preserved : Valid
-[wp] [Qed] Goal typed_pair_loop_invariant_5_established : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_6_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_pair_loop_invariant_6_established : Valid
[wp] [Alt-Ergo] Goal typed_pair_assert_rte_mem_access : Valid
[wp] [Alt-Ergo] Goal typed_pair_assert_rte_index_bound_3 : Valid
[wp] [Alt-Ergo] Goal typed_pair_assert_rte_index_bound_4 : Valid
[wp] [Qed] Goal typed_pair_assert_rte_index_bound_5 : Valid
[wp] [Qed] Goal typed_pair_assert_rte_index_bound_6 : Valid
[wp] [Alt-Ergo] Goal typed_pair_assert_rte_signed_overflow_2 : Valid
-[wp] [Qed] Goal typed_pair_loop_assigns : Valid
-[wp] [Qed] Goal typed_pair_loop_assigns_2 : Valid
-[wp] [Qed] Goal typed_pair_assigns_part1 : Valid
-[wp] [Qed] Goal typed_pair_assigns_part2 : Valid
-[wp] [Qed] Goal typed_pair_assigns_part3 : Valid
-[wp] [Qed] Goal typed_pair_assigns_part4 : Valid
-[wp] [Qed] Goal typed_pair_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_pair_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_pair_loop_variant_2_decrease : Valid
-[wp] [Qed] Goal typed_pair_loop_variant_2_positive : Valid
-[wp] [Alt-Ergo] Goal typed_pair_has_pair_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_pair_no_pair_ensures : Valid
-[wp] Proved goals: 19 / 35
+[wp] Proved goals: 9 / 9
Qed: 4
- Alt-Ergo: 15
+ Alt-Ergo: 5
------------------------------------------------------------
Functions WP Alt-Ergo Total Success
pair 20 15 35 100%
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.res.oracle
index 3d56522f9e5dc65bcc2d8f7be60673406c2e8e01..aa0a56a75fb331b2a4da497baecf2d428424c801 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/frama_c_hashtbl_solved.res.oracle
@@ -3,45 +3,6 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 102 goals scheduled
-[wp] [Alt-Ergo] Goal typed_add_complete_full_nominal : Valid
-[wp] [Alt-Ergo] Goal typed_add_disjoint_full_nominal : Valid
-[wp] [Qed] Goal typed_add_assigns_exit : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_add_assigns_normal_part6 : Valid
-[wp] [Alt-Ergo] Goal typed_add_assigns_normal_part7 : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part8 : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part9 : Valid
-[wp] [Qed] Goal typed_add_call_hash_requires : Valid
-[wp] [Alt-Ergo] Goal typed_add_full_ensures : Valid
-[wp] [Qed] Goal typed_add_full_assigns_exit : Valid
-[wp] [Qed] Goal typed_add_full_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_add_full_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_add_full_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_add_full_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_add_full_assigns_normal_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_add_full_assigns_normal_part6 : Valid
-[wp] [Alt-Ergo] Goal typed_add_full_assigns_normal_part7 : Valid
-[wp] [Alt-Ergo] Goal typed_add_full_assigns_normal_part8 : Valid
-[wp] [Qed] Goal typed_add_full_assigns_normal_part9 : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_ensures_3 : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_ensures_4 : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_ensures_5 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_exit : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_assigns_normal_part6 : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_assigns_normal_part7 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part8 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part9 : Valid
[wp] [Qed] Goal typed_eq_string_complete_not_eq_eq : Valid
[wp] [Qed] Goal typed_eq_string_disjoint_not_eq_eq : Valid
[wp] [Alt-Ergo] Goal typed_eq_string_loop_invariant_preserved : Valid
@@ -64,6 +25,8 @@
[wp] [Qed] Goal typed_hash_assigns_part2 : Valid
[wp] [Qed] Goal typed_hash_loop_variant_decrease : Valid
[wp] [Qed] Goal typed_hash_loop_variant_positive : Valid
+[wp] [Qed] Goal typed_size_ensures : Valid
+[wp] [Qed] Goal typed_size_assigns : Valid
[wp] [Alt-Ergo] Goal typed_init_ensures : Valid
[wp] [Alt-Ergo] Goal typed_init_ensures_2 : Valid
[wp] [Alt-Ergo] Goal typed_init_loop_invariant_preserved : Valid
@@ -77,6 +40,45 @@
[wp] [Script] Goal typed_init_assigns_part3 : Valid
[wp] [Qed] Goal typed_init_loop_variant_decrease : Valid
[wp] [Qed] Goal typed_init_loop_variant_positive : Valid
+[wp] [Alt-Ergo] Goal typed_add_complete_full_nominal : Valid
+[wp] [Alt-Ergo] Goal typed_add_disjoint_full_nominal : Valid
+[wp] [Qed] Goal typed_add_assigns_exit : Valid
+[wp] [Qed] Goal typed_add_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_add_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_add_assigns_normal_part3 : Valid
+[wp] [Qed] Goal typed_add_assigns_normal_part4 : Valid
+[wp] [Qed] Goal typed_add_assigns_normal_part5 : Valid
+[wp] [Alt-Ergo] Goal typed_add_assigns_normal_part6 : Valid
+[wp] [Alt-Ergo] Goal typed_add_assigns_normal_part7 : Valid
+[wp] [Qed] Goal typed_add_assigns_normal_part8 : Valid
+[wp] [Qed] Goal typed_add_assigns_normal_part9 : Valid
+[wp] [Qed] Goal typed_add_call_hash_requires : Valid
+[wp] [Alt-Ergo] Goal typed_add_nominal_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_add_nominal_ensures_2 : Valid
+[wp] [Alt-Ergo] Goal typed_add_nominal_ensures_3 : Valid
+[wp] [Alt-Ergo] Goal typed_add_nominal_ensures_4 : Valid
+[wp] [Alt-Ergo] Goal typed_add_nominal_ensures_5 : Valid
+[wp] [Qed] Goal typed_add_nominal_assigns_exit : Valid
+[wp] [Qed] Goal typed_add_nominal_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_add_nominal_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_add_nominal_assigns_normal_part3 : Valid
+[wp] [Qed] Goal typed_add_nominal_assigns_normal_part4 : Valid
+[wp] [Qed] Goal typed_add_nominal_assigns_normal_part5 : Valid
+[wp] [Alt-Ergo] Goal typed_add_nominal_assigns_normal_part6 : Valid
+[wp] [Alt-Ergo] Goal typed_add_nominal_assigns_normal_part7 : Valid
+[wp] [Qed] Goal typed_add_nominal_assigns_normal_part8 : Valid
+[wp] [Qed] Goal typed_add_nominal_assigns_normal_part9 : Valid
+[wp] [Alt-Ergo] Goal typed_add_full_ensures : Valid
+[wp] [Qed] Goal typed_add_full_assigns_exit : Valid
+[wp] [Qed] Goal typed_add_full_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_add_full_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_add_full_assigns_normal_part3 : Valid
+[wp] [Qed] Goal typed_add_full_assigns_normal_part4 : Valid
+[wp] [Qed] Goal typed_add_full_assigns_normal_part5 : Valid
+[wp] [Alt-Ergo] Goal typed_add_full_assigns_normal_part6 : Valid
+[wp] [Alt-Ergo] Goal typed_add_full_assigns_normal_part7 : Valid
+[wp] [Alt-Ergo] Goal typed_add_full_assigns_normal_part8 : Valid
+[wp] [Qed] Goal typed_add_full_assigns_normal_part9 : Valid
[wp] [Alt-Ergo] Goal typed_mem_binding_complete_not_found_found : Valid
[wp] [Alt-Ergo] Goal typed_mem_binding_disjoint_not_found_found : Valid
[wp] [Alt-Ergo] Goal typed_mem_binding_loop_invariant_preserved : Valid
@@ -103,8 +105,6 @@
[wp] [Alt-Ergo] Goal typed_mem_binding_call_eq_string_requires_2 : Valid
[wp] [Alt-Ergo] Goal typed_mem_binding_found_ensures : Valid
[wp] [Alt-Ergo] Goal typed_mem_binding_not_found_ensures : Valid
-[wp] [Qed] Goal typed_size_ensures : Valid
-[wp] [Qed] Goal typed_size_assigns : Valid
[wp] Proved goals: 102 / 102
Qed: 69
Script: 1
@@ -125,9 +125,19 @@
[rte] annotating function init
[rte] annotating function mem_binding
[rte] annotating function size
-[wp] 143 goals scheduled
-[wp] [Alt-Ergo] Goal typed_add_complete_full_nominal : Valid
-[wp] [Alt-Ergo] Goal typed_add_disjoint_full_nominal : Valid
+[wp] 41 goals scheduled
+[wp] [Alt-Ergo] Goal typed_eq_string_assert_rte_mem_access : Valid
+[wp] [Alt-Ergo] Goal typed_eq_string_assert_rte_mem_access_2 : Valid
+[wp] [Alt-Ergo] Goal typed_eq_string_assert_rte_signed_overflow : Valid
+[wp] [Alt-Ergo] Goal typed_hash_assert_rte_mem_access : Valid
+[wp] [Qed] Goal typed_hash_assert_rte_mem_access_2 : Valid
+[wp] [Alt-Ergo] Goal typed_hash_assert_rte_signed_overflow : Valid
+[wp] [Alt-Ergo] Goal typed_size_assert_rte_mem_access : Valid
+[wp] [Alt-Ergo] Goal typed_init_assert_rte_mem_access : Valid
+[wp] [Qed] Goal typed_init_assert_rte_index_bound : Valid
+[wp] [Qed] Goal typed_init_assert_rte_index_bound_2 : Valid
+[wp] [Alt-Ergo] Goal typed_init_assert_rte_mem_access_2 : Valid
+[wp] [Alt-Ergo] Goal typed_init_assert_rte_signed_overflow : Valid
[wp] [Alt-Ergo] Goal typed_add_assert_rte_index_bound : Valid
[wp] [Alt-Ergo] Goal typed_add_assert_rte_mem_access : Valid
[wp] [Qed] Goal typed_add_assert_rte_index_bound_2 : Valid
@@ -143,95 +153,6 @@
[wp] [Alt-Ergo] Goal typed_add_assert_rte_mem_access_6 : Valid
[wp] [Alt-Ergo] Goal typed_add_assert_rte_mem_access_7 : Valid
[wp] [Alt-Ergo] Goal typed_add_assert_rte_signed_overflow_2 : Valid
-[wp] [Qed] Goal typed_add_assigns_exit : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_add_assigns_normal_part6 : Valid
-[wp] [Alt-Ergo] Goal typed_add_assigns_normal_part7 : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part8 : Valid
-[wp] [Qed] Goal typed_add_assigns_normal_part9 : Valid
-[wp] [Qed] Goal typed_add_call_hash_requires : Valid
-[wp] [Alt-Ergo] Goal typed_add_full_ensures : Valid
-[wp] [Qed] Goal typed_add_full_assigns_exit : Valid
-[wp] [Qed] Goal typed_add_full_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_add_full_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_add_full_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_add_full_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_add_full_assigns_normal_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_add_full_assigns_normal_part6 : Valid
-[wp] [Alt-Ergo] Goal typed_add_full_assigns_normal_part7 : Valid
-[wp] [Alt-Ergo] Goal typed_add_full_assigns_normal_part8 : Valid
-[wp] [Qed] Goal typed_add_full_assigns_normal_part9 : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_ensures_3 : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_ensures_4 : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_ensures_5 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_exit : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part5 : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_assigns_normal_part6 : Valid
-[wp] [Alt-Ergo] Goal typed_add_nominal_assigns_normal_part7 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part8 : Valid
-[wp] [Qed] Goal typed_add_nominal_assigns_normal_part9 : Valid
-[wp] [Qed] Goal typed_eq_string_complete_not_eq_eq : Valid
-[wp] [Qed] Goal typed_eq_string_disjoint_not_eq_eq : Valid
-[wp] [Alt-Ergo] Goal typed_eq_string_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_eq_string_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_eq_string_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_eq_string_loop_invariant_2_established : Valid
-[wp] [Alt-Ergo] Goal typed_eq_string_assert_rte_mem_access : Valid
-[wp] [Alt-Ergo] Goal typed_eq_string_assert_rte_mem_access_2 : Valid
-[wp] [Alt-Ergo] Goal typed_eq_string_assert_rte_signed_overflow : Valid
-[wp] [Qed] Goal typed_eq_string_loop_assigns : Valid
-[wp] [Qed] Goal typed_eq_string_assigns_part1 : Valid
-[wp] [Qed] Goal typed_eq_string_assigns_part2 : Valid
-[wp] [Qed] Goal typed_eq_string_assigns_part3 : Valid
-[wp] [Qed] Goal typed_eq_string_assigns_part4 : Valid
-[wp] [Qed] Goal typed_eq_string_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_eq_string_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_eq_string_eq_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_eq_string_not_eq_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_hash_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_hash_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_hash_assert_rte_mem_access : Valid
-[wp] [Qed] Goal typed_hash_assert_rte_mem_access_2 : Valid
-[wp] [Alt-Ergo] Goal typed_hash_assert_rte_signed_overflow : Valid
-[wp] [Qed] Goal typed_hash_loop_assigns : Valid
-[wp] [Qed] Goal typed_hash_assigns_part1 : Valid
-[wp] [Qed] Goal typed_hash_assigns_part2 : Valid
-[wp] [Qed] Goal typed_hash_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_hash_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_init_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_init_ensures_2 : Valid
-[wp] [Alt-Ergo] Goal typed_init_assert_rte_mem_access : Valid
-[wp] [Alt-Ergo] Goal typed_init_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_init_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_init_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_init_assert_rte_index_bound : Valid
-[wp] [Qed] Goal typed_init_assert_rte_index_bound_2 : Valid
-[wp] [Alt-Ergo] Goal typed_init_assert_rte_mem_access_2 : Valid
-[wp] [Alt-Ergo] Goal typed_init_assert_rte_signed_overflow : Valid
-[wp] [Qed] Goal typed_init_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_init_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_init_assigns_part1 : Valid
-[wp] [Qed] Goal typed_init_assigns_part2 : Valid
-[wp] [Script] Goal typed_init_assigns_part3 : Valid
-[wp] [Qed] Goal typed_init_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_init_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_mem_binding_complete_not_found_found : Valid
-[wp] [Alt-Ergo] Goal typed_mem_binding_disjoint_not_found_found : Valid
-[wp] [Alt-Ergo] Goal typed_mem_binding_loop_invariant_preserved : Valid
-[wp] [Alt-Ergo] Goal typed_mem_binding_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_mem_binding_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_mem_binding_loop_invariant_2_established : Valid
[wp] [Alt-Ergo] Goal typed_mem_binding_assert_rte_index_bound : Valid
[wp] [Alt-Ergo] Goal typed_mem_binding_assert_rte_index_bound_2 : Valid
[wp] [Alt-Ergo] Goal typed_mem_binding_assert_rte_mem_access : Valid
@@ -246,33 +167,9 @@
[wp] [Qed] Goal typed_mem_binding_assert_rte_index_bound_10 : Valid
[wp] [Alt-Ergo] Goal typed_mem_binding_assert_rte_mem_access_3 : Valid
[wp] [Alt-Ergo] Goal typed_mem_binding_assert_rte_signed_overflow : Valid
-[wp] [Qed] Goal typed_mem_binding_loop_assigns_part1 : Valid
-[wp] [Qed] Goal typed_mem_binding_loop_assigns_part2 : Valid
-[wp] [Qed] Goal typed_mem_binding_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_mem_binding_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_mem_binding_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_mem_binding_assigns_exit_part4 : Valid
-[wp] [Qed] Goal typed_mem_binding_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_mem_binding_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_mem_binding_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_mem_binding_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_mem_binding_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_mem_binding_assigns_normal_part6 : Valid
-[wp] [Qed] Goal typed_mem_binding_assigns_normal_part7 : Valid
-[wp] [Qed] Goal typed_mem_binding_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_mem_binding_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_mem_binding_call_hash_requires : Valid
-[wp] [Qed] Goal typed_mem_binding_call_eq_string_requires : Valid
-[wp] [Alt-Ergo] Goal typed_mem_binding_call_eq_string_requires_2 : Valid
-[wp] [Alt-Ergo] Goal typed_mem_binding_found_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_mem_binding_not_found_ensures : Valid
-[wp] [Qed] Goal typed_size_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_size_assert_rte_mem_access : Valid
-[wp] [Qed] Goal typed_size_assigns : Valid
-[wp] Proved goals: 74 / 143
+[wp] Proved goals: 41 / 41
Qed: 16
- Script: 1
- Alt-Ergo: 57
+ Alt-Ergo: 25
------------------------------------------------------------
Functions WP Alt-Ergo Total Success
eq_string 11 7 18 100%
diff --git a/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.res.oracle b/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.res.oracle
index bebcd6d2a228371bf8142435eb8b888055e488e1..8f26f5372756daf4fdba29baeba2f1f8ad2d43eb 100644
--- a/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.res.oracle
+++ b/src/plugins/wp/tests/wp_gallery/oracle_qualif/loop-statement.res.oracle
@@ -4,6 +4,10 @@
[wp] Warning: Missing RTE guards
[wp] 15 goals scheduled
[wp] [Alt-Ergo] Goal typed_lemma_Lb : Valid
+[wp] [Qed] Goal typed_loop_statement_requires_Scond : Valid
+[wp] [Qed] Goal typed_loop_statement_ensures_Sbody : Valid
+[wp] [Qed] Goal typed_loop_statement_assigns : Valid
+[wp] [Alt-Ergo] Goal typed_loop_statement_requires_Rinv : Valid
[wp] [Qed] Goal typed_loop_statement_ensures_Scond : Valid
[wp] [Qed] Goal typed_loop_statement_ensures_Sloop : Valid
[wp] [Alt-Ergo] Goal typed_loop_statement_loop_invariant_Iloop_preserved : Valid
@@ -14,10 +18,6 @@
[wp] [Qed] Goal typed_loop_statement_assigns_2_exit_part2 : Valid
[wp] [Qed] Goal typed_loop_statement_assigns_2_normal_part1 : Valid
[wp] [Qed] Goal typed_loop_statement_assigns_2_normal_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_loop_statement_requires_Rinv : Valid
-[wp] [Qed] Goal typed_loop_statement_requires_Scond : Valid
-[wp] [Qed] Goal typed_loop_statement_ensures_Sbody : Valid
-[wp] [Qed] Goal typed_loop_statement_assigns : Valid
[wp] Proved goals: 15 / 15
Qed: 11
Alt-Ergo: 4
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/alias_assigns_hypotheses.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/alias_assigns_hypotheses.res.oracle
index cb72f2b3ee00828b6b13eb90b39e180c157ff726..33a25d793ff22746cb810bbf039b5d65e0bc4bf5 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/alias_assigns_hypotheses.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/alias_assigns_hypotheses.res.oracle
@@ -3,33 +3,33 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 30 goals scheduled
-[wp] [Qed] Goal typed_comprehension_alias_ensures : Valid
-[wp] [Qed] Goal typed_comprehension_alias_ensures_2 : Valid
-[wp] [Qed] Goal typed_comprehension_alias_assigns : Valid
-[wp] [Qed] Goal typed_field_alias_ensures : Valid
-[wp] [Qed] Goal typed_field_alias_ensures_2 : Valid
-[wp] [Qed] Goal typed_field_alias_assigns : Valid
-[wp] [Qed] Goal typed_field_range_alias_ensures : Valid
-[wp] [Qed] Goal typed_field_range_alias_ensures_2 : Valid
-[wp] [Qed] Goal typed_field_range_alias_assigns : Valid
+[wp] [Qed] Goal typed_global_alias_ensures : Valid
+[wp] [Qed] Goal typed_global_alias_ensures_2 : Valid
+[wp] [Qed] Goal typed_global_alias_assigns : Valid
+[wp] [Qed] Goal typed_global_no_alias_ensures : Valid
+[wp] [Qed] Goal typed_global_no_alias_assigns : Valid
[wp] [Qed] Goal typed_formal_alias_ensures : Valid
[wp] [Qed] Goal typed_formal_alias_ensures_2 : Valid
[wp] [Qed] Goal typed_formal_alias_assigns : Valid
+[wp] [Qed] Goal typed_formal_no_alias_ensures : Valid
+[wp] [Qed] Goal typed_formal_no_alias_assigns : Valid
[wp] [Qed] Goal typed_formal_alias_array_ensures : Valid
[wp] [Qed] Goal typed_formal_alias_array_ensures_2 : Valid
[wp] [Qed] Goal typed_formal_alias_array_ensures_3 : Valid
[wp] [Qed] Goal typed_formal_alias_array_assigns_part1 : Valid
[wp] [Qed] Goal typed_formal_alias_array_assigns_part2 : Valid
-[wp] [Qed] Goal typed_formal_no_alias_ensures : Valid
-[wp] [Qed] Goal typed_formal_no_alias_assigns : Valid
-[wp] [Qed] Goal typed_global_alias_ensures : Valid
-[wp] [Qed] Goal typed_global_alias_ensures_2 : Valid
-[wp] [Qed] Goal typed_global_alias_assigns : Valid
-[wp] [Qed] Goal typed_global_no_alias_ensures : Valid
-[wp] [Qed] Goal typed_global_no_alias_assigns : Valid
+[wp] [Qed] Goal typed_field_alias_ensures : Valid
+[wp] [Qed] Goal typed_field_alias_ensures_2 : Valid
+[wp] [Qed] Goal typed_field_alias_assigns : Valid
+[wp] [Qed] Goal typed_field_range_alias_ensures : Valid
+[wp] [Qed] Goal typed_field_range_alias_ensures_2 : Valid
+[wp] [Qed] Goal typed_field_range_alias_assigns : Valid
[wp] [Qed] Goal typed_set_alias_ensures : Valid
[wp] [Qed] Goal typed_set_alias_ensures_2 : Valid
[wp] [Qed] Goal typed_set_alias_assigns : Valid
+[wp] [Qed] Goal typed_comprehension_alias_ensures : Valid
+[wp] [Qed] Goal typed_comprehension_alias_ensures_2 : Valid
+[wp] [Qed] Goal typed_comprehension_alias_assigns : Valid
[wp] [Qed] Goal typed_union_alias_ensures : Valid
[wp] [Qed] Goal typed_union_alias_ensures_2 : Valid
[wp] [Qed] Goal typed_union_alias_assigns : Valid
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.res.oracle
index 24386e88747eca7dbf7c3b4f5bd12f818c5d5a1e..0b6ce2d0287b4891e9671afb5c1289c56e821b62 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.0.res.oracle
@@ -5,16 +5,16 @@
[wp] 12 goals scheduled
[wp] [Qed] Goal typed_f_ensures : Valid
[wp] [Qed] Goal typed_f_assigns : Valid
+[wp] [Qed] Goal typed_wrong_without_ref_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_wrong_without_ref_call_f_requires : Unsuccess
+[wp] [Qed] Goal typed_pointer_ensures : Valid
+[wp] [Qed] Goal typed_pointer_call_f_requires : Valid
+[wp] [Qed] Goal typed_local_ensures : Valid
+[wp] [Qed] Goal typed_local_call_f_requires : Valid
[wp] [Qed] Goal typed_formal_ensures : Valid
[wp] [Qed] Goal typed_formal_call_f_requires : Valid
[wp] [Qed] Goal typed_global_ensures : Valid
[wp] [Qed] Goal typed_global_call_f_requires : Valid
-[wp] [Qed] Goal typed_local_ensures : Valid
-[wp] [Qed] Goal typed_local_call_f_requires : Valid
-[wp] [Qed] Goal typed_pointer_ensures : Valid
-[wp] [Qed] Goal typed_pointer_call_f_requires : Valid
-[wp] [Qed] Goal typed_wrong_without_ref_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_wrong_without_ref_call_f_requires : Unsuccess
[wp] Proved goals: 11 / 12
Qed: 11
Alt-Ergo: 0 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.1.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.1.res.oracle
index 447bc62e87dbc502341cba6d50f4ed406ce19fad..48e1936e19564287ad810f53ddca2ccc7767dc19 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.1.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/byref.1.res.oracle
@@ -5,16 +5,16 @@
[wp] 12 goals scheduled
[wp] [Qed] Goal typed_ref_f_ensures : Valid
[wp] [Qed] Goal typed_ref_f_assigns : Valid
+[wp] [Qed] Goal typed_ref_wrong_without_ref_ensures : Valid
+[wp] [Qed] Goal typed_ref_wrong_without_ref_call_f_requires : Valid
+[wp] [Qed] Goal typed_ref_pointer_ensures : Valid
+[wp] [Qed] Goal typed_ref_pointer_call_f_requires : Valid
+[wp] [Qed] Goal typed_ref_local_ensures : Valid
+[wp] [Qed] Goal typed_ref_local_call_f_requires : Valid
[wp] [Qed] Goal typed_ref_formal_ensures : Valid
[wp] [Qed] Goal typed_ref_formal_call_f_requires : Valid
[wp] [Qed] Goal typed_ref_global_ensures : Valid
[wp] [Qed] Goal typed_ref_global_call_f_requires : Valid
-[wp] [Qed] Goal typed_ref_local_ensures : Valid
-[wp] [Qed] Goal typed_ref_local_call_f_requires : Valid
-[wp] [Qed] Goal typed_ref_pointer_ensures : Valid
-[wp] [Qed] Goal typed_ref_pointer_call_f_requires : Valid
-[wp] [Qed] Goal typed_ref_wrong_without_ref_ensures : Valid
-[wp] [Qed] Goal typed_ref_wrong_without_ref_call_f_requires : Valid
[wp] Proved goals: 12 / 12
Qed: 12
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var.res.oracle
index 54ef16384aa6e7917a8ea59934f1e802709848a1..d97c3812bd67b8c5da17e69e66ce4c1cbed3317e 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var.res.oracle
@@ -3,29 +3,6 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 78 goals scheduled
-[wp] [Qed] Goal typed_ref_array_in_struct_param_ensures_Pload2 : Valid
-[wp] [Qed] Goal typed_ref_array_in_struct_param_assigns : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_ensures_Mem_n5_nr6 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd_ensures_Ref_r2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_ensures_Mem_n2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part5 : Valid
[wp] [Qed] Goal typed_ref_call_ref_ctr_ensures_Ref_r1 : Valid
[wp] [Qed] Goal typed_ref_call_ref_ctr_assigns_exit : Valid
[wp] [Qed] Goal typed_ref_call_ref_ctr_assigns_normal_part1 : Valid
@@ -38,6 +15,43 @@
[wp] [Qed] Goal typed_ref_call_ref_ctr2_assigns_normal_part3 : Valid
[wp] [Qed] Goal typed_ref_call_ref_ctr2_assigns_normal_part4 : Valid
[wp] [Qed] Goal typed_ref_call_ref_ctr2_assigns_normal_part5 : Valid
+[wp] [Qed] Goal typed_ref_ref_bd_ensures : Valid
+[wp] [Qed] Goal typed_ref_ref_bd_assigns : Valid
+[wp] [Qed] Goal typed_ref_call_ref_bd_ensures_Ref_r2 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_bd_assigns_exit : Valid
+[wp] [Qed] Goal typed_ref_call_ref_bd_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_bd_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_bd2_ensures_Mem_n2 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_exit_part1 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_exit_part2 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part3 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part4 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_bd2_assigns_normal_part5 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_valid_ensures_R7_N4 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_exit_part1 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_exit_part2 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_exit_part3 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part3 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part4 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part5 : Valid
+[wp] [Qed] Goal typed_ref_call_ref_valid_call_ref_valid_requires : Valid
+[wp] [Qed] Goal typed_ref_call_ref_valid_call_ref_valid_2_requires : Valid
+[wp] [Qed] Goal typed_ref_no_ref_bd_ensures : Valid
+[wp] [Qed] Goal typed_ref_no_ref_bd_assigns_part1 : Valid
+[wp] [Qed] Goal typed_ref_no_ref_bd_assigns_part2 : Valid
+[wp] [Qed] Goal typed_ref_call_no_ref_bd_ensures_Mem_n5_nr6 : Valid
+[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_exit_part1 : Valid
+[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_exit_part2 : Valid
+[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_exit_part3 : Valid
+[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part3 : Valid
+[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part4 : Valid
+[wp] [Qed] Goal typed_ref_call_no_ref_bd_assigns_normal_part5 : Valid
[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_ensures_R_R_R : Valid
[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_ensures_R_R_R_2 : Valid
[wp] [Qed] Goal typed_ref_call_ref_ctr_nr_assigns_exit_part1 : Valid
@@ -54,17 +68,6 @@
[wp] [Qed] Goal typed_ref_call_ref_ctr_nstars_assigns_normal_part1 : Valid
[wp] [Qed] Goal typed_ref_call_ref_ctr_nstars_assigns_normal_part2 : Valid
[wp] [Qed] Goal typed_ref_call_ref_ctr_nstars_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_ensures_R7_N4 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_assigns_normal_part5 : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_call_ref_valid_requires : Valid
-[wp] [Qed] Goal typed_ref_call_ref_valid_call_ref_valid_2_requires : Valid
[wp] [Qed] Goal typed_ref_call_two_ref_ensures : Valid
[wp] [Qed] Goal typed_ref_call_two_ref_assigns_exit_part1 : Valid
[wp] [Qed] Goal typed_ref_call_two_ref_assigns_exit_part2 : Valid
@@ -76,11 +79,8 @@
[wp] [Qed] Goal typed_ref_g_assigns_exit : Valid
[wp] [Qed] Goal typed_ref_g_assigns_normal_part1 : Valid
[wp] [Qed] Goal typed_ref_g_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_no_ref_bd_ensures : Valid
-[wp] [Qed] Goal typed_ref_no_ref_bd_assigns_part1 : Valid
-[wp] [Qed] Goal typed_ref_no_ref_bd_assigns_part2 : Valid
-[wp] [Qed] Goal typed_ref_ref_bd_ensures : Valid
-[wp] [Qed] Goal typed_ref_ref_bd_assigns : Valid
+[wp] [Qed] Goal typed_ref_array_in_struct_param_ensures_Pload2 : Valid
+[wp] [Qed] Goal typed_ref_array_in_struct_param_assigns : Valid
[wp] Proved goals: 78 / 78
Qed: 78
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.0.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.0.res.oracle
index 54fb25c926cda9d7c86936fdb3dc64067610e846..b5878139820eb2eed4ceb79df18a6690a4635426 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.0.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.0.res.oracle
@@ -3,20 +3,18 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 34 goals scheduled
+[wp] [Qed] Goal typed_ref_reset_ensures : Valid
+[wp] [Qed] Goal typed_ref_reset_assigns : Valid
+[wp] [Qed] Goal typed_ref_incr_ensures : Valid
+[wp] [Qed] Goal typed_ref_incr_assigns : Valid
+[wp] [Qed] Goal typed_ref_load_ensures : Valid
+[wp] [Qed] Goal typed_ref_load_assigns : Valid
[wp] [Qed] Goal typed_ref_call_global_ensures : Valid
[wp] [Qed] Goal typed_ref_call_global_assigns_exit : Valid
[wp] [Qed] Goal typed_ref_call_global_assigns_normal_part1 : Valid
[wp] [Qed] Goal typed_ref_call_global_assigns_normal_part2 : Valid
[wp] [Qed] Goal typed_ref_call_global_call_reset_requires : Valid
[wp] [Qed] Goal typed_ref_call_global_call_load_requires : Valid
-[wp] [Qed] Goal typed_ref_call_local_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_local_call_reset_requires : Valid
-[wp] [Qed] Goal typed_ref_call_local_call_load_requires : Valid
[wp] [Qed] Goal typed_ref_call_param_ensures : Valid
[wp] [Qed] Goal typed_ref_call_param_assigns_exit_part1 : Valid
[wp] [Qed] Goal typed_ref_call_param_assigns_exit_part2 : Valid
@@ -25,18 +23,20 @@
[wp] [Qed] Goal typed_ref_call_param_assigns_normal_part3 : Valid
[wp] [Qed] Goal typed_ref_call_param_call_reset_requires : Valid
[wp] [Qed] Goal typed_ref_call_param_call_load_requires : Valid
+[wp] [Qed] Goal typed_ref_call_local_ensures : Valid
+[wp] [Qed] Goal typed_ref_call_local_assigns_exit_part1 : Valid
+[wp] [Qed] Goal typed_ref_call_local_assigns_exit_part2 : Valid
+[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part3 : Valid
+[wp] [Qed] Goal typed_ref_call_local_call_reset_requires : Valid
+[wp] [Qed] Goal typed_ref_call_local_call_load_requires : Valid
[wp] [Qed] Goal typed_ref_call_param_ref_ensures : Valid
[wp] [Qed] Goal typed_ref_call_param_ref_assigns_exit : Valid
[wp] [Qed] Goal typed_ref_call_param_ref_assigns_normal_part1 : Valid
[wp] [Qed] Goal typed_ref_call_param_ref_assigns_normal_part2 : Valid
[wp] [Qed] Goal typed_ref_call_param_ref_call_reset_requires : Valid
[wp] [Qed] Goal typed_ref_call_param_ref_call_load_requires : Valid
-[wp] [Qed] Goal typed_ref_incr_ensures : Valid
-[wp] [Qed] Goal typed_ref_incr_assigns : Valid
-[wp] [Qed] Goal typed_ref_load_ensures : Valid
-[wp] [Qed] Goal typed_ref_load_assigns : Valid
-[wp] [Qed] Goal typed_ref_reset_ensures : Valid
-[wp] [Qed] Goal typed_ref_reset_assigns : Valid
[wp] Proved goals: 34 / 34
Qed: 34
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.1.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.1.res.oracle
index 6601e9e2d00ee0d618d8ed8046f4859ba603748f..7a50ede52eb9de48083e80185e8fbe5291b9697e 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.1.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/dispatch_var2.1.res.oracle
@@ -3,20 +3,18 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 34 goals scheduled
+[wp] [Qed] Goal typed_ref_reset_ensures : Valid
+[wp] [Qed] Goal typed_ref_reset_assigns : Valid
+[wp] [Qed] Goal typed_ref_incr_ensures : Valid
+[wp] [Qed] Goal typed_ref_incr_assigns : Valid
+[wp] [Qed] Goal typed_ref_load_ensures : Valid
+[wp] [Qed] Goal typed_ref_load_assigns : Valid
[wp] [Qed] Goal typed_ref_call_global_ensures : Valid
[wp] [Qed] Goal typed_ref_call_global_assigns_exit : Valid
[wp] [Qed] Goal typed_ref_call_global_assigns_normal_part1 : Valid
[wp] [Qed] Goal typed_ref_call_global_assigns_normal_part2 : Valid
[wp] [Qed] Goal typed_ref_call_global_call_reset_requires : Valid
[wp] [Qed] Goal typed_ref_call_global_call_load_requires : Valid
-[wp] [Qed] Goal typed_ref_call_local_ensures : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_call_local_call_reset_requires : Valid
-[wp] [Qed] Goal typed_ref_call_local_call_load_requires : Valid
[wp] [Qed] Goal typed_ref_call_param_ensures : Valid
[wp] [Qed] Goal typed_ref_call_param_assigns_exit_part1 : Valid
[wp] [Qed] Goal typed_ref_call_param_assigns_exit_part2 : Valid
@@ -25,18 +23,20 @@
[wp] [Qed] Goal typed_ref_call_param_assigns_normal_part3 : Valid
[wp] [Qed] Goal typed_ref_call_param_call_reset_requires : Valid
[wp] [Qed] Goal typed_ref_call_param_call_load_requires : Valid
+[wp] [Qed] Goal typed_ref_call_local_ensures : Valid
+[wp] [Qed] Goal typed_ref_call_local_assigns_exit_part1 : Valid
+[wp] [Qed] Goal typed_ref_call_local_assigns_exit_part2 : Valid
+[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_ref_call_local_assigns_normal_part3 : Valid
+[wp] [Qed] Goal typed_ref_call_local_call_reset_requires : Valid
+[wp] [Qed] Goal typed_ref_call_local_call_load_requires : Valid
[wp] [Qed] Goal typed_ref_call_param_ref_ensures : Valid
[wp] [Qed] Goal typed_ref_call_param_ref_assigns_exit : Valid
[wp] [Qed] Goal typed_ref_call_param_ref_assigns_normal_part1 : Valid
[wp] [Qed] Goal typed_ref_call_param_ref_assigns_normal_part2 : Valid
[wp] [Qed] Goal typed_ref_call_param_ref_call_reset_requires : Valid
[wp] [Qed] Goal typed_ref_call_param_ref_call_load_requires : Valid
-[wp] [Qed] Goal typed_ref_incr_ensures : Valid
-[wp] [Qed] Goal typed_ref_incr_assigns : Valid
-[wp] [Qed] Goal typed_ref_load_ensures : Valid
-[wp] [Qed] Goal typed_ref_load_assigns : Valid
-[wp] [Qed] Goal typed_ref_reset_ensures : Valid
-[wp] [Qed] Goal typed_ref_reset_assigns : Valid
[wp] Proved goals: 34 / 34
Qed: 34
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.res.oracle
index 009b3d2962514d6403f57a102d082206f7a0bb15..81897c8db12744ff443786b8e730f7f1adcccc89 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference.res.oracle
@@ -3,6 +3,13 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 23 goals scheduled
+[wp] [Qed] Goal typed_ref_g_ensures : Valid
+[wp] [Qed] Goal typed_ref_g_assigns_exit_part1 : Valid
+[wp] [Qed] Goal typed_ref_g_assigns_exit_part2 : Valid
+[wp] [Qed] Goal typed_ref_g_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_ref_g_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_ref_g_assigns_normal_part3 : Valid
+[wp] [Qed] Goal typed_ref_g_call_f_requires : Valid
[wp] [Qed] Goal typed_ref_call_f2_ensures : Valid
[wp] [Qed] Goal typed_ref_call_f2_assigns_exit_part1 : Valid
[wp] [Qed] Goal typed_ref_call_f2_assigns_exit_part2 : Valid
@@ -17,13 +24,6 @@
[wp] [Qed] Goal typed_ref_call_global_assigns_normal_part1 : Valid
[wp] [Qed] Goal typed_ref_call_global_assigns_normal_part2 : Valid
[wp] [Qed] Goal typed_ref_call_global_call_f_requires : Valid
-[wp] [Qed] Goal typed_ref_g_ensures : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_ref_g_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_ref_g_call_f_requires : Valid
[wp] [Qed] Goal typed_ref_write_ensures : Valid
[wp] [Qed] Goal typed_ref_write_assigns : Valid
[wp] Proved goals: 21 / 23
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.res.oracle
index e29464dd5553cb3b620485ad15435ce831bdad74..9da7484d4d2dbe1ef5e6c0d68b4f796d572e69ac 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_and_struct.res.oracle
@@ -3,38 +3,38 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 32 goals scheduled
-[wp] [Qed] Goal typed_ref_call_array_in_struct_param_ensures_Pload2 : Valid
-[wp] [Qed] Goal typed_ref_call_array_in_struct_param_ensures_Pload3 : Valid
-[wp] [Qed] Goal typed_ref_call_array_in_struct_param_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_array_in_struct_param_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_array_in_struct_param_call_load_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_on_array_in_struct_global_ensures_Pload : Valid
-[wp] [Qed] Goal typed_ref_call_on_array_in_struct_global_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_on_array_in_struct_global_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_on_array_in_struct_global_call_load_5_requires : Valid
+[wp] [Qed] Goal typed_ref_reset_ensures : Valid
+[wp] [Qed] Goal typed_ref_reset_assigns : Valid
[wp] [Qed] Goal typed_ref_call_reset_ensures : Valid
[wp] [Qed] Goal typed_ref_call_reset_assigns_exit : Valid
[wp] [Qed] Goal typed_ref_call_reset_assigns_normal_part1 : Valid
[wp] [Qed] Goal typed_ref_call_reset_assigns_normal_part2 : Valid
[wp] [Qed] Goal typed_ref_call_reset_call_reset_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_reset_1_5_ensures_Presset_mat : Valid
-[wp] [Qed] Goal typed_ref_call_reset_1_5_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_reset_1_5_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_reset_1_5_call_reset_1_5_requires : Valid
[wp] [Alt-Ergo] Goal typed_ref_call_reset_5_ensures_Preset_5 : Valid
[wp] [Qed] Goal typed_ref_call_reset_5_assigns_exit : Valid
[wp] [Qed] Goal typed_ref_call_reset_5_assigns_normal : Valid
[wp] [Qed] Goal typed_ref_call_reset_5_call_reset_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_call_reset_5_dim2_ensures_Presset_mat : Valid
-[wp] [Qed] Goal typed_ref_call_reset_5_dim2_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_call_reset_5_dim2_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_call_reset_5_dim2_call_reset_5_requires : Valid
[wp] [Alt-Ergo] Goal typed_ref_call_reset_5_tps_ensures_Preset_5_tps : Valid
[wp] [Qed] Goal typed_ref_call_reset_5_tps_assigns_exit : Valid
[wp] [Qed] Goal typed_ref_call_reset_5_tps_assigns_normal : Valid
[wp] [Qed] Goal typed_ref_call_reset_5_tps_call_reset_5_requires : Valid
-[wp] [Qed] Goal typed_ref_reset_ensures : Valid
-[wp] [Qed] Goal typed_ref_reset_assigns : Valid
+[wp] [Alt-Ergo] Goal typed_ref_call_reset_1_5_ensures_Presset_mat : Valid
+[wp] [Qed] Goal typed_ref_call_reset_1_5_assigns_exit : Valid
+[wp] [Qed] Goal typed_ref_call_reset_1_5_assigns_normal : Valid
+[wp] [Qed] Goal typed_ref_call_reset_1_5_call_reset_1_5_requires : Valid
+[wp] [Alt-Ergo] Goal typed_ref_call_reset_5_dim2_ensures_Presset_mat : Valid
+[wp] [Qed] Goal typed_ref_call_reset_5_dim2_assigns_exit : Valid
+[wp] [Qed] Goal typed_ref_call_reset_5_dim2_assigns_normal : Valid
+[wp] [Qed] Goal typed_ref_call_reset_5_dim2_call_reset_5_requires : Valid
+[wp] [Alt-Ergo] Goal typed_ref_call_on_array_in_struct_global_ensures_Pload : Valid
+[wp] [Qed] Goal typed_ref_call_on_array_in_struct_global_assigns_exit : Valid
+[wp] [Qed] Goal typed_ref_call_on_array_in_struct_global_assigns_normal : Valid
+[wp] [Qed] Goal typed_ref_call_on_array_in_struct_global_call_load_5_requires : Valid
+[wp] [Qed] Goal typed_ref_call_array_in_struct_param_ensures_Pload2 : Valid
+[wp] [Qed] Goal typed_ref_call_array_in_struct_param_ensures_Pload3 : Valid
+[wp] [Qed] Goal typed_ref_call_array_in_struct_param_assigns_exit : Valid
+[wp] [Qed] Goal typed_ref_call_array_in_struct_param_assigns_normal : Valid
+[wp] [Qed] Goal typed_ref_call_array_in_struct_param_call_load_5_requires : Valid
[wp] Proved goals: 32 / 32
Qed: 27
Alt-Ergo: 5
diff --git a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.res.oracle b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.res.oracle
index 2d2721f73017227cb40285453549226662009c09..5fa325b91701864750b7557fa6443415d74dbdb9 100644
--- a/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.res.oracle
+++ b/src/plugins/wp/tests/wp_hoare/oracle_qualif/reference_array.res.oracle
@@ -3,6 +3,14 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 36 goals scheduled
+[wp] [Alt-Ergo] Goal typed_ref_reset_1_5_ensures : Valid
+[wp] [Qed] Goal typed_ref_reset_1_5_assigns_exit : Valid
+[wp] [Qed] Goal typed_ref_reset_1_5_assigns_normal : Valid
+[wp] [Qed] Goal typed_ref_reset_1_5_call_reset_5_requires : Valid
+[wp] [Alt-Ergo] Goal typed_ref_load_1_5_ensures : Valid
+[wp] [Qed] Goal typed_ref_load_1_5_assigns_exit : Valid
+[wp] [Qed] Goal typed_ref_load_1_5_assigns_normal : Valid
+[wp] [Qed] Goal typed_ref_load_1_5_call_load_5_requires : Valid
[wp] [Alt-Ergo] Goal typed_ref_add_1_5_ensures : Valid
[wp] [Qed] Goal typed_ref_add_1_5_assigns_exit : Valid
[wp] [Qed] Goal typed_ref_add_1_5_assigns_normal : Valid
@@ -15,14 +23,6 @@
[wp] [Qed] Goal typed_ref_calls_on_array_dim_1_call_load_5_requires : Valid
[wp] [Qed] Goal typed_ref_calls_on_array_dim_1_call_reset_5_requires : Valid
[wp] [Qed] Goal typed_ref_calls_on_array_dim_1_call_add_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_ensures_Pload : Valid
-[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_ensures_Preset : Valid
-[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_ensures_Padd : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_call_load_1_5_requires : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_call_reset_1_5_requires : Valid
-[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_call_add_1_5_requires : Valid
[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_to_1_ensures_Pload : Valid
[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_to_1_ensures_Preset : Valid
[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_to_1_ensures_Padd : Valid
@@ -31,14 +31,14 @@
[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_to_1_call_load_5_requires : Valid
[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_to_1_call_reset_5_requires : Valid
[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_to_1_call_add_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_load_1_5_ensures : Valid
-[wp] [Qed] Goal typed_ref_load_1_5_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_load_1_5_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_load_1_5_call_load_5_requires : Valid
-[wp] [Alt-Ergo] Goal typed_ref_reset_1_5_ensures : Valid
-[wp] [Qed] Goal typed_ref_reset_1_5_assigns_exit : Valid
-[wp] [Qed] Goal typed_ref_reset_1_5_assigns_normal : Valid
-[wp] [Qed] Goal typed_ref_reset_1_5_call_reset_5_requires : Valid
+[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_ensures_Pload : Valid
+[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_ensures_Preset : Valid
+[wp] [Alt-Ergo] Goal typed_ref_calls_on_array_dim_2_ensures_Padd : Valid
+[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_assigns_exit : Valid
+[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_assigns_normal : Valid
+[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_call_load_1_5_requires : Valid
+[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_call_reset_1_5_requires : Valid
+[wp] [Qed] Goal typed_ref_calls_on_array_dim_2_call_add_1_5_requires : Valid
[wp] Proved goals: 36 / 36
Qed: 24
Alt-Ergo: 12
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle
index 743c3bfc6a9d9b1c3becd821353a341a51ea2ce3..82ecbd70541d86c7a419e37e600542f381f6f451 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/model.res.oracle
@@ -92,7 +92,7 @@ Prove: P_P(x).
------------------------------------------------------------
[wp] Running WP plugin...
-[wp] 2 goals scheduled
+[wp] 1 goal scheduled
---------------------------------------------
--- Context 'typed_ref_f' Cluster 'Compound'
---------------------------------------------
@@ -164,36 +164,7 @@ end
let x = get1 t (shift_sint321 a i) in
region1 (base1 a) <=' 0 -> is_sint321 i -> is_sint321 x -> P_P1 x
end
-[wp:print-generated]
- theory WP2
- (* use why3.BuiltIn.BuiltIn *)
-
- (* use bool.Bool *)
-
- (* use int.Int *)
-
- (* use int.ComputerDivision *)
-
- (* use real.RealInfix *)
-
- (* use frama_c_wp.qed.Qed *)
-
- (* use map.Map *)
-
- (* use frama_c_wp.memory.Memory *)
-
- (* use frama_c_wp.cint.Cint *)
-
- (* use Compound *)
-
- (* use Axiomatic *)
-
- goal wp_goal :
- forall t:addr -> int, i:int, a:addr.
- let x = get t (shift_sint32 a i) in
- region (base a) <= 0 -> is_sint32 i -> is_sint32 x -> P_P x
- end
-[wp] 2 goals generated
+[wp] 1 goal generated
------------------------------------------------------------
Function f
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.res.oracle
index d23de5bf36c08ebb9d0caf73240db5bb164d5d3b..dac2be58e75ca61486ac7ca1bf782c6ba092b8b7 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/bool.res.oracle
@@ -3,13 +3,13 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
-[wp] [Alt-Ergo] Goal typed_band_bool_false_ensures : Valid
-[wp] [Qed] Goal typed_band_bool_true_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_bor_bool_false_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_job_ensures : Valid
[wp] [Alt-Ergo] Goal typed_bor_bool_true_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_bxor_bool_false_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_bor_bool_false_ensures : Valid
+[wp] [Qed] Goal typed_band_bool_true_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_band_bool_false_ensures : Valid
[wp] [Qed] Goal typed_bxor_bool_true_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_job_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_bxor_bool_false_ensures : Valid
[wp] Proved goals: 7 / 7
Qed: 2
Alt-Ergo: 5
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed.res.oracle
index 541ee8719f95fc7b63f2c9c6dfbcaa4d9ad3bd43..06068093e7ee75e3358fe8d141511712ef6c71b0 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed.res.oracle
@@ -3,17 +3,17 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
+[wp] [Passed] Smoke-test typed_foo_wp_smoke_default_requires
+[wp] [Failed] Smoke-test typed_foo_wp_smoke_A_requires
+ Qed: Valid
+[wp] tests/wp_plugin/doomed.i:27: Warning: Failed smoke-test
+[wp] [Passed] Smoke-test typed_foo_wp_smoke_B_requires
[wp] [Passed] Smoke-test typed_bar_wp_smoke_default_requires
[wp] [Qed] Goal typed_bar_ensures : Valid
[wp] [Failed] Smoke-test typed_buzz_wp_smoke_default_requires
Qed: Valid
[wp] tests/wp_plugin/doomed.i:41: Warning: Failed smoke-test
[wp] [Qed] Goal typed_buzz_ensures : Valid
-[wp] [Passed] Smoke-test typed_foo_wp_smoke_default_requires
-[wp] [Failed] Smoke-test typed_foo_wp_smoke_A_requires
- Qed: Valid
-[wp] tests/wp_plugin/doomed.i:27: Warning: Failed smoke-test
-[wp] [Passed] Smoke-test typed_foo_wp_smoke_B_requires
[wp] Proved goals: 5 / 7
Qed: 2 (failed: 2)
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.0.res.oracle
index 0f1ab89f30e93e02d96f35b7782b3773bee6ce01..b1a5c4a4fbc09fcce1b714599901ea1f0c29643e 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.0.res.oracle
@@ -9,10 +9,10 @@
[wp] [Qed] Goal typed_f2_ok_exits : Valid
[wp] [Qed] Goal typed_f3_ko_ensures : Valid
[wp] [Qed] Goal typed_f3_ok_ensures : Valid
-[wp] [Qed] Goal typed_f4_ko_ensures : Valid
[wp] [Qed] Goal typed_f4_ok_ensures : Valid
-[wp] [Qed] Goal typed_f5_ko_ensures : Valid
+[wp] [Qed] Goal typed_f4_ko_ensures : Valid
[wp] [Qed] Goal typed_f5_ok_ensures : Valid
+[wp] [Qed] Goal typed_f5_ko_ensures : Valid
[wp] Proved goals: 10 / 10
Qed: 10
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.1.res.oracle
index 1ccce739712018e9b9453a8d2a8e1ee668904622..130e2f527e0c702d8d61de7871768a960821ad7e 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.1.res.oracle
@@ -24,12 +24,18 @@
[wp] [Qed] Goal typed_f3_ko_ensures : Valid
[wp] [Passed] Smoke-test typed_call_exit_ok_wp_smoke_dead_call_s18
[wp] [Qed] Goal typed_f3_ok_ensures : Valid
+[wp] [Passed] Smoke-test typed_call_ko_global_wp_smoke_dead_call_s22
+[wp] [Qed] Goal typed_f4_ok_ensures : Valid
[wp] [Failed] Smoke-test typed_call_ko_global_wp_smoke_dead_call_s26
Qed: Valid
[wp] tests/wp_plugin/doomed_call.i:89: Warning: Failed smoke-test
[wp] [Qed] Goal typed_f4_ko_ensures : Valid
-[wp] [Passed] Smoke-test typed_call_ko_global_wp_smoke_dead_call_s22
-[wp] [Qed] Goal typed_f4_ok_ensures : Valid
+[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s29
+[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s30
+[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s31
+[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s30
+[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s31
+[wp] [Qed] Goal typed_f5_ok_ensures : Valid
[wp] [Passed] Smoke-test typed_call_wrong_wp_smoke_dead_call_s35
[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s34
[wp] [Failed] Smoke-test typed_call_effect_wp_smoke_dead_call_s36
@@ -40,12 +46,6 @@
Qed: Valid
[wp] tests/wp_plugin/doomed_call.i:121: Warning: Failed smoke-test
[wp] [Qed] Goal typed_f5_ko_ensures : Valid
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s29
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s30
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s31
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s30
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s31
-[wp] [Qed] Goal typed_f5_ok_ensures : Valid
[wp] Proved goals: 28 / 33
Qed: 10 (failed: 5)
Alt-Ergo: 18
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.2.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.2.res.oracle
index 972512d6665bff2ccf87f9d61b6a0f53228d8088..cfbb11197d446202f248457926496f212dfb6492 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.2.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_call.2.res.oracle
@@ -27,12 +27,18 @@
[wp] [Qed] Goal typed_f3_ko_ensures : Valid
[wp] [Passed] Smoke-test typed_call_exit_ok_wp_smoke_dead_call_s18
[wp] [Qed] Goal typed_f3_ok_ensures : Valid
+[wp] [Passed] Smoke-test typed_call_ko_global_wp_smoke_dead_call_s22
+[wp] [Qed] Goal typed_f4_ok_ensures : Valid
[wp] [Failed] Smoke-test typed_call_ko_global_wp_smoke_dead_call_s26
Qed: Valid
[wp] tests/wp_plugin/doomed_call.i:89: Warning: Failed smoke-test
[wp] [Qed] Goal typed_f4_ko_ensures : Valid
-[wp] [Passed] Smoke-test typed_call_ko_global_wp_smoke_dead_call_s22
-[wp] [Qed] Goal typed_f4_ok_ensures : Valid
+[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s29
+[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s30
+[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s31
+[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s30
+[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s31
+[wp] [Qed] Goal typed_f5_ok_ensures : Valid
[wp] [Passed] Smoke-test typed_call_wrong_wp_smoke_dead_call_s35
[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s34
[wp] [Failed] Smoke-test typed_call_effect_wp_smoke_dead_call_s36
@@ -43,12 +49,6 @@
Qed: Valid
[wp] tests/wp_plugin/doomed_call.i:121: Warning: Failed smoke-test
[wp] [Qed] Goal typed_f5_ko_ensures : Valid
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s29
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s30
-[wp] [Passed] Smoke-test typed_call_effect_wp_smoke_dead_call_s31
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s30
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s31
-[wp] [Qed] Goal typed_f5_ok_ensures : Valid
[wp] Proved goals: 31 / 36
Qed: 13 (failed: 5)
Alt-Ergo: 18
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.0.res.oracle
index b256a09e43c74003d6e3bc7a5b1c4f3abe89b236..0b349526c40d14e9bc6ee38bd5e6574999977b81 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.0.res.oracle
@@ -8,6 +8,12 @@
[wp] [Passed] Smoke-test typed_f1_ok_wp_smoke_dead_code_s10
[wp] [Qed] Goal typed_f1_ok_assigns_part1 : Valid
[wp] [Qed] Goal typed_f1_ok_assigns_part2 : Valid
+[wp] [Passed] Smoke-test typed_exit_wp_smoke_dead_call_s14
+[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s14
+[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s16
+[wp] [Qed] Goal typed_f2_ok_assigns_exit : Valid
+[wp] [Qed] Goal typed_f2_ok_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_f2_ok_assigns_normal_part2 : Valid
[wp] [Passed] Smoke-test typed_exit_wp_smoke_dead_call_s22
[wp] [Passed] Smoke-test typed_f2_ko_wp_smoke_dead_code_s22
[wp] [Failed] Smoke-test typed_f2_ko_wp_smoke_dead_code_s23
@@ -17,12 +23,6 @@
[wp] [Qed] Goal typed_f2_ko_assigns_exit : Valid
[wp] [Qed] Goal typed_f2_ko_assigns_normal_part1 : Valid
[wp] [Qed] Goal typed_f2_ko_assigns_normal_part2 : Valid
-[wp] [Passed] Smoke-test typed_exit_wp_smoke_dead_call_s14
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s14
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s16
-[wp] [Qed] Goal typed_f2_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_normal_part2 : Valid
[wp] [Passed] Smoke-test typed_call_wp_smoke_dead_call_s30
[wp] [Passed] Smoke-test typed_f3_ok_wp_smoke_dead_code_s30
[wp] [Passed] Smoke-test typed_f3_ok_wp_smoke_dead_code_s31
@@ -37,6 +37,12 @@
[wp] [Qed] Goal typed_f4_ok_assigns_normal_part1 : Valid
[wp] [Qed] Goal typed_f4_ok_assigns_normal_part2 : Valid
[wp] [Qed] Goal typed_f4_ok_assigns_normal_part3 : Valid
+[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s48
+[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s50
+[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s52
+[wp] [Qed] Goal typed_f5_ok_assigns_part1 : Valid
+[wp] [Qed] Goal typed_f5_ok_assigns_part2 : Valid
+[wp] [Qed] Goal typed_f5_ok_assigns_part3 : Valid
[wp] [Passed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s56
[wp] [Failed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s61
Qed: Valid
@@ -47,12 +53,6 @@
[wp] [Qed] Goal typed_f5_ko_assigns_part2 : Valid
[wp] [Qed] Goal typed_f5_ko_assigns_part3 : Valid
[wp] [Qed] Goal typed_f5_ko_assigns_part4 : Valid
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s48
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s50
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s52
-[wp] [Qed] Goal typed_f5_ok_assigns_part1 : Valid
-[wp] [Qed] Goal typed_f5_ok_assigns_part2 : Valid
-[wp] [Qed] Goal typed_f5_ok_assigns_part3 : Valid
[wp] Proved goals: 44 / 46
Qed: 23 (failed: 2)
Alt-Ergo: 21
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.1.res.oracle
index 0b4390c4e11c64231036c6c89c01b16fc65c1cdd..fd8fae824785bcd829b66d0b40756567adba02b3 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/doomed_dead.1.res.oracle
@@ -9,6 +9,13 @@
[wp] [Qed] Goal typed_f1_ok_assigns_part1 : Valid
[wp] [Qed] Goal typed_f1_ok_assigns_part2 : Valid
[wp] [Qed] Goal typed_f1_ok_assigns_part3 : Valid
+[wp] [Passed] Smoke-test typed_exit_wp_smoke_dead_call_s14
+[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s14
+[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s16
+[wp] [Qed] Goal typed_f2_ok_assigns_exit : Valid
+[wp] [Qed] Goal typed_f2_ok_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_f2_ok_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_f2_ok_assigns_normal_part3 : Valid
[wp] [Passed] Smoke-test typed_exit_wp_smoke_dead_call_s22
[wp] [Passed] Smoke-test typed_f2_ko_wp_smoke_dead_code_s22
[wp] [Failed] Smoke-test typed_f2_ko_wp_smoke_dead_code_s23
@@ -18,13 +25,6 @@
[wp] [Qed] Goal typed_f2_ko_assigns_exit : Valid
[wp] [Qed] Goal typed_f2_ko_assigns_normal_part1 : Valid
[wp] [Qed] Goal typed_f2_ko_assigns_normal_part2 : Valid
-[wp] [Passed] Smoke-test typed_exit_wp_smoke_dead_call_s14
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s14
-[wp] [Passed] Smoke-test typed_f2_ok_wp_smoke_dead_code_s16
-[wp] [Qed] Goal typed_f2_ok_assigns_exit : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_f2_ok_assigns_normal_part3 : Valid
[wp] [Passed] Smoke-test typed_call_wp_smoke_dead_call_s30
[wp] [Passed] Smoke-test typed_f3_ok_wp_smoke_dead_code_s30
[wp] [Passed] Smoke-test typed_f3_ok_wp_smoke_dead_code_s31
@@ -39,6 +39,12 @@
[wp] [Qed] Goal typed_f4_ok_assigns_normal_part1 : Valid
[wp] [Qed] Goal typed_f4_ok_assigns_normal_part2 : Valid
[wp] [Qed] Goal typed_f4_ok_assigns_normal_part3 : Valid
+[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s48
+[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s50
+[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s52
+[wp] [Qed] Goal typed_f5_ok_assigns_part1 : Valid
+[wp] [Qed] Goal typed_f5_ok_assigns_part2 : Valid
+[wp] [Qed] Goal typed_f5_ok_assigns_part3 : Valid
[wp] [Passed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s56
[wp] [Failed] Smoke-test typed_f5_ko_wp_smoke_dead_code_s61
Qed: Valid
@@ -49,12 +55,6 @@
[wp] [Qed] Goal typed_f5_ko_assigns_part2 : Valid
[wp] [Qed] Goal typed_f5_ko_assigns_part3 : Valid
[wp] [Qed] Goal typed_f5_ko_assigns_part4 : Valid
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s48
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s50
-[wp] [Passed] Smoke-test typed_f5_ok_wp_smoke_dead_code_s52
-[wp] [Qed] Goal typed_f5_ok_assigns_part1 : Valid
-[wp] [Qed] Goal typed_f5_ok_assigns_part2 : Valid
-[wp] [Qed] Goal typed_f5_ok_assigns_part3 : Valid
[wp] Proved goals: 46 / 48
Qed: 25 (failed: 2)
Alt-Ergo: 21
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.res.oracle
index 2561d69246cd7d32640e47700c1b3e7660874f55..9144906c8da84fbc097b34efdbe590b66f253b4a 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.res.oracle
@@ -4,15 +4,6 @@
[wp] tests/wp_plugin/dynamic.i:78: Warning: Missing 'calls' for default behavior
[wp] Warning: Missing RTE guards
[wp] 51 goals scheduled
-[wp] [Qed] Goal typed_behavior_call_point_h1_h2_s15 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_ensures_part1 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_ensures_part2 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_behavior_bhv1_assigns_normal_part4 : Valid
[wp] [Alt-Ergo] Goal typed_call_call_point_f1_f2_s3 : Valid
[wp] [Qed] Goal typed_call_ensures_part1 : Valid
[wp] [Qed] Goal typed_call_ensures_part2 : Valid
@@ -22,15 +13,26 @@
[wp] [Qed] Goal typed_guarded_call_ensures_part2 : Valid
[wp] [Qed] Goal typed_guarded_call_ensures_2_part1 : Valid
[wp] [Qed] Goal typed_guarded_call_ensures_2_part2 : Valid
-[wp] [Alt-Ergo] Goal typed_missing_context_call_point_h1_s25 : Unsuccess
-[wp] [Qed] Goal typed_missing_context_ensures : Valid
-[wp] [Qed] Goal typed_missing_context_assigns_exit : Valid
-[wp] [Qed] Goal typed_missing_context_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_missing_context_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_no_call_call_point_unreachable_g_s32 : Valid
-[wp] [Qed] Goal typed_no_call_ensures_part1 : Valid
-[wp] [Qed] Goal typed_no_call_ensures_part2 : Valid
-[wp] [Qed] Goal typed_no_call_call_unreachable_g_requires : Valid
+[wp] [Qed] Goal typed_behavior_call_point_h1_h2_s15 : Valid
+[wp] [Qed] Goal typed_behavior_bhv1_ensures_part1 : Valid
+[wp] [Qed] Goal typed_behavior_bhv1_ensures_part2 : Valid
+[wp] [Qed] Goal typed_behavior_bhv1_assigns_exit_part1 : Valid
+[wp] [Qed] Goal typed_behavior_bhv1_assigns_exit_part2 : Valid
+[wp] [Qed] Goal typed_behavior_bhv1_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_behavior_bhv1_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_behavior_bhv1_assigns_normal_part3 : Valid
+[wp] [Qed] Goal typed_behavior_bhv1_assigns_normal_part4 : Valid
+[wp] [Qed] Goal typed_some_behaviors_call_point_h1_h2_h0_for_bhv1_s20 : Valid
+[wp] [Qed] Goal typed_some_behaviors_bhv1_ensures_part1 : Valid
+[wp] [Qed] Goal typed_some_behaviors_bhv1_ensures_part2 : Valid
+[wp] [Qed] Goal typed_some_behaviors_bhv1_ensures_part3 : Valid
+[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_exit_part1 : Valid
+[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_exit_part2 : Valid
+[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part3 : Valid
+[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part4 : Valid
+[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part5 : Valid
[wp] [Qed] Goal typed_some_behaviors_call_point_h1_h2_h0_for_bhv0_s20 : Valid
[wp] [Qed] Goal typed_some_behaviors_bhv0_ensures_part1 : Valid
[wp] [Qed] Goal typed_some_behaviors_bhv0_ensures_part2 : Valid
@@ -44,17 +46,15 @@
[wp] [Qed] Goal typed_some_behaviors_bhv0_assigns_normal_part4 : Valid
[wp] [Qed] Goal typed_some_behaviors_bhv0_assigns_normal_part5 : Valid
[wp] [Qed] Goal typed_some_behaviors_bhv0_assigns_normal_part6 : Valid
-[wp] [Qed] Goal typed_some_behaviors_call_point_h1_h2_h0_for_bhv1_s20 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_ensures_part1 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_ensures_part2 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_ensures_part3 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part3 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part4 : Valid
-[wp] [Qed] Goal typed_some_behaviors_bhv1_assigns_normal_part5 : Valid
+[wp] [Alt-Ergo] Goal typed_missing_context_call_point_h1_s25 : Unsuccess
+[wp] [Qed] Goal typed_missing_context_ensures : Valid
+[wp] [Qed] Goal typed_missing_context_assigns_exit : Valid
+[wp] [Qed] Goal typed_missing_context_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_missing_context_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_no_call_call_point_unreachable_g_s32 : Valid
+[wp] [Qed] Goal typed_no_call_ensures_part1 : Valid
+[wp] [Qed] Goal typed_no_call_ensures_part2 : Valid
+[wp] [Qed] Goal typed_no_call_call_unreachable_g_requires : Valid
[wp] Proved goals: 50 / 51
Qed: 47
Alt-Ergo: 3 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.res.oracle
index fb7fe23261680138c94159f6ea04c9ac25f339e3..1d9ae90802a9173944e7f6725c1a27e606548204 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/frame.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Alt-Ergo] Goal typed_alias_ensures_KO : Unsuccess
-[wp] [Alt-Ergo] Goal typed_global_ensures_KO : Unsuccess
[wp] [Qed] Goal typed_local_ensures_FRAMED : Valid
[wp] [Alt-Ergo] Goal typed_local_ensures_KO : Unsuccess
+[wp] [Alt-Ergo] Goal typed_global_ensures_KO : Unsuccess
[wp] [Alt-Ergo] Goal typed_localref_ensures_KO : Unsuccess
[wp] [Qed] Goal typed_localref_assert_FRAMED : Valid
+[wp] [Alt-Ergo] Goal typed_alias_ensures_KO : Unsuccess
[wp] Proved goals: 2 / 6
Qed: 2
Alt-Ergo: 0 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/model.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/model.res.oracle
index becab8e8f0695bc02585f6dfc232d1e84394aede..9a0ca70837815110370de4bd01d9653916f4d785 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/model.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/model.res.oracle
@@ -84,37 +84,7 @@ end
f - - 1 0.0%
------------------------------------------------------------
[wp] Running WP plugin...
-[wp] 2 goals scheduled
-[wp:print-generated]
- theory WP1
- (* use why3.BuiltIn.BuiltIn *)
-
- (* use bool.Bool *)
-
- (* use int.Int *)
-
- (* use int.ComputerDivision *)
-
- (* use real.RealInfix *)
-
- (* use frama_c_wp.qed.Qed *)
-
- (* use map.Map *)
-
- (* use frama_c_wp.memory.Memory *)
-
- (* use frama_c_wp.cint.Cint *)
-
- (* use Compound *)
-
- (* use Axiomatic *)
-
- goal wp_goal :
- forall t:addr -> int, i:int, a:addr.
- let x = get t (shift_sint32 a i) in
- region (base a) <= 0 -> is_sint32 i -> is_sint32 x -> P_P x
- end
-[wp] [Alt-Ergo] Goal typed_f_ensures : Unsuccess
+[wp] 1 goal scheduled
---------------------------------------------
--- Context 'typed_ref_f' Cluster 'Compound'
---------------------------------------------
@@ -158,7 +128,7 @@ theory Axiomatic1
predicate P_P1 int
end
[wp:print-generated]
- theory WP2
+ theory WP1
(* use why3.BuiltIn.BuiltIn *)
(* use bool.Bool1 *)
@@ -187,8 +157,8 @@ end
region1 (base1 a) <=' 0 -> is_sint321 i -> is_sint321 x -> P_P1 x
end
[wp] [Alt-Ergo] Goal typed_ref_f_ensures : Unsuccess
-[wp] Proved goals: 0 / 2
- Alt-Ergo: 0 (unsuccess: 2)
+[wp] Proved goals: 0 / 1
+ Alt-Ergo: 0 (unsuccess: 1)
------------------------------------------------------------
Functions WP Alt-Ergo Total Success
f - - 2 0.0%
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.res.oracle
index d2e67a0b560403806ef2cdcc386d535ab3da3e40..d66e2f2fd319d17876094133fa82c11fb2de4300 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/repeat.res.oracle
@@ -5,28 +5,9 @@
[wp] tests/wp_plugin/repeat.c:47: Warning:
Missing assigns clause (assigns 'everything' instead)
[wp] 47 goals scheduled
-[wp] [Qed] Goal typed_induction_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_induction_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_induction_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_induction_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_induction_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_induction_loop_assigns : Valid
-[wp] [Qed] Goal typed_induction_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_induction_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_induction_assigns_normal : Valid
[wp] [Qed] Goal typed_master_ensures : Valid
[wp] [Qed] Goal typed_master_assigns_exit : Valid
[wp] [Qed] Goal typed_master_assigns_normal : Valid
-[wp] [Alt-Ergo] Goal typed_shifted_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_shifted_loop_invariant_preserved : Valid
-[wp] [Qed] Goal typed_shifted_loop_invariant_established : Valid
-[wp] [Alt-Ergo] Goal typed_shifted_loop_invariant_2_preserved : Valid
-[wp] [Qed] Goal typed_shifted_loop_invariant_2_established : Valid
-[wp] [Qed] Goal typed_shifted_loop_assigns : Valid
-[wp] [Qed] Goal typed_shifted_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_shifted_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_shifted_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_shifted_assigns_normal_part2 : Valid
[wp] [Qed] Goal typed_unroll_ensures : Valid
[wp] [Qed] Goal typed_unroll_loop_invariant_preserved : Valid
[wp] [Qed] Goal typed_unroll_loop_invariant_established : Valid
@@ -52,6 +33,25 @@
[wp] [Qed] Goal typed_unroll_assigns_normal_part09 : Valid
[wp] [Qed] Goal typed_unroll_assigns_normal_part10 : Valid
[wp] [Qed] Goal typed_unroll_assigns_normal_part11 : Valid
+[wp] [Qed] Goal typed_induction_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_induction_loop_invariant_preserved : Valid
+[wp] [Qed] Goal typed_induction_loop_invariant_established : Valid
+[wp] [Alt-Ergo] Goal typed_induction_loop_invariant_2_preserved : Valid
+[wp] [Qed] Goal typed_induction_loop_invariant_2_established : Valid
+[wp] [Qed] Goal typed_induction_loop_assigns : Valid
+[wp] [Qed] Goal typed_induction_assigns_exit_part1 : Valid
+[wp] [Qed] Goal typed_induction_assigns_exit_part2 : Valid
+[wp] [Qed] Goal typed_induction_assigns_normal : Valid
+[wp] [Alt-Ergo] Goal typed_shifted_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_shifted_loop_invariant_preserved : Valid
+[wp] [Qed] Goal typed_shifted_loop_invariant_established : Valid
+[wp] [Alt-Ergo] Goal typed_shifted_loop_invariant_2_preserved : Valid
+[wp] [Qed] Goal typed_shifted_loop_invariant_2_established : Valid
+[wp] [Qed] Goal typed_shifted_loop_assigns : Valid
+[wp] [Qed] Goal typed_shifted_assigns_exit_part1 : Valid
+[wp] [Qed] Goal typed_shifted_assigns_exit_part2 : Valid
+[wp] [Qed] Goal typed_shifted_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_shifted_assigns_normal_part2 : Valid
[wp] Proved goals: 47 / 47
Qed: 42
Alt-Ergo: 5
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle
index 2be801f58b0d34109b22d22ebdca6ac9d25d6ea4..ce5458f78c87634b3be434ba524388d503ccd667 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.0.res.oracle
@@ -3,25 +3,6 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 39 goals scheduled
-[wp] [Qed] Goal typed_caveat_loops_ensures_ok_first : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_ensures_ok_last : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_loop_invariant_ok_id_max_preserved : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_id_max_established : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_loop_invariant_ok_id_min_preserved : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_id_min_established : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_loop_invariant_ok_inv_preserved : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_inv_established : Valid
-[wp] [Qed] Goal typed_caveat_loops_loop_assigns : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_exit_part1 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_normal_part1 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_normal_part2 : Valid
-[wp] [Qed] Goal typed_caveat_loops_assigns_normal_part3 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_g_called_ensures_ok_u1 : Valid
-[wp] [Qed] Goal typed_caveat_loops_g_called_ensures_ok_u2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_g_not_called_ensures_ok_v1 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_loops_g_not_called_ensures_ok_v2 : Valid
[wp] [Qed] Goal typed_caveat_no_calls_ensures_ok_m1 : Valid
[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_m2 : Valid
[wp] [Qed] Goal typed_caveat_no_calls_ensures_ok_bug_why3_n1 : Valid
@@ -42,6 +23,25 @@
[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_q1 : Valid
[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_q2 : Valid
[wp] [Alt-Ergo] Goal typed_caveat_sequence_g_not_called_ensures_ok_q3 : Valid
+[wp] [Qed] Goal typed_caveat_loops_ensures_ok_first : Valid
+[wp] [Alt-Ergo] Goal typed_caveat_loops_ensures_ok_last : Valid
+[wp] [Alt-Ergo] Goal typed_caveat_loops_loop_invariant_ok_id_max_preserved : Valid
+[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_id_max_established : Valid
+[wp] [Alt-Ergo] Goal typed_caveat_loops_loop_invariant_ok_id_min_preserved : Valid
+[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_id_min_established : Valid
+[wp] [Alt-Ergo] Goal typed_caveat_loops_loop_invariant_ok_inv_preserved : Valid
+[wp] [Qed] Goal typed_caveat_loops_loop_invariant_ok_inv_established : Valid
+[wp] [Qed] Goal typed_caveat_loops_loop_assigns : Valid
+[wp] [Qed] Goal typed_caveat_loops_assigns_exit_part1 : Valid
+[wp] [Qed] Goal typed_caveat_loops_assigns_exit_part2 : Valid
+[wp] [Qed] Goal typed_caveat_loops_assigns_exit_part3 : Valid
+[wp] [Qed] Goal typed_caveat_loops_assigns_normal_part1 : Valid
+[wp] [Qed] Goal typed_caveat_loops_assigns_normal_part2 : Valid
+[wp] [Qed] Goal typed_caveat_loops_assigns_normal_part3 : Valid
+[wp] [Alt-Ergo] Goal typed_caveat_loops_g_called_ensures_ok_u1 : Valid
+[wp] [Qed] Goal typed_caveat_loops_g_called_ensures_ok_u2 : Valid
+[wp] [Alt-Ergo] Goal typed_caveat_loops_g_not_called_ensures_ok_v1 : Valid
+[wp] [Alt-Ergo] Goal typed_caveat_loops_g_not_called_ensures_ok_v2 : Valid
[wp] Proved goals: 39 / 39
Qed: 25
Alt-Ergo: 14
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle
index ad0100e7a0de24b7fc5c49b1038180f283fa669e..4bda2590b48433fac647442ebaa1d96c71b45ce6 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/sequence.1.res.oracle
@@ -3,6 +3,21 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 34 goals scheduled
+[wp] [Qed] Goal typed_caveat_no_calls_ensures_ok_m1 : Valid
+[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_m2 : Valid
+[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_n2 : Valid
+[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_n3 : Valid
+[wp] [Qed] Goal typed_caveat_no_calls_assigns : Valid
+[wp] [Qed] Goal typed_caveat_sequence_assigns_exit : Valid
+[wp] [Qed] Goal typed_caveat_sequence_assigns_normal : Valid
+[wp] [Qed] Goal typed_caveat_sequence_g_called_ensures_ok_o1 : Valid
+[wp] [Qed] Goal typed_caveat_sequence_g_called_ensures_ok_p1 : Valid
+[wp] [Qed] Goal typed_caveat_sequence_g_called_ensures_ok_p2 : Valid
+[wp] [Alt-Ergo] Goal typed_caveat_sequence_g_called_ensures_ok_p3 : Valid
+[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_o2 : Valid
+[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_q1 : Valid
+[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_q2 : Valid
+[wp] [Alt-Ergo] Goal typed_caveat_sequence_g_not_called_ensures_ok_q3 : Valid
[wp] [Qed] Goal typed_caveat_loops_ensures_ok_first : Valid
[wp] [Alt-Ergo] Goal typed_caveat_loops_ensures_ok_last : Valid
[wp] [Alt-Ergo] Goal typed_caveat_loops_loop_invariant_ok_id_max_preserved : Valid
@@ -22,21 +37,6 @@
[wp] [Qed] Goal typed_caveat_loops_g_called_ensures_ok_u2 : Valid
[wp] [Alt-Ergo] Goal typed_caveat_loops_g_not_called_ensures_ok_v1 : Valid
[wp] [Alt-Ergo] Goal typed_caveat_loops_g_not_called_ensures_ok_v2 : Valid
-[wp] [Qed] Goal typed_caveat_no_calls_ensures_ok_m1 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_m2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_n2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_no_calls_ensures_ok_n3 : Valid
-[wp] [Qed] Goal typed_caveat_no_calls_assigns : Valid
-[wp] [Qed] Goal typed_caveat_sequence_assigns_exit : Valid
-[wp] [Qed] Goal typed_caveat_sequence_assigns_normal : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_called_ensures_ok_o1 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_called_ensures_ok_p1 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_called_ensures_ok_p2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_sequence_g_called_ensures_ok_p3 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_o2 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_q1 : Valid
-[wp] [Qed] Goal typed_caveat_sequence_g_not_called_ensures_ok_q2 : Valid
-[wp] [Alt-Ergo] Goal typed_caveat_sequence_g_not_called_ensures_ok_q3 : Valid
[wp] Proved goals: 34 / 34
Qed: 22
Alt-Ergo: 12
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/stmt.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/stmt.res.oracle
index 7bd29dc92c3ddefcccd049aa53e76f6482b79a4f..3a74fac104c542c05e02bcaa5acab1560cebf58a 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/stmt.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/stmt.res.oracle
@@ -12,11 +12,11 @@
[wp] [CFG] Goal h_exits : Valid (Unreachable)
[wp] Warning: Missing RTE guards
[wp] 10 goals scheduled
+[wp] [Qed] Goal typed_f_ensures : Valid
+[wp] [Qed] Goal typed_f_assigns : Valid
[wp] [Qed] Goal typed_f_ensures_2 : Valid
[wp] [Qed] Goal typed_f_ensures_3 : Valid
[wp] [Qed] Goal typed_f_assert : Valid
-[wp] [Qed] Goal typed_f_ensures : Valid
-[wp] [Qed] Goal typed_f_assigns : Valid
[wp] [Qed] Goal typed_g_ensures_2 : Valid
[wp] [Qed] Goal typed_g_assert : Valid
[wp] [Qed] Goal typed_h_ensures_2 : Valid
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct.res.oracle
index 43fba563315355d7ca0addf14cea396b9273d25a..42aa2a20e4fbef7c950217e1b9386a86b2e31385 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/struct.res.oracle
@@ -3,6 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 18 goals scheduled
+[wp] [Qed] Goal typed_id_ensures_qed_ok_P1 : Valid
+[wp] [Qed] Goal typed_id_ensures_qed_ok_P2 : Valid
+[wp] [Qed] Goal typed_g_ensures_qed_ok_P3 : Valid
+[wp] [Qed] Goal typed_g_ensures_qed_ok_P4 : Valid
+[wp] [Qed] Goal typed_g_ensures_qed_ok_P5 : Valid
+[wp] [Qed] Goal typed_g_assigns : Valid
[wp] [Qed] Goal typed_f_ensures_qed_ok_E0 : Valid
[wp] [Qed] Goal typed_f_ensures_qed_ok_E1 : Valid
[wp] [Qed] Goal typed_f_ensures_qed_ok_E2 : Valid
@@ -15,12 +21,6 @@
[wp] [Qed] Goal typed_f_ensures_qed_ok_E9 : Valid
[wp] [Qed] Goal typed_f_ensures_qed_ok_E10 : Valid
[wp] [Qed] Goal typed_f_ensures_qed_ok_E11 : Valid
-[wp] [Qed] Goal typed_g_ensures_qed_ok_P3 : Valid
-[wp] [Qed] Goal typed_g_ensures_qed_ok_P4 : Valid
-[wp] [Qed] Goal typed_g_ensures_qed_ok_P5 : Valid
-[wp] [Qed] Goal typed_g_assigns : Valid
-[wp] [Qed] Goal typed_id_ensures_qed_ok_P1 : Valid
-[wp] [Qed] Goal typed_id_ensures_qed_ok_P2 : Valid
[wp] Proved goals: 18 / 18
Qed: 18
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_store/oracle_qualif/struct.res.oracle b/src/plugins/wp/tests/wp_store/oracle_qualif/struct.res.oracle
index 344ab6e6f744147c2bd03515ad9604f97d99258c..705f7dbdd5295e27155cd343fe99868e8a3713e2 100644
--- a/src/plugins/wp/tests/wp_store/oracle_qualif/struct.res.oracle
+++ b/src/plugins/wp/tests/wp_store/oracle_qualif/struct.res.oracle
@@ -3,10 +3,10 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Qed] Goal typed_f_assert_qed_ok : Valid
-[wp] [Alt-Ergo] Goal typed_f_call_g_requires : Valid
[wp] [Qed] Goal typed_g_ensures : Valid
[wp] [Qed] Goal typed_g_assigns : Valid
+[wp] [Qed] Goal typed_f_assert_qed_ok : Valid
+[wp] [Alt-Ergo] Goal typed_f_call_g_requires : Valid
[wp] [Alt-Ergo] Goal typed_main_ensures_P_qed_ok : Valid
[wp] [Alt-Ergo] Goal typed_main_ensures_Q_qed_ok : Valid
[wp] Proved goals: 6 / 6
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.res.oracle
index e706b784a7a92b81e6fa7c16a7982f020fccfbe3..1a80a196cf89532c5ad595a5ceedc2ad31dd2182 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/cast_fits.res.oracle
@@ -13,11 +13,11 @@
(target: __anonunion_L8_8*)
[wp] 8 goals scheduled
[wp] [Alt-Ergo] Goal typed_fits1_ensures : Valid
+[wp] [Alt-Ergo] Goal typed_mismatch1_ensures : Unsuccess (Stronger)
[wp] [Alt-Ergo] Goal typed_fits2_ensures : Valid
[wp] [Alt-Ergo] Goal typed_fits3_ensures : Valid
[wp] [Alt-Ergo] Goal typed_fits4_ensures : Valid
[wp] [Alt-Ergo] Goal typed_fits5_ensures : Valid
-[wp] [Alt-Ergo] Goal typed_mismatch1_ensures : Unsuccess (Stronger)
[wp] [Alt-Ergo] Goal typed_mismatch2_ensures : Unsuccess (Stronger)
[wp] [Alt-Ergo] Goal typed_mismatch3_ensures : Unsuccess (Stronger)
[wp] Proved goals: 5 / 8
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.res.oracle
index e3689c507d2476957466d03da0a6f7c251718493..18546f909a348ac909e1a04f80648b14d3305b68 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.0.res.oracle
@@ -3,13 +3,13 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
-[wp] [Qed] Goal typed_f_assigns : Valid
-[wp] [Qed] Goal typed_g_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_h_ensures : Valid
[wp] [Qed] Goal typed_job_assert : Valid
[wp] [Alt-Ergo] Goal typed_job_assert_2 : Valid
[wp] [Qed] Goal typed_job_assert_3 : Valid
[wp] [Alt-Ergo] Goal typed_job_assert_4 : Valid
+[wp] [Qed] Goal typed_f_assigns : Valid
+[wp] [Qed] Goal typed_g_assigns : Valid
+[wp] [Alt-Ergo] Goal typed_h_ensures : Valid
[wp] Proved goals: 7 / 7
Qed: 4
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.res.oracle
index 14f99e8e67f5e8a79c38b8083d09af44b03a87f6..86359ce6ec2a844ed6a61b3b7b1ff36e8998a6bf 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_alloc.1.res.oracle
@@ -3,13 +3,13 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
-[wp] [Qed] Goal typed_ref_f_assigns : Valid
-[wp] [Qed] Goal typed_ref_g_assigns : Valid
-[wp] [Alt-Ergo] Goal typed_ref_h_ensures : Valid
[wp] [Qed] Goal typed_ref_job_assert : Valid
[wp] [Alt-Ergo] Goal typed_ref_job_assert_2 : Valid
[wp] [Qed] Goal typed_ref_job_assert_3 : Valid
[wp] [Alt-Ergo] Goal typed_ref_job_assert_4 : Valid
+[wp] [Qed] Goal typed_ref_f_assigns : Valid
+[wp] [Qed] Goal typed_ref_g_assigns : Valid
+[wp] [Alt-Ergo] Goal typed_ref_h_ensures : Valid
[wp] Proved goals: 7 / 7
Qed: 4
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.res.oracle
index aa4dc3db0593a87b6409b0fdd1abc3e462965ba5..7459d60fcb3a9ff2576f1a64c007140d0205f2df 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.0.res.oracle
@@ -21,33 +21,41 @@
[wp] [Qed] Goal typed_lemma_lor_stb : Valid
[wp] [Qed] Goal typed_lemma_lxor_assoc : Valid
[wp] [Qed] Goal typed_lemma_lxor_com : Valid
-[wp] [Qed] Goal typed_band1_uchar_assert_ok : Valid
-[wp] [Alt-Ergo] Goal typed_band1_uchar_assert_ok_2 : Valid
-[wp] [Qed] Goal typed_band1_uint_assert_ok : Valid
-[wp] [Alt-Ergo] Goal typed_band1_uint_assert_ok_2 : Valid
-[wp] [Qed] Goal typed_band1_ulong_assert_ok : Valid
-[wp] [Alt-Ergo] Goal typed_band1_ulong_assert_ok_2 : Valid
-[wp] [Qed] Goal typed_band1_ushort_assert_ok : Valid
-[wp] [Alt-Ergo] Goal typed_band1_ushort_assert_ok_2 : Valid
-[wp] [Alt-Ergo] Goal typed_band_char_ensures_ok : Valid
[wp] [Qed] Goal typed_band_int_ensures_ok : Valid
[wp] [Qed] Goal typed_band_int_assert_ok : Valid
-[wp] [Alt-Ergo] Goal typed_band_uchar_ensures_ok : Valid
-[wp] [Qed] Goal typed_band_uint_ensures_ok : Valid
-[wp] [Alt-Ergo] Goal typed_bnot_char_ensures_ok : Valid
+[wp] [Qed] Goal typed_bor_int_ensures_ok : Valid
+[wp] [Qed] Goal typed_bxor_int_ensures_ok : Valid
[wp] [Qed] Goal typed_bnot_int_ensures_ok : Valid
-[wp] [Qed] Goal typed_bnot_uchar_ensures_ok : Valid
+[wp] [Qed] Goal typed_lshift_int_ensures_ok : Valid
+[wp] [Qed] Goal typed_rshift_int_ensures_ok : Valid
+[wp] [Qed] Goal typed_band1_uint_assert_ok : Valid
+[wp] [Alt-Ergo] Goal typed_band1_uint_assert_ok_2 : Valid
+[wp] [Qed] Goal typed_band_uint_ensures_ok : Valid
+[wp] [Qed] Goal typed_bor_uint_ensures_ok : Valid
+[wp] [Qed] Goal typed_bxor_uint_ensures_ok : Valid
+[wp] [Alt-Ergo] Goal typed_bxor_uint_ensures_ok_2 : Valid
[wp] [Qed] Goal typed_bnot_uint_ensures_ok : Valid
+[wp] [Qed] Goal typed_lshift_uint_ensures_ok : Valid
+[wp] [Qed] Goal typed_rshift_uint_ensures_ok : Valid
+[wp] [Alt-Ergo] Goal typed_band_char_ensures_ok : Valid
[wp] [Alt-Ergo] Goal typed_bor_char_ensures_ok : Valid
-[wp] [Qed] Goal typed_bor_int_ensures_ok : Valid
-[wp] [Qed] Goal typed_bor_uchar_ensures_ok : Valid
-[wp] [Qed] Goal typed_bor_uint_ensures_ok : Valid
[wp] [Alt-Ergo] Goal typed_bxor_char_ensures_ok : Valid
-[wp] [Qed] Goal typed_bxor_int_ensures_ok : Valid
+[wp] [Alt-Ergo] Goal typed_bnot_char_ensures_ok : Valid
+[wp] [Qed] Goal typed_lshift_char_ensures_ok : Valid
+[wp] [Qed] Goal typed_rshift_char_ensures_ok : Valid
+[wp] [Qed] Goal typed_band1_uchar_assert_ok : Valid
+[wp] [Alt-Ergo] Goal typed_band1_uchar_assert_ok_2 : Valid
+[wp] [Alt-Ergo] Goal typed_band_uchar_ensures_ok : Valid
+[wp] [Qed] Goal typed_bor_uchar_ensures_ok : Valid
[wp] [Qed] Goal typed_bxor_uchar_ensures_ok : Valid
[wp] [Alt-Ergo] Goal typed_bxor_uchar_ensures_ok_2 : Valid
-[wp] [Qed] Goal typed_bxor_uint_ensures_ok : Valid
-[wp] [Alt-Ergo] Goal typed_bxor_uint_ensures_ok_2 : Valid
+[wp] [Qed] Goal typed_bnot_uchar_ensures_ok : Valid
+[wp] [Qed] Goal typed_lshift_uchar_ensures_ok : Valid
+[wp] [Alt-Ergo] Goal typed_rshift_uchar_ensures_ok : Valid
+[wp] [Qed] Goal typed_band1_ushort_assert_ok : Valid
+[wp] [Alt-Ergo] Goal typed_band1_ushort_assert_ok_2 : Valid
+[wp] [Qed] Goal typed_band1_ulong_assert_ok : Valid
+[wp] [Alt-Ergo] Goal typed_band1_ulong_assert_ok_2 : Valid
[wp] [Qed] Goal typed_cast_ensures_ok : Valid
[wp] [Qed] Goal typed_cast_assert_ok : Valid
[wp] [Qed] Goal typed_cast_assert_ok_2 : Valid
@@ -56,14 +64,6 @@
[wp] [Qed] Goal typed_cast_assert_ok_5 : Valid
[wp] [Qed] Goal typed_cast_assert_ok_6 : Valid
[wp] [Qed] Goal typed_cast_assert_ok_7 : Valid
-[wp] [Qed] Goal typed_lshift_char_ensures_ok : Valid
-[wp] [Qed] Goal typed_lshift_int_ensures_ok : Valid
-[wp] [Qed] Goal typed_lshift_uchar_ensures_ok : Valid
-[wp] [Qed] Goal typed_lshift_uint_ensures_ok : Valid
-[wp] [Qed] Goal typed_rshift_char_ensures_ok : Valid
-[wp] [Qed] Goal typed_rshift_int_ensures_ok : Valid
-[wp] [Alt-Ergo] Goal typed_rshift_uchar_ensures_ok : Valid
-[wp] [Qed] Goal typed_rshift_uint_ensures_ok : Valid
[wp] Proved goals: 61 / 61
Qed: 41
Alt-Ergo: 20
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.res.oracle
index 1c174b6ad2ab0132d97ea5ed07c86ec4b24e7fbb..10406f8c492cb1a2ab30b5aa6196c538c69bbab4 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_bitwise.1.res.oracle
@@ -4,8 +4,8 @@
[wp] Warning: Missing RTE guards
[wp] 4 goals scheduled
[wp] [Alt-Ergo] Goal typed_band_int_assert_ko : Unsuccess
-[wp] [Alt-Ergo] Goal typed_bnot_uchar_ensures_ko : Unsuccess
[wp] [Alt-Ergo] Goal typed_bnot_uint_ensures_ko : Unsuccess
+[wp] [Alt-Ergo] Goal typed_bnot_uchar_ensures_ko : Unsuccess
[wp] [Alt-Ergo] Goal typed_cast_assert_ko : Unsuccess
[wp] Proved goals: 0 / 4
Alt-Ergo: 0 (unsuccess: 4)
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.res.oracle
index 820a581c2e10442ce536c96ce2ecf012b3e76ebd..a863510b6f644cac7b250b7ea486e3389ba1fc87 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_lemma.res.oracle
@@ -2,12 +2,12 @@
[kernel] Parsing tests/wp_typed/unit_lemma.i (no preprocessing)
[wp] Running WP plugin...
[wp] 6 goals scheduled
-[wp] [Alt-Ergo] Goal typed_lemma_P23_KO : Unsuccess
-[wp] [Alt-Ergo] Goal typed_lemma_P52 : Valid
+[wp] [Alt-Ergo] Goal typed_lemma_Foo : Valid
[wp] [Alt-Ergo] Goal typed_lemma_P13 : Valid
[wp] [Alt-Ergo] Goal typed_lemma_P14 : Valid
+[wp] [Alt-Ergo] Goal typed_lemma_P23_KO : Unsuccess
+[wp] [Alt-Ergo] Goal typed_lemma_P52 : Valid
[wp] [Alt-Ergo] Goal typed_lemma_P54 : Valid
-[wp] [Alt-Ergo] Goal typed_lemma_Foo : Valid
[wp] Proved goals: 5 / 6
Qed: 0
Alt-Ergo: 5 (unsuccess: 1)
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.res.oracle
index ab1c9992d7b13d591c01ef247c9393d6345c9906..137ed92886e4824874d4c3c9d6b161348f360a5e 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.0.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Qed] Goal typed_bar_assigns : Valid
[wp] [Qed] Goal typed_foo_assigns_part1 : Valid
[wp] [Alt-Ergo] Goal typed_foo_assigns_part2 : Valid
+[wp] [Qed] Goal typed_bar_assigns : Valid
[wp] Proved goals: 3 / 3
Qed: 2
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.res.oracle
index 131788981a35a7359070c4d0f9203f342fedf489..183c93047804be2c05c42fd6634638369e847318 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_local.1.res.oracle
@@ -3,9 +3,9 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 3 goals scheduled
-[wp] [Alt-Ergo] Goal typed_raw_bar_assigns : Valid
[wp] [Alt-Ergo] Goal typed_raw_foo_assigns_part1 : Valid
[wp] [Alt-Ergo] Goal typed_raw_foo_assigns_part2 : Valid
+[wp] [Alt-Ergo] Goal typed_raw_bar_assigns : Valid
[wp] Proved goals: 3 / 3
Qed: 0
Alt-Ergo: 3
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_tset.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_tset.res.oracle
index d82295e1dc51bd6fc34b5804a09dfaa7414c4659..73c76c092af6f8fd3ab0fc93f3f7af41fb7e4d83 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_tset.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/unit_tset.res.oracle
@@ -3,8 +3,8 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 2 goals scheduled
-[wp] [Qed] Goal typed_complex_call_job_requires : Valid
[wp] [Qed] Goal typed_complex_assigns : Valid
+[wp] [Qed] Goal typed_complex_call_job_requires : Valid
[wp] Proved goals: 2 / 2
Qed: 2
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.res.oracle
index c210a11f4cccf2b5c541a9928046681fd56eef9b..e0a7b4b82a7b3d5d7f80cfd6978774bc1b17dd1b 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_bitwise.0.res.oracle
@@ -5,14 +5,14 @@
[wp] 12 goals scheduled
[wp] [Qed] Goal typed_ref_rl1_ensures_b0 : Valid
[wp] [Alt-Ergo] Goal typed_ref_rl1_ensures_bk : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rln32_ensures_b1 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rln32_ensures_b2 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rln64_ensures_b1 : Valid
-[wp] [Alt-Ergo] Goal typed_ref_rln64_ensures_b2 : Valid
[wp] [Alt-Ergo] Goal typed_ref_rr1_ensures_b0 : Valid
[wp] [Alt-Ergo] Goal typed_ref_rr1_ensures_bk : Valid
+[wp] [Alt-Ergo] Goal typed_ref_rln32_ensures_b1 : Valid
+[wp] [Alt-Ergo] Goal typed_ref_rln32_ensures_b2 : Valid
[wp] [Alt-Ergo] Goal typed_ref_rrn32_ensures_b1 : Valid
[wp] [Alt-Ergo] Goal typed_ref_rrn32_ensures_b2 : Valid
+[wp] [Alt-Ergo] Goal typed_ref_rln64_ensures_b1 : Valid
+[wp] [Alt-Ergo] Goal typed_ref_rln64_ensures_b2 : Valid
[wp] [Alt-Ergo] Goal typed_ref_rrn64_ensures_b1 : Valid
[wp] [Alt-Ergo] Goal typed_ref_rrn64_ensures_b2 : Valid
[wp] Proved goals: 12 / 12
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.res.oracle
index 5e4efa11a65af41c09fe5fb907fbb742af6879a2..a6406197d72b3779c404adeb341ce848c0e7f9cd 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_collect.res.oracle
@@ -3,6 +3,21 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 32 goals scheduled
+[wp] [Qed] Goal typed_job_ensures_K : Valid
+[wp] [Qed] Goal typed_job_ensures_P : Valid
+[wp] [Qed] Goal typed_job_assigns_part1 : Valid
+[wp] [Qed] Goal typed_job_assigns_part2 : Valid
+[wp] [Qed] Goal typed_job_assigns_part3 : Valid
+[wp] [Qed] Goal typed_job2_ensures_K : Valid
+[wp] [Qed] Goal typed_job2_ensures_Q : Valid
+[wp] [Qed] Goal typed_job2_assigns_part1 : Valid
+[wp] [Qed] Goal typed_job2_assigns_part2 : Valid
+[wp] [Qed] Goal typed_job2_assigns_part3 : Valid
+[wp] [Qed] Goal typed_job3_ensures_K : Valid
+[wp] [Alt-Ergo] Goal typed_job3_ensures_Q : Valid
+[wp] [Qed] Goal typed_job3_assigns_part1 : Valid
+[wp] [Qed] Goal typed_job3_assigns_part2 : Valid
+[wp] [Qed] Goal typed_job3_assigns_part3 : Valid
[wp] [Qed] Goal typed_caller_ensures_K : Valid
[wp] [Alt-Ergo] Goal typed_caller_ensures_P1 : Valid
[wp] [Alt-Ergo] Goal typed_caller_ensures_P2 : Valid
@@ -20,21 +35,6 @@
[wp] [Alt-Ergo] Goal typed_caller3_ensures_R : Valid
[wp] [Alt-Ergo] Goal typed_caller3_call_job3_requires : Valid
[wp] [Alt-Ergo] Goal typed_caller3_call_job3_2_requires : Valid
-[wp] [Qed] Goal typed_job_ensures_K : Valid
-[wp] [Qed] Goal typed_job_ensures_P : Valid
-[wp] [Qed] Goal typed_job_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job_assigns_part2 : Valid
-[wp] [Qed] Goal typed_job_assigns_part3 : Valid
-[wp] [Qed] Goal typed_job2_ensures_K : Valid
-[wp] [Qed] Goal typed_job2_ensures_Q : Valid
-[wp] [Qed] Goal typed_job2_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job2_assigns_part2 : Valid
-[wp] [Qed] Goal typed_job2_assigns_part3 : Valid
-[wp] [Qed] Goal typed_job3_ensures_K : Valid
-[wp] [Alt-Ergo] Goal typed_job3_ensures_Q : Valid
-[wp] [Qed] Goal typed_job3_assigns_part1 : Valid
-[wp] [Qed] Goal typed_job3_assigns_part2 : Valid
-[wp] [Qed] Goal typed_job3_assigns_part3 : Valid
[wp] Proved goals: 32 / 32
Qed: 17
Alt-Ergo: 15
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.res.oracle
index 0ba543bbd4f02751a8696043616c85eb8a81ad65..3945dd8f3a65ec11fffa0303fe8300c4c4e63a66 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.0.res.oracle
@@ -29,28 +29,6 @@
[wp] [Qed] Goal typed_init_t1_assigns_part2 : Valid
[wp] [Alt-Ergo] Goal typed_init_t1_loop_variant_decrease : Valid
[wp] [Qed] Goal typed_init_t1_loop_variant_positive : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_ensures : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_exits : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_invariant_Partial_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_loop_invariant_Partial_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_invariant_Range_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_loop_invariant_Range_established : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_assert_Offset : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_call_init_requires : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_call_init_requires_2 : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v2_ensures : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_exits : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v2_loop_invariant_Partial_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_loop_invariant_Partial_established : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v2_loop_invariant_Range_preserved : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_loop_invariant_Range_established : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_assert_Offset_i : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v2_loop_variant_decrease : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_loop_variant_positive : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_call_init_requires : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_call_init_requires_2 : Valid
[wp] [Alt-Ergo] Goal typed_init_t2_v1_ensures : Valid
[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_invariant_Partial_i_preserved : Valid
[wp] [Qed] Goal typed_init_t2_v1_loop_invariant_Partial_i_established : Valid
@@ -100,6 +78,28 @@
[wp] [Qed] Goal typed_init_t2_v3_loop_variant_positive : Valid
[wp] [Alt-Ergo] Goal typed_init_t2_v3_loop_variant_2_decrease : Valid
[wp] [Qed] Goal typed_init_t2_v3_loop_variant_2_positive : Valid
+[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_ensures : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v1_exits : Valid
+[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_invariant_Partial_preserved : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v1_loop_invariant_Partial_established : Valid
+[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_invariant_Range_preserved : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v1_loop_invariant_Range_established : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v1_assert_Offset : Valid
+[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_variant_decrease : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v1_loop_variant_positive : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v1_call_init_requires : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v1_call_init_requires_2 : Valid
+[wp] [Alt-Ergo] Goal typed_init_t2_bis_v2_ensures : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v2_exits : Valid
+[wp] [Alt-Ergo] Goal typed_init_t2_bis_v2_loop_invariant_Partial_preserved : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v2_loop_invariant_Partial_established : Valid
+[wp] [Alt-Ergo] Goal typed_init_t2_bis_v2_loop_invariant_Range_preserved : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v2_loop_invariant_Range_established : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v2_assert_Offset_i : Valid
+[wp] [Alt-Ergo] Goal typed_init_t2_bis_v2_loop_variant_decrease : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v2_loop_variant_positive : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v2_call_init_requires : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v2_call_init_requires_2 : Valid
[wp] Proved goals: 92 / 92
Qed: 52
Alt-Ergo: 40
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.res.oracle
index 757500ea677bef03e3f14f519399211fb0656b4a..f9f0f2c219867828a57bba71fbce2fade387cf24 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.1.res.oracle
@@ -8,29 +8,29 @@
[wp] [CFG] Goal init_t2_v3_exits : Valid (Unreachable)
[wp] Warning: Missing RTE guards
[wp] 23 goals scheduled
-[wp] [Qed] Goal typed_init_t2_bis_v2_loop_assigns_part1 : Valid
-[wp] [Script] Goal typed_init_t2_bis_v2_loop_assigns_part2 : Valid
-[wp] [Script] Goal typed_init_t2_bis_v2_loop_assigns_part3 : Valid
-[wp] [Script] Goal typed_init_t2_bis_v2_assigns_exit_part1 : Valid
-[wp] [Script] Goal typed_init_t2_bis_v2_assigns_exit_part2 : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v2_assigns_exit_part3 : Valid
-[wp] [Script] Goal typed_init_t2_bis_v2_assigns_normal_part1 : Valid
-[wp] [Script] Goal typed_init_t2_bis_v2_assigns_normal_part2 : Valid
[wp] [Qed] Goal typed_init_t2_v2_loop_assigns_part1 : Valid
[wp] [Script] Goal typed_init_t2_v2_loop_assigns_part2 : Valid
[wp] [Script] Goal typed_init_t2_v2_loop_assigns_part3 : Valid
[wp] [Qed] Goal typed_init_t2_v2_loop_assigns_2_part1 : Valid
[wp] [Script] Goal typed_init_t2_v2_loop_assigns_2_part2 : Valid
[wp] [Script] Goal typed_init_t2_v2_loop_assigns_2_part3 : Valid
-[wp] [Script] Goal typed_init_t2_v2_assigns_part1 : Valid
+[wp] [Qed] Goal typed_init_t2_v2_assigns_part1 : Valid
[wp] [Script] Goal typed_init_t2_v2_assigns_part2 : Valid
[wp] [Qed] Goal typed_init_t2_v3_loop_assigns_part1 : Valid
[wp] [Script] Goal typed_init_t2_v3_loop_assigns_part2 : Valid
[wp] [Script] Goal typed_init_t2_v3_loop_assigns_part3 : Valid
[wp] [Qed] Goal typed_init_t2_v3_loop_assigns_2_part1 : Valid
-[wp] [Script] Goal typed_init_t2_v3_loop_assigns_2_part2 : Valid
-[wp] [Script] Goal typed_init_t2_v3_assigns_part1 : Valid
+[wp] [Qed] Goal typed_init_t2_v3_loop_assigns_2_part2 : Valid
+[wp] [Qed] Goal typed_init_t2_v3_assigns_part1 : Valid
[wp] [Script] Goal typed_init_t2_v3_assigns_part2 : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v2_loop_assigns_part1 : Valid
+[wp] [Script] Goal typed_init_t2_bis_v2_loop_assigns_part2 : Valid
+[wp] [Script] Goal typed_init_t2_bis_v2_loop_assigns_part3 : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v2_assigns_exit_part1 : Valid
+[wp] [Script] Goal typed_init_t2_bis_v2_assigns_exit_part2 : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v2_assigns_exit_part3 : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v2_assigns_normal_part1 : Valid
+[wp] [Script] Goal typed_init_t2_bis_v2_assigns_normal_part2 : Valid
[wp] Proved goals: 23 / 23
Qed: 11
Script: 12
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.res.oracle
index ef421c4c8085f87a16384d2910243dfe788934ff..41f563dd7bf77dbfd732205c343f841b0bad0caf 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_init.2.res.oracle
@@ -8,14 +8,6 @@
[wp] [CFG] Goal init_t2_v3_exits : Valid (Unreachable)
[wp] Warning: Missing RTE guards
[wp] 16 goals scheduled
-[wp] [Qed] Goal typed_init_t2_bis_v1_loop_assigns_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_assigns_part2 : Unsuccess
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_assigns_part3 : Unsuccess
-[wp] [Qed] Goal typed_init_t2_bis_v1_assigns_exit_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_assigns_exit_part2 : Unsuccess
-[wp] [Qed] Goal typed_init_t2_bis_v1_assigns_exit_part3 : Valid
-[wp] [Qed] Goal typed_init_t2_bis_v1_assigns_normal_part1 : Valid
-[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_assigns_normal_part2 : Unsuccess
[wp] [Qed] Goal typed_init_t2_v1_loop_assigns_part1 : Valid
[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_assigns_part2 : Unsuccess
[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_assigns_part3 : Unsuccess
@@ -24,6 +16,14 @@
[wp] [Alt-Ergo] Goal typed_init_t2_v1_loop_assigns_2_part3 : Unsuccess
[wp] [Qed] Goal typed_init_t2_v1_assigns_part1 : Valid
[wp] [Alt-Ergo] Goal typed_init_t2_v1_assigns_part2 : Unsuccess
+[wp] [Qed] Goal typed_init_t2_bis_v1_loop_assigns_part1 : Valid
+[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_assigns_part2 : Unsuccess
+[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_loop_assigns_part3 : Unsuccess
+[wp] [Qed] Goal typed_init_t2_bis_v1_assigns_exit_part1 : Valid
+[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_assigns_exit_part2 : Unsuccess
+[wp] [Qed] Goal typed_init_t2_bis_v1_assigns_exit_part3 : Valid
+[wp] [Qed] Goal typed_init_t2_bis_v1_assigns_normal_part1 : Valid
+[wp] [Alt-Ergo] Goal typed_init_t2_bis_v1_assigns_normal_part2 : Unsuccess
[wp] Proved goals: 7 / 16
Qed: 7
Alt-Ergo: 0 (unsuccess: 9)
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.res.oracle
index 17290739f7cfe29999b4cff7f2bb7431b8646644..b02ef572b0c167f0fc0adbda7ddc96eeb1a0002f 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.0.res.oracle
@@ -3,13 +3,13 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 7 goals scheduled
-[wp] [Qed] Goal typed_main_assert : Valid
-[wp] [Qed] Goal typed_main_call_swap_requires : Valid
-[wp] [Qed] Goal typed_main_call_swap_requires_2 : Valid
[wp] [Alt-Ergo] Goal typed_swap_ensures_A : Valid
[wp] [Qed] Goal typed_swap_ensures_B : Valid
[wp] [Qed] Goal typed_swap_assigns_part1 : Valid
[wp] [Qed] Goal typed_swap_assigns_part2 : Valid
+[wp] [Qed] Goal typed_main_assert : Valid
+[wp] [Qed] Goal typed_main_call_swap_requires : Valid
+[wp] [Qed] Goal typed_main_call_swap_requires_2 : Valid
[wp] Proved goals: 7 / 7
Qed: 6
Alt-Ergo: 1
diff --git a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.1.res.oracle b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.1.res.oracle
index 258b04e2719b1fa3a8f7cf6bae19c18e06cec255..1a4f9fd916dc87ddda1ca6877dad7c9460da89d1 100644
--- a/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.1.res.oracle
+++ b/src/plugins/wp/tests/wp_typed/oracle_qualif/user_swap.1.res.oracle
@@ -3,12 +3,12 @@
[wp] Running WP plugin...
[wp] Warning: Missing RTE guards
[wp] 6 goals scheduled
-[wp] [Qed] Goal typed_ref_main_assert : Valid
-[wp] [Qed] Goal typed_ref_main_call_swap_requires : Valid
-[wp] [Qed] Goal typed_ref_main_call_swap_requires_2 : Valid
[wp] [Qed] Goal typed_ref_swap_ensures_A : Valid
[wp] [Qed] Goal typed_ref_swap_ensures_B : Valid
[wp] [Qed] Goal typed_ref_swap_assigns : Valid
+[wp] [Qed] Goal typed_ref_main_assert : Valid
+[wp] [Qed] Goal typed_ref_main_call_swap_requires : Valid
+[wp] [Qed] Goal typed_ref_main_call_swap_requires_2 : Valid
[wp] Proved goals: 6 / 6
Qed: 6
------------------------------------------------------------
diff --git a/src/plugins/wp/wpAnnot.ml b/src/plugins/wp/wpAnnot.ml
index 7a807ad6ae2c1cef0c5224c99c6b998ac8e1a7b9..c27e5f587c1c40a375e52e7aed7d072cc4565844 100644
--- a/src/plugins/wp/wpAnnot.ml
+++ b/src/plugins/wp/wpAnnot.ml
@@ -162,13 +162,6 @@ let is_proved pf =
let is_invalid pf =
pf.invalid && not (is_proved pf)
-let status pf =
- try
- Array.iter (function Complete -> raise Exit | _ -> ()) pf.proved ;
- `Proved
- with Exit ->
- if pf.invalid then `Invalid else `Partial
-
(* -------------------------------------------------------------------------- *)
(* --- PID for Functions --- *)
(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/wp/wpAnnot.mli b/src/plugins/wp/wpAnnot.mli
index b08aa379c686030edbaabe947a8671f18428f2f4..fdd66f1de807146ead86fec1bf891ca75b0ebd5c 100644
--- a/src/plugins/wp/wpAnnot.mli
+++ b/src/plugins/wp/wpAnnot.mli
@@ -49,8 +49,6 @@ val is_proved : proof -> bool
val is_invalid : proof -> bool
(** whether an invalid proof result has been registered or not *)
-val status : proof -> [ `Proved | `Invalid | `Partial ]
-
val target : proof -> Property.t
val dependencies : proof -> Property.t list
diff --git a/src/plugins/wp/wpo.ml b/src/plugins/wp/wpo.ml
index 0574facb577f4e77dfa37fbe2ebb334da8594cbc..252264a5f932e20b76b203fb541fc3d744c2b170 100644
--- a/src/plugins/wp/wpo.ml
+++ b/src/plugins/wp/wpo.ml
@@ -805,7 +805,6 @@ let is_trivial g =
| GoalLemma vc -> VC_Lemma.is_trivial vc
| GoalAnnot vc -> VC_Annot.is_trivial vc
-
let reduce g =
match g.po_formula with
| GoalLemma vc -> WpContext.on_context (get_context g) VC_Lemma.is_trivial vc
@@ -815,8 +814,7 @@ let resolve g =
let valid = reduce g in
if valid then
let result = VCS.result ~solver:(qed_time g) VCS.Valid in
- ignore (set_result g VCS.Qed result) ;
- true
+ ( set_result g VCS.Qed result ; true )
else false
let compute g =
@@ -836,6 +834,12 @@ let is_unknown g = List.exists
(fun (_,r) -> VCS.is_verdict r && not (VCS.is_valid r))
( get_results g )
+let is_passed g =
+ if is_smoke_test g then
+ not (is_proved g)
+ else
+ is_proved g
+
let get_result =
Dynamic.register ~plugin:"Wp" "Wpo.get_result" ~journalize:false
(Datatype.func2 WpoType.ty ProverType.ty ResultType.ty)
diff --git a/src/plugins/wp/wpo.mli b/src/plugins/wp/wpo.mli
index 4c1981c0fa00a92b0237d4eb63fd4af5556cd6fc..fa6d1c337f4055a02c22da886ac0b2e353334be4 100644
--- a/src/plugins/wp/wpo.mli
+++ b/src/plugins/wp/wpo.mli
@@ -159,7 +159,8 @@ val get_proof : t -> [`Passed|`Failed|`Unknown] * Property.t
val get_target : t -> Property.t
val is_trivial : t -> bool (** do not tries simplification, do not check prover results *)
val is_proved : t -> bool (** do not tries simplification, check prover results *)
-val is_unknown : t -> bool
+val is_unknown : t -> bool (** at least one prover returns « Unknown » *)
+val is_passed : t -> bool (** proved, or unknown for smoke tests *)
val warnings : t -> Warning.t list
(** [true] if the result is valid. Dynamically exported.