simplify includes in trees

acast2/src/cast/TreeCastVisitor.cpp

@@ -6,6 +6,8 @@
  */
 #include "TreeCastVisitor.h"
+#include "tree/TreeClasses.h"
+
 #include "../CastVisitorBase.hpp"
 typedef cast_base_helper< tree::VisitableTreeBase::const_visitor_type, tree::TreeBase, alib::TreeTypes, tree::Tree, alib::TreeTypes > TreeCastVisitorType;

acast2/src/cast/TreeToStringCastVisitor.cpp

@@ -7,6 +7,7 @@
 #include "TreeToStringCastVisitor.h"
 #include "string/StringClasses.h"
+#include "tree/TreeClasses.h"
 #include "../CastVisitorBase.hpp"

alib2data/src/XmlApi.cpp

@@ -17,6 +17,7 @@
 #include "container/ContainerClasses.h"
 #include "grammar/GrammarClasses.h"
 #include "regexp/RegExpClasses.h"
+#include "tree/TreeClasses.h"
 namespace alib {

alib2data/src/object/ObjectBase.h

@@ -33,19 +33,7 @@ class UndirectedGraph;
 #include "../alphabet/SymbolFeatures.h"
 #include "../container/ContainerFeatures.h"
 #include "../primitive/PrimitiveFeatures.h"
-
-namespace tree {
-
-class RankedTree;
-class RankedPattern;
-class PrefixRankedTree;
-class PrefixRankedBarTree;
-class PrefixRankedPattern;
-class PrefixRankedBarPattern;
-class UnrankedTree;
-class UnrankedPattern;
-
-}
+#include "../tree/TreeFeatures.h"
 namespace alib {
@@ -83,6 +71,7 @@ typedef std::tuple< automaton::DFA, automaton::NFA, automaton::MultiInitialState
 typedef std::tuple< Void, exception::AlibException
 	> OtherTypes;
+
 // --------------------------------------------------------------------------------------------------------------------
 template<typename ... Ts>

alib2data/src/tree/Tree.h

@@ -16,7 +16,18 @@ namespace tree {
 /**
  * Wrapper around tree.
  */
-typedef alib::wrapper<TreeBase> Tree;
+class Tree : public alib::wrapper<TreeBase> {
+public:
+	explicit Tree(TreeBase* data) : alib::wrapper<TreeBase>(data) {
+	}
+
+	explicit Tree(const TreeBase& data) : alib::wrapper<TreeBase>(data.clone()) {
+	}
+
+	explicit Tree(TreeBase&& data) : alib::wrapper<TreeBase>(std::move(data).plunder()) {
+	}
+
+};
 } /* namespace tree */

alib2data/src/tree/TreeBase.h

@@ -8,9 +8,7 @@
 #ifndef TREE_BASE_H_
 #define TREE_BASE_H_
-#include "../common/base.hpp"
 #include "../object/ObjectBase.h"
-#include "../exception/AlibException.h"
 namespace tree {

alib2data/src/tree/TreeClasses.h

+/*
+ * TreeClasses.h
+ *
+ *  Created on: Nov 16, 2014
+ *      Author: Jan Travnicek
+ */
+
+#ifndef TREE_CLASSES_H_
+#define TREE_CLASSES_H_
+
+#include "ranked/RankedTree.h"
+#include "ranked/RankedPattern.h"
+#include "ranked/PrefixRankedTree.h"
+#include "ranked/PrefixRankedBarTree.h"
+#include "ranked/PrefixRankedPattern.h"
+#include "ranked/PrefixRankedBarPattern.h"
+#include "unranked/UnrankedTree.h"
+#include "unranked/UnrankedPattern.h"
+
+#endif /* TREE_CLASSES_H_ */

alib2data/src/tree/TreeFeatures.h

@@ -11,9 +11,30 @@
 namespace tree {
 enum class FEATURES {
-	RANKED_TREE, RANKED_PATTERN, PREFIX_RANKED_TREE, PREFIX_RANKED_BAR_TREE, PREFIX_RANKED_PATTERN, PREFIX_RANKED_BAR_PATTERN, UNRANKED_TREE, UNRANKED_PATTERN
+	RANKED_TREE,
+	RANKED_PATTERN,
+	PREFIX_RANKED_TREE,
+	PREFIX_RANKED_BAR_TREE,
+	PREFIX_RANKED_PATTERN,
+	PREFIX_RANKED_BAR_PATTERN,
+	UNRANKED_TREE,
+	UNRANKED_PATTERN
 };
+class Tree;
+
+class RankedTree;
+class RankedPattern;
+class PrefixRankedTree;
+class PrefixRankedBarTree;
+class PrefixRankedPattern;
+class PrefixRankedBarPattern;
+class UnrankedTree;
+class UnrankedPattern;
+
+class RankedNode;
+class UnrankedNode;
+
 } /* namespace tree */
 #endif /* TREE_FEATURES_H_ */

alib2data/src/tree/TreeFromRawParser.cpp

@@ -6,6 +6,7 @@
  */
 #include "TreeFromRawParser.h"
+#include "Tree.h"
 #include "TreeException.h"
 #include "ranked/RankedTree.h"
 #include "ranked/PrefixRankedTree.h"

alib2data/src/tree/TreeFromRawParser.h

@@ -9,9 +9,7 @@
 #define TREE_FROM_RAW_PARSER
 #include "../sax/FromXMLParserHelper.h"
-#include "Tree.h"
 #include "TreeFeatures.h"
-#include <deque>
 #include <set>
 #include "unranked/UnrankedNode.h"

alib2data/src/tree/TreeFromXMLParser.cpp

@@ -6,11 +6,12 @@
  */
 #include "TreeFromXMLParser.h"
-
 #include "../sax/ParserException.h"
-
 #include "../XmlApi.hpp"
+#include "Tree.h"
+#include "TreeClasses.h"
+
 namespace tree {
 Tree TreeFromXMLParser::parseTree(std::deque<sax::Token>::iterator& input) const {

alib2data/src/tree/TreeFromXMLParser.h

@@ -9,15 +9,13 @@
 #define TREE_FROM_XML_PARSER_H_
 #include "../sax/FromXMLParserHelper.h"
-#include "Tree.h"
 #include "TreeFeatures.h"
-#include "ranked/RankedTree.h"
-#include "unranked/UnrankedTree.h"
-#include <deque>
 #include <set>
 #include <variant>
-#include "../sax/Token.h"
+#include <vector>
+
+#include "../alphabet/Symbol.h"
 namespace alib {

alib2data/src/tree/TreeToRawComposer.cpp

@@ -7,8 +7,8 @@
 #include "TreeToRawComposer.h"
 #include "TreeException.h"
-
 #include "../XmlApi.hpp"
+#include "TreeClasses.h"
 namespace tree {

alib2data/src/tree/TreeToRawComposer.h

@@ -10,9 +10,8 @@
 #include <deque>
 #include "Tree.h"
-#include "ranked/RankedTree.h"
-#include "unranked/UnrankedTree.h"
 #include "../sax/Token.h"
+#include <vector>
 namespace alib {

alib2data/src/tree/TreeToXMLComposer.cpp

@@ -6,8 +6,8 @@
  */
 #include "TreeToXMLComposer.h"
-
 #include "../XmlApi.hpp"
+#include "TreeClasses.h"
 namespace tree {

alib2data/src/tree/TreeToXMLComposer.h

@@ -8,18 +8,10 @@
 #ifndef TREE_TO_XML_COMPOSER_H_
 #define TREE_TO_XML_COMPOSER_H_
-#include <string>
 #include <deque>
 #include "Tree.h"
-#include "ranked/RankedTree.h"
-#include "ranked/RankedPattern.h"
-#include "ranked/PrefixRankedTree.h"
-#include "ranked/PrefixRankedBarTree.h"
-#include "ranked/PrefixRankedPattern.h"
-#include "ranked/PrefixRankedBarPattern.h"
-#include "unranked/UnrankedTree.h"
-#include "unranked/UnrankedPattern.h"
 #include "../sax/Token.h"
+#include <set>
 namespace alib {

alib2data/test-src/tree/PatternTest.cpp

@@ -3,10 +3,14 @@
 #include "sax/SaxParseInterface.h"
 #include "sax/SaxComposeInterface.h"
+#include "tree/unranked/UnrankedPattern.h"
 #include "tree/ranked/RankedPattern.h"
 #include "tree/ranked/PrefixRankedPattern.h"
 #include "tree/ranked/PrefixRankedBarPattern.h"
+#include "tree/ranked/RankedNode.h"
+#include "tree/unranked/UnrankedNode.h"
+
 #include "tree/TreeException.h"
 #include "factory/XmlDataFactory.hpp"

alib2data/test-src/tree/TreeTest.cpp

@@ -4,10 +4,14 @@
 #include "sax/SaxComposeInterface.h"
 #include "tree/ranked/RankedTree.h"
+#include "tree/unranked/UnrankedTree.h"
 #include "tree/ranked/PrefixRankedTree.h"
 #include "tree/ranked/PrefixRankedBarTree.h"
 #include "tree/ranked/RankedPattern.h"
+#include "tree/ranked/RankedNode.h"
+#include "tree/unranked/UnrankedNode.h"
+
 #include "tree/TreeException.h"
 #include "factory/XmlDataFactory.hpp"

tniceprint/src/tniceprint.cpp

@@ -12,6 +12,8 @@
 #include <sax/SaxParseInterface.h>
 #include <sax/ParserException.h>
 #include <tree/Tree.h>
+#include <tree/ranked/RankedTree.h>
+#include <tree/unranked/UnrankedTree.h>
 int main(int argc, char** argv) {
 	try {