Changeset fa463f1 for src/SynTree

Timestamp:

Aug 30, 2016, 4:26:01 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

c8dfcd3

Parents:

3906301 (diff), 32a2a99 (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' into ctor

Location:

src/SynTree

Files:

• Declaration.h (modified) (1 diff)
• NamedTypeDecl.cc (modified) (4 diffs)
• ReferenceToType.cc (modified) (4 diffs)
• Type.h (modified) (1 diff)

src/SynTree/Declaration.h

@@ -153 +153 @@
   public:
         NamedTypeDecl( const std::string &name, DeclarationNode::StorageClass sc, Type *type );
-        NamedTypeDecl( const TypeDecl &other );
+        NamedTypeDecl( const NamedTypeDecl &other );
         virtual ~NamedTypeDecl();
 

src/SynTree/NamedTypeDecl.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// NamedTypeDecl.cc -- 
+// NamedTypeDecl.cc --
 //
 // Author           : Richard C. Bilson
@@ -21 +21 @@
         : Parent( name, sc, LinkageSpec::Cforall ), base( base ) {}
 
-NamedTypeDecl::NamedTypeDecl( const TypeDecl &other )
+NamedTypeDecl::NamedTypeDecl( const NamedTypeDecl &other )
         : Parent( other ), base( maybeClone( other.base ) ) {
         cloneAll( other.parameters, parameters );
@@ -35 +35 @@
 void NamedTypeDecl::print( std::ostream &os, int indent ) const {
         using namespace std;
-        
+
         if ( get_name() != "" ) {
                 os << get_name() << ": ";
@@ -59 +59 @@
 void NamedTypeDecl::printShort( std::ostream &os, int indent ) const {
         using namespace std;
-        
+
         if ( get_name() != "" ) {
                 os << get_name() << ": ";

src/SynTree/ReferenceToType.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ReferenceToType.cc -- 
+// ReferenceToType.cc --
 //
 // Author           : Richard C. Bilson
@@ -36 +36 @@
 void ReferenceToType::print( std::ostream &os, int indent ) const {
         using std::endl;
-        
+
         Type::print( os, indent );
         os << "instance of " << typeString() << " " << name << " ";
@@ -128 +128 @@
 }
 
+TypeInstType::~TypeInstType() {
+        // delete baseType; //This is shared and should not be deleted
+}
+
 void TypeInstType::set_baseType( TypeDecl *newValue ) {
         baseType = newValue;
@@ -137 +141 @@
 void TypeInstType::print( std::ostream &os, int indent ) const {
         using std::endl;
-        
+
         Type::print( os, indent );
         os << "instance of " << typeString() << " " << get_name() << " (" << ( isFtype ? "" : "not" ) << " function type) ";

src/SynTree/Type.h

@@ -327 +327 @@
         TypeInstType( const Type::Qualifiers &tq, const std::string &name, bool isFtype );
         TypeInstType( const TypeInstType &other ) : Parent( other ), baseType( other.baseType ), isFtype( other.isFtype ) {}
+        ~TypeInstType();
 
         TypeDecl *get_baseType() const { return baseType; }