Ignore:
Timestamp:
Jun 11, 2019, 1:36:05 PM (5 years ago)
Author:
Aaron Moss <a3moss@…>
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:
4b7cce6
Parents:
d57e349 (diff), 8548c35 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/iostream.hfa

    rd57e349 r3da7c19  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Jun  9 22:46:17 2019
    13 // Update Count     : 315
     12// Last Modified On : Mon Jun 10 18:05:13 2019
     13// Update Count     : 320
    1414//
    1515
     
    347347static inline _Istream_Cstr excl( const char * scanset, _Istream_Cstr & fmt ) { fmt.scanset = scanset; fmt.flags.inex = true; return fmt; }
    348348static inline _Istream_Cstr cstr( char * s ) { return (_Istream_Cstr){ s, 0p, -1, { .all : 0 } }; }
    349 static inline _Istream_Cstr ignore( const char * s ) { return (_Istream_Cstr)@{ s, 0p, -1, { .flags.ignore : true } }; }
     349static inline _Istream_Cstr ignore( const char * s ) { return (_Istream_Cstr)@{ 0p, 0p, -1, { .flags.ignore : true } }; }
    350350static inline _Istream_Cstr ignore( _Istream_Cstr & fmt ) { fmt.flags.ignore = true; return fmt; }
    351351static inline _Istream_Cstr wd( unsigned int w, char * s ) { return (_Istream_Cstr)@{ s, 0p, w, { .all : 0 } }; }
    352352static inline _Istream_Cstr wd( unsigned int w, _Istream_Cstr & fmt ) { fmt.wd = w; return fmt; }
    353 forall( dtype istype | istream( istype ) ) istype & ?|?( istype &, _Istream_Cstr );
     353forall( dtype istype | istream( istype ) ) istype & ?|?( istype & is, _Istream_Cstr f );
     354
     355struct _Istream_Char {
     356        bool ignore;                                                                            // do not change input argument
     357}; // _Istream_Char
     358
     359static inline _Istream_Char ignore( const char c ) { return (_Istream_Char)@{ true }; }
     360static inline _Istream_Char ignore( _Istream_Char & fmt ) { fmt.ignore = true; return fmt; }
     361forall( dtype istype | istream( istype ) ) istype & ?|?( istype & is, _Istream_Char f );
    354362
    355363forall( otype T )
     
    368376} // ?|?
    369377
    370 InputFMTDecl( char )
    371378InputFMTDecl( signed char )
    372379InputFMTDecl( unsigned char )
Note: See TracChangeset for help on using the changeset viewer.