Skip to content

Commit 6a7a21f

Browse files
don't break before multi-line string. don't break before assignment operator
1 parent f5c94ec commit 6a7a21f

19 files changed

+130
-181
lines changed

.clang-format

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ AllowShortIfStatementsOnASingleLine: true
1515
AllowShortLoopsOnASingleLine: false
1616
AlwaysBreakAfterDefinitionReturnType: None
1717
AlwaysBreakAfterReturnType: None
18-
AlwaysBreakBeforeMultilineStrings: true
18+
AlwaysBreakBeforeMultilineStrings: false
1919
AlwaysBreakTemplateDeclarations: true
2020
BinPackArguments: true
2121
BinPackParameters: false
@@ -34,7 +34,7 @@ BraceWrapping:
3434
SplitEmptyFunction: false
3535
SplitEmptyRecord: true
3636
SplitEmptyNamespace: true
37-
BreakBeforeBinaryOperators: All
37+
BreakBeforeBinaryOperators: NonAssignment
3838
BreakBeforeBraces: Custom
3939
BreakBeforeInheritanceComma: false
4040
BreakBeforeTernaryOperators: true

libs/librtlnumber/src/include/internal_bits.hpp

Lines changed: 29 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -61,110 +61,94 @@ constexpr bit_value_t l_buf[4] = {
6161
_0, _1, _x, _x};
6262
_static_unused(l_buf)
6363

