Changeset 1131392

Timestamp:

Jul 31, 2017, 5:30:11 PM (6 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:

641c3d0

Parents:

61e2761

Message:

convert to implicit check for != 0

File:

• src/Parser/InitializerNode.cc (modified) (7 diffs)

src/Parser/InitializerNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:20:24 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Oct  1 23:09:51 2016
-// Update Count     : 21
+// Last Modified On : Fri Jul 28 23:27:20 2017
+// Update Count     : 26
 //
 
@@ -22 +22 @@
 #include "SynTree/Initializer.h"
 
-InitializerNode::InitializerNode( ExpressionNode *_expr, bool aggrp, ExpressionNode *des )
-                : expr( _expr ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) {
+InitializerNode::InitializerNode( ExpressionNode * _expr, bool aggrp, ExpressionNode * des )
+                : expr( _expr ), aggregate( aggrp ), designator( des ), kids( nullptr ), maybeConstructed( true ) {
         if ( aggrp )
                 kids = dynamic_cast< InitializerNode * >( get_next() );
 
-        if ( kids != 0 )
-                set_last( 0 );
-}
+        if ( kids )
+                set_last( nullptr );
+} // InitializerNode::InitializerNode
 
-InitializerNode::InitializerNode( InitializerNode *init, bool aggrp, ExpressionNode *des )
-                : expr( 0 ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) {
-        if ( init != 0 )
+InitializerNode::InitializerNode( InitializerNode * init, bool aggrp, ExpressionNode * des )
+                : expr( nullptr ), aggregate( aggrp ), designator( des ), kids( nullptr ), maybeConstructed( true ) {
+        if ( init )
                 set_last( init );
 
@@ -39 +39 @@
                 kids = dynamic_cast< InitializerNode * >( get_next() );
 
-        if ( kids != 0 )
-                set_next( 0 );
-}
+        if ( kids )
+                set_next( nullptr );
+} // InitializerNode::InitializerNode
 
 InitializerNode::~InitializerNode() {
@@ -47 +47 @@
         delete designator;
         delete kids;
-}
+} // InitializerNode::~InitializerNode
 
 void InitializerNode::print( std::ostream &os, int indent ) const {
         os << std::string( indent, ' ' ) << "Initializer expression" << std::endl;
-}
+} // InitializerNode::print
 
 void InitializerNode::printOneLine( std::ostream &os ) const {
         if ( ! aggregate ) {
-                if ( designator != 0 ) {
+                if ( designator ) {
                         os << "designated by: (";
                         ExpressionNode *curdes = designator;
-                        while ( curdes != 0) {
+                        while ( curdes != nullptr) {
                                 curdes->printOneLine(os);
                                 curdes = (ExpressionNode *)(curdes->get_next());
@@ -65 +65 @@
                         os << ")";
                 } // if
-                if ( expr ) expr->printOneLine(os);
+                if ( expr ) expr->printOneLine( os );
         } else {  // It's an aggregate
                 os << "[--";
-                if ( next_init() != 0 )
-                        next_init()->printOneLine(os);
+                if ( next_init() != nullptr )
+                        next_init()->printOneLine( os );
                 if (aggregate) os << "--]";
         } // if
@@ -76 +76 @@
         if ( (moreInit = dynamic_cast< InitializerNode * >( get_next() ) ) ) {
                 moreInit->printOneLine( os );
-        }
-}
+        } // if
+} // InitializerNode::printOneLine
 
-Initializer *InitializerNode::build() const {
+Initializer * InitializerNode::build() const {
         if ( aggregate ) {
                 // steal designators from children
@@ -93 +93 @@
                 return new ListInit( initlist, designlist, maybeConstructed );
         } else {
-                if ( get_expression() != 0) {
+                if ( get_expression() ) {
                         return new SingleInit( maybeBuild< Expression >( get_expression() ), maybeConstructed );
-                }
+                } // if
         } // if
-        return 0;
-}
+        return nullptr;
+} // InitializerNode::build
 
 // Local Variables: //