rdfa: move raw_dfa member functions to rdfa.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc05f0f34d83ba2ca6468a8a71752687a979fcc1..c51d613371ff443761d01897a2c09bc269502d55 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -735,6 +735,7 @@ SET (hs_SRCS
     src/nfa/nfa_build_util.h
     src/nfa/nfa_internal.h
     src/nfa/nfa_kind.h
+    src/nfa/rdfa.cpp
     src/nfa/rdfa.h
     src/nfa/rdfa_graph.cpp
     src/nfa/rdfa_graph.h

diff --git a/src/nfa/dfa_build_strat.cpp b/src/nfa/dfa_build_strat.cpp
index d4d418aa7e0a007da012936bd3c4fdd67aaef536..b6b7a7fb9f413e06c118a14e6e0905a0e91ee55f 100644 (file)
--- a/src/nfa/dfa_build_strat.cpp
+++ b/src/nfa/dfa_build_strat.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016, Intel Corporation
+ * Copyright (c) 2015-2017, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -30,11 +30,9 @@
 
 namespace ue2 {
 
-// prevent weak vtables for raw_report_info, dfa_build_strat and raw_dfa
+// prevent weak vtables for raw_report_info, dfa_build_strat
 raw_report_info::~raw_report_info() {}
 
 dfa_build_strat::~dfa_build_strat() {}
 
-raw_dfa::~raw_dfa() {}
-
 } // namespace ue2

diff --git a/src/nfa/mcclellancompile.cpp b/src/nfa/mcclellancompile.cpp
index 43b555afc74661529486863307fbf2ca7e9c7dd9..9374677703b6eaf20156833b01b7256f7f38b79d 100644 (file)
--- a/src/nfa/mcclellancompile.cpp
+++ b/src/nfa/mcclellancompile.cpp
@@ -914,33 +914,6 @@ void find_better_daddy(dfa_info &info, dstate_id_t curr_id, bool using8bit,
     info.extra[curr_id].shermanState = true;
 }
 
-/*
- * Calls accessible outside this module.
- */
-
-u16 raw_dfa::getImplAlphaSize() const {
-    return alpha_size - N_SPECIAL_SYMBOL;
-}
-
-void raw_dfa::stripExtraEodReports(void) {
-    /* if a state generates a given report as a normal accept - then it does
-     * not also need to generate an eod report for it */
-    for (dstate &ds : states) {
-        for (const ReportID &report : ds.reports) {
-            ds.reports_eod.erase(report);
-        }
-    }
-}
-
-bool raw_dfa::hasEodReports(void) const {
-    for (const dstate &ds : states) {
-        if (!ds.reports_eod.empty()) {
-            return true;
-        }
-    }
-    return false;
-}
-
 static
 bool is_cyclic_near(const raw_dfa &raw, dstate_id_t root) {
     symbol_t alphasize = raw.getImplAlphaSize();

diff --git a/src/nfa/rdfa.cpp b/src/nfa/rdfa.cpp
new file mode 100644 (file)
index 0000000..077ff9e
--- /dev/null
+++ b/src/nfa/rdfa.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2017, Intel Corporation
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *  * Neither the name of Intel Corporation nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "rdfa.h"
+
+namespace ue2 {
+
+// prevent weak vtables
+raw_dfa::~raw_dfa() {}
+
+u16 raw_dfa::getImplAlphaSize() const {
+    return alpha_size - N_SPECIAL_SYMBOL;
+}
+
+void raw_dfa::stripExtraEodReports(void) {
+    /* if a state generates a given report as a normal accept - then it does
+     * not also need to generate an eod report for it */
+    for (dstate &ds : states) {
+        for (const ReportID &report : ds.reports) {
+            ds.reports_eod.erase(report);
+        }
+    }
+}
+
+bool raw_dfa::hasEodReports(void) const {
+    for (const dstate &ds : states) {
+        if (!ds.reports_eod.empty()) {
+            return true;
+        }
+    }
+    return false;
+}
+
+} // namespace ue2