From 9b8bf8dfe2ede69cd65cf172151f6c0d5cc85b0c Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 6 Feb 2019 16:18:49 -0800
Subject: [PATCH] cli: Compute fragile tokens *after* merging compatibile parse
 states

Previously, we failed to mark as fragile some tokens that *should* be
fragile because of tokens that were introduced during parse state
merging.
---
 cli/src/generate/build_tables/mod.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cli/src/generate/build_tables/mod.rs b/cli/src/generate/build_tables/mod.rs
index df19f9e0..7f8b1a45 100644
--- a/cli/src/generate/build_tables/mod.rs
+++ b/cli/src/generate/build_tables/mod.rs
@@ -47,7 +47,6 @@ pub(crate) fn build_tables(
         &keywords,
     );
     populate_used_symbols(&mut parse_table, syntax_grammar, lexical_grammar);
-    mark_fragile_tokens(&mut parse_table, lexical_grammar, &token_conflict_map);
     if minimize {
         minimize_parse_table(
             &mut parse_table,
@@ -67,6 +66,7 @@ pub(crate) fn build_tables(
         &token_conflict_map,
         minimize,
     );
+    mark_fragile_tokens(&mut parse_table, lexical_grammar, &token_conflict_map);
     Ok((
         parse_table,
         main_lex_table,
@@ -324,9 +324,9 @@ fn mark_fragile_tokens(
         }
         for (token, entry) in state.terminal_entries.iter_mut() {
             if token.is_terminal() {
-                for i in 0..n {
-                    if token_conflict_map.does_overlap(i, token.index) {
-                        if valid_tokens_mask[i] {
+                for (i, is_valid) in valid_tokens_mask.iter().enumerate() {
+                    if *is_valid {
+                        if token_conflict_map.does_overlap(i, token.index) {
                             entry.reusable = false;
                             break;
                         }