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

Fix bug in normalizer. We must create a scope whenever we extend the value stack.

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2013-09-16 09:14:18 -07:00
parent 01339a93a3
commit 1be2a30c8c
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/kernel/normalizer.cpp
View file

@ -83,9 +83,17 @@ class normalizer::imp {
*/ */
struct save_context { struct save_context {
imp & m_imp; imp & m_imp;
context m_old_ctx; context m_saved_ctx;
save_context(imp & imp):m_imp(imp), m_old_ctx(m_imp.m_ctx) { m_imp.m_cache.clear(); } cache m_saved_cache;
~save_context() { m_imp.m_ctx = m_old_ctx; } save_context(imp & imp):
m_imp(imp),
m_saved_ctx(m_imp.m_ctx) {
m_imp.m_cache.swap(m_saved_cache);
}
~save_context() {
m_imp.m_ctx = m_saved_ctx;
m_imp.m_cache.swap(m_saved_cache);
}
}; };
svalue lookup(value_stack const & s, unsigned i, unsigned k) { svalue lookup(value_stack const & s, unsigned i, unsigned k) {
@ -114,7 +122,11 @@ class normalizer::imp {
expr reify_closure(expr const & a, value_stack const & s, unsigned k) { expr reify_closure(expr const & a, value_stack const & s, unsigned k) {
lean_assert(is_lambda(a)); lean_assert(is_lambda(a));
expr new_t = reify(normalize(abst_domain(a), s, k), k); expr new_t = reify(normalize(abst_domain(a), s, k), k);
expr new_b = reify(normalize(abst_body(a), extend(s, svalue(k)), k+1), k+1); expr new_b;
{
cache::mk_scope sc(m_cache);
new_b = reify(normalize(abst_body(a), extend(s, svalue(k)), k+1), k+1);
}
return mk_lambda(abst_name(a), new_t, new_b); return mk_lambda(abst_name(a), new_t, new_b);
} }

8
src/util/scoped_map.h
View file

@ -26,7 +26,7 @@ class scoped_map {
typedef typename map::size_type size_type; typedef typename map::size_type size_type;
typedef typename map::value_type value_type; typedef typename map::value_type value_type;
enum class action_kind { Insert, Replace, Erase }; enum class action_kind { Insert, Replace, Erase };
map m_map; map m_map;
std::vector<std::pair<action_kind, value_type>> m_actions; std::vector<std::pair<action_kind, value_type>> m_actions;
std::vector<unsigned> m_scopes; std::vector<unsigned> m_scopes;
public: public:
@ -35,6 +35,12 @@ public:
const KeyEqual& equal = KeyEqual()): const KeyEqual& equal = KeyEqual()):
m_map(bucket_count, hash, equal) {} m_map(bucket_count, hash, equal) {}
void swap(scoped_map & other) {
m_map.swap(other.m_map);
m_actions.swap(other.m_actions);
m_scopes.swap(other.m_scopes);
}
/** \brief Return the number of scopes. */ /** \brief Return the number of scopes. */
unsigned num_scopes() const { unsigned num_scopes() const {
return m_scopes.size(); return m_scopes.size();