michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(frontends/lean/parse_rewrite_tactic): improve esimp tactic

Browse source
This commit is contained in:
Leonardo de Moura 2015-02-13 12:22:17 -08:00
parent 98960cbeda
commit db71a29c81
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/frontends/lean/parse_rewrite_tactic.cpp
View file

@ -32,9 +32,7 @@ static expr parse_rule(parser & p) {
} }
} }
static expr parse_rewrite_unfold(parser & p) { static expr parse_rewrite_unfold_core(parser & p) {
lean_assert(p.curr_is_token(get_up_tk()) || p.curr_is_token(get_caret_tk()));
p.next();
buffer<name> to_unfold; buffer<name> to_unfold;
if (p.curr_is_token(get_lcurly_tk())) { if (p.curr_is_token(get_lcurly_tk())) {
p.next(); p.next();
@ -52,6 +50,12 @@ static expr parse_rewrite_unfold(parser & p) {
return mk_rewrite_unfold(to_list(to_unfold), loc); return mk_rewrite_unfold(to_list(to_unfold), loc);
} }
static expr parse_rewrite_unfold(parser & p) {
lean_assert(p.curr_is_token(get_up_tk()) || p.curr_is_token(get_caret_tk()));
p.next();
return parse_rewrite_unfold_core(p);
}
expr parse_rewrite_element(parser & p) { expr parse_rewrite_element(parser & p) {
if (p.curr_is_token(get_up_tk()) || p.curr_is_token(get_caret_tk())) if (p.curr_is_token(get_up_tk()) || p.curr_is_token(get_caret_tk()))
return parse_rewrite_unfold(p); return parse_rewrite_unfold(p);
@ -138,6 +142,8 @@ expr parse_esimp_tactic(parser & p) {
buffer<expr> elems; buffer<expr> elems;
if (p.curr_is_token(get_up_tk()) || p.curr_is_token(get_caret_tk())) { if (p.curr_is_token(get_up_tk()) || p.curr_is_token(get_caret_tk())) {
elems.push_back(parse_rewrite_unfold(p)); elems.push_back(parse_rewrite_unfold(p));
} else if (p.curr_is_token(get_lcurly_tk())) {
elems.push_back(parse_rewrite_unfold_core(p));
} else { } else {
location loc = parse_tactic_location(p); location loc = parse_tactic_location(p);
elems.push_back(mk_rewrite_reduce(loc)); elems.push_back(mk_rewrite_reduce(loc));