MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for self-referencing structs to parser

Browse Source
This commit is contained in:
lazaray 2022-05-03 15:39:48 +02:00
parent e3678b6d4b
commit dc42991ecb
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
parser/raylib_parser.c
View File

@ -223,21 +223,20 @@ int main(int argc, char* argv[])
// Read struct lines // Read struct lines
for (int i = 0; i < linesCount; i++) for (int i = 0; i < linesCount; i++)
{ {
// Find structs (starting with "typedef struct ... {", ending with '} ... ;') // Find structs
// starting with "typedef struct ... {" or "typedef struct ... ; \n struct ... {"
// ending with "} ... ;"
// i.e. excluding "typedef struct rAudioBuffer rAudioBuffer;" -> Typedef and forward declaration only
if (IsTextEqual(lines[i], "typedef struct", 14)) if (IsTextEqual(lines[i], "typedef struct", 14))
{ {
int j = 0; bool validStruct = IsTextEqual(lines[i + 1], "struct", 6);
bool validStruct = false; if (!validStruct)
for (int c = 0; c < MAX_LINE_LENGTH; c++)
{ {
char v = lines[i][c]; for (int c = 0; c < MAX_LINE_LENGTH; c++)
if (v == '{') validStruct = true;
if (v == '{' || v == ';' || v == '\0')
{ {
// Not valid struct if it ends without '{': char v = lines[i][c];
// i.e typedef struct rAudioBuffer rAudioBuffer; -> Typedef and forward declaration if (v == '{') validStruct = true;
break; if ((v == '{') || (v == ';') || (v == '\0')) break;
} }
} }
if (!validStruct) continue; if (!validStruct) continue;
@ -322,9 +321,11 @@ int main(int argc, char* argv[])
const int TDS_LEN = 15; // length of "typedef struct " const int TDS_LEN = 15; // length of "typedef struct "
for (int c = TDS_LEN; c < 64 + TDS_LEN; c++) for (int c = TDS_LEN; c < 64 + TDS_LEN; c++)
{ {
if (linesPtr[0][c] == '{') if ((linesPtr[0][c] == '{') || (linesPtr[0][c] == ' '))
{ {
MemoryCopy(structs[i].name, &linesPtr[0][TDS_LEN], c - TDS_LEN - 1); int nameLen = c - TDS_LEN;
while (linesPtr[0][TDS_LEN + nameLen - 1] == ' ') nameLen--;
MemoryCopy(structs[i].name, &linesPtr[0][TDS_LEN], nameLen);
break; break;
} }
} }
@ -341,7 +342,7 @@ int main(int argc, char* argv[])
int fieldEndPos = 0; int fieldEndPos = 0;
while (fieldLine[fieldEndPos] != ';') fieldEndPos++; while (fieldLine[fieldEndPos] != ';') fieldEndPos++;
if (fieldLine[0] != '/') // Field line is not a comment if ((fieldLine[0] != '/') && !IsTextEqual(fieldLine, "struct", 6)) // Field line is not a comment and not a struct declaration
{ {
//printf("Struct field: %s_\n", fieldLine); // OK! //printf("Struct field: %s_\n", fieldLine); // OK!