Changeset 1ed33fed for src/CodeGen/CodeGenerator.h

Timestamp:

May 11, 2017, 2:49:34 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

3476a0d

Parents:

6ac2ada (diff), 6a4f3d4 (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

File:

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

src/CodeGen/CodeGenerator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  1 16:20:04 2017
-// Update Count     : 50
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May 10 10:57:00 2017
+// Update Count     : 51
 //
 
@@ -25 +25 @@
 #include "SymTab/Indexer.h"
 
+#include "Common/utility.h"
+
 namespace CodeGen {
         class CodeGenerator : public Visitor {
@@ -30 +32 @@
                 static int tabsize;
 
-                CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false );
+                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 );
@@ -74 +76 @@
                 virtual void visit( UntypedTupleExpr *tupleExpr );
                 virtual void visit( TupleExpr *tupleExpr );
+                virtual void visit( TupleIndexExpr * tupleExpr );
                 virtual void visit( TypeExpr *typeExpr );
                 virtual void visit( AsmExpr * );
@@ -110 +113 @@
                 };
 
+                struct LineMarker {
+                        CodeLocation const & loc;
+                        bool toPrint;
+
+                        LineMarker(CodeLocation const & loc, bool toPrint);
+                };
+
+                LineMarker lineDirective(BaseSyntaxNode const * node);
+
                 void asmName( DeclarationWithType *decl );
 
@@ -122 +134 @@
                 bool pretty = false;  // pretty print
                 bool genC = false;    // true if output has to be C code
+                bool lineMarks = false;
 
                 void printDesignators( std::list< Expression * > & );
@@ -149 +162 @@
         /// returns C-compatible name of declaration
         std::string genName( DeclarationWithType * decl );
+
+        std::ostream & operator<<(std::ostream &,
+                CodeGenerator::LineMarker const &);
 } // namespace CodeGen