X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteParser.ml;h=8a418200d94604127cd7aad3a000aafdca921417;hb=d43b4cfa41256e90fceb0129b7eadb38207190c3;hp=c9ece6dba31b1aa1b2260aae49d7f6aa8f67869f;hpb=b91d9e60b0a5f450d2725d4b9bb3ed7f81ef6d3a;p=helm.git diff --git a/helm/software/components/grafite_parser/grafiteParser.ml b/helm/software/components/grafite_parser/grafiteParser.ml index c9ece6dba..8a418200d 100644 --- a/helm/software/components/grafite_parser/grafiteParser.ml +++ b/helm/software/components/grafite_parser/grafiteParser.ml @@ -660,6 +660,7 @@ EXTEND nmacro: [ [ [ IDENT "ncheck" ]; t = term -> G.NCheck (loc,t) + | [ IDENT "screenshot"]; fname = QSTRING -> G.Screenshot (loc, fname) ] ]; @@ -802,6 +803,8 @@ EXTEND G.NObj (loc, N.Theorem (nflavour, name, N.Implicit `JustOne, Some body)) | IDENT "naxiom"; name = IDENT; SYMBOL ":"; typ = term -> G.NObj (loc, N.Theorem (`Axiom, name, typ, None)) + | IDENT "ninverter"; name = IDENT; IDENT "for" ; indty = term -> + G.NInverter (loc,name,indty) | NLETCOREC ; defs = let_defs -> nmk_rec_corec `CoInductive defs loc | NLETREC ; defs = let_defs -> @@ -817,26 +820,15 @@ EXTEND in G.NObj (loc, N.Inductive (params, ind_types)) | IDENT "universe"; IDENT "constraint"; u1 = tactic_term; - strict = [ SYMBOL <:unicode> -> true - | SYMBOL <:unicode> -> false ]; - u2 = tactic_term -> - let u1 = - match u1 with + SYMBOL <:unicode> ; u2 = tactic_term -> + let urify = function | CicNotationPt.AttributedTerm (_, CicNotationPt.Sort (`NType i)) -> NUri.uri_of_string ("cic:/matita/pts/Type"^i^".univ") - | CicNotationPt.AttributedTerm (_, CicNotationPt.Sort (`NCProp i)) -> - NUri.uri_of_string ("cic:/matita/pts/CProp"^i^".univ") - | _ -> raise (Failure "only a sort can be constrained") + | _ -> raise (Failure "only a Type[…] sort can be constrained") in - let u2 = - match u2 with - | CicNotationPt.AttributedTerm (_, CicNotationPt.Sort (`NType i)) -> - NUri.uri_of_string ("cic:/matita/pts/Type"^i^".univ") - | CicNotationPt.AttributedTerm (_, CicNotationPt.Sort (`NCProp i)) -> - NUri.uri_of_string ("cic:/matita/pts/CProp"^i^".univ") - | _ -> raise (Failure "only a sort can be constrained") - in - G.NUnivConstraint (loc, strict,u1,u2) + let u1 = urify u1 in + let u2 = urify u2 in + G.NUnivConstraint (loc,u1,u2) | IDENT "unification"; IDENT "hint"; n = int; t = tactic_term -> G.UnificationHint (loc, t, n) | IDENT "ncoercion"; name = IDENT; SYMBOL ":"; ty = term;