aboutsummaryrefslogtreecommitdiff
path: root/parsing
diff options
context:
space:
mode:
authorletouzey2010-11-18 18:34:58 +0000
committerletouzey2010-11-18 18:34:58 +0000
commita7cfd8a9cc4148241e80b8b598f7878b308b8647 (patch)
tree1b34d2f16e3a10cf0c4361e654252d0a518c2466 /parsing
parent59726c5343613379d38a9409af044d85cca130ed (diff)
adapt slighlty r13642 to support both camlp4 and camlp5-5 and camlp5-6
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13652 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'parsing')
-rw-r--r--parsing/pcoq.ml410
1 files changed, 10 insertions, 0 deletions
diff --git a/parsing/pcoq.ml4 b/parsing/pcoq.ml4
index a77fb7cd71..50cbd3145a 100644
--- a/parsing/pcoq.ml4
+++ b/parsing/pcoq.ml4
@@ -35,6 +35,16 @@ ELSE
open G
END
+(** Compatibility with Camlp5 6.x *)
+
+IFDEF CAMLP5_6_00 THEN
+let slist0sep x y = Slist0sep (x, y, false)
+let slist1sep x y = Slist1sep (x, y, false)
+ELSE
+let slist0sep x y = Slist0sep (x, y)
+let slist1sep x y = Slist1sep (x, y)
+END
+
let gram_token_of_token tok =
IFDEF CAMLP5 THEN
Stoken (Tok.to_pattern tok)