Skip to content

Commit 5bf9be5

Browse files
dconeybedconeybe
authored
Merge 7670fdb into 96450bd 
2 parents 96450bd + 7670fdb commit 5bf9be5

20 files changed

+839
-723
lines changed

‎Firestore/Protos/lib/pretty_printing.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ def generate_definition(self):
9898

9999
result = '''\
100100
std::string %s::ToString(int indent) const {
101-
std::string header = PrintHeader(indent, "%s", this);
102-
std::string result;\n\n''' % (
101+
std::string tostring_header = PrintHeader(indent, "%s", this);
102+
std::string tostring_result;\n\n''' % (
103103
self.full_classname, self._short_classname)
104104

105105
for field in self._fields:
@@ -109,17 +109,17 @@ def generate_definition(self):
109109
if can_be_empty:
110110
result += '''
111111
bool is_root = indent == 0;
112-
if (!result.empty() || is_root) {
113-
std::string tail = PrintTail(indent);
114-
return header + result + tail;
112+
if (!tostring_result.empty() || is_root) {
113+
std::string tostring_tail = PrintTail(indent);
114+
return tostring_header + tostring_result + tostring_tail;
115115
} else {
116116
return "";
117117
}
118118
}\n\n'''
119119
else:
120120
result += '''
121-
std::string tail = PrintTail(indent);
122-
return header + result + tail;
121+
std::string tostring_tail = PrintTail(indent);
122+
return tostring_header + tostring_result + tostring_tail;
123123
}\n\n'''
124124

125125
return result
@@ -276,7 +276,7 @@ def _generate(self, indent_level, display_name, cc_name, function_name,
276276
always_print: Whether to print the field if it has its default value.
277277
"""
278278

279-
format_str = '%sresult += %s("%s ",%s%s, indent + 1, %s);\n'
279+
format_str = '%stostring_result += %s("%s ",%s%s, indent + 1, %s);\n'
280280
for maybe_linebreak in [' ', '\n' + _indent(indent_level + 1)]:
281281
args = (
282282
_indent(indent_level), function_name, display_name, maybe_linebreak,

‎Firestore/Protos/nanopb/firestore/bundle.nanopb.cc

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -114,98 +114,106 @@ const char* EnumToString(
114114
}
115115

116116
std::string firestore_BundledQuery::ToString(int indent) const {
117-
std::string header = PrintHeader(indent, "BundledQuery", this);
118-
std::string result;
117+
std::string tostring_header = PrintHeader(indent, "BundledQuery", this);
118+
std::string tostring_result;
119119

120-
result += PrintPrimitiveField("parent: ", parent, indent + 1, false);
120+
tostring_result += PrintPrimitiveField("parent: ",
121+
parent, indent + 1, false);
121122
switch (which_query_type) {
122123
case firestore_BundledQuery_structured_query_tag:
123-
result += PrintMessageField("structured_query ",
124+
tostring_result += PrintMessageField("structured_query ",
124125
structured_query, indent + 1, true);
125126
break;
126127
}
127-
result += PrintEnumField("limit_type: ", limit_type, indent + 1, false);
128+
tostring_result += PrintEnumField("limit_type: ",
129+
limit_type, indent + 1, false);
128130

129131
bool is_root = indent == 0;
130-
if (!result.empty() || is_root) {
131-
std::string tail = PrintTail(indent);
132-
return header + result + tail;
132+
if (!tostring_result.empty() || is_root) {
133+
std::string tostring_tail = PrintTail(indent);
134+
return tostring_header + tostring_result + tostring_tail;
133135
} else {
134136
return "";
135137
}
136138
}
137139

138140
std::string firestore_NamedQuery::ToString(int indent) const {
139-
std::string header = PrintHeader(indent, "NamedQuery", this);
140-
std::string result;
141+
std::string tostring_header = PrintHeader(indent, "NamedQuery", this);
142+
std::string tostring_result;
141143

142-
result += PrintPrimitiveField("name: ", name, indent + 1, false);
143-
result += PrintMessageField("bundled_query ",
144+
tostring_result += PrintPrimitiveField("name: ", name, indent + 1, false);
145+
tostring_result += PrintMessageField("bundled_query ",
144146
bundled_query, indent + 1, false);
145-
result += PrintMessageField("read_time ", read_time, indent + 1, false);
147+
tostring_result += PrintMessageField("read_time ",
148+
read_time, indent + 1, false);
146149

147-
std::string tail = PrintTail(indent);
148-
return header + result + tail;
150+
std::string tostring_tail = PrintTail(indent);
151+
return tostring_header + tostring_result + tostring_tail;
149152
}
150153

151154
std::string firestore_BundledDocumentMetadata::ToString(int indent) const {
152-
std::string header = PrintHeader(indent, "BundledDocumentMetadata", this);
153-
std::string result;
154-
155-
result += PrintPrimitiveField("name: ", name, indent + 1, false);
156-
result += PrintMessageField("read_time ", read_time, indent + 1, false);
157-
result += PrintPrimitiveField("exists: ", exists, indent + 1, false);
155+
std::string tostring_header = PrintHeader(indent, "BundledDocumentMetadata", this);
156+
std::string tostring_result;
157+
158+
tostring_result += PrintPrimitiveField("name: ", name, indent + 1, false);
159+
tostring_result += PrintMessageField("read_time ",
160+
read_time, indent + 1, false);
161+
tostring_result += PrintPrimitiveField("exists: ",
162+
exists, indent + 1, false);
158163
for (pb_size_t i = 0; i != queries_count; ++i) {
159-
result += PrintPrimitiveField("queries: ",
164+
tostring_result += PrintPrimitiveField("queries: ",
160165
queries[i], indent + 1, true);
161166
}
162167

163-
std::string tail = PrintTail(indent);
164-
return header + result + tail;
168+
std::string tostring_tail = PrintTail(indent);
169+
return tostring_header + tostring_result + tostring_tail;
165170
}
166171

167172
std::string firestore_BundleMetadata::ToString(int indent) const {
168-
std::string header = PrintHeader(indent, "BundleMetadata", this);
169-
std::string result;
173+
std::string tostring_header = PrintHeader(indent, "BundleMetadata", this);
174+
std::string tostring_result;
170175

171-
result += PrintPrimitiveField("id: ", id, indent + 1, false);
172-
result += PrintMessageField("create_time ",
176+
tostring_result += PrintPrimitiveField("id: ", id, indent + 1, false);
177+
tostring_result += PrintMessageField("create_time ",
173178
create_time, indent + 1, false);
174-
result += PrintPrimitiveField("version: ", version, indent + 1, false);
175-
result += PrintPrimitiveField("total_documents: ",
179+
tostring_result += PrintPrimitiveField("version: ",
180+
version, indent + 1, false);
181+
tostring_result += PrintPrimitiveField("total_documents: ",
176182
total_documents, indent + 1, false);
177-
result += PrintPrimitiveField("total_bytes: ",
183+
tostring_result += PrintPrimitiveField("total_bytes: ",
178184
total_bytes, indent + 1, false);
179185

180-
std::string tail = PrintTail(indent);
181-
return header + result + tail;
186+
std::string tostring_tail = PrintTail(indent);
187+
return tostring_header + tostring_result + tostring_tail;
182188
}
183189

184190
std::string firestore_BundleElement::ToString(int indent) const {
185-
std::string header = PrintHeader(indent, "BundleElement", this);
186-
std::string result;
191+
std::string tostring_header = PrintHeader(indent, "BundleElement", this);
192+
std::string tostring_result;
187193

188194
switch (which_element_type) {
189195
case firestore_BundleElement_metadata_tag:
190-
result += PrintMessageField("metadata ", metadata, indent + 1, true);
196+
tostring_result += PrintMessageField("metadata ",
197+
metadata, indent + 1, true);
191198
break;
192199
case firestore_BundleElement_named_query_tag:
193-
result += PrintMessageField("named_query ",
200+
tostring_result += PrintMessageField("named_query ",
194201
named_query, indent + 1, true);
195202
break;
196203
case firestore_BundleElement_document_metadata_tag:
197-
result += PrintMessageField("document_metadata ",
204+
tostring_result += PrintMessageField("document_metadata ",
198205
document_metadata, indent + 1, true);
199206
break;
200207
case firestore_BundleElement_document_tag:
201-
result += PrintMessageField("document ", document, indent + 1, true);
208+
tostring_result += PrintMessageField("document ",
209+
document, indent + 1, true);
202210
break;
203211
}
204212

205213
bool is_root = indent == 0;
206-
if (!result.empty() || is_root) {
207-
std::string tail = PrintTail(indent);
208-
return header + result + tail;
214+
if (!tostring_result.empty() || is_root) {
215+
std::string tostring_tail = PrintTail(indent);
216+
return tostring_header + tostring_result + tostring_tail;
209217
} else {
210218
return "";
211219
}

‎Firestore/Protos/nanopb/firestore/local/maybe_document.nanopb.cc

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -83,51 +83,54 @@ PB_STATIC_ASSERT((pb_membersize(firestore_client_NoDocument, read_time) < 256 &&
8383

8484

8585
std::string firestore_client_NoDocument::ToString(int indent) const {
86-
std::string header = PrintHeader(indent, "NoDocument", this);
87-
std::string result;
86+
std::string tostring_header = PrintHeader(indent, "NoDocument", this);
87+
std::string tostring_result;
8888

89-
result += PrintPrimitiveField("name: ", name, indent + 1, false);
90-
result += PrintMessageField("read_time ", read_time, indent + 1, false);
89+
tostring_result += PrintPrimitiveField("name: ", name, indent + 1, false);
90+
tostring_result += PrintMessageField("read_time ",
91+
read_time, indent + 1, false);
9192

92-
std::string tail = PrintTail(indent);
93-
return header + result + tail;
93+
std::string tostring_tail = PrintTail(indent);
94+
return tostring_header + tostring_result + tostring_tail;
9495
}
9596

9697
std::string firestore_client_UnknownDocument::ToString(int indent) const {
97-
std::string header = PrintHeader(indent, "UnknownDocument", this);
98-
std::string result;
98+
std::string tostring_header = PrintHeader(indent, "UnknownDocument", this);
99+
std::string tostring_result;
99100

100-
result += PrintPrimitiveField("name: ", name, indent + 1, false);
101-
result += PrintMessageField("version ", version, indent + 1, false);
101+
tostring_result += PrintPrimitiveField("name: ", name, indent + 1, false);
102+
tostring_result += PrintMessageField("version ",
103+
version, indent + 1, false);
102104

103-
std::string tail = PrintTail(indent);
104-
return header + result + tail;
105+
std::string tostring_tail = PrintTail(indent);
106+
return tostring_header + tostring_result + tostring_tail;
105107
}
106108

107109
std::string firestore_client_MaybeDocument::ToString(int indent) const {
108-
std::string header = PrintHeader(indent, "MaybeDocument", this);
109-
std::string result;
110+
std::string tostring_header = PrintHeader(indent, "MaybeDocument", this);
111+
std::string tostring_result;
110112

111113
switch (which_document_type) {
112114
case firestore_client_MaybeDocument_no_document_tag:
113-
result += PrintMessageField("no_document ",
115+
tostring_result += PrintMessageField("no_document ",
114116
no_document, indent + 1, true);
115117
break;
116118
case firestore_client_MaybeDocument_document_tag:
117-
result += PrintMessageField("document ", document, indent + 1, true);
119+
tostring_result += PrintMessageField("document ",
120+
document, indent + 1, true);
118121
break;
119122
case firestore_client_MaybeDocument_unknown_document_tag:
120-
result += PrintMessageField("unknown_document ",
123+
tostring_result += PrintMessageField("unknown_document ",
121124
unknown_document, indent + 1, true);
122125
break;
123126
}
124-
result += PrintPrimitiveField("has_committed_mutations: ",
127+
tostring_result += PrintPrimitiveField("has_committed_mutations: ",
125128
has_committed_mutations, indent + 1, false);
126129

127130
bool is_root = indent == 0;
128-
if (!result.empty() || is_root) {
129-
std::string tail = PrintTail(indent);
130-
return header + result + tail;
131+
if (!tostring_result.empty() || is_root) {
132+
std::string tostring_tail = PrintTail(indent);
133+
return tostring_header + tostring_result + tostring_tail;
131134
} else {
132135
return "";
133136
}

‎Firestore/Protos/nanopb/firestore/local/mutation.nanopb.cc

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -77,40 +77,42 @@ PB_STATIC_ASSERT((pb_membersize(firestore_client_WriteBatch, local_write_time) <
7777

7878

7979
std::string firestore_client_MutationQueue::ToString(int indent) const {
80-
std::string header = PrintHeader(indent, "MutationQueue", this);
81-
std::string result;
80+
std::string tostring_header = PrintHeader(indent, "MutationQueue", this);
81+
std::string tostring_result;
8282

83-
result += PrintPrimitiveField("last_acknowledged_batch_id: ",
83+
tostring_result += PrintPrimitiveField("last_acknowledged_batch_id: ",
8484
last_acknowledged_batch_id, indent + 1, false);
85-
result += PrintPrimitiveField("last_stream_token: ",
85+
tostring_result += PrintPrimitiveField("last_stream_token: ",
8686
last_stream_token, indent + 1, false);
8787

8888
bool is_root = indent == 0;
89-
if (!result.empty() || is_root) {
90-
std::string tail = PrintTail(indent);
91-
return header + result + tail;
89+
if (!tostring_result.empty() || is_root) {
90+
std::string tostring_tail = PrintTail(indent);
91+
return tostring_header + tostring_result + tostring_tail;
9292
} else {
9393
return "";
9494
}
9595
}
9696

9797
std::string firestore_client_WriteBatch::ToString(int indent) const {
98-
std::string header = PrintHeader(indent, "WriteBatch", this);
99-
std::string result;
98+
std::string tostring_header = PrintHeader(indent, "WriteBatch", this);
99+
std::string tostring_result;
100100

101-
result += PrintPrimitiveField("batch_id: ", batch_id, indent + 1, false);
101+
tostring_result += PrintPrimitiveField("batch_id: ",
102+
batch_id, indent + 1, false);
102103
for (pb_size_t i = 0; i != writes_count; ++i) {
103-
result += PrintMessageField("writes ", writes[i], indent + 1, true);
104+
tostring_result += PrintMessageField("writes ",
105+
writes[i], indent + 1, true);
104106
}
105-
result += PrintMessageField("local_write_time ",
107+
tostring_result += PrintMessageField("local_write_time ",
106108
local_write_time, indent + 1, false);
107109
for (pb_size_t i = 0; i != base_writes_count; ++i) {
108-
result += PrintMessageField("base_writes ",
110+
tostring_result += PrintMessageField("base_writes ",
109111
base_writes[i], indent + 1, true);
110112
}
111113

112-
std::string tail = PrintTail(indent);
113-
return header + result + tail;
114+
std::string tostring_tail = PrintTail(indent);
115+
return tostring_header + tostring_result + tostring_tail;
114116
}
115117

116118
} // namespace firestore

‎Firestore/Protos/nanopb/firestore/local/target.nanopb.cc

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -82,46 +82,49 @@ PB_STATIC_ASSERT((pb_membersize(firestore_client_Target, query) < 256 && pb_memb
8282

8383

8484
std::string firestore_client_Target::ToString(int indent) const {
85-
std::string header = PrintHeader(indent, "Target", this);
86-
std::string result;
85+
std::string tostring_header = PrintHeader(indent, "Target", this);
86+
std::string tostring_result;
8787

88-
result += PrintPrimitiveField("target_id: ", target_id, indent + 1, false);
89-
result += PrintMessageField("snapshot_version ",
88+
tostring_result += PrintPrimitiveField("target_id: ",
89+
target_id, indent + 1, false);
90+
tostring_result += PrintMessageField("snapshot_version ",
9091
snapshot_version, indent + 1, false);
91-
result += PrintPrimitiveField("resume_token: ",
92+
tostring_result += PrintPrimitiveField("resume_token: ",
9293
resume_token, indent + 1, false);
93-
result += PrintPrimitiveField("last_listen_sequence_number: ",
94+
tostring_result += PrintPrimitiveField("last_listen_sequence_number: ",
9495
last_listen_sequence_number, indent + 1, false);
9596
switch (which_target_type) {
9697
case firestore_client_Target_query_tag:
97-
result += PrintMessageField("query ", query, indent + 1, true);
98+
tostring_result += PrintMessageField("query ",
99+
query, indent + 1, true);
98100
break;
99101
case firestore_client_Target_documents_tag:
100-
result += PrintMessageField("documents ", documents, indent + 1, true);
102+
tostring_result += PrintMessageField("documents ",
103+
documents, indent + 1, true);
101104
break;
102105
}
103-
result += PrintMessageField("last_limbo_free_snapshot_version ",
106+
tostring_result += PrintMessageField("last_limbo_free_snapshot_version ",
104107
last_limbo_free_snapshot_version, indent + 1, false);
105108

106-
std::string tail = PrintTail(indent);
107-
return header + result + tail;
109+
std::string tostring_tail = PrintTail(indent);
110+
return tostring_header + tostring_result + tostring_tail;
108111
}
109112

110113
std::string firestore_client_TargetGlobal::ToString(int indent) const {
111-
std::string header = PrintHeader(indent, "TargetGlobal", this);
112-
std::string result;
114+
std::string tostring_header = PrintHeader(indent, "TargetGlobal", this);
115+
std::string tostring_result;
113116

114-
result += PrintPrimitiveField("highest_target_id: ",
117+
tostring_result += PrintPrimitiveField("highest_target_id: ",
115118
highest_target_id, indent + 1, false);
116-
result += PrintPrimitiveField("highest_listen_sequence_number: ",
119+
tostring_result += PrintPrimitiveField("highest_listen_sequence_number: ",
117120
highest_listen_sequence_number, indent + 1, false);
118-
result += PrintMessageField("last_remote_snapshot_version ",
121+
tostring_result += PrintMessageField("last_remote_snapshot_version ",
119122
last_remote_snapshot_version, indent + 1, false);
120-
result += PrintPrimitiveField("target_count: ",
123+
tostring_result += PrintPrimitiveField("target_count: ",
121124
target_count, indent + 1, false);
122125

123-
std::string tail = PrintTail(indent);
124-
return header + result + tail;
126+
std::string tostring_tail = PrintTail(indent);
127+
return tostring_header + tostring_result + tostring_tail;
125128
}
126129

127130
} // namespace firestore

0 commit comments

Comments
 (0)