aboutsummaryrefslogtreecommitdiffhomepage
path: root/toplevel
diff options
context:
space:
mode:
authorGravatar aspiwack <aspiwack@85f007b7-540e-0410-9357-904b9bb8a0f7>2011-05-17 10:31:45 +0000
committerGravatar aspiwack <aspiwack@85f007b7-540e-0410-9357-904b9bb8a0f7>2011-05-17 10:31:45 +0000
commit5b9981239c3192d20d7db2de1248a63b59cbf44a (patch)
treecf163ba95662293731c6a864aba6d3e96af14637 /toplevel
parent07a1de8f9fcff9864e53a090307efa48eca8fe94 (diff)
Break circular dependency Proof_global -> Vernacexpr -> Proof_global.
Fixes bug #2547 ( http://www.lix.polytechnique.fr/coq/bugs/show_bug.cgi?id=2547 ) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@14131 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'toplevel')
-rw-r--r--toplevel/vernacexpr.ml7
1 files changed, 6 insertions, 1 deletions
diff --git a/toplevel/vernacexpr.ml b/toplevel/vernacexpr.ml
index de121e93d..6ea4e263f 100644
--- a/toplevel/vernacexpr.ml
+++ b/toplevel/vernacexpr.ml
@@ -195,6 +195,11 @@ type scheme =
type inline = int option (* inlining level, none for no inlining *)
+type bullet =
+ | Dash
+ | Star
+ | Plus
+
type vernac_expr =
(* Control *)
| VernacList of located_vernac_expr list
@@ -271,7 +276,7 @@ type vernac_expr =
(* Solving *)
- | VernacSolve of int * Proof_global.Bullet.t option * raw_tactic_expr * bool
+ | VernacSolve of int * bullet option * raw_tactic_expr * bool
| VernacSolveExistential of int * constr_expr
(* Auxiliary file and library management *)