max/lean4-htt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix(frontends/lean/parser): do not clear local universes when switching to tactic mode and/or quoting

Browse source
This commit is contained in:
Leonardo de Moura 2016-12-19 09:21:54 -08:00
parent b65c774f5b
commit ffc9c75824
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/frontends/lean/parser.cpp
View file

@ -114,7 +114,7 @@ parser::quote_scope::quote_scope(parser & p, bool q):
m_p.m_in_quote = true;
m_p.push_local_scope(false);
m_p.m_quote_stack = cons(m_p.mk_parser_scope(), m_p.m_quote_stack);
m_p.clear_locals();
m_p.clear_expr_locals();
} else {
lean_assert(m_p.m_in_quote);
lean_assert(m_p.m_quote_stack);
@ -535,8 +535,7 @@ void parser::pop_local_scope() {
m_parser_scope_stack = tail(m_parser_scope_stack);
}
void parser::clear_locals() {
m_local_level_decls = local_level_decls();
void parser::clear_expr_locals() {
m_local_decls = local_expr_decls();
}

2
src/frontends/lean/parser.h
View file

@ -433,7 +433,7 @@ public:
bool in_quote() const { return m_in_quote; }
void clear_locals();
void clear_expr_locals();
bool has_locals() const { return !m_local_decls.empty() || !m_local_level_decls.empty(); }
void add_local_level(name const & n, level const & l, bool is_variable = false);
void add_local_expr(name const & n, expr const & p, bool is_variable = false);

4
src/frontends/lean/tactic_notation.cpp
View file

@ -344,14 +344,14 @@ expr parse_begin_end_core(parser & p, pos_info const & start_pos,
expr parse_begin_end(parser & p, unsigned, expr const *, pos_info const & pos) {
parser::local_scope _(p);
p.clear_locals();
p.clear_expr_locals();
return parse_begin_end_core(p, pos, get_end_tk());
}
expr parse_by(parser & p, unsigned, expr const *, pos_info const & pos) {
p.next();
parser::local_scope _(p);
p.clear_locals();
p.clear_expr_locals();
auto tac_pos = p.pos();
expr tac = parse_tactic(p);
expr type = mk_tactic_unit();