Changes in src/CodeGen/CodeGenerator.cc [0dd18fd:a5f0529]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 15:34:00 2017
-// Update Count     : 488
+// Last Modified On : Tus Jul 25 15:29:00 2017
+// Update Count     : 486
 //
 #include "CodeGenerator.h"
@@ -64 +64 @@
         } // extension
 
+        ostream & CodeGenerator::Indenter::operator()( ostream & output ) const {
+          return output << string( cg.cur_indent, ' ' );
+        }
+
+        ostream & operator<<( ostream & output, const CodeGenerator::Indenter &indent ) {
+                return indent( output );
+        }
+
         CodeGenerator::LabelPrinter & CodeGenerator::LabelPrinter::operator()( std::list< Label > & l ) {
                 labels = &l;
@@ -79 +87 @@
         }
 
-        /* Using updateLocation at the beginning of a node and nextLine
-         * within a node should become the method of formating.
-         */
-        void CodeGenerator::updateLocation( CodeLocation const & to ) {
-                if ( !lineMarks ) {
-                        return;
-                } else if ( currentLocation.followedBy( to, 0 ) ) {
-                        return;
-                } else if ( currentLocation.followedBy( to, 1 ) ) {
-                        output << "\n" << indent;
-                        currentLocation.linenumber += 1;
-                } else if ( currentLocation.followedBy( to, 2 ) ) {
-                        output << "\n\n" << indent;
-                        currentLocation.linenumber += 2;
-                } else {
-                        output << "\n# " << to.linenumber << " \"" << to.filename
-                               << "\"\n" << indent;
-                        currentLocation = to;
+        CodeGenerator::LineMarker::LineMarker(
+                        CodeLocation const & loc, bool toPrint) :
+                loc(loc), toPrint(toPrint)
+        {}
+
+        CodeGenerator::LineMarker CodeGenerator::lineDirective(
+                        BaseSyntaxNode const * node) {
+                return LineMarker(node->location, lineMarks);
+        }
+
+        std::ostream & operator<<(std::ostream & out,
+                        CodeGenerator::LineMarker const & marker) {
+                if (marker.toPrint && marker.loc.isSet()) {
+                        return out << "\n# " << marker.loc.linenumber << " \""
+                                << marker.loc.filename << "\"\n";
+                } else if (marker.toPrint) {
+                        return out << "\n/* Missing CodeLocation */\n";
+                } else {
+                return out;
                 }
-                output << std::flush;
-        }
-
-        void CodeGenerator::updateLocation( BaseSyntaxNode const * to ) {
-                updateLocation( to->location );
-        }
-
-        void CodeGenerator::nextLine() {
-                if ( !lineMarks ) {
-                        output << "\n" << indent << std::flush;
-                }
-        }
-
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( CodeGenerator::tabsize ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
+        }
+
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
@@ -202 +200 @@
                         output << " {" << endl;
 
-                        ++indent;
+                        cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
-                                updateLocation( *i );
+                                output << lineDirective( *i ) << indent;
                                 (*i)->accept( *this );
                                 output << ";" << endl;
                         } // for
 
-                        --indent;
+                        cur_indent -= CodeGenerator::tabsize;
 
                         output << indent << "}";
@@ -227 +225 @@
         void CodeGenerator::visit( EnumDecl * enumDecl ) {
                 extension( enumDecl );
-                updateLocation( enumDecl );
+                output << lineDirective ( enumDecl );
                 output << "enum ";
                 genAttributes( enumDecl->get_attributes() );
@@ -239 +237 @@
                         output << " {" << endl;
 
-                        ++indent;
+                        cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                updateLocation( obj );
-                                output << mangleName( obj );
+                                output << lineDirective( obj ) << indent << mangleName( obj );
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -252 +249 @@
                         } // for
 
-                        --indent;
+                        cur_indent -= CodeGenerator::tabsize;
 
                         output << indent << "}";
@@ -262 +259 @@
         void CodeGenerator::visit( TypedefDecl * typeDecl ) {
                 assertf( ! genC, "Typedefs are removed and substituted in earlier passes." );
-                updateLocation( typeDecl );
+                output << lineDirective( typeDecl );
                 output << "typedef ";
                 output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty, genC ) << endl;
@@ -763 +760 @@
         void CodeGenerator::visit( StmtExpr * stmtExpr ) {
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
-                updateLocation( stmtExpr );
-                output << "({" << std::endl;
-                ++indent;
+                output << lineDirective( stmtExpr) << "({" << std::endl;
+                cur_indent += CodeGenerator::tabsize;
                 unsigned int numStmts = stmts.size();
                 unsigned int i = 0;
                 for ( Statement * stmt : stmts ) {
-                        updateLocation( stmt );
+                        output << lineDirective( stmt ) << indent;
             output << printLabels( stmt->get_labels() );
                         if ( i+1 == numStmts ) {
@@ -788 +784 @@
                         ++i;
                 }
-                --indent;
+                cur_indent -= CodeGenerator::tabsize;
                 output << indent << "})";
         }
@@ -797 +793 @@
                 output << "{" << endl;
 
-                ++indent;
+                cur_indent += CodeGenerator::tabsize;
 
                 for ( std::list<Statement *>::iterator i = ks.begin(); i != ks.end();  i++ ) {
@@ -808 +804 @@
                         } // if
                 } // for
-                --indent;
+                cur_indent -= CodeGenerator::tabsize;
 
                 output << indent << "}";
@@ -856 +852 @@
 
         void CodeGenerator::visit( IfStmt * ifStmt ) {
-                updateLocation( ifStmt );
+                output << lineDirective( ifStmt );
                 output << "if ( ";
                 ifStmt->get_condition()->accept( *this );
@@ -870 +866 @@
 
         void CodeGenerator::visit( SwitchStmt * switchStmt ) {
-                updateLocation( switchStmt );
+                output << lineDirective( switchStmt );
                 output << "switch ( " ;
                 switchStmt->get_condition()->accept( *this );
@@ -876 +872 @@
 
                 output << "{" << std::endl;
-                ++indent;
+                cur_indent += CodeGenerator::tabsize;
                 acceptAll( switchStmt->get_statements(), *this );
-                --indent;
+                cur_indent -= CodeGenerator::tabsize;
                 output << indent << "}";
         }
 
         void CodeGenerator::visit( CaseStmt * caseStmt ) {
-                updateLocation( caseStmt );
+                output << lineDirective( caseStmt );
+                output << indent;
                 if ( caseStmt->isDefault()) {
                         output << "default";
@@ -894 +891 @@
                 std::list<Statement *> sts = caseStmt->get_statements();
 
-                ++indent;
+                cur_indent += CodeGenerator::tabsize;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
                         output << indent << printLabels( (*i)->get_labels() )  ;
@@ -900 +897 @@
                         output << endl;
                 } // for
-                --indent;
+                cur_indent -= CodeGenerator::tabsize;
         }