Changeset c8c03683 for src/SynTree

Timestamp:

Jun 14, 2016, 12:53:26 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

7ff30d07

Parents:

e04ef3a (diff), d14d96a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/SynTree

Files:

• Attribute.cc (added)
• Attribute.h (added)
• Declaration.h (modified) (3 diffs)
• FunctionDecl.cc (modified) (5 diffs)
• Initializer.cc (modified) (4 diffs)
• Initializer.h (modified) (6 diffs)
• Mutator.cc (modified) (1 diff)
• Mutator.h (modified) (1 diff)
• Statement.cc (modified) (3 diffs)
• Statement.h (modified) (3 diffs)
• SynTree.h (modified) (2 diffs)
• Type.cc (modified) (3 diffs)
• Type.h (modified) (1 diff)
• Visitor.cc (modified) (1 diff)
• Visitor.h (modified) (1 diff)
• module.mk (modified) (2 diffs)

src/SynTree/Declaration.h

@@ -115 +115 @@
         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 +128 @@
         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 +140 @@
         std::list< std::string > oldIdents;
         std::list< Declaration* > oldDecls;
-        Attribute attribute;
+        std::list< Attribute * > attributes;
 };
 

src/SynTree/FunctionDecl.cc

@@ -19 +19 @@
 #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 +33 @@
 
 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 +40 @@
         delete type;
         delete statements;
+        deleteAll( attributes );
 }
 
@@ -65 +68 @@
                 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 +111 @@
                 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() ] << ' ';

src/SynTree/Initializer.cc

@@ -20 +20 @@
 
 Initializer::Initializer( bool maybeConstructed ) : maybeConstructed( maybeConstructed ) {}
+Initializer::Initializer( const Initializer & other ) : maybeConstructed( other.maybeConstructed ) {
+}
+
 
 Initializer::~Initializer() {}
@@ -39 +42 @@
 }
 
-SingleInit::~SingleInit() {}
-
-SingleInit *SingleInit::clone() const { return new SingleInit( *this); }
+SingleInit::~SingleInit() {
+        deleteAll(designators);
+}
 
 void SingleInit::print( std::ostream &os, int indent ) {
@@ -58 +61 @@
 
 ListInit::ListInit( const std::list<Initializer*> &_initializers, const std::list<Expression *> &_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 +87 @@
 
 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 );
 }
 

src/SynTree/Initializer.h

@@ -20 +20 @@
 #include "Visitor.h"
 #include "Mutator.h"
+#include "Type.h"
 
 #include <cassert>
@@ -28 +29 @@
         //      Initializer( std::string _name = std::string(""), int _pos = 0 );
         Initializer( bool maybeConstructed );
+        Initializer( const Initializer & other );
         virtual ~Initializer();
 
@@ -68 +70 @@
         std::list<Expression *> &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 +96 @@
         std::list<Initializer*>::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 +110 @@
   public:
         ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init );
+        ConstructorInit( const ConstructorInit &other );
         virtual ~ConstructorInit();
 
@@ -117 +120 @@
         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 ); }

src/SynTree/Mutator.cc

@@ -182 +182 @@
 }
 
+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 );

src/SynTree/Mutator.h

@@ -52 +52 @@
         virtual NullStmt* mutate( NullStmt *nullStmt );
         virtual Statement* mutate( DeclStmt *declStmt );
+        virtual Statement* mutate( ImplicitCtorDtorStmt *impCtorDtorStmt );
 
         virtual Expression* mutate( ApplicationExpr *applicationExpr );

src/SynTree/Statement.cc

@@ -358 +358 @@
 
 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 +383 @@
 
 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 +393 @@
 void NullStmt::print( std::ostream &os, int indent ) const {
         os << "Null Statement" << endl ;
+}
+
+ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( Statement * callStmt ) : Statement( std::list<Label>() ), callStmt( callStmt ) {
+        assert( callStmt );
+}
+
+ImplicitCtorDtorStmt::ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other ) : Statement( other ), callStmt( other.callStmt ) {
+}
+
+ImplicitCtorDtorStmt::~ImplicitCtorDtorStmt() {
+}
+
+void ImplicitCtorDtorStmt::print( std::ostream &os, int indent ) const {
+        os << "Implicit Ctor Dtor Statement" << endl;
+        os << string( indent + 2, ' ' ) << "with Ctor/Dtor: ";
+        callStmt->print( os, indent + 2);
+        os << endl;
 }
 

src/SynTree/Statement.h

@@ -21 +21 @@
 #include "Mutator.h"
 #include "Common/SemanticError.h"
