From aae6f6de14ec145b0336a71475d64c6532ae796d Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Sun, 12 Oct 2014 11:50:36 -0700 Subject: [PATCH] Remove whitespace between template closing tags --- .../build_tables/build_parse_table.cc | 6 ++--- src/compiler/build_tables/build_parse_table.h | 2 +- src/compiler/build_tables/build_tables.cc | 2 +- src/compiler/build_tables/build_tables.h | 2 +- src/compiler/build_tables/first_symbols.cc | 5 ++-- src/compiler/build_tables/first_symbols.h | 2 +- src/compiler/build_tables/parse_item.h | 2 +- src/compiler/build_tables/rule_transitions.cc | 2 +- src/compiler/grammar.cc | 4 ++-- .../prepare_grammar/expand_repeats.cc | 4 ++-- .../prepare_grammar/intern_symbols.cc | 2 +- src/compiler/prepared_grammar.cc | 24 +++++++++---------- src/compiler/prepared_grammar.h | 24 +++++++++---------- src/compiler/rules/visitor.h | 1 + 14 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/compiler/build_tables/build_parse_table.cc b/src/compiler/build_tables/build_parse_table.cc index 284288ce..5a8968a6 100644 --- a/src/compiler/build_tables/build_parse_table.cc +++ b/src/compiler/build_tables/build_parse_table.cc @@ -28,7 +28,7 @@ class ParseTableBuilder { const SyntaxGrammar grammar; ParseConflictManager conflict_manager; unordered_map parse_state_ids; - vector > item_sets_to_process; + vector> item_sets_to_process; ParseTable parse_table; ParseStateId add_parse_state(const ParseItemSet &item_set) { @@ -132,7 +132,7 @@ class ParseTableBuilder { : grammar(grammar), conflict_manager(ParseConflictManager(grammar, lex_grammar)) {} - pair > build() { + pair> build() { auto start_symbol = grammar.rules.empty() ? make_shared(0, rules::SymbolOptionToken) : make_shared(0); @@ -162,7 +162,7 @@ class ParseTableBuilder { } }; -pair > build_parse_table( +pair> build_parse_table( const SyntaxGrammar &grammar, const LexicalGrammar &lex_grammar) { return ParseTableBuilder(grammar, lex_grammar).build(); } diff --git a/src/compiler/build_tables/build_parse_table.h b/src/compiler/build_tables/build_parse_table.h index a2dbcb17..b9894379 100644 --- a/src/compiler/build_tables/build_parse_table.h +++ b/src/compiler/build_tables/build_parse_table.h @@ -11,7 +11,7 @@ class SyntaxGrammar; class LexicalGrammar; namespace build_tables { -std::pair > build_parse_table( +std::pair> build_parse_table( const SyntaxGrammar &grammar, const LexicalGrammar &lex_grammar); } } diff --git a/src/compiler/build_tables/build_tables.cc b/src/compiler/build_tables/build_tables.cc index 24d882e0..de9d8853 100644 --- a/src/compiler/build_tables/build_tables.cc +++ b/src/compiler/build_tables/build_tables.cc @@ -10,7 +10,7 @@ using std::tuple; using std::vector; using std::make_tuple; -tuple > build_tables( +tuple> build_tables( const SyntaxGrammar &grammar, const LexicalGrammar &lex_grammar) { auto parse_table_result = build_parse_table(grammar, lex_grammar); ParseTable parse_table = parse_table_result.first; diff --git a/src/compiler/build_tables/build_tables.h b/src/compiler/build_tables/build_tables.h index c84aa193..6cea52b7 100644 --- a/src/compiler/build_tables/build_tables.h +++ b/src/compiler/build_tables/build_tables.h @@ -12,7 +12,7 @@ class SyntaxGrammar; class LexicalGrammar; namespace build_tables { -std::tuple > build_tables( +std::tuple> build_tables( const SyntaxGrammar &grammar, const LexicalGrammar &lex_grammar); } } diff --git a/src/compiler/build_tables/first_symbols.cc b/src/compiler/build_tables/first_symbols.cc index ca742b2c..81d4b637 100644 --- a/src/compiler/build_tables/first_symbols.cc +++ b/src/compiler/build_tables/first_symbols.cc @@ -14,7 +14,7 @@ namespace build_tables { using std::set; using rules::Symbol; -class FirstSymbols : public rules::RuleFn > { +class FirstSymbols : public rules::RuleFn> { const SyntaxGrammar *grammar; set visited_symbols; @@ -58,7 +58,8 @@ class FirstSymbols : public rules::RuleFn > { } }; -set first_symbols(const rules::rule_ptr &rule, const SyntaxGrammar &grammar) { +set first_symbols(const rules::rule_ptr &rule, + const SyntaxGrammar &grammar) { return FirstSymbols(&grammar).apply(rule); } diff --git a/src/compiler/build_tables/first_symbols.h b/src/compiler/build_tables/first_symbols.h index 6e61d450..943bfe3e 100644 --- a/src/compiler/build_tables/first_symbols.h +++ b/src/compiler/build_tables/first_symbols.h @@ -17,7 +17,7 @@ namespace build_tables { * in a given grammar. */ std::set first_symbols(const rules::rule_ptr &rule, - const SyntaxGrammar &grammar); + const SyntaxGrammar &grammar); } // namespace build_tables } // namespace tree_sitter diff --git a/src/compiler/build_tables/parse_item.h b/src/compiler/build_tables/parse_item.h index c9a08a3f..e5ccec9b 100644 --- a/src/compiler/build_tables/parse_item.h +++ b/src/compiler/build_tables/parse_item.h @@ -20,7 +20,7 @@ class ParseItem : public Item { std::ostream &operator<<(std::ostream &stream, const ParseItem &item); -typedef std::unordered_map > ParseItemSet; +typedef std::unordered_map> ParseItemSet; } // namespace build_tables } // namespace tree_sitter diff --git a/src/compiler/build_tables/rule_transitions.cc b/src/compiler/build_tables/rule_transitions.cc index 3975ec6b..14622e3e 100644 --- a/src/compiler/build_tables/rule_transitions.cc +++ b/src/compiler/build_tables/rule_transitions.cc @@ -45,7 +45,7 @@ void merge_transitions(map *left, } template -class RuleTransitions : public rules::RuleFn > { +class RuleTransitions : public rules::RuleFn> { map apply_to_atom(const rules::Rule *rule) { auto atom = dynamic_cast(rule); if (atom) diff --git a/src/compiler/grammar.cc b/src/compiler/grammar.cc index 39d8adf8..715c4277 100644 --- a/src/compiler/grammar.cc +++ b/src/compiler/grammar.cc @@ -10,7 +10,7 @@ using std::string; using std::vector; using rules::rule_ptr; -Grammar::Grammar(const std::vector > &rules) +Grammar::Grammar(const std::vector> &rules) : rules_(rules), ubiquitous_tokens_({}) {} bool Grammar::operator==(const Grammar &other) const { @@ -69,6 +69,6 @@ Grammar &Grammar::ubiquitous_tokens(const set &ubiquitous_tokens) { return *this; } -const vector > &Grammar::rules() const { return rules_; } +const vector> &Grammar::rules() const { return rules_; } } // namespace tree_sitter diff --git a/src/compiler/prepare_grammar/expand_repeats.cc b/src/compiler/prepare_grammar/expand_repeats.cc index df18a323..844a9ead 100644 --- a/src/compiler/prepare_grammar/expand_repeats.cc +++ b/src/compiler/prepare_grammar/expand_repeats.cc @@ -47,11 +47,11 @@ class ExpandRepeats : public rules::IdentityRuleFn { : rule_name(rule_name), offset(offset) {} size_t offset; - vector > aux_rules; + vector> aux_rules; }; SyntaxGrammar expand_repeats(const SyntaxGrammar &grammar) { - vector > rules, aux_rules(grammar.aux_rules); + vector> rules, aux_rules(grammar.aux_rules); for (auto &pair : grammar.rules) { ExpandRepeats expander(pair.first, aux_rules.size()); diff --git a/src/compiler/prepare_grammar/intern_symbols.cc b/src/compiler/prepare_grammar/intern_symbols.cc index 9b66c271..66dad499 100644 --- a/src/compiler/prepare_grammar/intern_symbols.cc +++ b/src/compiler/prepare_grammar/intern_symbols.cc @@ -48,7 +48,7 @@ pair missing_rule_error(string rule_name) { pair intern_symbols(const Grammar &grammar) { InternSymbols interner(grammar); - vector > rules; + vector> rules; for (auto &pair : grammar.rules()) { auto new_rule = interner.apply(pair.second); diff --git a/src/compiler/prepared_grammar.cc b/src/compiler/prepared_grammar.cc index 13290b90..12c6a946 100644 --- a/src/compiler/prepared_grammar.cc +++ b/src/compiler/prepared_grammar.cc @@ -25,30 +25,28 @@ PreparedGrammar::PreparedGrammar() {} SyntaxGrammar::SyntaxGrammar() {} LexicalGrammar::LexicalGrammar() {} -SyntaxGrammar::SyntaxGrammar( - const vector > &rules, - const vector > &aux_rules) +SyntaxGrammar::SyntaxGrammar(const vector> &rules, + const vector> &aux_rules) : PreparedGrammar(rules, aux_rules) {} LexicalGrammar::LexicalGrammar( - const vector > &rules, - const vector > &aux_rules) + const vector> &rules, + const vector> &aux_rules) : PreparedGrammar(rules, aux_rules) {} PreparedGrammar::PreparedGrammar( - const vector > &rules, - const vector > &aux_rules) + const vector> &rules, + const vector> &aux_rules) : rules(rules), aux_rules(aux_rules) {} -SyntaxGrammar::SyntaxGrammar( - const vector > &rules, - const vector > &aux_rules, - const set &ubiquitous_tokens) +SyntaxGrammar::SyntaxGrammar(const vector> &rules, + const vector> &aux_rules, + const set &ubiquitous_tokens) : PreparedGrammar(rules, aux_rules), ubiquitous_tokens(ubiquitous_tokens) {} LexicalGrammar::LexicalGrammar( - const vector > &rules, - const vector > &aux_rules, + const vector> &rules, + const vector> &aux_rules, const vector &separators) : PreparedGrammar(rules, aux_rules), separators(separators) {} diff --git a/src/compiler/prepared_grammar.h b/src/compiler/prepared_grammar.h index cf681f35..f448eec6 100644 --- a/src/compiler/prepared_grammar.h +++ b/src/compiler/prepared_grammar.h @@ -14,11 +14,11 @@ class PreparedGrammar { public: PreparedGrammar(); PreparedGrammar( - const std::vector > &rules, - const std::vector > &aux_rules); + const std::vector> &rules, + const std::vector> &aux_rules); - const std::vector > rules; - const std::vector > aux_rules; + const std::vector> rules; + const std::vector> aux_rules; const std::string &rule_name(const rules::Symbol &symbol) const; const rules::rule_ptr &rule(const rules::Symbol &symbol) const; @@ -28,11 +28,11 @@ class SyntaxGrammar : public PreparedGrammar { public: SyntaxGrammar(); SyntaxGrammar( - const std::vector > &rules, - const std::vector > &aux_rules); + const std::vector> &rules, + const std::vector> &aux_rules); SyntaxGrammar( - const std::vector > &rules, - const std::vector > &aux_rules, + const std::vector> &rules, + const std::vector> &aux_rules, const std::set &ubiquitous_tokens); std::set ubiquitous_tokens; @@ -42,11 +42,11 @@ class LexicalGrammar : public PreparedGrammar { public: LexicalGrammar(); LexicalGrammar( - const std::vector > &rules, - const std::vector > &aux_rules); + const std::vector> &rules, + const std::vector> &aux_rules); LexicalGrammar( - const std::vector > &rules, - const std::vector > &aux_rules, + const std::vector> &rules, + const std::vector> &aux_rules, const std::vector &separators); std::vector separators; diff --git a/src/compiler/rules/visitor.h b/src/compiler/rules/visitor.h index 917be1e4..66dfd4b2 100644 --- a/src/compiler/rules/visitor.h +++ b/src/compiler/rules/visitor.h @@ -43,6 +43,7 @@ class RuleFn : private Visitor { protected: virtual T default_apply(const Rule *rule) { return T(); } + virtual T apply_to(const Blank *rule) { return default_apply((const Rule *)rule); }