Skip to content

Commit e26a49d

Browse files
fruffyfruffy
authored
Enforce clang-format on the entire code base. (#3679)
1 parent cfe574d commit e26a49d

File tree

504 files changed

+20896
-22402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

504 files changed

+20896
-22402
lines changed

‎backends/bmv2/common/JsonObjects.cpp

+48-77
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
#include "lib/json.h"
1817
#include "JsonObjects.h"
18+
1919
#include "helpers.h"
20+
#include "lib/json.h"
2021

2122
namespace BMV2 {
2223

@@ -51,8 +52,7 @@ JsonObjects::JsonObjects() {
5152
field_aliases = insert_array_field(toplevel, "field_aliases");
5253
}
5354

54-
Util::JsonArray*
55-
JsonObjects::get_field_list_contents(unsigned id) const {
55+
Util::JsonArray* JsonObjects::get_field_list_contents(unsigned id) const {
5656
for (auto e : *field_lists) {
5757
auto obj = e->to<Util::JsonObject>();
5858
auto val = obj->get("id")->to<Util::JsonValue>();
@@ -63,8 +63,7 @@ JsonObjects::get_field_list_contents(unsigned id) const {
6363
return nullptr;
6464
}
6565

66-
Util::JsonObject*
67-
JsonObjects::find_object_by_name(Util::JsonArray* array, const cstring& name) {
66+
Util::JsonObject* JsonObjects::find_object_by_name(Util::JsonArray* array, const cstring& name) {
6867
for (auto e : *array) {
6968
auto obj = e->to<Util::JsonObject>();
7069
auto val = obj->get("name")->to<Util::JsonValue>();
@@ -76,34 +75,27 @@ JsonObjects::find_object_by_name(Util::JsonArray* array, const cstring& name) {
7675
}
7776

7877
/// Insert a json array to a parent object under key 'name'.
79-
Util::JsonArray*
80-
JsonObjects::insert_array_field(Util::JsonObject* parent, cstring name) {
78+
Util::JsonArray* JsonObjects::insert_array_field(Util::JsonObject* parent, cstring name) {
8179
auto result = new Util::JsonArray();
8280
parent->emplace(name, result);
8381
return result;
8482
}
8583

8684
/// Append a json array to a parent json array.
87-
Util::JsonArray*
88-
JsonObjects::append_array(Util::JsonArray* parent) {
85+
Util::JsonArray* JsonObjects::append_array(Util::JsonArray* parent) {
8986
auto result = new Util::JsonArray();
9087
parent->append(result);
9188
return result;
9289
}
9390

9491
/// Insert a json array named 'parameters' in a parent json object.
95-
Util::JsonArray*
96-
JsonObjects::create_parameters(Util::JsonObject* object) {
92+
Util::JsonArray* JsonObjects::create_parameters(Util::JsonObject* object) {
9793
return insert_array_field(object, "parameters");
9894
}
9995

100-
void
101-
JsonObjects::add_program_info(const cstring& name) {
102-
toplevel->emplace("program", name);
103-
}
96+
void JsonObjects::add_program_info(const cstring& name) { toplevel->emplace("program", name); }
10497

105-
void
106-
JsonObjects::add_meta_info() {
98+
void JsonObjects::add_meta_info() {
10799
static constexpr int version_major = JSON_MAJOR_VERSION;
108100
static constexpr int version_minor = JSON_MINOR_VERSION;
109101
auto version = insert_array_field(meta, "version");
@@ -121,8 +113,8 @@ JsonObjects::add_meta_info() {
121113
* if 0 header does not contain varbit fields
122114
* @param fields a JsonArray for the fields in the header
123115
*/
124-
unsigned
125-
JsonObjects::add_header_type(const cstring& name, Util::JsonArray*& fields, unsigned max_length) {
116+
unsigned JsonObjects::add_header_type(const cstring& name, Util::JsonArray*& fields,
117+
unsigned max_length) {
126118
std::string sname(name, name.size());
127119
auto header_type_id_it = header_type_id.find(sname);
128120
if (header_type_id_it != header_type_id.end()) {
@@ -139,18 +131,15 @@ JsonObjects::add_header_type(const cstring& name, Util::JsonArray*& fields, unsi
139131
auto temp = new Util::JsonArray();
140132
header_type->emplace("fields", temp);
141133
}
142-
if (max_length > 0)
143-
header_type->emplace("max_length", max_length);
134+
if (max_length > 0) header_type->emplace("max_length", max_length);
144135
header_types->append(header_type);
145136
return id;
146137
}
147138

148-
unsigned
149-
JsonObjects::add_union_type(const cstring& name, Util::JsonArray*& fields) {
139+
unsigned JsonObjects::add_union_type(const cstring& name, Util::JsonArray*& fields) {
150140
std::string sname(name, name.size());
151141
auto it = union_type_id.find(sname);
152-
if (it != union_type_id.end())
153-
return it->second;
142+
if (it != union_type_id.end()) return it->second;
154143
auto union_type = new Util::JsonObject();
155144
unsigned id = BMV2::nextId("header_union_types");
156145
union_type_id[sname] = id;
@@ -166,10 +155,8 @@ JsonObjects::add_union_type(const cstring& name, Util::JsonArray*& fields) {
166155
return id;
167156
}
168157

169-
170158
/// Create a header type with empty field list.
171-
unsigned
172-
JsonObjects::add_header_type(const cstring& name) {
159+
unsigned JsonObjects::add_header_type(const cstring& name) {
173160
std::string sname(name, name.size());
174161
auto header_type_id_it = header_type_id.find(sname);
175162
if (header_type_id_it != header_type_id.end()) {
@@ -188,8 +175,7 @@ JsonObjects::add_header_type(const cstring& name) {
188175

189176
/// Create a set of fields to an existing header type.
190177
/// The header type is decribed by the name.
191-
void
192-
JsonObjects::add_header_field(const cstring& name, Util::JsonArray*& field) {
178+
void JsonObjects::add_header_field(const cstring& name, Util::JsonArray*& field) {
193179
CHECK_NULL(field);
194180
Util::JsonObject* headerType = find_object_by_name(header_types, name);
195181
Util::JsonArray* fields = headerType->get("fields")->to<Util::JsonArray>();
@@ -198,8 +184,7 @@ JsonObjects::add_header_field(const cstring& name, Util::JsonArray*& field) {
198184
}
199185

200186
/// Create a header instance in json.
201-
unsigned
202-
JsonObjects::add_header(const cstring& type, const cstring& name) {
187+
unsigned JsonObjects::add_header(const cstring& type, const cstring& name) {
203188
auto header = new Util::JsonObject();
204189
unsigned id = BMV2::nextId("headers");
205190
LOG1("add header id " << id);
@@ -213,8 +198,8 @@ JsonObjects::add_header(const cstring& type, const cstring& name) {
213198
}
214199

215200
/// Create a header_union instance in json.
216-
unsigned
217-
JsonObjects::add_union(const cstring& type, Util::JsonArray*& headers, const cstring& name) {
201+
unsigned JsonObjects::add_union(const cstring& type, Util::JsonArray*& headers,
202+
const cstring& name) {
218203
auto u = new Util::JsonObject();
219204
unsigned id = BMV2::nextId("header_unions");
220205
LOG3("add header_union id " << id);
@@ -227,8 +212,7 @@ JsonObjects::add_union(const cstring& type, Util::JsonArray*& headers, const cst
227212
return id;
228213
}
229214

230-
unsigned
231-
JsonObjects::add_metadata(const cstring& type, const cstring& name) {
215+
unsigned JsonObjects::add_metadata(const cstring& type, const cstring& name) {
232216
auto header = new Util::JsonObject();
233217
unsigned id = BMV2::nextId("headers");
234218
LOG3("add metadata header id " << id);
@@ -241,9 +225,8 @@ JsonObjects::add_metadata(const cstring& type, const cstring& name) {
241225
return id;
242226
}
243227

244-
void
245-
JsonObjects::add_header_stack(const cstring& type, const cstring& name,
246-
const unsigned size, const std::vector<unsigned>& ids) {
228+
void JsonObjects::add_header_stack(const cstring& type, const cstring& name, const unsigned size,
229+
const std::vector<unsigned>& ids) {
247230
auto stack = new Util::JsonObject();
248231
unsigned id = BMV2::nextId("stack");
249232
stack->emplace("name", name);
@@ -258,9 +241,8 @@ JsonObjects::add_header_stack(const cstring& type, const cstring& name,
258241
header_stacks->append(stack);
259242
}
260243

261-
void
262-
JsonObjects::add_header_union_stack(const cstring& type, const cstring& name,
263-
const unsigned size, const std::vector<unsigned>& ids) {
244+
void JsonObjects::add_header_union_stack(const cstring& type, const cstring& name,
245+
const unsigned size, const std::vector<unsigned>& ids) {
264246
auto stack = new Util::JsonObject();
265247
unsigned id = BMV2::nextId("union_stack");
266248
stack->emplace("name", name);
@@ -276,18 +258,16 @@ JsonObjects::add_header_union_stack(const cstring& type, const cstring& name,
276258
}
277259

278260
/// Add an error to json.
279-
void
280-
JsonObjects::add_error(const cstring& name, const unsigned type) {
261+
void JsonObjects::add_error(const cstring& name, const unsigned type) {
281262
auto arr = append_array(errors);
282263
arr->append(name);
283264
arr->append(type);
284265
}
285266

286267
/// Add a single enum entry to json.
287268
/// A enum entry is identified with { enum_name, entry_name, entry_value }
288-
void
289-
JsonObjects::add_enum(const cstring& enum_name, const cstring& entry_name,
290-
const unsigned entry_value) {
269+
void JsonObjects::add_enum(const cstring& enum_name, const cstring& entry_name,
270+
const unsigned entry_value) {
291271
// look up enum in json by name
292272
Util::JsonObject* enum_json = find_object_by_name(enums, enum_name);
293273
if (enum_json == nullptr) { // first entry in a new enum
@@ -310,8 +290,7 @@ JsonObjects::add_enum(const cstring& enum_name, const cstring& entry_name,
310290
}
311291
}
312292

313-
unsigned
314-
JsonObjects::add_parser(const cstring& name) {
293+
unsigned JsonObjects::add_parser(const cstring& name) {
315294
auto parser = new Util::JsonObject();
316295
unsigned id = BMV2::nextId("parser");
317296
parser->emplace("name", name);
@@ -327,10 +306,8 @@ JsonObjects::add_parser(const cstring& name) {
327306

328307
/// insert parser state into a parser identified by parser_id
329308
/// return the id of the parser state
330-
unsigned
331-
JsonObjects::add_parser_state(const unsigned parser_id, const cstring& state_name) {
332-
if (map_parser.find(parser_id) == map_parser.end())
333-
BUG("parser %1% not found.", parser_id);
309+
unsigned JsonObjects::add_parser_state(const unsigned parser_id, const cstring& state_name) {
310+
if (map_parser.find(parser_id) == map_parser.end()) BUG("parser %1% not found.", parser_id);
334311
auto parser = map_parser[parser_id];
335312
auto states = parser->get("parse_states")->to<Util::JsonArray>();
336313
auto state = new Util::JsonObject();
@@ -349,8 +326,7 @@ JsonObjects::add_parser_state(const unsigned parser_id, const cstring& state_nam
349326
return state_id;
350327
}
351328

352-
void
353-
JsonObjects::add_parser_transition(const unsigned state_id, Util::IJson* transition) {
329+
void JsonObjects::add_parser_transition(const unsigned state_id, Util::IJson* transition) {
354330
if (map_parser_state.find(state_id) == map_parser_state.end())
355331
BUG("parser state %1% not found.", state_id);
356332
auto state = map_parser_state[state_id];
@@ -361,8 +337,7 @@ JsonObjects::add_parser_transition(const unsigned state_id, Util::IJson* transit
361337
transitions->append(trans);
362338
}
363339

364-
void
365-
JsonObjects::add_parser_op(const unsigned state_id, Util::IJson* op) {
340+
void JsonObjects::add_parser_op(const unsigned state_id, Util::IJson* op) {
366341
if (map_parser_state.find(state_id) == map_parser_state.end())
367342
BUG("parser state %1% not found.", state_id);
368343
auto state = map_parser_state[state_id];
@@ -371,22 +346,20 @@ JsonObjects::add_parser_op(const unsigned state_id, Util::IJson* op) {
371346
statements->append(op);
372347
}
373348

374-
void
375-
JsonObjects::add_parser_transition_key(const unsigned state_id, Util::IJson* newKey) {
349+
void JsonObjects::add_parser_transition_key(const unsigned state_id, Util::IJson* newKey) {
376350
if (map_parser_state.find(state_id) != map_parser_state.end()) {
377-
auto state = map_parser_state[state_id];
378-
auto keys = state->get("transition_key")->to<Util::JsonArray>();
379-
CHECK_NULL(keys);
380-
auto new_keys = newKey->to<Util::JsonArray>();
381-
for (auto k : *new_keys) {
382-
keys->append(k);
383-
}
351+
auto state = map_parser_state[state_id];
352+
auto keys = state->get("transition_key")->to<Util::JsonArray>();
353+
CHECK_NULL(keys);
354+
auto new_keys = newKey->to<Util::JsonArray>();
355+
for (auto k : *new_keys) {
356+
keys->append(k);
357+
}
384358
}
385359
}
386360

387-
void
388-
JsonObjects::add_parse_vset(const cstring& name, const unsigned bitwidth,
389-
const big_int& size) {
361+
void JsonObjects::add_parse_vset(const cstring& name, const unsigned bitwidth,
362+
const big_int& size) {
390363
auto parse_vset = new Util::JsonObject();
391364
unsigned id = BMV2::nextId("parse_vsets");
392365
parse_vset->emplace("name", name);
@@ -396,8 +369,8 @@ JsonObjects::add_parse_vset(const cstring& name, const unsigned bitwidth,
396369
parse_vsets->append(parse_vset);
397370
}
398371

399-
unsigned
400-
JsonObjects::add_action(const cstring& name, Util::JsonArray*& params, Util::JsonArray*& body) {
372+
unsigned JsonObjects::add_action(const cstring& name, Util::JsonArray*& params,
373+
Util::JsonArray*& body) {
401374
CHECK_NULL(params);
402375
CHECK_NULL(body);
403376
auto action = new Util::JsonObject();
@@ -410,19 +383,17 @@ JsonObjects::add_action(const cstring& name, Util::JsonArray*& params, Util::Jso
410383
return id;
411384
}
412385

413-
void
414-
JsonObjects::add_extern_attribute(const cstring& name, const cstring& type,
415-
const cstring& value, Util::JsonArray* attributes) {
386+
void JsonObjects::add_extern_attribute(const cstring& name, const cstring& type,
387+
const cstring& value, Util::JsonArray* attributes) {
416388
auto attr = new Util::JsonObject();
417389
attr->emplace("name", name);
418390
attr->emplace("type", type);
419391
attr->emplace("value", value);
420392
attributes->append(attr);
421393
}
422394

423-
void
424-
JsonObjects::add_extern(const cstring& name, const cstring& type,
425-
Util::JsonArray* attributes) {
395+
void JsonObjects::add_extern(const cstring& name, const cstring& type,
396+
Util::JsonArray* attributes) {
426397
auto extn = new Util::JsonObject();
427398
unsigned id = BMV2::nextId("extern_instances");
428399
extn->emplace("name", name);

‎backends/bmv2/common/JsonObjects.h

+10-12
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ limitations under the License.
1818
#define BACKENDS_BMV2_COMMON_JSONOBJECTS_H_
1919

2020
#include <map>
21+
2122
#include "lib/json.h"
2223
#include "lib/ordered_map.h"
2324

2425
namespace BMV2 {
2526

2627
class JsonObjects {
2728
public:
28-
static Util::JsonObject* find_object_by_name(Util::JsonArray* array,
29-
const cstring& name);
29+
static Util::JsonObject* find_object_by_name(Util::JsonArray* array, const cstring& name);
3030

3131
void add_program_info(const cstring& name);
3232
void add_meta_info();
@@ -37,23 +37,21 @@ class JsonObjects {
3737
void add_header_field(const cstring& name, Util::JsonArray*& field);
3838
unsigned add_header(const cstring& type, const cstring& name);
3939
unsigned add_metadata(const cstring& type, const cstring& name);
40-
void add_header_stack(const cstring& type, const cstring& name,
41-
const unsigned size, const std::vector<unsigned>& header_ids);
42-
void add_header_union_stack(const cstring& type, const cstring& name,
43-
const unsigned size, const std::vector<unsigned>& header_ids);
40+
void add_header_stack(const cstring& type, const cstring& name, const unsigned size,
41+
const std::vector<unsigned>& header_ids);
42+
void add_header_union_stack(const cstring& type, const cstring& name, const unsigned size,
43+
const std::vector<unsigned>& header_ids);
4444
void add_error(const cstring& name, const unsigned type);
45-
void add_enum(const cstring& enum_name, const cstring& entry_name,
46-
const unsigned entry_value);
45+
void add_enum(const cstring& enum_name, const cstring& entry_name, const unsigned entry_value);
4746
unsigned add_parser(const cstring& name);
4847
unsigned add_parser_state(const unsigned id, const cstring& state_name);
4948
void add_parser_transition(const unsigned id, Util::IJson* transition);
5049
void add_parser_op(const unsigned id, Util::IJson* op);
5150
void add_parser_transition_key(const unsigned id, Util::IJson* key);
52-
void add_parse_vset(const cstring& name, const unsigned bitwidth,
53-
const big_int& size);
51+
void add_parse_vset(const cstring& name, const unsigned bitwidth, const big_int& size);
5452
unsigned add_action(const cstring& name, Util::JsonArray*& params, Util::JsonArray*& body);
55-
void add_extern_attribute(const cstring& name, const cstring& type,
56-
const cstring& value, Util::JsonArray* attributes);
53+
void add_extern_attribute(const cstring& name, const cstring& type, const cstring& value,
54+
Util::JsonArray* attributes);
5755
void add_extern(const cstring& name, const cstring& type, Util::JsonArray* attributes);
5856
JsonObjects();
5957
Util::JsonArray* insert_array_field(Util::JsonObject* parent, cstring name);

0 commit comments

Comments
 (0)