Changeset 37a3b8f9

Timestamp:

Nov 10, 2015, 4:15:48 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

d8847b7

Parents:

d2ded3e7

Message:

First code generation for generic types (incorrect)

Location:

src

Files:

• Parser/TypeData.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (1 diff)
• SynTree/ReferenceToType.cc (modified) (2 diffs)
• SynTree/Type.h (modified) (2 diffs)
• SynTree/TypeSubstitution.cc (modified) (3 diffs)
• SynTree/TypeSubstitution.h (modified) (1 diff)

src/Parser/TypeData.cc

@@ -799 +799 @@
           case DeclarationNode::Struct:
                 at = new StructDecl( aggregate->name );
+                buildForall( aggregate->params, at->get_parameters() );
                 break;
           case DeclarationNode::Union:
                 at = new UnionDecl( aggregate->name );
+                buildForall( aggregate->params, at->get_parameters() );
                 break;
           case DeclarationNode::Context:
                 at = new ContextDecl( aggregate->name );
+                buildList( aggregate->params, at->get_parameters() );
                 break;
           default:
                 assert( false );
         } // switch
-        buildList( aggregate->params, at->get_parameters() );
+//      buildList( aggregate->params, at->get_parameters() );
         buildList( aggregate->fields, at->get_members() );
 

src/SymTab/Validate.cc

@@ -629 +629 @@
         Declaration *makeStructAssignment( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting ) {
                 FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
+
+                // Make function polymorphic in same parameters as generic struct, if applicable
+                std::list< TypeDecl* >& genericParams = aggregateDecl->get_parameters();
+                for ( std::list< TypeDecl* >::const_iterator param = genericParams.begin(); param != genericParams.end(); ++param ) {
+                        assignType->get_forall().push_back( (*param)->clone() );
+                }
   
                 ObjectDecl *returnVal = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, refType->clone(), 0 );

src/SynTree/ReferenceToType.cc

@@ -59 +59 @@
 std::string StructInstType::typeString() const { return "struct"; }
 
+std::list<TypeDecl*>& StructInstType::get_baseParameters() { return baseStruct->get_parameters(); }
+
 void StructInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
         assert( baseStruct );
@@ -65 +67 @@
 
 std::string UnionInstType::typeString() const { return "union"; }
+
+std::list<TypeDecl*>& UnionInstType::get_baseParameters() { return baseUnion->get_parameters(); }
 
 void UnionInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {

src/SynTree/Type.h

@@ -237 +237 @@
         StructDecl *get_baseStruct() const { return baseStruct; }
         void set_baseStruct( StructDecl *newValue ) { baseStruct = newValue; }
-        
-        // a utility function
+
+        /// Accesses generic parameters of base struct
+        std::list<TypeDecl*>& get_baseParameters();
+        
+        /// Looks up the members of this struct named "name" and places them into "foundDecls".
+        /// Clones declarations into "foundDecls", caller responsible for freeing
         void lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const;
 
@@ -260 +264 @@
         UnionDecl *get_baseUnion() const { return baseUnion; }
         void set_baseUnion( UnionDecl *newValue ) { baseUnion = newValue; }
-        
-        // a utility function
+
+        /// Accesses generic parameters of base union
+        std::list<TypeDecl*>& get_baseParameters();
+        
+        /// looks up the members of this union named "name" and places them into "foundDecls"
+        /// Clones declarations into "foundDecls", caller responsible for freeing
         void lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const;
 

src/SynTree/TypeSubstitution.cc

@@ -126 +126 @@
 Type *TypeSubstitution::handleType( TypeClass *type ) {
         BoundVarsType oldBoundVars( boundVars );
+        // bind type variables from forall-qualifiers
         if ( freeOnly ) {
                 for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
@@ -136 +137 @@
 }
 
+template< typename TypeClass >
+Type *TypeSubstitution::handleAggregateType( TypeClass *type ) {
+        BoundVarsType oldBoundVars( boundVars );
+        // bind type variables from forall-qualifiers
+        if ( freeOnly ) {
+                for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+                        boundVars.insert( (*tyvar )->get_name() );
+                } // for
+        } // if
+        // bind type variables from generic type instantiations
+        for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_baseParameters().begin(); tyvar != type->get_baseParameters().end(); ++tyvar ) {
+                boundVars.insert( (*tyvar)->get_name() );
+        } // for
+        Type *ret = Mutator::mutate( type );
+        boundVars = oldBoundVars;
+        return ret;
+}
+
 Type * TypeSubstitution::mutate( VoidType *basicType ) {
         return handleType( basicType );
@@ -157 +176 @@
 
 Type * TypeSubstitution::mutate( StructInstType *aggregateUseType ) {
-        return handleType( aggregateUseType );
+        return handleAggregateType( aggregateUseType );
 }
 
 Type * TypeSubstitution::mutate( UnionInstType *aggregateUseType ) {
-        return handleType( aggregateUseType );
+        return handleAggregateType( aggregateUseType );
 }
 

src/SynTree/TypeSubstitution.h

@@ -58 +58 @@
         virtual Type* mutate(TypeInstType *aggregateUseType);
         virtual Expression* mutate(NameExpr *nameExpr);
-        
+
+        /// Records type variable bindings from forall-statements
         template< typename TypeClass > Type *handleType( TypeClass *type );
+        /// Records type variable bindings from forall-statements and instantiations of generic types
+        template< typename TypeClass > Type *handleAggregateType( TypeClass *type );
         
         virtual Type* mutate(VoidType *basicType);