Use dictionary concepts in GrepCore.hpp

Author: gibber9809

components/core/src/clp/GrepCore.hpp

@@ -14,6 +14,7 @@
 #include <string_utils/string_utils.hpp>
 
 #include "Defs.h"
+#include "DictionaryConcepts.hpp"
 #include "EncodedVariableInterpreter.hpp"
 #include "ir/parsing.hpp"
 #include "ir/types.hpp"
@@ -42,7 +43,9 @@ class GrepCore {
      * @param use_heuristic
      * @return Query if it may match a message, std::nullopt otherwise
      */
-    template <typename LogTypeDictionaryReaderType, typename VariableDictionaryReaderType>
+    template <
+            LogTypeDictionaryReaderReq LogTypeDictionaryReaderType,
+            VariableDictionaryReaderReq VariableDictionaryReaderType>
     static std::optional<Query> process_raw_query(
             LogTypeDictionaryReaderType const& logtype_dict,
             VariableDictionaryReaderType const& var_dict,
@@ -107,7 +110,7 @@ class GrepCore {
      * @param logtype
      * @return true if this token might match a message, false otherwise
      */
-    template <typename VariableDictionaryReaderType>
+    template <VariableDictionaryReaderReq VariableDictionaryReaderType>
     static bool process_var_token(
             QueryToken const& query_token,
             VariableDictionaryReaderType const& var_dict,
@@ -132,9 +135,10 @@ class GrepCore {
      * @return SubQueryMatchabilityResult::MayMatch
      */
     template <
-            typename LogTypeDictionaryReaderType,
-            typename VariableDictionaryReaderType,
-            typename LogTypeDictionaryEntryType = typename LogTypeDictionaryReaderType::entry_t>
+            LogTypeDictionaryReaderReq LogTypeDictionaryReaderType,
+            VariableDictionaryReaderReq VariableDictionaryReaderType,
+            LogTypeDictionaryEntryReq LogTypeDictionaryEntryType
+            = typename LogTypeDictionaryReaderType::entry_t>
     static SubQueryMatchabilityResult generate_logtypes_and_vars_for_subquery(
             LogTypeDictionaryReaderType const& logtype_dict,
             VariableDictionaryReaderType const& var_dict,
@@ -145,7 +149,9 @@ class GrepCore {
     );
 };
 
-template <typename LogTypeDictionaryReaderType, typename VariableDictionaryReaderType>
+template <
+        LogTypeDictionaryReaderReq LogTypeDictionaryReaderType,
+        VariableDictionaryReaderReq VariableDictionaryReaderType>
 std::optional<Query> GrepCore::process_raw_query(
         LogTypeDictionaryReaderType const& logtype_dict,
         VariableDictionaryReaderType const& var_dict,
@@ -266,7 +272,7 @@ std::optional<Query> GrepCore::process_raw_query(
     };
 }
 
-template <typename VariableDictionaryReaderType>
+template <VariableDictionaryReaderReq VariableDictionaryReaderType>
 bool GrepCore::process_var_token(
         QueryToken const& query_token,
         VariableDictionaryReaderType const& var_dict,
@@ -328,9 +334,9 @@ bool GrepCore::process_var_token(
 }
 
 template <
-        typename LogTypeDictionaryReaderType,
-        typename VariableDictionaryReaderType,
-        typename LogTypeDictionaryEntryType>
+        LogTypeDictionaryReaderReq LogTypeDictionaryReaderType,
+        VariableDictionaryReaderReq VariableDictionaryReaderType,
+        LogTypeDictionaryEntryReq LogTypeDictionaryEntryType>
 GrepCore::SubQueryMatchabilityResult GrepCore::generate_logtypes_and_vars_for_subquery(
         LogTypeDictionaryReaderType const& logtype_dict,
         VariableDictionaryReaderType const& var_dict,