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

refactor(kernel/default_converter): remove extra_opaque_pred

Browse source
This commit is contained in:
Leonardo de Moura 2015-02-07 19:05:46 -08:00
parent a11d1efb42
commit 73acaca21e
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/kernel/default_converter.cpp
View file

@ -14,16 +14,12 @@ Author: Leonardo de Moura
namespace lean { namespace lean {
static expr * g_dont_care = nullptr; static expr * g_dont_care = nullptr;
default_converter::default_converter(environment const & env, optional<module_idx> mod_idx, bool memoize, default_converter::default_converter(environment const & env, optional<module_idx> mod_idx, bool memoize):
extra_opaque_pred const & pred): m_env(env), m_module_idx(mod_idx), m_memoize(memoize) {
m_env(env), m_module_idx(mod_idx), m_memoize(memoize), m_extra_pred(pred) {
m_tc = nullptr; m_tc = nullptr;
m_jst = nullptr; m_jst = nullptr;
} }
default_converter::default_converter(environment const & env, optional<module_idx> mod_idx, bool memoize):
default_converter(env, mod_idx, memoize, [](name const &) { return false; }) {}
default_converter::default_converter(environment const & env, bool relax_main_opaque, bool memoize): default_converter::default_converter(environment const & env, bool relax_main_opaque, bool memoize):
default_converter(env, relax_main_opaque ? optional<module_idx>(0) : optional<module_idx>(), memoize) {} default_converter(env, relax_main_opaque ? optional<module_idx>(0) : optional<module_idx>(), memoize) {}
@ -114,7 +110,6 @@ expr default_converter::whnf_core(expr const & e) {
bool default_converter::is_opaque(declaration const & d) const { bool default_converter::is_opaque(declaration const & d) const {
lean_assert(d.is_definition()); lean_assert(d.is_definition());
if (d.is_theorem()) return true; // theorems are always opaque if (d.is_theorem()) return true; // theorems are always opaque
if (m_extra_pred(d.get_name())) return true; // extra_opaque predicate overrides opaque flag
if (!d.is_opaque()) return false; // d is a transparent definition if (!d.is_opaque()) return false; // d is a transparent definition
if (m_module_idx && d.get_module_idx() == *m_module_idx) return false; // the opaque definitions in mod_idx are considered transparent if (m_module_idx && d.get_module_idx() == *m_module_idx) return false; // the opaque definitions in mod_idx are considered transparent
return true; // d is opaque return true; // d is opaque

3
src/kernel/default_converter.h
View file

@ -18,7 +18,6 @@ protected:
environment m_env; environment m_env;
optional<module_idx> m_module_idx; optional<module_idx> m_module_idx;
bool m_memoize; bool m_memoize;
extra_opaque_pred m_extra_pred;
expr_struct_map<expr> m_whnf_core_cache; expr_struct_map<expr> m_whnf_core_cache;
expr_struct_map<pair<expr, constraint_seq>> m_whnf_cache; expr_struct_map<pair<expr, constraint_seq>> m_whnf_cache;
@ -72,8 +71,6 @@ protected:
pair<bool, constraint_seq> is_def_eq(expr const & t, expr const & s); pair<bool, constraint_seq> is_def_eq(expr const & t, expr const & s);
public: public:
default_converter(environment const & env, optional<module_idx> mod_idx, bool memoize,
extra_opaque_pred const & pred);
default_converter(environment const & env, optional<module_idx> mod_idx, bool memoize = true); default_converter(environment const & env, optional<module_idx> mod_idx, bool memoize = true);
default_converter(environment const & env, bool relax_main_opaque, bool memoize = true); default_converter(environment const & env, bool relax_main_opaque, bool memoize = true);