Changes in src/InitTweak/InitTweak.cc [f9cebb5:79970ed]

File:

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

src/InitTweak/InitTweak.cc

@@ -291 +291 @@
         }
 
+        namespace {
+                template <typename Predicate>
+                bool allofCtorDtor( Statement * stmt, const Predicate & pred ) {
+                        std::list< Expression * > callExprs;
+                        collectCtorDtorCalls( stmt, callExprs );
+                        // if ( callExprs.empty() ) return false; // xxx - do I still need this check?
+                        return std::all_of( callExprs.begin(), callExprs.end(), pred);
+                }
+        }
+
         bool isIntrinsicSingleArgCallStmt( Statement * stmt ) {
-                std::list< Expression * > callExprs;
-                collectCtorDtorCalls( stmt, callExprs );
-                // if ( callExprs.empty() ) return false; // xxx - do I still need this check?
-                return std::all_of( callExprs.begin(), callExprs.end(), []( Expression * callExpr ){
+                return allofCtorDtor( stmt, []( Expression * callExpr ){
                         if ( ApplicationExpr * appExpr = isIntrinsicCallExpr( callExpr ) ) {
                                 assert( ! appExpr->get_function()->get_results().empty() );
@@ -303 +310 @@
                         }
                         return false;
+                });
+        }
+
+        bool isIntrinsicCallStmt( Statement * stmt ) {
+                return allofCtorDtor( stmt, []( Expression * callExpr ) {
+                        return isIntrinsicCallExpr( callExpr );
                 });
         }
@@ -420 +433 @@
         }
 
+        bool isConstructor( const std::string & str ) { return str == "?{}"; }
+        bool isDestructor( const std::string & str ) { return str == "^?{}"; }
+        bool isCtorDtor( const std::string & str ) { return isConstructor( str ) || isDestructor( str ); }
 }