Changes in src/CodeGen/CodeGenerator.cc [721f17a:de62360d]

File:

• src/CodeGen/CodeGenerator.cc (modified) (15 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 : Fri Jun 26 16:52:58 2015
-// Update Count     : 144
+// Last Modified On : Tue Jun 23 16:16:57 2015
+// Update Count     : 133
 //
 
@@ -44 +44 @@
         }
 
-        ostream & CodeGenerator::Indenter::operator()( ostream & output ) {
-          return output << string( cg.cur_indent, ' ' );
-        }
-
-        ostream & operator<<( ostream & output, CodeGenerator::Indenter &indent ) {
-                return indent( output );
-        }
-
-        CodeGenerator::CodeGenerator( std::ostream &os ) : indent(*this), cur_indent( 0 ), insideFunction( false ), output( os ) { }
-
-        CodeGenerator::CodeGenerator( std::ostream &os, std::string init, int indentation, bool infunp )
-                        : indent(*this), cur_indent( indentation ), insideFunction( infunp ), output( os ) {
+        CodeGenerator::CodeGenerator( std::ostream &os ) : cur_indent( 0 ), insideFunction( false ), output( os ) { }
+
+        CodeGenerator::CodeGenerator( std::ostream &os, std::string init, int indent, bool infunp )
+                        : cur_indent( indent ), insideFunction( infunp ), output( os ) {
                 //output << std::string( init );
         }
 
-        CodeGenerator::CodeGenerator( std::ostream &os, char *init, int indentation, bool infunp )
-                        : indent(*this), cur_indent( indentation ), insideFunction( infunp ), output( os ) {
+        CodeGenerator::CodeGenerator( std::ostream &os, char *init, int indent, bool infunp )
+                        : cur_indent( indent ), insideFunction( infunp ), output( os ) {
                 //output << std::string( init );
         }
@@ -71 +63 @@
                 } // if
         }
-
+  
         //*** Declarations
         void CodeGenerator::visit( FunctionDecl *functionDecl ) {
@@ -116 +108 @@
 
                 if ( ! memb.empty() ) {
-                        output << " {" << endl;
+                        output << endl << string( cur_indent, ' ' ) << "{" << endl;
 
                         cur_indent += CodeGenerator::tabsize; 
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
-                                output << indent; 
+                                output << string( cur_indent, ' ' ); 
                                 (*i)->accept(*this );
                                 output << ";" << endl;
@@ -127 +119 @@
                         cur_indent -= CodeGenerator::tabsize; 
 
-                        output << indent << "}";
+                        output << string( cur_indent, ' ' ) << "}";
                 } // if
         }
@@ -150 +142 @@
 
                 if ( ! memb.empty() ) {
-                        output << " {" << endl;
+                        output << endl << "{" << endl;
 
                         cur_indent += CodeGenerator::tabsize; 
@@ -156 +148 @@
                                 ObjectDecl *obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << indent << mangleName( obj ); 
+                                output << string( cur_indent, ' ' ) << mangleName( obj ); 
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -166 +158 @@
                         cur_indent -= CodeGenerator::tabsize; 
 
-                        output << indent << "}";
+                        output << "}" << endl;
                 } // if
         }
@@ -269 +261 @@
               
                                   case OT_CONSTANT:
-                                  case OT_LABELADDRESS:
-                                        // there are no intrinsic definitions of 0/1 or label addresses as functions
+                                        // there are no intrinsic definitions of 0 or 1 as functions
                                         assert( false );
                                 }
@@ -458 +449 @@
 
                 for ( std::list<Statement *>::iterator i = ks.begin(); i != ks.end();  i++) {
-                        output << indent << printLabels( (*i)->get_labels() );
+                        output << string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() );
                         (*i)->accept(*this );
 
@@ -468 +459 @@
                 cur_indent -= CodeGenerator::tabsize; 
 
-                output << indent << "}";
+                output << string( cur_indent, ' ' ) << "}";
         }
 
@@ -508 +499 @@
                 cur_indent -= CodeGenerator::tabsize;
 
-                output << indent << "}";
+                output << string( cur_indent, ' ' ) << "}";
         }
 
         void CodeGenerator::visit( CaseStmt *caseStmt ) {
-                output << indent;
+                output << string( cur_indent, ' ' );
                 if ( caseStmt->isDefault()) {
                         output << "default";
@@ -525 +516 @@
                 cur_indent += CodeGenerator::tabsize;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
-                        output << indent << printLabels( (*i)->get_labels() )  ;
+                        output << string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() )  ;
                         (*i)->accept(*this );
                         output << endl;
@@ -578 +569 @@
                 whileStmt->get_body()->accept( *this );
 
-                output << indent;
+                output << string( cur_indent, ' ' );
 
                 if ( whileStmt->get_isDoWhile() ) {
@@ -610 +601 @@
 
         void CodeGenerator::visit( NullStmt *nullStmt ) {
-                //output << indent << CodeGenerator::printLabels( nullStmt->get_labels() );
+                //output << string( cur_indent, ' ' ) << CodeGenerator::printLabels( nullStmt->get_labels() );
                 output << "/* null statement */ ;";
         }