(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.55 and 1.65

version 1.55, 2002/08/29 16:54:38 version 1.65, 2002/09/20 22:11:25
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 51 
Line 56 
  
 CString::CString(const CString& cstr) CString::CString(const CString& cstr)
 { {
     _rep = new char[strlen(cstr._rep)+1];      _rep = (void*)new char[strlen((char*)cstr._rep)+1];
     _rep = strcpy(_rep, cstr._rep);      strcpy((char*)_rep, (char*)cstr._rep);
 } }
  
 CString::CString(char* cstr) CString::CString(char* cstr)
Line 63 
Line 68 
 CString::~CString() CString::~CString()
 { {
     if (_rep)     if (_rep)
         delete [] _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 CString::operator const char*() const
 { {
     return _rep;      return (char*)_rep;
 } }
  
 /////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
Line 340 
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(getChar16Data() + index, length);         return String(getChar16Data() + index, length);
Line 422 
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 530 
Line 543 
 } }
  
  
   #if 0
 // ATTN-RK-P3-20020603: This code is not completely correct // ATTN-RK-P3-20020603: This code is not completely correct
  // Wildcard String matching function that may be useful in the future  // Wildcard String matching function that may be useful in the future
 // The following code was provided by Bob Blair. // The following code was provided by Bob Blair.
Line 652 
Line 666 
 } }
  
  
       /** match matches a string against a GLOB style pattern.
           Return trues if the String parameter matches the pattern. C-Shell style
           glob matching is used.
           @param str String to be matched against the pattern
           @param pattern Pattern to use in the match
           @return Boolean true if str matches pattern
           The pattern definition is as follows:
           <pre>
           *             Matches any number of any characters
           ?             Match exactly one character
           [chars]       Match any character in chars
           [chara-charb] Match any character in the range between chara and charb
           </pre>
           The literal characters *, ?, [, ] can be included in a string by
           escaping them with backslash "\".  Ranges of characters can be concatenated.
           <pre>
           examples:
           Boolean result = String::match("This is a test", "*is*");
           Boolean works =  String::match("abcdef123", "*[0-9]");
           </pre>
       */
 Boolean String::match(const String& str, const String& pattern) Boolean String::match(const String& str, const String& pattern)
 { {
     return _StringMatch(     return _StringMatch(
         (Uint16*)str.getChar16Data(), (Uint16*)pattern.getChar16Data(), 0) != 0;         (Uint16*)str.getChar16Data(), (Uint16*)pattern.getChar16Data(), 0) != 0;
 } }
  
       /** matchNoCase Matches a String against a GLOB style pattern independent
           of case.
           Returns true if the str parameter matches the pattern. C-Shell style
           glob matching is used. Ignore case in all comparisons. Case is
           ignored in the match.
           @parm str String containing the string to be matched\
           @parm pattern GLOB style patterh to use in the match.
           @return Boolean true if str matches patterh
           @SeeAlso match
       */
 Boolean String::matchNoCase(const String& str, const String& pattern) Boolean String::matchNoCase(const String& str, const String& pattern)
 { {
     return _StringMatch(     return _StringMatch(
         (Uint16*)str.getChar16Data(), (Uint16*)pattern.getChar16Data(), 1) != 0;         (Uint16*)str.getChar16Data(), (Uint16*)pattern.getChar16Data(), 1) != 0;
 } }
   #endif
  
  
 /////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
Line 738 
Line 784 
     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.55  
changed lines
  Added in v.1.65
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2