Merge remote-tracking branch 'refs/remotes/origin/main'

1 files changed, 18 insertions, 0 deletions

diff --git a/src/CfimOfJson.ml b/src/CfimOfJson.ml
index 3494f004..a1dd0ad1 100644
--- a/src/CfimOfJson.ml
+++ b/src/CfimOfJson.ml
@@ -436,6 +436,21 @@ let assertion_of_json (js : json) : (A.assertion, string) result =
         Ok { A.cond; expected }
     | _ -> Error "")
 
+let region_var_group_of_json (js : json) : (A.region_var_group, string) result =
+  combine_error_msgs js "region_var_group_of_json"
+    (match js with
+    | `Assoc [ ("id", id); ("regions", regions); ("parents", parents) ] ->
+        let* id = A.RegionGroupId.id_of_json id in
+        let* regions = list_of_json T.RegionVarId.id_of_json regions in
+        let* parents = list_of_json A.RegionGroupId.id_of_json parents in
+        Ok { A.id; regions; parents }
+    | _ -> Error "")
+
+let region_var_groups_of_json (js : json) : (A.region_var_groups, string) result
+    =
+  combine_error_msgs js "region_var_group_of_json"
+    (list_of_json region_var_group_of_json js)
+
 let fun_sig_of_json (js : json) : (A.fun_sig, string) result =
   combine_error_msgs js "fun_sig_of_json"
     (match js with
@@ -443,12 +458,14 @@ let fun_sig_of_json (js : json) : (A.fun_sig, string) result =
         [
           ("region_params", region_params);
           ("num_early_bound_regions", num_early_bound_regions);
+          ("regions_hierarchy", regions_hierarchy);
           ("type_params", type_params);
           ("inputs", inputs);
           ("output", output);
         ] ->
         let* region_params = list_of_json region_var_of_json region_params in
         let* num_early_bound_regions = int_of_json num_early_bound_regions in
+        let* regions_hierarchy = region_var_groups_of_json regions_hierarchy in
         let* type_params = list_of_json type_var_of_json type_params in
         let* inputs = list_of_json sty_of_json inputs in
         let* output = sty_of_json output in
@@ -456,6 +473,7 @@ let fun_sig_of_json (js : json) : (A.fun_sig, string) result =
           {
             A.region_params;
             num_early_bound_regions;
+            regions_hierarchy;
             type_params;
             inputs;
             output;