Changeset 714e206 for libcfa/src/collections

Timestamp:

Feb 10, 2024, 5:59:21 PM (5 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

9d4628b

Parents:

956299b

Message:

more cleanup, changes related to detection of missing values during input

File:

• libcfa/src/collections/string_res.cfa (modified) (2 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 : Wed Feb  7 22:21:33 2024
-// Update Count     : 81
+// Last Modified On : Sat Feb 10 17:47:22 2024
+// Update Count     : 83
 //
 
@@ -252 +252 @@
 
 ifstream & ?|?( ifstream & is, _Istream_Rquoted f ) with( f.rstr ) {
+        if ( eof( is ) ) throwResume ExceptionInst( missing_data );
         int args;
   fini: {
-                args = fmt( is, "%*[ \f\n\r\t\v]" );                    // remove leading whitespace
-          if ( eof( is ) ) break fini;
-                char rfmt[4] = { delimiters[0], '%', 'n', '\0' };
-                int len = 0;                                                                    // may not be set in fmt
-                args = fmt( is, rfmt, &len );                                   // remove leading quote
-          if ( len == 0 || eof( is ) ) break fini;
+                char rfmt[5] = { ' ', delimiters[0], '%', 'n', '\0' };
+                int len = -1;                                                                   // may not be set in fmt
+                args = fmt( is, rfmt, &len );                                   // remove leading whitespace and quote
+          if ( eof( is ) || len == -1 ) break fini;
 
                 // Change the remainder of the read into a getline by reseting the closing delimiter.