Changes in src/CodeGen/CodeGenerator.cc [de62360d:94b4364]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun 23 16:16:57 2015
-// Update Count     : 133
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Jun 15 12:47:16 2015
+// Update Count     : 142
 //
 
@@ -44 +44 @@
         }
 
-        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 ) {
+        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 ) {
                 //output << std::string( init );
         }
 
-        CodeGenerator::CodeGenerator( std::ostream &os, char *init, int indent, bool infunp )
-                        : cur_indent( indent ), insideFunction( infunp ), output( os ) {
+        CodeGenerator::CodeGenerator( std::ostream &os, char *init, int indentation, bool infunp )
+                        : indent(*this), cur_indent( indentation ), insideFunction( infunp ), output( os ) {
                 //output << std::string( init );
         }
@@ -63 +71 @@
                 } // if
         }
-  
+
         //*** Declarations
         void CodeGenerator::visit( FunctionDecl *functionDecl ) {
@@ -69 +77 @@
                 if ( functionDecl->get_isInline() ) {
                         output << "inline ";
-                } // if
-                if ( functionDecl->get_isNoreturn() ) {
-                        output << "_Noreturn ";
                 } // if
                 output << genType( functionDecl->get_functionType(), mangleName( functionDecl ) );
@@ -108 +113 @@
 
                 if ( ! memb.empty() ) {
-                        output << endl << string( cur_indent, ' ' ) << "{" << endl;
+                        output << " {" << endl;
 
                         cur_indent += CodeGenerator::tabsize; 
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
-                                output << string( cur_indent, ' ' ); 
+                                output << indent; 
                                 (*i)->accept(*this );
                                 output << ";" << endl;
@@ -119 +124 @@
                         cur_indent -= CodeGenerator::tabsize; 
 
-                        output << string( cur_indent, ' ' ) << "}";
+                        output << indent << "}";
                 } // if
         }
@@ -142 +147 @@
 
                 if ( ! memb.empty() ) {
-                        output << endl << "{" << endl;
+                        output << " {" << endl;
 
                         cur_indent += CodeGenerator::tabsize; 
@@ -148 +153 @@
                                 ObjectDecl *obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << string( cur_indent, ' ' ) << mangleName( obj ); 
+                                output << indent << mangleName( obj ); 
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -158 +163 @@
                         cur_indent -= CodeGenerator::tabsize; 
 
-                        output << "}" << endl;
+                        output << indent << "}";
                 } // if
         }
@@ -298 +303 @@
                                   case OT_PREFIX:
                                   case OT_PREFIXASSIGN:
-                                  case OT_LABELADDRESS:
                                         assert( untypedExpr->get_args().size() == 1 );
                                         output << "(";
@@ -322 +326 @@
                                         output << ")";
                                         break;
-                                        
+              
                                   case OT_CONSTANT:
                                         // there are no intrinsic definitions of 0 or 1 as functions
@@ -449 +453 @@
 
                 for ( std::list<Statement *>::iterator i = ks.begin(); i != ks.end();  i++) {
-                        output << string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() );
+                        output << indent << printLabels( (*i)->get_labels() );
                         (*i)->accept(*this );
 
@@ -459 +463 @@
                 cur_indent -= CodeGenerator::tabsize; 
 
-                output << string( cur_indent, ' ' ) << "}";
+                output << indent << "}";
         }
 
@@ -499 +503 @@
                 cur_indent -= CodeGenerator::tabsize;
 
-                output << string( cur_indent, ' ' ) << "}";
+                output << indent << "}";
         }
 
         void CodeGenerator::visit( CaseStmt *caseStmt ) {
-                output << string( cur_indent, ' ' );
+                output << indent;
                 if ( caseStmt->isDefault()) {
                         output << "default";
@@ -516 +520 @@
                 cur_indent += CodeGenerator::tabsize;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
-                        output << string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() )  ;
+                        output << indent << printLabels( (*i)->get_labels() )  ;
                         (*i)->accept(*this );
                         output << endl;
@@ -569 +573 @@
                 whileStmt->get_body()->accept( *this );
 
-                output << string( cur_indent, ' ' );
+                output << indent;
 
                 if ( whileStmt->get_isDoWhile() ) {
@@ -601 +605 @@
 
         void CodeGenerator::visit( NullStmt *nullStmt ) {
-                //output << string( cur_indent, ' ' ) << CodeGenerator::printLabels( nullStmt->get_labels() );
+                //output << indent << CodeGenerator::printLabels( nullStmt->get_labels() );
                 output << "/* null statement */ ;";
         }
@@ -638 +642 @@
                         break;
                   case DeclarationNode::Inline:
-                        output << "inline ";
+                        // handled as special via isInline flag (FIX)
                         break;
                   case DeclarationNode::Fortran:
+                        // not handled
                         output << "fortran ";
                         break;
                   case DeclarationNode::Noreturn:
+                        // not handled
                         output << "_Noreturn ";
                         break;
                   case DeclarationNode::Threadlocal:
+                        // not handled
                         output << "_Thread_local ";
                         break;