Merge pull request #314 from tree-sitter/update-git-submodules

Update submodules
tree-sitter · Jul 11, 2024 · 961a682 · 961a682
2 parents dfbef14 + 52a2641
commit 961a682
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 24 deletions.
diff --git a/tree-sitter-c-sharp/tree-sitter-c-sharp.cabal b/tree-sitter-c-sharp/tree-sitter-c-sharp.cabal
@@ -12,7 +12,7 @@ category:            Tree-sitter, CSharp, C#
 build-type:          Simple
 data-files:          vendor/tree-sitter-c-sharp/src/node-types.json
                    , vendor/tree-sitter-c-sharp/test/corpus/*.txt
-extra-source-files:  ChangeLog.md
+extra-doc-files:  ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-c-sharp/vendor/tree-sitter-c-sharp b/tree-sitter-c-sharp/vendor/tree-sitter-c-sharp
diff --git a/tree-sitter-go/tree-sitter-go.cabal b/tree-sitter-go/tree-sitter-go.cabal
@@ -12,7 +12,7 @@ category:            Tree-sitter, Go
 build-type:          Simple
 data-files:          vendor/tree-sitter-go/src/node-types.json
                    , vendor/tree-sitter-go/test/corpus/*.txt
-extra-source-files:  ChangeLog.md
+extra-doc-files:     ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-haskell/tree-sitter-haskell.cabal b/tree-sitter-haskell/tree-sitter-haskell.cabal
@@ -10,7 +10,7 @@ maintainer:          [email protected]
 copyright:           2019 GitHub
 category:            Tree-sitter, Haskell
 build-type:          Simple
-extra-source-files:  ChangeLog.md
+extra-doc-files:     ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-java/tree-sitter-java.cabal b/tree-sitter-java/tree-sitter-java.cabal
@@ -12,7 +12,7 @@ category:            Tree-sitter, Java
 build-type:          Simple
 data-files:          vendor/tree-sitter-java/src/node-types.json
                    , vendor/tree-sitter-java/test/corpus/*.txt
-extra-source-files:  ChangeLog.md
+extra-doc-files:     ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-json/tree-sitter-json.cabal b/tree-sitter-json/tree-sitter-json.cabal
@@ -12,7 +12,7 @@ category:            Tree-sitter, JSON
 build-type:          Simple
 data-files:          vendor/tree-sitter-json/src/node-types.json
                    , vendor/tree-sitter-json/test/corpus/*.txt
-extra-source-files:  ChangeLog.md
+extra-doc-files:     ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-nix/tree-sitter-nix.cabal b/tree-sitter-nix/tree-sitter-nix.cabal
@@ -51,7 +51,7 @@ library tree-sitter-nix-internal
   import: common
   exposed-modules:     TreeSitter.Nix.Internal
   hs-source-dirs:      internal
-  build-depends:       base
+  build-depends:       base >= 4.7 && < 5
                      , tree-sitter
   Include-dirs:        vendor/tree-sitter-nix/src
   c-sources:           vendor/tree-sitter-nix/src/parser.c

diff --git a/tree-sitter-ocaml/tree-sitter-ocaml.cabal b/tree-sitter-ocaml/tree-sitter-ocaml.cabal
@@ -11,7 +11,7 @@ category:            Tree-sitter, OCaml
 build-type:          Simple
 data-files:          vendor/tree-sitter-ocaml/grammars/ocaml/src/node-types.json
                    , vendor/tree-sitter-ocaml/grammars/ocaml/test/corpus/*.txt
-extra-source-files:  ChangeLog.md
+extra-doc-files:     ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-ocaml/vendor/tree-sitter-ocaml b/tree-sitter-ocaml/vendor/tree-sitter-ocaml
diff --git a/tree-sitter-php/tree-sitter-php.cabal b/tree-sitter-php/tree-sitter-php.cabal
@@ -11,7 +11,7 @@ copyright:           2019 GitHub
 category:            Tree-sitter, PHP
 build-type:          Simple
 data-files:          vendor/tree-sitter-php/php/src/node-types.json
-extra-source-files:  ChangeLog.md
+extra-doc-files:     ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-php/vendor/tree-sitter-php b/tree-sitter-php/vendor/tree-sitter-php
diff --git a/tree-sitter-python/tree-sitter-python.cabal b/tree-sitter-python/tree-sitter-python.cabal
@@ -12,7 +12,7 @@ category:            Tree-sitter, Python
 build-type:          Simple
 data-files:          vendor/tree-sitter-python/src/node-types.json
                    , vendor/tree-sitter-python/test/corpus/*.txt
-extra-source-files:  ChangeLog.md
+extra-doc-files:    ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-python/vendor/tree-sitter-python b/tree-sitter-python/vendor/tree-sitter-python
diff --git a/tree-sitter-ql/tree-sitter-ql.cabal b/tree-sitter-ql/tree-sitter-ql.cabal
@@ -12,7 +12,7 @@ category:            Tree-sitter, QL
 build-type:          Simple
 data-files:          vendor/tree-sitter-ql/src/node-types.json
                    , vendor/tree-sitter-ql/test/corpus/*.txt
-extra-source-files:  ChangeLog.md
+extra-doc-files:    ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-ruby/tree-sitter-ruby.cabal b/tree-sitter-ruby/tree-sitter-ruby.cabal
@@ -12,7 +12,7 @@ category:            Tree-sitter, Ruby
 build-type:          Simple
 data-files:          vendor/tree-sitter-ruby/src/node-types.json
                    , vendor/tree-sitter-ruby/test/corpus/*.txt
-extra-source-files:  ChangeLog.md
+extra-doc-files:    ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-rust/tree-sitter-rust.cabal b/tree-sitter-rust/tree-sitter-rust.cabal
@@ -11,7 +11,7 @@ category:            Tree-sitter, Rust
 build-type:          Simple
 data-files:          vendor/tree-sitter-rust/src/node-types.json
                    , vendor/tree-sitter-rust/test/corpus/*.txt
-extra-source-files:  ChangeLog.md
+extra-doc-files:    ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-tsx/tree-sitter-tsx.cabal b/tree-sitter-tsx/tree-sitter-tsx.cabal
@@ -12,7 +12,7 @@ category:            Tree-sitter, TypeScript
 build-type:          Simple
 data-files:          vendor/tree-sitter-typescript/tsx/src/node-types.json
                    , vendor/tree-sitter-typescript/test/corpus/*.txt
-extra-source-files:  ChangeLog.md
+extra-doc-files:    ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-tsx/vendor/tree-sitter-typescript b/tree-sitter-tsx/vendor/tree-sitter-typescript
diff --git a/tree-sitter-typescript/tree-sitter-typescript.cabal b/tree-sitter-typescript/tree-sitter-typescript.cabal
@@ -12,7 +12,7 @@ category:            Tree-sitter, TypeScript
 build-type:          Simple
 data-files:          vendor/tree-sitter-typescript/typescript/src/node-types.json
                    , vendor/tree-sitter-typescript/test/corpus/*.txt
-extra-source-files:  ChangeLog.md
+extra-doc-files:    ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter-typescript/vendor/tree-sitter-typescript b/tree-sitter-typescript/vendor/tree-sitter-typescript
diff --git a/tree-sitter/tree-sitter.cabal b/tree-sitter/tree-sitter.cabal
@@ -17,14 +17,15 @@ category:            Parsing, Tree-sitter
 build-type:          Simple
 
 tested-with:
-  GHC == 8.10.7
-  GHC == 9.0.2
   GHC == 9.2.8
   GHC == 9.4.8
+  GHC == 9.6.6
+  GHC == 9.8.2
 
 extra-source-files:  vendor/tree-sitter/lib/src/**/*.c
                    , vendor/tree-sitter/lib/src/**/*.h
