diff options
| author | Hugo Herbelin | 2017-02-09 18:33:08 +0100 |
|---|---|---|
| committer | Hugo Herbelin | 2017-02-09 18:44:51 +0100 |
| commit | 29d7872c0159d2aab7264c0577a2f5a9dc7c90c9 (patch) | |
| tree | d30347af9c2654172090fdbb3c9ece8d527090da | |
| parent | 0b8d185baab95d92a7779482c7861c7be0a8e979 (diff) | |
Turning an anomaly on 'pat into a proper "unsupported" error message.
| -rw-r--r-- | interp/topconstr.ml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/interp/topconstr.ml b/interp/topconstr.ml index d388376bc2..a397ca82eb 100644 --- a/interp/topconstr.ml +++ b/interp/topconstr.ml @@ -60,6 +60,9 @@ let rec cases_pattern_fold_names f a = function | CPatPrim _ | CPatAtom _ -> a | CPatCast _ -> assert false +let ids_of_pattern = + cases_pattern_fold_names Id.Set.add Id.Set.empty + let ids_of_pattern_list = List.fold_left (Loc.located_fold_left @@ -173,7 +176,8 @@ let split_at_annot bl na = (List.rev ans, LocalRawAssum (r, k, t) :: rest) end | LocalRawDef _ as x :: rest -> aux (x :: acc) rest - | LocalPattern _ :: rest -> assert false + | LocalPattern (loc,_,_) :: rest -> + Loc.raise loc (Stream.Error "pattern with quote not allowed after fix") | [] -> user_err_loc(loc,"", str "No parameter named " ++ Nameops.pr_id id ++ str".") @@ -196,8 +200,9 @@ let map_local_binders f g e bl = (map_binder g e nal, LocalRawAssum(nal,k,f e ty)::bl) | LocalRawDef((loc,na),ty) -> (name_fold g na e, LocalRawDef((loc,na),f e ty)::bl) - | LocalPattern _ -> - assert false in + | LocalPattern (loc,pat,t) -> + let ids = ids_of_pattern pat in + (Id.Set.fold g ids e, LocalPattern (loc,pat,Option.map (f e) t)::bl) in let (e,rbl) = List.fold_left h (e,[]) bl in (e, List.rev rbl) |