Changeset e9e4e9ee for src/CodeGen/CodeGenerator.cc

Timestamp:

Jan 19, 2017, 11:04:27 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:

2175062

Parents:

5ebb2fbc (diff), 68e6031 (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) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Dec 13 14:51:27 2016
-// Update Count     : 362
+// Last Modified On : Wed Jan 18 15:23:08 2017
+// Update Count     : 414
 //
 
@@ -111 +111 @@
         }
 
-        void CodeGenerator::genAttributes( std::list< Attribute * > & attributes ) {
-                if ( ! attributes.empty() ) {
-                        output << "__attribute__ ((";
-                        for ( Attribute *& attr : attributes ) {
-                                if ( ! attr->empty() ) {
-                                        output << attr->get_name() << "(";
-                                        genCommaList( attr->get_parameters().begin(), attr->get_parameters().end() );
-                                        output << ")";
-                                } // if
-                                output << ",";
-                        } // for
-                        output << ")) ";
-                } // if
-        }
+        void CodeGenerator::genAttributes( list< Attribute * > & attributes ) {
+          if ( attributes.empty() ) return;
+                output << "__attribute__ ((";
+                for ( list< Attribute * >::iterator attr( attributes.begin() );; ) {
+                        output << (*attr)->get_name();
+                        if ( ! (*attr)->get_parameters().empty() ) {
+                                output << "(";
+                                genCommaList( (*attr)->get_parameters().begin(), (*attr)->get_parameters().end() );
+                                output << ")";
+                        } // if
+                  if ( ++attr == attributes.end() ) break;
+                        output << ",";                                                          // separator
+                } // for
+                output << ")) ";
+        } // CodeGenerator::genAttributes