Changeset 893256d for src/CodeGen

Timestamp:

Jul 20, 2015, 2:29:52 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, with_gc

Children:

18997b9

Parents:

2794fff (diff), 994ec2c (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' into ctor

Conflicts:

src/Parser/ParseNode.h

Location:

src/CodeGen

Files:

• FixNames.h (modified) (1 diff)
• GenType.cc (modified) (3 diffs)
• Generate.h (modified) (1 diff)

src/CodeGen/FixNames.h

@@ -20 +20 @@
 
 namespace CodeGen {
+        /// mangles object and function names
         void fixNames( std::list< Declaration* > translationUnit );
 } // namespace CodeGen

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

src/CodeGen/Generate.h

@@ -23 +23 @@
 
 namespace CodeGen {
+        /// Generates code
         void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics );
 } // namespace CodeGen