Add type grammar (#89)

tree-sitter · Mar 29, 2024 · 61110c1 · 61110c1
1 parent f7e6311
commit 61110c1
Show file tree

Hide file tree

Showing 32 changed files with 994,210 additions and 19 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,10 +1,13 @@
 * text eol=lf
 
+grammars/ocaml/src/*.json linguist-generated
+grammars/ocaml/src/parser.c linguist-generated
+
 grammars/interface/src/*.json linguist-generated
 grammars/interface/src/parser.c linguist-generated
 
-grammars/ocaml/src/*.json linguist-generated
-grammars/ocaml/src/parser.c linguist-generated
+grammars/type/src/*.json linguist-generated
+grammars/type/src/parser.c linguist-generated
 
 include/tree_sitter/* linguist-vendored
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,6 +25,9 @@ jobs:
       - name: Test interface
         working-directory: grammars/interface
         run: tree-sitter test
+      - name: Test type
+        working-directory: grammars/type
+        run: tree-sitter test
       - name: Test highlighting
         run: tree-sitter test
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -19,6 +19,9 @@ include = [
   "grammars/interface/grammar.js",
   "grammars/interface/src/*.c",
   "grammars/interface/src/*.json",
+  "grammars/type/grammar.js",
+  "grammars/type/src/*.c",
+  "grammars/type/src/*.json",
   "include/*",
   "queries/*"
 ]

diff --git a/Makefile b/Makefile
diff --git a/Package.swift b/Package.swift
diff --git a/README.md b/README.md
@@ -8,11 +8,12 @@
 
 OCaml grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter).
 
-This module defines two grammars for implementation (`.ml`) and interface (`.mli`) files. Require them as follows:
+This module defines grammars for implementations (`.ml`) interfaces (`.mli`) and types. Require them as follows:
 
 ```js
 require('tree-sitter-ocaml').ocaml;
 require('tree-sitter-ocaml').interface;
+require('tree-sitter-ocaml').type;
 ```
 
 References

diff --git a/binding.gyp b/binding.gyp
diff --git a/bindings/c/tree-sitter-ocaml.h b/bindings/c/tree-sitter-ocaml.h
diff --git a/bindings/go/binding_test.go b/bindings/go/binding_test.go
diff --git a/bindings/go/binding_type.go b/bindings/go/binding_type.go
diff --git a/bindings/node/binding.cc b/bindings/node/binding.cc
diff --git a/bindings/node/index.d.ts b/bindings/node/index.d.ts
diff --git a/bindings/node/index.js b/bindings/node/index.js
diff --git a/bindings/node/type.js b/bindings/node/type.js
diff --git a/bindings/python/tree_sitter_ocaml/__init__.py b/bindings/python/tree_sitter_ocaml/__init__.py
diff --git a/bindings/python/tree_sitter_ocaml/__init__.pyi b/bindings/python/tree_sitter_ocaml/__init__.pyi
diff --git a/bindings/python/tree_sitter_ocaml/binding.c b/bindings/python/tree_sitter_ocaml/binding.c
diff --git a/bindings/rust/README.md b/bindings/rust/README.md
diff --git a/bindings/rust/build.rs b/bindings/rust/build.rs
diff --git a/bindings/rust/lib.rs b/bindings/rust/lib.rs
diff --git a/bindings/swift/TreeSitterOCaml/ocaml.h b/bindings/swift/TreeSitterOCaml/ocaml.h
diff --git a/bindings/swift/TreeSitterOCamlTests/TreeSitterOCamlTests.swift b/bindings/swift/TreeSitterOCamlTests/TreeSitterOCamlTests.swift
diff --git a/grammars/type/grammar.js b/grammars/type/grammar.js
@@ -0,0 +1,16 @@
+/// <reference types="tree-sitter-cli/dsl" />
+// @ts-check
+
+module.exports = grammar(require('../ocaml/grammar'), {
+  name: 'ocaml_type',
+
+  rules: {
+    type: $ => $._type
+  }
+})
+
+// Make 'type' the first rule
+module.exports.grammar.rules = Object.assign(
+  {type: null},
+  module.exports.grammar.rules
+)
diff --git a/grammars/type/package.json b/grammars/type/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "../../bindings/node/type"
+}