Changeset fc12f05 for libcfa/src/collections/string_res.cfa

Timestamp:

Nov 13, 2023, 3:43:43 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

25f2798

Parents:

0030b508 (diff), 2174191 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• libcfa/src/collections/string_res.cfa (modified) (5 diffs)

libcfa/src/collections/string_res.cfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 14 18:06:01 2023
-// Update Count     : 12
+// Last Modified On : Wed Oct 18 21:54:54 2023
+// Update Count     : 15
 //
 
@@ -236 +236 @@
         // get bytes
         try {
+                        *(temp.Handle.ulink->EndVbyte) = '\0';   // pre-assign empty cstring
             in | wdi( lenReadable, temp.Handle.ulink->EndVbyte );
         } catch (cstring_length*) {
@@ -247 +248 @@
     }
 
-    s = temp;
+        if ( temp.Handle.lnth > 0 ) s = temp;
     return in;
 }
 
 void ?|?( ifstream & in, string_res & this ) {
-    (ifstream &)(in | this); ends( in );
+    (ifstream &)(in | this);
 }
 
@@ -268 +269 @@
         cstr[wd] = '\0';                                                                        // guard null terminate string
         try {
+                cstr[0] = '\0';                                                                 // pre-assign as empty cstring
                 is | cf;
         } catch( cstring_length * ) {
                 cont = true;
         } finally {
-        if ( ! cf.flags.ignore ) *(f.s) = cstr;                 // ok to initialize string
+                if ( ! cf.flags.ignore &&                                               // ok to initialize string
+                                cstr[0] != '\0' ) {                                             // something was read
+                        *(f.s) = cstr;
+                }
         } // try
         for ( ; cont; )  {                                                                      // overflow read ?
                 cont = false;
                 try {
+                        cstr[0] = '\0';                                                         // pre-assign as empty cstring
                         is | cf;
                 } catch( cstring_length * ) {
                         cont = true;                                                            // continue not allowed
                 } finally {
-                        if ( ! cf.flags.ignore ) *(f.s) += cstr;        // build string chunk at a time
+                        if ( ! cf.flags.ignore &&
+                                        cstr[0] != '\0' ) {                                     // something was read
+                                *(f.s) += cstr;                                                 // build string chunk at a time
+                        }
                 } // try
         } // for
@@ -288 +297 @@
 
 void ?|?( ifstream & in, _Istream_Rstr f ) {
-    (ifstream &)(in | f); ends( in );
+    (ifstream &)(in | f);
 }