Changeset f8d05ee for src/AST/Type.cpp

Timestamp:

Aug 12, 2020, 12:19:39 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

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.

Message:

Merge branch 'new-ast' of plg.uwaterloo.ca:software/cfa/cfa-cc into new-ast

File:

• src/AST/Type.cpp (modified) (5 diffs)

src/AST/Type.cpp

@@ -94 +94 @@
 // --- ParameterizedType
 
-void ParameterizedType::initWithSub( 
-        const ParameterizedType & o, Pass< ForallSubstitutor > & sub 
+void ParameterizedType::initWithSub(
+        const ParameterizedType & o, Pass< ForallSubstitutor > & sub
 ) {
-        forall = sub.pass( o.forall );
+        forall = sub.core( o.forall );
 }
 
@@ -103 +103 @@
 
 FunctionType::FunctionType( const FunctionType & o )
-: ParameterizedType( o.qualifiers, copy( o.attributes ) ), returns(), params(), 
+: ParameterizedType( o.qualifiers, copy( o.attributes ) ), returns(), params(),
   isVarArgs( o.isVarArgs ) {
         Pass< ForallSubstitutor > sub;
         initWithSub( o, sub );           // initialize substitution map
-        returns = sub.pass( o.returns ); // apply to return and parameter types
-        params = sub.pass( o.params );
+        returns = sub.core( o.returns ); // apply to return and parameter types
+        params = sub.core( o.params );
 }
 
@@ -128 +128 @@
 void ReferenceToType::initWithSub( const ReferenceToType & o, Pass< ForallSubstitutor > & sub ) {
         ParameterizedType::initWithSub( o, sub ); // initialize substitution
-        params = sub.pass( o.params );            // apply to parameters
+        params = sub.core( o.params );            // apply to parameters
 }
 
@@ -166 +166 @@
 // --- TraitInstType
 
-TraitInstType::TraitInstType( 
+TraitInstType::TraitInstType(
         const TraitDecl * b, CV::Qualifiers q, std::vector<ptr<Attribute>>&& as )
 : ReferenceToType( b->name, q, move(as) ), base( b ) {}
@@ -172 +172 @@
 // --- TypeInstType
 
-TypeInstType::TypeInstType( const TypeInstType & o ) 
+TypeInstType::TypeInstType( const TypeInstType & o )
 : ReferenceToType( o.name, o.qualifiers, copy( o.attributes ) ), base(), kind( o.kind ) {
         Pass< ForallSubstitutor > sub;
         initWithSub( o, sub );      // initialize substitution
-        base = sub.pass( o.base );  // apply to base type
+        base = sub.core( o.base );  // apply to base type
 }