Changeset 3ecfa13 for libcfa/src/iostream.hfa

Timestamp:

Feb 8, 2020, 3:21:45 PM (6 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:

8c9da33

Parents:

0f5da65 (diff), 74330e7 (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.hfa (modified) (8 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 : Fri Jul 12 12:08:38 2019
-// Update Count     : 334
+// Last Modified On : Fri Feb  7 17:53:52 2020
+// Update Count     : 336
 //
 
@@ -24 +24 @@
 trait ostream( dtype ostype ) {
         // private
-        bool sepPrt( ostype & );                                                        // get separator state (on/off)
-        void sepReset( ostype & );                                                      // set separator state to default state
-        void sepReset( ostype &, bool );                                        // set separator and default state
-        const char * sepGetCur( ostype & );                                     // get current separator string
-        void sepSetCur( ostype &, const char * );                       // set current separator string
-        bool getNL( ostype & );                                                         // check newline
-        void setNL( ostype &, bool );                                           // saw newline
-        bool getANL( ostype & );                                                        // get auto newline (on/off)
-        bool getPrt( ostype & );                                                        // get fmt called in output cascade
-        void setPrt( ostype &, bool );                                          // set fmt called in output cascade
+        bool $sepPrt( ostype & );                                                       // get separator state (on/off)
+        void $sepReset( ostype & );                                                     // set separator state to default state
+        void $sepReset( ostype &, bool );                                       // set separator and default state
+        const char * $sepGetCur( ostype & );                            // get current separator string
+        void $sepSetCur( ostype &, const char [] );                     // set current separator string
+        bool $getNL( ostype & );                                                        // check newline
+        void $setNL( ostype &, bool );                                          // saw newline
+        bool $getANL( ostype & );                                                       // get auto newline (on/off)
+        bool $getPrt( ostype & );                                                       // get fmt called in output cascade
+        void $setPrt( ostype &, bool );                                         // set fmt called in output cascade
         // public
         void sepOn( ostype & );                                                         // turn separator state on
@@ -43 +43 @@
 
         const char * sepGet( ostype & );                                        // get separator string
-        void sepSet( ostype &, const char * );                          // set separator to string (15 character maximum)
+        void sepSet( ostype &, const char [] );                         // set separator to string (15 character maximum)
         const char * sepGetTuple( ostype & );                           // get tuple separator string
-        void sepSetTuple( ostype &, const char * );                     // set tuple separator to string (15 character maximum)
+        void sepSetTuple( ostype &, const char [] );            // set tuple separator to string (15 character maximum)
 
         void ends( ostype & os );                                                       // end of output statement
         int fail( ostype & );
         int flush( ostype & );
-        void open( ostype & os, const char * name, const char * mode );
+        void open( ostype & os, const char name[], const char mode[] );
         void close( ostype & os );
-        ostype & write( ostype &, const char *, size_t );
+        ostype & write( ostype &, const char [], size_t );
         int fmt( ostype &, const char format[], ... ) __attribute__(( format(printf, 2, 3) ));
 }; // ostream
@@ -113 +113 @@
         void ?|?( ostype &, long double _Complex );
 
-        ostype & ?|?( ostype &, const char * );
-        void ?|?( ostype &, const char * );
+        ostype & ?|?( ostype &, const char [] );
+        void ?|?( ostype &, const char [] );
         // ostype & ?|?( ostype &, const char16_t * );
 #if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
@@ -256 +256 @@
 
 static inline {
-        _Ostream_Manip(const char *) bin( const char * s ) { return (_Ostream_Manip(const char *))@{ s, 1, 0, 'b', { .all : 0 } }; }
-        _Ostream_Manip(const char *) oct( const char * s ) { return (_Ostream_Manip(const char *))@{ s, 1, 0, 'o', { .all : 0 } }; }
-        _Ostream_Manip(const char *) hex( const char * s ) { return (_Ostream_Manip(const char *))@{ s, 1, 0, 'x', { .all : 0 } }; }
-        _Ostream_Manip(const char *) wd( unsigned int w, const char * s ) { return (_Ostream_Manip(const char *))@{ s, w, 0, 's', { .all : 0 } }; }
-        _Ostream_Manip(const char *) wd( unsigned int w, unsigned char pc, const char * s ) { return (_Ostream_Manip(const char *))@{ s, w, pc, 's', { .flags.pc : true } }; }
+        _Ostream_Manip(const char *) bin( const char s[] ) { return (_Ostream_Manip(const char *))@{ s, 1, 0, 'b', { .all : 0 } }; }
+        _Ostream_Manip(const char *) oct( const char s[] ) { return (_Ostream_Manip(const char *))@{ s, 1, 0, 'o', { .all : 0 } }; }
+        _Ostream_Manip(const char *) hex( const char s[] ) { return (_Ostream_Manip(const char *))@{ s, 1, 0, 'x', { .all : 0 } }; }
+        _Ostream_Manip(const char *) wd( unsigned int w, const char s[] ) { return (_Ostream_Manip(const char *))@{ s, w, 0, 's', { .all : 0 } }; }
+        _Ostream_Manip(const char *) wd( unsigned int w, unsigned char pc, const char s[] ) { return (_Ostream_Manip(const char *))@{ s, w, pc, 's', { .flags.pc : true } }; }
         _Ostream_Manip(const char *) & wd( unsigned int w, _Ostream_Manip(const char *) & fmt ) { fmt.wd = w; return fmt; }
         _Ostream_Manip(const char *) & wd( unsigned int w, unsigned char pc, _Ostream_Manip(const char *) & fmt ) { fmt.wd = w; fmt.pc = pc; fmt.flags.pc = true; return fmt; }
@@ -281 +281 @@
         int fail( istype & );
         int eof( istype & );
-        void open( istype & is, const char * name );
+        void open( istype & is, const char name[] );
         void close( istype & is );
         istype & read( istype &, char *, size_t );
@@ -316 +316 @@
         istype & ?|?( istype &, long double _Complex & );
 
-//      istype & ?|?( istype &, const char * );
+//      istype & ?|?( istype &, const char [] );
         istype & ?|?( istype &, char * );
 
@@ -343 +343 @@
 static inline {
         _Istream_Cstr skip( unsigned int n ) { return (_Istream_Cstr){ 0p, 0p, n, { .all : 0 } }; }
-        _Istream_Cstr skip( const char * scanset ) { return (_Istream_Cstr){ 0p, scanset, -1, { .all : 0 } }; }
-        _Istream_Cstr incl( const char * scanset, char * s ) { return (_Istream_Cstr){ s, scanset, -1, { .flags.inex : false } }; }
-        _Istream_Cstr & incl( const char * scanset, _Istream_Cstr & fmt ) { fmt.scanset = scanset; fmt.flags.inex = false; return fmt; }
-        _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 skip( const char scanset[] ) { return (_Istream_Cstr){ 0p, scanset, -1, { .all : 0 } }; }
+        _Istream_Cstr incl( const char scanset[], char * s ) { return (_Istream_Cstr){ s, scanset, -1, { .flags.inex : false } }; }
+        _Istream_Cstr & incl( const char scanset[], _Istream_Cstr & fmt ) { fmt.scanset = scanset; fmt.flags.inex = false; return fmt; }
+        _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( _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 } }; }
+        _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