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

Make ordering of cases deterministic in generated parsers

Browse source
This commit is contained in:
Max Brunsfeld 2014-02-10 18:38:01 -08:00
parent 8baa1396fd
commit 15c9e2d398
12 changed files with 369 additions and 348 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/compiler/parse_table.cpp
View file

@ -3,7 +3,7 @@
using std::string;
using std::ostream;
using std::to_string;
using std::unordered_set;
using std::set;
using std::vector;
using tree_sitter::rules::Symbol;
@ -38,6 +38,14 @@ namespace tree_sitter {
return types_eq && state_indices_eq && child_flags_eq;
}
bool ParseAction::operator<(const ParseAction &other) const {
if (type < other.type) return true;
if (type > other.type) return false;
if (state_index < other.state_index) return true;
if (state_index > other.state_index) return false;
return (child_flags < other.child_flags);
}
ostream& operator<<(ostream &stream, const ParseAction &action) {
switch (action.type) {
case ParseActionTypeError:
@ -54,8 +62,8 @@ namespace tree_sitter {
// State
ParseState::ParseState() : lex_state_index(-1) {}
unordered_set<rules::Symbol> ParseState::expected_inputs() const {
unordered_set<rules::Symbol> result;
set<rules::Symbol> ParseState::expected_inputs() const {
set<rules::Symbol> result;
for (auto pair : actions)
result.insert(pair.first);
return result;