Changes in src/CodeGen/CodeGenerator.cc [5ea7a22:d67cdb7]

File:

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

src/CodeGen/CodeGenerator.cc

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