Changeset aac5dfd for src/AST/Type.hpp

Timestamp:

Dec 12, 2020, 7:30:31 PM (4 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.hpp (modified) (5 diffs)

src/AST/Type.hpp

@@ -267 +267 @@
 };
 
-/// 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>>;
-
-        ForallList forall;
-
-        ParameterizedType( ForallList&& fs = {}, CV::Qualifiers q = {},
-                std::vector<ptr<Attribute>> && as = {} )
-        : Type(q, std::move(as)), forall(std::move(fs)) {}
-
-        ParameterizedType( CV::Qualifiers q, std::vector<ptr<Attribute>> && as = {} )
-        : Type(q, std::move(as)), forall() {}
-
-        // enforce use of ForallSubstitutor to copy parameterized type
-        ParameterizedType( const ParameterizedType & ) = delete;
-
-        ParameterizedType( ParameterizedType && ) = default;
-
-        // no need to change destructor, and operator= deleted in Node
-
-private:
-        virtual ParameterizedType * clone() const override = 0;
-        MUTATE_FRIEND
-};
-
 /// Function variable arguments flag
 enum ArgumentFlag { FixedArgs, VariableArgs };
 
 /// Type of a function `[R1, R2](*)(P1, P2, P3)`
-class FunctionType final : public ParameterizedType {
-public:
+class FunctionType final : public Type {
+        protected:
+        /// initializes forall with substitutor
+        void initWithSub( const FunctionType & o, Pass< ForallSubstitutor > & sub );
+public:
+        using ForallList = std::vector<ptr<TypeDecl>>;
+        ForallList forall;
+
         std::vector<ptr<Type>> returns;
         std::vector<ptr<Type>> params;
@@ -313 +290 @@
 
         FunctionType( ArgumentFlag va = FixedArgs, CV::Qualifiers q = {} )
-        : ParameterizedType(q), returns(), params(), isVarArgs(va) {}
+        : Type(q), returns(), params(), isVarArgs(va) {}
 
         FunctionType( const FunctionType & o );
@@ -329 +306 @@
 
 /// base class for types that refer to types declared elsewhere (aggregates and typedefs)
-class BaseInstType : public ParameterizedType {
-protected:
-        /// Initializes forall and parameters based on substitutor
-        void initWithSub( const BaseInstType & o, Pass< ForallSubstitutor > & sub );
+class BaseInstType : public Type {
 public:
         std::vector<ptr<Expr>> params;
@@ -340 +314 @@
         BaseInstType(
                 const std::string& n, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
-        : ParameterizedType(q, std::move(as)), params(), name(n) {}
+        : Type(q, std::move(as)), params(), name(n) {}
 
         BaseInstType(
                 const std::string& n, std::vector<ptr<Expr>> && params,
                 CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} )
-        : ParameterizedType(q, std::move(as)), params(std::move(params)), name(n) {}
-
-        BaseInstType( const BaseInstType & o );
+        : Type(q, std::move(as)), params(std::move(params)), name(n) {}
+
+        BaseInstType( const BaseInstType & o ) = default;
 
         /// Gets aggregate declaration this type refers to
@@ -433 +407 @@
         : BaseInstType( n, q, std::move(as) ), base(), kind( k ) {}
 
-        TypeInstType( const TypeInstType & o );
+        TypeInstType( const TypeInstType & o ) = default;
 
         /// sets `base`, updating `kind` correctly