Changes in src/ArgTweak/FunctionFixer.cc [f1b1e4c:843054c2]

File:

• src/ArgTweak/FunctionFixer.cc (modified) (2 diffs)

src/ArgTweak/FunctionFixer.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FunctionFixer.cc --
+// FunctionFixer.cc -- 
 //
 // Author           : Rodolfo G. Esteves
@@ -42 +42 @@
         Expression *FunctionFixer::mutate( UntypedExpr *untypedExpr ) throw ( SemanticError ) {
                 assert( untypedExpr != 0 );
+                NameExpr *function;
 
-                if ( NameExpr * function = dynamic_cast< NameExpr *>(untypedExpr->get_function() ) ) {
+                if ( ( function = dynamic_cast< NameExpr *>(untypedExpr->get_function()) ) != 0 ) {
                         std::list < DeclarationWithType * > options;
                         index->lookupId ( function->get_name(), options );
                         for ( std::list < DeclarationWithType * >::iterator i = options.begin(); i != options.end(); i++ ) {
-                                if ( FunctionType * f = dynamic_cast< FunctionType * > ( (*i)->get_type() ) )   {
+                                FunctionType *f;
+                                if ( ( f = dynamic_cast< FunctionType * > ( (*i)->get_type() ) ) != 0 ) {
                                         std::list < DeclarationWithType * > &pars = f->get_parameters();
+
                                         bool candidateExists ;
-                                        for ( std::list < DeclarationWithType * >::iterator p = pars.begin(); p != pars.end(); p++ ) {
+                                        for ( std::list < DeclarationWithType * >::iterator p = pars.begin(); p != pars.end(); p++ )
                                                 if ( ( candidateExists = align( f->get_parameters(), untypedExpr->get_args(), Matcher() ) ) ) break;
-                                        }
+
                                         if ( ! candidateExists ) throw SemanticError("Error in function call");
                                 } // if