Fix BTG writer for non-included index arrays.

[simgear.git] / simgear / misc / strutils.cxx

diff --git a/simgear/misc/strutils.cxx b/simgear/misc/strutils.cxx
index 8940ea6bf2244343c1e31204df46935bdc0f14eb..8bd33b7f507686233140ce7e68ab8a17cf52767b 100644 (file)
--- a/simgear/misc/strutils.cxx
+++ b/simgear/misc/strutils.cxx
@@ -21,8 +21,15 @@
 // $Id$
 
 #include <ctype.h>
+#include <cstring>
+#include <sstream>
+
 #include "strutils.hxx"
 
+using std::string;
+using std::vector;
+using std::stringstream;
+
 namespace simgear {
     namespace strutils {
 
@@ -82,7 +89,7 @@ namespace simgear {
                return split_whitespace( str, maxsplit );
 
            vector<string> result;
-           int n = strlen( sep );
+           int n = std::strlen( sep );
            if (n == 0)
            {
                // Error: empty separator string
@@ -96,7 +103,7 @@ namespace simgear {
 
            while (i+n <= len)
            {
-               if (s[i] == sep[0] && (n == 1 || memcmp(s+i, sep, n) == 0))
+               if (s[i] == sep[0] && (n == 1 || std::memcmp(s+i, sep, n) == 0))
                {
                    result.push_back( str.substr(j,i-j) );
                    i = j = i + n;
@@ -126,10 +133,9 @@ namespace simgear {
        static string
        do_strip( const string& s, int striptype )
        {
-           //     if (s.empty())
-           //      return s;
-
            string::size_type len = s.length();
+           if( len == 0 ) // empty string is trivial
+               return s;
            string::size_type i = 0;
            if (striptype != RIGHTSTRIP)
            {
@@ -178,5 +184,81 @@ namespace simgear {
            return do_strip( s, BOTHSTRIP );
        }
 
+       string 
+       rpad( const string & s, string::size_type length, char c )
+       {
+           string::size_type l = s.length();
+           if( l >= length ) return s;
+           string reply = s;
+           return reply.append( length-l, c );
+       }
+
+       string 
+       lpad( const string & s, size_t length, char c )
+       {
+           string::size_type l = s.length();
+           if( l >= length ) return s;
+           string reply = s;
+           return reply.insert( 0, length-l, c );
+       }
+
+       bool
+       starts_with( const string & s, const string & substr )
+       {       
+               return s.find( substr ) == 0;
+       }
+
+       bool
+       ends_with( const string & s, const string & substr )
+       {       
+               size_t n = s.rfind( substr );
+               return (n != string::npos) && (n == s.length() - substr.length());
+       }
+
+    string simplify(const string& s)
+    {
+        string result; // reserve size of 's'?
+        string::const_iterator it = s.begin(),
+            end = s.end();
+    
+    // advance to first non-space char - simplifes logic in main loop,
+    // since we can always prepend a single space when we see a 
+    // space -> non-space transition
+        for (; (it != end) && isspace(*it); ++it) { /* nothing */ }
+        
+        bool lastWasSpace = false;
+        for (; it != end; ++it) {
+            char c = *it;
+            if (isspace(c)) {
+                lastWasSpace = true;
+                continue;
+            }
+            
+            if (lastWasSpace) {
+                result.push_back(' ');
+            }
+            
+            lastWasSpace = false;
+            result.push_back(c);
+        }
+        
+        return result;
+    }
+    
+    int to_int(const std::string& s, int base)
+    {
+        stringstream ss(s);
+        switch (base) {
+        case 8:      ss >> std::oct; break;
+        case 16:     ss >> std::hex; break;
+        default: break;
+        }
+        
+        int result;
+        ss >> result;
+        return result;
+    }
+    
     } // end namespace strutils
+    
 } // end namespace simgear