Changes in src/CodeGen/CodeGenerator.cc [ab4bff5:2b7bf59]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -287 +287 @@
         void CodeGenerator::postvisit( TypeDecl * typeDecl ) {
                 assertf( ! genC, "TypeDecls should not reach code generation." );
-                output << typeDecl->genTypeString() << " " << typeDecl->name;
-                if ( typeDecl->get_kind() != TypeDecl::Any && typeDecl->sized ) {
-                        output << " | sized(" << typeDecl->name << ")";
-                }
-                if ( ! typeDecl->assertions.empty() ) {
+                output << typeDecl->genTypeString() << " " << typeDecl->get_name();
+                if ( typeDecl->get_kind() != TypeDecl::Any && typeDecl->get_sized() ) {
+                        output << " | sized(" << typeDecl->get_name() << ")";
+                }
+                if ( ! typeDecl->get_assertions().empty() ) {
                         output << " | { ";
-                        for ( DeclarationWithType * assert :  typeDecl->assertions ) {
-                                assert->accept( *visitor );
-                                output << "; ";
-                        }
+                        genCommaList( typeDecl->get_assertions().begin(), typeDecl->get_assertions().end() );
                         output << " }";
                 }
@@ -949 +946 @@
                 output << ";";
         }
-        void CodeGenerator::postvisit( CatchStmt * stmt ) {
-                assertf( ! genC, "Catch statements should not reach code generation." );
-
-                output << ((stmt->get_kind() == CatchStmt::Terminate) ?
-                "catch" : "catchResume");
-                output << "( ";
-                stmt->decl->accept( *visitor );
-                output << " ) ";
-
-                if( stmt->cond ) {
-                        output << "if/when(?) (";
-                        stmt->cond->accept( *visitor );
-                        output << ") ";
-                }
-                stmt->body->accept( *visitor );
-        }
-
-        void CodeGenerator::postvisit( WaitForStmt * stmt ) {
-                assertf( ! genC, "Waitfor statements should not reach code generation." );
-
-                bool first = true;
-                for( auto & clause : stmt->clauses ) {
-                        if(first) { output << "or "; first = false; }
-                        if( clause.condition ) {
-                                output << "when(";
-                                stmt->timeout.condition->accept( *visitor );
-                                output << ") ";
-                        }
-                        output << "waitfor(";
-                        clause.target.function->accept( *visitor );
-                        for( Expression * expr : clause.target.arguments ) {
-                                output << ",";
-                                expr->accept( *visitor );
-                        }
-                        output << ") ";
-                        clause.statement->accept( *visitor );
-                }
-
-                if( stmt->timeout.statement ) {
-                        output << "or ";
-                        if( stmt->timeout.condition ) {
-                                output << "when(";
-                                stmt->timeout.condition->accept( *visitor );
-                                output << ") ";
-                        }
-                        output << "timeout(";
-                        stmt->timeout.time->accept( *visitor );
-                        output << ") ";
-                        stmt->timeout.statement->accept( *visitor );
-                }
-
-                if( stmt->orelse.statement ) {
-                        output << "or ";
-                        if( stmt->orelse.condition ) {
-                                output << "when(";
-                                stmt->orelse.condition->accept( *visitor );
-                                output << ")";
-                        }
-                        output << "else ";
-                        stmt->orelse.statement->accept( *visitor );
-                }
-        }
-
 
         void CodeGenerator::postvisit( WhileStmt * whileStmt ) {
@@ -1090 +1024 @@
         }
 } // namespace CodeGen
-
-
-unsigned Indenter::tabsize = 2;
 
 std::ostream & operator<<( std::ostream & out, const BaseSyntaxNode * node ) {