Changeset e0e9a0b for src/AST/Type.hpp

Timestamp:

Jun 27, 2019, 5:16:54 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

7d0881c

Parents:

6be3b7d6

Message:

Somewhat deeper clone for types with forall qualifiers.

• Added WithForallSubstitutor? pass accessory to perform these changes
• modified copy constructors of ParameterizedType? to properly update children

File:

• src/AST/Type.hpp (modified) (11 diffs)

src/AST/Type.hpp

@@ -33 +33 @@
 
 namespace ast {
+
+template< typename T > class Pass;
+class ForallSubstitutor;
 
 class Type : public Node {
@@ -266 +269 @@
 /// Base type for potentially forall-qualified types
 class ParameterizedType : public Type {
+protected:
+        /// initializes forall with substitutor
+        void initWithSub( const ParameterizedType & o, Pass< ForallSubstitutor > & sub );
 public:
         using ForallList = std::vector<ptr<TypeDecl>>;
@@ -278 +284 @@
         : Type(q, std::move(as)), forall() {}
 
-        ParameterizedType( const ParameterizedType & o ) : Type( o ), forall() {
-                // one-level deep clone to avoid weak-reference errors
-                forall.reserve( o.forall.size() );
-                for ( const TypeDecl * d : o.forall ) { forall.emplace_back( d->clone() ); }
-        }
+        // enforce use of ForallSubstitutor to copy parameterized type
+        ParameterizedType( const ParameterizedType & ) = delete;
 
         ParameterizedType( ParameterizedType && ) = default;
@@ -312 +315 @@
         : ParameterizedType(q), returns(), params(), isVarArgs(va) {}
 
+        FunctionType( const FunctionType & o );
+
         /// true if either the parameters or return values contain a tttype
         bool isTtype() const;
@@ -325 +330 @@
 /// base class for types that refer to types declared elsewhere (aggregates and typedefs)
 class ReferenceToType : public ParameterizedType {
+protected:
+        /// Initializes forall and parameters based on substitutor
+        void initWithSub( const ReferenceToType & o, Pass< ForallSubstitutor > & sub );
 public:
         std::vector<ptr<Expr>> params;
@@ -330 +338 @@
         bool hoistType = false;
 
-        ReferenceToType( const std::string& n, CV::Qualifiers q = {},
-                std::vector<ptr<Attribute>> && as = {} )
+        ReferenceToType( 
+                const std::string& n, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
         : ParameterizedType(q, std::move(as)), params(), name(n) {}
+
+        ReferenceToType( const ReferenceToType & o );
 
         /// Gets aggregate declaration this type refers to
@@ -349 +359 @@
         readonly<StructDecl> base;
 
-        StructInstType( const std::string& n, CV::Qualifiers q = {},
-                std::vector<ptr<Attribute>> && as = {} )
+        StructInstType( 
+                const std::string& n, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
         : ReferenceToType( n, q, std::move(as) ), base() {}
-        StructInstType( const StructDecl * b, CV::Qualifiers q = {},
-                std::vector<ptr<Attribute>> && as = {} );
+
+        StructInstType( 
+                const StructDecl * b, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} );
 
         bool isComplete() const override;
@@ -370 +381 @@
         readonly<UnionDecl> base;
 
-        UnionInstType( const std::string& n, CV::Qualifiers q = {},
-                std::vector<ptr<Attribute>> && as = {} )
+        UnionInstType( 
+                const std::string& n, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
         : ReferenceToType( n, q, std::move(as) ), base() {}
-        UnionInstType( const UnionDecl * b, CV::Qualifiers q = {},
-                std::vector<ptr<Attribute>> && as = {} );
+
+        UnionInstType( 
+                const UnionDecl * b, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} );
 
         bool isComplete() const override;
@@ -391 +403 @@
         readonly<EnumDecl> base;
 
-        EnumInstType( const std::string& n, CV::Qualifiers q = {},
-                std::vector<ptr<Attribute>> && as = {} )
+        EnumInstType( 
+                const std::string& n, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
         : ReferenceToType( n, q, std::move(as) ), base() {}
-        EnumInstType( const EnumDecl * b, CV::Qualifiers q = {},
-                std::vector<ptr<Attribute>> && as = {} );
+
+        EnumInstType( 
+                const EnumDecl * b, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} );
 
         bool isComplete() const override;
@@ -412 +425 @@
         readonly<TraitDecl> base;
 
-        TraitInstType( const std::string& n, CV::Qualifiers q = {},
-                std::vector<ptr<Attribute>> && as = {} )
+        TraitInstType( 
+                const std::string& n, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
         : ReferenceToType( n, q, std::move(as) ), base() {}
-        TraitInstType( const TraitDecl * b, CV::Qualifiers q = {},
-                std::vector<ptr<Attribute>> && as = {} );
+        
+        TraitInstType( 
+                const TraitDecl * b, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} );
 
         // not meaningful for TraitInstType
@@ -435 +449 @@
         TypeVar::Kind kind;
 
-        TypeInstType( const std::string& n, const TypeDecl * b, CV::Qualifiers q = {},
+        TypeInstType( 
+                const std::string& n, const TypeDecl * b, CV::Qualifiers q = {},
                 std::vector<ptr<Attribute>> && as = {} )
         : ReferenceToType( n, q, std::move(as) ), base( b ), kind( b->kind ) {}
-        TypeInstType( const std::string& n, TypeVar::Kind k, CV::Qualifiers q = {},
+        
+        TypeInstType( 
+                const std::string& n, TypeVar::Kind k, CV::Qualifiers q = {},
                 std::vector<ptr<Attribute>> && as = {} )
         : ReferenceToType( n, q, std::move(as) ), base(), kind( k ) {}
+
+        TypeInstType( const TypeInstType & o );
 
         /// sets `base`, updating `kind` correctly