Changeset 937e51d for src/CodeGen/CodeGenerator.h

Timestamp:

Jun 26, 2015, 4:00:26 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

0df292b, e0ff3e6

Parents:

eb50842 (diff), 1869adf (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 pointer to pointer to qualified fix into master

File:

• src/CodeGen/CodeGenerator.h (moved) (moved from src/CodeGen/CodeGenerator2.h ) (6 diffs)

src/CodeGen/CodeGenerator.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CodeGenerator2.h -- 
+// CodeGenerator.h -- 
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 23:35:37 2015
-// Update Count     : 2
+// Last Modified By : Rob Schluntz
+// Last Modified On : Thu Jun 11 13:24:23 2015
+// Update Count     : 23
 //
 
@@ -17 +17 @@
 #define CODEGENV_H
 
-#include <strstream>
 #include <list>
 
@@ -25 +24 @@
 
 namespace CodeGen {
-        class CodeGenerator2 : public Visitor {
+        class CodeGenerator : public Visitor {
           public:
                 static int tabsize;
 
-                CodeGenerator2( std::ostream &os );
-                CodeGenerator2( std::ostream &os, std::string, int indent = 0, bool infun = false );
-                CodeGenerator2( std::ostream &os, char *, int indent = 0, bool infun = false );
-
-                CodeGenerator2( CodeGenerator2 & );
+                CodeGenerator( std::ostream &os );
+                CodeGenerator( std::ostream &os, std::string, int indent = 0, bool infun = false );
+                CodeGenerator( std::ostream &os, char *, int indent = 0, bool infun = false );
 
                 //*** Declaration
@@ -82 +79 @@
                 virtual void visit( DeclStmt * ); 
 
-                std::string get_string( void );
-                void add_string_left( std::string s ) { before << s; }
-                void shift_left();
                 template< class Iterator > void genCommaList( Iterator begin, Iterator end );
+
+                struct Indenter {
+                        Indenter(CodeGenerator &cg) : cg(cg) {}
+                        CodeGenerator & cg;
+                        std::ostream& operator()(std::ostream & os);
+                };
           private:
+
+                Indenter indent;
                 int cur_indent;
                 bool insideFunction;
-                std::ostream &before;
-                std::string after;
+                std::ostream &output;
 
                 static std::string printLabels ( std::list < Label > & );
@@ -100 +101 @@
         
         template< class Iterator >
-        void CodeGenerator2::genCommaList( Iterator begin, Iterator end ) {
+        void CodeGenerator::genCommaList( Iterator begin, Iterator end ) {
                 if ( begin == end ) return;
 
@@ -106 +107 @@
                         (*begin++)->accept( *this );
                         if ( begin == end ) return;
-                        before << ", ";
+                        output << ", ";
                 } // for
         }