Index: src/Parser/DeclarationNode.cc =================================================================== --- src/Parser/DeclarationNode.cc (revision bd8540001c298d12d68dabcd274a24ed5a4dfb7a) +++ src/Parser/DeclarationNode.cc (revision d63eeb0d6eeb995b4c8c414f1d4989b0189ef8ca) @@ -5,11 +5,11 @@ // 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 : Tue Jul 14 14:46:32 2015 -// Update Count : 126 +// Last Modified By : Rob Schluntz +// Last Modified On : Thu Jan 07 13:18:02 2016 +// Update Count : 130 // @@ -96,4 +96,6 @@ os << endl << string( indent + 2, ' ' ) << "with initializer "; initializer->printOneLine( os ); + os << " maybe constructed? " << initializer->get_maybeConstructed(); + } // if @@ -357,5 +359,5 @@ } // if } - + DeclarationNode *DeclarationNode::addQualifiers( DeclarationNode *q ) { if ( q ) { @@ -508,5 +510,5 @@ assert( false ); } // switch - + return this; } @@ -619,5 +621,5 @@ assert( a->type->kind == TypeData::Array ); TypeData *lastArray = findLast( a->type ); - if ( type ) { + if ( type ) { switch ( type->kind ) { case TypeData::Aggregate: @@ -663,5 +665,5 @@ } // if } - + DeclarationNode *DeclarationNode::addIdList( DeclarationNode *ids ) { type = addIdListToType( type, ids ); @@ -868,5 +870,5 @@ Type *DeclarationNode::buildType() const { assert( type ); - + switch ( type->kind ) { case TypeData::Enum: Index: src/Parser/InitializerNode.cc =================================================================== --- src/Parser/InitializerNode.cc (revision bd8540001c298d12d68dabcd274a24ed5a4dfb7a) +++ src/Parser/InitializerNode.cc (revision d63eeb0d6eeb995b4c8c414f1d4989b0189ef8ca) @@ -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 bd8540001c298d12d68dabcd274a24ed5a4dfb7a) +++ src/Parser/ParseNode.h (revision d63eeb0d6eeb995b4c8c414f1d4989b0189ef8ca) @@ -5,11 +5,11 @@ // file "LICENCE" distributed with Cforall. // -// ParseNode.h -- +// ParseNode.h -- // // Author : Rodolfo G. Esteves // Created On : Sat May 16 13:28:16 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Feb 1 13:32:32 2016 -// Update Count : 184 +// Last Modified By : Rob Schluntz +// Last Modified On : Tue Feb 09 13:23:34 2016 +// Update Count : 185 // @@ -177,12 +177,13 @@ enum Type { TupleC, Comma, TupleFieldSel, // n-adic // triadic - Cond, NCond, + Cond, NCond, // diadic - SizeOf, AlignOf, OffsetOf, Attr, CompLit, Plus, Minus, Mul, Div, Mod, Or, And, - BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq, + SizeOf, AlignOf, OffsetOf, Attr, CompLit, Plus, Minus, Mul, Div, Mod, Or, And, + BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq, Assign, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn, Index, FieldSel, PFieldSel, Range, // monadic UnPlus, UnMinus, AddressOf, PointTo, Neg, BitNeg, Incr, IncrPost, Decr, DecrPost, LabelAddress, + Ctor, Dtor, }; @@ -309,5 +310,5 @@ ValofExprNode( const ValofExprNode &other ); ~ValofExprNode(); - + virtual ValofExprNode *clone() const { return new ValofExprNode( *this ); } @@ -332,5 +333,5 @@ enum TypeClass { Type, Dtype, Ftype }; - static const char *storageName[]; + static const char *storageName[]; static const char *qualifierName[]; static const char *basicTypeName[]; @@ -422,5 +423,5 @@ class StatementNode : public ParseNode { public: - enum Type { Exp, If, Switch, Case, Default, Choose, Fallthru, + enum Type { Exp, If, Switch, Case, Default, Choose, Fallthru, While, Do, For, Goto, Continue, Break, Return, Throw, @@ -520,4 +521,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; } @@ -531,4 +535,5 @@ ExpressionNode *designator; // may be list InitializerNode *kids; + bool maybeConstructed; }; Index: src/Parser/TypeData.cc =================================================================== --- src/Parser/TypeData.cc (revision bd8540001c298d12d68dabcd274a24ed5a4dfb7a) +++ src/Parser/TypeData.cc (revision d63eeb0d6eeb995b4c8c414f1d4989b0189ef8ca) @@ -5,11 +5,11 @@ // 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 : Tue Jul 14 14:57:23 2015 -// Update Count : 32 +// Last Modified By : Rob Schluntz +// Last Modified On : Thu Jan 14 10:43:42 2016 +// Update Count : 36 // @@ -436,4 +436,6 @@ for ( std::list< TypeDecl* >::iterator i = outputList.begin(); i != outputList.end(); ++i ) { if ( (*i)->get_kind() == TypeDecl::Any ) { + // add assertion parameters to `type' tyvars + // add: 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 ) ); @@ -441,4 +443,14 @@ assignType->get_returnVals().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, assignType, 0, false, false ) ); + + // add: 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: 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 ) ); } // if } // for Index: src/Parser/parser.cc =================================================================== --- src/Parser/parser.cc (revision bd8540001c298d12d68dabcd274a24ed5a4dfb7a) +++ src/Parser/parser.cc (revision d63eeb0d6eeb995b4c8c414f1d4989b0189ef8ca) @@ -2,17 +2,17 @@ /* Bison implementation for Yacc-like parsers in C - + Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -27,5 +27,5 @@ Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ @@ -7353,6 +7353,6 @@ /* Line 1806 of yacc.c */ -#line 1690 "parser.yy" - { (yyval.in) = (yyvsp[(2) - (2)].in); } +#line 1684 "parser.yy" + { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); } break; Index: src/Parser/parser.yy =================================================================== --- src/Parser/parser.yy (revision bd8540001c298d12d68dabcd274a24ed5a4dfb7a) +++ src/Parser/parser.yy (revision d63eeb0d6eeb995b4c8c414f1d4989b0189ef8ca) @@ -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 : Mon Feb 1 18:22:42 2016 // Update Count : 1483 -// +// // This grammar is based on the ANSI99/11 C grammar, specifically parts of EXPRESSION and STATEMENTS, and on the C @@ -1688,5 +1688,5 @@ { $$ = $2; } | ATassign initializer - { $$ = $2; } + { $$ = $2->set_maybeConstructed( false ); } ;