+#include "Type.h"
 
 class Statement {
@@ -394 +395 @@
         virtual ~DeclStmt();
 
-        Declaration *get_decl() { return decl; }
+        Declaration *get_decl() const { return decl; }
         void set_decl( Declaration *newValue ) { decl = newValue; }
 
@@ -404 +405 @@
         Declaration *decl;
 };
+
+
+/// represents an implicit application of a constructor or destructor. Qualifiers are replaced
+/// immediately before and after the call so that qualified objects can be constructed
+/// with the same functions as unqualified objects.
+class ImplicitCtorDtorStmt : public Statement {
+  public:
+        ImplicitCtorDtorStmt( Statement * callStmt );
+        ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other );
+        virtual ~ImplicitCtorDtorStmt();
+
+        Statement *get_callStmt() const { return callStmt; }
+        void set_callStmt( Statement * newValue ) { callStmt = newValue; }
+
+        virtual ImplicitCtorDtorStmt *clone() const { return new ImplicitCtorDtorStmt( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+
+  private:
+        // Non-owned pointer to the constructor/destructor statement
+        Statement * callStmt;
+};
+
 
 std::ostream & operator<<( std::ostream & out, Statement * statement );

src/SynTree/SynTree.h

@@ -56 +56 @@
 class DeclStmt;
 class NullStmt;
+class ImplicitCtorDtorStmt;
 
 class Expression;
@@ -117 +118 @@
 class TypeSubstitution;
 
+// gcc attribute
+class Attribute;
+
 #endif // SYNTREE_H
 

src/SynTree/Type.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Type.cc -- 
+// Type.cc --
 //
 // Author           : Richard C. Bilson
@@ -54 +54 @@
 }
 
+void Type::Qualifiers::print( std::ostream &os, int indent ) const {
+        if ( isConst ) {
+                os << "const ";
+        } // if
+        if ( isVolatile ) {
+                os << "volatile ";
+        } // if
+        if ( isRestrict ) {
+                os << "restrict ";
+        } // if
+        if ( isLvalue ) {
+                os << "lvalue ";
+        } // if
+        if ( isAtomic ) {
+                os << "_Atomic ";
+        } // if
+        if ( isAttribute ) {
+                os << "__attribute(( )) ";
+        } // if
+}
+
 void Type::print( std::ostream &os, int indent ) const {
         if ( ! forall.empty() ) {
@@ -60 +81 @@
                 os << std::string( indent+2, ' ' );
         } // if
-        if ( tq.isConst ) {
-                os << "const ";
-        } // if
-        if ( tq.isVolatile ) {
-                os << "volatile ";
-        } // if
-        if ( tq.isRestrict ) {
-                os << "restrict ";
-        } // if
-        if ( tq.isLvalue ) {
-                os << "lvalue ";
-        } // if
-        if ( tq.isAtomic ) {
-                os << "_Atomic ";
-        } // if
-        if ( tq.isAttribute ) {
-                os << "__attribute(( )) ";
-        } // if
+        tq.print( os, indent );
 }
 

src/SynTree/Type.h

@@ -36 +36 @@
                 bool operator<( const Qualifiers &other );
                 bool operator>( const Qualifiers &other );
+                void print( std::ostream &os, int indent = 0 ) const;
 
                 bool isConst;

src/SynTree/Visitor.cc

@@ -152 +152 @@
 }
 
+void Visitor::visit( ImplicitCtorDtorStmt *impCtorDtorStmt ) {
+        maybeAccept( impCtorDtorStmt->get_callStmt(), *this );
+}
+
 void Visitor::visit( ApplicationExpr *applicationExpr ) {
         acceptAll( applicationExpr->get_results(), *this );

src/SynTree/Visitor.h

@@ -52 +52 @@
         virtual void visit( NullStmt *nullStmt );
         virtual void visit( DeclStmt *declStmt );
+        virtual void visit( ImplicitCtorDtorStmt *impCtorDtorStmt );
 
         virtual void visit( ApplicationExpr *applicationExpr );

src/SynTree/module.mk

@@ -6 +6 @@
 ## file "LICENCE" distributed with Cforall.
 ##
-## module.mk -- 
+## module.mk --
 ##
 ## Author           : Richard C. Bilson
@@ -46 +46 @@
        SynTree/Visitor.cc \
        SynTree/Mutator.cc \
-       SynTree/TypeSubstitution.cc
+       SynTree/TypeSubstitution.cc \
+       SynTree/Attribute.cc