Changeset e45215c

Timestamp:

Jul 15, 2015, 3:06:49 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:

d60ccbf

Parents:

145f1fc

Message:

basic designator codegen

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (1 diff)
• CodeGenerator.h (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -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 expression is a name, then initializing aggregate member, if constant expression then array
+                        if ( NameExpr * nm = dynamic_cast< NameExpr * >( *iter ) ) {
+                                if ( nm->get_name() == "0" || nm->get_name() == "1" ) {
+                                        // except if name is 0 or 1...
+                                        output << "[";
+                                        nm->accept( *this );
+                                        output << "]";
+                                } else {
+                                        output << ".";
+                                        nm->accept( *this );
+                                }
+                        } else if ( dynamic_cast< ConstantExpr * >( *iter ) ) {
+                                output << "[";
+                                (*iter)->accept( *this );
+                                output << "]";
+                        } else {
+                                assert(0);
+                        }
+                }
+                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() );

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jun 11 13:24:23 2015
-// Update Count     : 23
+// Last Modified On : Wed Jun 17 11:10:58 2015
+// Update Count     : 25
 //
 
@@ -93 +93 @@
                 std::ostream &output;
 
+                void printDesignators( std::list< Expression * > & );
                 static std::string printLabels ( std::list < Label > & );
                 void handleStorageClass( Declaration *decl );