From d477aad54f514f1446c24d03167329c32e97e5dd Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Thu, 20 Feb 2020 08:49:16 +0100
Subject: [PATCH] unit build string tree
---
.../string/ranked/RankedNonlinearPattern.cpp | 18 ------------------
.../string/ranked/RankedNonlinearPattern.cxx | 18 ++++++++++++++++++
.../string/ranked/RankedNonlinearPattern.h | 6 +++---
.../{RankedPattern.cpp => RankedPattern.cxx} | 4 ++--
.../ranked/{RankedTree.cpp => RankedTree.cxx} | 4 ++--
alib2str/src/tree/string/ranked/Tree.cpp | 3 +++
alib2str/src/tree/string/unranked/Tree.cpp | 3 +++
.../unranked/UnrankedNonlinearPattern.cpp | 18 ------------------
.../unranked/UnrankedNonlinearPattern.cxx | 18 ++++++++++++++++++
.../string/unranked/UnrankedNonlinearPattern.h | 6 +++---
.../tree/string/unranked/UnrankedPattern.cpp | 18 ------------------
.../tree/string/unranked/UnrankedPattern.cxx | 18 ++++++++++++++++++
.../{UnrankedTree.cpp => UnrankedTree.cxx} | 4 ++--
13 files changed, 72 insertions(+), 66 deletions(-)
delete mode 100644 alib2str/src/tree/string/ranked/RankedNonlinearPattern.cpp
create mode 100644 alib2str/src/tree/string/ranked/RankedNonlinearPattern.cxx
rename alib2str/src/tree/string/ranked/{RankedPattern.cpp => RankedPattern.cxx} (50%)
rename alib2str/src/tree/string/ranked/{RankedTree.cpp => RankedTree.cxx} (51%)
create mode 100644 alib2str/src/tree/string/ranked/Tree.cpp
create mode 100644 alib2str/src/tree/string/unranked/Tree.cpp
delete mode 100644 alib2str/src/tree/string/unranked/UnrankedNonlinearPattern.cpp
create mode 100644 alib2str/src/tree/string/unranked/UnrankedNonlinearPattern.cxx
delete mode 100644 alib2str/src/tree/string/unranked/UnrankedPattern.cpp
create mode 100644 alib2str/src/tree/string/unranked/UnrankedPattern.cxx
rename alib2str/src/tree/string/unranked/{UnrankedTree.cpp => UnrankedTree.cxx} (50%)
diff --git a/alib2str/src/tree/string/ranked/RankedNonlinearPattern.cpp b/alib2str/src/tree/string/ranked/RankedNonlinearPattern.cpp
deleted file mode 100644
index 987ce681d3..0000000000
--- a/alib2str/src/tree/string/ranked/RankedNonlinearPattern.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * RankedNonlinearPattern.cpp
- *
- * Created on: Sep 27, 2017
- * Author: Jan Travnicek
- */
-
-#include "RankedNonlinearPattern.h"
-#include <tree/Tree.h>
-
-#include <registration/StringRegistration.hpp>
-
-namespace {
-
-auto stringWrite = registration::StringWriterRegister < tree::RankedNonlinearPattern < > > ( );
-auto stringReader = registration::StringReaderRegister < tree::Tree, tree::RankedNonlinearPattern < > > ( );
-
-} /* namespace */
diff --git a/alib2str/src/tree/string/ranked/RankedNonlinearPattern.cxx b/alib2str/src/tree/string/ranked/RankedNonlinearPattern.cxx
new file mode 100644
index 0000000000..249f2079d8
--- /dev/null
+++ b/alib2str/src/tree/string/ranked/RankedNonlinearPattern.cxx
@@ -0,0 +1,18 @@
+/*
+ * RankedNonlinearPattern.cpp
+ *
+ * Created on: Sep 27, 2017
+ * Author: Jan Travnicek
+ */
+
+#include "RankedNonlinearPattern.h"
+#include <tree/Tree.h>
+
+#include <registration/StringRegistration.hpp>
+
+namespace {
+
+auto stringWriteRankedNonlinearPattern = registration::StringWriterRegister < tree::RankedNonlinearPattern < > > ( );
+auto stringReaderRankedNonlinearPattern = registration::StringReaderRegister < tree::Tree, tree::RankedNonlinearPattern < > > ( );
+
+} /* namespace */
diff --git a/alib2str/src/tree/string/ranked/RankedNonlinearPattern.h b/alib2str/src/tree/string/ranked/RankedNonlinearPattern.h
index 850d2fe414..f4af502625 100644
--- a/alib2str/src/tree/string/ranked/RankedNonlinearPattern.h
+++ b/alib2str/src/tree/string/ranked/RankedNonlinearPattern.h
@@ -5,8 +5,8 @@
* Author: Jan Travnicek
*/
-#ifndef _STRING_RANKED_PATTERN_H_
-#define _STRING_RANKED_PATTERN_H_
+#ifndef _STRING_RANKED_NONLINEAR_PATTERN_H_
+#define _STRING_RANKED_NONLINEAR_PATTERN_H_
#include <tree/ranked/RankedNonlinearPattern.h>
#include <core/stringApi.hpp>
@@ -56,4 +56,4 @@ void stringApi < tree::RankedNonlinearPattern < SymbolType > >::compose ( std::o
} /* namespace core */
-#endif /* _STRING_RANKED_PATTERN_H_ */
+#endif /* _STRING_RANKED_NONLINEAR_PATTERN_H_ */
diff --git a/alib2str/src/tree/string/ranked/RankedPattern.cpp b/alib2str/src/tree/string/ranked/RankedPattern.cxx
similarity index 50%
rename from alib2str/src/tree/string/ranked/RankedPattern.cpp
rename to alib2str/src/tree/string/ranked/RankedPattern.cxx
index 75b7389d2e..052bb62fa0 100644
--- a/alib2str/src/tree/string/ranked/RankedPattern.cpp
+++ b/alib2str/src/tree/string/ranked/RankedPattern.cxx
@@ -12,7 +12,7 @@
namespace {
-auto stringWrite = registration::StringWriterRegister < tree::RankedPattern < > > ( );
-auto stringReader = registration::StringReaderRegister < tree::Tree, tree::RankedPattern < > > ( );
+auto stringWriteRankedPattern = registration::StringWriterRegister < tree::RankedPattern < > > ( );
+auto stringReaderRankedPattern = registration::StringReaderRegister < tree::Tree, tree::RankedPattern < > > ( );
} /* namespace */
diff --git a/alib2str/src/tree/string/ranked/RankedTree.cpp b/alib2str/src/tree/string/ranked/RankedTree.cxx
similarity index 51%
rename from alib2str/src/tree/string/ranked/RankedTree.cpp
rename to alib2str/src/tree/string/ranked/RankedTree.cxx
index 382ec27619..760e03b40e 100644
--- a/alib2str/src/tree/string/ranked/RankedTree.cpp
+++ b/alib2str/src/tree/string/ranked/RankedTree.cxx
@@ -12,7 +12,7 @@
namespace {
-auto stringWrite = registration::StringWriterRegister < tree::RankedTree < > > ( );
-auto stringReader = registration::StringReaderRegister < tree::Tree, tree::RankedTree < > > ( );
+auto stringWriteRankedTree = registration::StringWriterRegister < tree::RankedTree < > > ( );
+auto stringReaderRankedTree = registration::StringReaderRegister < tree::Tree, tree::RankedTree < > > ( );
} /* namespace */
diff --git a/alib2str/src/tree/string/ranked/Tree.cpp b/alib2str/src/tree/string/ranked/Tree.cpp
new file mode 100644
index 0000000000..89e98d49f7
--- /dev/null
+++ b/alib2str/src/tree/string/ranked/Tree.cpp
@@ -0,0 +1,3 @@
+#include "RankedNonlinearPattern.cxx"
+#include "RankedPattern.cxx"
+#include "RankedTree.cxx"
diff --git a/alib2str/src/tree/string/unranked/Tree.cpp b/alib2str/src/tree/string/unranked/Tree.cpp
new file mode 100644
index 0000000000..b8e18033c2
--- /dev/null
+++ b/alib2str/src/tree/string/unranked/Tree.cpp
@@ -0,0 +1,3 @@
+#include "UnrankedNonlinearPattern.cxx"
+#include "UnrankedPattern.cxx"
+#include "UnrankedTree.cxx"
diff --git a/alib2str/src/tree/string/unranked/UnrankedNonlinearPattern.cpp b/alib2str/src/tree/string/unranked/UnrankedNonlinearPattern.cpp
deleted file mode 100644
index b1aff7a995..0000000000
--- a/alib2str/src/tree/string/unranked/UnrankedNonlinearPattern.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * UnrankedNonlinearPattern.cpp
- *
- * Created on: Sep 27, 2017
- * Author: Jan Travnicek
- */
-
-#include "UnrankedNonlinearPattern.h"
-#include <tree/Tree.h>
-
-#include <registration/StringRegistration.hpp>
-
-namespace {
-
-auto stringWrite = registration::StringWriterRegister < tree::UnrankedNonlinearPattern < > > ( );
-auto stringReader = registration::StringReaderRegister < tree::Tree, tree::UnrankedNonlinearPattern < > > ( );
-
-} /* namespace */
diff --git a/alib2str/src/tree/string/unranked/UnrankedNonlinearPattern.cxx b/alib2str/src/tree/string/unranked/UnrankedNonlinearPattern.cxx
new file mode 100644
index 0000000000..50b5b1ebac
--- /dev/null
+++ b/alib2str/src/tree/string/unranked/UnrankedNonlinearPattern.cxx
@@ -0,0 +1,18 @@
+/*
+ * UnrankedNonlinearPattern.cpp
+ *
+ * Created on: Sep 27, 2017
+ * Author: Jan Travnicek
+ */
+
+#include "UnrankedNonlinearPattern.h"
+#include <tree/Tree.h>
+
+#include <registration/StringRegistration.hpp>
+
+namespace {
+
+auto stringWriteUnrankedNonlinearPattern = registration::StringWriterRegister < tree::UnrankedNonlinearPattern < > > ( );
+auto stringReaderUnrankedNonlinearPattern = registration::StringReaderRegister < tree::Tree, tree::UnrankedNonlinearPattern < > > ( );
+
+} /* namespace */
diff --git a/alib2str/src/tree/string/unranked/UnrankedNonlinearPattern.h b/alib2str/src/tree/string/unranked/UnrankedNonlinearPattern.h
index 77ffdfd372..6e4f8a128f 100644
--- a/alib2str/src/tree/string/unranked/UnrankedNonlinearPattern.h
+++ b/alib2str/src/tree/string/unranked/UnrankedNonlinearPattern.h
@@ -5,8 +5,8 @@
* Author: Jan Travnicek
*/
-#ifndef _STRING_UNRANKED_PATTERN_H_
-#define _STRING_UNRANKED_PATTERN_H_
+#ifndef _STRING_UNRANKED_NONLINEAR_PATTERN_H_
+#define _STRING_UNRANKED_NONLINEAR_PATTERN_H_
#include <tree/unranked/UnrankedNonlinearPattern.h>
#include <core/stringApi.hpp>
@@ -56,4 +56,4 @@ void stringApi < tree::UnrankedNonlinearPattern < SymbolType > >::compose ( std:
} /* namespace core */
-#endif /* _STRING_UNRANKED_PATTERN_H_ */
+#endif /* _STRING_UNRANKED_NONLINEAR_PATTERN_H_ */
diff --git a/alib2str/src/tree/string/unranked/UnrankedPattern.cpp b/alib2str/src/tree/string/unranked/UnrankedPattern.cpp
deleted file mode 100644
index 65515dd27f..0000000000
--- a/alib2str/src/tree/string/unranked/UnrankedPattern.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * UnrankedPattern.cpp
- *
- * Created on: Sep 27, 2017
- * Author: Jan Travnicek
- */
-
-#include "UnrankedPattern.h"
-#include <tree/Tree.h>
-
-#include <registration/StringRegistration.hpp>
-
-namespace {
-
-auto stringWrite = registration::StringWriterRegister < tree::UnrankedPattern < > > ( );
-auto stringReader = registration::StringReaderRegister < tree::Tree, tree::UnrankedPattern < > > ( );
-
-} /* namespace */
diff --git a/alib2str/src/tree/string/unranked/UnrankedPattern.cxx b/alib2str/src/tree/string/unranked/UnrankedPattern.cxx
new file mode 100644
index 0000000000..2031f2e7b1
--- /dev/null
+++ b/alib2str/src/tree/string/unranked/UnrankedPattern.cxx
@@ -0,0 +1,18 @@
+/*
+ * UnrankedPattern.cpp
+ *
+ * Created on: Sep 27, 2017
+ * Author: Jan Travnicek
+ */
+
+#include "UnrankedPattern.h"
+#include <tree/Tree.h>
+
+#include <registration/StringRegistration.hpp>
+
+namespace {
+
+auto stringWriteUnrankedPattern = registration::StringWriterRegister < tree::UnrankedPattern < > > ( );
+auto stringReaderUnrankedPattern = registration::StringReaderRegister < tree::Tree, tree::UnrankedPattern < > > ( );
+
+} /* namespace */
diff --git a/alib2str/src/tree/string/unranked/UnrankedTree.cpp b/alib2str/src/tree/string/unranked/UnrankedTree.cxx
similarity index 50%
rename from alib2str/src/tree/string/unranked/UnrankedTree.cpp
rename to alib2str/src/tree/string/unranked/UnrankedTree.cxx
index afe90c1a8a..7eaaa22e36 100644
--- a/alib2str/src/tree/string/unranked/UnrankedTree.cpp
+++ b/alib2str/src/tree/string/unranked/UnrankedTree.cxx
@@ -12,7 +12,7 @@
namespace {
-auto stringWrite = registration::StringWriterRegister < tree::UnrankedTree < > > ( );
-auto stringReader = registration::StringReaderRegister < tree::Tree, tree::UnrankedTree < > > ( );
+auto stringWriteUnrankedTree = registration::StringWriterRegister < tree::UnrankedTree < > > ( );
+auto stringReaderUnrankedTree = registration::StringReaderRegister < tree::Tree, tree::UnrankedTree < > > ( );
} /* namespace */
--
GitLab