Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-01 20:28:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tools/nxstyle: align a right brace with the brace it closes

Browse source 
Braces were only tested against a multiple of the indentation unit, so
one at the wrong level still passed.

Signed-off-by: raiden00pl <raiden00@railab.me>
Assisted-by: Claude Code
This commit is contained in:
raiden00pl 2026-07-27 12:20:12 +02:00
parent ea2f8e5cbf
commit 79872b0a2e
No known key found for this signature in database
GPG key ID: 80BDA883437A37B1
1 changed files with 68 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

72
tools/nxstyle.c
View file

@ -48,6 +48,7 @@
#define LINE_SIZE 512
#define RANGE_NUMBER 4096
#define DEFAULT_WIDTH 78
#define MAX_BRACE 64
#define FIRST_SECTION INCLUDED_FILES
#define LAST_SECTION PUBLIC_FUNCTION_PROTOTYPES
@ -1389,6 +1390,11 @@ int main(int argc, char **argv, char **envp)
const char *ctrl_kw; /* Control keyword whose header is being parsed */
const char *brace_kw; /* Control keyword still waiting for its left brace */
int ctrl_hdrend; /* Index of the last character of that header */
int ctrl_indent; /* Indentation of that control keyword */
int brace_indent; /* Indentation of the keyword awaiting a brace */
int ctrl_brace; /* Alignment required of a brace on this line, or -1 */
int rbrace_match; /* Alignment of the left brace closed on this line */
int lbrace_indent[MAX_BRACE]; /* Indentation of each open left brace */
enum pptype_e ppline; /* > 0: The next line the continuation of a
* pre-processor command */
int rhcomment; /* Indentation of Comment to the right of code
@ -1532,6 +1538,8 @@ int main(int argc, char **argv, char **envp)
ctrl_kw = NULL; /* Control keyword being parsed */
brace_kw = NULL; /* Control keyword waiting for a brace */
ctrl_hdrend = -1; /* Index of the end of that header */
ctrl_indent = 0; /* Indentation of that control keyword */
brace_indent = 0; /* Indentation of the awaiting keyword */
bif = false; /* True: This line is beginning of a 'if' statement */
ppline = PPLINE_NONE; /* > 0: The next line the continuation of a
* pre-processor command */
@ -1569,6 +1577,8 @@ int main(int argc, char **argv, char **envp)
bppline = false; /* True: This line is a pre-processor line */
bctrlline = false; /* No control statement starts on this line */
ctrl_hdrend = -1; /* The header has not ended on this line yet */
ctrl_brace = -1; /* No brace is required on this line */
rbrace_match = -1; /* No left brace is closed on this line */
/* If we are not in a comment, then this certainly is not a right-hand
* comment.
@ -2348,7 +2358,8 @@ int main(int argc, char **argv, char **envp)
if (bnest > 0 && dnest == 0 && ctrl_kw == NULL)
{
bctrlline = true;
bctrlline = true;
ctrl_indent = indent;
if (check_keyword(line, indent, "else"))
{
@ -2806,6 +2817,16 @@ int main(int argc, char **argv, char **envp)
}
bnest++;
/* Remember where a brace beginning a line sits, so the
* brace closing it can be checked. -1 for any other.
*/
if (bnest >= 1 && bnest <= MAX_BRACE)
{
lbrace_indent[bnest - 1] = n == indent ? indent : -1;
}
if (dnest > 0)
{
dnest++;
@ -2845,6 +2866,13 @@ int main(int argc, char **argv, char **envp)
bnest = 0;
bswitch = false;
}
/* Recover the alignment of the matching left brace */
if (n == indent && bnest < MAX_BRACE)
{
rbrace_match = lbrace_indent[bnest];
}
}
/* Decrement the declaration nesting level */
@ -3592,7 +3620,13 @@ int main(int argc, char **argv, char **envp)
* an 'else if', or alternatives sharing the braces that follow.
*/
if (line[indent] != '{' && !bctrlline)
if (line[indent] == '{')
{
/* The brace sits one level in from the keyword */
ctrl_brace = brace_indent + 2;
}
else if (!bctrlline)
{
snprintf(buffer, sizeof(buffer),
"Missing braces after '%s'", brace_kw);
@ -3619,7 +3653,8 @@ int main(int argc, char **argv, char **envp)
{
/* The brace must appear on a following line */
brace_kw = ctrl_kw;
brace_kw = ctrl_kw;
brace_indent = ctrl_indent;
}
else if (line[ndx] == ';' &&
(strcmp(ctrl_kw, "while") == 0 ||
@ -3797,6 +3832,26 @@ int main(int argc, char **argv, char **envp)
* the coding standard.
*/
/* A brace opening the body of a control statement must be
* indented exactly one level from its keyword.
*/
else if (ctrl_brace >= 0)
{
if (indent != ctrl_brace)
{
ERROR("Bad left brace alignment", lineno, indent);
}
/* Record what the brace should have been so that the brace
* closing it is held to the same alignment.
*/
if (bnest >= 1 && bnest <= MAX_BRACE)
{
lbrace_indent[bnest - 1] = ctrl_brace;
}
}
else if (!bfunctions && (indent & 1) != 0)
{
ERROR("Bad left brace alignment", lineno, indent);
@ -3813,7 +3868,16 @@ int main(int argc, char **argv, char **envp)
* the coding standard.
*/
if (!bfunctions && (indent & 1) != 0)
/* A right brace must line up with the left brace it closes */
if (rbrace_match >= 0)
{
if (indent != rbrace_match)
{
ERROR("Bad right brace alignment", lineno, indent);
}
}
else if (!bfunctions && (indent & 1) != 0)
{
ERROR("Bad left brace alignment", lineno, indent);
}