From 946088bcccba9d8576adf7b497e45c324894a5bc Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Fri, 21 Feb 2014 08:23:20 -0800 Subject: [PATCH] Remove unused typedef from compiler.h --- include/tree_sitter/compiler.h | 3 +-- src/compiler/prepared_grammar.h | 1 + src/compiler/rules/rules.cpp | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/tree_sitter/compiler.h b/include/tree_sitter/compiler.h index 8e1c5767..6f0821ac 100644 --- a/include/tree_sitter/compiler.h +++ b/include/tree_sitter/compiler.h @@ -9,14 +9,13 @@ namespace tree_sitter { namespace rules { class Rule; - class Symbol; typedef std::shared_ptr rule_ptr; std::ostream& operator<<(std::ostream& stream, const rule_ptr &rule); rule_ptr blank(); rule_ptr choice(const std::vector &rules); - rule_ptr repeat(const rule_ptr content); + rule_ptr repeat(const rule_ptr &content); rule_ptr seq(const std::vector &rules); rule_ptr sym(const std::string &name); rule_ptr _sym(const std::string &name); diff --git a/src/compiler/prepared_grammar.h b/src/compiler/prepared_grammar.h index e45acce1..31522f5a 100644 --- a/src/compiler/prepared_grammar.h +++ b/src/compiler/prepared_grammar.h @@ -2,6 +2,7 @@ #define __tree_sitter__prepared_grammar__ #include "tree_sitter/compiler.h" +#include "rules/symbol.h" namespace tree_sitter { class PreparedGrammar : public Grammar { diff --git a/src/compiler/rules/rules.cpp b/src/compiler/rules/rules.cpp index 68f78e7e..55d7222a 100644 --- a/src/compiler/rules/rules.cpp +++ b/src/compiler/rules/rules.cpp @@ -24,11 +24,7 @@ namespace tree_sitter { return Choice::Build(rules); } - rule_ptr pattern(const string &value) { - return make_shared(value); - } - - rule_ptr repeat(const rule_ptr content) { + rule_ptr repeat(const rule_ptr &content) { return std::make_shared(content); } @@ -36,10 +32,6 @@ namespace tree_sitter { return Seq::Build(rules); } - rule_ptr str(const string &value) { - return make_shared(value); - } - rule_ptr sym(const string &name) { return make_shared(name); } @@ -47,5 +39,13 @@ namespace tree_sitter { rule_ptr _sym(const string &name) { return make_shared(name, SymbolTypeHidden); } + + rule_ptr pattern(const string &value) { + return make_shared(value); + } + + rule_ptr str(const string &value) { + return make_shared(value); + } } }