Move {Syntax,Lexical}Grammar into separate files

project.gyp

@@ -29,6 +29,7 @@
         'src/compiler/generate_code/c_code.cc',
         'src/compiler/grammar.cc',
         'src/compiler/lex_table.cc',
+        'src/compiler/lexical_grammar.cc',
         'src/compiler/parse_table.cc',
         'src/compiler/prepare_grammar/expand_repeats.cc',
         'src/compiler/prepare_grammar/expand_tokens.cc',
@@ -38,7 +39,7 @@
         'src/compiler/prepare_grammar/parse_regex.cc',
         'src/compiler/prepare_grammar/prepare_grammar.cc',
         'src/compiler/prepare_grammar/token_description.cc',
-        'src/compiler/prepared_grammar.cc',
+        'src/compiler/syntax_grammar.cc',
         'src/compiler/rules/blank.cc',
         'src/compiler/rules/built_in_symbols.cc',
         'src/compiler/rules/character_range.cc',

spec/compiler/build_tables/action_takes_precedence_spec.cc

@@ -2,7 +2,7 @@
 #include "compiler/rules/built_in_symbols.h"
 #include "compiler/parse_table.h"
 #include "compiler/build_tables/action_takes_precedence.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
 
 using namespace rules;
 using namespace build_tables;

spec/compiler/build_tables/build_conflict_spec.cc

@@ -1,6 +1,7 @@
 #include "compiler/compiler_spec_helper.h"
 #include "compiler/build_tables/build_conflict.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
+#include "compiler/lexical_grammar.h"
 
 using namespace rules;
 using namespace build_tables;

spec/compiler/build_tables/build_parse_table_spec.cc

@@ -1,7 +1,8 @@
 #include "compiler/compiler_spec_helper.h"
 #include "compiler/build_tables/build_parse_table.h"
 #include "compiler/parse_table.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/lexical_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/rules/built_in_symbols.h"
 
 using namespace rules;

spec/compiler/build_tables/first_symbols_spec.cc

@@ -1,5 +1,5 @@
 #include "compiler/compiler_spec_helper.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/build_tables/first_symbols.h"
 #include "compiler/rules/metadata.h"
 

spec/compiler/build_tables/item_set_closure_spec.cc

@@ -1,5 +1,5 @@
 #include "compiler/compiler_spec_helper.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/build_tables/item_set_closure.h"
 #include "compiler/build_tables/item_set_transitions.h"
 

spec/compiler/build_tables/item_set_transitions_spec.cc

@@ -1,6 +1,6 @@
 #include "compiler/compiler_spec_helper.h"
 #include "compiler/build_tables/item_set_transitions.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/helpers/rule_helpers.h"
 
 using namespace rules;

spec/compiler/build_tables/lex_item_spec.cc

@@ -1,7 +1,6 @@
 #include "compiler/compiler_spec_helper.h"
 #include "compiler/build_tables/item_set_transitions.h"
 #include "compiler/rules/metadata.h"
-#include "compiler/prepared_grammar.h"
 
 using namespace rules;
 using namespace build_tables;

spec/compiler/build_tables/rule_can_be_blank_spec.cc

@@ -1,7 +1,7 @@
 #include "compiler/compiler_spec_helper.h"
 #include "compiler/build_tables/rule_can_be_blank.h"
 #include "compiler/rules/metadata.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
 
 using namespace rules;
 using build_tables::rule_can_be_blank;

spec/compiler/prepare_grammar/expand_repeats_spec.cc

@@ -1,5 +1,5 @@
 #include "compiler/compiler_spec_helper.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/prepare_grammar/expand_repeats.h"
 #include "compiler/helpers/containers.h"
 

spec/compiler/prepare_grammar/expand_tokens_spec.cc

@@ -1,5 +1,5 @@
 #include "compiler/compiler_spec_helper.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/lexical_grammar.h"
 #include "compiler/helpers/containers.h"
 #include "compiler/prepare_grammar/expand_tokens.h"
 

spec/compiler/prepare_grammar/extract_tokens_spec.cc

