From d06aa8f9f4fb5929fcb4a9ff990a4b64a0b80950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pecka?= <peckato1@fit.cvut.cz>
Date: Fri, 14 Mar 2014 12:22:32 +0100
Subject: [PATCH] Closes #16: One header file that includes all regexp
 elements.

---
 aconversions/src/fa2re/BrzozowskiAlgebraic.h |  8 +-------
 aconversions/src/fa2re/StateElimination.h    |  8 +-------
 aconversions/src/re2fa/Brzozowski.h          |  1 +
 aconversions/src/re2fa/Glushkov.h            |  1 +
 aconversions/src/re2fa/Thompson.h            |  6 +-----
 aconvert.regexp/src/RegExpParser.h           | 11 ++--------
 aconvert.regexp/src/RegExpPrinter.h          |  9 ++-------
 alib/src/regexp/RegExpElements.h             | 21 ++++++++++++++++++++
 alib/src/regexp/RegExpParser.h               |  7 +------
 alib/src/regexp/RegExpPrinter.h              |  7 +------
 libaderivation/src/RegExpDerivation.h        |  8 +-------
 libaderivation/src/RegExpIntegral.h          |  9 ++-------
 libaregexptree/src/RegExpAlphabet.h          |  8 +-------
 libaregexptree/src/RegExpOptimize.h          |  8 +-------
 14 files changed, 37 insertions(+), 75 deletions(-)
 create mode 100644 alib/src/regexp/RegExpElements.h

diff --git a/aconversions/src/fa2re/BrzozowskiAlgebraic.h b/aconversions/src/fa2re/BrzozowskiAlgebraic.h
index 052406d8cb..598840a858 100644
--- a/aconversions/src/fa2re/BrzozowskiAlgebraic.h
+++ b/aconversions/src/fa2re/BrzozowskiAlgebraic.h
@@ -12,13 +12,7 @@
 #include <map>
 #include <queue>
 
-#include <regexp/RegExpElement.h>
-#include <regexp/Alternation.h>
-#include <regexp/Concatenation.h>
-#include <regexp/Iteration.h>
-#include <regexp/RegExpSymbol.h>
-#include <regexp/RegExpEmpty.h>
-#include <regexp/RegExpEpsilon.h>
+#include <regexp/RegExpElements.h>
 
 #include "AbstractFAtoREConverter.h"
 #include "../shared/RightRegularEquationSolver.h"
diff --git a/aconversions/src/fa2re/StateElimination.h b/aconversions/src/fa2re/StateElimination.h
index 58fda872b4..240ce7547d 100644
--- a/aconversions/src/fa2re/StateElimination.h
+++ b/aconversions/src/fa2re/StateElimination.h
@@ -12,13 +12,7 @@
 
 #include <automaton/FSM/FSM.h>
 #include <regexp/RegExp.h>
-#include <regexp/RegExpElement.h>
-#include <regexp/Alternation.h>
-#include <regexp/Concatenation.h>
-#include <regexp/Iteration.h>
-#include <regexp/RegExpEmpty.h>
-#include <regexp/RegExpEpsilon.h>
-#include <regexp/RegExpSymbol.h>
+#include <regexp/RegExpElements.h>
 
 #include "AbstractFAtoREConverter.h"
 
diff --git a/aconversions/src/re2fa/Brzozowski.h b/aconversions/src/re2fa/Brzozowski.h
index 4ab0be4cfa..dfb5828333 100644
--- a/aconversions/src/re2fa/Brzozowski.h
+++ b/aconversions/src/re2fa/Brzozowski.h
@@ -18,6 +18,7 @@
 #include "AbstractREtoFAConverter.h"
 
 #include "RegExpDerivation.h"
+
 #include "RegExpAlphabet.h"
 #include "RegExpOptimize.h"
 
diff --git a/aconversions/src/re2fa/Glushkov.h b/aconversions/src/re2fa/Glushkov.h
index 452028c1f4..c9d222497d 100644
--- a/aconversions/src/re2fa/Glushkov.h
+++ b/aconversions/src/re2fa/Glushkov.h
@@ -13,6 +13,7 @@
 #include <alphabet/Symbol.h>
 #include <automaton/State.h>
 #include <regexp/RegExp.h>
