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

[expr parsing] rename MD_ExprNode -> MD_Expr

Browse Source
This commit is contained in:
Allen Webster
2021-10-01 22:52:45 -07:00
parent 69ce78c71d
commit ed377ebd33
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/md.c
+5 -5
View File
@@ -3425,11 +3425,11 @@ MD_ExprBakeOperatorTableFromList(MD_Arena *arena, MD_ExprOprList *list)
return(result); return(result);
} }
MD_FUNCTION MD_ExprNode* MD_FUNCTION MD_Expr*
MD_Expr_Alloc(MD_Arena *arena, MD_ExprOpr *op, MD_Node *op_node, MD_Expr_Alloc(MD_Arena *arena, MD_ExprOpr *op, MD_Node *op_node,
MD_ExprNode *left, MD_ExprNode *right) MD_Expr *left, MD_Expr *right)
{ {
MD_ExprNode *result = MD_PushArrayZero(arena, MD_ExprNode, 1); MD_Expr *result = MD_PushArrayZero(arena, MD_Expr, 1);
result->is_op = 1; result->is_op = 1;
result->op_id = op->op_id; result->op_id = op->op_id;
result->op_ptr = op->op_ptr; result->op_ptr = op->op_ptr;
@@ -3583,7 +3583,7 @@ MD_ExprParse_Atom(MD_Arena *arena, MD_ExprParseCtx *ctx, MD_Node **iter, MD_Node
{ {
*iter = MD_NodeNextWithLimit(*iter, opl); *iter = MD_NodeNextWithLimit(*iter, opl);
// NOTE(mal): Unparsed leaf sets ({ ... }, [ ... ]) // NOTE(mal): Unparsed leaf sets ({ ... }, [ ... ])
result.node = MD_PushArrayZero(arena, MD_ExprNode, 1); result.node = MD_PushArrayZero(arena, MD_Expr, 1);
result.node->md_node = node; result.node->md_node = node;
} }
else if(MD_ExprParse_OprConsume(ctx, iter, opl, MD_ExprOprKind_Prefix, 1, &op)) else if(MD_ExprParse_OprConsume(ctx, iter, opl, MD_ExprOprKind_Prefix, 1, &op))
@@ -3618,7 +3618,7 @@ MD_ExprParse_Atom(MD_Arena *arena, MD_ExprParseCtx *ctx, MD_Node **iter, MD_Node
} }
else{ // NOTE(mal): leaf else{ // NOTE(mal): leaf
*iter = MD_NodeNextWithLimit(*iter, opl); *iter = MD_NodeNextWithLimit(*iter, opl);
result.node = MD_PushArrayZero(arena, MD_ExprNode, 1); result.node = MD_PushArrayZero(arena, MD_Expr, 1);
result.node->md_node = node; result.node->md_node = node;
} }
source/md.h
+9 -9
View File
@@ -755,12 +755,12 @@ struct MD_ExprOprTable
MD_MessageList errors; MD_MessageList errors;
}; };
typedef struct MD_ExprNode MD_ExprNode; typedef struct MD_Expr MD_Expr;
struct MD_ExprNode struct MD_Expr
{ {
struct MD_ExprNode *parent; struct MD_Expr *parent;
struct MD_ExprNode *left; struct MD_Expr *left;
struct MD_ExprNode *right; struct MD_Expr *right;
MD_b32 is_op; MD_b32 is_op;
MD_u32 op_id; MD_u32 op_id;
void *op_ptr; void *op_ptr;
@@ -770,11 +770,11 @@ struct MD_ExprNode
typedef struct MD_ExprParseResult MD_ExprParseResult; typedef struct MD_ExprParseResult MD_ExprParseResult;
struct MD_ExprParseResult struct MD_ExprParseResult
{ {
MD_ExprNode *node; MD_Expr *node;
MD_MessageList errors; MD_MessageList errors;
}; };
// TODO(allen): nil MD_ExprNode // TODO(allen): nil MD_Expr
typedef struct MD_ExprParseCtx MD_ExprParseCtx; typedef struct MD_ExprParseCtx MD_ExprParseCtx;
struct MD_ExprParseCtx struct MD_ExprParseCtx
@@ -1125,8 +1125,8 @@ MD_FUNCTION MD_Node* MD_NodeNextWithLimit(MD_Node *node, MD_Node *opl);
MD_FUNCTION MD_ExprNode* MD_Expr_Alloc(MD_Arena *arena, MD_ExprOpr *op, MD_Node *op_node, MD_FUNCTION MD_Expr* MD_Expr_Alloc(MD_Arena *arena, MD_ExprOpr *op, MD_Node *op_node,
MD_ExprNode *left, MD_ExprNode *right); MD_Expr *left, MD_Expr *right);
MD_FUNCTION MD_ExprParseCtx MD_ExprParse_MakeContext(MD_ExprOprTable *table,MD_Node *first); MD_FUNCTION MD_ExprParseCtx MD_ExprParse_MakeContext(MD_ExprOprTable *table,MD_Node *first);
tests/expression_tests.c
+2 -2
View File
@@ -117,7 +117,7 @@ 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_Expr *node, MD_b32 exclude_outer_parens)
{ {
if(node->is_op) if(node->is_op)
{ {
@@ -209,7 +209,7 @@ static void parenthesize_exclude_outer(MD_Arena *arena, OperatorDescription *des
} }
} }
static MD_String8 parenthesize(MD_Arena *arena, OperatorDescription *descs, MD_ExprNode *node) static MD_String8 parenthesize(MD_Arena *arena, OperatorDescription *descs, MD_Expr *node)
{ {
MD_String8 result = {0}; MD_String8 result = {0};
MD_String8List l = {0}; MD_String8List l = {0};