Changeset 8c49c0e for src/SymTab

Timestamp:

Sep 19, 2016, 4:39:33 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

aefcc3b

Parents:

3c13c03

Message:

decouple code that uses Type's forall list from std::list in preparation for trying to replace with a managed list

Location:

src/SymTab

Files:

• Indexer.cc (modified) (1 diff)
• Mangler.cc (modified) (4 diffs)
• Validate.cc (modified) (1 diff)

src/SymTab/Indexer.cc

@@ -143 +143 @@
                 for ( DeclarationWithType * decl : copy ) {
                         if ( FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl ) ) {
-                                std::list< DeclarationWithType * > params = function->get_functionType()->get_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.

src/SymTab/Mangler.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Mangler.cc -- 
+// Mangler.cc --
 //
 // Author           : Richard C. Bilson
@@ -35 +35 @@
                 return mangler.get_mangleName();
         }
-        
+
         Mangler::Mangler( bool mangleOverridable, bool typeMode )
                 : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ) {}
-                
+
         Mangler::Mangler( const Mangler &rhs ) : mangleName() {
                 varNums = rhs.varNums;
@@ -115 +115 @@
                         "Ir",   // LongDoubleImaginary
                 };
-  
+
                 printQualifiers( basicType );
                 mangleName << btLetter[ basicType->get_kind() ];
@@ -245 +245 @@
                 // skip if not including qualifiers
                 if ( typeMode ) return;
-                
+
                 if ( ! type->get_forall().empty() ) {
                         std::list< std::string > assertionNames;
                         int tcount = 0, dcount = 0, fcount = 0;
                         mangleName << "A";
-                        for ( std::list< TypeDecl* >::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+                        for ( Type::ForallList::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
                                 switch ( (*i)->get_kind() ) {
                                   case TypeDecl::Any:

src/SymTab/Validate.cc

@@ -429 +429 @@
         /// Fix up assertions
         void forallFixer( Type *func ) {
-                for ( std::list< TypeDecl * >::iterator type = func->get_forall().begin(); type != func->get_forall().end(); ++type ) {
+                for ( Type::ForallList::iterator type = func->get_forall().begin(); type != func->get_forall().end(); ++type ) {
                         std::list< DeclarationWithType * > toBeDone, nextRound;
                         toBeDone.splice( toBeDone.end(), (*type )->get_assertions() );