#132 Refactor duplication of all tokens set computation

Signed-off-by: vityaman <vityaman.dev@yandex.ru>
mike-lischke · Aug 7, 2024 · 5b276d5 · 5b276d5
1 parent 045f76f
commit 5b276d5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/ports/cpp/source/antlr4-c3/CodeCompletionCore.cpp b/ports/cpp/source/antlr4-c3/CodeCompletionCore.cpp
@@ -413,25 +413,22 @@ bool CodeCompletionCore::collectFollowSets(  // NOLINT
           collectFollowSets(transition->target, stopState, followSets, stateStack, ruleStack);
       isExhaustive = isExhaustive && nextStateFollowSetsIsExhaustive;
     } else if (transition->getTransitionType() == antlr4::atn::TransitionType::WILDCARD) {
-      FollowSetWithPath set;
-      set.intervals = antlr4::misc::IntervalSet::of(
-          antlr4::Token::MIN_USER_TOKEN_TYPE, static_cast<ptrdiff_t>(atn->maxTokenType)
-      );
-      set.path = ruleStack;
-      followSets.emplace_back(std::move(set));
+      followSets.push_back({
+          .intervals = allUserTokens(),
+          .path = ruleStack,
+          .following = {},
+      });
     } else {
       antlr4::misc::IntervalSet label = transition->label();
       if (!label.isEmpty()) {
         if (transition->getTransitionType() == antlr4::atn::TransitionType::NOT_SET) {
-          label = label.complement(antlr4::misc::IntervalSet::of(
-              antlr4::Token::MIN_USER_TOKEN_TYPE, static_cast<ptrdiff_t>(atn->maxTokenType)
-          ));
+          label = label.complement(allUserTokens());
         }
-        FollowSetWithPath set;
-        set.intervals = label;
-        set.path = ruleStack;
-        set.following = getFollowingTokens(transition);
-        followSets.emplace_back(std::move(set));
+        followSets.push_back({
+            .intervals = label,
+            .path = ruleStack,
+            .following = getFollowingTokens(transition),
+        });
       }
     }
   }
@@ -710,9 +707,7 @@ CodeCompletionCore::RuleEndStatus CodeCompletionCore::processRule(  // NOLINT
           antlr4::misc::IntervalSet set = transition->label();
           if (!set.isEmpty()) {
             if (transition->getTransitionType() == antlr4::atn::TransitionType::NOT_SET) {
-              set = set.complement(antlr4::misc::IntervalSet::of(
-                  antlr4::Token::MIN_USER_TOKEN_TYPE, static_cast<ptrdiff_t>(atn->maxTokenType)
-              ));
+              set = set.complement(allUserTokens());
             }
             if (atCaret) {
               if (!translateStackToRuleIndex(callStack)) {
@@ -768,6 +763,12 @@ CodeCompletionCore::RuleEndStatus CodeCompletionCore::processRule(  // NOLINT
   return result;
 }
 
+antlr4::misc::IntervalSet CodeCompletionCore::allUserTokens() const {
+  const auto min = antlr4::Token::MIN_USER_TOKEN_TYPE;
+  const auto max = static_cast<ptrdiff_t>(atn->maxTokenType);
+  return antlr4::misc::IntervalSet::of(min, max);
+}
+
 std::string CodeCompletionCore::generateBaseDescription(antlr4::atn::ATNState* state) {
   const std::string stateValue = (state->stateNumber == antlr4::atn::ATNState::INVALID_STATE_NUMBER)
                                      ? "Invalid"

diff --git a/ports/cpp/source/antlr4-c3/CodeCompletionCore.hpp b/ports/cpp/source/antlr4-c3/CodeCompletionCore.hpp
@@ -10,6 +10,7 @@
 #include <Parser.h>
 #include <ParserRuleContext.h>
 #include <Token.h>
+#include <Vocabulary.h>
 #include <atn/ATNState.h>
 #include <atn/PredicateTransition.h>
 #include <atn/RuleStartState.h>
@@ -20,6 +21,7 @@
 #include <chrono>
 #include <cstddef>
 #include <map>
+#include <optional>
 #include <string>
 #include <typeindex>
 #include <unordered_map>
@@ -244,6 +246,8 @@ class CodeCompletionCore {
       bool& timedOut
   );
 
+  antlr4::misc::IntervalSet allUserTokens() const;
+
   std::string generateBaseDescription(antlr4::atn::ATNState* state);
 
   void printDescription(