Changeset 933f32f for tests/sum.cfa

Timestamp:

May 24, 2019, 10:19:41 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (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' into cleanup-dtors

File:

• tests/sum.cfa (modified) (2 diffs)

tests/sum.cfa

@@ -11 +11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Dec 23 23:00:38 2018
-// Update Count     : 287
+// Last Modified On : Sun May 19 11:21:02 2019
+// Update Count     : 330
 //
 
 #include <fstream.hfa>
 #include <stdlib.hfa>
-
-void ?{}( int & c, zero_t ) { c = 0; }                                  // not in prelude
 
 trait sumable( otype T ) {
@@ -31 +29 @@
 T sum( size_t size, T a[] ) {
         T total = 0;                                                                            // initialize by 0 constructor
-        for ( size_t i = 0; i < size; i += 1 )
+        for ( i; size )
                 total += a[i];                                                                  // select appropriate +
         return total;
 } // sum
 
-// Not in prelude.
-unsigned char ?+?( unsigned char t1, unsigned char t2 ) { return (int)t1 + t2; } // cast forces integer addition, otherwise recursion
-unsigned char ?+=?( unsigned char & t1, unsigned char t2 ) { t1 = t1 + t2; return t1; }
-unsigned char ++?( unsigned char & t ) { t += 1; return t; }
-unsigned char ?++( unsigned char & t ) { unsigned char temp = t; t += 1; return temp; }
-
-// Not in prelude.
-void ?{}( unsigned char & c, zero_t ) { c = 0; }
-void ?{}( float & f, zero_t ) { f = 0.0; }
-void ?{}( double & d, zero_t ) { d = 0.0; }
-
 int main( void ) {
         const int low = 5, High = 15, size = High - low;
 
-        unsigned char s = 0, a[size], v = (char)low;
-        for ( int i = 0; i < size; i += 1, v += 1 ) {
+        signed char s = 0, a[size], v = (char)low;
+        for ( int i = 0; i < size; i += 1, v += 1hh ) {
                 s += v;
                 a[i] = v;
         } // for
         sout | "sum from" | low | "to" | High | "is"
-                 | sum( size, (unsigned char *)a ) | ", check" | (int)s;
+                 | sum( size, (signed char *)a ) | ", check" | (signed char)s;
+
+        unsigned char s = 0, a[size], v = low;
+        for ( int i = 0; i < size; i += 1, v += 1hhu ) {
+                s += (unsigned char)v;
+                a[i] = (unsigned char)v;
+        } // for
+        sout | "sum from" | low | "to" | High | "is"
+                 | sum( size, (unsigned char *)a ) | ", check" | (unsigned char)s;
+
+        short int s = 0, a[size], v = low;
+        for ( int i = 0; i < size; i += 1, v += 1h ) {
+                s += (short int)v;
+                a[i] = (short int)v;
+        } // for
+        sout | "sum from" | low | "to" | High | "is"
+                 | sum( size, (short int *)a ) | ", check" | (short int)s;
 
         int s = 0, a[size], v = low;