Changeset d9fa60a for src/Tuples

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/Tuples/TupleExpansion.cc (modified) (2 diffs)

src/Tuples/TupleExpansion.cc ¶

@@ -93 +93 @@
                         typedef Mutator Parent;
                         using Parent::mutate;
-                        
+
                         virtual Expression * mutate( TupleExpr * tupleExpr ) override;
                 };
@@ -218 +218 @@
         Type * TupleTypeReplacer::mutate( TupleType * tupleType ) {
                 std::string mangleName = SymTab::Mangler::mangleType( tupleType );
-                TupleType * newType = safe_dynamic_cast< TupleType * > ( Parent::mutate( tupleType ) );
+                tupleType = safe_dynamic_cast< TupleType * > ( Parent::mutate( tupleType ) );
                 if ( ! typeMap.count( mangleName ) ) {
                         // generate struct type to replace tuple type
                         StructDecl * decl = new StructDecl( "_tuple_type_" + mangleName );
                         decl->set_body( true );
-                        int cnt = 0;
-                        for ( Type * t : *newType ) {
-                                decl->get_members().push_back( new ObjectDecl( toString("field_", cnt++), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, t->clone(), nullptr ) );
+                        for ( size_t i = 0; i < tupleType->size(); ++i ) {
+                                TypeDecl * tyParam = new TypeDecl( toString("tuple_param_", i), DeclarationNode::NoStorageClass, nullptr, TypeDecl::Any );
+                                decl->get_members().push_back( new ObjectDecl( toString("field_", i), DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, new TypeInstType( Type::Qualifiers(), tyParam->get_name(), tyParam ), nullptr ) );
+                                decl->get_parameters().push_back( tyParam );
                         }
                         typeMap[mangleName] = decl;
                         addDeclaration( decl );
                 }
-                Type::Qualifiers qualifiers = newType->get_qualifiers();
-                delete newType;
-                return new StructInstType( qualifiers, typeMap[mangleName] );
+                Type::Qualifiers qualifiers = tupleType->get_qualifiers();
+
+                StructDecl * decl = typeMap[mangleName];
+                StructInstType * newType = new StructInstType( qualifiers, decl );
+                for ( Type * t : *tupleType ) {
+                        newType->get_parameters().push_back( new TypeExpr( t->clone() ) );
+                }
+                delete tupleType;
+                return newType;
         }