Changes in src/InitTweak/InitTweak.cc [a61ad31:65dc863]

File:

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

src/InitTweak/InitTweak.cc

@@ -14 +14 @@
                 public:
                         bool hasDesignations = false;
-                        virtual void visit( Designation * des ) {
-                                if ( ! des->get_designators().empty() ) hasDesignations = true;
-                                else Visitor::visit( des );
-                        }
+                        template<typename Init>
+                        void handleInit( Init * init ) {
+                                if ( ! init->get_designators().empty() ) hasDesignations = true;
+                                else Visitor::visit( init );
+                        }
+                        virtual void visit( SingleInit * singleInit ) { handleInit( singleInit); }
+                        virtual void visit( ListInit * listInit ) { handleInit( listInit); }
                 };
 
@@ -380 +383 @@
                 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 +461 @@
                 } 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 +546 @@
                 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 {