Changes in src/SynTree/Expression.cc [4cb935e:d5556a3]

File:

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

src/SynTree/Expression.cc

@@ -332 +332 @@
 }
 
+namespace {
+        TypeSubstitution makeSub( Type * t ) {
+                if ( StructInstType * aggInst = dynamic_cast< StructInstType * >( t ) ) {
+                        return TypeSubstitution( aggInst->get_baseParameters()->begin(), aggInst->get_baseParameters()->end(), aggInst->get_parameters().begin() );
+                } else if ( UnionInstType * aggInst = dynamic_cast< UnionInstType * >( t ) ) {
+                        return TypeSubstitution( aggInst->get_baseParameters()->begin(), aggInst->get_baseParameters()->end(), aggInst->get_parameters().begin() );
+                } else {
+                        assertf( false, "makeSub expects struct or union type for aggregate" );
+                }
+        }
+}
+
 
 MemberExpr::MemberExpr( DeclarationWithType *_member, Expression *_aggregate, Expression *_aname ) :
                 Expression( _aname ), member(_member), aggregate(_aggregate) {
-        set_result( member->get_type()->clone() );
+
+        TypeSubstitution sub( makeSub( aggregate->get_result() ) );
+        Type * res = member->get_type()->clone();
+        sub.apply( res );
+        set_result( res );
         get_result()->set_isLvalue( true );
 }
@@ -422 +438 @@
 }
 
-NameExpr::NameExpr( std::string _name, Expression *_aname ) : Expression( _aname ), name(_name) {
-        assertf(_name != "0", "Zero is not a valid name\n");
-        assertf(_name != "1", "One is not a valid name\n");
-}
+NameExpr::NameExpr( std::string _name, Expression *_aname ) : Expression( _aname ), name(_name) {}
 
 NameExpr::NameExpr( const NameExpr &other ) : Expression( other ), name( other.name ) {
@@ -511 +524 @@
 
 ImplicitCopyCtorExpr::~ImplicitCopyCtorExpr() {
+        set_env( nullptr ); // ImplicitCopyCtorExpr does not take ownership of an environment
         delete callExpr;
         deleteAll( tempDecls );
@@ -520 +534 @@
         os <<  "Implicit Copy Constructor Expression: " << std::endl;
         assert( callExpr );
+        os << std::string( indent+2, ' ' );
         callExpr->print( os, indent + 2 );
         os << std::endl << std::string( indent, ' ' ) << "with temporaries:" << std::endl;
@@ -571 +586 @@
         os << std::string( indent+2, ' ' );
         initializer->print( os, indent + 2 );
+        Expression::print( os, indent );
 }
 
@@ -590 +606 @@
         os << " ... ";
         high->print( os, indent );
+        Expression::print( os, indent );
 }
 
@@ -601 +618 @@
         }
 }
-StmtExpr::StmtExpr( const StmtExpr &other ) : Expression( other ), statements( other.statements->clone() ) {}
+StmtExpr::StmtExpr( const StmtExpr &other ) : Expression( other ), statements( other.statements->clone() ) {
+        cloneAll( other.returnDecls, returnDecls );
+        cloneAll( other.dtors, dtors );
+}
 StmtExpr::~StmtExpr() {
         delete statements;
+        deleteAll( dtors );
+        deleteAll( returnDecls );
 }
 void StmtExpr::print( std::ostream &os, int indent ) const {
         os << "Statement Expression: " << std::endl << std::string( indent, ' ' );
         statements->print( os, indent+2 );
+        if ( ! returnDecls.empty() ) {
+                os << std::string( indent+2, ' ' ) << "with returnDecls: ";
+                printAll( returnDecls, os, indent+2 );
+        }
+        if ( ! dtors.empty() ) {
+                os << std::string( indent+2, ' ' ) << "with dtors: ";
+                printAll( dtors, os, indent+2 );
+        }
+        Expression::print( os, indent );
 }
 
@@ -631 +662 @@
         get_expr()->print( os, indent+2 );
         if ( get_object() ) {
-                os << " with decl: ";
+                os << std::string( indent+2, ' ' ) << "with decl: ";
                 get_object()->printShort( os, indent+2 );
         }
+        Expression::print( os, indent );
 }