Store changes, to interators and added destring and better reading of arrays and objects

Author: brichards64

src/Store/Store.cpp

@@ -68,6 +68,7 @@ void Store::JsonParser(std::string input){
   int type=0;
   std::string key="";
   std::string value="";
+  int bracket_counter=0;
 
   for(std::string::size_type i = 0; i < input.size(); ++i) {
 
@@ -101,9 +102,11 @@ void Store::JsonParser(std::string input){
      }
      else if(type==3  && !(input[i]==' ' || input[i]=='{' || input[i]=='[')) value+=input[i];
      else if(type==3  && input[i]=='{'){ value+=input[i]; type=6; }
-     else if(type==6  && input[i]=='}'){ value+=input[i]; type=5; }
+     else if(type==6  && input[i]=='{'){ value+=input[i]; bracket_counter++; }
+     else if(type==6  && input[i]=='}'){ value+=input[i]; bracket_counter--;if(bracket_counter==-1){ type=5; bracket_counter=0;} }
      else if(type==3  && input[i]=='['){ value+=input[i]; type=7; }
-     else if(type==7  && input[i]==']'){ value+=input[i]; type=5; }
+     else if(type==7  && input[i]=='['){ value+=input[i]; bracket_counter++; }
+     else if(type==7  && input[i]==']'){ value+=input[i]; bracket_counter--;if(bracket_counter==-1){ type=5; bracket_counter=0;} }
      else if(type==4 || type==6 || type==7) value+=input[i];
   }
 
@@ -197,3 +200,11 @@ std::string Store::StringStrip(std::string in){
   return in;
 
 }
+
+bool Store::Destring(std::string key){
+
+  if(!m_variables.count(key)) return false;
+  m_variables[key]=StringStrip(m_variables[key]);
+  return true;
+
+}

src/Store/Store.h

@@ -31,6 +31,7 @@ namespace ToolFramework{
     void Delete(); ///< Deletes all entries in the Store.
     bool Has(std::string key); ///<Returns bool based on if store contains entry given by sting @param string key to comapre.
     std::vector<std::string> Keys(); //returns a vector of the keys
+    bool Destring(std::string key); //convers an element from a string by stripping the speachmarks @param string key to comapre.
 
     /**
        Templated getter function for sore content. Assignment is templated and via reference.
@@ -214,8 +215,8 @@ namespace ToolFramework{
 
     } 
 
-    std::map<std::string, std::string>::const_iterator begin() { return m_variables.begin(); }
-    std::map<std::string, std::string>::const_iterator end()   { return m_variables.end(); }
+    std::map<std::string, std::string>::iterator begin() { return m_variables.begin(); }
+    std::map<std::string, std::string>::iterator end()   { return m_variables.end(); }
 
 
   private: