From 10a3251fbe7507418d7ea6f17a5007ff68f4487f Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Mon, 29 Sep 2014 10:16:24 -0700
Subject: [PATCH] Remove index parameter from STACK_FROM_TOP macro

---
 src/runtime/parser.c | 6 +++---
 src/runtime/stack.h  | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/runtime/parser.c b/src/runtime/parser.c
index 2b09fbe7..76fccd13 100644
--- a/src/runtime/parser.c
+++ b/src/runtime/parser.c
@@ -105,7 +105,7 @@ static void reduce(TSParser *parser, TSSymbol symbol, size_t child_count) {
 
 static int reduce_extra(TSParser *parser, TSSymbol symbol) {
   TSTree *last_node = NULL;
-  TS_STACK_FROM_TOP(parser->stack, entry, i) {
+  TS_STACK_FROM_TOP(parser->stack, entry) {
     if (!ts_tree_is_extra(entry->node)) {
       last_node = entry->node;
       break;
@@ -137,7 +137,7 @@ static int handle_error(TSParser *parser) {
      *  Unwind the parse stack until a state is found in which an error is
      *  expected and the current lookahead token is expected afterwards.
      */
-    TS_STACK_FROM_TOP(parser->stack, entry, i) {
+    TS_STACK_FROM_TOP(parser->stack, entry) {
       TSParseAction action_on_error =
           action_for(parser->language, entry->state, ts_builtin_sym_error);
 
@@ -148,7 +148,7 @@ static int handle_error(TSParser *parser) {
 
         if (action_after_error.type != TSParseActionTypeError) {
           DEBUG_PARSE("RECOVER %u", state_after_error);
-          ts_stack_shrink(&parser->stack, i + 1);
+          ts_stack_shrink(&parser->stack, entry - parser->stack.entries + 1);
           error->size = ts_length_sub(
               ts_length_sub(
                 parser->lexer.token_start_position,
diff --git a/src/runtime/stack.h b/src/runtime/stack.h
index c485e6d6..e9c7d397 100644
--- a/src/runtime/stack.h
+++ b/src/runtime/stack.h
@@ -26,11 +26,10 @@ TSStateId ts_stack_top_state(const TSStack *stack);
 TSTree *ts_stack_top_node(const TSStack *stack);
 TSLength ts_stack_right_position(const TSStack *stack);
 
-#define TS_STACK_FROM_TOP(stack, entry, index)               \
-  size_t index = stack.size - 1;                             \
-  (void) index;                                              \
+#define TS_STACK_FROM_TOP(stack, entry)                      \
   for (TSStackEntry *entry = stack.entries + stack.size - 1; \
-       entry >= stack.entries; entry-- && index--)
+       entry >= stack.entries;                               \
+       entry--)
 
 #ifdef __cplusplus
 }