Changes in src/CodeGen/CodeGenerator.cc [7f5566b:971ae89]

File:

• src/CodeGen/CodeGenerator.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 27 14:40:06 2015
-// Update Count     : 218
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Sep 17 15:24:08 2015
+// Update Count     : 231
 //
 
@@ -186 +186 @@
         }
 
+        void CodeGenerator::printDesignators( std::list< Expression * > & designators ) {
+                typedef std::list< Expression * > DesignatorList;
+                if ( designators.size() == 0 ) return;
+                for ( DesignatorList::iterator iter = designators.begin(); iter != designators.end(); ++iter ) {
+                        if ( dynamic_cast< NameExpr * >( *iter ) ) {
+                                // if expression is a name, then initializing aggregate member
+                                output << ".";
+                                (*iter)->accept( *this );
+                        } else {
+                                // if not a simple name, it has to be a constant expression, i.e. an array designator
+                                output << "[";
+                                (*iter)->accept( *this );
+                                output << "]";
+                        }
+                }
+                output << " = ";
+        }
+
         void CodeGenerator::visit( SingleInit *init ) {
+                printDesignators( init->get_designators() );
                 init->get_value()->accept( *this );
         }
 
         void CodeGenerator::visit( ListInit *init ) {
+                printDesignators( init->get_designators() );
                 output << "{ ";
                 genCommaList( init->begin_initializers(), init->end_initializers() );
@@ -372 +392 @@
 
         void CodeGenerator::visit( CastExpr *castExpr ) {
-                output << "((";
-                if ( castExpr->get_results().empty() ) {
-                        output << "void" ;
-                } else {
-                        output << genType( castExpr->get_results().front(), "" );
-                } // if
-                output << ")";
-                castExpr->get_arg()->accept( *this );
-                output << ")";
+                // if the cast is to an lvalue type, then the cast
+                // should be dropped, since the result of a cast is
+                // never an lvalue in C
+                if ( castExpr->get_results().front()->get_isLvalue() ) {
+                        castExpr->get_arg()->accept( *this );
+                } else {
+                        output << "((";
+                        if ( castExpr->get_results().empty() ) {
+                                output << "void" ;
+                        } else {
+                                output << genType( castExpr->get_results().front(), "" );
+                        } // if
+                        output << ")";
+                        castExpr->get_arg()->accept( *this );
+                        output << ")";                  
+                }
         }