Changeset cda48b6

Timestamp:

Jun 11, 2015, 1:27:16 PM (10 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, string, with_gc

Children:

a8541d9

Parents:

7bcf74e

Message:

more codegen reformatting

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (14 diffs)
• CodeGenerator.h (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jun 04 15:00:00 2015
-// Update Count     : 125
+// Last Modified On : Thu Jun 11 13:22:39 2015
+// Update Count     : 137
 //
 
@@ -43 +43 @@
         }
 
-        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 );
         }
@@ -62 +70 @@
                 } // if
         }
-  
+ 
         //*** Declarations
         void CodeGenerator::visit( FunctionDecl *functionDecl ) {
@@ -104 +112 @@
 
                 if ( ! memb.empty() ) {
-                        output << endl << string( cur_indent, ' ' ) << "{" << endl;
+                        output << endl << indent << "{" << 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;
@@ -115 +123 @@
                         cur_indent -= CodeGenerator::tabsize; 
 
-                        output << string( cur_indent, ' ' ) << "}";
+                        output << indent << "}";
                 } // if
         }
@@ -138 +146 @@
 
                 if ( ! memb.empty() ) {
-                        output << endl << "{" << endl;
+                        output << " {" << endl;
 
                         cur_indent += CodeGenerator::tabsize; 
@@ -144 +152 @@
                                 ObjectDecl *obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << string( cur_indent, ' ' ) << mangleName( obj ); 
+                                output << indent << mangleName( obj ); 
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -154 +162 @@
                         cur_indent -= CodeGenerator::tabsize; 
 
-                        output << "}" << endl;
+                        output << indent << "}";
                 } // if
         }
@@ -444 +452 @@
 
                 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 );
 
@@ -454 +462 @@
                 cur_indent -= CodeGenerator::tabsize; 
 
-                output << string( cur_indent, ' ' ) << "}";
+                output << indent << "}";
         }
 
@@ -494 +502 @@
                 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";
@@ -511 +519 @@
                 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;
@@ -564 +572 @@
                 whileStmt->get_body()->accept( *this );
 
-                output << string( cur_indent, ' ' );
+                output << indent;
 
                 if ( whileStmt->get_isDoWhile() ) {
@@ -596 +604 @@
 
         void CodeGenerator::visit( NullStmt *nullStmt ) {
-                //output << string( cur_indent, ' ' ) << CodeGenerator::printLabels( nullStmt->get_labels() );
+                //output << indent << CodeGenerator::printLabels( nullStmt->get_labels() );
                 output << "/* null statement */ ;";
         }

src/CodeGen/CodeGenerator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:34:43 2015
-// Update Count     : 15
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Jun 11 13:24:23 2015
+// Update Count     : 23
 //
 
@@ -80 +80 @@
 
                 template< class Iterator > void genCommaList( Iterator begin, Iterator end );
+
+                struct Indenter {
+                        Indenter(CodeGenerator &cg) : cg(cg) {}
+                        CodeGenerator & cg;
+                        std::ostream& operator()(std::ostream & os);
+                };
           private:
+
+                Indenter indent;
                 int cur_indent;
                 bool insideFunction;