diff options
| author |  aspiwack <aspiwack@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2011-05-17 10:31:45 +0000 |
|---|---|---|
| committer | aspiwack <aspiwack@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2011-05-17 10:31:45 +0000 |
| commit | 5b9981239c3192d20d7db2de1248a63b59cbf44a (patch) | |
| tree | cf163ba95662293731c6a864aba6d3e96af14637 /parsing | |
| parent | 07a1de8f9fcff9864e53a090307efa48eca8fe94 (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 'parsing')
| -rw-r--r-- | parsing/g_vernac.ml4 | 6 | ||||
| -rw-r--r-- | parsing/ppvernac.ml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/parsing/g_vernac.ml4 b/parsing/g_vernac.ml4 index 359323902..6dae6ee23 100644 --- a/parsing/g_vernac.ml4 +++ b/parsing/g_vernac.ml4 @@ -103,9 +103,9 @@ GEXTEND Gram | b = bullet; tac = subgoal_command -> tac None (Some b)] ] ; bullet: - [ [ "-" -> Proof_global.Bullet.Dash - | "*" -> Proof_global.Bullet.Star - | "+" -> Proof_global.Bullet.Plus ] ] + [ [ "-" -> Dash + | "*" -> Star + | "+" -> Plus ] ] ; subgoal_command: [ [ c = check_command; "." -> fun g _ -> c g diff --git a/parsing/ppvernac.ml b/parsing/ppvernac.ml index ebd8175d7..db6f0e621 100644 --- a/parsing/ppvernac.ml +++ b/parsing/ppvernac.ml @@ -747,9 +747,9 @@ let rec pr_vernac = function (if i = 1 then mt() else int i ++ str ": ") ++ begin match b with | None -> mt () - | Some Proof_global.Bullet.Dash -> str"-" - | Some Proof_global.Bullet.Star -> str"*" - | Some Proof_global.Bullet.Plus -> str"+" + | Some Dash -> str"-" + | Some Star -> str"*" + | Some Plus -> str"+" end ++ pr_raw_tactic tac ++ (try if deftac then str ".." else mt () |