diff options
| -rw-r--r-- | doc/syntax-v8.tex | 8 | ||||
| -rw-r--r-- | parsing/g_tacticnew.ml4 | 8 | ||||
| -rw-r--r-- | translate/pptacticnew.ml | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/doc/syntax-v8.tex b/doc/syntax-v8.tex index dfefabaf5..21c95d326 100644 --- a/doc/syntax-v8.tex +++ b/doc/syntax-v8.tex @@ -419,12 +419,12 @@ $$ \nlsep \TERM{lapply}~\tacconstr %% \nlsep \TERM{simple_induction}~\NT{quantified-hyp} -\nlsep \TERM{induction}~\NT{induction-arg}~\OPT{\NT{eliminator}} - ~\OPT{\NT{with-names}} +\nlsep \TERM{induction}~\NT{induction-arg}~\OPT{\NT{with-names}} + ~\OPT{\NT{eliminator}} \nlsep \TERM{double}~\TERM{induction}~\NT{quantified-hyp}~\NT{quantified-hyp} \nlsep \TERM{simple_destruct}~\NT{quantified-hyp} -\nlsep \TERM{destruct}~\NT{induction-arg}~\OPT{\NT{eliminator}} - ~\OPT{\NT{with-names}} +\nlsep \TERM{destruct}~\NT{induction-arg}~\OPT{\NT{with-names}} + ~\OPT{\NT{eliminator}} \nlsep \TERM{decompose}~\TERM{record}~\tacconstr \nlsep \TERM{decompose}~\TERM{sum}~\tacconstr \nlsep \TERM{decompose}~\TERM{[}~\PLUS{\NT{reference}}~\TERM{]} diff --git a/parsing/g_tacticnew.ml4 b/parsing/g_tacticnew.ml4 index d98f8ad45..45253cd90 100644 --- a/parsing/g_tacticnew.ml4 +++ b/parsing/g_tacticnew.ml4 @@ -355,14 +355,14 @@ GEXTEND Gram (* Derived basic tactics *) | IDENT "simple_induction"; h = quantified_hypothesis -> TacSimpleInduction h - | IDENT "induction"; c = induction_arg; el = OPT eliminator; - ids = with_names -> TacNewInduction (c,el,ids) + | IDENT "induction"; c = induction_arg; ids = with_names; + el = OPT eliminator -> TacNewInduction (c,el,ids) | IDENT "double"; IDENT "induction"; h1 = quantified_hypothesis; h2 = quantified_hypothesis -> TacDoubleInduction (h1,h2) | IDENT "simple_destruct"; h = quantified_hypothesis -> TacSimpleDestruct h - | IDENT "destruct"; c = induction_arg; el = OPT eliminator; - ids = with_names -> TacNewDestruct (c,el,ids) + | IDENT "destruct"; c = induction_arg; ids = with_names; + el = OPT eliminator -> TacNewDestruct (c,el,ids) | IDENT "decompose"; IDENT "record" ; c = constr -> TacDecomposeAnd c | IDENT "decompose"; IDENT "sum"; c = constr -> TacDecomposeOr c | IDENT "decompose"; "["; l = LIST1 global; "]"; c = constr diff --git a/translate/pptacticnew.ml b/translate/pptacticnew.ml index 035cdfd63..a7181e13b 100644 --- a/translate/pptacticnew.ml +++ b/translate/pptacticnew.ml @@ -469,14 +469,14 @@ and pr_atom1 env = function hov 1 (str "simple_induction" ++ pr_arg pr_quantified_hypothesis h) | TacNewInduction (h,e,ids) -> hov 1 (str "induction" ++ spc () ++ - pr_induction_arg (pr_constr env) h ++ - pr_opt (pr_eliminator env) e ++ pr_with_names ids) + pr_induction_arg (pr_constr env) h ++ pr_with_names ids ++ + pr_opt (pr_eliminator env) e) | TacSimpleDestruct h -> hov 1 (str "simple_destruct" ++ pr_arg pr_quantified_hypothesis h) | TacNewDestruct (h,e,ids) -> hov 1 (str "destruct" ++ spc () ++ - pr_induction_arg (pr_constr env) h ++ - pr_opt (pr_eliminator env) e ++ pr_with_names ids) + pr_induction_arg (pr_constr env) h ++ pr_with_names ids ++ + pr_opt (pr_eliminator env) e) | TacDoubleInduction (h1,h2) -> hov 1 (str "double induction" ++ |