diff options
author | 2010-05-19 15:29:48 +0000 | |
---|---|---|
committer | 2010-05-19 15:29:48 +0000 | |
commit | 1b089eb0231b4bd6d4cafb30f9e051bb53665978 (patch) | |
tree | 489e0f8ce7b4a80db388c63219b9cf4380b7f185 /parsing/q_util.mli | |
parent | 259dde7928696593c2d3c6de474f5cf50fa4417d (diff) |
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
Diffstat (limited to 'parsing/q_util.mli')
-rw-r--r-- | parsing/q_util.mli | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/parsing/q_util.mli b/parsing/q_util.mli index 59b3f334c..c19a0ecf5 100644 --- a/parsing/q_util.mli +++ b/parsing/q_util.mli @@ -6,7 +6,7 @@ * GNU Lesser General Public License Version 2.1 ***********************************************************************) -val patt_of_expr : MLast.expr -> MLast.patt +open Compat val mlexpr_of_list : ('a -> MLast.expr) -> 'a list -> MLast.expr @@ -30,4 +30,4 @@ val mlexpr_of_string : string -> MLast.expr val mlexpr_of_option : ('a -> MLast.expr) -> 'a option -> MLast.expr -val mlexpr_of_prod_entry_key : Pcoq.Gram.te Extend.prod_entry_key -> MLast.expr +val mlexpr_of_prod_entry_key : Pcoq.prod_entry_key -> MLast.expr |