Changeset 21300d7 for libcfa/src/iostream.cfa

Timestamp:

Jun 12, 2019, 4:06:37 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

462a7c7, d60780c

Parents:

aaeacf4 (diff), 6625727 (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/iostream.cfa (modified) (6 diffs)

libcfa/src/iostream.cfa

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