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

fix(frontends/lean): change how "as-is" expressions are handled

Browse source 
Implicit arguments are consumed.
This commit is contained in:
Leonardo de Moura 2014-10-08 19:00:16 -07:00
parent 86410d392b
commit d445857f56
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -556,11 +556,15 @@ 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)) {
return get_as_is_arg(e);
} else {
buffer<expr> args; buffer<expr> args;
for (unsigned i = 0; i < macro_num_args(e); i++) for (unsigned i = 0; i < macro_num_args(e); i++)
args.push_back(visit(macro_arg(e, i), cs)); args.push_back(visit(macro_arg(e, i), cs));
return update_macro(e, args.size(), args.data()); return update_macro(e, args.size(), args.data());
} }
}
expr elaborator::visit_constant(expr const & e) { expr elaborator::visit_constant(expr const & e) {
declaration d = env().get(const_name(e)); declaration d = env().get(const_name(e));
@ -760,9 +764,7 @@ 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_as_is(e)) { if (is_explicit(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);