X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_notation%2FcicNotationPt.ml;h=99b8909e544627ad6fbabc712b43e6a4fd5abf31;hb=ba2dfe6409e95bf9e558dc0d4be382b068671409;hp=3d6242e962bb705e72ac7f24d557427827c0f1f9;hpb=2e41c32bf536719437749de627c7e034f5852f83;p=helm.git

diff --git a/helm/ocaml/cic_notation/cicNotationPt.ml b/helm/ocaml/cic_notation/cicNotationPt.ml
index 3d6242e96..99b8909e5 100644
--- a/helm/ocaml/cic_notation/cicNotationPt.ml
+++ b/helm/ocaml/cic_notation/cicNotationPt.ml
@@ -31,10 +31,16 @@ type sort_kind = [ `Prop | `Set | `Type | `CProp ]
 type fold_kind = [ `Left | `Right ]
 
 type location = Lexing.position * Lexing.position
+(* cut and past from CicAst.loc_of_floc *)
+let loc_of_floc = function
+  | { Lexing.pos_cnum = loc_begin }, { Lexing.pos_cnum = loc_end } ->
+      (loc_begin, loc_end)
 
 type term_attribute =
-  [ `Loc of location  (* source file location *)
-  | `IdRef of string  (* ACic pointer *)
+  [ `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 *)
   ]
 
 type literal =
@@ -73,15 +79,19 @@ type term =
 
   | Literal of literal
   | Layout of layout_pattern
+
   | Magic of magic_term
   | Variable of pattern_variable
 
-and capture_variable = Cic.name * term option (* name, type *)
+  (* name, type. First component must be Ident or Variable (FreshVar _) *)
+and capture_variable = term * term option
+
 and meta_subst = term option
 and subst = string * term
 and case_pattern = string * capture_variable list
 
-and box_kind = H | V
+and box_kind = H | V | HV | HOV
+and box_spec = box_kind * bool * bool (* kind, spacing, indent *)
 
 and layout_pattern =
   | Sub of term * term
@@ -96,18 +106,20 @@ and layout_pattern =
   | Sqrt of term
   | Root of term * term (* argument, index *)
   | Break
-  | Box of box_kind * term list
+  | Box of box_spec * 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 *)
@@ -122,27 +134,18 @@ and pattern_variable =
   | FreshVar of string
 
 type argument_pattern =
-  | IdentArg of string
-  | EtaArg of string option * argument_pattern  (* eta abstraction *)
+  | IdentArg of int * string (* eta-depth, name *)
 
 type cic_appl_pattern =
-  | UriPattern of string
-  | ArgPattern of argument_pattern
+  | UriPattern of UriManager.uri
+  | VarPattern of string
   | ApplPattern of cic_appl_pattern list
 
-type value =
-  | TermValue of term
-  | StringValue of string
-  | NumValue of string
-  | OptValue of value option
-  | ListValue of value list
-
-type value_type =
-  | TermType
-  | StringType
-  | NumType
-  | OptType of value_type
-  | ListType of value_type
-
-type declaration = string * value_type
+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
+  | Dump  (* dump grammar *)