Index: src/examples/searchsort.c =================================================================== --- src/examples/searchsort.c (revision f96b061a0c32b7d62a02f5ad4df3a87e9cb19abc) +++ (revision ) @@ -1,102 +1,0 @@ -// -*- Mode: C -*- -// -// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// searchsort.c -- -// -// Author : Peter A. Buhr -// Created On : Thu Feb 4 18:17:50 2016 -// Last Modified By : Peter A. Buhr -// Last Modified On : Tue Mar 22 22:16:46 2016 -// Update Count : 55 -// - -#include -#include // bsearch, qsort - -int main( void ) { - const unsigned int size = 10; - int iarr[size]; - - for ( unsigned int i = 0; i < size; i += 1 ) { - iarr[i] = size - i; - sout | iarr[i] | ", "; - } // for - sout | endl; - qsort( iarr, size ); - for ( unsigned int i = 0; i < size; i += 1 ) { - sout | iarr[i] | ", "; - } // for - sout | endl; - for ( unsigned int i = 0; i < size; i += 1 ) { - int *v = bsearch( size - i, iarr, size ); - sout | *v | ", "; - } // for - sout | endl | endl; - - // descending sort/search by changing < to > - for ( unsigned int i = 0; i < size; i += 1 ) { - iarr[i] = i + 1; - sout | iarr[i] | ", "; - } // for - sout | endl; - { - int ? y; } - qsort( iarr, size ); - for ( unsigned int i = 0; i < size; i += 1 ) { - sout | iarr[i] | ", "; - } // for - sout | endl; - for ( unsigned int i = 0; i < size; i += 1 ) { - int *v = bsearch( size - i, iarr, size ); - sout | *v | ", "; - } // for - } - sout | endl | endl; - - double darr[size]; - for ( unsigned int i = 0; i < size; i += 1 ) { - darr[i] = size - i + 0.5; - sout | darr[i] | ", "; - } // for - sout | endl; - qsort( darr, size ); - for ( unsigned int i = 0; i < size; i += 1 ) { - sout | darr[i] | ", "; - } // for - sout | endl; - for ( unsigned int i = 0; i < size; i += 1 ) { - double *v = bsearch( size - i + 0.5, darr, size ); - sout | *v | ", "; - } // for - sout | endl | endl; - - struct S { int i, j; } sarr[size]; - int ?storage; } + +// Local Variables: // +// mode: c // +// tab-width: 4 // +// End: // Index: src/libcfa/containers/vector.c =================================================================== --- src/libcfa/containers/vector.c (revision f96b061a0c32b7d62a02f5ad4df3a87e9cb19abc) +++ src/libcfa/containers/vector.c (revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3) @@ -1,2 +1,17 @@ +// +// 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. +// +// vector.c -- +// +// Author : Thierry Delisle +// Created On : Tue Jul 5 18:07:52 2016 +// Last Modified By : Peter A. Buhr +// Last Modified On : Tue Jul 5 18:08:31 2016 +// Update Count : 2 +// + #include @@ -71,2 +86,7 @@ } } + +// Local Variables: // +// mode: c // +// tab-width: 4 // +// End: // Index: src/libcfa/prelude.cf =================================================================== --- src/libcfa/prelude.cf (revision f96b061a0c32b7d62a02f5ad4df3a87e9cb19abc) +++ src/libcfa/prelude.cf (revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3) @@ -1,3 +1,2 @@ -# 2 "prelude.cf" // needed for error messages from this file // -*- Mode: C -*- // @@ -9,11 +8,9 @@ // Created On : Sat Nov 29 07:23:41 2014 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Mar 2 18:03:41 2016 -// Update Count : 89 -// - -// Following line added from stddef.h by build - -typedef long int ptrdiff_t; +// Last Modified On : Tue Jul 5 18:04:40 2016 +// Update Count : 92 +// + +# 2 "prelude.cf" // needed for error messages from this file // Section numbers from: http://plg.uwaterloo.ca/~cforall/refrat.pdf @@ -854,2 +851,7 @@ void ^?{}( const volatile void * *); void ^?{}( const volatile void * volatile *); + +// Local Variables: // +// mode: c // +// tab-width: 8 // +// End: // Index: src/libcfa/rational.c =================================================================== --- src/libcfa/rational.c (revision f96b061a0c32b7d62a02f5ad4df3a87e9cb19abc) +++ src/libcfa/rational.c (revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3) @@ -1,3 +1,2 @@ -// -*- Mode: C -*- // // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo @@ -11,6 +10,6 @@ // Created On : Wed Apr 6 17:54:28 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed May 4 14:16:14 2016 -// Update Count : 25 +// Last Modified On : Tue Jul 5 18:29:12 2016 +// Update Count : 26 // Index: src/tests/.expect/searchsort.txt =================================================================== --- src/tests/.expect/searchsort.txt (revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3) +++ src/tests/.expect/searchsort.txt (revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3) @@ -0,0 +1,16 @@ +10, 9, 8, 7, 6, 5, 4, 3, 2, 1, +1, 2, 3, 4, 5, 6, 7, 8, 9, 10, +10, 9, 8, 7, 6, 5, 4, 3, 2, 1, + +1, 2, 3, 4, 5, 6, 7, 8, 9, 10, +10, 9, 8, 7, 6, 5, 4, 3, 2, 1, +10, 9, 8, 7, 6, 5, 4, 3, 2, 1, + +10.5, 9.5, 8.5, 7.5, 6.5, 5.5, 4.5, 3.5, 2.5, 1.5, +1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, +10.5, 9.5, 8.5, 7.5, 6.5, 5.5, 4.5, 3.5, 2.5, 1.5, + +10 11, 9 10, 8 9, 7 8, 6 7, 5 6, 4 5, 3 4, 2 3, 1 2, +1 2, 2 3, 3 4, 4 5, 5 6, 6 7, 7 8, 8 9, 9 10, 10 11, +10 11, 9 10, 8 9, 7 8, 6 7, 5 6, 4 5, 3 4, 2 3, 1 2, + Index: src/tests/io.c =================================================================== --- src/tests/io.c (revision f96b061a0c32b7d62a02f5ad4df3a87e9cb19abc) +++ src/tests/io.c (revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3) @@ -1,3 +1,2 @@ -// -*- Mode: C -*- // // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo @@ -11,6 +10,6 @@ // Created On : Wed Mar 2 16:56:02 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Jun 8 22:52:04 2016 -// Update Count : 30 +// Last Modified On : Tue Jul 5 18:29:23 2016 +// Update Count : 31 // Index: src/tests/rational.c =================================================================== --- src/tests/rational.c (revision f96b061a0c32b7d62a02f5ad4df3a87e9cb19abc) +++ src/tests/rational.c (revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3) @@ -1,3 +1,2 @@ -// -*- Mode: C -*- // // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo @@ -11,6 +10,6 @@ // Created On : Mon Mar 28 08:43:12 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed May 4 14:19:36 2016 -// Update Count : 24 +// Last Modified On : Tue Jul 5 18:29:37 2016 +// Update Count : 25 // Index: src/tests/searchsort.c =================================================================== --- src/tests/searchsort.c (revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3) +++ src/tests/searchsort.c (revision a6151baa3a12bfe16ad97aa148f11da6d2d8d4c3) @@ -0,0 +1,101 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// searchsort.c -- +// +// Author : Peter A. Buhr +// Created On : Thu Feb 4 18:17:50 2016 +// Last Modified By : Peter A. Buhr +// Last Modified On : Tue Jul 5 18:06:07 2016 +// Update Count : 56 +// + +#include +#include // bsearch, qsort + +int main( void ) { + const unsigned int size = 10; + int iarr[size]; + + for ( unsigned int i = 0; i < size; i += 1 ) { + iarr[i] = size - i; + sout | iarr[i] | ", "; + } // for + sout | endl; + qsort( iarr, size ); + for ( unsigned int i = 0; i < size; i += 1 ) { + sout | iarr[i] | ", "; + } // for + sout | endl; + for ( unsigned int i = 0; i < size; i += 1 ) { + int *v = bsearch( size - i, iarr, size ); + sout | *v | ", "; + } // for + sout | endl | endl; + + // descending sort/search by changing < to > + for ( unsigned int i = 0; i < size; i += 1 ) { + iarr[i] = i + 1; + sout | iarr[i] | ", "; + } // for + sout | endl; + { + int ? y; } + qsort( iarr, size ); + for ( unsigned int i = 0; i < size; i += 1 ) { + sout | iarr[i] | ", "; + } // for + sout | endl; + for ( unsigned int i = 0; i < size; i += 1 ) { + int *v = bsearch( size - i, iarr, size ); + sout | *v | ", "; + } // for + } + sout | endl | endl; + + double darr[size]; + for ( unsigned int i = 0; i < size; i += 1 ) { + darr[i] = size - i + 0.5; + sout | darr[i] | ", "; + } // for + sout | endl; + qsort( darr, size ); + for ( unsigned int i = 0; i < size; i += 1 ) { + sout | darr[i] | ", "; + } // for + sout | endl; + for ( unsigned int i = 0; i < size; i += 1 ) { + double *v = bsearch( size - i + 0.5, darr, size ); + sout | *v | ", "; + } // for + sout | endl | endl; + + struct S { int i, j; } sarr[size]; + int ?