Changes in src/CodeGen/CodeGenerator.cc [0dd18fd:d104b02]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug 18 15:34:00 2017
-// Update Count     : 488
+// Last Modified On : Tus Jul 25 15:29:00 2017
+// Update Count     : 486
 //
 #include "CodeGenerator.h"
@@ -79 +79 @@
         }
 
-        /* Using updateLocation at the beginning of a node and nextLine
-         * within a node should become the method of formating.
-         */
-        void CodeGenerator::updateLocation( CodeLocation const & to ) {
-                if ( !lineMarks ) {
-                        return;
-                } else if ( currentLocation.followedBy( to, 0 ) ) {
-                        return;
-                } else if ( currentLocation.followedBy( to, 1 ) ) {
-                        output << "\n" << indent;
-                        currentLocation.linenumber += 1;
-                } else if ( currentLocation.followedBy( to, 2 ) ) {
-                        output << "\n\n" << indent;
-                        currentLocation.linenumber += 2;
-                } else {
-                        output << "\n# " << to.linenumber << " \"" << to.filename
-                               << "\"\n" << indent;
-                        currentLocation = to;
-                }
-                output << std::flush;
-        }
-
-        void CodeGenerator::updateLocation( BaseSyntaxNode const * to ) {
-                updateLocation( to->location );
-        }
-
-        void CodeGenerator::nextLine() {
-                if ( !lineMarks ) {
-                        output << "\n" << indent << std::flush;
+        CodeGenerator::LineMarker::LineMarker(
+                        CodeLocation const & loc, bool toPrint) :
+                loc(loc), toPrint(toPrint)
+        {}
+
+        CodeGenerator::LineMarker CodeGenerator::lineDirective(
+                        BaseSyntaxNode const * node) {
+                return LineMarker(node->location, lineMarks);
+        }
+
+        std::ostream & operator<<(std::ostream & out,
+                        CodeGenerator::LineMarker const & marker) {
+                if (marker.toPrint && marker.loc.isSet()) {
+                        return out << "\n# " << marker.loc.linenumber << " \""
+                                << marker.loc.filename << "\"\n";
+                } else if (marker.toPrint) {
+                        return out << "\n/* Missing CodeLocation */\n";
+                } else {
+                return out;
                 }
         }
@@ -192 +182 @@
                         genCommaList( aggDecl->get_parameters().begin(), aggDecl->get_parameters().end() );
                         output << ")" << endl;
+                        output << indent;
                 }
 
@@ -204 +195 @@
                         ++indent;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
-                                updateLocation( *i );
+                                output << lineDirective( *i ) << indent;
                                 (*i)->accept( *this );
                                 output << ";" << endl;
@@ -227 +218 @@
         void CodeGenerator::visit( EnumDecl * enumDecl ) {
                 extension( enumDecl );
-                updateLocation( enumDecl );
+                output << lineDirective ( enumDecl );
                 output << "enum ";
                 genAttributes( enumDecl->get_attributes() );
@@ -243 +234 @@
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                updateLocation( obj );
-                                output << mangleName( obj );
+                                output << lineDirective( obj ) << indent << mangleName( obj );
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -262 +252 @@
         void CodeGenerator::visit( TypedefDecl * typeDecl ) {
                 assertf( ! genC, "Typedefs are removed and substituted in earlier passes." );
-                updateLocation( typeDecl );
+                output << lineDirective( typeDecl );
                 output << "typedef ";
                 output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty, genC ) << endl;
@@ -332 +322 @@
         void CodeGenerator::visit( __attribute__((unused)) ConstructorInit * init ){
                 assertf( ! genC, "ConstructorInit nodes should not reach code generation." );
-                // xxx - generate something reasonable for constructor/destructor pairs
-                output << "<ctorinit>";
+                // pseudo-output for constructor/destructor pairs
+                output << "<ctorinit>{" << std::endl << ++indent << "ctor: ";
+                maybeAccept( init->get_ctor(), *this );
+                output << ", " << std::endl << indent << "dtor: ";
+                maybeAccept( init->get_dtor(), *this );
+                output << std::endl << --indent << "}";
         }
 
@@ -347 +341 @@
                         if ( varExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic && operatorLookup( varExpr->get_var()->get_name(), opInfo ) ) {
                                 std::list< Expression* >::iterator arg = applicationExpr->get_args().begin();
-                                switch ( opInfo.type ) {
-                                  case OT_PREFIXASSIGN:
-                                  case OT_POSTFIXASSIGN:
-                                  case OT_INFIXASSIGN:
-                                  case OT_CTOR:
-                                  case OT_DTOR:
-                                        {
-                                                assert( arg != applicationExpr->get_args().end() );
-                                                if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( *arg ) ) {
-                                                        // remove & from first assignment/ctor argument
-                                                        *arg = addrExpr->get_arg();
-                                                } else {
-                                                        // no address-of operator, so must be a pointer - add dereference
-                                                        // NOTE: if the assertion starts to trigger, check that the application expr isn't being shared.
-                                                        // Since its arguments are modified here, this assertion most commonly triggers when the application
-                                                        // is visited multiple times.
-                                                        UntypedExpr * newExpr = new UntypedExpr( new NameExpr( "*?" ) );
-                                                        newExpr->get_args().push_back( *arg );
-                                                        Type * type = InitTweak::getPointerBase( (*arg)->get_result() );
-                                                        assertf( type, "First argument to a derefence must be a pointer. Ensure that expressions are not being shared." );
-                                                        newExpr->set_result( type->clone() );
-                                                        *arg = newExpr;
-                                                } // if
-                                                break;
-                                        }
-
-                                  default:
-                                        // do nothing
-                                        ;
-                                } // switch
-
                                 switch ( opInfo.type ) {
                                   case OT_INDEX:
@@ -584 +547 @@
                 if ( castExpr->get_result()->isVoid() ) {
                         output << "(void)" ;
-                } else if ( ! castExpr->get_result()->get_lvalue() ) {
-                        // at least one result type of cast, but not an lvalue
+                } else {
+                        // at least one result type of cast.
+                        // Note: previously, lvalue casts were skipped. Since it's now impossible for the user to write
+                        // an lvalue cast, this has been taken out.
                         output << "(";
                         output << genType( castExpr->get_result(), "", pretty, genC );
                         output << ")";
-                } else {
-                        // otherwise, the cast is to an lvalue type, so the cast should be dropped, since the result of a cast is
-                        // never an lvalue in C
                 } // if
                 castExpr->get_arg()->accept( *this );
@@ -706 +668 @@
                 extension( commaExpr );
                 output << "(";
+                if ( genC ) {
+                        // arg1 of a CommaExpr is never used, so it can be safely cast to void to reduce gcc warnings.
+                        commaExpr->set_arg1( new CastExpr( commaExpr->get_arg1() ) );
+                }
                 commaExpr->get_arg1()->accept( *this );
                 output << " , ";
                 commaExpr->get_arg2()->accept( *this );
                 output << ")";
+        }
+
+        void CodeGenerator::visit( TupleAssignExpr * tupleExpr ) {
+                assertf( ! genC, "TupleAssignExpr should not reach code generation." );
+                tupleExpr->stmtExpr->accept( *this );
         }
 
@@ -761 +732 @@
         }
 
+        void CodeGenerator::visit( UniqueExpr * unqExpr ) {
+                assertf( ! genC, "Unique expressions should not reach code generation." );
+                output << "unq<" << unqExpr->get_id() << ">{ ";
+                unqExpr->get_expr()->accept( *this );
+                output << " }";
+        }
+
         void CodeGenerator::visit( StmtExpr * stmtExpr ) {
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
-                updateLocation( stmtExpr );
-                output << "({" << std::endl;
+                output << lineDirective( stmtExpr) << "({" << std::endl;
                 ++indent;
                 unsigned int numStmts = stmts.size();
                 unsigned int i = 0;
                 for ( Statement * stmt : stmts ) {
-                        updateLocation( stmt );
-            output << printLabels( stmt->get_labels() );
+                        output << lineDirective( stmt ) << indent;
+                        output << printLabels( stmt->get_labels() );
                         if ( i+1 == numStmts ) {
                                 // last statement in a statement expression needs to be handled specially -
@@ -815 +792 @@
         void CodeGenerator::visit( ExprStmt * exprStmt ) {
                 assert( exprStmt );
-                Expression * expr = exprStmt->get_expr();
                 if ( genC ) {
                         // cast the top-level expression to void to reduce gcc warnings.
-                        expr = new CastExpr( expr );
+                        exprStmt->set_expr( new CastExpr( exprStmt->get_expr() ) );
                 }
-                expr->accept( *this );
+                exprStmt->get_expr()->accept( *this );
                 output << ";";
         }
@@ -856 +832 @@
 
         void CodeGenerator::visit( IfStmt * ifStmt ) {
-                updateLocation( ifStmt );
+                output << lineDirective( ifStmt );
                 output << "if ( ";
                 ifStmt->get_condition()->accept( *this );
@@ -870 +846 @@
 
         void CodeGenerator::visit( SwitchStmt * switchStmt ) {
-                updateLocation( switchStmt );
+                output << lineDirective( switchStmt );
                 output << "switch ( " ;
                 switchStmt->get_condition()->accept( *this );
@@ -883 +859 @@
 
         void CodeGenerator::visit( CaseStmt * caseStmt ) {
-                updateLocation( caseStmt );
+                output << lineDirective( caseStmt );
+                output << indent;
                 if ( caseStmt->isDefault()) {
                         output << "default";