Changeset f1b1e4c for src/ArgTweak

Timestamp:

Jun 1, 2016, 11:54:23 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

be945ac

Parents:

70f89d00

Message:

can construct global const objects, except with intrinsic constructors

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 ( ( function = dynamic_cast< NameExpr *>(untypedExpr->get_function()) ) != 0 ) {
+                if ( NameExpr * function = dynamic_cast< NameExpr *>(untypedExpr->get_function() ) ) {
                         std::list < DeclarationWithType * > options;
                         index->lookupId ( function->get_name(), options );
                         for ( std::list < DeclarationWithType * >::iterator i = options.begin(); i != options.end(); i++ ) {
-                                FunctionType *f;
-                                if ( ( f = dynamic_cast< FunctionType * > ( (*i)->get_type() ) ) != 0 ) {
+                                if ( FunctionType * f = dynamic_cast< FunctionType * > ( (*i)->get_type() ) )   {
                                         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