Changes in src/CodeGen/CodeGenerator.cc [c0aa336:35b1bf4]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -89 +89 @@
         }
 
-        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, bool pretty ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ) {}
 
         CodeGenerator::CodeGenerator( std::ostream & os, std::string init, int indentation, bool infunp )
@@ -102 +102 @@
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
-                if ( ! mangle ) return decl->get_name();
+                if ( pretty ) return decl->get_name();
                 if ( decl->get_mangleName() != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors
@@ -140 +140 @@
                         output << "_Noreturn ";
                 } // if
-                output << genType( functionDecl->get_functionType(), mangleName( functionDecl ) );
+                output << genType( functionDecl->get_functionType(), mangleName( functionDecl ), pretty );
 
                 // how to get this to the Functype?
@@ -161 +161 @@
 
                 handleStorageClass( objectDecl );
-                output << genType( objectDecl->get_type(), mangleName( objectDecl ) );
+                output << genType( objectDecl->get_type(), mangleName( objectDecl ), pretty );
 
                 asmName( objectDecl );
@@ -178 +178 @@
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl ) {
                 genAttributes( aggDecl->get_attributes() );
-                
+
                 if ( aggDecl->get_name() != "" )
                         output << aggDecl->get_name();
@@ -249 +249 @@
                 assert( false && "Typedefs are removed and substituted in earlier passes." );
                 //output << "typedef ";
-                //output << genType( typeDecl->get_base(), typeDecl->get_name() );
+                //output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty );
         }
 
@@ -258 +258 @@
                 output << "extern unsigned long " << typeDecl->get_name();
                 if ( typeDecl->get_base() ) {
-                        output << " = sizeof( " << genType( typeDecl->get_base(), "" ) << " )";
+                        output << " = sizeof( " << genType( typeDecl->get_base(), "", pretty ) << " )";
                 } // if
         }
@@ -552 +552 @@
                         // at least one result type of cast, but not an lvalue
                         output << "(";
-                        output << genType( castExpr->get_result(), "" );
+                        output << genType( castExpr->get_result(), "", pretty );
                         output << ")";
                 } else {
@@ -592 +592 @@
                 output << "sizeof(";
                 if ( sizeofExpr->get_isType() ) {
-                        output << genType( sizeofExpr->get_type(), "" );
+                        output << genType( sizeofExpr->get_type(), "", pretty );
                 } else {
                         sizeofExpr->get_expr()->accept( *this );
@@ -604 +604 @@
                 output << "__alignof__(";
                 if ( alignofExpr->get_isType() ) {
-                        output << genType( alignofExpr->get_type(), "" );
+                        output << genType( alignofExpr->get_type(), "", pretty );
                 } else {
                         alignofExpr->get_expr()->accept( *this );
@@ -618 +618 @@
                 // use GCC builtin
                 output << "__builtin_offsetof(";
-                output << genType( offsetofExpr->get_type(), "" );
+                output << genType( offsetofExpr->get_type(), "", pretty );
                 output << ", " << mangleName( offsetofExpr->get_member() );
                 output << ")";
@@ -680 +680 @@
         void CodeGenerator::visit( CompoundLiteralExpr *compLitExpr ) {
                 assert( compLitExpr->get_type() && dynamic_cast< ListInit * > ( compLitExpr->get_initializer() ) );
-                output << "(" << genType( compLitExpr->get_type(), "" ) << ")";
+                output << "(" << genType( compLitExpr->get_type(), "", pretty ) << ")";
                 compLitExpr->get_initializer()->accept( *this );
         }