Index: src/CodeGen/CodeGenerator.cc =================================================================== --- src/CodeGen/CodeGenerator.cc (revision 083cf3181fe3a210bc837e36dd40f9dc8d3ae198) +++ src/CodeGen/CodeGenerator.cc (revision 71f4e4f59e25d1ae31af19227f4d2a8a9365bac7) @@ -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 : Rob Schluntz -// Last Modified On : Thu Sep 17 15:25:58 2015 -// Update Count : 233 +// Last Modified On : Wed Jan 13 16:26:59 2016 +// Update Count : 234 // @@ -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,5 +256,5 @@ output << "]"; break; - + case OT_CALL: case OT_CTOR: @@ -263,5 +263,5 @@ assert( false ); break; - + case OT_PREFIX: case OT_PREFIXASSIGN: @@ -272,5 +272,5 @@ output << ")"; break; - + case OT_POSTFIX: case OT_POSTFIXASSIGN: @@ -289,5 +289,5 @@ output << ")"; break; - + case OT_CONSTANT: case OT_LABELADDRESS: @@ -308,5 +308,5 @@ } // if } - + void CodeGenerator::visit( UntypedExpr *untypedExpr ) { if ( NameExpr *nameExpr = dynamic_cast< NameExpr* >( untypedExpr->get_function() ) ) { @@ -322,5 +322,5 @@ output << "]"; break; - + case OT_CALL: case OT_CTOR: @@ -328,5 +328,5 @@ assert( false ); break; - + case OT_PREFIX: case OT_PREFIXASSIGN: @@ -338,5 +338,5 @@ output << ")"; break; - + case OT_POSTFIX: case OT_POSTFIXASSIGN: @@ -345,5 +345,5 @@ output << opInfo.symbol; break; - + case OT_INFIX: case OT_INFIXASSIGN: @@ -355,5 +355,5 @@ output << ")"; break; - + case OT_CONSTANT: // there are no intrinsic definitions of 0 or 1 as functions @@ -373,5 +373,5 @@ } // if } - + void CodeGenerator::visit( NameExpr *nameExpr ) { OperatorInfo opInfo; @@ -383,5 +383,5 @@ } // if } - + void CodeGenerator::visit( AddressExpr *addressExpr ) { output << "(&"; @@ -410,17 +410,17 @@ output << ")"; castExpr->get_arg()->accept( *this ); - output << ")"; + 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; @@ -431,10 +431,10 @@ } // if } - + void CodeGenerator::visit( ConstantExpr *constantExpr ) { assert( constantExpr->get_constant() ); constantExpr->get_constant()->accept( *this ); } - + void CodeGenerator::visit( SizeofExpr *sizeofExpr ) { output << "sizeof("; @@ -457,5 +457,5 @@ output << ")"; } - + void CodeGenerator::visit( LogicalExpr *logicalExpr ) { output << "("; @@ -469,5 +469,5 @@ output << ")"; } - + void CodeGenerator::visit( ConditionalExpr *conditionalExpr ) { output << "("; @@ -479,5 +479,5 @@ output << ")"; } - + void CodeGenerator::visit( CommaExpr *commaExpr ) { output << "("; @@ -487,7 +487,7 @@ output << ")"; } - + void CodeGenerator::visit( TupleExpr *tupleExpr ) {} - + void CodeGenerator::visit( TypeExpr *typeExpr ) {} @@ -520,5 +520,5 @@ } } - cur_indent -= CodeGenerator::tabsize; + cur_indent -= CodeGenerator::tabsize; output << indent << "}"; @@ -526,6 +526,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 ); @@ -577,5 +577,5 @@ switchStmt->get_condition()->accept( *this ); output << " ) "; - + output << "{" << std::endl; cur_indent += CodeGenerator::tabsize; @@ -597,5 +597,5 @@ } // if output << ":\n"; - + std::list sts = caseStmt->get_statements(); @@ -614,5 +614,5 @@ if ( ! branchStmt->get_target().empty() ) output << "goto " << branchStmt->get_target(); - else { + else { if ( branchStmt->get_computedTarget() != 0 ) { output << "goto *"; @@ -665,6 +665,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 (;"; @@ -690,5 +690,5 @@ void CodeGenerator::visit( DeclStmt *declStmt ) { declStmt->get_decl()->accept( *this ); - + if ( doSemicolon( declStmt->get_decl() ) ) { output << ";";