diff options
| author |  letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-10-06 14:42:26 +0000 |
|---|---|---|
| committer | letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-10-06 14:42:26 +0000 |
| commit | 8a068af4615a7fd85b2328274fef606539cc6b9a (patch) | |
| tree | 34c385ef3ec3969f5d57dfea4dd3619e2bcd0dd9 | |
| parent | d099918e5c1b3a1b46eac629511842039abbc0fe (diff) | |
restore compatibility with camlp5 < 6.00
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15881 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | parsing/compat.ml4 | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/parsing/compat.ml4 b/parsing/compat.ml4 index 9a7c75bcc..9219cc86e 100644 --- a/parsing/compat.ml4 +++ b/parsing/compat.ml4 @@ -20,12 +20,20 @@ end exception Exc_located = Ploc.Exc +IFDEF CAMLP5_6_00 THEN +let ploc_make_loc fname lnb pos bpep = Ploc.make_loc fname lnb pos bpep "" +let ploc_file_name = Ploc.file_name +ELSE +let ploc_make_loc fname lnb pos bpep = Ploc.make lnb pos bpep +let ploc_file_name _ = "" +END + let of_coqloc loc = let (fname, lnb, pos, bp, ep) = Loc.represent loc in - Ploc.make_loc fname lnb pos (bp, ep) "" + ploc_make_loc fname lnb pos (bp,ep) let to_coqloc loc = - Loc.create (Ploc.file_name loc) (Ploc.line_nb loc) + Loc.create (ploc_file_name loc) (Ploc.line_nb loc) (Ploc.bol_pos loc) (Ploc.first_pos loc, Ploc.last_pos loc) let make_loc = Ploc.make_unlined |