Changes in src/SymTab/Indexer.cc [1057e3d:3f024c9]

File:

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

src/SymTab/Indexer.cc

@@ -106 +106 @@
                 if ( ! CodeGen::isCtorDtorAssign( id ) ) return;
 
-                // helpful data structure to organize properties for a type
+                // helpful data structure
                 struct ValueType {
-                        struct DeclBall { // properties for this particular decl
+                        struct DeclBall {
                                 IdData decl;
-                                bool isUserDefinedFunc;
+                                bool isUserDefinedFunc; // properties for this particular decl
+                                bool isDefaultCtor;
+                                bool isDtor;
                                 bool isCopyFunc;
                         };
                         // properties for this type
+                        bool existsUserDefinedFunc = false;    // any user-defined function found
+                        bool existsUserDefinedCtor = false;    // any user-defined constructor found
+                        bool existsUserDefinedDtor = false;    // any user-defined destructor found
                         bool existsUserDefinedCopyFunc = false;    // user-defined copy ctor found
-                        BaseSyntaxNode * deleteStmt = nullptr;     // non-null if a user-defined function is found
+                        bool existsUserDefinedDefaultCtor = false; // user-defined default ctor found
                         std::list< DeclBall > decls;
 
@@ -122 +127 @@
                         ValueType & operator+=( IdData data ) {
                                 DeclarationWithType * function = data.id;
-                                bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->linkage );
-                                bool isCopyFunc = InitTweak::isCopyFunction( function, function->name );
-                                decls.push_back( DeclBall{ data, isUserDefinedFunc, isCopyFunc } );
+                                bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->get_linkage() );
+                                bool isDefaultCtor = InitTweak::isDefaultConstructor( function );
+                                bool isDtor = InitTweak::isDestructor( function );
+                                bool isCopyFunc = InitTweak::isCopyFunction( function, function->get_name() );
+                                decls.push_back( DeclBall{ data, isUserDefinedFunc, isDefaultCtor, isDtor, isCopyFunc } );
+                                existsUserDefinedFunc = existsUserDefinedFunc || isUserDefinedFunc;
+                                existsUserDefinedCtor = existsUserDefinedCtor || (isUserDefinedFunc && CodeGen::isConstructor( function->get_name() ) );
+                                existsUserDefinedDtor = existsUserDefinedDtor || (isUserDefinedFunc && isDtor);
                                 existsUserDefinedCopyFunc = existsUserDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
-                                if ( isUserDefinedFunc && ! deleteStmt ) {
-                                        // any user-defined function can act as an implicit delete statement for generated constructors.
-                                        // a delete stmt should not act as an implicit delete statement.
-                                        deleteStmt = data.id;
-                                }
+                                existsUserDefinedDefaultCtor = existsUserDefinedDefaultCtor || (isUserDefinedFunc && isDefaultCtor);
                                 return *this;
                         }
@@ -142 +148 @@
                 for ( auto decl : copy ) {
                         if ( FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl.id ) ) {
-                                std::list< DeclarationWithType * > & params = function->type->parameters;
+                                std::list< DeclarationWithType * > & params = function->get_functionType()->get_parameters();
                                 assert( ! params.empty() );
                                 // use base type of pointer, so that qualifiers on the pointer type aren't considered.
@@ -154 +160 @@
 
                 // if a type contains user defined ctor/dtor/assign, then special rules trigger, which determine
-                // the set of ctor/dtor/assign that can be used  by the requester. In particular, if the user defines
-                // a default ctor, then the generated default ctor is unavailable, likewise for copy ctor
-                // and dtor. If the user defines any ctor/dtor, then no generated field ctors are available.
-                // If the user defines any ctor then the generated default ctor is unavailable (intrinsic default
-                // ctor must be overridden exactly). If the user defines anything that looks like a copy constructor,
-                // then the generated copy constructor is unavailable, and likewise for the assignment operator.
+                // the set of ctor/dtor/assign 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.
+                // If the user defines any ctor then the generated default ctor should not be seen (intrinsic default
+                // ctor must be overridden exactly).
                 for ( std::pair< const std::string, ValueType > & pair : funcMap ) {
                         ValueType & val = pair.second;
                         for ( ValueType::DeclBall ball : val.decls ) {
-                                bool isNotUserDefinedFunc = ! ball.isUserDefinedFunc && ball.decl.id->linkage != LinkageSpec::Intrinsic;
-                                bool isCopyFunc = ball.isCopyFunc;
-                                bool existsUserDefinedCopyFunc = val.existsUserDefinedCopyFunc;
-
-                                // only implicitly delete non-user defined functions that are not intrinsic, and are
-                                // not copy functions (assignment or copy constructor). If a  user-defined copy function exists,
-                                // do not pass along the non-user-defined copy functions since signatures do not have to match,
-                                // and the generated functions will often be cheaper.
-                                if ( isNotUserDefinedFunc ) {
-                                        if ( isCopyFunc ) {
-                                                // Skip over non-user-defined copy functions when there is a user-defined copy function.
-                                                // Since their signatures do not have to be exact, deleting them is the wrong choice.
-                                                if ( existsUserDefinedCopyFunc ) continue;
-                                        } else {
-                                                // delete non-user-defined non-copy functions if applicable.
-                                                // deleteStmt will be non-null only if a user-defined function is found.
-                                                ball.decl.deleteStmt = val.deleteStmt;
-                                        }
+                                bool noUserDefinedFunc = ! val.existsUserDefinedFunc;
+                                bool isUserDefinedFunc = ball.isUserDefinedFunc;
+                                bool isAcceptableDefaultCtor = (! val.existsUserDefinedCtor || (! val.existsUserDefinedDefaultCtor && ball.decl.id->get_linkage() == LinkageSpec::Intrinsic)) && ball.isDefaultCtor; // allow default constructors only when no user-defined constructors exist, except in the case of intrinsics, which require exact overrides
+                                bool isAcceptableCopyFunc = ! val.existsUserDefinedCopyFunc && ball.isCopyFunc; // handles copy ctor and assignment operator
+                                bool isAcceptableDtor = ! val.existsUserDefinedDtor && ball.isDtor;
+                                if ( noUserDefinedFunc || isUserDefinedFunc || isAcceptableDefaultCtor || isAcceptableCopyFunc || isAcceptableDtor ) {
+                                        // decl conforms to the rules described above, so it should be seen by the requester
+                                        out.push_back( ball.decl );
                                 }
-                                out.push_back( ball.decl );
                         }
                 }
@@ -477 +471 @@
         void Indexer::addId( DeclarationWithType * decl, Expression * baseExpr ) {
                 // default handling of conflicts is to raise an error
-                addId( decl, [decl](IdData &, const std::string & msg) { SemanticError( decl, msg ); return true; }, baseExpr, decl->isDeleted ? decl : nullptr );
+                addId( decl, [decl](IdData &, const std::string & msg) { SemanticError( decl, msg ); return true; }, baseExpr );
         }