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

Finish metadata system for struct members, fix parsing bugs for consts

Browse Source
This commit is contained in:
doyle
2019-04-05 23:09:07 +11:00
parent 4a794b2492
commit 3c447706c9
3 changed files with 246 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Data/DqnInspect_TestData.h
+1 -2
View File
@@ -11,10 +11,9 @@ enum struct OpenGLShader { Vertex, Count, };
DQN_INSPECT struct SampleStruct
{
// TODO(doyle): This shit not support yet, you can imagine why
int ebo DQN_INSPECT_META(char const *DisplayName = "Element Buffer Object"), vbo, vao DQN_INSPECT_META(char const *DisplayName = "Vertex Array Object", int OpenGLVersion = 330);
const int *const a;
int const *const b, c, *d, *e;
int ebo DQN_INSPECT_META(char const *DisplayName = "Element Buffer Object"), vbo, vao DQN_INSPECT_META(char const *DisplayName = "Vertex Array Object", int OpenGLVersion = 330);
V4 draw_color DQN_INSPECT_META(char const *DisplayName = "HelloWorld");
// #if 0
// #endif
Data/DqnInspect_TestDataGenerated.cpp
+78 -79
View File
@@ -15,15 +15,14 @@
enum struct DqnInspectMemberType
{
SampleStruct,
SampleStruct_ebo,
SampleStruct_vbo,
SampleStruct_vao,
SampleStruct_a,
SampleStruct_b,
SampleStruct_c,
SampleStruct_d,
SampleStruct_e,
SampleStruct_ebo,
SampleStruct_DQN_INSPECT_META,
SampleStruct_DisplayName,
SampleStruct_int,
SampleStruct_draw_color,
SampleStruct_lights,
SampleStruct_camera_matrixes,
@@ -48,219 +47,219 @@ enum struct DqnInspectMemberType
enum struct DqnInspectDeclType
{
V3,
V4,
int,
vao,
char,
Array,
int *,
void *,
char **,
int const,
int ******,
int *const,
int const*,
SampleStruct,
char const *,
EnumWithMetadata,
int const *const,
int *********const,
V3_,
V4_,
int_,
Array_,
int_Ptr_,
void_Ptr_,
char_Ptr_Ptr_,
int_const_,
int_Ptr_Ptr_Ptr_Ptr_Ptr_Ptr_,
int_Ptr_const_,
int_const_Ptr_,
SampleStruct_,
char_const_Ptr_,
EnumWithMetadata_,
int_const_Ptr_const_,
int_Ptr_Ptr_Ptr_Ptr_Ptr_Ptr_Ptr_Ptr_Ptr_const_,
};
enum struct DqnInspectMetaType
{
DisplayName,
OpenGLVersion,
};
char const * DqnInspectMetadata_SampleStruct_ebo_DisplayName = "Element Buffer Object";
char const * DqnInspectMetadata_SampleStruct_vao_DisplayName = "Vertex Array Object";
int DqnInspectMetadata_SampleStruct_vao_OpenGLVersion = 330;
char const * DqnInspectMetadata_SampleStruct_draw_color_DisplayName = "HelloWorld";
DqnInspectMetadata const DqnInspectMetadata_SampleStruct_ebo[] =
{
{ DqnInspectDeclType::char const *_, DqnInspectMetaType::DisplayName, &DqnInspectMetadata_SampleStruct_ebo_DisplayName},
{ DqnInspectDeclType::char_const_Ptr_, DqnInspectMetaType::DisplayName, &DqnInspectMetadata_SampleStruct_ebo_DisplayName},
};
DqnInspectMetadata const DqnInspectMetadata_SampleStruct_vao[] =
{
{ DqnInspectDeclType::char_const_Ptr_, DqnInspectMetaType::DisplayName, &DqnInspectMetadata_SampleStruct_vao_DisplayName},
{ DqnInspectDeclType::int_, DqnInspectMetaType::OpenGLVersion, &DqnInspectMetadata_SampleStruct_vao_OpenGLVersion},
};
DqnInspectMetadata const DqnInspectMetadata_SampleStruct_draw_color[] =
{
{ DqnInspectDeclType::char const *_, DqnInspectMetaType::DisplayName, &DqnInspectMetadata_SampleStruct_draw_color_DisplayName},
{ DqnInspectDeclType::char_const_Ptr_, DqnInspectMetaType::DisplayName, &DqnInspectMetadata_SampleStruct_draw_color_DisplayName},
};
DqnInspectStructMember const DqnInspect_SampleStruct_StructMembers[] =
DqnInspectMember const DqnInspect_SampleStruct_Members[] =
{
{
DqnInspectMemberType::SampleStruct_ebo,
STR_AND_LEN("int"), STR_AND_LEN("ebo"),
nullptr, 0, // template_expr and template_expr_len
0, // array_dimensions
DqnInspectMetadata_SampleStruct_ebo, ARRAY_COUNT(DqnInspectMetadata_SampleStruct_ebo), // metadata array
},
{
DqnInspectMemberType::SampleStruct_vbo,
STR_AND_LEN("int"), STR_AND_LEN("vbo"),
nullptr, 0, // template_expr and template_expr_len
0, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_vao,
STR_AND_LEN("int"), STR_AND_LEN("vao"),
nullptr, 0, // template_expr and template_expr_len
0, // array_dimensions
DqnInspectMetadata_SampleStruct_vao, ARRAY_COUNT(DqnInspectMetadata_SampleStruct_vao), // metadata array
},
{
DqnInspectMemberType::SampleStruct_a,
STR_AND_LEN("int *const"), STR_AND_LEN("a"),
nullptr, 0, // template_expr and template_expr_len
1 // array_dimensions,
1, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_b,
STR_AND_LEN("int const *const"), STR_AND_LEN("b"),
nullptr, 0, // template_expr and template_expr_len
1 // array_dimensions,
1, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_c,
STR_AND_LEN("int"), STR_AND_LEN("c"),
nullptr, 0, // template_expr and template_expr_len
0 // array_dimensions,
0, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_d,
STR_AND_LEN("int *"), STR_AND_LEN("d"),
nullptr, 0, // template_expr and template_expr_len
1 // array_dimensions,
1, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_e,
STR_AND_LEN("int *"), STR_AND_LEN("e"),
nullptr, 0, // template_expr and template_expr_len
1 // array_dimensions,
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_ebo,
STR_AND_LEN("int"), STR_AND_LEN("ebo"),
nullptr, 0, // template_expr and template_expr_len
0 // array_dimensions,
DqnInspectVariant_SampleStruct_ebo, ARRAY_COUNT(DqnInspectVariant_SampleStruct_ebo), // metadata array
},
{
DqnInspectMemberType::SampleStruct_DQN_INSPECT_META,
STR_AND_LEN("vao"), STR_AND_LEN("DQN_INSPECT_META"),
nullptr, 0, // template_expr and template_expr_len
0 // array_dimensions,
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_DisplayName,
STR_AND_LEN("char const *"), STR_AND_LEN("DisplayName"),
nullptr, 0, // template_expr and template_expr_len
1 // array_dimensions,
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_int,
STR_AND_LEN("char"), STR_AND_LEN("int"),
nullptr, 0, // template_expr and template_expr_len
0 // array_dimensions,
1, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_draw_color,
STR_AND_LEN("V4"), STR_AND_LEN("draw_color"),
nullptr, 0, // template_expr and template_expr_len
0 // array_dimensions,
DqnInspectVariant_SampleStruct_draw_color, ARRAY_COUNT(DqnInspectVariant_SampleStruct_draw_color), // metadata array
0, // array_dimensions
DqnInspectMetadata_SampleStruct_draw_color, ARRAY_COUNT(DqnInspectMetadata_SampleStruct_draw_color), // metadata array
},
{
DqnInspectMemberType::SampleStruct_lights,
STR_AND_LEN("Array"), STR_AND_LEN("lights"),
nullptr, 0, // template_expr and template_expr_len
0 // array_dimensions,
0, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_camera_matrixes,
STR_AND_LEN("Array"), STR_AND_LEN("camera_matrixes"),
nullptr, 0, // template_expr and template_expr_len
0 // array_dimensions,
0, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_bitmaps,
STR_AND_LEN("char **"), STR_AND_LEN("bitmaps"),
nullptr, 0, // template_expr and template_expr_len
2 // array_dimensions,
2, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_shaders,
STR_AND_LEN("int"), STR_AND_LEN("shaders"),
nullptr, 0, // template_expr and template_expr_len
1 // array_dimensions,
1, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_win32_handle,
STR_AND_LEN("void *"), STR_AND_LEN("win32_handle"),
nullptr, 0, // template_expr and template_expr_len
1 // array_dimensions,
1, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_lighting_ambient_coeff,
STR_AND_LEN("V3"), STR_AND_LEN("lighting_ambient_coeff"),
nullptr, 0, // template_expr and template_expr_len
0 // array_dimensions,
0, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_draw_call_count,
STR_AND_LEN("int"), STR_AND_LEN("draw_call_count"),
nullptr, 0, // template_expr and template_expr_len
0 // array_dimensions,
0, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_f,
STR_AND_LEN("int"), STR_AND_LEN("f"),
nullptr, 0, // template_expr and template_expr_len
0 // array_dimensions,
0, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_g,
STR_AND_LEN("int const"), STR_AND_LEN("g"),
nullptr, 0, // template_expr and template_expr_len
0 // array_dimensions,
0, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_h,
STR_AND_LEN("int *const"), STR_AND_LEN("h"),
nullptr, 0, // template_expr and template_expr_len
1 // array_dimensions,
1, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_i,
STR_AND_LEN("int const*"), STR_AND_LEN("i"),
nullptr, 0, // template_expr and template_expr_len
1 // array_dimensions,
1, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_j,
STR_AND_LEN("int *********const"), STR_AND_LEN("j"),
nullptr, 0, // template_expr and template_expr_len
9 // array_dimensions,
9, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_k,
STR_AND_LEN("int"), STR_AND_LEN("k"),
nullptr, 0, // template_expr and template_expr_len
0 // array_dimensions,
0, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_l,
STR_AND_LEN("int ******"), STR_AND_LEN("l"),
nullptr, 0, // template_expr and template_expr_len
6 // array_dimensions,
6, // array_dimensions
nullptr, 0, // metadata array
},
{
DqnInspectMemberType::SampleStruct_m,
STR_AND_LEN("int *"), STR_AND_LEN("m"),
nullptr, 0, // template_expr and template_expr_len
1 // array_dimensions,
1, // array_dimensions
nullptr, 0, // metadata array
},
};
@@ -268,13 +267,13 @@ DqnInspectStructMember const DqnInspect_SampleStruct_StructMembers[] =
DqnInspectStruct const DqnInspect_SampleStruct_Struct =
{
STR_AND_LEN("SampleStruct"),
DqnInspect_SampleStruct_StructMembers, // members
ARRAY_COUNT(DqnInspect_SampleStruct_StructMembers) // members_len
DqnInspect_SampleStruct_Members, // members
ARRAY_COUNT(DqnInspect_SampleStruct_Members) // members_len
};
DqnInspectStruct const *DqnInspect_Struct(SampleStruct const *)
{
DqnInspect_Struct const *result = &DqnInspect_SampleStruct_Struct;
DqnInspectStruct const *result = &DqnInspect_SampleStruct_Struct;
return result;
}
@@ -301,7 +300,7 @@ bool DqnInspectMetadata_Coords(EnumWithMetadata val, V3 *value)
return false;
}
void Function1(int a, float b = {}, char char const * c = nullptr, bool e = false, int f = 1, char char * g = "Hello world");
void Function1(int a, float b = {}, char const * c = nullptr, bool e = false, int f = 1, char * g = "Hello world");
void * Function2(V3 foo = V3(10, 20, 50), V3 bar = {120, 150, 20}, ...);
Array<int const *, 3> const *const Function3(Array<int, 32> const * foobar);
#endif // DQN_INSPECT_DQNINSPECT_TESTDATA_H