ok this is kinda funny

polyvariant · Oct 30, 2024 · b4f306c · b4f306c
1 parent b296bb0
commit b4f306c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 26 deletions.
diff --git a/core/.jvm/src/main/scala/org/polyvariant/treesitter4s/lowlevel/TreeSitterPlatform.scala b/core/.jvm/src/main/scala/org/polyvariant/treesitter4s/lowlevel/TreeSitterPlatform.scala
@@ -19,8 +19,6 @@ package org.polyvariant.treesitter4s.lowlevel
 import com.sun.jna.*
 import org.polyvariant.treesitter4s.internal.TreeSitterLibrary
 
-import java.util.concurrent.ConcurrentHashMap
-import scala.jdk.CollectionConverters.*
 import java.io.Closeable
 
 object TreeSitterPlatform {
@@ -51,15 +49,6 @@ object TreeSitterPlatform {
 
       type Language = CC
 
-      /* private */
-      // val languages = new ConcurrentHashMap[String, (NativeLibrary, Language)]
-
-      // def close(): Unit = {
-      //   languages.values().asScala.foreach(_._1.close())
-      //   languages.clear()
-      // }
-      def close(): Unit = ()
-
       val Language: LanguageMethods =
         new {
 

diff --git a/core/src/main/scala/org/polyvariant/treesitter4s/TreeSitterAPI.scala b/core/src/main/scala/org/polyvariant/treesitter4s/TreeSitterAPI.scala
@@ -18,8 +18,6 @@ package org.polyvariant.treesitter4s
 
 import org.polyvariant.treesitter4s.lowlevel.TreeSitter
 
-import scala.util.Using
-
 // High-level Tree Sitter API.
 // For the lower-level one, see TreeSitter in the lowlevel package.
 trait TreeSitterAPI {
@@ -30,15 +28,12 @@ trait TreeSitterAPI {
 
 object TreeSitterAPI {
 
-  // hm what's interesting is that the committed version segfaults on
-  // a different function (ts_node_string) and here we crash at ts_parser_set_language.
-  // strange things
-  def make(language: (ts: TreeSitter) => ts.Language): TreeSitterAPI =
-    Using.resource(TreeSitter.instance()) { ts =>
-      Using.resource(language(ts)) { lang =>
-        internal.Facade.make(ts, lang)
-      }
-    }
+  def make(language: (ts: TreeSitter) => ts.Language): TreeSitterAPI = {
+    val ts = TreeSitter.instance()
+    val lang = language(ts)
+
+    internal.Facade.make(ts, lang)
+  }
 
 }
 

diff --git a/core/src/main/scala/org/polyvariant/treesitter4s/lowlevel/TreeSitter.scala b/core/src/main/scala/org/polyvariant/treesitter4s/lowlevel/TreeSitter.scala
@@ -18,7 +18,7 @@ package org.polyvariant.treesitter4s.lowlevel
 
 import java.io.Closeable
 
-trait TreeSitter extends AutoCloseable {
+trait TreeSitter {
   type Parser
   type Tree
 

diff --git a/tests/src/test/scala/org/polyvariant/treesitter4s/tests/BindingTests.scala b/tests/src/test/scala/org/polyvariant/treesitter4s/tests/BindingTests.scala
@@ -22,9 +22,8 @@ import weaver._
 import org.polyvariant.treesitter4s.TreeSitterAPI
 
 object BindingTests extends FunSuite {
-  val tsPython = TreeSitterAPI.make(_.Language("python"))
-
-  def parseExample(s: String): Tree = tsPython.parse(s)
+  val ts = TreeSitterAPI.make(_.Language("python"))
+  def parseExample(s: String): Tree = ts.parse(s)
 
   test("root node child count") {
     val tree = parseExample("def main = print('Hello')\n")