Changeset 607 for CMT/HEAD/source/cmt_string.cxx

Timestamp:

Apr 3, 2012, 3:54:50 PM (12 years ago)

Author:

rybkin

Message:

See C.L. 482

File:

• CMT/HEAD/source/cmt_string.cxx (modified) (5 diffs)

CMT/HEAD/source/cmt_string.cxx

@@ -244 +244 @@
 void cmt_string::resize (int n)
 {
+  _size = n;
   allocate (n + 1);
+  _data[n] = 0;
 }
 
@@ -544 +546 @@
   if ((_data == 0) ||
       (pos < 0) ||
-      (pos >= _size))
+      (pos >= _size) ||
+      length == 0)
     {
       return ((cmt_string) "");
@@ -550 +553 @@
   else
     {
+      //      cerr << "|cmt_string::substr>: `" << *this << "' pos: " << pos << " length: " << length;
+
+      if ((pos + length) >= _size ||
+          length < 0)
+        {
+          //      cmt_string result (&_data[pos]);
+          //cerr << " |---> `" << result << "'" << endl;
+          //      return (result);
+          return (&_data[pos]);
+        }
+      else
+        {
+          cmt_string result;
+          result.resize (length);
+          for (int i = 0; i < length; i++)
+            result[i] = _data[pos + i];
+          //cerr << " |---> `" << result << "'" << endl;
+          return (result);
+        }
+
+      /*
       cmt_string result (&_data[pos]);
       result.erase (length);
+      cerr << " |---> `" << result << "'" << endl;
       return (result);
+      */
     }
 }
@@ -574 +600 @@
   if ((_data == 0) ||
       (pos < 0) ||
-      (pos >= _size))
+      (pos >= _size) ||
+      length == 0)
     {
       dest = "";
@@ -580 +607 @@
   else
     {
+      //      cerr << "|void cmt_string::substr>: `" << *this << "' pos: " << pos << " length: " << length;
+
+      if ((pos + length) >= _size ||
+          length < 0)
+        {
+          dest = (const char*) &_data[pos];
+        }
+      else
+        {
+          dest.resize (length);
+          for (int i = 0; i < length; i++)
+            dest[i] = _data[pos + i];
+        }
+
+      /*
       dest = (const char*) &_data[pos];
       dest.erase (length);
+      */
+      //      cerr << " |---> `" << dest << "'" << endl;
     }
 }