Changeset f8d05ee for src/AST/Type.cpp
- Timestamp:
- Aug 12, 2020, 12:19:39 PM (4 years ago)
- Branches:
- ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
- Children:
- 74807be, fb0ae06
- Parents:
- 7f66cec (diff), 7ff3e522 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/AST/Type.cpp
r7f66cec rf8d05ee 94 94 // --- ParameterizedType 95 95 96 void ParameterizedType::initWithSub( 97 const ParameterizedType & o, Pass< ForallSubstitutor > & sub 96 void ParameterizedType::initWithSub( 97 const ParameterizedType & o, Pass< ForallSubstitutor > & sub 98 98 ) { 99 forall = sub. pass( o.forall );99 forall = sub.core( o.forall ); 100 100 } 101 101 … … 103 103 104 104 FunctionType::FunctionType( const FunctionType & o ) 105 : ParameterizedType( o.qualifiers, copy( o.attributes ) ), returns(), params(), 105 : ParameterizedType( o.qualifiers, copy( o.attributes ) ), returns(), params(), 106 106 isVarArgs( o.isVarArgs ) { 107 107 Pass< ForallSubstitutor > sub; 108 108 initWithSub( o, sub ); // initialize substitution map 109 returns = sub. pass( o.returns ); // apply to return and parameter types110 params = sub. pass( o.params );109 returns = sub.core( o.returns ); // apply to return and parameter types 110 params = sub.core( o.params ); 111 111 } 112 112 … … 128 128 void ReferenceToType::initWithSub( const ReferenceToType & o, Pass< ForallSubstitutor > & sub ) { 129 129 ParameterizedType::initWithSub( o, sub ); // initialize substitution 130 params = sub. pass( o.params ); // apply to parameters130 params = sub.core( o.params ); // apply to parameters 131 131 } 132 132 … … 166 166 // --- TraitInstType 167 167 168 TraitInstType::TraitInstType( 168 TraitInstType::TraitInstType( 169 169 const TraitDecl * b, CV::Qualifiers q, std::vector<ptr<Attribute>>&& as ) 170 170 : ReferenceToType( b->name, q, move(as) ), base( b ) {} … … 172 172 // --- TypeInstType 173 173 174 TypeInstType::TypeInstType( const TypeInstType & o ) 174 TypeInstType::TypeInstType( const TypeInstType & o ) 175 175 : ReferenceToType( o.name, o.qualifiers, copy( o.attributes ) ), base(), kind( o.kind ) { 176 176 Pass< ForallSubstitutor > sub; 177 177 initWithSub( o, sub ); // initialize substitution 178 base = sub. pass( o.base ); // apply to base type178 base = sub.core( o.base ); // apply to base type 179 179 } 180 180
Note: See TracChangeset
for help on using the changeset viewer.