Index: src/examples/Makefile.in =================================================================== --- src/examples/Makefile.in (revision 658f6de0ed93906e66453f048c3c4bfd269e58ce) +++ src/examples/Makefile.in (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -189,7 +189,7 @@ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/examples/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/examples/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/examples/Makefile + $(AUTOMAKE) --foreign src/examples/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Index: src/examples/abs.c =================================================================== --- src/examples/abs.c (revision 658f6de0ed93906e66453f048c3c4bfd269e58ce) +++ src/examples/abs.c (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -10,6 +10,6 @@ // Created On : Thu Jan 28 18:26:16 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 17 09:32:04 2016 -// Update Count : 44 +// Last Modified On : Wed Mar 2 15:07:26 2016 +// Update Count : 51 // @@ -20,13 +20,13 @@ char ch = -65; sout | "char\t\t\t" | ch | "\tabs " | abs( ch ) | endl; - sout | "signed int\t\t" | -65 | "\tabs " | abs( -65 ) | endl; - sout | "signed long int\t\t" | -65l | "\tabs " | abs( -65l ) | endl; - sout | "signed long long int\t" | -65ll | "\tabs " | abs( -65ll ) | endl; - sout | "float\t\t\t" | -65.0f | "\tabs " | abs( -65.0f ) | endl; - sout | "double\t\t\t" | -65.0 | "\tabs " | abs( -65.0 ) | endl; - sout | "long double\t\t" | -65.0l | "\tabs " | abs( -65.0l ) | endl; - sout | "float _Complex\t\t" | -65.0F-2.0iF | "\tabs " | abs( -65.0F-2.0iF ) | endl; - sout | "double _Complex\t\t" | -65.0D-2.0iD | "\tabs " | abs( -65.0D-2.0iD ) | endl; - sout | "long double _Complex\t" | -65.0L-2.0iL | "\tabs " | abs( -65.0L-2.0iL ) | endl; + sout | "signed int\t\t" | -65 | "\tabs" | abs( -65 ) | endl; + sout | "signed long int\t\t" | -65l | "\tabs" | abs( -65l ) | endl; + sout | "signed long long int\t" | -65ll | "\tabs" | abs( -65ll ) | endl; + sout | "float\t\t\t" | -65.0f | "\tabs" | abs( -65.0f ) | endl; + sout | "double\t\t\t" | -65.0 | "\tabs" | abs( -65.0 ) | endl; + sout | "long double\t\t" | -65.0l | "\tabs" | abs( -65.0l ) | endl; + sout | "float _Complex\t\t" | -65.0F-2.0iF | "\tabs" | abs( -65.0F-2.0iF ) | endl; + sout | "double _Complex\t\t" | -65.0D-2.0iD | "\tabs" | abs( -65.0D-2.0iD ) | endl; + sout | "long double _Complex\t" | -65.0L-2.0iL | "\tabs" | abs( -65.0L-2.0iL ) | endl; } // main Index: src/examples/ato.c =================================================================== --- src/examples/ato.c (revision 658f6de0ed93906e66453f048c3c4bfd269e58ce) +++ src/examples/ato.c (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -11,6 +11,6 @@ // Created On : Thu Feb 4 08:10:57 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 17 11:44:03 2016 -// Update Count : 42 +// Last Modified On : Mon Feb 29 17:57:35 2016 +// Update Count : 44 // @@ -24,29 +24,29 @@ int main( void ) { int i = ato( "-123" ); - sout | i | ' ' | "-123" | endl; + sout | i | "-123" | endl; unsigned int ui = ato( "123" ); - sout | ui | ' ' | "123" | endl; + sout | ui | "123" | endl; long int li = ato( "-123" ); - sout | li | ' ' | "-123" | endl; + sout | li | "-123" | endl; unsigned long int uli = ato( "123" ); - sout | uli | ' ' | "123" | endl; + sout | uli | "123" | endl; long long int lli = ato( "-123" ); - sout | lli | ' ' | "-123" | endl; + sout | lli | "-123" | endl; unsigned long long int ulli = ato( "123" ); - sout | ulli | ' ' | "123" | endl; + sout | ulli | "123" | endl; float f = ato( "-123.456" ); - sout | f | ' ' | "-123.456" | endl; + sout | f | "-123.456" | endl; double d = ato( "-123.4567890123456" ); - sout | d | ' ' | "-123.4567890123456" | endl; + sout | d | "-123.4567890123456" | endl; long double ld = ato( "-123.45678901234567890123456789" ); - sout | ld | ' ' | "-123.45678901234567890123456789" | endl; + sout | ld | "-123.45678901234567890123456789" | endl; float _Complex fc = ato( "-123.456-123.456i" ); - sout | fc | ' ' | "-123.456-123.456i" | endl; + sout | fc | "-123.456-123.456i" | endl; double _Complex dc = ato( "-123.4567890123456+123.4567890123456i" ); - sout | dc | ' ' | "-123.4567890123456+123.4567890123456i" | endl; + sout | dc | "-123.4567890123456+123.4567890123456i" | endl; long double _Complex ldc = ato( "123.45678901234567890123456789-123.45678901234567890123456789i" ); - sout | ldc | ' ' | "123.45678901234567890123456789-123.45678901234567890123456789i" | endl; + sout | ldc | "123.45678901234567890123456789-123.45678901234567890123456789i" | endl; long double _Complex ldc2 = ato( "123.45678901234-123.4567890i" ); - sout | ldc2 | ' ' | "123.45678901234567890123456789-123.45678901234567890123456789i" | endl; + sout | ldc2 | "123.45678901234-123.4567890i" | endl; } // main Index: src/examples/fstream_test.c =================================================================== --- src/examples/fstream_test.c (revision 658f6de0ed93906e66453f048c3c4bfd269e58ce) +++ src/examples/fstream_test.c (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 17 11:45:43 2016 -// Update Count : 43 +// Last Modified On : Wed Mar 2 15:12:21 2016 +// Update Count : 51 // @@ -18,18 +18,15 @@ int main( void ) { int nombre; - sout | "Entrez un nombre, s'il vous plaît:\n"; + sout | "Entrez un nombre, s'il vous plaît:" | endl; sin | &nombre; - sout | "Vous avez entré " | nombre | " stocké à l'adresse " | &nombre | endl; - sout | "nombre " | nombre | " est " - | (nombre > 0 ? "plus grand que" : - nombre == 0 ? "égal à" : "moins de") - | " zéro" | endl; + sout | "Vous avez entré" | nombre | "stocké à l'adresse" | &nombre | endl; + sout | "nombre" | nombre | "est" + | (nombre > 0 ? "plus grand que" : nombre == 0 ? "égal à" : "moins de") + | "zéro" | endl; - sout | "Entrez trois nombres, s'il vous plaît:\n"; + sout | "Entrez trois nombres, s'il vous plaît: " | endl; int i, j, k; sin | &i | &j | &k; - sout | "Vous avez entré " | "i:" | i | " j:" | j | " k:" | k | endl; - - sout | 3 | ' ' | 3.5 | ' ' | 'a' | ' ' | "abc" | endl; + sout | "Vous avez entré" | "i:" | i | "j:" | j | "k:" | k | endl; } Index: src/examples/hello.c =================================================================== --- src/examples/hello.c (revision 658f6de0ed93906e66453f048c3c4bfd269e58ce) +++ src/examples/hello.c (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 17 12:11:45 2016 -// Update Count : 8 +// Last Modified On : Mon Feb 29 18:06:17 2016 +// Update Count : 10 // @@ -17,5 +17,5 @@ int main() { - sout | "Bonjour au monde!\n"; + sout | "Bonjour au monde!" | endl; } Index: src/examples/identity.c =================================================================== --- src/examples/identity.c (revision 658f6de0ed93906e66453f048c3c4bfd269e58ce) +++ src/examples/identity.c (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 17 12:17:32 2016 -// Update Count : 10 +// Last Modified On : Mon Feb 29 23:40:45 2016 +// Update Count : 12 // Index: src/examples/minmax.c =================================================================== --- src/examples/minmax.c (revision 658f6de0ed93906e66453f048c3c4bfd269e58ce) +++ src/examples/minmax.c (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 17 12:17:53 2016 -// Update Count : 47 +// Last Modified On : Mon Feb 29 23:45:16 2016 +// Update Count : 49 // @@ -23,26 +23,26 @@ sout | "char\t\t\t" | 'z' | ' ' | 'a' | "\tmin " | min( 'z', 'a' ) | endl; - sout | "signed int\t\t" | 4 | ' ' | 3 | "\tmin " | min( 4, 3 ) | endl; - sout | "unsigned int\t\t" | 4u | ' ' | 3u | "\tmin " | min( 4u, 3u ) | endl; - sout | "signed long int\t\t" | 4l | ' ' | 3l | "\tmin " | min( 4l, 3l ) | endl; - sout | "unsigned long int\t" | 4ul | ' ' | 3ul | "\tmin " | min( 4ul, 3ul ) | endl; - sout | "signed long long int\t" | 4ll | ' ' | 3ll | "\tmin " | min( 4ll, 3ll ) | endl; - sout | "unsigned long long int\t" | 4ull | ' ' | 3ull | "\tmin " | min( 4ull, 3ull ) | endl; - sout | "float\t\t\t" | 4.0f | ' ' | 3.1f | "\tmin " | min( 4.0f, 3.1f ) | endl; - sout | "double\t\t\t" | 4.0 | ' ' | 3.1 | "\tmin " | min( 4.0, 3.1 ) | endl; - sout | "long double\t\t" | 4.0l | ' ' | 3.1l | "\tmin " | min( 4.0l, 3.1l ) | endl; + sout | "signed int\t\t" | 4 | 3 | "\tmin" | min( 4, 3 ) | endl; + sout | "unsigned int\t\t" | 4u | 3u | "\tmin" | min( 4u, 3u ) | endl; + sout | "signed long int\t\t" | 4l | 3l | "\tmin" | min( 4l, 3l ) | endl; + sout | "unsigned long int\t" | 4ul | 3ul | "\tmin" | min( 4ul, 3ul ) | endl; + sout | "signed long long int\t" | 4ll | 3ll | "\tmin" | min( 4ll, 3ll ) | endl; + sout | "unsigned long long int\t" | 4ull | 3ull | "\tmin" | min( 4ull, 3ull ) | endl; + sout | "float\t\t\t" | 4.0f | 3.1f | "\tmin" | min( 4.0f, 3.1f ) | endl; + sout | "double\t\t\t" | 4.0 | 3.1 | "\tmin" | min( 4.0, 3.1 ) | endl; + sout | "long double\t\t" | 4.0l | 3.1l | "\tmin" | min( 4.0l, 3.1l ) | endl; sout | endl; sout | "char\t\t\t" | 'z' | ' ' | 'a' | "\tmax " | max( 'z', 'a' ) | endl; - sout | "signed int\t\t" | 4 | ' ' | 3 | "\tmax " | max( 4, 3 ) | endl; - sout | "unsigned int\t\t" | 4u | ' ' | 3u | "\tmax " | max( 4u, 3u ) | endl; - sout | "signed long int\t\t" | 4l | ' ' | 3l | "\tmax " | max( 4l, 3l ) | endl; - sout | "unsigned long int\t" | 4ul | ' ' | 3ul | "\tmax " | max( 4ul, 3ul ) | endl; - sout | "signed long long int\t" | 4ll | ' ' | 3ll | "\tmax " | max( 4ll, 3ll ) | endl; - sout | "unsigned long long int\t" | 4ull | ' ' | 3ull | "\tmax " | max( 4ull, 3ull ) | endl; - sout | "float\t\t\t" | 4.0f | ' ' | 3.1f | "\tmax " | max( 4.0f, 3.1f ) | endl; - sout | "double\t\t\t" | 4.0 | ' ' | 3.1 | "\tmax " | max( 4.0, 3.1 ) | endl; - sout | "long double\t\t" | 4.0l | ' ' | 3.1l | "\tmax " | max( 4.0l, 3.1l ) | endl; + sout | "signed int\t\t" | 4 | 3 | "\tmax" | max( 4, 3 ) | endl; + sout | "unsigned int\t\t" | 4u | 3u | "\tmax" | max( 4u, 3u ) | endl; + sout | "signed long int\t\t" | 4l | 3l | "\tmax" | max( 4l, 3l ) | endl; + sout | "unsigned long int\t" | 4ul | 3ul | "\tmax" | max( 4ul, 3ul ) | endl; + sout | "signed long long int\t" | 4ll | 3ll | "\tmax" | max( 4ll, 3ll ) | endl; + sout | "unsigned long long int\t" | 4ull | 3ull | "\tmax" | max( 4ull, 3ull ) | endl; + sout | "float\t\t\t" | 4.0f | 3.1f | "\tmax" | max( 4.0f, 3.1f ) | endl; + sout | "double\t\t\t" | 4.0 | 3.1 | "\tmax" | max( 4.0, 3.1 ) | endl; + sout | "long double\t\t" | 4.0l | 3.1l | "\tmax" | max( 4.0l, 3.1l ) | endl; } // main Index: src/examples/quad.c =================================================================== --- src/examples/quad.c (revision 658f6de0ed93906e66453f048c3c4bfd269e58ce) +++ src/examples/quad.c (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 17 12:19:24 2016 -// Update Count : 6 +// Last Modified On : Tue Mar 1 08:24:56 2016 +// Update Count : 7 // @@ -28,5 +28,5 @@ int main() { int N = 2; - sout | "result of quad of " | N | " is " | quad( N ) | endl; + sout | "result of quad of" | N | "is" | quad( N ) | endl; } Index: src/examples/read.c =================================================================== --- src/examples/read.c (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) +++ src/examples/read.c (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -0,0 +1,60 @@ +// -*- Mode: C -*- +// +// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// read.c -- +// +// Author : Peter A. Buhr +// Created On : Wed Mar 2 16:56:02 2016 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed Mar 2 16:56:44 2016 +// Update Count : 2 +// + +#include + +int main() { + char c; + short int si; + unsigned short int usi; + int i; + unsigned int ui; + long int li; + unsigned long int uli; + long long int lli; + unsigned long long int ulli; + float f; + double d; + long double ld; + float _Complex fc; + double _Complex dc; + long double _Complex ldc; + char s1[10], s2[10]; + + ifstream in; + open( &in, "read.data", "r" ); + + &in | &c + | &si | &usi | &i | &ui | &li | &uli | &lli | &ulli + | &f | &d | &ld + | &fc | &dc | &ldc + | str( s1 ) | str( s2, 10 ); + + sout | c | ' ' | endl + | si | usi | i | ui | li | uli | lli | ulli | endl + | f | d | ld | endl + | f | "" | d | "" | ld | endl; + + sepSet( sout, ", $" ); + sout | fc | dc | ldc | endl + | sepOn | s1 | sepOff | s2 | endl + | s1 | "" | s2 | endl; +} + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa read.c" // +// End: // Index: src/examples/read.data =================================================================== --- src/examples/read.data (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) +++ src/examples/read.data (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -0,0 +1,1 @@ +A 1 2 3 4 5 6 7 8 1.1 1.2 1.3 1.1+2.3 1.1-2.3 1.1-2.3 abc xyz Index: src/examples/sum.c =================================================================== --- src/examples/sum.c (revision 658f6de0ed93906e66453f048c3c4bfd269e58ce) +++ src/examples/sum.c (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Tue Feb 16 23:49:31 2016 -// Update Count : 189 +// Last Modified On : Wed Mar 2 14:31:45 2016 +// Update Count : 193 // @@ -47,6 +47,6 @@ a[i] = v; } // for - sout | "sum from " | low | " to " | High | " is " - | (int)sum( size, a ) | ", check " | (int)s | endl; + sout | "sum from" | low | "to" | High | "is" + | (int)sum( size, a ) | "" | ", check" | (int)s | endl; int s = 0, a[size], v = low; @@ -55,6 +55,6 @@ a[i] = (int)v; } // for - sout | "sum from " | low | " to " | High | " is " - | sum( size, (int *)a ) | ", check " | (int)s | endl; + sout | "sum from" | low | "to" | High | "is" + | sum( size, (int *)a ) | "" | ", check" | (int)s | endl; float s = 0.0, a[size], v = low / 10.0; @@ -63,6 +63,6 @@ a[i] = (float)v; } // for - sout | "sum from " | low / 10.0 | " to " | High / 10.0 | " is " - | sum( size, (float *)a ) | ", check " | (float)s | endl; + sout | "sum from" | low / 10.0 | "to" | High / 10.0 | "is" + | sum( size, (float *)a ) | "" | ", check" | (float)s | endl; double s = 0, a[size], v = low / 10.0; @@ -71,6 +71,6 @@ a[i] = (double)v; } // for - sout | "sum from " | low / 10.0 | " to " | High / 10.0 | " is " - | sum( size, (double *)a ) | ", check " | (double)s | endl; + sout | "sum from" | low / 10.0 | "to" | High / 10.0 | "is" + | sum( size, (double *)a ) | "" | ", check" | (double)s | endl; struct S { int i, j; } 0 = { 0, 0 }, 1 = { 1, 1 }; @@ -79,5 +79,5 @@ S ++?( S *t ) { *t += 1; return *t; } S ?++( S *t ) { S temp = *t; *t += 1; return temp; } - ofstream * ?|?( ofstream * os, S v ) { return os | v.i | ' ' | v.j; } + ofstream * ?|?( ofstream * os, S v ) { return os | v.i | v.j; } S s = 0, a[size], v = { low, low }; @@ -86,6 +86,6 @@ a[i] = (S)v; } // for - sout | "sum from " | low | " to " | High | " is " - | sum( size, (S *)a ) | ", check " | (S)s | endl; + sout | "sum from" | low | "to" | High | "is" + | sum( size, (S *)a ) | "" | ", check" | (S)s | endl; } // main Index: src/examples/swap.c =================================================================== --- src/examples/swap.c (revision 658f6de0ed93906e66453f048c3c4bfd269e58ce) +++ src/examples/swap.c (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -10,6 +10,6 @@ // Created On : Wed May 27 17:56:53 2015 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Feb 17 12:22:12 2016 -// Update Count : 64 +// Last Modified On : Wed Mar 2 16:15:11 2016 +// Update Count : 65 // @@ -54,15 +54,15 @@ float f1 = 1.5, f2 = 2.5; - sout | "float\t\t\t" | f1 | ' ' | f2 | "\t\t\tswap "; + sout | "float\t\t\t" | f1 | ' ' | f2 | "\t\tswap "; swap( &f1, &f2 ); sout | '\t' | f1 | ' ' | f2 | endl; double d1 = 1.5, d2 = 2.5; - sout | "double\t\t\t" | d1 | ' ' | d2 | "\t\t\tswap "; + sout | "double\t\t\t" | d1 | ' ' | d2 | "\t\tswap "; swap( &d1, &d2 ); sout | '\t' | d1 | ' ' | d2 | endl; long double ld1 = 1.5, ld2 = 2.5; - sout | "long double\t\t" | ld1 | ' ' | ld2 | "\t\t\tswap "; + sout | "long double\t\t" | ld1 | ' ' | ld2 | "\t\tswap "; swap( &ld1, &ld2 ); sout | '\t' | ld1 | ' ' | ld2 | endl; Index: src/examples/tests/vector_test.out.txt =================================================================== --- src/examples/tests/vector_test.out.txt (revision 658f6de0ed93906e66453f048c3c4bfd269e58ce) +++ src/examples/tests/vector_test.out.txt (revision 90c3b1c9b36943edd6040aac93c3da9265b218a4) @@ -1,5 +1,5 @@ enter N elements and C-d on a separate line: Array elements: -1 2 3 4 5 +1 2 3 4 5 Array elements reversed: -5 4 3 2 1 +5 4 3 2 1