From 2a6574330addaed4322819c1e84b5fd3052ae4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pecka?= <peckato1@fit.cvut.cz>
Date: Tue, 16 Sep 2014 21:53:27 +0200
Subject: [PATCH] algo: conversions: namespace
---
aconversions2/src/ConversionHandler.cpp | 35 ++++++++-----------
aconversions2/src/ConversionHandler.h | 5 ---
aconversions2/src/aconversion.cpp | 1 -
.../conversions/fa2re/BrzozowskiAlgebraic.cpp | 5 +++
.../conversions/fa2re/BrzozowskiAlgebraic.h | 5 +++
.../fa2re/formal/StateEliminationFormal.cpp | 5 +++
.../fa2re/formal/StateEliminationFormal.h | 5 +++
.../unbounded/StateEliminationUnbounded.cpp | 5 +++
.../unbounded/StateEliminationUnbounded.h | 5 +++
.../fa2rg/fa2lrg/FAtoLRGConverter.cpp | 5 +++
.../fa2rg/fa2lrg/FAtoLRGConverter.h | 5 +++
.../fa2rg/fa2rrg/FAtoRRGConverter.cpp | 5 +++
.../fa2rg/fa2rrg/FAtoRRGConverter.h | 5 +++
.../src/conversions/re2fa/Brzozowski.cpp | 5 +++
alib2algo/src/conversions/re2fa/Brzozowski.h | 5 +++
alib2algo/src/conversions/re2fa/Glushkov.cpp | 5 +++
alib2algo/src/conversions/re2fa/Glushkov.h | 5 +++
alib2algo/src/conversions/re2fa/Thompson.cpp | 5 +++
alib2algo/src/conversions/re2fa/Thompson.h | 5 +++
.../re2rg/re2rrg/BrzozowskiDerivationRRG.cpp | 5 +++
.../re2rg/re2rrg/BrzozowskiDerivationRRG.h | 5 +++
.../conversions/re2rg/re2rrg/GlushkovRRG.cpp | 5 +++
.../conversions/re2rg/re2rrg/GlushkovRRG.h | 4 +++
alib2algo/src/conversions/rg2fa/RGtoFA.cpp | 5 +++
alib2algo/src/conversions/rg2fa/RGtoFA.h | 5 +++
.../src/conversions/rg2re/RGtoREAlgebraic.cpp | 5 +++
.../src/conversions/rg2re/RGtoREAlgebraic.h | 5 +++
.../lrg2rrg/LeftToRightRegularGrammar.cpp | 4 +++
.../rg2rg/lrg2rrg/LeftToRightRegularGrammar.h | 4 +++
.../rrg2lrg/RightToLeftRegularGrammar.cpp | 5 +++
.../rg2rg/rrg2lrg/RightToLeftRegularGrammar.h | 5 +++
.../test-src/conversions/re2fa/re2faTest.cpp | 18 +++++-----
.../test-src/conversions/rg2rg/rg2rgTest.cpp | 4 +--
33 files changed, 163 insertions(+), 37 deletions(-)
diff --git a/aconversions2/src/ConversionHandler.cpp b/aconversions2/src/ConversionHandler.cpp
index fe9bcabb5c..43ab1cc0b5 100644
--- a/aconversions2/src/ConversionHandler.cpp
+++ b/aconversions2/src/ConversionHandler.cpp
@@ -36,9 +36,6 @@ using namespace regexp;
using namespace sax;
using namespace std;
-namespace conversions
-{
-
ConversionHandler::ConversionHandler( list<Token> & tokens, const std::string & target, const std::string & algorithm, std::ostream & out ) :
m_tokens( tokens ),
m_source( parseFormalismFromTokens( ) ),
@@ -124,7 +121,7 @@ void ConversionHandler::convertFSMtoREF(void)
break;
case STATE_ELIMINATION:
default: {
- alib::DataFactory::toStdout(fa2re::StateEliminationFormal::convert(automaton));
+ alib::DataFactory::toStdout(conversions::fa2re::StateEliminationFormal::convert(automaton));
break;
}
}
@@ -141,11 +138,11 @@ void ConversionHandler::convertFSMtoREU( void )
std::string xmlMark = m_tokens.front( ).getData( );
if( xmlMark == "NFA") {
const automaton::NFA fsm = alib::DataFactory::fromTokens<automaton::NFA>( m_tokens );
- regexp::UnboundedRegExp re = fa2re::BrzozowskiAlgebraic::convert( fsm );
+ regexp::UnboundedRegExp re = conversions::fa2re::BrzozowskiAlgebraic::convert( fsm );
alib::DataFactory::toStdout(re);
} else if( xmlMark == "DFA") {
const automaton::DFA fsm = alib::DataFactory::fromTokens<automaton::DFA>( m_tokens );
- regexp::UnboundedRegExp re = fa2re::BrzozowskiAlgebraic::convert( fsm );
+ regexp::UnboundedRegExp re = conversions::fa2re::BrzozowskiAlgebraic::convert( fsm );
alib::DataFactory::toStdout(re);
} else {
throw exception::AlibException("Unrecognised formalism");
@@ -154,7 +151,7 @@ void ConversionHandler::convertFSMtoREU( void )
}
case STATE_ELIMINATION:
default: {
- alib::DataFactory::toStdout(fa2re::StateEliminationUnbounded::convert(automaton));
+ alib::DataFactory::toStdout(conversions::fa2re::StateEliminationUnbounded::convert(automaton));
break;
}
}
@@ -177,7 +174,7 @@ void ConversionHandler::convertFSMtoRRG( void )
switch( m_algorithm )
{
default: {
- fa2rg::FAtoRRGConverter conv;
+ conversions::fa2rg::FAtoRRGConverter conv;
alib::DataFactory::toStdout(conv.convert(fsm));
break;
}
@@ -191,7 +188,7 @@ void ConversionHandler::convertFSMtoLRG( void )
switch( m_algorithm )
{
default: {
- fa2rg::FAtoLRGConverter conv;
+ conversions::fa2rg::FAtoLRGConverter conv;
alib::DataFactory::toStdout(conv.convert(fsm));
break;
}
@@ -207,18 +204,18 @@ void ConversionHandler::convertREtoFSM( void )
switch( m_algorithm )
{
case BRZOZOWSKI_DERIVATION: {
- re2fa::Brzozowski conv;
+ conversions::re2fa::Brzozowski conv;
alib::DataFactory::toStdout(conv.convert(regexp));
break;
}
case THOMPSON_NFA: {
- re2fa::Thompson conv;
+ conversions::re2fa::Thompson conv;
alib::DataFactory::toStdout(conv.convert(regexp));
break;
}
case GLUSHKOV_NFA:
default: {
- re2fa::Glushkov conv;
+ conversions::re2fa::Glushkov conv;
alib::DataFactory::toStdout(conv.convert(regexp));
break;
}
@@ -242,12 +239,12 @@ void ConversionHandler::convertREtoRRG( void )
switch(m_algorithm)
{
case BRZOZOWSKI_DERIVATION: {
- re2rg::BrzozowskiDerivationRRG conv;
+ conversions::re2rg::BrzozowskiDerivationRRG conv;
alib::DataFactory::toStdout(conv.convert(regexp));
break;
}
default: {
- alib::DataFactory::toStdout(re2rg::GlushkovRRG::convert(regexp));
+ alib::DataFactory::toStdout(conversions::re2rg::GlushkovRRG::convert(regexp));
break;
}
}
@@ -258,7 +255,7 @@ void ConversionHandler::convertREtoRRG( void )
void ConversionHandler::convertRGtoFSM( void )
{
const grammar::Grammar grammar = alib::DataFactory::fromTokens<grammar::Grammar>(m_tokens);
- alib::DataFactory::toStdout(rg2fa::RGtoFA::convert(grammar));
+ alib::DataFactory::toStdout(conversions::rg2fa::RGtoFA::convert(grammar));
}
void ConversionHandler::convertRGtoRG( void )
@@ -283,7 +280,7 @@ void ConversionHandler::convertRGtoRE( void )
{
case BRZOZOWSKI_ALGEBRAIC:
default:
- alib::DataFactory::toStdout(rg2re::RGtoREAlgebraic::convert(grammar));
+ alib::DataFactory::toStdout(conversions::rg2re::RGtoREAlgebraic::convert(grammar));
break;
}
}
@@ -295,7 +292,7 @@ void ConversionHandler::convertLRGtoRRG( void )
switch( m_algorithm )
{
default:
- rg2rg::LeftToRightRegularGrammar conv;
+ conversions::rg2rg::LeftToRightRegularGrammar conv;
alib::DataFactory::toStdout(conv.convert(lrg));
break;
}
@@ -308,7 +305,7 @@ void ConversionHandler::convertRRGtoLRG( void )
switch( m_algorithm )
{
default:
- rg2rg::RightToLeftRegularGrammar conv;
+ conversions::rg2rg::RightToLeftRegularGrammar conv;
alib::DataFactory::toStdout(conv.convert(rrg));
break;
}
@@ -377,5 +374,3 @@ ConversionHandler::TAlgorithm ConversionHandler::parseAlgorithmFromString( const
throw exception::AlibException( "ConversionHandler:: Invalid algorithm. See help." );
}
-
-} /* namespace conversions */
diff --git a/aconversions2/src/ConversionHandler.h b/aconversions2/src/ConversionHandler.h
index d08dd4cebb..998978f9a1 100644
--- a/aconversions2/src/ConversionHandler.h
+++ b/aconversions2/src/ConversionHandler.h
@@ -14,9 +14,6 @@
#include <factory/DataFactory.hpp>
-namespace conversions
-{
-
/**
* Wraps all conversions.
* Determine what formalism input, what is desired output and algorithm. Then perform conversion.
@@ -116,6 +113,4 @@ private:
std::ostream & m_out;
};
-} /* namespace conversions */
-
#endif /* ALGORITHMCHOOSER_H_ */
diff --git a/aconversions2/src/aconversion.cpp b/aconversions2/src/aconversion.cpp
index 83fffdcb4a..9cea6f7055 100644
--- a/aconversions2/src/aconversion.cpp
+++ b/aconversions2/src/aconversion.cpp
@@ -18,7 +18,6 @@
using namespace std;
using namespace sax;
using namespace alib;
-using namespace conversions;
void help( void )
diff --git a/alib2algo/src/conversions/fa2re/BrzozowskiAlgebraic.cpp b/alib2algo/src/conversions/fa2re/BrzozowskiAlgebraic.cpp
index c5d06d955a..19093a3ed8 100644
--- a/alib2algo/src/conversions/fa2re/BrzozowskiAlgebraic.cpp
+++ b/alib2algo/src/conversions/fa2re/BrzozowskiAlgebraic.cpp
@@ -11,6 +11,9 @@
#include "automaton/FSM/NFA.h"
#include "automaton/FSM/EpsilonNFA.h"
+namespace conversions
+{
+
namespace fa2re {
template<>
@@ -100,3 +103,5 @@ regexp::UnboundedRegExp BrzozowskiAlgebraic::convert( const automaton::DFA & aut
}
} /* namespace fa2re */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/fa2re/BrzozowskiAlgebraic.h b/alib2algo/src/conversions/fa2re/BrzozowskiAlgebraic.h
index 84e5c551cc..bc6f21919c 100644
--- a/alib2algo/src/conversions/fa2re/BrzozowskiAlgebraic.h
+++ b/alib2algo/src/conversions/fa2re/BrzozowskiAlgebraic.h
@@ -17,6 +17,9 @@
#include "common/macros.h"
#include "../../equations/RightRegularEquationSolver.h"
+namespace conversions
+{
+
namespace fa2re
{
@@ -40,4 +43,6 @@ public:
} /* namespace fa2re */
+} /* namespace conversions */
+
#endif /* BRZOZOWSKIALGEBRAIC_H_ */
diff --git a/alib2algo/src/conversions/fa2re/formal/StateEliminationFormal.cpp b/alib2algo/src/conversions/fa2re/formal/StateEliminationFormal.cpp
index e72117421c..6e8da9ec6b 100644
--- a/alib2algo/src/conversions/fa2re/formal/StateEliminationFormal.cpp
+++ b/alib2algo/src/conversions/fa2re/formal/StateEliminationFormal.cpp
@@ -13,6 +13,9 @@
#include "../../../regexp/RegExpOptimize.h"
+namespace conversions
+{
+
namespace fa2re
{
@@ -287,3 +290,5 @@ void StateEliminationFormal::extendExtendedNFA(automaton::ExtendedNFA& automaton
const StateEliminationFormal StateEliminationFormal::STATE_ELIMINATION_FORMAL;
} /* namespace fa2re */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/fa2re/formal/StateEliminationFormal.h b/alib2algo/src/conversions/fa2re/formal/StateEliminationFormal.h
index 76959dc25c..7a1119185e 100644
--- a/alib2algo/src/conversions/fa2re/formal/StateEliminationFormal.h
+++ b/alib2algo/src/conversions/fa2re/formal/StateEliminationFormal.h
@@ -17,6 +17,9 @@
#include <automaton/FSM/EpsilonNFA.h>
#include <automaton/FSM/ExtendedNFA.h>
+namespace conversions
+{
+
namespace fa2re
{
@@ -63,4 +66,6 @@ private:
} /* namespace fa2re */
+} /* namespace conversions */
+
#endif /* STATEELIMINATIONFORMAL_H_ */
diff --git a/alib2algo/src/conversions/fa2re/unbounded/StateEliminationUnbounded.cpp b/alib2algo/src/conversions/fa2re/unbounded/StateEliminationUnbounded.cpp
index 8f47b0765c..c468c21e16 100644
--- a/alib2algo/src/conversions/fa2re/unbounded/StateEliminationUnbounded.cpp
+++ b/alib2algo/src/conversions/fa2re/unbounded/StateEliminationUnbounded.cpp
@@ -13,6 +13,9 @@
#include "../../../regexp/RegExpOptimize.h"
+namespace conversions
+{
+
namespace fa2re
{
@@ -266,3 +269,5 @@ void StateEliminationUnbounded::extendExtendedNFA(automaton::ExtendedNFA& automa
const StateEliminationUnbounded StateEliminationUnbounded::STATE_ELIMINATION_UNBOUNDED;
} /* namespace fa2re */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/fa2re/unbounded/StateEliminationUnbounded.h b/alib2algo/src/conversions/fa2re/unbounded/StateEliminationUnbounded.h
index 70e114212d..337758bbeb 100644
--- a/alib2algo/src/conversions/fa2re/unbounded/StateEliminationUnbounded.h
+++ b/alib2algo/src/conversions/fa2re/unbounded/StateEliminationUnbounded.h
@@ -17,6 +17,9 @@
#include <automaton/FSM/EpsilonNFA.h>
#include <automaton/FSM/ExtendedNFA.h>
+namespace conversions
+{
+
namespace fa2re
{
@@ -63,4 +66,6 @@ private:
} /* namespace fa2re */
+} /* namespace conversions */
+
#endif /* STATEELIMINATIONUNBOUNDED_H_ */
diff --git a/alib2algo/src/conversions/fa2rg/fa2lrg/FAtoLRGConverter.cpp b/alib2algo/src/conversions/fa2rg/fa2lrg/FAtoLRGConverter.cpp
index b42754ae07..46e952c7c9 100644
--- a/alib2algo/src/conversions/fa2rg/fa2lrg/FAtoLRGConverter.cpp
+++ b/alib2algo/src/conversions/fa2rg/fa2lrg/FAtoLRGConverter.cpp
@@ -6,6 +6,9 @@
#include <exception/AlibException.h>
+namespace conversions
+{
+
namespace fa2rg
{
@@ -170,3 +173,5 @@ void FAtoLRGConverter::Visit(void*, const automaton::OneTapeDTM&) const {
const FAtoLRGConverter FAtoLRGConverter::FA_TO_LRG_CONVERTER;
} /* namespace fa2rg */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/fa2rg/fa2lrg/FAtoLRGConverter.h b/alib2algo/src/conversions/fa2rg/fa2lrg/FAtoLRGConverter.h
index 53bf0f2e6c..72bad6fceb 100644
--- a/alib2algo/src/conversions/fa2rg/fa2lrg/FAtoLRGConverter.h
+++ b/alib2algo/src/conversions/fa2rg/fa2lrg/FAtoLRGConverter.h
@@ -8,6 +8,9 @@
#include <grammar/Grammar.h>
#include <automaton/Automaton.h>
+namespace conversions
+{
+
namespace fa2rg
{
@@ -47,4 +50,6 @@ private:
} /* namespace fa2rg */
+} /* namespace conversions */
+
#endif /* __FATOLRGCONVERTER_H__ */
diff --git a/alib2algo/src/conversions/fa2rg/fa2rrg/FAtoRRGConverter.cpp b/alib2algo/src/conversions/fa2rg/fa2rrg/FAtoRRGConverter.cpp
index d9336f3f0c..2ffe36d25d 100644
--- a/alib2algo/src/conversions/fa2rg/fa2rrg/FAtoRRGConverter.cpp
+++ b/alib2algo/src/conversions/fa2rg/fa2rrg/FAtoRRGConverter.cpp
@@ -5,6 +5,9 @@
#include <exception/AlibException.h>
+namespace conversions
+{
+
namespace fa2rg
{
@@ -164,3 +167,5 @@ void FAtoRRGConverter::Visit(void*, const automaton::OneTapeDTM&) const {
const FAtoRRGConverter FAtoRRGConverter::FA_TO_RRG_CONVERTER;
} /* namespace fa2rg */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/fa2rg/fa2rrg/FAtoRRGConverter.h b/alib2algo/src/conversions/fa2rg/fa2rrg/FAtoRRGConverter.h
index c3ee534601..830f442b08 100644
--- a/alib2algo/src/conversions/fa2rg/fa2rrg/FAtoRRGConverter.h
+++ b/alib2algo/src/conversions/fa2rg/fa2rrg/FAtoRRGConverter.h
@@ -8,6 +8,9 @@
#include <grammar/Grammar.h>
#include <automaton/Automaton.h>
+namespace conversions
+{
+
namespace fa2rg
{
@@ -47,4 +50,6 @@ private:
} /* namespace fa2rg */
+} /* namespace conversions */
+
#endif /* __FATORRGCONVERTER_H__ */
diff --git a/alib2algo/src/conversions/re2fa/Brzozowski.cpp b/alib2algo/src/conversions/re2fa/Brzozowski.cpp
index ca82b08dec..b64f806399 100644
--- a/alib2algo/src/conversions/re2fa/Brzozowski.cpp
+++ b/alib2algo/src/conversions/re2fa/Brzozowski.cpp
@@ -19,6 +19,9 @@
#include "../../regexp/RegExpDerivation.h"
#include "../../regexp/RegExpOptimize.h"
+namespace conversions
+{
+
namespace re2fa
{
@@ -128,3 +131,5 @@ automaton::DFA Brzozowski::convert(const regexp::RegExp& regexp)
}
} /* namespace re2fa */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/re2fa/Brzozowski.h b/alib2algo/src/conversions/re2fa/Brzozowski.h
index 09679bfb0d..0d7e0d197c 100644
--- a/alib2algo/src/conversions/re2fa/Brzozowski.h
+++ b/alib2algo/src/conversions/re2fa/Brzozowski.h
@@ -13,6 +13,9 @@
#include <regexp/unbounded/UnboundedRegExp.h>
#include <automaton/FSM/DFA.h>
+namespace conversions
+{
+
namespace re2fa
{
@@ -39,4 +42,6 @@ private:
} /* namespace re2fa */
+} /* namespace conversions */
+
#endif /* BRZOZOWSKI_H_ */
diff --git a/alib2algo/src/conversions/re2fa/Glushkov.cpp b/alib2algo/src/conversions/re2fa/Glushkov.cpp
index 924bc64c8c..d19623afe1 100644
--- a/alib2algo/src/conversions/re2fa/Glushkov.cpp
+++ b/alib2algo/src/conversions/re2fa/Glushkov.cpp
@@ -12,6 +12,9 @@
#include "label/IntegerLabel.h"
#include "label/LabelPairLabel.h"
+namespace conversions
+{
+
namespace re2fa {
automaton::NFA Glushkov::convert(const regexp::RegExp& regexp) {
@@ -89,3 +92,5 @@ automaton::NFA Glushkov::convert( const regexp::FormalRegExp & re ) {
}
} /* namespace conversions */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/re2fa/Glushkov.h b/alib2algo/src/conversions/re2fa/Glushkov.h
index 251fd4b736..ff94eeec3e 100644
--- a/alib2algo/src/conversions/re2fa/Glushkov.h
+++ b/alib2algo/src/conversions/re2fa/Glushkov.h
@@ -23,6 +23,9 @@
#include <automaton/FSM/NFA.h>
+namespace conversions
+{
+
namespace re2fa {
/**
@@ -55,4 +58,6 @@ private:
} /* namespace conversions */
+} /* namespace conversions */
+
#endif /* GLUSHKOV_H_ */
diff --git a/alib2algo/src/conversions/re2fa/Thompson.cpp b/alib2algo/src/conversions/re2fa/Thompson.cpp
index e05d6f6b21..48b8abedc3 100644
--- a/alib2algo/src/conversions/re2fa/Thompson.cpp
+++ b/alib2algo/src/conversions/re2fa/Thompson.cpp
@@ -8,6 +8,9 @@
#include <tuple>
#include <automaton/Automaton.h>
+namespace conversions
+{
+
namespace re2fa
{
@@ -258,3 +261,5 @@ void Thompson::Visit(void* userData, const regexp::UnboundedRegExpEmpty&)
}
} /* namespace re2fa */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/re2fa/Thompson.h b/alib2algo/src/conversions/re2fa/Thompson.h
index ace518cd99..6b82bc9a7a 100644
--- a/alib2algo/src/conversions/re2fa/Thompson.h
+++ b/alib2algo/src/conversions/re2fa/Thompson.h
@@ -13,6 +13,9 @@
#include <regexp/unbounded/UnboundedRegExpElements.h>
#include <automaton/FSM/EpsilonNFA.h>
+namespace conversions
+{
+
namespace re2fa
{
@@ -56,4 +59,6 @@ private:
} /* namespace re2fa */
+} /* namespace conversions */
+
#endif /* THOMPSON_H_ */
diff --git a/alib2algo/src/conversions/re2rg/re2rrg/BrzozowskiDerivationRRG.cpp b/alib2algo/src/conversions/re2rg/re2rrg/BrzozowskiDerivationRRG.cpp
index 60c1bab6c3..8fbd0ab7ba 100644
--- a/alib2algo/src/conversions/re2rg/re2rrg/BrzozowskiDerivationRRG.cpp
+++ b/alib2algo/src/conversions/re2rg/re2rrg/BrzozowskiDerivationRRG.cpp
@@ -18,6 +18,9 @@
#include "../../../regexp/RegExpOptimize.h"
#include "../../../regexp/RegExpDerivation.h"
+namespace conversions
+{
+
namespace re2rg
{
@@ -130,3 +133,5 @@ grammar::RightRG BrzozowskiDerivationRRG::convert(const regexp::RegExp& regexp)
}
} /* namespace re2rg */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/re2rg/re2rrg/BrzozowskiDerivationRRG.h b/alib2algo/src/conversions/re2rg/re2rrg/BrzozowskiDerivationRRG.h
index b61df215fa..2a3d0df53e 100644
--- a/alib2algo/src/conversions/re2rg/re2rrg/BrzozowskiDerivationRRG.h
+++ b/alib2algo/src/conversions/re2rg/re2rrg/BrzozowskiDerivationRRG.h
@@ -13,6 +13,9 @@
#include <regexp/formal/FormalRegExp.h>
#include <regexp/unbounded/UnboundedRegExp.h>
+namespace conversions
+{
+
namespace re2rg
{
@@ -39,4 +42,6 @@ private:
} /* namespace re2rg */
+} /* namespace conversions */
+
#endif /* BRZOZOWSKIDERIVATIONRRG_H_ */
diff --git a/alib2algo/src/conversions/re2rg/re2rrg/GlushkovRRG.cpp b/alib2algo/src/conversions/re2rg/re2rrg/GlushkovRRG.cpp
index 71d479dc7d..ee659b54ad 100644
--- a/alib2algo/src/conversions/re2rg/re2rrg/GlushkovRRG.cpp
+++ b/alib2algo/src/conversions/re2rg/re2rrg/GlushkovRRG.cpp
@@ -20,6 +20,9 @@
#include "../../../regexp/GlushkovPair.h"
#include "../../../regexp/GlushkovSymbol.h"
+namespace conversions
+{
+
namespace re2rg
{
@@ -111,3 +114,5 @@ void GlushkovRRG::Visit(void* userData, const regexp::UnboundedRegExp& regexp) c
const GlushkovRRG GlushkovRRG::GLUSHKOV_RRG;
} /* namespace re2rg */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/re2rg/re2rrg/GlushkovRRG.h b/alib2algo/src/conversions/re2rg/re2rrg/GlushkovRRG.h
index 9abc636365..66ef9b7a6f 100644
--- a/alib2algo/src/conversions/re2rg/re2rrg/GlushkovRRG.h
+++ b/alib2algo/src/conversions/re2rg/re2rrg/GlushkovRRG.h
@@ -15,6 +15,8 @@
#include <regexp/formal/FormalRegExp.h>
#include <regexp/unbounded/UnboundedRegExp.h>
+namespace conversions
+{
namespace re2rg
{
@@ -44,4 +46,6 @@ private:
} /* namespace re2rg */
+} /* namespace conversions */
+
#endif /* GLUSHKOVRRG_H_ */
diff --git a/alib2algo/src/conversions/rg2fa/RGtoFA.cpp b/alib2algo/src/conversions/rg2fa/RGtoFA.cpp
index 48313ade36..42f7a1f032 100644
--- a/alib2algo/src/conversions/rg2fa/RGtoFA.cpp
+++ b/alib2algo/src/conversions/rg2fa/RGtoFA.cpp
@@ -10,6 +10,9 @@
#include <exception/AlibException.h>
#include <label/StringLabel.h>
+namespace conversions
+{
+
namespace rg2fa
{
@@ -194,3 +197,5 @@ void RGtoFA::Visit(void*, const grammar::LeftLG&) const
const RGtoFA RGtoFA::RG_TO_FA_CONVERSION;
} /* namespace rg2fa */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/rg2fa/RGtoFA.h b/alib2algo/src/conversions/rg2fa/RGtoFA.h
index 6e03ae103e..280f840ffd 100644
--- a/alib2algo/src/conversions/rg2fa/RGtoFA.h
+++ b/alib2algo/src/conversions/rg2fa/RGtoFA.h
@@ -15,6 +15,9 @@
#include <automaton/Automaton.h>
#include <automaton/FSM/NFA.h>
+namespace conversions
+{
+
namespace rg2fa
{
@@ -60,4 +63,6 @@ private:
} /* namespace rg2fa */
+} /* namespace conversions */
+
#endif /* __RGTOFA_H__ */
diff --git a/alib2algo/src/conversions/rg2re/RGtoREAlgebraic.cpp b/alib2algo/src/conversions/rg2re/RGtoREAlgebraic.cpp
index 041d78ef61..ea82475d2f 100644
--- a/alib2algo/src/conversions/rg2re/RGtoREAlgebraic.cpp
+++ b/alib2algo/src/conversions/rg2re/RGtoREAlgebraic.cpp
@@ -12,6 +12,9 @@
#include <regexp/unbounded/UnboundedRegExpElements.h>
+namespace conversions
+{
+
namespace rg2re
{
@@ -160,3 +163,5 @@ void RGtoREAlgebraic::Visit(void*, const grammar::LeftLG&) const
const RGtoREAlgebraic RGtoREAlgebraic::RG_TO_RE_ALGEBRAIC;
} /* namespace rg2re */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/rg2re/RGtoREAlgebraic.h b/alib2algo/src/conversions/rg2re/RGtoREAlgebraic.h
index 142749d1b0..ebe15dd73f 100644
--- a/alib2algo/src/conversions/rg2re/RGtoREAlgebraic.h
+++ b/alib2algo/src/conversions/rg2re/RGtoREAlgebraic.h
@@ -14,6 +14,9 @@
#include <regexp/RegExp.h>
+namespace conversions
+{
+
namespace rg2re
{
@@ -54,4 +57,6 @@ protected:
} /* namespace rg2re */
+} /* namespace conversions */
+
#endif /* RGTOREALGEBRAIC_H_ */
diff --git a/alib2algo/src/conversions/rg2rg/lrg2rrg/LeftToRightRegularGrammar.cpp b/alib2algo/src/conversions/rg2rg/lrg2rrg/LeftToRightRegularGrammar.cpp
index c9b1a00677..0a1cca7dba 100644
--- a/alib2algo/src/conversions/rg2rg/lrg2rrg/LeftToRightRegularGrammar.cpp
+++ b/alib2algo/src/conversions/rg2rg/lrg2rrg/LeftToRightRegularGrammar.cpp
@@ -7,6 +7,8 @@
#include "LeftToRightRegularGrammar.h"
+namespace conversions {
+
namespace rg2rg {
grammar::RightRG LeftToRightRegularGrammar::convert(const grammar::LeftRG& lrg)
@@ -59,3 +61,5 @@ grammar::RightRG LeftToRightRegularGrammar::convert(const grammar::LeftRG& lrg)
}
} /* namespace rg2rg */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/rg2rg/lrg2rrg/LeftToRightRegularGrammar.h b/alib2algo/src/conversions/rg2rg/lrg2rrg/LeftToRightRegularGrammar.h
index f01665d3b3..b217f73568 100644
--- a/alib2algo/src/conversions/rg2rg/lrg2rrg/LeftToRightRegularGrammar.h
+++ b/alib2algo/src/conversions/rg2rg/lrg2rrg/LeftToRightRegularGrammar.h
@@ -11,6 +11,8 @@
#include <grammar/Regular/LeftRG.h>
#include <grammar/Regular/RightRG.h>
+namespace conversions{
+
namespace rg2rg
{
@@ -26,4 +28,6 @@ public:
} /* namespace rg2rg */
+} /* namespace conversions */
+
#endif /* LEFT_TO_RIGHT_REGULAR_GRAMMAR_H_ */
diff --git a/alib2algo/src/conversions/rg2rg/rrg2lrg/RightToLeftRegularGrammar.cpp b/alib2algo/src/conversions/rg2rg/rrg2lrg/RightToLeftRegularGrammar.cpp
index f51ab73248..a43a808f34 100644
--- a/alib2algo/src/conversions/rg2rg/rrg2lrg/RightToLeftRegularGrammar.cpp
+++ b/alib2algo/src/conversions/rg2rg/rrg2lrg/RightToLeftRegularGrammar.cpp
@@ -7,6 +7,9 @@
#include "RightToLeftRegularGrammar.h"
+namespace conversions
+{
+
namespace rg2rg
{
@@ -60,3 +63,5 @@ grammar::LeftRG RightToLeftRegularGrammar::convert(const grammar::RightRG& rrg)
}
} /* namespace rg2rg */
+
+} /* namespace conversions */
diff --git a/alib2algo/src/conversions/rg2rg/rrg2lrg/RightToLeftRegularGrammar.h b/alib2algo/src/conversions/rg2rg/rrg2lrg/RightToLeftRegularGrammar.h
index 8b7e3dc720..7cecd00f27 100644
--- a/alib2algo/src/conversions/rg2rg/rrg2lrg/RightToLeftRegularGrammar.h
+++ b/alib2algo/src/conversions/rg2rg/rrg2lrg/RightToLeftRegularGrammar.h
@@ -11,6 +11,9 @@
#include <grammar/Regular/LeftRG.h>
#include <grammar/Regular/RightRG.h>
+namespace conversions
+{
+
namespace rg2rg
{
@@ -29,4 +32,6 @@ public:
} /* namespace rg2rg */
+} /* namespace conversions */
+
#endif /* RIGHT_TO_LEFT_REGULAR_GRAMMAR_H_ */
diff --git a/alib2algo/test-src/conversions/re2fa/re2faTest.cpp b/alib2algo/test-src/conversions/re2fa/re2faTest.cpp
index 0d0d507550..67a85f2881 100644
--- a/alib2algo/test-src/conversions/re2fa/re2faTest.cpp
+++ b/alib2algo/test-src/conversions/re2fa/re2faTest.cpp
@@ -29,12 +29,12 @@ void re2faTest::testThompson() {
regexp::RegExpFromStringParser parser(inputs);
regexp::RegExp regexp1( parser.parseValue() );
- re2fa::Thompson thompson1;
+ conversions::re2fa::Thompson thompson1;
automaton::EpsilonNFA enfa1 = thompson1.convert(regexp1);
- regexp::RegExp regexp2( fa2re::BrzozowskiAlgebraic::convert(enfa1) );
+ regexp::RegExp regexp2( conversions::fa2re::BrzozowskiAlgebraic::convert(enfa1) );
- re2fa::Thompson thompson2;
+ conversions::re2fa::Thompson thompson2;
automaton::EpsilonNFA enfa2 = thompson2.convert(regexp2);
automaton::NFA nfa1 = epsilon::FSMEpsilonRemover::remove(enfa1);
@@ -56,12 +56,12 @@ void re2faTest::testGlushkov() {
regexp::RegExpFromStringParser parser(inputs);
regexp::UnboundedRegExp regexp1( static_cast<const regexp::UnboundedRegExp &>( parser.parseValue().getData() ) );
- re2fa::Glushkov glushkov1;
+ conversions::re2fa::Glushkov glushkov1;
automaton::NFA nfa1 = glushkov1.convert(regexp1);
- regexp::UnboundedRegExp regexp2( static_cast<const regexp::UnboundedRegExp &>( fa2re::BrzozowskiAlgebraic::convert(nfa1) ) );
+ regexp::UnboundedRegExp regexp2( static_cast<const regexp::UnboundedRegExp &>( conversions::fa2re::BrzozowskiAlgebraic::convert(nfa1) ) );
- re2fa::Glushkov glushkov2;
+ conversions::re2fa::Glushkov glushkov2;
automaton::NFA nfa2 = glushkov2.convert(regexp2);
automaton::DFA dfa1 = determinize::NFADeterminizer::determinize(nfa1);
@@ -80,12 +80,12 @@ void re2faTest::testBrzozowski() {
regexp::RegExpFromStringParser parser(inputs);
regexp::RegExp regexp1( parser.parseValue() );
- re2fa::Brzozowski brzozowski1;
+ conversions::re2fa::Brzozowski brzozowski1;
automaton::DFA dfa1 = brzozowski1.convert(regexp1);
- regexp::RegExp regexp2( fa2re::BrzozowskiAlgebraic::convert(dfa1) );
+ regexp::RegExp regexp2( conversions::fa2re::BrzozowskiAlgebraic::convert(dfa1) );
- re2fa::Brzozowski brzozowski2;
+ conversions::re2fa::Brzozowski brzozowski2;
automaton::DFA dfa2 = brzozowski2.convert(regexp2);
automaton::DFA mdfa1 = minimize::MinimizeDFA::minimize(dfa1);
diff --git a/alib2algo/test-src/conversions/rg2rg/rg2rgTest.cpp b/alib2algo/test-src/conversions/rg2rg/rg2rgTest.cpp
index 24b8c9772e..d8f04053e7 100644
--- a/alib2algo/test-src/conversions/rg2rg/rg2rgTest.cpp
+++ b/alib2algo/test-src/conversions/rg2rg/rg2rgTest.cpp
@@ -32,7 +32,7 @@ void rg2rgTest::testConversion() {
rrGrammar.addRule(alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::IntegerLabel(2)))), std::make_pair(alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::StringLabel("b")))), alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::IntegerLabel(3))))));
rrGrammar.addRule(alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::IntegerLabel(3)))), alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::StringLabel("a")))));
- rg2rg::RightToLeftRegularGrammar convertor;;
+ conversions::rg2rg::RightToLeftRegularGrammar convertor;;
grammar::LeftRG lrGrammar = convertor.convert(rrGrammar);
grammar::LeftRG lrGrammarRef(alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::IntegerLabel(4)))));
@@ -64,7 +64,7 @@ void rg2rgTest::testConversion2() {
lrGrammar.addRule(alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::IntegerLabel(3)))), std::make_pair(alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::IntegerLabel(2)))), alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::StringLabel("b"))))));
lrGrammar.addRule(alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::IntegerLabel(4)))), std::make_pair(alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::IntegerLabel(3)))), alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::StringLabel("a"))))));
- rg2rg::LeftToRightRegularGrammar convertor;
+ conversions::rg2rg::LeftToRightRegularGrammar convertor;
grammar::RightRG rrGrammar = convertor.convert(lrGrammar);
grammar::RightRG rrGrammarRef(alphabet::Symbol(alphabet::LabeledSymbol(label::Label(label::IntegerLabel(5)))));
--
GitLab