griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

makesdna: support C-style comments in array definitions

Browse Source 
Support parsing C style comments such as:

`char filepath[/*FILE_MAX*/ 1024]`

This is done by skipping white-space inside square brackets
so the value is read as:

`char filepath[1024]`.

Ref: !139196
This commit is contained in:
Campbell Barton
2025-05-22 09:08:30 +00:00
parent 5e12caba08
commit 4e7b9185a4
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/makesdna/intern/makesdna.cc
View File

@@ -600,6 +600,7 @@ static int preprocess_include(char *maindata, const int maindata_len)
int newlen = 0;
comment = false;
a = maindata_len;
int square_bracket_level = 0;
bool skip_until_closing_brace = false;
while (a--) {
@@ -614,10 +615,25 @@ static int preprocess_include(char *maindata, const int maindata_len)
cp[0] = cp[1] = 32;
}
if (comment == false) {
if (cp[0] == '[') {
square_bracket_level++;
}
else if (cp[0] == ']') {
square_bracket_level--;
}
}
/* do not copy when: */
if (comment) {
/* pass */
}
else if (cp[0] == ' ' && (square_bracket_level > 0)) {
/* NOTE(@ideasman42): This is done to allow `member[C_STYLE_COMMENT 1024]`,
* which is then read as `member[1024]`.
* It's important to skip the spaces here,
* otherwise the literal would be read as: `member[` and `1024]`. */
}
else if (cp[0] == ' ' && cp[1] == ' ') {
/* pass */
}
@@ -660,6 +676,8 @@ static int preprocess_include(char *maindata, const int maindata_len)
cp++;
}
BLI_assert(square_bracket_level == 0);
MEM_freeN(temp);
return newlen;
}