Changeset 7416d46a for src/tests/sum.c

Timestamp:

Jan 30, 2018, 3:54:32 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

633a642

Parents:

f792cb8 (diff), 42be3c3 (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.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/tests/sum.c (modified) (7 diffs)

src/tests/sum.c

@@ -11 +11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Dec  7 09:13:36 2017
-// Update Count     : 261
+// Last Modified On : Fri Jan 26 11:31:02 2018
+// Update Count     : 271
 //
 
 #include <fstream>
+#include <stdlib>
 
 void ?{}( int & c, zero_t ) { c = 0; }
@@ -28 +29 @@
 
 forall( otype T | sumable( T ) )                                                // use trait
-T sum( unsigned int n, T a[] ) {
-        T total = 0;                                                                            // instantiate T, select 0
-        for ( unsigned int i = 0; i < n; i += 1 )
-                total += a[i];                                                                  // select +
+T sum( unsigned int size, T a[] ) {
+        T total = 0;                                                                            // instantiate T from 0 by calling constructor
+        for ( unsigned int i = 0; i < size; i += 1 )
+                total += a[i];                                                                  // select appropriate +
         return total;
 } // sum
@@ -55 +56 @@
         } // for
         sout | "sum from" | low | "to" | High | "is"
-                | sum( size, (unsigned char *)a ) | ", check" | (int)s | endl;
+                 | sum( size, (unsigned char *)a ) | ", check" | (int)s | endl;
 
         int s = 0, a[size], v = low;
@@ -63 +64 @@
         } // for
         sout | "sum from" | low | "to" | High | "is"
-                | sum( size, (int *)a ) | ", check" | (int)s | endl;
+                 | sum( size, (int *)a ) | ", check" | (int)s | endl;
 
         float s = 0.0f, a[size], v = low / 10.0f;
@@ -71 +72 @@
         } // for
         sout | "sum from" | low / 10.0f | "to" | High / 10.0f | "is"
-                | sum( size, (float *)a ) | ", check" | (float)s | endl;
+                 | sum( size, (float *)a ) | ", check" | (float)s | endl;
 
         double s = 0.0, a[size], v = low / 10.0;
@@ -79 +80 @@
         } // for
         sout | "sum from" | low / 10.0 | "to" | High / 10.0 | "is"
-                | sum( size, (double *)a ) | ", check" | (double)s | endl;
+                 | sum( size, (double *)a ) | ", check" | (double)s | endl;
 
         struct S { int i, j; };
@@ -98 +99 @@
         } // for
         sout | "sum from" | low | "to" | High | "is"
-                | sum( size, (S *)a ) | ", check" | (S)s | endl;
+                 | sum( size, (S *)a ) | ", check" | (S)s | endl;
+
+        forall( otype Impl | sumable( Impl ) )
+        struct GS {
+                Impl * x, * y;
+        };
+        GS(int) gs;
+        gs.x = anew( size );                                                            // create array storage for field
+        s = 0; v = low;
+        for ( int i = 0; i < size; i += 1, v += 1 ) {
+                s += (int)v;
+                gs.x[i] = (int)v;                                                               // set filed array in generic type
+        } // for
+        sout | "sum from" | low | "to" | High | "is"
+                 | sum( size, gs.x ) | ", check" | (int)s | endl; // add filed array in generic type
 } // main