Changeset b03eed6 for src/CodeGen/CodeGenerator.cc

Timestamp:

Apr 19, 2018, 5:54:41 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

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

Children:

8633f060

Parents:

e16294d (diff), da9d79b (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/CodeGen/CodeGenerator.cc

@@ -116 +116 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ), endl( *this ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks, bool printExprTypes ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ), printExprTypes( printExprTypes ), endl( *this ) {}
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
@@ -157 +157 @@
                 node->print( ss );
                 assertf( false, "Unhandled node reached in CodeGenerator: %s", ss.str().c_str() );
+        }
+
+        // *** Expression
+        void CodeGenerator::previsit( Expression * node ) {
+                previsit( (BaseSyntaxNode *)node );
+                GuardAction( [this, node](){
+                        if ( printExprTypes ) {
+                                output << " /* " << genType( node->result, "", pretty, genC ) << " */ ";
+                        }
+                } );
         }
 
@@ -586 +596 @@
                         output << ")";
                 } // if
-                castExpr->get_arg()->accept( *visitor );
+                castExpr->arg->accept( *visitor );
+                output << ")";
+        }
+
+        void CodeGenerator::postvisit( KeywordCastExpr * castExpr ) {
+                assertf( ! genC, "KeywordCast should not reach code generation." );
+                extension( castExpr );
+                output << "((" << castExpr->targetString() << " &)";
+                castExpr->arg->accept( *visitor );
                 output << ")";
         }