From 2387bd6a82b639325e12bf43458d1b0258850440 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Sun, 10 Apr 2016 20:00:30 +0200
Subject: [PATCH] decrease include dependencies

---
 alib2algo/src/equations/RegularEquationSolver.h    | 1 +
 alib2algo/src/regexp/convert/ToAutomatonThompson.h | 2 ++
 alib2algo/src/regexp/properties/RegExpEmpty.h      | 2 ++
 alib2algo/src/regexp/properties/RegExpEpsilon.h    | 2 ++
 alib2algo/src/regexp/transform/RegExpDerivation.h  | 2 ++
 alib2algo/src/regexp/transform/RegExpIntegral.h    | 2 ++
 alib2data/src/regexp/formal/FormalRegExp.cpp       | 1 -
 alib2data/src/regexp/formal/FormalRegExp.h         | 4 +---
 alib2data/src/regexp/unbounded/UnboundedRegExp.cpp | 1 -
 alib2data/src/regexp/unbounded/UnboundedRegExp.h   | 4 +---
 astat2/src/RegExpStat.cpp                          | 2 ++
 11 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/alib2algo/src/equations/RegularEquationSolver.h b/alib2algo/src/equations/RegularEquationSolver.h
index 11d067699c..a3d3fb4880 100644
--- a/alib2algo/src/equations/RegularEquationSolver.h
+++ b/alib2algo/src/equations/RegularEquationSolver.h
@@ -9,6 +9,7 @@
 #define REGULAREQUATIONSOLVER_H_
 
 #include <regexp/unbounded/UnboundedRegExp.h>
+#include <regexp/unbounded/UnboundedRegExpElement.h>
 #include <alphabet/Symbol.h>
 
 #include <map>
diff --git a/alib2algo/src/regexp/convert/ToAutomatonThompson.h b/alib2algo/src/regexp/convert/ToAutomatonThompson.h
index 931a81734a..e84832bccf 100644
--- a/alib2algo/src/regexp/convert/ToAutomatonThompson.h
+++ b/alib2algo/src/regexp/convert/ToAutomatonThompson.h
@@ -12,7 +12,9 @@
 
 #include <regexp/RegExp.h>
 #include <regexp/formal/FormalRegExp.h>
+#include <regexp/formal/FormalRegExpElement.h>
 #include <regexp/unbounded/UnboundedRegExp.h>
