diff options
| author | Hugo Herbelin | 2014-09-30 09:50:07 +0200 |
|---|---|---|
| committer | Hugo Herbelin | 2014-09-30 10:02:47 +0200 |
| commit | a1be9ce30ed0c59d3cd8651ff0c624a24a6d3fc9 (patch) | |
| tree | a2d0ce66634899dd71d5abb8e525cf1a7ebad7cb /parsing | |
| 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 'parsing')
| -rw-r--r-- | parsing/g_tactic.ml4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/parsing/g_tactic.ml4 b/parsing/g_tactic.ml4 index 3e83e2ca18..80edccfeb1 100644 --- a/parsing/g_tactic.ml4 +++ b/parsing/g_tactic.ml4 @@ -296,8 +296,7 @@ GEXTEND Gram naming_intropattern: [ [ prefix = pattern_ident -> IntroFresh prefix | "?" -> IntroAnonymous - | id = ident -> IntroIdentifier id - | "_" -> IntroWildcard ] ] + | id = ident -> IntroIdentifier id ] ] ; nonsimple_intropattern: [ [ l = simple_intropattern -> l @@ -307,6 +306,7 @@ GEXTEND Gram simple_intropattern: [ [ pat = or_and_intropattern -> !@loc, IntroAction (IntroOrAndPattern pat) | pat = equality_intropattern -> !@loc, IntroAction pat + | "_" -> !@loc, IntroAction IntroWildcard | pat = simple_intropattern; "/"; c = constr -> !@loc, IntroAction (IntroApplyOn (c,pat)) | pat = naming_intropattern -> !@loc, IntroNaming pat ] ] |