Changes in src/SymTab/Indexer.cc [2ae171d8:6d49ea3]

File:

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

src/SymTab/Indexer.cc

@@ -23 +23 @@
 #include <utility>                 // for pair, make_pair, move
 
-#include "CodeGen/OperatorTable.h" // for isCtorDtor, isCtorDtorAssign
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for cloneAll
@@ -112 +111 @@
         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 ( ! CodeGen::isCtorDtorAssign( id ) ) return;
+                if ( ! InitTweak::isCtorDtorAssign( id ) ) return;
 
                 // helpful data structure
@@ -140 +139 @@
                                 decls.push_back( DeclBall{ function, isUserDefinedFunc, isDefaultCtor, isDtor, isCopyFunc } );
                                 existsUserDefinedFunc = existsUserDefinedFunc || isUserDefinedFunc;
-                                existsUserDefinedCtor = existsUserDefinedCtor || (isUserDefinedFunc && CodeGen::isConstructor( function->get_name() ) );
+                                existsUserDefinedCtor = existsUserDefinedCtor || (isUserDefinedFunc && InitTweak::isConstructor( function->get_name() ) );
                                 existsUserDefinedDtor = existsUserDefinedDtor || (isUserDefinedFunc && isDtor);
                                 existsUserDefinedCopyFunc = existsUserDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
@@ -158 +157 @@
                                 assert( ! params.empty() );
                                 // use base type of pointer, so that qualifiers on the pointer type aren't considered.
-                                Type * base = InitTweak::getPointerBase( params.front()->get_type() );
-                                assert( base );
+                                Type * base = safe_dynamic_cast< PointerType * >( params.front()->get_type() )->get_base();
                                 funcMap[ Mangler::mangle( base ) ] += function;
                         } else {
@@ -345 +343 @@
                 leaveScope();
 
-                debugPrint( "Adding trait " << aggregateDecl->get_name() << std::endl );
+                debugPrint( "Adding context " << aggregateDecl->get_name() << std::endl );
                 addTrait( aggregateDecl );
         }