X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteParser.ml;h=68299b8ea72f26042223058893dbdfacc3c3f421;hb=0920a5755553774f5b41d7603318ea997ecbdca5;hp=ea74231adb46762d2a5c41e7af435b0855a38e62;hpb=df1201e37d6f2631dc31ffc87b979a6c81180a3a;p=helm.git diff --git a/helm/software/components/grafite_parser/grafiteParser.ml b/helm/software/components/grafite_parser/grafiteParser.ml index ea74231ad..68299b8ea 100644 --- a/helm/software/components/grafite_parser/grafiteParser.ml +++ b/helm/software/components/grafite_parser/grafiteParser.ml @@ -51,11 +51,11 @@ type 'status parser_status = { statement : #LE.status as 'status statement Grammar.Entry.e; } -let grafite_callback = ref (fun _ _ -> ()) -let set_grafite_callback cb = grafite_callback := Obj.magic cb +let grafite_callback = ref (fun _ -> ()) +let set_grafite_callback cb = grafite_callback := cb -let lexicon_callback = ref (fun _ _ -> ()) -let set_lexicon_callback cb = lexicon_callback := Obj.magic cb +let lexicon_callback = ref (fun _ -> ()) +let set_lexicon_callback cb = lexicon_callback := cb let initial_parser () = let grammar = CicNotationParser.level2_ast_grammar () in @@ -79,7 +79,7 @@ let mk_rec_corec ind_kind defs loc = let name,ty = match defs with | (params,(N.Ident (name, None), ty),_,_) :: _ -> - let ty = match ty with Some ty -> ty | None -> N.Implicit in + let ty = match ty with Some ty -> ty | None -> N.Implicit `JustOne in let ty = List.fold_right (fun var ty -> N.Binder (`Pi,var,ty) @@ -95,7 +95,7 @@ let mk_rec_corec ind_kind defs loc = else `MutualDefinition in - (loc, N.Theorem(flavour, name, ty, Some (N.LetRec (ind_kind, defs, body)))) + (loc, N.Theorem(flavour, name, ty, Some (N.LetRec (ind_kind, defs, body)), `Regular)) let nmk_rec_corec ind_kind defs loc = let loc,t = mk_rec_corec ind_kind defs loc in @@ -209,11 +209,11 @@ EXTEND let deannotate = function | N.AttributedTerm (_,t) | t -> t in match deannotate params with - | N.Implicit -> [false] + | N.Implicit _ -> [false] | N.UserInput -> [true] | N.Appl l -> List.map (fun x -> match deannotate x with - | N.Implicit -> false + | N.Implicit _ -> false | N.UserInput -> true | _ -> raise (Invalid_argument "malformed target parameter list 1")) l | _ -> raise (Invalid_argument ("malformed target parameter list 2\n" ^ CicNotationPp.pp_term params)) ] @@ -238,6 +238,7 @@ EXTEND using: [ [ using = OPT [ IDENT "using"; t = tactic_term -> t ] -> using ] ]; ntactic: [ [ IDENT "napply"; t = tactic_term -> G.NApply (loc, t) + | IDENT "napplyS"; t = tactic_term -> G.NSmartApply (loc, t) | IDENT "nassert"; seqs = LIST0 [ hyps = LIST0 @@ -249,21 +250,36 @@ EXTEND concl = tactic_term -> (List.rev hyps,concl) ] -> G.NAssert (loc, seqs) | IDENT "nauto"; params = auto_params -> G.NAuto (loc, params) + | SYMBOL "/"; num = OPT NUMBER ; SYMBOL "/" -> + let depth = match num with Some n -> n | None -> "1" in + G.NAuto (loc, ([],["slir","";"depth",depth])) | IDENT "ncases"; what = tactic_term ; where = pattern_spec -> G.NCases (loc, what, where) | IDENT "nchange"; what = pattern_spec; "with"; with_what = tactic_term -> G.NChange (loc, what, with_what) + | SYMBOL "@"; num = OPT NUMBER; l = LIST0 tactic_term -> + G.NConstructor (loc, + (match num with None -> None | Some x -> Some (int_of_string x)),l) + | IDENT "ncut"; t = tactic_term -> G.NCut (loc, t) +(* | IDENT "ndiscriminate"; t = tactic_term -> G.NDiscriminate (loc, t) + | IDENT "nsubst"; t = tactic_term -> G.NSubst (loc, t) *) + | IDENT "ndestruct" -> G.NDestruct loc | IDENT "nelim"; what = tactic_term ; where = pattern_spec -> G.NElim (loc, what, where) | IDENT "ngeneralize"; p=pattern_spec -> G.NGeneralize (loc, p) + | IDENT "nlapply"; t = tactic_term -> G.NLApply (loc, t) | IDENT "nletin"; name = IDENT ; SYMBOL <:unicode> ; t = tactic_term; where = pattern_spec -> G.NLetIn (loc,where,t,name) | kind = nreduction_kind; p = pattern_spec -> G.NReduce (loc, kind, p) - | IDENT "nrewrite"; dir = direction; what = tactic_term ; where = pattern_spec -> + | IDENT "nrewrite"; dir = direction; what = tactic_term ; where = pattern_spec -> G.NRewrite (loc, dir, what, where) + | IDENT "ntry"; tac = SELF -> G.NTry (loc,tac) + | IDENT "nrepeat"; tac = SELF -> G.NRepeat (loc,tac) + | LPAREN; l = LIST1 SELF; RPAREN -> G.NBlock (loc,l) + | IDENT "nassumption" -> G.NAssumption loc | SYMBOL "#"; n=IDENT -> G.NIntro (loc,n) | SYMBOL "#"; SYMBOL "_" -> G.NIntro (loc,"_") | SYMBOL "*" -> G.NCase1 (loc,"_") @@ -466,6 +482,8 @@ EXTEND ]; auto_fixed_param: [ [ IDENT "paramodulation" + | IDENT "fast_paramod" + | IDENT "slir" | IDENT "depth" | IDENT "width" | IDENT "size" @@ -557,6 +575,7 @@ EXTEND | SYMBOL "|" -> G.NShift loc | i = LIST1 int SEP SYMBOL ","; SYMBOL ":" -> G.NPos (loc, i) | SYMBOL "*"; SYMBOL ":" -> G.NWildcard loc + | name = IDENT; SYMBOL ":" -> G.NPosbyname (loc, name) | SYMBOL "]" -> G.NMerge loc | SYMBOL ";" -> G.NSemicolon loc | SYMBOL "." -> G.NDot loc @@ -648,6 +667,12 @@ EXTEND in (params,name,typ,fields) ] ]; + + nmacro: [ + [ [ IDENT "ncheck" ]; t = term -> G.NCheck (loc,t) + | [ IDENT "screenshot"]; fname = QSTRING -> G.Screenshot (loc, fname) + ] + ]; macro: [ [ [ IDENT "check" ]; t = term -> @@ -782,12 +807,17 @@ EXTEND IDENT "nqed" -> G.NQed loc | nflavour = ntheorem_flavour; name = IDENT; SYMBOL ":"; typ = term; body = OPT [ SYMBOL <:unicode> (* ≝ *); body = term -> body ] -> - G.NObj (loc, N.Theorem (nflavour, name, typ, body)) + G.NObj (loc, N.Theorem (nflavour, name, typ, body,`Regular)) | nflavour = ntheorem_flavour; name = IDENT; SYMBOL <:unicode> (* ≝ *); body = term -> - G.NObj (loc, N.Theorem (nflavour, name, N.Implicit, Some body)) + G.NObj (loc, N.Theorem (nflavour, name, N.Implicit `JustOne, Some body,`Regular)) | IDENT "naxiom"; name = IDENT; SYMBOL ":"; typ = term -> - G.NObj (loc, N.Theorem (`Axiom, name, typ, None)) + G.NObj (loc, N.Theorem (`Axiom, name, typ, None, `Regular)) + | IDENT "ndiscriminator" ; indty = tactic_term -> G.NDiscriminator (loc,indty) + | IDENT "ninverter"; name = IDENT; IDENT "for" ; indty = tactic_term ; + paramspec = OPT inverter_param_list ; + outsort = OPT [ SYMBOL ":" ; outsort = term -> outsort ] -> + G.NInverter (loc,name,indty,paramspec,outsort) | NLETCOREC ; defs = let_defs -> nmk_rec_corec `CoInductive defs loc | NLETREC ; defs = let_defs -> @@ -803,30 +833,28 @@ 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 - | 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 + 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 - 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; + SYMBOL <:unicode>; t = term; "on"; + id = [ IDENT | PIDENT ]; SYMBOL ":"; source = term; + "to"; target = term -> + G.NCoercion(loc,name,t,ty,(id,source),target) | IDENT "nrecord" ; (params,name,ty,fields) = record_spec -> G.NObj (loc, N.Record (params,name,ty,fields)) + | IDENT "ncopy" ; s = IDENT; IDENT "from"; u = URI; "with"; + m = LIST0 [ u1 = URI; SYMBOL <:unicode>; u2 = URI -> u1,u2 ] -> + G.NCopy (loc,s,NUri.uri_of_string u, + List.map (fun a,b -> NUri.uri_of_string a, NUri.uri_of_string b) m) ]]; grafite_command: [ [ @@ -839,16 +867,16 @@ EXTEND typ = term; SYMBOL <:unicode> ; newname = IDENT -> G.Obj (loc, N.Theorem - (`Variant,name,typ,Some (N.Ident (newname, None)))) + (`Variant,name,typ,Some (N.Ident (newname, None)), `Regular)) | flavour = theorem_flavour; name = IDENT; SYMBOL ":"; typ = term; body = OPT [ SYMBOL <:unicode> (* ≝ *); body = term -> body ] -> - G.Obj (loc, N.Theorem (flavour, name, typ, body)) + G.Obj (loc, N.Theorem (flavour, name, typ, body,`Regular)) | flavour = theorem_flavour; name = IDENT; SYMBOL <:unicode> (* ≝ *); body = term -> G.Obj (loc, - N.Theorem (flavour, name, N.Implicit, Some body)) + N.Theorem (flavour, name, N.Implicit `JustOne, Some body,`Regular)) | IDENT "axiom"; name = IDENT; SYMBOL ":"; typ = term -> - G.Obj (loc, N.Theorem (`Axiom, name, typ, None)) + G.Obj (loc, N.Theorem (`Axiom, name, typ, None, `Regular)) | LETCOREC ; defs = let_defs -> mk_rec_corec `CoInductive defs loc | LETREC ; defs = let_defs -> @@ -925,6 +953,7 @@ EXTEND punct = punctuation_tactical -> G.NTactic (loc, [nnon_punct_of_punct tac; npunct_of_punct punct]) | mac = macro; SYMBOL "." -> G.Macro (loc, mac) + | mac = nmacro; SYMBOL "." -> G.NMacro (loc, mac) ] ]; comment: [ @@ -938,33 +967,35 @@ EXTEND [ ex = executable -> fun ?(never_include=false) ~include_paths status -> let stm = G.Executable (loc, ex) in - Obj.magic !grafite_callback status stm; + !grafite_callback stm; status, LSome stm | com = comment -> fun ?(never_include=false) ~include_paths status -> let stm = G.Comment (loc, com) in - Obj.magic !grafite_callback status stm; + !grafite_callback stm; status, LSome stm | (iloc,fname,normal,mode) = include_command ; SYMBOL "." -> fun ?(never_include=false) ~include_paths status -> + let _root, buri, fullpath, _rrelpath = + Librarian.baseuri_of_script ~include_paths fname in + if never_include then raise (NoInclusionPerformed fullpath) + else + begin let stm = - G.Executable (loc, G.Command (loc, G.Include (iloc, normal, fname))) - in - Obj.magic !grafite_callback status stm; - let _root, buri, fullpath, _rrelpath = - Librarian.baseuri_of_script ~include_paths fname - in + G.Executable + (loc, G.Command (loc, G.Include (iloc,normal,`OldAndNew,fname))) in + !grafite_callback stm; let status = - if never_include then raise (NoInclusionPerformed fullpath) - else LE.eval_command status (L.Include (iloc,buri,mode,fullpath)) - in + LE.eval_command status (L.Include (iloc,buri,mode,fullpath)) in let stm = - G.Executable (loc, G.Command (loc, G.Include (iloc, normal, buri))) + G.Executable + (loc,G.Command (loc,G.Include (iloc,normal,`OldAndNew,buri))) in - status, LSome stm + status, LSome stm + end | scom = lexicon_command ; SYMBOL "." -> fun ?(never_include=false) ~include_paths status -> - !lexicon_callback status scom; + !lexicon_callback scom; let status = LE.eval_command status scom in status, LNone loc | EOI -> raise End_of_file