Fix lint errors

script/lint.sh

@@ -8,7 +8,7 @@ if [[ ! -f $CPPLINT ]]; then
   chmod +x $CPPLINT
 fi
 
-FILTERS='--filter=-legal/copyright,-readability/todo'
+FILTERS='--filter=-legal/copyright,-readability/todo,-build/c++11'
 
 $CPPLINT --linelength=90 --root=include $FILTERS include/tree_sitter/compiler.h 2>&1
 $CPPLINT --linelength=90 --root=src $FILTERS $(find src/compiler -type f) 2>&1

src/compiler/build_tables/build_lex_table.cc

@@ -1,3 +1,4 @@
+#include "compiler/build_tables/build_lex_table.h"
 #include <map>
 #include <set>
 #include <string>

src/compiler/build_tables/build_parse_table.cc

@@ -1,3 +1,4 @@
+#include "compiler/build_tables/build_parse_table.h"
 #include <algorithm>
 #include <map>
 #include <set>
@@ -258,10 +259,11 @@ class ParseTableBuilder {
         return "END_OF_INPUT";
       else
         return "";
-    } else if (symbol.is_token)
+    } else if (symbol.is_token) {
       return lexical_grammar.rules[symbol.index].name;
-    else
+    } else {
       return grammar.rules[symbol.index].name;
+    }
   }
 
   string action_description(const ParseAction &action) const {

src/compiler/build_tables/build_tables.cc

@@ -1,3 +1,5 @@
+#include "compiler/build_tables/build_tables.h"
+#include <tuple>
 #include "compiler/build_tables/build_lex_table.h"
 #include "compiler/build_tables/build_parse_table.h"
 #include "compiler/prepared_grammar.h"

src/compiler/build_tables/build_tables.h

@@ -2,7 +2,7 @@
 #define COMPILER_BUILD_TABLES_BUILD_TABLES_H_
 
 #include <string>
-#include <utility>
+#include <tuple>
 #include <vector>
 #include "tree_sitter/compiler.h"
 #include "compiler/parse_table.h"

src/compiler/build_tables/lex_conflict_manager.cc

@@ -1,7 +1,7 @@
 #include "compiler/build_tables/lex_conflict_manager.h"
+#include <utility>
 #include "compiler/parse_table.h"
 #include "compiler/rules/built_in_symbols.h"
-#include <utility>
 
 namespace tree_sitter {
 namespace build_tables {

src/compiler/build_tables/lex_conflict_manager.h

@@ -14,7 +14,7 @@ class LexConflictManager {
   const LexicalGrammar grammar;
 
  public:
-  LexConflictManager(const LexicalGrammar &);
+  explicit LexConflictManager(const LexicalGrammar &);
   bool resolve(const LexAction &, const LexAction &) const;
 };
 

src/compiler/build_tables/parse_conflict_manager.cc

@@ -1,7 +1,7 @@
 #include "compiler/build_tables/parse_conflict_manager.h"
+#include <utility>
 #include "compiler/parse_table.h"
 #include "compiler/rules/built_in_symbols.h"
-#include <utility>
 
 namespace tree_sitter {
 namespace build_tables {
@@ -32,13 +32,14 @@ pair<bool, ConflictType> ParseConflictManager::resolve(
         int max_precedence = *old_action.precedence_values.rbegin();
         int new_precedence = *new_action.precedence_values.rbegin();
         if (new_precedence < min_precedence ||
-            (new_precedence == min_precedence && min_precedence < max_precedence))
+            (new_precedence == min_precedence &&
+             min_precedence < max_precedence)) {
           return { false, ConflictTypeResolved };
-        else if (new_precedence > max_precedence ||
-                 (new_precedence == max_precedence &&
-                  min_precedence < max_precedence))
+        } else if (new_precedence > max_precedence ||
+                   (new_precedence == max_precedence &&
+                    min_precedence < max_precedence)) {
           return { true, ConflictTypeResolved };
-        else if (min_precedence == max_precedence) {
+        } else if (min_precedence == max_precedence) {
           switch (new_action.associativity) {
             case AssociativityLeft:
               return { true, ConflictTypeResolved };

src/compiler/build_tables/parse_conflict_manager.h

@@ -25,7 +25,7 @@ class ParseConflictManager {
   const SyntaxGrammar syntax_grammar;
 
  public:
-  ParseConflictManager(const SyntaxGrammar &);
+  explicit ParseConflictManager(const SyntaxGrammar &);
   std::pair<bool, ConflictType> resolve(const ParseAction &, const ParseAction &,
                                         const rules::Symbol &) const;
 };

src/compiler/build_tables/parse_item.cc

@@ -1,4 +1,5 @@
 #include "compiler/build_tables/parse_item.h"
+#include <string>
 #include "tree_sitter/compiler.h"
 
 namespace tree_sitter {

src/compiler/prepare_grammar/expand_repeats.cc

@@ -56,7 +56,7 @@ class ExpandRepeats : public rules::IdentityRuleFn {
   }
 
  public:
-  ExpandRepeats(size_t offset) : offset(offset) {}
+  explicit ExpandRepeats(size_t offset) : offset(offset) {}
 
   rule_ptr expand(const rule_ptr &rule, const string &name) {
     rule_name = name;

src/compiler/prepare_grammar/expand_tokens.cc

@@ -31,8 +31,8 @@ class ExpandTokens : public rules::IdentityRuleFn {
 
   rule_ptr apply_to(const String *rule) {
     vector<rule_ptr> elements;
-    uint8_t *iter = (uint8_t *)rule->value.data();
-    uint8_t *end = iter + rule->value.size();
+    const uint8_t *iter = reinterpret_cast<const uint8_t *>(rule->value.data());
+    const uint8_t *end = iter + rule->value.size();
 
     while (iter < end) {
       int32_t el;

src/compiler/prepare_grammar/extract_tokens.cc

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

src/compiler/prepare_grammar/extract_tokens.h

@@ -1,7 +1,7 @@
 #ifndef COMPILER_PREPARE_GRAMMAR_EXTRACT_TOKENS_H_
 #define COMPILER_PREPARE_GRAMMAR_EXTRACT_TOKENS_H_
 
-#include <utility>
+#include <tuple>
 #include "tree_sitter/compiler.h"
 #include "compiler/prepare_grammar/interned_grammar.h"
 

src/compiler/prepare_grammar/is_token.cc

@@ -1,6 +1,6 @@
+#include "compiler/prepare_grammar/is_token.h"
 #include "tree_sitter/compiler.h"
 #include "compiler/rules/visitor.h"
-#include "compiler/rules/symbol.h"
 #include "compiler/rules/string.h"
 #include "compiler/rules/metadata.h"
 #include "compiler/rules/pattern.h"
@@ -12,9 +12,11 @@ class IsToken : public rules::RuleFn<bool> {
   bool apply_to(const rules::String *rule) {
     return true;
   }
+
   bool apply_to(const rules::Pattern *rule) {
     return true;
   }
+
   bool apply_to(const rules::Metadata *rule) {
     return rule->value_for(rules::IS_TOKEN);
   }

src/compiler/prepare_grammar/prepare_grammar.cc

@@ -1,8 +1,9 @@
+#include "compiler/prepare_grammar/prepare_grammar.h"
+#include <tuple>
 #include "compiler/prepare_grammar/expand_repeats.h"
 #include "compiler/prepare_grammar/expand_tokens.h"
 #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"
 
 namespace tree_sitter {
@@ -14,7 +15,6 @@ using std::make_tuple;
 
 tuple<SyntaxGrammar, LexicalGrammar, const GrammarError *> prepare_grammar(
   const Grammar &input_grammar) {
-
   // Convert all string-based `NamedSymbols` into numerical `Symbols`
   auto intern_result = intern_symbols(input_grammar);
   const GrammarError *error = intern_result.second;

src/compiler/prepare_grammar/prepare_grammar.h

@@ -1,7 +1,7 @@
 #ifndef COMPILER_PREPARE_GRAMMAR_PREPARE_GRAMMAR_H_
 #define COMPILER_PREPARE_GRAMMAR_PREPARE_GRAMMAR_H_
 
-#include <utility>
+#include <tuple>
 #include "compiler/prepared_grammar.h"
 
 namespace tree_sitter {

src/compiler/rule.h

@@ -1,5 +1,5 @@
-#ifndef COMPILER_RULES_RULE_H_
-#define COMPILER_RULES_RULE_H_
+#ifndef COMPILER_RULE_H_
+#define COMPILER_RULE_H_
 
 #include <string>
 #include <memory>
@@ -31,10 +31,10 @@ namespace std {
 template <>
 struct hash<tree_sitter::rule_ptr> {
   size_t operator()(const tree_sitter::rule_ptr &rule) const {
-    return typeid(*rule).hash_code() ^ rule->hash_code();
+    return rule->hash_code();
   }
 };
 
 }  // namespace std
 
-#endif  // COMPILER_RULES_RULE_H_
+#endif  // COMPILER_RULE_H_

src/compiler/rules/character_range.cc

@@ -1,7 +1,7 @@
 #include "compiler/rules/character_range.h"
-#include "compiler/util/string_helpers.h"
 #include <algorithm>
 #include <string>
+#include "compiler/util/string_helpers.h"
 
 namespace tree_sitter {
 namespace rules {

src/runtime/parser.c

@@ -1,12 +1,11 @@
+#include "runtime/parser.h"
 #include <stdio.h>
 #include <stdbool.h>
 #include "tree_sitter/runtime.h"
 #include "tree_sitter/parser.h"
 #include "runtime/tree.h"
 #include "runtime/lexer.h"
-#include "runtime/parser.h"
 #include "runtime/length.h"
-#include "runtime/debugger.h"
 
 /*
  *  Debugging