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

Fix bug in pretty printer

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2013-08-15 20:10:00 -07:00
parent efbf3a434d
commit 07946f9e32
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/frontend/pp.cpp
View file

@ -320,7 +320,7 @@ struct pp_fn {
\remark The argument B is only relevant when processing \remark The argument B is only relevant when processing
condensed definitions. \see pp_abstraction_core. condensed definitions. \see pp_abstraction_core.
*/ */
std::pair<expr, expr> collect_nested(expr const & e, expr B, expr_kind k, buffer<std::pair<name, expr>> & r) { std::pair<expr, expr> collect_nested(expr const & e, expr T, expr_kind k, buffer<std::pair<name, expr>> & r) {
if (e.kind() == k) { if (e.kind() == k) {
name const & n = abst_name(e); name const & n = abst_name(e);
name n1 = n; name n1 = n;
@ -331,11 +331,11 @@ struct pp_fn {
} }
r.push_back(mk_pair(n1, abst_domain(e))); r.push_back(mk_pair(n1, abst_domain(e)));
expr b = instantiate_with_closed(abst_body(e), mk_constant(n1)); expr b = instantiate_with_closed(abst_body(e), mk_constant(n1));
if (B) if (T)
B = instantiate_with_closed(B, mk_constant(n1)); T = instantiate_with_closed(abst_body(T), mk_constant(n1));
return collect_nested(b, B, k, r); return collect_nested(b, T, k, r);
} else { } else {
return mk_pair(e, B); return mk_pair(e, T);
} }
} }
@ -370,40 +370,42 @@ struct pp_fn {
/** /**
\brief Pretty print Lambdas, Pis and compact definitions. \brief Pretty print Lambdas, Pis and compact definitions.
When B != 0, it is a compact definition. When T != 0, it is a compact definition.
A compact definition is of the form A compact definition is of the form
Defintion Name Pi(x : A), B := Lambda (x : A), T Defintion Name Pi(x : A), B := Lambda (x : A), C
it is printed as it is printed as
Defintion Name (x : A) : B := T Defintion Name (x : A) : B := C
This method only generates the This method only generates the
(x : A) : B := T (x : A) : B := C
for compact definitions. for compact definitions.
\remark if T != 0, then T is Pi(x : A), B
*/ */
result pp_abstraction_core(expr const & e, unsigned depth, expr B) { result pp_abstraction_core(expr const & e, unsigned depth, expr T) {
if (is_arrow(e)) { if (is_arrow(e)) {
lean_assert(!B); lean_assert(!T);
result p_lhs = pp_child(abst_domain(e), depth); result p_lhs = pp_child(abst_domain(e), depth);
result p_rhs = pp_arrow_body(abst_body(e), depth); result p_rhs = pp_arrow_body(abst_body(e), depth);
format r_format = group(format{p_lhs.first, space(), g_arrow_fmt, line(), p_rhs.first}); format r_format = group(format{p_lhs.first, space(), g_arrow_fmt, line(), p_rhs.first});
return mk_result(r_format, std::max(p_lhs.second, p_rhs.second) + 1); return mk_result(r_format, std::max(p_lhs.second, p_rhs.second) + 1);
} else { } else {
buffer<std::pair<name, expr>> nested; buffer<std::pair<name, expr>> nested;
auto p = collect_nested(e, B, e.kind(), nested); auto p = collect_nested(e, T, e.kind(), nested);
expr b = p.first; expr b = p.first;
B = p.second; T = p.second;
lean_assert(b.kind() != e.kind()); lean_assert(b.kind() != e.kind());
format head; format head;
if (!B) { if (!T) {
head = is_lambda(e) ? g_lambda_fmt : g_Pi_fmt; head = is_lambda(e) ? g_lambda_fmt : g_Pi_fmt;
} }
format body_sep; format body_sep;
if (B) { if (T) {
format B_f = pp(B, 0).first; format T_f = pp(T, 0).first;
body_sep = format{space(), colon(), space(), B_f, space(), highlight_keyword(format(":="))}; body_sep = format{space(), colon(), space(), T_f, space(), highlight_keyword(format(":="))};
} else { } else {
body_sep = comma(); body_sep = comma();
} }
@ -414,7 +416,7 @@ struct pp_fn {
result p_domain = pp_scoped_child(domain0, depth); result p_domain = pp_scoped_child(domain0, depth);
result p_body = pp_scoped_child(b, depth); result p_body = pp_scoped_child(b, depth);
format sig = format{names, space(), colon(), space(), p_domain.first}; format sig = format{names, space(), colon(), space(), p_domain.first};
if (B) if (T)
sig = format{lp(), sig, rp()}; sig = format{lp(), sig, rp()};
format r_format = group(nest(m_indent, format{head, space(), sig, body_sep, line(), p_body.first})); format r_format = group(nest(m_indent, format{head, space(), sig, body_sep, line(), p_body.first}));
return mk_result(r_format, std::max(p_domain.second, p_body.second)+1); return mk_result(r_format, std::max(p_domain.second, p_body.second)+1);
@ -583,7 +585,7 @@ public:
return expr_formatter::operator()(kwd, n, t, v); return expr_formatter::operator()(kwd, n, t, v);
} else { } else {
lean_assert(is_lambda(v)); lean_assert(is_lambda(v));
format def = pp_fn(m_frontend, context(), m_options).pp_abstraction_core(v, 0, it1).first; format def = pp_fn(m_frontend, context(), m_options).pp_abstraction_core(v, 0, t).first;
return format{highlight_command(format(kwd)), space(), format(n), def}; return format{highlight_command(format(kwd)), space(), format(n), def};
} }
} }