Changeset 18f0b70 for tests

Timestamp:

Nov 10, 2020, 12:21:21 AM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

0dd9a5e

Parents:

16ba4a6 (diff), 75baaa3 (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:

tests

Files:

• alloc.cfa (modified) (3 diffs)
• malloc.cfa (modified) (1 diff)

tests/alloc.cfa

@@ -208 +208 @@
 
 
+        int const_count, dest_count;
         struct Struct { int x; double y; };
+        void  ?{}( Struct & a ) {                                       // construct
+                a.[ x, y ] = [ -1, -1.0 ];
+        }
+        void  ?{}( Struct & a, int x, double y ) {      // initialize
+                a.[ x, y ] = [ x, y ];
+                const_count++;
+        }
+        void ^?{}( Struct & a ) {  dest_count++; }      // destruct
         Struct st, st1, sta[dim], sta1[dim], * stp, * stp1;
 
@@ -329 +338 @@
         printf( "\n" );
 
+        const_count = dest_count = 0;
         stp = new( 42, 42.5 );
+        assert( const_count == 1 && dest_count == 0 );                                          // assertion for testing
         stp1 = new( 42, 42.5 );
+        assert( const_count == 2 && dest_count == 0 );                                          // assertion for testing
+
         printf( "CFA new initialize\n%d %g %d %g\n", stp->x, stp->y, stp1->x, stp1->y );
         delete( stp, stp1 );
+        assert( const_count == 2 && dest_count == 2 );                                          // assertion for testing
 
         // new, array types
         stp = anew( dim, 42, 42.5 );
+        assert( const_count == 2 + dim && dest_count == 2 );                            // assertion for testing
         printf( "CFA array new initialize\n" );
         for ( i; dim ) { printf( "%d %g, ", stp[i].x, stp[i].y ); }
         printf( "\n" );
+
         stp1 = anew( dim, 42, 42.5 );
+        assert( const_count == 2 + 2 * dim && dest_count == 2 );                        // assertion for testing
         for ( i; dim ) { printf( "%d %g, ", stp1[i].x, stp1[i].y ); }
         printf( "\n" );
         adelete( stp, stp1 );
+        assert( const_count == 2 + 2 * dim && dest_count == 2 + 2 * dim);       // assertion for testing
 
         // extras
@@ -354 +372 @@
         *ip = 0xdeadbeef;
         printf( "CFA deep malloc %#x\n", *ip );
-        free( ip );
+
+        dp = alloc(5.0`fill); // just for testing multiple free
+        assert(*dp == 5.0);
+        free( ip, dp );
 
 #ifdef ERR1

tests/malloc.cfa

@@ -319 +319 @@
         free(ip);
 
-        free( 0p ); // sanity check
+        free( (void*) 0p ); // sanity check
         free( NULL ); // sanity check