diff options
| author | Maxime Dénès | 2018-02-24 09:26:03 +0100 |
|---|---|---|
| committer | Maxime Dénès | 2018-02-24 09:26:03 +0100 |
| commit | 7895d276146496648d576914aab4aded4b4a32cd (patch) | |
| tree | 24e8de17078242c1ea39e31ecfe55a1c024d0eff /library | |
| parent | 0c5f0afffd37582787f79267d9841259095b7edc (diff) | |
| parent | 9bebbb96e58b3c1b0f7f88ba2af45462eae69b0f (diff) | |
Merge PR #6745: [ast] Improve precision of Ast location recognition in serialization.
Diffstat (limited to 'library')
| -rw-r--r-- | library/declaremods.ml | 5 | ||||
| -rw-r--r-- | library/declaremods.mli | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/library/declaremods.ml b/library/declaremods.ml index 28a04252a3..291039d199 100644 --- a/library/declaremods.ml +++ b/library/declaremods.ml @@ -451,7 +451,7 @@ let intern_arg interp_modast (acc, cst) (idl,(typ,ann)) = let env = Global.env () in let sobjs = get_module_sobjs false env inl mty in let mp0 = get_module_path mty in - let fold acc (_, id) = + let fold acc {CAst.v=id} = let dir = DirPath.make [id] in let mbid = MBId.make lib_dir id in let mp = MPbound mbid in @@ -982,8 +982,7 @@ type 'modast module_interpretor = Entries.module_struct_entry * Misctypes.module_kind * Univ.ContextSet.t type 'modast module_params = - (Id.t Loc.located list * ('modast * inline)) list - + (lident list * ('modast * inline)) list (** {6 Debug} *) diff --git a/library/declaremods.mli b/library/declaremods.mli index 0df55f34d7..db28933768 100644 --- a/library/declaremods.mli +++ b/library/declaremods.mli @@ -16,7 +16,7 @@ type 'modast module_interpretor = Entries.module_struct_entry * Misctypes.module_kind * Univ.ContextSet.t type 'modast module_params = - (Id.t Loc.located list * ('modast * inline)) list + (Misctypes.lident list * ('modast * inline)) list (** [declare_module interp_modast id fargs typ exprs] declares module [id], with structure constructed by [interp_modast] |