Changeset aa99647

Timestamp:

Sep 11, 2015, 9:44:54 AM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

32a1e5fd

Parents:

f60d997 (diff), 4550bcf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (2 diffs)
• CodeGenerator.h (modified) (2 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 : Wed Aug 12 14:33:52 2015
+// Update Count     : 222
 //
 
@@ -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 ( NameExpr * nm = 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() );

src/CodeGen/CodeGenerator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 24 13:34:47 2015
-// Update Count     : 25
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Aug 12 14:27:14 2015
+// Update Count     : 27
 //
 
@@ -95 +95 @@
                 std::ostream &output;
 
+                void printDesignators( std::list< Expression * > & );
                 static std::string printLabels ( std::list < Label > & );
                 void handleStorageClass( Declaration *decl );