+#include <regexp/unbounded/UnboundedRegExpElement.h>
 #include <automaton/FSM/EpsilonNFA.h>
 
 namespace regexp {
diff --git a/alib2algo/src/regexp/properties/RegExpEmpty.h b/alib2algo/src/regexp/properties/RegExpEmpty.h
index 8406ca5e91..598f7e5d17 100644
--- a/alib2algo/src/regexp/properties/RegExpEmpty.h
+++ b/alib2algo/src/regexp/properties/RegExpEmpty.h
@@ -12,7 +12,9 @@
 
 #include <regexp/RegExp.h>
 #include <regexp/formal/FormalRegExp.h>
+#include <regexp/formal/FormalRegExpElement.h>
 #include <regexp/unbounded/UnboundedRegExp.h>
+#include <regexp/unbounded/UnboundedRegExpElement.h>
 
 namespace regexp {
 
diff --git a/alib2algo/src/regexp/properties/RegExpEpsilon.h b/alib2algo/src/regexp/properties/RegExpEpsilon.h
index 7fbcd6f0c4..ac9ba2968c 100644
--- a/alib2algo/src/regexp/properties/RegExpEpsilon.h
+++ b/alib2algo/src/regexp/properties/RegExpEpsilon.h
@@ -12,7 +12,9 @@
 
 #include <regexp/RegExp.h>
 #include <regexp/formal/FormalRegExp.h>
+#include <regexp/formal/FormalRegExpElement.h>
 #include <regexp/unbounded/UnboundedRegExp.h>
+#include <regexp/unbounded/UnboundedRegExpElement.h>
 
 namespace regexp {
 
diff --git a/alib2algo/src/regexp/transform/RegExpDerivation.h b/alib2algo/src/regexp/transform/RegExpDerivation.h
index 9cf1fc7f14..ad6b98361b 100644
--- a/alib2algo/src/regexp/transform/RegExpDerivation.h
+++ b/alib2algo/src/regexp/transform/RegExpDerivation.h
@@ -12,7 +12,9 @@
 
 #include <regexp/RegExp.h>
 #include <regexp/formal/FormalRegExp.h>
+#include <regexp/formal/FormalRegExpElement.h>
 #include <regexp/unbounded/UnboundedRegExp.h>
+#include <regexp/unbounded/UnboundedRegExpElement.h>
 
 #include <string/LinearString.h>
 
diff --git a/alib2algo/src/regexp/transform/RegExpIntegral.h b/alib2algo/src/regexp/transform/RegExpIntegral.h
index 122bec3c48..4dc79e6330 100644
--- a/alib2algo/src/regexp/transform/RegExpIntegral.h
+++ b/alib2algo/src/regexp/transform/RegExpIntegral.h
@@ -12,7 +12,9 @@
 
 #include <regexp/RegExp.h>
 #include <regexp/formal/FormalRegExp.h>
+#include <regexp/formal/FormalRegExpElement.h>
 #include <regexp/unbounded/UnboundedRegExp.h>
+#include <regexp/unbounded/UnboundedRegExpElement.h>
 
 #include <string/LinearString.h>
 
diff --git a/alib2data/src/regexp/formal/FormalRegExp.cpp b/alib2data/src/regexp/formal/FormalRegExp.cpp
index a92f4ef00c..6acb58b5a4 100644
--- a/alib2data/src/regexp/formal/FormalRegExp.cpp
+++ b/alib2data/src/regexp/formal/FormalRegExp.cpp
@@ -8,7 +8,6 @@
 #include "FormalRegExp.h"
 #include <exception/AlibException.h>
 #include "FormalRegExpEmpty.h"
-#include "FormalRegExpSymbol.h"
 
 #include <iostream>
 #include <algorithm>
diff --git a/alib2data/src/regexp/formal/FormalRegExp.h b/alib2data/src/regexp/formal/FormalRegExp.h
index 27fb4f07b7..ecbb8de2a5 100644
--- a/alib2data/src/regexp/formal/FormalRegExp.h
+++ b/alib2data/src/regexp/formal/FormalRegExp.h
@@ -8,12 +8,10 @@
 #ifndef FORMAL_REG_EXP_H_
 #define FORMAL_REG_EXP_H_
 
-#include <vector>
-#include <list>
 #include <string>
 #include <set>
-#include "FormalRegExpElement.h"
 #include "../RegExpBase.h"
+#include "../../alphabet/Symbol.h"
 #include "../../alphabet/Alphabet.hpp"
 
 namespace regexp {
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
index 61054def9e..65887d82bc 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.cpp
@@ -8,7 +8,6 @@
 #include "UnboundedRegExp.h"
 #include <exception/AlibException.h>
 #include "UnboundedRegExpEmpty.h"
-#include "UnboundedRegExpSymbol.h"
 
 #include <iostream>
 #include <algorithm>
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExp.h b/alib2data/src/regexp/unbounded/UnboundedRegExp.h
index 52db41b45c..2de760735a 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExp.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExp.h
@@ -8,12 +8,10 @@
 #ifndef UNBOUNDED_REG_EXP_H_
 #define UNBOUNDED_REG_EXP_H_
 
-#include <vector>
-#include <list>
 #include <string>
 #include <set>
-#include "UnboundedRegExpElement.h"
 #include "../RegExpBase.h"
+#include "../../alphabet/Symbol.h"
 #include "../../alphabet/Alphabet.hpp"
 
 namespace regexp {
diff --git a/astat2/src/RegExpStat.cpp b/astat2/src/RegExpStat.cpp
index bb6803bb00..35d32cb164 100644
--- a/astat2/src/RegExpStat.cpp
+++ b/astat2/src/RegExpStat.cpp
@@ -10,7 +10,9 @@
 #include <exception/AlibException.h>
 
 #include <regexp/formal/FormalRegExp.h>
+#include <regexp/formal/FormalRegExpElement.h>
 #include <regexp/unbounded/UnboundedRegExp.h>
+#include <regexp/unbounded/UnboundedRegExpElement.h>
 
 #include <factory/XmlDataFactory.hpp>
 #include <iostream>
-- 
GitLab