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

fix(frontends/lean/elaborator): 'as-is' expressions

Browse source 
The elaborator should not introduce implicit arguments on terms marked
as 'as-is'.
This commit is contained in:
Leonardo de Moura 2014-10-07 15:15:50 -07:00
parent 4a119a0424
commit 16041e4948
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -556,16 +556,10 @@ expr elaborator::visit_sort(expr const & e) {
} }
expr elaborator::visit_macro(expr const & e, constraint_seq & cs) { expr elaborator::visit_macro(expr const & e, constraint_seq & cs) {
if (is_as_is(e)) { buffer<expr> args;
return get_as_is_arg(e); for (unsigned i = 0; i < macro_num_args(e); i++)
} else { args.push_back(visit(macro_arg(e, i), cs));
// Remark: Macros are not meant to be used in the front end. return update_macro(e, args.size(), args.data());
// Perhaps, we should throw error.
buffer<expr> args;
for (unsigned i = 0; i < macro_num_args(e); i++)
args.push_back(visit(macro_arg(e, i), cs));
return update_macro(e, args.size(), args.data());
}
} }
expr elaborator::visit_constant(expr const & e) { expr elaborator::visit_constant(expr const & e) {
@ -766,7 +760,9 @@ pair<expr, constraint_seq> elaborator::visit(expr const & e) {
expr r; expr r;
expr b = e; expr b = e;
constraint_seq cs; constraint_seq cs;
if (is_explicit(e)) { if (is_as_is(e)) {
r = get_as_is_arg(e);
} else if (is_explicit(e)) {
b = get_explicit_arg(e); b = get_explicit_arg(e);
if (is_sorry(b)) { if (is_sorry(b)) {
r = visit_constant(b); r = visit_constant(b);