Changeset 2b6c1e0

Timestamp:

Jun 2, 2015, 1:26:42 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

b2152e7a

Parents:

6c4ff37

Message:

more output code formatting

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (11 diffs)
• CodeGenerator.h (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jun 02 11:45:06 2015
-// Update Count     : 65
+// Last Modified On : Tue Jun 02 13:25:22 2015
+// Update Count     : 118
 //
 
@@ -36 +36 @@
 namespace CodeGen {
         int CodeGenerator::tabsize = 4;
+
+        // the kinds of statements that would ideally be separated by more whitespace
+        bool wantSpacing( Statement * stmt) {
+                return dynamic_cast< IfStmt * >( stmt ) || dynamic_cast< CompoundStmt * >( stmt ) ||
+                        dynamic_cast< WhileStmt * >( stmt ) || dynamic_cast< ForStmt * > ( stmt ) || dynamic_cast< SwitchStmt *>( stmt );
+        }
 
         CodeGenerator::CodeGenerator( std::ostream &os ) : cur_indent( 0 ), insideFunction( false ), output( os ) { }
@@ -429 +435 @@
   
         void CodeGenerator::visit( TypeExpr *typeExpr ) {}
-  
-  
+
         //*** Statements
         void CodeGenerator::visit( CompoundStmt *compoundStmt ) {
                 std::list<Statement*> ks = compoundStmt->get_kids();
-
-                output << endl << string( cur_indent, ' ' ) << "{" << endl;
-
-                cur_indent += CodeGenerator::tabsize; 
+                output << "{" << endl;
+
+                cur_indent += CodeGenerator::tabsize;
 
                 for ( std::list<Statement *>::iterator i = ks.begin(); i != ks.end();  i++) {
-                        output << string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() )  ;
+                        output << string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() );
                         (*i)->accept(*this );
+
                         output << endl;
+                        if ( wantSpacing( *i ) ) {
+                                output << endl;
+                        }
                 }
                 cur_indent -= CodeGenerator::tabsize; 
 
-                output << string( cur_indent, ' ' ) << "}" << endl;
+                output << string( cur_indent, ' ' ) << "}";
         }
 
@@ -464 +472 @@
                 output << "if (";
                 ifStmt->get_condition()->accept(*this );
-                output << ")\n";
-
-                cur_indent += CodeGenerator::tabsize;
-                output << string( cur_indent, ' ' );
+                output << ") ";
+
                 ifStmt->get_thenPart()->accept(*this );
-                cur_indent -= CodeGenerator::tabsize; 
-                output << endl;
 
                 if ( ifStmt->get_elsePart() != 0) {
-                        output << string( cur_indent, ' ' ) << " else " << endl ;
-
-                        cur_indent += CodeGenerator::tabsize; 
+                        output << " else ";
                         ifStmt->get_elsePart()->accept(*this );
-                        cur_indent -= CodeGenerator::tabsize; 
                 } // if
         }
@@ -485 +486 @@
                 output << "switch (" ;
                 switchStmt->get_condition()->accept(*this );
-                output << ")\n";
+                output << ") ";
                 
-                output << string( cur_indent, ' ' ) << "{" << std::endl;
+                output << "{" << std::endl;
                 cur_indent += CodeGenerator::tabsize;
 
@@ -494 +495 @@
                 cur_indent -= CodeGenerator::tabsize;
 
-                output << /* "\r" << */ string( cur_indent, ' ' ) << "}" << endl;
+                output << string( cur_indent, ' ' ) << "}";
         }
 
@@ -500 +501 @@
                 output << string( cur_indent, ' ' );
                 if ( caseStmt->isDefault()) 
-                        output << "default"  ;
+                        output << "default";
                 else {
-                        output << "case "  ;
+                        output << "case ";
                         caseStmt->get_condition()->accept(*this );
                 } // if
@@ -540 +541 @@
                         break;
                 }
-                output << ";" << endl;
+                output << ";";
         }
 
@@ -562 +563 @@
                         output << ")";
                 } // if
-                output << "\n";
-
-                output << string( cur_indent, ' ' ) << CodeGenerator::printLabels( whileStmt->get_body()->get_labels() );
+                output << " ";
+
+                output << CodeGenerator::printLabels( whileStmt->get_body()->get_labels() );
                 whileStmt->get_body()->accept( *this );
 
@@ -574 +575 @@
                         output << ");";
                 } // if
-
-                output << "\n";
         }
 
@@ -592 +591 @@
                 if ( forStmt->get_increment() != 0 )
                         forStmt->get_increment()->accept( *this );
-                output << ")" << endl;
+                output << ") ";
 
                 if ( forStmt->get_body() != 0 ) {
-                        output << string( cur_indent, ' ' ) << CodeGenerator::printLabels( forStmt->get_body()->get_labels() );
+                        output << CodeGenerator::printLabels( forStmt->get_body()->get_labels() );
                         forStmt->get_body()->accept( *this );
                 } // if

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jun 02 11:45:20 2015
-// Update Count     : 9
+// Last Modified On : Tue Jun 02 13:25:09 2015
+// Update Count     : 12
 //
 
@@ -32 +32 @@
                 CodeGenerator( std::ostream &os, std::string, int indent = 0, bool infun = false );
                 CodeGenerator( std::ostream &os, char *, int indent = 0, bool infun = false );
-
-                CodeGenerator( CodeGenerator & );
 
                 //*** Declaration