ed/metadesk
1
0
Fork 0
mirror of https://github.com/Ed94/metadesk.git synced 2026-08-04 06:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

more styl consistency

Browse Source
This commit is contained in:
Allen Webster
2021-09-25 17:01:24 -07:00
parent f65aa9f76f
commit 70e630cab6
4 changed files with 110 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/type_metadata/type_metadata.c
+6 -3
View File
@@ -492,7 +492,8 @@ main(int argc, char **argv)
// print member lists // print member lists
for (TypeMember *member = type->first_member; for (TypeMember *member = type->first_member;
member != 0; member != 0;
member = member->next){ member = member->next)
{
printf(" %.*s: %.*s\n", printf(" %.*s: %.*s\n",
MD_S8VArg(member->node->string), MD_S8VArg(member->node->string),
MD_S8VArg(member->type->node->string)); MD_S8VArg(member->type->node->string));
@@ -501,7 +502,8 @@ main(int argc, char **argv)
// print enumerant lists // print enumerant lists
for (TypeEnumerant *enumerant = type->first_enumerant; for (TypeEnumerant *enumerant = type->first_enumerant;
enumerant != 0; enumerant != 0;
enumerant = enumerant->next){ enumerant = enumerant->next)
{
printf(" %.*s: %d\n", printf(" %.*s: %d\n",
MD_S8VArg(enumerant->node->string), MD_S8VArg(enumerant->node->string),
enumerant->value); enumerant->value);
@@ -510,7 +512,8 @@ main(int argc, char **argv)
for (MapInfo *map = first_map; for (MapInfo *map = first_map;
map != 0; map != 0;
map = map->next){ map = map->next)
{
MD_Node *node = map->node; MD_Node *node = map->node;
printf("%.*s: map\n", MD_S8VArg(node->string)); printf("%.*s: map\n", MD_S8VArg(node->string));
} }
source/md.h
-1
View File
@@ -33,7 +33,6 @@
** #define MD_IMPL_ArenaAlloc () -> MD_IMPL_Arena* ** #define MD_IMPL_ArenaAlloc () -> MD_IMPL_Arena*
** #define MD_IMPL_ArenaRelease (MD_IMPL_Arena*) -> void ** #define MD_IMPL_ArenaRelease (MD_IMPL_Arena*) -> void
** #define MD_IMPL_ArenaGetPos (MD_IMPL_Arena*) -> MD_u64 ** #define MD_IMPL_ArenaGetPos (MD_IMPL_Arena*) -> MD_u64
** #define MD_IMPL_ArenaGetCap (MD_IMPL_Arena*) -> MD_u64
** #define MD_IMPL_ArenaPush (MD_IMPL_Arena*, MD_u64) -> void* ** #define MD_IMPL_ArenaPush (MD_IMPL_Arena*, MD_u64) -> void*
** #define MD_IMPL_ArenaPopTo (MD_IMPL_Arena*, MD_u64) -> void ** #define MD_IMPL_ArenaPopTo (MD_IMPL_Arena*, MD_u64) -> void
** #define MD_IMPL_ArenaSetAutoAlign (MD_IMPL_Arena*, MD_u64) -> void ** #define MD_IMPL_ArenaSetAutoAlign (MD_IMPL_Arena*, MD_u64) -> void
tests/expression_tests.c
+84 -42
View File
@@ -86,24 +86,29 @@ typedef enum{
} Op; } Op;
#undef X #undef X
static MD_String8 node_raw_contents(MD_Node *node, MD_b32 exclude_outer){ static MD_String8 node_raw_contents(MD_Node *node, MD_b32 exclude_outer)
{
MD_String8 result = {0}; MD_String8 result = {0};
MD_u64 beg = node->offset; MD_u64 beg = node->offset;
if(exclude_outer && !MD_NodeIsNil(node->first_child)){ if(exclude_outer && !MD_NodeIsNil(node->first_child))
{
beg = node->first_child->offset; beg = node->first_child->offset;
} }
MD_u64 end = beg; { MD_u64 end = beg;
{
MD_Node *last_descendant = node; MD_Node *last_descendant = node;
while(!MD_NodeIsNil(last_descendant->last_child)){ for(;!MD_NodeIsNil(last_descendant->last_child);)
{
last_descendant = last_descendant->last_child; last_descendant = last_descendant->last_child;
} }
end = last_descendant->offset + last_descendant->raw_string.size; end = last_descendant->offset + last_descendant->raw_string.size;
} }
MD_Node *root = node; MD_Node *root = node;
while(!MD_NodeIsNil(root->parent)){ for(;!MD_NodeIsNil(root->parent);)
{
root = root->parent; root = root->parent;
} }
@@ -112,80 +117,100 @@ static MD_String8 node_raw_contents(MD_Node *node, MD_b32 exclude_outer){
} }
static void parenthesize_exclude_outer(MD_Arena *arena, OperatorDescription *descs, MD_String8List *l, static void parenthesize_exclude_outer(MD_Arena *arena, OperatorDescription *descs, MD_String8List *l,
MD_ExprNode *node, MD_b32 exclude_outer_parens){ MD_ExprNode *node, MD_b32 exclude_outer_parens)
if(node->is_op){ {
if(!exclude_outer_parens){ if(node->is_op)
{
if(!exclude_outer_parens)
{
MD_S8ListPush(arena, l, MD_S8Lit("(")); MD_S8ListPush(arena, l, MD_S8Lit("("));
} }
MD_ExprOperator *op = &descs[node->op_id].op; MD_ExprOperator *op = &descs[node->op_id].op;
if(op->kind == MD_ExprOperatorKind_Binary || op->kind == MD_ExprOperatorKind_BinaryRightAssociative){ if(op->kind == MD_ExprOperatorKind_Binary || op->kind == MD_ExprOperatorKind_BinaryRightAssociative)
{
parenthesize_exclude_outer(arena, descs, l, node->left, 0); parenthesize_exclude_outer(arena, descs, l, node->left, 0);
MD_b32 is_subscript = (node->op_id == Op_ArraySubscript); MD_b32 is_subscript = (node->op_id == Op_ArraySubscript);
if(is_subscript){ if(is_subscript)
{
MD_S8ListPush(arena, l, MD_S8Lit("[")); MD_S8ListPush(arena, l, MD_S8Lit("["));
parenthesize_exclude_outer(arena, descs, l, node->right, 1); parenthesize_exclude_outer(arena, descs, l, node->right, 1);
MD_S8ListPush(arena, l, MD_S8Lit("]")); MD_S8ListPush(arena, l, MD_S8Lit("]"));
} }
else{ else
{
MD_S8ListPush(arena, l, MD_S8Lit(" ")); MD_S8ListPush(arena, l, MD_S8Lit(" "));
MD_S8ListPush(arena, l, node->md_node->string); MD_S8ListPush(arena, l, node->md_node->string);
MD_S8ListPush(arena, l, MD_S8Lit(" ")); MD_S8ListPush(arena, l, MD_S8Lit(" "));
parenthesize_exclude_outer(arena, descs, l, node->right, 0); parenthesize_exclude_outer(arena, descs, l, node->right, 0);
} }
} }
else if(op->kind == MD_ExprOperatorKind_Prefix){ else if(op->kind == MD_ExprOperatorKind_Prefix)
{
MD_S8ListPush(arena, l, node->md_node->string); MD_S8ListPush(arena, l, node->md_node->string);
MD_u8 last_op_c = MD_S8Suffix(node->md_node->string, 1).str[0]; MD_u8 last_op_c = MD_S8Suffix(node->md_node->string, 1).str[0];
if(MD_CharIsAlpha(last_op_c) || MD_CharIsDigit(last_op_c)){ // NOTE: Keyword prefix operator (e.g. sizeof) if(MD_CharIsAlpha(last_op_c) || MD_CharIsDigit(last_op_c))
{ // NOTE: Keyword prefix operator (e.g. sizeof)
MD_S8ListPush(arena, l, MD_S8Lit(" ")); MD_S8ListPush(arena, l, MD_S8Lit(" "));
} }
parenthesize_exclude_outer(arena, descs, l, node->left, 0); parenthesize_exclude_outer(arena, descs, l, node->left, 0);
} }
else if(op->kind == MD_ExprOperatorKind_Postfix){ else if(op->kind == MD_ExprOperatorKind_Postfix)
{
parenthesize_exclude_outer(arena, descs, l, node->left, 0); parenthesize_exclude_outer(arena, descs, l, node->left, 0);
MD_b32 is_call = (node->op_id == Op_Call); MD_b32 is_call = (node->op_id == Op_Call);
if(is_call){ if(is_call)
{
MD_S8ListPush(arena, l, MD_S8Lit("(...)")); MD_S8ListPush(arena, l, MD_S8Lit("(...)"));
} }
else{ else
{
MD_S8ListPush(arena, l, node->md_node->string); MD_S8ListPush(arena, l, node->md_node->string);
} }
} }
else{ else
{
MD_S8ListPush(arena, l, MD_S8Lit("--- Can't print expression ---")); MD_S8ListPush(arena, l, MD_S8Lit("--- Can't print expression ---"));
} }
if(!exclude_outer_parens){ if(!exclude_outer_parens)
{
MD_S8ListPush(arena, l, MD_S8Lit(")")); MD_S8ListPush(arena, l, MD_S8Lit(")"));
} }
} }
else{ else
if(MD_NodeIsNil(node->md_node->first_child)){ {
if(MD_NodeIsNil(node->md_node->first_child))
{
MD_S8ListPush(arena, l, node_raw_contents(node->md_node, 0)); MD_S8ListPush(arena, l, node_raw_contents(node->md_node, 0));
} }
else{ else
{
if(node->md_node->flags & MD_NodeFlag_HasBracketLeft && if(node->md_node->flags & MD_NodeFlag_HasBracketLeft &&
node->md_node->flags & MD_NodeFlag_HasBracketRight){ node->md_node->flags & MD_NodeFlag_HasBracketRight)
{
MD_S8ListPush(arena, l, MD_S8Lit("[...]")); MD_S8ListPush(arena, l, MD_S8Lit("[...]"));
} }
else if(node->md_node->flags & MD_NodeFlag_HasBraceLeft && else if(node->md_node->flags & MD_NodeFlag_HasBraceLeft &&
node->md_node->flags & MD_NodeFlag_HasBraceRight){ node->md_node->flags & MD_NodeFlag_HasBraceRight)
{
MD_S8ListPush(arena, l, MD_S8Lit("{...}")); MD_S8ListPush(arena, l, MD_S8Lit("{...}"));
} }
else{ else
{
MD_S8ListPush(arena, l, MD_S8Lit("???")); MD_S8ListPush(arena, l, MD_S8Lit("???"));
} }
} }
} }
} }
static MD_String8 parenthesize(MD_Arena *arena, OperatorDescription *descs, MD_ExprNode *node){ static MD_String8 parenthesize(MD_Arena *arena, OperatorDescription *descs, MD_ExprNode *node)
{
MD_String8 result = {0}; MD_String8 result = {0};
MD_String8List l = {0}; MD_String8List l = {0};
parenthesize_exclude_outer(arena, descs, &l, node, 1); parenthesize_exclude_outer(arena, descs, &l, node, 1);
@@ -193,7 +218,8 @@ static MD_String8 parenthesize(MD_Arena *arena, OperatorDescription *descs, MD_E
return result; return result;
} }
int main(void){ int main(void)
{
OperatorDescription operator_array[Op_COUNT] = {0}; OperatorDescription operator_array[Op_COUNT] = {0};
#define X(name, token, kind_, prec) \ #define X(name, token, kind_, prec) \
operator_array[Op_##name].s = MD_S8Lit(token); \ operator_array[Op_##name].s = MD_S8Lit(token); \
@@ -203,7 +229,8 @@ operator_array[Op_##name].op = (MD_ExprOperator){ .op_id = Op_##name, .kind = MD
arena = MD_ArenaAlloc(); arena = MD_ArenaAlloc();
/* NOTE: Operator table bake errors */ { /* NOTE: Operator table bake errors */
{
MD_ExprOperatorList operator_list = {0}; MD_ExprOperatorList operator_list = {0};
MD_ExprOperatorTable op_table = {0}; MD_ExprOperatorTable op_table = {0};
@@ -249,7 +276,8 @@ operator_array[Op_##name].op = (MD_ExprOperator){ .op_id = Op_##name, .kind = MD
MD_ExprOperatorList operator_list = {0}; MD_ExprOperatorList operator_list = {0};
for(Op op = Op_Null+1; op < Op_COUNT; ++op){ for(Op op = Op_Null+1; op < Op_COUNT; ++op)
{
OperatorDescription *desc = operator_array + op; OperatorDescription *desc = operator_array + op;
MD_Node *node = MD_MakeNode(arena, MD_NodeKind_Main, desc->s, desc->s, 0); MD_Node *node = MD_MakeNode(arena, MD_NodeKind_Main, desc->s, desc->s, 0);
MD_ExprOperatorPush(arena, &operator_list, op, desc->op.kind, desc->op.precedence, node); MD_ExprOperatorPush(arena, &operator_list, op, desc->op.kind, desc->op.precedence, node);
@@ -316,47 +344,61 @@ operator_array[Op_##name].op = (MD_ExprOperator){ .op_id = Op_##name, .kind = MD
{ .q = "a 1", .a = "", ExpressionErrorKind_Expr, 2}, { .q = "a 1", .a = "", ExpressionErrorKind_Expr, 2},
}; };
for(MD_u32 i_test = 0; i_test < MD_ArrayCount(tests); i_test+=1){ for(MD_u32 i_test = 0; i_test < MD_ArrayCount(tests); i_test+=1)
{
Expression_QA test = tests[i_test]; Expression_QA test = tests[i_test];
MD_String8 q = MD_S8CString(test.q); MD_String8 q = MD_S8CString(test.q);
MD_String8 a = MD_S8CString(test.a); MD_String8 a = MD_S8CString(test.a);
MD_ParseResult parse = MD_ParseWholeString(arena, MD_S8Lit("test"), q); MD_ParseResult parse = MD_ParseWholeString(arena, MD_S8Lit("test"), q);
if(parse.errors.max_message_kind == MD_MessageKind_Null){ if(parse.errors.max_message_kind == MD_MessageKind_Null)
{
MD_ExprParseResult expr_parse = MD_ExprParse(arena, &op_table, parse.node->first_child, MD_NilNode()); MD_ExprParseResult expr_parse = MD_ExprParse(arena, &op_table, parse.node->first_child, MD_NilNode());
if(expr_parse.errors.max_message_kind == MD_MessageKind_Null){ if(expr_parse.errors.max_message_kind == MD_MessageKind_Null)
{
MD_String8 parser_answer = parenthesize(arena, operator_array, expr_parse.node); MD_String8 parser_answer = parenthesize(arena, operator_array, expr_parse.node);
if(!MD_S8Match(parser_answer, a, 0)){ if(!MD_S8Match(parser_answer, a, 0))
{
printf("Example %d : Expected answer for %.*s is %.*s. Got %.*s\n", printf("Example %d : Expected answer for %.*s is %.*s. Got %.*s\n",
i_test, MD_S8VArg(q), MD_S8VArg(a), MD_S8VArg(parser_answer)); i_test, MD_S8VArg(q), MD_S8VArg(a), MD_S8VArg(parser_answer));
} }
} }
else{ else
if(test.error_kind == ExpressionErrorKind_Expr){ {
for(MD_Message *message = expr_parse.errors.first; message; message = message->next){ if(test.error_kind == ExpressionErrorKind_Expr)
if(message->node->offset != test.error_offset){ {
for(MD_Message *message = expr_parse.errors.first; message; message = message->next)
{
if(message->node->offset != test.error_offset)
{
printf("Example %d : \"%.*s\". Expected error on character %d; got character %ld instead\n", printf("Example %d : \"%.*s\". Expected error on character %d; got character %ld instead\n",
i_test, MD_S8VArg(q), test.error_offset, (long)message->node->offset); i_test, MD_S8VArg(q), test.error_offset, (long)message->node->offset);
} }
} }
} }
else{ else
{
MD_Message *message = expr_parse.errors.first; MD_Message *message = expr_parse.errors.first;
printf("Example %d : \"%.*s\". Unexpected Expr parsing error: \"%.*s\"\n", i_test, MD_S8VArg(q), printf("Example %d : \"%.*s\". Unexpected Expr parsing error: \"%.*s\"\n", i_test, MD_S8VArg(q),
MD_S8VArg(message->string)); MD_S8VArg(message->string));
} }
} }
} }
else{ else
if(test.error_kind == ExpressionErrorKind_MD){ {
for(MD_Message *message = parse.errors.first; message; message = message->next){ if(test.error_kind == ExpressionErrorKind_MD)
if(message->node->offset != test.error_offset){ {
for(MD_Message *message = parse.errors.first; message; message = message->next)
{
if(message->node->offset != test.error_offset)
{
printf("Example %d : \"%.*s\". Expected error on character %d; got character %ld instead\n", printf("Example %d : \"%.*s\". Expected error on character %d; got character %ld instead\n",
i_test, MD_S8VArg(q), test.error_offset, (long)message->node->offset); i_test, MD_S8VArg(q), test.error_offset, (long)message->node->offset);
} }
} }
} }
else{ else
{
printf("Example %d : \"%.*s\". Unexpected MD parsing error\n", i_test, MD_S8VArg(q)); printf("Example %d : \"%.*s\". Unexpected MD parsing error\n", i_test, MD_S8VArg(q));
} }
} }
tests/sanity_tests.c
+20 -10
View File
@@ -94,7 +94,8 @@ int main(void)
MD_Token *token = tokens; MD_Token *token = tokens;
MD_Token *token_opl = tokens + MD_ArrayCount(tokens); MD_Token *token_opl = tokens + MD_ArrayCount(tokens);
MD_u64 pos = 0; MD_u64 pos = 0;
for (; pos < string.size && token < token_opl; ){ for (; pos < string.size && token < token_opl; )
{
*token = MD_TokenFromString(MD_S8Skip(string, pos)); *token = MD_TokenFromString(MD_S8Skip(string, pos));
pos += token->raw_string.size; pos += token->raw_string.size;
token += 1; token += 1;
@@ -443,26 +444,32 @@ int main(void)
}; };
MD_MapKey keys[MD_ArrayCount(key_strings)*2]; MD_MapKey keys[MD_ArrayCount(key_strings)*2];
for (MD_u64 i = 0; i < MD_ArrayCount(key_strings); i += 1){ for (MD_u64 i = 0; i < MD_ArrayCount(key_strings); i += 1)
{
keys[i] = MD_MapKeyStr(key_strings[i]); keys[i] = MD_MapKeyStr(key_strings[i]);
} }
for (MD_u64 i = MD_ArrayCount(key_strings); i < MD_ArrayCount(keys); i += 1){ for (MD_u64 i = MD_ArrayCount(key_strings); i < MD_ArrayCount(keys); i += 1)
{
keys[i] = MD_MapKeyPtr((void *)i); keys[i] = MD_MapKeyPtr((void *)i);
} }
{ {
MD_Map map = MD_MapMake(arena); MD_Map map = MD_MapMake(arena);
for (MD_u64 i = 0; i < MD_ArrayCount(keys); i += 1){ for (MD_u64 i = 0; i < MD_ArrayCount(keys); i += 1)
{
MD_MapInsert(arena, &map, keys[i], (void *)i); MD_MapInsert(arena, &map, keys[i], (void *)i);
} }
for (MD_u64 i = 0; i < MD_ArrayCount(keys); i += 1){ for (MD_u64 i = 0; i < MD_ArrayCount(keys); i += 1)
{
MD_MapSlot *slot = MD_MapLookup(&map, keys[i]); MD_MapSlot *slot = MD_MapLookup(&map, keys[i]);
TestResult(slot && slot->val == (void *)i); TestResult(slot && slot->val == (void *)i);
} }
for (MD_u64 i = 0; i < MD_ArrayCount(keys); i += 1){ for (MD_u64 i = 0; i < MD_ArrayCount(keys); i += 1)
{
MD_MapOverwrite(arena, &map, keys[i], (void *)(i + 10)); MD_MapOverwrite(arena, &map, keys[i], (void *)(i + 10));
} }
for (MD_u64 i = 0; i < MD_ArrayCount(keys); i += 1){ for (MD_u64 i = 0; i < MD_ArrayCount(keys); i += 1)
{
MD_MapSlot *slot = MD_MapLookup(&map, keys[i]); MD_MapSlot *slot = MD_MapLookup(&map, keys[i]);
TestResult(slot && slot->val == (void *)(i + 10)); TestResult(slot && slot->val == (void *)(i + 10));
} }
@@ -481,7 +488,8 @@ int main(void)
}; };
MD_Node *nodes[MD_ArrayCount(samples)]; MD_Node *nodes[MD_ArrayCount(samples)];
for (int i = 0; i < MD_ArrayCount(samples); i += 1){ for (int i = 0; i < MD_ArrayCount(samples); i += 1)
{
MD_ParseResult result = MD_ParseOneNode(arena, samples[i], 0); MD_ParseResult result = MD_ParseOneNode(arena, samples[i], 0);
nodes[i] = result.node; nodes[i] = result.node;
} }
@@ -715,7 +723,8 @@ int main(void)
}; };
MD_String8 *string = test_strings; MD_String8 *string = test_strings;
for (int i = 0; i < MD_ArrayCount(test_strings); i += 1, string += 1){ for (int i = 0; i < MD_ArrayCount(test_strings); i += 1, string += 1)
{
MD_ParseResult result = MD_ParseWholeString(arena, file_name, *string); MD_ParseResult result = MD_ParseWholeString(arena, file_name, *string);
TestResult((result.errors.first == 0) && TestResult((result.errors.first == 0) &&
(result.node->first_child == result.node->last_child) && (result.node->first_child == result.node->last_child) &&
@@ -740,7 +749,8 @@ int main(void)
}; };
MD_String8 *string = test_strings; MD_String8 *string = test_strings;
for (int i = 0; i < MD_ArrayCount(test_strings); i += 1, string += 1){ for (int i = 0; i < MD_ArrayCount(test_strings); i += 1, string += 1)
{
MD_ParseResult result = MD_ParseWholeString(arena, file_name, *string); MD_ParseResult result = MD_ParseWholeString(arena, file_name, *string);
TestResult((result.errors.first == 0) && TestResult((result.errors.first == 0) &&
(result.node->first_child == result.node->last_child) && (result.node->first_child == result.node->last_child) &&