Changes in src/SymTab/Indexer.cc [1ba88a0:8884112]

File:

• src/SymTab/Indexer.cc (modified) (6 diffs)

src/SymTab/Indexer.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 21:37:33 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:47:47 2016
-// Update Count     : 12
+// Last Modified By : Rob Schluntz
+// Last Modified On : Fri Apr 22 15:25:43 2016
+// Update Count     : 11
 //
 
@@ -21 +21 @@
 #include <unordered_set>
 #include <utility>
-#include <algorithm>
 
 #include "Mangler.h"
@@ -34 +33 @@
 #include "SynTree/Initializer.h"
 #include "SynTree/Statement.h"
-
-#include "InitTweak/InitTweak.h"
 
 #define debugPrint(x) if ( doDebug ) { std::cout << x; }
@@ -104 +101 @@
         }
 
-        void Indexer::removeSpecialOverrides( const std::string &id, std::list< DeclarationWithType * > & out ) const {
-                // only need to perform this step for constructors and destructors
-                if ( ! InitTweak::isCtorDtor( id ) ) return;
-
-                // helpful data structure
-                struct ValueType {
-                        struct DeclBall {
-                                FunctionDecl * decl;
-                                bool isUserDefinedFunc; // properties for this particular decl
-                                bool isDefaultFunc;
-                                bool isCopyFunc;
-                        };
-                        // properties for this type
-                        bool userDefinedFunc = false; // any user defined function found
-                        bool userDefinedDefaultFunc = false; // user defined default ctor found
-                        bool userDefinedCopyFunc = false; // user defined copy ctor found
-                        std::list< DeclBall > decls;
-
-                        // another FunctionDecl for the current type was found - determine
-                        // if it has special properties and update data structure accordingly
-                        ValueType & operator+=( FunctionDecl * function ) {
-                                bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->get_linkage() );
-                                bool isDefaultFunc = function->get_functionType()->get_parameters().size() == 1;
-                                bool isCopyFunc = InitTweak::isCopyConstructor( function );
-                                decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultFunc, isCopyFunc } );
-                                userDefinedFunc = userDefinedFunc || isUserDefinedFunc;
-                                userDefinedDefaultFunc = userDefinedDefaultFunc || (isUserDefinedFunc && isDefaultFunc);
-                                userDefinedCopyFunc = userDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
-                                return *this;
-                        }
-                }; // ValueType
-
-                std::list< DeclarationWithType * > copy;
-                copy.splice( copy.end(), out );
-
-                // organize discovered declarations by type
-                std::unordered_map< std::string, ValueType > funcMap;
-                for ( DeclarationWithType * decl : copy ) {
-                        if ( FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl ) ) {
-                                std::list< DeclarationWithType * > params = function->get_functionType()->get_parameters();
-                                assert( ! params.empty() );
-                                funcMap[ Mangler::mangle( params.front()->get_type() ) ] += function;
-                        } else {
-                                out.push_back( decl );
-                        }
-                }
-
-                // if a type contains user defined ctor/dtors, then special rules trigger, which determine
-                // the set of ctor/dtors that are seen by the requester. In particular, if the user defines
-                // a default ctor, then the generated default ctor should never be seen, likewise for copy ctor
-                // and dtor. If the user defines any ctor/dtor, then no generated field ctors should be seen.
-                for ( std::pair< const std::string, ValueType > & pair : funcMap ) {
-                        ValueType & val = pair.second;
-                        for ( ValueType::DeclBall ball : val.decls ) {
-                                if ( ! val.userDefinedFunc || ball.isUserDefinedFunc || (! val.userDefinedDefaultFunc && ball.isDefaultFunc) || (! val.userDefinedCopyFunc && ball.isCopyFunc) ) {
-                                        // decl conforms to the rules described above, so it should be seen by the requester
-                                        out.push_back( ball.decl );
-                                }
-                        }
-                }
-        }
-
         void Indexer::makeWritable() {
                 if ( ! tables ) {
@@ -526 +461 @@
                         searchTables = searchTables->base.tables;
                 }
-
-                // some special functions, e.g. constructors and destructors
-                // remove autogenerated functions when they are defined so that
-                // they can never be matched
-                removeSpecialOverrides( id, out );
         }
 
@@ -590 +520 @@
                         const MangleTable &mangleTable = decls->second;
                         for ( MangleTable::const_iterator decl = mangleTable.begin(); decl != mangleTable.end(); ++decl ) {
-                                // check for C decls with the same name, skipping those with a compatible type (by mangleName)
+                                // check for C decls with the same name, skipping
+                                // those with a compatible type (by mangleName)
                                 if ( decl->second->get_linkage() == LinkageSpec::C && decl->first != mangleName ) return true;
                         }