Changeset 58fe85a for libcfa/src/iostream.hfa

Timestamp:

Jan 7, 2021, 3:27:00 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

2b4daf2, 64aeca0

Parents:

3c64c668 (diff), eef8dfb (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' into park_unpark

File:

• libcfa/src/iostream.hfa (modified) (15 diffs)

libcfa/src/iostream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 20 15:30:56 2020
-// Update Count     : 337
+// Last Modified On : Tue Aug 11 22:16:14 2020
+// Update Count     : 350
 //
 
@@ -19 +19 @@
 
 
-//*********************************** ostream ***********************************
+// *********************************** ostream ***********************************
 
 
@@ -67 +67 @@
 
 forall( dtype ostype | ostream( ostype ) ) {
-        ostype & ?|?( ostype &, zero_t );
-        void ?|?( ostype &, zero_t );
-        ostype & ?|?( ostype &, one_t );
-        void ?|?( ostype &, one_t );
-
         ostype & ?|?( ostype &, bool );
         void ?|?( ostype &, bool );
@@ -156 +151 @@
 } // distribution
 
-//*********************************** manipulators ***********************************
+// *********************************** manipulators ***********************************
 
 forall( otype T )
@@ -166 +161 @@
                 unsigned char all;
                 struct {
+                        unsigned char neg:1;                                            // val is negative
                         unsigned char pc:1;                                                     // precision specified
                         unsigned char left:1;                                           // left justify
@@ -175 +171 @@
 }; // _Ostream_Manip
 
-//*********************************** integral ***********************************
+// *********************************** integral ***********************************
 
 // See 6.7.9. 19) The initialization shall occur in initializer list order, each initializer provided for a particular
@@ -215 +211 @@
 IntegralFMTDecl( int128, 'd' )
 IntegralFMTDecl( unsigned int128, 'u' )
-#endif
-
-//*********************************** floating point ***********************************
+#endif // __SIZEOF_INT128__
+
+// *********************************** floating point ***********************************
 
 // Default suffix for values with no fraction is "."
@@ -246 +242 @@
 FloatingPointFMTDecl( long double )
 
-//*********************************** character ***********************************
+// *********************************** character ***********************************
 
 static inline {
@@ -263 +259 @@
 } // ?|?
 
-//*********************************** C string ***********************************
+// *********************************** C string ***********************************
 
 static inline {
@@ -282 +278 @@
 
 
-//*********************************** istream ***********************************
+// *********************************** istream ***********************************
 
 
@@ -314 +310 @@
         istype & ?|?( istype &, unsigned int & );
         istype & ?|?( istype &, long int & );
+        istype & ?|?( istype &, unsigned long int & );
         istype & ?|?( istype &, long long int & );
-        istype & ?|?( istype &, unsigned long int & );
         istype & ?|?( istype &, unsigned long long int & );
+#if defined( __SIZEOF_INT128__ )
+        istype & ?|?( istype &, int128 & );
+        istype & ?|?( istype &, unsigned int128 & );
+#endif // __SIZEOF_INT128__
 
         istype & ?|?( istype &, float & );
@@ -336 +336 @@
 } // distribution
 
-//*********************************** manipulators ***********************************
+// *********************************** manipulators ***********************************
 
 struct _Istream_Cstr {
@@ -358 +358 @@
         _Istream_Cstr excl( const char scanset[], char * s ) { return (_Istream_Cstr){ s, scanset, -1, { .flags.inex : true } }; }
         _Istream_Cstr & excl( const char scanset[], _Istream_Cstr & fmt ) { fmt.scanset = scanset; fmt.flags.inex = true; return fmt; }
-        _Istream_Cstr ignore( const char s[] ) { return (_Istream_Cstr)@{ s, 0p, -1, { .flags.ignore : true } }; }
+        _Istream_Cstr ignore( 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 wdi( unsigned int w, char s[] ) { return (_Istream_Cstr)@{ s, 0p, w, { .all : 0 } }; }
@@ -370 +370 @@
 
 static inline {
-        _Istream_Char ignore( const char c ) { return (_Istream_Char)@{ true }; }
+        _Istream_Char ignore( const char ) { return (_Istream_Char)@{ true }; }
         _Istream_Char & ignore( _Istream_Char & fmt ) { fmt.ignore = true; return fmt; }
 } // distribution
 forall( dtype istype | istream( istype ) ) istype & ?|?( istype & is, _Istream_Char f );
 
-forall( otype T )
+forall( dtype T | sized( T ) )
 struct _Istream_Manip {
         T & val;                                                                                        // polymorphic base-type
@@ -413 +413 @@
 
 
-//*********************************** time ***********************************
+// *********************************** time ***********************************