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

parser: fixed lua defines output, fixed makefile for raygui, added LONG type for defines

Browse Source
This commit is contained in:
Илья Колбин 2022-01-11 13:24:05 +03:00
parent 5097077597
commit 22986c3ef7
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parser/Makefile
View File

@ -20,7 +20,7 @@ parse:
./raylib_parser -i ../src/raymath.h -o raymath_api.$(EXTENSION) -f $(FORMAT) -d RMAPI ./raylib_parser -i ../src/raymath.h -o raymath_api.$(EXTENSION) -f $(FORMAT) -d RMAPI
./raylib_parser -i ../src/extras/easings.h -o easings_api.$(EXTENSION) -f $(FORMAT) -d EASEDEF ./raylib_parser -i ../src/extras/easings.h -o easings_api.$(EXTENSION) -f $(FORMAT) -d EASEDEF
./raylib_parser -i ../src/extras/physac.h -o physac_api.$(EXTENSION) -f $(FORMAT) -d PHYSACDEF ./raylib_parser -i ../src/extras/physac.h -o physac_api.$(EXTENSION) -f $(FORMAT) -d PHYSACDEF
./raylib_parser -i ../src/extras/raygui.h -o raygui_api.$(EXTENSION) -f $(FORMAT) -d RAYGUIDEF ./raylib_parser -i ../src/extras/raygui.h -o raygui_api.$(EXTENSION) -f $(FORMAT) -d RAYGUIAPI
./raylib_parser -i ../src/extras/rmem.h -o rmem_api.$(EXTENSION) -f $(FORMAT) -d RMEMAPI ./raylib_parser -i ../src/extras/rmem.h -o rmem_api.$(EXTENSION) -f $(FORMAT) -d RMEMAPI
clean: clean:

2
parser/raylib_api.lua
View File

