Skip to content
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

use the path given in --display instead of Common.find_file result #4943

Closed
wants to merge 3 commits into from
Closed

use the path given in --display instead of Common.find_file result #4943

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cda28f6
use the path given in --display instead of Common.find_file result
ousado Mar 15, 2016
2bb5124
fix failing test for Issue4270
ousado Mar 15, 2016
a2cc3cc
replace fold with let rec loop
ousado Mar 16, 2016
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
11 changes: 10 additions & 1 deletion typeload.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3399,7 +3399,16 @@ let resolve_module_file com m remap p =
) in
String.concat "/" (x :: l) ^ "/" ^ name
) ^ ".hx" in
let file = Common.find_file com file in
let file = (match com.display with
| DMNone -> Common.find_file com file
| _ -> let revm = (snd m ^ ".hx") :: List.rev (fst m) in
let pflist = List.rev (ExtString.String.nsplit (!Parser.resume_display).pfile "/") in
let rec loop p m = (match (p,m) with
| [], m :: mt -> false (* module longer than pfile, so not what we're looking for *)
| _, [] -> true (* module exhausted, we have a match *)
| p :: pt, m :: mt -> if p = m then loop pt mt else false) (* check equality of parts *)
in if loop pflist revm then (!Parser.resume_display).pfile else Common.find_file com file)
in
let file = (match String.lowercase (snd m) with
| "con" | "aux" | "prn" | "nul" | "com1" | "com2" | "com3" | "lpt1" | "lpt2" | "lpt3" when Sys.os_type = "Win32" ->
(* these names are reserved by the OS - old DOS legacy, such files cannot be easily created but are reported as visible *)
Expand Down