Index: src/ResolvExpr/AlternativeFinder.cc =================================================================== --- src/ResolvExpr/AlternativeFinder.cc (revision 54c9000e4efa1fe5278b3e7542f24426b99cc070) +++ src/ResolvExpr/AlternativeFinder.cc (revision 490ff5c3cdf33976fd18d953a739387a1031d3c6) @@ -1380,6 +1380,6 @@ void AlternativeFinder::Finder::postvisit( NameExpr *nameExpr ) { std::list< SymTab::Indexer::IdData > declList; - indexer.lookupId( nameExpr->get_name(), declList ); - PRINT( std::cerr << "nameExpr is " << nameExpr->get_name() << std::endl; ) + indexer.lookupId( nameExpr->name, declList ); + PRINT( std::cerr << "nameExpr is " << nameExpr->name << std::endl; ) for ( auto & data : declList ) { Expression * newExpr = data.combine(); @@ -1402,5 +1402,5 @@ // not sufficient to clone here, because variable's type may have changed // since the VariableExpr was originally created. - alternatives.push_back( Alternative( new VariableExpr( variableExpr->get_var() ), env, Cost::zero ) ); + alternatives.push_back( Alternative( new VariableExpr( variableExpr->var ), env, Cost::zero ) ); } @@ -1469,7 +1469,7 @@ // xxx - resolveTypeof? if ( StructInstType *structInst = dynamic_cast< StructInstType* >( offsetofExpr->get_type() ) ) { - addOffsetof( structInst, offsetofExpr->get_member() ); + addOffsetof( structInst, offsetofExpr->member ); } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( offsetofExpr->get_type() ) ) { - addOffsetof( unionInst, offsetofExpr->get_member() ); + addOffsetof( unionInst, offsetofExpr->member ); } } @@ -1548,12 +1548,12 @@ secondFinder.findWithAdjustment( logicalExpr->get_arg2() ); if ( secondFinder.alternatives.empty() ) return; - for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) { - for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) { + for ( const Alternative & first : firstFinder.alternatives ) { + for ( const Alternative & second : secondFinder.alternatives ) { TypeEnvironment compositeEnv; - compositeEnv.simpleCombine( first->env ); - compositeEnv.simpleCombine( second->env ); - - LogicalExpr *newExpr = new LogicalExpr( first->expr->clone(), second->expr->clone(), logicalExpr->get_isAnd() ); - alternatives.push_back( Alternative( newExpr, compositeEnv, first->cost + second->cost ) ); + compositeEnv.simpleCombine( first.env ); + compositeEnv.simpleCombine( second.env ); + + LogicalExpr *newExpr = new LogicalExpr( first.expr->clone(), second.expr->clone(), logicalExpr->get_isAnd() ); + alternatives.push_back( Alternative( newExpr, compositeEnv, first.cost + second.cost ) ); } } @@ -1605,6 +1605,6 @@ AlternativeFinder secondFinder( indexer, newEnv ); secondFinder.findWithAdjustment( commaExpr->get_arg2() ); - for ( AltList::const_iterator alt = secondFinder.alternatives.begin(); alt != secondFinder.alternatives.end(); ++alt ) { - alternatives.push_back( Alternative( new CommaExpr( newFirstArg->clone(), alt->expr->clone() ), alt->env, alt->cost ) ); + for ( const Alternative & alt : secondFinder.alternatives ) { + alternatives.push_back( Alternative( new CommaExpr( newFirstArg->clone(), alt.expr->clone() ), alt.env, alt.cost ) ); } // for delete newFirstArg; @@ -1614,21 +1614,21 @@ // resolve low and high, accept alternatives whose low and high types unify AlternativeFinder firstFinder( indexer, env ); - firstFinder.findWithAdjustment( rangeExpr->get_low() ); + firstFinder.findWithAdjustment( rangeExpr->low ); if ( firstFinder.alternatives.empty() ) return; AlternativeFinder secondFinder( indexer, env ); - secondFinder.findWithAdjustment( rangeExpr->get_high() ); + secondFinder.findWithAdjustment( rangeExpr->high ); if ( secondFinder.alternatives.empty() ) return; - for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) { - for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) { + for ( const Alternative & first : firstFinder.alternatives ) { + for ( const Alternative & second : secondFinder.alternatives ) { TypeEnvironment compositeEnv; - compositeEnv.simpleCombine( first->env ); - compositeEnv.simpleCombine( second->env ); + compositeEnv.simpleCombine( first.env ); + compositeEnv.simpleCombine( second.env ); OpenVarSet openVars; AssertionSet needAssertions, haveAssertions; - Alternative newAlt( 0, compositeEnv, first->cost + second->cost ); + Alternative newAlt( 0, compositeEnv, first.cost + second.cost ); Type* commonType = nullptr; - if ( unify( first->expr->get_result(), second->expr->get_result(), newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) { - RangeExpr *newExpr = new RangeExpr( first->expr->clone(), second->expr->clone() ); - newExpr->set_result( commonType ? commonType : first->expr->get_result()->clone() ); + if ( unify( first.expr->result, second.expr->result, newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) { + RangeExpr * newExpr = new RangeExpr( first.expr->clone(), second.expr->clone() ); + newExpr->result = commonType ? commonType : first.expr->result->clone(); newAlt.expr = newExpr; inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( alternatives ) ); Index: src/SymTab/Indexer.cc =================================================================== --- src/SymTab/Indexer.cc (revision 54c9000e4efa1fe5278b3e7542f24426b99cc070) +++ src/SymTab/Indexer.cc (revision 490ff5c3cdf33976fd18d953a739387a1031d3c6) @@ -434,5 +434,5 @@ } } else { - // Check that a Cforall declaration doesn't overload any C declaration + // Check that a Cforall declaration doesn't override any C declaration if ( hasCompatibleCDecl( name, mangleName, scope ) ) { throw SemanticError( "Cforall declaration hides C function ", decl ); @@ -654,5 +654,5 @@ void Indexer::print( std::ostream &os, int indent ) const { - using std::cerr; + using std::cerr; if ( tables ) { Index: src/SymTab/Indexer.h =================================================================== --- src/SymTab/Indexer.h (revision 54c9000e4efa1fe5278b3e7542f24426b99cc070) +++ src/SymTab/Indexer.h (revision 490ff5c3cdf33976fd18d953a739387a1031d3c6) @@ -40,6 +40,9 @@ struct IdData { - DeclarationWithType * id; - Expression * baseExpr; // WithExpr + DeclarationWithType * id = nullptr; + Expression * baseExpr = nullptr; // WithExpr + + /// non-null if this declaration is deleted + BaseSyntaxNode * deleteStmt = nullptr; Expression * combine() const; Index: src/Tuples/Explode.h =================================================================== --- src/Tuples/Explode.h (revision 54c9000e4efa1fe5278b3e7542f24426b99cc070) +++ src/Tuples/Explode.h (revision 490ff5c3cdf33976fd18d953a739387a1031d3c6) @@ -43,5 +43,5 @@ /// Append alternative to an OutputIterator of Alternatives template - void append( OutputIterator out, Expression* expr, const ResolvExpr::TypeEnvironment& env, + void append( OutputIterator out, Expression* expr, const ResolvExpr::TypeEnvironment& env, const ResolvExpr::Cost& cost, const ResolvExpr::Cost& cvtCost ) { *out++ = ResolvExpr::Alternative{ expr, env, cost, cvtCost }; @@ -49,5 +49,5 @@ /// Append alternative to an ExplodedActual - static inline void append( ResolvExpr::ExplodedActual& ea, Expression* expr, + static inline void append( ResolvExpr::ExplodedActual& ea, Expression* expr, const ResolvExpr::TypeEnvironment&, const ResolvExpr::Cost&, const ResolvExpr::Cost& ) { ea.exprs.emplace_back( expr ); @@ -57,5 +57,5 @@ /// helper function used by explode template< typename Output > - void explodeUnique( Expression * expr, const ResolvExpr::Alternative & alt, + void explodeUnique( Expression * expr, const ResolvExpr::Alternative & alt, const SymTab::Indexer & indexer, Output&& out, bool isTupleAssign ) { if ( isTupleAssign ) { @@ -63,9 +63,9 @@ if ( CastExpr * castExpr = isReferenceCast( expr ) ) { ResolvExpr::AltList alts; - explodeUnique( + explodeUnique( castExpr->get_arg(), alt, indexer, back_inserter( alts ), isTupleAssign ); for ( ResolvExpr::Alternative & alt : alts ) { // distribute reference cast over all components - append( std::forward(out), distributeReference( alt.release_expr() ), + append( std::forward(out), distributeReference( alt.release_expr() ), alt.env, alt.cost, alt.cvtCost ); } @@ -108,5 +108,5 @@ /// expands a tuple-valued alternative into multiple alternatives, each with a non-tuple-type template< typename Output > - void explode( const ResolvExpr::Alternative &alt, const SymTab::Indexer & indexer, + void explode( const ResolvExpr::Alternative &alt, const SymTab::Indexer & indexer, Output&& out, bool isTupleAssign = false ) { explodeUnique( alt.expr, alt, indexer, std::forward(out), isTupleAssign ); @@ -115,5 +115,5 @@ // explode list of alternatives template< typename AltIterator, typename Output > - void explode( AltIterator altBegin, AltIterator altEnd, const SymTab::Indexer & indexer, + void explode( AltIterator altBegin, AltIterator altEnd, const SymTab::Indexer & indexer, Output&& out, bool isTupleAssign = false ) { for ( ; altBegin != altEnd; ++altBegin ) { @@ -123,5 +123,5 @@ template< typename Output > - void explode( const ResolvExpr::AltList & alts, const SymTab::Indexer & indexer, Output&& out, + void explode( const ResolvExpr::AltList & alts, const SymTab::Indexer & indexer, Output&& out, bool isTupleAssign = false ) { explode( alts.begin(), alts.end(), indexer, std::forward(out), isTupleAssign );