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

feat(frontends/lean/pp): minimize number of spaces when pretty printing notation

Browse source
This commit is contained in:
Leonardo de Moura 2014-10-19 13:08:15 -07:00
parent ed1afe26bd
commit 4d4bc0551f
5 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/frontends/lean/pp.cpp
View file

@ -691,6 +691,13 @@ auto pretty_fn::pp_notation_child(expr const & e, unsigned lbp, unsigned rbp) ->
} }
} }
static bool add_extra_space(name const & tk) {
// TODO(Leo): this is a hard-coded temporary solution for deciding whether extra
// spaces should be added or not when pretty printing notation.
// We should implement a better solution in the future.
return tk != "," && tk != "(" && tk != ")";
}
auto pretty_fn::pp_notation(notation_entry const & entry, buffer<optional<expr>> & args) -> optional<result> { auto pretty_fn::pp_notation(notation_entry const & entry, buffer<optional<expr>> & args) -> optional<result> {
if (entry.is_numeral()) { if (entry.is_numeral()) {
return some(result(format(entry.get_num()))); return some(result(format(entry.get_num())));
@ -703,7 +710,8 @@ auto pretty_fn::pp_notation(notation_entry const & entry, buffer<optional<expr>>
unsigned i = ts.size(); unsigned i = ts.size();
unsigned last_rbp = max_bp()-1; unsigned last_rbp = max_bp()-1;
unsigned token_lbp = 0; unsigned token_lbp = 0;
bool last = true; bool extra_space = false;
bool last = true;
while (i > 0) { while (i > 0) {
--i; --i;
format curr; format curr;
@ -723,7 +731,10 @@ auto pretty_fn::pp_notation(notation_entry const & entry, buffer<optional<expr>>
args.pop_back(); args.pop_back();
result e_r = pp_notation_child(e, token_lbp, a.rbp()); result e_r = pp_notation_child(e, token_lbp, a.rbp());
format e_fmt = e_r.fmt(); format e_fmt = e_r.fmt();
curr = format(tk) + space() + e_fmt; curr = format(tk);
if (add_extra_space(tk))
curr = curr + space();
curr = curr + e_fmt;
if (last) if (last)
last_rbp = a.rbp(); last_rbp = a.rbp();
break; break;
@ -764,6 +775,8 @@ auto pretty_fn::pp_notation(notation_entry const & entry, buffer<optional<expr>>
unsigned curr_lbp = token_lbp; unsigned curr_lbp = token_lbp;
if (auto t = a.get_terminator()) { if (auto t = a.get_terminator()) {
curr = format(*t); curr = format(*t);
if (add_extra_space(*t))
curr = space() + curr;
curr_lbp = get_some_precedence(m_token_table, *t); curr_lbp = get_some_precedence(m_token_table, *t);
} }
unsigned i = rec_args.size(); unsigned i = rec_args.size();
@ -774,7 +787,9 @@ auto pretty_fn::pp_notation(notation_entry const & entry, buffer<optional<expr>>
result arg_res = pp_notation_child(rec_args[i], curr_lbp, a.rbp()); result arg_res = pp_notation_child(rec_args[i], curr_lbp, a.rbp());
if (i == 0) if (i == 0)
sep_fmt = format(tk); sep_fmt = format(tk);
curr = sep_fmt + space() + arg_res.fmt() + space() + curr; curr = sep_fmt + space() + arg_res.fmt() + curr;
if (i > 0 && add_extra_space(a.get_sep()))
curr = space() + curr;
curr_lbp = sep_lbp; curr_lbp = sep_lbp;
} }
break; break;
@ -836,8 +851,11 @@ auto pretty_fn::pp_notation(notation_entry const & entry, buffer<optional<expr>>
fmt = curr; fmt = curr;
last = false; last = false;
} else { } else {
fmt = curr + space() + fmt; if (extra_space)
curr = curr + space();
fmt = curr + fmt;
} }
extra_space = add_extra_space(tk);
} }
unsigned first_lbp = token_lbp; unsigned first_lbp = token_lbp;
if (!entry.is_nud()) { if (!entry.is_nud()) {

8
tests/lean/notation3.lean.expected.out
View file

@ -1,5 +1,5 @@
notation3.lean:2:0: warning: imported file uses 'sorry' notation3.lean:2:0: warning: imported file uses 'sorry'
[ a , b , b ] : list num [ a, b, b ] : list num
( a , true , a = b , b ) : num × Prop × Prop × num (a, true, a = b, b) : num × Prop × Prop × num
( a , b ) : num × num (a, b) : num × num
[ 1 , 2 + 2 , 3 ] : list num [ 1, 2 + 2, 3 ] : list num

8
tests/lean/notation4.lean.expected.out
View file

@ -1,5 +1,5 @@
notation4.lean:2:0: warning: imported file uses 'sorry' notation4.lean:2:0: warning: imported file uses 'sorry'
∃ (A : Type₁) (x y : A) , x = y : Prop ∃ (A : Type₁) (x y : A), x = y : Prop
∃ (x : num) , x = 0 : Prop ∃ (x : num), x = 0 : Prop
Σ (x : num) , x = 10 : Type₁ Σ (x : num), x = 10 : Type₁
Σ (A : Type₁) , list A : Type₂ Σ (A : Type₁), list A : Type₂

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

@ -7,6 +7,6 @@ has type
B B
but is expected to have type but is expected to have type
N N
[ x , y , z , x , y , y ] : list [ x, y, z, x, y, y ] : list
[ x ] : list [ x ] : list
[ ] : list [ ] : list

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

@ -1,3 +1,3 @@
∃ (x : A) , p x : bool ∃ (x : A), p x : bool
∃ (x y : A) , q x y : bool ∃ (x y : A), q x y : bool
λ (x : A), x : A → A λ (x : A), x : A → A