Changes in src/libcfa/iostream.c [6ba0659:5721a6d]

File:

• src/libcfa/iostream.c (modified) (7 diffs)

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb 17 14:19:56 2016
-// Update Count     : 76
+// Last Modified On : Mon Feb  1 14:20:30 2016
+// Update Count     : 60
 //
 
@@ -19 +19 @@
 #include <stdio.h>
 #include <string.h>                                                                             // strlen
-#include <float.h>                                                                              // DBL_DIG, LDBL_DIG
 #include <complex.h>                                                                    // creal, cimag
 }
@@ -73 +72 @@
 ostype * ?|?( ostype *os, double d ) {
         char buffer[32];
-        return write( os, buffer, sprintf( buffer, "%.*lg", DBL_DIG, d ) );
+        return write( os, buffer, sprintf( buffer, "%g", d ) );
 } // ?|?
 
@@ -79 +78 @@
 ostype * ?|?( ostype *os, long double d ) {
         char buffer[32];
-        return write( os, buffer, sprintf( buffer, "%.*Lg", LDBL_DIG, d ) );
+        return write( os, buffer, sprintf( buffer, "%Lg", d ) );
 } // ?|?
 
@@ -111 +110 @@
 forall( dtype ostype, dtype retostype | ostream( ostype ) | ostream( retostype ) ) 
 retostype * ?|?( ostype *os, retostype * (*manip)(ostype*) ) {
-  return manip( os );
+  return manip(os);
 }
 
 forall( dtype ostype | ostream( ostype ) ) 
 ostype * endl( ostype * os ) {
-        os | "\n";
-        flush( os );
-        return os;
+  os | "\n";
+  // flush
+  return os;
 } // endl
 
-//---------------------------------------
-
-forall( type elt_type | writeable( elt_type ), type iterator_type | iterator( iterator_type, elt_type ),
+forall( type elt_type | writeable( elt_type ),
+                type iterator_type | iterator( iterator_type, elt_type ),
                 dtype os_type | ostream( os_type ) )
 void write( iterator_type begin, iterator_type end, os_type *os ) {
-        void print( elt_type i ) { os | i | ' '; }
+        void print( elt_type i ) {
+                os | i | ' ';
+        }
         for_each( begin, end, print );
 } // ?|?
 
-forall( type elt_type | writeable( elt_type ), type iterator_type | iterator( iterator_type, elt_type ),
+forall( type elt_type | writeable( elt_type ),
+                type iterator_type | iterator( iterator_type, elt_type ),
                 dtype os_type | ostream( os_type ) )
 void write_reverse( iterator_type begin, iterator_type end, os_type *os ) {
@@ -137 +138 @@
 } // ?|?
 
-//---------------------------------------
 
 forall( dtype istype | istream( istype ) )
@@ -146 +146 @@
 forall( dtype istype | istream( istype ) )
 istype * ?|?( istype *is, int *ip ) {
-        return get( is, ip );
+        char cur;
+  
+        // skip some whitespace
+        do {
+                is | &cur;
+                if ( fail( is ) || eof( is ) ) return is;
+        } while ( !( cur >= '0' && cur <= '9' ) );
+  
+        // accumulate digits
+        *ip = 0;
+        while ( cur >= '0' && cur <= '9' ) {
+                *ip = *ip * 10 + ( cur - '0' );
+                is | &cur;
+                if ( fail( is ) || eof( is ) ) return is;
+        }
+  
+        unread( is, cur );
+        return is;
 } // ?|?