From 36870bfced9701a36766c697aa0b3e3f066ae1e7 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Fri, 8 Jan 2016 15:51:30 -0800
Subject: [PATCH] Make Grammar a simple struct

---
 externals/json-parser                         |  1 +
 include/tree_sitter/compiler.h                | 23 ++++------
 project.gyp                                   |  1 -
 spec/compiler/compile_spec.cc                 |  8 ++--
 spec/compiler/helpers/stream_methods.cc       |  2 +-
 .../prepare_grammar/intern_symbols_spec.cc    | 14 +++---
 spec/fixtures/grammars/anonymous_tokens.cc    |  6 +--
 spec/fixtures/grammars/arithmetic.cc          |  6 +--
 spec/fixtures/grammars/c.cc                   |  8 ++--
 spec/fixtures/grammars/cpp.cc                 |  8 ++--
 spec/fixtures/grammars/golang.cc              |  6 +--
 spec/fixtures/grammars/javascript.cc          |  8 ++--
 spec/fixtures/grammars/json.cc                |  6 +--
 src/compiler/grammar.cc                       | 44 -------------------
 .../prepare_grammar/intern_symbols.cc         | 10 ++---
 .../prepare_grammar/prepare_grammar.h         |  2 +-
 16 files changed, 53 insertions(+), 100 deletions(-)
 create mode 160000 externals/json-parser
 delete mode 100644 src/compiler/grammar.cc

diff --git a/externals/json-parser b/externals/json-parser
new file mode 160000
index 00000000..70533215
--- /dev/null
+++ b/externals/json-parser
@@ -0,0 +1 @@
+Subproject commit 70533215eea575e40a0b91a34ae01a779641d73a
diff --git a/include/tree_sitter/compiler.h b/include/tree_sitter/compiler.h
index fbc18010..2c0b6847 100644
--- a/include/tree_sitter/compiler.h
+++ b/include/tree_sitter/compiler.h
@@ -27,18 +27,10 @@ rule_ptr prec_right(const rule_ptr &);
 rule_ptr prec_right(int precedence, const rule_ptr &);
 rule_ptr token(const rule_ptr &rule);
 
