Changeset 0ca15b7

Timestamp:

Oct 19, 2021, 9:55:27 PM (3 years ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

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

Children:

2b30370

Parents:

fe18b46

Message:

String hybrid testing and fixing the overwrite cases

Files:

• libcfa/src/containers/string_res.cfa (modified) (4 diffs)
• tests/collections/.expect/string-overwrite-noshare.txt (added)
• tests/collections/string-overwrite-noshare.cfa (added)
• tests/collections/string-overwrite.cfa (modified) (6 diffs)

libcfa/src/containers/string_res.cfa

@@ -405 +405 @@
 
     verify( shareEditSetEndPeer->Handle.s >= shareEditSetStartPeer->Handle.s );
-    size_t editSetLength = shareEditSetEndPeer->Handle.s + shareEditSetEndPeer->Handle.lnth - shareEditSetStartPeer->Handle.s;
-    verify( editSetLength >= this.Handle.lnth );
+    size_t origEditSetLength = shareEditSetEndPeer->Handle.s + shareEditSetEndPeer->Handle.lnth - shareEditSetStartPeer->Handle.s;
+    verify( origEditSetLength >= this.Handle.lnth );
 
     if ( this.shareEditSet_owns_ulink ) {                 // assigning to private context
@@ -418 +418 @@
         if ( char * oldBytes = VbyteTryAdjustLast( *this.Handle.ulink, delta ) ) {
             // growing: copy from old to new
-            char * dest = VbyteAlloc( *this.Handle.ulink, editSetLength );
+            char * dest = VbyteAlloc( *this.Handle.ulink, origEditSetLength + delta );
             char *destCursor = dest;  memcpy(destCursor, prefixStartOrig, prefixLen);
             destCursor += prefixLen;  memcpy(destCursor, buffer         , bsize    );
@@ -424 +424 @@
             assignEditSet(this, shareEditSetStartPeer, shareEditSetEndPeer, 
                 dest,
-                editSetLength,
+                origEditSetLength + delta,
                 0p, bsize);
             free( oldBytes );
@@ -434 +434 @@
             assignEditSet(this, shareEditSetStartPeer, shareEditSetEndPeer, 
                 shareEditSetStartPeer->Handle.s,
-                editSetLength,
+                origEditSetLength + delta,
                 0p, bsize);
         }
 
     } else if (                                           // assigning to shared context
-        this.Handle.lnth == editSetLength &&              // overwriting entire run of SES
+        this.Handle.lnth == origEditSetLength &&          // overwriting entire run of SES
         & valSrc &&                                       // sourcing from a managed string
         valSrc.Handle.ulink == this.Handle.ulink  ) {     // sourcing from same heap

tests/collections/string-overwrite.cfa

@@ -1 +1 @@
 #include <containers/string.hfa>
+#include <string_sharectx.hfa>
 
 /*
@@ -11 +12 @@
 WE = witness end
 
-The dest does:
+The test does:
   starts with the entire string being, initially, the alphabet; prints this entire alphabet
   sets up modifier and witness as ranges within it, and prints a visualization of those ranges
@@ -24 +25 @@
 This API's convention has Start positions being inclusive and end positions being exclusive.
 
+                                v Case number in output
 With 1 equivalence class:
 MS = ME = WS = WE               1
@@ -118 +120 @@
     struct { int ms; int me; int ws; int we; char *replaceWith; char *label; } cases[] = {
         { 12, 14, 10, 20, "xxxxx", "warmup" },
-//        { 12, 14, 12, 14, "xxxxx", ""       },  // the bug that got me into this test (should be a dup with case 6)
         { 10, 10, 10, 10, "=====", "1"      },
         { 10, 10, 10, 10, "=="   , ""       },
@@ -223 +224 @@
         { 12, 14, 10, 16, "="    , ""       },
         { 12, 14, 10, 16, ""     , ""       },
-/*
-        { , , , , "=====", "NN"     },
-        {  "=="   , ""       },
-        {  "="    , ""       },
-        {  ""     , ""       },
-*/
     };
     for ( i; sizeof(cases)/sizeof(cases[0]) ) {
@@ -238 +233 @@
 
 
-// void f( string & s, string & toEdit ) {
-
-//     sout | s | "|" | toEdit | "|";
-
-//     s(14, 16) = "-";
-//     sout | s | "|" | toEdit | "|";
-// }
-
 int main() {
+
+    #ifdef STRING_SHARING_OFF
+    string_sharectx c = { NO_SHARING };
+    #endif
+
+
     //          0         1         2
     //          01234567890123456789012345