Changes in / [63afee0:66a2a61]

Location:

src

Files:

• GenPoly/InstantiateGeneric.cc (modified) (2 diffs)
• SynTree/ReferenceToType.cc (modified) (2 diffs)
• SynTree/Type.h (modified) (2 diffs)
• SynTree/TypeSubstitution.cc (modified) (1 diff)

src/GenPoly/InstantiateGeneric.cc

@@ -219 +219 @@
                 StructDecl *concDecl = instantiations.lookup( inst );
                 if ( ! concDecl ) {
+                        assert( inst->get_baseParameters() && "Base struct has parameters" );
                         // set concDecl to new type, insert type declaration into statements to add
                         concDecl = new StructDecl( typeNamer.newName( inst->get_name() ) );
                         substituteMembers( inst->get_baseStruct()->get_members(),
-                                                                inst->get_baseParameters(), inst->get_parameters(),
+                                                                *inst->get_baseParameters(), inst->get_parameters(),
                                                                 concDecl->get_members() );
                         addDeclaration( concDecl );
@@ -246 +247 @@
                 if ( ! concDecl ) {
                         // set concDecl to new type, insert type declaration into statements to add
+                        assert( inst->get_baseParameters() && "Base union has parameters" );
                         concDecl = new UnionDecl( typeNamer.newName( inst->get_name() ) );
                         substituteMembers( inst->get_baseUnion()->get_members(),
-                                                                inst->get_baseParameters(), inst->get_parameters(),
+                                                                *inst->get_baseParameters(), inst->get_parameters(),
                                                                 concDecl->get_members() );
                         addDeclaration( concDecl );

src/SynTree/ReferenceToType.cc

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

src/SynTree/Type.h

@@ -238 +238 @@
         void set_baseStruct( StructDecl *newValue ) { baseStruct = newValue; }
 
-        /// Accesses generic parameters of base struct
-        std::list<TypeDecl*>& get_baseParameters();
+        /// Accesses generic parameters of base struct (NULL if none such)
+        std::list<TypeDecl*>* get_baseParameters();
         
         /// Looks up the members of this struct named "name" and places them into "foundDecls".
@@ -265 +265 @@
         void set_baseUnion( UnionDecl *newValue ) { baseUnion = newValue; }
 
-        /// Accesses generic parameters of base union
-        std::list<TypeDecl*>& get_baseParameters();
+        /// Accesses generic parameters of base union (NULL if none such)
+        std::list<TypeDecl*>* get_baseParameters();
         
         /// looks up the members of this union named "name" and places them into "foundDecls"

src/SynTree/TypeSubstitution.cc

@@ -147 +147 @@
         } // 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
+        std::list< TypeDecl* > *baseParameters = type->get_baseParameters();
+        if ( baseParameters && ! type->get_parameters().empty() ) {
+                for ( std::list< TypeDecl* >::const_iterator tyvar = baseParameters->begin(); tyvar != baseParameters->end(); ++tyvar ) {
+                        boundVars.insert( (*tyvar)->get_name() );
+                } // for
+        } // if
         Type *ret = Mutator::mutate( type );
         boundVars = oldBoundVars;