X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fcomponents%2Fcontent%2FnotationPt.ml;h=4804208f0657e6a8c54397ac1e7e0591355159da;hb=9a4c611198cd91b51218e0f5348e94f68240210d;hp=686fcd4ef2ffc1fd3e1bd0b2f7f2e820b001fc0c;hpb=a2412e41cda18a25d780ae631ee02d6ae05c52b1;p=helm.git diff --git a/matitaB/components/content/notationPt.ml b/matitaB/components/content/notationPt.ml index 686fcd4ef..4804208f0 100644 --- a/matitaB/components/content/notationPt.ml +++ b/matitaB/components/content/notationPt.ml @@ -51,9 +51,9 @@ type term_attribute = ] type literal = - [ `Symbol of string - | `Keyword of string - | `Number of string + [ `Symbol of string * (string option * string option) + | `Keyword of string * (string option * string option) + | `Number of string * (string option * string option) ] type case_indtype = string * href option @@ -62,7 +62,7 @@ type 'term capture_variable = 'term * 'term option (** To be increased each time the term type below changes, used for "safe" * marshalling *) -let magic = 7 +let magic = 8 type term = (* CIC AST *) @@ -101,8 +101,9 @@ type term = | NCic of NCic.term (* Syntax pattern extensions *) - - | Literal of literal + (* string option = optional name of an Ast.Symbol occurring in the level 2 + * term, which is associated to this literal *) + | Literal of (string option * literal) | Layout of layout_pattern | Magic of magic_term @@ -226,3 +227,11 @@ let binder_prec = 20 let apply_prec = 70 let simple_prec = 90 +(* sequents *) + +type context_entry = + Decl of term + | Def of term * term + +type sequent = int * context * term +and context = (string * context_entry) list