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

refactor(library/reducible): use default_converter in reducible, and converters based on reducible hints

Browse source
This commit is contained in:
Leonardo de Moura 2015-02-07 17:31:53 -08:00
parent 7823905fc1
commit 1640568f6a
2 changed files with 39 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/library/reducible.cpp
View file

@ -8,7 +8,6 @@ Author: Leonardo de Moura
#include "util/sstream.h"
#include "kernel/environment.h"
#include "kernel/type_checker.h"
#include "kernel/default_converter.h"
#include "library/kernel_serializer.h"
#include "library/scoped_ext.h"
#include "library/reducible.h"
@ -117,21 +116,35 @@ bool is_reducible_off(environment const & env, name const & n) {
return s.m_reducible_off.contains(n);
}
reducible_on_converter::reducible_on_converter(environment const & env, bool relax_main_opaque, bool memoize):
default_converter(env, relax_main_opaque, memoize) {
m_reducible_on = reducible_ext::get_state(env).m_reducible_on;
}
bool reducible_on_converter::is_opaque(declaration const & d) const {
if (!m_reducible_on.contains(d.get_name())) return true;
return default_converter::is_opaque(d);
}
reducible_off_converter::reducible_off_converter(environment const & env, bool relax_main_opaque, bool memoize):
default_converter(env, relax_main_opaque, memoize) {
m_reducible_off = reducible_ext::get_state(env).m_reducible_off;
}
bool reducible_off_converter::is_opaque(declaration const & d) const {
if (m_reducible_off.contains(d.get_name())) return true;
return default_converter::is_opaque(d);
}
std::unique_ptr<type_checker> mk_type_checker(environment const & env, name_generator const & ngen,
bool relax_main_opaque, reducible_behavior rb,
bool memoize) {
reducible_state const & s = reducible_ext::get_state(env);
if (rb == OpaqueIfNotReducibleOn) {
name_set reducible_on = s.m_reducible_on;
name_set reducible_off = s.m_reducible_off;
extra_opaque_pred pred([=](name const & n) { return !reducible_on.contains(n); });
return std::unique_ptr<type_checker>(new type_checker(env, ngen, mk_default_converter(env, relax_main_opaque,
memoize, pred)));
return std::unique_ptr<type_checker>(new type_checker(env, ngen,
std::unique_ptr<converter>(new reducible_on_converter(env, relax_main_opaque, memoize))));
} else {
name_set reducible_off = s.m_reducible_off;
extra_opaque_pred pred([=](name const & n) { return reducible_off.contains(n); });
return std::unique_ptr<type_checker>(new type_checker(env, ngen, mk_default_converter(env, relax_main_opaque,
memoize, pred)));
return std::unique_ptr<type_checker>(new type_checker(env, ngen,
std::unique_ptr<converter>(new reducible_off_converter(env, relax_main_opaque, memoize))));
}
}

15
src/library/reducible.h
View file

@ -7,6 +7,7 @@ Author: Leonardo de Moura
#pragma once
#include <memory>
#include "kernel/type_checker.h"
#include "kernel/default_converter.h"
namespace lean {
enum class reducible_status { On, Off, None };
@ -33,6 +34,20 @@ bool is_reducible_on(environment const & env, name const & n);
*/
bool is_reducible_off(environment const & env, name const & n);
class reducible_on_converter : public default_converter {
name_set m_reducible_on;
public:
reducible_on_converter(environment const & env, bool relax_main_opaque, bool memoize);
virtual bool is_opaque(declaration const & d) const;
};
class reducible_off_converter : public default_converter {
name_set m_reducible_off;
public:
reducible_off_converter(environment const & env, bool relax_main_opaque, bool memoize);
virtual bool is_opaque(declaration const & d) const;
};
enum reducible_behavior { OpaqueIfNotReducibleOn, OpaqueIfReducibleOff };
/** \brief Create a type checker that takes the "reducibility" hints into account. */