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

refactor(util/sexpr/format): remove format constructors using std::initializer_list

Browse source 
For some reason lean.js (Lean compiled using emscripten) crashes when
this kind of constructor is used.
This commit is contained in:
Leonardo de Moura 2015-06-20 14:01:34 -07:00
parent d28c26b6eb
commit 3626bd83bf
4 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/kernel/level.cpp
View file

@ -523,7 +523,7 @@ format pp(level l, bool unicode, unsigned indent) {
return format("?") + format(meta_id(l));
case level_kind::Succ: {
auto p = to_offset(l);
return format{pp_child(p.first, unicode, indent), format("+"), format(p.second)};
return pp_child(p.first, unicode, indent) + format("+") + format(p.second);
}
case level_kind::Max: case level_kind::IMax: {
format r = format(is_max(l) ? "max" : "imax");

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

@ -27,7 +27,7 @@ static void tst1() {
format f_atom3(1);
format f_atom4(3.1415);
format f1(highlight(f_atom1), f_atom2);
format f2{f_atom1, f_atom2, highlight(f_atom3, format::format_color::ORANGE), f_atom4};
format f2 = f_atom1 + f_atom2 + highlight(f_atom3, format::format_color::ORANGE) + f_atom4;
format f3 = compose(f1, f2);
format f4 = nest(3, f3);
format f5 = line();

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

@ -255,11 +255,11 @@ int format::space_upto_line_break(sexpr const & s, int available, bool & found_n
}
format operator+(format const & f1, format const & f2) {
return format{f1, f2};
return compose(f1, f2);
}
format operator^(format const & f1, format const & f2) {
return format {f1, format(" "), f2};
return compose(f1, compose(format(" "), f2));
}
std::ostream & format::pretty(std::ostream & out, unsigned w, bool colors, format const & f) {

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

@ -55,9 +55,6 @@ private:
lean_assert(is_list(l));
return sexpr(sexpr(format_kind::FLAT_COMPOSE), l);
}
static inline sexpr sexpr_compose(std::initializer_list<sexpr> const & l) {
return sexpr_compose(sexpr(l));
}
static inline sexpr const & sexpr_compose_list(sexpr const & s) {
lean_assert(sexpr_kind(s) == format_kind::COMPOSE || sexpr_kind(s) == format_kind::FLAT_COMPOSE);
return cdr(s);
@ -111,16 +108,16 @@ private:
return static_cast<format_color>(to_int(cdr(s)));
}
static inline sexpr sexpr_color_end() {
return sexpr{sexpr(format_kind::COLOR_END)};
return sexpr(sexpr(format_kind::COLOR_END), sexpr());
}
static inline sexpr sexpr_highlight(sexpr const & s, format_color c) {
return sexpr_compose({sexpr_color_begin(c), s, sexpr_color_end()});
return sexpr_compose(sexpr(sexpr_color_begin(c), sexpr(s, sexpr(sexpr_color_end(), sexpr()))));
}
static inline sexpr sexpr_nil() {
return sexpr{sexpr(format::format_kind::NIL)};
return sexpr(sexpr(format::format_kind::NIL), sexpr());
}
static inline sexpr sexpr_line() {
return sexpr{sexpr(format::format_kind::LINE)};
return sexpr(sexpr(format::format_kind::LINE), sexpr());
}
// Functions used inside of pretty printing
@ -166,19 +163,6 @@ public:
explicit format(mpq const & v):m_value(sexpr_text(sexpr(v))) {}
format(format const & f1, format const & f2):m_value(sexpr_compose({f1.m_value, f2.m_value})) {}
format(format const & f):m_value(f.m_value) {}
format(std::initializer_list<format> const & l):format() {
lean_assert(l.size() >= 2);
auto it = l.begin();
sexpr const & s1 = (it++)->m_value;
sexpr const & s2 = (it++)->m_value;
m_value = sexpr_compose({s1, s2});
m_value = std::accumulate(it, l.end(), m_value,
[](sexpr const & result, const format f) {
return sexpr_compose({result, f.m_value});
});
}
format_kind kind() const {
return sexpr_kind(m_value);
}