Changeset 66ef082

Timestamp:

May 9, 2017, 4:25:20 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

0961bf4

Parents:

19801aa (diff), 6e300d9 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (14 diffs)
• CodeGen/LineStream.cc (modified) (4 diffs)
• CodeGen/LineStream.h (modified) (3 diffs)
• main.cc (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 30 16:38:01 2017
-// Update Count     : 482
+// Last Modified By : Andrew Beach
+// Last Modified On : Tus May  9 14:32:00 2017
+// Update Count     : 483
 //
 
@@ -41 +41 @@
 namespace CodeGen {
         int CodeGenerator::tabsize = 4;
+
+        // Pseudo Function: output << lineDirective(*currentNode);
+    struct lineDirective {
+        CodeLocation const & loc;
+                lineDirective(CodeLocation const & location) : loc(location) {}
+                lineDirective(BaseSyntaxNode const * node) : loc(node->location) {}
+        };
+        std::ostream & operator<<(std::ostream & out, lineDirective const & ld) {
+                if (ld.loc.isSet())
+                        return out << "\n# " << ld.loc.linenumber << " \""
+                                << ld.loc.filename << "\"\n";
+                return out << "\n// Unset Location\n";
+        }
 
         // the kinds of statements that would ideally be followed by whitespace
@@ -128 +141 @@
 
 
-        //*** Declarations
+        // *** Declarations
         void CodeGenerator::visit( FunctionDecl * functionDecl ) {
                 extension( functionDecl );
@@ -182 +195 @@
                 }
 
-                output << kind;
+                output << lineDirective( aggDecl ) << kind;
                 if ( aggDecl->get_name() != "" )
                         output << aggDecl->get_name();
@@ -192 +205 @@
                         cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
-                                output << indent;
+                                output << lineDirective( *i ) << indent;
                                 (*i)->accept( *this );
                                 output << ";" << endl;
@@ -215 +228 @@
         void CodeGenerator::visit( EnumDecl * enumDecl ) {
                 extension( enumDecl );
+                output << lineDirective ( enumDecl );
                 output << "enum ";
                 genAttributes( enumDecl->get_attributes() );
@@ -230 +244 @@
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << indent << mangleName( obj );
+                                output << lineDirective( obj ) << indent << mangleName( obj );
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -248 +262 @@
         void CodeGenerator::visit( TypedefDecl * typeDecl ) {
                 assertf( ! genC, "Typedefs are removed and substituted in earlier passes." );
+                output << lineDirective( typeDecl );
                 output << "typedef ";
                 output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty, genC ) << endl;
@@ -319 +334 @@
         }
 
-        //*** Expressions
+        // *** Expressions
         void CodeGenerator::visit( ApplicationExpr * applicationExpr ) {
                 extension( applicationExpr );
@@ -722 +737 @@
         void CodeGenerator::visit( StmtExpr * stmtExpr ) {
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
-                output << "({" << std::endl;
+                output << lineDirective( stmtExpr) << "({" << std::endl;
                 cur_indent += CodeGenerator::tabsize;
                 unsigned int numStmts = stmts.size();
                 unsigned int i = 0;
                 for ( Statement * stmt : stmts ) {
-                        output << indent << printLabels( stmt->get_labels() );
+                        output << lineDirective( stmt ) << indent;
+            output << printLabels( stmt->get_labels() );
                         if ( i+1 == numStmts ) {
                                 // last statement in a statement expression needs to be handled specially -
@@ -749 +765 @@
         }
 
-        //*** Statements
+        // *** Statements
         void CodeGenerator::visit( CompoundStmt * compoundStmt ) {
                 std::list<Statement*> ks = compoundStmt->get_kids();
@@ -813 +829 @@
 
         void CodeGenerator::visit( IfStmt * ifStmt ) {
+                output << lineDirective( ifStmt );
                 output << "if ( ";
                 ifStmt->get_condition()->accept( *this );
@@ -826 +843 @@
 
         void CodeGenerator::visit( SwitchStmt * switchStmt ) {
+                output << lineDirective( switchStmt );
                 output << "switch ( " ;
                 switchStmt->get_condition()->accept( *this );
@@ -838 +856 @@
 
         void CodeGenerator::visit( CaseStmt * caseStmt ) {
+                output << lineDirective( caseStmt );
                 output << indent;
                 if ( caseStmt->isDefault()) {

src/CodeGen/LineStream.cc

@@ -10 +10 @@
 // Created On       : Thr May 4 13:15:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri May 5 14:29:00 2017
+// Last Modified On : Mon May 8 12:08:00 2017
 // Update Count     : 0
 //
@@ -17 +17 @@
 
 namespace CodeGen {
-
-        LineStream::LineStream(std::ostream & baseStream, bool insertLines) :
-                baseStream(baseStream), insertLines(insertLines)
-        {}
 
         void LineStream::printLineDirective(CodeLocation const & location) {
@@ -44 +40 @@
                 actualLocation.unset();
 
-                if (addNewLine) {
+                if (addNewline) {
                         expectedLocation.linenumber += 1;
                         buffer.put('\n');
@@ -79 +75 @@
 
         LineStream & LineStream::operator<<(StreamFlag flag) {
-                static StringFlag const endlCopy = std::endl;
+                static StreamFlag const endlCopy = std::endl;
                 if (!insertLines) {
                         baseStream << flag;

src/CodeGen/LineStream.h

@@ -10 +10 @@
 // Created On       : Wed May 4 09:15:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri May 5 14:29:00 2017
+// Last Modified On : Mon May 8 14:03:00 2017
 // Update Count     : 1
 //
@@ -25 +25 @@
 namespace CodeGen {
 
-        class LineStream : public std::ostream {
+        class LineStream {
                 std::ostream & baseStream;
                 std::ostringstream buffer;
@@ -49 +49 @@
 
                 /// Formated output is buffered until flushed.
-                std::ostream & operator<<(char const *str);
-                std::ostream & operator<<(std::string str);
-                std::ostream & operator<<(StreamFlag flag);
+                LineStream & operator<<(char const *str);
+                LineStream & operator<<(std::string const & str);
+                LineStream & operator<<(StreamFlag flag);
+
+                /// Flush all buffered output.
+                LineStream & flush();
 
         }; // LineStream

src/main.cc

@@ -37 +37 @@
 #include "CodeGen/FixMain.h"
 #include "CodeTools/DeclStats.h"
+#include "CodeTools/TrackLoc.h"
 #include "ControlStruct/Mutate.h"
 #include "SymTab/Validate.h"
@@ -308 +309 @@
                 } // if
 
+                CodeTools::fillLocations( translationUnit );
                 CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true );