-class Grammar {
-  const std::vector<std::pair<std::string, rule_ptr>> rules_;
-  std::vector<rule_ptr> extra_tokens_;
-  std::vector<std::vector<std::string>> expected_conflicts_;
-
- public:
-  explicit Grammar(const std::vector<std::pair<std::string, rule_ptr>> &);
-  Grammar &extra_tokens(const std::vector<rule_ptr> &);
-  Grammar &expected_conflicts(const std::vector<std::vector<std::string>> &);
-  const std::vector<std::pair<std::string, rule_ptr>> &rules() const;
-  const std::vector<rule_ptr> &extra_tokens() const;
-  const std::vector<std::vector<std::string>> &expected_conflicts() const;
+struct Grammar {
+  std::vector<std::pair<std::string, rule_ptr>> rules;
+  std::vector<rule_ptr> extra_tokens;
+  std::vector<std::vector<std::string>> expected_conflicts;
 };
 
 enum GrammarErrorType {
@@ -51,8 +43,11 @@ enum GrammarErrorType {
 
 class GrammarError {
  public:
-  GrammarError(GrammarErrorType type, std::string message);
-  bool operator==(const GrammarError &other) const;
+  GrammarError(GrammarErrorType type, std::string message) : type(type), message(message) {}
+  bool operator==(const GrammarError &other) const {
+    return type == other.type && message == other.message;
+  }
+
   GrammarErrorType type;
   std::string message;
 };
diff --git a/project.gyp b/project.gyp
index 16d629a8..9effe59a 100644
--- a/project.gyp
+++ b/project.gyp
@@ -24,7 +24,6 @@
         'src/compiler/build_tables/rule_can_be_blank.cc',
         'src/compiler/compile.cc',
         'src/compiler/generate_code/c_code.cc',
-        'src/compiler/grammar.cc',
         'src/compiler/lex_table.cc',
         'src/compiler/parse_table.cc',
         'src/compiler/precedence_range.cc',
diff --git a/spec/compiler/compile_spec.cc b/spec/compiler/compile_spec.cc
index bcff2239..88a749e4 100644
--- a/spec/compiler/compile_spec.cc
+++ b/spec/compiler/compile_spec.cc
@@ -8,9 +8,9 @@ START_TEST
 describe("Compile", []() {
   describe("when the grammar's start symbol is a token", [&]() {
     it("does not fail", [&]() {
-      Grammar grammar({
+      Grammar grammar{{
         { "rule1", str("the-value") }
-      });
+      }, {}, {}};
 
       auto result = compile(grammar, "test_grammar");
       const GrammarError *error = result.second;
@@ -20,9 +20,9 @@ describe("Compile", []() {
 
   describe("when the grammar's start symbol is blank", [&]() {
     it("does not fail", [&]() {
-      Grammar grammar({
+      Grammar grammar{{
         { "rule1", blank() }
-      });
+      }, {}, {}};
 
       auto result = compile(grammar, "test_grammar");
       const GrammarError *error = result.second;
diff --git a/spec/compiler/helpers/stream_methods.cc b/spec/compiler/helpers/stream_methods.cc
index 84925e13..652c21f7 100644
--- a/spec/compiler/helpers/stream_methods.cc
+++ b/spec/compiler/helpers/stream_methods.cc
@@ -12,7 +12,7 @@ ostream &operator<<(ostream &stream, const Grammar &grammar) {
   stream << string("#<grammar");
   stream << string(" rules: {");
   bool started = false;
-  for (auto pair : grammar.rules()) {
+  for (auto pair : grammar.rules) {
     if (started)
       stream << string(", ");
     stream << pair.first;
diff --git a/spec/compiler/prepare_grammar/intern_symbols_spec.cc b/spec/compiler/prepare_grammar/intern_symbols_spec.cc
index dbf4871b..ea3f7a72 100644
--- a/spec/compiler/prepare_grammar/intern_symbols_spec.cc
+++ b/spec/compiler/prepare_grammar/intern_symbols_spec.cc
@@ -10,11 +10,11 @@ using prepare_grammar::intern_symbols;
 
 describe("intern_symbols", []() {
   it("replaces named symbols with numerically-indexed symbols", [&]() {
-    Grammar grammar({
+    Grammar grammar{{
       { "x", choice({ sym("y"), sym("_z") }) },
       { "y", sym("_z") },
       { "_z", str("stuff") }
-    });
+    }, {}, {}};
 
     auto result = intern_symbols(grammar);
 
@@ -28,9 +28,9 @@ describe("intern_symbols", []() {
 
   describe("when there are symbols that reference undefined rules", [&]() {
     it("returns an error", []() {
-      Grammar grammar({
+      Grammar grammar{{
         { "x", sym("y") },
-      });
+      }, {}, {}};
 
       auto result = intern_symbols(grammar);
 
@@ -39,11 +39,13 @@ describe("intern_symbols", []() {
   });
 
   it("translates the grammar's optional 'extra_tokens' to numerical symbols", [&]() {
-    auto grammar = Grammar({
+    Grammar grammar{{
       { "x", choice({ sym("y"), sym("z") }) },
       { "y", sym("z") },
       { "z", str("stuff") }
-    }).extra_tokens({ sym("z") });
+    }, {
+      sym("z")
+    }, {}};
 
     auto result = intern_symbols(grammar);
 
diff --git a/spec/fixtures/grammars/anonymous_tokens.cc b/spec/fixtures/grammars/anonymous_tokens.cc
index 681442be..d9639b51 100644
--- a/spec/fixtures/grammars/anonymous_tokens.cc
+++ b/spec/fixtures/grammars/anonymous_tokens.cc
@@ -3,14 +3,14 @@
 
 namespace tree_sitter_examples {
 
-extern const Grammar anonymous_tokens = Grammar({
+extern const Grammar anonymous_tokens{{
   { "program", choice({
     str("\n"),
     str("\r"),
     pattern("\\d"),
     str("\"hello\"") }) },
-}).extra_tokens({
+}, {
   pattern("\\s"),
-});
+}, {}};
 
 }  // namespace tree_sitter_examples
diff --git a/spec/fixtures/grammars/arithmetic.cc b/spec/fixtures/grammars/arithmetic.cc
index 37288248..75b7f703 100644
--- a/spec/fixtures/grammars/arithmetic.cc
+++ b/spec/fixtures/grammars/arithmetic.cc
@@ -3,7 +3,7 @@
 
 namespace tree_sitter_examples {
 
-extern const Grammar arithmetic = Grammar({
+extern const Grammar arithmetic{{
   { "program", sym("_expression") },
 
   { "_expression", choice({
@@ -37,9 +37,9 @@ extern const Grammar arithmetic = Grammar({
       pattern("[0-9]") })) })) },
 
   { "comment", pattern("#.*") },
-}).extra_tokens({
+}, {
   sym("comment"),
   pattern("\\s"),
-});
+}, {}};
 
 }  // namespace tree_sitter_examples
diff --git a/spec/fixtures/grammars/c.cc b/spec/fixtures/grammars/c.cc
index 02202a8e..f233c85d 100644
--- a/spec/fixtures/grammars/c.cc
+++ b/spec/fixtures/grammars/c.cc
@@ -5,7 +5,7 @@ namespace tree_sitter_examples {
 
 // http://slps.github.io/zoo/c/iso-9899-tc3.html
 
-extern const Grammar c = Grammar({
+extern const Grammar c{{
   { "translation_unit", repeat(choice({
     sym("preproc_define"),
     sym("function_definition"),
@@ -251,13 +251,13 @@ extern const Grammar c = Grammar({
         pattern("[^\\*]"),
         pattern("\\*[^/]") })),
       str("*/") }) })) },
-}).extra_tokens({
+}, {
   sym("comment"),
   pattern("[ \t\r\n]"),
-}).expected_conflicts({
+}, {
   { "_type_specifier", "_expression" },
   { "_type_specifier", "_expression", "macro_type" },
   { "_type_specifier", "macro_type" },
-});
+}};
 
 }  // namespace tree_sitter_examples
diff --git a/spec/fixtures/grammars/cpp.cc b/spec/fixtures/grammars/cpp.cc
index 3c047024..6be0e8e5 100644
--- a/spec/fixtures/grammars/cpp.cc
+++ b/spec/fixtures/grammars/cpp.cc
@@ -5,7 +5,7 @@ namespace tree_sitter_examples {
 
 // http://slps.github.io/zoo/cpp/iso-n2723.html
 
-extern const Grammar cpp = Grammar({
+extern const Grammar cpp{{
   { "translation_unit", repeat(sym("_declaration")) },
 
   { "_declaration", choice({
@@ -211,13 +211,13 @@ extern const Grammar cpp = Grammar({
   { "number", pattern("\\d+(\\.\\d+)?") },
 
   { "comment", pattern("//[^\n]*") },
-}).extra_tokens({
+}, {
   sym("comment"),
   pattern("[ \t\r\n]"),
-}).expected_conflicts({
+}, {
   { "type_specifier", "_expression" },
   { "template_call", "_expression" },
   { "template_call", "relational_expression" },
-});
+}};
 
 }  // namespace tree_sitter_examples
diff --git a/spec/fixtures/grammars/golang.cc b/spec/fixtures/grammars/golang.cc
index 9bbb33db..83fd52e9 100644
--- a/spec/fixtures/grammars/golang.cc
+++ b/spec/fixtures/grammars/golang.cc
@@ -9,7 +9,7 @@ static rule_ptr terminated(rule_ptr rule) {
     str(";") }) });
 }
 
-extern const Grammar golang = Grammar({
+extern const Grammar golang{{
   { "program", seq({
     sym("package_directive"),
     repeat(sym("imports_block")),
@@ -203,10 +203,10 @@ extern const Grammar golang = Grammar({
 
   { "comment", pattern("//[^\n]*") },
 
-}).extra_tokens({
+}, {
   sym("comment"),
   sym("_line_break"),
   pattern("[ \t\r]"),
-});
+}, {}};
 
 }  // namespace tree_sitter_examples
diff --git a/spec/fixtures/grammars/javascript.cc b/spec/fixtures/grammars/javascript.cc
index e7887888..32fecaf9 100644
--- a/spec/fixtures/grammars/javascript.cc
+++ b/spec/fixtures/grammars/javascript.cc
@@ -30,7 +30,7 @@ enum {
   PREC_ARGS = 16,
 };
 
-extern const Grammar javascript = Grammar({
+extern const Grammar javascript{{
   { "program", repeat(sym("_statement")) },
 
   /*
@@ -349,13 +349,13 @@ extern const Grammar javascript = Grammar({
     str(")"),
     sym("statement_block") }) },
 
-}).extra_tokens({
+}, {
   sym("comment"),
   sym("_line_break"),
   pattern("[ \t\r]"),
-}).expected_conflicts({
+}, {
   { "for_in_statement", "_expression" },
   { "method_definition", "_expression" },
-});
+}};
 
 }  // namespace tree_sitter_examples
diff --git a/spec/fixtures/grammars/json.cc b/spec/fixtures/grammars/json.cc
index e58bd0a7..553b8e44 100644
--- a/spec/fixtures/grammars/json.cc
+++ b/spec/fixtures/grammars/json.cc
@@ -3,7 +3,7 @@
 
 namespace tree_sitter_examples {
 
-extern const Grammar json = Grammar({
+extern const Grammar json{{
   { "_value", choice({
     sym("object"),
     sym("array"),
@@ -22,8 +22,8 @@ extern const Grammar json = Grammar({
   { "null", str("null") },
   { "true", str("true") },
   { "false", str("false") },
-}).extra_tokens({
+}, {
   pattern("\\s"),
-});
+}, {}};
 
 }  // namespace tree_sitter_examples
diff --git a/src/compiler/grammar.cc b/src/compiler/grammar.cc
deleted file mode 100644
index e5adccbf..00000000
--- a/src/compiler/grammar.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "tree_sitter/compiler.h"
-#include "compiler/rule.h"
-
-namespace tree_sitter {
-
-using std::ostream;
-using std::pair;
-using std::string;
-using std::vector;
-
-Grammar::Grammar(const vector<pair<string, rule_ptr>> &rules)
-    : rules_(rules), extra_tokens_({}) {}
-
-const vector<pair<string, rule_ptr>> &Grammar::rules() const {
-  return rules_;
-}
-
-const vector<rule_ptr> &Grammar::extra_tokens() const {
-  return extra_tokens_;
-}
-
-const vector<vector<string>> &Grammar::expected_conflicts() const {
-  return expected_conflicts_;
-}
-
-Grammar &Grammar::extra_tokens(const vector<rule_ptr> &extra_tokens) {
-  extra_tokens_ = extra_tokens;
-  return *this;
-}
-
-Grammar &Grammar::expected_conflicts(
-  const vector<vector<string>> &expected_conflicts) {
-  expected_conflicts_ = expected_conflicts;
-  return *this;
-}
-
-GrammarError::GrammarError(GrammarErrorType type, string message)
-    : type(type), message(message) {}
-
-bool GrammarError::operator==(const GrammarError &other) const {
-  return type == other.type && message == other.message;
-}
-
-}  // namespace tree_sitter
diff --git a/src/compiler/prepare_grammar/intern_symbols.cc b/src/compiler/prepare_grammar/intern_symbols.cc
index cd77e6a9..5a5048df 100644
--- a/src/compiler/prepare_grammar/intern_symbols.cc
+++ b/src/compiler/prepare_grammar/intern_symbols.cc
@@ -31,8 +31,8 @@ class InternSymbols : public rules::IdentityRuleFn {
 
  public:
   std::shared_ptr<rules::Symbol> symbol_for_rule_name(string rule_name) {
-    for (size_t i = 0; i < grammar.rules().size(); i++)
-      if (grammar.rules()[i].first == rule_name)
+    for (size_t i = 0; i < grammar.rules.size(); i++)
+      if (grammar.rules[i].first == rule_name)
         return make_shared<rules::Symbol>(i);
     return nullptr;
   }
@@ -51,7 +51,7 @@ pair<InternedGrammar, const GrammarError *> intern_symbols(const Grammar &gramma
   InternedGrammar result;
   InternSymbols interner(grammar);
 
-  for (auto &pair : grammar.rules()) {
+  for (auto &pair : grammar.rules) {
     auto new_rule = interner.apply(pair.second);
     if (!interner.missing_rule_name.empty())
       return { result, missing_rule_error(interner.missing_rule_name) };
@@ -61,14 +61,14 @@ pair<InternedGrammar, const GrammarError *> intern_symbols(const Grammar &gramma
       new_rule));
   }
 
-  for (auto &rule : grammar.extra_tokens()) {
+  for (auto &rule : grammar.extra_tokens) {
     auto new_rule = interner.apply(rule);
     if (!interner.missing_rule_name.empty())
       return { result, missing_rule_error(interner.missing_rule_name) };
     result.extra_tokens.push_back(new_rule);
   }
 
-  for (auto &names : grammar.expected_conflicts()) {
+  for (auto &names : grammar.expected_conflicts) {
     set<rules::Symbol> entry;
     for (auto &name : names) {
       auto symbol = interner.symbol_for_rule_name(name);
diff --git a/src/compiler/prepare_grammar/prepare_grammar.h b/src/compiler/prepare_grammar/prepare_grammar.h
index 1e03e70b..6a57db3a 100644
--- a/src/compiler/prepare_grammar/prepare_grammar.h
+++ b/src/compiler/prepare_grammar/prepare_grammar.h
@@ -7,7 +7,7 @@
 
 namespace tree_sitter {
 
-class Grammar;
+struct Grammar;
 class GrammarError;
 
 namespace prepare_grammar {