Changes in src/CodeGen/CodeGenerator.cc [f975c65:29cf9c8]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May 10 14:45:00 2017
+// Last Modified On : Tus May  9 16:50:00 2017
 // Update Count     : 484
 //
@@ -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
@@ -89 +102 @@
         }
 
-        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;
-                }
-        }
-
-        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 ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ) {}
 
         CodeGenerator::CodeGenerator( std::ostream & os, std::string init, int indentation, bool infunp )
@@ -152 +143 @@
         // *** Declarations
         void CodeGenerator::visit( FunctionDecl * functionDecl ) {
+                output << lineDirective( functionDecl );
+
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
@@ -175 +168 @@
                 }
 
+                output << lineDirective( objectDecl );
+
                 extension( objectDecl );
                 genAttributes( objectDecl->get_attributes() );
@@ -226 +221 @@
 
         void CodeGenerator::visit( StructDecl * structDecl ) {
+                output << lineDirective( structDecl );
+
                 extension( structDecl );
                 handleAggregate( structDecl, "struct " );
@@ -231 +228 @@
 
         void CodeGenerator::visit( UnionDecl * unionDecl ) {
+                output << lineDirective( unionDecl );
+
                 extension( unionDecl );
                 handleAggregate( unionDecl, "union " );
@@ -709 +708 @@
         void CodeGenerator::visit( UntypedTupleExpr * tupleExpr ) {
                 assertf( ! genC, "UntypedTupleExpr should not reach code generation." );
-                extension( tupleExpr );
                 output << "[";
                 genCommaList( tupleExpr->get_exprs().begin(), tupleExpr->get_exprs().end() );
@@ -717 +715 @@
         void CodeGenerator::visit( TupleExpr * tupleExpr ) {
                 assertf( ! genC, "TupleExpr should not reach code generation." );
-                extension( tupleExpr );
                 output << "[";
                 genCommaList( tupleExpr->get_exprs().begin(), tupleExpr->get_exprs().end() );
                 output << "]";
-        }
-
-        void CodeGenerator::visit( TupleIndexExpr * tupleExpr ) {
-                assertf( ! genC, "TupleIndexExpr should not reach code generation." );
-                extension( tupleExpr );
-                tupleExpr->get_tuple()->accept( *this );
-                output << "." << tupleExpr->get_index();
         }