Changes in / [f5e81d1:cd14861]

Location:

src

Files:

• Common/utility.h (modified) (8 diffs)
• InitTweak/InitTweak.cc (modified) (5 diffs)
• InitTweak/InitTweak.h (modified) (1 diff)
• SymTab/Indexer.cc (modified) (2 diffs)

src/Common/utility.h

@@ -18 +18 @@
 
 #include <cctype>
-#include <algorithm>
 #include <iostream>
 #include <iterator>
@@ -114 +113 @@
 }
 
+template< class T, typename ResultType, ResultType( T::* memfunc )() >
+ResultType dispatch( T *pT ) {
+        return (pT->*memfunc)();
+}
+
 template < typename T >
 std::list<T> tail( std::list<T> l ) {
@@ -158 +162 @@
 }
 
+template< class Constructed, typename Arg >
+Constructed *ctor( Arg arg ) {
+        Constructed *c = new Constructed( arg );
+        return c;
+}
+
+template< class Constructed, typename Arg >
+Constructed ctor_noptr( Arg arg ) {
+        return Constructed( arg );
+}
+
 template< typename T >
 void replace( std::list< T > &org, typename std::list< T >::iterator pos, std::list< T > &with ) {
@@ -170 +185 @@
 }
 
-template< typename... Args >
-auto filter(Args&&... args) -> decltype(std::copy_if(std::forward<Args>(args)...)) {
-  return std::copy_if(std::forward<Args>(args)...);
-}
-
-template< typename... Args >
-auto zip(Args&&... args) -> decltype(zipWith(std::forward<Args>(args)..., std::make_pair)) {
-  return zipWith(std::forward<Args>(args)..., std::make_pair);
+template< typename T1, typename T2 >
+T2 *cast_ptr( T1 *from ) {
+        return dynamic_cast< T2 * >( from );
+}
+
+template< class Exception, typename Arg >
+void inline assert_throw( bool pred, Arg arg ) {
+        if (pred) throw Exception( arg );
+}
+
+template< typename T >
+struct is_null_pointer {
+        bool operator()( const T *ptr ) { return ( ptr == 0 ); }
+};
+
+template< class InputIterator, class OutputIterator, class Predicate >
+void filter(InputIterator begin, InputIterator end, OutputIterator out, Predicate pred) {
+        while ( begin++ != end )
+                if ( pred(*begin) ) *out++ = *begin;
+
+        return;
+}
+
+template< class InputIterator1, class InputIterator2, class OutputIterator >
+void zip( InputIterator1 b1, InputIterator1 e1, InputIterator2 b2, InputIterator2 e2, OutputIterator out ) {
+        while ( b1 != e1 && b2 != e2 )
+                *out++ = std::pair<typename InputIterator1::value_type, typename InputIterator2::value_type>(*b1++, *b2++);
 }
 
@@ -187 +221 @@
 
 // it's nice to actually be able to increment iterators by an arbitrary amount
-template< class InputIt, class Distance >
-InputIt operator+( InputIt it, Distance n ) {
-        advance(it, n);
-        return it;
+template< typename Iterator >
+Iterator operator+(Iterator i, int inc) {
+        while ( inc > 0 ) {
+                ++i;
+                --inc;
+        }
+        return i;
 }
 
@@ -209 +246 @@
         warn_single( params... );
 }
-
-// -----------------------------------------------------------------------------
-// Ref Counted Singleton class
-// Objects that inherit from this class will have at most one reference to it
-// but if all references die, the object will be deleted.
 
 template< typename ThisType >
@@ -233 +265 @@
 std::weak_ptr<ThisType> RefCountSingleton<ThisType>::global_instance;
 
-// -----------------------------------------------------------------------------
 // RAII object to regulate "save and restore" behaviour, e.g.
 // void Foo::bar() {
@@ -248 +279 @@
 };
 
