Attempt to fix some minor memory leaks

[dragonfireclient.git] / src / strfnd.h

diff --git a/src/strfnd.h b/src/strfnd.h
index dbbec11a640180ecdffa24a583f0ebde5734401b..049ae0bae99375554e596418849fb0e1bbd1469d 100644 (file)
--- a/src/strfnd.h
+++ b/src/strfnd.h
@@ -1,9 +1,28 @@
+/*
+Minetest-c55
+Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #ifndef STRFND_HEADER
 #define STRFND_HEADER
 
 #include <string>
 
-std::string trim(std::string str);
+std::string trim(const std::string &str);
 
 class Strfnd{
     std::string tek;
@@ -46,6 +65,19 @@ class Strfnd{
                //std::cout<<"palautus=\""<<palautus<<"\""<<std::endl;
         return palautus;
     }
+       void skip_over(std::string chars){
+               while(p < tek.size()){
+                       bool is = false;
+                       for(unsigned int i=0; i<chars.size(); i++){
+                               if(chars[i] == tek[p]){
+                                       is = true;
+                                       break;
+                               }
+                       }
+                       if(!is) break;
+                       p++;
+               }
+       }
     bool atend(){
         if(p>=tek.size()) return true;
         return false;
@@ -55,8 +87,59 @@ class Strfnd{
     }
 };
 
-inline std::string trim(std::string str)
+class WStrfnd{
+    std::wstring tek;
+    unsigned int p;
+public:
+    void start(std::wstring niinq){
+        tek = niinq;
+        p=0;
+    }
+    unsigned int where(){
+        return p;
+    }
+    void to(unsigned int i){
+        p = i;
+    }
+    std::wstring what(){
+        return tek;
+    }
+    std::wstring next(std::wstring plop){
+        //std::cout<<"tek=\""<<tek<<"\" plop=\""<<plop<<"\""<<std::endl;
+        size_t n;
+        std::wstring palautus;
+        if (p < tek.size())
+        {  
+            //std::cout<<"\tp<tek.size()"<<std::endl;
+            if ((n = tek.find(plop, p)) == std::wstring::npos || plop == L"")
+            {  
+                //std::cout<<"\t\tn == string::npos || plop == \"\""<<std::endl;
+                n = tek.size();
+            }
+            else
+            {  
+                //std::cout<<"\t\tn != string::npos"<<std::endl;
+            }
+            palautus = tek.substr(p, n-p);
+            p = n + plop.length();
+        }
+        //else
+            //std::cout<<"\tp>=tek.size()"<<std::endl;
+               //std::cout<<"palautus=\""<<palautus<<"\""<<std::endl;
+        return palautus;
+    }
+    bool atend(){
+        if(p>=tek.size()) return true;
+        return false;
+    }
+    WStrfnd(std::wstring s){
+        start(s);
+    }
+};
+
+inline std::string trim(const std::string &s)
 {
+       std::string str = s;
     while( 
             str.length()>0
             &&