andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Simplify pretty-print in JsonBuilder.

Browse Source 
GitOrigin-RevId: bf1606d732c665555fa744ade9cd498af6a5ccf7
This commit is contained in:
levlam 2019-08-13 18:33:32 +03:00
parent 2f7fc17460
commit c99486e667
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tdutils/td/utils/JsonBuilder.h
View File

@ -198,10 +198,13 @@ class JsonBuilder {
return offset_ >= 0; return offset_ >= 0;
} }
void print_offset() { void print_offset() {
if (offset_ >= 0) {
sb_ << '\n';
for (int x = 0; x < offset_; x++) { for (int x = 0; x < offset_; x++) {
sb_ << " "; sb_ << " ";
} }
} }
}
void dec_offset() { void dec_offset() {
if (offset_ >= 0) { if (offset_ >= 0) {
CHECK(offset_ > 0); CHECK(offset_ > 0);
@ -363,10 +366,7 @@ class JsonArrayScope : public JsonScope {
} }
void leave() { void leave() {
jb_->dec_offset(); jb_->dec_offset();
if (jb_->is_pretty()) {
*sb_ << "\n";
jb_->print_offset(); jb_->print_offset();
}
*sb_ << "]"; *sb_ << "]";
} }
template <class T> template <class T>
@ -385,10 +385,7 @@ class JsonArrayScope : public JsonScope {
} else { } else {
is_first_ = true; is_first_ = true;
} }
if (jb_->is_pretty()) {
*sb_ << "\n";
jb_->print_offset(); jb_->print_offset();
}
return jb_->enter_value(); return jb_->enter_value();
} }
@ -410,10 +407,7 @@ class JsonObjectScope : public JsonScope {
} }
void leave() { void leave() {
jb_->dec_offset(); jb_->dec_offset();
if (jb_->is_pretty()) {
*sb_ << "\n";
jb_->print_offset(); jb_->print_offset();
}
*sb_ << "}"; *sb_ << "}";
} }
template <class S, class T> template <class S, class T>
@ -432,10 +426,7 @@ class JsonObjectScope : public JsonScope {
} else { } else {
is_first_ = true; is_first_ = true;
} }
if (jb_->is_pretty()) {
*sb_ << "\n";
jb_->print_offset(); jb_->print_offset();
}
jb_->enter_value() << key; jb_->enter_value() << key;
if (jb_->is_pretty()) { if (jb_->is_pretty()) {
*sb_ << " : "; *sb_ << " : ";