Changeset 62423350 for src/CodeGen

Timestamp:

Jun 29, 2017, 5:06:24 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

a12d5aa

Parents:

bb1cd95

Message:

Big push on designations and initialization: works with generic types, tuples, arrays, tests pass.
Refactor guard_value_impl.
Add list of declarations to TupleType?.

File:

• src/CodeGen/CodeGenerator.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -292 +292 @@
                 if ( designators.size() == 0 ) return;
                 for ( Expression * des : designators ) {
-                        if ( dynamic_cast< ConstantExpr * >( des ) ) {
-                                // if expression is a ConstantExpr, then initializing array element
+                        if ( dynamic_cast< NameExpr * >( des ) || dynamic_cast< VariableExpr * >( des ) ) {
+                                // if expression is a NameExpr or VariableExpr, then initializing aggregate member
+                                output << ".";
+                                des->accept( *this );
+                        } else {
+                                // otherwise, it has to be a ConstantExpr or CastExpr, initializing array eleemnt
                                 output << "[";
                                 des->accept( *this );
                                 output << "]";
-                        } else {
-                                // if not a ConstantExpr, it has to be a NameExpr or VariableExpr, initializing aggregate member
-                                output << ".";
-                                des->accept( *this );
                         } // if
                 } // for