Telodendria/Cytoplasm
Telodendria/Cytoplasm
3
3
Fork 5
Code Issues 17 Pull requests 2 Projects Releases 2 Packages Activity Actions

Add key->[known structure] schemas to j2s #50

Merged
jordan merged 3 commits from lda/Cytoplasm:master into master 2024-08-27 16:34:50 +00:00
Conversation 3 Commits 3 Files changed 1 +27 -14
1 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5889bec95f - Show all commits

41
tools/j2s.c
View file

@ -38,6 +38,7 @@
#define MAX_DEPENDENCIES 32
#define IsDelimited(field, c1, c2) (*field == c1 && field[strlen(field) - 1] == c2)
jordan commented 2024-08-27 13:43:45 +00:00
Review
Copy link

Very clever. I don't know if IsDelimited is a great name though. But I also can't think of a better one so maybe it is fine.

Very clever. I don't know if `IsDelimited` is a great name though. But I also can't think of a better one so maybe it is fine.
static char *
Trim(char c, char *str)
{
@ -75,11 +76,11 @@ TypeToJsonType(char *type)
}
else
{
if (*type == '[' && type[strlen(type) - 1] == ']')
if (IsDelimited(type, '[', ']'))
{
return JSON_ARRAY;
}
else if (*type == '{' && type[strlen(type) - 1] == '}')
else if (IsDelimited(type, '{', '}'))
{
return JSON_OBJECT;
}
@ -348,13 +349,13 @@ Main(Array * args)
goto finish;
}
if (*fieldType == '[' && fieldType[strlen(fieldType) - 1] == ']')
if (IsDelimited(fieldType, '[', ']'))
{
fieldType++;
fieldType[strlen(fieldType) - 1] = '\0';
isArrType = true;
}
else if (*fieldType == '{' && fieldType[strlen(fieldType) - 1] == '}')
else if (IsDelimited(fieldType, '{', '}'))
{
fieldType++;
fieldType[strlen(fieldType) - 1] = '\0';
@ -545,12 +546,12 @@ Main(Array * args)
cType = "double";
}
else if (StrEquals(fieldType, "object") ||
(*fieldType == '{' &&
fieldType[strlen(fieldType) - 1] == '}'))
IsDelimited(fieldType, '{', '}'))
{
cType = "HashMap *";
}
else if (StrEquals(fieldType, "array") || (*fieldType == '[' && fieldType[strlen(fieldType) - 1] == ']'))
else if (StrEquals(fieldType, "array") ||
IsDelimited(fieldType, '[', ']'))
{
cType = "Array *";
}
@ -559,7 +560,19 @@ Main(Array * args)
cType = fieldType;
}
StreamPrintf(headerFile, " %s %s;\n", cType, field);
if (IsDelimited(fieldType, '{', '}') ||
IsDelimited(fieldType, '[', ']'))
{
fieldType[strlen(fieldType) - 1] = '\0';
StreamPrintf(headerFile, " %s /* of %s */ %s;\n", cType, fieldType + 1, field);
fieldType[strlen(fieldType)] = '}';
}
else
{
StreamPrintf(headerFile, " %s %s;\n", cType, field);
}
}
StreamPrintf(headerFile, "} %s;\n\n", type);
@ -690,7 +703,7 @@ Main(Array * args)
StreamPrintf(implFile, " out->%s = JsonValueAsObject(val);\n", key);
StreamPrintf(implFile, " Free(val); /* Not JsonValueFree() because we want the inner value. */\n");
}
else if (*fieldType == '{' && fieldType[strlen(fieldType) - 1] == '}')
else if (IsDelimited(fieldType, '{', '}'))
{
fieldType++;
fieldType[strlen(fieldType) - 1] = '\0';
@ -817,7 +830,7 @@ Main(Array * args)
fieldType[strlen(fieldType)] = '}';
}
else if (*fieldType == '[' && fieldType[strlen(fieldType) - 1] == ']')
else if (IsDelimited(fieldType, '[', ']'))
{
fieldType++;
fieldType[strlen(fieldType) - 1] = '\0';
@ -1059,7 +1072,7 @@ Main(Array * args)
{
StreamPrintf(implFile, " HashMapSet(json, \"%s\", JsonValueObject(JsonDuplicate(val->%s)));\n", Trim('_', key), key);
}
else if (*fieldType == '{' && fieldType[strlen(fieldType) - 1] == '}')
else if (IsDelimited(fieldType, '{', '}'))
{
int isPrimitive;
@ -1125,7 +1138,7 @@ Main(Array * args)
fieldType[strlen(fieldType)] = '}';
}
else if (*fieldType == '[' && fieldType[strlen(fieldType) - 1] == ']')
else if (IsDelimited(fieldType, '[', ']'))
{
int isPrimitive;
@ -1246,7 +1259,7 @@ Main(Array * args)
{
StreamPrintf(implFile, " Free(val->%s);\n", key);
}
else if (*fieldType == '{' && fieldType[strlen(fieldType) - 1] == '}')
else if (IsDelimited(fieldType, '{', '}'))
{
int isPrimitive;
@ -1275,7 +1288,7 @@ Main(Array * args)
fieldType[strlen(fieldType)] = '}';
}
else if (*fieldType == '[' && fieldType[strlen(fieldType) - 1] == ']')
else if (IsDelimited(fieldType, '[', ']'))
{
int isPrimitive;