From eb30429700b36860b3414525624dfcab57050949 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Sun, 9 Mar 2014 21:37:21 -0700 Subject: [PATCH] Make paths explicit in #includes --- spec/compiler/compiler_spec_helper.h | 2 +- spec/compiler/helpers/character_set_helpers.h | 2 +- spec/compiler/prepare_grammar_spec.cpp | 2 +- spec/compiler/rules/character_set_spec.cpp | 2 +- spec/compiler/rules/pattern_spec.cpp | 4 +-- spec/compiler/rules/rules_spec.cpp | 2 +- src/compiler/build_tables/build_tables.cpp | 26 ++++++++++--------- src/compiler/build_tables/build_tables.h | 5 ++-- src/compiler/build_tables/first_set.cpp | 12 ++++----- src/compiler/build_tables/first_set.h | 4 +-- src/compiler/build_tables/follow_sets.cpp | 10 +++---- src/compiler/build_tables/follow_sets.h | 4 +-- src/compiler/build_tables/item.cpp | 4 +-- src/compiler/build_tables/item.h | 4 +-- .../build_tables/item_set_closure.cpp | 10 +++---- src/compiler/build_tables/item_set_closure.h | 2 +- .../build_tables/item_set_transitions.cpp | 8 +++--- .../build_tables/item_set_transitions.h | 2 +- src/compiler/build_tables/merge_transitions.h | 4 +-- .../build_tables/rule_can_be_blank.cpp | 14 +++++----- .../build_tables/rule_transitions.cpp | 22 ++++++++-------- src/compiler/build_tables/rule_transitions.h | 4 +-- src/compiler/compile.cpp | 8 +++--- src/compiler/generate_code/c_code.cpp | 8 +++--- src/compiler/generate_code/c_code.h | 4 +-- src/compiler/generate_code/helpers.cpp | 2 +- src/compiler/grammar.cpp | 2 +- src/compiler/lex_table.cpp | 2 +- src/compiler/lex_table.h | 10 +++---- src/compiler/parse_table.cpp | 2 +- src/compiler/parse_table.h | 4 +-- .../prepare_grammar/expand_repeats.cpp | 16 ++++++------ .../prepare_grammar/extract_tokens.cpp | 22 ++++++++-------- .../prepare_grammar/prepare_grammar.cpp | 8 +++--- src/compiler/prepared_grammar.cpp | 4 +-- src/compiler/prepared_grammar.h | 2 +- src/compiler/rules/blank.cpp | 4 +-- src/compiler/rules/blank.h | 2 +- src/compiler/rules/built_in_symbols.cpp | 2 +- src/compiler/rules/built_in_symbols.h | 2 +- src/compiler/rules/character_range.cpp | 2 +- src/compiler/rules/character_set.cpp | 4 +-- src/compiler/rules/character_set.h | 6 ++--- src/compiler/rules/choice.cpp | 4 +-- src/compiler/rules/choice.h | 2 +- src/compiler/rules/pattern.cpp | 12 ++++----- src/compiler/rules/pattern.h | 2 +- src/compiler/rules/repeat.cpp | 8 +++--- src/compiler/rules/repeat.h | 2 +- src/compiler/rules/rule.cpp | 8 +++--- src/compiler/rules/rules.cpp | 20 +++++++------- src/compiler/rules/seq.cpp | 6 ++--- src/compiler/rules/seq.h | 2 +- src/compiler/rules/string.cpp | 12 ++++----- src/compiler/rules/string.h | 2 +- src/compiler/rules/symbol.cpp | 10 +++---- src/compiler/rules/symbol.h | 2 +- src/compiler/rules/visitor.cpp | 20 +++++++------- src/compiler/rules/visitor.h | 2 +- 59 files changed, 191 insertions(+), 188 deletions(-) diff --git a/spec/compiler/compiler_spec_helper.h b/spec/compiler/compiler_spec_helper.h index 5d20df01..206e34f0 100644 --- a/spec/compiler/compiler_spec_helper.h +++ b/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; diff --git a/spec/compiler/helpers/character_set_helpers.h b/spec/compiler/helpers/character_set_helpers.h index 27804669..b41f5a14 100644 --- a/spec/compiler/helpers/character_set_helpers.h +++ b/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 { diff --git a/spec/compiler/prepare_grammar_spec.cpp b/spec/compiler/prepare_grammar_spec.cpp index 4bca04b4..204c5682 100644 --- a/spec/compiler/prepare_grammar_spec.cpp +++ b/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 diff --git a/spec/compiler/rules/character_set_spec.cpp b/spec/compiler/rules/character_set_spec.cpp index 1e3558fa..eb17f78b 100644 --- a/spec/compiler/rules/character_set_spec.cpp +++ b/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; diff --git a/spec/compiler/rules/pattern_spec.cpp b/spec/compiler/rules/pattern_spec.cpp index 5fa90e2e..b615309f 100644 --- a/spec/compiler/rules/pattern_spec.cpp +++ b/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; diff --git a/spec/compiler/rules/rules_spec.cpp b/spec/compiler/rules/rules_spec.cpp index 9d9700a2..9552f218 100644 --- a/spec/compiler/rules/rules_spec.cpp +++ b/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; diff --git a/src/compiler/build_tables/build_tables.cpp b/src/compiler/build_tables/build_tables.cpp index b19454d4..aef2d74a 100644 --- a/src/compiler/build_tables/build_tables.cpp +++ b/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 +#include +#include +#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 build() { ParseItem item(rules::START, make_shared(grammar.start_rule_name), {}, rules::END_OF_INPUT); @@ -156,4 +158,4 @@ namespace tree_sitter { return TableBuilder(grammar, lex_grammar).build(); } } -} \ No newline at end of file +} diff --git a/src/compiler/build_tables/build_tables.h b/src/compiler/build_tables/build_tables.h index 8939ba18..729deb9e 100644 --- a/src/compiler/build_tables/build_tables.h +++ b/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 +#include "compiler/parse_table.h" +#include "compiler/lex_table.h" namespace tree_sitter { class PreparedGrammar; diff --git a/src/compiler/build_tables/first_set.cpp b/src/compiler/build_tables/first_set.cpp index 29e019e1..37459fde 100644 --- a/src/compiler/build_tables/first_set.cpp +++ b/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; diff --git a/src/compiler/build_tables/first_set.h b/src/compiler/build_tables/first_set.h index 418cd706..0d1ea315 100644 --- a/src/compiler/build_tables/first_set.h +++ b/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 +#include "compiler/build_tables/item.h" +#include "compiler/rules/symbol.h" namespace tree_sitter { class PreparedGrammar; diff --git a/src/compiler/build_tables/follow_sets.cpp b/src/compiler/build_tables/follow_sets.cpp index af885ea1..91e2359b 100644 --- a/src/compiler/build_tables/follow_sets.cpp +++ b/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; diff --git a/src/compiler/build_tables/follow_sets.h b/src/compiler/build_tables/follow_sets.h index b61ec8a4..3b750a62 100644 --- a/src/compiler/build_tables/follow_sets.h +++ b/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 #include +#include "compiler/build_tables/item.h" +#include "compiler/rules/symbol.h" namespace tree_sitter { class PreparedGrammar; diff --git a/src/compiler/build_tables/item.cpp b/src/compiler/build_tables/item.cpp index 08efd941..9750368c 100644 --- a/src/compiler/build_tables/item.cpp +++ b/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; diff --git a/src/compiler/build_tables/item.h b/src/compiler/build_tables/item.h index 9a32231d..292478be 100644 --- a/src/compiler/build_tables/item.h +++ b/src/compiler/build_tables/item.h @@ -1,10 +1,10 @@ #ifndef __tree_sitter__item__ #define __tree_sitter__item__ -#include "rules/symbol.h" -#include #include +#include #include +#include "compiler/rules/symbol.h" namespace tree_sitter { class Grammar; diff --git a/src/compiler/build_tables/item_set_closure.cpp b/src/compiler/build_tables/item_set_closure.cpp index d6986f10..0d3d1b75 100644 --- a/src/compiler/build_tables/item_set_closure.cpp +++ b/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 +#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; diff --git a/src/compiler/build_tables/item_set_closure.h b/src/compiler/build_tables/item_set_closure.h index a4f306e5..f7fdde89 100644 --- a/src/compiler/build_tables/item_set_closure.h +++ b/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; diff --git a/src/compiler/build_tables/item_set_transitions.cpp b/src/compiler/build_tables/item_set_transitions.cpp index eeace711..1c00a3d9 100644 --- a/src/compiler/build_tables/item_set_transitions.cpp +++ b/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; diff --git a/src/compiler/build_tables/item_set_transitions.h b/src/compiler/build_tables/item_set_transitions.h index f4795945..a16e7f73 100644 --- a/src/compiler/build_tables/item_set_transitions.h +++ b/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 +#include "compiler/build_tables/item.h" namespace tree_sitter { class PreparedGrammar; diff --git a/src/compiler/build_tables/merge_transitions.h b/src/compiler/build_tables/merge_transitions.h index 121e0a65..340353ec 100644 --- a/src/compiler/build_tables/merge_transitions.h +++ b/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 +#include "compiler/rules/character_set.h" +#include "compiler/rules/symbol.h" namespace tree_sitter { namespace build_tables { diff --git a/src/compiler/build_tables/rule_can_be_blank.cpp b/src/compiler/build_tables/rule_can_be_blank.cpp index 8ec22768..94335dd4 100644 --- a/src/compiler/build_tables/rule_can_be_blank.cpp +++ b/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; diff --git a/src/compiler/build_tables/rule_transitions.cpp b/src/compiler/build_tables/rule_transitions.cpp index b66a076d..68d2e52c 100644 --- a/src/compiler/build_tables/rule_transitions.cpp +++ b/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; diff --git a/src/compiler/build_tables/rule_transitions.h b/src/compiler/build_tables/rule_transitions.h index a6450994..5bcfe2aa 100644 --- a/src/compiler/build_tables/rule_transitions.h +++ b/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 +#include "compiler/rules/character_set.h" +#include "compiler/rules/symbol.h" namespace tree_sitter { namespace build_tables { diff --git a/src/compiler/compile.cpp b/src/compiler/compile.cpp index 983c9015..65c59d43 100644 --- a/src/compiler/compile.cpp +++ b/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) { diff --git a/src/compiler/generate_code/c_code.cpp b/src/compiler/generate_code/c_code.cpp index a2b7ea17..0f8ad802 100644 --- a/src/compiler/generate_code/c_code.cpp +++ b/src/compiler/generate_code/c_code.cpp @@ -1,9 +1,9 @@ -#include "c_code.h" -#include #include +#include #include -#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; diff --git a/src/compiler/generate_code/c_code.h b/src/compiler/generate_code/c_code.h index 1c76345a..066ef096 100644 --- a/src/compiler/generate_code/c_code.h +++ b/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 { diff --git a/src/compiler/generate_code/helpers.cpp b/src/compiler/generate_code/helpers.cpp index 5c994ee7..e8412840 100644 --- a/src/compiler/generate_code/helpers.cpp +++ b/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 { diff --git a/src/compiler/grammar.cpp b/src/compiler/grammar.cpp index 8e1679a2..f2593c5f 100644 --- a/src/compiler/grammar.cpp +++ b/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; diff --git a/src/compiler/lex_table.cpp b/src/compiler/lex_table.cpp index 8b13d068..18cbf48c 100644 --- a/src/compiler/lex_table.cpp +++ b/src/compiler/lex_table.cpp @@ -1,4 +1,4 @@ -#include "lex_table.h" +#include "compiler/lex_table.h" namespace tree_sitter { using std::string; diff --git a/src/compiler/lex_table.h b/src/compiler/lex_table.h index 104cb1f0..98d81f0b 100644 --- a/src/compiler/lex_table.h +++ b/src/compiler/lex_table.h @@ -1,12 +1,12 @@ #ifndef __TreeSitter__lex_table__ #define __TreeSitter__lex_table__ -#include -#include -#include #include -#include "rules/symbol.h" -#include "rules/character_set.h" +#include +#include +#include +#include "compiler/rules/symbol.h" +#include "compiler/rules/character_set.h" namespace tree_sitter { typedef enum { diff --git a/src/compiler/parse_table.cpp b/src/compiler/parse_table.cpp index 02a43a1a..cf46aef2 100644 --- a/src/compiler/parse_table.cpp +++ b/src/compiler/parse_table.cpp @@ -1,4 +1,4 @@ -#include "parse_table.h" +#include "compiler/parse_table.h" namespace tree_sitter { using std::string; diff --git a/src/compiler/parse_table.h b/src/compiler/parse_table.h index 4dbb2cfe..9457e962 100644 --- a/src/compiler/parse_table.h +++ b/src/compiler/parse_table.h @@ -4,8 +4,8 @@ #include #include #include -#include "rules/symbol.h" -#include "./lex_table.h" +#include "compiler/lex_table.h" +#include "compiler/rules/symbol.h" namespace tree_sitter { typedef enum { diff --git a/src/compiler/prepare_grammar/expand_repeats.cpp b/src/compiler/prepare_grammar/expand_repeats.cpp index 5d1670e4..c21190f6 100644 --- a/src/compiler/prepare_grammar/expand_repeats.cpp +++ b/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 +#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; diff --git a/src/compiler/prepare_grammar/extract_tokens.cpp b/src/compiler/prepare_grammar/extract_tokens.cpp index 7db2371d..9cb86e90 100644 --- a/src/compiler/prepare_grammar/extract_tokens.cpp +++ b/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 +#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; diff --git a/src/compiler/prepare_grammar/prepare_grammar.cpp b/src/compiler/prepare_grammar/prepare_grammar.cpp index 2c828be6..3176a810 100644 --- a/src/compiler/prepare_grammar/prepare_grammar.cpp +++ b/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; diff --git a/src/compiler/prepared_grammar.cpp b/src/compiler/prepared_grammar.cpp index fe25ffa4..6c370ed8 100644 --- a/src/compiler/prepared_grammar.cpp +++ b/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; diff --git a/src/compiler/prepared_grammar.h b/src/compiler/prepared_grammar.h index 5164fb15..08298a46 100644 --- a/src/compiler/prepared_grammar.h +++ b/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 { diff --git a/src/compiler/rules/blank.cpp b/src/compiler/rules/blank.cpp index e8a88dfa..e147a26b 100644 --- a/src/compiler/rules/blank.cpp +++ b/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 { diff --git a/src/compiler/rules/blank.h b/src/compiler/rules/blank.h index 92c60a87..9b19950d 100644 --- a/src/compiler/rules/blank.h +++ b/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 { diff --git a/src/compiler/rules/built_in_symbols.cpp b/src/compiler/rules/built_in_symbols.cpp index 20bd5cc6..8776995d 100644 --- a/src/compiler/rules/built_in_symbols.cpp +++ b/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 { diff --git a/src/compiler/rules/built_in_symbols.h b/src/compiler/rules/built_in_symbols.h index 2d3899ba..64f6d9b7 100644 --- a/src/compiler/rules/built_in_symbols.h +++ b/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 { diff --git a/src/compiler/rules/character_range.cpp b/src/compiler/rules/character_range.cpp index 094b233a..e1fa216e 100644 --- a/src/compiler/rules/character_range.cpp +++ b/src/compiler/rules/character_range.cpp @@ -1,4 +1,4 @@ -#include "character_range.h" +#include "compiler/rules/character_range.h" #include namespace tree_sitter { diff --git a/src/compiler/rules/character_set.cpp b/src/compiler/rules/character_set.cpp index 5ebeaa70..2a256617 100644 --- a/src/compiler/rules/character_set.cpp +++ b/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; diff --git a/src/compiler/rules/character_set.h b/src/compiler/rules/character_set.h index 83902616..89664acc 100644 --- a/src/compiler/rules/character_set.h +++ b/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 #include +#include +#include "compiler/rules/rule.h" +#include "compiler/rules/character_range.h" namespace tree_sitter { namespace rules { diff --git a/src/compiler/rules/choice.cpp b/src/compiler/rules/choice.cpp index 64b67db4..ec64fc6e 100644 --- a/src/compiler/rules/choice.cpp +++ b/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; diff --git a/src/compiler/rules/choice.h b/src/compiler/rules/choice.h index 8f0cf235..77e0a69e 100644 --- a/src/compiler/rules/choice.h +++ b/src/compiler/rules/choice.h @@ -1,8 +1,8 @@ #ifndef __tree_sitter__choice__ #define __tree_sitter__choice__ -#include "rule.h" #include +#include "compiler/rules/rule.h" namespace tree_sitter { namespace rules { diff --git a/src/compiler/rules/pattern.cpp b/src/compiler/rules/pattern.cpp index d4e440c7..5bc0aab1 100644 --- a/src/compiler/rules/pattern.cpp +++ b/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 +#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 { diff --git a/src/compiler/rules/pattern.h b/src/compiler/rules/pattern.h index 7d8fa66b..b556a3db 100644 --- a/src/compiler/rules/pattern.h +++ b/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 { diff --git a/src/compiler/rules/repeat.cpp b/src/compiler/rules/repeat.cpp index 36ac5663..3e6ade50 100644 --- a/src/compiler/rules/repeat.cpp +++ b/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) {} diff --git a/src/compiler/rules/repeat.h b/src/compiler/rules/repeat.h index 0031df31..9a8bc322 100644 --- a/src/compiler/rules/repeat.h +++ b/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 { diff --git a/src/compiler/rules/rule.cpp b/src/compiler/rules/rule.cpp index 43bc1a93..a5c727d5 100644 --- a/src/compiler/rules/rule.cpp +++ b/src/compiler/rules/rule.cpp @@ -1,10 +1,10 @@ -#include "rule.h" +#include "compiler/rules/rule.h" #include -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); diff --git a/src/compiler/rules/rules.cpp b/src/compiler/rules/rules.cpp index 328144c7..f93e1f36 100644 --- a/src/compiler/rules/rules.cpp +++ b/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; diff --git a/src/compiler/rules/seq.cpp b/src/compiler/rules/seq.cpp index 70cddcdb..fb52f420 100644 --- a/src/compiler/rules/seq.cpp +++ b/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; diff --git a/src/compiler/rules/seq.h b/src/compiler/rules/seq.h index 2c9fbf02..11f3b098 100644 --- a/src/compiler/rules/seq.h +++ b/src/compiler/rules/seq.h @@ -1,8 +1,8 @@ #ifndef __tree_sitter__seq__ #define __tree_sitter__seq__ -#include "rule.h" #include +#include "compiler/rules/rule.h" namespace tree_sitter { namespace rules { diff --git a/src/compiler/rules/string.cpp b/src/compiler/rules/string.cpp index 161c538c..4e6ffd4d 100644 --- a/src/compiler/rules/string.cpp +++ b/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); } } -} \ No newline at end of file +} diff --git a/src/compiler/rules/string.h b/src/compiler/rules/string.h index 982bc88e..c67e2b37 100644 --- a/src/compiler/rules/string.h +++ b/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 { diff --git a/src/compiler/rules/symbol.cpp b/src/compiler/rules/symbol.cpp index 941580b0..cc5750f9 100644 --- a/src/compiler/rules/symbol.cpp +++ b/src/compiler/rules/symbol.cpp @@ -1,11 +1,11 @@ -#include "symbol.h" -#include "visitor.h" +#include "compiler/rules/symbol.h" #include - -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) {}; diff --git a/src/compiler/rules/symbol.h b/src/compiler/rules/symbol.h index 28c53dd1..f92da38d 100644 --- a/src/compiler/rules/symbol.h +++ b/src/compiler/rules/symbol.h @@ -1,8 +1,8 @@ #ifndef __tree_sitter__sym__ #define __tree_sitter__sym__ -#include "rule.h" #include +#include "compiler/rules/rule.h" namespace tree_sitter { namespace rules { diff --git a/src/compiler/rules/visitor.cpp b/src/compiler/rules/visitor.cpp index e7ee297f..e76f3f10 100644 --- a/src/compiler/rules/visitor.cpp +++ b/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 { diff --git a/src/compiler/rules/visitor.h b/src/compiler/rules/visitor.h index 29520e08..176fb38a 100644 --- a/src/compiler/rules/visitor.h +++ b/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 {