aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7>2010-12-06 09:58:51 +0000
committerGravatar glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7>2010-12-06 09:58:51 +0000
commitcb74dea69e7de85f427719019bc23ed3c974c8f3 (patch)
treee012193826834ae0421b4b29ab0fcb785b10e0b0
parented6115081b748fa969d680802cf8cff3f3eef330 (diff)
Use !Pp_control.std_ft for printing grammars
With camlp5 6.02.1, this fixes "Print Grammar" in coqide. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13687 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--lib/compat.ml46
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/compat.ml4 b/lib/compat.ml4
index f2994edc6..c95f7ed45 100644
--- a/lib/compat.ml4
+++ b/lib/compat.ml4
@@ -128,7 +128,11 @@ module GrammarMake (L:LexerSig) : GrammarSig = struct
let action = Gramext.action
let entry_create = Entry.create
let entry_parse = Entry.parse
+IFDEF CAMLP5_6_02_1 THEN
+ let entry_print x = Entry.print !Pp_control.std_ft x
+ELSE
let entry_print = Entry.print
+END
let srules' = Gramext.srules
let parse_tokens_after_filter = Entry.parse_token
end
@@ -158,7 +162,7 @@ module GrammarMake (L:LexerSig) : GrammarSig = struct
let action = Action.mk
let entry_create = Entry.mk
let entry_parse e s = parse e (*FIXME*)Loc.ghost s
- let entry_print x = Entry.print Format.std_formatter x
+ let entry_print x = Entry.print !Pp_control.std_ft x
let srules' = srules (entry_create "dummy")
end