Changeset 2b30370

Timestamp:

Oct 20, 2021, 4:38:37 PM (3 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

4e8df745

Parents:

0ca15b7

Message:

Bug fixes for empty-string from no-arg ctor with sharing off

Files:

• libcfa/src/containers/string_res.cfa (modified) (2 diffs)
• tests/collections/.expect/string-api-coverage.txt (modified) (1 diff)
• tests/collections/string-api-coverage.cfa (modified) (1 diff)

libcfa/src/containers/string_res.cfa

@@ -209 +209 @@
     // 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++) {
-        // 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];
-    }
-    return 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];
+        }
+    }
 }
 
@@ -223 +226 @@
         (Handle){ * ambient_string_sharectx->activeHeap };
         (shareEditSet_owns_ulink){ false };
+        verify( Handle.s == 0p && Handle.lnth == 0 );
     } else {
         (Handle){ * new( (size_t) 10 ) };  // TODO: can I lazily avoid allocating for empty string
         (shareEditSet_owns_ulink){ true };
+        Handle.s = Handle.ulink->StartVbyte;
+        verify( Handle.lnth == 0 );
     }
     s.shareEditSet_prev = &s;

tests/collections/.expect/string-api-coverage.txt

@@ -1 +1 @@
 hello hello hello
+
+hello
 true false
 true false

tests/collections/string-api-coverage.cfa

@@ -37 +37 @@
 
     // IO operator, x2
-    sout | s | s | s;
+    sout | s | s | s;  // hello hello hello
+
+    // empty ctor then assign
+    string sxx;
+    sout | sxx;  // (blank line)
+    sxx = s;
+    sout | sxx;  // hello
 
     // Comparisons