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

fix(frontends/lean/class): take whnf into account in add_instance

Browse source
This commit is contained in:
Leonardo de Moura 2014-09-09 16:06:20 -07:00
parent 38058450d4
commit c92a9b8808
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/frontends/lean/class.cpp
View file

@ -6,8 +6,10 @@ Author: Leonardo de Moura
*/ */
#include <string> #include <string>
#include "util/sstream.h" #include "util/sstream.h"
#include "kernel/instantiate.h"
#include "library/scoped_ext.h" #include "library/scoped_ext.h"
#include "library/kernel_serializer.h" #include "library/kernel_serializer.h"
#include "library/opaque_hints.h"
#include "frontends/lean/parser.h" #include "frontends/lean/parser.h"
namespace lean { namespace lean {
@ -93,11 +95,18 @@ environment add_class(environment const & env, name const & n) {
return class_ext::add_entry(env, get_dummy_ios(), class_entry(n)); return class_ext::add_entry(env, get_dummy_ios(), class_entry(n));
} }
static name g_tmp_prefix = name::mk_internal_unique_name();
environment add_instance(environment const & env, name const & n) { environment add_instance(environment const & env, name const & n) {
declaration d = env.get(n); declaration d = env.get(n);
expr type = d.get_type(); expr type = d.get_type();
while (is_pi(type)) name_generator ngen(g_tmp_prefix);
type = binding_body(type); auto tc = mk_type_checker_with_hints(env, ngen, false);
while (true) {
type = tc->whnf(type).first;
if (!is_pi(type))
break;
type = instantiate(binding_body(type), mk_local(ngen.next(), binding_domain(type)));
}
name c = get_class_name(env, get_app_fn(type)); name c = get_class_name(env, get_app_fn(type));
return class_ext::add_entry(env, get_dummy_ios(), class_entry(c, n)); return class_ext::add_entry(env, get_dummy_ios(), class_entry(c, n));
} }