Changes in src/InitTweak/InitTweak.cc [ee1635c8:96a10cd]

File:

• src/InitTweak/InitTweak.cc (modified) (4 diffs)

src/InitTweak/InitTweak.cc

@@ -358 +358 @@
                 template<typename CallExpr>
                 Expression *& callArg( CallExpr * callExpr, unsigned int pos ) {
-                        if ( pos >= callExpr->get_args().size() ) assert( false && "asking for argument that doesn't exist. Return NULL/throw exception?" );
+                        if ( pos >= callExpr->get_args().size() ) assertf( false, "asking for argument that doesn't exist. Return NULL/throw exception?" );
                         for ( Expression *& arg : callExpr->get_args() ) {
                                 if ( pos == 0 ) return arg;
@@ -373 +373 @@
                         return callArg( untypedExpr, pos );
                 } else {
-                        assert( false && "Unexpected expression type passed to getCallArg" );
+                        assertf( false, "Unexpected expression type passed to getCallArg" );
                 }
         }
@@ -387 +387 @@
                         } else if ( MemberExpr * memberExpr = dynamic_cast< MemberExpr * >( func ) ) {
                                 return memberExpr->get_member()->get_name();
+                        } else if ( UntypedMemberExpr * memberExpr = dynamic_cast< UntypedMemberExpr * > ( func ) ) {
+                                return memberExpr->get_member();
                         } else {
-                                assert( false && "Unexpected expression type being called as a function in call expression" );
+                                assertf( false, "Unexpected expression type being called as a function in call expression" );
                         }
                 }
@@ -400 +402 @@
                 } else {
                         std::cerr << expr << std::endl;
-                        assert( false && "Unexpected expression type passed to getFunctionName" );
+                        assertf( false, "Unexpected expression type passed to getFunctionName" );
                 }
         }