Changeset be8bd88 for src/tests

Timestamp:

Mar 8, 2017, 3:22:50 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:

031a2c95, 0e7ea335

Parents:

87c3bef (diff), 6363ad1 (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/tupleAssign.txt (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• tupleAssign.c (modified) (3 diffs)

src/tests/.expect/tupleAssign.txt

@@ +1 @@
+u=5 v=6 x=10 y=11 z=[100, 200]
 u=5 v=6 x=10 y=11 z=[100, 200]
 u=11 v=10 x=11 y=10 z=[11, 10]
+u=11 v=10 x=11 y=10 z=[11, 10]
+u=10 v=11 z=[10, 11]
 u=10 v=11 z=[10, 11]
 u=123 v=456 z=[111, 222]
-d=-2153.12 i=-2153 c=-105 t=[-2153, -2153.12, -2153]
-d=-2153.12 i=-2153 c=-105 t=[-2153, -2153.12, -2153]
+u=123 v=456 z=[111, 222]
+d=94.12 i=94 c=^ t=[94, 94.12, 94]
+d=94.12 i=94 c=^ t=[94, 94.12, 94]
+d=-94.12 i=-94 c=¢ t=[-94, -94.12, -94]
+d=-94.12 i=-94 c=¢ t=[-94, -94.12, -94]

src/tests/Makefile.am

@@ -30 +30 @@
 EXTRA_FLAGS =
 CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
-CC = @CFA_BINDIR@/cfa
+CC = @CFA_BINDIR@/@CFA_NAME@
 
 .PHONY : list

src/tests/Makefile.in

@@ -113 +113 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
-CC = @CFA_BINDIR@/cfa
+CC = @CFA_BINDIR@/@CFA_NAME@
 CCAS = @CCAS@
 CCASDEPMODE = @CCASDEPMODE@
@@ -123 +123 @@
 CFA_INCDIR = @CFA_INCDIR@
 CFA_LIBDIR = @CFA_LIBDIR@
+CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}

src/tests/tupleAssign.c

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Tue Nov 15 17:24:32 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Nov 15 17:27:28 2016
-// Update Count     : 3
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Mar  6 21:23:58 2017
+// Update Count     : 34
 //
+
+#include <fstream>
 
 int main() {
@@ -21 +23 @@
 
                 // swap x, y and store the new [x, y] in [u, v] and in z;
-                printf("u=%d v=%d x=%d y=%d z=[%d, %d]\n", u, v, x, y, z);
+                printf( "u=%d v=%d x=%d y=%d z=[%d, %d]\n", u, v, x, y, z );
+                sout | "u=" | u | "v=" | v | "x=" | x | "y=" | y | "z=[" | z | "]" | endl;
                 z = [u, v] = [x, y] = [y, x];
-                printf("u=%d v=%d x=%d y=%d z=[%d, %d]\n", u, v, x, y, z);
+                printf( "u=%d v=%d x=%d y=%d z=[%d, %d]\n", u, v, x, y, z );
+                sout | "u=" | u | "v=" | v | "x=" | x | "y=" | y | "z=[" | z | "]" | endl;
 
                 // shuffle elements -- v = z.0, z.0 = z.1, z.1 = u, u = v
                 [v, z, u] = [z, u, v];
-                printf("u=%d v=%d z=[%d, %d]\n", u, v, z);
+                printf( "u=%d v=%d z=[%d, %d]\n", u, v, z );
+                sout | "u=" | u | "v=" | v | "z=[" | z | "]" | endl;
 
                 // multiple assignment with tuple expression on right
                 z = [111, 222];
                 [u, v] = [123, 456];
-                printf("u=%d v=%d z=[%d, %d]\n", u, v, z);
+                printf( "u=%d v=%d z=[%d, %d]\n", u, v, z );
+                sout | "u=" | u | "v=" | v | "z=[" | z | "]" | endl;
         }
-
         {
                 // test mass assignment
@@ -48 +53 @@
                 // no conversion from X to integral types, so this serves as a santiy
                 // check that as long as this compiles, ?=?(_, x) is not generated.
-                [t, x, d, i, c, x] = (double)-2153.12;
-                printf("d=%lg i=%d c=%d t=[%d, %lg, %d]\n", d, i, (int)c, t);
-                [x, c, i, d, x, t] = (double)-2153.12;
-                printf("d=%lg i=%d c=%d t=[%d, %lg, %d]\n", d, i, (int)c, t);
+                [t, x, d, i, c, x] = (double)94.12;
+                printf( "d=%lg i=%d c=%c t=[%d, %lg, %d]\n", d, i, (int)c, t );
+                sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]" | endl;
+                [x, c, i, d, x, t] = (double)-94.12;
+                printf( "d=%lg i=%d c=%c t=[%d, %lg, %d]\n", d, i, c, t );
+                sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]" | endl;
         }
 }