Changes in src/InitTweak/InitTweak.cc [175ad32:d180746]

File:

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

src/InitTweak/InitTweak.cc

@@ -1 @@
-#include <algorithm>
+#include <stddef.h>                // for NULL
+#include <algorithm>               // for find, all_of
+#include <cassert>                 // for assertf, assert, safe_dynamic_cast
+#include <iostream>                // for ostream, cerr, endl
+#include <iterator>                // for back_insert_iterator, back_inserter
+#include <memory>                  // for __shared_ptr
+
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Common/UniqueName.h"     // for UniqueName
+#include "Common/utility.h"        // for toString, deleteAll, maybeClone
+#include "GenPoly/GenPoly.h"       // for getFunctionType
 #include "InitTweak.h"
-#include "SynTree/Visitor.h"
-#include "SynTree/Statement.h"
-#include "SynTree/Initializer.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Attribute.h"
-#include "GenPoly/GenPoly.h"
-#include "ResolvExpr/typeops.h"
+#include "Parser/LinkageSpec.h"    // for Spec, isBuiltin, Intrinsic
+#include "ResolvExpr/typeops.h"    // for typesCompatibleIgnoreQualifiers
+#include "SymTab/Indexer.h"        // for Indexer
+#include "SynTree/Attribute.h"     // for Attribute
+#include "SynTree/Constant.h"      // for Constant
+#include "SynTree/Declaration.h"   // for ObjectDecl, DeclarationWithType
+#include "SynTree/Expression.h"    // for Expression, UntypedExpr, Applicati...
+#include "SynTree/Initializer.h"   // for Initializer, ListInit, Designation
+#include "SynTree/Label.h"         // for Label, noLabels
+#include "SynTree/Statement.h"     // for CompoundStmt, ExprStmt, BranchStmt
+#include "SynTree/Type.h"          // for FunctionType, ArrayType, PointerType
+#include "SynTree/Visitor.h"       // for Visitor, maybeAccept
+
+class UntypedValofExpr;
 
 namespace InitTweak {
@@ -170 +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 );
                 }
@@ -380 +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;
@@ -458 +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;
@@ -545 +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 {