traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix lint errors

Browse source
This commit is contained in:
Max Brunsfeld 2014-07-02 09:01:38 -07:00
parent 6424eea62a
commit 18ae326459
4 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/compiler/build_tables/build_parse_table.cc
View file

@ -13,8 +13,6 @@
#include "compiler/build_tables/item_set_transitions.h"
#include "compiler/build_tables/first_set.h"
#include <iostream>
namespace tree_sitter {
using std::pair;
using std::string;
@ -99,8 +97,7 @@ namespace tree_sitter {
auto current_action = current_actions.find(symbol);
return (
current_action == current_actions.end() ||
conflict_manager.resolve_parse_action(symbol, current_action->second, action)
);
conflict_manager.resolve_parse_action(symbol, current_action->second, action));
}
set<int> precedence_values_for_item_set(const ParseItemSet &item_set) {

1
src/compiler/build_tables/merge_transitions.h
View file

@ -2,6 +2,7 @@
#define COMPILER_BUILD_TABLES_MERGE_TRANSITIONS_H_
#include <map>
#include <utility>
#include "compiler/rules/character_set.h"
#include "compiler/rules/symbol.h"

4
src/compiler/generate_code/c_code.cc
View file

@ -293,7 +293,7 @@ namespace tree_sitter {
case ParseActionTypeReduceExtra:
add("REDUCE_EXTRA(" + symbol_id(action.symbol) + ")");
break;
default:;
default: {}
}
}
@ -309,7 +309,7 @@ namespace tree_sitter {
case LexActionTypeError:
line("LEX_ERROR();");
break;
default:;
default: {}
}
}

5
src/compiler/prepare_grammar/prepare_grammar.cc
View file

@ -1,10 +1,9 @@
#include "compiler/prepare_grammar/prepare_grammar.h"
#include "compiler/prepared_grammar.h"
#include "compiler/prepare_grammar/extract_tokens.h"
#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/interned_grammar.h"
#include "compiler/prepare_grammar/prepare_grammar.h"
#include "compiler/prepared_grammar.h"
namespace tree_sitter {