Changeset dc5072f for libcfa/src

Timestamp:

Jun 13, 2019, 8:39:28 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:

6a1dfda

Parents:

d60780c

Message:

remove const char * input because of error

Location:

libcfa/src

Files:

• iostream.cfa (modified) (3 diffs)
• iostream.hfa (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 : Wed Jun 12 15:00:31 2019
-// Update Count     : 819
+// Last Modified On : Thu Jun 13 17:21:10 2019
+// Update Count     : 812
 //
 
@@ -740 +740 @@
         } // ?|?
 
-        istype & ?|?( istype & is, const char * fmt ) {
-                fmt( is, fmt, "" );
-                return is;
-        } // ?|?
+        // istype & ?|?( istype & is, const char * fmt ) {
+        //      fmt( is, fmt, "" );
+        //      return is;
+        // } // ?|?
 
         istype & ?|?( istype & is, char * s ) {
@@ -777 +777 @@
         // 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 %d\n", f.scanset, f.wd );
+                if ( f.wd == -1 ) fmt( is, f.scanset, "" ); // no input arguments
+                else for ( f.wd ) fmt( is, "%*c" );
                 return is;
         } // if

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 12 13:35:42 2019
-// Update Count     : 331
+// Last Modified On : Thu Jun 13 17:20:21 2019
+// Update Count     : 325
 //
 
@@ -316 +316 @@
         istype & ?|?( istype &, long double _Complex & );
 
-        istype & ?|?( istype &, const char * );
+//      istype & ?|?( istype &, const char * );
         istype & ?|?( istype &, char * );
 
@@ -350 +350 @@
         _Istream_Cstr ignore( const char * s ) { return (_Istream_Cstr)@{ s, 0p, -1, { .flags.ignore : true } }; }
         _Istream_Cstr & ignore( _Istream_Cstr & fmt ) { fmt.flags.ignore = true; return fmt; }
-        _Istream_Cstr wd( unsigned int w, char * s ) { return (_Istream_Cstr)@{ s, 0p, w, { .all : 0 } }; }
-        _Istream_Cstr & wd( unsigned int w, _Istream_Cstr & fmt ) { fmt.wd = w; return fmt; }
+        _Istream_Cstr wdi( unsigned int w, char * s ) { return (_Istream_Cstr)@{ s, 0p, w, { .all : 0 } }; }
+        _Istream_Cstr & wdi( unsigned int w, _Istream_Cstr & fmt ) { fmt.wd = w; return fmt; }
 } // distribution
 forall( dtype istype | istream( istype ) ) istype & ?|?( istype & is, _Istream_Cstr f );
@@ -377 +377 @@
         _Istream_Manip(T) & ignore( _Istream_Manip(T) & fmt ) { fmt.ignore = true; return fmt; } \
         _Istream_Manip(T) wdi( unsigned int w, T & val ) { return (_Istream_Manip(T))@{ val, w, false }; } \
-        _Istream_Manip(T) & wd( unsigned int w, _Istream_Manip(T) & fmt ) { fmt.wd = w; return fmt; } \
+        _Istream_Manip(T) & wdi( unsigned int w, _Istream_Manip(T) & fmt ) { fmt.wd = w; return fmt; } \
 } /* distribution */ \
 forall( dtype istype | istream( istype ) ) { \