From a1be9ce30ed0c59d3cd8651ff0c624a24a6d3fc9 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Tue, 30 Sep 2014 09:50:07 +0200
Subject: 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.
---
 pretyping/evd.ml     | 3 +--
 pretyping/miscops.ml | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'pretyping')

diff --git a/pretyping/evd.ml b/pretyping/evd.ml
index ffc1ea2a77..826fd59ba8 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 e96e3a8b7f..83e33f84ea 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
-- 
cgit v1.2.3