X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteParser.ml;h=93cff174c4fb26e1c99334a761aef12e1b7aba14;hb=0e1bf8990c7c3100f5c5ca50c99ead4f3858e76f;hp=742e538febd09a0f50b3780a319ac3d67a08c81d;hpb=a9c8d96d47a5895c99bca2fe93decf464bca62c3;p=helm.git diff --git a/helm/software/components/grafite_parser/grafiteParser.ml b/helm/software/components/grafite_parser/grafiteParser.ml index 742e538fe..93cff174c 100644 --- a/helm/software/components/grafite_parser/grafiteParser.ml +++ b/helm/software/components/grafite_parser/grafiteParser.ml @@ -76,15 +76,14 @@ let mk_rec_corec ng ind_kind defs loc = `MutualDefinition to rememer this. *) let name,ty = match defs with - | (params,(N.Ident (name, None), Some ty),_,_) :: _ -> + | (params,(N.Ident (name, None), ty),_,_) :: _ -> + let ty = match ty with Some ty -> ty | None -> N.Implicit in let ty = List.fold_right (fun var ty -> N.Binder (`Pi,var,ty) ) params ty in name,ty - | (_,(N.Ident (name, None), None),_,_) :: _ -> - name, N.Implicit | _ -> assert false in let body = N.Ident (name,None) in @@ -118,8 +117,8 @@ EXTEND constructor: [ [ name = IDENT; SYMBOL ":"; typ = term -> (name, typ) ] ]; tactic_term: [ [ t = term LEVEL "90" -> t ] ]; new_name: [ - [ id = IDENT -> Some id - | SYMBOL "_" -> None ] + [ SYMBOL "_" -> None + | id = IDENT -> Some id ] ]; ident_list0: [ [ LPAREN; idents = LIST0 new_name; RPAREN -> idents ] ]; tactic_term_list1: [ @@ -220,6 +219,7 @@ EXTEND SYMBOL <:unicode>; concl = tactic_term -> (List.rev hyps,concl) ] -> G.NAssert (loc, seqs) + | IDENT "nauto"; params = auto_params -> G.NAuto (loc, params) | IDENT "ncases"; what = tactic_term ; where = pattern_spec -> G.NCases (loc, what, where) | IDENT "nchange"; what = pattern_spec; "with"; with_what = tactic_term -> @@ -465,6 +465,9 @@ EXTEND | IDENT "nodefaults" -> G.IPNoDefaults | IDENT "depth"; SYMBOL "="; depth = int -> G.IPDepth depth | IDENT "level"; SYMBOL "="; level = int -> G.IPLevel level + | IDENT "comments" -> G.IPComments + | IDENT "coercions" -> G.IPCoercions + | IDENT "debug"; SYMBOL "="; debug = int -> G.IPDebug debug ] -> params ] ]; @@ -664,7 +667,7 @@ EXTEND in L.Number_alias (instance, dsc) ] - ]; + ]; argument: [ [ l = LIST0 [ SYMBOL <:unicode> (* η *); SYMBOL "." -> () ]; id = IDENT -> @@ -709,8 +712,9 @@ EXTEND ]; level3_term: [ [ u = URI -> N.UriPattern (UriManager.uri_of_string u) + | r = NREF -> N.NRefPattern (NReference.reference_of_string r) + | IMPLICIT -> N.ImplicitPattern | id = IDENT -> N.VarPattern id - | SYMBOL "_" -> N.ImplicitPattern | LPAREN; terms = LIST1 SELF; RPAREN -> (match terms with | [] -> assert false @@ -726,9 +730,11 @@ EXTEND include_command: [ [ IDENT "include" ; path = QSTRING -> - loc,path,L.WithPreferences + loc,path,true,L.WithPreferences + | IDENT "include" ; IDENT "source" ; path = QSTRING -> + loc,path,false,L.WithPreferences | IDENT "include'" ; path = QSTRING -> - loc,path,L.WithoutPreferences + loc,path,true,L.WithoutPreferences ]]; grafite_command: [ [ @@ -746,6 +752,9 @@ EXTEND | nflavour = ntheorem_flavour; name = IDENT; SYMBOL ":"; typ = term; body = OPT [ SYMBOL <:unicode> (* ≝ *); body = term -> body ] -> G.NObj (loc, N.Theorem (nflavour, name, typ, body)) + | nflavour = ntheorem_flavour; name = IDENT; SYMBOL <:unicode> (* ≝ *); + body = term -> + G.NObj (loc, N.Theorem (nflavour, name, N.Implicit, Some body)) | flavour = theorem_flavour; name = IDENT; SYMBOL ":"; typ = term; body = OPT [ SYMBOL <:unicode> (* ≝ *); body = term -> body ] -> G.Obj (loc, N.Theorem (flavour, name, typ, body)) @@ -785,6 +794,27 @@ EXTEND ind_types 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 + | 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 + 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) | IDENT "coercion" ; t = [ u = URI -> N.Uri (u,None) | t = tactic_term ; OPT "with" -> t ] ; arity = OPT int ; saturations = OPT int; @@ -864,22 +894,22 @@ EXTEND let stm = G.Comment (loc, com) in !grafite_callback status stm; status, LSome stm - | (iloc,fname,mode) = include_command ; SYMBOL "." -> + | (iloc,fname,normal,mode) = include_command ; SYMBOL "." -> fun ?(never_include=false) ~include_paths status -> let stm = - G.Executable (loc, G.Command (loc, G.Include (iloc, fname))) + G.Executable (loc, G.Command (loc, G.Include (iloc, normal, fname))) in !grafite_callback status stm; let _root, buri, fullpath, _rrelpath = Librarian.baseuri_of_script ~include_paths fname in - let stm = - G.Executable (loc, G.Command (loc, G.Include (iloc, buri))) - in let status = if never_include then raise (NoInclusionPerformed fullpath) else LE.eval_command status (L.Include (iloc,buri,mode,fullpath)) in + let stm = + G.Executable (loc, G.Command (loc, G.Include (iloc, normal, buri))) + in status, LSome stm | scom = lexicon_command ; SYMBOL "." -> fun ?(never_include=false) ~include_paths status ->