1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
|
/**
* @file parens.cpp
* Adds or removes parens.
*
* @author Ben Gardner
* @license GPL v2+
*/
#include "parens.h"
#include "log_rules.h"
using namespace uncrustify;
//! Add an open parenthesis after first and add a close parenthesis before the last
static void add_parens_between(Chunk *first, Chunk *last);
/**
* Scans between two parens and adds additional parens if needed.
* This function is recursive. If it hits another open paren, it'll call itself
* with the new bounds.
*
* Adds optional parens in an IF or SWITCH conditional statement.
*
* This basically just checks for a CT_COMPARE that isn't surrounded by parens.
* The edges for the compare are the open, close and any CT_BOOL tokens.
*
* This only handles VERY simple patterns:
* (!a && b) => (!a && b) -- no change
* (a && b == 1) => (a && (b == 1))
* (a == 1 || b > 2) => ((a == 1) || (b > 2))
*
* FIXME: we really should bail if we transition between a preprocessor and
* a non-preprocessor
*/
static void check_bool_parens(Chunk *popen, Chunk *pclose, int nest);
void do_parens()
{
constexpr static auto LCURRENT = LPARADD;
LOG_FUNC_ENTRY();
log_rule_B("mod_full_paren_if_bool");
if (options::mod_full_paren_if_bool())
{
Chunk *pc = Chunk::GetHead();
while ((pc = pc->GetNextNcNnl())->IsNotNullChunk())
{
if ( pc->IsNot(CT_SPAREN_OPEN)
|| ( pc->GetParentType() != CT_IF
&& pc->GetParentType() != CT_ELSEIF
&& pc->GetParentType() != CT_SWITCH))
{
continue;
}
// Grab the close sparen
Chunk *pclose = pc->GetNextType(CT_SPAREN_CLOSE, pc->GetLevel(), E_Scope::PREPROC);
if (pclose->IsNotNullChunk())
{
check_bool_parens(pc, pclose, 0);
pc = pclose;
}
}
}
} // do_parens
void do_parens_assign() // Issue #3316
{
constexpr static auto LCURRENT = LPARADD;
LOG_FUNC_ENTRY();
log_rule_B("mod_full_paren_assign_bool");
if (options::mod_full_paren_assign_bool())
{
Chunk *pc = Chunk::GetHead();
while ((pc = pc->GetNextNcNnl())->IsNotNullChunk())
{
if (pc->Is(CT_ASSIGN))
{
if (pc->TestFlags(PCF_IN_SPAREN)) // Issue #4239
{
continue;
}
LOG_FMT(LPARADD, "%s(%d): orig line is %zu, orig col is %zu, text is '%s', level is %zu\n",
__func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), pc->Text(), pc->GetLevel());
// look before for a open sparen
size_t check_level = pc->GetLevel();
Chunk *p = pc->GetPrevNc(E_Scope::PREPROC);
while (p->IsNotNullChunk())
{
LOG_FMT(LPARADD, "%s(%d): orig line is %zu, text is '%s', level is %zu, type is %s\n",
__func__, __LINE__, p->GetOrigLine(), p->Text(), p->GetLevel(), get_token_name(p->GetType()));
//log_pcf_flags(LPARADD, p->GetFlags());
if (p->TestFlags(PCF_STMT_START))
{
break;
}
if (p->Is(CT_PAREN_OPEN))
{
check_level--;
}
if (p->Is(CT_SPAREN_OPEN))
{
break;
}
p = p->GetPrevNc(E_Scope::PREPROC);
if (p->GetLevel() < check_level - 1)
{
break;
}
}
LOG_FMT(LPARADD, "%s(%d): orig line is %zu, text is '%s', level is %zu, type is %s\n",
__func__, __LINE__, p->GetOrigLine(), p->Text(), p->GetLevel(), get_token_name(p->GetType()));
if (p->GetParentType() == CT_WHILE)
{
continue;
}
// Grab the semicolon
Chunk *semicolon = pc->GetNextType(CT_SEMICOLON, pc->GetLevel(), E_Scope::PREPROC);
if (semicolon->IsNotNullChunk())
{
check_bool_parens(pc, semicolon, 0);
pc = semicolon;
}
}
}
}
} // do_parens_assign
void do_parens_return() // Issue #3316
{
constexpr static auto LCURRENT = LPARADD;
LOG_FUNC_ENTRY();
log_rule_B("mod_full_paren_return_bool");
if (options::mod_full_paren_return_bool())
{
Chunk *pc = Chunk::GetHead();
while ((pc = pc->GetNextNcNnl())->IsNotNullChunk())
{
if (pc->Is(CT_RETURN))
{
LOG_FMT(LPARADD, "%s(%d): orig line is %zu, text is '%s', level is %zu\n",
__func__, __LINE__, pc->GetOrigLine(), pc->Text(), pc->GetLevel());
// look before for a open sparen
size_t check_level = pc->GetLevel();
Chunk *p = pc->GetPrevNc(E_Scope::PREPROC);
while (p->IsNotNullChunk())
{
LOG_FMT(LPARADD, "%s(%d): orig line is %zu, text is '%s', level is %zu, type is %s\n",
__func__, __LINE__, p->GetOrigLine(), p->Text(), p->GetLevel(), get_token_name(p->GetType()));
//log_pcf_flags(LPARADD, p->GetFlags());
if (p->TestFlags(PCF_STMT_START))
{
break;
}
if (p->Is(CT_PAREN_OPEN))
{
check_level--;
}
if (p->Is(CT_SPAREN_OPEN))
{
break;
}
p = p->GetPrevNc(E_Scope::PREPROC);
if (p->GetLevel() < check_level - 1)
{
break;
}
}
LOG_FMT(LPARADD, "%s(%d): orig line is %zu, text is '%s', level is %zu, type is %s\n",
__func__, __LINE__, p->GetOrigLine(), p->Text(), p->GetLevel(), get_token_name(p->GetType()));
if (p->GetParentType() == CT_WHILE)
{
continue;
}
// Grab the semicolon
Chunk *semicolon = pc->GetNextType(CT_SEMICOLON, pc->GetLevel(), E_Scope::PREPROC);
if (semicolon->IsNotNullChunk())
{
check_bool_parens(pc, semicolon, 0);
pc = semicolon;
}
}
}
}
} // do_parens_return
static void add_parens_between(Chunk *first, Chunk *last)
{
LOG_FUNC_ENTRY();
LOG_FMT(LPARADD, "%s(%d): first: line %zu, col %zu, between '%s' [lvl is %zu] and\n",
__func__, __LINE__, first->GetOrigLine(), first->GetOrigCol(),
first->Text(), first->GetLevel());
LOG_FMT(LPARADD, "%s(%d): last: line %zu, col %zu, '%s' [lvl is %zu]\n",
__func__, __LINE__, last->GetOrigLine(), last->GetOrigCol(),
last->Text(), last->GetLevel());
// Don't do anything if we have a bad sequence, ie "&& )"
Chunk *first_n = first->GetNextNcNnl();
if (first_n == last)
{
return;
}
Chunk pc;
pc.SetType(CT_PAREN_OPEN);
pc.SetOrigLine(first_n->GetOrigLine());
pc.SetColumn(first_n->GetColumn()); // Issue #3236
pc.SetOrigCol(first_n->GetOrigCol()); // Issue #3236
pc.SetOrigColEnd(first_n->GetOrigColEnd()); // Issue #3236
pc.Str() = "(";
pc.SetFlags(first_n->GetFlags() & PCF_COPY_FLAGS);
pc.SetLevel(first_n->GetLevel());
pc.SetPpLevel(first_n->GetPpLevel());
pc.SetBraceLevel(first_n->GetBraceLevel());
pc.CopyAndAddBefore(first_n);
shift_the_rest_of_the_line(first_n); // Issue #3236
Chunk *last_prev = last->GetPrevNcNnl(E_Scope::PREPROC);
pc.SetType(CT_PAREN_CLOSE);
pc.SetOrigLine(last_prev->GetOrigLine());
pc.SetOrigCol(last_prev->GetOrigCol());
pc.SetColumn(last_prev->GetColumn() + 1); // Issue #3236
pc.SetOrigCol(last_prev->GetOrigCol() + 1); // Issue #3236
pc.SetOrigColEnd(last_prev->GetOrigColEnd() + 1); // Issue #3236
pc.Str() = ")";
pc.SetFlags(last_prev->GetFlags() & PCF_COPY_FLAGS);
pc.SetLevel(last_prev->GetLevel());
pc.SetPpLevel(last_prev->GetPpLevel());
pc.SetBraceLevel(last_prev->GetBraceLevel());
pc.CopyAndAddAfter(last_prev);
shift_the_rest_of_the_line(last); // Issue #3236
for (Chunk *tmp = first_n;
tmp != last_prev;
tmp = tmp->GetNextNcNnl())
{
tmp->SetLevel(tmp->GetLevel() + 1);
}
last_prev->SetLevel(last_prev->GetLevel() + 1);
} // add_parens_between
static void check_bool_parens(Chunk *popen, Chunk *pclose, int nest)
{
LOG_FUNC_ENTRY();
Chunk *ref = popen;
bool hit_compare = false;
LOG_FMT(LPARADD, "%s(%d): nest is %d, popen on line %zu, orig col is %zu, pclose on line %zu, orig col is %zu, level is %zu\n",
__func__, __LINE__, nest,
popen->GetOrigLine(), popen->GetOrigCol(),
pclose->GetOrigLine(), pclose->GetOrigCol(),
popen->GetLevel());
Chunk *pc = popen;
while ( (pc = pc->GetNextNcNnl())->IsNotNullChunk()
&& pc != pclose)
{
if (pc->TestFlags(PCF_IN_PREPROC))
{
LOG_FMT(LPARADD2, " -- bail on PP %s [%s] at line %zu col %zu, level %zu\n",
get_token_name(pc->GetType()),
pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
return;
}
if ( pc->Is(CT_BOOL)
|| pc->Is(CT_QUESTION)
|| pc->Is(CT_COND_COLON)
|| pc->Is(CT_COMMA))
{
LOG_FMT(LPARADD2, " -- %s [%s] at line %zu col %zu, level %zu\n",
get_token_name(pc->GetType()),
pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
if (hit_compare)
{
hit_compare = false;
if (!language_is_set(LANG_CS))
{
add_parens_between(ref, pc);
}
}
ref = pc;
}
else if (pc->Is(CT_COMPARE))
{
LOG_FMT(LPARADD2, " -- compare '%s' at line %zu, orig col is %zu, level is %zu\n",
pc->Text(), pc->GetOrigLine(), pc->GetOrigCol(), pc->GetLevel());
hit_compare = true;
}
else if (pc->IsParenOpen())
{
Chunk *next = pc->GetClosingParen();
if (next->IsNotNullChunk())
{
check_bool_parens(pc, next, nest + 1);
pc = next;
}
}
else if (pc->Is(CT_SEMICOLON)) // Issue #3236
{
ref = pc;
}
else if ( pc->Is(CT_BRACE_OPEN)
|| pc->Is(CT_SQUARE_OPEN)
|| pc->Is(CT_ANGLE_OPEN))
{
// Skip [], {}, and <>
pc = pc->GetClosingParen();
}
}
if ( hit_compare
&& ref != popen
&& !language_is_set(LANG_CS))
{
add_parens_between(ref, pclose);
}
} // check_bool_parens
|
