Changes in src/SymTab/Indexer.cc [fbcde64:08d5507b]

File:

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

src/SymTab/Indexer.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:37:33 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 30 16:38:47 2017
-// Update Count     : 19
+// Last Modified On : Tue Mar 14 08:07:34 2017
+// Update Count     : 17
 //
 
@@ -119 +119 @@
                                 FunctionDecl * decl;
                                 bool isUserDefinedFunc; // properties for this particular decl
-                                bool isDefaultCtor;
-                                bool isDtor;
+                                bool isDefaultFunc;
                                 bool isCopyFunc;
                         };
                         // properties for this type
-                        bool userDefinedFunc = false; // any user-defined function found
-                        bool userDefinedCtor = false; // any user-defined constructor found
-                        bool userDefinedDtor = false; // any user-defined destructor found
-                        bool userDefinedCopyFunc = false; // user-defined copy ctor found
+                        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;
 
@@ -134 +132 @@
                         ValueType & operator+=( FunctionDecl * function ) {
                                 bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->get_linkage() );
-                                bool isDefaultCtor = InitTweak::isDefaultConstructor( function );
-                                bool isDtor = InitTweak::isDestructor( function );
+                                bool isDefaultFunc = function->get_functionType()->get_parameters().size() == 1;
                                 bool isCopyFunc = InitTweak::isCopyFunction( function, function->get_name() );
-                                decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultCtor, isDtor, isCopyFunc } );
+                                decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultFunc, isCopyFunc } );
                                 userDefinedFunc = userDefinedFunc || isUserDefinedFunc;
-                                userDefinedCtor = userDefinedCtor || (isUserDefinedFunc && InitTweak::isConstructor( function->get_name() ) );
-                                userDefinedDtor = userDefinedDtor || (isUserDefinedFunc && isDtor);
+                                userDefinedDefaultFunc = userDefinedDefaultFunc || (isUserDefinedFunc && isDefaultFunc);
                                 userDefinedCopyFunc = userDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
                                 return *this;
@@ -167 +163 @@
                 // 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.
-                // If the user defines any ctor then the generated default ctor should not 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.userDefinedCtor && ball.isDefaultCtor) || (! val.userDefinedCopyFunc && ball.isCopyFunc) || (! val.userDefinedDtor && ball.isDtor) ) {
+                                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 );
@@ -483 +478 @@
         void Indexer::visit( CompoundLiteralExpr *compLitExpr ) {
                 acceptNewScope( compLitExpr->get_result(), *this );
+                maybeAccept( compLitExpr->get_type(), *this );
                 maybeAccept( compLitExpr->get_initializer(), *this );
         }