Fix parsing of exceptions struct to json

Kappa-Dev · Oct 4, 2024 · 390e3c8 · 390e3c8
1 parent 008661f
commit 390e3c8
Show file tree

Hide file tree

Showing 11 changed files with 197 additions and 97 deletions.
diff --git a/core/KaSa_rep/frontend/ckappa_sig.ml b/core/KaSa_rep/frontend/ckappa_sig.ml
@@ -138,7 +138,9 @@ let rule_id_of_json json =
   match json with
   | `Assoc [ (s, json) ] when s = "rule_id" -> Yojson.Basic.Util.to_int json
   | _ ->
-    raise (Yojson.Basic.Util.Type_error (JsonUtil.build_msg "rule id", json))
+    raise
+      (Yojson.Basic.Util.Type_error
+         (JsonUtil.exn_msg_cant_import_from_json "rule id", json))
 
 let write_c_rule_id ob f = Yojson.Basic.to_buffer ob (rule_id_to_json f)
 

diff --git a/core/KaSa_rep/remanent_state/remanent_state.ml b/core/KaSa_rep/remanent_state/remanent_state.ml
@@ -298,7 +298,8 @@ let add_map get title label to_json state l =
              | `Assoc [ (s, m) ] when s = label -> m
              | x ->
                raise
-                 (Yojson.Basic.Util.Type_error (JsonUtil.build_msg title, x))))
+                 (Yojson.Basic.Util.Type_error
+                    (JsonUtil.exn_msg_cant_import_from_json title, x))))
         (List.rev y) )
     :: l
   )
@@ -344,7 +345,10 @@ let add_triple title label to_json =
     ->
       match to_json l with
       | `Assoc [ (s, m) ] when s = label -> m
-      | x -> raise (Yojson.Basic.Util.Type_error (JsonUtil.build_msg title, x)))
+      | x ->
+        raise
+          (Yojson.Basic.Util.Type_error
+             (JsonUtil.exn_msg_cant_import_from_json title, x)))
 
 let add_list_triple title lable to_json =
   JsonUtil.of_list (add_triple title lable to_json)
@@ -435,7 +439,7 @@ let of_json = function
       with Not_found ->
         raise
           (Yojson.Basic.Util.Type_error
-             (JsonUtil.build_msg "no error handler", json))
+             (JsonUtil.exn_msg_cant_import_from_json "no error handler", json))
     in
     let contact_maps =
       try
@@ -474,7 +478,8 @@ let of_json = function
       separating_transitions )
   | x ->
     raise
-      (Yojson.Basic.Util.Type_error (JsonUtil.build_msg "remanent state", x))
+      (Yojson.Basic.Util.Type_error
+         (JsonUtil.exn_msg_cant_import_from_json "remanent state", x))
 
 let do_event_gen f phase n state =
   let error, log_info =