Changes in src/Formula.hpp [d8a0ec:426f2a]

File:

• src/Formula.hpp (modified) (4 diffs)

src/Formula.hpp

@@ -16 +16 @@
 
 #include "types.hpp"
+#include "helpers.hpp"
 
 class element;
@@ -22 +23 @@
 {
 public:
-  typedef element*                                      key_type;
+  typedef const element*                                key_type;
   typedef unsigned int                                  mapped_type;
   typedef std::pair<key_type, mapped_type>              value_type;
@@ -65 +66 @@
 
   unsigned int getElementCount() const;
-  bool hasElement(const element*)       const;
+  bool hasElement(key_type)             const;
   bool hasElement(atomicNumber_t)       const;
   bool hasElement(const std::string&)   const;
 
-  void operator+=(const element*);
+  void operator+=(key_type);
   void operator+=(atomicNumber_t);
   void operator+=(const std::string&);
 
-  void operator-=(const element*);
+  void operator-=(key_type);
   void operator-=(atomicNumber_t);
   void operator-=(const std::string&);
 
-  void addElements(const element*,unsigned int);
+  void addElements(key_type,unsigned int);
   void addElements(atomicNumber_t,unsigned int);
   void addElements(const std::string&,unsigned int);
 
+  void addFormula(const Formula&,unsigned int);
+
+  enumeration<key_type> enumerateElements() const;
+
   // only const versions, because someone might try to increment a previously
   // not set element
-  const unsigned int operator[](const element*) const;
+  const unsigned int operator[](key_type) const;
   const unsigned int operator[](atomicNumber_t) const;
   const unsigned int operator[](std::string)    const;
@@ -98 +103 @@
 
 private:
+  void parseFromString(std::string::const_iterator&,std::string::const_iterator&,char) throw(ParseError);
+  int parseMaybeNumber(std::string::const_iterator &it,std::string::const_iterator &end) throw(ParseError);
   // this contains all counts of elements in the formula
   // the size of the actual structure might be used in comparisons