Skip to content

Commit f1181a0

Browse files
Chris DoddChrisDodd
Chris Dodd
authored and
ChrisDodd
committed
Fix clang formatting
1 parent 6c8e85c commit f1181a0

File tree

706 files changed

+16364
-16342
lines changed

Some content is hidden

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

706 files changed

+16364
-16342
lines changed

‎.clang-format

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ AccessModifierOffset: -3
1919
IncludeBlocks: Regroup
2020
# Force pointers to the type for C++.
2121
DerivePointerAlignment: false
22-
PointerAlignment: Left
22+
PointerAlignment: Right
2323
Standard: c++17
2424
IncludeCategories:
2525
# Matches common headers first and sorts them before project includes

‎backends/bmv2/common/JsonObjects.cpp

+36-36
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ JsonObjects::JsonObjects() {
5252
field_aliases = insert_array_field(toplevel, "field_aliases");
5353
}
5454

55-
Util::JsonArray* 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,7 +63,7 @@ Util::JsonArray* JsonObjects::get_field_list_contents(unsigned id) const {
6363
return nullptr;
6464
}
6565

66-
Util::JsonObject* 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) {
6767
for (auto e : *array) {
6868
auto obj = e->to<Util::JsonObject>();
6969
auto val = obj->get("name")->to<Util::JsonValue>();
@@ -75,25 +75,25 @@ Util::JsonObject* JsonObjects::find_object_by_name(Util::JsonArray* array, const
7575
}
7676

7777
/// Insert a json array to a parent object under key 'name'.
78-
Util::JsonArray* JsonObjects::insert_array_field(Util::JsonObject* parent, cstring name) {
78+
Util::JsonArray *JsonObjects::insert_array_field(Util::JsonObject *parent, cstring name) {
7979
auto result = new Util::JsonArray();
8080
parent->emplace(name, result);
8181
return result;
8282
}
8383

8484
/// Append a json array to a parent json array.
85-
Util::JsonArray* JsonObjects::append_array(Util::JsonArray* parent) {
85+
Util::JsonArray *JsonObjects::append_array(Util::JsonArray *parent) {
8686
auto result = new Util::JsonArray();
8787
parent->append(result);
8888
return result;
8989
}
9090

9191
/// Insert a json array named 'parameters' in a parent json object.
92-
Util::JsonArray* JsonObjects::create_parameters(Util::JsonObject* object) {
92+
Util::JsonArray *JsonObjects::create_parameters(Util::JsonObject *object) {
9393
return insert_array_field(object, "parameters");
9494
}
9595

96-
void JsonObjects::add_program_info(const cstring& name) { toplevel->emplace("program", name); }
96+
void JsonObjects::add_program_info(const cstring &name) { toplevel->emplace("program", name); }
9797

9898
void JsonObjects::add_meta_info() {
9999
static constexpr int version_major = JSON_MAJOR_VERSION;
@@ -113,7 +113,7 @@ void JsonObjects::add_meta_info() {
113113
* if 0 header does not contain varbit fields
114114
* @param fields a JsonArray for the fields in the header
115115
*/
116-
unsigned JsonObjects::add_header_type(const cstring& name, Util::JsonArray*& fields,
116+
unsigned JsonObjects::add_header_type(const cstring &name, Util::JsonArray *&fields,
117117
unsigned max_length) {
118118
std::string sname(name, name.size());
119119
auto header_type_id_it = header_type_id.find(sname);
@@ -136,7 +136,7 @@ unsigned JsonObjects::add_header_type(const cstring& name, Util::JsonArray*& fie
136136
return id;
137137
}
138138

139-
unsigned JsonObjects::add_union_type(const cstring& name, Util::JsonArray*& fields) {
139+
unsigned JsonObjects::add_union_type(const cstring &name, Util::JsonArray *&fields) {
140140
std::string sname(name, name.size());
141141
auto it = union_type_id.find(sname);
142142
if (it != union_type_id.end()) return it->second;
@@ -156,7 +156,7 @@ unsigned JsonObjects::add_union_type(const cstring& name, Util::JsonArray*& fiel
156156
}
157157

158158
/// Create a header type with empty field list.
159-
unsigned JsonObjects::add_header_type(const cstring& name) {
159+
unsigned JsonObjects::add_header_type(const cstring &name) {
160160
std::string sname(name, name.size());
161161
auto header_type_id_it = header_type_id.find(sname);
162162
if (header_type_id_it != header_type_id.end()) {
@@ -175,16 +175,16 @@ unsigned JsonObjects::add_header_type(const cstring& name) {
175175

176176
/// Create a set of fields to an existing header type.
177177
/// The header type is decribed by the name.
178-
void JsonObjects::add_header_field(const cstring& name, Util::JsonArray*& field) {
178+
void JsonObjects::add_header_field(const cstring &name, Util::JsonArray *&field) {
179179
CHECK_NULL(field);
180-
Util::JsonObject* headerType = find_object_by_name(header_types, name);
181-
Util::JsonArray* fields = headerType->get("fields")->to<Util::JsonArray>();
180+
Util::JsonObject *headerType = find_object_by_name(header_types, name);
181+
Util::JsonArray *fields = headerType->get("fields")->to<Util::JsonArray>();
182182
BUG_CHECK(fields != nullptr, "header '%1%' not found", name);
183183
fields->append(field);
184184
}
185185

186186
/// Create a header instance in json.
187-
unsigned JsonObjects::add_header(const cstring& type, const cstring& name) {
187+
unsigned JsonObjects::add_header(const cstring &type, const cstring &name) {
188188
auto header = new Util::JsonObject();
189189
unsigned id = BMV2::nextId("headers");
190190
LOG1("add header id " << id);
@@ -198,8 +198,8 @@ unsigned JsonObjects::add_header(const cstring& type, const cstring& name) {
198198
}
199199

200200
/// Create a header_union instance in json.
201-
unsigned JsonObjects::add_union(const cstring& type, Util::JsonArray*& headers,
202-
const cstring& name) {
201+
unsigned JsonObjects::add_union(const cstring &type, Util::JsonArray *&headers,
202+
const cstring &name) {
203203
auto u = new Util::JsonObject();
204204
unsigned id = BMV2::nextId("header_unions");
205205
LOG3("add header_union id " << id);
@@ -212,7 +212,7 @@ unsigned JsonObjects::add_union(const cstring& type, Util::JsonArray*& headers,
212212
return id;
213213
}
214214

215-
unsigned JsonObjects::add_metadata(const cstring& type, const cstring& name) {
215+
unsigned JsonObjects::add_metadata(const cstring &type, const cstring &name) {
216216
auto header = new Util::JsonObject();
217217
unsigned id = BMV2::nextId("headers");
218218
LOG3("add metadata header id " << id);
@@ -225,8 +225,8 @@ unsigned JsonObjects::add_metadata(const cstring& type, const cstring& name) {
225225
return id;
226226
}
227227

228-
void JsonObjects::add_header_stack(const cstring& type, const cstring& name, const unsigned size,
229-
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) {
230230
auto stack = new Util::JsonObject();
231231
unsigned id = BMV2::nextId("stack");
232232
stack->emplace("name", name);
@@ -241,8 +241,8 @@ void JsonObjects::add_header_stack(const cstring& type, const cstring& name, con
241241
header_stacks->append(stack);
242242
}
243243

244-
void JsonObjects::add_header_union_stack(const cstring& type, const cstring& name,
245-
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) {
246246
auto stack = new Util::JsonObject();
247247
unsigned id = BMV2::nextId("union_stack");
248248
stack->emplace("name", name);
@@ -258,18 +258,18 @@ void JsonObjects::add_header_union_stack(const cstring& type, const cstring& nam
258258
}
259259

260260
/// Add an error to json.
261-
void JsonObjects::add_error(const cstring& name, const unsigned type) {
261+
void JsonObjects::add_error(const cstring &name, const unsigned type) {
262262
auto arr = append_array(errors);
263263
arr->append(name);
264264
arr->append(type);
265265
}
266266

267267
/// Add a single enum entry to json.
268268
/// A enum entry is identified with { enum_name, entry_name, entry_value }
269-
void JsonObjects::add_enum(const cstring& enum_name, const cstring& entry_name,
269+
void JsonObjects::add_enum(const cstring &enum_name, const cstring &entry_name,
270270
const unsigned entry_value) {
271271
// look up enum in json by name
272-
Util::JsonObject* enum_json = find_object_by_name(enums, enum_name);
272+
Util::JsonObject *enum_json = find_object_by_name(enums, enum_name);
273273
if (enum_json == nullptr) { // first entry in a new enum
274274
enum_json = new Util::JsonObject();
275275
enum_json->emplace("name", enum_name);
@@ -290,7 +290,7 @@ void JsonObjects::add_enum(const cstring& enum_name, const cstring& entry_name,
290290
}
291291
}
292292

293-
unsigned JsonObjects::add_parser(const cstring& name) {
293+
unsigned JsonObjects::add_parser(const cstring &name) {
294294
auto parser = new Util::JsonObject();
295295
unsigned id = BMV2::nextId("parser");
296296
parser->emplace("name", name);
@@ -306,7 +306,7 @@ unsigned JsonObjects::add_parser(const cstring& name) {
306306

307307
/// insert parser state into a parser identified by parser_id
308308
/// return the id of the parser state
309-
unsigned JsonObjects::add_parser_state(const unsigned parser_id, const cstring& state_name) {
309+
unsigned JsonObjects::add_parser_state(const unsigned parser_id, const cstring &state_name) {
310310
if (map_parser.find(parser_id) == map_parser.end()) BUG("parser %1% not found.", parser_id);
311311
auto parser = map_parser[parser_id];
312312
auto states = parser->get("parse_states")->to<Util::JsonArray>();
@@ -326,7 +326,7 @@ unsigned JsonObjects::add_parser_state(const unsigned parser_id, const cstring&
326326
return state_id;
327327
}
328328

329-
void JsonObjects::add_parser_transition(const unsigned state_id, Util::IJson* transition) {
329+
void JsonObjects::add_parser_transition(const unsigned state_id, Util::IJson *transition) {
330330
if (map_parser_state.find(state_id) == map_parser_state.end())
331331
BUG("parser state %1% not found.", state_id);
332332
auto state = map_parser_state[state_id];
@@ -337,7 +337,7 @@ void JsonObjects::add_parser_transition(const unsigned state_id, Util::IJson* tr
337337
transitions->append(trans);
338338
}
339339

340-
void JsonObjects::add_parser_op(const unsigned state_id, Util::IJson* op) {
340+
void JsonObjects::add_parser_op(const unsigned state_id, Util::IJson *op) {
341341
if (map_parser_state.find(state_id) == map_parser_state.end())
342342
BUG("parser state %1% not found.", state_id);
343343
auto state = map_parser_state[state_id];
@@ -346,7 +346,7 @@ void JsonObjects::add_parser_op(const unsigned state_id, Util::IJson* op) {
346346
statements->append(op);
347347
}
348348

349-
void 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) {
350350
if (map_parser_state.find(state_id) != map_parser_state.end()) {
351351
auto state = map_parser_state[state_id];
352352
auto keys = state->get("transition_key")->to<Util::JsonArray>();
@@ -358,8 +358,8 @@ void JsonObjects::add_parser_transition_key(const unsigned state_id, Util::IJson
358358
}
359359
}
360360

361-
void JsonObjects::add_parse_vset(const cstring& name, const unsigned bitwidth,
362-
const big_int& size) {
361+
void JsonObjects::add_parse_vset(const cstring &name, const unsigned bitwidth,
362+
const big_int &size) {
363363
auto parse_vset = new Util::JsonObject();
364364
unsigned id = BMV2::nextId("parse_vsets");
365365
parse_vset->emplace("name", name);
@@ -369,8 +369,8 @@ void JsonObjects::add_parse_vset(const cstring& name, const unsigned bitwidth,
369369
parse_vsets->append(parse_vset);
370370
}
371371

372-
unsigned JsonObjects::add_action(const cstring& name, Util::JsonArray*& params,
373-
Util::JsonArray*& body) {
372+
unsigned JsonObjects::add_action(const cstring &name, Util::JsonArray *&params,
373+
Util::JsonArray *&body) {
374374
CHECK_NULL(params);
375375
CHECK_NULL(body);
376376
auto action = new Util::JsonObject();
@@ -383,17 +383,17 @@ unsigned JsonObjects::add_action(const cstring& name, Util::JsonArray*& params,
383383
return id;
384384
}
385385

386-
void JsonObjects::add_extern_attribute(const cstring& name, const cstring& type,
387-
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) {
388388
auto attr = new Util::JsonObject();
389389
attr->emplace("name", name);
390390
attr->emplace("type", type);
391391
attr->emplace("value", value);
392392
attributes->append(attr);
393393
}
394394

395-
void JsonObjects::add_extern(const cstring& name, const cstring& type,
396-
Util::JsonArray* attributes) {
395+
void JsonObjects::add_extern(const cstring &name, const cstring &type,
396+
Util::JsonArray *attributes) {
397397
auto extn = new Util::JsonObject();
398398
unsigned id = BMV2::nextId("extern_instances");
399399
extn->emplace("name", name);

‎backends/bmv2/common/JsonObjects.h

+57-57
Original file line numberDiff line numberDiff line change
@@ -26,71 +26,71 @@ namespace BMV2 {
2626

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

31-
void add_program_info(const cstring& name);
31+
void add_program_info(const cstring &name);
3232
void add_meta_info();
33-
unsigned add_header_type(const cstring& name, Util::JsonArray*& fields, unsigned max_length);
34-
unsigned add_union_type(const cstring& name, Util::JsonArray*& fields);
35-
unsigned add_union(const cstring& type, Util::JsonArray*& fields, const cstring& name);
36-
unsigned add_header_type(const cstring& name);
37-
void add_header_field(const cstring& name, Util::JsonArray*& field);
38-
unsigned add_header(const cstring& type, const cstring& name);
39-
unsigned add_metadata(const cstring& type, const cstring& name);
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);
44-
void add_error(const cstring& name, const unsigned type);
45-
void add_enum(const cstring& enum_name, const cstring& entry_name, const unsigned entry_value);
46-
unsigned add_parser(const cstring& name);
47-
unsigned add_parser_state(const unsigned id, const cstring& state_name);
48-
void add_parser_transition(const unsigned id, Util::IJson* transition);
49-
void add_parser_op(const unsigned id, Util::IJson* op);
50-
void add_parser_transition_key(const unsigned id, Util::IJson* key);
51-
void add_parse_vset(const cstring& name, const unsigned bitwidth, const big_int& size);
52-
unsigned add_action(const cstring& name, Util::JsonArray*& params, Util::JsonArray*& body);
53-
void add_extern_attribute(const cstring& name, const cstring& type, const cstring& value,
54-
Util::JsonArray* attributes);
55-
void add_extern(const cstring& name, const cstring& type, Util::JsonArray* attributes);
33+
unsigned add_header_type(const cstring &name, Util::JsonArray *&fields, unsigned max_length);
34+
unsigned add_union_type(const cstring &name, Util::JsonArray *&fields);
35+
unsigned add_union(const cstring &type, Util::JsonArray *&fields, const cstring &name);
36+
unsigned add_header_type(const cstring &name);
37+
void add_header_field(const cstring &name, Util::JsonArray *&field);
38+
unsigned add_header(const cstring &type, const cstring &name);
39+
unsigned add_metadata(const cstring &type, const cstring &name);
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);
44+
void add_error(const cstring &name, const unsigned type);
45+
void add_enum(const cstring &enum_name, const cstring &entry_name, const unsigned entry_value);
46+
unsigned add_parser(const cstring &name);
47+
unsigned add_parser_state(const unsigned id, const cstring &state_name);
48+
void add_parser_transition(const unsigned id, Util::IJson *transition);
49+
void add_parser_op(const unsigned id, Util::IJson *op);
50+
void add_parser_transition_key(const unsigned id, Util::IJson *key);
51+
void add_parse_vset(const cstring &name, const unsigned bitwidth, const big_int &size);
52+
unsigned add_action(const cstring &name, Util::JsonArray *&params, Util::JsonArray *&body);
53+
void add_extern_attribute(const cstring &name, const cstring &type, const cstring &value,
54+
Util::JsonArray *attributes);
55+
void add_extern(const cstring &name, const cstring &type, Util::JsonArray *attributes);
5656
JsonObjects();
57-
Util::JsonArray* insert_array_field(Util::JsonObject* parent, cstring name);
58-
Util::JsonArray* append_array(Util::JsonArray* parent);
59-
Util::JsonArray* create_parameters(Util::JsonObject* object);
60-
Util::JsonObject* create_primitive(Util::JsonArray* parent, cstring name);
57+
Util::JsonArray *insert_array_field(Util::JsonObject *parent, cstring name);
58+
Util::JsonArray *append_array(Util::JsonArray *parent);
59+
Util::JsonArray *create_parameters(Util::JsonObject *object);
60+
Util::JsonObject *create_primitive(Util::JsonArray *parent, cstring name);
6161
// Given a field list id returns the array of values called "elements"
62-
Util::JsonArray* get_field_list_contents(unsigned id) const;
62+
Util::JsonArray *get_field_list_contents(unsigned id) const;
6363

64-
std::map<unsigned, Util::JsonObject*> map_parser;
65-
std::map<unsigned, Util::JsonObject*> map_parser_state;
64+
std::map<unsigned, Util::JsonObject *> map_parser;
65+
std::map<unsigned, Util::JsonObject *> map_parser_state;
6666

67-
Util::JsonObject* toplevel;
68-
Util::JsonObject* meta;
69-
Util::JsonArray* actions;
70-
Util::JsonArray* calculations;
71-
Util::JsonArray* checksums;
72-
Util::JsonArray* counters;
73-
Util::JsonArray* deparsers;
74-
Util::JsonArray* enums;
75-
Util::JsonArray* errors;
76-
Util::JsonArray* externs;
77-
Util::JsonArray* field_lists;
78-
Util::JsonArray* headers;
79-
Util::JsonArray* header_stacks;
80-
Util::JsonArray* header_types;
81-
Util::JsonArray* header_union_types;
82-
Util::JsonArray* header_unions;
83-
Util::JsonArray* header_union_stacks;
67+
Util::JsonObject *toplevel;
68+
Util::JsonObject *meta;
69+
Util::JsonArray *actions;
70+
Util::JsonArray *calculations;
71+
Util::JsonArray *checksums;
72+
Util::JsonArray *counters;
73+
Util::JsonArray *deparsers;
74+
Util::JsonArray *enums;
75+
Util::JsonArray *errors;
76+
Util::JsonArray *externs;
77+
Util::JsonArray *field_lists;
78+
Util::JsonArray *headers;
79+
Util::JsonArray *header_stacks;
80+
Util::JsonArray *header_types;
81+
Util::JsonArray *header_union_types;
82+
Util::JsonArray *header_unions;
83+
Util::JsonArray *header_union_stacks;
8484
ordered_map<std::string, unsigned> header_type_id;
8585
ordered_map<std::string, unsigned> union_type_id;
86-
Util::JsonArray* learn_lists;
87-
Util::JsonArray* meter_arrays;
88-
Util::JsonArray* parsers;
89-
Util::JsonArray* parse_vsets;
90-
Util::JsonArray* pipelines;
91-
Util::JsonArray* register_arrays;
92-
Util::JsonArray* force_arith;
93-
Util::JsonArray* field_aliases;
86+
Util::JsonArray *learn_lists;
87+
Util::JsonArray *meter_arrays;
88+
Util::JsonArray *parsers;
89+
Util::JsonArray *parse_vsets;
90+
Util::JsonArray *pipelines;
91+
Util::JsonArray *register_arrays;
92+
Util::JsonArray *force_arith;
93+
Util::JsonArray *field_aliases;
9494
};
9595

9696
} // namespace BMV2

0 commit comments

Comments
 (0)