Skip to content

Fix #810: keep hashing the filename #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vouillon merged 1 commit into from
Apr 23, 2025
Merged

Fix #810: keep hashing the filename #829

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/ppx/ppx_eliom_utils.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ let pat_args = function [] -> punit () | [p] -> p | l -> Pat.tuple l
These bits are encoded using an OCaml-compatible variant of Base
64, as the hash is used to generate OCaml identifiers. *)
let file_hash loc =
let s = Filename.basename loc.Location.loc_start.pos_fname in
let s = Digest.string (Filename.basename loc.Location.loc_start.pos_fname) in
let e = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_'" in
let o = Bytes.create 6 in
let g p = Char.code s.[p] in
Expand Down Expand Up @@ -283,7 +283,7 @@ module Cmo = struct
; ev_kind = Event_after ty
; _ } ->
if pos_cnum' = pos_cnum + 1
then Hashtbl.add events (Filename.basename pos_fname, pos_cnum) ty
Copy link
Copy Markdown
Member Author

@vouillon vouillon Apr 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only used internally, so we can keep the full path here.

then Hashtbl.add events (pos_fname, pos_cnum) ty
| _ -> ())
evl

Expand Down Expand Up @@ -459,10 +459,7 @@ module Cmo = struct

let find err loc =
let {Lexing.pos_fname; pos_cnum; _} = loc.Location.loc_start in
try
typ
(Hashtbl.find (Lazy.force events)
(Filename.basename pos_fname, pos_cnum))
try typ (Hashtbl.find (Lazy.force events) (pos_fname, pos_cnum))
with Not_found ->
Typ.extension ~loc @@ Location.Error.to_extension
@@ Location.Error.make ~loc ~sub:[]
Expand Down