Changeset 78a0b88 for src/CodeGen/CodeGenerator.cc

Timestamp:

Sep 1, 2017, 3:33:25 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

bc3127d

Parents:

e8ccca3 (diff), a01f7c94 (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

File:

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

src/CodeGen/CodeGenerator.cc

@@ -195 +195 @@
                 }
 
-                output << kind;
-                if ( aggDecl->get_name() != "" )
-                        output << aggDecl->get_name();
+                output << kind << aggDecl->get_name();
 
                 if ( aggDecl->has_body() ) {
@@ -233 +231 @@
                 genAttributes( enumDecl->get_attributes() );
 
-                if ( enumDecl->get_name() != "" )
-                        output << enumDecl->get_name();
+                output << enumDecl->get_name();
 
                 std::list< Declaration* > &memb = enumDecl->get_members();
@@ -260 +257 @@
         }
 
-        void CodeGenerator::visit( __attribute__((unused)) TraitDecl * traitDecl ) {}
+        void CodeGenerator::visit( TraitDecl * traitDecl ) {
+                assertf( ! genC, "TraitDecl nodes should not reach code generation." );
+                extension( traitDecl );
+                handleAggregate( traitDecl, "trait " );
+        }
 
         void CodeGenerator::visit( TypedefDecl * typeDecl ) {
@@ -760 +761 @@
                 for ( Statement * stmt : stmts ) {
                         updateLocation( stmt );
-                        output << printLabels( stmt->get_labels() );
+                        output << indent << printLabels( stmt->get_labels() );
                         if ( i+1 == numStmts ) {
                                 // last statement in a statement expression needs to be handled specially -