Changeset 356c62a for src/tests

Timestamp:

Feb 24, 2017, 4:01:59 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, stuck-waitfor-destruct, with_gc

Children:

31868da

Parents:

131dbb3 (diff), 23c4aa8 (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/abs.txt (modified) (1 diff)
• .expect/globals.txt (added)
• .expect/monitor.txt (added)
• abs.c (modified) (2 diffs)
• globals.c (added)
• monitor.c (added)
• simpleGenericTriple.c (modified) (1 diff)

src/tests/.expect/abs.txt

@@ -1 @@
-char                    ¿       abs A
+char                    -65     abs 65
 signed int              -65     abs 65
 signed long int         -65     abs 65

src/tests/abs.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 18:26:16 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 15:07:26 2016
-// Update Count     : 51
+// Last Modified On : Wed Feb 22 22:31:03 2017
+// Update Count     : 52
 //
 
@@ -18 +18 @@
 
 int main( void ) {
-        char ch = -65;
+        signed char ch = -65;
         sout | "char\t\t\t"                                     | ch     | "\tabs " | abs( ch ) | endl;
         sout | "signed int\t\t"                         | -65    | "\tabs" | abs( -65 ) | endl;

src/tests/simpleGenericTriple.c

@@ -28 +28 @@
   int x1 = 123, x3 = 456;
   double x2 = 999.123;
-  struct T3(int) Li = { x1, x2, x3 };
+  struct T3(int) Li = { x1, (int)x2, x3 };
   struct T3(int) Ri = { 9, 2, 3 };
   struct T3(int) reti = Li+Ri;