Changes in / [28762a1:c77fd8b]
- Files:
-
- 2 added
- 3 deleted
- 5 edited
-
doc/generic_types/refereeReport.txt (deleted)
-
src/examples/fwrite.c (added)
-
src/examples/identity.c (added)
-
src/tests/.expect/identity.txt (deleted)
-
src/tests/.expect/io.txt (modified) (2 diffs)
-
src/tests/Makefile.am (modified) (3 diffs)
-
src/tests/Makefile.in (modified) (1 diff)
-
src/tests/coroutine.c (modified) (1 diff)
-
src/tests/identity.c (deleted)
-
src/tests/io.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
src/tests/.expect/io.txt
r28762a1 rc77fd8b 4 4 123 5 5 6 x (1 x [2 x {3 x =4 x $5 x £6 x ¥7 x ¡8 x ¿9 x «107 1, x 2. x 3; x 4! x 5? x 6% x 7¢ x 8» x 9) x 10] x 11} x8 x`1`x'2'x"3"x:4:x 5 x 6 x9 710 x11 812 x13 914 x15 1016 x17 x ( 1 ) x 2 , x 3 :x: 418 6 A 19 7 1 2 3 4 5 6 7 8 … … 30 18 abc, $xyz 31 19 32 1, 2, 3, 4 33 1, $2, $3 ", $" 34 1 2 3 " " 35 1 2 3 36 12 3 37 123 38 1 23 39 1 2 3 40 1 2 3 4 " " 41 1, 2, 3, 4 ", " 42 1, 2, 3, 4 20 v(27 v[27 v{27 $27 =27 £27 ¥27 ¡27 ¿27 «27 21 25, 25. 25: 25; 25! 25? 25% 25¢ 25» 25) 25] 25} 22 25'27 25`27 25"27 25 27 25 23 27 25 24 27 25 25 27 25 27 25 26 27 43 27 3, 4, a, 7.2 44 28 3, 4, a, 7.2 45 29 3 4 a 7.2 46 3 4 a 7.234a7.2 3 4 a 7.230 3 4 a 7.234a7.2 3 4 a 7.2 47 31 3-4-a-7.2^3^4-3-4-a-7.2 -
src/tests/Makefile.am
r28762a1 rc77fd8b 11 11 ## Created On : Sun May 31 09:08:15 2015 12 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Thu Jun 8 07:41:43201714 ## Update Count : 4 413 ## Last Modified On : Thu May 25 14:39:15 2017 14 ## Update Count : 43 15 15 ############################################################################### 16 16 … … 20 20 21 21 if BUILD_CONCURRENCY 22 concurrent =yes23 quick_test 24 concurrent_test =coroutine thread monitor multi-monitor sched-int-barge sched-int-block sched-int-disjoint sched-int-wait sched-ext sched-ext-multi preempt22 concurrent=yes 23 quick_test+= coroutine thread monitor 24 concurrent_test=coroutine thread monitor multi-monitor sched-int-barge sched-int-block sched-int-disjoint sched-int-wait sched-ext sched-ext-multi preempt 25 25 else 26 26 concurrent=no … … 57 57 @+python test.py --debug=${debug} --concurrent=${concurrent} ${concurrent_test} 58 58 59 .dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@59 .dummy : .dummy.c 60 60 ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@} #don't use CFLAGS, this rule is not a real test 61 61 62 63 % : %.c @CFA_BINDIR@/@CFA_NAME@ 64 ${CC} ${CFLAGS} ${<} -o ${@} 65 66 dtor-early-exit-ERR1: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@ 62 dtor-early-exit-ERR1: dtor-early-exit.c 67 63 ${CC} ${CFLAGS} -DERR1 ${<} -o ${@} 68 64 69 dtor-early-exit-ERR2: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@65 dtor-early-exit-ERR2: dtor-early-exit.c 70 66 ${CC} ${CFLAGS} -DERR2 ${<} -o ${@} 71 67 72 declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@68 declarationSpecifier: declarationSpecifier.c 73 69 ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@} 74 70 75 gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@71 gccExtensions : gccExtensions.c 76 72 ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@} 77 73 78 extension : extension.c @CFA_BINDIR@/@CFA_NAME@74 extension : extension.c 79 75 ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@} 80 76 81 attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@77 attributes : attributes.c 82 78 ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@} 83 79 84 KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@80 KRfunctions : KRfunctions.c 85 81 ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@} 86 82 87 gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@83 gmp : gmp.c 88 84 ${CC} ${CFLAGS} -lgmp ${<} -o ${@} 89 85 90 memberCtors-ERR1: memberCtors.c @CFA_BINDIR@/@CFA_NAME@86 memberCtors-ERR1: memberCtors.c 91 87 ${CC} ${CFLAGS} -DERR1 ${<} -o ${@} 92 88 93 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@89 completeTypeError : completeTypeError.c 94 90 ${CC} ${CFLAGS} -DERR1 ${<} -o ${@} -
src/tests/Makefile.in
r28762a1 rc77fd8b 661 661 @+python test.py --debug=${debug} --concurrent=${concurrent} ${concurrent_test} 662 662 663 .dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@663 .dummy : .dummy.c 664 664 ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@} #don't use CFLAGS, this rule is not a real test 665 665 666 % : %.c @CFA_BINDIR@/@CFA_NAME@ 667 ${CC} ${CFLAGS} ${<} -o ${@} 668 669 dtor-early-exit-ERR1: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@ 666 dtor-early-exit-ERR1: dtor-early-exit.c 670 667 ${CC} ${CFLAGS} -DERR1 ${<} -o ${@} 671 668 672 dtor-early-exit-ERR2: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@669 dtor-early-exit-ERR2: dtor-early-exit.c 673 670 ${CC} ${CFLAGS} -DERR2 ${<} -o ${@} 674 671 675 declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@672 declarationSpecifier: declarationSpecifier.c 676 673 ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@} 677 674 678 gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@675 gccExtensions : gccExtensions.c 679 676 ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@} 680 677 681 extension : extension.c @CFA_BINDIR@/@CFA_NAME@678 extension : extension.c 682 679 ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@} 683 680 684 attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@681 attributes : attributes.c 685 682 ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@} 686 683 687 KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@684 KRfunctions : KRfunctions.c 688 685 ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@} 689 686 690 gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@687 gmp : gmp.c 691 688 ${CC} ${CFLAGS} -lgmp ${<} -o ${@} 692 689 693 memberCtors-ERR1: memberCtors.c @CFA_BINDIR@/@CFA_NAME@690 memberCtors-ERR1: memberCtors.c 694 691 ${CC} ${CFLAGS} -DERR1 ${<} -o ${@} 695 692 696 completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@693 completeTypeError : completeTypeError.c 697 694 ${CC} ${CFLAGS} -DERR1 ${<} -o ${@} 698 695 -
src/tests/coroutine.c
r28762a1 rc77fd8b 1 //2 // Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo3 //4 // The contents of this file are covered under the licence agreement in the5 // file "LICENCE" distributed with Cforall.6 //7 // fibonacci.c --8 //9 // Author : Thierry Delisle10 // Created On : Thu Jun 8 07:29:37 201711 // Last Modified By : Peter A. Buhr12 // Last Modified On : Thu Jun 8 07:37:12 201713 // Update Count : 514 //15 16 1 #include <fstream> 17 2 #include <coroutine> 18 3 19 4 coroutine Fibonacci { 20 int fn;// used for communication5 int fn; // used for communication 21 6 }; 22 7 23 void ?{}( Fibonacci * this) {24 8 void ?{}(Fibonacci* this) { 9 this->fn = 0; 25 10 } 26 11 27 void main( Fibonacci * this) {28 int fn1, fn2;// retained between resumes29 this->fn = 0; // case 0 30 31 suspend();// return to last resume12 void main(Fibonacci* this) { 13 int fn1, fn2; // retained between resumes 14 this->fn = 0; 15 fn1 = this->fn; 16 suspend(); // return to last resume 32 17 33 this->fn = 1; // case 1 34 35 36 suspend();// return to last resume18 this->fn = 1; 19 fn2 = fn1; 20 fn1 = this->fn; 21 suspend(); // return to last resume 37 22 38 for ( ;; ) { // general case 39 40 41 42 suspend();// return to last resume43 } // for 23 for ( ;; ) { 24 this->fn = fn1 + fn2; 25 fn2 = fn1; 26 fn1 = this->fn; 27 suspend(); // return to last resume 28 } 44 29 } 45 30 46 int next( Fibonacci * this) {47 resume( this );// transfer to last suspend48 31 int next(Fibonacci* this) { 32 resume(this); // transfer to last suspend 33 return this->fn; 49 34 } 50 35 51 36 int main() { 52 Fibonacci f1, f2; 53 for ( int i = 1; i <= 10; i += 1 ) { 54 sout | next( &f1 ) | ' ' | next( &f2 ) | endl; 55 } // for 37 Fibonacci f1, f2; 38 for ( int i = 1; i <= 10; i += 1 ) { 39 sout | next(&f1) | ' ' | next(&f2) | endl; 40 } 41 42 return 0; 56 43 } 57 58 // Local Variables: //59 // tab-width: 4 //60 // compile-command: "cfa fibonacci.c" //61 // End: // -
src/tests/io.c
r28762a1 rc77fd8b 10 10 // Created On : Wed Mar 2 16:56:02 2016 11 11 // Last Modified By : Peter A. Buhr 12 // Last Modified On : T hu Jun 8 09:52:10201713 // Update Count : 5112 // Last Modified On : Tue Mar 21 22:36:06 2017 13 // Update Count : 48 14 14 // 15 15 … … 17 17 18 18 int main() { 19 char c; // basic types19 char c; // basic types 20 20 short int si; 21 21 unsigned short int usi; … … 32 32 double _Complex dc; 33 33 long double _Complex ldc; 34 enum { size = 10 }; 35 char s1[size], s2[size]; 34 char s1[10], s2[10]; 36 35 37 36 int x = 3, y = 5, z = 7; … … 42 41 sout | endl; 43 42 43 ifstream in; // create / open file 44 open( &in, "io.data", "r" ); 45 46 &in | &c // character 47 | &si | &usi | &i | &ui | &li | &uli | &lli | &ulli // integral 48 | &f | &d | &ld // floating point 49 | &fc | &dc | &ldc // floating-point complex 50 | cstr( s1 ) | cstr( s2, 10 ); // C string, length unchecked and checked 51 52 sout | c | ' ' | endl // character 53 | si | usi | i | ui | li | uli | lli | ulli | endl // integral 54 | f | d | ld | endl // floating point 55 | fc | dc | ldc | endl; // complex 56 sout | endl; 57 sout | f | "" | d | "" | ld | endl // floating point without separator 58 | sepDisable | fc | dc | ldc | sepEnable | endl // complex without separator 59 | sepOn | s1 | sepOff | s2 | endl // local separator removal 60 | s1 | "" | s2 | endl; // C string without separator 61 sout | endl; 62 63 sepSet( sout, ", $" ); // change separator, maximum of 15 characters 64 sout | f | d | ld | endl 65 | fc | dc | ldc | endl 66 | s1 | s2 | endl; 67 sout | endl; 68 sepSet( sout, " " ); 69 44 70 sout 45 71 // opening delimiters 46 | "x (" | 1 47 | "x [" | 2 48 | "x {" | 3 49 | "x =" | 4 50 | "x $" | 5 51 | "x £" | 6 52 | "x ¥" | 7 53 | "x ¡" | 8 54 | "x ¿" | 9 55 | "x «" | 10 72 | "v(" | 27 73 | "v[" | 27 74 | "v{" | 27 75 | "$" | 27 76 | "=" | 27 77 | "£" | 27 78 | "¥" | 27 79 | "¡" | 27 80 | "¿" | 27 81 | "«" | 27 82 | endl 83 // closing delimiters 84 | 25 | "," 85 | 25 | "." 86 | 25 | ":" 87 | 25 | ";" 88 | 25 | "!" 89 | 25 | "?" 90 | 25 | "%" 91 | 25 | "¢" 92 | 25 | "»" 93 | 25 | ")" 94 | 25 | "]" 95 | 25 | "}" 96 | endl 97 // opening-closing delimiters 98 | 25 | "'" | 27 99 | 25 | "`" | 27 100 | 25 | "\"" | 27 101 | 25 | " " | 27 102 | 25 | "\f" | 27 103 | 25 | "\n" | 27 104 | 25 | "\r" | 27 105 | 25 | "\t" | 27 106 | 25 | "\v" | 27 56 107 | endl; 57 sout58 // closing delimiters59 | 1 | ", x"60 | 2 | ". x"61 | 3 | "; x"62 | 4 | "! x"63 | 5 | "? x"64 | 6 | "% x"65 | 7 | "¢ x"66 | 8 | "» x"67 | 9 | ") x"68 | 10 | "] x"69 | 11 | "} x"70 | endl;71 sout72 // opening-closing delimiters73 | "x`" | 1 | "`x'" | 274 | "'x\"" | 3 | "\"x:" | 475 | ":x " | 5 | " x\t" | 676 | "\tx\f" | 7 | "\fx\v" | 877 | "\vx\n" | 9 | "\nx\r" | 1078 | "\rx" |79 endl;80 sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4 | endl;81 108 82 ifstream in; // create / open file 83 open( &in, "io.data", "r" ); 84 85 &in | &c // character 86 | &si | &usi | &i | &ui | &li | &uli | &lli | &ulli // integral 87 | &f | &d | &ld // floating point 88 | &fc | &dc | &ldc // floating-point complex 89 | cstr( s1 ) | cstr( s2, size ); // C string, length unchecked and checked 90 91 sout | c | ' ' | endl // character 92 | si | usi | i | ui | li | uli | lli | ulli | endl // integral 93 | f | d | ld | endl // floating point 94 | fc | dc | ldc | endl; // complex 95 sout | endl; 96 sout | f | "" | d | "" | ld | endl // floating point without separator 97 | sepDisable | fc | dc | ldc | sepEnable | endl // complex without separator 98 | sepOn | s1 | sepOff | s2 | endl // local separator removal 99 | s1 | "" | s2 | endl; // C string without separator 100 sout | endl; 101 102 sepSet( sout, ", $" ); // change separator, maximum of 15 characters 103 sout | f | d | ld | endl 104 | fc | dc | ldc | endl 105 | s1 | s2 | endl; 106 sout | endl; 107 108 [int, int] t1 = [1, 2], t2 = [3, 4]; 109 sout | t1 | t2 | endl; // print tuple 110 111 sepSet( sout, " " ); 112 sepSet( sout, ", $" ); // set separator from " " to ", $" 113 sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"" | endl; 114 sepSet( sout, " " ); // reset separator to " " 115 sout | 1 | 2 | 3 | " \"" | sepGet( sout ) | "\"" | endl; 116 117 sout | sepOn | 1 | 2 | 3 | sepOn | endl; // separator at start of line 118 sout | 1 | sepOff | 2 | 3 | endl; // locally turn off implicit separator 119 120 sout | sepDisable | 1 | 2 | 3 | endl; // globally turn off implicit separation 121 sout | 1 | sepOn | 2 | 3 | endl; // locally turn on implicit separator 122 sout | sepEnable | 1 | 2 | 3 | endl; // globally turn on implicit separation 123 124 sepSetTuple( sout, " " ); // set tuple separator from ", " to " " 125 sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl; 126 sepSetTuple( sout, ", " ); // reset tuple separator to ", " 127 sout | t1 | t2 | " \"" | sepGetTuple( sout ) | "\"" | endl; 128 129 sout | t1 | t2 | endl; // print tuple 130 131 [int, int, const char *, double] t3 = { 3, 4, "a", 7.2 }; 109 [int, int, const char *, double] t = { 3, 4, "a", 7.2 }; 132 110 sout | [ 3, 4, "a", 7.2 ] | endl; 133 sout | t 3| endl;111 sout | t | endl; 134 112 sepSetTuple( sout, " " ); 135 sout | t 3| endl;136 sout | sepOn | t 3 | sepDisable | t3 | sepEnable | t3| endl;113 sout | t | endl; 114 sout | sepOn | t | sepDisable | t | sepEnable | t | endl; 137 115 sepSet( sout, "^" ); 138 116 sepSetTuple( sout, "-" ); 139 sout | t 3 | 3 | 4 | t3| endl;117 sout | t | 3 | 4 | t | endl; 140 118 } 141 119
Note:
See TracChangeset
for help on using the changeset viewer.
