aboutsummaryrefslogtreecommitdiff
path: root/interp
diff options
context:
space:
mode:
authorMaxime Dénès2015-09-17 09:48:19 +0200
committerMaxime Dénès2015-09-17 09:48:19 +0200
commit13ea0a5011875e362aa388989b72b3f7ed0c505b (patch)
treefaa045035065875845cea1c80cbb3a3b4f624fbf /interp
parentf2f805ed8275f70767284f4d3c8a13db6f8c8923 (diff)
parentfbb3ccdb099170e5a39c9f39512b1ab2503951ea (diff)
Merge branch 'v8.5' into trunk
Diffstat (limited to 'interp')
-rw-r--r--interp/constrintern.ml6
1 files changed, 5 insertions, 1 deletions
diff --git a/interp/constrintern.ml b/interp/constrintern.ml
index ecaf2b8c13..c754f1910c 100644
--- a/interp/constrintern.ml
+++ b/interp/constrintern.ml
@@ -1142,7 +1142,11 @@ let drop_notations_pattern looked_for =
sort_fields false loc l (fun _ l -> (CPatAtom (loc, None))::l) in
begin match sorted_fields with
| None -> RCPatAtom (loc, None)
- | Some (_, head, pl) ->
+ | Some (n, head, pl) ->
+ let pl =
+ if !oldfashion_patterns then pl else
+ let pars = List.make n (CPatAtom (loc, None)) in
+ List.rev_append pars pl in
match drop_syndef top env head pl with
|Some (a,b,c) -> RCPatCstr(loc, a, b, c)
|None -> raise (InternalizationError (loc,NotAConstructor head))