Changes in src/CodeGen/CodeGenerator.cc [8a6cf7e:a5f0529]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu Jun  8 16:00:00 2017
-// Update Count     : 485
+// Last Modified On : Tus Jul 25 15:29:00 2017
+// Update Count     : 486
 //
+#include "CodeGenerator.h"
 
 #include <cassert>                   // for assert, assertf
 #include <list>                      // for _List_iterator, list, list<>::it...
 
-#include "CodeGenerator.h"
 #include "Common/SemanticError.h"    // for SemanticError
 #include "Common/UniqueName.h"       // for UniqueName
@@ -64 +64 @@
         } // extension
 
+        ostream & CodeGenerator::Indenter::operator()( ostream & output ) const {
+          return output << string( cg.cur_indent, ' ' );
+        }
+
+        ostream & operator<<( ostream & output, const CodeGenerator::Indenter &indent ) {
+                return indent( output );
+        }
+
         CodeGenerator::LabelPrinter & CodeGenerator::LabelPrinter::operator()( std::list< Label > & l ) {
                 labels = &l;
@@ -101 +109 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( CodeGenerator::tabsize ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
 
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
@@ -182 +190 @@
                         genCommaList( aggDecl->get_parameters().begin(), aggDecl->get_parameters().end() );
                         output << ")" << endl;
-                        output << indent;
                 }
 
@@ -193 +200 @@
                         output << " {" << endl;
 
-                        ++indent;
+                        cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
                                 output << lineDirective( *i ) << indent;
@@ -200 +207 @@
                         } // for
 
-                        --indent;
+                        cur_indent -= CodeGenerator::tabsize;
 
                         output << indent << "}";
@@ -230 +237 @@
                         output << " {" << endl;
 
-                        ++indent;
+                        cur_indent += CodeGenerator::tabsize;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
@@ -242 +249 @@
                         } // for
 
-                        --indent;
+                        cur_indent -= CodeGenerator::tabsize;
 
                         output << indent << "}";
@@ -322 +329 @@
         void CodeGenerator::visit( __attribute__((unused)) ConstructorInit * init ){
                 assertf( ! genC, "ConstructorInit nodes should not reach code generation." );
-                // 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 << "}";
+                // xxx - generate something reasonable for constructor/destructor pairs
+                output << "<ctorinit>";
         }
 
@@ -341 +344 @@
                         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:
@@ -560 +594 @@
         }
 
+        void CodeGenerator::visit( VirtualCastExpr * castExpr ) {
+                assertf( ! genC, "VirtualCastExpr should not reach code generation." );
+                extension( castExpr );
+                output << "(virtual ";
+                castExpr->get_arg()->accept( *this );
+                output << ")";
+        }
+
         void CodeGenerator::visit( UntypedMemberExpr * memberExpr ) {
                 assertf( ! genC, "UntypedMemberExpr should not reach code generation." );
@@ -661 +703 @@
                 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 << " , ";
@@ -723 +761 @@
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
                 output << lineDirective( stmtExpr) << "({" << std::endl;
-                ++indent;
+                cur_indent += CodeGenerator::tabsize;
                 unsigned int numStmts = stmts.size();
                 unsigned int i = 0;
                 for ( Statement * stmt : stmts ) {
                         output << lineDirective( stmt ) << indent;
-                        output << printLabels( stmt->get_labels() );
+            output << printLabels( stmt->get_labels() );
                         if ( i+1 == numStmts ) {
                                 // last statement in a statement expression needs to be handled specially -
@@ -746 +784 @@
                         ++i;
                 }
-                --indent;
+                cur_indent -= CodeGenerator::tabsize;
                 output << indent << "})";
         }
@@ -755 +793 @@
                 output << "{" << endl;
 
-                ++indent;
+                cur_indent += CodeGenerator::tabsize;
 
                 for ( std::list<Statement *>::iterator i = ks.begin(); i != ks.end();  i++ ) {
@@ -766 +804 @@
                         } // if
                 } // for
-                --indent;
+                cur_indent -= CodeGenerator::tabsize;
 
                 output << indent << "}";
@@ -773 +811 @@
         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.
-                        exprStmt->set_expr( new CastExpr( exprStmt->get_expr() ) );
+                        expr = new CastExpr( expr );
                 }
-                exprStmt->get_expr()->accept( *this );
+                expr->accept( *this );
                 output << ";";
         }
@@ -833 +872 @@
 
                 output << "{" << std::endl;
-                ++indent;
+                cur_indent += CodeGenerator::tabsize;
                 acceptAll( switchStmt->get_statements(), *this );
-                --indent;
+                cur_indent -= CodeGenerator::tabsize;
                 output << indent << "}";
         }
@@ -852 +891 @@
                 std::list<Statement *> sts = caseStmt->get_statements();
 
-                ++indent;
+                cur_indent += CodeGenerator::tabsize;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
                         output << indent << printLabels( (*i)->get_labels() )  ;
@@ -858 +897 @@
                         output << endl;
                 } // for
-                --indent;
+                cur_indent -= CodeGenerator::tabsize;
         }