Changeset 9d264e18 for tests

Timestamp:

Nov 12, 2020, 1:29:43 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

b5344a3

Parents:

d6ad99e (diff), 8ca26d5 (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:

• .expect/alloc-ERROR.txt (modified) (3 diffs)
• alloc.cfa (modified) (2 diffs)
• malloc.cfa (modified) (2 diffs)
• manipulatorsOutput3.cfa (modified) (3 diffs)

tests/.expect/alloc-ERROR.txt

@@ -1 @@
-alloc.cfa:361:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.cfa:382:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:
@@ -19 +19 @@
 
 
-alloc.cfa:362:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.cfa:383:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:
@@ -30 +30 @@
 
 
-alloc.cfa:363:1 error: No reasonable alternatives for expression Applying untyped:
+alloc.cfa:384:1 error: No reasonable alternatives for expression Applying untyped:
   Name: ?=?
 ...to:

tests/alloc.cfa

@@ -10 +10 @@
 // Created On       : Wed Feb  3 07:56:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Oct  9 23:03:11 2020
-// Update Count     : 431
+// Last Modified On : Thu Nov 12 10:02:18 2020
+// Update Count     : 432
 //
 
@@ -375 +375 @@
         dp = alloc(5.0`fill); // just for testing multiple free
         assert(*dp == 5.0);
-        free( ip, dp );
+        free( ip, dp, 0p );
 
 #ifdef ERR1

tests/malloc.cfa

@@ -319 +319 @@
         free(ip);
 
-        free( (void*) 0p ); // sanity check
+        free( (void *) 0p ); // sanity check
         free( NULL ); // sanity check
 
@@ -605 +605 @@
         return 0;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa malloc.cfa" //
+// End: //

tests/manipulatorsOutput3.cfa

@@ -156 +156 @@
         sout | nl;
 
-        ui128 = 0x7fffffffffffffff;
-        ui128 <<= 64;
-        ui128 += 0xffffffffffffffff;
         sout | left( wd( 160, i128 ) );
         sout | left( sign( wd( 0, i128 ) ) );
@@ -177 +174 @@
         sout | left( wd( 160, bin( i128 ) ) );
         sout | left( sign( wd( 160, i128 ) ) );
-        sout | left( wd( 160, upcase(hex( i128 )) ) );
-        sout | left( wd( 160, upcase(oct( i128 ) )) );
-        sout | left( wd( 160, upcase(bin( i128 )) ) );
+        sout | left( wd( 160, upcase( hex( i128 ) ) ) );
+        sout | left( wd( 160, upcase( oct( i128 ) ) ) );
+        sout | left( wd( 160, upcase( bin( i128 ) ) ) );
 
         x = 1234;
@@ -316 +313 @@
         }
 
-
         // int128 constants (and printing)
         int128 v = 0xffff_ffffffff_ffffffff_L128 + 0xffffffff_ffffffff_ffffffff_ffffffff_L128;