Move grammars to grammars directory (#86)

.gitattributes

@@ -1,8 +1,12 @@
-/interface/src/parser.c linguist-generated
-/interface/src/grammar.json linguist-generated
-/interface/src/node-types.json linguist-generated
-/interface/src/tree_sitter/* linguist-vendored
-/ocaml/src/parser.c linguist-generated
-/ocaml/src/grammar.json linguist-generated
-/ocaml/src/node-types.json linguist-generated
-/ocaml/src/tree_sitter/* linguist-vendored
+* text eol=lf
+
+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
+
+include/tree_sitter/* linguist-vendored
+
+bindings/** linguist-generated
+binding.gyp linguist-generated

.gitignore

@@ -13,9 +13,9 @@ Package.resolved
 
 # These files would be generated by 'tree-sitter generate' with the default
 # settings. We don't want them because there's already a copy at the root.
-/interface/Cargo.toml
-/interface/binding.gyp
-/interface/bindings
-/ocaml/Cargo.toml
-/ocaml/binding.gyp
-/ocaml/bindings
+grammars/interface/Cargo.toml
+grammars/interface/binding.gyp
+grammars/interface/bindings
+grammars/ocaml/Cargo.toml
+grammars/ocaml/binding.gyp
+grammars/ocaml/bindings

Cargo.toml

@@ -12,12 +12,14 @@ edition = "2018"
 
 build = "bindings/rust/build.rs"
 include = [
-  "common/*",
   "bindings/rust/*",
-  "ocaml/grammar.js",
-  "ocaml/src/*",
-  "interface/grammar.js",
-  "interface/src/*",
+  "grammars/ocaml/grammar.js",
+  "grammars/ocaml/src/*.c",
+  "grammars/ocaml/src/*.json",
+  "grammars/interface/grammar.js",
+  "grammars/interface/src/*.c",
+  "grammars/interface/src/*.json",
+  "include/*",
   "queries/*"
 ]
 

Package.swift

@@ -15,16 +15,17 @@ let package = Package(
             name: "TreeSitterOCaml",
             path: ".",
             sources: [
-                "interface/src/parser.c",
-                "interface/src/scanner.c",
-                "ocaml/src/parser.c",
-                "ocaml/src/scanner.c",
+                "grammars/interface/src/parser.c",
+                "grammars/interface/src/scanner.c",
+                "grammars/ocaml/src/parser.c",
+                "grammars/ocaml/src/scanner.c",
+                "include",
             ],
             resources: [
                 .copy("queries")
             ],
             publicHeadersPath: "bindings/swift",
-            cSettings: [.headerSearchPath("ocaml/src")]
+            cSettings: [.headerSearchPath("include")]
         ),
         .testTarget(
             name: "TreeSitterOCamlTests",

grammars/interface/package.json

@@ -0,0 +1,3 @@
+{
+  "main": "../../bindings/node/interface"
+}