From 45b9d338821c4498c38e749a1a47da12df28c7a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pecka?= <tomaspecka@gmail.com>
Date: Thu, 16 Jan 2014 19:01:15 +0100
Subject: [PATCH] Add utils to namespace
---
aconversions/src/conversions/fa2rg/Makefile | 3 ---
aconversions/src/utils/AutomatonUtils.cpp | 8 +++++++-
aconversions/src/utils/AutomatonUtils.h | 11 ++++++-----
.../src/utils/ConversionException.cpp | 9 +++++++++
aconversions/src/utils/ConversionException.h | 10 ++++++----
aconversions/src/utils/GrammarUtils.cpp | 8 ++++++++
aconversions/src/utils/GrammarUtils.h | 16 +++++++++-------
aconversions/src/utils/RegExpUtils.cpp | 17 +++++++++++++++++
aconversions/src/utils/RegExpUtils.h | 19 +++++++++++++++++++
aconversions/src/utils/utils.h | 5 +++++
10 files changed, 86 insertions(+), 20 deletions(-)
create mode 100644 aconversions/src/utils/RegExpUtils.cpp
create mode 100644 aconversions/src/utils/RegExpUtils.h
diff --git a/aconversions/src/conversions/fa2rg/Makefile b/aconversions/src/conversions/fa2rg/Makefile
index 411d17e6eb..2bd0de8263 100644
--- a/aconversions/src/conversions/fa2rg/Makefile
+++ b/aconversions/src/conversions/fa2rg/Makefile
@@ -32,9 +32,6 @@ FAtoRRGConverter.o: FAtoRRGConverter.cpp FAtoRRGConverter.h AbstractFAtoRGConver
$(CXX) $(CXXFLAGS) $< -o $@
-AutomatonUtils.o: ../../utils/AutomatonUtils.cpp ../../utils/AutomatonUtils.h ../../utils/utils.h
- $(CXX) $(CXXFLAGS) $< -o $@
-
ConversionException.o: ../../utils/ConversionException.cpp ../../utils/ConversionException.h
$(CXX) $(CXXFLAGS) $< -o $@
diff --git a/aconversions/src/utils/AutomatonUtils.cpp b/aconversions/src/utils/AutomatonUtils.cpp
index 9d491cbc29..40f0233566 100644
--- a/aconversions/src/utils/AutomatonUtils.cpp
+++ b/aconversions/src/utils/AutomatonUtils.cpp
@@ -1,5 +1,10 @@
#include "AutomatonUtils.h"
+using namespace automaton;
+
+namespace conversions
+{
+
/**
* Creates unique state in set by appending integer to name parameter.
*
@@ -7,7 +12,6 @@
* @param existingStates set of states where to insert new state
* @return state with unique name(@see Symbol)
*/
-
State AutomatonUtils::createUniqueState( const char * name, const set<State> & existingStates )
{
string str ( name );
@@ -38,3 +42,5 @@ State AutomatonUtils::createUniqueState( const string & name, const set<State> &
return s; // intentionally, unreachable
}
+
+} /* namespace conversions */
diff --git a/aconversions/src/utils/AutomatonUtils.h b/aconversions/src/utils/AutomatonUtils.h
index deed8616ac..02ad0f6d21 100644
--- a/aconversions/src/utils/AutomatonUtils.h
+++ b/aconversions/src/utils/AutomatonUtils.h
@@ -6,19 +6,20 @@
#include <automaton/exception/AutomatonException.h>
#include <automaton/State.h>
-using namespace std;
-using namespace alib;
-using namespace automaton;
+namespace conversions
+{
class AutomatonUtils
{
public:
- static State createUniqueState( const char * name, const set<State> & existingStates );
- static State createUniqueState( const string & name, const set<State> & existingStates );
+ static automaton::State createUniqueState( const char * name, const std::set<automaton::State> & existingStates );
+ static automaton::State createUniqueState( const std::string & name, const std::set<automaton::State> & existingStates );
private:
};
+} /* namespace conversions */
+
#endif /* AUTOMATONUTILS_H_ */
diff --git a/aconversions/src/utils/ConversionException.cpp b/aconversions/src/utils/ConversionException.cpp
index d7683ec5e6..19aa02a964 100644
--- a/aconversions/src/utils/ConversionException.cpp
+++ b/aconversions/src/utils/ConversionException.cpp
@@ -7,6 +7,13 @@
#include "ConversionException.h"
+using namespace std;
+using namespace alib;
+
+
+namespace conversions
+{
+
ConversionException::ConversionException( void )
{
@@ -21,3 +28,5 @@ ConversionException::~ConversionException( void ) throw ( )
{
}
+
+} /* namespace conversions */
diff --git a/aconversions/src/utils/ConversionException.h b/aconversions/src/utils/ConversionException.h
index c789ca3c30..f8a9ee0fe7 100644
--- a/aconversions/src/utils/ConversionException.h
+++ b/aconversions/src/utils/ConversionException.h
@@ -10,15 +10,17 @@
#include <AlibException.h>
-using namespace std;
-using namespace alib;
+namespace conversions
+{
-class ConversionException : public AlibException
+class ConversionException : public alib::AlibException
{
public:
ConversionException( void );
- ConversionException( const string & cause );
+ ConversionException( const std::string & cause );
virtual ~ConversionException( void ) throw ();
};
+} /* namespace conversions */
+
#endif /* CONVERSIONEXCEPTION_H_ */
diff --git a/aconversions/src/utils/GrammarUtils.cpp b/aconversions/src/utils/GrammarUtils.cpp
index b594704631..41dbfbd787 100644
--- a/aconversions/src/utils/GrammarUtils.cpp
+++ b/aconversions/src/utils/GrammarUtils.cpp
@@ -1,5 +1,11 @@
#include "GrammarUtils.h"
+using namespace alphabet;
+using namespace grammar;
+
+namespace conversions
+{
+
/**
* Checks whether given non-terminal symbol is on the right side of any rule
*
@@ -80,3 +86,5 @@ Symbol GrammarUtils::createUniqueSymbol( const string & name, const RegularGramm
return s; // intentionally, unreachable
}
+
+}
diff --git a/aconversions/src/utils/GrammarUtils.h b/aconversions/src/utils/GrammarUtils.h
index 039e15c99e..e7fef96a70 100644
--- a/aconversions/src/utils/GrammarUtils.h
+++ b/aconversions/src/utils/GrammarUtils.h
@@ -15,24 +15,26 @@
#include <grammar/Rule.h>
#include <alphabet/Symbol.h>
-using namespace std;
-using namespace grammar;
+namespace conversions
+{
class GrammarUtils
{
public:
- static bool isNonterminalOnRightSide( const Symbol & nonTerminal, const set<Rule> & rules );
- static const list<Symbol>::const_iterator getFirstSymbolFromSet( const list<Symbol> & ruleSymbols, const set<Symbol> & grammarSymbols );
+ static bool isNonterminalOnRightSide( const alphabet::Symbol & nonTerminal, const std::set<grammar::Rule> & rules );
+ static const std::list<alphabet::Symbol>::const_iterator getFirstSymbolFromSet( const std::list<alphabet::Symbol> & ruleSymbols, const std::set<alphabet::Symbol> & grammarSymbols );
- static bool isEpsilonRule( const Rule & rule );
+ static bool isEpsilonRule( const grammar::Rule & rule );
- static Symbol createUniqueSymbol( const char * name, const RegularGrammar & grammar, SuffixType suffix );
- static Symbol createUniqueSymbol( const string & name, const RegularGrammar & grammar, SuffixType suffix );
+ static alphabet::Symbol createUniqueSymbol( const char * name, const grammar::RegularGrammar & grammar, SuffixType suffix );
+ static alphabet::Symbol createUniqueSymbol( const std::string & name, const grammar::RegularGrammar & grammar, SuffixType suffix );
private:
};
+} /* namespace conversions */
+
#endif /* GRAMMARUTILS_H_ */
diff --git a/aconversions/src/utils/RegExpUtils.cpp b/aconversions/src/utils/RegExpUtils.cpp
new file mode 100644
index 0000000000..cc4532bf52
--- /dev/null
+++ b/aconversions/src/utils/RegExpUtils.cpp
@@ -0,0 +1,17 @@
+#include "RegExpUtils.h"
+
+using namespace alphabet;
+using namespace std;
+
+namespace conversions
+{
+
+set<Symbol> getAlphabet( void )
+{
+ std::set<Symbol> alphabet;
+ // iterate through
+
+ return alphabet;
+}
+
+} /* namespace conversions */
diff --git a/aconversions/src/utils/RegExpUtils.h b/aconversions/src/utils/RegExpUtils.h
new file mode 100644
index 0000000000..aff77de130
--- /dev/null
+++ b/aconversions/src/utils/RegExpUtils.h
@@ -0,0 +1,19 @@
+#ifndef REGEXPUTILS_H_
+#define REGEXPUTILS_H_
+
+#include "utils.h"
+
+namespace conversions
+{
+
+class RegExpUtils
+{
+public:
+ static std::set<alphabet::Symbol> getAlphabet( void );
+
+private:
+};
+
+} /* namespace conversions */
+
+#endif /* GRAMMARUTILS_H_ */
diff --git a/aconversions/src/utils/utils.h b/aconversions/src/utils/utils.h
index 56c69e7856..4d14be70ae 100644
--- a/aconversions/src/utils/utils.h
+++ b/aconversions/src/utils/utils.h
@@ -8,6 +8,9 @@
#include <set>
#include <list>
+namespace conversions
+{
+
#define isInSet(x,set) ( (set).find((x)) != (set).end())
enum SuffixType
@@ -17,4 +20,6 @@ enum SuffixType
UNDEFINED
};
+} /* namespace conversions */
+
#endif /* UTILS_H_ */
--
GitLab