packaging cleanup: get rid of ancient debhelpers, use dh_install

[helm.git] / helm / ocaml / cic_notation / cicNotationPt.ml

diff --git a/helm/ocaml/cic_notation/cicNotationPt.ml b/helm/ocaml/cic_notation/cicNotationPt.ml
index ab484c3eb76a4db2e39d217cbe5b2731fb413c6c..68ad7d83dd834898e10824d2dc4af863edfa3dda 100644 (file)
--- a/helm/ocaml/cic_notation/cicNotationPt.ml
+++ b/helm/ocaml/cic_notation/cicNotationPt.ml
@@ -35,12 +35,18 @@ type location = Lexing.position * Lexing.position
 let loc_of_floc = function
   | { Lexing.pos_cnum = loc_begin }, { Lexing.pos_cnum = loc_end } ->
       (loc_begin, loc_end)
+let fail floc msg =
+  let (x, y) = loc_of_floc floc in
+  failwith (Printf.sprintf "Error at characters %d - %d: %s" x y msg)
 
 type term_attribute =
   [ `Loc of location                  (* source file location *)
   | `IdRef of string                  (* ACic pointer *)
   | `Href of UriManager.uri list      (* hyperlinks for literals *)
   | `Level of int * Gramext.g_assoc   (* precedence, associativity *)
+  | `XmlAttrs of (string option * string * string) list
+      (* list of XML attributes: namespace, name, value *)
+  | `Raw of string                    (* unparsed version *)
   ]
 
 type literal =
@@ -58,6 +64,7 @@ type term =
   | Binder of binder_kind * capture_variable * term (* kind, name, body *)
   | Case of term * string option * term option * (case_pattern * term) list
       (* what to match, inductive type, out type, <pattern,action> list *)
+  | Cast of term * 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 *)
@@ -79,6 +86,7 @@ type term =
 
   | Literal of literal
   | Layout of layout_pattern
+
   | Magic of magic_term
   | Variable of pattern_variable
 
@@ -104,19 +112,22 @@ and layout_pattern =
       |+ column separator, row separator +| *)
   | Sqrt of term
   | Root of term * term (* argument, index *)
-(*   | Break *)
+  | Break
   | Box of box_spec * term list
+  | Group of term list
 
 and magic_term =
   (* level 1 magics *)
-  | List0 of term * literal option
-  | List1 of term * literal option
+  | List0 of term * literal option (* pattern, separator *)
+  | List1 of term * literal option (* pattern, separator *)
   | Opt of term
 
   (* level 2 magics *)
   | Fold of fold_kind * term * string list * term
     (* base case pattern, recursive case bound names, recursive case pattern *)
   | Default of term * term  (* "some" case pattern, "none" case pattern *)
+  | Fail
+  | If of term * term * term (* test, pattern if true, pattern if false *)
 
 and pattern_variable =
   (* level 1 and 2 variables *)
@@ -136,12 +147,18 @@ type argument_pattern =
 type cic_appl_pattern =
   | UriPattern of UriManager.uri
   | VarPattern of string
+  | ImplicitPattern
   | ApplPattern of cic_appl_pattern list
 
-type phrase = (* TODO hackish: replace with TacticAst.statement or similar *)
-  | Print of term
-  | Notation of term * Gramext.g_assoc option * int option * term
-      (* level 1 pattern, associativity, precedence, level 2 pattern *)
-  | Interpretation of (string * argument_pattern list) * cic_appl_pattern
-  | Render of UriManager.uri
+(** {2 Standard precedences} *)
+
+let let_in_prec = 10
+let binder_prec = 20
+let apply_prec = 70
+let simple_prec = 90
+
+let let_in_assoc = Gramext.NonA
+let binder_assoc = Gramext.RightA
+let apply_assoc = Gramext.LeftA
+let simple_assoc = Gramext.NonA