Update include paths to not reference 'runtime' directory

lib/src/array.h

@@ -10,7 +10,7 @@ extern "C" {
 #include <stdint.h>
 #include <assert.h>
 #include <stdbool.h>
-#include "runtime/alloc.h"
+#include "./alloc.h"
 
 #define Array(T)     \
   struct {           \

lib/src/get_changed_ranges.c

@@ -1,8 +1,8 @@
-#include "runtime/get_changed_ranges.h"
-#include "runtime/subtree.h"
-#include "runtime/language.h"
-#include "runtime/error_costs.h"
-#include "runtime/tree_cursor.h"
+#include "./get_changed_ranges.h"
+#include "./subtree.h"
+#include "./language.h"
+#include "./error_costs.h"
+#include "./tree_cursor.h"
 #include <assert.h>
 
 // #define DEBUG_GET_CHANGED_RANGES

lib/src/get_changed_ranges.h

@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 
-#include "runtime/tree_cursor.h"
-#include "runtime/subtree.h"
+#include "./tree_cursor.h"
+#include "./subtree.h"
 
 typedef Array(TSRange) TSRangeArray;
 

lib/src/language.c

@@ -1,6 +1,6 @@
-#include "runtime/language.h"
-#include "runtime/subtree.h"
-#include "runtime/error_costs.h"
+#include "./language.h"
+#include "./subtree.h"
+#include "./error_costs.h"
 #include <string.h>
 
 void ts_language_table_entry(const TSLanguage *self, TSStateId state,

lib/src/language.h

@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#include "runtime/subtree.h"
+#include "./subtree.h"
 #include "tree_sitter/parser.h"
 
 #define ts_builtin_sym_error_repeat (ts_builtin_sym_error - 1)

lib/src/length.h

@@ -3,7 +3,7 @@
 
 #include <stdlib.h>
 #include <stdbool.h>
-#include "runtime/point.h"
+#include "./point.h"
 #include "tree_sitter/runtime.h"
 
 typedef struct {

lib/src/lexer.c

@@ -1,8 +1,8 @@
 #include <stdio.h>
-#include "runtime/lexer.h"
-#include "runtime/subtree.h"
-#include "runtime/length.h"
-#include "runtime/utf16.h"
+#include "./lexer.h"
+#include "./subtree.h"
+#include "./length.h"
+#include "./utf16.h"
 #include "utf8proc.h"
 
 #define LOG(...)                                                                      \

lib/src/lexer.h

@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 
-#include "runtime/length.h"
-#include "runtime/subtree.h"
+#include "./length.h"
+#include "./subtree.h"
 #include "tree_sitter/runtime.h"
 #include "tree_sitter/parser.h"
 

lib/src/node.c

@@ -1,7 +1,7 @@
 #include <stdbool.h>
-#include "runtime/subtree.h"
-#include "runtime/tree.h"
-#include "runtime/language.h"
+#include "./subtree.h"
+#include "./tree.h"
+#include "./language.h"
 
 typedef struct {
   Subtree parent;

lib/src/parser.c

@@ -3,18 +3,18 @@
 #include <limits.h>
 #include <stdbool.h>
 #include "tree_sitter/runtime.h"
-#include "runtime/subtree.h"
-#include "runtime/lexer.h"
-#include "runtime/length.h"
-#include "runtime/array.h"
-#include "runtime/language.h"
-#include "runtime/alloc.h"
-#include "runtime/stack.h"
-#include "runtime/reusable_node.h"
-#include "runtime/reduce_action.h"
-#include "runtime/error_costs.h"
-#include "runtime/get_changed_ranges.h"
-#include "runtime/tree.h"
+#include "./subtree.h"
+#include "./lexer.h"
+#include "./length.h"
+#include "./array.h"
+#include "./language.h"
+#include "./alloc.h"
+#include "./stack.h"
+#include "./reusable_node.h"
+#include "./reduce_action.h"
+#include "./error_costs.h"
+#include "./get_changed_ranges.h"
+#include "./tree.h"
 
 #define LOG(...)                                                                            \
   if (self->lexer.logger.log || self->dot_graph_file) {                                     \

lib/src/reduce_action.h

@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#include "runtime/array.h"
+#include "./array.h"
 #include "tree_sitter/runtime.h"
 
 typedef struct {

lib/src/reusable_node.h

@@ -1,4 +1,4 @@
-#include "runtime/subtree.h"
+#include "./subtree.h"
 
 typedef struct {
   Subtree tree;

lib/src/runtime.c

@@ -6,14 +6,14 @@
 //   - include
 //   - externals/utf8proc
 
-#include "runtime/get_changed_ranges.c"
-#include "runtime/language.c"
-#include "runtime/lexer.c"
-#include "runtime/node.c"
-#include "runtime/parser.c"
-#include "runtime/stack.c"
-#include "runtime/subtree.c"
-#include "runtime/tree_cursor.c"
-#include "runtime/tree.c"
-#include "runtime/utf16.c"
+#include "./get_changed_ranges.c"
+#include "./language.c"
+#include "./lexer.c"
+#include "./node.c"
+#include "./parser.c"
+#include "./stack.c"
+#include "./subtree.c"
+#include "./tree_cursor.c"
+#include "./tree.c"
+#include "./utf16.c"
 #include "utf8proc.c"

lib/src/stack.c

@@ -1,9 +1,9 @@
-#include "runtime/alloc.h"
-#include "runtime/language.h"
-#include "runtime/subtree.h"
-#include "runtime/array.h"
-#include "runtime/stack.h"
-#include "runtime/length.h"
+#include "./alloc.h"
+#include "./language.h"
+#include "./subtree.h"
+#include "./array.h"
+#include "./stack.h"
+#include "./length.h"
 #include <assert.h>
 #include <stdio.h>
 

lib/src/stack.h

@@ -5,9 +5,9 @@
 extern "C" {
 #endif
 
-#include "runtime/array.h"
-#include "runtime/subtree.h"
-#include "runtime/error_costs.h"
+#include "./array.h"
+#include "./subtree.h"
+#include "./error_costs.h"
 #include <stdio.h>
 
 typedef struct Stack Stack;

lib/src/subtree.c

@@ -4,12 +4,12 @@
 #include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
-#include "runtime/alloc.h"
-#include "runtime/atomic.h"
-#include "runtime/subtree.h"
-#include "runtime/length.h"
-#include "runtime/language.h"
-#include "runtime/error_costs.h"
+#include "./alloc.h"
+#include "./atomic.h"
+#include "./subtree.h"
+#include "./length.h"
+#include "./language.h"
+#include "./error_costs.h"
 #include <stddef.h>
 
 typedef struct {

lib/src/subtree.h

@@ -7,9 +7,9 @@ extern "C" {
 
 #include <stdbool.h>
 #include <stdio.h>
-#include "runtime/length.h"
-#include "runtime/array.h"
-#include "runtime/error_costs.h"
+#include "./length.h"
+#include "./array.h"
+#include "./error_costs.h"
 #include "tree_sitter/runtime.h"
 #include "tree_sitter/parser.h"
 

lib/src/tree.c

@@ -1,9 +1,9 @@
 #include "tree_sitter/runtime.h"
-#include "runtime/array.h"
-#include "runtime/get_changed_ranges.h"
-#include "runtime/subtree.h"
-#include "runtime/tree_cursor.h"
-#include "runtime/tree.h"
+#include "./array.h"
+#include "./get_changed_ranges.h"
+#include "./subtree.h"
+#include "./tree_cursor.h"
+#include "./tree.h"
 
 static const unsigned PARENT_CACHE_CAPACITY = 32;
 

lib/src/tree_cursor.c

@@ -1,8 +1,8 @@
 #include "tree_sitter/runtime.h"
-#include "runtime/alloc.h"
-#include "runtime/tree_cursor.h"
-#include "runtime/language.h"
-#include "runtime/tree.h"
+#include "./alloc.h"
+#include "./tree_cursor.h"
+#include "./language.h"
+#include "./tree.h"
 
 typedef struct {
   Subtree parent;

lib/src/tree_cursor.h

@@ -1,7 +1,7 @@
 #ifndef RUNTIME_TREE_CURSOR_H_
 #define RUNTIME_TREE_CURSOR_H_
 
-#include "runtime/subtree.h"
+#include "./subtree.h"
 
 typedef struct {
   const Subtree *subtree;

lib/src/utf16.c

@@ -1,4 +1,4 @@
-#include "runtime/utf16.h"
+#include "./utf16.h"
 
 utf8proc_ssize_t utf16_iterate(
   const utf8proc_uint8_t *string,

script/build-runtime

@@ -11,11 +11,11 @@ ${CC}                   \
   -c                    \
   -O3                   \
   -std=c99              \
-  -I src                \
-  -I include            \
-  -I externals/utf8proc \
-  src/runtime/runtime.c \
-  -o runtime.o
+  -I lib/src            \
+  -I lib/include        \
+  -I lib/utf8proc       \
+  lib/src/runtime.c     \
+  -o tree-sitter.o
 
-ar rcs libruntime.a runtime.o
-rm runtime.o
+ar rcs libtree-sitter.a tree-sitter.o
+rm tree-sitter.o