Changes in src/CodeGen/CodeGenerator.cc [87e08e24:d104b02]

File:

• src/CodeGen/CodeGenerator.cc (modified) (10 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"
@@ -79 +79 @@
         }
 
-        /* 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;
-                }
-                output << std::flush;
-        }
-
-        void CodeGenerator::updateLocation( BaseSyntaxNode const * to ) {
-                updateLocation( to->location );
-        }
-
-        void CodeGenerator::nextLine() {
-                if ( !lineMarks ) {
-                        output << "\n" << indent << std::flush;
+        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;
                 }
         }
@@ -205 +195 @@
                         ++indent;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
-                                updateLocation( *i );
-                                output << indent;
+                                output << lineDirective( *i ) << indent;
                                 (*i)->accept( *this );
                                 output << ";" << endl;
@@ -229 +218 @@
         void CodeGenerator::visit( EnumDecl * enumDecl ) {
                 extension( enumDecl );
-                updateLocation( enumDecl );
+                output << lineDirective ( enumDecl );
                 output << "enum ";
                 genAttributes( enumDecl->get_attributes() );
@@ -245 +234 @@
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                updateLocation( obj );
-                                output << indent << mangleName( obj );
+                                output << lineDirective( obj ) << indent << mangleName( obj );
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -264 +252 @@
         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;
@@ -753 +741 @@
         void CodeGenerator::visit( StmtExpr * stmtExpr ) {
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
-                updateLocation( stmtExpr );
-                output << "({" << std::endl;
+                output << lineDirective( stmtExpr) << "({" << std::endl;
                 ++indent;
                 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 ) {
@@ -845 +832 @@
 
         void CodeGenerator::visit( IfStmt * ifStmt ) {
-                updateLocation( ifStmt );
+                output << lineDirective( ifStmt );
                 output << "if ( ";
                 ifStmt->get_condition()->accept( *this );
@@ -859 +846 @@
 
         void CodeGenerator::visit( SwitchStmt * switchStmt ) {
-                updateLocation( switchStmt );
+                output << lineDirective( switchStmt );
                 output << "switch ( " ;
                 switchStmt->get_condition()->accept( *this );
@@ -872 +859 @@
 
         void CodeGenerator::visit( CaseStmt * caseStmt ) {
-                updateLocation( caseStmt );
+                output << lineDirective( caseStmt );
+                output << indent;
                 if ( caseStmt->isDefault()) {
                         output << "default";