PR#6931: Incorrect error message

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16235 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Damien Doligez 2015-07-22 14:04:39 +00:00
parent 5afcc281dd
commit 3e17d04ef0
3 changed files with 3 additions and 2 deletions

View File

@ -118,6 +118,7 @@ Bug fixes:
- PR#6897: Bad error message for some pattern matching on extensible variants
- PR#6899: Optional parameters and non generalizable type variables
(Thomas Refis and Leo White)
- PR#6931: Incorrect error message
- GPR#205: Clear caml_backtrace_last_exn before registering as root (report
and fix by Frederic Bour)

View File

@ -1,4 +1,4 @@
4.03.0+dev8-2015-07-15
4.03.0+dev9-2015-07-22
# The version string is the first line of this file.
# It must be in the format described in stdlib/sys.mli

View File

@ -731,7 +731,7 @@ end) = struct
end
let wrap_disambiguate kind ty f x =
try f x with Error (loc, env, Wrong_name (_,_,tk,tp,name,valid_names)) ->
try f x with Error (loc, env, Wrong_name ("",_,tk,tp,name,valid_names)) ->
raise (Error (loc, env, Wrong_name (kind,ty,tk,tp,name,valid_names)))
module Label = NameChoice (struct