Changes in libcfa/src/containers/string_res.cfa [d32679d5:7d25f44]

File:

• libcfa/src/containers/string_res.cfa (modified) (18 diffs)

libcfa/src/containers/string_res.cfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Aug 12 15:37:47 2023
-// Update Count     : 10
+// Last Modified On : Thu Jun 29 09:29:06 2023
+// Update Count     : 2
 //
 
@@ -17 +17 @@
 #include "string_sharectx.hfa"
 #include "stdlib.hfa"
-#include <ctype.h>
 
 // Workaround for observed performance penalty from calling CFA's alloc.
@@ -135 +134 @@
         serr | nlOff;
         serr | " lnth:" | lnth | " s:" | (void *)s | ",\"";
-        for ( i; lnth ) {
+        for ( int i = 0; i < lnth; i += 1 ) {
             serr | s[i];
         } // for
@@ -199 +198 @@
 // Output operator
 ofstream & ?|?(ofstream &out, const string_res &s) {
-        // CFA string is NOT null terminated, so print exactly lnth characters in a minimum width of 0.
-        out | wd( 0, s.Handle.lnth, s.Handle.s ) | nonl;
+    // Store auto-newline state so it can be restored
+    bool anl = getANL$(out);
+    nlOff(out);
+    for (size_t i = 0; i < s.Handle.lnth; i++) {
+        out | s[i];
+    }
+    out | sepVal;
+    // Re-apply newlines after done, for chaining version
+    if (anl) nlOn(out);
     return out;
 }
 
 void ?|?(ofstream &out, const string_res &s) {
-        (ofstream &)(out | s); ends( out );
-}
-
-// Input operator
-ifstream & ?|?(ifstream &in, string_res &s) {
-
-    // Reading into a temp before assigning to s is near zero overhead in typical cases because of sharing.
-    // If s is a substring of something larger, simple assignment takes care of that case correctly.
-    // But directly reading a variable amount of text into the middle of a larger context is not practical.
-    string_res temp;
-
-    // Read in chunks.  Often, one chunk is enough.  Keep the string that accumulates chunks last in the heap,
-    // so available room is rest of heap.  When a chunk fills the heap, force growth then take the next chunk.
-    for (;;) {
-        // Append dummy content to temp, forcing expansion when applicable (occurs always on subsequent loops)
-        // length 2 ensures room for at least one real char, plus scanf/pipe-cstr's null terminator
-        temp += "--";
-        assert( temp.Handle.ulink->EndVbyte == temp.Handle.s + temp.Handle.lnth );    // last in heap
-
-        // reset, to overwrite the appended "--"
-        temp.Handle.lnth -= 2;
-        temp.Handle.ulink->EndVbyte -= 2;
-
-        // rest of heap, less 1 byte for null terminator, is available to read into
-        int lenReadable = (char*)temp.Handle.ulink->ExtVbyte - temp.Handle.ulink->EndVbyte - 1;
-        assert (lenReadable >= 1);
-
-        // get bytes
-        in | wdi( lenReadable, temp.Handle.ulink->EndVbyte );
-        int lenWasRead = strlen(temp.Handle.ulink->EndVbyte);
-
-        // update metadata
-        temp.Handle.lnth += lenWasRead;
-        temp.Handle.ulink->EndVbyte += lenWasRead;
-
-      if (lenWasRead < lenReadable) break;
-    }
-
-    s = temp;
-    return in;
-}
-
+    // Store auto-newline state so it can be restored
+    bool anl = getANL$(out);
+    if( s.Handle.lnth == 0 ) {
+        sout | "";
+    } else {
+        nlOff(out);
+        for (size_t i = 0; i < s.Handle.lnth; i++) {
+            // Need to re-apply on the last output operator, for whole-statement version
+            if (anl && i == s.Handle.lnth-1) nlOn(out);
+            out | s[i];
+        }
+    }
+}
 
 // Empty constructor
@@ -361 +338 @@
     // adjust all substring string and handle locations, and check if any substring strings are outside the new base string
     char *limit = resultSesStart + resultSesLnth;
