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
| _ -> 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 attrs = `Provided, `Definition, `Regular in
+ (loc, N.Theorem(name, ty, Some (N.LetRec (ind_kind, defs, body)), attrs))
-let nmk_rec_corec ind_kind defs loc =
+let nmk_rec_corec ind_kind defs loc index =
let loc,t = mk_rec_corec ind_kind defs loc in
- G.NObj (loc,t)
+ G.NObj (loc,t,index)
(*
let nnon_punct_of_punct = function
(* 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
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 "-"; id = IDENT ->
G.NTactic(loc,[G.NClear (loc, [id])])
| IDENT "paramod"
| IDENT "width"
| IDENT "size"
+ | IDENT "nohyps"
]
];
auto_params: [
loc,path,G.WithoutPreferences
]];
+ index: [[ b = OPT SYMBOL "-" -> match b with None -> true | _ -> false ]];
+
grafite_ncommand: [ [
- IDENT "qed" ; b = OPT SYMBOL "-" ->
- let b = match b with None -> true | Some _ -> false in
- G.NQed (loc,b)
+ IDENT "qed" ; i = index -> G.NQed (loc,i)
| nflavour = ntheorem_flavour; name = IDENT; SYMBOL ":"; typ = term;
body = OPT [ SYMBOL <:unicode<def>> (* ≝ *); body = term -> body ] ->
- G.NObj (loc, N.Theorem (nflavour, name, typ, body,`Regular))
+ let attrs = `Provided, nflavour, `Regular in
+ G.NObj (loc, N.Theorem (name, typ, body, attrs),true)
| nflavour = ntheorem_flavour; name = IDENT; SYMBOL <:unicode<def>> (* ≝ *);
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))
+ let attrs = `Provided, nflavour, `Regular in
+ G.NObj (loc,
+ N.Theorem(name, N.Implicit `JustOne, Some body, attrs),
+ true)
+ | IDENT "axiom"; i = index; name = IDENT; SYMBOL ":"; typ = term ->
+ let attrs = `Provided, `Axiom, `Regular in
+ G.NObj (loc, N.Theorem (name, typ, None, attrs),i)
| 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
+ | LETCOREC ; defs = let_codefs ->
+ nmk_rec_corec `CoInductive defs loc true
| LETREC ; defs = let_defs ->
- nmk_rec_corec `Inductive defs loc
+ nmk_rec_corec `Inductive defs loc true
| IDENT "inductive"; spec = inductive_spec ->
let (params, ind_types) = spec in
- G.NObj (loc, N.Inductive (params, ind_types))
+ G.NObj (loc, N.Inductive (params, ind_types),true)
| 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))
+ G.NObj (loc, N.Inductive (params, ind_types),true)
| IDENT "universe"; IDENT "constraint"; u1 = tactic_term;
SYMBOL <:unicode<lt>> ; u2 = tactic_term ->
let urify = function
let compose = compose = None in
G.NCoercion(loc,name,compose,spec)
| IDENT "record" ; (params,name,ty,fields) = record_spec ->
- G.NObj (loc, N.Record (params,name,ty,fields))
+ G.NObj (loc, N.Record (params,name,ty,fields),true)
| 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,