Replace symlinks (#95)

tree-sitter · Jun 30, 2024 · cd95a67 · cd95a67
1 parent 0e3a2ef
commit cd95a67
Show file tree

Hide file tree

Showing 28 changed files with 1,179 additions and 36 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,14 +2,15 @@
 
 grammars/ocaml/src/*.json linguist-generated
 grammars/ocaml/src/parser.c linguist-generated
+grammars/ocaml/src/tree_sitter/* linguist-vendored
 
 grammars/interface/src/*.json linguist-generated
 grammars/interface/src/parser.c linguist-generated
+grammars/interface/src/tree_sitter/* linguist-vendored
 
 grammars/type/src/*.json linguist-generated
 grammars/type/src/parser.c linguist-generated
-
-include/tree_sitter/* linguist-vendored
+grammars/type/src/tree_sitter/* linguist-vendored
 
 bindings/** linguist-generated
 binding.gyp linguist-generated

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -90,6 +90,7 @@ jobs:
       - name: Test
         run: npm run test-binding
 
+
   test-rust:
     name: Test Rust binding
     runs-on: ${{matrix.os}}

diff --git a/Cargo.toml b/Cargo.toml
@@ -12,18 +12,15 @@ autoexamples = false
 
 build = "bindings/rust/build.rs"
 include = [
-  "bindings/rust/*",
+  "bindings/rust",
+  "common",
   "grammars/ocaml/grammar.js",
-  "grammars/ocaml/src/*.c",
-  "grammars/ocaml/src/*.json",
+  "grammars/ocaml/src",
   "grammars/interface/grammar.js",
-  "grammars/interface/src/*.c",
-  "grammars/interface/src/*.json",
+  "grammars/interface/src",
   "grammars/type/grammar.js",
-  "grammars/type/src/*.c",
-  "grammars/type/src/*.json",
-  "include/*",
-  "queries/*"
+  "grammars/type/src",
+  "queries"
 ]
 
 [lib]

diff --git a/Makefile b/Makefile
diff --git a/Package.swift b/Package.swift
diff --git a/binding.gyp b/binding.gyp
diff --git a/bindings/go/binding_interface.go b/bindings/go/binding_interface.go
diff --git a/bindings/go/binding_ocaml.go b/bindings/go/binding_ocaml.go
diff --git a/bindings/go/binding_type.go b/bindings/go/binding_type.go
diff --git a/bindings/rust/build.rs b/bindings/rust/build.rs
diff --git a/include/scanner.h → common/scanner.h b/include/scanner.h → common/scanner.h
diff --git a/grammars/interface/src/scanner.c b/grammars/interface/src/scanner.c
@@ -1,4 +1,4 @@
-#include "../../../include/scanner.h"
+#include "../../../common/scanner.h"
 
 void *tree_sitter_ocaml_interface_external_scanner_create() { return create(); }
 

diff --git a/grammars/interface/src/tree_sitter b/grammars/interface/src/tree_sitter
diff --git a/include/tree_sitter/alloc.h → grammars/interface/src/tree_sitter/alloc.h b/include/tree_sitter/alloc.h → grammars/interface/src/tree_sitter/alloc.h
diff --git a/include/tree_sitter/array.h → grammars/interface/src/tree_sitter/array.h b/include/tree_sitter/array.h → grammars/interface/src/tree_sitter/array.h
diff --git a/include/tree_sitter/parser.h → grammars/interface/src/tree_sitter/parser.h b/include/tree_sitter/parser.h → grammars/interface/src/tree_sitter/parser.h
diff --git a/grammars/ocaml/src/scanner.c b/grammars/ocaml/src/scanner.c
@@ -1,4 +1,4 @@
-#include "../../../include/scanner.h"
+#include "../../../common/scanner.h"
 
 void *tree_sitter_ocaml_external_scanner_create() { return create(); }
 

diff --git a/grammars/ocaml/src/tree_sitter b/grammars/ocaml/src/tree_sitter
diff --git a/grammars/ocaml/src/tree_sitter/alloc.h b/grammars/ocaml/src/tree_sitter/alloc.h
@@ -0,0 +1,54 @@
+#ifndef TREE_SITTER_ALLOC_H_
+#define TREE_SITTER_ALLOC_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+// Allow clients to override allocation functions
+#ifdef TREE_SITTER_REUSE_ALLOCATOR
+
+extern void *(*ts_current_malloc)(size_t);
+extern void *(*ts_current_calloc)(size_t, size_t);
+extern void *(*ts_current_realloc)(void *, size_t);
+extern void (*ts_current_free)(void *);
+
+#ifndef ts_malloc
+#define ts_malloc  ts_current_malloc
+#endif
+#ifndef ts_calloc
+#define ts_calloc  ts_current_calloc
+#endif
+#ifndef ts_realloc
+#define ts_realloc ts_current_realloc
+#endif
+#ifndef ts_free
+#define ts_free    ts_current_free
+#endif
+
+#else
+
+#ifndef ts_malloc
+#define ts_malloc  malloc
+#endif
+#ifndef ts_calloc
+#define ts_calloc  calloc
+#endif
+#ifndef ts_realloc
+#define ts_realloc realloc
+#endif
+#ifndef ts_free
+#define ts_free    free
+#endif
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TREE_SITTER_ALLOC_H_