Skip to content

Commit 50ab712

Browse files
committed
C-based parsers,style: adjust placements of "{" after if
Signed-off-by: Masatake YAMATO <[email protected]>
1 parent 7e5c8dc commit 50ab712

File tree

1 file changed

+32
-16
lines changed

1 file changed

+32
-16
lines changed

parsers/c-based.c

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,8 @@ static bool findScopeHierarchy (vString *const string, const statementInfo *cons
11341134
{
11351135
if (s->declaration == DECL_PRIVATE ||
11361136
s->declaration == DECL_PROTECTED ||
1137-
s->declaration == DECL_PUBLIC) {
1137+
s->declaration == DECL_PUBLIC)
1138+
{
11381139
continue;
11391140
}
11401141

@@ -1757,11 +1758,13 @@ static void setAccess (statementInfo *const st, const accessType access)
17571758
st->member.access = access;
17581759
cppUngetc (c);
17591760
}
1760-
else if (c == ':') {
1761+
else if (c == ':')
1762+
{
17611763
reinitStatement (st, false);
17621764
st->member.accessDefault = access;
17631765
}
1764-
else {
1766+
else
1767+
{
17651768
cppUngetc (c);
17661769
}
17671770
}
@@ -2177,12 +2180,15 @@ static void analyzePostParens (statementInfo *const st, parenInfo *const info)
21772180
cppUngetc (c);
21782181
if (isOneOf (c, "{;,="))
21792182
;
2180-
else if (isInputLanguage (Lang_java)) {
2181-
2182-
if (!insideAnnotationBody(st)) {
2183+
else if (isInputLanguage (Lang_java))
2184+
{
2185+
if (!insideAnnotationBody(st))
2186+
{
21832187
skipJavaThrows (st);
21842188
}
2185-
} else {
2189+
}
2190+
else
2191+
{
21862192
if (! skipPostArgumentStuff (st, info))
21872193
{
21882194
verbose (
@@ -2201,19 +2207,27 @@ static bool languageSupportsGenerics (void)
22012207
static void processAngleBracket (void)
22022208
{
22032209
int c = cppGetc ();
2204-
if (c == '>') {
2210+
if (c == '>')
2211+
{
22052212
/* already found match for template */
2206-
} else if (languageSupportsGenerics () && c != '<' && c != '=') {
2213+
}
2214+
else if (languageSupportsGenerics () && c != '<' && c != '=')
2215+
{
22072216
/* this is a template */
22082217
cppUngetc (c);
22092218
skipToMatch ("<>");
2210-
} else if (c == '<') {
2219+
}
2220+
else if (c == '<')
2221+
{
22112222
/* skip "<<" or "<<=". */
22122223
c = cppGetc ();
2213-
if (c != '=') {
2224+
if (c != '=')
2225+
{
22142226
cppUngetc (c);
22152227
}
2216-
} else {
2228+
}
2229+
else
2230+
{
22172231
cppUngetc (c);
22182232
}
22192233
}
@@ -2650,7 +2664,8 @@ static void parseGeneralToken (statementInfo *const st, const int c)
26502664
{
26512665
parseAtMarkStyleAnnotation (st);
26522666
}
2653-
else if (c == STRING_SYMBOL) {
2667+
else if (c == STRING_SYMBOL)
2668+
{
26542669
setToken(st, TOKEN_NONE);
26552670
}
26562671
}
@@ -2830,7 +2845,8 @@ static int tagCheck (statementInfo *const st)
28302845
{
28312846
if (st->declaration == DECL_TEMPLATE)
28322847
corkIndex = qualifyBlockTag (st, prev2);
2833-
else if (st->declaration == DECL_FUNCTION_TEMPLATE) {
2848+
else if (st->declaration == DECL_FUNCTION_TEMPLATE)
2849+
{
28342850
corkIndex = qualifyFunctionTag (st, st->blockName);
28352851
}
28362852
else if (st->haveQualifyingName)
@@ -2875,8 +2891,8 @@ static int tagCheck (statementInfo *const st)
28752891
break;
28762892

28772893
case TOKEN_KEYWORD:
2878-
2879-
if (token->keyword == KEYWORD_DEFAULT && isType(prev, TOKEN_ARGS) && insideAnnotationBody(st)) {
2894+
if (token->keyword == KEYWORD_DEFAULT && isType(prev, TOKEN_ARGS) && insideAnnotationBody(st))
2895+
{
28802896
corkIndex = qualifyFunctionDeclTag(st, prev2);
28812897
}
28822898
break;

0 commit comments

Comments
 (0)