Merge branch 'refactor-nfa-to-dfa' into fixed-tagged-dfa

y-scope · Jan 7, 2025 · 49474bb · 49474bb
2 parents 5d7e53b + 6515cbc
commit 49474bb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -99,11 +99,10 @@ set(SOURCE_FILES
     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/DfaStateType.hpp
     src/log_surgeon/finite_automata/Nfa.hpp
     src/log_surgeon/finite_automata/NfaState.hpp
-    src/log_surgeon/finite_automata/NfaStateType.hpp
     src/log_surgeon/finite_automata/RegisterHandler.hpp
+    src/log_surgeon/finite_automata/StateType.hpp
     src/log_surgeon/finite_automata/Tag.hpp
     src/log_surgeon/finite_automata/TaggedTransition.hpp
     src/log_surgeon/finite_automata/UnicodeIntervalTree.hpp

diff --git a/src/log_surgeon/finite_automata/DfaState.hpp b/src/log_surgeon/finite_automata/DfaState.hpp
@@ -8,16 +8,16 @@
 #include <type_traits>
 #include <vector>
 
-#include <log_surgeon/finite_automata/StateType.hpp>
 #include <log_surgeon/Constants.hpp>
+#include <log_surgeon/finite_automata/StateType.hpp>
 #include <log_surgeon/finite_automata/UnicodeIntervalTree.hpp>
 
 namespace log_surgeon::finite_automata {
 template <StateType state_type>
 class DfaState;
 
-using DfaByteState = DfaState<StateType::Byte>;
-using DfaUtf8State = DfaState<StateType::Utf8>;
+using ByteDfaState = DfaState<StateType::Byte>;
+using Utf8DfaState = DfaState<StateType::Utf8>;
 
 template <StateType state_type>
 class DfaState {

diff --git a/src/log_surgeon/finite_automata/DfaStateType.hpp b/src/log_surgeon/finite_automata/DfaStateType.hpp
diff --git a/src/log_surgeon/finite_automata/NfaState.hpp b/src/log_surgeon/finite_automata/NfaState.hpp
@@ -123,7 +123,7 @@ class NfaState {
     std::vector<NfaState*> m_epsilon_transitions;
     std::array<std::vector<NfaState*>, cSizeOfByte> m_bytes_transitions;
     // NOTE: We don't need m_tree_transitions for the `stateType ==
-    // NfaStateType::Byte` case, so we use an empty class (`std::tuple<>`)
+    // StateType::Byte` case, so we use an empty class (`std::tuple<>`)
     // in that case.
     std::conditional_t<state_type == StateType::Utf8, Tree, std::tuple<>> m_tree_transitions;
 };
@@ -146,7 +146,7 @@ class RegOpNfaStatePair {
 
     [[nodiscard]] auto is_start() const -> bool { return m_register_operation.is_start(); }
 
-    [[nodiscard]] auto get_state() const -> NfaStateTypeTypedDfaState* { return m_nfa_state; }
+    [[nodiscard]] auto get_state() const -> TypedDfaState* { return m_nfa_state; }
 
     bool operator<(RegOpNfaStatePair const& other) const { return m_nfa_state < other.m_nfa_state; }
 

diff --git a/src/log_surgeon/finite_automata/StateType.hpp b/src/log_surgeon/finite_automata/StateType.hpp
@@ -4,7 +4,7 @@
 #include <cstdint>
 
 namespace log_surgeon::finite_automata {
-enum class StateType  : uint8_t {
+enum class StateType : uint8_t {
     Byte,
     Utf8
 };

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -7,8 +7,8 @@ set(
         ../src/log_surgeon/finite_automata/RegexAST.hpp
         ../src/log_surgeon/finite_automata/Nfa.hpp
         ../src/log_surgeon/finite_automata/NfaState.hpp
-        ../src/log_surgeon/finite_automata/NfaStateType.hpp
         ../src/log_surgeon/finite_automata/RegisterHandler.hpp
+        ../src/log_surgeon/finite_automata/StateType.hpp
         ../src/log_surgeon/finite_automata/Tag.hpp
         ../src/log_surgeon/finite_automata/TaggedTransition.hpp
         ../src/log_surgeon/Lalr1Parser.cpp
@@ -24,7 +24,7 @@ set(
         ../src/log_surgeon/Token.hpp
 )
 
-set(SOURCES_TESTS test-lexer.cpp test-NFA.cpp test-prefix-tree.cpp test-register-handler.cpp test-tag.cpp)
+set(SOURCES_TESTS test-lexer.cpp test-nfa.cpp test-prefix-tree.cpp test-register-handler.cpp test-tag.cpp)
 
 add_executable(unit-test ${SOURCES_LOG_SURGEON} ${SOURCES_TESTS})
 target_link_libraries(unit-test PRIVATE Catch2::Catch2WithMain log_surgeon::log_surgeon)

diff --git a/tests/test-NFA.cpp → tests/test-nfa.cpp b/tests/test-NFA.cpp → tests/test-nfa.cpp
@@ -21,7 +21,7 @@ using std::stringstream;
 using std::vector;
 
 using ByteLexicalRule = log_surgeon::LexicalRule<ByteNfaState>;
-using ByteNFA = log_surgeon::finite_automata::Nfa<ByteNfaState>;
+using ByteNfa = log_surgeon::finite_automata::Nfa<ByteNfaState>;
 using RegexASTCatByte = log_surgeon::finite_automata::RegexASTCat<ByteNfaState>;
 using RegexASTCaptureByte = log_surgeon::finite_automata::RegexASTCapture<ByteNfaState>;
 using RegexASTGroupByte = log_surgeon::finite_automata::RegexASTGroup<ByteNfaState>;
@@ -44,7 +44,7 @@ TEST_CASE("Test NFA", "[NFA]") {
     auto& capture_rule_ast = dynamic_cast<SchemaVarAST&>(*schema_ast->m_schema_vars[0]);
     vector<ByteLexicalRule> rules;
     rules.emplace_back(0, std::move(capture_rule_ast.m_regex_ptr));
-    ByteNFA const nfa{std::move(rules)};
+    ByteNfa const nfa{std::move(rules)};
 
     // Compare against expected output
     string expected_serialized_nfa = "0:byte_transitions={A-->1,Z-->2},"