Changeset fbcde64 for src/SynTree

Timestamp:

Mar 30, 2017, 5:21:07 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, 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:

936a287

Parents:

89ae7f4

Message:

remove duplication in compound literal, support aggregate-type compound literals

Location:

src/SynTree

Files:

• Expression.cc (modified) (3 diffs)
• Expression.h (modified) (4 diffs)
• Mutator.cc (modified) (2 diffs)
• Visitor.cc (modified) (2 diffs)

src/SynTree/Expression.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:42:04 2017
-// Update Count     : 51
+// Last Modified On : Thu Mar 30 16:41:13 2017
+// Update Count     : 52
 //
 
@@ -571 +571 @@
 
 
-CompoundLiteralExpr::CompoundLiteralExpr( Type * type, Initializer * initializer ) : type( type ), initializer( initializer ) {
+CompoundLiteralExpr::CompoundLiteralExpr( Type * type, Initializer * initializer ) : initializer( initializer ) {
         assert( type && initializer );
-        set_result( type->clone() );
-}
-
-CompoundLiteralExpr::CompoundLiteralExpr( const CompoundLiteralExpr &other ) : Expression( other ), type( other.type->clone() ), initializer( other.initializer->clone() ) {}
+        set_result( type );
+}
+
+CompoundLiteralExpr::CompoundLiteralExpr( const CompoundLiteralExpr &other ) : Expression( other ), initializer( other.initializer->clone() ) {}
 
 CompoundLiteralExpr::~CompoundLiteralExpr() {
         delete initializer;
-        delete type;
 }
 
@@ -586 +585 @@
         os << "Compound Literal Expression: " << std::endl;
         os << std::string( indent+2, ' ' );
-        type->print( os, indent + 2 );
+        get_result()->print( os, indent + 2 );
         os << std::string( indent+2, ' ' );
         initializer->print( os, indent + 2 );

src/SynTree/Expression.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jan 14 14:37:54 2017
-// Update Count     : 37
+// Last Modified On : Thu Mar 30 16:44:00 2017
+// Update Count     : 41
 //
 
@@ -35 +35 @@
 
         Type *& get_result() { return result; }
+        const Type * get_result() const { return result; }
         void set_result( Type * newValue ) { result = newValue; }
         bool has_result() const { return result != nullptr; }
@@ -586 +587 @@
         virtual ~CompoundLiteralExpr();
 
-        Type * get_type() const { return type; }
-        void set_type( Type * t ) { type = t; }
-
         Initializer * get_initializer() const { return initializer; }
         void set_initializer( Initializer * i ) { initializer = i; }
@@ -597 +595 @@
         virtual void print( std::ostream & os, int indent = 0 ) const;
   private:
-        Type * type;
         Initializer * initializer;
 };

src/SynTree/Mutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 15:02:23 2017
-// Update Count     : 21
+// Last Modified On : Thu Mar 30 16:45:19 2017
+// Update Count     : 22
 //
 
@@ -369 +369 @@
         compLitExpr->set_env( maybeMutate( compLitExpr->get_env(), *this ) );
         compLitExpr->set_result( maybeMutate( compLitExpr->get_result(), *this ) );
-        compLitExpr->set_type( maybeMutate( compLitExpr->get_type(), *this ) );
         compLitExpr->set_initializer( maybeMutate( compLitExpr->get_initializer(), *this ) );
         return compLitExpr;

src/SynTree/Visitor.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 15:01:25 2017
-// Update Count     : 23
+// Last Modified On : Thu Mar 30 16:45:25 2017
+// Update Count     : 24
 //
 
@@ -292 +292 @@
 void Visitor::visit( CompoundLiteralExpr *compLitExpr ) {
         maybeAccept( compLitExpr->get_result(), *this );
-        maybeAccept( compLitExpr->get_type(), *this );
         maybeAccept( compLitExpr->get_initializer(), *this );
 }