ported location handling to camlp4 3.08

[helm.git] / helm / ocaml / cic_transformations / cicAst.ml

diff --git a/helm/ocaml/cic_transformations/cicAst.ml b/helm/ocaml/cic_transformations/cicAst.ml
index f7392fa3ac34bdfe8c4423902cd54a4c4c15fb06..fcc80369794c375c8bbe0b8d825d8cece1f2b701 100644 (file)
--- a/helm/ocaml/cic_transformations/cicAst.ml
+++ b/helm/ocaml/cic_transformations/cicAst.ml
@@ -23,7 +23,28 @@
  * http://helm.cs.unibo.it/
  *)
 
-type location = int * int
+(** {2 Parsing related types} *)
+
+type location = Lexing.position * Lexing.position
+
+  (* maps old style (i.e. <= 3.07) lexer location to new style location, padding
+  * with dummy values where needed *)
+let floc_of_loc (loc_begin, loc_end) =
+  let floc_begin =
+    { Lexing.pos_fname = ""; Lexing.pos_lnum = -1; Lexing.pos_bol = -1;
+      Lexing.pos_cnum = loc_begin }
+  in
+  let floc_end = { floc_begin with Lexing.pos_cnum = loc_end } in
+  (floc_begin, floc_end)
+
+  (* the other way round *)
+let loc_of_floc = function
+  | { Lexing.pos_cnum = loc_begin }, { Lexing.pos_cnum = loc_end } ->
+      (loc_begin, loc_end)
+
+let dummy_floc = floc_of_loc (-1, -1)
+
+(** {2 Cic Ast} *)
 
 type binder_kind = [ `Lambda | `Pi | `Exists | `Forall ]
 type induction_kind = [ `Inductive | `CoInductive ]