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

feat(frontends/lean/migrate_cmd): catch memory error in the migrate command

Browse source
This commit is contained in:
Leonardo de Moura 2015-04-27 12:58:11 -07:00
parent 7a1064b7e8
commit d41e055d1c
1 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/frontends/lean/migrate_cmd.cpp
View file

@ -20,6 +20,7 @@ Author: Leonardo de Moura
#include "library/util.h" #include "library/util.h"
#include "library/occurs.h" #include "library/occurs.h"
#include "library/module.h" #include "library/module.h"
#include "library/flycheck.h"
#include "library/constants.h" #include "library/constants.h"
#include "library/replace_visitor.h" #include "library/replace_visitor.h"
#include "library/error_handling/error_handling.h" #include "library/error_handling/error_handling.h"
@ -76,11 +77,14 @@ struct migrate_cmd_fn {
buffer<pair<name, name>> m_renames; buffer<pair<name, name>> m_renames;
buffer<name> m_hiding; buffer<name> m_hiding;
bool m_throwable; // true if a throwable exception (which is not a lean::exception) was thrown
list<expr> m_ctx; list<expr> m_ctx;
buffer<expr> m_S_params; buffer<expr> m_S_params;
migrate_cmd_fn(parser & p): migrate_cmd_fn(parser & p):
m_p(p), m_env(p.env()), m_ngen(p.mk_ngen()) { m_p(p), m_env(p.env()), m_ngen(p.mk_ngen()) {
m_throwable = false;
m_trace = get_migrate_trace(p.get_options()); m_trace = get_migrate_trace(p.get_options());
} }
@ -156,6 +160,22 @@ struct migrate_cmd_fn {
m_main(m), m_num_params(m_main.m_S_params.size()) {} m_main(m), m_num_params(m_main.m_S_params.size()) {}
}; };
void report_fail_to_migrate(declaration const & d, throwable & ex) {
if (m_trace) {
out() << "failed to migrate '" << d.get_name() << "', kernel rejected new declaration\n";
::lean::display_error(out(), nullptr, ex);
out() << "\n";
}
}
void report_skip(declaration const & d, throwable & ex) {
if (m_trace) {
out() << "skipped '" << d.get_name() << "': failed to be elaborated\n";
::lean::display_error(out(), nullptr, ex);
out() << "\n";
}
}
void migrate_decl(declaration const & d) { void migrate_decl(declaration const & d) {
if (!check_sufficient_args(d.get_type())) { if (!check_sufficient_args(d.get_type())) {
if (m_trace) if (m_trace)
@ -217,24 +237,23 @@ struct migrate_cmd_fn {
if (m_trace) if (m_trace)
out() << "migrated: " << full_name << " : " << new_type << "\n"; out() << "migrated: " << full_name << " : " << new_type << "\n";
} catch (exception & ex) { } catch (exception & ex) {
if (m_trace) { report_fail_to_migrate(d, ex);
out() << "failed to migrate '" << d.get_name() << "', kernel rejected new declaration\n"; return;
::lean::display_error(out(), nullptr, ex); } catch (throwable & ex) {
out() << "\n"; m_throwable = true;
} report_fail_to_migrate(d, ex);
return; return;
} }
} catch (exception & ex) { } catch (exception & ex) {
if (m_trace) { report_skip(d, ex);
out() << "skipped '" << d.get_name() << "': failed to be elaborated\n"; return;
::lean::display_error(out(), nullptr, ex); } catch (throwable & ex) {
out() << "\n"; m_throwable = true;
} report_skip(d, ex);
return; return;
} }
} }
void parse_params() { void parse_params() {
if (!m_p.curr_is_token(get_from_tk())) { if (!m_p.curr_is_token(get_from_tk())) {
unsigned rbp = 0; unsigned rbp = 0;
@ -423,6 +442,11 @@ struct migrate_cmd_fn {
if (is_prefix_of(m_from, d.get_name())) if (is_prefix_of(m_from, d.get_name()))
migrate_decl(d); migrate_decl(d);
}); });
if (m_throwable && !m_trace) {
flycheck_warning wrn(m_p.regular_stream());
m_p.display_warning_pos(m_pos);
m_p.regular_stream() << " some declarations were not migrated due to resource constraints (use 'set_option migrate.trace true' for additional details)" << endl;
}
return m_env; return m_env;
} }
}; };