Changes in src/CodeGen/CodeGenerator.h [e04ef3a:888cbe4]

File:

• src/CodeGen/CodeGenerator.h (modified) (7 diffs)

src/CodeGen/CodeGenerator.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CodeGenerator.h -- 
+// CodeGenerator.h --
 //
 // Author           : Richard C. Bilson
@@ -60 +60 @@
                 virtual void visit( MemberExpr *memberExpr );
                 virtual void visit( VariableExpr *variableExpr );
-                virtual void visit( ConstantExpr *constantExpr ); 
+                virtual void visit( ConstantExpr *constantExpr );
                 virtual void visit( SizeofExpr *sizeofExpr );
                 virtual void visit( AlignofExpr *alignofExpr );
@@ -85 +85 @@
                 virtual void visit( ForStmt * );
                 virtual void visit( NullStmt * );
-                virtual void visit( DeclStmt * ); 
+                virtual void visit( DeclStmt * );
+
+                void genAttributes( std::list< Attribute * > & attributes );
 
                 template< class Iterator > void genCommaList( Iterator begin, Iterator end );
@@ -92 +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;
                 };
 
@@ -106 +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 );
@@ -114 +123 @@
 
         };
-        
+
         template< class Iterator >
         void CodeGenerator::genCommaList( Iterator begin, Iterator end ) {
@@ -125 +134 @@
                 } // for
         }
-  
+
         inline bool doSemicolon( Declaration* decl ) {
                 if ( FunctionDecl* func = dynamic_cast< FunctionDecl* >( decl ) ) {