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

File:

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

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tus May  9 16:50:00 2017
-// Update Count     : 484
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Mar 30 16:38:01 2017
+// Update Count     : 482
 //
 
@@ -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
@@ -141 +128 @@
 
 
-        // *** Declarations
+        //*** Declarations
         void CodeGenerator::visit( FunctionDecl * functionDecl ) {
-                output << lineDirective( functionDecl );
-
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
@@ -168 +153 @@
                 }
 
-                output << lineDirective( objectDecl );
-
                 extension( objectDecl );
                 genAttributes( objectDecl->get_attributes() );
@@ -209 +192 @@
                         cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
-                                output << lineDirective( *i ) << indent;
+                                output << indent;
                                 (*i)->accept( *this );
                                 output << ";" << endl;
@@ -221 +204 @@
 
         void CodeGenerator::visit( StructDecl * structDecl ) {
-                output << lineDirective( structDecl );
-
                 extension( structDecl );
                 handleAggregate( structDecl, "struct " );
@@ -228 +209 @@
 
         void CodeGenerator::visit( UnionDecl * unionDecl ) {
-                output << lineDirective( unionDecl );
-
                 extension( unionDecl );
                 handleAggregate( unionDecl, "union " );
@@ -236 +215 @@
         void CodeGenerator::visit( EnumDecl * enumDecl ) {
                 extension( enumDecl );
-                output << lineDirective ( enumDecl );
                 output << "enum ";
                 genAttributes( enumDecl->get_attributes() );
@@ -252 +230 @@
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << lineDirective( obj ) << indent << mangleName( obj );
+                                output << indent << mangleName( obj );
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -270 +248 @@
         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;
@@ -285 +262 @@
                         } // if
                 } else {
-                        output << typeDecl->genTypeString() << " " << typeDecl->get_name();
-                        if ( typeDecl->get_kind() != TypeDecl::Any && typeDecl->get_sized() ) {
-                                output << " | sized(" << typeDecl->get_name() << ")";
-                        }
+                        output << typeDecl->typeString() << " " << typeDecl->get_name();
                         if ( ! typeDecl->get_assertions().empty() ) {
                                 output << " | { ";
@@ -342 +316 @@
         }
 
-        // *** Expressions
+        //*** Expressions
         void CodeGenerator::visit( ApplicationExpr * applicationExpr ) {
                 extension( applicationExpr );
@@ -745 +719 @@
         void CodeGenerator::visit( StmtExpr * stmtExpr ) {
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
-                output << lineDirective( stmtExpr) << "({" << std::endl;
+                output << "({" << std::endl;
                 cur_indent += CodeGenerator::tabsize;
                 unsigned int numStmts = stmts.size();
                 unsigned int i = 0;
                 for ( Statement * stmt : stmts ) {
-                        output << lineDirective( stmt ) << indent;
-            output << printLabels( stmt->get_labels() );
+                        output << indent << printLabels( stmt->get_labels() );
                         if ( i+1 == numStmts ) {
                                 // last statement in a statement expression needs to be handled specially -
@@ -773 +746 @@
         }
 
-        // *** Statements
+        //*** Statements
         void CodeGenerator::visit( CompoundStmt * compoundStmt ) {
                 std::list<Statement*> ks = compoundStmt->get_kids();
@@ -796 +769 @@
         void CodeGenerator::visit( ExprStmt * exprStmt ) {
                 assert( exprStmt );
-                Expression * expr = exprStmt->get_expr();
-                if ( genC ) {
-                        // cast the top-level expression to void to reduce gcc warnings.
-                        expr = new CastExpr( expr );
-                }
+                // cast the top-level expression to void to reduce gcc warnings.
+                Expression * expr = new CastExpr( exprStmt->get_expr() );
                 expr->accept( *this );
                 output << ";";
@@ -837 +807 @@
 
         void CodeGenerator::visit( IfStmt * ifStmt ) {
-                output << lineDirective( ifStmt );
                 output << "if ( ";
                 ifStmt->get_condition()->accept( *this );
@@ -851 +820 @@
 
         void CodeGenerator::visit( SwitchStmt * switchStmt ) {
-                output << lineDirective( switchStmt );
                 output << "switch ( " ;
                 switchStmt->get_condition()->accept( *this );
@@ -864 +832 @@
 
         void CodeGenerator::visit( CaseStmt * caseStmt ) {
-                output << lineDirective( caseStmt );
                 output << indent;
                 if ( caseStmt->isDefault()) {