Changeset 7b93027e for libcfa

Timestamp:

Feb 11, 2024, 3:04:17 PM (3 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

75e2286

Parents:

0b6089f

Message:

remove unnecessary code, start missing values for C strings

File:

• libcfa/src/iostream.cfa (modified) (4 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 : Sat Feb 10 09:28:32 2024
-// Update Count     : 1946
+// Last Modified On : Sun Feb 11 09:16:19 2024
+// Update Count     : 1965
 //
 
@@ -1058 +1058 @@
                         if ( flags.ignore ) args = fmt( is, fmtstr, &len ); // no string argument for '*'
                         else args = fmt( is, fmtstr, s, &len );
-                        // fprintf( stderr, "cstr %s %d %d %d %s\n", fmtstr, args, len, wd, s );
+                        // fprintf( stderr, "cstr %s %d %d %d\n", fmtstr, args, len, f.cstr.wd );
                         if ( check && len >= rwd && ! eof( is ) ) {     // might not fit
                                 char peek;
@@ -1069 +1069 @@
                         } // if
                         // FIX ME: CFA strings need to be modified to NOT change the argument for this case, then this can be removed.
-                        if ( ! flags.ignore && args == 0 ) s[0]= '\0'; // read failed => no pattern match => set string to null
+                        //fprintf( stderr, "cstr %d %d %d %d '%s'\n", flags.ignore, args, len, eof( is ), s );
+                        //if ( ! flags.ignore && args == 0 ) s[0]= '\0'; // read failed => no pattern match => set string to null
                 } else {
                         if ( flags.delimiter ) {                                        // getline
@@ -1080 +1081 @@
                                 if ( flags.ignore ) args = fmt( is, fmtstr, &len ); // no string argument for '*'
                                 else args = fmt( is, fmtstr, s, &len );
-
-                                // cannot have empty character constant ''
-                                if ( delimiters[2] != '\0' && len != 1 ) throwResume ExceptionInst( missing_data );
 
                                 if ( check && len == rwd && ! eof( is ) ) {     // might not fit