diff --git a/aconversions/src/conversions/fa2rg/Makefile b/aconversions/src/conversions/fa2rg/Makefile index 411d17e6eb335b69ccb6634995d2bb643a191195..2bd0de8263cf682855cf4863ee83b03306e579e5 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 9d491cbc299da9dfc07426863baee56ae717a0a9..40f0233566acaff826c38fcf382070e47fb95186 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 deed8616ac6f5e0fb19b600f6f83f4e437b96ffc..02ad0f6d215e20f52b53928c5cd559e1a10e0279 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 d7683ec5e617a1c095446d4f5693bc7e54683fdb..19aa02a96458030e7537029acddd3d67b46bf770 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 c789ca3c30e4c9f73400fdb7e4c70651c2bcdf89..f8a9ee0fe722389ca3d099ae1091329206600557 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 b5947046317d1e8908d72be1645ae38bb9ae315c..41dbfbd787807ca40fe6da6fa157fd32e27a54b0 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 039e15c99e055d2cac61b593e661229e737fe750..e7fef96a708a88ac24e4695ef82526aae59cf551 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 0000000000000000000000000000000000000000..cc4532bf52e59e60ff2651dc54109dd1959667dd --- /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 0000000000000000000000000000000000000000..aff77de1307fa59d01253b795a496ee56d9337c9 --- /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 56c69e78569563b3aaee1de7a43c6f77157633cb..4d14be70ae9a70739acf542085cf63c6548bc3b4 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_ */