Changeset 923d25a

Timestamp:

Jul 23, 2020, 2:42:23 PM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

d1ee9ec

Parents:

a8ed717

Message:

SueInstType? is a template that replaces {Struct,Union,Enum}InstType?, with using declarations keeping the interface the same.

Location:

src/AST

Files:

• Fwd.hpp (modified) (2 diffs)
• Type.cpp (modified) (2 diffs)
• Type.hpp (modified) (2 diffs)

src/AST/Fwd.hpp

@@ -10 +10 @@
 // Created On       : Wed May  8 16:05:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 24 09:48:00 2019
-// Update Count     : 1
+// Last Modified On : Thr Jul 23 14:15:00 2020
+// Update Count     : 2
 //
 
@@ -108 +108 @@
 class FunctionType;
 class ReferenceToType;
-class StructInstType;
-class UnionInstType;
-class EnumInstType;
+template<typename decl_t> class SueInstType;
+using StructInstType = SueInstType<StructDecl>;
+using UnionInstType = SueInstType<UnionDecl>;
+using EnumInstType = SueInstType<EnumDecl>;
 class TraitInstType;
 class TypeInstType;

src/AST/Type.cpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Mon May 13 15:00:00 2019
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Dec 15 16:56:28 2019
-// Update Count     : 4
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jul 23 14:16:00 2020
+// Update Count     : 5
 //
 
@@ -148 +148 @@
 }
 
-// --- StructInstType
-
-StructInstType::StructInstType( 
-        const StructDecl * b, CV::Qualifiers q, std::vector<ptr<Attribute>>&& as )
+// --- SueInstType (StructInstType, UnionInstType, EnumInstType)
+
+template<typename decl_t>
+SueInstType<decl_t>::SueInstType(
+        const decl_t * b, CV::Qualifiers q, std::vector<ptr<Attribute>>&& as )
 : ReferenceToType( b->name, q, move(as) ), base( b ) {}
 
-bool StructInstType::isComplete() const { return base ? base->body : false; }
-
-// --- UnionInstType
-
-UnionInstType::UnionInstType( 
-        const UnionDecl * b, CV::Qualifiers q, std::vector<ptr<Attribute>>&& as )
-: ReferenceToType( b->name, q, move(as) ), base( b ) {}
-
-bool UnionInstType::isComplete() const { return base ? base->body : false; }
-
-// --- EnumInstType
-
-EnumInstType::EnumInstType( 
-        const EnumDecl * b, CV::Qualifiers q, std::vector<ptr<Attribute>>&& as )
-: ReferenceToType( b->name, q, move(as) ), base( b ) {}
-
-bool EnumInstType::isComplete() const { return base ? base->body : false; }
+template<typename decl_t>
+bool SueInstType<decl_t>::isComplete() const {
+        return base ? base->body : false;
+}
+
+template class SueInstType<StructDecl>;
+template class SueInstType<UnionDecl>;
+template class SueInstType<EnumDecl>;
 
 // --- TraitInstType

src/AST/Type.hpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Thu May 9 10:00:00 2019
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 11 21:56:46 2019
-// Update Count     : 5
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu Jul 23 14:15:00 2020
+// Update Count     : 6
 //
 
@@ -354 +354 @@
 };
 
-/// instance of struct type
-class StructInstType final : public ReferenceToType {
-public:
-        readonly<StructDecl> base;
-
-        StructInstType(
+// Common implementation for the SUE instance types. Not to be used directly.
+template<typename decl_t>
+class SueInstType final : public ReferenceToType {
+public:
+        using base_type = decl_t;
+        readonly<decl_t> base;
+
+        SueInstType(
                 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 = {} );
+        SueInstType(
+                const decl_t * b, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} );
 
         bool isComplete() const override;
 
-        const StructDecl * aggr() const override { return base; }
-
-        const Type * accept( Visitor & v ) const override { return v.visit( this ); }
-private:
-        StructInstType * clone() const override { return new StructInstType{ *this }; }
-        MUTATE_FRIEND
-};
-
-/// instance of union type
-class UnionInstType final : public ReferenceToType {
-public:
-        readonly<UnionDecl> base;
-
-        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 = {} );
-
-        bool isComplete() const override;
-
-        const UnionDecl * aggr() const override { return base; }
-
-        const Type * accept( Visitor & v ) const override { return v.visit( this ); }
-private:
-        UnionInstType * clone() const override { return new UnionInstType{ *this }; }
-        MUTATE_FRIEND
-};
-
-/// instance of enum type
-class EnumInstType final : public ReferenceToType {
-public:
-        readonly<EnumDecl> base;
-
-        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 = {} );
-
-        bool isComplete() const override;
-
-        const EnumDecl * aggr() const override { return base; }
-
-        const Type * accept( Visitor & v ) const override { return v.visit( this ); }
-private:
-        EnumInstType * clone() const override { return new EnumInstType{ *this }; }
-        MUTATE_FRIEND
-};
-
-/// instance of trait type
+        const decl_t * aggr() const override { return base; }
+
+        const Type * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
+        SueInstType<decl_t> * clone() const override { return new SueInstType<decl_t>{ *this }; }
+        MUTATE_FRIEND
+};
+
+/// An instance of a struct type.
+using StructInstType = SueInstType<StructDecl>;
+
+/// An instance of a union type.
+using UnionInstType = SueInstType<UnionDecl>;
+
+/// An instance of an enum type.
+using EnumInstType = SueInstType<EnumDecl>;
+
+/// An instance of a trait type.
 class TraitInstType final : public ReferenceToType {
 public: