Index: src/SynTree/Attribute.cc =================================================================== --- src/SynTree/Attribute.cc (revision e50db109d71f2d05534388d73f26a49091a8ff14) +++ src/SynTree/Attribute.cc (revision e50db109d71f2d05534388d73f26a49091a8ff14) @@ -0,0 +1,47 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// Attribute.cc -- +// +// Author : Rob Schluntz +// Created On : Mon June 06 14:51:16 2016 +// Last Modified By : Rob Schluntz +// Last Modified On : Mon June 06 14:54:48 2016 +// Update Count : 1 +// + +#include + +#include "Common/utility.h" +#include "Attribute.h" +#include "Expression.h" + +Attribute::Attribute( const Attribute &other ) : name( other.name ) { + cloneAll( other.parameters, parameters ); +} + +Attribute::~Attribute() { + deleteAll( parameters ); +} + +void Attribute::print( std::ostream &os, int indent ) const { + using std::endl; + using std::string; + + if ( ! empty() ) { + os << "Attribute with name: " << name; + if ( ! parameters.empty() ) { + os << " with parameters: " << endl; + printAll( parameters, os, indent ); + } + } +} + +// Local Variables: // +// tab-width: 4 // +// mode: c++ // +// compile-command: "make install" // +// End: // Index: src/SynTree/Attribute.h =================================================================== --- src/SynTree/Attribute.h (revision e50db109d71f2d05534388d73f26a49091a8ff14) +++ src/SynTree/Attribute.h (revision e50db109d71f2d05534388d73f26a49091a8ff14) @@ -0,0 +1,43 @@ +// +// Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// Declaration.h -- +// +// Author : Richard C. Bilson +// Created On : Mon May 18 07:44:20 2015 +// Last Modified By : Rob Schluntz +// Last Modified On : Fri May 06 16:26:12 2016 +// Update Count : 33 +// + +#ifndef GCC_ATTRIBUTE_H +#define GCC_ATTRIBUTE_H + +#include "SynTree.h" + +// GCC attribute +// https://gcc.gnu.org/onlinedocs/gcc-6.1.0/gcc/Attribute-Syntax.html#Attribute-Syntax +class Attribute { + public: + Attribute( std::string name = "", const std::list< Expression * > & parameters = std::list< Expression * >() ) : name( name ), parameters( parameters ) {} + Attribute( const Attribute &other ); + virtual ~Attribute(); + + std::string get_name() const { return name; } + void set_name( const std::string & newValue ) { name = newValue; } + std::list< Expression * > & get_parameters() { return parameters; } + bool empty() const { return name == ""; } + + Attribute * clone() const { return new Attribute( *this ); } + void print( std:: ostream &os, int indent = 0 ) const; + + private: + std::string name; + // to keep things nice and tight, use NameExpr for special identifier parameters + std::list< Expression * > parameters; +}; + +#endif Index: src/SynTree/Declaration.h =================================================================== --- src/SynTree/Declaration.h (revision e04ef3a33b7695190c509b61da6fe0cfcf46b265) +++ src/SynTree/Declaration.h (revision e50db109d71f2d05534388d73f26a49091a8ff14) @@ -115,17 +115,5 @@ typedef DeclarationWithType Parent; public: - // temporary - merge this into general GCC attributes - struct Attribute { - enum Type { - NoAttribute, Constructor, Destructor, - } type; - enum Priority { - // priorities 0-100 are reserved by gcc, so it's okay to use 100 an exceptional case - Default = 100, High, - } priority; - Attribute(Type t = NoAttribute, Priority p = Default) : type(t), priority(p) {}; - }; - - FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, Attribute attribute = Attribute() ); + FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, const std::list< Attribute * > attributes = std::list< Attribute * >() ); FunctionDecl( const FunctionDecl &other ); virtual ~FunctionDecl(); @@ -140,6 +128,5 @@ std::list< std::string >& get_oldIdents() { return oldIdents; } std::list< Declaration* >& get_oldDecls() { return oldDecls; } - Attribute get_attribute() const { return attribute; } - void set_attribute( Attribute newValue ) { attribute = newValue; } + std::list< Attribute * >& get_attributes() { return attributes; } virtual FunctionDecl *clone() const { return new FunctionDecl( *this ); } @@ -153,5 +140,5 @@ std::list< std::string > oldIdents; std::list< Declaration* > oldDecls; - Attribute attribute; + std::list< Attribute * > attributes; }; Index: src/SynTree/FunctionDecl.cc =================================================================== --- src/SynTree/FunctionDecl.cc (revision e04ef3a33b7695190c509b61da6fe0cfcf46b265) +++ src/SynTree/FunctionDecl.cc (revision e50db109d71f2d05534388d73f26a49091a8ff14) @@ -19,8 +19,9 @@ #include "Statement.h" #include "Type.h" +#include "Attribute.h" #include "Common/utility.h" -FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, Attribute attribute ) - : Parent( name, sc, linkage ), type( type ), statements( statements ), attribute( attribute ) { +FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes ) + : Parent( name, sc, linkage ), type( type ), statements( statements ), attributes( attributes ) { set_isInline( isInline ); set_isNoreturn( isNoreturn ); @@ -32,5 +33,6 @@ FunctionDecl::FunctionDecl( const FunctionDecl &other ) - : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ), attribute( other.attribute ) { + : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) { + cloneAll( other.attributes, attributes ); } @@ -38,4 +40,5 @@ delete type; delete statements; + deleteAll( attributes ); } @@ -65,17 +68,7 @@ os << "_Noreturn "; } // if - switch ( attribute.type ) { - case Attribute::Constructor: - os << "Global Constructor "; - break; - case Attribute::Destructor: - os << "Global Destructor "; - break; - default: - break; - } - if ( attribute.priority != Attribute::Default ) { - os << "with priority " << attribute.priority << " "; - } + + printAll( attributes, os, indent ); + if ( get_storageClass() != DeclarationNode::NoStorageClass ) { os << DeclarationNode::storageName[ get_storageClass() ] << ' '; @@ -118,17 +111,7 @@ os << "_Noreturn "; } // if - switch ( attribute.type ) { - case Attribute::Constructor: - os << " Global Constructor "; - break; - case Attribute::Destructor: - os << " Global Destructor "; - break; - default: - break; - } - if ( attribute.priority != Attribute::Default ) { - os << "with priority " << attribute.priority << " "; - } + + // xxx - should printShort print attributes? + if ( get_storageClass() != DeclarationNode::NoStorageClass ) { os << DeclarationNode::storageName[ get_storageClass() ] << ' '; Index: src/SynTree/Initializer.cc =================================================================== --- src/SynTree/Initializer.cc (revision e04ef3a33b7695190c509b61da6fe0cfcf46b265) +++ src/SynTree/Initializer.cc (revision e50db109d71f2d05534388d73f26a49091a8ff14) @@ -20,4 +20,7 @@ Initializer::Initializer( bool maybeConstructed ) : maybeConstructed( maybeConstructed ) {} +Initializer::Initializer( const Initializer & other ) : maybeConstructed( other.maybeConstructed ) { +} + Initializer::~Initializer() {} @@ -39,7 +42,7 @@ } -SingleInit::~SingleInit() {} - -SingleInit *SingleInit::clone() const { return new SingleInit( *this); } +SingleInit::~SingleInit() { + deleteAll(designators); +} void SingleInit::print( std::ostream &os, int indent ) { @@ -58,11 +61,10 @@ ListInit::ListInit( const std::list &_initializers, const std::list &_designators, bool maybeConstructed ) - : Initializer( maybeConstructed), initializers( _initializers ), designators( _designators ) { + : Initializer( maybeConstructed ), initializers( _initializers ), designators( _designators ) { } -ListInit::~ListInit() {} - -ListInit *ListInit::clone() const { - return new ListInit( *this ); +ListInit::~ListInit() { + deleteAll( initializers ); + deleteAll( designators ); } @@ -85,11 +87,11 @@ ConstructorInit::ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init ) : Initializer( true ), ctor( ctor ), dtor( dtor ), init( init ) {} +ConstructorInit::ConstructorInit( const ConstructorInit &other ) : Initializer( other ), ctor( maybeClone( other.ctor ) ), dtor( maybeClone( other.dtor ) ), init( maybeClone( other.init ) ) { +} + ConstructorInit::~ConstructorInit() { delete ctor; + delete dtor; delete init; -} - -ConstructorInit *ConstructorInit::clone() const { - return new ConstructorInit( *this ); } Index: src/SynTree/Initializer.h =================================================================== --- src/SynTree/Initializer.h (revision e04ef3a33b7695190c509b61da6fe0cfcf46b265) +++ src/SynTree/Initializer.h (revision e50db109d71f2d05534388d73f26a49091a8ff14) @@ -20,4 +20,5 @@ #include "Visitor.h" #include "Mutator.h" +#include "Type.h" #include @@ -28,4 +29,5 @@ // Initializer( std::string _name = std::string(""), int _pos = 0 ); Initializer( bool maybeConstructed ); + Initializer( const Initializer & other ); virtual ~Initializer(); @@ -68,5 +70,5 @@ std::list &get_designators() { return designators; } - virtual SingleInit *clone() const; + virtual SingleInit *clone() const { return new SingleInit( *this); } virtual void accept( Visitor &v ) { v.visit( this ); } virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); } @@ -94,5 +96,5 @@ std::list::iterator end_initializers() { return initializers.end(); } - virtual ListInit *clone() const; + virtual ListInit *clone() const { return new ListInit( *this ); } virtual void accept( Visitor &v ) { v.visit( this ); } virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); } @@ -108,4 +110,5 @@ public: ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init ); + ConstructorInit( const ConstructorInit &other ); virtual ~ConstructorInit(); @@ -117,5 +120,5 @@ Initializer * get_init() const { return init; } - virtual ConstructorInit *clone() const; + ConstructorInit *clone() const { return new ConstructorInit( *this ); } virtual void accept( Visitor &v ) { v.visit( this ); } virtual Initializer *acceptMutator( Mutator &m ) { return m.mutate( this ); } Index: src/SynTree/Mutator.cc =================================================================== --- src/SynTree/Mutator.cc (revision e04ef3a33b7695190c509b61da6fe0cfcf46b265) +++ src/SynTree/Mutator.cc (revision e50db109d71f2d05534388d73f26a49091a8ff14) @@ -182,4 +182,9 @@ } +Statement *Mutator::mutate( ImplicitCtorDtorStmt *impCtorDtorStmt ) { + impCtorDtorStmt->set_callStmt( maybeMutate( impCtorDtorStmt->get_callStmt(), *this ) ); + return impCtorDtorStmt; +} + Expression *Mutator::mutate( ApplicationExpr *applicationExpr ) { mutateAll( applicationExpr->get_results(), *this ); Index: src/SynTree/Mutator.h =================================================================== --- src/SynTree/Mutator.h (revision e04ef3a33b7695190c509b61da6fe0cfcf46b265) +++ src/SynTree/Mutator.h (revision e50db109d71f2d05534388d73f26a49091a8ff14) @@ -52,4 +52,5 @@ virtual NullStmt* mutate( NullStmt *nullStmt ); virtual Statement* mutate( DeclStmt *declStmt ); + virtual Statement* mutate( ImplicitCtorDtorStmt *impCtorDtorStmt ); virtual Expression* mutate( ApplicationExpr *applicationExpr ); Index: src/SynTree/Statement.cc =================================================================== --- src/SynTree/Statement.cc (revision e04ef3a33b7695190c509b61da6fe0cfcf46b265) +++ src/SynTree/Statement.cc (revision e50db109d71f2d05534388d73f26a49091a8ff14) @@ -358,5 +358,5 @@ void CatchStmt::print( std::ostream &os, int indent ) const { - os << string( indent, ' ' ) << "Catch Statement" << endl; + os << "Catch Statement" << endl; os << string( indent, ' ' ) << "... catching" << endl; @@ -383,5 +383,5 @@ void FinallyStmt::print( std::ostream &os, int indent ) const { - os << string( indent, ' ' ) << "Finally Statement" << endl; + os << "Finally Statement" << endl; os << string( indent + 2, ' ' ) << "with block: " << endl; block->print( os, indent + 4 ); @@ -393,4 +393,21 @@ void NullStmt::print( std::ostream &os, int indent ) const { os << "Null Statement" << endl ; +} + +ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( Statement * callStmt ) : Statement( std::list