* http://helm.cs.unibo.it/
*)
-(* $Id$ *)
+(* $Id: grafiteParser.ml 13176 2016-04-18 15:29:33Z fguidi $ *)
module N = NotationPt
module G = GrafiteAst
try
f ()
with
- | Stdpp.Exc_located (_, End_of_file) -> raise End_of_file
- | Stdpp.Exc_located (floc, Stream.Error msg) ->
+ | Ploc.Exc (_, End_of_file) -> raise End_of_file
+ | Ploc.Exc (floc, Stream.Error msg) ->
raise (HExtlib.Localized (floc,CicNotationParser.Parse_error msg))
- | Stdpp.Exc_located (floc, HExtlib.Localized(_,exn)) ->
+ | Ploc.Exc (floc, HExtlib.Localized(_,exn)) ->
raise (HExtlib.Localized
(floc,CicNotationParser.Parse_error (Printexc.to_string exn)))
- | Stdpp.Exc_located (floc, exn) ->
+ | Ploc.Exc (floc, exn) ->
raise (HExtlib.Localized
(floc,CicNotationParser.Parse_error (Printexc.to_string exn)))
let parse_statement grafite_parser parsable =
exc_located_wrapper
- (fun () -> (Grammar.Entry.parse_parsable (Obj.magic grafite_parser) (fst parsable)))
+ (fun () -> (Grammar.Entry.parse_parsable grafite_parser (fst parsable)))
let strm_of_parsable (_,buf) = buf
let default_associativity = Gramext.NonA
-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 `JustOne in
- let ty =
- List.fold_right
- (fun var ty -> N.Binder (`Pi,var,ty)
- ) params ty
- in
- name,ty
- | _ -> assert false
- in
- let body = N.Ident (name,None) in
- (loc, N.Theorem(`Definition, name, ty, Some (N.LetRec (ind_kind, defs, body)), `Regular))
+let mk_rec_corec src flavour ind_kind defs loc =
+ let attrs = src, flavour, `Regular in
+ (loc, N.LetRec (ind_kind, defs, attrs))
+
+let nmk_rec_corec src flavour ind_kind defs loc index =
+ let loc,t = mk_rec_corec src flavour ind_kind defs loc in
+ G.NObj (loc,t,index)
-let nmk_rec_corec ind_kind defs loc =
- let loc,t = mk_rec_corec ind_kind defs loc in
- G.NObj (loc,t)
+let shift_vars binder (vars, ty) bo =
+ let map var bo = N.Binder (binder, (var, ty), bo) in
+ List.fold_right map vars bo
+let shift_params binder params bo =
+ List.fold_right (shift_vars binder) params bo
(*
let nnon_punct_of_punct = function
| G.Skip loc -> G.NSkip loc
type by_continuation =
BYC_done
| BYC_weproved of N.term * string option * N.term option
- | BYC_letsuchthat of string * N.term * string * N.term
+ | BYC_letsuchthat of string * N.term * N.term * string
| BYC_wehaveand of string * N.term * string * N.term
let mk_parser statement lstatus =
(* let grammar = CicNotationParser.level2_ast_grammar lstatus in *)
let term = CicNotationParser.term lstatus in
let let_defs = CicNotationParser.let_defs lstatus in
+ let let_codefs = CicNotationParser.let_codefs lstatus in
let protected_binder_vars = CicNotationParser.protected_binder_vars lstatus in
(* {{{ parser initialization *)
EXTEND
GLOBAL: term statement;
constructor: [ [ name = IDENT; SYMBOL ":"; typ = term -> (name, typ) ] ];
tactic_term: [ [ t = term LEVEL "90" -> t ] ];
-(* MATITA 1.0
- new_name: [
- [ SYMBOL "_" -> None
- | id = IDENT -> Some id ]
- ];
-*)
ident_list1: [ [ LPAREN; idents = LIST1 IDENT; RPAREN -> idents ] ];
- tactic_term_list1: [
- [ tactic_terms = LIST1 tactic_term SEP SYMBOL "," -> tactic_terms ]
- ];
nreduction_kind: [
[ IDENT "normalize" ; delta = OPT [ IDENT "nodelta" -> () ] ->
let delta = match delta with None -> true | _ -> false in
`Normalize delta
- (*| IDENT "unfold"; t = OPT tactic_term -> `Unfold t*)
| IDENT "whd" ; delta = OPT [ IDENT "nodelta" -> () ] ->
let delta = match delta with None -> true | _ -> false in
`Whd delta]
];
pattern_spec: [
[ res = OPT [
- "in";
+ "in" ;
wanted_and_sps =
[ "match" ; wanted = tactic_term ;
sps = OPT [ "in"; sps = sequent_pattern_spec -> sps ] ->
Some wanted,sps
| sps = sequent_pattern_spec ->
None,Some sps
- ] ->
+ ];
+ SYMBOL ";" ->
let wanted,hyp_paths,goal_path =
match wanted_and_sps with
wanted,None -> wanted, [], Some N.UserInput
| SYMBOL "<" -> `RightToLeft ]
];
int: [ [ num = NUMBER -> int_of_string num ] ];
-(* MATITA 1.0
- intros_spec: [
- [ OPT [ IDENT "names" ];
- num = OPT [ num = int -> num ];
- idents = intros_names ->
- num, idents
- ]
- ];
-*)
-(* MATITA 1.0 using: [ [ using = OPT [ IDENT "using"; t = tactic_term -> t ] -> using ] ]; *)
ntactic: [
[ SYMBOL "@"; t = tactic_term -> G.NTactic(loc,[G.NApply (loc, t)])
- | IDENT "apply"; t = tactic_term -> G.NTactic(loc,[G.NApply (loc, t)])
| IDENT "applyS"; t = tactic_term -> G.NTactic(loc,[G.NSmartApply(loc, t)])
| IDENT "assert";
seqs = LIST0 [
SYMBOL <:unicode<vdash>>;
concl = tactic_term -> (List.rev hyps,concl) ] ->
G.NTactic(loc,[G.NAssert (loc, seqs)])
- (*| IDENT "auto"; params = auto_params ->
- G.NTactic(loc,[G.NAuto (loc, params)])*)
| SYMBOL "/"; num = OPT NUMBER ;
just_and_params = auto_params; SYMBOL "/" ->
let just,params = just_and_params in
| Some (`Univ univ) ->
G.NTactic(loc,
[G.NAuto(loc,(Some univ,["depth",depth]@params))])
- | Some `EmptyUniv ->
- G.NTactic(loc,
- [G.NAuto(loc,(Some [],["depth",depth]@params))])
| Some `Trace ->
G.NMacro(loc,
G.NAutoInteractive (loc, (None,["depth",depth]@params))))
- | IDENT "intros" -> G.NMacro (loc, G.NIntroGuess loc)
- | IDENT "check"; t = term -> G.NMacro(loc,G.NCheck (loc,t))
+ | SYMBOL "#"; SYMBOL "#" -> G.NMacro (loc, G.NIntroGuess loc)
+ | IDENT "check"; t = tactic_term -> G.NMacro(loc,G.NCheck (loc,t))
| IDENT "screenshot"; fname = QSTRING ->
G.NMacro(loc,G.Screenshot (loc, fname))
| IDENT "cases"; what = tactic_term ; where = pattern_spec ->
G.NTactic(loc,[G.NCases (loc, what, where)])
- | IDENT "change"; what = pattern_spec; "with"; with_what = tactic_term ->
+ | IDENT "change"; "with"; with_what = tactic_term; what = pattern_spec ->
G.NTactic(loc,[G.NChange (loc, what, with_what)])
- | SYMBOL "-"; ids = LIST1 IDENT ->
- G.NTactic(loc,[G.NClear (loc, ids)])
- | (*SYMBOL "^"*)PLACEHOLDER; num = OPT NUMBER;
+ | SYMBOL "-"; id = IDENT ->
+ G.NTactic(loc,[G.NClear (loc, [id])])
+ | PLACEHOLDER; num = OPT NUMBER;
l = OPT [ SYMBOL "{"; l = LIST1 tactic_term; SYMBOL "}" -> l ] ->
G.NTactic(loc,[G.NConstructor (loc, (match num with None -> None | Some x -> Some (int_of_string x)),match l with None -> [] | Some l -> l)])
| IDENT "cut"; t = tactic_term -> G.NTactic(loc,[G.NCut (loc, t)])
-(* | IDENT "discriminate"; t = tactic_term -> G.NDiscriminate (loc, t)
- | IDENT "subst"; t = tactic_term -> G.NSubst (loc, t) *)
| IDENT "destruct"; just = OPT [ dom = ident_list1 -> dom ];
exclude = OPT [ IDENT "skip"; skip = ident_list1 -> skip ]
-> let exclude' = match exclude with None -> [] | Some l -> l in
G.NTactic(loc,[G.NReduce (loc, kind, p)])
| dir = direction; what = tactic_term ; where = pattern_spec ->
G.NTactic(loc,[G.NRewrite (loc, dir, what, where)])
- | IDENT "rewrite"; dir = direction; what = tactic_term ; where = pattern_spec ->
- G.NTactic(loc,[G.NRewrite (loc, dir, what, where)])
| IDENT "try"; tac = SELF ->
let tac = match tac with G.NTactic(_,[t]) -> t | _ -> assert false in
G.NTactic(loc,[ G.NTry (loc,tac)])
| SYMBOL "#"; ns=IDENT -> G.NTactic(loc,[ G.NIntros (loc,[ns])])
| SYMBOL "#"; SYMBOL "_" -> G.NTactic(loc,[ G.NIntro (loc,"_")])
| SYMBOL "*" -> G.NTactic(loc,[ G.NCase1 (loc,"_")])
- | SYMBOL "*"; n=IDENT -> G.NTactic(loc,[ G.NCase1 (loc,n)])
+ | SYMBOL "*"; "as"; n=IDENT -> G.NTactic(loc,[ G.NCase1 (loc,n)])
+ | IDENT "assume" ; id = IDENT; SYMBOL ":"; t = tactic_term ; t1 = OPT [IDENT "that"; IDENT "is";
+ IDENT "equivalent"; "to"; t' = tactic_term -> t']-> G.NTactic (loc,[G.Assume (loc,id,t,t1)])
+ | IDENT "suppose" ; t = tactic_term ; LPAREN ; id = IDENT ; RPAREN ; t1 = OPT [IDENT "that"; IDENT
+ "is"; IDENT "equivalent"; "to"; t' = tactic_term -> t'] -> G.NTactic (loc,[G.Suppose (loc,t,id,t1)])
+ | just =
+ [ IDENT "using"; t=tactic_term -> `Term t
+ | params = auto_params ->
+ let just,params = params in
+ `Auto
+ (match just with
+ | None -> (None,params)
+ | Some (`Univ univ) -> (Some univ,params)
+ (* `Trace behaves exaclty like None for the moment being *)
+ | Some (`Trace) -> (None,params)
+ )
+ ];
+ cont=by_continuation -> G.NTactic (loc,[
+ (match cont with
+ BYC_done -> G.Bydone (loc, just)
+ | BYC_weproved (ty,id,t1) ->
+ G.By_just_we_proved(loc, just, ty, id, t1)
+ (*
+ | BYC_letsuchthat (id1,t1,t2,id2) ->
+ G.ExistsElim (loc, just, id1, t1, t2, id2)
+ | BYC_wehaveand (id1,t1,id2,t2) ->
+ G.AndElim (loc, just, id1, t1, id2, t2)*))
+ ])
+ | IDENT "we" ; IDENT "need" ; "to" ; IDENT "prove" ; t = tactic_term ; id = OPT [ LPAREN ; id = IDENT ; RPAREN -> id ] ; t1 = OPT [IDENT "or" ; IDENT "equivalently"; t' = tactic_term -> t']->
+ G.NTactic (loc,[G.We_need_to_prove (loc, t, id, t1)])
]
];
auto_fixed_param: [
[ IDENT "demod"
| IDENT "fast_paramod"
| IDENT "paramod"
- | IDENT "depth"
| IDENT "width"
| IDENT "size"
- | IDENT "timeout"
- | IDENT "library"
- | IDENT "type"
- | IDENT "all"
+ | IDENT "nohyps"
+(* | IDENT "timeout" *)
]
];
auto_params: [
| i = auto_fixed_param ; SYMBOL "="; v = [ v = int ->
string_of_int v | v = IDENT -> v ] -> i,v ];
just = OPT [ IDENT "by"; by =
- [ univ = tactic_term_list1 -> `Univ univ
- | SYMBOL "{"; SYMBOL "}" -> `EmptyUniv
+ [ univ = LIST0 tactic_term SEP SYMBOL "," -> `Univ univ
| SYMBOL "_" -> `Trace ] -> by ] -> just,params
]
];
-(* MATITA 1.0
by_continuation: [
[ WEPROVED; ty = tactic_term ; LPAREN ; id = IDENT ; RPAREN ; t1 = OPT [IDENT "that" ; IDENT "is" ; IDENT "equivalent" ; "to" ; t2 = tactic_term -> t2] -> BYC_weproved (ty,Some id,t1)
| WEPROVED; ty = tactic_term ; t1 = OPT [IDENT "that" ; IDENT "is" ; IDENT "equivalent" ; "to" ; t2 = tactic_term -> t2] ;
| "done" -> BYC_done
| "let" ; id1 = IDENT ; SYMBOL ":" ; t1 = tactic_term ;
IDENT "such" ; IDENT "that" ; t2=tactic_term ; LPAREN ;
- id2 = IDENT ; RPAREN -> BYC_letsuchthat (id1,t1,id2,t2)
+ id2 = IDENT ; RPAREN -> BYC_letsuchthat (id1,t1,t2,id2)
| WEHAVE; t1=tactic_term ; LPAREN ; id1=IDENT ; RPAREN ;"and" ; t2=tactic_term ; LPAREN ; id2=IDENT ; RPAREN ->
BYC_wehaveand (id1,t1,id2,t2)
]
];
-*)
-(* MATITA 1.0
+
rewriting_step_continuation : [
[ "done" -> true
| -> false
]
];
-*)
+
(* MATITA 1.0
atomic_tactical:
[ "sequence" LEFTA
loc,path,G.WithoutPreferences
]];
+ index: [[ b = OPT SYMBOL "-" -> match b with None -> true | _ -> false ]];
+
+ source: [[
+ src = OPT [ IDENT "implied" ] ->
+ match src with None -> `Provided | _ -> `Implied
+ ]];
+
grafite_ncommand: [ [
- IDENT "qed" ; b = OPT SYMBOL "-" ->
- let b = match b with None -> true | Some _ -> false in
- if not b then prerr_endline "Should not index";
- G.NQed (loc,b)
- | nflavour = ntheorem_flavour; name = IDENT; SYMBOL ":"; typ = term;
+ lc = lexicon_command -> lc
+ | IDENT "qed" ; i = index -> G.NQed (loc,i)
+ | IDENT "defined" ; i = index -> G.NQed (loc,i) (* FG: presentational qed for definitions *)
+ | src = source; nflavour = ntheorem_flavour; name = IDENT;
+ params = LIST0 protected_binder_vars; SYMBOL ":"; typ = term; (* FG: params added *)
body = OPT [ SYMBOL <:unicode<def>> (* ≝ *); body = term -> body ] ->
- G.NObj (loc, N.Theorem (nflavour, name, typ, body,`Regular))
- | nflavour = ntheorem_flavour; name = IDENT; SYMBOL <:unicode<def>> (* ≝ *);
+ let typ = shift_params `Forall params typ in
+ let body = match body with
+ | Some bo -> Some (shift_params `Lambda params bo)
+ | None -> None
+ in
+ let attrs = src, nflavour, `Regular in
+ G.NObj (loc, N.Theorem (name, typ, body, attrs),true)
+ | src = source; nflavour = ntheorem_flavour; name = IDENT;
+ params = LIST0 protected_binder_vars; SYMBOL <:unicode<def>> (* ≝ *); (* FG: params added *)
body = term ->
- G.NObj (loc, N.Theorem (nflavour, name, N.Implicit `JustOne, Some body,`Regular))
- | IDENT "axiom"; name = IDENT; SYMBOL ":"; typ = term ->
- G.NObj (loc, N.Theorem (`Axiom, name, typ, None, `Regular))
- | IDENT "discriminator" ; indty = tactic_term -> G.NDiscriminator (loc,indty)
- | IDENT "inverter"; 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)
- | LETCOREC ; defs = let_defs ->
- nmk_rec_corec `CoInductive defs loc
- | LETREC ; defs = let_defs ->
- nmk_rec_corec `Inductive defs loc
- | IDENT "inductive"; spec = inductive_spec ->
+ let body = shift_params `Lambda params body in
+ let attrs = src, nflavour, `Regular in
+ G.NObj (loc,
+ N.Theorem(name, N.Implicit `JustOne, Some body, attrs),
+ true)
+ | src = source; IDENT "axiom"; i = index; name = IDENT;
+ params = LIST0 protected_binder_vars; SYMBOL ":"; typ = term -> (* FG: params added *)
+ let typ = shift_params `Forall params typ in
+ let attrs = src, `Axiom, `Regular in
+ G.NObj (loc, N.Theorem (name, typ, None, attrs),i)
+ | src = source; IDENT "inductive"; spec = inductive_spec ->
let (params, ind_types) = spec in
- G.NObj (loc, N.Inductive (params, ind_types))
- | IDENT "coinductive"; spec = inductive_spec ->
+ G.NObj (loc, N.Inductive (params, ind_types, src),true)
+ | src = source; IDENT "coinductive"; spec = inductive_spec ->
let (params, ind_types) = spec in
let ind_types = (* set inductive flags to false (coinductive) *)
List.map (fun (name, _, term, ctors) -> (name, false, term, ctors))
ind_types
in
- G.NObj (loc, N.Inductive (params, ind_types))
- | IDENT "universe"; IDENT "constraint"; u1 = tactic_term;
+ G.NObj (loc, N.Inductive (params, ind_types, src),true)
+ | src = source; IDENT "record" ; (params,name,ty,fields) = record_spec ->
+ G.NObj (loc, N.Record (params,name,ty,fields,src),true)
+(* FG: new syntax for inductive/coinductive definitions and statements *)
+ | src = source; IDENT "rec"; nflavour = ntheorem_flavour; defs = let_defs ->
+ nmk_rec_corec src nflavour `Inductive defs loc true
+ | src = source; IDENT "corec"; nflavour = ntheorem_flavour; defs = let_codefs ->
+ nmk_rec_corec src nflavour `CoInductive defs loc true
+(**)
+ | LETCOREC ; defs = let_codefs ->
+ nmk_rec_corec `Provided `Definition `CoInductive defs loc true
+ | LETREC ; defs = let_defs ->
+ nmk_rec_corec `Provided `Definition `Inductive defs loc true
+ | IDENT "discriminator" ; indty = tactic_term -> G.NDiscriminator (loc,indty)
+ | IDENT "inverter"; 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)
+ | IDENT "universe"; cyclic = OPT [ IDENT "cyclic" -> () ] ; IDENT "constraint"; u1 = tactic_term;
SYMBOL <:unicode<lt>> ; u2 = tactic_term ->
+ let acyclic = match cyclic with None -> true | Some () -> false in
let urify = function
| NotationPt.AttributedTerm (_, NotationPt.Sort (`NType i)) ->
NUri.uri_of_string ("cic:/matita/pts/Type"^i^".univ")
in
let u1 = urify u1 in
let u2 = urify u2 in
- G.NUnivConstraint (loc,u1,u2)
+ G.NUnivConstraint (loc,acyclic,u1,u2)
| IDENT "unification"; IDENT "hint"; n = int; t = tactic_term ->
G.UnificationHint (loc, t, n)
| IDENT "coercion"; name = IDENT;
compose = OPT [ IDENT "nocomposites" -> () ];
- SYMBOL ":"; ty = term;
+ spec = OPT [ SYMBOL ":"; ty = term;
SYMBOL <:unicode<def>>; t = term; "on";
id = [ IDENT | PIDENT ]; SYMBOL ":"; source = term;
- "to"; target = term ->
+ "to"; target = term -> t,ty,(id,source),target ] ->
let compose = compose = None in
- G.NCoercion(loc,name,compose,t,ty,(id,source),target)
- | IDENT "record" ; (params,name,ty,fields) = record_spec ->
- G.NObj (loc, N.Record (params,name,ty,fields))
+ G.NCoercion(loc,name,compose,spec)
| IDENT "copy" ; s = IDENT; IDENT "from"; u = URI; "with";
m = LIST0 [ u1 = URI; SYMBOL <:unicode<mapsto>>; 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)
- | lc = lexicon_command -> lc
]];
lexicon_command: [ [