Changeset 9ca5e56 for libcfa

Timestamp:

Aug 12, 2023, 3:49:57 PM (16 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

d32679d5

Parents:

43109ce

Message:

formatting, remove superfluous space at end of string when printing, change C for-loops into CFA for-loops

Location:

libcfa/src/containers

Files:

• string.cfa (modified) (2 diffs)
• string_res.cfa (modified) (16 diffs)
• string_res.hfa (modified) (2 diffs)

libcfa/src/containers/string.cfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug  7 10:07:26 2023
-// Update Count     : 2
+// Last Modified On : Sat Aug 12 15:24:18 2023
+// Update Count     : 6
 //
 
@@ -102 +102 @@
 // Output
 
-ofstream & ?|?( ofstream & fs, const string & this ) {
-    return fs | (*this.inner);
-}
-
-void ?|?( ofstream & fs, const string & this ) {
-    fs | (*this.inner);
+ofstream & ?|?( ofstream & out, const string & this ) {
+    return out | (*this.inner); // print internal string_res
+}
+
+void ?|?( ofstream & out, const string & this ) {
+    (ofstream &)(out | (*this.inner)); ends( out );
 }
 

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 : Thu Jun 29 09:29:06 2023
-// Update Count     : 2
+// Last Modified On : Sat Aug 12 15:37:47 2023
+// Update Count     : 10
 //
 
@@ -134 +134 @@
         serr | nlOff;
         serr | " lnth:" | lnth | " s:" | (void *)s | ",\"";
-        for ( int i = 0; i < lnth; i += 1 ) {
+        for ( i; lnth ) {
             serr | s[i];
         } // for
@@ -198 +198 @@
 // Output operator
 ofstream & ?|?(ofstream &out, const string_res &s) {
-    // 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);
+        // 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;
     return out;
 }
 
 void ?|?(ofstream &out, const string_res &s) {
-    // 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];
-        }
-    }
+        (ofstream &)(out | s); ends( out );
 }
 
@@ -338 +320 @@
     // 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 ) {
@@ -396 +378 @@
     string_res * shareEditSetStartPeer = & this;
     string_res * shareEditSetEndPeer = & this;
-    for (string_res * editPeer = this.shareEditSet_next; editPeer != &this; editPeer = editPeer->shareEditSet_next) {
+    for ( string_res * editPeer = this.shareEditSet_next; editPeer != &this; editPeer = editPeer->shareEditSet_next ) {
         if ( editPeer->Handle.s < shareEditSetStartPeer->Handle.s ) {
             shareEditSetStartPeer = editPeer;
@@ -589 +571 @@
 
 bool contains(const string_res &s, char ch) {
-    for (i; size(s)) {
+    for ( i; size(s) ) {
         if (s[i] == ch) return true;
     }
@@ -643 +625 @@
     }
 
-    for (size_t i = fromPos; i < s.Handle.lnth; i++) {
+    for ( i; fromPos ~ s.Handle.lnth ) {
         size_t remaining = s.Handle.lnth - i;
         // Never going to find the search string if the remaining string is
@@ -652 +634 @@
 
         bool matched = true;
-        for (size_t j = 0; j < searchsize; j++) {
+        for ( j; searchsize ) {
             if (search[j] != s.Handle.s[i + j]) {
                 matched = false;
@@ -740 +722 @@
 
 int exclude(const string_res &s, const charclass_res &mask) {
-    for (int i = 0; i < size(s); i++) {
+    for ( i; size(s) ) {
         if ( test(mask, s[i]) ) return i;
     }
@@ -747 +729 @@
 
 int include(const string_res &s, const charclass_res &mask) {
-    for (int i = 0; i < size(s); i++) {
+    for ( i; size(s) ) {
         if ( ! test(mask, s[i]) ) return i;
     }
@@ -775 +757 @@
                 for ( HandleNode *ni = HeaderPtr->flink; ni != HeaderPtr; ni = ni->flink ) {
                         serr | "\tnode:" | ni | " lnth:" | ni->lnth | " s:" | (void *)ni->s | ",\"";
-                        for ( int i = 0; i < ni->lnth; i += 1 ) {
+                        for ( i; ni->lnth ) {
                                 serr | ni->s[i];
                         } // for
@@ -881 +863 @@
         for ( HandleNode *n = HeaderPtr->flink; n != HeaderPtr; n = n->flink ) {
             serr | "\tnode:" | n | " lnth:" | n->lnth | " s:" | (void *)n->s | ",\"";
-            for ( int i = 0; i < n->lnth; i += 1 ) {
-                serr | n->s[i];
+            for ( i; n->lnth ) {
+                        serr | n->s[i];
             } // for
             serr | "\" flink:" | n->flink | " blink:" | n->blink | nl;
@@ -960 +942 @@
     EndVbyte = StartVbyte;
     h = Header.flink;                                   // ignore header node
-    for (;;) {
+    for () {
                 memmove( EndVbyte, h->s, h->lnth );
                 obase = h->s;
@@ -971 +953 @@
                 // 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 ?
@@ -1001 +983 @@
                         serr | nlOff;
                         serr | "\tnode:" | n | " lnth:" | n->lnth | " s:" | (void *)n->s | ",\"";
-                        for ( int i = 0; i < n->lnth; i += 1 ) {
+                        for ( i; n->lnth ) {
                                 serr | n->s[i];
                         } // for
@@ -1036 +1018 @@
                         serr | nlOff;
                         serr | "\tnode:" | n | " lnth:" | n->lnth | " s:" | (void *)n->s | ",\"";
-                        for ( int i = 0; i < n->lnth; i += 1 ) {
+                        for ( i; n->lnth ) {
                                 serr | n->s[i];
                         } // for

libcfa/src/containers/string_res.hfa

@@ -9 +9 @@
 // Author           : Michael L. Brooks
 // Created On       : Fri Sep 03 11:00:00 2021
-// Last Modified By : Michael L. Brooks
-// Last Modified On : Fri Sep 03 11:00:00 2021
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Aug 12 15:45:47 2023
+// Update Count     : 2
 //
 
@@ -30 +30 @@
     VbyteHeap *ulink;                   // upward link
 
-    char *s;                                            // pointer to byte string
+    char *s;                                                    // pointer to byte string
     unsigned int lnth;                                  // length of byte string
 }; // HandleNode