Changes in src/CodeGen/CodeGenerator.cc [f1e012b:803deb1]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jan 19 13:15:44 2016
-// Update Count     : 251
+// Last Modified On : Wed Jan 20 12:54:50 2016
+// Update Count     : 241
 //
 
@@ -258 +258 @@
 
                                   case OT_CALL:
-                                        // there are no intrinsic definitions of the function call operator or constructors or destructors
+                                        // there are no intrinsic definitions of the function call operator
                                         assert( false );
                                         break;
-
-                                  case OT_CTOR:
-                                  // intrinsic constructors should never be called directly - they should be transformed back into Initializer nodes
-                                  assert(false);
-                                  break;
-
-                                  case OT_DTOR:
-                                  // intrinsic destructors do nothing - don't generate any code
-                                  output << " // " << dynamic_cast<VariableExpr*>(applicationExpr->get_function())->get_var()->get_name() << endl;
-                                  break;
 
                                   case OT_PREFIX:
@@ -287 +277 @@
                                         output << opInfo.symbol;
                                         break;
-
 
                                   case OT_INFIX:
@@ -334 +323 @@
                                   case OT_CALL:
                                         assert( false );
-
-                                        case OT_CTOR:
-                                        case OT_DTOR:
-                                        // intrinsic constructors should never be called
-                                        // intrinsic destructors do nothing
                                         break;
 
@@ -408 +392 @@
 
         void CodeGenerator::visit( CastExpr *castExpr ) {
-                // if the cast is to an lvalue type, then the cast
-                // should be dropped, since the result of a cast is
-                // never an lvalue in C
-                if ( castExpr->get_results().front()->get_isLvalue() ) {
-                        castExpr->get_arg()->accept( *this );
-                } else {
-                        output << "((";
-                        if ( castExpr->get_results().empty() ) {
-                                output << "void" ;
-                        } else {
-                                output << genType( castExpr->get_results().front(), "" );
-                        } // if
+                output << "(";
+                if ( castExpr->get_results().empty() ) {
+                        output << "(void)" ;
+                } else if ( ! castExpr->get_results().front()->get_isLvalue() ) {
+                        // at least one result type of cast, but not an lvalue
+                        output << "(";
+                        output << genType( castExpr->get_results().front(), "" );
                         output << ")";
-                        castExpr->get_arg()->accept( *this );
-                        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
                 }
+                castExpr->get_arg()->accept( *this );
+                output << ")";
         }