diff options
| author | Hugo Herbelin | 2015-12-25 06:08:29 +0100 |
|---|---|---|
| committer | Hugo Herbelin | 2015-12-25 10:59:24 +0100 |
| commit | 1f2cc4026cd5e977979ff1507fd5fa0d96e1a92f (patch) | |
| tree | 46a0d82265d2a9652853ca79b27ec16f4d761471 /parsing | |
| parent | 83b2b197eb33b78f2e3054819f1a36f971c24426 (diff) | |
Moving the ad hoc interpretation of "intros" as "intros **" from tacinterp.ml
to g_tactic.ml4 so as to leave room for "IntroPattern []" to mean
"no introduction".
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/g_tactic.ml4 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/parsing/g_tactic.ml4 b/parsing/g_tactic.ml4 index a197e0209c..31125e37cf 100644 --- a/parsing/g_tactic.ml4 +++ b/parsing/g_tactic.ml4 @@ -281,6 +281,9 @@ GEXTEND Gram intropatterns: [ [ l = LIST0 nonsimple_intropattern -> l ]] ; + ne_intropatterns: + [ [ l = LIST1 nonsimple_intropattern -> l ]] + ; or_and_intropattern: [ [ "["; tc = LIST1 intropatterns SEP "|"; "]" -> tc | "()" -> [[]] @@ -532,7 +535,10 @@ GEXTEND Gram simple_tactic: [ [ (* Basic tactics *) - IDENT "intros"; pl = intropatterns -> TacAtom (!@loc, TacIntroPattern pl) + IDENT "intros"; pl = ne_intropatterns -> + TacAtom (!@loc, TacIntroPattern pl) + | IDENT "intros" -> + TacAtom (!@loc, TacIntroPattern [!@loc,IntroForthcoming false]) | IDENT "intro"; id = ident; hto = move_location -> TacAtom (!@loc, TacIntroMove (Some id, hto)) | IDENT "intro"; hto = move_location -> TacAtom (!@loc, TacIntroMove (None, hto)) |