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

feat(library/equations_compiler): add flag for marking equations that we should not report an error if they are not used

Browse source
This commit is contained in:
Leonardo de Moura 2017-02-05 19:26:45 -08:00
parent 3ef463ccc9
commit e8f2f2ed3c
3 changed files with 44 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/library/equations_compiler/elim_match.cpp
View file

@ -43,7 +43,6 @@ Author: Leonardo de Moura
#define LEAN_DEFAULT_EQN_COMPILER_MAX_STEPS 128
#endif
namespace lean {
static name * g_eqn_compiler_ite = nullptr;
static name * g_eqn_compiler_max_steps = nullptr;
@ -362,6 +361,8 @@ struct elim_match_fn {
}
lean_assert(is_equation(it));
equation E;
bool ignore_if_unused = ignore_equation_if_unused(it);
m_used_eqns.push_back(ignore_if_unused);
E.m_vars = to_list(locals);
E.m_lctx = ctx.lctx();
E.m_rhs = instantiate_rev(equation_rhs(it), locals);
@ -394,7 +395,6 @@ struct elim_match_fn {
lean_assert(eqns.size() == 1);
return list<equation>();
}
m_used_eqns.push_back(false);
idx++;
}
return to_list(R);

57
src/library/equations_compiler/equations.cpp
View file

@ -69,9 +69,15 @@ public:
};
class equation_macro_cell : public equation_base_macro_cell {
bool m_ignore_if_unused;
public:
equation_macro_cell(bool ignore_if_unused):m_ignore_if_unused(ignore_if_unused) {}
virtual name get_name() const { return *g_equation_name; }
virtual void write(serializer & s) const { s.write_string(*g_equation_opcode); }
virtual void write(serializer & s) const {
s.write_string(*g_equation_opcode);
s.write_bool(m_ignore_if_unused);
}
bool ignore_if_unused() const { return m_ignore_if_unused; }
};
// This is just a placeholder to indicate no equations were provided
@ -81,11 +87,17 @@ public:
virtual void write(serializer & s) const { s.write_string(*g_no_equation_opcode); }
};
static macro_definition * g_equation = nullptr;
static macro_definition * g_no_equation = nullptr;
static macro_definition * g_equation = nullptr;
static macro_definition * g_equation_ignore_if_unused = nullptr;
static macro_definition * g_no_equation = nullptr;
bool is_equation(expr const & e) { return is_macro(e) && macro_def(e) == *g_equation; }
bool ignore_equation_if_unused(expr const & e) {
lean_assert(is_equation(e));
return static_cast<equation_macro_cell const *>(macro_def(e).raw())->ignore_if_unused();
}
bool is_lambda_equation(expr const & e) {
if (is_lambda(e))
return is_lambda_equation(binding_body(e));
@ -95,9 +107,12 @@ bool is_lambda_equation(expr const & e) {
expr const & equation_lhs(expr const & e) { lean_assert(is_equation(e)); return macro_arg(e, 0); }
expr const & equation_rhs(expr const & e) { lean_assert(is_equation(e)); return macro_arg(e, 1); }
expr mk_equation(expr const & lhs, expr const & rhs) {
expr mk_equation(expr const & lhs, expr const & rhs, bool ignore_if_unused) {
expr args[2] = { lhs, rhs };
return mk_macro(*g_equation, 2, args);
if (ignore_if_unused)
return mk_macro(*g_equation_ignore_if_unused, 2, args);
else
return mk_macro(*g_equation, 2, args);
}
expr mk_no_equation() { return mk_macro(*g_no_equation); }
bool is_no_equation(expr const & e) { return is_macro(e) && macro_def(e) == *g_no_equation; }
@ -177,7 +192,6 @@ expr update_equations(expr const & eqns, buffer<expr> const & new_eqs) {
}
}
// LEGACY
expr mk_equations(unsigned num_fns, unsigned num_eqs, expr const * eqs) {
return mk_equations(equations_header(num_fns), num_eqs, eqs);
@ -212,18 +226,19 @@ unsigned get_equations_result_size(expr const & e) { return macro_num_args(e); }
expr const & get_equations_result(expr const & e, unsigned i) { return macro_arg(e, i); }
void initialize_equations() {
g_equations_name = new name("equations");
g_equation_name = new name("equation");
g_no_equation_name = new name("no_equation");
g_inaccessible_name = new name("innaccessible");
g_equations_result_name = new name("equations_result");
g_equation = new macro_definition(new equation_macro_cell());
g_no_equation = new macro_definition(new no_equation_macro_cell());
g_equations_result = new macro_definition(new equations_result_macro_cell());
g_equations_opcode = new std::string("Eqns");
g_equation_opcode = new std::string("Eqn");
g_no_equation_opcode = new std::string("NEqn");
g_equations_result_opcode = new std::string("EqnR");
g_equations_name = new name("equations");
g_equation_name = new name("equation");
g_no_equation_name = new name("no_equation");
g_inaccessible_name = new name("innaccessible");
g_equations_result_name = new name("equations_result");
g_equation = new macro_definition(new equation_macro_cell(false));
g_equation_ignore_if_unused = new macro_definition(new equation_macro_cell(true));
g_no_equation = new macro_definition(new no_equation_macro_cell());
g_equations_result = new macro_definition(new equations_result_macro_cell());
g_equations_opcode = new std::string("Eqns");
g_equation_opcode = new std::string("Eqn");
g_no_equation_opcode = new std::string("NEqn");
g_equations_result_opcode = new std::string("EqnR");
register_annotation(*g_inaccessible_name);
register_macro_deserializer(*g_equations_opcode,
[](deserializer & d, unsigned num, expr const * args) {
@ -242,10 +257,12 @@ void initialize_equations() {
}
});
register_macro_deserializer(*g_equation_opcode,
[](deserializer &, unsigned num, expr const * args) {
[](deserializer & d, unsigned num, expr const * args) {
bool ignore_if_unused;
d >> ignore_if_unused;
if (num != 2)
throw corrupted_stream_exception();
return mk_equation(args[0], args[1]);
return mk_equation(args[0], args[1], ignore_if_unused);
});
register_macro_deserializer(*g_no_equation_opcode,
[](deserializer &, unsigned num, expr const *) {

6
src/library/equations_compiler/equations.h
View file

@ -13,10 +13,14 @@ class io_state;
bool is_equation(expr const & e);
expr const & equation_lhs(expr const & e);
expr const & equation_rhs(expr const & e);
expr mk_equation(expr const & lhs, expr const & rhs);
expr mk_equation(expr const & lhs, expr const & rhs, bool ignore_if_unused = false);
/** \brief Return true if e is of the form <tt>fun a_1 ... a_n, equation</tt> */
bool is_lambda_equation(expr const & e);
/** \brief Return true iff e is an equation created with ignore_if_unused flag set to true.
\pre is_equation(e) */
bool ignore_equation_if_unused(expr const & e);
/** \brief Placeholder to indicate no equations were provided (e.g., to a match-with expression) */
expr mk_no_equation();
bool is_no_equation(expr const & e);