-// -----------------------------------------------------------------------------
-// Helper struct and function to support
-// for ( val : reverseIterate( container ) ) {}
-// syntax to have a for each that iterates backwards
-
 template< typename T >
 struct reverseIterate_t {

src/InitTweak/InitTweak.cc

@@ -304 +304 @@
 
         namespace {
-                DeclarationWithType * getCalledFunction( Expression * expr ) {
-                        assert( expr );
-                        if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( expr ) ) {
-                                return varExpr->get_var();
-                        } else if ( MemberExpr * memberExpr = dynamic_cast< MemberExpr * >( expr ) ) {
-                                return memberExpr->get_member();
-                        } else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
-                                return getCalledFunction( castExpr->get_arg() );
-                        }
-                        return nullptr;
+                VariableExpr * getCalledFunction( ApplicationExpr * appExpr ) {
+                        assert( appExpr );
+                        // xxx - it's possible this can be other things, e.g. MemberExpr, so this is insufficient
+                        return dynamic_cast< VariableExpr * >( appExpr->get_function() );
                 }
         }
@@ -320 +314 @@
                 ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr );
                 if ( ! appExpr ) return NULL;
-                DeclarationWithType * function = getCalledFunction( appExpr->get_function() );
+                VariableExpr * function = getCalledFunction( appExpr );
                 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.
-                return function->get_linkage() == LinkageSpec::Intrinsic ? appExpr : NULL;
+                return function->get_var()->get_linkage() == LinkageSpec::Intrinsic ? appExpr : NULL;
         }
 
@@ -385 +379 @@
                         }       else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( func ) ) {
                                 return funcName( castExpr->get_arg() );
-                        } else if ( MemberExpr * memberExpr = dynamic_cast< MemberExpr * >( func ) ) {
-                                return memberExpr->get_member()->get_name();
                         } else {
                                 assert( false && "Unexpected expression type being called as a function in call expression" );
@@ -480 +472 @@
         bool isConstructor( const std::string & str ) { return str == "?{}"; }
         bool isDestructor( const std::string & str ) { return str == "^?{}"; }
-        bool isAssignment( const std::string & str ) { return str == "?=?"; }
         bool isCtorDtor( const std::string & str ) { return isConstructor( str ) || isDestructor( str ); }
-        bool isCtorDtorAssign( const std::string & str ) { return isCtorDtor( str ) || isAssignment( str ); }
-
-        FunctionDecl * isCopyFunction( Declaration * decl, const std::string & fname ) {
+
+        FunctionDecl * isCopyConstructor( Declaration * decl ) {
                 FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl );
                 if ( ! function ) return 0;
-                if ( function->get_name() != fname ) return 0;
+                if ( ! isConstructor( function->get_name() ) ) return 0;
                 FunctionType * ftype = function->get_functionType();
                 if ( ftype->get_parameters().size() != 2 ) return 0;
@@ -496 +486 @@
                 assert( ptrType );
 
-                if ( ResolvExpr::typesCompatibleIgnoreQualifiers( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
+                if ( ResolvExpr::typesCompatible( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
                         return function;
                 } else {
-                        return nullptr;
-                }
-        }
-
-        FunctionDecl * isCopyConstructor( Declaration * decl ) {
-                return isCopyFunction( decl, "?{}" );
+                        return 0;
+                }
         }
 }

src/InitTweak/InitTweak.h

@@ -28 +28 @@
         bool isConstructor( const std::string & );
         bool isDestructor( const std::string & );
-        bool isAssignment( const std::string & );
         bool isCtorDtor( const std::string & );
-        bool isCtorDtorAssign( const std::string & );
 
         FunctionDecl * isCopyConstructor( Declaration * decl );
-        FunctionDecl * isCopyFunction( Declaration * decl, const std::string & fname );
 
         /// transform Initializer into an argument list that can be passed to a call expression

src/SymTab/Indexer.cc

@@ -105 +105 @@
 
         void Indexer::removeSpecialOverrides( const std::string &id, std::list< DeclarationWithType * > & out ) const {
-                // only need to perform this step for constructors, destructors, and assignment functions
-                if ( ! InitTweak::isCtorDtorAssign( id ) ) return;
+                // only need to perform this step for constructors and destructors
+                if ( ! InitTweak::isCtorDtor( id ) ) return;
 
                 // helpful data structure
@@ -127 +127 @@
                                 bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->get_linkage() );
                                 bool isDefaultFunc = function->get_functionType()->get_parameters().size() == 1;
-                                bool isCopyFunc = InitTweak::isCopyFunction( function, function->get_name() );
+                                bool isCopyFunc = InitTweak::isCopyConstructor( function );
                                 decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultFunc, isCopyFunc } );
                                 userDefinedFunc = userDefinedFunc || isUserDefinedFunc;