@ -2797,7 +2797,7 @@ return {
type = "UNKNOWN", type = "UNKNOWN",
value = "SHADER_LOC_MAP_METALNESS", value = "SHADER_LOC_MAP_METALNESS",
description = "" description = ""
}, }
}, },
functions = { functions = {
{ {

25
parser/raylib_parser.c
View File

@ -112,7 +112,7 @@ typedef struct EnumInfo {
} EnumInfo; } EnumInfo;
// Type of parsed define // Type of parsed define
typedef enum { UNKNOWN = 0, MACRO, GUARD, INT, FLOAT, DOUBLE, CHAR, STRING, COLOR } DefineType; typedef enum { UNKNOWN = 0, MACRO, GUARD, INT, LONG, FLOAT, DOUBLE, CHAR, STRING, COLOR } DefineType;
// Define info data // Define info data
typedef struct DefineInfo { typedef struct DefineInfo {
@ -482,15 +482,19 @@ int main(int argc, char* argv[])
else if (linePtr[j] == '\'') defines[defineIndex].type = CHAR; else if (linePtr[j] == '\'') defines[defineIndex].type = CHAR;
else if (IsTextEqual(linePtr+j, "CLITERAL(Color)", 15)) defines[defineIndex].type = COLOR; else if (IsTextEqual(linePtr+j, "CLITERAL(Color)", 15)) defines[defineIndex].type = COLOR;
else if (isdigit(linePtr[j])) { // Parsing numbers else if (isdigit(linePtr[j])) { // Parsing numbers
bool isFloat = false; bool isFloat = false, isNumber = true;
while (linePtr[j] != ' ' && linePtr[j] != '\t' && linePtr[j] != '\n' && linePtr[j] != '\r') { while (linePtr[j] != ' ' && linePtr[j] != '\t' && linePtr[j] != '\0') {
char ch = linePtr[j];
if (ch == '.') isFloat = true;
if (!(isdigit(ch)||(ch >= 'a' && ch <= 'f')||(ch >= 'A' && ch <= 'F')||ch=='x'||ch=='L'||ch=='.'||ch=='+'||ch=='-')) isNumber = false;
j++; j++;
if (linePtr[j] == '.') isFloat = true;
} }
if (isNumber) {
if (isFloat) { if (isFloat) {
defines[defineIndex].type = linePtr[j-1] == 'f' ? FLOAT : DOUBLE; defines[defineIndex].type = linePtr[j-1] == 'f' ? FLOAT : DOUBLE;
} else { } else {
defines[defineIndex].type = INT; defines[defineIndex].type = linePtr[j-1] == 'L' ? LONG : INT;
}
} }
} }
@ -883,6 +887,7 @@ static const char *StrDefineType(DefineType type)
case GUARD: return "GUARD"; case GUARD: return "GUARD";
case MACRO: return "MACRO"; case MACRO: return "MACRO";
case INT: return "INT"; case INT: return "INT";
case LONG: return "LONG";
case FLOAT: return "FLOAT"; case FLOAT: return "FLOAT";
case DOUBLE: return "DOUBLE"; case DOUBLE: return "DOUBLE";
case CHAR: return "CHAR"; case CHAR: return "CHAR";
@ -1058,18 +1063,18 @@ static void ExportParsedData(const char *fileName, int format)
fprintf(outFile, " type = \"%s\",\n", StrDefineType(defines[i].type)); fprintf(outFile, " type = \"%s\",\n", StrDefineType(defines[i].type));
if (defines[i].type == INT || defines[i].type == DOUBLE || defines[i].type == STRING) { if (defines[i].type == INT || defines[i].type == DOUBLE || defines[i].type == STRING) {
fprintf(outFile, " value = %s,\n", defines[i].value); fprintf(outFile, " value = %s,\n", defines[i].value);
} else if (defines[i].type == FLOAT) { } else if (defines[i].type == FLOAT || defines[i].type == LONG) {
int n = TextLength(defines[i].value); int n = TextLength(defines[i].value);
defines[i].value[n-1] = '\0'; defines[i].value[n-1] = '\0';
fprintf(outFile, " value = %s,\n", defines[i].value); fprintf(outFile, " value = %s,\n", defines[i].value);
defines[i].value[n-1] = 'f'; defines[i].value[n-1] = defines[i].type == FLOAT ? 'f' : 'L';
} else { } else {
fprintf(outFile, " value = \"%s\",\n", defines[i].value); fprintf(outFile, " value = \"%s\",\n", defines[i].value);
} }
fprintf(outFile, " description = \"%s\"\n", defines[i].desc + 3); fprintf(outFile, " description = \"%s\"\n", defines[i].desc + 3);
fprintf(outFile, " }"); fprintf(outFile, " }");
if (i < funcCount - 1) fprintf(outFile, ",\n"); if (i < defineCount - 1) fprintf(outFile, ",\n");
else fprintf(outFile, "\n"); else fprintf(outFile, "\n");
} }
fprintf(outFile, " },\n"); fprintf(outFile, " },\n");
@ -1166,11 +1171,11 @@ static void ExportParsedData(const char *fileName, int format)
fprintf(outFile, " \"type\": \"%s\",\n", StrDefineType(defines[i].type)); fprintf(outFile, " \"type\": \"%s\",\n", StrDefineType(defines[i].type));
if (defines[i].type == INT || defines[i].type == DOUBLE || defines[i].type == STRING) { if (defines[i].type == INT || defines[i].type == DOUBLE || defines[i].type == STRING) {
fprintf(outFile, " \"value\": %s,\n", defines[i].value); fprintf(outFile, " \"value\": %s,\n", defines[i].value);
} else if (defines[i].type == FLOAT) { } else if (defines[i].type == FLOAT || defines[i].type == LONG) {
int n = TextLength(defines[i].value); int n = TextLength(defines[i].value);
defines[i].value[n-1] = '\0'; defines[i].value[n-1] = '\0';
fprintf(outFile, " \"value\": %s,\n", defines[i].value); fprintf(outFile, " \"value\": %s,\n", defines[i].value);
defines[i].value[n-1] = 'f'; defines[i].value[n-1] = defines[i].type == FLOAT ? 'f' : 'L';
} else { } else {
fprintf(outFile, " \"value\": \"%s\",\n", defines[i].value); fprintf(outFile, " \"value\": \"%s\",\n", defines[i].value);
} }