Changeset 6e49f18 for src/CodeGen

Timestamp:

Sep 27, 2017, 11:11:30 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:

f802e46

Parents:

a6c5d7c (diff), fa16264 (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

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (2 diffs)
• CodeGenerator.h (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -540 +540 @@
                 extension( nameExpr );
                 OperatorInfo opInfo;
-                if ( operatorLookup( nameExpr->get_name(), opInfo ) ) {
-                        assert( opInfo.type == OT_CONSTANT );
-                        output << opInfo.symbol;
+                if ( operatorLookup( nameExpr->name, opInfo ) ) {
+                        if ( opInfo.type == OT_CONSTANT ) {
+                                output << opInfo.symbol;
+                        } else {
+                                output << opInfo.outputName;
+                        }
                 } else {
                         output << nameExpr->get_name();
@@ -943 +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 ) {

src/CodeGen/CodeGenerator.h

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