ported to Mysql

[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 92ab328c18a1e9ac16881d5d7815da2664cd9a68..cb65c2497322e58d98cb12fba14414a2102073f8 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 ]
@@ -44,13 +65,19 @@ type term =
   | LetIn of capture_variable * term * term  (* name, body, where *)
   | LetRec of induction_kind * (capture_variable * term * int) list * term
       (* (name, body, decreasing argument) list, where *)
-  | Ident of string * subst list  (* literal, substitutions *)
+  | Ident of string * subst list option
+      (* literal, substitutions.
+      * Some [] -> user has given an empty explicit substitution list 
+      * None -> user has given no explicit substitution list *)
   | Implicit
   | Meta of int * meta_subst list
   | Num of string * int (* literal, instance *)
   | Sort of sort_kind
   | Symbol of string * int  (* canonical name, instance *)
 
+  | UserInput (* place holder for user input, used by MatitaConsole, not to be
+              used elsewhere *)
+
 and capture_variable = Cic.name * term option (* name, type *)
 and meta_subst = term option
 and subst = string * term