-                   , ChangeLog.md
+
+extra-doc-files: ChangeLog.md
 
 common common
   default-language: Haskell2010

diff --git a/tree-sitter/vendor/tree-sitter b/tree-sitter/vendor/tree-sitter
+1 −0		.github/workflows/ci.yml
+1 −1		Cargo.toml
+1 −1		Makefile
+2 −2		package-lock.json
+1 −1		package.json
+1 −1		pyproject.toml
+528,537 −528,538		src/parser.c
+1 −1		src/scanner.c
+3 −2		.gitattributes
+2 −1		.github/workflows/ci.yml
+6 −9		Cargo.toml
+2 −2		Makefile
+1 −2		Package.swift
+1 −1		binding.gyp
+1 −1		bindings/go/binding_interface.go
+1 −1		bindings/go/binding_ocaml.go
+1 −1		bindings/go/binding_type.go
+3 −3		bindings/rust/build.rs
+0 −0		common/scanner.h
+1 −1		grammars/interface/src/scanner.c
+0 −1		grammars/interface/src/tree_sitter
+0 −0		grammars/interface/src/tree_sitter/alloc.h
+0 −0		grammars/interface/src/tree_sitter/array.h
+0 −0		grammars/interface/src/tree_sitter/parser.h
+1 −1		grammars/ocaml/src/scanner.c
+0 −1		grammars/ocaml/src/tree_sitter
+54 −0		grammars/ocaml/src/tree_sitter/alloc.h
+290 −0		grammars/ocaml/src/tree_sitter/array.h
+230 −0		grammars/ocaml/src/tree_sitter/parser.h
+1 −1		grammars/type/src/scanner.c
+0 −1		grammars/type/src/tree_sitter
+54 −0		grammars/type/src/tree_sitter/alloc.h
+290 −0		grammars/type/src/tree_sitter/array.h
+230 −0		grammars/type/src/tree_sitter/parser.h
+7 −7		package.json
+1 −1		setup.py
+1 −1		.github/workflows/fuzz.yml
+1 −1		Cargo.toml
+1 −1		common/common.mak
+5 −5		common/define-grammar.js
+37 −37		package-lock.json
+1 −1		package.json
+55 −35		php/src/grammar.json
+53 −18		php/src/node-types.json
+93,261 −83,368		php/src/parser.c
+55 −35		php_only/src/grammar.json
+53 −18		php_only/src/node-types.json
+91,357 −81,785		php_only/src/parser.c
+1 −1		pyproject.toml
+28 −8		test/corpus/statements.txt
+1 −1		Makefile
+3 −0		bindings/rust/build.rs
+1 −1		grammar.js
+1 −1		src/grammar.json
+4,391 −6,818		src/parser.c
+6 −3		src/tree_sitter/array.h
+43 −8		src/tree_sitter/parser.h
+3 −1		test/corpus/literals.txt
+2 −2		Cargo.toml
+23 −3		Package.swift
+5 −1		bindings/rust/lib.rs
+1 −1		common/common.mak
+157 −155		common/define-grammar.js
+6 −6		package-lock.json
+2 −2		package.json
+1 −1		pyproject.toml
+75 −1		test/corpus/types.txt
+167 −203		tsx/src/grammar.json
+183 −660		tsx/src/node-types.json
+235,098 −346,798		tsx/src/parser.c
+163 −203		typescript/src/grammar.json
+185 −662		typescript/src/node-types.json
+237,179 −351,759		typescript/src/parser.c
+51 −270		Cargo.lock
+8 −8		Cargo.toml
+1 −1		cli/Cargo.toml
+12 −3		cli/loader/src/lib.rs
+13 −2		cli/npm/install.js
+5 −1		cli/src/generate/dsl.js
+33 −10		cli/src/tests/query_test.rs
+4 −0		docs/section-3-creating-parsers.md
+1 −1		docs/section-4-syntax-highlighting.md
+4 −0		lib/binding_rust/bindings.rs
+15 −0		lib/binding_rust/lib.rs
+8 −0		lib/include/tree_sitter/api.h
+5 −1		lib/src/parser.c
+10 −1		lib/src/query.c