ruleToStopState

antlr · Mar 12, 2021 · 3d6f006 · 3d6f006
1 parent 7857faf
commit 3d6f006
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/runtime/Dart/lib/src/atn/src/atn.dart b/runtime/Dart/lib/src/atn/src/atn.dart
@@ -27,7 +27,7 @@ class ATN {
   List<RuleStartState> ruleToStartState = <RuleStartState>[];
 
   /// Maps from rule index to stop state number.
-  late List<RuleStopState> ruleToStopState;
+  List<RuleStopState>? ruleToStopState;
 
   Map<String, TokensStartState> modeNameToStartState = {};
 

diff --git a/runtime/Dart/lib/src/atn/src/atn_deserializer.dart b/runtime/Dart/lib/src/atn/src/atn_deserializer.dart
@@ -296,7 +296,7 @@ class ATNDeserializer {
       if (state is! RuleStopState) {
         continue;
       }
-      atn.ruleToStopState[state.ruleIndex] = state;
+      atn.ruleToStopState![state.ruleIndex] = state;
       atn.ruleToStartState[state.ruleIndex].stopState = state;
     }
 
@@ -368,7 +368,7 @@ class ATNDeserializer {
 
           final returnTransition = EpsilonTransition(
               ruleTransition.followState, outermostPrecedenceReturn);
-          atn.ruleToStopState[ruleTransition.target.ruleIndex]
+          atn.ruleToStopState![ruleTransition.target.ruleIndex]
               .addTransition(returnTransition);
         }
       }
@@ -527,7 +527,7 @@ class ATNDeserializer {
       excludeTransition =
           (endState as StarLoopEntryState).loopBackState!.transition(0);
     } else {
-      endState = atn.ruleToStopState[idx];
+      endState = atn.ruleToStopState![idx];
     }
 
     // all non-excluded transitions that currently target end state need to target blockEnd instead

diff --git a/runtime/Dart/lib/src/atn/src/parser_atn_simulator.dart b/runtime/Dart/lib/src/atn/src/parser_atn_simulator.dart
@@ -945,7 +945,8 @@ class ParserATNSimulator extends ATNSimulator {
       if (lookToEndOfRule && config.state.onlyHasEpsilonTransitions()) {
         final nextTokens = atn.nextTokens(config.state);
         if (nextTokens.contains(Token.EPSILON)) {
-          ATNState endOfRuleState = atn.ruleToStopState[config.state.ruleIndex];
+          ATNState endOfRuleState =
+              atn.ruleToStopState![config.state.ruleIndex];
           result.add(ATNConfig.dup(config, state: endOfRuleState), mergeCache);
         }
       }

diff --git a/runtime/Dart/lib/src/parser_interpreter.dart b/runtime/Dart/lib/src/parser_interpreter.dart
@@ -154,7 +154,7 @@ class ParserInterpreter extends Parser {
           try {
             visitState(p);
           } on RecognitionException catch (e) {
-            state = atn.ruleToStopState[p.ruleIndex].stateNumber;
+            state = atn.ruleToStopState![p.ruleIndex].stateNumber;
             context!.exception = e;
             errorHandler.reportError(this, e);
             recover(e);
@@ -267,8 +267,8 @@ class ParserInterpreter extends Parser {
           context,
           (transition as PrecedencePredicateTransition).precedence,
         )) {
-          throw FailedPredicateException(this,
-              'precpred(context, ${(transition).precedence})');
+          throw FailedPredicateException(
+              this, 'precpred(context, ${(transition).precedence})');
         }
         break;