diff options
| author |  Stephane Glondu <steph@glondu.net> | 2012-01-12 16:08:29 +0100 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2012-01-12 16:08:29 +0100 |
| commit | 23a6061a81ffa0c214d521287b6af0a31bfa22f0 (patch) | |
| tree | f1ca9ba9240b98b8695a9f1870e56602734cf97c /tactics/tactic_option.ml | |
| parent | de109d8c0c68f569b907e6e24271f259ba28888e (diff) | |
| parent | 39efc41237ec906226a3a53d7396d51173495204 (diff) | |
Merge commit 'upstream/8.4_beta+dfsg' into experimental/master
Diffstat (limited to 'tactics/tactic_option.ml')
| -rw-r--r-- | tactics/tactic_option.ml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tactics/tactic_option.ml b/tactics/tactic_option.ml index df5a3283..57b8c540 100644 --- a/tactics/tactic_option.ml +++ b/tactics/tactic_option.ml @@ -1,13 +1,11 @@ (************************************************************************) (* v * The Coq Proof Assistant / The Coq Development Team *) -(* <O___,, * CNRS-Ecole Polytechnique-INRIA Futurs-Universite Paris Sud *) +(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010 *) (* \VV/ **************************************************************) (* // * This file is distributed under the terms of the *) (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: subtac.ml 12623 2010-01-04 17:50:38Z letouzey $ *) - open Libobject open Proof_type open Pp @@ -27,7 +25,7 @@ let declare_tactic_option ?(default=Tacexpr.TacId []) name = let subst (s, (local, tac)) = (local, Tacinterp.subst_tactic s tac) in - let input, _output = + let input : bool * Tacexpr.glob_tactic_expr -> obj = declare_object { (default_object name) with cache_function = cache; |