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

fix(frontends/lean/elaborator): nested parser should reset imports

Browse source
This commit is contained in:
Sebastian Ullrich 2018-08-22 11:02:31 -07:00
parent 287fdce45b
commit 14a5246695
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/frontends/lean/elaborator.cpp
View file

@ -3337,7 +3337,6 @@ expr elaborator::visit_node_macro(expr const & e) {
name full_macro = const_name(macro_e);
sstream struc, stx_pat, binds, mk_args, view_pat, reviews;
unsigned i = 0;
struc << "prelude\n";
if (macro.is_atomic())
struc << "def «" << macro.to_string() << "»";
else
@ -3398,7 +3397,7 @@ expr elaborator::visit_node_macro(expr const & e) {
<< "review := fun ⟨" << view_pat.str() << "⟩, syntax.node (syntax_node.mk `" << macro.to_string() << " [" << reviews.str() << "]) }";
std::istringstream in(struc.str());
parser p(m_env, get_global_ios(), nullptr, in, "foo");
p.parse_command_like();
p.set_imports_parsed();
p.parse_command_like();
p.parse_command_like();
p.parse_command_like();
@ -3413,7 +3412,6 @@ expr elaborator::visit_node_choice_macro(expr const & e) {
expr args = mdata_expr(e);
sstream struc, view_cases, review_cases;
unsigned i = 0;
struc << "prelude\n";
if (macro.is_atomic())
struc << "def «" << macro.to_string() << "»";
else
@ -3454,7 +3452,7 @@ expr elaborator::visit_node_choice_macro(expr const & e) {
<< "]) }";
std::istringstream in(struc.str());
parser p(m_env, get_global_ios(), nullptr, in, "foo");
p.parse_command_like();
p.set_imports_parsed();
p.parse_command_like();
p.parse_command_like();
p.parse_command_like();

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

@ -236,6 +236,7 @@ public:
position. */
void check_break_before(break_at_pos_exception::token_context ctxt = break_at_pos_exception::token_context::none);
void set_imports_parsed() { m_imports_parsed = true; }
bool ignore_noncomputable() const { return m_ignore_noncomputable; }
void set_ignore_noncomputable() { m_ignore_noncomputable = true; }