Changeset 67a67af for src/CodeGen

Timestamp:

Aug 11, 2017, 10:55:14 AM (7 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:

03321e4, f196351

Parents:

3b4571b (diff), 54cd58b (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/CodeGen

Files:

• CodeGenerator.cc (modified) (13 diffs)
• CodeGenerator.h (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -64 +64 @@
         } // extension
 
-        ostream & CodeGenerator::Indenter::operator()( ostream & output ) const {
-          return output << string( cg.cur_indent, ' ' );
-        }
-
-        ostream & operator<<( ostream & output, const CodeGenerator::Indenter &indent ) {
-                return indent( output );
-        }
-
         CodeGenerator::LabelPrinter & CodeGenerator::LabelPrinter::operator()( std::list< Label > & l ) {
                 labels = &l;
@@ -109 +101 @@
         }
 
-        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, bool lineMarks ) : indent( CodeGenerator::tabsize ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
@@ -200 +192 @@
                         output << " {" << endl;
 
-                        cur_indent += CodeGenerator::tabsize;
+                        ++indent;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
                                 output << lineDirective( *i ) << indent;
@@ -207 +199 @@
                         } // for
 
-                        cur_indent -= CodeGenerator::tabsize;
+                        --indent;
 
                         output << indent << "}";
@@ -237 +229 @@
                         output << " {" << endl;
 
-                        cur_indent += CodeGenerator::tabsize;
+                        ++indent;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
@@ -249 +241 @@
                         } // for
 
-                        cur_indent -= CodeGenerator::tabsize;
+                        --indent;
 
                         output << indent << "}";
@@ -761 +753 @@
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
                 output << lineDirective( stmtExpr) << "({" << std::endl;
-                cur_indent += CodeGenerator::tabsize;
+                ++indent;
                 unsigned int numStmts = stmts.size();
                 unsigned int i = 0;
@@ -784 +776 @@
                         ++i;
                 }
-                cur_indent -= CodeGenerator::tabsize;
+                --indent;
                 output << indent << "})";
         }
@@ -793 +785 @@
                 output << "{" << endl;
 
-                cur_indent += CodeGenerator::tabsize;
+                ++indent;
 
                 for ( std::list<Statement *>::iterator i = ks.begin(); i != ks.end();  i++ ) {
@@ -804 +796 @@
                         } // if
                 } // for
-                cur_indent -= CodeGenerator::tabsize;
+                --indent;
 
                 output << indent << "}";
@@ -872 +864 @@
 
                 output << "{" << std::endl;
-                cur_indent += CodeGenerator::tabsize;
+                ++indent;
                 acceptAll( switchStmt->get_statements(), *this );
-                cur_indent -= CodeGenerator::tabsize;
+                --indent;
                 output << indent << "}";
         }
@@ -891 +883 @@
                 std::list<Statement *> sts = caseStmt->get_statements();
 
-                cur_indent += CodeGenerator::tabsize;
+                ++indent;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
                         output << indent << printLabels( (*i)->get_labels() )  ;
@@ -897 +889 @@
                         output << endl;
                 } // for
-                cur_indent -= CodeGenerator::tabsize;
+                --indent;
         }
 

src/CodeGen/CodeGenerator.h

@@ -23 +23 @@
 #include "SynTree/Visitor.h"      // for Visitor
 #include "SynTree/SynTree.h"      // for Visitor Nodes
+
+#include "Common/Indenter.h"      // for Indenter
 
 namespace CodeGen {
@@ -100 +102 @@
                 template< class Iterator > void genCommaList( Iterator begin, Iterator end );
 
-                struct Indenter {
-                        Indenter(CodeGenerator &cg) : cg(cg) {}
-                        CodeGenerator & cg;
-                        std::ostream& operator()(std::ostream & os) const;
-                };
-
                 struct LabelPrinter {
                         LabelPrinter(CodeGenerator &cg) : cg(cg), labels( 0 ) {}
@@ -128 +124 @@
           private:
                 Indenter indent;
-                int cur_indent;
                 bool insideFunction;
                 std::ostream &output;