(file) Return to String.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/String.cpp between version 1.53 and 1.64

version 1.53, 2002/08/27 23:38:44 version 1.64, 2002/09/20 19:57:09
Line 29 
Line 29 
  
  
 #include <cctype> #include <cctype>
   #include <cstring>
 #include "String.h" #include "String.h"
 #include "Array.h" #include "Array.h"
 #include "InternalException.h" #include "InternalException.h"
 #include <iostream> #include <iostream>
   #include <fstream>
   #ifndef PEGASUS_REMOVE_DEPRECATED
   #include "System.h"  // for strcasecmp
   #endif
  
 PEGASUS_USING_STD; PEGASUS_USING_STD;
  
Line 40 
Line 45 
  
 /////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
 // //
   // CString
   //
   ///////////////////////////////////////////////////////////////////////////////
   
   CString::CString()
       : _rep(0)
   {
   }
   
   CString::CString(const CString& cstr)
   {
       _rep = (void*)new char[strlen((char*)cstr._rep)+1];
       strcpy((char*)_rep, (char*)cstr._rep);
   }
   
   CString::CString(char* cstr)
       : _rep(cstr)
   {
   }
   
   CString::~CString()
   {
       if (_rep)
           delete [] (char*)_rep;
   }
   
   CString& CString::operator=(const CString& cstr)
   {
       _rep = (char*)new char[strlen((char*)cstr._rep)+1];
       strcpy((char*)_rep, (char*)cstr._rep);
       return *this;
   }
   
   CString::operator const char*() const
   {
       return (char*)_rep;
   }
   
   ///////////////////////////////////////////////////////////////////////////////
   //
 // String // String
 // //
 /////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
Line 128 
Line 173 
 String::String(const String& str, Uint32 n) String::String(const String& str, Uint32 n)
 { {
     _rep = new StringRep;     _rep = new StringRep;
     assign(str.getData(), n);      assign(str.getChar16Data(), n);
 } }
  
 String::String(const Char16* str) String::String(const Char16* str)
Line 230 
Line 275 
     return _rep->c16a.size() - 1;     return _rep->c16a.size() - 1;
 } }
  
 const Char16* String::getData() const  const Char16* String::getChar16Data() const
 { {
     return _rep->c16a.getData();     return _rep->c16a.getData();
 } }
  
 char* String::allocateCString(Uint32 extraBytes, Boolean& truncatedCharacters) const  CString String::getCString() const
 { {
     truncatedCharacters = false;  
     Uint32 n = size() + 1;     Uint32 n = size() + 1;
     char* str = new char[n + extraBytes];      char* str = new char[n];
     char* p = str;     char* p = str;
     const Char16* q = getData();      const Char16* q = getChar16Data();
  
     for (Uint32 i = 0; i < n; i++)     for (Uint32 i = 0; i < n; i++)
     {     {
         Uint16 c = *q++;         Uint16 c = *q++;
         *p++ = char(c);         *p++ = char(c);
  
         if (c & 0xff00)          //if (c & 0xff00)
             truncatedCharacters = true;          //    truncatedCharacters = true;
     }  
   
     return str;  
 } }
  
 char* String::allocateCString(Uint32 extraBytes) const      return CString(str);
 {  
     Boolean truncatedCharacters = false;  
     return allocateCString(extraBytes, truncatedCharacters);  
 } }
  
 Char16& String::operator[](Uint32 index) Char16& String::operator[](Uint32 index)
Line 295 
Line 333 
  
 String& String::append(const String& str) String& String::append(const String& str)
 { {
     return append(str.getData(), str.size());      return append(str.getChar16Data(), str.size());
 } }
  
 void String::remove(Uint32 index, Uint32 size) void String::remove(Uint32 index, Uint32 size)
