type 'a localized_option =
LSome of 'a
- | LNone of Token.flocation
+ | LNone of GrafiteAst.loc
-type statement =
- include_paths:string list ->
- LexiconEngine.status ->
- LexiconEngine.status *
+type ast_statement =
(CicNotationPt.term, CicNotationPt.term,
CicNotationPt.term GrafiteAst.reduction, CicNotationPt.obj, string)
- GrafiteAst.statement localized_option
+ GrafiteAst.statement
+
+type statement =
+ include_paths:string list ->
+ LexiconEngine.status ->
+ LexiconEngine.status * ast_statement localized_option
let grammar = CicNotationParser.level2_ast_grammar
| IDENT "normalize" -> `Normalize
| IDENT "reduce" -> `Reduce
| IDENT "simplify" -> `Simpl
- | IDENT "unfold"; t = OPT term -> `Unfold t
+ | IDENT "unfold"; t = OPT tactic_term -> `Unfold t
| IDENT "whd" -> `Whd ]
];
sequent_pattern_spec: [
GrafiteAst.Absurd (loc, t)
| IDENT "apply"; t = tactic_term ->
GrafiteAst.Apply (loc, t)
+ | IDENT "applyS"; t = tactic_term ->
+ GrafiteAst.ApplyS (loc, t)
| IDENT "assumption" ->
GrafiteAst.Assumption loc
| IDENT "auto";
GrafiteAst.Fold (loc, kind, t, p)
| IDENT "fourier" ->
GrafiteAst.Fourier loc
- | IDENT "fwd"; hyp = IDENT; idents = OPT ident_list0 ->
+ | IDENT "fwd"; hyp = IDENT; idents = OPT [ "as"; idents = LIST1 IDENT -> idents ] ->
let idents = match idents with None -> [] | Some idents -> idents in
GrafiteAst.FwdSimpl (loc, hyp, idents)
| IDENT "generalize"; p=pattern_spec; id = OPT ["as" ; id = IDENT -> id] ->
depth = OPT [ IDENT "depth"; SYMBOL "="; i = int -> i ];
what = tactic_term;
to_what = OPT [ "to" ; t = tactic_term_list1 -> t ];
- ident = OPT [ IDENT "using" ; ident = IDENT -> ident ] ->
+ ident = OPT [ "as" ; ident = IDENT -> ident ] ->
let to_what = match to_what with None -> [] | Some to_what -> to_what in
GrafiteAst.LApply (loc, depth, to_what, what, ident)
| IDENT "left" -> GrafiteAst.Left loc
[
[ SYMBOL "[" -> GrafiteAst.Branch loc
| SYMBOL "|" -> GrafiteAst.Shift loc
- | i = int; SYMBOL ":" -> GrafiteAst.Pos (loc, i)
+ | i = LIST1 int SEP SYMBOL ","; SYMBOL ":" -> GrafiteAst.Pos (loc, i)
+ | SYMBOL "*"; SYMBOL ":" -> GrafiteAst.Wildcard loc
| SYMBOL "]" -> GrafiteAst.Merge loc
| SYMBOL ";" -> GrafiteAst.Semicolon loc
| SYMBOL "." -> GrafiteAst.Dot loc
GrafiteAst.WMatch (loc,t)
| [ IDENT "whelp"; IDENT "instance" ] ; t = term ->
GrafiteAst.WInstance (loc,t)
- | [ IDENT "whelp"; IDENT "locate" ] ; id = IDENT ->
+ | [ IDENT "whelp"; IDENT "locate" ] ; id = QSTRING ->
GrafiteAst.WLocate (loc,id)
| [ IDENT "whelp"; IDENT "elim" ] ; t = term ->
GrafiteAst.WElim (loc, t)
];
include_command: [ [
- IDENT "include" ; path = QSTRING -> loc,path
+ IDENT "include" ; path = QSTRING ->
+ loc,path,LexiconAst.WithPreferences
+ | IDENT "include'" ; path = QSTRING ->
+ loc,path,LexiconAst.WithoutPreferences
]];
grafite_command: [ [
body = term ->
GrafiteAst.Obj (loc,
Ast.Theorem (flavour, name, Ast.Implicit, Some body))
+ | IDENT "axiom"; name = IDENT; SYMBOL ":"; typ = term ->
+ GrafiteAst.Obj (loc, Ast.Theorem (`Axiom, name, typ, None))
| "let"; ind_kind = [ "corec" -> `CoInductive | "rec"-> `Inductive ];
defs = CicNotationParser.let_defs ->
let name,ty =
fun ~include_paths status -> status,LSome(GrafiteAst.Executable (loc,ex))
| com = comment ->
fun ~include_paths status -> status,LSome (GrafiteAst.Comment (loc, com))
- | (iloc,fname) = include_command ; SYMBOL "." ->
+ | (iloc,fname,mode) = include_command ; SYMBOL "." ->
fun ~include_paths status ->
let path = DependenciesParser.baseuri_of_script ~include_paths fname in
let status =
- LexiconEngine.eval_command status (LexiconAst.Include (iloc,path))
+ LexiconEngine.eval_command status (LexiconAst.Include (iloc,path,mode))
in
status,
LSome