doylet/Dqn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unify linked list for cpp decls

Browse Source
This commit is contained in:
Doyle 2019-02-23 01:54:27 +11:00
parent 2cd7acaacb
commit e5e699c05f
2 changed files with 164 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

197
Code/DqnReflect.h
View File

@ -4,12 +4,28 @@
#define DQN_REFLECT #define DQN_REFLECT
#define DQN_REFLECT_META(...) #define DQN_REFLECT_META(...)
enum struct DqnReflect_StructMemberMetadataType { String, Int, Float };
struct DqnReflect_StructMemberMetadata
{
DqnReflect_StructMemberMetadataType type;
union
{
char *str_val;
int int_val;
float flt_val;
};
};
struct DqnReflect_StructMember struct DqnReflect_StructMember
{ {
char const *type; char const *type;
int type_len; int type_len;
char const *name; char const *name;
int name_len; int name_len;
DqnReflect_StructMemberMetadata *metadata;
int metadata_len;
}; };
struct DqnReflect_Struct struct DqnReflect_Struct
@ -136,7 +152,7 @@ struct StringLiteral
template <typename T> template <typename T>
struct LinkedList struct LinkedList
{ {
T data; T value;
LinkedList *next; LinkedList *next;
}; };
@ -360,11 +376,21 @@ struct CPPReflectMetadataEntry
}; };
using CPPReflectMetadataArray = FixedArray<CPPReflectMetadataEntry, 8>; using CPPReflectMetadataArray = FixedArray<CPPReflectMetadataEntry, 8>;
struct CPPEnumValuesLinkedList
template <typename T>
struct CPPDeclLinkedList
{ {
StringLiteral value;
CPPReflectMetadataArray metadata_array; CPPReflectMetadataArray metadata_array;
CPPEnumValuesLinkedList *next; T value;
CPPDeclLinkedList *next;
};
struct CPPVariableDecl
{
StringLiteral type;
StringLiteral name;
b32 is_array;
int array_len;
}; };
struct CPPTokeniser struct CPPTokeniser
@ -511,6 +537,23 @@ CPPReflectMetadataArray ParseCPPReflectMeta(CPPTokeniser *tokeniser)
return result; return result;
} }
struct CPPDeclToMetaValue
{
StringLiteral cpp_decl;
StringLiteral value;
};
// i.e. DataType cpp_decl DQN_REFLECT_META(key = value, key2 = value2, ...);
struct MetadataEntry
{
StringLiteral key;
FixedArray<CPPDeclToMetaValue, 32> cpp_decl_to_val;
};
void WriteMetadataReflectionMethods()
{
}
void ParseCPPEnum(CPPTokeniser *tokeniser) void ParseCPPEnum(CPPTokeniser *tokeniser)
{ {
CPPToken token = CPPTokeniser_NextToken(tokeniser); CPPToken token = CPPTokeniser_NextToken(tokeniser);
@ -530,44 +573,37 @@ void ParseCPPEnum(CPPTokeniser *tokeniser)
if (!ExpectToken(token, CPPTokenType::Identifier)) if (!ExpectToken(token, CPPTokenType::Identifier))
return; return;
int original_indent_level = tokeniser->indent_level;
CPPToken const enum_name = token; CPPToken const enum_name = token;
token = CPPTokeniser_NextToken(tokeniser); token = CPPTokeniser_NextToken(tokeniser);
if (!ExpectToken(token, CPPTokenType::LeftBrace)) if (!ExpectToken(token, CPPTokenType::LeftBrace))
return; return;
b32 has_metadata = false; CPPDeclLinkedList<StringLiteral> *enum_members = nullptr;
CPPEnumValuesLinkedList *start_enum_value_token = nullptr, *enum_value_token = nullptr;
MemArenaScopedRegion mem_region = MemArena_MakeScopedRegion(&global_main_arena); MemArenaScopedRegion mem_region = MemArena_MakeScopedRegion(&global_main_arena);
{
CPPDeclLinkedList<StringLiteral> *link_iterator = nullptr;
for (token = CPPTokeniser_NextToken(tokeniser); for (token = CPPTokeniser_NextToken(tokeniser);
token.type != CPPTokenType::EndOfStream && token.type != CPPTokenType::SemiColon; tokeniser->indent_level != original_indent_level && token.type != CPPTokenType::EndOfStream;
token = CPPTokeniser_NextToken(tokeniser)) token = CPPTokeniser_NextToken(tokeniser))
{ {
if (token.type == CPPTokenType::Identifier) if (token.type == CPPTokenType::Identifier)
{ {
CPPToken enum_value = token; auto *link = MEM_ARENA_ALLOC_STRUCT(&global_main_arena, CPPDeclLinkedList<StringLiteral>);
*link = {};
if (!link_iterator) enum_members = link; // Set members to first linked list entry
else link_iterator->next = link;
link_iterator = link;
link->value = StringLiteral(token.str, token.len);
CPPToken peek_token = CPPTokeniser_PeekToken(tokeniser); CPPToken peek_token = CPPTokeniser_PeekToken(tokeniser);
CPPReflectMetadataArray metadata_array = {};
if (IsIdentifierToken(peek_token, STR_LITERAL("DQN_REFLECT_META"))) if (IsIdentifierToken(peek_token, STR_LITERAL("DQN_REFLECT_META")))
{ {
has_metadata = true; link->metadata_array = ParseCPPReflectMeta(tokeniser);
metadata_array = ParseCPPReflectMeta(tokeniser);
} }
if (!start_enum_value_token)
{
start_enum_value_token = MEM_ARENA_ALLOC_STRUCT(&global_main_arena, CPPEnumValuesLinkedList);
enum_value_token = start_enum_value_token;
} }
else
{
enum_value_token->next = MEM_ARENA_ALLOC_STRUCT(&global_main_arena, CPPEnumValuesLinkedList);
enum_value_token = enum_value_token->next;
}
(*enum_value_token) = {};
enum_value_token->metadata_array = metadata_array;
enum_value_token->value = StringLiteral(enum_value.str, enum_value.len);
} }
} }
@ -577,7 +613,7 @@ void ParseCPPEnum(CPPTokeniser *tokeniser)
{ {
CPPTokeniser_SprintfToFile(tokeniser, "char const *DqnReflect_%.*s_Strings[] = {", enum_name.len, enum_name.str); CPPTokeniser_SprintfToFile(tokeniser, "char const *DqnReflect_%.*s_Strings[] = {", enum_name.len, enum_name.str);
tokeniser->indent_level++; tokeniser->indent_level++;
for (CPPEnumValuesLinkedList *link = start_enum_value_token; link; link = link->next) for (CPPDeclLinkedList<StringLiteral> *link = enum_members; link; link = link->next)
{ {
StringLiteral enum_value = link->value; StringLiteral enum_value = link->value;
CPPTokeniser_SprintfToFileNoIndenting(tokeniser, "\"%.*s\", ", enum_value.len, enum_value.str); CPPTokeniser_SprintfToFileNoIndenting(tokeniser, "\"%.*s\", ", enum_value.len, enum_value.str);
@ -611,7 +647,7 @@ void ParseCPPEnum(CPPTokeniser *tokeniser)
{ {
LinkedList<SourceCode> *curr_src_code = nullptr; LinkedList<SourceCode> *curr_src_code = nullptr;
char const *fmt = (enum_is_struct_or_class) ? "if (val == %.*s::%.*s) " : "if (val == %.*s) "; char const *fmt = (enum_is_struct_or_class) ? "if (val == %.*s::%.*s) " : "if (val == %.*s) ";
for (CPPEnumValuesLinkedList *link = start_enum_value_token; link; link = link->next) for (CPPDeclLinkedList<StringLiteral> *link = enum_members; link; link = link->next)
{ {
if (!curr_src_code) curr_src_code = &src_code; if (!curr_src_code) curr_src_code = &src_code;
else else
@ -627,12 +663,12 @@ void ParseCPPEnum(CPPTokeniser *tokeniser)
else required_len = snprintf(nullptr, 0, fmt, enum_value.len, enum_value.str) + 1; else required_len = snprintf(nullptr, 0, fmt, enum_value.len, enum_value.str) + 1;
longest_decl_len = REFLECT_MAX(longest_decl_len, required_len); longest_decl_len = REFLECT_MAX(longest_decl_len, required_len);
curr_src_code->data.decl.str = MEM_ARENA_ALLOC_ARRAY(&global_main_arena, char, required_len); curr_src_code->value.decl.str = MEM_ARENA_ALLOC_ARRAY(&global_main_arena, char, required_len);
curr_src_code->data.decl.len = required_len; curr_src_code->value.decl.len = required_len;
curr_src_code->data.enum_value = enum_value; curr_src_code->value.enum_value = enum_value;
if (enum_is_struct_or_class) snprintf(curr_src_code->data.decl.str, curr_src_code->data.decl.len, fmt, enum_name.len, enum_name.str, enum_value.len, enum_value.str); if (enum_is_struct_or_class) snprintf(curr_src_code->value.decl.str, curr_src_code->value.decl.len, fmt, enum_name.len, enum_name.str, enum_value.len, enum_value.str);
else snprintf(curr_src_code->data.decl.str, curr_src_code->data.decl.len, fmt, enum_value.len, enum_value.str); else snprintf(curr_src_code->value.decl.str, curr_src_code->value.decl.len, fmt, enum_value.len, enum_value.str);
} }
curr_src_code->next = nullptr; curr_src_code->next = nullptr;
} }
@ -642,9 +678,9 @@ void ParseCPPEnum(CPPTokeniser *tokeniser)
src_code_ptr; src_code_ptr;
src_code_ptr = src_code_ptr->next, ++enum_index) src_code_ptr = src_code_ptr->next, ++enum_index)
{ {
StringLiteral enum_value = src_code_ptr->data.enum_value; StringLiteral enum_value = src_code_ptr->value.enum_value;
int padding = longest_decl_len - src_code_ptr->data.decl.len; int padding = longest_decl_len - src_code_ptr->value.decl.len;
CPPTokeniser_SprintfToFile(tokeniser, "%.*s%*s", src_code_ptr->data.decl.len, src_code_ptr->data.decl.str, padding, ""); CPPTokeniser_SprintfToFile(tokeniser, "%.*s%*s", src_code_ptr->value.decl.len, src_code_ptr->value.decl.str, padding, "");
CPPTokeniser_SprintfToFileNoIndenting(tokeniser, CPPTokeniser_SprintfToFileNoIndenting(tokeniser,
"return DqnReflect_%.*s_Strings[%d]; // \"%.*s\"\n", "return DqnReflect_%.*s_Strings[%d]; // \"%.*s\"\n",
enum_name.len, enum_name.str, enum_name.len, enum_name.str,
@ -656,22 +692,9 @@ void ParseCPPEnum(CPPTokeniser *tokeniser)
// //
// Write User Annotated Metadata Getter Functions // Write User Annotated Metadata Getter Functions
// //
if (has_metadata)
{ {
struct CPPDeclToMetaValue
{
StringLiteral cpp_decl;
StringLiteral value;
};
struct MetadataEntry
{
StringLiteral key;
FixedArray<CPPDeclToMetaValue, 32> cpp_decl_to_val;
};
FixedArray<MetadataEntry, 32> metadata_entries = {}; FixedArray<MetadataEntry, 32> metadata_entries = {};
for (CPPEnumValuesLinkedList *link = start_enum_value_token; for (CPPDeclLinkedList<StringLiteral> *link = enum_members;
link; link;
link = link->next) link = link->next)
{ {
@ -739,14 +762,6 @@ void ParseCPPEnum(CPPTokeniser *tokeniser)
} }
} }
struct CPPVariableDecl
{
StringLiteral type;
StringLiteral name;
b32 is_array;
int array_len;
};
void ParseCPPStruct(CPPTokeniser *tokeniser) void ParseCPPStruct(CPPTokeniser *tokeniser)
{ {
CPPToken token = CPPTokeniser_NextToken(tokeniser); CPPToken token = CPPTokeniser_NextToken(tokeniser);
@ -764,7 +779,12 @@ void ParseCPPStruct(CPPTokeniser *tokeniser)
name = StringLiteral(token.str, token.len); name = StringLiteral(token.str, token.len);
} }
FixedArray<CPPVariableDecl, 128> struct_members = {}; int struct_members_len = 0;
CPPDeclLinkedList<CPPVariableDecl> *struct_members = nullptr;
MemArenaScopedRegion mem_region = MemArena_MakeScopedRegion(&global_main_arena);
{
CPPDeclLinkedList<CPPVariableDecl> *link_iterator = nullptr;
for (token = CPPTokeniser_NextToken(tokeniser); for (token = CPPTokeniser_NextToken(tokeniser);
tokeniser->indent_level != original_indent_level && token.type != CPPTokenType::EndOfStream; tokeniser->indent_level != original_indent_level && token.type != CPPTokenType::EndOfStream;
token = CPPTokeniser_NextToken(tokeniser)) token = CPPTokeniser_NextToken(tokeniser))
@ -785,16 +805,20 @@ void ParseCPPStruct(CPPTokeniser *tokeniser)
CPPToken peek_token = CPPTokeniser_PeekToken(tokeniser); CPPToken peek_token = CPPTokeniser_PeekToken(tokeniser);
if (peek_token.type == CPPTokenType::Identifier) if (peek_token.type == CPPTokenType::Identifier)
{ {
CPPVariableDecl *decl = FixedArray_Make(&struct_members, 1); auto *link = MEM_ARENA_ALLOC_STRUCT(&global_main_arena, CPPDeclLinkedList<CPPVariableDecl>);
decl->type = StringLiteral(token.str, token.len); *link = {};
decl->name = StringLiteral(peek_token.str, peek_token.len); if (!link_iterator) struct_members = link; // Set struct_members to first linked list entry
else link_iterator->next = link;
link_iterator = link;
struct_members_len++;
link->value.type = StringLiteral(token.str, token.len);
link->value.name = StringLiteral(peek_token.str, peek_token.len);
CPPTokeniser_NextToken(tokeniser); CPPTokeniser_NextToken(tokeniser);
peek_token = CPPTokeniser_PeekToken(tokeniser); peek_token = CPPTokeniser_PeekToken(tokeniser);
CPPReflectMetadataArray metadata_array = {}; if (IsIdentifierToken(peek_token, STR_LITERAL("DQN_REFLECT_META")))
if (IsIdentifierToken(token, STR_LITERAL("DQN_REFLECT_META"))) link->metadata_array = ParseCPPReflectMeta(tokeniser);
{
metadata_array = ParseCPPReflectMeta(tokeniser);
} }
} }
} }
@ -803,7 +827,11 @@ void ParseCPPStruct(CPPTokeniser *tokeniser)
if (name.len == 0) if (name.len == 0)
return; return;
CPPTokeniser_SprintfToFile(tokeniser, "DqnReflect_Struct DqnReflect_Struct%.*s =\n{\n", name.len, name.str); //
// Write DqnReflect_Struct Definition
//
{
CPPTokeniser_SprintfToFile(tokeniser, "DqnReflect_Struct DqnReflect_%.*s_Struct =\n{\n", name.len, name.str);
tokeniser->indent_level++; tokeniser->indent_level++;
CPPTokeniser_SprintfToFile(tokeniser, "\"%.*s\", // name \n", name.len, name.str); CPPTokeniser_SprintfToFile(tokeniser, "\"%.*s\", // name \n", name.len, name.str);
@ -811,27 +839,48 @@ void ParseCPPStruct(CPPTokeniser *tokeniser)
CPPTokeniser_SprintfToFile(tokeniser, "{ // members \n"); CPPTokeniser_SprintfToFile(tokeniser, "{ // members \n");
tokeniser->indent_level++; tokeniser->indent_level++;
for (CPPVariableDecl const &decl : struct_members) for (CPPDeclLinkedList<CPPVariableDecl> const *link = struct_members; link; link = link->next)
{ {
CPPVariableDecl const *decl = &link->value;
CPPTokeniser_SprintfToFile(tokeniser, "{\n"); CPPTokeniser_SprintfToFile(tokeniser, "{\n");
tokeniser->indent_level++; tokeniser->indent_level++;
CPPTokeniser_SprintfToFile(tokeniser, "\"%.*s\",\n", decl.type.len, decl.type.str); CPPTokeniser_SprintfToFile(tokeniser, "\"%.*s\",\n", decl->type.len, decl->type.str);
CPPTokeniser_SprintfToFile(tokeniser, "DQN_REFLECT_CHAR_COUNT(\"%.*s\"),\n", decl.type.len, decl.type.str); CPPTokeniser_SprintfToFile(tokeniser, "DQN_REFLECT_CHAR_COUNT(\"%.*s\"),\n", decl->type.len, decl->type.str);
CPPTokeniser_SprintfToFile(tokeniser, "\"%.*s\",\n", decl.name.len, decl.name.str); CPPTokeniser_SprintfToFile(tokeniser, "\"%.*s\",\n", decl->name.len, decl->name.str);
CPPTokeniser_SprintfToFile(tokeniser, "DQN_REFLECT_CHAR_COUNT(\"%.*s\"),\n", decl.name.len, decl.name.str); CPPTokeniser_SprintfToFile(tokeniser, "DQN_REFLECT_CHAR_COUNT(\"%.*s\"),\n", decl->name.len, decl->name.str);
tokeniser->indent_level--; tokeniser->indent_level--;
CPPTokeniser_SprintfToFile(tokeniser, "},\n"); CPPTokeniser_SprintfToFile(tokeniser, "},\n");
} }
tokeniser->indent_level--; tokeniser->indent_level--;
CPPTokeniser_SprintfToFile(tokeniser, "},\n"); CPPTokeniser_SprintfToFile(tokeniser, "},\n");
CPPTokeniser_SprintfToFile(tokeniser, "%d // members_len \n", (int)struct_members.len); CPPTokeniser_SprintfToFile(tokeniser, "%d // members_len \n", struct_members_len);
tokeniser->indent_level--; tokeniser->indent_level--;
CPPTokeniser_SprintfToFile(tokeniser, "};\n"); CPPTokeniser_SprintfToFile(tokeniser, "};\n\n");
assert(tokeniser->indent_level == 0);
}
//
// Write DqnReflect_Struct getter
//
{
CPPTokeniser_SprintfToFile(tokeniser, "DqnReflect_Struct const *DqnReflect_GetStruct(%.*s const *val)\n", name.len, name.str);
CPPTokeniser_SprintfToFile(tokeniser, "{\n");
tokeniser->indent_level++;
CPPTokeniser_SprintfToFile(tokeniser, "DqnReflect_Struct const *result = &DqnReflect_%.*s_Struct;\n", name.len, name.str);
CPPTokeniser_SprintfToFile(tokeniser, "return result;\n");
tokeniser->indent_level--;
CPPTokeniser_SprintfToFile(tokeniser, "}\n\n");
}
//
// Write User Annotated Metadata Getter Functions
//
{
}
int break_here = 5; int break_here = 5;
(void)break_here; (void)break_here;
assert(tokeniser->indent_level == 0);
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])

8
Data/DqnReflect_TestData.h
View File

@ -1,8 +1,8 @@
enum struct OpenGLShader DQN_REFLECT enum struct OpenGLShader
{ {
Invalid, Invalid,
Rect (VertexShaderFilePath = "Rect.vert", FragmentShaderFilePath = "Rect.frag"), Rect DQN_REFLECT_META(VertexShaderFilePath = "Rect.vert", FragmentShaderFilePath = "Rect.frag"),
Text (VertexShaderFilePath = "Text.vert", FragmentShaderFilePath = "Text.frag"), Text DQN_REFLECT_META(VertexShaderFilePath = "Text.vert", FragmentShaderFilePath = "Text.frag"),
}; };
#if 0 #if 0
@ -19,7 +19,7 @@ DQN_REFLECT struct OpenGLState
// #endif // #endif
// u32 ebo, vbo, vao; // u32 ebo, vbo, vao;
// u32 shaders[(int)OpenGLShader::Count]; // u32 shaders[(int)OpenGLShader::Count];
V4 draw_color; V4 draw_color DQN_REFLECT_META(FriendlyName = "HelloWorld");
V3 lighting_ambient_coeff; V3 lighting_ambient_coeff;
// u8 **bitmaps; // u8 **bitmaps;
// FixedArray<RendererLight, 32> lights; // FixedArray<RendererLight, 32> lights;