Changeset 58cb21c

Timestamp:

May 10, 2017, 10:28:50 AM (7 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:

240e1ff

Parents:

cbb675d (diff), 29cf9c8 (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 plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

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

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus May  9 14:32:00 2017
-// Update Count     : 483
+// Last Modified On : Tus May  9 16:50:00 2017
+// Update Count     : 484
 //
 
@@ -42 +42 @@
         int CodeGenerator::tabsize = 4;
 
-        // Pseudo Function: output << lineDirective(*currentNode);
+        // Pseudo Function: output << lineDirective(currentNode);
     struct lineDirective {
         CodeLocation const & loc;
@@ -143 +143 @@
         // *** Declarations
         void CodeGenerator::visit( FunctionDecl * functionDecl ) {
+                output << lineDirective( functionDecl );
+
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
@@ -166 +168 @@
                 }
 
+                output << lineDirective( objectDecl );
+
                 extension( objectDecl );
                 genAttributes( objectDecl->get_attributes() );
@@ -195 +199 @@
                 }
 
-                output << lineDirective( aggDecl ) << kind;
+                output << kind;
                 if ( aggDecl->get_name() != "" )
                         output << aggDecl->get_name();
@@ -217 +221 @@
 
         void CodeGenerator::visit( StructDecl * structDecl ) {
+                output << lineDirective( structDecl );
+
                 extension( structDecl );
                 handleAggregate( structDecl, "struct " );
@@ -222 +228 @@
 
         void CodeGenerator::visit( UnionDecl * unionDecl ) {
+                output << lineDirective( unionDecl );
+
                 extension( unionDecl );
                 handleAggregate( unionDecl, "union " );