Changes in src/Parser/FormatParserStorage.hpp [765f16:7a51be]

File:

• src/Parser/FormatParserStorage.hpp (modified) (5 diffs)

src/Parser/FormatParserStorage.hpp

@@ -16 +16 @@
 #include "CodePatterns/Singleton.hpp"
 
-#include <iosfwd>
+#include <string>
 #include <map>
-#include <string>
 #include <vector>
 
-#include "CodePatterns/Assert.hpp"
-#include "CodePatterns/Log.hpp"
-#include "FormatParser.hpp"
-#include "ParserTypes.hpp"
+#include "Parser/FormatParser.hpp"
+#include "Parser/MpqcParser.hpp"
+#include "Parser/PcpParser.hpp"
+#include "Parser/PdbParser.hpp"
+#include "Parser/TremoloParser.hpp"
+#include "Parser/XyzParser.hpp"
 
 class atom;
-class FormatParserInterface;
+
+// enum has to be outside of class for operator++ to be possible
+enum ParserTypes { mpqc, pcp, pdb, tremolo, xyz, ParserTypes_end, ParserTypes_begin = mpqc };
+typedef enum ParserTypes ParserTypes;
+
+ParserTypes &operator++(ParserTypes &type);
 
 class FormatParserStorage : public Singleton<FormatParserStorage> {
@@ -33 +39 @@
 public:
 
+  void addMpqc();
+  void addPcp();
+  void addPdb();
+  void addTremolo();
+  void addXyz();
   bool add(std::string type);
   bool add(ParserTypes type);
@@ -41 +52 @@
   bool saveSelectedMolecules(std::ostream &output, std::string suffix);
   bool saveWorld(std::ostream &output, std::string suffix);
-  
-  FormatParserInterface &get(ParserTypes _type);
+  MpqcParser &getMpqc();
+  PcpParser &getPcp();
+  PdbParser &getPdb();
+  TremoloParser &getTremolo();
+  XyzParser &getXyz();
+  FormatParser &get(enum ParserTypes _type);
 
   ParserTypes getTypeFromName(std::string type);
@@ -56 +71 @@
   
   // list of allocated parsers
-  std::vector<FormatParserInterface *> ParserList;
+  std::vector<FormatParser *> ParserList;
 
   // list of allocated strams
@@ -75 +90 @@
   std::map<std::string, ParserTypes> ParserLookupNames;
 
+
   // prefix of the filenames to use on save
   std::string prefix;
-
-public:
-  template<ParserTypes Ptype> void addParser()
-  {
-    if (!ParserPresent[Ptype]) {
-      ParserList[Ptype] = new FormatParser<Ptype>();
-      ParserPresent[Ptype] = true;
-    } else {
-      ASSERT(ParserNames.find(Ptype) != ParserNames.end(),
-          "FormatParserStorage::addParser() - ParserNames unknown for type"+toString((size_t)Ptype)+".");
-      ASSERT(ParserSuffixes.find(Ptype) != ParserSuffixes.end(),
-          "FormatParserStorage::addParser() - ParserSuffixes unknown for type"+toString((size_t)Ptype)+".");
-      LOG(2, "INFO: Parser " << ParserNames[Ptype] << " is already present." << std::endl
-          << "Note that you don't need to add '-o " 
-          << ParserSuffixes[Ptype] << "' if the input file is non-empty and of type " 
-          << ParserSuffixes[Ptype] << "." << std::endl);
-    }
-  }
-
-  template<ParserTypes Ptype> FormatParser<Ptype> &getParser() 
-  {
-    if(!ParserPresent[Ptype])
-      addParser< Ptype >();
-    return dynamic_cast<FormatParser<Ptype> &>(*ParserList[Ptype]);
-  }
 };