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

Loosen criteria for identifying conflict-free tokens for error recovery

Browse source
This commit is contained in:
Max Brunsfeld 2019-01-20 16:58:31 -08:00
parent 9e610bf88e
commit f6cdd5e3d4
2 changed files with 74 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cli/src/generate/build_tables/mod.rs
View file

@ -86,14 +86,14 @@ fn populate_error_state(
let n = lexical_grammar.variables.len();
// First identify the *conflict-free tokens*: tokens that do not overlap with
// any other token in any way.
// any other token in any way, besides matching exactly the same string.
let conflict_free_tokens: TokenSet = (0..n)
.into_iter()
.filter_map(|i| {
let conflicts_with_other_tokens = (0..n).into_iter().any(|j| {
j != i
&& !coincident_token_index.contains(Symbol::terminal(i), Symbol::terminal(j))
&& token_conflict_map.does_conflict(i, j)
&& token_conflict_map.does_match_shorter_or_longer(i, j)
});
if conflicts_with_other_tokens {
None