From 74c27830fe54314b605862364d38ba5c9db8e5dd Mon Sep 17 00:00:00 2001
From: Kilyan Le Gallic <kilyan.legallic@cea.fr>
Date: Thu, 11 Apr 2024 17:27:16 +0200
Subject: [PATCH] [wp] Added conversion of Why3 symbols names to explicit
notation
---
src/plugins/wp/Why3Import.ml | 52 ++++++++++++++++++++++--------------
1 file changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/plugins/wp/Why3Import.ml b/src/plugins/wp/Why3Import.ml
index 6aec238ad47..1442041f3ae 100644
--- a/src/plugins/wp/Why3Import.ml
+++ b/src/plugins/wp/Why3Import.ml
@@ -42,6 +42,9 @@ let extract_path thname =
| hd :: tl -> hd, List.rev tl
| [] -> "", []
+let construct_acsl_name thpaths thname sname =
+ (String.concat "::" thpaths) ^ "::" ^ thname ^ "::" ^ sname
+
(* For debug only*)
let pp_id fmt (id: W.Ident.ident) =
Format.pp_print_string fmt id.id_string
@@ -65,8 +68,9 @@ let pp_li fmt (li : C.logic_info) =
(* -------------------------------------------------------------------------- *)
type tenv = C.logic_type_info W.Ty.Hts.t
+type lenv = C.logic_info W.Term.Hls.t
type tvars = C.logic_type W.Ty.Mtv.t
-type tlogics = C.logic_info W.Term.Hls.t
+
let tvars_of_txs (txs: W.Ty.tvsymbol list) : string list * tvars =
List.fold_right
@@ -75,22 +79,22 @@ let tvars_of_txs (txs: W.Ty.tvsymbol list) : string list * tvars =
x :: txs, W.Ty.Mtv.add tv (C.Lvar x) tvs
) txs ([], W.Ty.Mtv.empty)
-let rec lt_of_ty (tenv : tenv) (tvs : tvars) (ty: W.Ty.ty) : C.logic_type =
+let rec lt_of_ty (tenv : tenv) (tvs : tvars) ((thname, thpaths)) (ty: W.Ty.ty) : C.logic_type =
match ty.ty_node with
| Tyvar x -> W.Ty.Mtv.find x tvs
- | Tyapp(s,ts) -> C.Ltype( lti_of_ts tenv s, List.map (lt_of_ty tenv tvs) ts)
+ | Tyapp(s,ts) -> C.Ltype( lti_of_ts tenv s (thname, thpaths), List.map (lt_of_ty tenv tvs (thname, thpaths)) ts)
-and lti_of_ts (tenv : tenv) (ts : W.Ty.tysymbol): C.logic_type_info =
+and lti_of_ts (tenv : tenv) (ts : W.Ty.tysymbol) ((thname, thpaths)): C.logic_type_info =
try W.Ty.Hts.find tenv ts with Not_found ->
let (lt_params,tvars) = tvars_of_txs ts.ts_args in
let lt_def =
match ts.ts_def with
| NoDef | Range _ | Float _ -> None
- | Alias ty -> Some (C.LTsyn (lt_of_ty tenv tvars ty))
+ | Alias ty -> Some (C.LTsyn (lt_of_ty tenv tvars (thname, thpaths) ty))
in
let lti =
C.{
- lt_name = ts.ts_name.id_string; (* "int::Int::add" *)
+ lt_name = construct_acsl_name thpaths thname ts.ts_name.id_string; (* "int::Int::add" *)
lt_params ; lt_def ;
lt_attr = [];
}
@@ -101,9 +105,9 @@ and lti_of_ts (tenv : tenv) (ts : W.Ty.tysymbol): C.logic_type_info =
(* --- Functions --- *)
(* -------------------------------------------------------------------------- *)
-let lv_of_ty (tenv:tenv) (tvars:tvars) (index) (ty:W.Ty.ty) : C.logic_var =
+let lv_of_ty (tenv:tenv) (tvars:tvars) ((thname, thpaths)) (index) (ty:W.Ty.ty) : C.logic_var =
Cil_const.make_logic_var_formal (Printf.sprintf "x%d" index)
- @@ lt_of_ty tenv tvars ty
+ @@ (lt_of_ty tenv tvars ((thname, thpaths)) ty)
let lr_of_ty_opt (lt_opt) =
match lt_opt with
@@ -111,22 +115,24 @@ let lr_of_ty_opt (lt_opt) =
| Some tr -> tr
-let li_of_ls (tenv:tenv) (ls : W.Term.lsymbol) (tlogics:tlogics) : C.logic_info =
+let li_of_ls (tenv:tenv) (ls : W.Term.lsymbol) (lenv:lenv) ((thname, thpaths)) : C.logic_info =
let l_tparams,tvars =
tvars_of_txs @@ W.Ty.Stv.elements @@ W.Term.ls_ty_freevars ls in
- let l_type = Option.map (lt_of_ty tenv tvars) ls.ls_value in
- let l_profile = List.mapi (lv_of_ty tenv tvars) ls.ls_args in
+ let l_type = Option.map (lt_of_ty tenv tvars (thname, thpaths)) ls.ls_value in
+ let l_profile = List.mapi (lv_of_ty tenv tvars (thname, thpaths)) ls.ls_args in
let l_args = List.map ( fun (lv:C.logic_var) -> lv.lv_type) l_profile in
let signature = C.Larrow (l_args, lr_of_ty_opt l_type) in
let li =
C.{
- l_var_info = Cil_const.make_logic_var_global ls.ls_name.id_string signature; (*"int::Int::add"*)
+ l_var_info = Cil_const.make_logic_var_global
+ (construct_acsl_name thpaths thname ls.ls_name.id_string)
+ signature;
l_labels = [];
l_tparams;
l_type;
l_profile ;
l_body = C.LBnone;
- } in W.Term.Hls.add tlogics ls li; li
+ } in W.Term.Hls.add lenv ls li; li
(* -------------------------------------------------------------------------- *)
@@ -136,8 +142,10 @@ let li_of_ls (tenv:tenv) (ls : W.Term.lsymbol) (tlogics:tlogics) : C.logic_info
-let import_theory env (tenv:tenv) (tlogics:tlogics) thname =
+let import_theory env (tenv:tenv) (lenv:lenv) thname =
let theory_name, theory_path = extract_path thname in
+ L.debug ~level:0 "Theory name : %s" theory_name;
+ List.iter (L.debug ~level:0 "%s") theory_path;
try
let theory = W.Env.read_theory env theory_path theory_name in
List.iter (fun (tdecl : T.tdecl) ->
@@ -148,14 +156,14 @@ let import_theory env (tenv:tenv) (tlogics:tlogics) thname =
| Dtype ts ->
L.debug ~level:0 "Decl and type %a" pp_id ts.ts_name;
L.debug ~level:0 "Location %a" pp_id_loc ts.ts_name;
- let lti = lti_of_ts tenv ts in
+ let lti = lti_of_ts tenv ts (theory_name, theory_path) in
L.debug ~level:0 "Correspondign LTI %a" pp_lti lti;
| Ddata ddatas ->
List.iter
(fun ((ts, _) : W.Decl.data_decl) ->
L.debug ~level:0 "Decl and data %a" pp_id ts.ts_name;
L.debug ~level:0 "Location %a" pp_id_loc ts.ts_name;
- let lti = lti_of_ts tenv ts in
+ let lti = lti_of_ts tenv ts (theory_name, theory_path) in
L.debug ~level:0 "Correspondign data LTI %a" pp_lti lti;
) ddatas
| Dparam ls ->
@@ -166,7 +174,7 @@ let import_theory env (tenv:tenv) (tlogics:tlogics) thname =
(fun ((ls,_):W.Decl.logic_decl) ->
L.debug ~level:0 "Decl and dlogic %a" pp_id ls.ls_name;
L.debug ~level:0 "Location %a" pp_id_loc ls.ls_name;
- let li = li_of_ls tenv ls tlogics in
+ let li = li_of_ls tenv ls lenv (theory_name,theory_path) in
L.debug ~level:0 "Corresponding dlogic LTI %a" pp_li li;
) dlogics
| _ -> L.debug ~level:0 "Decl but whatever"
@@ -178,13 +186,17 @@ let import_theory env (tenv:tenv) (tlogics:tlogics) thname =
with W.Env.LibraryNotFound _ ->
L.error "Library %s not found" thname
+(* -------------------------------------------------------------------------- *)
+(* --- Main --- *)
+(* -------------------------------------------------------------------------- *)
+
let () =
Boot.Main.extend
begin fun () ->
let env = create_why3_env @@ L.Library.get () in
let tenv : tenv = W.Ty.Hts.create 0 in
- let tlogics : tlogics = W.Term.Hls.create 0 in
- List.iter (import_theory env tenv tlogics) @@ L.Import.get ();
+ let lenv : lenv = W.Term.Hls.create 0 in
+ List.iter (import_theory env tenv lenv) @@ L.Import.get ();
L.debug ~level:0 "Length of type environment : %d " (W.Ty.Hts.length tenv);
W.Ty.Hts.iter (fun (ty) (lti) ->
L.debug ~level:0 "TY %a" pp_id ty.ts_name;
@@ -193,7 +205,7 @@ let () =
W.Term.Hls.iter (fun (ls) (li) ->
L.debug ~level:0 "TY %a" pp_id ls.ls_name;
L.debug ~level:0 "LI %a" pp_li li;
- ) tlogics
+ ) lenv
end
--
GitLab