Changes in src/CodeGen/CodeGenerator.cc [03e5d14:7baed7d]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 15:40:35 2016
-// Update Count     : 243
+// Last Modified On : Fri May 06 16:01:00 2016
+// Update Count     : 255
 //
 
@@ -26 +26 @@
 #include "SynTree/Statement.h"
 #include "SynTree/Type.h"
+#include "SynTree/Attribute.h"
 
 #include "Common/utility.h"
@@ -33 +34 @@
 #include "OperatorTable.h"
 #include "GenType.h"
+
+#include "InitTweak/InitTweak.h"
 
 using namespace std;
@@ -67 +70 @@
         string mangleName( DeclarationWithType *decl ) {
                 if ( decl->get_mangleName() != "" ) {
-                        return decl->get_mangleName();
+                        // need to incorporate scope level in order to differentiate names for destructors
+                        return decl->get_scopedMangleName();
                 } else {
                         return decl->get_name();
                 } // if
         }
+
+        void CodeGenerator::genAttributes( std::list< Attribute * > & attributes ) {
+                if ( ! attributes.empty() ) {
+                        output << "__attribute__ ((";
+                        for ( Attribute *& attr : attributes ) {
+                                if ( ! attr->empty() ) {
+                                        output << attr->get_name() << "(";
+                                        genCommaList( attr->get_parameters().begin(), attr->get_parameters().end() );
+                                        output << ")";
+                                }
+                                output << ",";
+                        }
+                        output << ")) ";
+                }
+        }
+
 
         //*** Declarations
         void CodeGenerator::visit( FunctionDecl *functionDecl ) {
-                // generalize this
-                FunctionDecl::Attribute attr = functionDecl->get_attribute();
-                switch ( attr.type ) {
-                        case FunctionDecl::Attribute::Constructor:
-                                output << "__attribute__ ((constructor";
-                                if ( attr.priority != FunctionDecl::Attribute::Default ) {
-                                        output << "(" << attr.priority << ")";
-                                }
-                                output << ")) ";
-                                break;
-                        case FunctionDecl::Attribute::Destructor:
-                                output << "__attribute__ ((destructor";
-                                if ( attr.priority != FunctionDecl::Attribute::Default ) {
-                                        output << "(" << attr.priority << ")";
-                                }
-                                output << ")) ";
-                                break;
-                        default:
-                                break;
-                }
+                genAttributes( functionDecl->get_attributes() );
+
                 handleStorageClass( functionDecl );
                 if ( functionDecl->get_isInline() ) {
@@ -233 +235 @@
                 printDesignators( init->get_designators() );
                 output << "{ ";
-                genCommaList( init->begin_initializers(), init->end_initializers() );
+                if ( init->begin_initializers() == init->end_initializers() ) {
+                        // illegal to leave initializer list empty for scalar initializers,
+                        // but always legal to have 0
+                        output << "0";
+                } else {
+                        genCommaList( init->begin_initializers(), init->end_initializers() );
+                }
                 output << " }";
         }
@@ -251 +259 @@
                                   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
                                                         UntypedExpr *newExpr = new UntypedExpr( new NameExpr( "*?" ) );
                                                         newExpr->get_args().push_back( *arg );
+                                                        assert( (*arg)->get_results().size() == 1 );
+                                                        Type * type = InitTweak::getPointerBase( (*arg)->get_results().front() );
+                                                        assert( type );
+                                                        newExpr->get_results().push_back( type );
                                                         *arg = newExpr;
                                                 } // if
@@ -283 +298 @@
                                         break;
 
+                                  case OT_CTOR:
+                                  case OT_DTOR:
+                                        if ( applicationExpr->get_args().size() == 1 ) {
+                                                // the expression fed into a single parameter constructor or destructor
+                                                // may contain side effects, so must still output this expression
+                                                output << "(";
+                                                (*arg++)->accept( *this );
+                                                output << ") /* " << opInfo.inputName << " */";
+                                        } else if ( applicationExpr->get_args().size() == 2 ) {
+                                                // intrinsic two parameter constructors are essentially bitwise assignment
+                                                output << "(";
+                                                (*arg++)->accept( *this );
+                                                output << opInfo.symbol;
+                                                (*arg)->accept( *this );
+                                                output << ") /* " << opInfo.inputName << " */";
+                                        } else {
+                                                // no constructors with 0 or more than 2 parameters
+                                                assert( false );
+                                        }
+                                        break;
+
                                   case OT_PREFIX:
                                   case OT_PREFIXASSIGN:
@@ -298 +334 @@
                                         output << opInfo.symbol;
                                         break;
+
 
                                   case OT_INFIX:
@@ -344 +381 @@
                                   case OT_CALL:
                                         assert( false );
+
+
+                                  case OT_CTOR:
+                                  case OT_DTOR:
+                                        if ( untypedExpr->get_args().size() == 1 ) {
+                                                // the expression fed into a single parameter constructor or destructor
+                                                // may contain side effects, so must still output this expression
+                                                output << "(";
+                                                (*arg++)->accept( *this );
+                                                output << ") /* " << opInfo.inputName << " */";
+                                        } else if ( untypedExpr->get_args().size() == 2 ) {
+                                                // intrinsic two parameter constructors are essentially bitwise assignment
+                                                output << "(";
+                                                (*arg++)->accept( *this );
+                                                output << opInfo.symbol;
+                                                (*arg)->accept( *this );
+                                                output << ") /* " << opInfo.inputName << " */";
+                                        } else {
+                                                // no constructors with 0 or more than 2 parameters
+                                                assert( false );
+                                        }
                                         break;
 
@@ -558 +616 @@
 
         void CodeGenerator::visit( ExprStmt *exprStmt ) {
-                // I don't see why this check is necessary.
-                // If this starts to cause problems then put it back in,
-                // with an explanation
                 assert( exprStmt );
-
-                // if ( exprStmt != 0 ) {
-                exprStmt->get_expr()->accept( *this );
-                output << ";" ;
-                // } // if
+                // cast the top-level expression to void to reduce gcc warnings.
+                Expression * expr = new CastExpr( exprStmt->get_expr() );
+                expr->accept( *this );
+                output << ";";
         }
 
@@ -675 +729 @@
 
         void CodeGenerator::visit( WhileStmt *whileStmt ) {
-                if ( whileStmt->get_isDoWhile() )
+                if ( whileStmt->get_isDoWhile() ) {
                         output << "do" ;
-                else {
+                } else {
                         output << "while (" ;
                         whileStmt->get_condition()->accept( *this );
@@ -701 +755 @@
                 output << "for (;";
 
-                if ( forStmt->get_condition() != 0 )
+                if ( forStmt->get_condition() != 0 ) {
                         forStmt->get_condition()->accept( *this );
+                }
                 output << ";";
 
-                if ( forStmt->get_increment() != 0 )
-                        forStmt->get_increment()->accept( *this );
+                if ( forStmt->get_increment() != 0 ) {
+                        // cast the top-level expression to void to reduce gcc warnings.
+                        Expression * expr = new CastExpr( forStmt->get_increment() );
+                        expr->accept( *this );
+                }
                 output << ") ";