Changeset 6943a987 for src/SynTree

Timestamp:

Aug 29, 2016, 10:33:05 AM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

5e644d3e

Parents:

79841be (diff), 413ad05 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/SynTree

Files:

• AggregateDecl.cc (modified) (1 diff)
• Declaration.cc (modified) (2 diffs)
• Declaration.h (modified) (7 diffs)
• DeclarationWithType.cc (modified) (2 diffs)
• Expression.cc (modified) (3 diffs)
• FunctionDecl.cc (modified) (3 diffs)
• Initializer.cc (modified) (1 diff)
• ObjectDecl.cc (modified) (2 diffs)
• Statement.cc (modified) (7 diffs)
• Statement.h (modified) (2 diffs)
• TypeSubstitution.h (modified) (1 diff)

src/SynTree/AggregateDecl.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// AggregateDecl.cc -- 
+// AggregateDecl.cc --
 //
 // Author           : Richard C. Bilson

src/SynTree/Declaration.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Dec 09 14:08:29 2015
-// Update Count     : 12
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 18 23:49:57 2016
+// Update Count     : 13
 //
 
@@ -27 +27 @@
 static IdMapType idMap;
 
-Declaration::Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage )
+Declaration::Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage )
                 : name( name ), storageClass( sc ), linkage( linkage ), isInline( false ), isNoreturn( false ), uniqueId( 0 ) {
 }

src/SynTree/Declaration.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 21:03:17 2016
-// Update Count     : 39
+// Last Modified On : Thu Aug 18 23:50:24 2016
+// Update Count     : 40
 //
 
@@ -26 +26 @@
 class Declaration {
   public:
-        Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage );
+        Declaration( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage );
         Declaration( const Declaration &other );
         virtual ~Declaration();
@@ -34 +34 @@
         DeclarationNode::StorageClass get_storageClass() const { return storageClass; }
         void set_storageClass( DeclarationNode::StorageClass newValue ) { storageClass = newValue; }
-        LinkageSpec::Type get_linkage() const { return linkage; }
-        void set_linkage( LinkageSpec::Type newValue ) { linkage = newValue; }
+        LinkageSpec::Spec get_linkage() const { return linkage; }
+        void set_linkage( LinkageSpec::Spec newValue ) { linkage = newValue; }
         bool get_isInline() const { return isInline; }
         void set_isInline( bool newValue ) { isInline = newValue; }
@@ -56 +56 @@
         std::string name;
         DeclarationNode::StorageClass storageClass;
-        LinkageSpec::Type linkage;
+        LinkageSpec::Spec linkage;
         bool isInline, isNoreturn;
         UniqueId uniqueId;
@@ -64 +64 @@
 class DeclarationWithType : public Declaration {
   public:
-        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, const std::list< Attribute * > & attributes );
+        DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes );
         DeclarationWithType( const DeclarationWithType &other );
         virtual ~DeclarationWithType();
@@ -97 +97 @@
         typedef DeclarationWithType Parent;
   public:
-        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes = std::list< Attribute * >(), bool isInline = false, bool isNoreturn = false );
+        ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes = std::list< Attribute * >(), bool isInline = false, bool isNoreturn = false );
         ObjectDecl( const ObjectDecl &other );
         virtual ~ObjectDecl();
@@ -123 +123 @@
         typedef DeclarationWithType Parent;
   public:
-        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 std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, const std::list< Attribute * > attributes = std::list< Attribute * >() );
         FunctionDecl( const FunctionDecl &other );
         virtual ~FunctionDecl();

src/SynTree/DeclarationWithType.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Apr 11 15:35:27 2016
-// Update Count     : 3
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 18 23:50:41 2016
+// Update Count     : 4
 //
 
@@ -19 +19 @@
 #include "Common/utility.h"
 
-DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, const std::list< Attribute * > & attributes )
+DeclarationWithType::DeclarationWithType( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes )
                 : Declaration( name, sc, linkage ), attributes( attributes ) {
 }

src/SynTree/Expression.cc

@@ -200 +200 @@
 
 OffsetofExpr::OffsetofExpr( const OffsetofExpr &other ) :
-        Expression( other ), type( maybeClone( other.type ) ), member( maybeClone( other.member ) ) {}
+        Expression( other ), type( maybeClone( other.type ) ), member( other.member ) {}
 
 OffsetofExpr::~OffsetofExpr() {
         delete type;
-        delete member;
 }
 
@@ -359 +358 @@
         assert( member );
         os << std::string( indent + 2, ' ' );
