Changeset 8135d4c for src/CodeGen

Timestamp:

Aug 22, 2017, 7:31:52 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9aaac6e9

Parents:

fc56cdbf (diff), b3d413b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into references

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (10 diffs)
• CodeGenerator.h (modified) (5 diffs)
• Generate.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 : Tus Jul 25 15:29:00 2017
-// Update Count     : 486
+// Last Modified On : Fri Aug 18 15:34:00 2017
+// Update Count     : 488
 //
 #include "CodeGenerator.h"
@@ -79 +79 @@
         }
 
-        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;
+        /* 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;
                 }
         }
@@ -195 +205 @@
                         ++indent;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
-                                output << lineDirective( *i ) << indent;
+                                updateLocation( *i );
                                 (*i)->accept( *this );
                                 output << ";" << endl;
@@ -218 +228 @@
         void CodeGenerator::visit( EnumDecl * enumDecl ) {
                 extension( enumDecl );
-                output << lineDirective ( enumDecl );
+                updateLocation( enumDecl );
                 output << "enum ";
                 genAttributes( enumDecl->get_attributes() );
@@ -234 +244 @@
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << lineDirective( obj ) << indent << mangleName( obj );
+                                updateLocation( obj );
+                                output << mangleName( obj );
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -252 +263 @@
         void CodeGenerator::visit( TypedefDecl * typeDecl ) {
                 assertf( ! genC, "Typedefs are removed and substituted in earlier passes." );
-                output << lineDirective( typeDecl );
+                updateLocation( typeDecl );
                 output << "typedef ";
                 output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty, genC ) << endl;
@@ -741 +752 @@
         void CodeGenerator::visit( StmtExpr * stmtExpr ) {
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
-                output << lineDirective( stmtExpr) << "({" << std::endl;
+                updateLocation( stmtExpr );
+                output << "({" << std::endl;
                 ++indent;
                 unsigned int numStmts = stmts.size();
                 unsigned int i = 0;
                 for ( Statement * stmt : stmts ) {
-                        output << lineDirective( stmt ) << indent;
+                        updateLocation( stmt );
                         output << printLabels( stmt->get_labels() );
                         if ( i+1 == numStmts ) {
@@ -832 +844 @@
 
         void CodeGenerator::visit( IfStmt * ifStmt ) {
-                output << lineDirective( ifStmt );
+                updateLocation( ifStmt );
                 output << "if ( ";
                 ifStmt->get_condition()->accept( *this );
@@ -846 +858 @@
 
         void CodeGenerator::visit( SwitchStmt * switchStmt ) {
-                output << lineDirective( switchStmt );
+                updateLocation( switchStmt );
                 output << "switch ( " ;
                 switchStmt->get_condition()->accept( *this );
@@ -859 +871 @@
 
         void CodeGenerator::visit( CaseStmt * caseStmt ) {
-                output << lineDirective( caseStmt );
-                output << indent;
+                updateLocation( caseStmt );
                 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 : Tus Jul 25 25:30:00 2017
-// Update Count     : 54
+// Last Modified On : Fri Aug 18 15:40:00 2017
+// Update Count     : 56
 //
 
@@ -21 +21 @@
 
 #include "Common/Indenter.h"      // for Indenter
-
 #include "SynTree/Declaration.h"  // for DeclarationWithType (ptr only), Fun...
 #include "SynTree/Visitor.h"      // for Visitor
 #include "SynTree/SynTree.h"      // for Visitor Nodes
-
-#include "Common/Indenter.h"      // for Indenter
 
 namespace CodeGen {
@@ -113 +110 @@
                 };
 
-                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;
@@ -134 +124 @@
                 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 );
@@ -160 +154 @@
         /// 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 : Wed May 19 13:05:00 2017
-// Update Count     : 6
+// Last Modified On : Fri Aug 18 15:39:00 2017
+// Update Count     : 7
 //
 #include "Generate.h"
@@ -33 +33 @@
                 for ( auto & dcl : translationUnit ) {
                         if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
-                                os << cgv.lineDirective(dcl);
+                                cgv.updateLocation( dcl );
                                 dcl->accept(cgv);
                                 if ( doSemicolon( dcl ) ) {