portage en ocaml / camlp4 3.00

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@379 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 6 insertions, 3 deletions

diff --git a/parsing/lexer.mll b/parsing/lexer.mll
index 6a35d19de..0f7b4938c 100644
--- a/parsing/lexer.mll
+++ b/parsing/lexer.mll
@@ -261,9 +261,12 @@ let token_text = function
   | (con, prm) -> con ^ " \"" ^ prm ^ "\""
 
 let tparse (p_con, p_prm) =
-  if p_prm = "" then
-    parser [< '(con, prm) when con = p_con >] -> prm
+  ifdef CAMLP4_300 then 
+    None
   else
-    parser [< '(con, prm) when con = p_con && prm = p_prm >] -> prm
+    if p_prm = "" then
+      parser [< '(con, prm) when con = p_con >] -> prm
+    else
+      parser [< '(con, prm) when con = p_con && prm = p_prm >] -> prm
 
 }