Merge branch 'master' into dev

This commit is contained in:
ryanfleury
2022-02-17 14:19:24 -07:00
8 changed files with 97 additions and 103 deletions
+1 -3
View File
@@ -1097,8 +1097,6 @@ MD_FUNCTION MD_Node* MD_MakeErrorMarkerNode(MD_Arena *arena, MD_String8 parse_
MD_FUNCTION MD_Message*MD_MakeNodeError(MD_Arena *arena, MD_Node *node,
MD_MessageKind kind, MD_String8 str);
MD_FUNCTION MD_Message*MD_MakeDetachedError(MD_Arena *arena, MD_MessageKind kind,
MD_String8 str, void *ptr);
MD_FUNCTION MD_Message*MD_MakeTokenError(MD_Arena *arena, MD_String8 parse_contents,
MD_Token token, MD_MessageKind kind,
MD_String8 str);
@@ -1181,7 +1179,7 @@ MD_FUNCTION MD_b32 MD_NodeDeepMatch(MD_Node *a, MD_Node *b, MD_MatchFlags flags)
//~ Expression Parsing
MD_FUNCTION void MD_ExprOprPush(MD_Arena *arena, MD_ExprOprList *list,
MD_ExprOprKind kind, MD_u64 precedence,
MD_ExprOprKind kind, MD_u32 precedence,
MD_String8 op_string,
MD_u32 op_id, void *op_ptr);