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
|
/**
* @file semicolons.cpp
* Removes extra semicolons
*
* @author Ben Gardner
* @license GPL v2+
*/
#include "semicolons.h"
#include "prototypes.h"
static void remove_semicolon(Chunk *pc);
/**
* We are on a semicolon that is after an unidentified brace close.
* Check for what is before the brace open.
* Do not remove if it is a square close, word, type, or paren close.
*/
static void check_unknown_brace_close(Chunk *semi, Chunk *brace_close);
static void remove_semicolon(Chunk *pc)
{
LOG_FUNC_ENTRY();
LOG_FMT(LDELSEMI, "%s(%d): Removed semicolon: orig line is %zu, orig col is %zu",
__func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol());
log_func_stack_inline(LDELSEMI);
// TODO: do we want to shift stuff back a column?
Chunk::Delete(pc);
}
void remove_extra_semicolons()
{
LOG_FUNC_ENTRY();
Chunk *pc = Chunk::GetHead();
while (pc->IsNotNullChunk())
{
Chunk *next = pc->GetNextNcNnl();
Chunk *prev;
if ( pc->Is(CT_SEMICOLON)
&& !pc->TestFlags(PCF_IN_PREPROC)
&& (prev = pc->GetPrevNcNnl())->IsNotNullChunk())
{
LOG_FMT(LSCANSEMI, "%s(%d): Semi orig line is %zu, orig col is %zu, parent is %s, prev = '%s' [%s/%s]\n",
__func__, __LINE__, pc->GetOrigLine(), pc->GetOrigCol(), get_token_name(pc->GetParentType()),
prev->Text(),
get_token_name(prev->GetType()), get_token_name(prev->GetParentType()));
if (pc->GetParentType() == CT_TYPEDEF)
{
// keep it
}
else if ( prev->Is(CT_BRACE_CLOSE)
&& ( prev->GetParentType() == CT_ELSE
|| prev->GetParentType() == CT_ELSEIF
|| prev->GetParentType() == CT_FOR
|| prev->GetParentType() == CT_FUNC_CLASS_DEF
|| prev->GetParentType() == CT_FUNC_DEF
|| prev->GetParentType() == CT_IF
|| prev->GetParentType() == CT_NAMESPACE
|| prev->GetParentType() == CT_OC_MSG_DECL
|| prev->GetParentType() == CT_SWITCH
|| prev->GetParentType() == CT_USING_STMT
|| prev->GetParentType() == CT_WHILE))
{
// looking for code block vs. initialisation
bool code_block_found = true;
Chunk *closing_brace = pc->GetPrevNcNnl(); // Issue #3506
if (closing_brace->IsNotNullChunk())
{
Chunk *opening_brace = closing_brace->GetOpeningParen();
if (opening_brace->IsNotNullChunk())
{
Chunk *equal_sign = opening_brace->GetPrevNcNnl();
if ( equal_sign->IsNotNullChunk()
&& equal_sign->Is(CT_ASSIGN))
{
// initialisation found
code_block_found = false;
}
}
}
if (code_block_found)
{
// code block found
remove_semicolon(pc);
}
}
else if ( prev->Is(CT_BRACE_CLOSE)
&& prev->GetParentType() == CT_NONE)
{
check_unknown_brace_close(pc, prev);
}
else if ( prev->Is(CT_SEMICOLON)
&& prev->GetParentType() != CT_FOR)
{
remove_semicolon(pc);
}
else if ( language_is_set(LANG_D)
&& ( prev->GetParentType() == CT_ENUM
|| prev->GetParentType() == CT_STRUCT
|| prev->GetParentType() == CT_UNION))
{
remove_semicolon(pc);
}
else if ( language_is_set(LANG_JAVA)
&& prev->GetParentType() == CT_SYNCHRONIZED)
{
remove_semicolon(pc);
}
else if (prev->Is(CT_BRACE_OPEN))
{
remove_semicolon(pc);
}
}
pc = next;
}
} // remove_extra_semicolons
static void check_unknown_brace_close(Chunk *semi, Chunk *brace_close)
{
LOG_FUNC_ENTRY();
Chunk *pc = brace_close->GetPrevType(CT_BRACE_OPEN, brace_close->GetLevel());
pc = pc->GetPrevNcNnl();
if ( pc->IsNotNullChunk()
&& pc->IsNot(CT_ANGLE_CLOSE)
&& pc->IsNot(CT_COND_COLON) // Issue #3920
&& pc->IsNot(CT_RETURN)
&& pc->IsNot(CT_SQUARE_CLOSE)
&& pc->IsNot(CT_TSQUARE)
&& pc->IsNot(CT_TYPE)
&& pc->IsNot(CT_WORD)
&& !pc->IsParenClose())
{
remove_semicolon(semi);
}
}
|
