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
| IDENT "paramod"
| IDENT "width"
| IDENT "size"
+ | IDENT "nohyps"
]
];
auto_params: [
loc,path,G.WithoutPreferences
]];
- index: [[ b = OPT SYMBOL "-" -> match b with None -> false | _ -> true ]];
+ index: [[ b = OPT SYMBOL "-" -> match b with None -> true | _ -> false ]];
grafite_ncommand: [ [
IDENT "qed" ; i = index -> G.NQed (loc,i)
G.NObj (loc,
N.Theorem(nflavour, name, N.Implicit `JustOne, Some body,`Regular),
true)
- | i = index; IDENT "axiom"; name = IDENT; SYMBOL ":"; typ = term ->
+ | IDENT "axiom"; i = index; name = IDENT; SYMBOL ":"; typ = term ->
G.NObj (loc, N.Theorem (`Axiom, name, typ, None, `Regular),i)
| IDENT "discriminator" ; indty = tactic_term -> G.NDiscriminator (loc,indty)
| IDENT "inverter"; name = IDENT; IDENT "for" ; indty = tactic_term ;