Make paths explicit in #includes

spec/compiler/compiler_spec_helper.h

@@ -6,7 +6,7 @@
 #include "helpers/equals_pointer.h"
 #include "helpers/character_set_helpers.h"
 #include "tree_sitter/compiler.h"
-#include "rules/character_set.h"
+#include "compiler/rules/character_set.h"
 
 using namespace tree_sitter;
 using namespace std;

spec/compiler/helpers/character_set_helpers.h

@@ -2,7 +2,7 @@
 #define __tree_sitter__character_set_helpers__
 
 #include "tree_sitter/compiler.h"
-#include "rules/character_set.h"
+#include "compiler/rules/character_set.h"
 
 namespace tree_sitter {
     namespace rules {

spec/compiler/prepare_grammar_spec.cpp

@@ -1,7 +1,7 @@
 #include "compiler_spec_helper.h"
 #include "prepared_grammar.h"
 #include "prepare_grammar/prepare_grammar.h"
-#include "rules/symbol.h"
+#include "compiler/rules/symbol.h"
 
 START_TEST
 

spec/compiler/rules/character_set_spec.cpp

@@ -1,5 +1,5 @@
 #include "compiler_spec_helper.h"
-#include "rules/character_set.h"
+#include "compiler/rules/character_set.h"
 
 using namespace rules;
 

spec/compiler/rules/pattern_spec.cpp

@@ -1,6 +1,6 @@
 #include "compiler_spec_helper.h"
-#include "rules/pattern.h"
-#include "rules/character_set.h"
+#include "compiler/rules/pattern.h"
+#include "compiler/rules/character_set.h"
 
 using namespace rules;
 

spec/compiler/rules/rules_spec.cpp

@@ -1,5 +1,5 @@
 #include "compiler_spec_helper.h"
-#include "rules/rule.h"
+#include "compiler/rules/rule.h"
 
 using namespace rules;
 

src/compiler/build_tables/build_tables.cpp

@@ -1,11 +1,13 @@
-#include "build_tables.h"
-#include "prepared_grammar.h"
-#include "item.h"
-#include "item_set_closure.h"
-#include "item_set_transitions.h"
-#include "tree_sitter/compiler.h"
-#include "rules/built_in_symbols.h"
-#include "first_set.h"
+#include "compiler/build_tables/build_tables.h"
+#include <string>
+#include <utility>
+#include <map>
+#include "compiler/prepared_grammar.h"
+#include "compiler/rules/built_in_symbols.h"
+#include "compiler/build_tables/item.h"
+#include "compiler/build_tables/item_set_closure.h"
+#include "compiler/build_tables/item_set_transitions.h"
+#include "compiler/build_tables/first_set.h"
 
 namespace tree_sitter {
     using std::pair;
@@ -26,12 +28,12 @@ namespace tree_sitter {
             ParseTable parse_table;
             LexTable lex_table;
 
-            long parse_state_id_for_item_set(const ParseItemSet &item_set) const {
+            int64_t parse_state_id_for_item_set(const ParseItemSet &item_set) const {
                 auto entry = parse_state_ids.find(item_set);
                 return (entry == parse_state_ids.end()) ? NOT_FOUND : entry->second;
             }
 
-            long lex_state_id_for_item_set(const LexItemSet &item_set) const {
+            int64_t lex_state_id_for_item_set(const LexItemSet &item_set) const {
                 auto entry = lex_state_ids.find(item_set);
                 return (entry == lex_state_ids.end()) ? NOT_FOUND : entry->second;
             }
@@ -141,7 +143,7 @@ namespace tree_sitter {
 
             TableBuilder(const PreparedGrammar &grammar, const PreparedGrammar &lex_grammar) :
                 grammar(grammar),
-                lex_grammar(lex_grammar) {};
+                lex_grammar(lex_grammar) {}
 
             pair<ParseTable, LexTable> build() {
                 ParseItem item(rules::START, make_shared<Symbol>(grammar.start_rule_name), {}, rules::END_OF_INPUT);
@@ -156,4 +158,4 @@ namespace tree_sitter {
             return TableBuilder(grammar, lex_grammar).build();
         }
     }
-}
+}

src/compiler/build_tables/build_tables.h

@@ -1,8 +1,9 @@
 #ifndef __TreeSitter__build_tables__
 #define __TreeSitter__build_tables__
 
-#include "parse_table.h"
-#include "lex_table.h"
+#include <utility>
+#include "compiler/parse_table.h"
+#include "compiler/lex_table.h"
 
 namespace tree_sitter {
     class PreparedGrammar;

src/compiler/build_tables/first_set.cpp

@@ -1,10 +1,10 @@
-#include "first_set.h"
+#include "compiler/build_tables/first_set.h"
 #include "tree_sitter/compiler.h"
-#include "prepared_grammar.h"
-#include "rule_can_be_blank.h"
-#include "rules/visitor.h"
-#include "rules/seq.h"
-#include "rules/choice.h"
+#include "compiler/prepared_grammar.h"
+#include "compiler/build_tables/rule_can_be_blank.h"
+#include "compiler/rules/visitor.h"
+#include "compiler/rules/seq.h"
+#include "compiler/rules/choice.h"
 
 namespace tree_sitter {
     using std::set;

src/compiler/build_tables/first_set.h

@@ -1,9 +1,9 @@
 #ifndef __tree_sitter__first_set__
 #define __tree_sitter__first_set__
 
-#include "rules/symbol.h"
-#include "item.h"
 #include <set>
+#include "compiler/build_tables/item.h"
+#include "compiler/rules/symbol.h"
 
 namespace tree_sitter {
     class PreparedGrammar;

src/compiler/build_tables/follow_sets.cpp

@@ -1,8 +1,8 @@
-#include "follow_sets.h"
-#include "first_set.h"
-#include "rule_transitions.h"
-#include "rule_can_be_blank.h"
-#include "prepared_grammar.h"
+#include "compiler/build_tables/follow_sets.h"
+#include "compiler/build_tables/first_set.h"
+#include "compiler/build_tables/rule_transitions.h"
+#include "compiler/build_tables/rule_can_be_blank.h"
+#include "compiler/prepared_grammar.h"
 
 namespace tree_sitter {
     using std::set;

src/compiler/build_tables/follow_sets.h

@@ -1,10 +1,10 @@
 #ifndef __tree_sitter__follow_sets__
 #define __tree_sitter__follow_sets__
 
-#include "item.h"
-#include "rules/symbol.h"
 #include <set>
 #include <map>
+#include "compiler/build_tables/item.h"
+#include "compiler/rules/symbol.h"
 
 namespace tree_sitter {
     class PreparedGrammar;

src/compiler/build_tables/item.cpp

@@ -1,6 +1,6 @@
-#include "item.h"
+#include "compiler/build_tables/item.h"
+#include "compiler/build_tables/rule_can_be_blank.h"
 #include "tree_sitter/compiler.h"
-#include "rule_can_be_blank.h"
 
 namespace tree_sitter {
     using std::string;

src/compiler/build_tables/item.h

@@ -1,10 +1,10 @@
 #ifndef __tree_sitter__item__
 #define __tree_sitter__item__
 
-#include "rules/symbol.h"
-#include <string>
 #include <set>
+#include <string>
 #include <vector>
+#include "compiler/rules/symbol.h"
 
 namespace tree_sitter {
     class Grammar;

src/compiler/build_tables/item_set_closure.cpp

@@ -1,9 +1,9 @@
-#include "item_set_closure.h"
-#include "tree_sitter/compiler.h"
-#include "./follow_sets.h"
-#include "item.h"
-#include "prepared_grammar.h"
+#include "compiler/build_tables/item_set_closure.h"
 #include <algorithm>
+#include "tree_sitter/compiler.h"
+#include "compiler/build_tables/follow_sets.h"
+#include "compiler/build_tables/item.h"
+#include "compiler/prepared_grammar.h"
 
 namespace tree_sitter {
     using std::set;

src/compiler/build_tables/item_set_closure.h

@@ -1,7 +1,7 @@
 #ifndef __tree_sitter__close_item_set__
 #define __tree_sitter__close_item_set__
 
-#include "item.h"
+#include "compiler/build_tables/item.h"
 
 namespace tree_sitter {
     class PreparedGrammar;

src/compiler/build_tables/item_set_transitions.cpp

@@ -1,7 +1,7 @@
-#include "item_set_transitions.h"
-#include "item_set_closure.h"
-#include "rule_transitions.h"
-#include "merge_transitions.h"
+#include "compiler/build_tables/item_set_transitions.h"
+#include "compiler/build_tables/item_set_closure.h"
+#include "compiler/build_tables/rule_transitions.h"
+#include "compiler/build_tables/merge_transitions.h"
 
 namespace tree_sitter {
     using std::map;

src/compiler/build_tables/item_set_transitions.h

@@ -1,8 +1,8 @@
 #ifndef __tree_sitter__item_set_transitions__
 #define __tree_sitter__item_set_transitions__
 
-#include "item.h"
 #include <map>
+#include "compiler/build_tables/item.h"
 
 namespace tree_sitter {
     class PreparedGrammar;

src/compiler/build_tables/merge_transitions.h

@@ -1,9 +1,9 @@
 #ifndef __tree_sitter__merge_transitions__
 #define __tree_sitter__merge_transitions__
 
-#include "rules/character_set.h"
-#include "rules/symbol.h"
 #include <map>
+#include "compiler/rules/character_set.h"
+#include "compiler/rules/symbol.h"
 
 namespace tree_sitter {
     namespace build_tables {

src/compiler/build_tables/rule_can_be_blank.cpp

@@ -1,11 +1,11 @@
-#include "rule_can_be_blank.h"
+#include "compiler/build_tables/rule_can_be_blank.h"
 #include "tree_sitter/compiler.h"
-#include "prepared_grammar.h"
-#include "rules/symbol.h"
-#include "rules/visitor.h"
-#include "rules/seq.h"
-#include "rules/choice.h"
-#include "rules/blank.h"
+#include "compiler/prepared_grammar.h"
+#include "compiler/rules/symbol.h"
+#include "compiler/rules/visitor.h"
+#include "compiler/rules/seq.h"
+#include "compiler/rules/choice.h"
+#include "compiler/rules/blank.h"
 
 namespace tree_sitter  {
     using namespace rules;

src/compiler/build_tables/rule_transitions.cpp

@@ -1,14 +1,14 @@
-#include "rule_transitions.h"
-#include "rule_can_be_blank.h"
-#include "merge_transitions.h"
-#include "rules/blank.h"
-#include "rules/choice.h"
-#include "rules/seq.h"
-#include "rules/string.h"
-#include "rules/repeat.h"
-#include "rules/pattern.h"
-#include "rules/character_set.h"
-#include "rules/visitor.h"
+#include "compiler/build_tables/rule_transitions.h"
+#include "compiler/build_tables/rule_can_be_blank.h"
+#include "compiler/build_tables/merge_transitions.h"
+#include "compiler/rules/blank.h"
+#include "compiler/rules/choice.h"
+#include "compiler/rules/seq.h"
+#include "compiler/rules/string.h"
+#include "compiler/rules/repeat.h"
+#include "compiler/rules/pattern.h"
+#include "compiler/rules/character_set.h"
+#include "compiler/rules/visitor.h"
 
 namespace tree_sitter {
     using std::map;

src/compiler/build_tables/rule_transitions.h

@@ -1,9 +1,9 @@
 #ifndef __tree_sitter__transitions__
 #define __tree_sitter__transitions__
 
-#include "rules/character_set.h"
-#include "rules/symbol.h"
 #include <map>
+#include "compiler/rules/character_set.h"
+#include "compiler/rules/symbol.h"
 
 namespace tree_sitter  {
     namespace build_tables {

src/compiler/compile.cpp

@@ -1,8 +1,8 @@
 #include "tree_sitter/compiler.h"
-#include "prepare_grammar/prepare_grammar.h"
-#include "build_tables/build_tables.h"
-#include "generate_code/c_code.h"
-#include "prepared_grammar.h"
+#include "compiler/prepare_grammar/prepare_grammar.h"
+#include "compiler/build_tables/build_tables.h"
+#include "compiler/generate_code/c_code.h"
+#include "compiler/prepared_grammar.h"
 
 namespace tree_sitter {
     std::string compile(const Grammar &grammar, std::string name) {

src/compiler/generate_code/c_code.cpp

@@ -1,9 +1,9 @@
-#include "c_code.h"
-#include <vector>
 #include <map>
+#include <vector>
 #include <set>
-#include "rules/built_in_symbols.h"
-#include "./helpers.h"
+#include "compiler/generate_code/c_code.h"
+#include "compiler/generate_code/helpers.h"
+#include "compiler/rules/built_in_symbols.h"
 
 namespace tree_sitter {
     using std::string;

src/compiler/generate_code/c_code.h

@@ -1,8 +1,8 @@
 #ifndef __tree_sitter__code_generator__
 #define __tree_sitter__code_generator__
 
-#include "parse_table.h"
-#include "lex_table.h"
+#include "compiler/parse_table.h"
+#include "compiler/lex_table.h"
 
 namespace tree_sitter {
     namespace generate_code {

src/compiler/generate_code/helpers.cpp

@@ -1,4 +1,4 @@
-#include "./helpers.h"
+#include "compiler/generate_code/helpers.h"
 
 namespace tree_sitter {
     namespace generate_code {

src/compiler/grammar.cpp

@@ -1,5 +1,5 @@
 #include "tree_sitter/compiler.h"
-#include "rules/rule.h"
+#include "compiler/rules/rule.h"
 
 namespace tree_sitter {
     using std::string;

src/compiler/lex_table.cpp

@@ -1,4 +1,4 @@
-#include "lex_table.h"
+#include "compiler/lex_table.h"
 
 namespace tree_sitter {
     using std::string;

src/compiler/lex_table.h

@@ -1,12 +1,12 @@
 #ifndef __TreeSitter__lex_table__
 #define __TreeSitter__lex_table__
 
-#include <vector>
-#include <string>
-#include <set>
 #include <map>
-#include "rules/symbol.h"
-#include "rules/character_set.h"
+#include <vector>
+#include <set>
+#include <string>
+#include "compiler/rules/symbol.h"
+#include "compiler/rules/character_set.h"
 
 namespace tree_sitter {
     typedef enum {

src/compiler/parse_table.cpp

@@ -1,4 +1,4 @@
-#include "parse_table.h"
+#include "compiler/parse_table.h"
 
 namespace tree_sitter {
     using std::string;

src/compiler/parse_table.h

@@ -4,8 +4,8 @@
 #include <map>
 #include <vector>
 #include <set>
-#include "rules/symbol.h"
-#include "./lex_table.h"
+#include "compiler/lex_table.h"
+#include "compiler/rules/symbol.h"
 
 namespace tree_sitter {
     typedef enum {

src/compiler/prepare_grammar/expand_repeats.cpp

@@ -1,12 +1,12 @@
-#include "expand_repeats.h"
-#include "prepared_grammar.h"
-#include "rules/visitor.h"
-#include "rules/seq.h"
-#include "rules/symbol.h"
-#include "rules/choice.h"
-#include "rules/blank.h"
-#include "rules/repeat.h"
+#include "compiler/prepare_grammar/expand_repeats.h"
 #include <map>
+#include "compiler/prepared_grammar.h"
+#include "compiler/rules/visitor.h"
+#include "compiler/rules/seq.h"
+#include "compiler/rules/symbol.h"
+#include "compiler/rules/choice.h"
+#include "compiler/rules/blank.h"
+#include "compiler/rules/repeat.h"
 
 namespace tree_sitter {
     using std::string;

src/compiler/prepare_grammar/extract_tokens.cpp

@@ -1,15 +1,15 @@
-#include "extract_tokens.h"
-#include "tree_sitter/compiler.h"
-#include "prepared_grammar.h"
-#include "rules/visitor.h"
-#include "rules/seq.h"
-#include "rules/choice.h"
-#include "rules/repeat.h"
-#include "rules/blank.h"
-#include "rules/symbol.h"
-#include "rules/string.h"
-#include "rules/pattern.h"
+#include "compiler/prepare_grammar/extract_tokens.h"
 #include <map>
+#include "tree_sitter/compiler.h"
+#include "compiler/prepared_grammar.h"
+#include "compiler/rules/visitor.h"
+#include "compiler/rules/seq.h"
+#include "compiler/rules/choice.h"
+#include "compiler/rules/repeat.h"
+#include "compiler/rules/blank.h"
+#include "compiler/rules/symbol.h"
+#include "compiler/rules/string.h"
+#include "compiler/rules/pattern.h"
 
 namespace tree_sitter {
     using std::pair;

src/compiler/prepare_grammar/prepare_grammar.cpp

@@ -1,7 +1,7 @@
-#include "prepare_grammar.h"
-#include "prepared_grammar.h"
-#include "extract_tokens.h"
-#include "expand_repeats.h"
+#include "compiler/prepare_grammar/prepare_grammar.h"
+#include "compiler/prepared_grammar.h"
+#include "compiler/prepare_grammar/extract_tokens.h"
+#include "compiler/prepare_grammar/expand_repeats.h"
 
 namespace tree_sitter {
     using std::pair;

src/compiler/prepared_grammar.cpp

@@ -1,5 +1,5 @@
-#include "prepared_grammar.h"
-#include "rules/symbol.h"
+#include "compiler/prepared_grammar.h"
+#include "compiler/rules/symbol.h"
 
 namespace tree_sitter {
     using std::string;

src/compiler/prepared_grammar.h

@@ -2,7 +2,7 @@
 #define __tree_sitter__prepared_grammar__
 
 #include "tree_sitter/compiler.h"
-#include "rules/symbol.h"
+#include "compiler/rules/symbol.h"
 
 namespace tree_sitter {
     class PreparedGrammar : public Grammar {

src/compiler/rules/blank.cpp

@@ -1,5 +1,5 @@
-#include "blank.h"
-#include "visitor.h"
+#include "compiler/rules/blank.h"
+#include "compiler/rules/visitor.h"
 
 namespace tree_sitter  {
     namespace rules {

src/compiler/rules/blank.h

@@ -1,7 +1,7 @@
 #ifndef __tree_sitter__blank__
 #define __tree_sitter__blank__
 
-#include "rule.h"
+#include "compiler/rules/rule.h"
 
 namespace tree_sitter  {
     namespace rules {

src/compiler/rules/built_in_symbols.cpp

@@ -1,4 +1,4 @@
-#include "built_in_symbols.h"
+#include "compiler/rules/built_in_symbols.h"
 
 namespace tree_sitter {
     namespace rules {

src/compiler/rules/built_in_symbols.h

@@ -1,7 +1,7 @@
 #ifndef __tree_sitter__built_in_symbols__
 #define __tree_sitter__built_in_symbols__
 
-#include "./symbol.h"
+#include "compiler/rules/symbol.h"
 
 namespace tree_sitter {
     namespace rules {

src/compiler/rules/character_range.cpp

@@ -1,4 +1,4 @@
-#include "character_range.h"
+#include "compiler/rules/character_range.h"
 #include <string>
 
 namespace tree_sitter {

src/compiler/rules/character_set.cpp

@@ -1,5 +1,5 @@
-#include "character_set.h"
-#include "visitor.h"
+#include "compiler/rules/character_set.h"
+#include "compiler/rules/visitor.h"
 
 using std::string;
 using std::hash;

src/compiler/rules/character_set.h

@@ -1,10 +1,10 @@
 #ifndef __tree_sitter__character_set__
 #define __tree_sitter__character_set__
 
-#include "rule.h"
-#include "./character_range.h"
-#include <set>
 #include <initializer_list>
+#include <set>
+#include "compiler/rules/rule.h"
+#include "compiler/rules/character_range.h"
 
 namespace tree_sitter  {
     namespace rules {

src/compiler/rules/choice.cpp

@@ -1,5 +1,5 @@
-#include "choice.h"
-#include "visitor.h"
+#include "compiler/rules/choice.h"
+#include "compiler/rules/visitor.h"
 
 namespace tree_sitter  {
     using std::string;

src/compiler/rules/choice.h

@@ -1,8 +1,8 @@
 #ifndef __tree_sitter__choice__
 #define __tree_sitter__choice__
 
-#include "rule.h"
 #include <vector>
+#include "compiler/rules/rule.h"
 
 namespace tree_sitter {
     namespace rules {

src/compiler/rules/pattern.cpp

@@ -1,10 +1,10 @@
-#include "pattern.h"
-#include "visitor.h"
-#include "choice.h"
-#include "seq.h"
-#include "repeat.h"
-#include "character_set.h"
+#include "compiler/rules/pattern.h"
 #include <set>
+#include "compiler/rules/visitor.h"
+#include "compiler/rules/choice.h"
+#include "compiler/rules/seq.h"
+#include "compiler/rules/repeat.h"
+#include "compiler/rules/character_set.h"
 
 namespace tree_sitter {
     namespace rules {

src/compiler/rules/pattern.h

@@ -1,7 +1,7 @@
 #ifndef __tree_sitter_pattern_h_
 #define __tree_sitter_pattern_h_
 
-#include "rule.h"
+#include "compiler/rules/rule.h"
 
 namespace tree_sitter {
     namespace rules {

src/compiler/rules/repeat.cpp

@@ -1,9 +1,9 @@
-#include "repeat.h"
-#include "visitor.h"
-
-using std::string;
+#include "compiler/rules/repeat.h"
+#include "compiler/rules/visitor.h"
 
 namespace tree_sitter {
+    using std::string;
+    
     namespace rules {
         Repeat::Repeat(const rule_ptr content) : content(content) {}
 

src/compiler/rules/repeat.h

@@ -1,7 +1,7 @@
 #ifndef __tree_sitter__repeat__
 #define __tree_sitter__repeat__
 
-#include "rule.h"
+#include "compiler/rules/rule.h"
 
 namespace tree_sitter  {
     namespace rules {

src/compiler/rules/rule.cpp

@@ -1,10 +1,10 @@
-#include "rule.h"
+#include "compiler/rules/rule.h"
 #include <set>
 
-using std::ostream;
-using std::string;
-
 namespace tree_sitter {
+    using std::ostream;
+    using std::string;
+    
     namespace rules {
         bool Rule::operator!=(const Rule &other) const {
             return !this->operator==(other);

src/compiler/rules/rules.cpp

@@ -1,14 +1,14 @@
 #include "tree_sitter/compiler.h"
-#include "./rule.h"
-#include "./blank.h"
-#include "./symbol.h"
-#include "./choice.h"
-#include "./seq.h"
-#include "./string.h"
-#include "./pattern.h"
-#include "./character_set.h"
-#include "./repeat.h"
-#include "./built_in_symbols.h"
+#include "compiler/rules/rule.h"
+#include "compiler/rules/blank.h"
+#include "compiler/rules/symbol.h"
+#include "compiler/rules/choice.h"
+#include "compiler/rules/seq.h"
+#include "compiler/rules/string.h"
+#include "compiler/rules/pattern.h"
+#include "compiler/rules/character_set.h"
+#include "compiler/rules/repeat.h"
+#include "compiler/rules/built_in_symbols.h"
 
 namespace tree_sitter {
     using std::make_shared;

src/compiler/rules/seq.cpp

@@ -1,6 +1,6 @@
-#include "seq.h"
-#include "visitor.h"
-#include "blank.h"
+#include "compiler/rules/seq.h"
+#include "compiler/rules/visitor.h"
+#include "compiler/rules/blank.h"
 
 namespace tree_sitter {
     using std::make_shared;

src/compiler/rules/seq.h

@@ -1,8 +1,8 @@
 #ifndef __tree_sitter__seq__
 #define __tree_sitter__seq__
 
-#include "rule.h"
 #include <vector>
+#include "compiler/rules/rule.h"
 
 namespace tree_sitter  {
     namespace rules {

src/compiler/rules/string.cpp

@@ -1,10 +1,10 @@
-#include "string.h"
-#include "visitor.h"
-
-using std::string;
-using std::hash;
+#include "compiler/rules/string.h"
+#include "compiler/rules/visitor.h"
 
 namespace tree_sitter  {
+    using std::string;
+    using std::hash;
+    
     namespace rules {
         String::String(string value) : value(value) {};
 
@@ -29,4 +29,4 @@ namespace tree_sitter  {
             visitor.visit(this);
         }
     }
-}
+}

src/compiler/rules/string.h

@@ -1,7 +1,7 @@
 #ifndef __tree_sitter__string__
 #define __tree_sitter__string__
 
-#include "rule.h"
+#include "compiler/rules/rule.h"
 
 namespace tree_sitter  {
     namespace rules {

src/compiler/rules/symbol.cpp

@@ -1,11 +1,11 @@
-#include "symbol.h"
-#include "visitor.h"
+#include "compiler/rules/symbol.h"
 #include <map>
-
-using std::string;
-using std::hash;
+#include "compiler/rules/visitor.h"
 
 namespace tree_sitter  {
+    using std::string;
+    using std::hash;
+    
     namespace rules {
         Symbol::Symbol(const std::string &name) : name(name), type(SymbolTypeNormal) {};
         Symbol::Symbol(const std::string &name, SymbolType type) : name(name), type(type) {};

src/compiler/rules/symbol.h

@@ -1,8 +1,8 @@
 #ifndef __tree_sitter__sym__
 #define __tree_sitter__sym__
 
-#include "rule.h"
 #include <utility>
+#include "compiler/rules/rule.h"
 
 namespace tree_sitter  {
     namespace rules {

src/compiler/rules/visitor.cpp

@@ -1,13 +1,13 @@
-#include "visitor.h"
-#include "rule.h"
-#include "blank.h"
-#include "symbol.h"
-#include "choice.h"
-#include "seq.h"
-#include "string.h"
-#include "pattern.h"
-#include "character_set.h"
-#include "repeat.h"
+#include "compiler/rules/visitor.h"
+#include "compiler/rules/rule.h"
+#include "compiler/rules/blank.h"
+#include "compiler/rules/symbol.h"
+#include "compiler/rules/choice.h"
+#include "compiler/rules/seq.h"
+#include "compiler/rules/string.h"
+#include "compiler/rules/pattern.h"
+#include "compiler/rules/character_set.h"
+#include "compiler/rules/repeat.h"
 
 namespace tree_sitter {
     namespace rules {

src/compiler/rules/visitor.h

@@ -1,7 +1,7 @@
 #ifndef __tree_sitter__rule_visitor__
 #define __tree_sitter__rule_visitor__
 
-#include "./rule.h"
+#include "compiler/rules/rule.h"
 
 namespace tree_sitter {
     namespace rules {