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

Improve application type mismatch errors. We also show the implicit arguments (not just their types)

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2013-09-04 10:23:51 -07:00
parent 408005b730
commit 613d83cdf4
4 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/library/formatter.cpp
View file

@ -44,15 +44,18 @@ format formatter::operator()(kernel_exception const & ex, options const & opts)
format(_ex->get_name()), format("'")}; format(_ex->get_name()), format("'")};
} else if (app_type_mismatch_exception const * _ex = dynamic_cast<app_type_mismatch_exception const *>(&ex)) { } else if (app_type_mismatch_exception const * _ex = dynamic_cast<app_type_mismatch_exception const *>(&ex)) {
unsigned indent = get_pp_indent(opts); unsigned indent = get_pp_indent(opts);
format app_f = operator()(_ex->get_context(), _ex->get_application(), false, opts); context const & ctx = _ex->get_context();
expr const & app = _ex->get_application();
format app_fmt = operator()(ctx, app, false, opts);
std::vector<expr> const & arg_types = _ex->get_arg_types(); std::vector<expr> const & arg_types = _ex->get_arg_types();
auto it = arg_types.begin(); auto it = arg_types.begin();
format f_type_fmt = operator()(_ex->get_context(), *it, false, opts); format f_type_fmt = operator()(ctx, *it, false, opts);
format arg_types_fmt; format arg_types_fmt;
++it; ++it;
for (; it != arg_types.end(); ++it) { for (unsigned i = 1; it != arg_types.end(); ++it, ++i) {
format arg_type_fmt = operator()(_ex->get_context(), *it, false, opts); format arg_fmt = operator()(ctx, arg(app, i), false, opts);
arg_types_fmt += nest(indent, compose(line(), arg_type_fmt)); format arg_type_fmt = operator()(ctx, *it, false, opts);
arg_types_fmt += nest(indent, compose(line(), group(format{arg_fmt, space(), colon(), nest(indent, format{line(), arg_type_fmt})})));
} }
format arg_type_msg; format arg_type_msg;
if (arg_types.size() > 2) if (arg_types.size() > 2)
@ -60,7 +63,7 @@ format formatter::operator()(kernel_exception const & ex, options const & opts)
else else
arg_type_msg = format("Argument type:"); arg_type_msg = format("Argument type:");
return format({format("type mismatch at application"), return format({format("type mismatch at application"),
nest(indent, compose(line(), app_f)), nest(indent, compose(line(), app_fmt)),
line(), format("Function type:"), line(), format("Function type:"),
nest(indent, compose(line(), f_type_fmt)), nest(indent, compose(line(), f_type_fmt)),
line(), arg_type_msg, line(), arg_type_msg,

4
tests/lean/ex2.lean.expected.out
View file

@ -15,8 +15,8 @@ Error (line: 13, pos: 11) type mismatch at application
Function type: Function type:
Bool -> Bool -> Bool Bool -> Bool -> Bool
Arguments types: Arguments types:
Bool a : Bool
Type A : Type
Variable A : Type Variable A : Type
(lean::pp::notation := false, pp::unicode := false, pp::colors := false) (lean::pp::notation := false, pp::unicode := false, pp::colors := false)
Error (line: 16, pos: 4) unknown option 'lean::p::notation', type 'Help Options.' for list of available options Error (line: 16, pos: 4) unknown option 'lean::p::notation', type 'Help Options.' for list of available options

12
tests/lean/ex3.lean.expected.out
View file

@ -9,9 +9,9 @@ Error (line: 5, pos: 6) type mismatch at application
Function type: Function type:
Π (A : Type) (_ _ : A), Bool Π (A : Type) (_ _ : A), Bool
Arguments types: Arguments types:
Type Bool : Type
Bool ⊤ : Bool
T a : T
Assumed: myeq2 Assumed: myeq2
Set: lean::pp::implicit Set: lean::pp::implicit
Error (line: 9, pos: 15) type mismatch at application Error (line: 9, pos: 15) type mismatch at application
@ -19,6 +19,6 @@ Error (line: 9, pos: 15) type mismatch at application
Function type: Function type:
Π (A : Type) (a b : A), Bool Π (A : Type) (a b : A), Bool
Arguments types: Arguments types:
Type Bool : Type
Bool ⊤ : Bool
T a : T

4
tests/lean/tst9.lean.expected.out
View file

@ -9,5 +9,5 @@ Error (line: 5, pos: 6) type mismatch at application
Function type: Function type:
N → N → Bool N → N → Bool
Arguments types: Arguments types:
Bool ⊤ : Bool
?M0 f _ a a : ?M0