Changeset 93c10de for src/AST/Decl.hpp

Timestamp:

Nov 24, 2022, 11:01:37 AM (19 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/Decl.hpp (modified) (3 diffs)

src/AST/Decl.hpp

@@ -10 +10 @@
 // Created On       : Thu May 9 10:00:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu May  5 12:09:00 2022
-// Update Count     : 33
+// Last Modified On : Thu Nov 24  9:44:00 2022
+// Update Count     : 34
 //
 
@@ -191 +191 @@
         ptr<Type> init;
 
-        /// Data extracted from a type decl
-        struct Data {
-                Kind kind;
-                bool isComplete;
-
-                Data() : kind( NUMBER_OF_KINDS ), isComplete( false ) {}
-                Data( const TypeDecl * d ) : kind( d->kind ), isComplete( d->sized ) {}
-                Data( Kind k, bool c ) : kind( k ), isComplete( c ) {}
-                Data( const Data & d1, const Data & d2 )
-                        : kind( d1.kind ), isComplete( d1.isComplete || d2.isComplete ) {}
-
-                bool operator==( const Data & o ) const { return kind == o.kind && isComplete == o.isComplete; }
-                bool operator!=( const Data & o ) const { return !(*this == o); }
-        };
-
         TypeDecl(
                 const CodeLocation & loc, const std::string & name, Storage::Classes storage,
@@ -225 +210 @@
 };
 
-std::ostream & operator<< ( std::ostream &, const TypeDecl::Data & );
+/// Data extracted from a TypeDecl.
+struct TypeData {
+        TypeDecl::Kind kind;
+        bool isComplete;
+
+        TypeData() : kind( TypeDecl::NUMBER_OF_KINDS ), isComplete( false ) {}
+        TypeData( const TypeDecl * d ) : kind( d->kind ), isComplete( d->sized ) {}
+        TypeData( TypeDecl::Kind k, bool c ) : kind( k ), isComplete( c ) {}
+        TypeData( const TypeData & d1, const TypeData & d2 )
+                : kind( d1.kind ), isComplete( d1.isComplete || d2.isComplete ) {}
+
+        bool operator==( const TypeData & o ) const { return kind == o.kind && isComplete == o.isComplete; }
+        bool operator!=( const TypeData & o ) const { return !(*this == o); }
+};
+
+std::ostream & operator<< ( std::ostream &, const TypeData & );
 
 /// C-style typedef `typedef Foo Bar`