Changes in src/InitTweak/InitTweak.cc [10a7775:2b46a13]

File:

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

src/InitTweak/InitTweak.cc

@@ -60 +60 @@
   }
 
-  Expression * getCtorDtorCall( Statement * stmt ) {
-    if ( stmt == NULL ) return NULL;
+  bool isInstrinsicSingleArgCallStmt( Statement * stmt ) {
+    if ( stmt == NULL ) return false;
     if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( stmt ) ) {
-      return exprStmt->get_expr();
+      ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( exprStmt->get_expr() );
+      assert( appExpr );
+      VariableExpr * function = dynamic_cast< VariableExpr * >( appExpr->get_function() );
+      assert( function );
+      // 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.
+      FunctionType * funcType = GenPoly::getFunctionType( function->get_var()->get_type() );
+      assert( funcType );
+      return function->get_var()->get_linkage() == LinkageSpec::Intrinsic && funcType->get_parameters().size() == 1;
     } else if ( CompoundStmt * compoundStmt = dynamic_cast< CompoundStmt * >( stmt ) ) {
       // could also be a compound statement with a loop, in the case of an array
@@ -69 +77 @@
       ForStmt * forStmt = dynamic_cast< ForStmt * >( compoundStmt->get_kids().back() );
       assert( forStmt && forStmt->get_body() );
-      return getCtorDtorCall( forStmt->get_body() );
-    } if ( ImplicitCtorDtorStmt * impCtorDtorStmt = dynamic_cast< ImplicitCtorDtorStmt * > ( stmt ) ) {
-      return getCtorDtorCall( impCtorDtorStmt->get_callStmt() );
+      return isInstrinsicSingleArgCallStmt( forStmt->get_body() );
     } else {
       // should never get here
@@ -77 +83 @@
     }
   }
-
-  bool isInstrinsicSingleArgCallStmt( Statement * stmt ) {
-    Expression * callExpr = getCtorDtorCall( stmt );
-    if ( ! callExpr ) return false;
-    ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( callExpr );
-    assert( appExpr );
-    VariableExpr * function = dynamic_cast< VariableExpr * >( appExpr->get_function() );
-    assert( function );
-    // 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.
-    FunctionType * funcType = GenPoly::getFunctionType( function->get_var()->get_type() );
-    assert( funcType );
-    return function->get_var()->get_linkage() == LinkageSpec::Intrinsic && funcType->get_parameters().size() == 1;
-  }
-
-  namespace {
-    template<typename CallExpr>
-    Expression * callArg( CallExpr * callExpr, unsigned int pos ) {
-      if ( pos >= callExpr->get_args().size() ) assert( false && "asking for argument that doesn't exist. Return NULL/throw exception?" );
-      for ( Expression * arg : callExpr->get_args() ) {
-        if ( pos == 0 ) return arg;
-        pos--;
-      }
-      assert( false );
-    }
-  }
-
-  Expression * getCallArg( Expression * callExpr, unsigned int pos ) {
-    if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( callExpr ) ) {
-      return callArg( appExpr, pos );
-    } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * >( callExpr ) ) {
-      return callArg( untypedExpr, pos );
-    } else {
-      assert( false && "Unexpected expression type passed to getCallArg" );
-    }
-  }
-
-  namespace {
-    template<typename CallExpr>
-    std::string funcName( CallExpr * expr ) {
-      Expression * func = expr->get_function();
-      if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( func ) ) {
-        return nameExpr->get_name();
-      } else if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( func ) ) {
-        return varExpr->get_var()->get_name();
-      } else {
-        assert( false && "Unexpected expression type being called as a function in call expression" );
-      }
-    }
-  }
-
-  std::string getFunctionName( Expression * expr ) {
-    if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr ) ) {
-      return funcName( appExpr );
-    } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * > ( expr ) ) {
-      return funcName( untypedExpr );
-    } else {
-      assert( false && "Unexpected expression type passed to getFunctionName" );
-    }
-  }
-
-  Type * getPointerBase( Type * type ) {
-    if ( PointerType * ptrType = dynamic_cast< PointerType * >( type ) ) {
-      return ptrType->get_base();
-    } else if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
-      return arrayType->get_base();
-    } else {
-      return NULL;
-    }
-  }
-
 }