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

Treat reduce actions with different production IDs as distinct

Browse source
This commit is contained in:
Max Brunsfeld 2015-12-09 14:23:19 -08:00
parent 2c2c567a29
commit 75f31a79a3
18 changed files with 40492 additions and 31041 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/compiler/parse_table.cc
View file

@ -69,14 +69,13 @@ ParseAction ParseAction::Reduce(Symbol symbol, size_t consumed_symbol_count,
}
bool ParseAction::operator==(const ParseAction &other) const {
bool types_eq = type == other.type;
bool symbols_eq = symbol == other.symbol;
bool state_indices_eq = state_index == other.state_index;
bool consumed_symbol_counts_eq =
consumed_symbol_count == other.consumed_symbol_count;
bool precedences_eq = precedence_range == other.precedence_range;
return types_eq && symbols_eq && state_indices_eq &&
consumed_symbol_counts_eq && precedences_eq;
return (
type == other.type &&
symbol == other.symbol &&
state_index == other.state_index &&
production == other.production &&
consumed_symbol_count == other.consumed_symbol_count
);
}
bool ParseAction::operator<(const ParseAction &other) const {
@ -92,6 +91,10 @@ bool ParseAction::operator<(const ParseAction &other) const {
return true;
if (other.state_index < state_index)
return false;
if (production < other.production)
return true;
if (other.production < production)
return false;
return consumed_symbol_count < other.consumed_symbol_count;
}