From 1b089eb0231b4bd6d4cafb30f9e051bb53665978 Mon Sep 17 00:00:00 2001 From: letouzey Date: Wed, 19 May 2010 15:29:48 +0000 Subject: Add (almost) compatibility with camlp4, without breaking support for camlp5 The choice between camlp4/5 is done during configure with flags -usecamlp5 (default for the moment) vs. -usecamlp4. Currently, to have a full camlp4 compatibility, you need to change all "EXTEND" and "GEXTEND Gram" into "EXTEND Gram", and change "EOI" into "`EOI" in grammar entries. I've a sed script that does that (actually the converse), but I prefer to re-think it and check a few things before branching this sed into the build mechanism. lib/compat.ml4 is heavily used to hide incompatibilities between camlp4/5 and try to propose a common interface (cf LexerSig / GrammarSig). A few incompatible quotations have been turned into underlying code manually, in order to make the IFDEF CAMLP5 THEN ... ELSE ... END parsable by both camlp4 and 5. See in particular the fate of <:str_item< declare ... end >> Stdpp isn't used anymore, but rather Ploc (hidden behind local module Loc). This forces to use camlp5 > 5.01. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13019 85f007b7-540e-0410-9357-904b9bb8a0f7 --- config/Makefile.template | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/Makefile.template b/config/Makefile.template index e29a4befe..8fb9e48c3 100644 --- a/config/Makefile.template +++ b/config/Makefile.template @@ -56,6 +56,7 @@ CAMLLIB="CAMLLIBDIRECTORY" CAMLHLIB="CAMLLIBDIRECTORY" # Camlp4 library directory (avoid CAMLP4LIB used on Windows) +CAMLP4=CAMLP4VARIANT CAMLP4O=CAMLP4TOOL CAMLP4COMPAT=CAMLP4COMPATFLAGS MYCAMLP4LIB="CAMLP4LIBDIRECTORY" -- cgit v1.2.3