Changes in / [b29f8f3:51b986f]

Location:

src

Files:

• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (4 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -697 +697 @@
                         std::list< Type* >::iterator candidate_end = (*i).expr->get_results().begin();
                         std::advance( candidate_end, castExpr->get_results().size() );
+                        if ( ! unifyList( (*i).expr->get_results().begin(), candidate_end,
+                                                         castExpr->get_results().begin(), castExpr->get_results().end(), i->env, needAssertions, haveAssertions, openVars, indexer ) ) continue;
                         Cost thisCost = castCostList( (*i).expr->get_results().begin(), candidate_end,
                                                                                   castExpr->get_results().begin(), castExpr->get_results().end(), indexer, i->env );

src/SymTab/Validate.cc

@@ -162 +162 @@
         class EliminateTypedef : public Mutator {
           public:
-          EliminateTypedef() : scopeLevel( 0 ) {}
-            /// Replaces typedefs by forward declarations
+                EliminateTypedef() : scopeLevel( 0 ) {}
                 static void eliminateTypedef( std::list< Declaration * > &translationUnit );
           private:
@@ -543 +542 @@
                 std::list<Statement *> initList;
                 initList.push_back( initStmt );
-  
+
                 UntypedExpr *cond = new UntypedExpr( new NameExpr( "?<?" ) );
                 cond->get_args().push_back( new VariableExpr( index ) );
@@ -618 +617 @@
 
                 // need to remove the prototypes, since this may be nested in a routine
-                for (int start = 0, end = assigns.size()/2; start < end; start++) {
+                for ( int start = 0, end = assigns.size() / 2; start < end; start++ ) {
                         delete assigns.front();
                         assigns.pop_front();
@@ -961 +960 @@
         }
 
-                Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
+        Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
                 Mutator::mutate( contextDecl );
                 return handleAggregate( contextDecl );