Changeset 235b41f for src/tests

Timestamp:

Sep 5, 2017, 3:41:04 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

416cc86

Parents:

800d275 (diff), 3f8dd01 (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/64/gmp.txt (modified) (1 diff)
• .expect/dtor-early-exit-ERR1.txt (modified) (1 diff)
• .expect/dtor-early-exit-ERR2.txt (modified) (1 diff)
• .expect/function-operator.txt (added)
• .expect/ifcond.txt (modified) (1 diff)
• div.c (modified) (2 diffs)
• dtor-early-exit.c (modified) (2 diffs)
• function-operator.c (added)
• gmp.c (modified) (2 diffs)
• ifcond.c (modified) (2 diffs)
• stdincludes.c (modified) (2 diffs)
• waitfor.c (added)

src/tests/.expect/64/gmp.txt

@@ -5 +5 @@
 y:97
 y:12345678901234567890123456789
+y:200
+y:-400
+y:24691357802469135780246913578
 y:3
 y:-3

src/tests/.expect/dtor-early-exit-ERR1.txt

@@ -1 +1 @@
 dtor-early-exit.c:142:1 error: jump to label 'L1' crosses initialization of y Branch (Goto)
+  with target: L1
+  with original target: L1
 

src/tests/.expect/dtor-early-exit-ERR2.txt

@@ -1 +1 @@
 dtor-early-exit.c:142:1 error: jump to label 'L2' crosses initialization of y Branch (Goto)
+  with target: L2
+  with original target: L2
 

src/tests/.expect/ifcond.txt

@@ -1 +1 @@
 x != 0 correct
-x != 0 && y == 0 incorrect
+x != 0 && y != 0 correct
 x == y correct

src/tests/div.c

@@ -1 @@
-//                               -*- Mode: C -*- 
 // 
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -11 +10 @@
 // Created On       : Tue Aug  8 16:28:43 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug  9 17:09:40 2017
-// Update Count     : 16
+// Last Modified On : Wed Aug 30 07:56:28 2017
+// Update Count     : 17
 // 
 

src/tests/dtor-early-exit.c

@@ -220 +220 @@
 }
 
+// TODO: implement __label__ and uncomment these lines
+void computedGoto() {
+  // __label__ bar;
+  void *ptr;
+  ptr = &&foo;
+  goto *ptr;
+  assert(false);
+foo: ;
+//   void f() {
+//     ptr = &&bar;
+//     goto *ptr;
+//     assert(false);
+//   }
+//   f();
+//   assert(false);
+// bar: ;
+}
+
 int main() {
         sepDisable(sout);
@@ -229 +247 @@
         sout | endl;
         h();
+
+        computedGoto();
 }
 

src/tests/gmp.c

@@ -10 +10 @@
 // Created On       : Tue Apr 19 08:55:51 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 25 12:50:01 2017
-// Update Count     : 544
+// Last Modified On : Mon Sep  4 09:51:18 2017
+// Update Count     : 550
 // 
 
@@ -29 +29 @@
         sout | "y:" | y | endl;
         y = "12345678901234567890123456789";
+        sout | "y:" | y | endl;
+        y = 100`mp + 100`mp;
+        sout | "y:" | y | endl;
+        y = -200u`mp + -200u`mp;
+        sout | "y:" | y | endl;
+        y = "12345678901234567890123456789"`mp + "12345678901234567890123456789"`mp;
         sout | "y:" | y | endl;
         y = si;

src/tests/ifcond.c

@@ -1 @@
-//                               -*- Mode: C -*- 
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// ifcond.c -- 
-// 
+//
+// ifcond.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Sat Aug 26 10:13:11 2017
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 29 08:25:02 2017
-// Update Count     : 12
-// 
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri Sep 01 15:22:19 2017
+// Update Count     : 14
+//
 
-#include<fstream>
+#include <fstream>
 
 int f( int r ) { return r; }
@@ -28 +27 @@
         } // if
 
-        if ( int x = 4, y = 0 ) {                                                       // FIXME && distribution
+        if ( int x = 4, y = 0 ) {
+                sout | "x != 0 && y != 0 incorrect" | endl;
+        } else if ( int x = 4, y = 1 ) {
                 sout | "x != 0 && y != 0 correct" | endl;
-    } else {
-                sout | "x != 0 && y == 0 incorrect" | endl;
+        } else {
+                sout | "x == 0 || y == 0 incorrect" | endl;
         } // if
 

src/tests/stdincludes.c

@@ -1 @@
-//                              -*- Mode: C++ -*- 
 // 
 // Cforall Version 1.0.0 Copyright (C) 2017 University of Waterloo
@@ -11 +10 @@
 // Created On       : Tue Aug 29 08:26:14 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 29 08:52:11 2017
-// Update Count     : 4
+// Last Modified On : Wed Aug 30 07:56:39 2017
+// Update Count     : 5
 //