Changes in src/examples/sum.c [6ba0659:b63e376]

File:

• src/examples/sum.c (modified) (8 diffs)

src/examples/sum.c

@@ -10 +10 @@
 // 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 : Fri Mar  4 15:06:47 2016
+// Update Count     : 196
 //
 
 #include <fstream>
 
-context sumable( type T ) {
+trait sumable( otype T ) {
         const T 0;
         T ?+?( T, T );
@@ -24 +24 @@
 }; // sumable
 
-forall( type T | sumable( T ) )
+forall( otype T | sumable( T ) )
 T sum( unsigned int n, T a[] ) {
         T total = 0;                                                                            // instantiate T, select 0
@@ -47 +47 @@
                 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 +55 @@
                 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 +63 @@
                 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 +71 @@
                 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 +79 @@
         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 +86 @@
                 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