Merge commit '3ae76c1467d047743c3e2d7a418a8cbc905a6938'

zeek · Sep 3, 2024 · 24d9307 · 24d9307
2 parents f695272 + 3ae76c1
commit 24d9307
Show file tree

Hide file tree

Showing 13 changed files with 71 additions and 30 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,10 @@ include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = ">=0.22.6"
+tree-sitter-language = "0.1.0"
 
 [build-dependencies]
 cc = "1.0.87"
+
+[dev-dependencies]
+tree-sitter = "0.23.0"
diff --git a/bindings/go/binding_test.go b/bindings/go/binding_test.go
diff --git a/bindings/go/go.mod b/bindings/go/go.mod
diff --git a/bindings/node/binding_test.js b/bindings/node/binding_test.js
diff --git a/bindings/python/tests/test_binding.py b/bindings/python/tests/test_binding.py
diff --git a/bindings/python/tree_sitter_zeek/binding.c b/bindings/python/tree_sitter_zeek/binding.c
diff --git a/bindings/rust/lib.rs b/bindings/rust/lib.rs
diff --git a/bindings/swift/TreeSitterZeekTests/TreeSitterZeekTests.swift b/bindings/swift/TreeSitterZeekTests/TreeSitterZeekTests.swift
diff --git a/go.mod b/go.mod
@@ -0,0 +1,7 @@
+module github.com/tree-sitter/tree-sitter-zeek
+
+go 1.23
+
+require github.com/tree-sitter/go-tree-sitter v0.23.1
+
+require github.com/mattn/go-pointer v0.0.1 // indirect
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     }
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.20.1",
+    "tree-sitter-cli": "^0.23.0",
     "prebuildify": "^6.0.0"
   },
   "tree-sitter": [
@@ -51,8 +51,9 @@
     }
   ],
   "scripts": {
-    "test": "tree-sitter test",
     "install": "node-gyp-build",
-    "prebuildify": "prebuildify --napi --strip"
+    "prestart": "tree-sitter build --wasm",
+    "start": "tree-sitter playground",
+    "test": "node --test bindings/node/*_test.js"
   }
 }
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ readme = "README.md"
 Homepage = "https://github.com/tree-sitter/tree-sitter-zeek"
 
 [project.optional-dependencies]
-core = ["tree-sitter~=0.21"]
+core = ["tree-sitter~=0.23"]
 
 [tool.cibuildwheel]
 build = "cp38-*"

diff --git a/src/tree_sitter/parser.h b/src/tree_sitter/parser.h