64-
constexpr bit_value_t l_not[4]
65-
= {
64+
constexpr bit_value_t l_not[4] = {
6665
/* 0 1 x z <- a */
6766
_1, _0, _x, _x};
6867
_static_unused(l_not)
6968

70-
constexpr bit_value_t is_unk[4]
71-
= {
69+
constexpr bit_value_t is_unk[4] = {
7270
/* 0 1 x z <- a*/
7371
_0, _0, _1, _1};
7472
_static_unused(is_unk)
7573

76-
constexpr bit_value_t is_x_bit[4]
77-
= {
74+
constexpr bit_value_t is_x_bit[4] = {
7875
/* 0 1 x z <- a*/
7976
_0, _0, _1, _0};
8077
_static_unused(is_x_bit)
8178

82-
constexpr bit_value_t is_z_bit[4]
83-
= {
79+
constexpr bit_value_t is_z_bit[4] = {
8480
/* 0 1 x z <- a*/
8581
_0, _0, _0, _1};
8682
_static_unused(is_z_bit)
8783

88-
constexpr bit_value_t is_one_bit[4]
89-
= {
84+
constexpr bit_value_t is_one_bit[4] = {
9085
/* 0 1 x z <- a*/
9186
_0, _1, _0, _0};
9287
_static_unused(is_one_bit)
9388

94-
constexpr bit_value_t is_zero_bit[4]
95-
= {
89+
constexpr bit_value_t is_zero_bit[4] = {
9690
/* 0 1 x z <- a*/
9791
_1, _0, _0, _0};
9892
_static_unused(is_zero_bit)
9993

100-
constexpr bit_value_t l_and[4][4]
101-
= {
94+
constexpr bit_value_t l_and[4][4] = {
10295
/* a / 0 1 x z <-b */
10396
/* 0 */ {_0, _0, _0, _0},
10497
/* 1 */ {_0, _1, _x, _x},
10598
/* x */ {_0, _x, _x, _x},
10699
/* z */ {_0, _x, _x, _x}};
107100
_static_unused(l_and)
108101

109-
constexpr bit_value_t l_nand[4][4]
110-
= unroll_2d_invert(l_and);
102+
constexpr bit_value_t l_nand[4][4] = unroll_2d_invert(l_and);
111103
_static_unused(l_nand)
112104

113-
constexpr bit_value_t l_or[4][4]
114-
= {
105+
constexpr bit_value_t l_or[4][4] = {
115106
/* a / 0 1 x z <-b */
116107
/* 0 */ {_0, _1, _x, _x},
117108
/* 1 */ {_1, _1, _1, _1},
118109
/* x */ {_x, _1, _x, _x},
119110
/* z */ {_x, _1, _x, _x}};
120111
_static_unused(l_or)
121112

122-
constexpr bit_value_t l_nor[4][4]
123-
= unroll_2d_invert(l_or);
113+
constexpr bit_value_t l_nor[4][4] = unroll_2d_invert(l_or);
124114
_static_unused(l_nor)
125115

126-
constexpr bit_value_t l_xor[4][4]
127-
= {
116+
constexpr bit_value_t l_xor[4][4] = {
128117
/* a / 0 1 x z <-b */
129118
/* 0 */ {_0, _1, _x, _x},
130119
/* 1 */ {_1, _0, _x, _x},
131120
/* x */ {_x, _x, _x, _x},
132121
/* z */ {_x, _x, _x, _x}};
133122
_static_unused(l_xor)
134123

135-
constexpr bit_value_t l_xnor[4][4]
136-
= unroll_2d_invert(l_xor);
124+
constexpr bit_value_t l_xnor[4][4] = unroll_2d_invert(l_xor);
137125
_static_unused(l_xnor)
138126

139-
constexpr bit_value_t l_notif1[4][4]
140-
= {
127+
constexpr bit_value_t l_notif1[4][4] = {
141128
/* in / 0 1 x z <-control */
142129
/* 0 */ {_z, _1, _x, _x},
143130
/* 1 */ {_z, _0, _x, _x},
144131
/* x */ {_z, _x, _x, _x},
145132
/* z */ {_z, _x, _x, _x}};
146133
_static_unused(l_notif1)
147134

148-
constexpr bit_value_t l_notif0[4][4]
149-
= {
135+
constexpr bit_value_t l_notif0[4][4] = {
150136
/* in / 0 1 x z <-control */
151137
/* 0 */ {_1, _z, _x, _x},
152138
/* 1 */ {_0, _z, _x, _x},
153139
/* x */ {_x, _z, _x, _x},
154140
/* z */ {_x, _z, _x, _x}};
155141
_static_unused(l_notif0)
156142

157-
constexpr bit_value_t l_bufif1[4][4]
158-
= {
143+
constexpr bit_value_t l_bufif1[4][4] = {
159144
/* in / 0 1 x z <-control */
160145
/* 0 */ {_z, _0, _x, _x},
161146
/* 1 */ {_z, _1, _x, _x},
162147
/* x */ {_z, _x, _x, _x},
163148
/* z */ {_z, _x, _x, _x}};
164149
_static_unused(l_bufif1)
165150

166-
constexpr bit_value_t l_bufif0[4][4]
167-
= {
151+
constexpr bit_value_t l_bufif0[4][4] = {
168152
/* in / 0 1 x z <-control */
169153
/* 0 */ {_0, _z, _x, _x},
170154
/* 1 */ {_1, _z, _x, _x},
@@ -176,26 +160,23 @@ _static_unused(l_bufif0)
176160
* Tran NO SUPPORT FOR THESE YET
177161
*/
178162
/* cmos gates */
179-
constexpr bit_value_t l_rpmos[4][4]
180-
= {
163+
constexpr bit_value_t l_rpmos[4][4] = {
181164
/* in / 0 1 x z <-control */
182165
/* 0 */ {_0, _z, _x, _x},
183166
/* 1 */ {_1, _z, _x, _x},
184167
/* x */ {_x, _z, _x, _x},
185168
/* z */ {_z, _z, _z, _z}};
186169
_static_unused(l_rpmos)
187170

188-
constexpr bit_value_t l_rnmos[4][4]
189-
= {
171+
constexpr bit_value_t l_rnmos[4][4] = {
190172
/* in / 0 1 x z <-control */
191173
/* 0 */ {_z, _0, _x, _x},
192174
/* 1 */ {_z, _1, _x, _x},
193175
/* x */ {_z, _x, _x, _x},
194176
/* z */ {_z, _z, _z, _z}};
195177
_static_unused(l_rnmos)
196178

197-
constexpr bit_value_t l_nmos[4][4]
198-
= {
179+
constexpr bit_value_t l_nmos[4][4] = {
199180
/* in / 0 1 x z <-control */
200181
/* 0 */ {_z, _0, _x, _x},
201182
/* 1 */ {_z, _1, _x, _x},
@@ -204,8 +185,7 @@ _static_unused(l_rnmos)
204185
_static_unused(l_nmos)
205186

206187
// see table 5-21 p:54 IEEE 1364-2005
207-
constexpr bit_value_t l_ternary[4][4]
208-
= {
188+
constexpr bit_value_t l_ternary[4][4] = {
209189
/* in / 0 1 x z <-control */
210190
/* 0 */ {_0, _x, _x, _x},
211191
/* 1 */ {_x, _1, _x, _x},
@@ -217,70 +197,61 @@ _static_unused(l_ternary)
217197
* these extend the library and simplify the process
218198
*/
219199
/* helper */
220-
constexpr bit_value_t l_unk[4][4]
221-
= {
200+
constexpr bit_value_t l_unk[4][4] = {
222201
/* in / 0 1 x z <-control */
223202
/* 0 */ {_x, _x, _x, _x},
224203
/* 1 */ {_x, _x, _x, _x},
225204
/* x */ {_x, _x, _x, _x},
226205
/* z */ {_x, _x, _x, _x}};
227206
_static_unused(l_unk)
228207

229-
constexpr bit_value_t l_case_eq[4][4]
230-
= {
208+
constexpr bit_value_t l_case_eq[4][4] = {
231209
/* a / 0 1 x z <-b */
232210
/* 0 */ {_1, _0, _0, _0},
233211
/* 1 */ {_0, _1, _0, _0},
234212
/* x */ {_0, _0, _1, _0},
235213
/* z */ {_0, _0, _0, _1}};
236214
_static_unused(l_case_eq)
237215

238-
constexpr bit_value_t l_lt[4][4]
239-
= {
216+
constexpr bit_value_t l_lt[4][4] = {
240217
/* a / 0 1 x z <-b */
241218
/* 0 */ {_0, _1, _x, _x},
242219
/* 1 */ {_0, _0, _x, _x},
243220
/* x */ {_x, _x, _x, _x},
244221
/* z */ {_x, _x, _x, _x}};
245222
_static_unused(l_lt)
246223

247-
constexpr bit_value_t l_gt[4][4]
248-
= {
224+
constexpr bit_value_t l_gt[4][4] = {
249225
/* a / 0 1 x z <-b */
250226
/* 0 */ {_0, _0, _x, _x},
251227
/* 1 */ {_1, _0, _x, _x},
252228
/* x */ {_x, _x, _x, _x},
253229
/* z */ {_x, _x, _x, _x}};
254230
_static_unused(l_gt)
255231

256-
constexpr bit_value_t l_eq[4][4]
257-
= unroll_2d(l_xnor);
232+
constexpr bit_value_t l_eq[4][4] = unroll_2d(l_xnor);
258233
_static_unused(l_eq)
259234

260-
constexpr bit_value_t l_sum[4][4][4]
261-
= {
235+
constexpr bit_value_t l_sum[4][4][4] = {
262236
/* c_in */
263237
/* 0 */ unroll_2d(l_xor),
264238
/* 1 */ unroll_2d(l_xnor),
265239
/* x */ unroll_2d(l_unk),
266240
/* z */ unroll_2d(l_unk)};
267241
_static_unused(l_sum)
268242

269-
constexpr bit_value_t l_carry[4][4][4]
270-
= {
243+
constexpr bit_value_t l_carry[4][4][4] = {
271244
/* c_in */
272245
/* 0 */ unroll_2d(l_and),
273246
/* 1 */ unroll_2d(l_or),
274247
/* x */ unroll_2d(l_ternary),
275248
/* z */ unroll_2d(l_ternary)};
276249
_static_unused(l_carry)
277250

278-
constexpr bit_value_t l_half_carry[4][4]
279-
= unroll_2d(l_carry[_0]);
251+
constexpr bit_value_t l_half_carry[4][4] = unroll_2d(l_carry[_0]);
280252
_static_unused(l_half_carry)
281253

282-
constexpr bit_value_t l_half_sum[4][4]
283-
= unroll_2d(l_sum[_0]);
254+
constexpr bit_value_t l_half_sum[4][4] = unroll_2d(l_sum[_0]);
284255
_static_unused(l_half_sum)
285256

286257
static char bit_to_c(bit_value_t bit, bool uppercase) {

libs/libvtrutil/src/tl_optional.hpp

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,7 @@ struct optional_copy_assign_base<T, false> : optional_move_base<T> {
505505
return *this;
506506
}
507507
optional_copy_assign_base&
508-
operator=(optional_copy_assign_base&& rhs)
509-
= default;
508+
operator=(optional_copy_assign_base&& rhs) = default;
510509
};
511510

512511
// This class manages conditionally having a trivial move assignment operator
@@ -534,8 +533,7 @@ struct optional_move_assign_base<T, false> : optional_copy_assign_base<T> {
534533
optional_move_assign_base(optional_move_assign_base&& rhs) = default;
535534

536535
optional_move_assign_base&
537-
operator=(const optional_move_assign_base& rhs)
538-
= default;
536+
operator=(const optional_move_assign_base& rhs) = default;
539537

540538
optional_move_assign_base&
541539
operator=(optional_move_assign_base&& rhs) noexcept(
@@ -553,8 +551,7 @@ struct optional_delete_ctor_base {
553551
optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
554552
optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
555553
optional_delete_ctor_base&
556-
operator=(const optional_delete_ctor_base&)
557-
= default;
554+
operator=(const optional_delete_ctor_base&) = default;
558555
optional_delete_ctor_base&
559556
operator=(optional_delete_ctor_base&&) noexcept = default;
560557
};
@@ -565,8 +562,7 @@ struct optional_delete_ctor_base<T, true, false> {
565562
optional_delete_ctor_base(const optional_delete_ctor_base&) = default;
566563
optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
567564
optional_delete_ctor_base&
568-
operator=(const optional_delete_ctor_base&)
569-
= default;
565+
operator=(const optional_delete_ctor_base&) = default;
570566
optional_delete_ctor_base&
571567
operator=(optional_delete_ctor_base&&) noexcept = default;
572568
};
@@ -577,8 +573,7 @@ struct optional_delete_ctor_base<T, false, true> {
577573
optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
578574
optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = default;
579575
optional_delete_ctor_base&
580-
operator=(const optional_delete_ctor_base&)
581-
= default;
576+
operator=(const optional_delete_ctor_base&) = default;
582577
optional_delete_ctor_base&
583578
operator=(optional_delete_ctor_base&&) noexcept = default;
584579
};
@@ -589,8 +584,7 @@ struct optional_delete_ctor_base<T, false, false> {
589584
optional_delete_ctor_base(const optional_delete_ctor_base&) = delete;
590585
optional_delete_ctor_base(optional_delete_ctor_base&&) noexcept = delete;
591586
optional_delete_ctor_base&
592-
operator=(const optional_delete_ctor_base&)
593-
= default;
587+
operator=(const optional_delete_ctor_base&) = default;
594588
optional_delete_ctor_base&
595589
operator=(optional_delete_ctor_base&&) noexcept = default;
596590
};
@@ -605,8 +599,7 @@ struct optional_delete_assign_base {
605599
optional_delete_assign_base(const optional_delete_assign_base&) = default;
606600
optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
607601
optional_delete_assign_base&
608-
operator=(const optional_delete_assign_base&)
609-
= default;
602+
operator=(const optional_delete_assign_base&) = default;
610603
optional_delete_assign_base&
611604
operator=(optional_delete_assign_base&&) noexcept = default;
612605
};
@@ -617,8 +610,7 @@ struct optional_delete_assign_base<T, true, false> {
617610
optional_delete_assign_base(const optional_delete_assign_base&) = default;
618611
optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
619612
optional_delete_assign_base&
620-
operator=(const optional_delete_assign_base&)
621-
= default;
613+
operator=(const optional_delete_assign_base&) = default;
622614
optional_delete_assign_base&
623615
operator=(optional_delete_assign_base&&) noexcept = delete;
624616
};
@@ -629,8 +621,7 @@ struct optional_delete_assign_base<T, false, true> {
629621
optional_delete_assign_base(const optional_delete_assign_base&) = default;
630622
optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
631623
optional_delete_assign_base&
632-
operator=(const optional_delete_assign_base&)
633-
= delete;
624+
operator=(const optional_delete_assign_base&) = delete;
634625
optional_delete_assign_base&
635626
operator=(optional_delete_assign_base&&) noexcept = default;
636627
};
@@ -641,8 +632,7 @@ struct optional_delete_assign_base<T, false, false> {
641632
optional_delete_assign_base(const optional_delete_assign_base&) = default;
642633
optional_delete_assign_base(optional_delete_assign_base&&) noexcept = default;
643634
optional_delete_assign_base&
644-
operator=(const optional_delete_assign_base&)
645-
= delete;
635+
operator=(const optional_delete_assign_base&) = delete;
646636
optional_delete_assign_base&
647637
operator=(optional_delete_assign_base&&) noexcept = delete;
648638
};

libs/libvtrutil/src/vtr_prefix_sum.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ class PrefixSum2D {
219219
prefix_sum_[x - 1][y - 1];
220220
}
221221
}
222-
}
222+
}
223223

224224
/**
225225
* @brief Constructs a 2D prefix sum from a 2D grid of values.

odin_ii/src/ast/ast_util.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ void add_top_module_to_ast(ast_t* ast, ast_node_t* to_add) {
113113
oassert(ast);
114114
if (to_add) {
115115
ast->top_modules_count += 1;
116-
ast->top_modules
117-
= (ast_node_t**)vtr::realloc(ast->top_modules, sizeof(ast_node_t*) * ast->top_modules_count);
116+
ast->top_modules = (ast_node_t**)vtr::realloc(ast->top_modules, sizeof(ast_node_t*) * ast->top_modules_count);
118117

119118
ast->top_modules[ast->top_modules_count - 1] = to_add;
120119
}

0 commit comments

Comments
 (0)