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

fix(library/normalize): fixes #599

Browse source
This commit is contained in:
Leonardo de Moura 2015-05-13 18:34:51 -07:00
parent 51a30892a1
commit 163577c23a
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/library/normalize.cpp
View file

@ -194,7 +194,7 @@ class normalize_fn {
return some_expr(e);
expr const & f = get_app_fn(e);
if (is_constant(f) && has_constructor_hint(m_tc.env(), const_name(f))) {
if (auto r = unfold_app(m_tc.env(), e))
if (auto r = unfold_term(m_tc.env(), e))
return r;
else
return some_expr(e);

10
src/library/util.cpp
View file

@ -21,9 +21,7 @@ bool is_standard(environment const & env) {
return env.prop_proof_irrel() && env.impredicative();
}
optional<expr> unfold_app(environment const & env, expr const & e) {
if (!is_app(e))
return none_expr();
optional<expr> unfold_term(environment const & env, expr const & e) {
expr const & f = get_app_fn(e);
if (!is_constant(f))
return none_expr();
@ -36,6 +34,12 @@ optional<expr> unfold_app(environment const & env, expr const & e) {
return some_expr(apply_beta(d, args.size(), args.data()));
}
optional<expr> unfold_app(environment const & env, expr const & e) {
if (!is_app(e))
return none_expr();
return unfold_term(env, e);
}
optional<level> dec_level(level const & l) {
switch (kind(l)) {
case level_kind::Zero: case level_kind::Param: case level_kind::Global: case level_kind::Meta:

3
src/library/util.h
View file

@ -10,6 +10,9 @@ Author: Leonardo de Moura
namespace lean {
typedef std::unique_ptr<type_checker> type_checker_ptr;
/** \brief Unfold constant \c e or constant application (i.e., \c e is of the form (f ....),
where \c f is a constant */
optional<expr> unfold_term(environment const & env, expr const & e);
/** \brief If \c e is of the form <tt>(f a_1 ... a_n)</tt>, where \c f is
a non-opaque definition, then unfold \c f, and beta reduce.
Otherwise, return none.

8
tests/lean/hott/599.hlean Normal file
View file

@ -0,0 +1,8 @@
structure pointed [class] (A : Type) := (point : A)
open unit pointed
definition pointed_unit [instance] [constructor] : pointed unit :=
mk star
example : point unit = point unit := by esimp