+        os << (void*)member << " ";
         member->print( os, indent + 2 );
         os << std::endl;
@@ -383 +383 @@
                 Expression( _aname ), function(_function), args(_args) {}
 
-UntypedExpr::~UntypedExpr() {}
+UntypedExpr::~UntypedExpr() {
+        delete function;
+        deleteAll( args );
+}
 
 void UntypedExpr::print( std::ostream &os, int indent ) const {

src/SynTree/FunctionDecl.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 15:59:48 2016
-// Update Count     : 19
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 18 23:50:14 2016
+// Update Count     : 20
 //
 
@@ -22 +22 @@
 #include "Common/utility.h"
 
-FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes )
+FunctionDecl::FunctionDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements, bool isInline, bool isNoreturn, std::list< Attribute * > attributes )
                 : Parent( name, sc, linkage, attributes ), type( type ), statements( statements ) {
         set_isInline( isInline );
@@ -39 +39 @@
         delete type;
         delete statements;
+        deleteAll( oldDecls );
 }
 

src/SynTree/Initializer.cc

@@ -43 +43 @@
 
 SingleInit::~SingleInit() {
+        delete value;
         deleteAll(designators);
 }

src/SynTree/ObjectDecl.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 13 13:23:32 2016
-// Update Count     : 30
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 18 23:50:33 2016
+// Update Count     : 31
 //
 
@@ -22 +22 @@
 #include "Statement.h"
 
-ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Type linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, bool isInline, bool isNoreturn )
+ObjectDecl::ObjectDecl( const std::string &name, DeclarationNode::StorageClass sc, LinkageSpec::Spec linkage, Expression *bitfieldWidth, Type *type, Initializer *init, const std::list< Attribute * > attributes, bool isInline, bool isNoreturn )
         : Parent( name, sc, linkage, attributes ), type( type ), init( init ), bitfieldWidth( bitfieldWidth ) {
         set_isInline( isInline );

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:25:20 2016
-// Update Count     : 61
+// Last Modified On : Fri Aug 12 13:58:48 2016
+// Update Count     : 62
 //
 
@@ -124 +124 @@
         Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {}
 
-IfStmt::~IfStmt() {}
+IfStmt::~IfStmt() {
+        delete condition;
+        delete thenPart;
+        delete elsePart;
+}
 
 void IfStmt::print( std::ostream &os, int indent ) const {
@@ -155 +159 @@
         delete condition;
         // destroy statements
+        deleteAll( statements );
 }
 
@@ -183 +188 @@
 CaseStmt::~CaseStmt() {
         delete condition;
+        deleteAll( stmts );
 }
 
@@ -216 +222 @@
 WhileStmt::~WhileStmt() {
         delete body;
+        delete condition;
 }
 
@@ -290 +297 @@
 TryStmt::~TryStmt() {
         delete block;
+        deleteAll( handlers );
+        delete finallyBlock;
 }
 
@@ -309 +318 @@
 }
 
-CatchStmt::CatchStmt( std::list<Label> labels, Declaration *_decl, Statement *_body, bool isCatchRest ) :
-        Statement( labels ), decl ( _decl ), body( _body ), catchRest ( isCatchRest ) {
+CatchStmt::CatchStmt( std::list<Label> labels, Declaration *_decl, Statement *_body, bool catchAny ) :
+        Statement( labels ), decl ( _decl ), body( _body ), catchRest ( catchAny ) {
 }
 

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:26:02 2016
-// Update Count     : 64
+// Last Modified On : Fri Aug 12 13:57:46 2016
+// Update Count     : 65
 //
 
@@ -314 +314 @@
 class CatchStmt : public Statement {
   public:
-        CatchStmt( std::list<Label> labels, Declaration *decl, Statement *body, bool isCatchRest = false );
+        CatchStmt( std::list<Label> labels, Declaration *decl, Statement *body, bool catchAny = false );
         CatchStmt( const CatchStmt &other );
         virtual ~CatchStmt();

src/SynTree/TypeSubstitution.h

@@ -169 +169 @@
         TypeSubstitution sub = TypeSubstitution( formalBegin, formalEnd, actual );
         for ( std::list< Declaration* >::iterator i = memberBegin; i != memberEnd; ++i ) {
-                Declaration *newdecl = (*i)->clone();
-                sub.apply( newdecl );
-                *out++ = newdecl;
+                sub.apply( *i );
+                *out++ = *i;
         } // for
 }