Changes in src/InitTweak/InitTweak.cc [907eccb:207c7e1d]

File:

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

src/InitTweak/InitTweak.cc

@@ -327 +327 @@
                         } else if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * > ( expr ) ) {
                                 return handleDerefCalledFunction( appExpr );
+                        } else if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( expr ) ) {
+                                return getCalledFunction( addrExpr->get_arg() );
                         }
                         return nullptr;
@@ -336 +338 @@
                 if ( ! appExpr ) return NULL;
                 DeclarationWithType * function = getCalledFunction( appExpr->get_function() );
-                assert( 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.
@@ -386 +388 @@
                 } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * >( callExpr ) ) {
                         return callArg( untypedExpr, pos );
+                } else if ( TupleAssignExpr * tupleExpr = dynamic_cast< TupleAssignExpr * > ( callExpr ) ) {
+                        std::list< Statement * > & stmts = tupleExpr->get_stmtExpr()->get_statements()->get_kids();
+                        assertf( ! stmts.empty(), "TupleAssignExpr somehow has no statements." );
+                        ExprStmt * stmt = safe_dynamic_cast< ExprStmt * >( stmts.back() );
+                        TupleExpr * tuple = safe_dynamic_cast< TupleExpr * >( stmt->get_expr() );
+                        assertf( ! tuple->get_exprs().empty(), "TupleAssignExpr somehow has empty tuple expr." );
+                        return getCallArg( tuple->get_exprs().front(), pos );
                 } else {
-                        assertf( false, "Unexpected expression type passed to getCallArg" );
+                        assertf( false, "Unexpected expression type passed to getCallArg: %s", toString( callExpr ).c_str() );
                 }
         }
@@ -538 +547 @@
         }
 
+        FunctionDecl * isAssignment( Declaration * decl ) {
+                return isCopyFunction( decl, "?=?" );
+        }
+        FunctionDecl * isDestructor( Declaration * decl ) {
+                if ( isDestructor( decl->get_name() ) ) {
+                        return dynamic_cast< FunctionDecl * >( decl );
+                }
+                return nullptr;
+        }
+        FunctionDecl * isDefaultConstructor( Declaration * decl ) {
+                if ( isConstructor( decl->get_name() ) ) {
+                        if ( FunctionDecl * func = dynamic_cast< FunctionDecl * >( decl ) ) {
+                                if ( func->get_functionType()->get_parameters().size() == 1 ) {
+                                        return func;
+                                }
+                        }
+                }
+                return nullptr;
+        }
         FunctionDecl * isCopyConstructor( Declaration * decl ) {
                 return isCopyFunction( decl, "?{}" );