Changeset 3f7e12cb for src/CodeGen/CodeGenerator.cc

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

954908d

Parents:

78315272 (diff), e35f30a (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

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->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 << " }";
                 }
@@ -443 +446 @@
         void CodeGenerator::postvisit( UntypedExpr * untypedExpr ) {
                 extension( untypedExpr );
-                if ( NameExpr * nameExpr = dynamic_cast< NameExpr* >( untypedExpr->get_function() ) ) {
+                if ( NameExpr * nameExpr = dynamic_cast< NameExpr* >( untypedExpr->function ) ) {
                         OperatorInfo opInfo;
-                        if ( operatorLookup( nameExpr->get_name(), opInfo ) ) {
-                                std::list< Expression* >::iterator arg = untypedExpr->get_args().begin();
+                        if ( operatorLookup( nameExpr->name, opInfo ) ) {
+                                std::list< Expression* >::iterator arg = untypedExpr->args.begin();
                                 switch ( opInfo.type ) {
                                   case OT_INDEX:
-                                        assert( untypedExpr->get_args().size() == 2 );
+                                        assert( untypedExpr->args.size() == 2 );
                                         (*arg++)->accept( *visitor );
                                         output << "[";
@@ -461 +464 @@
                                   case OT_CTOR:
                                   case OT_DTOR:
-                                        if ( untypedExpr->get_args().size() == 1 ) {
+                                        if ( untypedExpr->args.size() == 1 ) {
                                                 // the expression fed into a single parameter constructor or destructor may contain side
                                                 // effects, so must still output this expression
@@ -480 +483 @@
                                                 (*arg++)->accept( *visitor );
                                                 output << opInfo.symbol << "{ ";
-                                                genCommaList( arg, untypedExpr->get_args().end() );
+                                                genCommaList( arg, untypedExpr->args.end() );
                                                 output << "}) /* " << opInfo.inputName << " */";
                                         } // if
@@ -488 +491 @@
                                   case OT_PREFIXASSIGN:
                                   case OT_LABELADDRESS:
-                                        assert( untypedExpr->get_args().size() == 1 );
+                                        assert( untypedExpr->args.size() == 1 );
                                         output << "(";
                                         output << opInfo.symbol;
@@ -497 +500 @@
                                   case OT_POSTFIX:
                                   case OT_POSTFIXASSIGN:
-                                        assert( untypedExpr->get_args().size() == 1 );
+                                        assert( untypedExpr->args.size() == 1 );
                                         (*arg)->accept( *visitor );
                                         output << opInfo.symbol;
@@ -504 +507 @@
                                   case OT_INFIX:
                                   case OT_INFIXASSIGN:
-                                        assert( untypedExpr->get_args().size() == 2 );
+                                        assert( untypedExpr->args.size() == 2 );
                                         output << "(";
                                         (*arg++)->accept( *visitor );
@@ -517 +520 @@
                                 } // switch
                         } else {
-                                if ( nameExpr->get_name() == "..." ) { // case V1 ... V2 or case V1~V2
-                                        assert( untypedExpr->get_args().size() == 2 );
-                                        (*untypedExpr->get_args().begin())->accept( *visitor );
-                                        output << " ... ";
-                                        (*--untypedExpr->get_args().end())->accept( *visitor );
-                                } else {                                                                // builtin routines
-                                        nameExpr->accept( *visitor );
-                                        output << "(";
-                                        genCommaList( untypedExpr->get_args().begin(), untypedExpr->get_args().end() );
-                                        output << ")";
-                                } // if
+                                // builtin routines
+                                nameExpr->accept( *visitor );
+                                output << "(";
+                                genCommaList( untypedExpr->args.begin(), untypedExpr->args.end() );
+                                output << ")";
                         } // if
                 } else {
-                        untypedExpr->get_function()->accept( *visitor );
+                        untypedExpr->function->accept( *visitor );
                         output << "(";
-                        genCommaList( untypedExpr->get_args().begin(), untypedExpr->get_args().end() );
+                        genCommaList( untypedExpr->args.begin(), untypedExpr->args.end() );
                         output << ")";
                 } // if
@@ -538 +535 @@
 
         void CodeGenerator::postvisit( RangeExpr * rangeExpr ) {
-                rangeExpr->get_low()->accept( *visitor );
+                rangeExpr->low->accept( *visitor );
                 output << " ... ";
-                rangeExpr->get_high()->accept( *visitor );
+                rangeExpr->high->accept( *visitor );
         }
 
@@ -546 +543 @@
                 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();
@@ -885 +885 @@
 
         void CodeGenerator::postvisit( CaseStmt * caseStmt ) {
+                updateLocation( caseStmt );
+                output << indent;
                 if ( caseStmt->isDefault()) {
                         output << "default";
@@ -947 +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 ) {
@@ -1025 +1090 @@
         }
 } // namespace CodeGen
+
+
+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: //