From c3a76ebdb6f194523f5b817206ae3f050295bba9 Mon Sep 17 00:00:00 2001
From: Michele Alberti <michele.alberti@cea.fr>
Date: Tue, 2 May 2023 18:21:46 +0200
Subject: [PATCH] [interpretation] Prefer using type name also for values.
---
src/interpretation.ml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/interpretation.ml b/src/interpretation.ml
index 15f367d..673ba98 100644
--- a/src/interpretation.ml
+++ b/src/interpretation.ml
@@ -65,30 +65,30 @@ type caisar_env = {
cwd : string;
}
-let ls_of_caisar_op engine op ty_args ty =
+let ls_of_caisar_op engine caisar_op ty_args ty =
let caisar_env = CRE.user_env engine in
(* Fmt.pr "ls_of_caisar_op: %a@." pp_caisar_op op; *)
(* Option.iter ty ~f:(Fmt.pr "ty: %a@." Pretty.print_ty); *)
- Hashtbl.find_or_add caisar_env.ls_of_caisar_op op ~default:(fun () ->
+ Hashtbl.find_or_add caisar_env.ls_of_caisar_op caisar_op ~default:(fun () ->
let id = Ident.id_fresh "caisar_op" in
let ls =
- match op with
+ match caisar_op with
| Classifier (NNet c | ONNX c) -> c
| Vector v -> v
| _ -> Term.create_lsymbol id ty_args ty
in
(* Fmt.pr "ls: %a@." Pretty.print_ls ls; *)
- Hashtbl.Poly.add_exn caisar_env.ls_of_caisar_op ~key:op ~data:ls;
- Term.Hls.add caisar_env.caisar_op_of_ls ls op;
+ Hashtbl.Poly.add_exn caisar_env.ls_of_caisar_op ~key:caisar_op ~data:ls;
+ Term.Hls.add caisar_env.caisar_op_of_ls ls caisar_op;
ls)
let caisar_op_of_ls engine ls =
let caisar_env = CRE.user_env engine in
Term.Hls.find caisar_env.caisar_op_of_ls ls
-let term_of_caisar_op ?(args = []) engine op ty =
+let term_of_caisar_op ?(args = []) engine caisar_op ty =
let t_args, ty_args = List.unzip args in
- Term.t_app_infer (ls_of_caisar_op engine op ty_args ty) t_args
+ Term.t_app_infer (ls_of_caisar_op engine caisar_op ty_args ty) t_args
let caisar_env env cwd =
{
--
GitLab