Changeset b5c5684

Timestamp:

Jun 10, 2015, 3:37:34 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

bfbf97f

Parents:

8a95629

Message:

removes casts from char[] initialized with strings, correctly casts array initializers, correctly casts union initializer

File:

• src/ResolvExpr/Resolver.cc (modified) (4 diffs)

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun  7 21:50:37 2015
-// Update Count     : 23
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jun 10 15:32:16 2015
+// Update Count     : 45
 //
 
@@ -272 +272 @@
         }
 
+        template< typename T >
+        bool isCharType( T t ) {
+                if ( BasicType * bt = dynamic_cast< BasicType * >( t ) ) {
+                        return bt->get_kind() == BasicType::Char || bt->get_kind() == BasicType::SignedChar || 
+                                bt->get_kind() == BasicType::UnsignedChar;
+                }
+                return false;
+        }
+
         void Resolver::visit( SingleInit *singleInit ) {
                 if ( singleInit->get_value() ) {
@@ -296 +305 @@
                         delete castExpr;
                         singleInit->set_value( newExpr );
+
+                        // check if initializing type is char[]
+                        if ( ArrayType * at = dynamic_cast< ArrayType * >( initContext ) ) {
+                                if ( isCharType( at->get_base() ) ) {
+                                        // check if the resolved type is char *
+                                        if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_results().front() ) ) {
+                                                if ( isCharType( pt->get_base() ) ) {
+                                                        // strip cast if we're initializing a char[] with a char *, e.g.
+                                                        // char x[] = "hello";
+                                                        CastExpr *ce = dynamic_cast< CastExpr * >( newExpr );
+                                                        singleInit->set_value( ce->get_arg() );
+                                                        ce->set_arg( NULL );
+                                                        delete ce;                                                                      
+                                                }
+                                        }
+                                }
+                        }
                 } // if
 //      singleInit->get_value()->accept( *this );
@@ -301 +327 @@
 
         void Resolver::visit( ListInit *listInit ) {
-                Visitor::visit(listInit);
+                if ( ArrayType * at = dynamic_cast< ArrayType * >( initContext ) ) {
+                        std::list< Initializer * >::iterator iter( listInit->begin_initializers() );
+                        for ( ; iter != listInit->end_initializers(); ++iter ) {
+                                initContext = at->get_base();
+                                (*iter)->accept( *this );
+                        } // for
+                } else if ( UnionInstType *st = dynamic_cast< UnionInstType * >( initContext ) ) {
+                        DeclarationWithType *dt = dynamic_cast< DeclarationWithType * >( *st->get_baseUnion()->get_members().begin() );
+                        initContext = dt->get_type();
+                        (*listInit->begin_initializers())->accept( *this );
+                } else {
+                        // basic types are handled here
+                        Visitor::visit( listInit );
+                }
+
 #if 0
                 if ( ArrayType *at = dynamic_cast<ArrayType*>(initContext) ) {