Changes in src/SymTab/Indexer.cc [af5c204a:ce8c12f]

File:

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

src/SymTab/Indexer.cc

@@ -124 +124 @@
                         };
                         // 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
-                        bool existsUserDefinedDefaultCtor = false; // user-defined default ctor found
+                        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
                         std::list< DeclBall > decls;
 
@@ -139 +138 @@
                                 bool isCopyFunc = InitTweak::isCopyFunction( function, function->get_name() );
                                 decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultCtor, isDtor, isCopyFunc } );
-                                existsUserDefinedFunc = existsUserDefinedFunc || isUserDefinedFunc;
-                                existsUserDefinedCtor = existsUserDefinedCtor || (isUserDefinedFunc && InitTweak::isConstructor( function->get_name() ) );
-                                existsUserDefinedDtor = existsUserDefinedDtor || (isUserDefinedFunc && isDtor);
-                                existsUserDefinedCopyFunc = existsUserDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
-                                existsUserDefinedDefaultCtor = existsUserDefinedDefaultCtor || (isUserDefinedFunc && isDefaultCtor);
+                                userDefinedFunc = userDefinedFunc || isUserDefinedFunc;
+                                userDefinedCtor = userDefinedCtor || (isUserDefinedFunc && InitTweak::isConstructor( function->get_name() ) );
+                                userDefinedDtor = userDefinedDtor || (isUserDefinedFunc && isDtor);
+                                userDefinedCopyFunc = userDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
                                 return *this;
                         }
@@ -158 +156 @@
                                 assert( ! params.empty() );
                                 // use base type of pointer, so that qualifiers on the pointer type aren't considered.
-                                Type * base = safe_dynamic_cast< PointerType * >( params.front()->get_type() )->get_base();
+                                Type * base = InitTweak::getPointerBase( params.front()->get_type() );
+                                assert( base );
                                 funcMap[ Mangler::mangle( base ) ] += function;
                         } else {
@@ -165 +164 @@
                 }
 
-                // if a type contains user defined ctor/dtor/assign, then special rules trigger, which determine
-                // the set of ctor/dtor/assign that are seen by the requester. In particular, if the user defines
+                // 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.
-                // If the user defines any ctor then the generated default ctor should not be seen (intrinsic default
-                // ctor must be overridden exactly).
+                // 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 ) {
-                                bool noUserDefinedFunc = ! val.existsUserDefinedFunc;
-                                bool isUserDefinedFunc = ball.isUserDefinedFunc;
-                                bool isAcceptableDefaultCtor = (! val.existsUserDefinedCtor || (! val.existsUserDefinedDefaultCtor && ball.decl->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 ) {
+                                if ( ! val.userDefinedFunc || ball.isUserDefinedFunc || (! val.userDefinedCtor && ball.isDefaultCtor) || (! val.userDefinedCopyFunc && ball.isCopyFunc) || (! val.userDefinedDtor && ball.isDtor) ) {
                                         // decl conforms to the rules described above, so it should be seen by the requester
                                         out.push_back( ball.decl );
@@ -285 +278 @@
                 addType( typeDecl );
                 acceptAll( typeDecl->get_assertions(), *this );
-                acceptNewScope( typeDecl->get_init(), *this );
         }
 
@@ -495 +487 @@
         }
 
+        void Indexer::visit( UntypedValofExpr *valofExpr ) {
+                acceptNewScope( valofExpr->get_result(), *this );
+                maybeAccept( valofExpr->get_body(), *this );
+        }
+
         void Indexer::visit( RangeExpr *rangeExpr ) {
                 maybeAccept( rangeExpr->get_low(), *this );
@@ -513 +510 @@
                 acceptNewScope( tupleExpr->get_result(), *this );
                 maybeAccept( tupleExpr->get_tuple(), *this );
+        }
+
+        void Indexer::visit( MemberTupleExpr *tupleExpr ) {
+                acceptNewScope( tupleExpr->get_result(), *this );
+                maybeAccept( tupleExpr->get_member(), *this );
+                maybeAccept( tupleExpr->get_aggregate(), *this );
         }