+#include <regexp/RegExpElements.h>
 
 #include "AbstractREtoFAConverter.h"
 
diff --git a/aconversions/src/re2fa/Thompson.h b/aconversions/src/re2fa/Thompson.h
index 8ab66196cf..89f0b2e79a 100644
--- a/aconversions/src/re2fa/Thompson.h
+++ b/aconversions/src/re2fa/Thompson.h
@@ -13,11 +13,7 @@
 
 #include <automaton/FSM/FSM.h>
 #include <regexp/RegExp.h>
-#include <regexp/RegExpElement.h>
-#include <regexp/Alternation.h>
-#include <regexp/Concatenation.h>
-#include <regexp/Iteration.h>
-#include <regexp/RegExpSymbol.h>
+#include <regexp/RegExpElements.h>
 
 #include "AbstractREtoFAConverter.h"
 
diff --git a/aconvert.regexp/src/RegExpParser.h b/aconvert.regexp/src/RegExpParser.h
index 37e161181e..5d3bde9c99 100644
--- a/aconvert.regexp/src/RegExpParser.h
+++ b/aconvert.regexp/src/RegExpParser.h
@@ -4,14 +4,7 @@
 #include "RegExpLexer.h"
 
 #include "regexp/RegExp.h"
-#include "regexp/RegExpElement.h"
-
-#include "regexp/Alternation.h"
-#include "regexp/Concatenation.h"
-#include "regexp/Iteration.h"
-#include "regexp/RegExpSymbol.h"
-#include "regexp/RegExpEpsilon.h"
-#include "regexp/RegExpEmpty.h"
+#include "regexp/RegExpElements.h"
 
 class ParseError {
   
@@ -37,4 +30,4 @@ private:
 
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/aconvert.regexp/src/RegExpPrinter.h b/aconvert.regexp/src/RegExpPrinter.h
index 124afe6dfc..ffc82d1312 100644
--- a/aconvert.regexp/src/RegExpPrinter.h
+++ b/aconvert.regexp/src/RegExpPrinter.h
@@ -3,12 +3,7 @@
 
 #include <iostream>
 #include "regexp/RegExp.h"
-#include "regexp/Alternation.h"
-#include "regexp/Concatenation.h"
-#include "regexp/Iteration.h"
-#include "regexp/RegExpSymbol.h"
-#include "regexp/RegExpEpsilon.h"
-#include "regexp/RegExpEmpty.h"
+#include "regexp/RegExpElements.h"
 
 class RegExpPrinter {
   std::ostream& m_Out;
@@ -25,4 +20,4 @@ public:
   void print(regexp::RegExp& regexp);
 };
 
-#endif /*REGEXP_PRINTER_H_*/
\ No newline at end of file
+#endif /*REGEXP_PRINTER_H_*/
diff --git a/alib/src/regexp/RegExpElements.h b/alib/src/regexp/RegExpElements.h
new file mode 100644
index 0000000000..b0f3401aec
--- /dev/null
+++ b/alib/src/regexp/RegExpElements.h
@@ -0,0 +1,21 @@
+/*
+ * RegExpElements.h
+ *
+ *  Created on: 14. 3. 2014
+ *      Author: tomas
+ */
+
+#ifndef REGEXPELEMENTS_H_
+#define REGEXPELEMENTS_H_
+
+
+#include "Alternation.h"
+#include "Concatenation.h"
+#include "Iteration.h"
+#include "RegExpElement.h"
+#include "RegExpEpsilon.h"
+#include "RegExpEmpty.h"
+#include "RegExpSymbol.h"
+
+
+#endif /* REGEXPELEMENTS_H_ */
diff --git a/alib/src/regexp/RegExpParser.h b/alib/src/regexp/RegExpParser.h
index 126f20ee5d..654d3fe719 100644
--- a/alib/src/regexp/RegExpParser.h
+++ b/alib/src/regexp/RegExpParser.h
@@ -9,14 +9,9 @@
 #define REGEXPPARSER_H_
 
 #include "RegExp.h"
+#include "RegExpElements.h"
 #include "../sax/Token.h"
-#include "RegExpSymbol.h"
-#include "RegExpEpsilon.h"
-#include "RegExpEmpty.h"
 
-#include "Alternation.h"
-#include "Concatenation.h"
-#include "Iteration.h"
 
 namespace regexp {
 
diff --git a/alib/src/regexp/RegExpPrinter.h b/alib/src/regexp/RegExpPrinter.h
index d152e7d41b..76eacc5bea 100644
--- a/alib/src/regexp/RegExpPrinter.h
+++ b/alib/src/regexp/RegExpPrinter.h
@@ -10,12 +10,7 @@
 
 #include <ostream>
 #include "RegExp.h"
-#include "Alternation.h"
-#include "Concatenation.h"
-#include "Iteration.h"
-#include "RegExpSymbol.h"
-#include "RegExpEpsilon.h"
-#include "RegExpEmpty.h"
+#include "RegExpElements.h"
 
 namespace regexp {
 
diff --git a/libaderivation/src/RegExpDerivation.h b/libaderivation/src/RegExpDerivation.h
index e840bfd4e2..b61df11dba 100644
--- a/libaderivation/src/RegExpDerivation.h
+++ b/libaderivation/src/RegExpDerivation.h
@@ -9,13 +9,7 @@
 #define REGEXPDERIVATION_H_
 
 #include <regexp/RegExp.h>
-#include <regexp/RegExpElement.h>
-#include <regexp/Alternation.h>
-#include <regexp/Concatenation.h>
-#include <regexp/Iteration.h>
-#include <regexp/RegExpSymbol.h>
-#include <regexp/RegExpEmpty.h>
-#include <regexp/RegExpEpsilon.h>
+#include <regexp/RegExpElements.h>
 
 #include <AlibException.h>
 
diff --git a/libaderivation/src/RegExpIntegral.h b/libaderivation/src/RegExpIntegral.h
index 4e0b2b549d..4acc909880 100644
--- a/libaderivation/src/RegExpIntegral.h
+++ b/libaderivation/src/RegExpIntegral.h
@@ -9,14 +9,9 @@
 #define REGEXPINTEGRAL_H_
 
 #include <AlibException.h>
+
 #include <regexp/RegExp.h>
-#include <regexp/RegExpElement.h>
-#include <regexp/Alternation.h>
-#include <regexp/Concatenation.h>
-#include <regexp/Iteration.h>
-#include <regexp/RegExpSymbol.h>
-#include <regexp/RegExpEmpty.h>
-#include <regexp/RegExpEpsilon.h>
+#include <regexp/RegExpElements.h>
 
 class RegExpIntegral
 {
diff --git a/libaregexptree/src/RegExpAlphabet.h b/libaregexptree/src/RegExpAlphabet.h
index c8f0859054..a584656cf4 100644
--- a/libaregexptree/src/RegExpAlphabet.h
+++ b/libaregexptree/src/RegExpAlphabet.h
@@ -2,13 +2,7 @@
 #define REGEXPALPHABET_H_
 
 #include <regexp/RegExp.h>
-#include <regexp/RegExpElement.h>
-#include <regexp/Alternation.h>
-#include <regexp/Concatenation.h>
-#include <regexp/Iteration.h>
-#include <regexp/RegExpSymbol.h>
-#include <regexp/RegExpEmpty.h>
-#include <regexp/RegExpEpsilon.h>
+#include <regexp/RegExpElements.h>
 
 #include <AlibException.h>
 
diff --git a/libaregexptree/src/RegExpOptimize.h b/libaregexptree/src/RegExpOptimize.h
index da1def4c4c..6408d86bc9 100644
--- a/libaregexptree/src/RegExpOptimize.h
+++ b/libaregexptree/src/RegExpOptimize.h
@@ -9,13 +9,7 @@
 #define REGEXPOPTIMIZE_H_
 
 #include <regexp/RegExp.h>
-#include <regexp/RegExpElement.h>
-#include <regexp/Alternation.h>
-#include <regexp/Concatenation.h>
-#include <regexp/Iteration.h>
-#include <regexp/RegExpSymbol.h>
-#include <regexp/RegExpEmpty.h>
-#include <regexp/RegExpEpsilon.h>
+#include <regexp/RegExpElements.h>
 
 #include <AlibException.h>
 
-- 
GitLab