-    for ( string_res * p = this.shareEditSet_next; p != &this; p = p->shareEditSet_next ) {
+    for (string_res * p = this.shareEditSet_next; p != &this; p = p->shareEditSet_next) {
         verify (p->Handle.s >= beforeBegin);
         if ( p->Handle.s >= afterBegin ) {
@@ -414 +391 @@
 }
 
-// traverse the share-edit set (SES) to recover the range of a base string to which `this` belongs
-static void locateInShareEditSet( string_res &this, string_res *&shareEditSetStartPeer, string_res *&shareEditSetEndPeer ) {
-    shareEditSetStartPeer = & this;
-    shareEditSetEndPeer = & this;
+static string_res & assign_(string_res &this, const char* buffer, size_t bsize, const string_res & valSrc) {
+
+    // traverse the incumbent share-edit set (SES) to recover the range of a base string to which `this` belongs
+    string_res * shareEditSetStartPeer = & this;
+    string_res * shareEditSetEndPeer = & this;
     for (string_res * editPeer = this.shareEditSet_next; editPeer != &this; editPeer = editPeer->shareEditSet_next) {
         if ( editPeer->Handle.s < shareEditSetStartPeer->Handle.s ) {
@@ -426 +404 @@
         }
     }
-}
-
-static string_res & assign_(string_res &this, const char* buffer, size_t bsize, const string_res & valSrc) {
-
-    string_res * shareEditSetStartPeer;
-    string_res * shareEditSetEndPeer;
-    locateInShareEditSet( this, shareEditSetStartPeer, shareEditSetEndPeer );
 
     verify( shareEditSetEndPeer->Handle.s >= shareEditSetStartPeer->Handle.s );
@@ -618 +589 @@
 
 bool contains(const string_res &s, char ch) {
-    for ( i; size(s) ) {
+    for (i; size(s)) {
         if (s[i] == ch) return true;
     }
@@ -672 +643 @@
     }
 
-    for ( i; fromPos ~ s.Handle.lnth ) {
+    for (size_t i = fromPos; i < s.Handle.lnth; i++) {
         size_t remaining = s.Handle.lnth - i;
         // Never going to find the search string if the remaining string is
@@ -681 +652 @@
 
         bool matched = true;
-        for ( j; searchsize ) {
+        for (size_t j = 0; j < searchsize; j++) {
             if (search[j] != s.Handle.s[i + j]) {
                 matched = false;
@@ -769 +740 @@
 
 int exclude(const string_res &s, const charclass_res &mask) {
-    for ( i; size(s) ) {
+    for (int i = 0; i < size(s); i++) {
         if ( test(mask, s[i]) ) return i;
     }
@@ -776 +747 @@
 
 int include(const string_res &s, const charclass_res &mask) {
-    for ( i; size(s) ) {
+    for (int i = 0; i < size(s); i++) {
         if ( ! test(mask, s[i]) ) return i;
     }
@@ -804 +775 @@
                 for ( HandleNode *ni = HeaderPtr->flink; ni != HeaderPtr; ni = ni->flink ) {
                         serr | "\tnode:" | ni | " lnth:" | ni->lnth | " s:" | (void *)ni->s | ",\"";
-                        for ( i; ni->lnth ) {
+                        for ( int i = 0; i < ni->lnth; i += 1 ) {
                                 serr | ni->s[i];
                         } // for
@@ -910 +881 @@
         for ( HandleNode *n = HeaderPtr->flink; n != HeaderPtr; n = n->flink ) {
             serr | "\tnode:" | n | " lnth:" | n->lnth | " s:" | (void *)n->s | ",\"";
-            for ( i; n->lnth ) {
-                        serr | n->s[i];
+            for ( int i = 0; i < n->lnth; i += 1 ) {
+                serr | n->s[i];
             } // for
             serr | "\" flink:" | n->flink | " blink:" | n->blink | nl;
@@ -989 +960 @@
     EndVbyte = StartVbyte;
     h = Header.flink;                                   // ignore header node
-    for () {
+    for (;;) {
                 memmove( EndVbyte, h->s, h->lnth );
                 obase = h->s;
@@ -1000 +971 @@
                 // check if any substrings are allocated within a string
                 
-                for () {
+                for (;;) {
                         if ( h == &Header ) break;                      // end of header list ?
                         if ( h->s >= limit ) break;                     // outside of current string ?
@@ -1030 +1001 @@
                         serr | nlOff;
                         serr | "\tnode:" | n | " lnth:" | n->lnth | " s:" | (void *)n->s | ",\"";
-                        for ( i; n->lnth ) {
+                        for ( int i = 0; i < n->lnth; i += 1 ) {
                                 serr | n->s[i];
                         } // for
@@ -1065 +1036 @@
                         serr | nlOff;
                         serr | "\tnode:" | n | " lnth:" | n->lnth | " s:" | (void *)n->s | ",\"";
-                        for ( i; n->lnth ) {
+                        for ( int i = 0; i < n->lnth; i += 1 ) {
                                 serr | n->s[i];
                         } // for