diff --git a/code/mdesk/mdesk.c b/code/mdesk/mdesk.c index bbcd8fa..5130022 100644 --- a/code/mdesk/mdesk.c +++ b/code/mdesk/mdesk.c @@ -121,13 +121,13 @@ node_rec_depth_first(Node* node, Node* subtree_root, U64 child_off, U64 sib_off) NodeRec rec = {0}; rec.next = nil_node(); - if (!node_is_nil(*member_from_offset(Node**, node, child_off))) { + if ( ! node_is_nil(*member_from_offset(Node**, node, child_off))) { rec.next = *member_from_offset(Node**, node, child_off); rec.push_count = 1; } else for (Node* p = node; !node_is_nil(p) && p != subtree_root; p = p->parent, rec.pop_count += 1) { - if (!node_is_nil(*member_from_offset(Node**, p, sib_off))) { + if ( ! node_is_nil(*member_from_offset(Node**, p, sib_off))) { rec.next = *member_from_offset(Node**, p, sib_off); break; } @@ -138,19 +138,12 @@ node_rec_depth_first(Node* node, Node* subtree_root, U64 child_off, U64 sib_off) //- rjf: tree building void -unhook(Node* node) -{ +unhook(Node* node) { Node* parent = node->parent; - if (!node_is_nil(parent)) + if ( ! node_is_nil(parent)) { - if(node->kind == NodeKind_Tag) - { - dll_remove_npz(nil_node(), parent->first_tag, parent->last_tag, node, next, prev); - } - else - { - dll_remove_npz(nil_node(), parent->first, parent->last, node, next, prev); - } + if (node->kind == NodeKind_Tag) dll_remove_npz(nil_node(), parent->first_tag, parent->last_tag, node, next, prev); + else dll_remove_npz(nil_node(), parent->first, parent->last, node, next, prev); node->parent = nil_node(); } } @@ -224,8 +217,7 @@ tree_match(Node *a, Node *b, StringMatchFlags flags) { for(Node *a_child = a->first, *b_child = b->first; !node_is_nil(a_child) || !node_is_nil(b_child); a_child = a_child->next, b_child = b_child->next) { - if (!tree_match(a_child, b_child, flags)) - { + if ( ! tree_match(a_child, b_child, flags)) { result = 0; goto end; } @@ -690,6 +682,7 @@ parse_from_text_tokens(Arena* arena, String8 filename, String8 text, TokenArray if (token->flags & TokenFlag_Whitespace) { token += 1; goto end_consume; + // } // TODO(Ed): Add opt-in support for comment awareness @@ -697,6 +690,9 @@ parse_from_text_tokens(Arena* arena, String8 filename, String8 text, TokenArray if (token->flags & TokenGroup_Comment) { token += 1; goto end_consume; + // < // > + // or + // /* */ } //- rjf: [node follow up] : following label -> work top parent has children. @@ -707,7 +703,7 @@ parse_from_text_tokens(Arena* arena, String8 filename, String8 text, TokenArray parse_work_push(ParseWorkKind_NodeChildrenStyleScan, parent); token += 1; goto end_consume; - // Transition to a state where we scan for // explicit delimiters (e.g., '{', '[', '('). + // ..