Changeset 174845e for src/tests

Timestamp:

Jun 5, 2018, 3:35:49 PM (7 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, with_gc

Children:

beefc34c

Parents:

41770ed1 (diff), dafdbe7 (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

Location:

src/tests

Files:

• .expect/ifwhileCtl.txt (moved) (moved from src/tests/.expect/ifcond.txt ) (1 diff)
• ifwhileCtl.c (moved) (moved from src/tests/ifcond.c ) (2 diffs)
• sum.c (modified) (4 diffs)

src/tests/.expect/ifwhileCtl.txt

@@ -3 +3 @@
 x == y correct
 s.i < 4 correct
+x != 0 correct
+x == y correct
+s.i < 4 correct

src/tests/ifwhileCtl.c

@@ -10 +10 @@
 // Created On       : Sat Aug 26 10:13:11 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  2 09:55:02 2018
-// Update Count     : 15
+// Last Modified On : Mon Jun  4 22:46:48 2018
+// Update Count     : 19
 //
 
@@ -42 +42 @@
 
         if ( struct S { int i; } s = { 3 }; s.i < 4 ) {
+                S s1;
                 sout | "s.i < 4 correct" | endl;
         } else {
+                S s1;
                 sout | "s.i >= 4 incorrect" | endl;
         } // if
+
+        while ( int x = 1 ) {
+                sout | "x != 0 correct" | endl;
+                break;
+        } // while
+
+        while ( int x = 4, y = 0 ) {
+                sout | "x != 0 && y != 0 incorrect" | endl;
+        } // while
+
+        while ( int x = 5, y = f( x ); x == y ) {
+                sout | "x == y correct" | endl;
+                break;
+        } // while
+
+        while ( struct S { int i; } s = { 3 }; s.i < 4 ) {
+                S s1;
+                sout | "s.i < 4 correct" | endl;
+                break;
+        } // while
 } // main
 

src/tests/sum.c

@@ -11 +11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 17 11:49:17 2018
-// Update Count     : 273
+// Last Modified On : Sun Jun  3 19:23:41 2018
+// Update Count     : 278
 //
 
@@ -18 +18 @@
 #include <stdlib>
 
-void ?{}( int & c, zero_t ) { c = 0; }
+void ?{}( int & c, zero_t ) { c = 0; }                                  // not in prelude
 
 trait sumable( otype T ) {
-        void ?{}( T &, zero_t );                                                        // constructor from 0 literal
+        void ?{}( T &, zero_t );                                                        // 0 literal constructor
         T ?+?( T, T );                                                                          // assortment of additions
         T ?+=?( T &, T );
@@ -29 +29 @@
 
 forall( otype T | sumable( T ) )                                                // use trait
-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 )
+T sum( size_t size, T a[] ) {
+        T total = 0;                                                                            // initialize by 0 constructor
+        for ( size_t i = 0; i < size; i += 1 )
                 total += a[i];                                                                  // select appropriate +
         return total;
@@ -111 +111 @@
         for ( int i = 0; i < size; i += 1, v += 1 ) {
                 s += (int)v;
-                gs.x[i] = (int)v;                                                               // set filed array in generic type
+                gs.x[i] = (int)v;                                                               // set field 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
+                 | sum( size, gs.x ) | ", check" | (int)s | endl; // add field array in generic type
 } // main