diff options
| author |  Matej Kosik <m4tej.kosik@gmail.com> | 2016-08-25 14:31:30 +0200 |
|---|---|---|
| committer | Matej Kosik <m4tej.kosik@gmail.com> | 2016-08-25 14:31:30 +0200 |
| commit | a2b0c48d8b531ae1b193eed4dec1afeaa67fbece (patch) | |
| tree | af83d8a0fb79c51e13c44bc60be9cde810f87152 /toplevel/vernacentries.ml | |
| parent | 1297523bffdc3a9fe3e447acc6837be835e86d06 (diff) | |
| parent | 7244637f251272c0d0155d49fc7c1af255b7cef8 (diff) | |
Merge remote-tracking branch 'v8.6' into trunk
Diffstat (limited to 'toplevel/vernacentries.ml')
| -rw-r--r-- | toplevel/vernacentries.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toplevel/vernacentries.ml b/toplevel/vernacentries.ml index 5b746ca46..eeb4e26af 100644 --- a/toplevel/vernacentries.ml +++ b/toplevel/vernacentries.ml @@ -137,7 +137,7 @@ let make_cases s = let rec rename avoid = function | [] -> [] | (n,_)::l -> - let n' = Namegen.next_name_away_in_cases_pattern ([],mkMeta 0) n avoid in + let n' = Namegen.next_name_away_with_default (Id.to_string Namegen.default_dependent_ident) n avoid in Id.to_string n' :: rename (n'::avoid) l in let al' = rename [] al in (Id.to_string consname :: al') :: l) @@ -1065,7 +1065,7 @@ let vernac_declare_arguments locality r l nargs flags = vernac_declare_implicits locality r [] else if some_implicits_specified || List.mem `ClearImplicits flags then vernac_declare_implicits locality r implicits; - if nargs >= 0 && nargs < List.fold_left max 0 rargs then + if nargs >= 0 && nargs <= List.fold_left max ~-1 rargs then error "The \"/\" option must be placed after the last \"!\"."; let no_flags = List.is_empty flags in let rec narrow = function |