Index: src/GenPoly/Box.cc =================================================================== --- src/GenPoly/Box.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/GenPoly/Box.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -110,5 +110,5 @@ void addInferredParams( ApplicationExpr *appExpr, FunctionType *functionType, std::list< Expression *>::iterator &arg, const TyVarMap &tyVars ); /// Stores assignment operators from assertion list in local map of assignment operations - void findTypeOps( const std::list< TypeDecl *> &forall ); + void findTypeOps( const Type::ForallList &forall ); void passAdapters( ApplicationExpr *appExpr, FunctionType *functionType, const TyVarMap &exprTyVars ); FunctionDecl *makeAdapter( FunctionType *adaptee, FunctionType *realType, const std::string &mangleName, const TyVarMap &tyVars ); @@ -612,8 +612,8 @@ } - void Pass1::findTypeOps( const std::list< TypeDecl *> &forall ) { + void Pass1::findTypeOps( const Type::ForallList &forall ) { // what if a nested function uses an assignment operator? // assignOps.clear(); - for ( std::list< TypeDecl *>::const_iterator i = forall.begin(); i != forall.end(); ++i ) { + for ( Type::ForallList::const_iterator i = forall.begin(); i != forall.end(); ++i ) { for ( std::list< DeclarationWithType *>::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) { std::string typeName; @@ -680,5 +680,5 @@ std::list< DeclarationWithType *> ¶mList = functionType->get_parameters(); std::list< FunctionType *> functions; - for ( std::list< TypeDecl *>::iterator tyVar = functionType->get_forall().begin(); tyVar != functionType->get_forall().end(); ++tyVar ) { + for ( Type::ForallList::iterator tyVar = functionType->get_forall().begin(); tyVar != functionType->get_forall().end(); ++tyVar ) { for ( std::list< DeclarationWithType *>::iterator assert = (*tyVar)->get_assertions().begin(); assert != (*tyVar)->get_assertions().end(); ++assert ) { findFunction( (*assert)->get_type(), functions, scopeTyVars, needsAdapter ); @@ -946,5 +946,5 @@ void Pass1::addInferredParams( ApplicationExpr *appExpr, FunctionType *functionType, std::list< Expression *>::iterator &arg, const TyVarMap &tyVars ) { std::list< Expression *>::iterator cur = arg; - for ( std::list< TypeDecl *>::iterator tyVar = functionType->get_forall().begin(); tyVar != functionType->get_forall().end(); ++tyVar ) { + for ( Type::ForallList::iterator tyVar = functionType->get_forall().begin(); tyVar != functionType->get_forall().end(); ++tyVar ) { for ( std::list< DeclarationWithType *>::iterator assert = (*tyVar)->get_assertions().begin(); assert != (*tyVar)->get_assertions().end(); ++assert ) { InferredParams::const_iterator inferParam = appExpr->get_inferParams().find( (*assert)->get_uniqueId() ); @@ -1013,7 +1013,7 @@ Statement *bodyStmt; - std::list< TypeDecl *>::iterator tyArg = realType->get_forall().begin(); - std::list< TypeDecl *>::iterator tyParam = adapterType->get_forall().begin(); - std::list< TypeDecl *>::iterator realTyParam = adaptee->get_forall().begin(); + Type::ForallList::iterator tyArg = realType->get_forall().begin(); + Type::ForallList::iterator tyParam = adapterType->get_forall().begin(); + Type::ForallList::iterator realTyParam = adaptee->get_forall().begin(); for ( ; tyParam != adapterType->get_forall().end(); ++tyArg, ++tyParam, ++realTyParam ) { assert( tyArg != realType->get_forall().end() ); @@ -1064,5 +1064,5 @@ std::list< DeclarationWithType *> ¶mList = functionType->get_parameters(); std::list< FunctionType *> functions; - for ( std::list< TypeDecl *>::iterator tyVar = functionType->get_forall().begin(); tyVar != functionType->get_forall().end(); ++tyVar ) { + for ( Type::ForallList::iterator tyVar = functionType->get_forall().begin(); tyVar != functionType->get_forall().end(); ++tyVar ) { for ( std::list< DeclarationWithType *>::iterator assert = (*tyVar)->get_assertions().begin(); assert != (*tyVar)->get_assertions().end(); ++assert ) { findFunction( (*assert)->get_type(), functions, exprTyVars, needsAdapter ); @@ -1416,7 +1416,7 @@ // find each of its needed secondary assignment operators std::list< Expression* > &tyParams = refType->get_parameters(); - std::list< TypeDecl* > &forallParams = functionDecl->get_type()->get_forall(); + Type::ForallList &forallParams = functionDecl->get_type()->get_forall(); std::list< Expression* >::const_iterator tyIt = tyParams.begin(); - std::list< TypeDecl* >::const_iterator forallIt = forallParams.begin(); + Type::ForallList::const_iterator forallIt = forallParams.begin(); for ( ; tyIt != tyParams.end() && forallIt != forallParams.end(); ++tyIt, ++forallIt ) { // Add appropriate mapping to assignment expression environment @@ -1592,5 +1592,5 @@ ObjectDecl newPtr( "", DeclarationNode::NoStorageClass, LinkageSpec::C, 0, new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ) ), 0 ); - for ( std::list< TypeDecl *>::const_iterator tyParm = funcType->get_forall().begin(); tyParm != funcType->get_forall().end(); ++tyParm ) { + for ( Type::ForallList::const_iterator tyParm = funcType->get_forall().begin(); tyParm != funcType->get_forall().end(); ++tyParm ) { ObjectDecl *sizeParm, *alignParm; // add all size and alignment parameters to parameter list Index: src/GenPoly/CopyParams.cc =================================================================== --- src/GenPoly/CopyParams.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/GenPoly/CopyParams.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -54,5 +54,5 @@ std::map< std::string, DeclarationWithType* > assignOps; // assume the assignment operator is the first assert param after any "type" parameter - for ( std::list< TypeDecl* >::const_iterator tyVar = funcDecl->get_functionType()->get_forall().begin(); tyVar != funcDecl->get_functionType()->get_forall().end(); ++tyVar ) { + for ( Type::ForallList::const_iterator tyVar = funcDecl->get_functionType()->get_forall().begin(); tyVar != funcDecl->get_functionType()->get_forall().end(); ++tyVar ) { if ( (*tyVar)->get_kind() == TypeDecl::Any ) { assert( !(*tyVar)->get_assertions().empty() ); Index: src/GenPoly/FindFunction.cc =================================================================== --- src/GenPoly/FindFunction.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/GenPoly/FindFunction.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -29,5 +29,5 @@ virtual Type *mutate( PointerType *pointerType ); private: - void handleForall( const std::list< TypeDecl* > &forall ); + void handleForall( const Type::ForallList &forall ); std::list< FunctionType* > &functions; @@ -51,6 +51,6 @@ } - void FindFunction::handleForall( const std::list< TypeDecl* > &forall ) { - for ( std::list< TypeDecl* >::const_iterator i = forall.begin(); i != forall.end(); ++i ) { + void FindFunction::handleForall( const Type::ForallList &forall ) { + for ( Type::ForallList::const_iterator i = forall.begin(); i != forall.end(); ++i ) { TyVarMap::iterator var = tyVars.find( (*i)->get_name() ); if ( var != tyVars.end() ) { Index: src/GenPoly/GenPoly.cc =================================================================== --- src/GenPoly/GenPoly.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/GenPoly/GenPoly.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -110,5 +110,5 @@ ReferenceToType *isDynRet( FunctionType *function, const TyVarMap &forallTypes ) { if ( function->get_returnVals().empty() ) return 0; - + return (ReferenceToType*)isDynType( function->get_returnVals().front()->get_type(), forallTypes ); } @@ -127,5 +127,5 @@ // } // if if ( isDynRet( adaptee, tyVars ) ) return true; - + for ( std::list< DeclarationWithType* >::const_iterator innerArg = adaptee->get_parameters().begin(); innerArg != adaptee->get_parameters().end(); ++innerArg ) { // if ( isPolyType( (*innerArg)->get_type(), tyVars ) ) { @@ -228,5 +228,5 @@ void makeTyVarMap( Type *type, TyVarMap &tyVarMap ) { - for ( std::list< TypeDecl* >::const_iterator tyVar = type->get_forall().begin(); tyVar != type->get_forall().end(); ++tyVar ) { + for ( Type::ForallList::const_iterator tyVar = type->get_forall().begin(); tyVar != type->get_forall().end(); ++tyVar ) { assert( *tyVar ); tyVarMap[ (*tyVar)->get_name() ] = (*tyVar)->get_kind(); Index: src/InitTweak/GenInit.cc =================================================================== --- src/InitTweak/GenInit.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/InitTweak/GenInit.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -288,5 +288,5 @@ managedTypes.beginScope(); // go through assertions and recursively add seen ctor/dtors - for ( TypeDecl * tyDecl : functionDecl->get_functionType()->get_forall() ) { + for ( auto & tyDecl : functionDecl->get_functionType()->get_forall() ) { for ( DeclarationWithType *& assertion : tyDecl->get_assertions() ) { assertion = assertion->acceptMutator( *this ); Index: src/Parser/TypeData.cc =================================================================== --- src/Parser/TypeData.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/Parser/TypeData.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -428,31 +428,33 @@ } // TypeData::print -void buildForall( const DeclarationNode * firstNode, std::list< TypeDecl* > &outputList ) { +template< typename ForallList > +void buildForall( const DeclarationNode * firstNode, ForallList &outputList ) { buildList( firstNode, outputList ); - for ( std::list< TypeDecl* >::iterator i = outputList.begin(); i != outputList.end(); ++i ) { - if ( (*i)->get_kind() == TypeDecl::Any ) { + for ( typename ForallList::iterator i = outputList.begin(); i != outputList.end(); ++i ) { + TypeDecl * td = static_cast(*i); + if ( td->get_kind() == TypeDecl::Any ) { // add assertion parameters to `type' tyvars in reverse order // add dtor: void ^?{}(T *) FunctionType * dtorType = new FunctionType( Type::Qualifiers(), false ); - dtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) ); - (*i)->get_assertions().push_front( new FunctionDecl( "^?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, dtorType, 0, false, false ) ); + dtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), td->get_name(), td ) ), 0 ) ); + td->get_assertions().push_front( new FunctionDecl( "^?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, dtorType, 0, false, false ) ); // add copy ctor: void ?{}(T *, T) FunctionType * copyCtorType = new FunctionType( Type::Qualifiers(), false ); - copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) ); - copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) ); - (*i)->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, copyCtorType, 0, false, false ) ); + copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), td->get_name(), td ) ), 0 ) ); + copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), td->get_name(), td ), 0 ) ); + td->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, copyCtorType, 0, false, false ) ); // add default ctor: void ?{}(T *) FunctionType * ctorType = new FunctionType( Type::Qualifiers(), false ); - ctorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) ); - (*i)->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, ctorType, 0, false, false ) ); + ctorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), td->get_name(), td ) ), 0 ) ); + td->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, ctorType, 0, false, false ) ); // add assignment operator: T * ?=?(T *, T) FunctionType * assignType = new FunctionType( Type::Qualifiers(), false ); - assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) ); - assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) ); - assignType->get_returnVals().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) ); - (*i)->get_assertions().push_front( new FunctionDecl( "?=?", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, assignType, 0, false, false ) ); + assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), td->get_name(), td ) ), 0 ) ); + assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), td->get_name(), td ), 0 ) ); + assignType->get_returnVals().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), td->get_name(), td ), 0 ) ); + td->get_assertions().push_front( new FunctionDecl( "?=?", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, assignType, 0, false, false ) ); } // if } // for @@ -562,5 +564,5 @@ // character types. The implementation shall define char to have the same range, representation, and behavior as // either signed char or unsigned char. - static BasicType::Kind chartype[] = { BasicType::SignedChar, BasicType::UnsignedChar, BasicType::Char }; + static BasicType::Kind chartype[] = { BasicType::SignedChar, BasicType::UnsignedChar, BasicType::Char }; if ( td->length != DeclarationNode::NoLength ) { Index: src/ResolvExpr/AlternativeFinder.cc =================================================================== --- src/ResolvExpr/AlternativeFinder.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/ResolvExpr/AlternativeFinder.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -362,5 +362,5 @@ /// Adds type variables to the open variable set and marks their assertions void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions ) { - for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) { + for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) { unifiableVars[ (*tyvar)->get_name() ] = (*tyvar)->get_kind(); for ( std::list< DeclarationWithType* >::iterator assert = (*tyvar)->get_assertions().begin(); assert != (*tyvar)->get_assertions().end(); ++assert ) { Index: src/ResolvExpr/FindOpenVars.cc =================================================================== --- src/ResolvExpr/FindOpenVars.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/ResolvExpr/FindOpenVars.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// FindOpenVars.cc -- +// FindOpenVars.cc -- // // Author : Richard C. Bilson @@ -47,5 +47,5 @@ void FindOpenVars::common_action( Type *type ) { if ( nextIsOpen ) { - for ( std::list< TypeDecl* >::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) { + for ( Type::ForallList::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) { openVars[ (*i)->get_name() ] = (*i)->get_kind(); for ( std::list< DeclarationWithType* >::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) { @@ -56,5 +56,5 @@ } } else { - for ( std::list< TypeDecl* >::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) { + for ( Type::ForallList::const_iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) { closedVars[ (*i)->get_name() ] = (*i)->get_kind(); for ( std::list< DeclarationWithType* >::const_iterator assert = (*i)->get_assertions().begin(); assert != (*i)->get_assertions().end(); ++assert ) { Index: src/ResolvExpr/RenameVars.cc =================================================================== --- src/ResolvExpr/RenameVars.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/ResolvExpr/RenameVars.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// RenameVars.cc -- +// RenameVars.cc -- // // Author : Richard C. Bilson @@ -115,5 +115,5 @@ mapStack.push_front( mapStack.front() ); // renames all "forall" type names to `_${level}_${name}' - 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 ) { std::ostringstream output; output << "_" << level << "_" << (*i)->get_name(); Index: src/ResolvExpr/TypeEnvironment.cc =================================================================== --- src/ResolvExpr/TypeEnvironment.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/ResolvExpr/TypeEnvironment.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -158,6 +158,6 @@ } - void TypeEnvironment::add( const std::list< TypeDecl* > &tyDecls ) { - for ( std::list< TypeDecl* >::const_iterator i = tyDecls.begin(); i != tyDecls.end(); ++i ) { + void TypeEnvironment::add( const Type::ForallList &tyDecls ) { + for ( Type::ForallList::const_iterator i = tyDecls.begin(); i != tyDecls.end(); ++i ) { EqvClass newClass; newClass.vars.insert( (*i)->get_name() ); Index: src/ResolvExpr/TypeEnvironment.h =================================================================== --- src/ResolvExpr/TypeEnvironment.h (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/ResolvExpr/TypeEnvironment.h (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -55,5 +55,5 @@ bool lookup( const std::string &var, EqvClass &eqvClass ) const; void add( const EqvClass &eqvClass ); - void add( const std::list< TypeDecl* > &tyDecls ); + void add( const Type::ForallList &tyDecls ); template< typename SynTreeClass > int apply( SynTreeClass *&type ) const; template< typename SynTreeClass > int applyFree( SynTreeClass *&type ) const; Index: src/ResolvExpr/Unify.cc =================================================================== --- src/ResolvExpr/Unify.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/ResolvExpr/Unify.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -416,5 +416,5 @@ void markAssertions( AssertionSet &assertion1, AssertionSet &assertion2, Type *type ) { - for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) { + for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) { for ( std::list< DeclarationWithType* >::const_iterator assert = (*tyvar)->get_assertions().begin(); assert != (*tyvar)->get_assertions().end(); ++assert ) { markAssertionSet( assertion1, *assert ); Index: src/SymTab/Indexer.cc =================================================================== --- src/SymTab/Indexer.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/SymTab/Indexer.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -143,5 +143,5 @@ 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. Index: src/SymTab/Mangler.cc =================================================================== --- src/SymTab/Mangler.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/SymTab/Mangler.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -5,5 +5,5 @@ // file "LICENCE" distributed with Cforall. // -// Mangler.cc -- +// Mangler.cc -- // // Author : Richard C. Bilson @@ -35,8 +35,8 @@ 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,5 +115,5 @@ "Ir", // LongDoubleImaginary }; - + printQualifiers( basicType ); mangleName << btLetter[ basicType->get_kind() ]; @@ -245,10 +245,10 @@ // 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: Index: src/SymTab/Validate.cc =================================================================== --- src/SymTab/Validate.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/SymTab/Validate.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -429,5 +429,5 @@ /// 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() ); Index: src/SynTree/Expression.cc =================================================================== --- src/SynTree/Expression.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/SynTree/Expression.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -318,4 +318,5 @@ void UntypedMemberExpr::print( std::ostream &os, int indent ) const { os << "Untyped Member Expression, with field: " << std::endl; + os << std::string( indent+2, ' ' ); get_member()->print(os, indent+4); os << std::string( indent+2, ' ' ); Index: src/SynTree/Type.h =================================================================== --- src/SynTree/Type.h (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/SynTree/Type.h (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -20,4 +20,5 @@ #include "Visitor.h" #include "Mutator.h" +#include "Common/utility.h" class Type { @@ -64,5 +65,7 @@ void set_isAtomic( bool newValue ) { tq.isAtomic = newValue; } void set_isAttribute( bool newValue ) { tq.isAttribute = newValue; } - std::list& get_forall() { return forall; } + + typedef std::list ForallList; + ForallList& get_forall() { return forall; } /// How many elemental types are represented by this type @@ -76,5 +79,5 @@ private: Qualifiers tq; - std::list forall; + ForallList forall; }; Index: src/SynTree/TypeSubstitution.cc =================================================================== --- src/SynTree/TypeSubstitution.cc (revision 3c13c03a94ca1d4baa7d03b64383f9d28bb7901f) +++ src/SynTree/TypeSubstitution.cc (revision 8c49c0e874fb58f676d7d0589d6897e2cf4e9581) @@ -72,23 +72,23 @@ Type *TypeSubstitution::lookup( std::string formalType ) const { TypeEnvType::const_iterator i = typeEnv.find( formalType ); - + // break on not in substitution set if ( i == typeEnv.end() ) return 0; - + // attempt to transitively follow TypeInstType links. while ( TypeInstType *actualType = dynamic_cast< TypeInstType* >( i->second ) ) { const std::string& typeName = actualType->get_name(); - + // break cycles in the transitive follow if ( formalType == typeName ) break; - + // Look for the type this maps to, returning previous mapping if none-such i = typeEnv.find( typeName ); if ( i == typeEnv.end() ) return actualType; } - + // return type from substitution set return i->second; - + #if 0 if ( i == typeEnv.end() ) { @@ -149,5 +149,5 @@ // bind type variables from forall-qualifiers if ( freeOnly ) { - for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) { + for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) { boundVars.insert( (*tyvar )->get_name() ); } // for @@ -163,5 +163,5 @@ // bind type variables from forall-qualifiers if ( freeOnly ) { - for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) { + for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) { boundVars.insert( (*tyvar )->get_name() ); } // for