X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fcomponents%2Fcontent%2FnotationPt.ml;h=cead5e7ae8eda28cc6ec9d5fc8262b522ae6f3b6;hb=a5709dff43233c041f77a4ee4b7f2df1a3c51ab6;hp=731a2ba7436f70b6c21f7b05ab0e0274118f9071;hpb=8a660ee06d72cfee52c707bb1d8d8be3bab0d682;p=helm.git diff --git a/matita/components/content/notationPt.ml b/matita/components/content/notationPt.ml index 731a2ba74..cead5e7ae 100644 --- a/matita/components/content/notationPt.ml +++ b/matita/components/content/notationPt.ml @@ -29,8 +29,7 @@ type binder_kind = [ `Lambda | `Pi | `Exists | `Forall ] type induction_kind = [ `Inductive | `CoInductive ] -type sort_kind = [ `Prop | `Set | `Type of CicUniv.universe | `CProp of -CicUniv.universe | `NType of string |`NCProp of string] +type sort_kind = [ `Prop | `Set | `NType of string |`NCProp of string] type fold_kind = [ `Left | `Right ] type location = Stdpp.location @@ -38,7 +37,7 @@ let fail floc msg = let (x, y) = HExtlib.loc_of_floc floc in failwith (Printf.sprintf "Error at characters %d - %d: %s" x y msg) -type href = UriManager.uri +type href = NReference.reference type child_pos = [ `Left | `Right | `Inner ] @@ -166,7 +165,6 @@ type argument_pattern = | IdentArg of int * string (* eta-depth, name *) type cic_appl_pattern = - | UriPattern of UriManager.uri | NRefPattern of NReference.reference | VarPattern of string | ImplicitPattern @@ -179,7 +177,7 @@ type 'term inductive_type = string * bool * 'term * (string * 'term) list type 'term obj = | Inductive of 'term capture_variable list * 'term inductive_type list (** parameters, list of loc * mutual inductive types *) - | Theorem of Cic.object_flavour * string * 'term * 'term option * NCic.def_pragma + | Theorem of NCic.def_flavour * string * 'term * 'term option * NCic.def_pragma (** flavour, name, type, body * - name is absent when an unnamed theorem is being proved, tipically in * interactive usage