ABC.cmi instead of aBC.cmi.Look up compiled files under the module name as written first
🐛 Bug fixtypecheckercodegentests
Load-path lookups (Misc.find_in_path_uncap, Config_util.find_opt and the .cmi loader in Bs_cmi_load) accept a file under the module name as written or uncapitalized, and tried the uncapitalized name first. On a case-insensitive file system both spellings match the same file, so the returned path read src/aBC.cmi in "does not match the interface" errors and in other messages naming the file. The lookups now try the name as written first and fall back to the uncapitalized one. On a case-sensitive file system only one spelling exists for a module, so the result is the same file as before.
Diagnostic output
Before: does not match the interface src/aBC.cmi: After: does not match the interface src/ABC.cmi:
🐛 Bug fixFind compiled files under the module's name as written before its uncapitalized form, so error messages on case-insensitive file systems show
Review
- Is the lookup order load-bearing? Both spellings exist side by side only for two source files of the same module name, which the build rejects as duplicates. Capitalized files, the common case, now resolve with one file check instead of two.
- No effect
- Output: unchanged
- Tests
- ounit
tests/ounit_tests/+ ounit_find_in_path_tests.ml~ ounit_tests_main.ml
- Changelog fragment changes/cmi-lookup-as-written.fix.md
- No committed generated JS changes
7 files · +108 −13 · changelog 1 · codegen 2 · compiler 2 · tests 2
| A | changes/cmi-lookup-as-written.fix.md | +1 | −0 |
| M | compiler/core/bs_cmi_load.ml | +1 | −1 |
| M | compiler/core/config_util.ml | +9 | −6 |
| M | compiler/ext/misc.ml | +4 | −4 |
| M | compiler/ext/misc.mli | +2 | −2 |
| A | tests/ounit_tests/ounit_find_in_path_tests.ml | +90 | −0 |
| M | tests/ounit_tests/ounit_tests_main.ml | +1 | −0 |