cwText.h,cpp : Added case insensitve compare.

cwText.cpp

@@ -30,23 +30,6 @@ namespace cw
 
     return eosFl ? s : nullptr;
   }
-  /*
-  unsigned _toText( char* buf, unsigned bufN, unsigned char v )
-  {
-    if( bufN < 1 )
-      return 0;
-    buf[0] = v;
-    return 1;
-  }
-
-  unsigned _toText( char* buf, unsigned bufN, char v )
-  {
-    if( bufN < 1 )
-      return 0;
-    buf[0] = v;
-    return 1;
-  }
-  */
   
 }
 
@@ -77,21 +60,43 @@ const char* cw::textCopy( char* dst, unsigned dstN, const char* src, unsigned sr
   return dst;
 }
 
-
+void cw::textToLower( char* s )
-void textToLower( char* s )
 {
   if( s != nullptr )
     for(; *s; ++s)
       *s = std::tolower(*s);
 }
 
-void textToUpper( char* s )
+void cw::textToUpper( char* s )
 {
   if( s != nullptr )
     for(; *s; ++s)
       *s = std::toupper(*s);
 }
 
+void cw::textToLower( char* dst, const char* src, unsigned dstN )
+{
+  if( src != nullptr && dstN>0 )
+  {
+    unsigned sn = std::min(dstN,textLength(src)+1);
+    unsigned i;
+    for(i=0; i<sn; ++i)
+      dst[i] = std::tolower( src[i] );
+    dst[i-1] = 0;
+  }
+}
+
+void cw::textToUpper( char* dst, const char* src, unsigned dstN )
+{
+  if( src != nullptr && dstN>0 )
+  {
+    unsigned sn = std::min(dstN,textLength(src)+1);
+    unsigned i;
+    for(i=0; i<sn; ++i)
+      dst[i] = std::toupper( src[i] );
+    dst[i-1] = 0;
+  }
+}
 
 int cw::textCompare( const char* s0, const char* s1 )
 {
@@ -109,6 +114,26 @@ int cw::textCompare( const char* s0, const char* s1, unsigned n)
   return strncmp(s0,s1,n);  
 }
 
+int cw::textCompareI( const char* s0, const char* s1 )
+{
+  char b0N = textLength(s0)+1;
+  char b1N = textLength(s1)+1;
+  char b0[ b0N ];
+  char b1[ b1N ];
+  textToLower(b0,s0,b0N);
+  textToLower(b1,s1,b1N);
+  return textCompare(b0,b1);
+}
+
+int cw::textCompareI( const char* s0, const char* s1, unsigned n )
+{
+  char b0[ n+1 ];
+  char b1[ n+1 ];
+  textToLower(b0,s0,n+1);
+  textToLower(b1,s1,n+1);
+  return textCompare(b0,b1,n);
+}
+
 const char* cw::nextWhiteChar( const char* s )
 { return _nextWhiteChar(s,false); }
 

cwText.h

@@ -16,16 +16,33 @@ namespace cw
 
   void textToLower( char* s );
   void textToUpper( char* s );
+
+  void textToLower( char* dst, const char* src, unsigned dstN );
+  void textToUpper( char* dst, const char* src, unsigned dstN );
   
   // Note: if both s0 and s1 are nullptr then a match is indicated
-  int textCompare( const char* s0, const char* s1 );
+  int textCompare(  const char* s0, const char* s1 );
-  int textCompare( const char* s0, const char* s1, unsigned n);
+  int textCompare(  const char* s0, const char* s1, unsigned n);
+  
+  // Case insensitive compare
+  int textCompareI( const char* s0, const char* s1 );
+  int textCompareI( const char* s0, const char* s1, unsigned n);
   
   inline bool textIsEqual( const char* s0, const char* s1 )             { return textCompare(s0,s1) == 0; }
   inline bool textIsEqual( const char* s0, const char* s1, unsigned n ) { return textCompare(s0,s1,n) == 0; }
 
+  // Case insensitive is-equal
+  inline bool textIsEqualI( const char* s0, const char* s1 )             { return textCompareI(s0,s1) == 0; }
+  inline bool textIsEqualI( const char* s0, const char* s1, unsigned n ) { return textCompareI(s0,s1,n) == 0; }
+  
   inline bool textIsNotEqual( const char* s0, const char* s1 )             { return !textIsEqual(s0,s1);   }
   inline bool textIsNotEqual( const char* s0, const char* s1, unsigned n ) { return !textIsEqual(s0,s1,n); }
+
+  // Case insensitive is-not-equal
+  inline bool textIsNotEqualI( const char* s0, const char* s1 )             { return !textIsEqualI(s0,s1);   }
+  inline bool textIsNotEqualI( const char* s0, const char* s1, unsigned n ) { return !textIsEqualI(s0,s1,n); }
+
+  
   
   // Return a pointer to the next white space char
   // or nullptr if 's' is null are there are no whitespace char's.