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

fix(util/sexpr/format): retract change that may be creating problems for emscripten

Browse source
This commit is contained in:
Leonardo de Moura 2015-06-18 10:49:13 -07:00
parent 42c236eb2e
commit 694eef7f6a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/library/tactic/rewrite_tactic.cpp
View file

@ -1108,7 +1108,7 @@ class rewrite_fn {
r += t.pp(fmt); r += t.pp(fmt);
} }
format cs = pp_choice_symbols(m_lemma); format cs = pp_choice_symbols(m_lemma);
if (!cs.is_nil()) { if (!cs.is_nil_fmt()) {
r += line() + format("rewrite lemma uses the following overloaded symbols"); r += line() + format("rewrite lemma uses the following overloaded symbols");
r += nest(get_pp_indent(fmt.get_options()), line() + cs); r += nest(get_pp_indent(fmt.get_options()), line() + cs);
} }

2
src/util/sexpr/format.cpp
View file

@ -224,7 +224,7 @@ int format::space_upto_line_break(sexpr const & s, int available, bool & found_n
{ {
sexpr list = sexpr_compose_list(s); sexpr list = sexpr_compose_list(s);
int len = 0; int len = 0;
while (list && !found_newline) { while (!is_nil(list) && !found_newline) {
sexpr const & h = car(list); sexpr const & h = car(list);
list = cdr(list); list = cdr(list);
len += space_upto_line_break(h, available, found_newline); len += space_upto_line_break(h, available, found_newline);

2
src/util/sexpr/format.h
View file

@ -182,7 +182,7 @@ public:
format_kind kind() const { format_kind kind() const {
return sexpr_kind(m_value); return sexpr_kind(m_value);
} }
bool is_nil() const { return kind() == format_kind::NIL; } bool is_nil_fmt() const { return kind() == format_kind::NIL; }
unsigned hash() const { return m_value.hash(); } unsigned hash() const { return m_value.hash(); }
explicit operator bool() const { return static_cast<bool>(m_value); } explicit operator bool() const { return static_cast<bool>(m_value); }