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

refactor(kernel/type_checker): replace mk_default_converter with default_converter

Browse source
This commit is contained in:
Leonardo de Moura 2015-02-07 19:01:59 -08:00
parent f018fdabb9
commit a47615009f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/kernel/type_checker.cpp
View file

@ -12,6 +12,7 @@ Author: Leonardo de Moura
#include "util/sstream.h"
#include "util/scoped_map.h"
#include "kernel/type_checker.h"
#include "kernel/default_converter.h"
#include "kernel/expr_maps.h"
#include "kernel/instantiate.h"
#include "kernel/free_vars.h"
@ -421,12 +422,12 @@ type_checker::type_checker(environment const & env, name_generator const & g, st
}
type_checker::type_checker(environment const & env, name_generator const & g, bool memoize):
type_checker(env, g, mk_default_converter(env, optional<module_idx>(), memoize), memoize) {}
type_checker(env, g, std::unique_ptr<converter>(new default_converter(env, optional<module_idx>(), memoize)), memoize) {}
static name * g_tmp_prefix = nullptr;
type_checker::type_checker(environment const & env):
type_checker(env, name_generator(*g_tmp_prefix), mk_default_converter(env), true) {}
type_checker(env, name_generator(*g_tmp_prefix), std::unique_ptr<converter>(new default_converter(env, optional<module_idx>())), true) {}
type_checker::~type_checker() {}
@ -478,14 +479,14 @@ certified_declaration check(environment const & env, declaration const & d, name
check_name(env, d.get_name());
check_duplicated_params(env, d);
bool memoize = true;
type_checker checker1(env, g, mk_default_converter(env, optional<module_idx>(), memoize));
type_checker checker1(env, g, std::unique_ptr<converter>(new default_converter(env, optional<module_idx>(), memoize)));
expr sort = checker1.check(d.get_type(), d.get_univ_params()).first;
checker1.ensure_sort(sort, d.get_type());
if (d.is_definition()) {
optional<module_idx> midx;
if (d.is_opaque())
midx = optional<module_idx>(d.get_module_idx());
type_checker checker2(env, g, mk_default_converter(env, midx, memoize));
type_checker checker2(env, g, std::unique_ptr<converter>(new default_converter(env, midx, memoize)));
expr val_type = checker2.check(d.get_value(), d.get_univ_params()).first;
if (!checker2.is_def_eq(val_type, d.get_type()).first) {
throw_kernel_exception(env, d.get_value(), [=](formatter const & fmt) {