Index: src/Parser/DeclarationNode.cc =================================================================== --- src/Parser/DeclarationNode.cc (revision 37f0da89b626150c903d8d8fecc683c0c6c8dee0) +++ src/Parser/DeclarationNode.cc (revision dc2e7e0625c69ea1a4e1ba396569d2cd6cec9f99) @@ -5,10 +5,10 @@ // file "LICENCE" distributed with Cforall. // -// DeclarationNode.cc -- +// DeclarationNode.cc -- // // Author : Rodolfo G. Esteves // Created On : Sat May 16 12:34:05 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Wed Apr 13 16:53:17 2016 +// Last Modified By : Rob Schluntz +// Last Modified On : Thu Apr 14 15:38:09 2016 // Update Count : 161 // @@ -97,4 +97,6 @@ os << endl << string( indent + 2, ' ' ) << "with initializer "; initializer->printOneLine( os ); + os << " maybe constructed? " << initializer->get_maybeConstructed(); + } // if @@ -353,5 +355,5 @@ } // if } - + DeclarationNode *DeclarationNode::addQualifiers( DeclarationNode *q ) { if ( q ) { @@ -504,5 +506,5 @@ assert( false ); } // switch - + return this; } @@ -615,5 +617,5 @@ assert( a->type->kind == TypeData::Array ); TypeData *lastArray = findLast( a->type ); - if ( type ) { + if ( type ) { switch ( type->kind ) { case TypeData::Aggregate: @@ -659,5 +661,5 @@ } // if } - + DeclarationNode *DeclarationNode::addIdList( DeclarationNode *ids ) { type = addIdListToType( type, ids ); @@ -864,5 +866,5 @@ Type *DeclarationNode::buildType() const { assert( type ); - + switch ( type->kind ) { case TypeData::Enum: Index: src/Parser/InitializerNode.cc =================================================================== --- src/Parser/InitializerNode.cc (revision 37f0da89b626150c903d8d8fecc683c0c6c8dee0) +++ src/Parser/InitializerNode.cc (revision dc2e7e0625c69ea1a4e1ba396569d2cd6cec9f99) @@ -5,12 +5,12 @@ // file "LICENCE" distributed with Cforall. // -// InitializerNode.cc -- -// +// InitializerNode.cc -- +// // Author : Rodolfo G. Esteves // Created On : Sat May 16 13:20:24 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Thu Oct 8 17:18:55 2015 -// Update Count : 4 -// +// Last Modified By : Rob Schluntz +// Last Modified On : Thu Jan 07 13:32:57 2016 +// Update Count : 13 +// #include @@ -23,5 +23,5 @@ InitializerNode::InitializerNode( ExpressionNode *_expr, bool aggrp, ExpressionNode *des ) - : expr( _expr ), aggregate( aggrp ), designator( des ), kids( 0 ) { + : expr( _expr ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) { if ( aggrp ) kids = dynamic_cast< InitializerNode *>( get_link() ); @@ -32,5 +32,5 @@ InitializerNode::InitializerNode( InitializerNode *init, bool aggrp, ExpressionNode *des ) - : expr( 0 ), aggregate( aggrp ), designator( des ), kids( 0 ) { + : expr( 0 ), aggregate( aggrp ), designator( des ), kids( 0 ), maybeConstructed( true ) { if ( init != 0 ) set_link(init); @@ -91,5 +91,5 @@ } // if - return new ListInit( initlist, designlist ); + return new ListInit( initlist, designlist, maybeConstructed ); } else { std::list< Expression *> designators; @@ -99,5 +99,5 @@ if ( get_expression() != 0) - return new SingleInit( get_expression()->build(), designators ); + return new SingleInit( get_expression()->build(), designators, maybeConstructed ); } // if Index: src/Parser/ParseNode.h =================================================================== --- src/Parser/ParseNode.h (revision 37f0da89b626150c903d8d8fecc683c0c6c8dee0) +++ src/Parser/ParseNode.h (revision dc2e7e0625c69ea1a4e1ba396569d2cd6cec9f99) @@ -10,5 +10,5 @@ // Created On : Sat May 16 13:28:16 2015 // Last Modified By : Rob Schluntz -// Last Modified On : Mon Apr 11 11:50:52 2016 +// Last Modified On : Thu Apr 14 15:37:52 2016 // Update Count : 205 // @@ -185,4 +185,5 @@ // monadic UnPlus, UnMinus, AddressOf, PointTo, Neg, BitNeg, Incr, IncrPost, Decr, DecrPost, LabelAddress, + Ctor, Dtor, }; @@ -525,4 +526,7 @@ ExpressionNode *get_designators() const { return designator; } + InitializerNode *set_maybeConstructed( bool value ) { maybeConstructed = value; return this; } + bool get_maybeConstructed() const { return maybeConstructed; } + InitializerNode *next_init() const { return kids; } @@ -536,4 +540,5 @@ ExpressionNode *designator; // may be list InitializerNode *kids; + bool maybeConstructed; }; Index: src/Parser/TypeData.cc =================================================================== --- src/Parser/TypeData.cc (revision 37f0da89b626150c903d8d8fecc683c0c6c8dee0) +++ src/Parser/TypeData.cc (revision dc2e7e0625c69ea1a4e1ba396569d2cd6cec9f99) @@ -5,10 +5,10 @@ // file "LICENCE" distributed with Cforall. // -// TypeData.cc -- +// TypeData.cc -- // // Author : Rodolfo G. Esteves // Created On : Sat May 16 15:12:51 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Wed Mar 2 17:26:45 2016 +// Last Modified By : Rob Schluntz +// Last Modified On : Wed Apr 06 16:57:53 2016 // Update Count : 49 // @@ -449,4 +449,22 @@ for ( std::list< TypeDecl* >::iterator i = outputList.begin(); i != outputList.end(); ++i ) { if ( (*i)->get_kind() == TypeDecl::Any ) { + // add assertion parameters to `type' tyvars in reverse order + // add dtor: void ^?{}(T *) + FunctionType *dtorType = new FunctionType( Type::Qualifiers(), false ); + dtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) ); + (*i)->get_assertions().push_front( new FunctionDecl( "^?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, dtorType, 0, false, false ) ); + + // add copy ctor: void ?{}(T *, T) + FunctionType *copyCtorType = new FunctionType( Type::Qualifiers(), false ); + copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) ); + copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) ); + (*i)->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, copyCtorType, 0, false, false ) ); + + // add default ctor: void ?{}(T *) + FunctionType *ctorType = new FunctionType( Type::Qualifiers(), false ); + ctorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) ); + (*i)->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, ctorType, 0, false, false ) ); + + // add assignment operator: T * ?=?(T *, T) FunctionType *assignType = new FunctionType( Type::Qualifiers(), false ); assignType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) ); @@ -902,5 +920,5 @@ if ( cur->get_enumeratorValue() != NULL ) { ObjectDecl *member = dynamic_cast(*members); - member->set_init( new SingleInit( maybeBuild< Expression >( cur->get_enumeratorValue() ) ) ); + member->set_init( new SingleInit( maybeBuild< Expression >( cur->get_enumeratorValue() ), std::list< Expression * >() ) ); } // if } // for Index: src/Parser/parser.cc =================================================================== --- src/Parser/parser.cc (revision 37f0da89b626150c903d8d8fecc683c0c6c8dee0) +++ src/Parser/parser.cc (revision dc2e7e0625c69ea1a4e1ba396569d2cd6cec9f99) @@ -7468,5 +7468,5 @@ /* Line 1806 of yacc.c */ #line 1704 "parser.yy" - { (yyval.in) = (yyvsp[(2) - (2)].in); } + { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); } break; Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision 37f0da89b626150c903d8d8fecc683c0c6c8dee0) +++ src/Parser/parser.yy (revision dc2e7e0625c69ea1a4e1ba396569d2cd6cec9f99) @@ -5,6 +5,6 @@ // file "LICENCE" distributed with Cforall. // -// cfa.y -- -// +// cfa.y -- +// // Author : Peter A. Buhr // Created On : Sat Sep 1 20:22:55 2001 @@ -12,5 +12,5 @@ // Last Modified On : Wed Apr 13 16:58:43 2016 // Update Count : 1519 -// +// // This grammar is based on the ANSI99/11 C grammar, specifically parts of EXPRESSION and STATEMENTS, and on the C @@ -1702,5 +1702,5 @@ { $$ = $2; } | ATassign initializer - { $$ = $2; } + { $$ = $2->set_maybeConstructed( false ); } ;