Changes in src/SynTree/Expression.cc [62423350:4b0f997]

File:

• src/SynTree/Expression.cc (modified) (7 diffs)

src/SynTree/Expression.cc

@@ -21 +21 @@
 #include <iterator>
 
+#include "Type.h"
+#include "Initializer.h"
+#include "Expression.h"
 #include "Declaration.h"
-#include "Expression.h"
-#include "Initializer.h"
 #include "Statement.h"
-#include "Type.h"
 #include "TypeSubstitution.h"
-#include "VarExprReplacer.h"
-
 #include "Common/utility.h"
-#include "Common/PassVisitor.h"
-
 #include "InitTweak/InitTweak.h"
 
@@ -96 +92 @@
 
         Declaration *decl = get_var();
+        // if ( decl != 0) decl->print(os, indent + 2);
         if ( decl != 0) decl->printShort(os, indent + 2);
         os << std::endl;
@@ -290 +287 @@
         delete arg;
 }
+
+// CastExpr *CastExpr::clone() const { return 0; }
 
 void CastExpr::print( std::ostream &os, int indent ) const {
@@ -356 +355 @@
 }
 
+//// is this right? It's cloning the member, but the member is a declaration so probably shouldn't be cloned...
 MemberExpr::MemberExpr( const MemberExpr &other ) :
                 Expression( other ), member( other.member ), aggregate( maybeClone( other.aggregate ) ) {
@@ -361 +361 @@
 
 MemberExpr::~MemberExpr() {
-        // don't delete the member declaration, since it points somewhere else in the tree
+        // delete member;
         delete aggregate;
 }
@@ -591 +591 @@
 }
 
+UntypedValofExpr::UntypedValofExpr( const UntypedValofExpr & other ) : Expression( other ), body ( maybeClone( other.body ) ) {}
+
+UntypedValofExpr::~UntypedValofExpr() { delete body; }
+
+void UntypedValofExpr::print( std::ostream &os, int indent ) const {
+        os << std::string( indent, ' ' ) << "Valof Expression: " << std::endl;
+        if ( get_body() != 0 )
+                get_body()->print( os, indent + 2 );
+}
+
 RangeExpr::RangeExpr( Expression *low, Expression *high ) : low( low ), high( high ) {}
 RangeExpr::RangeExpr( const RangeExpr &other ) : Expression( other ), low( other.low->clone() ), high( other.high->clone() ) {}
@@ -660 +670 @@
 }
 
-InitAlternative::InitAlternative( Type * type, Designation * designation ) : type( type ), designation( designation ) {}
-InitAlternative::InitAlternative( const InitAlternative & other ) : type( maybeClone( other.type ) ), designation( maybeClone( other.designation ) ) {}
-InitAlternative::~InitAlternative() {
-        delete type;
-        delete designation;
-}
-
-UntypedInitExpr::UntypedInitExpr( Expression * expr, const std::list<InitAlternative> & initAlts ) : expr( expr ), initAlts( initAlts ) {}
-UntypedInitExpr::UntypedInitExpr( const UntypedInitExpr & other ) : Expression( other ), expr( maybeClone( other.expr ) ), initAlts( other.initAlts ) {}
-UntypedInitExpr::~UntypedInitExpr() {
-        delete expr;
-}
-
-void UntypedInitExpr::print( std::ostream & os, int indent ) const {
-        os << "Untyped Init Expression" << std::endl << std::string( indent+2, ' ' );
-        expr->print( os, indent+2 );
-        if ( ! initAlts.empty() ) {
-                for ( const InitAlternative & alt : initAlts ) {
-                        os << std::string( indent+2, ' ' ) <<  "InitAlternative: ";
-                        alt.type->print( os, indent+2 );
-                        alt.designation->print( os, indent+2 );
-                }
-        }
-}
-
-InitExpr::InitExpr( Expression * expr, Designation * designation ) : expr( expr ), designation( designation ) {
-        set_result( expr->get_result()->clone() );
-}
-InitExpr::InitExpr( const InitExpr & other ) : Expression( other ), expr( maybeClone( other.expr ) ), designation( maybeClone( other.designation) ) {}
-InitExpr::~InitExpr() {
-        delete expr;
-        delete designation;
-}
-
-void InitExpr::print( std::ostream & os, int indent ) const {
-        os << "Init Expression" << std::endl << std::string( indent+2, ' ' );
-        expr->print( os, indent+2 );
-        os << std::string( indent+2, ' ' ) << "with designation: ";
-        designation->print( os, indent+2 );
-}
-
-
 std::ostream & operator<<( std::ostream & out, const Expression * expr ) {
         if ( expr ) {