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
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 "/" ;
+ (univ,params) = auto_params ->
+ let depth = match num with Some n -> n | None -> "1" in
+ G.NAuto (loc, (univ,["slir","";"depth",depth]@params))
| IDENT "ncases"; what = tactic_term ; where = pattern_spec ->
G.NCases (loc, what, where)
| IDENT "nchange"; what = pattern_spec; "with"; with_what = 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 "ninversion"; what = tactic_term ; where = pattern_spec ->
+ G.NInversion (loc, what, where)
| IDENT "nlapply"; t = tactic_term -> G.NLApply (loc, t)
| IDENT "nletin"; name = IDENT ; SYMBOL <:unicode<def>> ; t = tactic_term;
where = pattern_spec ->
| "let" ; id1 = IDENT ; SYMBOL ":" ; t1 = tactic_term ;
IDENT "such" ; IDENT "that" ; t2=tactic_term ; LPAREN ;
id2 = IDENT ; RPAREN ->
- G.ExistsElim (loc, `Auto ([],[]), id1, t1, id2, t2)
+ G.ExistsElim (loc, `Auto (None,[]), id1, t1, id2, t2)
| just =
[ IDENT "using"; t=tactic_term -> `Term t
| params = auto_params -> `Auto params] ;
];
auto_fixed_param: [
[ IDENT "paramodulation"
+ | IDENT "demod"
+ | IDENT "fast_paramod"
+ | IDENT "paramod"
+ | IDENT "slir"
| IDENT "depth"
| IDENT "width"
| IDENT "size"
]
];
auto_params: [
- [ params =
+ [ params =
LIST0 [
i = auto_fixed_param -> i,""
| i = auto_fixed_param ; SYMBOL "="; v = [ v = int ->
string_of_int v | v = IDENT -> v ] -> i,v ];
- tl = OPT [ IDENT "by"; tl = tactic_term_list1 -> tl] ->
- (match tl with Some l -> l | None -> []),
+ tl = OPT [ IDENT "by"; tl = tactic_term_list1 -> tl] -> tl,
+ (* (match tl with Some l -> l | None -> []), *)
params
]
];
| 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
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, `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 ] ->