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

Fix token conflict detection bugs

Browse source
This commit is contained in:
Max Brunsfeld 2019-01-16 20:56:36 -08:00
parent ae07d2d6e4
commit e4b9d9dfa9
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cli/src/generate/build_tables/minimize_parse_table.rs
View file

@ -228,8 +228,9 @@ impl<'a> Minimizer<'a> {
// Do not add a token if it conflicts with an existing token.
if token.is_terminal() {
for existing_token in state.terminal_entries.keys() {
if (is_word_token && self.keywords.contains(existing_token))
|| is_keyword && self.syntax_grammar.word_token.as_ref() == Some(existing_token)
if (is_word_token || is_keyword)
&& (self.keywords.contains(existing_token)
|| self.syntax_grammar.word_token.as_ref() == Some(existing_token))
{
continue;
}