Changes in src/CodeGen/CodeGenerator.cc [064e3ff:486341f]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -83 +83 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool mangle ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), mangle( mangle ) {}
 
         CodeGenerator::CodeGenerator( std::ostream & os, std::string init, int indentation, bool infunp )
@@ -95 +95 @@
         }
 
-        string mangleName( DeclarationWithType * decl ) {
+        string CodeGenerator::mangleName( DeclarationWithType * decl ) {
+                if ( ! mangle ) return decl->get_name();
                 if ( decl->get_mangleName() != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors
@@ -148 +149 @@
         void CodeGenerator::visit( ObjectDecl * objectDecl ) {
                 extension( objectDecl );
+                genAttributes( objectDecl->get_attributes() );
+
                 handleStorageClass( objectDecl );
                 output << genType( objectDecl->get_type(), mangleName( objectDecl ) );
@@ -271 +274 @@
                 printDesignators( init->get_designators() );
                 output << "{ ";
-                if ( init->begin_initializers() == init->end_initializers() ) {
+                if ( init->begin() == init->end() ) {
                         // illegal to leave initializer list empty for scalar initializers, but always legal to have 0
                         output << "0";
                 } else {
-                        genCommaList( init->begin_initializers(), init->end_initializers() );
+                        genCommaList( init->begin(), init->end() );
                 } // if
                 output << " }";
@@ -309 +312 @@
                                                         Type * type = InitTweak::getPointerBase( (*arg)->get_results().front() );
                                                         assert( type );
-                                                        newExpr->get_results().push_back( type );
+                                                        newExpr->get_results().push_back( type->clone() );
                                                         *arg = newExpr;
                                                 } // if