Index: src/CodeGen/CodeGenerator.cc =================================================================== --- src/CodeGen/CodeGenerator.cc (revision 2a4b0884c14643e09650daaeb3a6667b5bff6b48) +++ src/CodeGen/CodeGenerator.cc (revision ae42f2a7f234c8e9567c98613f8f967c7fabd3df) @@ -5,11 +5,11 @@ // file "LICENCE" distributed with Cforall. // -// CodeGenerator.cc -- +// CodeGenerator.cc -- // // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jan 25 21:22:00 2016 -// Update Count : 242 +// Last Modified By : Rob Schluntz +// Last Modified On : Tue Feb 09 13:24:40 2016 +// Update Count : 255 // @@ -98,5 +98,5 @@ handleStorageClass( objectDecl ); output << genType( objectDecl->get_type(), mangleName( objectDecl ) ); - + if ( objectDecl->get_init() ) { output << " = "; @@ -112,5 +112,5 @@ if ( aggDecl->get_name() != "" ) output << aggDecl->get_name(); - + std::list< Declaration * > &memb = aggDecl->get_members(); @@ -118,12 +118,12 @@ output << " {" << endl; - cur_indent += CodeGenerator::tabsize; + cur_indent += CodeGenerator::tabsize; for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++) { - output << indent; + output << indent; (*i)->accept( *this ); output << ";" << endl; } - cur_indent -= CodeGenerator::tabsize; + cur_indent -= CodeGenerator::tabsize; output << indent << "}"; @@ -140,5 +140,5 @@ handleAggregate( aggregateDecl ); } - + void CodeGenerator::visit( EnumDecl *aggDecl ) { output << "enum "; @@ -146,5 +146,5 @@ if ( aggDecl->get_name() != "" ) output << aggDecl->get_name(); - + std::list< Declaration* > &memb = aggDecl->get_members(); @@ -152,9 +152,9 @@ output << " {" << endl; - cur_indent += CodeGenerator::tabsize; + cur_indent += CodeGenerator::tabsize; for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++) { ObjectDecl *obj = dynamic_cast< ObjectDecl* >( *i ); assert( obj ); - output << indent << mangleName( obj ); + output << indent << mangleName( obj ); if ( obj->get_init() ) { output << " = "; @@ -164,17 +164,17 @@ } // for - cur_indent -= CodeGenerator::tabsize; + cur_indent -= CodeGenerator::tabsize; output << indent << "}"; } // if } - + void CodeGenerator::visit( ContextDecl *aggregateDecl ) {} - + void CodeGenerator::visit( TypedefDecl *typeDecl ) { output << "typedef "; output << genType( typeDecl->get_base(), typeDecl->get_name() ); } - + void CodeGenerator::visit( TypeDecl *typeDecl ) { // really, we should mutate this into something that isn't a TypeDecl but that requires large-scale changes, @@ -216,5 +216,5 @@ } - void CodeGenerator::visit( Constant *constant ) { + void CodeGenerator::visit( Constant *constant ) { output << constant->get_value() ; } @@ -233,5 +233,5 @@ assert( arg != applicationExpr->get_args().end() ); if ( AddressExpr *addrExpr = dynamic_cast< AddressExpr * >( *arg ) ) { - + *arg = addrExpr->get_arg(); } else { @@ -242,10 +242,10 @@ break; } - + default: // do nothing ; } - + switch ( opInfo.type ) { case OT_INDEX: @@ -256,10 +256,20 @@ output << "]"; break; - + case OT_CALL: - // there are no intrinsic definitions of the function call operator + // there are no intrinsic definitions of the function call operator or constructors or destructors 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(applicationExpr->get_function())->get_var()->get_name() << endl; + break; + case OT_PREFIX: case OT_PREFIXASSIGN: @@ -270,5 +280,5 @@ output << ")"; break; - + case OT_POSTFIX: case OT_POSTFIXASSIGN: @@ -277,4 +287,5 @@ output << opInfo.symbol; break; + case OT_INFIX: @@ -287,5 +298,5 @@ output << ")"; break; - + case OT_CONSTANT: case OT_LABELADDRESS: @@ -306,5 +317,5 @@ } // if } - + void CodeGenerator::visit( UntypedExpr *untypedExpr ) { if ( NameExpr *nameExpr = dynamic_cast< NameExpr* >( untypedExpr->get_function() ) ) { @@ -320,9 +331,14 @@ output << "]"; break; - + case OT_CALL: assert( false ); - break; - + + case OT_CTOR: + case OT_DTOR: + // intrinsic constructors should never be called + // intrinsic destructors do nothing + break; + case OT_PREFIX: case OT_PREFIXASSIGN: @@ -334,5 +350,5 @@ output << ")"; break; - + case OT_POSTFIX: case OT_POSTFIXASSIGN: @@ -341,5 +357,5 @@ output << opInfo.symbol; break; - + case OT_INFIX: case OT_INFIXASSIGN: @@ -351,5 +367,5 @@ output << ")"; break; - + case OT_CONSTANT: // there are no intrinsic definitions of 0 or 1 as functions @@ -369,5 +385,5 @@ } // if } - + void CodeGenerator::visit( NameExpr *nameExpr ) { OperatorInfo opInfo; @@ -379,5 +395,5 @@ } // if } - + void CodeGenerator::visit( AddressExpr *addressExpr ) { output << "(&"; @@ -408,14 +424,14 @@ output << ")"; } - + void CodeGenerator::visit( UntypedMemberExpr *memberExpr ) { assert( false ); } - + void CodeGenerator::visit( MemberExpr *memberExpr ) { memberExpr->get_aggregate()->accept( *this ); output << "." << mangleName( memberExpr->get_member() ); } - + void CodeGenerator::visit( VariableExpr *variableExpr ) { OperatorInfo opInfo; @@ -426,10 +442,10 @@ } // if } - + void CodeGenerator::visit( ConstantExpr *constantExpr ) { assert( constantExpr->get_constant() ); constantExpr->get_constant()->accept( *this ); } - + void CodeGenerator::visit( SizeofExpr *sizeofExpr ) { output << "sizeof("; @@ -464,5 +480,5 @@ output << ")"; } - + void CodeGenerator::visit( LogicalExpr *logicalExpr ) { output << "("; @@ -476,5 +492,5 @@ output << ")"; } - + void CodeGenerator::visit( ConditionalExpr *conditionalExpr ) { output << "("; @@ -486,5 +502,5 @@ output << ")"; } - + void CodeGenerator::visit( CommaExpr *commaExpr ) { output << "("; @@ -494,7 +510,7 @@ output << ")"; } - + void CodeGenerator::visit( TupleExpr *tupleExpr ) {} - + void CodeGenerator::visit( TypeExpr *typeExpr ) {} @@ -527,5 +543,5 @@ } } - cur_indent -= CodeGenerator::tabsize; + cur_indent -= CodeGenerator::tabsize; output << indent << "}"; @@ -533,6 +549,6 @@ 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, + // 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 ); @@ -584,5 +600,5 @@ switchStmt->get_condition()->accept( *this ); output << " ) "; - + output << "{" << std::endl; cur_indent += CodeGenerator::tabsize; @@ -604,5 +620,5 @@ } // if output << ":\n"; - + std::list sts = caseStmt->get_statements(); @@ -621,5 +637,5 @@ if ( ! branchStmt->get_target().empty() ) output << "goto " << branchStmt->get_target(); - else { + else { if ( branchStmt->get_computedTarget() != 0 ) { output << "goto *"; @@ -672,6 +688,6 @@ void CodeGenerator::visit( ForStmt *forStmt ) { - // initialization is always hoisted, so don't - // bother doing anything with that + // initialization is always hoisted, so don't + // bother doing anything with that output << "for (;"; @@ -697,5 +713,5 @@ void CodeGenerator::visit( DeclStmt *declStmt ) { declStmt->get_decl()->accept( *this ); - + if ( doSemicolon( declStmt->get_decl() ) ) { output << ";"; Index: src/CodeGen/OperatorTable.cc =================================================================== --- src/CodeGen/OperatorTable.cc (revision 2a4b0884c14643e09650daaeb3a6667b5bff6b48) +++ src/CodeGen/OperatorTable.cc (revision ae42f2a7f234c8e9567c98613f8f967c7fabd3df) @@ -9,7 +9,7 @@ // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jun 23 17:41:14 2015 -// Update Count : 5 +// Last Modified By : Rob Schluntz +// Last Modified On : Tue Oct 06 15:26:34 2015 +// Update Count : 9 // @@ -21,4 +21,6 @@ const OperatorInfo tableValues[] = { { "?[?]", "", "_operator_index", OT_INDEX }, + { "?{}", "", "_constructor", OT_CTOR }, + { "^?{}", "", "_destructor", OT_DTOR }, // ~?{}, -?{}, !?{}, $?{}, ??{}, ^?{}, ?destroy, ?delete { "?()", "", "_operator_call", OT_CALL }, { "?++", "++", "_operator_postincr", OT_POSTFIXASSIGN }, Index: src/CodeGen/OperatorTable.h =================================================================== --- src/CodeGen/OperatorTable.h (revision 2a4b0884c14643e09650daaeb3a6667b5bff6b48) +++ src/CodeGen/OperatorTable.h (revision ae42f2a7f234c8e9567c98613f8f967c7fabd3df) @@ -9,7 +9,7 @@ // Author : Richard C. Bilson // Created On : Mon May 18 07:44:20 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Tue Jun 23 16:09:27 2015 -// Update Count : 3 +// Last Modified By : Rob Schluntz +// Last Modified On : Wed Jun 24 16:17:57 2015 +// Update Count : 5 // @@ -22,4 +22,6 @@ enum OperatorType { OT_INDEX, + OT_CTOR, + OT_DTOR, OT_CALL, OT_PREFIX,