Changeset c015e2d for libcfa

Timestamp:

Jul 8, 2024, 8:37:18 PM (5 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

d287f3e

Parents:

a4e1b09

Message:

update reading boolean and match text

Location:

libcfa/src

Files:

• iostream.cfa (modified) (4 diffs)
• iostream.hfa (modified) (2 diffs)

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb 12 09:26:05 2024
-// Update Count     : 1966
+// Last Modified On : Mon Jul  8 16:49:05 2024
+// Update Count     : 2017
 //
 
@@ -772 +772 @@
 
 
+#define FALSE "false"
+#define TRUE "true"
+
 forall( istype & | basic_istream( istype ) ) {
         istype & ?|?( istype & is, bool & b ) {
                 if ( eof( is ) ) throwResume ExceptionInst( missing_data );
-                char val[6];
-                int args = fmt( is, "%5s", val );
-                if ( ! eof( is ) && args != 1 ) throwResume ExceptionInst( missing_data );
-                if ( strcmp( val, "true" ) == 0 ) b = true;
-                else if ( strcmp( val, "false" ) == 0 ) b = false;
-                else {
-                        fprintf( stderr, "invalid Boolean constant\n" );
-                        abort();                                                                        // cannot use abort stream
+                int len = -1;                                                                   // len not set if no match
+                // Optional leading whitespace at start of strings.
+                fmt( is, " " FALSE "%n", &len );                                // try false
+                if ( len != sizeof( FALSE ) - 1 ) {                             // remove null terminate
+                        fmt( is, " " TRUE "%n", &len );                         // try true
+                        if ( len != sizeof( TRUE ) - 1 ) throwResume ExceptionInst( missing_data );
                 } // if
                 return is;
@@ -940 +941 @@
         } // ?|?
 
-        istype & ?|?( istype & is, const char fmt[] ) {
+        istype & ?|?( istype & is, const char fmt[] ) {         // match text
                 if ( eof( is ) ) throwResume ExceptionInst( missing_data );
                 size_t len = strlen( fmt );
@@ -946 +947 @@
                 strcpy( fmtstr, fmt );                                                  // copy format and add %n
                 strcpy( &fmtstr[len], "%n" );
-                int len2 = -1;
-                fmt( is, fmtstr, &len2 );
-                if ( ! eof( is ) && len2 == -1 ) throwResume ExceptionInst( missing_data );
+                len = -1;
+                // scanf cursor does not move if no match
+                fmt( is, fmtstr, &len );
+                if ( ! eof( is ) && len == -1 ) throwResume ExceptionInst( missing_data );
                 return is;
         } // ?|?

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 21 07:32:19 2024
-// Update Count     : 744
+// Last Modified On : Sat Jul  6 11:33:31 2024
+// Update Count     : 758
 //
 
@@ -359 +359 @@
         istype & ?|?( istype &, long double _Complex & );
 
-        istype & ?|?( istype &, const char [] );
+        // This is too restrictive as it prevents building a format in a string and using that format.
+        // inline istype & ?|?( istype &, char [] ) {                   // possible error, too restrictive to change
+        //      _Static_assert( false, "reading a character array without a maximum length is unsafe. Use input manipulator \"wdi( N, s )\", where \"char s[N]\" or fmt( s )." );
+        // }
+        istype & ?|?( istype &, const char [] );                        // match text
 
         // manipulators