Changeset 3da7c19 for tests

Timestamp:

Jun 11, 2019, 1:36:05 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

4b7cce6

Parents:

d57e349 (diff), 8548c35 (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/manipulatorsInput.txt (modified) (1 diff)
• .expect/manipulatorsOutput2.x64.txt (moved) (moved from tests/.expect/manipulatorsOutput2.txt )
• .expect/manipulatorsOutput2.x86.txt (added)
• .in/manipulatorsInput.txt (modified) (1 diff)
• manipulatorsInput.cfa (modified) (2 diffs)
• sum.cfa (modified) (2 diffs)

tests/.expect/manipulatorsInput.txt

@@ -26 +26 @@
 13 wwwwwwww
 a
-b
-b
-b
+a
 -1
 15

tests/.in/manipulatorsInput.txt

@@ -7 +7 @@
 abcyyy
 aaaaaaaaxxxxxxxxaabbccbbdddwwwbbbbbbbbwwwwwwwwaaaaaaaawwwwwwww
-abcd
+ab
 0xff 017 15-15
 0xff 017 15-15

tests/manipulatorsInput.cfa

@@ -7 +7 @@
 // Created On       : Sat Jun  8 17:58:54 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 10 08:11:03 2019
-// Update Count     : 7
+// Last Modified On : Mon Jun 10 18:38:35 2019
+// Update Count     : 8
 // 
 
@@ -52 +52 @@
                 char c;
                 sin | c;                                                        sout | c;
-                sin | wdi( 3, c );                                      sout | c;
                 sin | ignore( c );                                      sout | c;
-                sin | ignore( wdi( 3, c ) );            sout | c;
 
                 signed char sc;

tests/sum.cfa

@@ -11 +11 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May 19 11:21:02 2019
-// Update Count     : 330
+// Last Modified On : Thu Jun  6 16:18:22 2019
+// Update Count     : 333
 //
 
@@ -111 +111 @@
         };
         GS(int) gs;
-        gs.x = anew( size );                                                            // create array storage for field
+        // FIX ME, resolution problem with anew not picking up the LH type
+        gs.x = (typeof(gs.x))anew( size );                                      // create array storage for field
         s = 0; v = low;
         for ( int i = 0; i < size; i += 1, v += 1 ) {