Index: src/libcfa/Makefile.am =================================================================== --- src/libcfa/Makefile.am (revision 6e991d61d3d430d19f91624ec57c3454edee668a) +++ src/libcfa/Makefile.am (revision fbfb38e115e532f4ffb93eb36c9df8163dd09f7d) @@ -6,5 +6,5 @@ ## file "LICENCE" distributed with Cforall. ## -## Makefile.am -- +## Makefile.am -- ## ## Author : Peter A. Buhr @@ -51,5 +51,5 @@ CFLAGS = -g -Wall -Wno-unused-function -B${abs_top_srcdir}/src/driver -XCFA -t # TEMPORARY: does not build with -O2 -CC = ${abs_top_srcdir}/src/driver/cfa +CC = ${abs_top_srcdir}/src/driver/cfa # extension-less header files are overridden by default make rules => explicitly override rule @@ -67,3 +67,4 @@ include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders} +CLEANFILES = libcfa-prelude.c MAINTAINERCLEANFILES += ${includedir}/* Index: src/libcfa/Makefile.in =================================================================== --- src/libcfa/Makefile.in (revision 6e991d61d3d430d19f91624ec57c3454edee668a) +++ src/libcfa/Makefile.in (revision fbfb38e115e532f4ffb93eb36c9df8163dd09f7d) @@ -111,5 +111,5 @@ AWK = @AWK@ BACKEND_CC = @BACKEND_CC@ -CC = ${abs_top_srcdir}/src/driver/cfa +CC = ${abs_top_srcdir}/src/driver/cfa CCDEPMODE = @CCDEPMODE@ CFA_BINDIR = @CFA_BINDIR@ @@ -219,4 +219,5 @@ cfaheaders = # limits include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders} +CLEANFILES = libcfa-prelude.c all: all-am @@ -457,4 +458,5 @@ clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: Index: src/libcfa/fstream.c =================================================================== --- src/libcfa/fstream.c (revision 6e991d61d3d430d19f91624ec57c3454edee668a) +++ src/libcfa/fstream.c (revision fbfb38e115e532f4ffb93eb36c9df8163dd09f7d) @@ -5,10 +5,10 @@ // file "LICENCE" distributed with Cforall. // -// fstream.c -- +// fstream.c -- // // Author : Peter A. Buhr // Created On : Wed May 27 17:56:53 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Wed Apr 6 17:55:27 2016 +// Last Modified By : Rob Schluntz +// Last Modified On : Thu Apr 14 17:04:24 2016 // Update Count : 176 // @@ -75,5 +75,5 @@ if ( fclose( (FILE *)(os->file) ) == EOF ) { perror( IO_MSG "close output" ); - } // if + } // if } // close @@ -139,5 +139,5 @@ if ( fclose( (FILE *)(is->file) ) == EOF ) { perror( IO_MSG "close input" ); - } // if + } // if } // close @@ -154,5 +154,5 @@ return is; } // read - + ifstream *ungetc( ifstream * is, char c ) { if ( fail( is ) ) { Index: src/libcfa/iostream.c =================================================================== --- src/libcfa/iostream.c (revision 6e991d61d3d430d19f91624ec57c3454edee668a) +++ src/libcfa/iostream.c (revision fbfb38e115e532f4ffb93eb36c9df8163dd09f7d) @@ -5,10 +5,10 @@ // file "LICENCE" distributed with Cforall. // -// iostream.c -- +// iostream.c -- // // Author : Peter A. Buhr // Created On : Wed May 27 17:56:53 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Wed Apr 6 16:13:29 2016 +// Last Modified By : Rob Schluntz +// Last Modified On : Thu Apr 14 16:02:09 2016 // Update Count : 278 // @@ -193,10 +193,10 @@ -forall( dtype ostype | ostream( ostype ) ) +forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *os, ostype * (* manip)( ostype * ) ) { return manip( os ); } // ?|? -forall( dtype ostype | ostream( ostype ) ) +forall( dtype ostype | ostream( ostype ) ) ostype * endl( ostype * os ) { os | '\n'; @@ -206,5 +206,5 @@ } // endl -forall( dtype ostype | ostream( ostype ) ) +forall( dtype ostype | ostream( ostype ) ) ostype * sepOn( ostype * os ) { sepOn( os ); @@ -212,5 +212,5 @@ } // sepOn -forall( dtype ostype | ostream( ostype ) ) +forall( dtype ostype | ostream( ostype ) ) ostype * sepOff( ostype * os ) { sepOff( os ); @@ -218,5 +218,5 @@ } // sepOff -forall( dtype ostype | ostream( ostype ) ) +forall( dtype ostype | ostream( ostype ) ) ostype * sepEnable( ostype * os ) { sepEnable( os ); @@ -224,5 +224,5 @@ } // sepEnable -forall( dtype ostype | ostream( ostype ) ) +forall( dtype ostype | ostream( ostype ) ) ostype * sepDisable( ostype * os ) { sepDisable( os ); @@ -344,5 +344,5 @@ } // ?|? -_Istream_cstrUC cstr( char * s ) { _Istream_cstrUC s = { s }; return s; } +_Istream_cstrUC cstr( char * str ) { _Istream_cstrUC s = { str }; return s; } forall( dtype istype | istream( istype ) ) istype * ?|?( istype * is, _Istream_cstrUC cstr ) { @@ -351,5 +351,5 @@ } // cstr -_Istream_cstrC cstr( char * s, int size ) { _Istream_cstrC s = { s, size }; return s; } +_Istream_cstrC cstr( char * str, int size ) { _Istream_cstrC s = { str, size }; return s; } forall( dtype istype | istream( istype ) ) istype * ?|?( istype * is, _Istream_cstrC cstr ) { Index: src/libcfa/prelude.cf =================================================================== --- src/libcfa/prelude.cf (revision 6e991d61d3d430d19f91624ec57c3454edee668a) +++ src/libcfa/prelude.cf (revision fbfb38e115e532f4ffb93eb36c9df8163dd09f7d) @@ -1,9 +1,9 @@ # 2 "prelude.cf" // needed for error messages from this file -// -*- Mode: C -*- -// +// -*- Mode: C -*- +// // Copyright (C) Glen Ditchfield 1994, 1999 -// +// // prelude.cf -- Standard Cforall Preample for C99 -// +// // Author : Glen Ditchfield // Created On : Sat Nov 29 07:23:41 2014 @@ -117,11 +117,11 @@ forall( ftype FT ) lvalue FT *?( FT * ); -_Bool +?( _Bool ), -?( _Bool ), ~?( _Bool ); -signed int +?( signed int ), -?( signed int ), ~?( signed int ); -unsigned int +?( unsigned int ), -?( unsigned int ), ~?( unsigned int ); -signed long int +?( signed long int ), -?( signed long int ), ~?( signed long int ); -unsigned long int +?( unsigned long int ), -?( unsigned long int ), ~?( unsigned long int ); -signed long long int +?( signed long long int ), -?( signed long long int ), ~?( signed long long int ); -unsigned long long int +?( unsigned long long int ), -?( unsigned long long int ), ~?( unsigned long long int ); +_Bool +?( _Bool ), -?( _Bool ), ~?( _Bool ); +signed int +?( signed int ), -?( signed int ), ~?( signed int ); +unsigned int +?( unsigned int ), -?( unsigned int ), ~?( unsigned int ); +signed long int +?( signed long int ), -?( signed long int ), ~?( signed long int ); +unsigned long int +?( unsigned long int ), -?( unsigned long int ), ~?( unsigned long int ); +signed long long int +?( signed long long int ), -?( signed long long int ), ~?( signed long long int ); +unsigned long long int +?( unsigned long long int ), -?( unsigned long long int ), ~?( unsigned long long int ); float +?( float ), -?( float ); double +?( double ), -?( double ); @@ -627,2 +627,229 @@ ?+=?( long double _Complex *, long double _Complex ), ?+=?( volatile long double _Complex *, long double _Complex ), ?-=?( long double _Complex *, long double _Complex ), ?-=?( volatile long double _Complex *, long double _Complex ); + + + + + +// ------------------------------------------------------------ +// +// Section ??? Constructors and Destructors +// +// ------------------------------------------------------------ + +// default ctor +void ?{}( _Bool * ), ?{}( volatile _Bool * ); +void ?{}( char * ), ?{}( volatile char * ); +void ?{}( unsigned char * ), ?{}( volatile unsigned char * ); +void ?{}( char signed * ), ?{}( volatile char signed * ); +void ?{}( int short * ), ?{}( volatile int short * ); +void ?{}( int short unsigned * ), ?{}( volatile int short unsigned * ); +void ?{}( signed int * ), ?{}( volatile signed int * ); +void ?{}( unsigned int * ), ?{}( volatile unsigned int * ); +void ?{}( signed long int * ), ?{}( volatile signed long int * ); +void ?{}( unsigned long int * ), ?{}( volatile unsigned long int * ); +void ?{}( signed long long int * ), ?{}( volatile signed long long int * ); +void ?{}( unsigned long long int * ), ?{}( volatile unsigned long long int * ); +void ?{}( float * ), ?{}( volatile float * ); +void ?{}( double * ), ?{}( volatile double * ); +void ?{}( long double * ), ?{}( volatile long double * ); +void ?{}( float _Complex * ), ?{}( volatile float _Complex * ); +void ?{}( double _Complex * ), ?{}( volatile double _Complex * ); +void ?{}( long double _Complex * ), ?{}( volatile long double _Complex * ); + +// copy ctor +void ?{}( _Bool *, _Bool ), ?{}( volatile _Bool *, _Bool ); +void ?{}( char *, char ), ?{}( volatile char *, char ); +void ?{}( unsigned char *, unsigned char ), ?{}( volatile unsigned char *, unsigned char ); +void ?{}( char signed *, char signed ), ?{}( volatile char signed *, char signed ); +void ?{}( int short *, int short ), ?{}( volatile int short *, int short ); +void ?{}( int short unsigned *, int short unsigned ), ?{}( volatile int short unsigned *, int short unsigned ); +void ?{}( signed int *, signed int), ?{}( volatile signed int *, signed int ); +void ?{}( unsigned int *, unsigned int), ?{}( volatile unsigned int *, unsigned int ); +void ?{}( signed long int *, signed long int), ?{}( volatile signed long int *, signed long int ); +void ?{}( unsigned long int *, unsigned long int), ?{}( volatile unsigned long int *, unsigned long int ); +void ?{}( signed long long int *, signed long long int), ?{}( volatile signed long long int *, signed long long int ); +void ?{}( unsigned long long int *, unsigned long long int), ?{}( volatile unsigned long long int *, unsigned long long int ); +void ?{}( float *, float), ?{}( volatile float *, float ); +void ?{}( double *, double), ?{}( volatile double *, double ); +void ?{}( long double *, long double), ?{}( volatile long double *, long double ); +void ?{}( float _Complex *, float _Complex), ?{}( volatile float _Complex *, float _Complex ); +void ?{}( double _Complex *, double _Complex), ?{}( volatile double _Complex *, double _Complex ); +void ?{}( long double _Complex *, long double _Complex), ?{}( volatile long double _Complex *, long double _Complex ); + +// dtor +void ^?{}( _Bool * ), ^?{}( volatile _Bool * ); +void ^?{}( char * ), ^?{}( volatile char * ); +void ^?{}( char unsigned * ), ^?{}( volatile char unsigned * ); +void ^?{}( char signed * ), ^?{}( volatile char signed * ); +void ^?{}( int short * ), ^?{}( volatile int short * ); +void ^?{}( int short unsigned * ), ^?{}( volatile int short unsigned * ); +void ^?{}( signed int * ), ^?{}( volatile signed int * ); +void ^?{}( unsigned int * ), ^?{}( volatile unsigned int * ); +void ^?{}( signed long int * ), ^?{}( volatile signed long int * ); +void ^?{}( unsigned long int * ), ^?{}( volatile unsigned long int * ); +void ^?{}( signed long long int * ), ^?{}( volatile signed long long int * ); +void ^?{}( unsigned long long int * ), ^?{}( volatile unsigned long long int * ); +void ^?{}( float * ), ^?{}( volatile float * ); +void ^?{}( double * ), ^?{}( volatile double * ); +void ^?{}( long double * ), ^?{}( volatile long double * ); +void ^?{}( float _Complex * ), ^?{}( volatile float _Complex * ); +void ^?{}( double _Complex * ), ^?{}( volatile double _Complex * ); +void ^?{}( long double _Complex * ), ^?{}( volatile long double _Complex * ); + +// // default ctor +// forall( dtype DT ) void ?{}( DT ** ); +// forall( dtype DT ) void ?{}( const DT ** ); +// forall( dtype DT ) void ?{}( volatile DT ** ); +// forall( dtype DT ) void ?{}( const volatile DT ** ); + +// // copy ctor +// forall( dtype DT ) void ?{}( DT **, DT* ); +// forall( dtype DT ) void ?{}( const DT **, DT* ); +// forall( dtype DT ) void ?{}( volatile DT **, DT* ); +// forall( dtype DT ) void ?{}( const volatile DT **, DT* ); + +// // dtor +// forall( dtype DT ) void ^?{}( DT ** ); +// forall( dtype DT ) void ^?{}( const DT ** ); +// forall( dtype DT ) void ^?{}( volatile DT ** ); +// forall( dtype DT ) void ^?{}( const volatile DT ** ); + +// copied from assignment section +// copy constructors +forall( ftype FT ) void ?{}( FT **, FT * ); +forall( ftype FT ) void ?{}( FT * volatile *, FT * ); + +forall( dtype DT ) void ?{}( DT * *, DT * ); +forall( dtype DT ) void ?{}( DT * volatile *, DT * ); +forall( dtype DT ) void ?{}( const DT * *, DT * ); +forall( dtype DT ) void ?{}( const DT * volatile *, DT * ); +forall( dtype DT ) void ?{}( const DT * *, const DT * ); +forall( dtype DT ) void ?{}( const DT * volatile *, const DT * ); +forall( dtype DT ) void ?{}( volatile DT * *, DT * ); +forall( dtype DT ) void ?{}( volatile DT * volatile *, DT * ); +forall( dtype DT ) void ?{}( volatile DT * *, volatile DT * ); +forall( dtype DT ) void ?{}( volatile DT * volatile *, volatile DT * ); + +forall( dtype DT ) void ?{}( const volatile DT * *, DT * ); +forall( dtype DT ) void ?{}( const volatile DT * volatile *, DT * ); +forall( dtype DT ) void ?{}( const volatile DT * *, const DT * ); +forall( dtype DT ) void ?{}( const volatile DT * volatile *, const DT * ); +forall( dtype DT ) void ?{}( const volatile DT * *, volatile DT * ); +forall( dtype DT ) void ?{}( const volatile DT * volatile *, volatile DT * ); +forall( dtype DT ) void ?{}( const volatile DT * *, const volatile DT * ); +forall( dtype DT ) void ?{}( const volatile DT * volatile *, const volatile DT * ); + +forall( dtype DT ) void ?{}( DT * *, void * ); +forall( dtype DT ) void ?{}( DT * volatile *, void * ); +forall( dtype DT ) void ?{}( const DT * *, void * ); +forall( dtype DT ) void ?{}( const DT * volatile *, void * ); +forall( dtype DT ) void ?{}( const DT * *, const void * ); +forall( dtype DT ) void ?{}( const DT * volatile *, const void * ); +forall( dtype DT ) void ?{}( volatile DT * *, void * ); +forall( dtype DT ) void ?{}( volatile DT * volatile *, void * ); +forall( dtype DT ) void ?{}( volatile DT * *, volatile void * ); +forall( dtype DT ) void ?{}( volatile DT * volatile *, volatile void * ); + +forall( dtype DT ) void ?{}( const volatile DT * *, void * ); +forall( dtype DT ) void ?{}( const volatile DT * volatile *, void * ); +forall( dtype DT ) void ?{}( const volatile DT * *, const void * ); +forall( dtype DT ) void ?{}( const volatile DT * volatile *, const void * ); +forall( dtype DT ) void ?{}( const volatile DT * *, volatile void * ); +forall( dtype DT ) void ?{}( const volatile DT * volatile *, volatile void * ); +forall( dtype DT ) void ?{}( const volatile DT * *, const volatile void * ); +forall( dtype DT ) void ?{}( const volatile DT * volatile *, const volatile void * ); + +forall( dtype DT ) void ?{}( void * *, DT * ); +forall( dtype DT ) void ?{}( void * volatile *, DT * ); +forall( dtype DT ) void ?{}( const void * *, DT * ); +forall( dtype DT ) void ?{}( const void * volatile *, DT * ); +forall( dtype DT ) void ?{}( const void * *, const DT * ); +forall( dtype DT ) void ?{}( const void * volatile *, const DT * ); +forall( dtype DT ) void ?{}( volatile void * *, DT * ); +forall( dtype DT ) void ?{}( volatile void * volatile *, DT * ); +forall( dtype DT ) void ?{}( volatile void * *, volatile DT * ); +forall( dtype DT ) void ?{}( volatile void * volatile *, volatile DT * ); +forall( dtype DT ) void ?{}( const volatile void * *, DT * ); +forall( dtype DT ) void ?{}( const volatile void * volatile *, DT * ); +forall( dtype DT ) void ?{}( const volatile void * *, const DT * ); +forall( dtype DT ) void ?{}( const volatile void * volatile *, const DT * ); +forall( dtype DT ) void ?{}( const volatile void * *, volatile DT * ); +forall( dtype DT ) void ?{}( const volatile void * volatile *, volatile DT * ); +forall( dtype DT ) void ?{}( const volatile void * *, const volatile DT * ); +forall( dtype DT ) void ?{}( const volatile void * volatile *, const volatile DT * ); + +void ?{}( void * *, void * ); +void ?{}( void * volatile *, void * ); +void ?{}( const void * *, void * ); +void ?{}( const void * volatile *, void * ); +void ?{}( const void * *, const void * ); +void ?{}( const void * volatile *, const void * ); +void ?{}( volatile void * *, void * ); +void ?{}( volatile void * volatile *, void * ); +void ?{}( volatile void * *, volatile void * ); +void ?{}( volatile void * volatile *, volatile void * ); +void ?{}( const volatile void * *, void * ); +void ?{}( const volatile void * volatile *, void * ); +void ?{}( const volatile void * *, const void * ); +void ?{}( const volatile void * volatile *, const void * ); +void ?{}( const volatile void * *, volatile void * ); +void ?{}( const volatile void * volatile *, volatile void * ); +void ?{}( const volatile void * *, const volatile void * ); +void ?{}( const volatile void * volatile *, const volatile void * ); + +//forall( dtype DT ) void ?{}( DT * *, forall( dtype DT2 ) const DT2 * ); +//forall( dtype DT ) void ?{}( DT * volatile *, forall( dtype DT2 ) const DT2 * ); +forall( dtype DT ) void ?{}( const DT * *, forall( dtype DT2 ) const DT2 * ); +forall( dtype DT ) void ?{}( const DT * volatile *, forall( dtype DT2 ) const DT2 * ); +//forall( dtype DT ) void ?{}( volatile DT * *, forall( dtype DT2 ) const DT2 * ); +//forall( dtype DT ) void ?{}( volatile DT * volatile *, forall( dtype DT2 ) const DT2 * ); +forall( dtype DT ) void ?{}( const volatile DT * *, forall( dtype DT2 ) const DT2 * ); +forall( dtype DT ) void ?{}( const volatile DT * volatile *, forall( dtype DT2 ) const DT2 * ); + +forall( ftype FT ) void ?{}( FT * *, forall( ftype FT2 ) FT2 * ); +forall( ftype FT ) void ?{}( FT * volatile *, forall( ftype FT2 ) FT2 * ); + +// default ctors +forall( ftype FT ) void ?{}( FT * * ); +forall( ftype FT ) void ?{}( FT * volatile * ); + +forall( dtype DT ) void ?{}( DT * *); +forall( dtype DT ) void ?{}( DT * volatile *); +forall( dtype DT ) void ?{}( const DT * *); +forall( dtype DT ) void ?{}( const DT * volatile *); +forall( dtype DT ) void ?{}( volatile DT * *); +forall( dtype DT ) void ?{}( volatile DT * volatile *); +forall( dtype DT ) void ?{}( const volatile DT * *); +forall( dtype DT ) void ?{}( const volatile DT * volatile *); + +void ?{}( void * *); +void ?{}( void * volatile *); +void ?{}( const void * *); +void ?{}( const void * volatile *); +void ?{}( volatile void * *); +void ?{}( volatile void * volatile *); +void ?{}( const volatile void * *); +void ?{}( const volatile void * volatile *); + +// dtors +forall( ftype FT ) void ^?{}( FT * * ); +forall( ftype FT ) void ^?{}( FT * volatile * ); + +forall( dtype DT ) void ^?{}( DT * *); +forall( dtype DT ) void ^?{}( DT * volatile *); +forall( dtype DT ) void ^?{}( const DT * *); +forall( dtype DT ) void ^?{}( const DT * volatile *); +forall( dtype DT ) void ^?{}( volatile DT * *); +forall( dtype DT ) void ^?{}( volatile DT * volatile *); +forall( dtype DT ) void ^?{}( const volatile DT * *); +forall( dtype DT ) void ^?{}( const volatile DT * volatile *); + +void ^?{}( void * *); +void ^?{}( void * volatile *); +void ^?{}( const void * *); +void ^?{}( const void * volatile *); +void ^?{}( volatile void * *); +void ^?{}( volatile void * volatile *); +void ^?{}( const volatile void * *); +void ^?{}( const volatile void * volatile *);