Changeset f7cb0bc

Timestamp:

Jun 30, 2017, 4:59:54 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

a5de33e, b1e63ac5

Parents:

435e75f

git-author:

Rob Schluntz <rschlunt@…> (06/30/17 16:55:23)

git-committer:

Rob Schluntz <rschlunt@…> (06/30/17 16:59:54)

Message:

refactor indenter from CodeGen? and CurrentObject?

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (13 diffs)
• CodeGen/CodeGenerator.h (modified) (3 diffs)
• Common/Indenter.h (added)
• ResolvExpr/CurrentObject.cc (modified) (2 diffs)
• ResolvExpr/CurrentObject.h (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -66 +66 @@
         } // 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;
@@ -111 +103 @@
         }
 
-        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 ) {
@@ -202 +194 @@
                         output << " {" << endl;
 
-                        cur_indent += CodeGenerator::tabsize;
+                        ++indent;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
                                 output << lineDirective( *i ) << indent;
@@ -209 +201 @@
                         } // for
 
-                        cur_indent -= CodeGenerator::tabsize;
+                        --indent;
 
                         output << indent << "}";
@@ -239 +231 @@
                         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 );
@@ -251 +243 @@
                         } // for
 
-                        cur_indent -= CodeGenerator::tabsize;
+                        --indent;
 
                         output << indent << "}";
@@ -755 +747 @@
                 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;
@@ -778 +770 @@
                         ++i;
                 }
-                cur_indent -= CodeGenerator::tabsize;
+                --indent;
                 output << indent << "})";
         }
@@ -787 +779 @@
                 output << "{" << endl;
 
-                cur_indent += CodeGenerator::tabsize;
+                ++indent;
 
                 for ( std::list<Statement *>::iterator i = ks.begin(); i != ks.end();  i++ ) {
@@ -798 +790 @@
                         } // if
                 } // for
-                cur_indent -= CodeGenerator::tabsize;
+                --indent;
 
                 output << indent << "}";
@@ -866 +858 @@
 
                 output << "{" << std::endl;
-                cur_indent += CodeGenerator::tabsize;
+                ++indent;
                 acceptAll( switchStmt->get_statements(), *this );
-                cur_indent -= CodeGenerator::tabsize;
+                --indent;
                 output << indent << "}";
         }
@@ -885 +877 @@
                 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() )  ;
@@ -891 +883 @@
                         output << endl;
                 } // for
-                cur_indent -= CodeGenerator::tabsize;
+                --indent;
         }
 

src/CodeGen/CodeGenerator.h

@@ -25 +25 @@
 #include "SymTab/Indexer.h"
 
+#include "Common/Indenter.h"
 #include "Common/utility.h"
 
@@ -102 +103 @@
                 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 ) {}
@@ -130 +125 @@
           private:
                 Indenter indent;
-                int cur_indent;
                 bool insideFunction;
                 std::ostream &output;

src/ResolvExpr/CurrentObject.cc

@@ -19 +19 @@
 #include "CurrentObject.h"
 
+#include "Common/Indenter.h"
+
 #include "SynTree/Declaration.h"
 #include "SynTree/Initializer.h"
@@ -45 +47 @@
                         assertf( false, "unhandled type on getConstValue %s", toString( constExpr->get_result() ).c_str() ); // xxx - might be semantic error
                 }
-        }
-
-        struct Indenter {
-                static const int amt = 2;
-                unsigned int indent = 0;
-
-                Indenter & operator+=(int nlevels) { indent += amt*nlevels; return *this; }
-                Indenter & operator-=(int nlevels) { indent -= amt*nlevels; return *this; }
-                Indenter operator+(int nlevels) { Indenter indenter = *this; return indenter += nlevels; }
-                Indenter operator-(int nlevels) { Indenter indenter = *this; return indenter -= nlevels; }
-                Indenter & operator++() { return *this += 1; }
-                Indenter & operator--() { return *this -= 1; }
-        };
-        std::ostream & operator<<( std::ostream & out, Indenter & indent ) {
-                return out << std::string(indent.indent, ' ');
         }
 

src/ResolvExpr/CurrentObject.h

@@ -25 +25 @@
         class MemberIterator;
 
+        // TODO: memory management of MemberIterators
         class CurrentObject {
         public: