Changeset e99e43f for tests/swap.cfa

Timestamp:

Jan 10, 2019, 3:50:34 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

d97c3a4

Parents:

aeb8f70 (diff), 08222c7 (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.

git-author:

Aaron Moss <a3moss@…> (01/10/19 14:46:09)

git-committer:

Aaron Moss <a3moss@…> (01/10/19 15:50:34)

Message:

Merge remote-tracking branch 'plg/master' into deferred_resn

File:

• tests/swap.cfa (moved) (moved from tests/swap.c ) (2 diffs)

tests/swap.cfa

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// swap.c --
+// swap.cfa --
 //
 // Author           : Peter A. Buhr
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  7 09:13:13 2017
-// Update Count     : 71
+// Last Modified On : Sun Dec 23 23:00:49 2018
+// Update Count     : 77
 //
 
@@ -19 +19 @@
 int main( void ) {
         char c1 = 'a', c2 = 'b';
-        sout | "char\t\t\t" | c1 | ' ' | c2 | "\t\t\tswap ";
+        sout | "char\t\t\t" | c1 | ' ' | c2 | "\t\t\tswap " | nonl;
         swap( c1, c2 );
-        sout | '\t' | c1 | ' ' | c2 | endl;
+        sout | '\t' | c1 | ' ' | c2;
 
         signed int i1 = -1, i2 = -2;
-        sout | "signed int\t\t" | i1 | i2 | "\t\t\tswap ";
+        sout | "signed int\t\t" | i1 | i2 | "\t\t\tswap " | nonl;
         swap( i1, i2 );
-        sout | '\t' | i1 | i2 | endl;
+        sout | '\t' | i1 | i2;
 
         unsigned int ui1 = 1, ui2 = 2;
-        sout | "unsigned int\t\t" | ui1 | ui2 | "\t\t\tswap ";
+        sout | "unsigned int\t\t" | ui1 | ui2 | "\t\t\tswap " | nonl;
         swap( ui1, ui2 );
-        sout | '\t' | ui1 | ui2 | endl;
+        sout | '\t' | ui1 | ui2;
 
         signed long int li1 = -1, li2 = -2;
-        sout | "signed long int\t\t" | li1 | li2 | "\t\t\tswap ";
+        sout | "signed long int\t\t" | li1 | li2 | "\t\t\tswap " | nonl;
         swap( li1, li2 );
-        sout | '\t' | li1 | li2 | endl;
+        sout | '\t' | li1 | li2;
 
         unsigned long int uli1 = 1, uli2 = 2;
-        sout | "unsigned long int\t" | uli1 | uli2 | "\t\t\tswap ";
+        sout | "unsigned long int\t" | uli1 | uli2 | "\t\t\tswap " | nonl;
         swap( uli1, uli2 );
-        sout | '\t' | uli1 | uli2 | endl;
+        sout | '\t' | uli1 | uli2;
 
         signed long long int lli1 = -1, lli2 = -2;
-        sout | "signed long long int\t" | lli1 | lli2 | "\t\t\tswap ";
+        sout | "signed long long int\t" | lli1 | lli2 | "\t\t\tswap " | nonl;
         swap( lli1, lli2 );
-        sout | '\t' | lli1 | lli2 | endl;
+        sout | '\t' | lli1 | lli2;
 
         unsigned long long int ulli1 = 1, ulli2 = 2;
-        sout | "unsigned long long int\t" | ulli1 | ulli2 | "\t\t\tswap ";
+        sout | "unsigned long long int\t" | ulli1 | ulli2 | "\t\t\tswap " | nonl;
         swap( ulli1, ulli2 );
-        sout | '\t' | ulli1 | ulli2 | endl;
+        sout | '\t' | ulli1 | ulli2;
 
         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\t\tswap " | nonl;
         swap( f1, f2 );
-        sout | '\t' | f1 | f2 | endl;
+        sout | '\t' | f1 | f2;
 
         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\t\tswap " | nonl;
         swap( d1, d2 );
-        sout | '\t' | d1 | d2 | endl;
+        sout | '\t' | d1 | d2;
 
         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\t\tswap " | nonl;
         swap( ld1, ld2 );
-        sout | '\t' | ld1 | ld2 | endl;
+        sout | '\t' | ld1 | ld2;
 
         float _Complex fc1 = 1.5f+1.5if, fc2 = 2.5f+2.5if;
-        sout | "float _Complex\t\t" | fc1 | fc2 | "\tswap ";
+        sout | "float _Complex\t\t" | fc1 | fc2 | "\tswap " | nonl;
         swap( fc1, fc2 );
-        sout | '\t' | fc1 | fc2 | endl;
+        sout | '\t' | fc1 | fc2;
 
         double _Complex dc1 = 1.5d+1.5id, dc2 = 2.5d+2.5id;
-        sout | "double _Complex\t\t" | dc1 | dc2 | "\tswap ";
+        sout | "double _Complex\t\t" | dc1 | dc2 | "\tswap " | nonl;
         swap( dc1, dc2 );
-        sout | '\t' | dc1 | dc2 | endl;
+        sout | '\t' | dc1 | dc2;
 
         long double _Complex ldc1 = 1.5d+1.5il, ldc2 = 2.5d+2.5il;
-        sout | "long double _Complex\t" | ldc1 | ldc2 | "\tswap ";
+        sout | "long double _Complex\t" | ldc1 | ldc2 | "\tswap " | nonl;
         swap( ldc1, ldc2 );
-        sout | '\t' | ldc1 | ldc2 | endl;
+        sout | '\t' | ldc1 | ldc2;
 
         struct S { int i, j; } s1 = { 1, 2 }, s2 = { 2, 1 };
         ofstream & ?|?( ofstream & os, S s ) { return os | s.i | s.j; }
-        sout | "struct S\t\t" | s1 | "," | s2 | "\t\tswap ";
+        void ?|?( ofstream & os, S s ) { (ofstream &)(os | s.i | s.j); nl( os ); }
+        sout | "struct S\t\t" | s1 | "," | s2 | "\t\tswap " | nonl;
         swap( s1, s2 );
-        sout | '\t' | s1 | "," | s2 | endl;
+        sout | '\t' | s1 | "," | s2;
 } // main
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa swap.c" //
+// compile-command: "cfa swap.cfa" //
 // End: //