Changes in src/SynTree/Expression.cc [b6fe7e6:6eb8948]

File:

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

src/SynTree/Expression.cc

@@ -311 +311 @@
 }
 
-UntypedMemberExpr::UntypedMemberExpr( std::string _member, Expression *_aggregate, Expression *_aname ) :
+UntypedMemberExpr::UntypedMemberExpr( Expression * _member, Expression *_aggregate, Expression *_aname ) :
                 Expression( _aname ), member(_member), aggregate(_aggregate) {}
 
 UntypedMemberExpr::UntypedMemberExpr( const UntypedMemberExpr &other ) :
-                Expression( other ), member( other.member ), aggregate( maybeClone( other.aggregate ) ) {
+                Expression( other ), member( maybeClone( other.member ) ), aggregate( maybeClone( other.aggregate ) ) {
 }
 
 UntypedMemberExpr::~UntypedMemberExpr() {
         delete aggregate;
+        delete member;
 }
 
 void UntypedMemberExpr::print( std::ostream &os, int indent ) const {
-        os << "Untyped Member Expression, with field: " << get_member();
+        os << "Untyped Member Expression, with field: " << std::endl;
+        get_member()->print(os, indent+4);
+        os << std::string( indent+2, ' ' );
 
         Expression *agg = get_aggregate();
-        os << ", from aggregate: ";
+        os << "from aggregate: " << std::endl;
         if (agg != 0) {
-                os << std::string( indent + 2, ' ' );
-                agg->print(os, indent + 2);
+                os << std::string( indent + 4, ' ' );
+                agg->print(os, indent + 4);
         }
         os << std::string( indent+2, ' ' );
@@ -372 +375 @@
 }
 
-
-UntypedExpr::UntypedExpr( Expression *_function, Expression *_aname ) : Expression( _aname ), function( _function ) {}
+UntypedExpr::UntypedExpr( Expression *_function, const std::list<Expression *> &_args, Expression *_aname ) :
+                Expression( _aname ), function(_function), args(_args) {}
 
 UntypedExpr::UntypedExpr( const UntypedExpr &other ) :
@@ -379 +382 @@
         cloneAll( other.args, args );
 }
-
-UntypedExpr::UntypedExpr( Expression *_function, std::list<Expression *> &_args, Expression *_aname ) :
-                Expression( _aname ), function(_function), args(_args) {}
 
 UntypedExpr::~UntypedExpr() {
@@ -565 +565 @@
 }
 
+StmtExpr::StmtExpr( CompoundStmt *statements ) : statements( statements ) {
+        assert( statements );
+        std::list< Statement * > & body = statements->get_kids();
+        if ( ! body.empty() ) {
+                if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( body.back() ) ) {
+                        cloneAll( exprStmt->get_expr()->get_results(), get_results() );
+                }
+        }
+}
+StmtExpr::StmtExpr( const StmtExpr &other ) : statements( other.statements->clone() ) {}
+StmtExpr::~StmtExpr() {
+        delete statements;
+}
+void StmtExpr::print( std::ostream &os, int indent ) const {
+        os << std::string( indent, ' ' ) << "Statement Expression: " << std::endl;
+        statements->print( os, indent+2 );
+}
+
 std::ostream & operator<<( std::ostream & out, const Expression * expr ) {
         expr->print( out );