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

File:

• src/CodeGen/CodeGenerator.cc (modified) (8 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 : Wed Apr 27 11:59:36 2016
+// Update Count     : 255
 //
 
@@ -67 +67 @@
         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();
@@ -75 +76 @@
         //*** 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;
-                }
                 handleStorageClass( functionDecl );
                 if ( functionDecl->get_isInline() ) {
@@ -233 +214 @@
                 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 +238 @@
                                   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 );
@@ -283 +273 @@
                                         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 - output as a void expression
+                                                output << "((void)(";
+                                                (*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 +309 @@
                                         output << opInfo.symbol;
                                         break;
+
 
                                   case OT_INFIX:
@@ -344 +356 @@
                                   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 - output as a void expression
+                                                output << "((void)(";
+                                                (*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;