max/lean4-htt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix(frontends/lean/elaborator): remove dirty trick used when generating type mismatch error messages, the trick was incompatible with the new error recovery code

Browse source 
closes #1363
This commit is contained in:
Leonardo de Moura 2017-02-07 11:17:18 -08:00
parent 715f0bdd8c
commit c7b407cfd0
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/frontends/lean/elaborator.cpp
View file

@ -1244,16 +1244,18 @@ expr elaborator::second_pass(expr const & fn, buffer<expr> const & args,
expr new_arg_type = infer_type(new_arg);
optional<expr> new_new_arg = ensure_has_type(new_arg, new_arg_type, info.args_expected_types[i], ref_arg);
if (!new_new_arg) {
info.new_args.shrink(info.new_args_size[i]);
info.new_args.push_back(new_arg);
format msg = mk_app_type_mismatch_error(mk_app(fn, info.new_args.size(), info.new_args.data()),
buffer<expr> tmp_args;
tmp_args.append(info.new_args_size[i], info.new_args.data());
tmp_args.push_back(new_arg);
format msg = mk_app_type_mismatch_error(mk_app(fn, tmp_args),
new_arg, new_arg_type, info.args_expected_types[i]);
throw elaborator_exception(ref, msg);
}
if (!is_def_eq(info.args_mvars[i], *new_new_arg)) {
info.new_args.shrink(info.new_args_size[i]);
info.new_args.push_back(new_arg);
format msg = mk_app_arg_mismatch_error(mk_app(fn, info.new_args.size(), info.new_args.data()),
buffer<expr> tmp_args;
tmp_args.append(info.new_args_size[i], info.new_args.data());
tmp_args.push_back(new_arg);
format msg = mk_app_arg_mismatch_error(mk_app(fn, tmp_args),
new_arg, info.args_mvars[i]);
throw elaborator_exception(ref, msg);
}