Changes in / [5916272:4cc585b]

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (10 diffs)
• CodeGen/CodeGenerator.h (modified) (4 diffs)
• CodeGen/Generate.cc (modified) (2 diffs)
• ControlStruct/ForExprMutator.cc (modified) (2 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;
                 }
         }
@@ -204 +194 @@
                         ++indent;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
-                                updateLocation( *i );
+                                output << lineDirective( *i ) << indent;
                                 (*i)->accept( *this );
                                 output << ";" << endl;
@@ -227 +217 @@
         void CodeGenerator::visit( EnumDecl * enumDecl ) {
                 extension( enumDecl );
-                updateLocation( enumDecl );
+                output << lineDirective ( enumDecl );
                 output << "enum ";
                 genAttributes( enumDecl->get_attributes() );
@@ -243 +233 @@
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                updateLocation( obj );
-                                output << mangleName( obj );
+                                output << lineDirective( obj ) << indent << mangleName( obj );
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -262 +251 @@
         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 +752 @@
         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 ) {
@@ -856 +844 @@
 
         void CodeGenerator::visit( IfStmt * ifStmt ) {
-                updateLocation( ifStmt );
+                output << lineDirective( ifStmt );
                 output << "if ( ";
                 ifStmt->get_condition()->accept( *this );
@@ -870 +858 @@
 
         void CodeGenerator::visit( SwitchStmt * switchStmt ) {
-                updateLocation( switchStmt );
+                output << lineDirective( switchStmt );
                 output << "switch ( " ;
                 switchStmt->get_condition()->accept( *this );
@@ -883 +871 @@
 
         void CodeGenerator::visit( CaseStmt * caseStmt ) {
-                updateLocation( caseStmt );
+                output << lineDirective( caseStmt );
+                output << indent;
                 if ( caseStmt->isDefault()) {
                         output << "default";

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 15:40:00 2017
-// Update Count     : 56
+// Last Modified On : Tus Jul 25 25:30:00 2017
+// Update Count     : 54
 //
 
@@ -108 +108 @@
                 };
 
+                struct LineMarker {
+                        CodeLocation const & loc;
+                        bool toPrint;
+
+                        LineMarker(CodeLocation const & loc, bool toPrint);
+                };
+
+                LineMarker lineDirective(BaseSyntaxNode const * node);
+
                 void asmName( DeclarationWithType *decl );
 
                 void extension( Expression *expr );
                 void extension( Declaration *decl );
-
-                void updateLocation( BaseSyntaxNode const * to );
           private:
                 Indenter indent;
@@ -122 +129 @@
                 bool genC = false;    // true if output has to be C code
                 bool lineMarks = false;
-
-                CodeLocation currentLocation;
-                void updateLocation( CodeLocation const & to );
-                void nextLine();
 
                 void handleStorageClass( DeclarationWithType *decl );
@@ -152 +155 @@
         /// returns C-compatible name of declaration
         std::string genName( DeclarationWithType * decl );
+
+        std::ostream & operator<<(std::ostream &,
+                CodeGenerator::LineMarker const &);
 } // namespace CodeGen
 

src/CodeGen/Generate.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 15:39:00 2017
-// Update Count     : 7
+// Last Modified On : Wed May 19 13:05:00 2017
+// Update Count     : 6
 //
 #include "Generate.h"
@@ -33 +33 @@
                 for ( auto & dcl : translationUnit ) {
                         if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
-                                cgv.updateLocation( dcl );
+                                os << cgv.lineDirective(dcl);
                                 dcl->accept(cgv);
                                 if ( doSemicolon( dcl ) ) {

src/ControlStruct/ForExprMutator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 10:22:00 2017
-// Update Count     : 12
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 17 15:32:46 2017
+// Update Count     : 11
 //
 
@@ -21 +21 @@
 
 namespace ControlStruct {
-        Statement *hoist( Statement *originalStmt, std::list<Statement *> &init ) {
-                // If no hoisting is needed, skip:
-                if ( 0 == init.size() ) {
-                        return originalStmt;
-                }
+        Statement *ForExprMutator::postmutate( IfStmt *ifStmt ) {
+                std::list<Statement *> &init = ifStmt->get_initialization();
+                if ( init.size() == 0 ) {
+                        return ifStmt;
+                } // if
 
-                // Create compound statement, move initializers outside,
-                // the resut of the original stays as is.
+                // create compound statement, move initializers outside, leave _for_ as-is
                 CompoundStmt *block = new CompoundStmt( std::list< Label >() );
                 std::list<Statement *> &stmts = block->get_kids();
                 stmts.splice( stmts.end(), init );
 
-                // Add for to the new block.
-                stmts.push_back( originalStmt );
+                // add for to the new block
+                stmts.push_back( ifStmt );
                 return block;
         }
 
-        Statement *ForExprMutator::postmutate( IfStmt *ifStmt ) {
-                return hoist( ifStmt, ifStmt->initialization );
-        }
         Statement *ForExprMutator::postmutate( ForStmt *forStmt ) {
                 // hoist any initializer declarations to make them C89 (rather than C99)
-                return hoist( forStmt, forStmt->initialization );
+                std::list<Statement *> &init = forStmt->get_initialization();
+                if ( init.size() == 0 ) {
+                        return forStmt;
+                } // if
+
+                // create compound statement, move initializers outside, leave _for_ as-is
+                CompoundStmt *block = new CompoundStmt( std::list< Label >() );
+                std::list<Statement *> &stmts = block->get_kids();
+                stmts.splice( stmts.end(), init );
+
+                // add for to the new block
+                stmts.push_back( forStmt );
+                return block;
         }
 } // namespace ControlStruct