Changes in libcfa/src/iostream.cfa [04396aa:61c7239]

File:

• libcfa/src/iostream.cfa (modified) (6 diffs)

libcfa/src/iostream.cfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// iostream.cfa --
+// iostream.c --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 12 15:00:31 2019
-// Update Count     : 819
+// Last Modified On : Sun Jun  9 16:27:17 2019
+// Update Count     : 803
 //
 
@@ -740 +740 @@
         } // ?|?
 
-        istype & ?|?( istype & is, const char * fmt ) {
-                fmt( is, fmt, "" );
-                return is;
-        } // ?|?
-
-        istype & ?|?( istype & is, char * s ) {
-                fmt( is, "%s", s );
-                return is;
-        } // ?|?
-
         // manipulators
         istype & ?|?( istype & is, istype & (* manip)( istype & ) ) {
@@ -777 +767 @@
         // skip xxx
         if ( ! f.s ) {
-                //printf( "skip %s %d\n", f.scanset, f.wd );
-                if ( f.wd != -1 ) for ( f.wd ) fmt( is, "%*c" ); // no input arguments
-                else fmt( is, f.scanset, "" );
+                // printf( "skip %s\n", f.scanset );
+                fmt( is, f.scanset, "" );                                               // no input arguments
                 return is;
         } // if
@@ -808 +797 @@
 } // ?|?
 
-forall( dtype istype | istream( istype ) )
-istype & ?|?( istype & is, _Istream_Char f ) {
-        fmt( is, "%*c" );                                                                       // argument variable unused
-        return is;
-} // ?|?
-
 #define InputFMTImpl( T, CODE ) \
 forall( dtype istype | istream( istype ) ) \
@@ -819 +802 @@
         enum { size = 16 }; \
         char fmtstr[size]; \
-        if ( f.wd == -1 ) { \
+        if ( f.wd == -1 || strcmp( CODE, "c" ) == 0 ) { /* ignore width with "c" */     \
                 snprintf( fmtstr, size, "%%%s%s", f.ignore ? "*" : "", CODE ); \
         } else { \
@@ -829 +812 @@
 } // ?|?
 
+InputFMTImpl( char, "c" )
 InputFMTImpl( signed char, "hhi" )
 InputFMTImpl( unsigned char, "hhi" )