From 3672da6ac34a1d57970291876cadc97e05d419ff Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 17 Sep 2018 22:24:37 -0700
Subject: [PATCH] :art: Use NULL_SUBTREE constant in a few more places

---
 src/runtime/get_changed_ranges.c | 2 +-
 src/runtime/reusable_node.h      | 6 +++---
 src/runtime/stack.c              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/runtime/get_changed_ranges.c b/src/runtime/get_changed_ranges.c
index 40e61c47..cb531b2d 100644
--- a/src/runtime/get_changed_ranges.c
+++ b/src/runtime/get_changed_ranges.c
@@ -218,7 +218,7 @@ typedef enum {
 } IteratorComparison;
 
 IteratorComparison iterator_compare(const Iterator *old_iter, const Iterator *new_iter) {
-  Subtree old_tree = {.ptr = NULL}, new_tree = {.ptr = NULL};
+  Subtree old_tree = NULL_SUBTREE, new_tree = NULL_SUBTREE;
   uint32_t old_start = 0, new_start = 0;
   TSSymbol old_alias_symbol = 0, new_alias_symbol = 0;
   iterator_get_visible_state(old_iter, &old_tree, &old_alias_symbol, &old_start);
diff --git a/src/runtime/reusable_node.h b/src/runtime/reusable_node.h
index 8c18bce7..cb9cea58 100644
--- a/src/runtime/reusable_node.h
+++ b/src/runtime/reusable_node.h
@@ -12,12 +12,12 @@ typedef struct {
 } ReusableNode;
 
 static inline ReusableNode reusable_node_new() {
-  return (ReusableNode) {array_new(), (Subtree) {.ptr = NULL}};
+  return (ReusableNode) {array_new(), NULL_SUBTREE};
 }
 
 static inline void reusable_node_clear(ReusableNode *self) {
   array_clear(&self->stack);
-  self->last_external_token.ptr = NULL;
+  self->last_external_token = NULL_SUBTREE;
 }
 
 static inline void reusable_node_reset(ReusableNode *self, Subtree tree) {
@@ -32,7 +32,7 @@ static inline void reusable_node_reset(ReusableNode *self, Subtree tree) {
 static inline Subtree reusable_node_tree(ReusableNode *self) {
   return self->stack.size > 0
     ? self->stack.contents[self->stack.size - 1].tree
-    : (Subtree) { .ptr = NULL };
+    : NULL_SUBTREE;
 }
 
 static inline uint32_t reusable_node_byte_offset(ReusableNode *self) {
diff --git a/src/runtime/stack.c b/src/runtime/stack.c
index 7645bd4a..4828163a 100644
--- a/src/runtime/stack.c
+++ b/src/runtime/stack.c
@@ -375,7 +375,7 @@ Stack *ts_stack_new(SubtreePool *subtree_pool) {
   array_reserve(&self->node_pool, MAX_NODE_POOL_SIZE);
 
   self->subtree_pool = subtree_pool;
-  self->base_node = stack_node_new(NULL, (Subtree) {.ptr = NULL}, false, 1, &self->node_pool);
+  self->base_node = stack_node_new(NULL, NULL_SUBTREE, false, 1, &self->node_pool);
   ts_stack_clear(self);
 
   return self;
@@ -682,7 +682,7 @@ void ts_stack_clear(Stack *self) {
   array_clear(&self->heads);
   array_push(&self->heads, ((StackHead){
     .node = self->base_node,
-    .last_external_token.ptr = NULL,
+    .last_external_token = NULL_SUBTREE,
     .status = StackStatusActive,
     .lookahead_when_paused = 0,
   }));