diff options
| author |  Hugo Herbelin <Hugo.Herbelin@inria.fr> | 2014-09-30 09:50:07 +0200 |
|---|---|---|
| committer | Hugo Herbelin <Hugo.Herbelin@inria.fr> | 2014-09-30 10:02:47 +0200 |
| commit | a1be9ce30ed0c59d3cd8651ff0c624a24a6d3fc9 (patch) | |
| tree | a2d0ce66634899dd71d5abb8e525cf1a7ebad7cb /pretyping | |
| parent | 538b77dbb3b7799dc4d2e18033fc4fbf2eb26f7f (diff) | |
Seeing IntroWildcard as an action intro pattern rather than as a naming pattern
(the action is "clear").
Added subst_intropattern which was missing since the introduction of
ApplyOn intro patterns.
Still to do: make "intros _ ?id" working without interferences when
"id" is precisely the internal name used for hypotheses to discard.
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/evd.ml | 3 | ||||
| -rw-r--r-- | pretyping/miscops.ml | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pretyping/evd.ml b/pretyping/evd.ml index ffc1ea2a7..826fd59ba 100644 --- a/pretyping/evd.ml +++ b/pretyping/evd.ml @@ -612,8 +612,7 @@ let add_name_newly_undefined naming evk evi (evtoid,idtoev) = (Loc.ghost,"",str "Already an existential evar of name " ++ pr_id id); id' | Misctypes.IntroFresh id -> - Namegen.next_ident_away_from id (fun id -> Idmap.mem id idtoev) - | Misctypes.IntroWildcard -> assert false in + Namegen.next_ident_away_from id (fun id -> Idmap.mem id idtoev) in (EvMap.add evk id evtoid, Idmap.add id evk idtoev) let add_name_undefined naming evk evi (evtoid,idtoev as evar_names) = diff --git a/pretyping/miscops.ml b/pretyping/miscops.ml index e96e3a8b7..83e33f84e 100644 --- a/pretyping/miscops.ml +++ b/pretyping/miscops.ml @@ -34,6 +34,5 @@ let glob_sort_eq g1 g2 = match g1, g2 with let intro_pattern_naming_eq nam1 nam2 = match nam1, nam2 with | IntroAnonymous, IntroAnonymous -> true | IntroIdentifier id1, IntroIdentifier id2 -> Names.Id.equal id1 id2 -| IntroWildcard, IntroWildcard -> true | IntroFresh id1, IntroFresh id2 -> Names.Id.equal id1 id2 | _ -> false |