diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2014-01-10 07:53:33 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2014-01-10 07:53:33 +0000 |
| commit | 3b4d7cf63b889b86c33efcbbe79f9937b663b9f6 (patch) | |
| tree | befe14b04b00480f16f1b79de58f38eba00936f4 /bytecomp/matching.ml | |
| parent | 4a25508fc253019e936460396328b22554f83050 (diff) | |
| parent | d90b126bd428999d767ef4db4c5d3b05eb27c345 (diff) | |
Merge module-alias branch (cf. PR#6063)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14394 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'bytecomp/matching.ml')
| -rw-r--r-- | bytecomp/matching.ml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bytecomp/matching.ml b/bytecomp/matching.ml index 7387ea64a..b6ba0ac86 100644 --- a/bytecomp/matching.ml +++ b/bytecomp/matching.ml @@ -2163,7 +2163,9 @@ let combine_constructor arg ex_pat cstr partial ctx def else Lprim(Pfield 0, [arg]) in Lifthenelse(Lprim(Pintcomp Ceq, - [slot; transl_path path]), + [slot; + transl_path ~loc:ex_pat.pat_loc + ex_pat.pat_env path]), act, rem) | _ -> assert false) tests default in @@ -2734,7 +2736,7 @@ let partial_function loc () = (* [Location.get_pos_info] is too expensive *) let (fname, line, char) = Location.get_pos_info loc.Location.loc_start in Lprim(Praise Raise_regular, [Lprim(Pmakeblock(0, Immutable), - [transl_path Predef.path_match_failure; + [transl_normal_path Predef.path_match_failure; Lconst(Const_block(0, [Const_base(Const_string (fname, None)); Const_base(Const_int line); |