Changeset d9fa60a for src/SynTree

Timestamp:

Nov 16, 2016, 4:37:50 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

186fd86

Parents:

33a7b6d

Message:

moved substituion into MemberExpr? constructor, change generated tuple structs to generic structs, tuples containing type variables almost works

File:

• src/SynTree/Expression.cc (modified) (1 diff)

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 );
 }