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

refactor(library/reducible): replace ext with attribute_manager

Browse source
This commit is contained in:
Sebastian Ullrich 2016-07-06 17:39:06 -07:00
parent 0ebc9eada2
commit 463e4a2cf3
4 changed files with 29 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -641,12 +641,6 @@ environment print_cmd(parser & p) {
} else if (p.curr_is_token_or_id(get_no_pattern_attr_tk())) {
p.next();
print_no_patterns(p);
} else if (p.curr_is_token_or_id(get_reducible_tk())) {
p.next();
print_reducible_info(p, reducible_status::Reducible);
} else if (p.curr_is_token_or_id(get_irreducible_tk())) {
p.next();
print_reducible_info(p, reducible_status::Irreducible);
} else if (p.curr_is_token_or_id(get_options_tk())) {
p.next();
out << p.ios().get_options() << endl;

11
src/library/attribute_manager.cpp
View file

@ -122,6 +122,12 @@ void register_no_params_attribute(char const * attr, char const * descr, set_no_
return on_set(env, ios, d, ns, persistent);
});
}
void register_no_params_attribute(char const * attr, char const * descr) {
register_no_params_attribute(attr, descr,
[](environment const & env, io_state const &, name const &, name const &, bool) {
return env;
});
}
void register_prio_attribute(char const * attr, char const * descr, set_prio_attribute_proc const & on_set) {
register_attribute(attr, descr,
@ -232,6 +238,11 @@ environment set_attribute(environment const & env, io_state const & ios, char co
throw_unknown_attribute(attr);
}
environment set_attribute(environment const & env, io_state const & ios, char const * attr,
name const & d, name const & ns, bool persistent) {
return set_attribute(env, ios, attr, d, LEAN_DEFAULT_PRIORITY, list<unsigned>(), ns, persistent);
}
unsigned get_attribute_prio(environment const & env, name const & attr, name const & d) {
if (auto it = attribute_ext::get_state(env).find(attr)) {
optional<unsigned> prio = it->get_prio({d, list<unsigned>()});

3
src/library/attribute_manager.h
View file

@ -28,6 +28,7 @@ typedef std::function<environment(environment const &, io_state const &, name co
void register_attribute(char const * attr, char const * descr, set_attribute_proc const & on_set);
void register_no_params_attribute(char const * attr, char const * descr, set_no_params_attribute_proc const & on_set);
void register_no_params_attribute(char const * attr, char const * descr);
void register_prio_attribute(char const * attr, char const * descr, set_prio_attribute_proc const & on_set);
void register_opt_param_attribute(char const * attr, char const * descr, set_opt_param_attribute_proc const & on_set);
void register_params_attribute(char const * attr, char const * descr, set_params_attribute_proc const & on_set);
@ -42,6 +43,8 @@ char const * get_attribute_token(char const * attr);
environment set_attribute(environment const & env, io_state const & ios, char const * attr,
name const & d, unsigned prio, list<unsigned> const & params, name const & ns, bool persistent);
environment set_attribute(environment const & env, io_state const & ios, char const * attr,
name const & d, name const & ns, bool persistent);
bool has_attribute(environment const & env, char const * attr, name const & d);
void get_attribute_instances(environment const & env, name const & attr, buffer<name> &);

99
src/library/reducible.cpp
View file

@ -14,76 +14,10 @@ Author: Leonardo de Moura
#include "library/attribute_manager.h"
namespace lean {
struct reducible_entry {
reducible_status m_status;
name m_name;
reducible_entry():m_status(reducible_status::Semireducible) {}
reducible_entry(reducible_status s, name const & n):m_status(s), m_name(n) {}
};
typedef name_map<reducible_status> reducible_state;
static reducible_status get_status(reducible_state const & s, name const & n) {
if (auto it = s.find(n))
return *it;
else
return reducible_status::Semireducible;
}
static name * g_class_name = nullptr;
static std::string * g_key = nullptr;
struct reducible_config {
typedef reducible_state state;
typedef reducible_entry entry;
static void add_entry(environment const &, io_state const &, state & s, entry const & e) {
s.insert(e.m_name, e.m_status);
}
static name const & get_class_name() {
return *g_class_name;
}
static std::string const & get_serialization_key() {
return *g_key;
}
static void write_entry(serializer & s, entry const & e) {
s << static_cast<char>(e.m_status) << e.m_name;
}
static entry read_entry(deserializer & d) {
entry e; char s;
d >> s >> e.m_name;
e.m_status = static_cast<reducible_status>(s);
return e;
}
static optional<unsigned> get_fingerprint(entry const & e) {
return some(hash(static_cast<unsigned>(e.m_status), e.m_name.hash()));
}
};
template class scoped_ext<reducible_config>;
typedef scoped_ext<reducible_config> reducible_ext;
void initialize_reducible() {
g_class_name = new name("reducible");
g_key = new std::string("REDU");
reducible_ext::initialize();
register_no_params_attribute("reducible", "reducible",
[](environment const & env, io_state const &, name const & d, name const & ns,
bool persistent) {
return set_reducible(env, d, reducible_status::Reducible, ns, persistent);
});
register_no_params_attribute("semireducible", "semireducible",
[](environment const & env, io_state const &, name const & d, name const & ns,
bool persistent) {
return set_reducible(env, d, reducible_status::Semireducible, ns, persistent);
});
register_no_params_attribute("irreducible", "irreducible",
[](environment const & env, io_state const &, name const & d, name const & ns,
bool persistent) {
return set_reducible(env, d, reducible_status::Irreducible, ns, persistent);
});
register_no_params_attribute("reducible", "reducible");
register_no_params_attribute("semireducible", "semireducible");
register_no_params_attribute("irreducible", "irreducible");
register_incompatible("reducible", "semireducible");
register_incompatible("reducible", "irreducible");
@ -91,14 +25,6 @@ void initialize_reducible() {
}
void finalize_reducible() {
reducible_ext::finalize();
delete g_key;
delete g_class_name;
}
void for_each_reducible(environment const & env, std::function<void(name const &, reducible_status)> const & fn) {
reducible_state m_state = reducible_ext::get_state(env);
m_state.for_each(fn);
}
static void check_declaration(environment const & env, name const & n) {
@ -109,25 +35,30 @@ static void check_declaration(environment const & env, name const & n) {
environment set_reducible(environment const & env, name const & n, reducible_status s, name const & ns, bool persistent) {
check_declaration(env, n);
return reducible_ext::add_entry(env, get_dummy_ios(), reducible_entry(s, n), ns, persistent);
return set_attribute(env, get_dummy_ios(),
s == reducible_status::Reducible ? "reducible" :
s == reducible_status::Irreducible ? "irreducible" :
"semireducible", n, ns, persistent);
}
reducible_status get_reducible_status(environment const & env, name const & n) {
reducible_state const & s = reducible_ext::get_state(env);
return get_status(s, n);
if (has_attribute(env, "reducible", n))
return reducible_status::Reducible;
else if (has_attribute(env, "irreducible", n))
return reducible_status::Irreducible;
else
return reducible_status::Semireducible;
}
name_predicate mk_not_reducible_pred(environment const & env) {
reducible_state m_state = reducible_ext::get_state(env);
return [=](name const & n) { // NOLINT
return get_status(m_state, n) != reducible_status::Reducible;
return !has_attribute(env, "reducible", n);
};
}
name_predicate mk_irreducible_pred(environment const & env) {
reducible_state m_state = reducible_ext::get_state(env);
return [=](name const & n) { // NOLINT
return get_status(m_state, n) == reducible_status::Irreducible;
return has_attribute(env, "irreducible", n);
};
}