Changeset d22e90f for src/CodeGen/CodeGenerator.h

Timestamp:

Sep 20, 2017, 11:47:26 AM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, 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:

47b5b63

Parents:

a9a4771

git-author:

Rob Schluntz <rschlunt@…> (09/20/17 11:46:26)

git-committer:

Rob Schluntz <rschlunt@…> (09/20/17 11:47:26)

Message:

Cleanup CodeGen? and make linemarkers a bit more accurate

File:

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

src/CodeGen/CodeGenerator.h

@@ -31 +31 @@
 
                 CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false, bool lineMarks = false );
-                CodeGenerator( std::ostream &os, std::string, int indent = 0, bool infun = false );
-                CodeGenerator( std::ostream &os, char *, int indent = 0, bool infun = false );
 
                 //*** Turn off visit_children for all nodes
@@ -125 +123 @@
 
                 void updateLocation( BaseSyntaxNode const * to );
+                struct LineEnder {
+                        CodeGenerator & cg;
+                        LineEnder( CodeGenerator & cg ) : cg( cg ) {}
+                        std::ostream & operator()(std::ostream &) const;
+                };
           private:
                 Indenter indent;
-                bool insideFunction;
-                std::ostream &output;
+                std::ostream & output;
                 LabelPrinter printLabels;
                 bool pretty = false;  // pretty print
                 bool genC = false;    // true if output has to be C code
                 bool lineMarks = false;
+        public:
+                LineEnder endl;
+        private:
 
                 CodeLocation currentLocation;
                 void updateLocation( CodeLocation const & to );
-                void nextLine();
 
                 void handleStorageClass( DeclarationWithType *decl );
@@ -163 +167 @@
         /// returns C-compatible name of declaration
         std::string genName( DeclarationWithType * decl );
+
+        inline std::ostream & operator<<( std::ostream & os, const CodeGenerator::LineEnder & endl ) {
+                return endl( os );
+        }
 } // namespace CodeGen