Changeset 7944 for trunk/mgpp

Timestamp:

2004-08-14T07:30:16+12:00 (20 years ago)

Author:

kjdon

Message:

trying to keep mgpp up to date with gsdl version. added in mdewsnip changes 2004/05/24: (Human Info) Added a variant of SetCStr that allows you to specify an initial size for the string (for more efficient memory usage). (Human Info) Changed iterators from here++ to ++here, and allocated memory for arrays a little better.

Location:

trunk/mgpp/text

Files:

• UCArray.cpp (modified) (8 diffs)
• UCArray.h (modified) (1 diff)

trunk/mgpp/text/UCArray.cpp

@@ -30 +30 @@
     text.push_back (*cStr);
     cStr++;
+  }
+}
+
+void SetCStr (UCArray &text, const char *cStr, size_t nSizeHint) {
+  text.erase(text.begin(), text.end());
+
+  // reserve the needed space in advance
+  if (text.capacity() < nSizeHint + 1) {
+    text.reserve(nSizeHint + 1);
+  }
+  while (*cStr != '\0') {
+    text.push_back (*cStr);
+    ++cStr;
   }
 }
@@ -53 +66 @@
   while (here != end) {
     s << *here;
-    here++;
+    ++here;
   }
 
@@ -133 +146 @@
   if (!ReadVarLenUL (f, arraySize)) return false;
 
+  // reserve the needed space in advance
+  if (a.capacity() < arraySize + 1) {
+    a.reserve(arraySize + 1);
+  }
+
   // read in the array
   unsigned char b = 0;
@@ -156 +174 @@
     if (ferror (f) != 0) return false;
     
-    here++;
+    ++here;
   }
   
@@ -219 +237 @@
       pos = diff;
 
-    a1Here++;
-    a2Here++;
+    ++a1Here;
+    ++a2Here;
   }
 
@@ -234 +252 @@
 
   while (i < l && *a1Here == *a2Here) {
-    i++; a1Here++; a2Here++;
+    i++; ++a1Here; ++a2Here;
   }
   
@@ -255 +273 @@
   char* tmp=GetCStr(a);
   int ret=(fwrite (tmp+preLen, sizeof (char), sufLen, f) == sufLen);
-  delete (tmp);
-  return (ret);
+  delete []tmp;
+  return (ret != 0);
 }
 
@@ -267 +285 @@
   sufLen = fgetc(f);
 
-  if (a.size () > preLen) a.erase (a.begin()+preLen, a.end());
+  if (a.size() > preLen) a.erase (a.begin()+preLen, a.end());
+
+  // reserve the needed space in advance
+  if (a.capacity() < a.size() + sufLen + 1) {
+    a.reserve(a.size() + sufLen + 1);
+  }
+
   while (sufLen > 0) {
     unsigned char c = fgetc (f);

trunk/mgpp/text/UCArray.h

@@ -55 +55 @@
 // functions to manipulate UCArrays
 void SetCStr (UCArray &text, const char *cStr);
+// same as SetCStr but first tries to allocate nSizeHint space (only if needed)
+void SetCStr (UCArray &text, const char *cStr, size_t nSizeHint);
 char * GetCStr(UCArray text);
 inline void UCArrayClear (UCArray &a) {