Skip to content

Commit aa14e7a

Browse files
committed
Fix #mod_use raising exception (MPR#7867)
1 parent 530aac7 commit aa14e7a

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

Changes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,10 @@ Working version
504504

505505
### Bug fixes:
506506

507+
- MPR#7867: Fix #mod_use raising an exception for filenames with no
508+
extension.
509+
(Geoff Gole)
510+
507511
- GPR#2100: Fix Unix.getaddrinfo when called on strings containing
508512
null bytes; it would crash the GC later on.
509513
(Armaël Guéneau, report and fix by Joe, review by Sébastien Hinderer)

testsuite/tests/tool-toplevel/pr6468.compilers.reference

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ val g : unit -> int = <fun>
88
Exception: Not_found.
99
Raised at file "//toplevel//", line 2, characters 17-26
1010
Called from file "//toplevel//", line 1, characters 11-15
11-
Called from file "toplevel/toploop.ml", line 179, characters 17-27
11+
Called from file "toplevel/toploop.ml", line 180, characters 17-27
1212

toplevel/opttoploop.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ let input_name = Location.input_name
162162

163163
let parse_mod_use_file name lb =
164164
let modname =
165-
String.capitalize_ascii (Filename.chop_extension (Filename.basename name))
165+
String.capitalize_ascii
166+
(Filename.remove_extension (Filename.basename name))
166167
in
167168
let items =
168169
List.concat

toplevel/toploop.ml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ let input_name = Location.input_name
123123

124124
let parse_mod_use_file name lb =
125125
let modname =
126-
String.capitalize_ascii (Filename.chop_extension (Filename.basename name))
126+
String.capitalize_ascii
127+
(Filename.remove_extension (Filename.basename name))
127128
in
128129
let items =
129130
List.concat

0 commit comments

Comments
 (0)