Changes in src/InitTweak/InitTweak.cc [b128d3e:d180746]

File:

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

src/InitTweak/InitTweak.cc

@@ -187 +187 @@
 
                         UntypedExpr * increment = new UntypedExpr( new NameExpr( "++?" ) );
-                        increment->get_args().push_back( index->clone() );
+                        increment->get_args().push_back( new AddressExpr( index->clone() ) );
                         *out++ = new ExprStmt( noLabels, increment );
                 }
@@ -325 +325 @@
                         std::string name = getFunctionName( expr );
                         assertf( name == "*?", "Unexpected untyped expression: %s", name.c_str() );
-                        assertf( ! expr->get_args().empty(), "Cannot get called function from dereference with no arguments" );
+                        assertf( ! expr->get_args().empty(), "Can't get called function from dereference with no arguments" );
                         return getCalledFunction( expr->get_args().front() );
                 }
@@ -397 +397 @@
                 template<typename CallExpr>
                 Expression *& callArg( CallExpr * callExpr, unsigned int pos ) {
-                        if ( pos >= callExpr->get_args().size() ) assertf( false, "getCallArg for argument that doesn't exist: (%u); %s.", pos, toString( callExpr ).c_str() );
+                        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;
@@ -418 +418 @@
                         assertf( ! tuple->get_exprs().empty(), "TupleAssignExpr somehow has empty tuple expr." );
                         return getCallArg( tuple->get_exprs().front(), pos );
-                } else if ( ImplicitCopyCtorExpr * copyCtor = dynamic_cast< ImplicitCopyCtorExpr * >( callExpr ) ) {
-                        return getCallArg( copyCtor->callExpr, pos );
                 } else {
                         assertf( false, "Unexpected expression type passed to getCallArg: %s", toString( callExpr ).c_str() );
@@ -433 +431 @@
                         std::string name = getFunctionName( expr );
                         assertf( name == "*?", "Unexpected untyped expression: %s", name.c_str() );
-                        assertf( ! expr->get_args().empty(), "Cannot get function name from dereference with no arguments" );
+                        assertf( ! expr->get_args().empty(), "Can't get function name from dereference with no arguments" );
                         return funcName( expr->get_args().front() );
                 }
@@ -452 +450 @@
                         } else if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( func ) ) {
                                 return handleDerefName( appExpr );
-                        } else if ( ConstructorExpr * ctorExpr = dynamic_cast< ConstructorExpr * >( func ) ) {
-                                return funcName( getCallArg( ctorExpr->get_callExpr(), 0 ) );
                         } else {
-                                assertf( false, "Unexpected expression type being called as a function in call expression: %s", toString( func ).c_str() );
+                                assertf( false, "Unexpected expression type being called as a function in call expression" );
                         }
                 }
@@ -479 +475 @@
                 } else if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
                         return arrayType->get_base();
-                } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( type ) ) {
-                        return refType->get_base();
                 } else {
                         return NULL;
@@ -566 +560 @@
                 if ( ftype->get_parameters().size() != 2 ) return 0;
 
-                Type * t1 = getPointerBase( ftype->get_parameters().front()->get_type() );
+                Type * t1 = ftype->get_parameters().front()->get_type();
                 Type * t2 = ftype->get_parameters().back()->get_type();
-                assert( t1 );
-
-                if ( ResolvExpr::typesCompatibleIgnoreQualifiers( t1, t2, SymTab::Indexer() ) ) {
+                PointerType * ptrType = dynamic_cast< PointerType * > ( t1 );
+                assert( ptrType );
+
+                if ( ResolvExpr::typesCompatibleIgnoreQualifiers( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
                         return function;
                 } else {