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

Fix non-deterministic order in conflict description

Browse source
This commit is contained in:
Max Brunsfeld 2015-03-07 10:47:37 -08:00
parent 2d436cf141
commit 3458fa6e50
4 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/compiler/parse_table.cc
View file

@ -64,6 +64,16 @@ bool ParseAction::operator==(const ParseAction &other) const {
return types_eq && symbols_eq && state_indices_eq && consumed_symbol_counts_eq;
}
bool ParseAction::operator<(const ParseAction &other) const {
if (type < other.type) return true;
if (other.type < type) return false;
if (symbol < other.symbol) return true;
if (other.symbol < symbol) return false;
if (state_index < other.state_index) return true;
if (other.state_index < state_index) return false;
return consumed_symbol_count < other.consumed_symbol_count;
}
ostream &operator<<(ostream &stream, const ParseAction &action) {
switch (action.type) {
case ParseActionTypeError: