Changes in src/tests/ifcond.c [96ff407:a01f7c94]

File:

• src/tests/ifcond.c (modified) (2 diffs)

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