From 2c6e6bf0b5dae42d1e14a1d6342fc7f80579c489 Mon Sep 17 00:00:00 2001
From: Louis Gesbert <louis.gesbert@ocamlpro.com>
Date: Tue, 3 Oct 2023 18:49:00 +0200
Subject: [PATCH] Disambiguate constructors and fields across modules

---
 compiler/desugared/name_resolution.ml     | 24 ++++++++++++++++++++++-
 tests/test_modules/good/mod_use.catala_en |  6 +++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/compiler/desugared/name_resolution.ml b/compiler/desugared/name_resolution.ml
index d5a3e535..31f63fb1 100644
--- a/compiler/desugared/name_resolution.ml
+++ b/compiler/desugared/name_resolution.ml
@@ -998,4 +998,26 @@ let form_context (prgm : Surface.Ast.program) : context =
       (process_law_structure process_use_item)
       ctxt prgm.program_items
   in
-  ctxt
+  let rec gather_all_constrs ctxt =
+    (* Gather struct fields and enum constrs from modules: this helps with disambiguation *)
+    let modules, constructor_idmap, field_idmap =
+      ModuleName.Map.fold
+        (fun m ctx (mmap, constrs, fields) ->
+           let ctx = gather_all_constrs ctx in
+           ModuleName.Map.add m ctx mmap,
+           Ident.Map.union
+             (fun _ enu1 enu2 ->
+                Some (EnumName.Map.union (fun _ _ -> assert false)
+                        enu1 enu2))
+             constrs ctx.constructor_idmap,
+           Ident.Map.union
+             (fun _ str1 str2 ->
+                Some (StructName.Map.union (fun _ _ -> assert false)
+                        str1 str2))
+             fields ctx.field_idmap
+        )
+        ctxt.modules (ModuleName.Map.empty, ctxt.constructor_idmap, ctxt.field_idmap)
+    in
+    { ctxt with modules; constructor_idmap; field_idmap }
+  in
+  gather_all_constrs ctxt
diff --git a/tests/test_modules/good/mod_use.catala_en b/tests/test_modules/good/mod_use.catala_en
index a5bd15d2..6bf3245a 100644
--- a/tests/test_modules/good/mod_use.catala_en
+++ b/tests/test_modules/good/mod_use.catala_en
@@ -12,13 +12,13 @@ declaration scope T2:
   output o4 content decimal
 
 scope T2:
-  definition o1 equals Mod_def.Enum1.No
+  definition o1 equals No
   definition o2 equals t1.e1
   definition o3 equals t1.sr
   definition o4 equals Mod_def.half of 10
-  assertion (Mod_def.Str1 { -- fld1: No -- fld2: 1 }).Mod_def.Str1.fld1 = No
+  assertion (Mod_def.Str1 { -- fld1: No -- fld2: 1 }).fld1 = No
   assertion o1 = Mod_def.Enum1.No
-  assertion o2 = Mod_def.Enum1.Maybe
+  assertion o2 = Maybe
   assertion o3 = $1000
   assertion o4 = 5.0
 ```