Changeset 37a3b8f


Ignore:
Timestamp:
Nov 10, 2015, 4:15:48 PM (6 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, string, with_gc
Children:
d8847b7
Parents:
d2ded3e7
Message:

First code generation for generic types (incorrect)

Location:
src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/TypeData.cc

    rd2ded3e7 r37a3b8f  
    799799          case DeclarationNode::Struct:
    800800                at = new StructDecl( aggregate->name );
     801                buildForall( aggregate->params, at->get_parameters() );
    801802                break;
    802803          case DeclarationNode::Union:
    803804                at = new UnionDecl( aggregate->name );
     805                buildForall( aggregate->params, at->get_parameters() );
    804806                break;
    805807          case DeclarationNode::Context:
    806808                at = new ContextDecl( aggregate->name );
     809                buildList( aggregate->params, at->get_parameters() );
    807810                break;
    808811          default:
    809812                assert( false );
    810813        } // switch
    811         buildList( aggregate->params, at->get_parameters() );
     814//      buildList( aggregate->params, at->get_parameters() );
    812815        buildList( aggregate->fields, at->get_members() );
    813816
  • src/SymTab/Validate.cc

    rd2ded3e7 r37a3b8f  
    629629        Declaration *makeStructAssignment( StructDecl *aggregateDecl, StructInstType *refType, unsigned int functionNesting ) {
    630630                FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
     631
     632                // Make function polymorphic in same parameters as generic struct, if applicable
     633                std::list< TypeDecl* >& genericParams = aggregateDecl->get_parameters();
     634                for ( std::list< TypeDecl* >::const_iterator param = genericParams.begin(); param != genericParams.end(); ++param ) {
     635                        assignType->get_forall().push_back( (*param)->clone() );
     636                }
    631637 
    632638                ObjectDecl *returnVal = new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, refType->clone(), 0 );
  • src/SynTree/ReferenceToType.cc

    rd2ded3e7 r37a3b8f  
    5959std::string StructInstType::typeString() const { return "struct"; }
    6060
     61std::list<TypeDecl*>& StructInstType::get_baseParameters() { return baseStruct->get_parameters(); }
     62
    6163void StructInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
    6264        assert( baseStruct );
     
    6567
    6668std::string UnionInstType::typeString() const { return "union"; }
     69
     70std::list<TypeDecl*>& UnionInstType::get_baseParameters() { return baseUnion->get_parameters(); }
    6771
    6872void UnionInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
  • src/SynTree/Type.h

    rd2ded3e7 r37a3b8f  
    237237        StructDecl *get_baseStruct() const { return baseStruct; }
    238238        void set_baseStruct( StructDecl *newValue ) { baseStruct = newValue; }
    239        
    240         // a utility function
     239
     240        /// Accesses generic parameters of base struct
     241        std::list<TypeDecl*>& get_baseParameters();
     242       
     243        /// Looks up the members of this struct named "name" and places them into "foundDecls".
     244        /// Clones declarations into "foundDecls", caller responsible for freeing
    241245        void lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const;
    242246
     
    260264        UnionDecl *get_baseUnion() const { return baseUnion; }
    261265        void set_baseUnion( UnionDecl *newValue ) { baseUnion = newValue; }
    262        
    263         // a utility function
     266
     267        /// Accesses generic parameters of base union
     268        std::list<TypeDecl*>& get_baseParameters();
     269       
     270        /// looks up the members of this union named "name" and places them into "foundDecls"
     271        /// Clones declarations into "foundDecls", caller responsible for freeing
    264272        void lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const;
    265273
  • src/SynTree/TypeSubstitution.cc

    rd2ded3e7 r37a3b8f  
    126126Type *TypeSubstitution::handleType( TypeClass *type ) {
    127127        BoundVarsType oldBoundVars( boundVars );
     128        // bind type variables from forall-qualifiers
    128129        if ( freeOnly ) {
    129130                for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
     
    136137}
    137138
     139template< typename TypeClass >
     140Type *TypeSubstitution::handleAggregateType( TypeClass *type ) {
     141        BoundVarsType oldBoundVars( boundVars );
     142        // bind type variables from forall-qualifiers
     143        if ( freeOnly ) {
     144                for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
     145                        boundVars.insert( (*tyvar )->get_name() );
     146                } // for
     147        } // if
     148        // bind type variables from generic type instantiations
     149        for ( std::list< TypeDecl* >::const_iterator tyvar = type->get_baseParameters().begin(); tyvar != type->get_baseParameters().end(); ++tyvar ) {
     150                boundVars.insert( (*tyvar)->get_name() );
     151        } // for
     152        Type *ret = Mutator::mutate( type );
     153        boundVars = oldBoundVars;
     154        return ret;
     155}
     156
    138157Type * TypeSubstitution::mutate( VoidType *basicType ) {
    139158        return handleType( basicType );
     
    157176
    158177Type * TypeSubstitution::mutate( StructInstType *aggregateUseType ) {
    159         return handleType( aggregateUseType );
     178        return handleAggregateType( aggregateUseType );
    160179}
    161180
    162181Type * TypeSubstitution::mutate( UnionInstType *aggregateUseType ) {
    163         return handleType( aggregateUseType );
     182        return handleAggregateType( aggregateUseType );
    164183}
    165184
  • src/SynTree/TypeSubstitution.h

    rd2ded3e7 r37a3b8f  
    5858        virtual Type* mutate(TypeInstType *aggregateUseType);
    5959        virtual Expression* mutate(NameExpr *nameExpr);
    60        
     60
     61        /// Records type variable bindings from forall-statements
    6162        template< typename TypeClass > Type *handleType( TypeClass *type );
     63        /// Records type variable bindings from forall-statements and instantiations of generic types
     64        template< typename TypeClass > Type *handleAggregateType( TypeClass *type );
    6265       
    6366        virtual Type* mutate(VoidType *basicType);
Note: See TracChangeset for help on using the changeset viewer.