Skip to content

GitLab

why3
why3

Mise à jour terminée. Pour connaître les apports de la version 13.8.4 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/02/11/security-release-gitlab-13-8-4-released/
https://about.gitlab.com/releases/2021/02/05/gitlab-13-8-3-released/

Commit 4c908010 authored by Andrei Paskevich's avatar Andrei Paskevich
Browse files
Options

split_goal refactoring 

- split_* splits on the right-hand side
- full_split_* splits on the both sides
- split functions do not propagate labels
- remove split_conjunction, subsumed by split_goal
parent 3c6c998a
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 240 deletions
Makefile.in
View file @ 4c908010
......@@ -123,7 +123,7 @@ LIB_DRIVER = call_provers driver_ast driver_parser driver_lexer driver \
whyconf autodetection
LIB_TRANSFORM = simplify_recursive_definition simplify_formula \
inlining split_conjunction split_goal \
inlining split_goal \
eliminate_definition eliminate_algebraic \
eliminate_inductive eliminate_let eliminate_if \
encoding_enumeration encoding encoding_decorate_mono \
......
src/transform/introduction.ml
View file @ 4c908010
......@@ -16,7 +16,7 @@ open Task
let rec intros pr f = match f.f_node with
| Fbinop (Fimplies,f1,f2) ->
(* split f1 *)
let l = Split_goal.split_pos [] f1 in
let l = Split_goal.split_pos f1 in
List.fold_right
(fun f acc ->
let id = create_prsymbol (id_fresh "H") in
......
src/transform/split_conjunction.ml deleted 100644 → 0
View file @ 3c6c998a
(**************************************************************************)
(* *)
(* Copyright (C) 2010- *)
(* Francois Bobot *)
(* Jean-Christophe Filliatre *)
(* Johannes Kanig *)
(* Andrei Paskevich *)
(* *)
(* This software is free software; you can redistribute it and/or *)
(* modify it under the terms of the GNU Library General Public *)
(* License version 2.1, with the special exception on linking *)
(* described in file LICENSE. *)
(* *)
(* This software is distributed in the hope that it will be useful, *)
(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *)
(* *)
(**************************************************************************)
open Ident
open Term
open Decl
open Util
let rec split_pos split_neg acc f =
let split_pos acc f =
let p = split_pos split_neg acc f in
(*Format.printf "@[<hov 2>f : %a@\n acc : %a :@\n %a@]@."
Pretty.print_fmla f
(Pp.print_list Pp.semi Pretty.print_fmla) acc
(Pp.print_list Pp.semi Pretty.print_fmla) p;*)
p in
match f.f_node with
| Ftrue -> acc
| Ffalse -> f::acc
| Fapp _ -> f::acc
| Fbinop (Fand,f1,f2) ->
split_pos (split_pos acc f2) f1
(* let l2 = split_pos [] f2 in *)
(* let acc = List.fold_left (fun acc f -> f_implies f1 f :: acc) acc l2 in *)
(* split_pos acc f1 *)
| Fbinop (Fimplies,f1,f2) ->
list_fold_product
(fun acc f1 f2 -> (f_implies f1 f2)::acc)
acc (split_neg [] f1) (split_pos [] f2)
| Fbinop (Fiff,f1,f2) ->
split_pos (split_pos acc (f_implies f1 f2)) (f_implies f2 f1)
| Fbinop (For,f1,f2) ->
list_fold_product
(fun acc f1 f2 -> (f_or f1 f2)::acc)
acc (split_pos [] f1) (split_pos [] f2)
| Fnot f -> List.fold_left (fun acc f -> f_not f::acc) acc (split_neg [] f)
| Fif (fif,fthen,felse) ->
split_pos
(split_pos acc (f_implies fif fthen))
(f_implies (f_not fif) felse)
| Flet (t,fb) ->
let vs,f = f_open_bound fb in
List.fold_left
(fun acc f -> (f_let_close vs t f)::acc) acc (split_pos [] f)
| Fcase _ -> (* TODO better *) f::acc
| Fquant (Fforall,fmlaq) ->
let vsl,trl,fmla = f_open_quant fmlaq in
List.fold_left (fun acc f ->
(* TODO : Remove unused variable*)
(f_forall_close vsl trl f)::acc) acc (split_pos [] fmla)
| Fquant (Fexists,_) -> f::acc
let rec split_neg split_pos acc f =
let split_neg = split_neg split_pos in
match f.f_node with
| Ftrue -> f::acc
| Ffalse -> acc
| Fapp _ -> f::acc
| Fbinop (Fand,f1,f2) ->
list_fold_product
(fun acc f1 f2 -> (f_and f1 f2)::acc)
acc (split_neg [] f1) (split_neg [] f2)
| Fbinop (Fimplies,f1,f2) -> split_neg (split_neg acc f2) (f_not f1)
| Fbinop (Fiff,f1,f2) ->
split_neg (split_neg acc (f_and (f_not f1) (f_not f2))) (f_and f2 f1)
| Fbinop (For,f1,f2) -> split_neg (split_neg acc f2) f1
| Fnot f -> List.fold_left (fun acc f -> f_not f::acc) acc (split_pos [] f)
| Fif (fif,fthen,felse) ->
split_neg (split_neg acc (f_and fif fthen))
(f_and (f_not fif) felse)
| Flet (t,fb) ->
let vs,f = f_open_bound fb in
List.fold_left
(fun acc f -> (f_let_close vs t f)::acc) acc (split_neg [] f)
| Fcase _ -> (* TODO better *) f::acc
| Fquant (Fexists,fmlaq) ->
let vsl,trl,fmla = f_open_quant fmlaq in
List.fold_left (fun acc f ->
(* TODO : Remove unused variable*)
(f_exists_close vsl trl f)::acc) acc (split_neg [] fmla)
| Fquant (Fforall,_) -> f::acc
let elt is_split_kind split_pos d =
match d.d_node with
| Dprop (k,pr,f) when is_split_kind k ->
let l = split_pos [] f in
let l = List.map (fun p -> create_prop_decl k
(create_prsymbol (id_clone pr.pr_name)) p) l in
begin match k with
| Pgoal -> List.map (fun p -> [p]) l
| Paxiom -> [l]
| _ -> assert false
end
| _ -> [[d]]
let is_split_goal = function Pgoal -> true | _ -> false
let is_split_axiom = function Paxiom -> true | _ -> false
let is_split_all = function _ -> true
let t isk fsp = Trans.decl_l (elt isk fsp) None
let split_pos1 = split_pos (fun acc x -> x::acc)
let rec split_pos2 acc d = split_pos split_neg2 acc d
and split_neg2 acc d = split_neg split_pos2 acc d
let split_pos_goal = t is_split_goal split_pos1
let split_pos_neg_goal = t is_split_goal split_pos2
let split_pos_axiom = t is_split_axiom split_pos1
let split_pos_neg_axiom = t is_split_axiom split_pos2
let split_pos_all = t is_split_all split_pos1
let split_pos_neg_all = t is_split_all split_pos2
let () = Trans.register_transform_l
"split_goal_pos_goal" split_pos_goal
let () = Trans.register_transform_l
"split_goal_pos_neg_goal" split_pos_neg_goal
let () = Trans.register_transform_l
"split_goal_pos_axiom" split_pos_axiom
let () = Trans.register_transform_l
"split_goal_pos_neg_axiom" split_pos_neg_axiom
let () = Trans.register_transform_l
"split_goal_pos_all" split_pos_all
let () = Trans.register_transform_l
"split_goal_pos_neg_all" split_pos_neg_all
src/transform/split_conjunction.mli deleted 100644 → 0
View file @ 3c6c998a
(**************************************************************************)
(* *)
(* Copyright (C) 2010- *)
(* Francois Bobot *)
(* Jean-Christophe Filliatre *)
(* Johannes Kanig *)
(* Andrei Paskevich *)
(* *)
(* This software is free software; you can redistribute it and/or *)
(* modify it under the terms of the GNU Library General Public *)
(* License version 2.1, with the special exception on linking *)
(* described in file LICENSE. *)
(* *)
(* This software is distributed in the hope that it will be useful, *)
(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *)
(* *)
(**************************************************************************)
(** Move the conjunctions to top level and split the axiom or goal *)
val split_pos_goal : Task.task Trans.tlist
val split_pos_neg_goal : Task.task Trans.tlist
val split_pos_axiom : Task.task Trans.tlist
val split_pos_neg_axiom : Task.task Trans.tlist
val split_pos_all : Task.task Trans.tlist
val split_pos_neg_all : Task.task Trans.tlist
(** naming convention :
- pos : move the conjuctions in positive sub-formula to top level
- neg : move the conjuctions in negative sub-formula to top level
- goal : apply the transformation only to goal
- axiom : apply the transformation only to axioms
- all : apply the transformation to goal and axioms *)
src/transform/split_goal.ml
View file @ 4c908010
......@@ -43,103 +43,118 @@ let asym_split = Ident.label "asym_split"
let to_split f = List.exists (fun (l,_) -> l = "asym_split") f.f_label
let inherit_labels ll f =
if f.f_label = [] then f_label ll f else f
let rec split_pos acc f =
let f = f_map (fun t -> t) (inherit_labels f.f_label) f in
match f.f_node with
let rec split_pos ro acc f = match f.f_node with
| Ftrue -> acc
| Ffalse -> f::acc
| Fapp _ -> f::acc
| Fbinop (Fand,f1,f2) when to_split f ->
split_pos (split_pos acc (f_implies f1 f2)) f1
split_pos ro (split_pos ro acc (f_implies f1 f2)) f1
| Fbinop (Fand,f1,f2) ->
split_pos (split_pos acc f2) f1
split_pos ro (split_pos ro acc f2) f1
| Fbinop (Fimplies,f1,f2) when ro ->
apply_append (f_implies f1) acc (split_pos ro [] f2)
| Fbinop (Fimplies,f1,f2) ->
apply_append2 f_implies acc (split_neg [] f1) (split_pos [] f2)
apply_append2 f_implies acc (split_neg ro [] f1) (split_pos ro [] f2)
| Fbinop (Fiff,f1,f2) ->
split_pos (split_pos acc (f_implies f2 f1)) (f_implies f1 f2)
split_pos ro (split_pos ro acc (f_implies f2 f1)) (f_implies f1 f2)
| Fbinop (For,f1,f2) when ro ->
apply_append (f_or f1) acc (split_pos ro [] f2)
| Fbinop (For,f1,f2) ->
apply_append2 f_or acc (split_pos [] f1) (split_pos [] f2)
apply_append2 f_or acc (split_pos ro [] f1) (split_pos ro [] f2)
| Fnot f ->
apply_append f_not acc (split_neg [] f)
apply_append f_not acc (split_neg ro [] f)
| Fif (fif,fthen,felse) ->
split_pos (split_pos acc (f_implies (f_not fif) felse))
(f_implies fif fthen)
let acc = split_pos ro acc (f_implies (f_not fif) felse) in
split_pos ro acc (f_implies fif fthen)
| Flet (t,fb) -> let vs,f = f_open_bound fb in
apply_append (f_let_close vs t) acc (split_pos [] f)
apply_append (f_let_close vs t) acc (split_pos ro [] f)
| Fcase (tl,bl) ->
split_case split_pos f_true acc tl bl
split_case (split_pos ro) f_true acc tl bl
| Fquant (Fforall,fq) -> let vsl,trl,f = f_open_quant fq in
(* TODO : Remove unused variable *)
apply_append (f_forall_close vsl trl) acc (split_pos [] f)
apply_append (f_forall_close vsl trl) acc (split_pos ro [] f)
| Fquant (Fexists,_) -> f::acc
and split_neg acc f =
let f = f_map (fun t -> t) (inherit_labels f.f_label) f in
match f.f_node with
and split_neg ro acc f = match f.f_node with
| Ftrue -> f::acc
| Ffalse -> acc
| Fapp _ -> f::acc
| Fbinop (Fand,f1,f2) when ro ->
apply_append (f_and f1) acc (split_neg ro [] f2)
| Fbinop (Fand,f1,f2) ->
apply_append2 f_and acc (split_neg [] f1) (split_neg [] f2)
apply_append2 f_and acc (split_neg ro [] f1) (split_neg ro [] f2)
| Fbinop (Fimplies,f1,f2) when to_split f ->
split_neg (split_neg acc (f_and f1 f2)) (f_not f1)
split_neg ro (split_neg ro acc (f_and f1 f2)) (f_not f1)
| Fbinop (Fimplies,f1,f2) ->
split_neg (split_neg acc f2) (f_not f1)
split_neg ro (split_neg ro acc f2) (f_not f1)
| Fbinop (Fiff,f1,f2) ->
split_neg (split_neg acc (f_and (f_not f1) (f_not f2))) (f_and f1 f2)
let acc = split_neg ro acc (f_and (f_not f1) (f_not f2)) in
split_neg ro acc (f_and f1 f2)
| Fbinop (For,f1,f2) when to_split f ->
split_neg (split_neg acc (f_and (f_not f1) f2)) f1
split_neg ro (split_neg ro acc (f_and (f_not f1) f2)) f1
| Fbinop (For,f1,f2) ->
split_neg (split_neg acc f2) f1
split_neg ro (split_neg ro acc f2) f1
| Fnot f ->
apply_append f_not acc (split_pos [] f)
apply_append f_not acc (split_pos ro [] f)
| Fif (fif,fthen,felse) ->
split_neg (split_neg acc (f_and (f_not fif) felse)) (f_and fif fthen)
let acc = split_neg ro acc (f_and (f_not fif) felse) in
split_neg ro acc (f_and fif fthen)
| Flet (t,fb) -> let vs,f = f_open_bound fb in
apply_append (f_let_close vs t) acc (split_neg [] f)
apply_append (f_let_close vs t) acc (split_neg ro [] f)
| Fcase (tl,bl) ->
split_case split_neg f_false acc tl bl
split_case (split_neg ro) f_false acc tl bl
| Fquant (Fexists,fq) -> let vsl,trl,f = f_open_quant fq in
(* TODO : Remove unused variable *)
apply_append (f_exists_close vsl trl) acc (split_neg [] f)
apply_append (f_exists_close vsl trl) acc (split_neg ro [] f)
| Fquant (Fforall,_) -> f::acc
let split_goal pr f =
let split_goal ro pr f =
let make_prop f = [create_prop_decl Pgoal pr f] in
List.map make_prop (split_pos [] f)
List.map make_prop (split_pos ro [] f)
let split_axiom pr f =
let split_axiom ro pr f =
let make_prop f =
let pr = create_prsymbol (id_clone pr.pr_name) in
create_prop_decl Paxiom pr f
in
List.map make_prop (split_pos [] f)
List.map make_prop (split_pos ro [] f)
let split_all d = match d.d_node with
| Dprop (Pgoal, pr,f) -> split_goal pr f
| Dprop (Paxiom,pr,f) -> [split_axiom pr f]
let split_all ro d = match d.d_node with
| Dprop (Pgoal, pr,f) -> split_goal ro pr f
| Dprop (Paxiom,pr,f) -> [split_axiom ro pr f]
| _ -> [[d]]
let split_premise d = match d.d_node with
| Dprop (Paxiom,pr,f) -> split_axiom pr f
let split_premise ro d = match d.d_node with
| Dprop (Paxiom,pr,f) -> split_axiom ro pr f
| _ -> [d]
let split_goal = Trans.goal_l split_goal
let split_all = Trans.decl_l split_all None
let split_premise = Trans.decl split_premise None
let full_split_pos = split_pos false []
let full_split_neg = split_neg false []
let split_pos = split_pos true []
let split_neg = split_neg true []
let full_split_goal = Trans.goal_l (split_goal false)
let full_split_all = Trans.decl_l (split_all false) None
let full_split_premise = Trans.decl (split_premise false) None
let split_goal = Trans.goal_l (split_goal true)
let split_all = Trans.decl_l (split_all true) None
let split_premise = Trans.decl (split_premise true) None
let () = Trans.register_transform_l "split_goal" split_goal
let () = Trans.register_transform_l "split_all" split_all
let () = Trans.register_transform "split_premise" split_premise
let () = Trans.register_transform_l "full_split_goal" full_split_goal
let () = Trans.register_transform_l "full_split_all" full_split_all
let () = Trans.register_transform "full_split_premise" full_split_premise
let ls_of_var v =
create_fsymbol (id_fresh ("spl_" ^ v.vs_name.id_string)) [] v.vs_ty
let rec rsplit pr dl acc f =
let rsp = rsplit pr dl in
let rec split_intro pr dl acc f =
let rsp = split_intro pr dl in
match f.f_node with
| Ftrue -> acc
| Fbinop (Fand,f1,f2) when to_split f ->
......@@ -149,28 +164,28 @@ let rec rsplit pr dl acc f =
| Fbinop (Fimplies,f1,f2) ->
let pp = create_prsymbol (id_fresh (pr.pr_name.id_string ^ "_spl")) in
let dl = create_prop_decl Paxiom pp f1 :: dl in
rsplit pr dl acc f2
split_intro pr dl acc f2
| Fbinop (Fiff,f1,f2) ->
rsp (rsp acc (f_implies f1 f2)) (f_implies f2 f1)
rsp (rsp acc (f_implies f2 f1)) (f_implies f1 f2)
| Fif (fif,fthen,felse) ->
rsp (rsp acc (f_implies fif fthen)) (f_implies (f_not fif) felse)
rsp (rsp acc (f_implies (f_not fif) felse)) (f_implies fif fthen)
| Flet (t,fb) -> let vs,f = f_open_bound fb in
let ls = ls_of_var vs in
let f = f_subst_single vs (t_app ls [] vs.vs_ty) f in
let dl = create_logic_decl [make_fs_defn ls [] t] :: dl in
rsplit pr dl acc f
split_intro pr dl acc f
| Fquant (Fforall,fq) -> let vsl,_,f = f_open_quant fq in
let lls = List.map ls_of_var vsl in
let add s vs ls = Mvs.add vs (t_app ls [] vs.vs_ty) s in
let f = f_subst (List.fold_left2 add Mvs.empty vsl lls) f in
let add dl ls = create_logic_decl [ls, None] :: dl in
let dl = List.fold_left add dl lls in
rsplit pr dl acc f
split_intro pr dl acc f
| _ ->
let goal f = List.rev (create_prop_decl Pgoal pr f :: dl) in
List.rev_append (List.rev_map goal (split_pos [] f)) acc
List.rev_append (List.rev_map goal (split_pos f)) acc
let right_split = Trans.goal_l (fun pr f -> rsplit pr [] [] f)
let split_intro = Trans.goal_l (fun pr f -> split_intro pr [] [] f)
let () = Trans.register_transform_l "right_split" right_split
let () = Trans.register_transform_l "split_intro" split_intro
src/transform/split_goal.mli
View file @ 4c908010
......@@ -19,16 +19,29 @@
val asym_split : Ident.label
val split_pos : Term.fmla list -> Term.fmla -> Term.fmla list
(** [split_pos l f] returns a list [g1;..;gk] @ l such that
f is logically equivalent to g1 /\ .. /\ gk *)
val split_pos : Term.fmla -> Term.fmla list
(** [split_pos f] returns a list [[g1;..;gk]] such that
[f] is logically equivalent to [g1 /\ .. /\ gk] *)
val split_neg : Term.fmla list -> Term.fmla -> Term.fmla list
(** [split_neg l f] returns a list [g1;..;gk] @ l such that
f is logically equivalent to g1 \/ .. \/ gk *)
val split_neg : Term.fmla -> Term.fmla list
(** [split_neg f] returns a list [[g1;..;gk]] such that
[f] is logically equivalent to [g1 \/ .. \/ gk] *)
val full_split_pos : Term.fmla -> Term.fmla list
(** [full_split_pos f] returns a list [[g1;..;gk]] such that
[f] is logically equivalent to [g1 /\ .. /\ gk] and the length
of the resulting list can be exponential wrt the size of [f] *)
val full_split_neg : Term.fmla -> Term.fmla list
(** [full_split_neg f] returns a list [[g1;..;gk]] such that
[f] is logically equivalent to [g1 \/ .. \/ gk] and the length
of the resulting list can be exponential wrt the size of [f] *)
val split_goal : Task.task Trans.tlist
val split_all : Task.task Trans.tlist
val right_split : Task.task Trans.tlist
val full_split_goal : Task.task Trans.tlist
val full_split_all : Task.task Trans.tlist
val split_intro : Task.task Trans.tlist
(** [split_intro] is [split_goal] with skolemization and formula separation *)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment