Changes in src/CodeGen/CodeGenerator.cc [bd06384:da9d79b]

File:

• src/CodeGen/CodeGenerator.cc (modified) (8 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 ) {
@@ -159 +159 @@
         }
 
+        // *** Expression
+        void CodeGenerator::previsit( Expression * node ) {
+                previsit( (BaseSyntaxNode *)node );
+                GuardAction( [this, node](){
+                        if ( printExprTypes ) {
+                                output << " /* " << genType( node->result, "", pretty, genC ) << " */ ";
+                        }
+                } );
+        }
+
         // *** Declarations
         void CodeGenerator::postvisit( FunctionDecl * functionDecl ) {
@@ -203 +213 @@
 
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
-                genAttributes( aggDecl->get_attributes() );
-
                 if( ! aggDecl->get_parameters().empty() && ! genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
@@ -213 +221 @@
                 }
 
-                output << kind << aggDecl->get_name();
+                output << kind;
+                genAttributes( aggDecl->get_attributes() );
+                output << aggDecl->get_name();
 
                 if ( aggDecl->has_body() ) {
@@ -298 +308 @@
                         output << " }";
                 }
+        }
+
+        void CodeGenerator::postvisit( StaticAssertDecl * assertDecl ) {
+                output << "_Static_assert(";
+                assertDecl->condition->accept( *visitor );
+                output << ", ";
+                assertDecl->message->accept( *visitor );
+                output << ")";
         }
 
@@ -578 +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 << ")";
         }
@@ -928 +954 @@
                         output << "continue";
                         break;
+                  case BranchStmt::FallThrough:
+                  case BranchStmt::FallThroughDefault:
+                        assertf( ! genC, "fallthru should not reach code generation." );
+                  output << "fallthru";
+                        break;
                 } // switch
+                // print branch target for labelled break/continue/fallthru in debug mode
+                if ( ! genC && branchStmt->get_type() != BranchStmt::Goto ) {
+                        if ( ! branchStmt->get_target().empty() ) {
+                                output << " " << branchStmt->get_target();
+                        } else if ( branchStmt->get_type() == BranchStmt::FallThrough ) {
+                                output << " default";
+                        }
+                }
                 output << ";";
         }
@@ -1106 +1145 @@
 unsigned Indenter::tabsize = 2;
 
+std::ostream & operator<<( std::ostream & out, const BaseSyntaxNode * node ) {
+        if ( node ) {
+                node->print( out );
+        } else {
+                out << "nullptr";
+        }
+        return out;
+}
+
 // Local Variables: //
 // tab-width: 4 //