@@ -1,7 +1,7 @@
 #include "compiler/compiler_spec_helper.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/lexical_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/prepare_grammar/extract_tokens.h"
-#include "compiler/prepared_grammar.h"
 #include "compiler/helpers/containers.h"
 
 START_TEST

spec/compiler/prepare_grammar/intern_symbols_spec.cc

@@ -1,5 +1,4 @@
 #include "compiler/compiler_spec_helper.h"
-#include "compiler/prepared_grammar.h"
 #include "compiler/prepare_grammar/intern_symbols.h"
 #include "compiler/rules/named_symbol.h"
 #include "compiler/rules/symbol.h"

src/compiler/build_tables/action_takes_precedence.h

@@ -5,7 +5,7 @@
 #include "tree_sitter/compiler.h"
 #include "compiler/parse_table.h"
 #include "compiler/rules/symbol.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
 
 namespace tree_sitter {
 namespace build_tables {

src/compiler/build_tables/build_conflict.cc

@@ -1,7 +1,8 @@
 #include "compiler/build_tables/build_conflict.h"
 #include "compiler/rules/symbol.h"
 #include "compiler/rules/built_in_symbols.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/lexical_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/build_tables/parse_item.h"
 #include <string>
 

src/compiler/build_tables/build_lex_table.cc

@@ -8,7 +8,7 @@
 #include "compiler/build_tables/item_set_transitions.h"
 #include "compiler/build_tables/lex_item.h"
 #include "compiler/parse_table.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/lexical_grammar.h"
 #include "compiler/rules/built_in_symbols.h"
 #include "compiler/rules/choice.h"
 #include "compiler/rules/metadata.h"

src/compiler/build_tables/build_parse_table.cc

@@ -9,7 +9,8 @@
 #include "compiler/build_tables/action_takes_precedence.h"
 #include "compiler/build_tables/build_conflict.h"
 #include "compiler/build_tables/parse_item.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/lexical_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/rules/symbol.h"
 #include "compiler/rules/built_in_symbols.h"
 

src/compiler/build_tables/build_tables.cc

@@ -1,6 +1,7 @@
 #include "compiler/build_tables/build_lex_table.h"
 #include "compiler/build_tables/build_parse_table.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/lexical_grammar.h"
+#include "compiler/syntax_grammar.h"
 
 namespace tree_sitter {
 namespace build_tables {

src/compiler/build_tables/first_symbols.cc

@@ -1,6 +1,6 @@
 #include "compiler/build_tables/first_symbols.h"
 #include "compiler/build_tables/rule_can_be_blank.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/rules/choice.h"
 #include "compiler/rules/metadata.h"
 #include "compiler/rules/seq.h"

src/compiler/build_tables/item_set_closure.cc

@@ -7,7 +7,7 @@
 #include "compiler/build_tables/rule_transitions.h"
 #include "compiler/build_tables/rule_can_be_blank.h"
 #include "compiler/build_tables/item.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
 
 namespace tree_sitter {
 namespace build_tables {

src/compiler/build_tables/item_set_transitions.cc

@@ -4,7 +4,7 @@
 #include "compiler/build_tables/merge_transitions.h"
 #include "compiler/build_tables/parse_item.h"
 #include "compiler/build_tables/rule_transitions.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/rules/symbol.h"
 
 namespace tree_sitter {

src/compiler/build_tables/rule_can_be_blank.cc

@@ -1,7 +1,7 @@
 #include "compiler/build_tables/rule_can_be_blank.h"
 #include <set>
 #include "tree_sitter/compiler.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/rules/symbol.h"
 #include "compiler/rules/visitor.h"
 #include "compiler/rules/seq.h"

src/compiler/compile.cc

@@ -2,7 +2,8 @@
 #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"
+#include "compiler/syntax_grammar.h"
+#include "compiler/lexical_grammar.h"
 
 namespace tree_sitter {
 

src/compiler/generate_code/c_code.cc

@@ -7,7 +7,8 @@
 #include "compiler/generate_code/c_code.h"
 #include "compiler/lex_table.h"
 #include "compiler/parse_table.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/lexical_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/rules/built_in_symbols.h"
 #include "compiler/util/string_helpers.h"
 

src/compiler/lexical_grammar.cc

@@ -0,0 +1,37 @@
+#include "compiler/lexical_grammar.h"
+#include <vector>
+#include <string>
+#include <utility>
+#include "compiler/rules/symbol.h"
+
+namespace tree_sitter {
+
+using std::string;
+using std::pair;
+using std::vector;
+using std::set;
+
+LexicalGrammar::LexicalGrammar() {}
+
+LexicalGrammar::LexicalGrammar(
+    const vector<pair<string, rules::rule_ptr>> &rules,
+    const vector<pair<string, rules::rule_ptr>> &aux_rules)
+    : rules(rules), aux_rules(aux_rules) {}
+
+LexicalGrammar::LexicalGrammar(
+    const vector<pair<string, rules::rule_ptr>> &rules,
+    const vector<pair<string, rules::rule_ptr>> &aux_rules,
+    const vector<rules::rule_ptr> &separators)
+    : rules(rules), aux_rules(aux_rules), separators(separators) {}
+
+const rules::rule_ptr &LexicalGrammar::rule(const rules::Symbol &symbol) const {
+  return symbol.is_auxiliary() ? aux_rules[symbol.index].second
+                               : rules[symbol.index].second;
+}
+
+const string &LexicalGrammar::rule_name(const rules::Symbol &symbol) const {
+  return symbol.is_auxiliary() ? aux_rules[symbol.index].first
+                               : rules[symbol.index].first;
+}
+
+}  // namespace tree_sitter

src/compiler/lexical_grammar.h

@@ -0,0 +1,33 @@
+#ifndef COMPILER_LEXICAL_GRAMMAR_H_
+#define COMPILER_LEXICAL_GRAMMAR_H_
+
+#include <vector>
+#include <string>
+#include <utility>
+#include "tree_sitter/compiler.h"
+#include "compiler/rules/symbol.h"
+
+namespace tree_sitter {
+
+class LexicalGrammar {
+ public:
+  LexicalGrammar();
+  LexicalGrammar(
+      const std::vector<std::pair<std::string, rules::rule_ptr>> &rules,
+      const std::vector<std::pair<std::string, rules::rule_ptr>> &aux_rules);
+  LexicalGrammar(
+      const std::vector<std::pair<std::string, rules::rule_ptr>> &rules,
+      const std::vector<std::pair<std::string, rules::rule_ptr>> &aux_rules,
+      const std::vector<rules::rule_ptr> &separators);
+
+  const std::string &rule_name(const rules::Symbol &symbol) const;
+  const rules::rule_ptr &rule(const rules::Symbol &symbol) const;
+
+  const std::vector<std::pair<std::string, rules::rule_ptr>> rules;
+  const std::vector<std::pair<std::string, rules::rule_ptr>> aux_rules;
+  std::vector<rules::rule_ptr> separators;
+};
+
+}  // namespace tree_sitter
+
+#endif  // COMPILER_LEXICAL_GRAMMAR_H_

src/compiler/prepare_grammar/expand_repeats.cc

@@ -2,7 +2,7 @@
 #include <vector>
 #include <string>
 #include <utility>
-#include "compiler/prepared_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/rules/visitor.h"
 #include "compiler/rules/seq.h"
 #include "compiler/rules/symbol.h"

src/compiler/prepare_grammar/expand_tokens.cc

@@ -2,7 +2,7 @@
 #include <vector>
 #include <string>
 #include <utility>
-#include "compiler/prepared_grammar.h"
+#include "compiler/lexical_grammar.h"
 #include "compiler/rules/visitor.h"
 #include "compiler/rules/pattern.h"
 #include "compiler/rules/string.h"

src/compiler/prepare_grammar/extract_tokens.cc

@@ -4,7 +4,8 @@
 #include <set>
 #include <string>
 #include "tree_sitter/compiler.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/lexical_grammar.h"
+#include "compiler/syntax_grammar.h"
 #include "compiler/rules/visitor.h"
 #include "compiler/rules/symbol.h"
 #include "compiler/rules/string.h"

src/compiler/prepare_grammar/intern_symbols.cc

@@ -3,7 +3,6 @@
 #include <vector>
 #include <set>
 #include "tree_sitter/compiler.h"
-#include "compiler/prepared_grammar.h"
 #include "compiler/rules/visitor.h"
 #include "compiler/rules/named_symbol.h"
 #include "compiler/rules/symbol.h"

src/compiler/prepare_grammar/prepare_grammar.cc

@@ -3,7 +3,8 @@
 #include "compiler/prepare_grammar/extract_tokens.h"
 #include "compiler/prepare_grammar/intern_symbols.h"
 #include "compiler/prepare_grammar/prepare_grammar.h"
-#include "compiler/prepared_grammar.h"
+#include "compiler/lexical_grammar.h"
+#include "compiler/syntax_grammar.h"
 
 namespace tree_sitter {
 namespace prepare_grammar {

src/compiler/prepare_grammar/prepare_grammar.h

@@ -2,7 +2,8 @@
 #define COMPILER_PREPARE_GRAMMAR_PREPARE_GRAMMAR_H_
 
 #include <utility>
-#include "compiler/prepared_grammar.h"
+#include "compiler/lexical_grammar.h"
+#include "compiler/syntax_grammar.h"
 
 namespace tree_sitter {
 

src/compiler/prepared_grammar.cc

@@ -1,53 +0,0 @@
-#include "compiler/prepared_grammar.h"
-#include <vector>
-#include <string>
-#include <utility>
-#include "compiler/rules/symbol.h"
-
-namespace tree_sitter {
-
-using std::string;
-using std::pair;
-using std::vector;
-using std::set;
-
-const rules::rule_ptr &PreparedGrammar::rule(const rules::Symbol &symbol) const {
-  return symbol.is_auxiliary() ? aux_rules[symbol.index].second
-                               : rules[symbol.index].second;
-}
-
-const string &PreparedGrammar::rule_name(const rules::Symbol &symbol) const {
-  return symbol.is_auxiliary() ? aux_rules[symbol.index].first
-                               : rules[symbol.index].first;
-}
-
-PreparedGrammar::PreparedGrammar() {}
-SyntaxGrammar::SyntaxGrammar() {}
-LexicalGrammar::LexicalGrammar() {}
-
-SyntaxGrammar::SyntaxGrammar(const vector<pair<string, rules::rule_ptr>> &rules,
-                             const vector<pair<string, rules::rule_ptr>> &aux_rules)
-    : PreparedGrammar(rules, aux_rules) {}
-
-LexicalGrammar::LexicalGrammar(
-    const vector<pair<string, rules::rule_ptr>> &rules,
-    const vector<pair<string, rules::rule_ptr>> &aux_rules)
-    : PreparedGrammar(rules, aux_rules) {}
-
-PreparedGrammar::PreparedGrammar(
-    const vector<pair<string, rules::rule_ptr>> &rules,
-    const vector<pair<string, rules::rule_ptr>> &aux_rules)
-    : rules(rules), aux_rules(aux_rules) {}
-
-SyntaxGrammar::SyntaxGrammar(const vector<pair<string, rules::rule_ptr>> &rules,
-                             const vector<pair<string, rules::rule_ptr>> &aux_rules,
-                             const set<rules::Symbol> &ubiquitous_tokens)
-    : PreparedGrammar(rules, aux_rules), ubiquitous_tokens(ubiquitous_tokens) {}
-
-LexicalGrammar::LexicalGrammar(
-    const vector<pair<string, rules::rule_ptr>> &rules,
-    const vector<pair<string, rules::rule_ptr>> &aux_rules,
-    const vector<rules::rule_ptr> &separators)
-    : PreparedGrammar(rules, aux_rules), separators(separators) {}
-
-}  // namespace tree_sitter

src/compiler/syntax_grammar.cc

@@ -0,0 +1,35 @@
+#include "compiler/syntax_grammar.h"
+#include <vector>
+#include <string>
+#include <utility>
+#include "compiler/rules/symbol.h"
+
+namespace tree_sitter {
+
+using std::string;
+using std::pair;
+using std::vector;
+using std::set;
+
+SyntaxGrammar::SyntaxGrammar() {}
+
+SyntaxGrammar::SyntaxGrammar(const vector<pair<string, rules::rule_ptr>> &rules,
+                             const vector<pair<string, rules::rule_ptr>> &aux_rules)
+    : rules(rules), aux_rules(aux_rules) {}
+
+SyntaxGrammar::SyntaxGrammar(const vector<pair<string, rules::rule_ptr>> &rules,
+                             const vector<pair<string, rules::rule_ptr>> &aux_rules,
+                             const set<rules::Symbol> &ubiquitous_tokens)
+    : rules(rules), aux_rules(aux_rules), ubiquitous_tokens(ubiquitous_tokens) {}
+
+const rules::rule_ptr &SyntaxGrammar::rule(const rules::Symbol &symbol) const {
+  return symbol.is_auxiliary() ? aux_rules[symbol.index].second
+                               : rules[symbol.index].second;
+}
+
+const string &SyntaxGrammar::rule_name(const rules::Symbol &symbol) const {
+  return symbol.is_auxiliary() ? aux_rules[symbol.index].first
+                               : rules[symbol.index].first;
+}
+
+}  // namespace tree_sitter

src/compiler/syntax_grammar.h

@@ -1,5 +1,5 @@
-#ifndef COMPILER_PREPARED_GRAMMAR_H_
-#define COMPILER_PREPARED_GRAMMAR_H_
+#ifndef COMPILER_SYNTAX_GRAMMAR_H_
+#define COMPILER_SYNTAX_GRAMMAR_H_
 
 #include <vector>
 #include <string>
@@ -10,21 +10,7 @@
 
 namespace tree_sitter {
 
-class PreparedGrammar {
- public:
-  PreparedGrammar();
-  PreparedGrammar(
-      const std::vector<std::pair<std::string, rules::rule_ptr>> &rules,
-      const std::vector<std::pair<std::string, rules::rule_ptr>> &aux_rules);
-
-  const std::vector<std::pair<std::string, rules::rule_ptr>> rules;
-  const std::vector<std::pair<std::string, rules::rule_ptr>> aux_rules;
-
-  const std::string &rule_name(const rules::Symbol &symbol) const;
-  const rules::rule_ptr &rule(const rules::Symbol &symbol) const;
-};
-
-class SyntaxGrammar : public PreparedGrammar {
+class SyntaxGrammar {
  public:
   SyntaxGrammar();
   SyntaxGrammar(
@@ -35,23 +21,14 @@ class SyntaxGrammar : public PreparedGrammar {
       const std::vector<std::pair<std::string, rules::rule_ptr>> &aux_rules,
       const std::set<rules::Symbol> &ubiquitous_tokens);
 
+  const std::string &rule_name(const rules::Symbol &symbol) const;
+  const rules::rule_ptr &rule(const rules::Symbol &symbol) const;
+  
+  const std::vector<std::pair<std::string, rules::rule_ptr>> rules;
+  const std::vector<std::pair<std::string, rules::rule_ptr>> aux_rules;
   std::set<rules::Symbol> ubiquitous_tokens;
 };
 
-class LexicalGrammar : public PreparedGrammar {
- public:
-  LexicalGrammar();
-  LexicalGrammar(
-      const std::vector<std::pair<std::string, rules::rule_ptr>> &rules,
-      const std::vector<std::pair<std::string, rules::rule_ptr>> &aux_rules);
-  LexicalGrammar(
-      const std::vector<std::pair<std::string, rules::rule_ptr>> &rules,
-      const std::vector<std::pair<std::string, rules::rule_ptr>> &aux_rules,
-      const std::vector<rules::rule_ptr> &separators);
-
-  std::vector<rules::rule_ptr> separators;
-};
-
 }  // namespace tree_sitter
 
-#endif  // COMPILER_PREPARED_GRAMMAR_H_
+#endif  // COMPILER_SYNTAX_GRAMMAR_H_