Changes in src/Tuples/TupleExpansion.cc [e6512c8:c0aa336]

File:

• src/Tuples/TupleExpansion.cc (modified) (4 diffs)

src/Tuples/TupleExpansion.cc

@@ -29 +29 @@
 #include "ResolvExpr/typeops.h"
 #include "InitTweak/GenInit.h"
-#include "InitTweak/InitTweak.h"
 
 namespace Tuples {
@@ -79 +78 @@
                         }
                   private:
-                        ScopedMap< int, StructDecl * > typeMap;
+                        ScopedMap< std::string, StructDecl * > typeMap;
                 };
 
@@ -214 +213 @@
 
         Type * TupleTypeReplacer::mutate( TupleType * tupleType ) {
+                std::string mangleName = SymTab::Mangler::mangleType( tupleType );
                 tupleType = safe_dynamic_cast< TupleType * > ( Parent::mutate( tupleType ) );
-                unsigned tupleSize = tupleType->size();
-                if ( ! typeMap.count( tupleSize ) ) {
-                        // generate struct type to replace tuple type based on the number of components in the tuple
-                        StructDecl * decl = new StructDecl( toString( "_tuple_type_", tupleSize  ) );
+                if ( ! typeMap.count( mangleName ) ) {
+                        // generate struct type to replace tuple type
+                        // xxx - should fix this to only generate one tuple struct for each number of type parameters
+                        StructDecl * decl = new StructDecl( "_tuple_type_" + mangleName );
                         decl->set_body( true );
-                        for ( size_t i = 0; i < tupleSize; ++i ) {
+                        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 );
                         }
-                        if ( tupleSize == 0 ) {
+                        if ( tupleType->size() == 0 ) {
                                 // empty structs are not standard C. Add a dummy field to empty tuples to silence warnings when a compound literal Tuple0 is created.
                                 decl->get_members().push_back( new ObjectDecl( "dummy", DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr ) );
                         }
-                        typeMap[tupleSize] = decl;
+                        typeMap[mangleName] = decl;
                         addDeclaration( decl );
                 }
                 Type::Qualifiers qualifiers = tupleType->get_qualifiers();
 
-                StructDecl * decl = typeMap[tupleSize];
+                StructDecl * decl = typeMap[mangleName];
                 StructInstType * newType = new StructInstType( qualifiers, decl );
                 for ( Type * t : *tupleType ) {
@@ -337 +337 @@
                 public:
                         typedef Visitor Parent;
-                        virtual void visit( ApplicationExpr * appExpr ) {
-                                if ( DeclarationWithType * function = InitTweak::getFunction( appExpr ) ) {
-                                        if ( function->get_linkage() == LinkageSpec::Intrinsic ) {
-                                                if ( function->get_name() == "*?" || function->get_name() == "?[?]" ) {
-                                                        // intrinsic dereference, subscript are pure, but need to recursively look for impurity
-                                                        Parent::visit( appExpr );
-                                                        return;
-                                                }
-                                        }
-                                }
-                                maybeImpure = true;
-                        }
+                        virtual void visit( ApplicationExpr * appExpr ) { maybeImpure = true;   }
                         virtual void visit( UntypedExpr * untypedExpr ) { maybeImpure = true; }
                         bool maybeImpure = false;