Changes in src/ResolvExpr/AlternativeFinder.cc [e04ef3a:70f89d00]

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (4 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sat May 16 23:52:08 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 13 16:13:54 2016
-// Update Count     : 25
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Apr 20 14:24:03 2016
+// Update Count     : 24
 //
 
@@ -39 +39 @@
 #include "Tuples/NameMatcher.h"
 #include "Common/utility.h"
+#include "InitTweak/InitTweak.h"
 
 extern bool resolvep;
@@ -546 +547 @@
 
                 {
-                        NameExpr *fname = 0;;
-                        if ( ( fname = dynamic_cast<NameExpr *>( untypedExpr->get_function()))
-                                 && ( fname->get_name() == std::string("&&")) ) {
+                        std::string fname = InitTweak::getFunctionName( untypedExpr );
+                        if ( fname == "&&" ) {
                                 VoidType v = Type::Qualifiers();                // resolve to type void *
                                 PointerType pt( Type::Qualifiers(), v.clone() );
@@ -757 +757 @@
                 for ( std::list< DeclarationWithType* >::iterator i = declList.begin(); i != declList.end(); ++i ) {
                         VariableExpr newExpr( *i, nameExpr->get_argName() );
-                        newExpr.set_extension( nameExpr->get_extension() );
                         alternatives.push_back( Alternative( newExpr.clone(), env, Cost() ) );
                         PRINT(