Changes in src/InitTweak/InitTweak.cc [29bc63e:e3e16bc]

File:

• src/InitTweak/InitTweak.cc (modified) (9 diffs)

src/InitTweak/InitTweak.cc

@@ +1 @@
+#include <stddef.h>                // for NULL
 #include <algorithm>               // for find, all_of
 #include <cassert>                 // for assertf, assert, strict_dynamic_cast
@@ -22 +23 @@
 #include "SynTree/Type.h"          // for FunctionType, ArrayType, PointerType
 #include "SynTree/Visitor.h"       // for Visitor, maybeAccept
-#include "Tuples/Tuples.h"         // for Tuples::isTtype
 
 class UntypedValofExpr;
@@ -184 +184 @@
                         callExpr->get_args().splice( callExpr->get_args().end(), args );
 
-                        *out++ = new IfStmt( noLabels, cond, new ExprStmt( noLabels, callExpr ), nullptr );
+                        *out++ = new IfStmt( noLabels, cond, new ExprStmt( noLabels, callExpr ), NULL );
 
                         UntypedExpr * increment = new UntypedExpr( new NameExpr( "++?" ) );
@@ -250 +250 @@
         // To accomplish this, generate switch statement, consuming all of expander's elements
         Statement * InitImpl::buildListInit( UntypedExpr * dst, std::list< Expression * > & indices ) {
-                if ( ! init ) return nullptr;
+                if ( ! init ) return NULL;
                 CompoundStmt * block = new CompoundStmt( noLabels );
                 build( dst, indices.begin(), indices.end(), init, back_inserter( block->get_kids() ) );
                 if ( block->get_kids().empty() ) {
                         delete block;
-                        return nullptr;
+                        return NULL;
                 } else {
-                        init = nullptr; // init was consumed in creating the list init
+                        init = NULL; // init was consumed in creating the list init
                         return block;
                 }
         }
 
-        Statement * ExprImpl::buildListInit( UntypedExpr *, std::list< Expression * > & ) {
-                return nullptr;
+        Statement * ExprImpl::buildListInit( __attribute((unused)) UntypedExpr * dst, __attribute((unused)) std::list< Expression * > & indices ) {
+                return NULL;
         }
 
@@ -270 +270 @@
         }
 
-        bool tryConstruct( DeclarationWithType * dwt ) {
-                ObjectDecl * objDecl = dynamic_cast< ObjectDecl * >( dwt );
-                if ( ! objDecl ) return false;
+        bool tryConstruct( ObjectDecl * objDecl ) {
                 return ! LinkageSpec::isBuiltin( objDecl->get_linkage() ) &&
-                        (objDecl->get_init() == nullptr ||
-                                ( objDecl->get_init() != nullptr && objDecl->get_init()->get_maybeConstructed() ))
-                        && ! objDecl->get_storageClasses().is_extern
-                        && isConstructable( objDecl->type );
-        }
-
-        bool isConstructable( Type * type ) {
-                return ! dynamic_cast< VarArgsType * >( type ) && ! dynamic_cast< ReferenceType * >( type ) && ! dynamic_cast< FunctionType * >( type ) && ! Tuples::isTtype( type );
+                        (objDecl->get_init() == NULL ||
+                                ( objDecl->get_init() != NULL && objDecl->get_init()->get_maybeConstructed() ))
+                        && ! objDecl->get_storageClasses().is_extern;
         }
 
@@ -321 +314 @@
                 collectCtorDtorCalls( stmt, matches );
                 assert( matches.size() <= 1 );
-                return matches.size() == 1 ? matches.front() : nullptr;
+                return matches.size() == 1 ? matches.front() : NULL;
         }
 
@@ -366 +359 @@
         ApplicationExpr * isIntrinsicCallExpr( Expression * expr ) {
                 ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr );
-                if ( ! appExpr ) return nullptr;
+                if ( ! appExpr ) return NULL;
                 DeclarationWithType * function = getCalledFunction( appExpr->get_function() );
                 assertf( function, "getCalledFunction returned nullptr: %s", toString( appExpr->get_function() ).c_str() );
                 // check for Intrinsic only - don't want to remove all overridable ctor/dtors because autogenerated ctor/dtor
                 // will call all member dtors, and some members may have a user defined dtor.
-                return function->get_linkage() == LinkageSpec::Intrinsic ? appExpr : nullptr;
+                return function->get_linkage() == LinkageSpec::Intrinsic ? appExpr : NULL;
         }
 
@@ -489 +482 @@
                         return refType->get_base();
                 } else {
-                        return nullptr;
+                        return NULL;
                 }
         }
@@ -495 +488 @@
         Type * isPointerType( Type * type ) {
                 if ( getPointerBase( type ) ) return type;
-                else return nullptr;
+                else return NULL;
         }