Line 314 
Line 352 
 { {
     if (index < size())     if (index < size())
     {     {
         if (length == PEG_NOT_FOUND)          if ((length == PEG_NOT_FOUND) || (length > size() - index))
             length = size() - index;             length = size() - index;
  
         return String(getData() + index, length);          return String(getChar16Data() + index, length);
     }     }
     else     else
         return String();         return String();
Line 325 
Line 363 
  
 Uint32 String::find(Char16 c) const Uint32 String::find(Char16 c) const
 { {
     const Char16* first = getData();      const Char16* first = getChar16Data();
  
     for (const Char16* p = first; *p; p++)     for (const Char16* p = first; *p; p++)
     {     {
Line 338 
Line 376 
  
 Uint32 String::find(Uint32 index, Char16 c) const Uint32 String::find(Uint32 index, Char16 c) const
 { {
     const Char16* data = getData();      const Char16* data = getChar16Data();
  
     for (Uint32 i = index, n = size(); i < n; i++)     for (Uint32 i = index, n = size(); i < n; i++)
     {     {
Line 351 
Line 389 
  
 Uint32 String::find(const String& s) const Uint32 String::find(const String& s) const
 { {
     const Char16* pSubStr = s.getData();      const Char16* pSubStr = s.getChar16Data();
     const Char16* pStr = getData();      const Char16* pStr = getChar16Data();
     Uint32 subStrLen = s.size();     Uint32 subStrLen = s.size();
     Uint32 strLen = size();     Uint32 strLen = size();
  
Line 384 
Line 422 
  
 Uint32 String::reverseFind(Char16 c) const Uint32 String::reverseFind(Char16 c) const
 { {
     const Char16* first = getData();      const Char16* first = getChar16Data();
     const Char16* last = getData() + size();      const Char16* last = getChar16Data() + size();
  
     while (last != first)     while (last != first)
     {     {
Line 396 
Line 434 
     return PEG_NOT_FOUND;     return PEG_NOT_FOUND;
 } }
  
   // ATTN-RK-P3-20020509: Define case-sensitivity for non-English characters
 void String::toLower() void String::toLower()
 { {
     for (Char16* p = &_rep->c16a[0]; *p; p++)     for (Char16* p = &_rep->c16a[0]; *p; p++)
Line 407 
Line 446 
  
 int String::compare(const String& s1, const String& s2, Uint32 n) int String::compare(const String& s1, const String& s2, Uint32 n)
 { {
     const Char16* s1c16 = s1.getData();      const Char16* s1c16 = s1.getChar16Data();
     const Char16* s2c16 = s2.getData();      const Char16* s2c16 = s2.getChar16Data();
  
     while (n--)     while (n--)
     {     {
Line 423 
Line 462 
  
 int String::compare(const String& s1, const String& s2) int String::compare(const String& s1, const String& s2)
 { {
     const Char16* s1c16 = s1.getData();      const Char16* s1c16 = s1.getChar16Data();
     const Char16* s2c16 = s2.getData();      const Char16* s2c16 = s2.getChar16Data();
  
     while (*s1c16 && *s2c16)     while (*s1c16 && *s2c16)
     {     {
Line 444 
Line 483 
  
 int String::compareNoCase(const String& s1, const String& s2) int String::compareNoCase(const String& s1, const String& s2)
 { {
     const Char16* _s1 = s1.getData();      const Char16* _s1 = s1.getChar16Data();
     const Char16* _s2 = s2.getData();      const Char16* _s2 = s2.getChar16Data();
  
     while (*_s1 && *_s2)     while (*_s1 && *_s2)
     {     {
Line 483 
Line 522 
     if (str1.size() != str2.size())     if (str1.size() != str2.size())
         return false;         return false;
  
     const Char16* p = str1.getData();      const Char16* p = str1.getChar16Data();
     const Char16* q = str2.getData();      const Char16* q = str2.getChar16Data();
  
     Uint32 n = str1.size();     Uint32 n = str1.size();
  
Line 629 
Line 668 
 Boolean String::match(const String& str, const String& pattern) Boolean String::match(const String& str, const String& pattern)
 { {
     return _StringMatch(     return _StringMatch(
         (Uint16*)str.getData(), (Uint16*)pattern.getData(), 0) != 0;          (Uint16*)str.getChar16Data(), (Uint16*)pattern.getChar16Data(), 0) != 0;
 } }
  
 Boolean String::matchNoCase(const String& str, const String& pattern) Boolean String::matchNoCase(const String& str, const String& pattern)
 { {
     return _StringMatch(     return _StringMatch(
         (Uint16*)str.getData(), (Uint16*)pattern.getData(), 1) != 0;          (Uint16*)str.getChar16Data(), (Uint16*)pattern.getChar16Data(), 1) != 0;
 } }
  
  
Line 712 
Line 751 
     return String::compare(str1, str2) >= 0;     return String::compare(str1, str2) >= 0;
 } }
  
   #ifndef PEGASUS_REMOVE_DEPRECATED
 int CompareNoCase(const char* s1, const char* s2) int CompareNoCase(const char* s1, const char* s2)
 { {
     while (*s1 && *s2)      return System::strcasecmp(s1, s2);
     {  
         int r = tolower(*s1++) - tolower(*s2++);  
   
         if (r)  
             return r;  
     }  
   
     if (*s2)  
         return -1;  
     else if (*s1)  
         return 1;  
   
     return 0;  
 }  
   
 int EqualNoCase(const char* s1, const char* s2)  
 {  
     return CompareNoCase(s1, s2) == 0;  
 } }
   #endif
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END

Legend:
Removed from v.1.53  
changed lines
  Added in v.1.64
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2