Fix leaked lookahead trees in normal parsing

spec/runtime/document_spec.cc

@@ -1,5 +1,8 @@
 #include "spec_helper.h"
+#include "runtime/alloc.h"
 #include "runtime/debugger.h"
+#include "helpers/record_alloc.h"
+#include "helpers/stream_methods.h"
 #include "helpers/tree_helpers.h"
 #include "helpers/spy_debugger.h"
 #include "helpers/spy_input.h"
@@ -12,13 +15,22 @@ describe("Document", [&]() {
   TSNode root;
 
   before_each([&]() {
+    record_alloc::start();
     doc = ts_document_make();
   });
 
   after_each([&]() {
     ts_document_free(doc);
+    record_alloc::stop();
+    AssertThat(record_alloc::outstanding_allocation_indices(), IsEmpty());
   });
 
+  auto assert_node_string_equals = [&](TSNode node, const string &expected) {
+    char *actual = ts_node_string(node, doc);
+    AssertThat(actual, Equals(expected));
+    ts_free(actual);
+  };
+
   describe("set_input(input)", [&]() {
     SpyInput *spy_input;
 
@@ -30,8 +42,9 @@ describe("Document", [&]() {
       ts_document_parse(doc);
 
       root = ts_document_root_node(doc);
-      AssertThat(ts_node_string(root, doc), Equals(
-        "(object (pair (string) (array (number) (number))))"));
+      assert_node_string_equals(
+        root,
+        "(object (pair (string) (array (number) (number))))");
     });
 
     after_each([&]() {
@@ -48,8 +61,9 @@ describe("Document", [&]() {
       ts_document_parse(doc);
 
       root = ts_document_root_node(doc);
-      AssertThat(ts_node_string(root, doc), Equals(
-        "(array (true) (false))"));
+      assert_node_string_equals(
+        root,
+        "(array (true) (false))");
     });
 
     it("allows the input to be retrieved later", [&]() {
@@ -74,8 +88,9 @@ describe("Document", [&]() {
       ts_document_parse(doc);
 
       TSNode new_root = ts_document_root_node(doc);
-      AssertThat(ts_node_string(new_root, doc), Equals(
-        "(object (pair (string) (array (null) (number))))"));
+      assert_node_string_equals(
+        new_root,
+        "(object (pair (string) (array (null) (number))))");
       AssertThat(spy_input->strings_read, Equals(vector<string>({" [null, 2", ""})));
     });
 
@@ -83,14 +98,16 @@ describe("Document", [&]() {
       ts_document_set_input_string(doc, "");
       ts_document_parse(doc);
       TSNode new_root = ts_document_root_node(doc);
-      AssertThat(ts_node_string(new_root, doc), Equals(
-        "(ERROR (UNEXPECTED <EOF>))"));
+      assert_node_string_equals(
+        new_root,
+        "(ERROR (UNEXPECTED <EOF>))");
 
       ts_document_set_input_string(doc, "1");
       ts_document_parse(doc);
       new_root = ts_document_root_node(doc);
-      AssertThat(ts_node_string(new_root, doc), Equals(
-        "(number)"));
+      assert_node_string_equals(
+        new_root,
+        "(number)");
     });
   });
 
@@ -104,8 +121,9 @@ describe("Document", [&]() {
       ts_document_parse(doc);
 
       root = ts_document_root_node(doc);
-      AssertThat(ts_node_string(root, doc), Equals(
-        "(object (pair (string) (array (number) (number))))"));
+      assert_node_string_equals(
+        root,
+        "(object (pair (string) (array (number) (number))))");
     });
 
     it("clears out any previous tree", [&]() {
@@ -117,9 +135,10 @@ describe("Document", [&]() {
 
       ts_document_parse(doc);
       root = ts_document_root_node(doc);
-      AssertThat(ts_node_string(root, doc), Equals(
+      assert_node_string_equals(
+        root,
         "(program (expression_statement "
-          "(object (pair (string) (array (number) (number))))))"));
+          "(object (pair (string) (array (number) (number))))))");
     });
   });
 

spec/runtime/node_spec.cc

@@ -1,7 +1,10 @@
 #include "spec_helper.h"
+#include "runtime/alloc.h"
 #include "helpers/tree_helpers.h"
 #include "helpers/point_helpers.h"
 #include "helpers/test_languages.h"
+#include "helpers/record_alloc.h"
+#include "helpers/stream_methods.h"
 
 START_TEST
 
@@ -33,21 +36,28 @@ describe("Node", []() {
   size_t null_end_index = null_index + string("null").size();
 
   before_each([&]() {
+    record_alloc::start();
+
     document = ts_document_make();
     ts_document_set_language(document, get_test_language("json"));
     ts_document_set_input_string(document, input_string.c_str());
     ts_document_parse(document);
 
     array_node = ts_document_root_node(document);
-    AssertThat(ts_node_string(array_node, document), Equals(
+    char *node_string = ts_node_string(array_node, document);
+    AssertThat(node_string, Equals(
       "(array "
         "(number) "
         "(false) "
         "(object (pair (string) (null))))"));
+    ts_free(node_string);
   });
 
   after_each([&]() {
     ts_document_free(document);
+
+    record_alloc::stop();
+    AssertThat(record_alloc::outstanding_allocation_indices(), IsEmpty());
   });
 
   describe("named_child_count(), named_child(i)", [&]() {

spec/runtime/stack_spec.cc

@@ -1,4 +1,3 @@
-#define TREE_SITTER_WRAP_MALLOC
 #include "spec_helper.h"
 #include "helpers/tree_helpers.h"
 #include "helpers/record_alloc.h"