Changeset a01f7c94

Timestamp:

Sep 1, 2017, 3:24:37 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

78a0b88

Parents:

681c764

Message:

Implement multi-declaration if conditional and update test

Location:

src

Files:

• Parser/StatementNode.cc (modified) (1 diff)
• tests/.expect/ifcond.txt (modified) (1 diff)
• tests/ifcond.c (modified) (2 diffs)

src/Parser/StatementNode.cc

@@ -99 +99 @@
         } // if
 
-        Expression * cond = ctl->condition ? maybeMoveBuild< Expression >(ctl->condition) : new VariableExpr( dynamic_cast<DeclarationWithType *>( dynamic_cast<DeclStmt *>( init.back() )->decl ) );
+        Expression * cond = nullptr;
+        if ( ctl->condition ) {
+                // compare the provided condition against 0
+                cond =  notZeroExpr( maybeMoveBuild< Expression >(ctl->condition) );
+        } else {
+                for ( Statement * stmt : init ) {
+                        // build the && of all of the declared variables compared against 0
+                        DeclStmt * declStmt = safe_dynamic_cast< DeclStmt * >( stmt );
+                        DeclarationWithType * dwt = safe_dynamic_cast< DeclarationWithType * >( declStmt->decl );
+                        Expression * nze = notZeroExpr( new VariableExpr( dwt ) );
+                        cond = cond ? new LogicalExpr( cond, nze, true ) : nze;
+                }
+        }
         delete ctl;
-        return new IfStmt( noLabels, notZeroExpr( cond ), thenb, elseb, init );
+        return new IfStmt( noLabels, cond, thenb, elseb, init );
 }
 

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/ifcond.c

@@ -1 @@
-// 
+//
 // 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 : Wed Aug 30 07:55:24 2017
-// Update Count     : 13
-// 
+// 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; }
@@ -27 +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