Changeset aac5dfd for src/AST/Type.cpp

Timestamp:

Dec 12, 2020, 7:30:31 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5d1aa2f

Parents:

6ce9a4f2 (diff), 4803a901 (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 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/AST/Type.cpp

@@ -94 +94 @@
 // --- ParameterizedType
 
-void ParameterizedType::initWithSub(
-        const ParameterizedType & o, Pass< ForallSubstitutor > & sub
+void FunctionType::initWithSub(
+        const FunctionType & o, Pass< ForallSubstitutor > & sub
 ) {
         forall = sub.core( o.forall );
@@ -104 +104 @@
 
 FunctionType::FunctionType( const FunctionType & o )
-: ParameterizedType( o.qualifiers, copy( o.attributes ) ), returns(), params(),
+: Type( o.qualifiers, copy( o.attributes ) ), returns(), params(),
   isVarArgs( o.isVarArgs ) {
         Pass< ForallSubstitutor > sub;
@@ -125 +125 @@
 }
 
-// --- BaseInstType
-
-void BaseInstType::initWithSub( const BaseInstType & o, Pass< ForallSubstitutor > & sub ) {
-        ParameterizedType::initWithSub( o, sub ); // initialize substitution
-        params = sub.core( o.params );            // apply to parameters
-}
-
-BaseInstType::BaseInstType( const BaseInstType & o )
-: ParameterizedType( o.qualifiers, copy( o.attributes ) ), params(), name( o.name ),
-  hoistType( o.hoistType ) {
-        Pass< ForallSubstitutor > sub;
-        initWithSub( o, sub );
-}
-
 std::vector<readonly<Decl>> BaseInstType::lookup( const std::string& name ) const {
         assertf( aggr(), "Must have aggregate to perform lookup" );
@@ -176 +162 @@
         const TraitDecl * b, CV::Qualifiers q, std::vector<ptr<Attribute>>&& as )
 : BaseInstType( b->name, q, move(as) ), base( b ) {}
-
-// --- TypeInstType
-
-TypeInstType::TypeInstType( const TypeInstType & o )
-: BaseInstType( o.name, o.qualifiers, copy( o.attributes ) ), base(), kind( o.kind ) {
-        Pass< ForallSubstitutor > sub;
-        initWithSub( o, sub );      // initialize substitution
-        base = sub.core( o.base );  // apply to base type
-}
 
 void TypeInstType::set_base( const TypeDecl * b ) {