Changeset 87b5bf0 for src/CodeGen

Timestamp:

Jun 29, 2016, 2:30:12 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, with_gc

Children:

e64365c

Parents:

7305915 (diff), 2fb2ad5 (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 plg2:software/cfa/cfa-cc

Location:

src/CodeGen

Files:

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

src/CodeGen/CodeGenerator.cc

@@ -48 +48 @@
         }
 
-        ostream & CodeGenerator::Indenter::operator()( ostream & output ) {
+        ostream & CodeGenerator::Indenter::operator()( ostream & output ) const {
           return output << string( cg.cur_indent, ' ' );
         }
 
-        ostream & operator<<( ostream & output, CodeGenerator::Indenter &indent ) {
+        ostream & operator<<( ostream & output, const CodeGenerator::Indenter &indent ) {
                 return indent( output );
         }
 
-        CodeGenerator::CodeGenerator( std::ostream &os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ) { }
+        CodeGenerator::LabelPrinter & CodeGenerator::LabelPrinter::operator()( std::list< Label > & l ) {
+                labels = &l;
+                return *this;
+        }
+
+        ostream & operator<<( ostream & output, CodeGenerator::LabelPrinter &printLabels ) {
+                std::list< Label > & labs = *printLabels.labels;
+                // l.unique(); // assumes a sorted list. Why not use set? Does order matter?
+                for ( Label & l : labs ) {
+                        output << l.get_name() + ": ";
+                        printLabels.cg.genAttributes( l.get_attributes() );
+                }
+                return output;
+        }
+
+        CodeGenerator::CodeGenerator( std::ostream &os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ) { }
 
         CodeGenerator::CodeGenerator( std::ostream &os, std::string init, int indentation, bool infunp )
-                        : indent( *this), cur_indent( indentation ), insideFunction( infunp ), output( os ) {
+                        : indent( *this), cur_indent( indentation ), insideFunction( infunp ), output( os ), printLabels( *this ) {
                 //output << std::string( init );
         }
 
         CodeGenerator::CodeGenerator( std::ostream &os, char *init, int indentation, bool infunp )
-                        : indent( *this ), cur_indent( indentation ), insideFunction( infunp ), output( os ) {
+                        : indent( *this ), cur_indent( indentation ), insideFunction( infunp ), output( os ), printLabels( *this ) {
                 //output << std::string( init );
         }
@@ -735 +750 @@
         void CodeGenerator::visit( ReturnStmt *returnStmt ) {
                 output << "return ";
-
-                // xxx -- check for null expression;
-                if ( returnStmt->get_expr() ) {
-                        returnStmt->get_expr()->accept( *this );
-                } // if
+                maybeAccept( returnStmt->get_expr(), *this );
                 output << ";";
         }
@@ -799 +810 @@
                         output << ";";
                 } // if
-        }
-
-        std::string CodeGenerator::printLabels( std::list< Label > &l ) {
-                std::string str( "" );
-                l.unique(); // assumes a sorted list. Why not use set?
-
-                for ( std::list< Label >::iterator i = l.begin(); i != l.end(); i++ )
-                        str += *i + ": ";
-
-                return str;
         }
 

src/CodeGen/CodeGenerator.h

@@ -94 +94 @@
                         Indenter(CodeGenerator &cg) : cg(cg) {}
                         CodeGenerator & cg;
-                        std::ostream& operator()(std::ostream & os);
+                        std::ostream& operator()(std::ostream & os) const;
+                };
+
+                struct LabelPrinter {
+                        LabelPrinter(CodeGenerator &cg) : cg(cg), labels( 0 ) {}
+                        LabelPrinter & operator()( std::list< Label > & l );
+                        CodeGenerator & cg;
+                        std::list< Label > * labels;
                 };
 
@@ -108 +115 @@
                 bool insideFunction;
                 std::ostream &output;
+                LabelPrinter printLabels;
 
                 void printDesignators( std::list< Expression * > & );
-                static std::string printLabels ( std::list < Label > & );
                 void handleStorageClass( Declaration *decl );
                 void handleAggregate( AggregateDecl *aggDecl );