Changes in / [f4bc57c:d1aa5c0]

Location:

src

Files:

• InitTweak/InitTweak.cc (modified) (2 diffs)
• SymTab/Autogen.cc (modified) (1 diff)

src/InitTweak/InitTweak.cc

@@ -115 +115 @@
 
         namespace {
-                std::string funcName( Expression * func ) {
+                template<typename CallExpr>
+                std::string funcName( CallExpr * expr ) {
+                        Expression * func = expr->get_function();
                         if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( func ) ) {
                                 return nameExpr->get_name();
                         } else if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( func ) ) {
                                 return varExpr->get_var()->get_name();
-                        }       else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( func ) ) {
-                                return funcName( castExpr->get_arg() );
                         } else {
                                 assert( false && "Unexpected expression type being called as a function in call expression" );
@@ -130 +130 @@
         std::string getFunctionName( Expression * expr ) {
                 if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr ) ) {
-                        return funcName( appExpr->get_function() );
+                        return funcName( appExpr );
                 } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * > ( expr ) ) {
-                        return funcName( untypedExpr->get_function() );
+                        return funcName( untypedExpr );
                 } else {
-                        std::cerr << expr << std::endl;
                         assert( false && "Unexpected expression type passed to getFunctionName" );
                 }

src/SymTab/Autogen.cc

@@ -482 +482 @@
                 ObjectDecl *dst = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), typeInst->clone() ), 0 );
                 if ( typeDecl->get_base() ) {
-                        // xxx - generate ctor/dtors for typedecls, e.g.
-                        // otype T = int *;
                         stmts = new CompoundStmt( std::list< Label >() );
                         UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) );