Changeset 839ccbb for src/GenPoly/InstantiateGeneric.cc
- Timestamp:
- Nov 20, 2015, 4:19:13 PM (9 years ago)
- 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:
- 5189888
- Parents:
- 05587c2 (diff), ed94eac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - git-author:
- Peter A. Buhr <pabuhr@…> (11/20/15 12:51:58)
- git-committer:
- Peter A. Buhr <pabuhr@…> (11/20/15 16:19:13)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/GenPoly/InstantiateGeneric.cc
r05587c2 r839ccbb 219 219 StructDecl *concDecl = instantiations.lookup( inst ); 220 220 if ( ! concDecl ) { 221 assert( inst->get_baseParameters() && "Base struct has parameters" ); 221 222 // set concDecl to new type, insert type declaration into statements to add 222 223 concDecl = new StructDecl( typeNamer.newName( inst->get_name() ) ); 223 224 substituteMembers( inst->get_baseStruct()->get_members(), 224 inst->get_baseParameters(), inst->get_parameters(),225 *inst->get_baseParameters(), inst->get_parameters(), 225 226 concDecl->get_members() ); 226 227 addDeclaration( concDecl ); … … 246 247 if ( ! concDecl ) { 247 248 // set concDecl to new type, insert type declaration into statements to add 249 assert( inst->get_baseParameters() && "Base union has parameters" ); 248 250 concDecl = new UnionDecl( typeNamer.newName( inst->get_name() ) ); 249 251 substituteMembers( inst->get_baseUnion()->get_members(), 250 inst->get_baseParameters(), inst->get_parameters(),252 *inst->get_baseParameters(), inst->get_parameters(), 251 253 concDecl->get_members() ); 252 254 addDeclaration( concDecl );
Note: See TracChangeset
for help on using the changeset viewer.