Changeset 86a8be5

Timestamp:

Jun 10, 2019, 9:36:03 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

b326277

Parents:

558d13b

Message:

not wd with char type, and update test appropriately

Files:

• libcfa/src/iostream.cfa (modified) (4 diffs)
• libcfa/src/iostream.hfa (modified) (3 diffs)
• tests/.expect/manipulatorsInput.txt (modified) (1 diff)
• tests/.in/manipulatorsInput.txt (modified) (1 diff)
• tests/manipulatorsInput.cfa (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 : 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" )

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 Jun  9 22:46:17 2019
-// Update Count     : 315
+// Last Modified On : Mon Jun 10 18:05:13 2019
+// Update Count     : 320
 //
 
@@ -347 +347 @@
 static inline _Istream_Cstr excl( const char * scanset, _Istream_Cstr & fmt ) { fmt.scanset = scanset; fmt.flags.inex = true; return fmt; }
 static inline _Istream_Cstr cstr( char * s ) { return (_Istream_Cstr){ s, 0p, -1, { .all : 0 } }; }
-static inline _Istream_Cstr ignore( const char * s ) { return (_Istream_Cstr)@{ s, 0p, -1, { .flags.ignore : true } }; }
+static inline _Istream_Cstr ignore( const char * s ) { return (_Istream_Cstr)@{ 0p, 0p, -1, { .flags.ignore : true } }; }
 static inline _Istream_Cstr ignore( _Istream_Cstr & fmt ) { fmt.flags.ignore = true; return fmt; }
 static inline _Istream_Cstr wd( unsigned int w, char * s ) { return (_Istream_Cstr)@{ s, 0p, w, { .all : 0 } }; }
 static inline _Istream_Cstr wd( unsigned int w, _Istream_Cstr & fmt ) { fmt.wd = w; return fmt; }
-forall( dtype istype | istream( istype ) ) istype & ?|?( istype &, _Istream_Cstr );
+forall( dtype istype | istream( istype ) ) istype & ?|?( istype & is, _Istream_Cstr f );
+
+struct _Istream_Char {
+        bool ignore;                                                                            // do not change input argument
+}; // _Istream_Char
+
+static inline _Istream_Char ignore( const char c ) { return (_Istream_Char)@{ true }; }
+static inline _Istream_Char ignore( _Istream_Char & fmt ) { fmt.ignore = true; return fmt; }
+forall( dtype istype | istream( istype ) ) istype & ?|?( istype & is, _Istream_Char f );
 
 forall( otype T )
@@ -368 +376 @@
 } // ?|?
 
-InputFMTDecl( char )
 InputFMTDecl( signed char )
 InputFMTDecl( unsigned char )

tests/.expect/manipulatorsInput.txt

@@ -26 +26 @@
 13 wwwwwwww
 a
-b
-b
-b
+a
 -1
 15

tests/.in/manipulatorsInput.txt

@@ -7 +7 @@
 abcyyy
 aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
-abcd
+ab
 0xff 017 15-15
 0xff 017 15-15

tests/manipulatorsInput.cfa

@@ -7 +7 @@
 // Created On       : Sat Jun  8 17:58:54 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 10 08:11:03 2019
-// Update Count     : 7
+// Last Modified On : Mon Jun 10 18:38:35 2019
+// Update Count     : 8
 // 
 
@@ -52 +52 @@
                 char c;
                 sin | c;                                                        sout | c;
-                sin | wdi( 3, c );                                      sout | c;
                 sin | ignore( c );                                      sout | c;
-                sin | ignore( wdi( 3, c ) );            sout | c;
 
                 signed char sc;