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

fix(library/export_decl): bug at export_decl_modification::perform

Browse source 
The `perform` method was adding the modification to the environment
where it was being applied.
This commit is contained in:
Leonardo de Moura 2018-05-31 09:16:46 -07:00
parent 80545832f4
commit e80765daca
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/library/export_decl.cpp
View file

@ -64,6 +64,18 @@ static environment update(environment const & env, export_decl_env_ext const & e
return env.update(g_ext->m_ext_id, std::make_shared<export_decl_env_ext>(ext));
}
static environment add_export_decl_core(environment const & env, name const & in_ns, export_decl const & e) {
auto ns_map = get_export_decl_extension(env).m_ns_map;
list<export_decl> decls;
if (ns_map.contains(in_ns))
decls = *ns_map.find(in_ns);
if (std::find(decls.begin(), decls.end(), e) != decls.end())
return env;
return update(env, export_decl_env_ext(insert(ns_map, in_ns, cons(e, decls))));
}
struct export_decl_modification : public modification {
LEAN_MODIFICATION("export_decl")
@ -75,7 +87,7 @@ struct export_decl_modification : public modification {
m_in_ns(in_ns), m_export_decl(e) {}
void perform(environment & env) const override {
env = add_export_decl(env, m_in_ns, m_export_decl);
env = add_export_decl_core(env, m_in_ns, m_export_decl);
}
void serialize(serializer & s) const override {
@ -95,17 +107,10 @@ struct export_decl_modification : public modification {
};
environment add_export_decl(environment const & env, name const & in_ns, export_decl const & e) {
auto ns_map = get_export_decl_extension(env).m_ns_map;
list<export_decl> decls;
if (ns_map.contains(in_ns))
decls = *ns_map.find(in_ns);
if (std::find(decls.begin(), decls.end(), e) != decls.end())
return env;
auto new_env = update(env, export_decl_env_ext(insert(ns_map, in_ns, cons(e, decls))));
environment new_env = add_export_decl_core(env, in_ns, e);
return module::add(new_env, std::make_shared<export_decl_modification>(in_ns, e));
}
environment add_export_decl(environment const & env, export_decl const & entry) {
return add_export_decl(env, get_namespace(env), entry);
}