Changeset 3da7c19 for libcfa/src/iostream.cfa

Timestamp:

Jun 11, 2019, 1:36:05 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

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:

4b7cce6

Parents:

d57e349 (diff), 8548c35 (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) (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 : Sun Jun  9 20:54:05 2019
-// Update Count     : 804
+// Last Modified On : Mon Jun 10 18:06:16 2019
+// Update Count     : 809
 //
 
@@ -797 +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 ) ) \
@@ -802 +808 @@
         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 +818 @@
 } // ?|?
 
-InputFMTImpl( char, "c" )
 InputFMTImpl( signed char, "hhi" )
 InputFMTImpl( unsigned char, "hhi" )