Changeset 93c10de for src/AST/Type.hpp

Timestamp:

Nov 24, 2022, 11:01:37 AM (22 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

82a90d4

Parents:

78de1e5

Message:

Minimal changes to pull out nested types, TypeInstType::TypeEnvKey? and TypeDecl::Data (now TypeData?) from there parent types. Although they do connect to the parent types they were nested in they are used on their own most of the time.

File:

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

src/AST/Type.hpp

@@ -10 +10 @@
 // Created On       : Thu May 9 10:00:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Jul 14 15:54:00 2021
-// Update Count     : 7
+// Last Modified On : Thu Nov 24  9:47:00 2022
+// Update Count     : 8
 //
 
@@ -390 +390 @@
 };
 
+struct TypeEnvKey;
+
 /// instance of named type alias (typedef or variable)
 class TypeInstType final : public BaseInstType {
@@ -401 +403 @@
         int expr_id = 0;
 
-        // compact representation used for map lookups.
-        struct TypeEnvKey {
-                const TypeDecl * base = nullptr;
-                int formal_usage = 0;
-                int expr_id = 0;
-
-                TypeEnvKey() = default;
-                TypeEnvKey(const TypeDecl * base, int formal_usage = 0, int expr_id = 0)
-                : base(base), formal_usage(formal_usage), expr_id(expr_id) {}
-                TypeEnvKey(const TypeInstType & inst)
-                : base(inst.base), formal_usage(inst.formal_usage), expr_id(inst.expr_id) {}
-                std::string typeString() const;
-                bool operator==(const TypeEnvKey & other) const;
-                bool operator<(const TypeEnvKey & other) const;
-        };
-
         bool operator==(const TypeInstType & other) const;
 
@@ -433 +419 @@
         TypeInstType( const TypeInstType & o ) = default;
 
-        TypeInstType( const TypeEnvKey & key )
-        : BaseInstType(key.base->name), base(key.base), kind(key.base->kind), formal_usage(key.formal_usage), expr_id(key.expr_id) {}
+        TypeInstType( const TypeEnvKey & key );
 
         /// sets `base`, updating `kind` correctly
@@ -453 +438 @@
         TypeInstType * clone() const override { return new TypeInstType{ *this }; }
         MUTATE_FRIEND
+};
+
+/// Compact representation of TypeInstType used for map lookups.
+struct TypeEnvKey {
+        const TypeDecl * base = nullptr;
+        int formal_usage = 0;
+        int expr_id = 0;
+
+        TypeEnvKey() = default;
+        TypeEnvKey(const TypeDecl * base, int formal_usage = 0, int expr_id = 0)
+        : base(base), formal_usage(formal_usage), expr_id(expr_id) {}
+        TypeEnvKey(const TypeInstType & inst)
+        : base(inst.base), formal_usage(inst.formal_usage), expr_id(inst.expr_id) {}
+        std::string typeString() const;
+        bool operator==(const TypeEnvKey & other) const;
+        bool operator<(const TypeEnvKey & other) const;
 };
 
@@ -560 +561 @@
 namespace std {
         template<>
-        struct hash<typename ast::TypeInstType::TypeEnvKey> {
-                size_t operator() (const ast::TypeInstType::TypeEnvKey & x) const {
+        struct hash<typename ast::TypeEnvKey> {
+                size_t operator() (const ast::TypeEnvKey & x) const {
                         const size_t p = 1000007;
                         size_t res = reinterpret_cast<size_t>(x.base);