Changeset 6840e7c for src/CodeGen

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

837ce06

Parents:

b96ec83 (diff), a15b72c (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' into cleanup-dtors

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (3 diffs)
• CodeGenerator.h (modified) (1 diff)
• FixNames.cc (modified) (1 diff)
• GenType.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -287 +287 @@
         void CodeGenerator::postvisit( TypeDecl * typeDecl ) {
                 assertf( ! genC, "TypeDecls should not reach code generation." );
-                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 << typeDecl->genTypeString() << " " << typeDecl->name;
+                if ( typeDecl->get_kind() != TypeDecl::Any && typeDecl->sized ) {
+                        output << " | sized(" << typeDecl->name << ")";
+                }
+                if ( ! typeDecl->assertions.empty() ) {
                         output << " | { ";
-                        genCommaList( typeDecl->get_assertions().begin(), typeDecl->get_assertions().end() );
+                        for ( DeclarationWithType * assert :  typeDecl->assertions ) {
+                                assert->accept( *visitor );
+                                output << "; ";
+                        }
                         output << " }";
                 }
@@ -946 +949 @@
                 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 ) {
@@ -1024 +1090 @@
         }
 } // namespace CodeGen
+
+
+unsigned Indenter::tabsize = 2;
 
 std::ostream & operator<<( std::ostream & out, const BaseSyntaxNode * node ) {

src/CodeGen/CodeGenerator.h

@@ -100 +100 @@
                 void postvisit( ReturnStmt * );
                 void postvisit( ThrowStmt * );
+                void postvisit( CatchStmt * );
+                void postvisit( WaitForStmt * );
                 void postvisit( WhileStmt * );
                 void postvisit( ForStmt * );

src/CodeGen/FixNames.cc

@@ -66 +66 @@
                 );
 
-                mainDecl->get_functionType()->get_parameters().push_back(
+                main_type->get_parameters().push_back(
                         new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
                 );
 
-                mainDecl->get_functionType()->get_parameters().push_back(
+                main_type->get_parameters().push_back(
                         new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0,
                         new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Char ) ) ),

src/CodeGen/GenType.cc

@@ -210 +210 @@
 
         std::string GenType::handleGeneric( ReferenceToType * refType ) {
-                if ( ! refType->get_parameters().empty() ) {
+                if ( ! refType->parameters.empty() ) {
                         std::ostringstream os;
                         PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
                         os << "(";
-                        cg.pass.genCommaList( refType->get_parameters().begin(), refType->get_parameters().end() );
+                        cg.pass.genCommaList( refType->parameters.begin(), refType->parameters.end() );
                         os << ") ";
                         return os.str();