Changeset 78a0b88 for src/Parser

Timestamp:

Sep 1, 2017, 3:33:25 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

bc3127d

Parents:

e8ccca3 (diff), a01f7c94 (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 plg2:software/cfa/cfa-cc

Location:

src/Parser

Files:

• ExpressionNode.cc (modified) (1 diff)
• StatementNode.cc (modified) (1 diff)

src/Parser/ExpressionNode.cc

@@ -360 +360 @@
 Expression * build_unary_ptr( OperKinds op, ExpressionNode * expr_node ) {
         std::list< Expression * > args;
-        args.push_back(  maybeMoveBuild< Expression >(expr_node) ); // xxx
+        args.push_back(  maybeMoveBuild< Expression >(expr_node) ); // xxx -- this is exactly the same as the val case now, refactor this code.
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
 } // build_unary_ptr

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 );
 }