From 5869c1ea188f9cf58e3d1515a038ba67491c5aa7 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 21 Mar 2014 13:02:25 -0700
Subject: [PATCH] Clean up stack breakdown function

---
 include/tree_sitter/parser.h | 23 +++++++++--------------
 src/runtime/stack.c          | 10 ++++++++++
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/include/tree_sitter/parser.h b/include/tree_sitter/parser.h
index f90259ad..e4ff02ec 100644
--- a/include/tree_sitter/parser.h
+++ b/include/tree_sitter/parser.h
@@ -154,6 +154,7 @@ void ts_stack_shrink(ts_stack *stack, size_t new_size);
 void ts_stack_push(ts_stack *stack, state_id state, ts_tree *node);
 state_id ts_stack_top_state(const ts_stack *stack);
 ts_tree * ts_stack_top_node(const ts_stack *stack);
+size_t ts_stack_right_position(const ts_stack *stack);
 
 
 /*
@@ -270,35 +271,29 @@ static ts_lr_parser * ts_lr_parser_make() {
 }
 
 static size_t ts_lr_parser_breakdown_stack(ts_lr_parser *parser, ts_input_edit *edit) {
+    ts_stack *stack = &parser->stack;
     if (!edit) return 0;
 
     ts_tree *node;
-    size_t position;
+    size_t position = 0;
+    size_t child_count = 0;
     
     for (;;) {
-        node = ts_stack_top_node(&parser->stack);
+        node = ts_stack_top_node(stack);
         if (!node) break;
 
-        position = 0;
-        for (size_t i = 0; i < parser->stack.size; i++) {
-            ts_tree *node = parser->stack.entries[i].node;
-            position += node->offset + node->size;
-        }
-        
-        size_t child_count = 0;
+        position = ts_stack_right_position(stack);
         ts_tree **children = ts_tree_children(node, &child_count);
-
         if (position <= edit->position && !children) break;
 
-        parser->stack.size--;
+        stack->size--;
         position -= (node->offset + node->size);
 
         for (size_t i = 0; i < child_count && position < edit->position; i++) {
             ts_tree *child = children[i];
-
-            state_id state = ts_stack_top_state(&parser->stack);
+            state_id state = ts_stack_top_state(stack);
             state_id next_state = ts_parse_actions[state][child->symbol].data.to_state;
-            ts_stack_push(&parser->stack, next_state, child);
+            ts_stack_push(stack, next_state, child);
             ts_tree_retain(child);
             position += child->offset + child->size;
         }
diff --git a/src/runtime/stack.c b/src/runtime/stack.c
index f79a0bcb..0b3eb35d 100644
--- a/src/runtime/stack.c
+++ b/src/runtime/stack.c
@@ -49,6 +49,15 @@ void ts_stack_shrink(ts_stack *stack, size_t new_size) {
     stack->size = new_size;
 }
 
+size_t ts_stack_right_position(const ts_stack *stack) {
+    size_t result = 0;
+    for (size_t i = 0; i < stack->size; i++) {
+        ts_tree *node = stack->entries[i].node;
+        result += node->offset + node->size;
+    }
+    return result;
+}
+
 ts_tree * ts_stack_reduce(ts_stack *stack, ts_symbol symbol, int child_count, const int *collapse_flags) {
     size_t new_stack_size = stack->size - child_count;
 
@@ -71,3 +80,4 @@ ts_tree * ts_stack_reduce(ts_stack *stack, ts_symbol symbol, int child_count, co
     ts_stack_shrink(stack, new_stack_size);
     return lookahead;
 }
+