Changeset f32c7f4 for src

Timestamp:

Aug 12, 2015, 2:35:51 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:

4550bcf

Parents:

d60ccbf

git-author:

Rob Schluntz <rschlunt@…> (08/12/15 14:33:29)

git-committer:

Rob Schluntz <rschlunt@…> (08/12/15 14:35:51)

Message:

fixed codegen for designators

File:

• src/CodeGen/CodeGenerator.cc (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
 //
 
@@ -190 +190 @@
                 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 ) ) {
+                                // 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 << "]";
-                        } else {
-                                assert(0);
                         }
                 }