Changes in / [b368dd8:518e97d]

Location:

src

Files:

• ResolvExpr/Alternative.cc (modified) (3 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (3 diffs)
• ResolvExpr/TypeEnvironment.cc (modified) (2 diffs)
• SynTree/ReferenceToType.cc (modified) (5 diffs)

src/ResolvExpr/Alternative.cc

@@ -27 +27 @@
 
 namespace ResolvExpr {
-        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( 0 ) {}
+        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( nullptr ) {}
 
         Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost )
@@ -48 +48 @@
         }
 
-        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( other.env ) {
+        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( std::move( other.env ) ) {
                 other.expr = nullptr;
         }
@@ -58 +58 @@
                 cvtCost = other.cvtCost;
                 expr = other.expr;
-                env = other.env;
+                env = std::move( other.env );
                 other.expr = nullptr;
                 return *this;

src/ResolvExpr/AlternativeFinder.cc

@@ -324 +324 @@
                 aggInst->lookup( name, members );
 
-                for ( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
-                        if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( *i ) ) {
-                                alternatives.push_back( Alternative( new MemberExpr( dwt, expr->clone() ), env, newCost ) );
-                                renameTypes( alternatives.back().expr );
-                                addAnonConversions( alternatives.back() ); // add anonymous member interpretations whenever an aggregate value type is seen as a member expression.
+                for ( Declaration * decl : members ) {
+                        if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType* >( decl ) ) {
+                                // addAnonAlternatives uses vector::push_back, which invalidates references to existing elements, so
+                                // can't construct in place and use vector::back
+                                Alternative newAlt( new MemberExpr( dwt, expr->clone() ), env, newCost );
+                                renameTypes( newAlt.expr );
+                                addAnonConversions( newAlt ); // add anonymous member interpretations whenever an aggregate value type is seen as a member expression.
+                                alternatives.push_back( std::move(newAlt) );
                         } else {
                                 assert( false );
@@ -1379 +1382 @@
                         Cost cost = Cost::zero;
                         Expression * newExpr = data.combine( cost );
-                        alternatives.push_back( Alternative( newExpr, env, Cost::zero, cost ) );
+
+                        // addAnonAlternatives uses vector::push_back, which invalidates references to existing elements, so
+                        // can't construct in place and use vector::back
+                        Alternative newAlt( newExpr, env, Cost::zero, cost );
                         PRINT(
                                 std::cerr << "decl is ";
@@ -1388 +1394 @@
                                 std::cerr << std::endl;
                         )
-                        renameTypes( alternatives.back().expr );
-                        addAnonConversions( alternatives.back() ); // add anonymous member interpretations whenever an aggregate value type is seen as a name expression.
+                        renameTypes( newAlt.expr );
+                        addAnonConversions( newAlt ); // add anonymous member interpretations whenever an aggregate value type is seen as a name expression.
+                        alternatives.push_back( std::move(newAlt) );
                 } // for
         }

src/ResolvExpr/TypeEnvironment.cc

@@ -50 +50 @@
         }
 
-        EqvClass::EqvClass() : type( 0 ), allowWidening( true ) {
+        EqvClass::EqvClass() : type( nullptr ), allowWidening( true ) {
         }
 
@@ -159 +159 @@
 
         void TypeEnvironment::print( std::ostream &os, Indenter indent ) const {
-                for ( std::list< EqvClass >::const_iterator i = env.begin(); i != env.end(); ++i ) {
-                        i->print( os, indent );
+                for ( const EqvClass & theClass : env ) {
+                        theClass.print( os, indent );
                 } // for
         }

src/SynTree/ReferenceToType.cc

@@ -50 +50 @@
 
 namespace {
-        void doLookup( const std::list< Declaration* > &members, const std::string &name, std::list< Declaration* > &foundDecls ) {
-                for ( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
-                        if ( (*i)->get_name() == name ) {
-                                foundDecls.push_back( *i );
+        void doLookup( const std::list< Declaration * > & members, const std::string & name, std::list< Declaration* > & foundDecls ) {
+                for ( Declaration * decl : members ) {
+                        if ( decl->name == name ) {
+                                foundDecls.push_back( decl );
                         } // if
                 } // for
@@ -60 +60 @@
 
 StructInstType::StructInstType( const Type::Qualifiers & tq, StructDecl * baseStruct, const std::list< Attribute * > & attributes ) :
-                Parent( tq, baseStruct->get_name(), attributes ), baseStruct( baseStruct ) {}
+                Parent( tq, baseStruct->name, attributes ), baseStruct( baseStruct ) {}
 
 std::string StructInstType::typeString() const { return "struct"; }
@@ -84 +84 @@
 void StructInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
         assert( baseStruct );
-        doLookup( baseStruct->get_members(), name, foundDecls );
+        doLookup( baseStruct->members, name, foundDecls );
 }
 
@@ -103 +103 @@
 
 UnionInstType::UnionInstType( const Type::Qualifiers & tq, UnionDecl * baseUnion, const std::list< Attribute * > & attributes ) :
-                Parent( tq, baseUnion->get_name(), attributes ), baseUnion( baseUnion ) {}
+                Parent( tq, baseUnion->name, attributes ), baseUnion( baseUnion ) {}
 
 std::string UnionInstType::typeString() const { return "union"; }
@@ -127 +127 @@
 void UnionInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
         assert( baseUnion );
-        doLookup( baseUnion->get_members(), name, foundDecls );
+        doLookup( baseUnion->members, name, foundDecls );
 }