diff options
author | Son Ho | 2024-03-28 17:17:42 +0100 |
---|---|---|
committer | Son Ho | 2024-03-28 17:17:42 +0100 |
commit | 4eac16f0954ab037413c24a69799a9d595f920f2 (patch) | |
tree | cfdbbad092c8e60d0680e2a8626de55ece6317c3 /compiler | |
parent | 4a2bd6819685ae9aa83b634fd47018064d985321 (diff) |
Revert some changes which shouldn't be here
Diffstat (limited to 'compiler')
-rw-r--r-- | compiler/ExtractBase.ml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/compiler/ExtractBase.ml b/compiler/ExtractBase.ml index b7255dbc..99167ae4 100644 --- a/compiler/ExtractBase.ml +++ b/compiler/ExtractBase.ml @@ -237,7 +237,7 @@ module IdSet = Collections.MakeSet (IdOrderedType) *) type names_map = { id_to_name : string IdMap.t; - name_to_id : (id * Meta.meta option) StringMap.t; + name_to_id : id StringMap.t; (** The name to id map is used to look for name clashes, and generate nice debugging messages: if there is a name clash, it is useful to know precisely which identifiers are mapped to the same name... @@ -253,8 +253,8 @@ let empty_names_map : names_map = } (** Small helper to report name collision *) -let report_name_collision (id_to_string : id -> string) - ((id1, meta) : id * Meta.meta option) (id2 : id) (name : string) : unit = +let report_name_collision (id_to_string : id -> string) (id1 : id) (id2 : id) + (name : string) : unit = let id1 = "\n- " ^ id_to_string id1 in let id2 = "\n- " ^ id_to_string id2 in let err = @@ -263,10 +263,9 @@ let report_name_collision (id_to_string : id -> string) ^ "\nYou may want to rename some of your definitions, or report an issue." in (* If we fail hard on errors, raise an exception *) - save_error meta err + save_error None err -let names_map_get_id_from_name (name : string) (nm : names_map) : - (id * meta option) option = +let names_map_get_id_from_name (name : string) (nm : names_map) : id option = StringMap.find_opt name nm.name_to_id let names_map_check_collision (id_to_string : id -> string) (id : id) |