Changeset 70f89d00 for src/SynTree

Timestamp:

May 30, 2016, 12:51:22 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f1b1e4c

Parents:

677c1be

Message:

function scoped const objects can be constructed, add missing copy constructors to Initializer.cc

Location:

src/SynTree

Files:

• Initializer.cc (modified) (4 diffs)
• Initializer.h (modified) (7 diffs)

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 );
 }
 
@@ -84 +86 @@
 
 
-ConstructorInit::ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init ) : Initializer( true ), ctor( ctor ), dtor( dtor ), init( init ) {}
+ConstructorInit::ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init, ObjectDecl * object, Type::Qualifiers qualifiers ) : Initializer( true ), ctor( ctor ), dtor( dtor ), init( init ), object( object ), qualifiers( qualifiers ) {}
+ConstructorInit::ConstructorInit( const ConstructorInit &other ) : Initializer( other ), ctor( maybeClone( other.ctor ) ), dtor( maybeClone( other.dtor ) ), init( maybeClone( other.init ) ), object( other.object ), qualifiers( other.qualifiers ) {
+}
+
 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 ); }
@@ -107 +109 @@
 class ConstructorInit : public Initializer {
   public:
-        ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init );
+        ConstructorInit( Statement * ctor, Statement * dtor, Initializer * init, ObjectDecl * objectDecl, Type::Qualifiers qualifiers );
+        ConstructorInit( const ConstructorInit &other );
         virtual ~ConstructorInit();
 
@@ -116 +119 @@
         void set_init( Initializer * newValue ) { init = newValue; }
         Initializer * get_init() const { return init; }
+        void set_object( ObjectDecl * newValue ) { object = newValue; }
+        ObjectDecl * get_object() const { return object; }
+        void set_qualifiers( Type::Qualifiers newValue ) { qualifiers = newValue; }
+        Type::Qualifiers get_qualifiers() { return qualifiers; }
 
-        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 ); }
@@ -128 +135 @@
         // if an appropriate constructor definition is not found by the resolver
         Initializer * init;
+        // Non-owned pointer back to the object being constructed
+        ObjectDecl * object;
+        // to construct const objects, need to first remove type qualifiers, then resolve
+        // then add qualifiers back onto object
+        Type::Qualifiers qualifiers;
 };