Merge branch 'restructure-tagging' into fix-tagged-transitions

Author: SharafMohamed

CMakeLists.txt

@@ -68,6 +68,20 @@ set(SOURCE_FILES
     src/log_surgeon/Constants.hpp
     src/log_surgeon/FileReader.cpp
     src/log_surgeon/FileReader.hpp
+    src/log_surgeon/finite_automata/Capture.hpp
+    src/log_surgeon/finite_automata/Dfa.hpp
+    src/log_surgeon/finite_automata/DfaState.hpp
+    src/log_surgeon/finite_automata/DfaStatePair.hpp
+    src/log_surgeon/finite_automata/Nfa.hpp
+    src/log_surgeon/finite_automata/NfaState.hpp
+    src/log_surgeon/finite_automata/PrefixTree.cpp
+    src/log_surgeon/finite_automata/PrefixTree.hpp
+    src/log_surgeon/finite_automata/RegexAST.hpp
+    src/log_surgeon/finite_automata/RegisterHandler.hpp
+    src/log_surgeon/finite_automata/SpontaneousTransition.hpp
+    src/log_surgeon/finite_automata/StateType.hpp
+    src/log_surgeon/finite_automata/UnicodeIntervalTree.hpp
+    src/log_surgeon/finite_automata/UnicodeIntervalTree.tpp
     src/log_surgeon/Lalr1Parser.cpp
     src/log_surgeon/Lalr1Parser.hpp
     src/log_surgeon/Lalr1Parser.tpp
@@ -93,20 +107,7 @@ set(SOURCE_FILES
     src/log_surgeon/SchemaParser.hpp
     src/log_surgeon/Token.cpp
     src/log_surgeon/Token.hpp
-    src/log_surgeon/finite_automata/Capture.hpp
-    src/log_surgeon/finite_automata/Dfa.hpp
-    src/log_surgeon/finite_automata/DfaState.hpp
-    src/log_surgeon/finite_automata/DfaStatePair.hpp
-    src/log_surgeon/finite_automata/Nfa.hpp
-    src/log_surgeon/finite_automata/NfaState.hpp
-    src/log_surgeon/finite_automata/PrefixTree.cpp
-    src/log_surgeon/finite_automata/PrefixTree.hpp
-    src/log_surgeon/finite_automata/RegexAST.hpp
-    src/log_surgeon/finite_automata/RegisterHandler.hpp
-    src/log_surgeon/finite_automata/SpontaneousTransition.hpp
-    src/log_surgeon/finite_automata/StateType.hpp
-    src/log_surgeon/finite_automata/UnicodeIntervalTree.hpp
-    src/log_surgeon/finite_automata/UnicodeIntervalTree.tpp
+    src/log_surgeon/UniqueIdGenerator.hpp
     )
 
 set(LCHIP_INSTALL_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/log_surgeon)

src/log_surgeon/UniqueIdGenerator.hpp

@@ -0,0 +1,16 @@
+#ifndef LOG_SURGEON_UNIQUEIDGENERATOR_HPP
+#define LOG_SURGEON_UNIQUEIDGENERATOR_HPP
+
+namespace log_surgeon {
+class UniqueIdGenerator {
+public:
+    UniqueIdGenerator() : current_id{0} {}
+
+    [[nodiscard]] auto generate_id() -> uint32_t { return current_id++; }
+
+private:
+    uint32_t current_id;
+};
+}  // namespace log_surgeon
+
+#endif  // LOG_SURGEON_UNIQUEIDGENERATOR_HPP

src/log_surgeon/finite_automata/Nfa.hpp

@@ -15,18 +15,9 @@
 #include <log_surgeon/Constants.hpp>
 #include <log_surgeon/finite_automata/NfaState.hpp>
 #include <log_surgeon/LexicalRule.hpp>
+#include <log_surgeon/UniqueIdGenerator.hpp>
 
 namespace log_surgeon::finite_automata {
-class UniqueIdGenerator {
-public:
-    UniqueIdGenerator() : current_id{0} {}
-
-    [[nodiscard]] auto generate_id() -> uint32_t { return current_id++; }
-
-private:
-    uint32_t current_id;
-};
-
 /**
  * Represents a NFA(non-deterministic finite automata) for recognizing a language based on the set
  * of rules used during initialization. Currently use as an intermediate model for generating the

tests/CMakeLists.txt

@@ -22,6 +22,7 @@ set(
         ../src/log_surgeon/SchemaParser.hpp
         ../src/log_surgeon/Token.cpp
         ../src/log_surgeon/Token.hpp
+        ../src/log_surgeon/UniqueIdGenerator.hpp
 )
 
 set(