mike-lischke#136 Fix CppParser::SimpleExample test

vityaman · Jul 31, 2024 · 0f5a5f0 · 0f5a5f0
1 parent ff80c5c
commit 0f5a5f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/ports/cpp/source/antlr4-c3/CodeCompletionCore.cpp b/ports/cpp/source/antlr4-c3/CodeCompletionCore.cpp
@@ -491,18 +491,12 @@ CodeCompletionCore::RuleEndStatus CodeCompletionCore::processRule(  // NOLINT
   // Start with rule specific handling before going into the ATN walk.
 
   // Check first if we've taken this path with the same input before.
-  std::map<size_t, RuleEndStatus> positionMap;
-  if (!shortcutMap.contains(startState->ruleIndex)) {
-    shortcutMap[startState->ruleIndex] = positionMap;
-  } else {
-    positionMap = shortcutMap[startState->ruleIndex];
-    if (positionMap.contains(tokenListIndex)) {
-      if (showDebugOutput) {
-        std::cout << "=====> shortcut" << "\n";
-      }
-
-      return positionMap[tokenListIndex];
+  std::map<size_t, RuleEndStatus>& positionMap = shortcutMap[startState->ruleIndex];
+  if (positionMap.contains(tokenListIndex)) {
+    if (showDebugOutput) {
+      std::cout << "=====> shortcut" << "\n";
     }
+    return positionMap[tokenListIndex];
   }
 
   RuleEndStatus result;
@@ -521,7 +515,7 @@ CodeCompletionCore::RuleEndStatus CodeCompletionCore::processRule(  // NOLINT
     antlr4::atn::RuleStopState* stop = atn.ruleToStopState[startState->ruleIndex];
     setsPerState[startState->stateNumber] = determineFollowSets(startState, stop);
   }
-  
+
   const FollowSetsHolder& followSets = setsPerState[startState->stateNumber];
 
   // Get the token index where our rule starts from our (possibly filtered)

diff --git a/ports/cpp/test/cpp14/Cpp14Test.cpp b/ports/cpp/test/cpp14/Cpp14Test.cpp
@@ -161,8 +161,7 @@ TEST(CPP14Parser, SimpleExample) {  // NOLINT: complexity
         CPP14Parser::RuleTranslationunit,
         CPP14Parser::RuleDeclarationseq,
         CPP14Parser::RuleDeclaration,
-        CPP14Parser::RuleBlockdeclaration,   // TS: +- `RuleFunctiondefinition`
-        CPP14Parser::RuleSimpledeclaration,  // TS: --
+        CPP14Parser::RuleFunctiondefinition,
         CPP14Parser::RuleDeclspecifierseq,
         CPP14Parser::RuleDeclspecifier,
         CPP14Parser::RuleTypespecifier,