From e686478ad234f5da8d995f8825cfeb2d8c62f00a Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Sat, 28 May 2016 20:24:08 -0700
Subject: [PATCH] Rename stack_merge function to stack_merge_all

---
 spec/runtime/stack_spec.cc | 14 +++++++-------
 src/runtime/parser.c       |  2 +-
 src/runtime/stack.c        |  2 +-
 src/runtime/stack.h        |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/spec/runtime/stack_spec.cc b/spec/runtime/stack_spec.cc
index d1601a40..79075c0e 100644
--- a/spec/runtime/stack_spec.cc
+++ b/spec/runtime/stack_spec.cc
@@ -121,7 +121,7 @@ describe("Stack", [&]() {
     });
   });
 
-  describe("merge()", [&]() {
+  describe("merge_all()", [&]() {
     before_each([&]() {
       // . <──0── A <──1── B*
       //          ↑
@@ -142,7 +142,7 @@ describe("Stack", [&]() {
       // . <──0── A <──1── B <──3── D*
       //          ↑                 |
       //          └───2─── C <──4───┘
-      ts_stack_merge(stack);
+      ts_stack_merge_all(stack);
       AssertThat(ts_stack_version_count(stack), Equals<size_t>(1));
       AssertThat(get_stack_entries(stack, 0), Equals(vector<StackEntry>({
         {stateD, 0},
@@ -154,7 +154,7 @@ describe("Stack", [&]() {
     });
 
     it("does not combine versions that have different states", [&]() {
-      ts_stack_merge(stack);
+      ts_stack_merge_all(stack);
       AssertThat(ts_stack_version_count(stack), Equals<size_t>(2));
     });
 
@@ -166,7 +166,7 @@ describe("Stack", [&]() {
       ts_stack_push(stack, 0, trees[3], false, stateD);
       ts_stack_push(stack, 1, trees[4], false, stateD);
 
-      ts_stack_merge(stack);
+      ts_stack_merge_all(stack);
       AssertThat(ts_stack_version_count(stack), Equals<size_t>(2));
     });
 
@@ -183,7 +183,7 @@ describe("Stack", [&]() {
         // . <──0── A <──1── B <──3── D <──5── E*
         //          ↑                 |
         //          └───2─── C <──4───┘
-        ts_stack_merge(stack);
+        ts_stack_merge_all(stack);
         AssertThat(ts_stack_version_count(stack), Equals<size_t>(1));
         AssertThat(get_stack_entries(stack, 0), Equals(vector<StackEntry>({
           {stateE, 0},
@@ -272,7 +272,7 @@ describe("Stack", [&]() {
         ts_stack_push(stack, 1, trees[4], false, stateE);
         ts_stack_push(stack, 1, trees[5], false, stateF);
         ts_stack_push(stack, 1, trees[6], false, stateD);
-        ts_stack_merge(stack);
+        ts_stack_merge_all(stack);
         ts_stack_push(stack, 0, trees[10], false, stateI);
 
         AssertThat(ts_stack_version_count(stack), Equals<size_t>(1));
@@ -393,7 +393,7 @@ describe("Stack", [&]() {
           ts_stack_push(stack, 1, trees[8], false, stateH);
           ts_stack_push(stack, 1, trees[9], false, stateD);
           ts_stack_push(stack, 1, trees[10], false, stateI);
-          ts_stack_merge(stack);
+          ts_stack_merge_all(stack);
 
           AssertThat(ts_stack_version_count(stack), Equals<size_t>(1));
           AssertThat(get_stack_entries(stack, 0), Equals(vector<StackEntry>({
diff --git a/src/runtime/parser.c b/src/runtime/parser.c
index 03430387..2f2fb482 100644
--- a/src/runtime/parser.c
+++ b/src/runtime/parser.c
@@ -1018,7 +1018,7 @@ TSTree *ts_parser_parse(TSParser *self, TSInput input, TSTree *previous_tree) {
       }
     }
 
-    ts_stack_merge(self->stack);
+    ts_stack_merge_all(self->stack);
     ts_tree_release(lookahead);
 
     if (ts_stack_version_count(self->stack) == 0) {
diff --git a/src/runtime/stack.c b/src/runtime/stack.c
index 921e477c..73a087a9 100644
--- a/src/runtime/stack.c
+++ b/src/runtime/stack.c
@@ -502,7 +502,7 @@ void ts_stack_merge_new(Stack *self, StackVersion reference_version,
   }
 }
 
-void ts_stack_merge(Stack *self) {
+void ts_stack_merge_all(Stack *self) {
   ts_stack_merge_from(self, 0);
 }
 
diff --git a/src/runtime/stack.h b/src/runtime/stack.h
index 6a983710..a03de83e 100644
--- a/src/runtime/stack.h
+++ b/src/runtime/stack.h
@@ -105,7 +105,7 @@ StackPopResult ts_stack_pop_all(Stack *, StackVersion);
 
 void ts_stack_merge_from(Stack *, StackVersion);
 
-void ts_stack_merge(Stack *);
+void ts_stack_merge_all(Stack *);
 
 void ts_stack_merge_new(Stack *, StackVersion base_version,
                         StackVersion new_version);