Changeset b29f8f3 for src/CodeGen

Timestamp:

Jul 29, 2015, 12:07:38 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

093f1a0

Parents:

1e8f143 (diff), 51b986f (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 from origin

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (3 diffs)
• GenType.cc (modified) (3 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 : Fri Jun 26 16:52:58 2015
-// Update Count     : 144
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 15 14:47:42 2015
+// Update Count     : 177
 //
 
@@ -38 +38 @@
         int CodeGenerator::tabsize = 4;
 
-        // the kinds of statements that would ideally be separated by more whitespace
+        // the kinds of statements that would ideally be followed by whitespace
         bool wantSpacing( Statement * stmt) {
                 return dynamic_cast< IfStmt * >( stmt ) || dynamic_cast< CompoundStmt * >( stmt ) ||
@@ -588 +588 @@
 
         void CodeGenerator::visit( ForStmt *forStmt ) {
-                output << "for (";
-
-                if ( forStmt->get_initialization() != 0 )
-                        forStmt->get_initialization()->accept( *this );
-                else
-                        output << ";";
-                
+                // initialization is always hoisted, so don't 
+                // bother doing anything with that 
+                output << "for (;";
+
                 if ( forStmt->get_condition() != 0 )
                         forStmt->get_condition()->accept( *this );

src/CodeGen/GenType.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 08 16:08:24 2015
-// Update Count     : 10
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul  9 16:43:52 2015
+// Update Count     : 13
 //
 
@@ -93 +93 @@
                         os << "_Atomic ";
                 } // if
+                if ( qualifiers.isAttribute ) {
+                        os << "__attribute(( )) ";
+                } // if
                 if ( dimension != 0 ) {
                         CodeGenerator cg( os );
                         dimension->accept( cg );
                 } else if ( isVarLen ) {
-                        // no dimension expression on a VLA
-                        // means it came in with the * token
+                        // no dimension expression on a VLA means it came in with the * token
                         os << "*";
                 } // if
@@ -202 +204 @@
                         typeString = "_Atomic " + typeString;
                 } // if
+                if ( type->get_isAttribute() ) {
+                        typeString = "__attribute(( )) " + typeString;
+                } // if
         }
 } // namespace CodeGen